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

8862 files changed, 133104 insertions, 26410 deletions

diff --git a/app-forensics/aide/ChangeLog b/app-forensics/aide/ChangeLog
index 9594c40230cf..70d029513113 100644
--- a/app-forensics/aide/ChangeLog
+++ b/app-forensics/aide/ChangeLog
@@ -1,6 +1,57 @@
-# ChangeLog for app-admin/aide
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.1 2004/09/12 06:44:02 dragonheart Exp $
+# ChangeLog for app-forensics/aide
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/ChangeLog,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
+
+  02 Oct 2005; Benjamin Smee <strerror@gentoo.org>
+  +files/aide-0.10_p20040917-r1-fix-psql.diff:
+  Added file for postgres fix re BUG 107927
+
+*aide-0.10_p20040917-r1 (30 Sep 2005)
+
+  30 Sep 2005; Benjamin Smee <strerror@gentoo.org> +files/aide.conf,
+  +files/aide.cron, +files/aideinit, +aide-0.10_p20040917-r1.ebuild:
+  Added helper script and changed default config
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> aide-0.10_p20040917.ebuild:
+  stable on amd64
+
+  27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  aide-0.10_p20040917.ebuild:
+  Stable on ppc.
+
+  06 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  aide-0.10_p20040917.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  aide-0.10_p20040917.ebuild:
+  Stable on sparc
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> aide-0.10_p20040917.ebuild:
+  Marked stable on x86.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> aide-0.10_p20040917.ebuild:
+  Fixed hasq/useq invocation
+
+*aide-0.10_p20040917 (18 Sep 2004)
+
+  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/aide-0.10_p20040917-fix-psql.diff, +aide-0.10_p20040917.ebuild:
+  Version bump; fixes bugs 23764, 37007, and 62194. Thanks to Joshua
+  Schmidlkofer for the postgresql patch.
+
+  17 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> aide-0.10.ebuild,
+  aide-0.9.ebuild:
+  Fixed deps (bug #44445)
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml:
+  metadata.xml update
 
 *aide-0.10 (12 Sep 2004)
 
@@ -13,7 +64,7 @@
   -aide-0.8.ebuild:
   Fix mhash segfault irt #62194, thanks Gianluca <g.insolvibile@cpr.it>.
 
-  03 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> aide-0.10.ebuild:
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> aide-0.10.ebuild:
   Stable on alpha.
 
   06 Jun 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml,
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index 00696e8f475e..f78ed5e3f9cd 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -1,18 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 dcdc22abbbffe429872e8a27b98beeef aide-0.9.ebuild 1359
-MD5 b7d062e0e2ee496501fef9b80c2b409d aide-0.10.ebuild 1366
-MD5 8fbe5bbfe21e1b2c75975971e4ff2594 ChangeLog 2995
-MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
+MD5 1f9a724bcbf5a980dde1a775ff905de2 ChangeLog 4891
+MD5 91b1915d9d4ebc8ceb302db89bd31b77 aide-0.10.ebuild 1418
+MD5 7281a76e068801286ae965927b25c83b aide-0.10_p20040917-r1.ebuild 3081
+MD5 f963571827dc97f1cbb03143bfcdbbca aide-0.10_p20040917.ebuild 2595
+MD5 4a0822e3949514e3f02289044fcb65f8 aide-0.9.ebuild 1390
 MD5 4f38a077259ca3be62ae6a55c82d5302 files/aide-0.10-gentoo.diff 2760
-MD5 b26d49d6bcafd39178a0da345cb2985d files/digest-aide-0.9 60
+MD5 71915b04e537c8182a7cb3c7f560e04e files/aide-0.10_p20040917-fix-psql.diff 4726
+MD5 71915b04e537c8182a7cb3c7f560e04e files/aide-0.10_p20040917-r1-fix-psql.diff 4726
 MD5 f07734c5b540f7a251d3d8139ef0f75f files/aide-0.9-gentoo.diff 2319
+MD5 85ae869c8edee90f3cceb6bf309c6c60 files/aide.conf 2713
+MD5 677202a99eef995fb515577bc4614aa8 files/aide.cron 5775
+MD5 9fd564a250e289afba0bf43ef639eae3 files/aideinit 2948
 MD5 8c599ad3440b5d4a3244875ff0655225 files/digest-aide-0.10 61
+MD5 ff4b62bd8854921c76dd8a59552f3382 files/digest-aide-0.10_p20040917 71
+MD5 ff4b62bd8854921c76dd8a59552f3382 files/digest-aide-0.10_p20040917-r1 71
+MD5 b26d49d6bcafd39178a0da345cb2985d files/digest-aide-0.9 60
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFBQw8vcAgAdbxYsnERAo+eAJ9sHGHNnSzoNhGi+QrgyLsg26TPAQCglN92
-4XxX/ArSMV6JGVm+1vOGYnc=
-=a0gZ
+iD8DBQFDb6H6mdTrptrqvGERAmMkAJ4lckVKaCsRebHElgwaxLmbi7RlwwCfdHv9
+yvYb0eOX/H7mM+H6AXWIrY4=
+=xFci
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/aide/aide-0.10.ebuild b/app-forensics/aide/aide-0.10.ebuild
index a350db2a9748..d1f6887d83e1 100644
--- a/app-forensics/aide/aide-0.10.ebuild
+++ b/app-forensics/aide/aide-0.10.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/app-forensics/aide/aide-0.10.ebuild,v 1.1 2004/09/12 06:44:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.10.ebuild,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
 
 inherit eutils
 
@@ -10,17 +10,18 @@ SRC_URI="mirror://sourceforge/aide/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha ~amd64"
+KEYWORDS="x86 ppc ~sparc alpha ~amd64"
 IUSE="nls postgres zlib crypt"
 
 DEPEND="app-arch/gzip
 	sys-devel/bison
 	sys-devel/flex
 	app-crypt/mhash
+	sys-devel/gettext
 	crypt? ( dev-libs/libgcrypt )
 	postgres? ( dev-db/postgresql )
 	zlib? ( sys-libs/zlib )"
-RDEPEND=""
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-forensics/aide/aide-0.10_p20040917-r1.ebuild b/app-forensics/aide/aide-0.10_p20040917-r1.ebuild
index 45c115b55b46..80105c0f595b 100644
--- a/app-forensics/aide/aide-0.10_p20040917-r1.ebuild
+++ b/app-forensics/aide/aide-0.10_p20040917-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/app-forensics/aide/aide-0.10_p20040917-r1.ebuild,v 1.1 2005/09/30 15:19:38 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.10_p20040917-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-forensics/aide/aide-0.10_p20040917.ebuild b/app-forensics/aide/aide-0.10_p20040917.ebuild
index 1b86b8958e40..542dec8de7e4 100644
--- a/app-forensics/aide/aide-0.10_p20040917.ebuild
+++ b/app-forensics/aide/aide-0.10_p20040917.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/app-forensics/aide/aide-0.10_p20040917.ebuild,v 1.1 2004/09/18 14:22:11 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.10_p20040917.ebuild,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 IUSE="nls postgres zlib crypt"
 
 DEPEND="app-arch/gzip
@@ -57,7 +57,7 @@ src_compile() {
 
 src_test() {
 	# aide abort()'s inside the sandbox for some reason
-	if ! hasq sandbox ${FEATURES};
+	if ! has sandbox ${FEATURES};
 	then
 		src/aide --init -c doc/aide.conf -V20 \
 			|| die "failed to initialise database"
@@ -84,7 +84,7 @@ pkg_postinst() {
 	einfo "Read the aide.conf(5) manual page for more information."
 	echo
 
-	if useq postgres; then
+	if use postgres; then
 		einfo "Due to a bad assumption by aide, you must issue the following"
 		einfo "command after the database initialization (aide --init ...):"
 		einfo
diff --git a/app-forensics/aide/aide-0.9.ebuild b/app-forensics/aide/aide-0.9.ebuild
index 6e621493987f..b53beea3d5ff 100644
--- a/app-forensics/aide/aide-0.9.ebuild
+++ b/app-forensics/aide/aide-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/app-forensics/aide/aide-0.9.ebuild,v 1.1 2004/09/12 06:44:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/aide/aide-0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ DEPEND="app-arch/gzip
 	crypt? ( dev-libs/libgcrypt )
 	postgres? ( dev-db/postgresql )
 	zlib? ( sys-libs/zlib )"
-RDEPEND=""
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index d8b96be3c5cd..25f363e289d8 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>forensics</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>forensics@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/air/ChangeLog b/app-forensics/air/ChangeLog
index 928edb322e9c..dd29ce34e642 100644
--- a/app-forensics/air/ChangeLog
+++ b/app-forensics/air/ChangeLog
@@ -1,6 +1,60 @@
-# ChangeLog for sys-apps/air
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.1 2004/09/12 06:53:08 dragonheart Exp $
+# ChangeLog for app-forensics/air
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/ChangeLog,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
+
+*air-1.2.8 (28 Sep 2005)
+
+  28 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/air-1.2.5-installfix.patch, -files/air-1.2.5-r1-installfix.patch,
+  -air-1.2.5-r1.ebuild, +air-1.2.8.ebuild:
+  version bump
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> air-1.2.7.ebuild:
+  Changed root:root -> root:0 permissions and made sharutils and coreutils
+  conditional to GNU userland.
+
+  27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> air-1.2.7.ebuild:
+  Stable on ppc.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> air-1.2.7.ebuild:
+  Marked stable on x86.
+
+*air-1.2.7 (04 Dec 2004)
+
+  04 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  -files/air-1.2.3_beta3-installfix.patch, -air-1.2.3_beta3.ebuild,
+  air-1.2.5-r1.ebuild, -air-1.2.5.ebuild, +air-1.2.7.ebuild:
+  version bump. keywords x86 and ppc to air-1.2.5-r1.
+
+  14 Oct 2004; David Holm <dholm@gentoo.org> air-1.2.5-r1.ebuild:
+  Added to ~ppc.
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  16 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  files/air-1.2.5-r1-installfix.patch, air-1.2.5-r1.ebuild:
+  Commented out automail line in install. Thanks to  
+  Daniel Webert <rockoo@rockoo.homelinux.org> in bug #64143.
+  also fixed permission on /usr/bin/air
+
+*air-1.2.5-r1 (13 Sep 2004)
+
+  13 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/air-1.2.5-r1-installfix.patch, +air-1.2.5-r1.ebuild:
+  More flexable patch and a few more checks
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> air-1.2.5.ebuild:
+  changed to remove /usr/bin/split which is installed by coreutils
+
+*air-1.2.5 (12 Sep 2004)
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/air-1.2.5-installfix.patch, +air-1.2.5.ebuild:
+  version bump
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml:
+  metadata.xml update
 
 *air-1.2.3_beta3 (12 Sep 2004)
 
diff --git a/app-forensics/air/Manifest b/app-forensics/air/Manifest
index ce19d9566ce7..b20cd485abf5 100644
--- a/app-forensics/air/Manifest
+++ b/app-forensics/air/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 a4e2290293bdeaa9714ea06ab7a2b444 air-1.2.3_beta3.ebuild 1389
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 d3ed3be1d0241acc52a64c4e3c21561a ChangeLog 1037
-MD5 5e2c9543b3ba5b7ad85af0c87c767029 files/digest-air-1.2.3_beta3 66
-MD5 ef2381a8147873ad21c5d638d5cde8d1 files/air-1.2.3_beta3-installfix.patch 5335
+MD5 4bee7213c707b630b410de19b7b72989 air-1.2.8.ebuild 1568
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
+MD5 84fe51d74e490ad721c4fdefc627cd01 ChangeLog 3102
+MD5 ef52314f83a8979fd3a5bc56416ceaa6 air-1.2.7.ebuild 1587
+MD5 77a44840c820d25ce30ccbf5915a4542 files/digest-air-1.2.8 60
+MD5 e57a11971a8230ba7ec6c7efa082fd93 files/digest-air-1.2.7 60
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFA+hSnmdTrptrqvGERAmnvAJ9ZGDoYwt8OsakfosFLbJ6huKSVJgCglOC7
-ZzPaEMclsz87/xTSe8NGb1c=
-=W025
+iD8DBQFDOw5rmdTrptrqvGERAsQrAJ9k6AyCZp+ISNcjfwM5MG7igAYOcwCfWZLn
+wsJH5SuH8DY3hkeyQUu0Krk=
+=uZ7z
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/air/air-1.2.7.ebuild b/app-forensics/air/air-1.2.7.ebuild
index a48c3b837a94..ff6bcadfda00 100644
--- a/app-forensics/air/air-1.2.7.ebuild
+++ b/app-forensics/air/air-1.2.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/app-forensics/air/air-1.2.7.ebuild,v 1.1 2004/12/04 06:27:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.7.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
 DESCRIPTION="A GUI front-end to dd/dcfldd"
 HOMEPAGE="http://air-imager.sourceforge.net/"
@@ -8,17 +8,17 @@ SRC_URI="mirror://sourceforge/air-imager/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND=">=dev-perl/perl-tk-804.027
-	app-arch/sharutils
+	userland_GNU? ( app-arch/sharutils )
 	sys-apps/sed
 	dev-lang/perl"
 
 RDEPEND="app-arch/mt-st
 	dev-lang/perl
-	sys-apps/coreutils"
+	userland_GNU? ( sys-apps/coreutils )"
 
 src_compile() {
 	einfo "nothing to compile"
@@ -40,7 +40,7 @@ src_install() {
 
 	rm ${D}/usr/bin/split
 
-	chown -R root:root ${D}
+	chown -R root:0 ${D}
 	fowners root:users /usr/share/air/logs
 	fperms ug+rwx /usr/share/air/logs
 	if [ -p ${D}usr/share/air/air-fifo ]; then
diff --git a/app-forensics/air/air-1.2.8.ebuild b/app-forensics/air/air-1.2.8.ebuild
index c10b7ce30464..8d78790f12eb 100644
--- a/app-forensics/air/air-1.2.8.ebuild
+++ b/app-forensics/air/air-1.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/app-forensics/air/air-1.2.8.ebuild,v 1.1 2005/09/28 21:42:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/air/air-1.2.8.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
 DESCRIPTION="A GUI front-end to dd/dcfldd"
 HOMEPAGE="http://air-imager.sourceforge.net/"
diff --git a/app-forensics/air/metadata.xml b/app-forensics/air/metadata.xml
index b9fc2b9c6f11..25f363e289d8 100644
--- a/app-forensics/air/metadata.xml
+++ b/app-forensics/air/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>dragonheart@gentoo.org</email>
-    <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
-</maintainer>
-<longdescription></longdescription>
+	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/airt/ChangeLog b/app-forensics/airt/ChangeLog
index 4103095260a2..7e9d43f96e63 100644
--- a/app-forensics/airt/ChangeLog
+++ b/app-forensics/airt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-forensics/airt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/airt/ChangeLog,v 1.1 2005/01/26 01:55:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/airt/ChangeLog,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
+
+*airt-0.4-r1 (19 Jul 2005)
+
+  19 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/airt-0.4-dismod.patch, +files/airt-0.4-kernelupdate.patch,
+  +airt-0.4-r1.ebuild:
+  patch to fix with newer kernels. dismod perl script modified to find the
+  System.map and dismod executables
 
   26 Jan 2005; Daniel Black <dragonheart@gentoo.org> +airt-0.4.ebuild,
   +metadata.xml:
diff --git a/app-forensics/airt/Manifest b/app-forensics/airt/Manifest
index 8b4e16ad0388..7069573c347a 100644
--- a/app-forensics/airt/Manifest
+++ b/app-forensics/airt/Manifest
@@ -1,4 +1,18 @@
-MD5 4b59820e60cb4d0b47a3e6f4b0a4c3c5 airt-0.4.ebuild 974
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 df3e59ec816b16c961e26b502ed7bf1e airt-0.4.ebuild 1066
 MD5 dd09b3d3602805b1bbcac35ef93e82c6 metadata.xml 707
-MD5 df64dfce8ed3b3f0ff26962cc24c69bd ChangeLog 294
+MD5 19bbba1defccb85f3602773e0e97b286 ChangeLog 673
+MD5 fc66b30754270e8dc4be294a126a9342 airt-0.4-r1.ebuild 1149
 MD5 827cc186dcaac15ec33e2fdf18c78399 files/digest-airt-0.4 60
+MD5 d22f2ab7a3eb68a1a10927e0817498dd files/airt-0.4-kernelupdate.patch 6178
+MD5 827cc186dcaac15ec33e2fdf18c78399 files/digest-airt-0.4-r1 60
+MD5 466eea11f18af7adea2700516d1661af files/airt-0.4-dismod.patch 641
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFC3NyRmdTrptrqvGERAtvyAJ4qZvtD4MHhnTidW2pqjk8UpHRzTgCXZwsZ
+dC7AbtLlU1DrgahR1vSKTg==
+=8TZH
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/airt/airt-0.4-r1.ebuild b/app-forensics/airt/airt-0.4-r1.ebuild
index 1d675dce012b..7fc9d9d098ba 100644
--- a/app-forensics/airt/airt-0.4-r1.ebuild
+++ b/app-forensics/airt/airt-0.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/app-forensics/airt/airt-0.4-r1.ebuild,v 1.1 2005/07/19 10:56:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/airt/airt-0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
 
 inherit linux-mod toolchain-funcs eutils
 
diff --git a/app-forensics/airt/airt-0.4.ebuild b/app-forensics/airt/airt-0.4.ebuild
index dba7b792e583..aeb24f676cec 100644
--- a/app-forensics/airt/airt-0.4.ebuild
+++ b/app-forensics/airt/airt-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/app-forensics/airt/airt-0.4.ebuild,v 1.1 2005/01/26 01:55:37 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/airt/airt-0.4.ebuild,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
 
 inherit linux-mod toolchain-funcs
 
@@ -9,7 +9,6 @@ HOMEPAGE="http://159.226.5.93/projects/airt.htm"
 SRC_URI="http://159.226.5.93/projects/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-SLOT="0"
 KEYWORDS="x86 -*"
 IUSE=""
 S=${WORKDIR}/${PN}
diff --git a/app-forensics/autopsy/ChangeLog b/app-forensics/autopsy/ChangeLog
index 42149d47bb61..6ad174171718 100644
--- a/app-forensics/autopsy/ChangeLog
+++ b/app-forensics/autopsy/ChangeLog
@@ -1,6 +1,39 @@
-# ChangeLog for app-admin/autopsy
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/autopsy/ChangeLog,v 1.1 2004/09/12 07:18:57 dragonheart Exp $
+# ChangeLog for app-forensics/autopsy
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/autopsy/ChangeLog,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
+
+*autopsy-2.05 (22 Apr 2005)
+
+  22 Apr 2005; Daniel Black <dragonheart@gentoo.org> autopsy-2.03.ebuild,
+  +autopsy-2.05.ebuild:
+  Version bump as per bug #89978. Thanks to Byrne <gentoo-bugzilla@nscs.uk.com>
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> autopsy-2.03.ebuild:
+  stable on amd64
+
+  25 Dec 2004; Jason Wever <weeve@gentoo.org> autopsy-2.03.ebuild:
+  Stable on sparc.
+
+  14 Dec 2004; Daniel Black <dragonheart@gentoo.org> -autopsy-2.00.ebuild,
+  autopsy-2.03.ebuild:
+  ppc and x86 stable. Old version removed:
+
+  21 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> autopsy-2.03.ebuild:
+  Added to ~amd64, bug #71926
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> autopsy-2.01.ebuild:
+  Stable on sparc.
+
+  12 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> files/autopsy.pl:
+  Added $FILE_EXE to configuration (fixes bug #63806)
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  autopsy-2.00.ebuild, autopsy-2.01.ebuild, autopsy-2.03.ebuild:
+  metadata.xml update. app-admin/sleuthkit dependancy changed to
+  app-forensics/sleuthkit
 
 *autopsy-2.03 (12 Sep 2004)
 
diff --git a/app-forensics/autopsy/Manifest b/app-forensics/autopsy/Manifest
index 0cc67b3dfa9d..e2caec52ff8c 100644
--- a/app-forensics/autopsy/Manifest
+++ b/app-forensics/autopsy/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e96787b73921c43f02ecea357cabddc0 autopsy-2.00.ebuild 1396
-MD5 af1c5dd2a9574d6906952c2132588260 ChangeLog 1347
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 b77c084d56123f0e3a7978de9bed46e1 autopsy-2.01.ebuild 1455
-MD5 c0090e9597689a336ccccbbdcd05edd5 autopsy-2.03.ebuild 1456
-MD5 c05a3215316f445eab678356bd2c3327 files/digest-autopsy-2.00 64
-MD5 7acbb37db527316691b7d21cb904a0ae files/autopsy.pl 663
+MD5 49ef1d12147f27e5b4efe77f5272f0f9 autopsy-2.05.ebuild 1467
+MD5 1e9cb75bff6594262f08636ca02bdcc4 ChangeLog 2743
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
+MD5 b6757d96a074933eb2fa50ca5353000c autopsy-2.01.ebuild 1446
+MD5 5ce3933378fb75a648e578c63c258f9a autopsy-2.03.ebuild 1447
+MD5 424d196219996c04c7d10d0fa801e247 files/digest-autopsy-2.05 64
+MD5 28529194353399823ebc1ae197c59063 files/autopsy.pl 692
 MD5 18d57e36340f7d07de759a1cc1b6bc79 files/digest-autopsy-2.01 64
 MD5 c8f162c1a97dac665f1b5fd943c831a4 files/digest-autopsy-2.03 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBQwnKmdTrptrqvGERAuwfAJ4upQ0Po3r5j9wkKekU3Ux3PZsTkgCcCUbv
-/bFmTt9xp4vDK9xjOQRF0MI=
-=vDkk
+iD8DBQFCazgHmdTrptrqvGERAlSDAJ4iQgoIYYiWliDqSEzN3vTH/rQ9DQCfYCRj
+1xNaIVvGvDZ4xE6u6KT6n/U=
+=cdKU
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/autopsy/autopsy-2.01.ebuild b/app-forensics/autopsy/autopsy-2.01.ebuild
index 18fe4c50e4ad..dfe607a70ed5 100644
--- a/app-forensics/autopsy/autopsy-2.01.ebuild
+++ b/app-forensics/autopsy/autopsy-2.01.ebuild
@@ -1,27 +1,25 @@
-# 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/app-forensics/autopsy/autopsy-2.01.ebuild,v 1.1 2004/09/12 07:18:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/autopsy/autopsy-2.01.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A graphical interface to the digital forensic analysis tools in The Sleuth Kit."
-SRC_URI="mirror://sourceforge/autopsy/${P}.tar.gz"
 HOMEPAGE="http://www.sleuthkit.org/autopsy/"
-RESTRICT="nomirror"
+SRC_URI="mirror://sourceforge/autopsy/${P}.tar.gz"
 
-KEYWORDS="x86 ~sparc ~s390 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="arm ppc s390 sparc x86"
 IUSE=""
-# Runtime depend on grep and file deliberate
 
+# Runtime depend on grep and file deliberate
 RDEPEND="dev-lang/perl
-	app-admin/sleuthkit
+	app-forensics/sleuthkit
 	sys-apps/grep
 	sys-apps/file"
-
 DEPEND="dev-lang/perl
-	app-admin/sleuthkit
+	app-forensics/sleuthkit
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/app-forensics/autopsy/autopsy-2.03.ebuild b/app-forensics/autopsy/autopsy-2.03.ebuild
index 4e0f2ace9491..94920d53cfb0 100644
--- a/app-forensics/autopsy/autopsy-2.03.ebuild
+++ b/app-forensics/autopsy/autopsy-2.03.ebuild
@@ -1,27 +1,25 @@
-# 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/app-forensics/autopsy/autopsy-2.03.ebuild,v 1.1 2004/09/12 07:18:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/autopsy/autopsy-2.03.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A graphical interface to the digital forensic analysis tools in The Sleuth Kit."
-SRC_URI="mirror://sourceforge/autopsy/${P}.tar.gz"
 HOMEPAGE="http://www.sleuthkit.org/autopsy/"
-RESTRICT="nomirror"
+SRC_URI="mirror://sourceforge/autopsy/${P}.tar.gz"
 
-KEYWORDS="~x86 ~sparc ~s390 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 arm ppc s390 sparc x86"
 IUSE=""
-# Runtime depend on grep and file deliberate
 
+# Runtime depend on grep and file deliberate
 RDEPEND="dev-lang/perl
-	app-admin/sleuthkit
+	app-forensics/sleuthkit
 	sys-apps/grep
 	sys-apps/file"
-
 DEPEND="dev-lang/perl
-	app-admin/sleuthkit
+	app-forensics/sleuthkit
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/app-forensics/autopsy/autopsy-2.05.ebuild b/app-forensics/autopsy/autopsy-2.05.ebuild
index e250bc1ae807..372581fe4446 100644
--- a/app-forensics/autopsy/autopsy-2.05.ebuild
+++ b/app-forensics/autopsy/autopsy-2.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/app-forensics/autopsy/autopsy-2.05.ebuild,v 1.1 2005/04/24 06:08:58 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/autopsy/autopsy-2.05.ebuild,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-forensics/autopsy/files/autopsy.pl b/app-forensics/autopsy/files/autopsy.pl
index 40bc343153f2..afafe972048d 100644
--- a/app-forensics/autopsy/files/autopsy.pl
+++ b/app-forensics/autopsy/files/autopsy.pl
@@ -16,6 +16,7 @@ $INSTALLDIR = '/usr/lib/autopsy';
 # System Utilities
 $STRINGS_EXE = '/usr/bin/strings';
 $GREP_EXE = '/bin/grep';
+$FILE_EXE = '/usr/bin/file';
 
 # Directories
 # Where sleuthkit is installed (leave this alone)
diff --git a/app-forensics/autopsy/metadata.xml b/app-forensics/autopsy/metadata.xml
index b9fc2b9c6f11..25f363e289d8 100644
--- a/app-forensics/autopsy/metadata.xml
+++ b/app-forensics/autopsy/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>dragonheart@gentoo.org</email>
-    <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
-</maintainer>
-<longdescription></longdescription>
+	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/chkrootkit/ChangeLog b/app-forensics/chkrootkit/ChangeLog
index bad72f6ffe5a..f13cfc7b5512 100644
--- a/app-forensics/chkrootkit/ChangeLog
+++ b/app-forensics/chkrootkit/ChangeLog
@@ -1,6 +1,126 @@
-# ChangeLog for app-admin/chkrootkit
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/ChangeLog,v 1.1 2004/09/12 06:58:28 dragonheart Exp $
+# ChangeLog for app-forensics/chkrootkit
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+*chkrootkit-0.46a (28 Oct 2005)
+
+  28 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> -chkrootkit-0.46.ebuild,
+  +chkrootkit-0.46a.ebuild:
+  Version bump; tidy previous ebuild.
+
+  27 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> chkrootkit-0.46.ebuild:
+  Bah fix the keywords...
+
+*chkrootkit-0.46 (27 Oct 2005)
+
+  27 Oct 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/chkrootkit-0.46-add-missing-includes.diff, +chkrootkit-0.46.ebuild:
+  Version bump.
+
+  06 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> -chkrootkit-0.43-r3.ebuild,
+  -chkrootkit-0.43-r4.ebuild, -chkrootkit-0.44.ebuild,
+  chkrootkit-0.44-r1.ebuild, chkrootkit-0.45.ebuild:
+  Added ~mips for bug 88425.  Tidy old ebuilds.
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> chkrootkit-0.45.ebuild:
+  Stable on alpha.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> chkrootkit-0.45.ebuild:
+  Stable on ppc64
+
+  29 May 2005; Marcus D. Hanwell <marcus@gentoo.org> chkrootkit-0.45.ebuild:
+  Stable on amd64.
+
+  27 May 2005; Joseph Jezak <josejx@gentoo.org> chkrootkit-0.45.ebuild:
+  Marked ppc stable.
+
+  26 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  chkrootkit-0.45.ebuild:
+  Stable on sparc
+
+  25 May 2005; Aaron Walker <ka0ttic@gentoo.org> chkrootkit-0.45.ebuild:
+  Stable on x86.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> chkrootkit-0.44-r1.ebuild:
+  Stable on ppc64
+
+*chkrootkit-0.45 (25 Feb 2005)
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/chkrootkit-0.45-makefile.diff, +chkrootkit-0.45.ebuild:
+  Version bump.
+
+*chkrootkit-0.44-r1 (23 Jan 2005)
+
+  23 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/chkrootkit-0.44-coreutils-static-falsepositive.patch,
+  +chkrootkit-0.44-r1.ebuild:
+  Revision bump to solve false detections with static coreutils (du and ls). Bug
+  #73372 refers. Thanks to the author Nelson Murilo <nelson@pangeia.com.br> for
+  a very rapid response.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> chkrootkit-0.44.ebuild:
+  Stable on amd64.
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> chkrootkit-0.44.ebuild:
+  Stable on alpha.
+
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> chkrootkit-0.44.ebuild:
+  Stable on sparc
+
+  30 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> chkrootkit-0.44.ebuild:
+  Marked stable on x86.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  chkrootkit-0.43-r4.ebuild:
+  stable on amd64.
+
+  08 Oct 2004; Jason Wever <weeve@gentoo.org> chkrootkit-0.43-r4.ebuild:
+  Stable on sparc.
+
+  05 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> chkrootkit-0.43-r4.ebuild:
+  Stable on alpha.
+
+  04 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> -chkrootkit-0.43-r2.ebuild,
+  chkrootkit-0.43-r4.ebuild, -chkrootkit-0.43.ebuild:
+  Marked 0.43-r4 stable on x86; clean up old versions.
+
+  28 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> chkrootkit-0.44.ebuild:
+  Updated ebuild & diff to respect user CFLAGS/LDFLAGS as well as
+  FEATURES=nostrip. Added warning message for false positives (bug #65635).
+  Also, marked ~ppc64 (should've been carried over from 0.43-r3).
+
+  19 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  chkrootkit-0.43-r3.ebuild:
+  Stable on alpha.
+
+*chkrootkit-0.44 (18 Sep 2004)
+
+  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org>
+  -files/chkrootkit-0.37-gentoo.diff, -chkrootkit-0.37.ebuild,
+  +chkrootkit-0.44.ebuild:
+  Version bump and clean up.
+
+  18 Sep 2004; Travis Tilley <lv@gentoo.org> chkrootkit-0.43-r3.ebuild:
+  stable on amd64
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> chkrootkit-0.43-r3.ebuild:
+  Stable on sparc.
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> chkrootkit-0.43-r3.ebuild:
+  stable on ppc
+
+  18 Sep 2004; Tom Gall <tgall@gentoo.org> chkrootkit-0.43-r3.ebuild:
+  stable on ppc64
+
+  18 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> chkrootkit-0.43-r3.ebuild:
+  Marked 0.43-r3 stable on x86.
+
+  12 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml:
+  Updated metadata (no-herd => forensics)
 
 *chkrootkit-0.43-r2 (12 Sep 2004)
 
@@ -14,7 +134,7 @@
   11 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml:
   Updated metadata info.
 
-  28 Aug 2004; Bryan �stergaard <kloeri@gentoo.org> chkrootkit-0.43-r4.ebuild:
+  28 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> chkrootkit-0.43-r4.ebuild:
   Fix bug 62049.
 
 *chkrootkit-0.43-r4 (27 Aug 2004)
@@ -26,18 +146,18 @@
   26 Aug 2004; Jason Wever <weeve@gentoo.org> chkrootkit-0.43-r2.ebuild:
   Stable on sparc.
 
-  22 Aug 2004; Bryan �stergaard <kloeri@gentoo.org> :
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> :
   Fix digest again..
 
-  22 Aug 2004; Bryan �stergaard <kloeri@gentoo.org> :
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> :
   Fix broken digest.
 
-  22 Aug 2004; Bryan �stergaard <kloeri@gentoo.org> chkrootkit-0.43-r2.ebuild:
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> chkrootkit-0.43-r2.ebuild:
   Stable on alpha + x86.
 
 *chkrootkit-0.43-r3 (22 Aug 2004)
 
-  22 Aug 2004; Bryan �stergaard <kloeri@gentoo.org>
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
   -files/chkrootkit-0.39a-gentoo.diff, -files/chkrootkit-0.41-gentoo.diff,
   -files/chkrootkit-0.42b-gentoo.diff, chkrootkit-0.43-r2.ebuild,
   +chkrootkit-0.43-r3.ebuild, chkrootkit-0.43.ebuild:
@@ -75,7 +195,7 @@
   23 Jun 2004; <malc@gentoo.org> chkrootkit-0.43.ebuild:
   Mark stable on amd64
 
-  16 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> chkrootkit-0.43.ebuild:
+  16 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> chkrootkit-0.43.ebuild:
   Stable on alpha.
 
   07 Jun 2004; Jason Wever <weeve@gentoo.org> chkrootkit-0.43.ebuild:
diff --git a/app-forensics/chkrootkit/Manifest b/app-forensics/chkrootkit/Manifest
index b98f790590d3..7dde49cc316a 100644
--- a/app-forensics/chkrootkit/Manifest
+++ b/app-forensics/chkrootkit/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6bbc32b04f7961ae408cc394b4c43d85 chkrootkit-0.43-r2.ebuild 925
-MD5 f746627867c6acedf3102019aa4521ff chkrootkit-0.37.ebuild 744
-MD5 2f68956f6c770fee44088d901846f9c2 chkrootkit-0.43.ebuild 963
-MD5 a0e208e7261f919222f7bee7c3f82f4a chkrootkit-0.43-r4.ebuild 1107
-MD5 baba1d946b2bf6de88e80ba50c7d6f3a ChangeLog 5887
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 19e68377b97301d5a838bd5f192cfa6c chkrootkit-0.43-r3.ebuild 926
-MD5 0fae3f5676335dc0c50bdf5658aa69b8 files/digest-chkrootkit-0.43-r2 142
-MD5 e4f72853578cf59cb609efc280621591 files/digest-chkrootkit-0.43-r3 142
-MD5 e4f72853578cf59cb609efc280621591 files/digest-chkrootkit-0.43-r4 142
-MD5 f97957a94793b86fd018b32e44811f89 files/chkrootkit-0.37-gentoo.diff 4531
+MD5 fb5809356decdc02129eb7dbfaeca2b0 ChangeLog 10284
+MD5 10e3c20015120e6380904475d127c3f3 chkrootkit-0.44-r1.ebuild 1591
+MD5 b889e1ad878a53a563e5be3ae4607b90 chkrootkit-0.45.ebuild 1513
+MD5 d4490d93d215197454e18661f4f62554 chkrootkit-0.46a.ebuild 1847
+MD5 99d10c59971b4836291ff235c6f480a6 files/chkrootkit-0.44-coreutils-static-falsepositive.patch 793
+MD5 c67831eb3ec73b91c86f9f686b0e176b files/chkrootkit-0.45-makefile.diff 1866
+MD5 c9af76526f66b71c6f9a92582b470969 files/chkrootkit-0.46-add-missing-includes.diff 769
 MD5 bb6a980a762d72e1928231eabf4a9304 files/chkrootkit.cron 78
-MD5 7cf45be07aafbbaa3252ce9ece31d5b6 files/digest-chkrootkit-0.37 66
-MD5 e403f736d82cbf43e0780a5bb62993cb files/digest-chkrootkit-0.43 66
+MD5 1f4cc273611ca05137d997b8d4bad9de files/digest-chkrootkit-0.44-r1 140
+MD5 ed6966a6a37372ee449f7dd995a4e0bb files/digest-chkrootkit-0.45 140
+MD5 7fd8fef5e617c26af637338a3f1fdfbe files/digest-chkrootkit-0.46a 141
+MD5 7460fdec86596dcf99c66fbb167712af metadata.xml 256
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFBQz7wEZCkKN40op4RApbPAKC9kSMzvAeIpktTADPrinMx6OM6nQCfcMgl
-rVsV7cKDh9CJfU3XbTA/j9Q=
-=+C1C
+iD8DBQFDYl5nEZCkKN40op4RApUQAKCAOLc4DzW8R+JwpaaflSfSCAL4LgCfdaLg
+gUy68+wA84jt6kdEoY656Lk=
+=fAx0
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild b/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild
index 62cb9a6f5535..fcfeffecd212 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.44-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/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild,v 1.1 2005/01/23 14:37:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.44-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
 
 LICENSE="AMS"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/app-forensics/chkrootkit/chkrootkit-0.45.ebuild b/app-forensics/chkrootkit/chkrootkit-0.45.ebuild
index 67a24e0f3943..a9d0a4ae914a 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.45.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.45.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/app-forensics/chkrootkit/chkrootkit-0.45.ebuild,v 1.1 2005/02/26 00:43:52 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.45.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.pangeia.com.br/pub/seg/pac/${P}.tar.gz
 
 LICENSE="AMS"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild b/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild
index f7dff1aca287..f5ac09af5a05 100644
--- a/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild
+++ b/app-forensics/chkrootkit/chkrootkit-0.46a.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/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild,v 1.1 2005/10/28 17:22:27 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/chkrootkit/chkrootkit-0.46a.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
diff --git a/app-forensics/chkrootkit/metadata.xml b/app-forensics/chkrootkit/metadata.xml
index d31152aca840..e1d15ad1b8fa 100644
--- a/app-forensics/chkrootkit/metadata.xml
+++ b/app-forensics/chkrootkit/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>forensics</herd>
 	<maintainer>
 		<email>ka0ttic@gentoo.org</email>
 		<name>Aaron Walker</name>
diff --git a/app-forensics/cmospwd/ChangeLog b/app-forensics/cmospwd/ChangeLog
index cec369c58e87..67306d128d33 100644
--- a/app-forensics/cmospwd/ChangeLog
+++ b/app-forensics/cmospwd/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-forensics/cmospwd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/cmospwd/ChangeLog,v 1.1 2005/01/26 04:04:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/cmospwd/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+*cmospwd-4.7 (07 Nov 2005)
+
+  07 Nov 2005; Daniel Black <dragonheart@gentoo.org> +cmospwd-4.7.ebuild:
+  version bump
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> cmospwd-4.6.ebuild:
+  stable x86
+
+*cmospwd-4.6 (28 Jul 2005)
+
+  28 Jul 2005; Daniel Black <dragonheart@gentoo.org> +cmospwd-4.6.ebuild:
+  Version bump
 
   26 Jan 2005; Daniel Black <dragonheart@gentoo.org>
   +cmospwd-4.4.ebuild, +metadata.xml:
diff --git a/app-forensics/cmospwd/Manifest b/app-forensics/cmospwd/Manifest
index 9911dd98b78b..be627256f192 100644
--- a/app-forensics/cmospwd/Manifest
+++ b/app-forensics/cmospwd/Manifest
@@ -1,4 +1,18 @@
-MD5 0b8e088650bd26eb93e1cf7f8ea84087 cmospwd-4.4.ebuild 628
-MD5 7294342c2d2b7beb07120906dd76011a metadata.xml 750
-MD5 7ecf6bf86b7ff8a15034723efa47fdce ChangeLog 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3693c3faf669c2e6b632087556c0b65c ChangeLog 652
+MD5 8c50d379ff493eeb34eaca8a15a72d46 cmospwd-4.4.ebuild 652
+MD5 212841be9d1b47c9dd404388da4b7cf4 cmospwd-4.6.ebuild 664
+MD5 f6a66af395e5957178f57c000c91faab cmospwd-4.7.ebuild 665
 MD5 1ca3acd7a0cc94c59a81c4ffa987369e files/digest-cmospwd-4.4 62
+MD5 df64eb704687cb1c07f4176eb6ce955d files/digest-cmospwd-4.6 62
+MD5 7279ba9270850ef2aa00a4e133a4a0b9 files/digest-cmospwd-4.7 62
+MD5 7294342c2d2b7beb07120906dd76011a metadata.xml 750
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDb7MRmdTrptrqvGERAvhrAJwJStS75ZodOs+TfLx1PcffXXa9sQCgkpUa
+tAyV3dXg48JYLjB19kRXtcw=
+=gZI4
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/cmospwd/cmospwd-4.4.ebuild b/app-forensics/cmospwd/cmospwd-4.4.ebuild
index e25dcfa733e9..7710bbb6c71e 100644
--- a/app-forensics/cmospwd/cmospwd-4.4.ebuild
+++ b/app-forensics/cmospwd/cmospwd-4.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/app-forensics/cmospwd/cmospwd-4.4.ebuild,v 1.1 2005/01/26 04:04:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/cmospwd/cmospwd-4.4.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -14,11 +14,11 @@ IUSE=""
 DEPEND="virtual/libc"
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} cmospwd.c -o cmospwd
+	$(tc-getCC) ${CFLAGS} cmospwd.c -o cmospwd || die
 }
 
 src_install() {
-	dosbin cmospwd
-	dodoc cmospwd.txt
+	dosbin cmospwd || die
+	dodoc cmospwd.txt || die
 }
 
diff --git a/app-forensics/cmospwd/cmospwd-4.6.ebuild b/app-forensics/cmospwd/cmospwd-4.6.ebuild
index 4d93bab7bd17..15ea04a8f710 100644
--- a/app-forensics/cmospwd/cmospwd-4.6.ebuild
+++ b/app-forensics/cmospwd/cmospwd-4.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/app-forensics/cmospwd/cmospwd-4.6.ebuild,v 1.1 2005/07/28 12:37:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/cmospwd/cmospwd-4.6.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.cgsecurity.org/index.html?cmospwd.html"
 SRC_URI="http://www.cgsecurity.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/libc"
 
diff --git a/app-forensics/cmospwd/cmospwd-4.7.ebuild b/app-forensics/cmospwd/cmospwd-4.7.ebuild
index 3d5a42c5f9b9..58a75ca680f9 100644
--- a/app-forensics/cmospwd/cmospwd-4.7.ebuild
+++ b/app-forensics/cmospwd/cmospwd-4.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/app-forensics/cmospwd/cmospwd-4.7.ebuild,v 1.1 2005/11/07 20:02:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/cmospwd/cmospwd-4.7.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/app-forensics/examiner/ChangeLog b/app-forensics/examiner/ChangeLog
index c5e22f6c99f4..d447dfcc8327 100644
--- a/app-forensics/examiner/ChangeLog
+++ b/app-forensics/examiner/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for dev-util/examiner
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/examiner/ChangeLog,v 1.1 2004/09/12 06:46:11 dragonheart Exp $
+# ChangeLog for app-forensics/examiner
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/examiner/ChangeLog,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
+
+*examiner-0.5-r1 (22 May 2005)
+
+  22 May 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/examiner-0.5-perl.patch, -examiner-0.5.ebuild,
+  +examiner-0.5-r1.ebuild:
+  Added perl patch thanks to DerCorny.
+
+  14 Dec 2004; Daniel Black <dragonheart@gentoo.org> examiner-0.5.ebuild:
+  ppc stable
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> +metadata.xml:
+  added metadata.xml
 
 *examiner-0.5 (12 Sep 2004)
 
diff --git a/app-forensics/examiner/Manifest b/app-forensics/examiner/Manifest
index 686ba412ebb2..673d23463c55 100644
--- a/app-forensics/examiner/Manifest
+++ b/app-forensics/examiner/Manifest
@@ -1,3 +1,15 @@
-MD5 804a94c699fc9b412463655aad35a4f3 examiner-0.5.ebuild 853
-MD5 e581e0773697f76841141332243cfcf0 ChangeLog 530
-MD5 547b032a7f8b384988edd55eff681928 files/digest-examiner-0.5 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 61a4a30e0ae1c44b6c5db2587e002744 ChangeLog 1171
+MD5 0dcea4661137874d91669613d53591ed examiner-0.5-r1.ebuild 962
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
+MD5 9c8083e2cacedcf0deb6bb8effa30eeb files/examiner-0.5-perl.patch 793
+MD5 547b032a7f8b384988edd55eff681928 files/digest-examiner-0.5-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCj9clmdTrptrqvGERAuaDAJ9/BQ22OdSTYvyrWEq16DO7h9/EogCfYDR7
+z4VZG30fKwGkMFXLu7UOcE8=
+=or2v
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/examiner/examiner-0.5-r1.ebuild b/app-forensics/examiner/examiner-0.5-r1.ebuild
index e864a1612595..189a6a6cf54f 100644
--- a/app-forensics/examiner/examiner-0.5-r1.ebuild
+++ b/app-forensics/examiner/examiner-0.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/app-forensics/examiner/examiner-0.5-r1.ebuild,v 1.1 2005/05/22 00:49:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/examiner/examiner-0.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
 
 inherit eutils
 
diff --git a/app-forensics/foremost/ChangeLog b/app-forensics/foremost/ChangeLog
index f0e234f47be5..f7dacc8670af 100644
--- a/app-forensics/foremost/ChangeLog
+++ b/app-forensics/foremost/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for app-admin/foremost
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/ChangeLog,v 1.1 2004/09/12 06:49:20 dragonheart Exp $
+# ChangeLog for app-forensics/foremost
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+*foremost-1.0 (12 Oct 2005)
+
+  12 Oct 2005; Daniel Black <dragonheart@gentoo.org> +foremost-1.0.ebuild:
+  version bump - bug #108827 thanks to Leo
+
+  14 Dec 2004; Daniel Black <dragonheart@gentoo.org> foremost-0.69.ebuild:
+  ppc stable
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  13 Sep 2004; Daniel Black <dragonheart@gentoo.org> foremost-0.69.ebuild:
+  x86 stable
+
+  12 Sep 2004; Daniel Black <dragonheart@gentoo.org> metadata.xml:
+  metadata.xml update. forensics herd taking over maintaince
 
 *foremost-0.69 (12 Sep 2004)
 
diff --git a/app-forensics/foremost/Manifest b/app-forensics/foremost/Manifest
index 7ceb016e8868..c46c1051b817 100644
--- a/app-forensics/foremost/Manifest
+++ b/app-forensics/foremost/Manifest
@@ -1,4 +1,16 @@
-MD5 abb2fb2e953cec46e6b8470897ed8ec5 foremost-0.69.ebuild 775
-MD5 beb5de3900055cacf345ac6d68fa779a ChangeLog 579
-MD5 de35d8f600d3d75d8075a8d848787013 metadata.xml 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 41c34bd332905d1eb66b789eaaac56a9 ChangeLog 1307
 MD5 86348e00b2e2d3102704e83a886d9b3d files/digest-foremost-0.69 64
+MD5 1ff94b62b800c7da0132e900b5544403 files/digest-foremost-1.0 63
+MD5 8988816827872cd28af0f1a87c7928ea foremost-0.69.ebuild 728
+MD5 6ae93ecd1100d1764708e58ef7c52940 foremost-1.0.ebuild 759
+MD5 9f665d3c6a1e0eb7509c6d55fc171395 metadata.xml 227
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDTY19mdTrptrqvGERAseMAJ9jJkFOGLZzWJ02LYk6KOnLUPHnygCcCDmS
+jaqoXURB92FY29OFj6oW89A=
+=nMZH
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/foremost/foremost-0.69.ebuild b/app-forensics/foremost/foremost-0.69.ebuild
index e09f7e258666..babf61f33a79 100644
--- a/app-forensics/foremost/foremost-0.69.ebuild
+++ b/app-forensics/foremost/foremost-0.69.ebuild
@@ -1,27 +1,22 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-0.69.ebuild,v 1.1 2004/09/12 06:49:20 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-0.69.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="A console program to recover files based on their headers and footers"
 HOMEPAGE="http://foremost.sourceforge.net/"
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"
 
-DEPEND="virtual/libc
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i "s:^CC_OPTS = .*$:CC_OPTS = ${CFLAGS}:" Makefile
-}
+RDEPEND="virtual/libc"
 
 src_compile() {
-	emake || die "emake failed"
+	emake CC_OPTS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {
diff --git a/app-forensics/foremost/foremost-1.0.ebuild b/app-forensics/foremost/foremost-1.0.ebuild
index ad9715b2487f..d8fdc43f711a 100644
--- a/app-forensics/foremost/foremost-1.0.ebuild
+++ b/app-forensics/foremost/foremost-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/app-forensics/foremost/foremost-1.0.ebuild,v 1.1 2005/10/12 22:24:28 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/foremost/foremost-1.0.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -8,7 +8,7 @@ DESCRIPTION="A console program to recover files based on their headers and foote
 HOMEPAGE="http://foremost.sourceforge.net/"
 SRC_URI="http://foremost.sourceforge.net/pkg/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 LICENSE="public-domain"
 SLOT="0"
diff --git a/app-forensics/foremost/metadata.xml b/app-forensics/foremost/metadata.xml
index ea303dc8c30d..95c0cd08de9d 100644
--- a/app-forensics/foremost/metadata.xml
+++ b/app-forensics/foremost/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>forensics</herd>
 <maintainer>
-  <email>mholzer@gentoo.org</email>
+  <email>forensics@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/app-forensics/galleta/ChangeLog b/app-forensics/galleta/ChangeLog
index 0309b2641374..df9fda2b12ba 100644
--- a/app-forensics/galleta/ChangeLog
+++ b/app-forensics/galleta/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-forensics/galleta
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/galleta/ChangeLog,v 1.1 2004/12/12 20:38:12 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/galleta/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+  07 Jul 2005; David Holm <dholm@gentoo.org> galleta-20040505_p1.ebuild:
+  Added to ~ppc.
 
 *galleta-20040505_p1 (13 Dec 2004)
 
diff --git a/app-forensics/galleta/Manifest b/app-forensics/galleta/Manifest
index 0d23ddb167e4..b88fddc9bb3b 100644
--- a/app-forensics/galleta/Manifest
+++ b/app-forensics/galleta/Manifest
@@ -1,2 +1,4 @@
-MD5 78a5f0ef1c7710f836dde7b76a20e71a galleta-20040505_p1.ebuild 442
+MD5 7db6d273929461077944e1e194629280 ChangeLog 476
+MD5 89b5189af6183d852962b6a694b01a3a galleta-20040505_p1.ebuild 673
+MD5 7383e502bbfe4bb327de704889dfd5d6 metadata.xml 311
 MD5 02a8fd4606aa31fb7b4f329318d956d4 files/digest-galleta-20040505_p1 68
diff --git a/app-forensics/galleta/galleta-20040505_p1.ebuild b/app-forensics/galleta/galleta-20040505_p1.ebuild
index 12f76a54e94a..e0f305bf9ad0 100644
--- a/app-forensics/galleta/galleta-20040505_p1.ebuild
+++ b/app-forensics/galleta/galleta-20040505_p1.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/app-forensics/galleta/galleta-20040505_p1.ebuild,v 1.1 2004/12/12 20:38:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/galleta/galleta-20040505_p1.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sourceforge.net/projects/odessa/"
 SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 DEPEND="virtual/libc"
 
diff --git a/app-forensics/mac-robber/ChangeLog b/app-forensics/mac-robber/ChangeLog
index bee57432a5d1..c21d51fb6aed 100644
--- a/app-forensics/mac-robber/ChangeLog
+++ b/app-forensics/mac-robber/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-forensics/mac-robber
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/mac-robber/ChangeLog,v 1.1 2005/01/26 02:44:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/mac-robber/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+  11 Aug 2005; Luis Medinas <metalgod@gentoo.org> mac-robber-1.00.ebuild:
+  Added ~amd64 keywords.
+
+  08 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  mac-robber-1.00.ebuild:
+  mark ~ppc
 
   26 Jan 2005; Daniel Black <dragonheart@gentoo.org> 
   +mac-robber-1.00.ebuild, +metadata.xml:
diff --git a/app-forensics/mac-robber/Manifest b/app-forensics/mac-robber/Manifest
index 8baab25c3702..0b044db18d12 100644
--- a/app-forensics/mac-robber/Manifest
+++ b/app-forensics/mac-robber/Manifest
@@ -1,4 +1,4 @@
-MD5 719831ae04815275ae93ec42c69fca89 mac-robber-1.00.ebuild 723
+MD5 6f5040703ded3a5134f5353db838668f ChangeLog 588
+MD5 f9be2af3015cfb445555980be3ce813f mac-robber-1.00.ebuild 735
 MD5 1e9937a862e19cdf3f8b0838c48c2ce5 metadata.xml 1434
-MD5 ed366bd36589891555de26927e783b64 ChangeLog 291
 MD5 df98bdff9227fef4cff867355797b655 files/digest-mac-robber-1.00 66
diff --git a/app-forensics/mac-robber/mac-robber-1.00.ebuild b/app-forensics/mac-robber/mac-robber-1.00.ebuild
index d24b835bf24d..0e2e9f209526 100644
--- a/app-forensics/mac-robber/mac-robber-1.00.ebuild
+++ b/app-forensics/mac-robber/mac-robber-1.00.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/app-forensics/mac-robber/mac-robber-1.00.ebuild,v 1.1 2005/01/26 02:44:04 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/mac-robber/mac-robber-1.00.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/app-forensics/magicrescue/ChangeLog b/app-forensics/magicrescue/ChangeLog
index 4af4f6faef1e..34896e1c6fd2 100644
--- a/app-forensics/magicrescue/ChangeLog
+++ b/app-forensics/magicrescue/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for app-forensics/magicrescue
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/ChangeLog,v 1.1 2005/01/26 03:00:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+  16 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -magicrescue-1.1.4.ebuild, +magicrescue-1.1.4-r1.ebuild:
+  fixed install paths as per bug #91937. Thanks Wormo for the patch
+
+*magicrescue-1.1.4-r1 (17 Sep 2005)
+
+  17 Sep 2005; Daniel Black <dragonheart@gentoo.org>  magicrescue-1.1.4-r1.ebuild files/digest-magicrescue-1.1.4-r1
+  # INSERT ENTRY HERE
+
+  07 Aug 2005; Simon Stelling <blubb@gentoo.org> magicrescue-1.1.4.ebuild:
+  added ~amd64 keyword
+
+  08 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  magicrescue-1.1.4.ebuild:
+  mark ~ppc
 
   26 Jan 2005; Daniel Black <dragonheart@gentoo.org> 
   +magicrescue-1.1.4.ebuild, +metadata.xml:
diff --git a/app-forensics/magicrescue/Manifest b/app-forensics/magicrescue/Manifest
index f23bc5d2865a..d2aa9005ce9e 100644
--- a/app-forensics/magicrescue/Manifest
+++ b/app-forensics/magicrescue/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 105847dd9829f12cc71df98401454278 metadata.xml 846
-MD5 f2a2838dfa5244f625a61f85386a4daf magicrescue-1.1.4.ebuild 750
-MD5 d4dd9dcad4dd90429113ac6544057531 files/digest-magicrescue-1.1.4 68
+MD5 23a93ac82ed8ab1cea040ed9f8b24de8 ChangeLog 953
+MD5 3ccc253488a04a02cc1da00ae9e904e5 magicrescue-1.1.4-r1.ebuild 783
+MD5 d4dd9dcad4dd90429113ac6544057531 files/digest-magicrescue-1.1.4-r1 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDK0XmmdTrptrqvGERAouRAJ0ceJ0dTjr35sIHPJSPd4XNfMI/NACfY00E
+Yy1S1pe4+8weUO0llK+aulM=
+=543n
+-----END PGP SIGNATURE-----
diff --git a/app-forensics/magicrescue/magicrescue-1.1.4-r1.ebuild b/app-forensics/magicrescue/magicrescue-1.1.4-r1.ebuild
index bd2af41f1070..b846157f471b 100644
--- a/app-forensics/magicrescue/magicrescue-1.1.4-r1.ebuild
+++ b/app-forensics/magicrescue/magicrescue-1.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/app-forensics/magicrescue/magicrescue-1.1.4-r1.ebuild,v 1.1 2005/09/16 22:23:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/magicrescue/magicrescue-1.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/app-forensics/memdump/ChangeLog b/app-forensics/memdump/ChangeLog
index 10c3f521f6d1..d3435f2bf0a4 100644
--- a/app-forensics/memdump/ChangeLog
+++ b/app-forensics/memdump/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-forensics/memdump
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/ChangeLog,v 1.1 2004/09/19 04:01:50 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/ChangeLog,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
+
+  10 Aug 2005; Simon Stelling <blubb@gentoo.org> memdump-1.0.ebuild:
+  added ~amd64 keyword
+
+  01 Dec 2004; Daniel Black <dragonheart@gentoo.org> memdump-1.0.ebuild:
+  added ppc keyword. Removed sys-apps/memdump which is the same package. Bug
+  #72212 refers.
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> memdump-1.0.ebuild:
+  Added to ~ppc.
 
 *memdump-1.0 (19 Sep 2004)
 
diff --git a/app-forensics/memdump/Manifest b/app-forensics/memdump/Manifest
index 8c163e4a2911..b2970f31e91a 100644
--- a/app-forensics/memdump/Manifest
+++ b/app-forensics/memdump/Manifest
@@ -1,2 +1,4 @@
-MD5 ecf9977ab885455782df1385eaf87126 memdump-1.0.ebuild 684
+MD5 fb6daece65b7b07115b8c54100383c14 ChangeLog 750
+MD5 403b14ceb8a42c8f76478224b4bc2ccb memdump-1.0.ebuild 894
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
 MD5 230810f720581e671e10d2ab23fdfc0c files/digest-memdump-1.0 62
diff --git a/app-forensics/memdump/memdump-1.0.ebuild b/app-forensics/memdump/memdump-1.0.ebuild
index ba6ff39d87ae..f4525dfc1a44 100644
--- a/app-forensics/memdump/memdump-1.0.ebuild
+++ b/app-forensics/memdump/memdump-1.0.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/app-forensics/memdump/memdump-1.0.ebuild,v 1.1 2004/09/19 04:01:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/memdump/memdump-1.0.ebuild,v 1.1.1.1 2005/11/30 10:09:55 chriswhite Exp $
 
 DESCRIPTION="Simple memory dumper for UNIX-Like systems"
 HOMEPAGE="http://www.porcupine.org/forensics"
 SRC_URI="http://www.porcupine.org/forensics/${P}.tar.gz"
 LICENSE="IBM"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc x86"
 DEPEND="sys-apps/sed
 	sys-apps/grep"
 RDEPEND="virtual/libc"
diff --git a/app-forensics/metadata.xml b/app-forensics/metadata.xml
index 0af62ee69b39..8591844d0510 100644
--- a/app-forensics/metadata.xml
+++ b/app-forensics/metadata.xml
@@ -5,5 +5,29 @@
 		The app-forensics category contains software which helps detect and
 		analyse security breaches.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-forensics enthält Programme welche beim Erkennen
+		und Analysieren von Sicherheitsbrüchen helfen.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-forensics contiene programas para ayudar a detectar
+		y analizar problemas de seguridad.
+	</longdescription>
+	<longdescription lang="ja">
+		app-forensicsカテゴリには安全保侵犯を捜し当てると取調べる
+		ソフトウェアが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De app-forensics categorie bevat applicaties voor het detecteren en
+		analyseren van inbreuken op de veiligheid van het systeem.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-forensics chứa các phần mềm hỗ trợ dò tìm,
+		phân tích các lỗ hổng bảo mật.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-forensics contiene programmi che aiutono a trovare
+		ed analizzare problemi di sicurezza.
+	</longdescription>
 </catmetadata>
 
diff --git a/app-forensics/pasco/ChangeLog b/app-forensics/pasco/ChangeLog
index be4af3c35045..7bf9a609e9d8 100644
--- a/app-forensics/pasco/ChangeLog
+++ b/app-forensics/pasco/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-forensics/pasco
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/pasco/ChangeLog,v 1.1 2004/12/12 20:50:10 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/pasco/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+  07 Jul 2005; David Holm <dholm@gentoo.org> pasco-20040505_p1.ebuild:
+  Added to ~ppc.
 
 *pasco-20040505_p1 (13 Dec 2004)
 
diff --git a/app-forensics/pasco/Manifest b/app-forensics/pasco/Manifest
index 8a3cdc66303d..f2a6a5663347 100644
--- a/app-forensics/pasco/Manifest
+++ b/app-forensics/pasco/Manifest
@@ -1,5 +1,4 @@
+MD5 181d153399d45be74a11d1f33a15e1a6 ChangeLog 451
 MD5 7383e502bbfe4bb327de704889dfd5d6 metadata.xml 311
-MD5 0b2dbb8b4fc95d1318f3aec8d6936b5c ChangeLog 391
-MD5 a726085ed98454e22038d3324a700d7e pasco-20040505_p1.ebuild 676
-MD5 02a8fd4606aa31fb7b4f329318d956d4 files/digest-galleta-20040505_p1 68
+MD5 647796ebbc52a09501168e2eaf2ed1f5 pasco-20040505_p1.ebuild 647
 MD5 5bbf15c79717e2ba4804e46535e77850 files/digest-pasco-20040505_p1 66
diff --git a/app-forensics/pasco/pasco-20040505_p1.ebuild b/app-forensics/pasco/pasco-20040505_p1.ebuild
index d7161f9e213b..4bad32f450e7 100644
--- a/app-forensics/pasco/pasco-20040505_p1.ebuild
+++ b/app-forensics/pasco/pasco-20040505_p1.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/app-forensics/pasco/pasco-20040505_p1.ebuild,v 1.1 2004/12/12 20:50:10 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/pasco/pasco-20040505_p1.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sourceforge.net/projects/odessa/"
 SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 DEPEND="virtual/libc"
 
diff --git a/app-forensics/regviewer/ChangeLog b/app-forensics/regviewer/ChangeLog
index 896b261792cc..85bc540674f1 100644
--- a/app-forensics/regviewer/ChangeLog
+++ b/app-forensics/regviewer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-forensics/regviewer
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/regviewer/ChangeLog,v 1.1 2004/12/12 11:25:46 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/regviewer/ChangeLog,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
+
+  07 Jul 2005; David Holm <dholm@gentoo.org> regviewer-0.1.ebuild:
+  Added to ~ppc.
+
+  21 Apr 2005; Daniel Black <dragonheart@gentoo.org> regviewer-0.1.ebuild:
+  Missing dependancy on gnome-base/libgnomeui
 
 *regviewer-0.1 (12 Dec 2004)
 
diff --git a/app-forensics/regviewer/Manifest b/app-forensics/regviewer/Manifest
index 6e653affeffe..85195305595f 100644
--- a/app-forensics/regviewer/Manifest
+++ b/app-forensics/regviewer/Manifest
@@ -1,2 +1,4 @@
-MD5 d2d866a28044873a30d556d84b98157b regviewer-0.1.ebuild 436
+MD5 a6f323627fc4e479b1b3fcb50a0348eb ChangeLog 584
+MD5 905f73ad32e3912c04ad371b1a38de52 metadata.xml 539
+MD5 adcb6b2dc00725d12edfe8a8e7b0d997 regviewer-0.1.ebuild 1049
 MD5 bec32da31766226a75b745647632fdc8 files/digest-regviewer-0.1 64
diff --git a/app-forensics/regviewer/regviewer-0.1.ebuild b/app-forensics/regviewer/regviewer-0.1.ebuild
index 6bc3e37b049a..0d0717771f8f 100644
--- a/app-forensics/regviewer/regviewer-0.1.ebuild
+++ b/app-forensics/regviewer/regviewer-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/app-forensics/regviewer/regviewer-0.1.ebuild,v 1.1 2004/12/12 11:25:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/regviewer/regviewer-0.1.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 DESCRIPTION="RegViewer is GTK 2.2 based GUI Windows registry file navigator"
 
@@ -8,7 +8,7 @@ HOMEPAGE="http://sourceforge.net/projects/regviewer/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 RDEPEND="dev-libs/atk
 	dev-libs/expat
@@ -17,6 +17,7 @@ RDEPEND="dev-libs/atk
 	gnome-base/gconf
 	gnome-base/libbonobo
 	gnome-base/libgnome
+	gnome-base/libgnomeui
 	gnome-base/orbit
 	media-libs/alsa-lib
 	media-libs/audiofile
diff --git a/app-forensics/rifiuti/ChangeLog b/app-forensics/rifiuti/ChangeLog
index 35e631c15122..39475ed2cb6c 100644
--- a/app-forensics/rifiuti/ChangeLog
+++ b/app-forensics/rifiuti/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-forensics/rifiuti
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rifiuti/ChangeLog,v 1.1 2004/12/12 20:59:53 dragonheart Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rifiuti/ChangeLog,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
+
+  07 Jul 2005; David Holm <dholm@gentoo.org> rifiuti-20040505_p1.ebuild:
+  Added to ~ppc.
 
 *rifiuti-20040505_p1 (13 Dec 2004)
 
diff --git a/app-forensics/rifiuti/Manifest b/app-forensics/rifiuti/Manifest
index a34673f7f61b..792cdbf93397 100644
--- a/app-forensics/rifiuti/Manifest
+++ b/app-forensics/rifiuti/Manifest
@@ -1,4 +1,4 @@
-MD5 170a68fb10b101d1a23634aa727de541 rifiuti-20040505_p1.ebuild 660
+MD5 b48b09d0b256cd89edee745dc3c3160d ChangeLog 476
 MD5 feba8170292590aeb74f51a1ec44fdb8 metadata.xml 315
-MD5 d41d8cd98f00b204e9800998ecf8427e ChangeLog 0
+MD5 01c41a80528b567248fae13ddae0af42 rifiuti-20040505_p1.ebuild 659
 MD5 ba597d3e2ba9a117e74ac447ce538da9 files/digest-rifiuti-20040505_p1 68
diff --git a/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild b/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
index 6f0c537dcd1e..158b6b680c72 100644
--- a/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild
+++ b/app-forensics/rifiuti/rifiuti-20040505_p1.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/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild,v 1.1 2004/12/12 20:59:53 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rifiuti/rifiuti-20040505_p1.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sourceforge.net/projects/odessa/"
 SRC_URI="mirror://sourceforge/odessa/${MY_P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 DEPEND="virtual/libc"
 
diff --git a/app-forensics/rkhunter/ChangeLog b/app-forensics/rkhunter/ChangeLog
index 71b20da22b61..0546ae090c85 100644
--- a/app-forensics/rkhunter/ChangeLog
+++ b/app-forensics/rkhunter/ChangeLog
@@ -1,6 +1,217 @@
-# ChangeLog for app-admin/rkhunter
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.1 2004/09/12 07:04:48 dragonheart Exp $
+# ChangeLog for app-forensics/rkhunter
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+  04 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.2.7-r1.ebuild:
+  Add sys-process/lsof to RDEPEND so that rkhunter can check for backdoors in
+  running processes, bug #104774.
+
+  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff:
+  Missed an old patch when tidying.
+
+*rkhunter-1.2.7-r1 (02 Sep 2005)
+
+  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> files/rkhunter.cron,
+  -rkhunter-1.2.3-r1.ebuild, -rkhunter-1.2.7.ebuild,
+  +rkhunter-1.2.7-r1.ebuild:
+  Revision bump; fix cron job to use mktemp.  Keeping keywords. Tidy old ebuilds
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.2.7.ebuild:
+  Stable on alpha.
+
+  30 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.2.7.ebuild:
+  Stable on mips.
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> rkhunter-1.2.7.ebuild:
+  Stable on amd64 wrt bug #99259.
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> rkhunter-1.2.7.ebuild:
+  Marked ppc stable.
+
+  28 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> rkhunter-1.2.7.ebuild:
+  Stable on sparc
+
+  28 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.2.7.ebuild:
+  Stable on x86.
+
+*rkhunter-1.2.7 (24 May 2005)
+
+  24 May 2005; Aaron Walker <ka0ttic@gentoo.org> -rkhunter-1.2.5.ebuild,
+  -rkhunter-1.2.6.ebuild, +rkhunter-1.2.7.ebuild:
+  Version bump.
+
+*rkhunter-1.2.6 (10 May 2005)
+
+  10 May 2005; Aaron Walker <ka0ttic@gentoo.org> +rkhunter-1.2.6.ebuild:
+  Version bump.
+
+*rkhunter-1.2.5 (03 May 2005)
+
+  03 May 2005; Aaron Walker <ka0ttic@gentoo.org> -rkhunter-1.2.4.ebuild,
+  +rkhunter-1.2.5.ebuild:
+  Version bump.
+
+  27 Apr 2005; Joshua Kinard <kumba@gentoo.org> rkhunter-1.2.4.ebuild:
+  Added ~mips to KEYWORDS.
+
+*rkhunter-1.2.4 (26 Apr 2005)
+
+  26 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/rkhunter-1.1.9-specify-logfile.patch,
+  -files/rkhunter-1.2.0-specify-logfile.patch, -rkhunter-1.1.9.ebuild,
+  -rkhunter-1.2.1.ebuild, -rkhunter-1.2.3.ebuild, +rkhunter-1.2.4.ebuild:
+  Version bump; still suffers from sec bug 90007, so use taviso's patch. Tidy
+  old ebuilds.
+
+  25 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  rkhunter-1.2.3-r1.ebuild:
+  Stable on alpha.
+
+  25 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> rkhunter-1.2.3-r1.ebuild:
+  stable on amd64 wrt #90007
+
+  25 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  rkhunter-1.2.3-r1.ebuild:
+  Stable on sparc wrt #90007
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  rkhunter-1.2.3-r1.ebuild:
+  Stable on ppc.
+
+*rkhunter-1.2.3-r1 (25 Apr 2005)
+
+  25 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.2.3-fix-insecure-tmp-creation.diff,
+  +rkhunter-1.2.3-r1.ebuild:
+  Revision bump for sec bug 90007; stable on x86.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> rkhunter-1.2.3.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> rkhunter-1.2.1.ebuild:
+  Stable on ppc.
+
+  26 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.2.1.ebuild:
+  Stable on alpha.
+
+  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> rkhunter-1.2.1.ebuild:
+  Stable on sparc
+
+*rkhunter-1.2.3 (22 Mar 2005)
+
+  22 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/rkhunter-1.2.2-fix-broken-test.diff,
+  +files/rkhunter-1.2.3-specify-logfile.patch, -rkhunter-1.2.0.ebuild,
+  -rkhunter-1.2.2.ebuild, +rkhunter-1.2.3.ebuild:
+  Version bump; tidy old ebuilds.
+
+*rkhunter-1.2.2 (19 Mar 2005)
+
+  19 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.2.2-fix-broken-test.diff, rkhunter-1.2.1.ebuild,
+  +rkhunter-1.2.2.ebuild:
+  Version bump; marked 1.2.1 stable on x86.
+
+*rkhunter-1.2.1 (22 Feb 2005)
+
+  22 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.2.1-create-tmpdir.diff, +rkhunter-1.2.1.ebuild:
+  Version bump.
+
+*rkhunter-1.2.0 (11 Feb 2005)
+
+  11 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.2.0-specify-logfile.patch, +rkhunter-1.2.0.ebuild:
+  Version bump.
+
+  11 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/rkhunter-1.1.8-specify-logfile.patch, -rkhunter-1.1.8-r1.ebuild,
+  -rkhunter-1.1.8.ebuild, rkhunter-1.1.9.ebuild:
+  ppc stable and version cleanout
+
+  06 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.1.9.ebuild:
+  Stable on alpha.
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> rkhunter-1.1.9.ebuild:
+  Stable on sparc
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.1.9.ebuild:
+  Marked stable on x86.
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> rkhunter-1.1.8-r1.ebuild:
+  Stable on sparc.
+
+  30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  rkhunter-1.1.8-r1.ebuild:
+  Stable on alpha.
+
+*rkhunter-1.1.9 (29 Dec 2004)
+
+  29 Dec 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.1.9-specify-logfile.patch, rkhunter-1.1.8-r1.ebuild,
+  +rkhunter-1.1.9.ebuild:
+  New upstream release finally; now officially recognizes Gentoo 1.6
+  (>=sys-apps/baselayout-1.11.x) w/o whining about an unsupported OS at
+  run-time. Marked 1.1.8-r1 stable on x86.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Dec 2004; Daniel Black <dragonheart@gentoo.org> rkhunter-1.1.8.ebuild:
+  ppc keyword
+
+*rkhunter-1.1.8-r1 (07 Dec 2004)
+
+  07 Dec 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/rkhunter-1.1.8-specify-logfile.patch,
+  files/rkhunter.bash-completion, files/rkhunter.cron,
+  -rkhunter-1.1.7.ebuild, +rkhunter-1.1.8-r1.ebuild, rkhunter-1.1.8.ebuild:
+  Revision bump. Added patch to allow --createlogfile to accept an opt.
+  argument (filename); rewrote cron script (super duper enhanced (x10)) for
+  bug 73432 - see the config section in files/rkhunter.cron for all the new
+  features. Cleaned up ebuild and removed 1.1.7.
+
+  06 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.1.7.ebuild,
+  rkhunter-1.1.8.ebuild:
+  Updated to use bash-completion.eclass
+
+  23 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.1.8.ebuild:
+  Stable on alpha.
+
+  19 Oct 2004; Jason Wever <weeve@gentoo.org> rkhunter-1.1.8.ebuild:
+  Stable on sparc.
+
+  16 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.1.8.ebuild:
+  Stable on x86.
+
+  02 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.1.7.ebuild,
+  rkhunter-1.1.8.ebuild:
+  Updated HOMEPAGE.
+
+  19 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> -rkhunter-1.1.5.ebuild,
+  -rkhunter-1.1.6.ebuild:
+  Cleaned up old ebuilds.
+
+  19 Sep 2004; <kloeri@gentoo.org> rkhunter-1.1.7.ebuild:
+  Stable on alpha.
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> rkhunter-1.1.7.ebuild:
+  Stable on sparc.
+
+  17 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> rkhunter-1.1.7.ebuild:
+  Marked 1.1.7 stable on x86.
+
+*rkhunter-1.1.8 (12 Sep 2004)
+
+  12 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> +rkhunter-1.1.8.ebuild:
+  Version bump.
+
+  12 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> metadata.xml:
+  Updated metadata (no-herd => forensics)
 
 *rkhunter-1.1.6 (12 Sep 2004)
 
@@ -47,7 +258,7 @@
   07 Aug 2004; <solar@gentoo.org> rkhunter-1.1.4.ebuild:
   version bump
 
-  24 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> rkhunter-1.1.2.ebuild:
+  24 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.1.2.ebuild:
   Stable on alpha.
 
   24 Jul 2004; <solar@gentoo.org> rkhunter-1.1.3.ebuild, files/rkhunter.cron:
@@ -76,7 +287,7 @@
   30 May 2004; Danny van Dyk <kugelfang@gentoo.org> rkhunter-1.0.9.ebuild:
   Marked ~amd64.
 
-  30 May 2004; Bryan �stergaard <kloeri@gentoo.org> rkhunter-1.0.9.ebuild:
+  30 May 2004; Bryan Østergaard <kloeri@gentoo.org> rkhunter-1.0.9.ebuild:
   Keyworded ~alpha.
 
 *rkhunter-1.0.9 (30 May 2004)
diff --git a/app-forensics/rkhunter/Manifest b/app-forensics/rkhunter/Manifest
index adde08b55a14..4f622455c664 100644
--- a/app-forensics/rkhunter/Manifest
+++ b/app-forensics/rkhunter/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7a051f6bf6c49fa77c097262416f55c5 rkhunter-1.1.5.ebuild 1332
-MD5 856b44cc3331c42a3c694695b4fa1de0 rkhunter-1.1.7.ebuild 1613
-MD5 14705fc0a0b9a58e3b62a4f8bf3d6781 rkhunter-1.1.6.ebuild 1333
-MD5 28aa50ba2347f6db87dfb98b8d248f29 ChangeLog 2665
-MD5 99d3c59f680729e17f4576a845aaa6a0 metadata.xml 262
-MD5 bbe8224c46ee3ddd8cea79ed4b817ae4 files/rkhunter.cron 1035
-MD5 6ffd297b11dded42095078ef68ef2fb9 files/rkhunter.bash-completion 2529
-MD5 2d65b1e87551b85f4cec0a1743734469 files/digest-rkhunter-1.1.5 66
-MD5 c183749d28050849a426ebbbbb2523a5 files/digest-rkhunter-1.1.6 66
-MD5 011c5df2094bff6d80ce80a90e530bb6 files/digest-rkhunter-1.1.7 66
+MD5 380428df977c5354d70ce7f3d68fe098 ChangeLog 9914
+MD5 f1608c19ea0727ee36b2a692b1f3470b metadata.xml 264
+MD5 2557b88b97dee88fa528a9933606f048 rkhunter-1.2.7-r1.ebuild 1761
+MD5 f620bf00896d60c4a4a47ace8956f8ac files/rkhunter-1.2.3-specify-logfile.patch 2481
+MD5 3f3b34e98201ab14484cb0bb478babc2 files/rkhunter.cron 3881
+MD5 2473ff095ea8aa159a379872571b5d43 files/rkhunter.bash-completion 2628
+MD5 ecbc10aed5cbe2c9d0dfcb0df424556e files/digest-rkhunter-1.2.7-r1 66
+MD5 d07a47cbe2364dc010d37ead80ff8f4b files/rkhunter-1.2.1-create-tmpdir.diff 551
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFBQ7uHEZCkKN40op4RAuaUAKCHnOm4jiserdmHW1gGUVe1+fd2tQCgnGbI
-y5yeiqFzwf+ri8MRL0KK32E=
-=H7VT
+iD8DBQFDGtcBEZCkKN40op4RAmwAAJ9s0kIlVXxHH4cRYx/g8lnK953inACgr/mv
+iE0lJBq1Tm1GrGXst0jmTig=
+=FUaQ
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/rkhunter/files/rkhunter.bash-completion b/app-forensics/rkhunter/files/rkhunter.bash-completion
index cab2a3067afd..892cb5398581 100644
--- a/app-forensics/rkhunter/files/rkhunter.bash-completion
+++ b/app-forensics/rkhunter/files/rkhunter.bash-completion
@@ -1,5 +1,5 @@
-# bash-completion script for rkhunter
-# place this file in /etc/bash_completion.d
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/files/rkhunter.bash-completion,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
+# rkhunter completion
 
 _rkhunter() {
 	local cur prev opts
@@ -19,7 +19,8 @@ _rkhunter() {
 
 	case "${prev}" in
 		--createlogfile)
-			COMPREPLY=($(compgen -W "${opts/--createlogfile}" -- "${cur}"))
+			COMPREPLY=($(compgen -o filenames -A file -W "${opts/--createlogfile}" \
+			    -- "${cur}"))
 			;;
 		--display-logfile)
 			COMPREPLY=($(compgen -W "${opts/--display-logfile}" -- "${cur}"))
diff --git a/app-forensics/rkhunter/files/rkhunter.cron b/app-forensics/rkhunter/files/rkhunter.cron
index 33e57d608914..715a9aa90c2f 100644
--- a/app-forensics/rkhunter/files/rkhunter.cron
+++ b/app-forensics/rkhunter/files/rkhunter.cron
@@ -1,44 +1,133 @@
-#!/bin/sh
+#!/bin/bash
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/files/rkhunter.cron,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
+# original author: Aaron Walker <ka0ttic@gentoo.org>
 
-### Begin Configuration ###
+########################## Begin Configuration ###############################
 
-# set this to 'yes' to enable
+# Default options - more options may be added depending on the
+# configuration variables you set below
+RKHUNTER_OPTS="-c --cronjob --skip-keypress"
+
+# Set this to 'yes' to enable ; this script does nothing otherwise
 ENABLE=no
 
-RKHUNTER_EXEC="/usr/bin/rkhunter"
-RKHUNTER_OPTS="--checkall --cronjob --skip-keypress"
+# Automatically update rkhunter's dat files prior to running?
+UPDATE=no
 
-# set to 'yes' if you wish the output to be mailed to you
+# Set this to 'yes' if you wish the output to be mailed to you
 SEND_EMAIL=no
 
-# NOTE: the rest of these options are only relevant 
-# if you set SEND_EMAIL to 'yes'
-
+# NOTE: the following EMAIL_* variables are only relevant if you set the
+# SEND_EMAIL variable to 'yes'
 EMAIL_SUBJECT="${HOSTNAME}: rkhunter output"
 EMAIL_RECIPIENT=root
-EMAIL_CMD="| mail -s \"${EMAIL_SUBJECT}\" ${EMAIL_RECIPIENT}"
-
-# set to 1 to recieve only warnings & errors
-# set to 2 to recieve ALL rkhunter output
-# set to 3 to recieve rkhunter report
-EMAIL_VERBOSITY=3
-
-### End Configuration ###
-
-if [ "${ENABLE}" = "yes" ]; then
-	CMD="${RKHUNTER_EXEC} ${RKHUNTER_OPTS}"
-
-	if [ "${SEND_EMAIL}" = "yes" ]; then
-		if [ "${EMAIL_VERBOSITY}" -eq 1 ]; then
-			CMD="${CMD} --quiet ${EMAIL_CMD}"
-		elif [ "${EMAIL_VERBOSITY}" -eq 2 ]; then
-			CMD="${CMD} ${EMAIL_CMD}"
-		else # default to report-mode
-			CMD="${CMD} --report-mode ${EMAIL_CMD}"
-		fi
-	else
-		CMD="${CMD} &>/dev/null"
+EMAIL_CMD="|mail -s \"${EMAIL_SUBJECT}\" ${EMAIL_RECIPIENT}"
+
+# Log rkhunter output?
+LOG=no
+
+# The default log location is /var/log/rkhunter.log. Set this variable if
+# you'd like to use an alternate location.
+#LOGFILE=""
+
+# By default, the log file created by rkhunter is world-readable (0644). If
+# you'd like to modify the permissions afterwards, set this variable.  The 
+# value of this variable, must be a valid chmod argument such as '0600' or 
+# 'u+rw,go-rwx'.  See the chmod(1) manual page for more information.
+#LOGFILE_PERMS="0600"
+
+# By default, rkhunter overwrites the previous log.  Set this variable
+# to 'yes' if you'd like the log output appended to the logfile, instead
+# of overwriting it.
+SAVE_OLD_LOGS=no
+
+# Set to 1 to recieve only warnings & errors
+# Set to 2 to recieve ALL rkhunter output
+# Set to 3 to recieve rkhunter report
+VERBOSITY=3
+
+########################### End Configuration ################################
+
+# exit immediately, unless enabled
+[[ "${ENABLE}" == "yes" ]] || exit 0
+
+# debug mode?  (mainly for my benefit)
+if [[ -n "${1}" ]] && [[ ${1} = "-d" ]] ; then
+	set -o verbose -o xtrace
+fi
+
+[[ -z "${LOGFILE}" ]] && LOGFILE="/var/log/rkhunter.log"
+
+# moved this out of config section since it'll
+# probably never need to be changed
+RKHUNTER_EXEC="/usr/bin/rkhunter"
+
+# sanity check
+if [[ ! -x "${RKHUNTER_EXEC}" ]] ; then
+	echo "${RKHUNTER_EXEC} does not exist or is not executable!"
+	exit 1
+fi
+
+# we create a few tmp files, so let's at least make
+# them readable/writable by root only
+umask 0077
+
+# all output goes to this temp file
+_tmpout=$(mktemp /tmp/rkhunter.cron.XXXXXX)
+exec > ${_tmpout} 2>&1
+
+# update data files
+if [[ "${UPDATE}" == "yes" ]] ; then
+	# save the output of --update in a tmp file so that it can be mailed
+	# along with the scan output; otherwise the user will get 2 mails
+	${RKHUNTER_EXEC} --update
+fi
+
+# formulate options string according to user configuration
+[[ "${LOG}" == "yes" ]] && \
+    RKHUNTER_OPTS="${RKHUNTER_OPTS} --createlogfile ${LOGFILE}"
+
+case "${VERBOSITY}" in
+	# warnings and errors only
+	1)	RKHUNTER_OPTS="${RKHUNTER_OPTS} --quiet" ;;
+	# default rkhunter output (no extra options)
+	2)	;;
+	# default to option 3 (report-mode)
+	*)	RKHUNTER_OPTS="${RKHUNTER_OPTS} --report-mode"	;;
+esac
+
+# save old log
+if [[ "${LOG}" == "yes" && "${SAVE_OLD_LOGS}" == "yes" ]] ; then
+	if [[ -e "${LOGFILE}" ]] ; then
+		_tmpfile=$(mktemp ${LOGFILE}.XXXXXX)
+		mv -f ${LOGFILE} ${_tmpfile}
+		echo -e "--\nrkhunter.cron commencing at: $(date)\n--" >> ${_tmpfile}
 	fi
+fi
+
+# finally, run rkhunter
+CMD="${RKHUNTER_EXEC} ${RKHUNTER_OPTS}"
+eval ${CMD}
+RV=$?
+
+# email output?
+if [[ "${SEND_EMAIL}" == "yes" ]] ; then
+	CMD="cat ${_tmpout} ${EMAIL_CMD}"
+	eval ${CMD}
+fi
 
-	eval exec "${CMD}"
+# remove temp file
+[[ -n "${_tmpout}" ]] && rm -f ${_tmpout}
+
+[[ "${LOG}" != "yes" ]] && exit ${RV}
+
+# from this point on, we can assume logging is enabled
+
+# append new log to old log and restore
+if [[ -n "${_tmpfile}" ]] ; then
+	cat ${LOGFILE} >> ${_tmpfile}
+	mv ${_tmpfile} ${LOGFILE}
 fi
+
+chmod ${LOGFILE_PERMS:-0644} ${LOGFILE}
+exit ${RV}
diff --git a/app-forensics/rkhunter/metadata.xml b/app-forensics/rkhunter/metadata.xml
index 522df7907b26..9ba0f07b9ee3 100644
--- a/app-forensics/rkhunter/metadata.xml
+++ b/app-forensics/rkhunter/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>forensics</herd>
   <maintainer>
     <email>ka0ttic@gentoo.org</email>
     <name>Aaron Walker</name>
diff --git a/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild b/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild
index f1bb7c65087e..df23bba37227 100644
--- a/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild
+++ b/app-forensics/rkhunter/rkhunter-1.2.7-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/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild,v 1.1 2005/09/02 09:58:35 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.2.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:54 chriswhite Exp $
 
 inherit eutils bash-completion
 
@@ -13,11 +13,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 mips ppc sparc x86"
 IUSE=""
 
-DEPEND="app-arch/tar
-	app-arch/gzip
-	virtual/mta"
-RDEPEND="app-shells/bash
-	dev-lang/perl"
+RDEPEND="virtual/mta
+	app-shells/bash
+	dev-lang/perl
+	sys-process/lsof"
 
 S="${WORKDIR}/${PN}/files"
 
@@ -42,7 +41,7 @@ src_install() {
 	dosed 's:^#\(DBDIR=.*\)local\(.*\)$:\1lib\2\nINSTALLDIR=/usr:' \
 		/etc/rkhunter.conf || die "sed rkhunter.conf failed"
 
-	doman development/rkhunter.8
+	doman development/rkhunter.8 || die "doman failed"
 	dodoc CHANGELOG LICENSE README WISHLIST || die "dodoc failed"
 
 	exeinto /etc/cron.daily
diff --git a/app-forensics/sleuthkit/ChangeLog b/app-forensics/sleuthkit/ChangeLog
index da340129f99d..746d12a92e95 100644
--- a/app-forensics/sleuthkit/ChangeLog
+++ b/app-forensics/sleuthkit/ChangeLog
@@ -1,6 +1,71 @@
-# ChangeLog for app-admin/sleuthkit
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/ChangeLog,v 1.1 2004/09/12 06:35:23 dragonheart Exp $
+# ChangeLog for app-forensics/sleuthkit
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+*sleuthkit-2.02 (27 Jul 2005)
+
+  27 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +sleuthkit-2.02.ebuild:
+  Version bump.
+
+*sleuthkit-1.73-r2 (29 Apr 2005)
+
+  29 Apr 2005; Daniel Black <dragonheart@gentoo.org> -sleuthkit-1.72.ebuild,
+  -sleuthkit-1.73-r1.ebuild, +sleuthkit-1.73-r2.ebuild:
+  Fixed mactime as per bug #86640. Thanks to Olivier
+  <ocastan@noosSPAMLESS.fr>. Old version cleanout
+
+  29 Apr 2005; Benjamin Schindler <config@gentoo.org> sleuthkit-2.01.ebuild:
+  Fixed bug 90489
+
+  24 Apr 2005; Jason Wever <weeve@gentoo.org> sleuthkit-2.01.ebuild:
+  Fixed keywords since this was accidentily committed as stable.
+
+*sleuthkit-2.01 (24 Apr 2005)
+
+  24 Apr 2005; Daniel Black <dragonheart@gentoo.org> +sleuthkit-2.01.ebuild:
+  Version bump as per bug #89978
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> sleuthkit-1.73-r1.ebuild:
+  stable on amd64
+
+  27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  sleuthkit-1.73-r1.ebuild:
+  Stable on ppc.
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sleuthkit-1.73-r1.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> sleuthkit-1.73-r1.ebuild:
+  Marked stable on x86.
+
+*sleuthkit-1.73-r1 (24 Jan 2005)
+
+  24 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +sleuthkit-1.73-r1.ebuild:
+  Added patch from pyflag.sf.net. Thanks to David Collett
+  (daveco@users.sourceforge.net)
+
+  25 Dec 2004; Jason Wever <weeve@gentoo.org> sleuthkit-1.73.ebuild:
+  Stable on sparc.
+
+  14 Dec 2004; Daniel Black <dragonheart@gentoo.org> -sleuthkit-1.69.ebuild,
+  -sleuthkit-1.70.ebuild, sleuthkit-1.73.ebuild:
+  ppc and x86 stable. Old version removed:
+
+  21 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> sleuthkit-1.73.ebuild:
+  Added to ~amd64, bug #71926
+
+*sleuthkit-1.73 (20 Nov 2004)
+
+  20 Nov 2004; Aaron Walker <ka0ttic@gentoo.org> +sleuthkit-1.73.ebuild:
+  Version bump for bug 71855; also, added toolchain-funcs support for CC.
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  18 Sep 2004; Jason Wever <weeve@gentoo.org> sleuthkit-1.72.ebuild:
+  Stable on sparc.
 
 *sleuthkit-1.72 (12 Sep 2004)
 
diff --git a/app-forensics/sleuthkit/Manifest b/app-forensics/sleuthkit/Manifest
index d6684119c04c..1b0b992252a1 100644
--- a/app-forensics/sleuthkit/Manifest
+++ b/app-forensics/sleuthkit/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 b801102a5f9e649518ad4e0fec2343c6 sleuthkit-1.70.ebuild 1290
-MD5 bbf3fb073388fe3419dee814315908ff sleuthkit-1.69.ebuild 1032
-MD5 6d796b061ed1c1337ef157a5f74dab35 metadata.xml 403
-MD5 5b3974fdf25ba52a1dc967f46f9197a2 ChangeLog 1755
-MD5 ec26655b002b24abae4cd967da714c8e sleuthkit-1.72.ebuild 1449
-MD5 78513b8353019a07577b105b5d9460c3 files/digest-sleuthkit-1.70 66
-MD5 d3ac0995a6995b69b23d6a7392e41035 files/digest-sleuthkit-1.69 66
-MD5 02411e8cd1953fcea0e99626e5d0d8b7 files/digest-sleuthkit-1.72 66
+MD5 e3256bd3aa379cd76d163f017e923129 sleuthkit-2.01.ebuild 1742
+MD5 5c778b1a0701118feaaa3edade1b0c3a sleuthkit-1.73.ebuild 1583
+MD5 0f2ff0722ddf4ab26abcf067667c1bdf sleuthkit-1.73-r2.ebuild 1603
+MD5 feb8e60ec36ce8b91a23872418faf13f ChangeLog 4076
+MD5 f56a7156a9f143e4a0c30bc51c7ef2fb sleuthkit-2.02.ebuild 1529
+MD5 20ee07270b7eadc3659cd96a982e460f metadata.xml 230
+MD5 cfe26f775d27b7e4baebd43ff9ed706a files/digest-sleuthkit-1.73 66
+MD5 422648eade250754bfb34f33e6cfe368 files/digest-sleuthkit-2.01 66
+MD5 b400ae4861345431a971d388f6012edd files/digest-sleuthkit-2.02 66
+MD5 8978f054c0edcc527fc8c8954774c9a9 files/sleuthkit-2.01-include_fix.patch 291
+MD5 225e6c10daf5b8802c4fb1f833a48fe6 files/digest-sleuthkit-1.73-r2 140
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFBQxF+mdTrptrqvGERAo9mAJ43wrL/90fuHOhsYAR1LYpFroGzCQCfalbo
-kJZB8driaJWPeabSxnxarXg=
-=IBBN
+iD8DBQFC56fyEZCkKN40op4RApiZAJ9D87SpW98OJx/6bImkxoGM1c4sUACfat1v
+J9SJtftuhesRER3STBGhk+o=
+=UV7e
 -----END PGP SIGNATURE-----
diff --git a/app-forensics/sleuthkit/metadata.xml b/app-forensics/sleuthkit/metadata.xml
index b9fc2b9c6f11..25f363e289d8 100644
--- a/app-forensics/sleuthkit/metadata.xml
+++ b/app-forensics/sleuthkit/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>dragonheart@gentoo.org</email>
-    <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
-</maintainer>
-<longdescription></longdescription>
+	<herd>forensics</herd>
+	<maintainer>
+		<email>forensics@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-forensics/sleuthkit/sleuthkit-1.73-r2.ebuild b/app-forensics/sleuthkit/sleuthkit-1.73-r2.ebuild
index abc2434d2786..d869f0f042b6 100644
--- a/app-forensics/sleuthkit/sleuthkit-1.73-r2.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-1.73-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/app-forensics/sleuthkit/sleuthkit-1.73-r2.ebuild,v 1.1 2005/04/29 23:50:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-1.73-r2.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/app-forensics/sleuthkit/sleuthkit-1.73.ebuild b/app-forensics/sleuthkit/sleuthkit-1.73.ebuild
index 1c6fcabb4600..67fd298b1dd9 100644
--- a/app-forensics/sleuthkit/sleuthkit-1.73.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-1.73.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/app-forensics/sleuthkit/sleuthkit-1.73.ebuild,v 1.1 2004/11/20 19:04:51 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-1.73.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/sleuthkit/${P}.tar.gz"
 
 LICENSE="GPL-2 IBM"
 SLOT="0"
-KEYWORDS="~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~arm ~hppa ppc ~s390 sparc x86 ~amd64"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-forensics/sleuthkit/sleuthkit-2.01.ebuild b/app-forensics/sleuthkit/sleuthkit-2.01.ebuild
index 154d30415b63..e3c0052885d7 100644
--- a/app-forensics/sleuthkit/sleuthkit-2.01.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-2.01.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/app-forensics/sleuthkit/sleuthkit-2.01.ebuild,v 1.1 2005/04/24 06:20:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-2.01.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/sleuthkit/${P}.tar.gz"
 
 LICENSE="GPL-2 IBM"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ppc s390 sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
@@ -29,6 +29,9 @@ src_unpack() {
 	sed -i '63,69d' src/timeline/config-perl || die "sed config-perl failed"
 	sed -i 's:`cd ../..; pwd`:/usr:' src/sorter/install \
 		|| die "sed install failed"
+	if use amd64; then
+		epatch ${FILESDIR}/${P}-include_fix.patch
+	fi
 }
 
 src_compile() {
diff --git a/app-forensics/sleuthkit/sleuthkit-2.02.ebuild b/app-forensics/sleuthkit/sleuthkit-2.02.ebuild
index e724c5b101fd..e2d8983a8793 100644
--- a/app-forensics/sleuthkit/sleuthkit-2.02.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-2.02.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/app-forensics/sleuthkit/sleuthkit-2.02.ebuild,v 1.1 2005/07/27 15:27:18 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-2.02.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/app-forensics/tct/ChangeLog b/app-forensics/tct/ChangeLog
index e230873b3c2c..f2c10e6863c6 100644
--- a/app-forensics/tct/ChangeLog
+++ b/app-forensics/tct/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for app-forensics/tct
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/ChangeLog,v 1.1 2004/09/16 16:55:09 ka0ttic Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/ChangeLog,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> tct-1.15-r1.ebuild:
+  Stable on ppc.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> tct-1.15-r1.ebuild,
+  -tct-1.15.ebuild:
+  Marked 1.15-r1 stable on x86; removed 1.15.
+
+  10 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  files/tct-1.15-r1-gentoo.diff:
+  Add missing semi-colon in patch.
+
+*tct-1.15-r1 (07 Nov 2004)
+
+  07 Nov 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/tct-1.15-r1-gentoo.diff, +tct-1.15-r1.ebuild:
+  Revision bump; fixes bug #70307, use tc-getCC, and don't install md5 man
+  page as it gets installed by openssl.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> tct-1.15.ebuild:
+  Added to ~ppc.
+
+  17 Sep 2004; Aaron Walker <ka0ttic@gentoo.org> files/tct-1.15-gentoo.diff,
+  tct-1.15.ebuild:
+  Converted to use sys-apps/file; Installs configs into /etc now rather than
+  installing a symlink.
 
 *tct-1.15 (16 Sep 2004)
 
diff --git a/app-forensics/tct/Manifest b/app-forensics/tct/Manifest
index 357d1e6e22cb..b03f9d0f3662 100644
--- a/app-forensics/tct/Manifest
+++ b/app-forensics/tct/Manifest
@@ -1,6 +1,6 @@
-MD5 478ff989dd3d48439827b48a36e0aaad .tct-1.15.ebuild.swp 12288
-MD5 bdc2b6b996666a4ab213ed51355fdcf4 tct-1.15.ebuild 2410
-MD5 9800dc278127ac2f4c88585063c51aff ChangeLog 258
 MD5 41bbb72e2d5a56f8446b18931f49c48a metadata.xml 236
-MD5 4f84b201211e39a37c212afd03072e54 files/tct-1.15-gentoo.diff 2134
-MD5 149e3bd10ce891ee1dd2ad2522a705f0 files/digest-tct-1.15 60
+MD5 f9b9ac0baa1e5d999e5a1325fea24576 ChangeLog 1219
+MD5 1e942678bda7d4730cd0d895e6d8ddbd tct-1.15-r1.ebuild 2504
+MD5 5a8ca858fffe912a24b5239392257ee4 files/tct-1.15-r1-gentoo.diff 5909
+MD5 c0948c285663f6861c03580bdd352d61 files/tct-1.15-gentoo.diff 5214
+MD5 149e3bd10ce891ee1dd2ad2522a705f0 files/digest-tct-1.15-r1 60
diff --git a/app-forensics/tct/files/tct-1.15-gentoo.diff b/app-forensics/tct/files/tct-1.15-gentoo.diff
index cc4ccf5dbaa2..b66bf9aded71 100644
--- a/app-forensics/tct/files/tct-1.15-gentoo.diff
+++ b/app-forensics/tct/files/tct-1.15-gentoo.diff
@@ -1,6 +1,65 @@
+diff -urN tct-1.15.orig/Makefile tct-1.15/Makefile
+--- tct-1.15.orig/Makefile	2001-09-15 16:23:28.000000000 -0400
++++ tct-1.15/Makefile	2004-09-16 23:52:56.153253952 -0400
+@@ -16,7 +16,6 @@
+ 	cd src/misc; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/fstools; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/pcat; make "CC=$(CC)" MAKELEVEL=
+-	cd src/file; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/lastcomm; make "CC=$(CC)" MAKELEVEL=
+ 	cd src/major_minor; make "CC=$(CC)" MAKELEVEL=
+ 	cd extras/entropy; make "CC=$(CC)" MAKELEVEL=
+@@ -30,7 +29,6 @@
+ 	cd src/misc; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/fstools; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/pcat; make $@ "CC=$(CC)" MAKELEVEL=
+-	cd src/file; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/lastcomm; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/major_minor; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd extras/entropy; make $@ "CC=$(CC)" MAKELEVEL=
+@@ -44,7 +42,6 @@
+ 	cd src/misc; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/fstools; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/pcat; make $@ "CC=$(CC)" MAKELEVEL=
+-	cd src/file; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/lastcomm; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd src/major_minor; make $@ "CC=$(CC)" MAKELEVEL=
+ 	cd extras/entropy; make $@ "CC=$(CC)" MAKELEVEL=
+diff -urN tct-1.15.orig/bin/grave-robber tct-1.15/bin/grave-robber
+--- tct-1.15.orig/bin/grave-robber	2004-01-22 14:48:01.000000000 -0500
++++ tct-1.15/bin/grave-robber	2004-09-17 00:47:07.559965000 -0400
+@@ -424,9 +424,7 @@
+ 	die "Can't find TCT_HOME - did you run reconfig?\n";
+ 	}
+ 
+-if (!-f "$BIN/file") {
+-	die "Can't find our \"$BIN/file\" command  - did you type \"make\" first?\n";
+-	}
++die "Can't find \"$FILE\" command \n" unless (-f $FILE);
+ 
+ require "logger.pl";
+ require "command.pl";
+@@ -495,15 +493,10 @@
+ #
+ #  we usually carry around the alternate magic file...
+ #
+-if (-f "$ETC/magic") { $magic_file = "$ETC/magic"; }
+-        else {
+-        die "Can't find the /etc/magic file\n" unless (-f "/etc/magic");
+-        $magic_file = "/etc/magic";
+-        warn "Couldn't find $ETC/magic, switching over to $magic_file\n";
+-        }
++$magic_file = "/usr/share/misc/file/magic";
++die "Can't find $magic_file" unless (-f $magic_file);
+ 
+ }
+-
+ #
+ #  does a system have a proc file system?  Returns 0 if so, !0 if no
+ #
 diff -urN tct-1.15.orig/conf/coroner.cf tct-1.15/conf/coroner.cf
 --- tct-1.15.orig/conf/coroner.cf	2004-01-22 14:48:00.000000000 -0500
-+++ tct-1.15/conf/coroner.cf	2004-09-16 10:16:17.209578032 -0400
++++ tct-1.15/conf/coroner.cf	2004-09-16 23:44:43.288180832 -0400
 @@ -2,7 +2,7 @@
  # Configuration file for coroner's toolkit
  #
@@ -21,7 +80,7 @@ diff -urN tct-1.15.orig/conf/coroner.cf tct-1.15/conf/coroner.cf
  #  What colors to use for MACtime HTML stuff
 diff -urN tct-1.15.orig/conf/grave-robber.cf tct-1.15/conf/grave-robber.cf
 --- tct-1.15.orig/conf/grave-robber.cf	2004-01-22 14:48:00.000000000 -0500
-+++ tct-1.15/conf/grave-robber.cf	2004-09-16 10:16:02.543440243 -0400
++++ tct-1.15/conf/grave-robber.cf	2004-09-16 23:44:43.288180832 -0400
 @@ -2,7 +2,7 @@
  # Configuration file for coroner's toolkit
  #
@@ -42,28 +101,67 @@ diff -urN tct-1.15.orig/conf/grave-robber.cf tct-1.15/conf/grave-robber.cf
  # Don't copy file larger than this (bytes).  Set to 0 if don't want limits
 diff -urN tct-1.15.orig/conf/paths.pl tct-1.15/conf/paths.pl
 --- tct-1.15.orig/conf/paths.pl	2004-01-08 17:29:05.000000000 -0500
-+++ tct-1.15/conf/paths.pl	2004-09-16 12:21:38.645527494 -0400
-@@ -23,7 +23,7 @@
++++ tct-1.15/conf/paths.pl	2004-09-16 23:46:48.573134624 -0400
+@@ -13,7 +13,7 @@
+ 
+ $CRONTAB="/usr/bin/crontab";
+ $DATE="/bin/date";
+-$DMESG="/sbin/dmesg";
++$DMESG="/bin/dmesg";
+ $DOMAINNAME="/bin/domainname";
+ $ECHO="/bin/echo";
+ 
+@@ -21,20 +21,20 @@
+ $FINGER="/usr/bin/finger";
+ $IFCONFIG="/sbin/ifconfig";
  $IPCS="/usr/bin/ipcs";
- $LAST="/usr/bin/last";
+-$LAST="/usr/bin/last";
++$LAST="/bin/last";
  
 -$LSOF="/usr/local/sbin/lsof";
 +$LSOF="/usr/sbin/lsof";
  $MKDIR="/bin/mkdir";
- $NETSTAT="/usr/bin/netstat";
+-$NETSTAT="/usr/bin/netstat";
++$NETSTAT="/bin/netstat";
  $PS="/bin/ps";
-@@ -61,7 +61,7 @@
+ $PWD="/bin/pwd";
+ 
+-$RPCINFO="/usr/bin/rpcinfo";
++$RPCINFO="/usr/sbin/rpcinfo";
+ $SHOWMOUNT="/usr/bin/showmount";
+ $STRINGS="/usr/bin/strings";
+-$SU="/usr/bin/su";
++$SU="/bin/su";
+ $SYNC="/bin/sync";
+-$TEE="/usr/bin/tee";
++$TEE="/bin/tee";
+ 
+ $TOP="/usr/bin/top";
+ $UNAME="/usr/bin/uname";
+@@ -61,9 +61,9 @@
  $PSTAT="/usr/sbin/pstat";
  
  # linux
 -$RPM="/usr/local/bin/rpm";
 +$RPM="/usr/bin/rpm";
  $KSYMS="/sbin/ksyms";
- $LSMOD="/sbin/lsmod";
+-$LSMOD="/sbin/lsmod";
++$LSMOD="/bin/lsmod";
  
+ # kernel modules
+ $MODINFO="/sbin/modinfo";
+@@ -77,7 +77,7 @@
+ #
+ # our stuff
+ #
+-$FILE     = "$TCT_HOME/bin/file";
++$FILE     = "/usr/bin/file";
+ $MD5      = "$TCT_HOME/bin/md5";
+ $PCAT     = "$TCT_HOME/bin/pcat";
+ $ICAT     = "$TCT_HOME/bin/icat";
 diff -urN tct-1.15.orig/reconfig tct-1.15/reconfig
 --- tct-1.15.orig/reconfig	2001-09-15 16:48:51.000000000 -0400
-+++ tct-1.15/reconfig	2004-09-16 09:43:15.790293315 -0400
++++ tct-1.15/reconfig	2004-09-16 23:44:43.289180680 -0400
 @@ -157,7 +157,8 @@
  		   "extras/ils2mac", "extras/realpath");
  
diff --git a/app-forensics/tct/files/tct-1.15-r1-gentoo.diff b/app-forensics/tct/files/tct-1.15-r1-gentoo.diff
index 363193d81a66..8f1487c19ccd 100644
--- a/app-forensics/tct/files/tct-1.15-r1-gentoo.diff
+++ b/app-forensics/tct/files/tct-1.15-r1-gentoo.diff
@@ -172,7 +172,7 @@ diff -urN tct-1.15.orig/lazarus/lazarus tct-1.15/lazarus/lazarus
 -	$magic_file = "/etc/magic";
 -	warn "Couldn't find $ETC/magic, switching over to $magic_file\n";
 -	}
-+$magic_file="/usr/share/misc/file/magic"
++$magic_file="/usr/share/misc/file/magic";
 +die "Can't find $magic_file\n" unless (-f $magic_file);
 +
  
diff --git a/app-forensics/tct/tct-1.15-r1.ebuild b/app-forensics/tct/tct-1.15-r1.ebuild
index c37c25c04629..f8b9444a8c27 100644
--- a/app-forensics/tct/tct-1.15-r1.ebuild
+++ b/app-forensics/tct/tct-1.15-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/app-forensics/tct/tct-1.15-r1.ebuild,v 1.1 2004/11/07 09:48:38 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/tct/tct-1.15-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:53 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.porcupine.org/forensics/${P}.tar.gz"
 
 LICENSE="IBM as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.0004
diff --git a/dev-db/c-jdbc/ChangeLog b/dev-db/c-jdbc/ChangeLog
index ca03f1f55d5e..517b085384e2 100644
--- a/dev-db/c-jdbc/ChangeLog
+++ b/dev-db/c-jdbc/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-db/c-jdbc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.1 2005/01/22 18:39:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> c-jdbc-1.0.4-r1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> files/controller.sh,
+  c-jdbc-1.0.4-r1.ebuild:
+  xml-apis.jar is provided by xml-commons , see #82561
+
+*c-jdbc-1.0.4-r1 (27 Mar 2005)
+
+  27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> files/controller.sh,
+  +c-jdbc-1.0.4-r1.ebuild, -c-jdbc-1.0.4.ebuild:
+  moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
+
+  04 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> c-jdbc-1.0.4.ebuild:
+  changed xml-commons dependency to xerces-2 dependency in order to fix #82561
 
 *c-jdbc-1.0.4 (22 Jan 2005)
 
diff --git a/dev-db/c-jdbc/Manifest b/dev-db/c-jdbc/Manifest
index d637eff4376f..e83ec8bcd520 100644
--- a/dev-db/c-jdbc/Manifest
+++ b/dev-db/c-jdbc/Manifest
@@ -1,7 +1,19 @@
-MD5 13cd804814398cb064a8c66dedacf3ec c-jdbc-1.0.4.ebuild 3787
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 abc885f1a2ce09197fd689cd5e1979b0 c-jdbc-1.0.4-r1.ebuild 3731
+MD5 93efc67352da22a498552ed3036acf56 ChangeLog 1140
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 62ac24f25532a4183e3ed1e1480878e7 files/console.sh 606
-MD5 a8d6fd20a9ab0d2f3d6b8c626cf6cf8b files/controller.sh 1118
+MD5 d1171c36b6ee239f4db6aeaa9ad7519a files/controller.sh 1133
 MD5 6f7e7b9ace7df13d6bab70f487a31189 files/c-jdbc-1.0.4-gentoo.patch 5047
-MD5 599e87927c86dfe53eaf0415b5bae480 files/digest-c-jdbc-1.0.4 70
-MD5 68ab5b03c75a8fb3512080cc775e2af7 files/cjdbc-conf 218
-MD5 95ac220f9cc6c65bf71f2298b124bd2d files/cjdbc-init 815
+MD5 599e87927c86dfe53eaf0415b5bae480 files/digest-c-jdbc-1.0.4-r1 70
+MD5 c366d1203f27f5438c29bc3a5724ab73 files/cjdbc-conf 313
+MD5 9c7589e63d5760dde9a3d56fdc58e6a7 files/cjdbc-init 926
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGhpOQiJ/wx066S4RAi3PAJ92CnKGlLx0JKvHclHn6lpCDOSypwCgpgtt
+VTOu773zF7ZX/k/XhwZ+JoM=
+=JtoA
+-----END PGP SIGNATURE-----
diff --git a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
index 0028f85f4bea..151261451fc8 100644
--- a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
+++ b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.1 2005/03/27 17:18:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="Transparent Database Clustering Middleware"
 HOMEPAGE="http://c-jdbc.objectweb.org"
 SRC_URI="http://download.forge.objectweb.org/${PN}/${P}-src.tar.gz"
-LICENSE="BSD"
+LICENSE="LGPL-2.1"
 SLOT="1"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc jikes examples"
-DEPEND=">=virtual/jdk-1.3
-	jikes?( >=dev-java/jikes-1.21 )"
 RDEPEND=">=virtual/jre-1.3
 	dev-java/ant
 	=dev-java/commons-cli-1*
 	=dev-java/crimson-1*
 	=dev-java/dom4j-1.5*
 	=dev-java/dtdparser-1.21*
-	=dev-java/jaxen-1.1_beta2*
-	>=dev-java/jcommon-0.9.7
+	~dev-java/jaxen-1.1_beta2
+	=dev-java/jcommon-0.9*
 	>=dev-java/jdepend-2.6
-	>=dev-java/jdbc2-stdext-2.0*
+	>=dev-java/jdbc2-stdext-2.0
 	>=dev-java/jgroups-2.2.7
 	=dev-java/jfreechart-0.9.21*
 	>=dev-java/kunststoff-2.0.2
@@ -30,8 +28,11 @@ RDEPEND=">=virtual/jre-1.3
 	=dev-java/mx4j-2.1*
 	=dev-java/jakarta-regexp-1.3*
 	>=dev-java/xalan-2.5.2
-	~dev-java/xerces-2.6.2
+	dev-java/xml-commons
 	=dev-db/octopus-3.0*"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	jikes? ( >=dev-java/jikes-1.21 )"
 
 S=${WORKDIR}/${P}-src
 
@@ -41,11 +42,10 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-gentoo.patch
 
+	rm -f 3rdparty/*/lib/*.jar
 	cd ${S}/lib
-	for i in `find . -name "*.jar"`
-	do
-		rm -f *.jar
-	done
+
+	rm -f *.jar */*.jar
 
 	java-pkg_jar-from commons-cli-1
 	java-pkg_jar-from crimson-1
@@ -63,7 +63,7 @@ src_unpack() {
 	cd ${S}/lib/jmx
 	java-pkg_jar-from mx4j-2.1
 	java-pkg_jar-from xalan
-	java-pkg_jar-from xerces-2 xml-apis.jar
+	java-pkg_jar-from xml-commons xml-apis.jar
 
 	cd ${S}/lib/other
 	java-pkg_jar-from jdepend
diff --git a/dev-db/c-jdbc/files/cjdbc-conf b/dev-db/c-jdbc/files/cjdbc-conf
index daa4d400e716..3fa97f1d2676 100644
--- a/dev-db/c-jdbc/files/cjdbc-conf
+++ b/dev-db/c-jdbc/files/cjdbc-conf
@@ -1,6 +1,6 @@
 # Copyright 2003 Gentoo Technologies, Inc. 
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/files/cjdbc-conf,v 1.1 2005/01/22 18:39:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/files/cjdbc-conf,v 1.1.1.1 2005/11/30 10:11:26 chriswhite Exp $
 
 # the controller config, has to be placed in /etc/c-jdbc
 con_conf="controller.xml"
diff --git a/dev-db/c-jdbc/files/cjdbc-init b/dev-db/c-jdbc/files/cjdbc-init
index 0ecb703802c8..b558fb4e351b 100644
--- a/dev-db/c-jdbc/files/cjdbc-init
+++ b/dev-db/c-jdbc/files/cjdbc-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/files/cjdbc-init,v 1.1 2005/01/22 18:39:03 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/files/cjdbc-init,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/dev-db/c-jdbc/files/controller.sh b/dev-db/c-jdbc/files/controller.sh
index 621e2cad7309..82b931be6871 100644
--- a/dev-db/c-jdbc/files/controller.sh
+++ b/dev-db/c-jdbc/files/controller.sh
@@ -11,7 +11,7 @@ sax_parser_class=org.apache.crimson.parser.XMLReaderImpl
   
 cp=${CJDBC_HOME}/config/language:${CJDBC_HOME}/config/controller:$CJDBC_HOME/xml
 cp=${cp}:${CJDBC_HOME}/config/virtualdatabase:${CJDBC_HOME}/config:${CJDBC_HOME}/xsl
-cp=${cp}:`java-config -p regexp`:`java-config -p xerces-2`
+cp=${cp}:`java-config -p jakarta-regexp-1.3`:`java-config -p xml-commons`
 cp=${cp}:`java-config -p octopus-3.0`:`java-config -p c-jdbc-1`
 cp=${cp}:`java-config -p hsqldb`:`java-config -p crimson-1`
 cp=${cp}:`java-config -p jgroups`:`java-config -p dom4j-1`
diff --git a/dev-db/cdb/ChangeLog b/dev-db/cdb/ChangeLog
index 966b7ab7c026..149ffae1c9e7 100644
--- a/dev-db/cdb/ChangeLog
+++ b/dev-db/cdb/ChangeLog
@@ -1,9 +1,57 @@
 # ChangeLog for dev-db/cdb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/ChangeLog,v 1.1 2002/07/09 18:49:09 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> cdb-0.75.ebuild:
+  Added ~ppc64; bug #102649
+
+  03 Sep 2005; Chris White <chriswhite@gentoo.org> cdb-0.75.ebuild:
+  Ok first off, I made uinit32.h actually get installed. If it's not, cdb.h
+  cries about not having it. Also, I installed cdb.a and symlinked it to
+  libcdb.a, as there's programs that check for cdb.a and will break if it's
+  not there. Symlink so -lcdb doesn't break as well.
+
+  28 Aug 2005; Fabian Groffen <grobian@gentoo.org> cdb-0.75.ebuild:
+  Marking ~ppc-macos (bug #87701)
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org> cdb-0.75.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cdb-0.75.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Joseph Jezak <josejx@gentoo.org> cdb-0.75.ebuild:
+  Marked ~ppc for bug #87349.
+
+  27 Mar 2005; Tom Martin <slarti@gentoo.org> cdb-0.75.ebuild:
+  Stable on amd64, testing on sparc.
+
+  07 Dec 2004; Dylan Carlson <absinthe@gentoo.org> cdb-0.75.ebuild:
+  Keywords ~amd64.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> cdb-0.75.ebuild:
+  sync IUSE (missing)
+
+  20 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> cdb-0.75.ebuild:
+  use sed -i to change head -1 to head -n 1 in Makefile (bug 33980); more error
+  checking/messages
+
+  16 Aug 2003; Tavis Ormandy <taviso@gentoo.org> cdb-0.75.ebuild:
+  Stable on alpha
+
+  31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> cdb-0.75.ebuild:
+  ~alpha
 
 *cdb-0.75 (9 Jul 2002)
 
+  29 Mar 2003; Seemant Kulleen <seemant@gentoo.org> cdb-0.75.ebuild,
+  files/cdb-0.75-errno.diff:
+  errno fix by: Nicolas Kaiser <nikai@nikai.net> in bug #18328
+
+  22 Jul 2002; Ryan Phillips <rphillips@gentoo.org> cdb-0.75.ebuild :
+
+  Passes repoman now
+
   9 Jul 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/dev-db/cdb/Manifest b/dev-db/cdb/Manifest
index e69de29bb2d1..281c48ce04b9 100644
--- a/dev-db/cdb/Manifest
+++ b/dev-db/cdb/Manifest
@@ -0,0 +1,4 @@
+MD5 115256fbe08da1da9a2993692cb88bde ChangeLog 2389
+MD5 36986e7362965ee89dff08d8d6bea6d3 cdb-0.75.ebuild 1532
+MD5 1a3e347b6ebfe24f60f255100a2af4a0 files/cdb-0.75-errno.diff 243
+MD5 7f28ce1d896bd4416c27bb55d6f63cdf files/digest-cdb-0.75 59
diff --git a/dev-db/cdb/cdb-0.75.ebuild b/dev-db/cdb/cdb-0.75.ebuild
index 7ecbf286b4f0..aa1889d165f5 100644
--- a/dev-db/cdb/cdb-0.75.ebuild
+++ b/dev-db/cdb/cdb-0.75.ebuild
@@ -1,31 +1,57 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/cdb-0.75.ebuild,v 1.1 2002/07/09 18:49:09 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/cdb/cdb-0.75.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A fast, reliable, simple package for creating and reading constant databases"
-SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
+inherit eutils toolchain-funcs
+
+DESCRIPTION="fast, reliable, simple package for creating and reading constant databases"
 HOMEPAGE="http://cr.yp.to/cdb.html"
+SRC_URI="http://cr.yp.to/cdb/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ~ppc-macos ~ppc64 s390 ~sparc x86"
+IUSE=""
+
+DEPEND=">=sys-apps/portage-2.0.47-r10
+	>=sys-apps/sed-4
+	app-arch/tar
+	app-arch/gzip"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-errno.diff
 
-src_compile() {                           
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
+	sed -i \
+		-e 's/head -1/head -n 1/g' Makefile || \
+			die "sed Makefile failed"
+}
+
+src_compile() {
+	echo "$(tc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(tc-getCC)" > conf-ld
 	echo "/usr" > conf-home
 	emake || die "emake failed"
 }
 
-src_install() {                               
-	exeinto /usr/bin
-	for i in cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest
-	do
-		doexe $i
-	done
+src_install() {
+	dobin cdbdump cdbget cdbmake cdbmake-12 cdbmake-sv cdbstats cdbtest || \
+		die "dobin failed"
+
+	# ok so.. first off, some automakes fail at not finding
+	# cdb.a, so install that
+	dolib cdb.a
 
-	into /usr
-	newlib.a cdb.a libcdb.a
+	# then do this pretty little symlinking to solve the somewhat
+	# cosmetic library issue at hand
+	dosym /usr/$(get_libdir)/cdb.a /usr/$(get_libdir)/libcdb.a || die "newlib.a failed"
+
+	# uint32.h needs installation too, otherwise compiles depending
+	# on it will fail
 	insinto /usr/include
-	doins cdb.h
+	doins cdb.h uint32.h || die "doins failed"
 
-	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION
+	dodoc CHANGES FILES README SYSDEPS TARGETS TODO VERSION || \
+		die "dodoc failed"
 }
-
diff --git a/dev-db/dbbalancer/ChangeLog b/dev-db/dbbalancer/ChangeLog
index 617aaa36eedb..c507d2e018b3 100644
--- a/dev-db/dbbalancer/ChangeLog
+++ b/dev-db/dbbalancer/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for dev-db/dbbalancer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/dbbalancer/ChangeLog,v 1.1 2003/01/31 21:33:37 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dbbalancer/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
+
+  22 Jul 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/dbbalancer-0.4.4-gentoo.patch, +metadata.xml,
+  dbbalancer-0.4.4.ebuild:
+  Fxied compile failed bug. (#93316)
+
+  05 Jun 2005; Leonardo Boshell <leonardop@gentoo.org>
+  dbbalancer-0.4.4.ebuild:
+  Fix docbook-dsssl-stylesheets dependency.
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  dbbalancer-0.4.4.ebuild:
+  fix depend (bug #45110)
+
+  16 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  dbbalancer-0.4.4.ebuild:
+  don't assign to A (bug #44712); use mirror://; no need to set RDEPEND="$DEPEND"
+
+  10 Sep 2003; Michael Sterrett <msterret@gentoo.org> dbbalancer-0.4.4.ebuild:
+  DEPEND: >=ace-5.2.4-r1 -> >=dev-libs/ace-5.2.4-r1
 
 *dbbalancer-0.4.4 (31 Jan 2003)
 
diff --git a/dev-db/dbbalancer/Manifest b/dev-db/dbbalancer/Manifest
index e69de29bb2d1..aa28ba317f43 100644
--- a/dev-db/dbbalancer/Manifest
+++ b/dev-db/dbbalancer/Manifest
@@ -0,0 +1,9 @@
+MD5 be7dc027f8200e0b1452c3c4afa36212 dbbalancer-0.4.4.ebuild 1564
+MD5 23d3ef77117cb0fa49405c4c4af1141e ChangeLog 1066
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 c2699fc064b7cc2aae36b2f0ea329768 files/dbbalancer-0.4.4-chapter6.sgml-gentoo.diff 16
+MD5 918713297d47c70154cd0ec46e6c2dbd files/dbbalancer-0.4.4-gentoo.patch 1373
+MD5 99c53676656e17cb2ac3334e669776e1 files/dbbalancer-0.4.4-Makefile.in-gentoo.diff 79
+MD5 e69553c5a9fb46bb162e25aaf33be818 files/dbbalancer-0.4.4-chapter2.sgml-gentoo.diff 122
+MD5 2b5818e0f33a3ddd10f05324e09ff12f files/dbbalancer-0.4.4-pgtest.cc-gentoo.diff 51
+MD5 33923028e28bc89f562757a9c9287c31 files/digest-dbbalancer-0.4.4 68
diff --git a/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild b/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild
index fc45608ae531..d1905b908dda 100644
--- a/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild
+++ b/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild
@@ -1,26 +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/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild,v 1.1 2003/01/31 21:33:37 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dbbalancer/dbbalancer-0.4.4.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Load balancing multithreaded PostgreSQL connection pool.
 Also has a replication mode to keep in sync the load balanced backend
-servers." 
+servers."
 HOMEPAGE="http://sourceforge.net/projects/dbbalancer"
-SRC_URI="http://easynews.dl.sourceforge.net/sourceforge/dbbalancer/dbbalancer-0.4.4.tar.gz"
-LICENSE="GPL"
+SRC_URI="mirror://sourceforge/dbbalancer/${P}.tar.gz"
+
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=postgresql-7.2.3-r1 >=ace-5.2.4-r1 >=openjade-1.3.1-r5 =docbook-dsssl-stylesheets-1.77"
-RDEPEND="$DEPEND"
+DEPEND=">=dev-db/postgresql-7.2.3-r1
+	>=dev-libs/ace-5.2.4-r1
+	>=app-text/openjade-1.3.1-r5
+	>=app-text/docbook-dsssl-stylesheets-1.77"
 
 S="${WORKDIR}/DBBalancer"
-A=${P}.tar.gz
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
 	patch ./Makefile.in ${FILESDIR}/${P}-Makefile.in-gentoo.diff
 	patch ./src/tests/postgres_cc/pgtest.cc ${FILESDIR}/${P}-pgtest.cc-gentoo.diff
 	patch ./docs/manual/chapter2.sgml ${FILESDIR}/${P}-chapter2.sgml-gentoo.diff
@@ -38,13 +43,12 @@ src_compile() {
 		--with-pq=/usr \
 		--with-pq-include=/usr/include/postgresql \
 		--with-jade=/usr/bin/jade \
-		--with-docbook=/usr/share/sgml/docbook/dsssl-stylesheets-1.77 \
-		|| die "./configure failed"
-	emake || die
+		--with-docbook=/usr/share/sgml/stylesheets/dsssl/docbook \
+			|| die "./configure failed"
+	emake || die "emake failed"
 	export SANDBOX_DISABLED=1
 }
 
 src_install() {
 	dosbin ${WORKDIR}/DBBalancer/dbbalancerd
 }
-
diff --git a/dev-db/dbdesigner/ChangeLog b/dev-db/dbdesigner/ChangeLog
index 7074c7d524be..46ac92cb684e 100644
--- a/dev-db/dbdesigner/ChangeLog
+++ b/dev-db/dbdesigner/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-db/dbdesigner
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/dbdesigner/ChangeLog,v 1.1 2004/03/17 16:49:49 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dbdesigner/ChangeLog,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+  16 Sep 2005; John N. Laliberte <allanonjl@gentoo.org>
+  dbdesigner-4.0.5.4.ebuild:
+  cp -a -> cp -pPR
+
+  04 Jun 2005; John N. Laliberte <allanonjl@gentoo.org> metadata.xml:
+  change maintainer to myself.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> dbdesigner-4.0.5.4.ebuild:
+  Added -* to keywords.
+
+  10 Jun 2004; Don Seiler <rizzo@gentoo.org> dbdesigner-4.0.5.4.ebuild:
+  Added x11-lib/qt to DEPENDS, closes Bug #53523 - thanks Christian Apolloni
+
+  10 Apr 2004; Markus Nigbur <pyrania@gentoo.org> dbdesigner-4.0.5.4.ebuild:
+  Added sys-libs/lib-compat to DEPEND.
 
 *dbdesigner-4.0.5.4 (17 Mar 2004)
 
diff --git a/dev-db/dbdesigner/Manifest b/dev-db/dbdesigner/Manifest
index fafa8f52b2cb..1813e74bff52 100644
--- a/dev-db/dbdesigner/Manifest
+++ b/dev-db/dbdesigner/Manifest
@@ -1,3 +1,4 @@
-MD5 1daed9cfd70e12d0972948c9e50aa9fd dbdesigner-4.0.5.4.ebuild 2886
-MD5 e561758787837ad7c96c23ef0b55e174 metadata.xml 368
+MD5 cf0bc1c5daae5a23e2ddd693dce31a50 dbdesigner-4.0.5.4.ebuild 1644
+MD5 f91207507c4155bf62838ec22ff9503c ChangeLog 923
+MD5 20b666328e82e5b9b42795d8a4529ced metadata.xml 413
 MD5 60c9074f70d74a2aced14aa67cd7335d files/digest-dbdesigner-4.0.5.4 70
diff --git a/dev-db/dbdesigner/dbdesigner-4.0.5.4.ebuild b/dev-db/dbdesigner/dbdesigner-4.0.5.4.ebuild
index c2717da8f65f..2d9419577484 100644
--- a/dev-db/dbdesigner/dbdesigner-4.0.5.4.ebuild
+++ b/dev-db/dbdesigner/dbdesigner-4.0.5.4.ebuild
@@ -1,15 +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/dev-db/dbdesigner/dbdesigner-4.0.5.4.ebuild,v 1.1 2004/03/17 16:49:49 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dbdesigner/dbdesigner-4.0.5.4.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 DESCRIPTION="DBDesigner 4 is a visual database design system that integrates database design, modeling, creation and maintenance into a single, seamless environment."
 HOMEPAGE="http://www.fabforce.net/dbdesigner4/"
 SRC_URI="http://fabforce.net/downloads/DBDesigner${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="-* ~x86"
 IUSE=""
-DEPEND=""
+DEPEND="x11-libs/qt
+		sys-libs/lib-compat"
 #RDEPEND=""
 
 MY_PN="DBDesigner4"
@@ -20,13 +21,13 @@ pkg_setup() {
 	ewarn
 	ewarn "Note that I might not have all the dependencies worked"
 	ewarn "out.  If you have problems, file a report at"
-	ewarn "http://bugs.gentoo.org and assign them to rizzo@gentoo.org"
+	ewarn "http://bugs.gentoo.org and assign them to allanonjl@gentoo.org"
 	ewarn
 }
 
 src_install() {
 	dodir ${INSTALLDIR}
-	cp -a ${S}/* ${D}/${INSTALLDIR}
+	cp -pPR ${S}/* ${D}/${INSTALLDIR}
 
 	cd ${D}/${INSTALLDIR}/Linuxlib
 	ln -s bplrtl.so.6.9.0 bplrtl.so.6.9
diff --git a/dev-db/dbdesigner/metadata.xml b/dev-db/dbdesigner/metadata.xml
index a1311602e3b9..a860988426f7 100644
--- a/dev-db/dbdesigner/metadata.xml
+++ b/dev-db/dbdesigner/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
+  <email>allanonjl@gentoo.org</email>
 </maintainer>
 <longdescription>DBDesigner 4 is a visual database design system that integrates database design, modeling, creation and maintenance into a single, seamless environment.</longdescription>
 </pkgmetadata>
diff --git a/dev-db/dybase/ChangeLog b/dev-db/dybase/ChangeLog
index da225138f752..eefc8640c5b2 100644
--- a/dev-db/dybase/ChangeLog
+++ b/dev-db/dybase/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/dybase
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/dybase/ChangeLog,v 1.1 2004/06/08 06:01:03 raker Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dybase/ChangeLog,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> dybase-0.19.ebuild:
+  Added to ~ppc.
 
 *dybase-0.19 (08 Jun 2004)
 
diff --git a/dev-db/dybase/Manifest b/dev-db/dybase/Manifest
index d93ddce9514f..760325a24ccc 100644
--- a/dev-db/dybase/Manifest
+++ b/dev-db/dybase/Manifest
@@ -1,2 +1,3 @@
-MD5 fca1fbc2a8be427c9e3a55c5f92f568c dybase-0.19.ebuild 852
+MD5 5b1bd1948f70b7f1a3f37a6732bf3f67 ChangeLog 424
+MD5 1c3e1ea35b485e77fd40156b8142ea4a dybase-0.19.ebuild 832
 MD5 28713f8b1c5a107cd813491aeb1be7b8 files/digest-dybase-0.19 63
diff --git a/dev-db/dybase/dybase-0.19.ebuild b/dev-db/dybase/dybase-0.19.ebuild
index 5a64cf0d6676..1a0a2050de51 100644
--- a/dev-db/dybase/dybase-0.19.ebuild
+++ b/dev-db/dybase/dybase-0.19.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/dev-db/dybase/dybase-0.19.ebuild,v 1.1 2004/06/08 06:01:04 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/dybase/dybase-0.19.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 DESCRIPTION="DyBASE is very simple object oriented embedded database for languages with dynamic type checking."
 HOMEPAGE="http://www.garret.ru/~knizhnik/dybase.html"
@@ -8,7 +8,7 @@ SRC_URI="http://www.garret.ru/~knizhnik/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
diff --git a/dev-db/edb/ChangeLog b/dev-db/edb/ChangeLog
index 7c183a0b8f49..78abdfdc2576 100644
--- a/dev-db/edb/ChangeLog
+++ b/dev-db/edb/ChangeLog
@@ -1,11 +1,33 @@
 # ChangeLog for dev-db/edb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/edb/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/edb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
+
+*edb-1.0.5 (09 Aug 2004)
+
+  09 Aug 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+   
+*edb-1.0.3 (03 Jun 2002)
+
+  23 Jul 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Added execute bit to autogen.sh to fix compilation breakage.
+
+  09 Apr 2003; Todd Sunderlin <todd@gentoo.org> edb-1.0.3.ebuild:
+  Marked stable for sparc.
+
+  26 Aug 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Removed gtk dependency. Fixes #6998. Submitted by vapier at netzero.com
+
+  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  3 Jun 2002; Brandon Low <lostlogic@gentoo.org> ChangeLog :
+  Updated to 1.0.3, and added scripts to ensure correct compilation on all
+  compiler versions
 
 *edb-1.0.2-r1 (1 Feb 2002)
 
   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/dev-db/edb/Manifest b/dev-db/edb/Manifest
index e69de29bb2d1..416591ae1646 100644
--- a/dev-db/edb/Manifest
+++ b/dev-db/edb/Manifest
@@ -0,0 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bab81c9c47e60449685700d1ffbd53fa edb-9999.ebuild 634
+MD5 eb2707d80970d395c93d1c6c5c29b43e edb-1.0.5.003.ebuild 628
+MD5 2d0647a67387b6483b9e24bafb1d794d metadata.xml 602
+MD5 0ac7f91a951919b37a9bd60cf932a530 edb-1.0.5.004.ebuild 612
+MD5 c8d7813a16e65983760de03bb62d317b edb-1.0.5.ebuild 653
+MD5 e648d36362a6f8bb2036085e9923fa6d ChangeLog 1348
+MD5 6a7f71b99bcaced007cddf65735034e0 files/digest-edb-1.0.5.004 65
+MD5 c0389bb566ce69a9f267601e2033e2d4 files/digest-edb-1.0.5.003 65
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-edb-9999 0
+MD5 51d95c6f5c812a7a345fdfc4312012c4 files/digest-edb-1.0.5 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDBrwzgIKl8Uu19MoRAjmaAJ95WcVLGoyuIfECOEVsZu1jO/FQ9ACfYQbx
+/5rPFGJCdmrUyOLeP3OhheY=
+=3exG
+-----END PGP SIGNATURE-----
diff --git a/dev-db/edb/edb-1.0.5.003.ebuild b/dev-db/edb/edb-1.0.5.003.ebuild
index 791d7ee79040..ab8f393c0a5b 100644
--- a/dev-db/edb/edb-1.0.5.003.ebuild
+++ b/dev-db/edb/edb-1.0.5.003.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/dev-db/edb/edb-1.0.5.003.ebuild,v 1.1 2005/05/22 01:57:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/edb/edb-1.0.5.003.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 EKEY_STATE=snap
 inherit enlightenment flag-o-matic
 
 DESCRIPTION="Enlightenment Data Base"
-HOMEPAGE="http://www.enlightenment.org/pages/edb.html"
+HOMEPAGE="http://www.enlightenment.org/Libraries/Edb/"
 
 IUSE="gtk ncurses"
 
diff --git a/dev-db/edb/edb-1.0.5.004.ebuild b/dev-db/edb/edb-1.0.5.004.ebuild
index efd96f2f202f..c39612790451 100644
--- a/dev-db/edb/edb-1.0.5.004.ebuild
+++ b/dev-db/edb/edb-1.0.5.004.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/dev-db/edb/edb-1.0.5.004.ebuild,v 1.1 2005/08/20 05:13:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/edb/edb-1.0.5.004.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 inherit enlightenment flag-o-matic
 
diff --git a/dev-db/edb/edb-1.0.5.ebuild b/dev-db/edb/edb-1.0.5.ebuild
index 0aa39c54abfb..131bc2f575cb 100644
--- a/dev-db/edb/edb-1.0.5.ebuild
+++ b/dev-db/edb/edb-1.0.5.ebuild
@@ -1,18 +1,18 @@
-# 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/dev-db/edb/edb-1.0.5.ebuild,v 1.1 2004/08/10 03:11:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/edb/edb-1.0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
-EHACKAUTOGEN=yes
+ECVS_MODULE="e17/libs/edb"
 inherit enlightenment flag-o-matic
 
 DESCRIPTION="Enlightenment Data Base"
-HOMEPAGE="http://www.enlightenment.org/pages/edb.html"
+HOMEPAGE="http://www.enlightenment.org/Libraries/Edb/"
 
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="gtk ncurses"
 
 DEPEND="gtk? ( =x11-libs/gtk+-1* )
 	ncurses? ( sys-libs/ncurses )"
-RDEPEND="virtual/libc"
 
 src_compile() {
 	export MY_ECONF="
diff --git a/dev-db/edb/edb-9999.ebuild b/dev-db/edb/edb-9999.ebuild
index 6421269e775f..39b25bbedced 100644
--- a/dev-db/edb/edb-9999.ebuild
+++ b/dev-db/edb/edb-9999.ebuild
@@ -1,18 +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/dev-db/edb/edb-9999.ebuild,v 1.1 2004/10/21 20:29:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/edb/edb-9999.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
-EHACKAUTOGEN=yes
+ECVS_MODULE="e17/libs/edb"
 inherit enlightenment flag-o-matic
 
 DESCRIPTION="Enlightenment Data Base"
-HOMEPAGE="http://www.enlightenment.org/pages/edb.html"
+HOMEPAGE="http://www.enlightenment.org/Libraries/Edb/"
 
 IUSE="gtk ncurses"
 
 DEPEND="gtk? ( =x11-libs/gtk+-1* )
 	ncurses? ( sys-libs/ncurses )"
-RDEPEND="virtual/libc"
 
 src_compile() {
 	export MY_ECONF="
diff --git a/dev-db/fastdb/ChangeLog b/dev-db/fastdb/ChangeLog
index f60954f1ac61..6a4506cefedd 100644
--- a/dev-db/fastdb/ChangeLog
+++ b/dev-db/fastdb/ChangeLog
@@ -1,8 +1,17 @@
 # ChangeLog for dev-db/fastdb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/fastdb/ChangeLog,v 1.1 2003/01/05 06:52:56 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/fastdb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
-*fastdb-2.55.ebuild (04 Jan 2003)
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> fastdb-2.55.ebuild,
+  fastdb-2.92.ebuild:
+  glibc -> libc
+
+*fastdb-2.92 (25 Feb 2004)
+
+  25 Feb 2004; David Holm <dholm@gentoo.org> fastdb-2.92.ebuild:
+  Version bump. Added to ~ppc.
+
+*fastdb-2.55 (04 Jan 2003)
 
   04 Jan 2003; George Shapovalov <george@gentoo.org> ChangeLog, fastdb-2.55.ebuild, files/digest-fastdb-2.55 :
   initial release (#11774)
diff --git a/dev-db/fastdb/Manifest b/dev-db/fastdb/Manifest
index e69de29bb2d1..b84638e2006f 100644
--- a/dev-db/fastdb/Manifest
+++ b/dev-db/fastdb/Manifest
@@ -0,0 +1,5 @@
+MD5 7529d17d3ba71e35ac8ae9a2dc887bb5 ChangeLog 739
+MD5 58a8f65fa630b7569845466771810777 fastdb-2.55.ebuild 967
+MD5 ba871cfad8c7e239bfa4225afbd91b07 fastdb-2.92.ebuild 973
+MD5 dda3126e5e0dcf25e87786d234457e17 files/digest-fastdb-2.55 63
+MD5 99c77cfc387929dcd818de0b9458b13c files/digest-fastdb-2.92 63
diff --git a/dev-db/fastdb/fastdb-2.55.ebuild b/dev-db/fastdb/fastdb-2.55.ebuild
index a6a23ae1e607..6e77acf45d61 100644
--- a/dev-db/fastdb/fastdb-2.55.ebuild
+++ b/dev-db/fastdb/fastdb-2.55.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/dev-db/fastdb/fastdb-2.55.ebuild,v 1.1 2003/01/05 06:52:56 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/fastdb/fastdb-2.55.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS that holds all data in memory; interfaces for C/C++/Kylix"
 HOMEPAGE="http://www.garret.ru/~knizhnik/fastdb.html"
@@ -12,7 +12,7 @@ KEYWORDS="x86"
 
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-db/fastdb/fastdb-2.92.ebuild b/dev-db/fastdb/fastdb-2.92.ebuild
index 8bc9602bbca4..7c34330af10f 100644
--- a/dev-db/fastdb/fastdb-2.92.ebuild
+++ b/dev-db/fastdb/fastdb-2.92.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/dev-db/fastdb/fastdb-2.92.ebuild,v 1.1 2004/02/25 09:40:21 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/fastdb/fastdb-2.92.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS that holds all data in memory; interfaces for C/C++/Kylix"
 HOMEPAGE="http://www.garret.ru/~knizhnik/fastdb.html"
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S="${WORKDIR}/${PN}"
 
diff --git a/dev-db/firebird-docs/ChangeLog b/dev-db/firebird-docs/ChangeLog
index 48ae97e9483e..ec87049e6cd6 100644
--- a/dev-db/firebird-docs/ChangeLog
+++ b/dev-db/firebird-docs/ChangeLog
@@ -1,9 +1,34 @@
-# ChangeLog for dev-lang/sather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird-docs/ChangeLog,v 1.1 2002/03/20 19:19:43 gbevin Exp $
+# ChangeLog for dev-db/firebird-docs
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird-docs/ChangeLog,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  firebird-docs-1.0.ebuild:
+  Don't use cp -a.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  firebird-docs-1.0.ebuild:
+  Stable on ppc.
+
+  08 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  firebird-docs-1.0.ebuild:
+  Keyworded ~sparc wrt #63184
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> firebird-docs-1.0.ebuild:
+  sync IUSE (missing)
+
+  22 Sep 2003; David Holm <dholm@gentoo.org> firebird-docs-1.0.ebuild:
+  Added to ~ppc.
 
 *firebird-docs-1.0 (20 Mar 2002)
 
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> firebird-docs-1.0.ebuild:
+  Changed description. Closes #19376.
+
+  22 Jul 2002; Ryan Phillips <rphillips@gentoo.org> firebird-docs-1.0.ebuild :
+
+  fixes for repoman
+
   20 Mar 2002; G.Bevin <gbevin@gentoo.org> firebird-docs-1.0.ebuild
   files/firebird-docs-1.0:
   
diff --git a/dev-db/firebird-docs/Manifest b/dev-db/firebird-docs/Manifest
index e69de29bb2d1..7030345ff208 100644
--- a/dev-db/firebird-docs/Manifest
+++ b/dev-db/firebird-docs/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47379049c09ca4474f3291f01414f6c6 ChangeLog 1126
+MD5 d4c9792a2943be489157caa416ae0510 firebird-docs-1.0.ebuild 883
+MD5 cd305087601602867d338c23d6d2264a files/digest-firebird-docs-1.0 134
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC2M1j5H05b2HAEkRAjAAAJ9/Z/1E2FD1dzedlPrum0T6LTbDPwCfTOvG
+BrCwIFSEdIS2ENP0NOBPCs8=
+=7wMg
+-----END PGP SIGNATURE-----
diff --git a/dev-db/firebird-docs/firebird-docs-1.0.ebuild b/dev-db/firebird-docs/firebird-docs-1.0.ebuild
index ddbe47d24367..d600b69fd3da 100644
--- a/dev-db/firebird-docs/firebird-docs-1.0.ebuild
+++ b/dev-db/firebird-docs/firebird-docs-1.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Geert Bevin <gbevin@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird-docs/firebird-docs-1.0.ebuild,v 1.1 2002/03/20 19:19:43 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird-docs/firebird-docs-1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 S=${WORKDIR}
-
-DESCRIPTION="Firebird is a relational database offering many ANSI SQL-92 features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names since 1981."
-SRC_URI="http://prdownloads.sourceforge.net/firebird/Firebird_v1_ReleaseNotes.pdf
+DESCRIPTION="A relational database offering many ANSI SQL-92 features"
+SRC_URI="mirror://sourceforge/firebird/Firebird_v1_ReleaseNotes.pdf
 	ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip"
-
 HOMEPAGE="http://firebird.sourceforge.net/"
-
+SLOT="0"
+LICENSE="MPL-1.1"
+KEYWORDS="x86 ppc ~sparc"
+IUSE=""
 DEPEND="app-arch/zip"
 
 src_unpack() {
@@ -25,6 +25,6 @@ src_compile() {
 
 src_install () {
 	dodir /usr/share/doc/${P}
-	cp -a ${DISTDIR}/Firebird_v1_ReleaseNotes.pdf ${D}/usr/share/doc/${P}
-	cp -a ${WORKDIR}/manuals ${D}/usr/share/doc/${P}
+	cp -pPR ${DISTDIR}/Firebird_v1_ReleaseNotes.pdf ${D}/usr/share/doc/${P}
+	cp -pPR ${WORKDIR}/manuals ${D}/usr/share/doc/${P}
 }
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog
index 39a9614cf1e9..add4be8226ec 100644
--- a/dev-db/firebird/ChangeLog
+++ b/dev-db/firebird/ChangeLog
@@ -1,6 +1,136 @@
-# ChangeLog for dev-lang/sather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.1 2002/03/20 19:19:43 gbevin Exp $
+# ChangeLog for dev-db/firebird
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.1.1.1 2005/11/30 10:11:26 chriswhite Exp $
+
+  25 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> firebird-1.5.1.ebuild:
+  Stable on sparc
+
+  24 Aug 2005; <sekretarz@gentoo.org> firebird-1.5.1.ebuild,
+  firebird-1.5.2.ebuild:
+  Changed chown root:root to root:0 to be compliant with BSD and Darwin, bug
+  #103563
+
+  31 Jul 2005; <sekretarz@gentoo.org> firebird-1.5.1.ebuild,
+  firebird-1.5.2.ebuild:
+  Firebird provide now symlink libfbclient.so to libgds.so in
+  /opt/firebird/lib directory for back compablity, bug #96636. Fixed harmless
+  sed errors, bug #99079
+
+  14 Jun 2005; <sekretarz@gentoo.org> files/70firebird,
+  firebird-1.5.1.ebuild, firebird-1.5.2.ebuild:
+  Fixed path in ebuild to install /etc/env.d/70firebird correctly, bug #95731
+
+  01 Mar 2005; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild,
+  firebird-1.5.2.ebuild:
+  corrected description, ansi sql 92 -> 99
+
+*firebird-1.5.2 (06 Jan 2005)
+
+  06 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  +firebird-1.5.2.ebuild:
+  Version bump
+
+  08 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  firebird-1.5.1.ebuild:
+  Fixed obsolete chown syntax, bug #69597
+
+  17 Oct 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+  firebird-1.5.1.ebuild:
+  Keyworded ~amd64
+
+  14 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  files/firebird-1.5.1-gcc34.patch:
+  Fixing patch for gcc-3.4, now it works with gcc-3.3 :)
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/firebird-1.0-gentoo.patch, -files/firebird-1.0.3-gentoo.patch,
+  -firebird-1.0-r1.ebuild, -firebird-1.0.3.ebuild, -firebird-1.5.0.ebuild:
+  ebuild clean up
+
+  13 Sep 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/firebird-1.5.1-gcc34.patch, firebird-1.5.1.ebuild:
+  Fixed gcc-34 compilation issues. Bug #59154, thanks to Canal Vorfeed
+  <canalvorfeed@mail.ru>
+
+  08 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> firebird-1.5.1.ebuild:
+  Keyworded ~sparc wrt #63184
+
+  01 Aug 2004; Carsten Lohrke <carlo@gentoo.org> firebird-1.5.1.ebuild:
+  small xinetd fix
+
+*firebird-1.5.1 (01 Aug 2004)
+
+  01 Aug 2004; Carsten Lohrke <carlo@gentoo.org> +firebird-1.5.1.ebuild:
+  version bump
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> firebird-1.0-r1.ebuild,
+  firebird-1.0.3.ebuild, firebird-1.5.0.ebuild:
+  sync IUSE (missing), glibc -> libc
+
+  14 May 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
+  Marked 1.5.0 as stable on x86
+
+  26 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
+  Modified the license to Interbase-1.0
+
+  25 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
+  move and symlink firebird.log to /var/log
+  
+  change the check the for localhost in /etc/hosts.equiv to make sure it
+  won't catch localhost.localdomain as well
+
+  unmask for x86
+
+  04 Apr 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
+  Modified classic local USE flag, changed to inetd
+  Added a warning to disable older xinetd server (if SuperServer is used)
+
+  31 Mar 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild, files/firebird.conf.d,
+  files/firebird.init.d:
+  Default build method changed to SuperServer Added local USE flag - classic, to
+  build the inetd version Modified config() to add localhost to /etc/hosts.equiv
+  instead of localhost.localdomain
+
+*firebird-1.5.0 (26 Feb 2004)
+
+  26 Feb 2004; <mksoft@gentoo.org> firebird-1.5.0.ebuild:
+  New upstream version
+  
+  26 Feb 2004; <mksoft@gentoo.org> firebird-1.0.3,firebird-1.0-r1:
+  Fixed Copyright years
+
+*firebird-1.0.3 (15 Jun 2003)
+  08 Dec 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  Added strip-flags -funroll-loops. Closes bug #33584
+
+  29 Oct 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  Modified firebird-1.0.3-gentoo.patch; Closes bug #28685
+  
+  30 Aug 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  Added RESTRICT="nouserpriv", bug #24455
+  Added metadata.xml
+  Marked ebuild as stable
+  
+  22 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  added a check for isc4.gdb for prev 1.0-r1 install. If exists and not
+  a symlink copy to /etc/firebird/isc4.gdb
+  
+  15 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  Added firebird to /etc/xinetd.d, 70firebird to /etc/env.d
+  Kill lingering gds_lock_mgr processes. Closes #15071
+
+  11 Jun 2003; Meir Kriheli <mksoft@gentoo.org> firebird-1.0.3.ebuild:
+  New upstream version, 1.0.3. Closes #16237
+  
+*firebird-1.0-r1 (22 Mar 2002)
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> firebird-1.0-r1.ebuild:
+  Changed description. Closes #19376.
+
+  22 Mar 2002; G.Bevin <gbevin@gentoo.org> firebird-1.0-r1.ebuild
+  files/firebird-1.0-r1 files/firebird-1.0-gentoo.patch:
+  
+  Fixes for compilation with gcc3 and setting of make.conf CFLAGS.
 
 *firebird-1.0 (20 Mar 2002)
 
diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index e69de29bb2d1..8e91dca21c3d 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70eaf71c2018b87fe06aed9df3799509 metadata.xml 225
+MD5 5fab08d620e109f362e07bc148f7aeae firebird-1.5.1.ebuild 6535
+MD5 ef4bb5a3c242e0fe4f581e1d63dac04d firebird-1.5.2.ebuild 6460
+MD5 c722c69fbc6f3fb2674789abbe09f201 ChangeLog 5031
+MD5 19238be258dea758cf3f082df5ae813a files/firebird.init.d 697
+MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird-1.5.0 50
+MD5 9019505bedbd32c5cec6700c075f3872 files/digest-firebird-1.5.2 73
+MD5 606e690fe61535cc02d7314616e263fb files/digest-firebird-1.5.1 73
+MD5 5bc644b4558c11069e2a946e029d70bb files/firebird-1.5.1-gcc34.patch 5906
+MD5 b0d6de21d0e14d41983d440d5675e9d5 files/firebird.xinetd 206
+MD5 5b28cc81eff2c59fbee652dc2c6ed483 files/firebird-1.5.0.xinetd 425
+MD5 d3278f869be37481ddde143f5ee98c4a files/70firebird 50
+MD5 c5f5e6bae2cae891269931331e69f1ca files/firebird.conf.d 80
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDDhsyKRy60XGEcJIRAvDoAJkBful9YKwwcDq5VT5ZBL4Ko7mNGQCgrlON
+IfdlkYrokejEOLFDu6K0Vb0=
+=OCm8
+-----END PGP SIGNATURE-----
diff --git a/dev-db/firebird/files/70firebird b/dev-db/firebird/files/70firebird
index 1f6d91cece6f..eebf96b9f0b1 100644
--- a/dev-db/firebird/files/70firebird
+++ b/dev-db/firebird/files/70firebird
@@ -1,3 +1,2 @@
-INTERBASE=/opt/interbase
-PATH=/opt/interbase/bin
-ROOTPATH=/opt/interbase/bin
+PATH=/opt/firebird/bin
+ROOTPATH=/opt/firebird/bin
diff --git a/dev-db/firebird/files/firebird-1.5.1-gcc34.patch b/dev-db/firebird/files/firebird-1.5.1-gcc34.patch
index f5ddb4bac4bd..e5df4841b3d2 100644
--- a/dev-db/firebird/files/firebird-1.5.1-gcc34.patch
+++ b/dev-db/firebird/files/firebird-1.5.1-gcc34.patch
@@ -1,27 +1,30 @@
 diff -uNr firebird-1.5.1.4481-orig/src/common/classes/alloc.h firebird-1.5.1.4481/src/common/classes/alloc.h
 --- firebird-1.5.1.4481-orig/src/common/classes/alloc.h	2003-10-30 22:25:52.000000000 +0000
-+++ firebird-1.5.1.4481/src/common/classes/alloc.h	2004-09-12 11:26:47.351584232 +0000
-@@ -237,12 +237,14 @@
++++ firebird-1.5.1.4481/src/common/classes/alloc.h	2004-09-14 04:12:37.967099632 +0000
+@@ -237,12 +237,17 @@
  // loaded by host application using STL
  
  // This is to prevent inclusion of <new> header
 -#ifdef __NEW__
-+#ifdef _NEW
++#if defined( _NEW ) || defined ( __NEW__ )
  #error "alloc.h must be included before <new>"
  #endif
--#define __NEW__
 +#define _NEW
+ #define __NEW__
  namespace std {
  	class bad_alloc : public exception {};
++#if ( __GNUC__ > 3) || ((__GNUC__==3) && __GNUC_MINOR__ >=4)
 +	struct nothrow_t { };
 +	extern const nothrow_t nothrow;    
++#endif
  }
  // Define operators as static inline to prevent replacement of STL versions
  static inline void* operator new(size_t s) {
-@@ -258,6 +260,19 @@
+@@ -258,6 +263,21 @@
  	);
  }
  
++#if ( __GNUC__ > 3) || ((__GNUC__==3) && __GNUC_MINOR__ >=4)
 +static inline void* operator new(size_t s, const std::nothrow_t&) {
 +#if defined(DEV_BUILD)
 +// Do not complain here. It causes client tools to crash on Red Hat 8.0
@@ -34,13 +37,14 @@ diff -uNr firebird-1.5.1.4481-orig/src/common/classes/alloc.h firebird-1.5.1.448
 +#endif
 +	);
 +}
++#endif
 +
  static inline void* operator new[](size_t s) {
  #if defined(DEV_BUILD)
  // Do not complain here. It causes client tools to crash on Red Hat 8.0
 diff -uNr firebird-1.5.1.4481-orig/src/common/classes/array.h firebird-1.5.1.4481/src/common/classes/array.h
 --- firebird-1.5.1.4481-orig/src/common/classes/array.h	2004-03-29 07:40:23.000000000 +0000
-+++ firebird-1.5.1.4481/src/common/classes/array.h	2004-09-12 11:31:34.555922536 +0000
++++ firebird-1.5.1.4481/src/common/classes/array.h	2004-09-14 04:10:26.267121072 +0000
 @@ -60,15 +60,15 @@
  class Array : private Storage {
  public:
@@ -93,7 +97,7 @@ diff -uNr firebird-1.5.1.4481-orig/src/common/classes/array.h firebird-1.5.1.448
  	    int pos;
 diff -uNr firebird-1.5.1.4481-orig/src/common/classes/tree.h firebird-1.5.1.4481/src/common/classes/tree.h
 --- firebird-1.5.1.4481-orig/src/common/classes/tree.h	2003-10-30 22:25:52.000000000 +0000
-+++ firebird-1.5.1.4481/src/common/classes/tree.h	2004-09-12 11:22:54.754944296 +0000
++++ firebird-1.5.1.4481/src/common/classes/tree.h	2004-09-14 04:10:26.268120920 +0000
 @@ -215,7 +215,7 @@
  	}
      Value& current() const { return (*curr)[curPos]; }
@@ -114,7 +118,7 @@ diff -uNr firebird-1.5.1.4481-orig/src/common/classes/tree.h firebird-1.5.1.4481
  			if (level) {
 diff -uNr firebird-1.5.1.4481-orig/src/common/classes/vector.h firebird-1.5.1.4481/src/common/classes/vector.h
 --- firebird-1.5.1.4481-orig/src/common/classes/vector.h	2002-12-14 21:43:18.000000000 +0000
-+++ firebird-1.5.1.4481/src/common/classes/vector.h	2004-09-12 11:23:25.422282152 +0000
++++ firebird-1.5.1.4481/src/common/classes/vector.h	2004-09-14 04:10:26.268120920 +0000
 @@ -100,17 +100,17 @@
  public:
  	SortedVector() : Vector<Value, Capacity>() {}
diff --git a/dev-db/firebird/files/firebird.init.d b/dev-db/firebird/files/firebird.init.d
index 46cea5f0a75b..14991ed5f5d5 100644
--- a/dev-db/firebird/files/firebird.init.d
+++ b/dev-db/firebird/files/firebird.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/dev-db/firebird/files/firebird.init.d,v 1.1 2004/03/31 00:35:47 mksoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d,v 1.1.1.1 2005/11/30 10:11:26 chriswhite Exp $
 
  
 #  NOTE: make sure you have localhost in your hosts.equiv file see next 2 
diff --git a/dev-db/firebird/firebird-1.5.1.ebuild b/dev-db/firebird/firebird-1.5.1.ebuild
index 551d602309f1..894c4a4c1c55 100644
--- a/dev-db/firebird/firebird-1.5.1.ebuild
+++ b/dev-db/firebird/firebird-1.5.1.ebuild
@@ -1,17 +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/dev-db/firebird/firebird-1.5.1.ebuild,v 1.1 2004/08/01 21:00:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.1.ebuild,v 1.1.1.1 2005/11/30 10:11:26 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
 extra_ver="4481"
-DESCRIPTION="A relational database offering many ANSI SQL-92 features"
+DESCRIPTION="A relational database offering many ANSI SQL-99 features"
 HOMEPAGE="http://firebird.sourceforge.net/"
 SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
 
 LICENSE="Interbase-1.0"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ia64 sparc x86"
 IUSE="inetd"
 RESTRICT="nouserpriv"
 
@@ -20,6 +20,13 @@ DEPEND="virtual/libc
 
 S=${WORKDIR}/${P}.${extra_ver}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 pkg_setup() {
 	enewgroup firebird 450
 	enewuser firebird 450 /bin/bash /opt/firebird firebird
@@ -38,7 +45,7 @@ src_compile() {
 
 	NOCONFIGURE=1
 	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
-	find . -exec sed -i -e "s/-lcurses/-lncurses/g" {} \;
+	find . -type f -exec sed -i -e "s/-lcurses/-lncurses/g" {} \;
 	econf ${myconf} || die "./configure failed"
 	emake -j 1 || die "error during make"
 }
@@ -59,13 +66,13 @@ src_install() {
 	rm -r ${D}/opt/firebird/examples
 
 	if use inetd ; then
-		insinto /etc/xinetd.d ; newins ${FILESDIR}/${P}.xinetd firebird
+		insinto /etc/xinetd.d ; newins ${FILESDIR}/${PN}-1.5.0.xinetd firebird
 	else
 		exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}.init.d firebird
 		insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird
 		fperms 640 /etc/conf.d/firebird
 	fi
-	insinto /etc/env.d ; newins ${FILESDIR}/70${P} 70firebird
+	insinto /etc/env.d ; newins ${FILESDIR}/70${PN} 70firebird
 
 	# Following is adapted from postinstall.sh
 
@@ -94,6 +101,8 @@ src_install() {
 	# create links for back compatibility
 	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
 	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
+	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so
+	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so.0
 
 	# move and link config files to /etc/firebird so they'll be protected
 	dodir /etc/firebird
@@ -192,7 +201,7 @@ pkg_config() {
 	if [ ! -f /etc/hosts.equiv ]
 	then
 		touch /etc/hosts.equiv
-		chown root.root /etc/hosts.equiv
+		chown root:0 /etc/hosts.equiv
 		chmod u=rw,go=r /etc/hosts.equiv
 	fi
 
diff --git a/dev-db/firebird/firebird-1.5.2.ebuild b/dev-db/firebird/firebird-1.5.2.ebuild
index 091a7dd57cc0..4cbc0990f249 100644
--- a/dev-db/firebird/firebird-1.5.2.ebuild
+++ b/dev-db/firebird/firebird-1.5.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.2.ebuild,v 1.1 2005/01/06 18:21:54 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-1.5.2.ebuild,v 1.1.1.1 2005/11/30 10:11:26 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
 extra_ver="4731"
-DESCRIPTION="A relational database offering many ANSI SQL-92 features"
+DESCRIPTION="A relational database offering many ANSI SQL-99 features"
 HOMEPAGE="http://firebird.sourceforge.net/"
 SRC_URI="mirror://sourceforge/firebird/${P}.${extra_ver}.tar.bz2"
 
@@ -38,7 +38,7 @@ src_compile() {
 
 	NOCONFIGURE=1
 	./autogen.sh ${myconf} || die "couldn't run autogen.sh"
-	find . -exec sed -i -e "s/-lcurses/-lncurses/g" {} \;
+	find . -type f -exec sed -i -e "s/-lcurses/-lncurses/g" {} \;
 	econf ${myconf} || die "./configure failed"
 	emake -j 1 || die "error during make"
 }
@@ -65,7 +65,7 @@ src_install() {
 		insinto /etc/conf.d ; newins ${FILESDIR}/firebird.conf.d firebird
 		fperms 640 /etc/conf.d/firebird
 	fi
-	insinto /etc/env.d ; newins ${FILESDIR}/70${P} 70firebird
+	insinto /etc/env.d ; newins ${FILESDIR}/70${PN} 70firebird
 
 	# Following is adapted from postinstall.sh
 
@@ -94,6 +94,8 @@ src_install() {
 	# create links for back compatibility
 	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so
 	dosym /opt/firebird/lib/libfbclient.so /usr/lib/libgds.so.0
+	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so
+	dosym /opt/firebird/lib/libfbclient.so /opt/firebird/lib/libgds.so.0
 
 	# move and link config files to /etc/firebird so they'll be protected
 	dodir /etc/firebird
@@ -192,7 +194,7 @@ pkg_config() {
 	if [ ! -f /etc/hosts.equiv ]
 	then
 		touch /etc/hosts.equiv
-		chown root:root /etc/hosts.equiv
+		chown root:0 /etc/hosts.equiv
 		chmod u=rw,go=r /etc/hosts.equiv
 	fi
 
diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index e0e7b760712f..5e216ef5bfc4 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -3,10 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-    <email>mksoft@gentoo.org</email>
-    <name>Meir Kriheli</name>
+  <email>sekretarz@gentoo.org</email>
 </maintainer>
-<longdescription>
-Firebird is a relational database offering many ANSI SQL-92 features that runs on Linux, Windows, and a variety of Unix platforms. Firebird offers excellent concurrency, high performance, and powerful language support for stored procedures and triggers. It has been used in production systems, under a variety of names since 1981. 
-</longdescription>
 </pkgmetadata>
diff --git a/dev-db/framerd/ChangeLog b/dev-db/framerd/ChangeLog
index 6f8ec52cc006..97e9820eb81d 100644
--- a/dev-db/framerd/ChangeLog
+++ b/dev-db/framerd/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for dev-lang/sather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/ChangeLog,v 1.1 2002/12/05 11:50:10 lordvan Exp $
+# ChangeLog for dev-db/framerd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/ChangeLog,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> framerd-2.4.3-r1.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> framerd-2.4.3-r1.ebuild:
+  glibc -> libc
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> framerd-2.4.3-r1.ebuild:
+  Fix use invocation
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> framerd-2.4.3-r1.ebuild:
+  Add die following econf for bug 48950
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  framerd-2.4.3-r1.ebuild:
+  don't set DEPEND="${RDEPEND}"; tidy
+
+  24 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> framerd-2.4.3.ebuild:
+  remove older version
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  framerd-2.4.3-r1.ebuild, framerd-2.4.3.ebuild:
+  Don't assign default to S; header fix
+
+*framerd-2.4.3-r1 (05 Dec 2002)
+  05 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org> framerd-2.4.3-r1.ebuild
+  Removed emacs dep
 
 *framerd-2.4.3 (05 Dec 2002)
 
diff --git a/dev-db/framerd/Manifest b/dev-db/framerd/Manifest
index e69de29bb2d1..fdeb5c20cda4 100644
--- a/dev-db/framerd/Manifest
+++ b/dev-db/framerd/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 156c02f3993a975505add33ac96f1f5c ChangeLog 1256
+MD5 9be9a07c60b8feedc0deb14f6a10d67c framerd-2.4.3-r1.ebuild 1165
+MD5 7cad1d06a6bf5d4c6b5c5747087869af files/setup.fdx.patch 284
+MD5 8832d735ce7ad2d16791a623ed0ef91f files/digest-framerd-2.4.3-r1 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB4R9EI1lqEGTUzyQRApTaAJ9m2vzp0jkt0Z7qULQCV31+ZWaEOQCeMf5c
+uiOI9aFMy9zX48lPbqhH0Jo=
+=Yawc
+-----END PGP SIGNATURE-----
diff --git a/dev-db/framerd/framerd-2.4.3-r1.ebuild b/dev-db/framerd/framerd-2.4.3-r1.ebuild
index 9c0a053aac2e..3dc09a0b4737 100644
--- a/dev-db/framerd/framerd-2.4.3-r1.ebuild
+++ b/dev-db/framerd/framerd-2.4.3-r1.ebuild
@@ -1,33 +1,34 @@
-# 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/dev-db/framerd/framerd-2.4.3-r1.ebuild,v 1.1 2002/12/05 19:53:01 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/framerd/framerd-2.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 DESCRIPTION="FramerD is a portable distributed object-oriented database designed to support the maintenance and sharing of knowledge bases."
 HOMEPAGE="http://www.framerd.org/"
 SRC_URI="mirror://sourceforge/framerd/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="readline"
-RDEPEND="readline? >=sys-libs/readline-4.1-r4"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${P}"
+
+DEPEND="virtual/libc
+	readline? ( >=sys-libs/readline-4.1-r4 )"
 
 src_compile() {
-    patch -p0 ${S}/etc/setup.fdx ${FILESDIR}/setup.fdx.patch
-    MY_OPTS="--enable-shared"
-    if [ ! "`use readline`" ]; then 
-	MY_OPTS="${MY_OPTS} --without-readline"
-    fi
-    econf ${MY_OPTS}
+	patch -p0 ${S}/etc/setup.fdx ${FILESDIR}/setup.fdx.patch
+	MY_OPTS="--enable-shared"
+	if ! use readline; then
+		MY_OPTS="${MY_OPTS} --without-readline"
+	fi
+	econf ${MY_OPTS} || die "econf failed"
 
-    emake || die "make failed"
-    #emake test || die "make test failed" # failed!!
+	emake || die "make failed"
+	#emake test || die "make test failed" # failed!!
 }
 
-src_install() {   
-    make DESTDIR=${D} install || die
-    mv ${D}/usr/share/framerd/framerd.cfg ${D}/usr/share/framerd/framerd.cfg_orig
-    perl -pe "s|${D}||" ${D}/usr/share/framerd/framerd.cfg_orig > ${D}/usr/share/framerd/framerd.cfg
-    rm ${D}/usr/share/framerd/framerd.cfg_orig
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	mv ${D}/usr/share/framerd/framerd.cfg ${D}/usr/share/framerd/framerd.cfg_orig
+	perl -pe "s|${D}||" ${D}/usr/share/framerd/framerd.cfg_orig > ${D}/usr/share/framerd/framerd.cfg
+	rm ${D}/usr/share/framerd/framerd.cfg_orig
 }
diff --git a/dev-db/freecdb/ChangeLog b/dev-db/freecdb/ChangeLog
index 7767d3141327..2796adb157bb 100644
--- a/dev-db/freecdb/ChangeLog
+++ b/dev-db/freecdb/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for dev-db/freecdb
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freecdb/ChangeLog,v 1.1 2003/05/05 08:28:53 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freecdb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
+
+  13 May 2005; Michael Sterrett <mr_bones_@gentoo.org> freecdb-0.62.ebuild:
+  remove bogus PROVIDE; tidy
+
+  02 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> freecdb-0.62.ebuild:
+  Stable ppc-macos
+
+  02 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> freecdb-0.62.ebuild:
+  Added to ~ppc-macos
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> freecdb-0.62.ebuild:
+  sync IUSE (missing)
+
+  10 May 2004; Mamoru KOMACHI <usata@gentoo.org> freecdb-0.62.ebuild:
+  Stable on ppc
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> freecdb-0.62.ebuild:
+  src_uri now uses mirror://debian
+
+  15 Nov 2003; MATSUU Takuto <matsuu@gentoo.org> freecdb-0.62.ebuild:
+  Add amd64 to KEYWORDS.
+
+  29 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> freecdb-0.62.ebuild:
+  Changed ~alpha and ~sparc keywords to stable
+
+  24 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> freecdb-0.62.ebuild:
+  Considered stable for x86
 
 *freecdb-0.62 (05 May 2003)
 
diff --git a/dev-db/freecdb/Manifest b/dev-db/freecdb/Manifest
index 18f2a3acd800..a833e48fabe8 100644
--- a/dev-db/freecdb/Manifest
+++ b/dev-db/freecdb/Manifest
@@ -1,2 +1,3 @@
-MD5 7a5b1c9c57a4fdd8be67b701965e43bc freecdb-0.62.ebuild 749
+MD5 c61ce2eacdbbd75665de5bb044404d5a freecdb-0.62.ebuild 779
+MD5 0258aeaa8802073ef0494c7c36a00784 ChangeLog 1287
 MD5 14c9849b21032e6997b9128685b303de files/digest-freecdb-0.62 63
diff --git a/dev-db/freecdb/freecdb-0.62.ebuild b/dev-db/freecdb/freecdb-0.62.ebuild
index e11a2463008f..1fa22cf482bc 100644
--- a/dev-db/freecdb/freecdb-0.62.ebuild
+++ b/dev-db/freecdb/freecdb-0.62.ebuild
@@ -1,28 +1,26 @@
-# 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/dev-db/freecdb/freecdb-0.62.ebuild,v 1.1 2003/05/05 08:28:53 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freecdb/freecdb-0.62.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 DESCRIPTION="A fast, reliable, simple package for creating and reading constant databases"
-SRC_URI="http://ftp.debian.org/debian/pool/main/f/freecdb//${P/-/_}.tar.gz"
+SRC_URI="mirror://debian/pool/main/f/freecdb//${P/-/_}.tar.gz"
 HOMEPAGE="http://packages.qa.debian.org/f/freecdb.html"
 
-SLOT="0"
-PROVIDE="virtual/cdb"
 LICENSE="public-domain"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha amd64 ppc-macos"
+IUSE=""
 
 DEPEND="sys-devel/make
 	dev-lang/perl"
 RDEPEND=""
 
-src_compile() {                           
-	emake DESTDIR=${D} || die "make failed"
+src_compile() {
+	emake DESTDIR="${D}" || die "emake failed"
 }
 
-src_install() {                               
-	mkdir -p ${D}/usr/{lib,bin,include}
-	mkdir -p ${D}/usr/share/man/man{1,3}
-	emake DESTDIR=${D} install
-
+src_install() {
+	dodir /usr/{lib,bin,include} /usr/share/man/man{1,3}
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc README
 }
diff --git a/dev-db/freetds/ChangeLog b/dev-db/freetds/ChangeLog
index 2633d1c7efe4..23624b9107f1 100644
--- a/dev-db/freetds/ChangeLog
+++ b/dev-db/freetds/ChangeLog
@@ -1,12 +1,119 @@
 # ChangeLog for dev-db/freetds
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/ChangeLog,v 1.1 2002/07/16 04:36:49 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/ChangeLog,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+*freetds-0.63 (04 Sep 2005)
+
+  04 Sep 2005; Stuart Herbert <stuart@gentoo.org> +freetds-0.63.ebuild:
+  Version bump, fix deps
+
+  20 Feb 2005; Hardave Riar <hardave@gentoo.org> freetds-0.62.3.ebuild:
+  Stable on mips
+
+*freetds-0.62.4 (18 Feb 2005)
+
+  18 Feb 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +freetds-0.62.4.ebuild:
+  Version bump.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> freetds-0.62.3.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  11 Oct 2004; Guy Martin <gmsoft@gentoo.org> freetds-0.62.3.ebuild:
+  Marked stable on hppa.
+
+  27 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> freetds-0.62.3.ebuild:
+  Stable on sparc
+
+  19 Aug 2004; Tom Gall <tgall@gentoo.org> freetds-0.62.3.ebuild:
+  stable on ppc64
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> freetds-0.62.3.ebuild:
+  Stable on alpha.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> freetds-0.61-r1.ebuild,
+  freetds-0.62.1.ebuild, freetds-0.62.3.ebuild:
+  glibc -> libc
+
+  27 May 2004; Stuart Herbert <stuart@gentoo.org> freetds-0.62.3.ebuild:
+  Marked stable on x86
+
+  26 May 2004; Stuart Herbert <stuart@gentoo.org> freetds-0.62.3.ebuild:
+  Added global USE flag mssql, for php
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> freetds-0.62.3.ebuild:
+  Added s390 keywords
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> freetds-0.61-r1.ebuild,
+  freetds-0.62.1.ebuild, freetds-0.62.3.ebuild:
+  Add die following econf for bug 48950
+
+*freetds-0.62.3 (24 Apr 2004)
+
+  24 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> freetds-0.62.3.ebuild:
+  version bump, bug 47435.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> freetds-0.61-r1.ebuild,
+  freetds-0.62.1.ebuild:
+  Don't assign default to S; header fix
+
+*freetds-0.62.1 (10 Feb 2004)
+
+  10 Feb 2004; Robin H. Johnson <robbat2@gentoo.org> freetds-0.62.1.ebuild:
+  bug #34271, bug #40243. add odbc IUSE and bump version.
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> freetds-0.61-r1.ebuild:
+  stable on alpha and ia64
+
+  08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> freetds-0.61-r1.ebuild:
+  bump to ppc stable
+
+  09 Nov 2003; Jason Wever <weeve@gentoo.org> freetds-0.61-r1.ebuild:
+  Marked stable on sparc.
+
+*freetds-0.61-r1 (22 Sep 2003)
+
+  22 Sep 2003; Seemant Kulleen <seemant@gentoo.org> freetds-0.53-r1.ebuild,
+  freetds-0.61-r1.ebuild, freetds-0.61.ebuild:
+  config files in the previous ebuild were being merged into /var/tmp/portage.
+  chris strom <cstrom@speakeasy.net> fixed this in bug #28451
+
+*freetds-0.61 (25 Apr 2003)
+
+  24 Jul 2003; Guy Martin <gmsoft@gentoo.org> freetds-0.61.ebuild :
+  Added hppa to KEYWORDS.
+
+  11 May 2003; Robin Johnson <robbat2@gentoo.org> freetds-0.61.ebuild:
+  Moved to x86
+
+  25 Apr 2003; Robin Johnson <robbat2@gentoo.org> freetds-0.61.ebuild:
+  version bump. fixed SOURCE_URI.
+
+*freetds-0.53-r1 (30 Aug 2002)
+
+  20 Sept 2002; Mike Frysinger <vapier@gentoo.org> :
+  Fixed HOMEPAGE variable
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> freetds-0.53-r1.ebuild
+  files/digest-freetds-0.53-r1 :
+
+  FHS compliance, thanks to: vapier@netzero.com (SpanKY) in bug #5359.
 
 *freetds-0.53 (15 Jul 2002)
 
+  20 Sept 2002; Mike Frysinger <vapier@gentoo.org> :
+  Fixed HOMEPAGE variable
+
+  22 Jul 2002; Ryan Phillips <rphillips@gentoo.org> freetds-0.53.ebuild :
+
+  Passes repoman
+
   15 Jul 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
-  Submitted by Jerry Haltom
+  Submitted by Jerry Haltom root@station-1.internal.feedbackplusinc.com
   
   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
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 2464d043e46c..081099406dca 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,8 +1,22 @@
-MD5 0c2fe25407a707d312675f933e1687ab freetds-0.53.ebuild 717
-MD5 6cec86d8a4e57e3dd296e960634c7350 freetds-0.61.ebuild~ 725
-MD5 6cec86d8a4e57e3dd296e960634c7350 freetds-0.61.ebuild 725
-MD5 14ad80fd512469dce28c2e486236e8d0 freetds-0.53-r1.ebuild 808
-MD5 7596444f7f7e41b1b2480c44873e9d86 ChangeLog 1223
-MD5 f8c6fc0b9d2b6da5df83a91b7941c2ae files/digest-freetds-0.53 61
-MD5 4d7f9bc13bc7adba2de9083a7090ba50 files/digest-freetds-0.61 61
-MD5 f8c6fc0b9d2b6da5df83a91b7941c2ae files/digest-freetds-0.53-r1 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb8a8ea24c699b5a3b23d0f527c021e2 ChangeLog 4112
+MD5 4d7f9bc13bc7adba2de9083a7090ba50 files/digest-freetds-0.61-r1 61
+MD5 ec951e4b36deea921446e7af76b38aaa files/digest-freetds-0.62.1 67
+MD5 278063aa59256a04662b39fa771f7325 files/digest-freetds-0.62.3 67
+MD5 f0ddaa5aefd28204ae348649abf43e03 files/digest-freetds-0.62.4 67
+MD5 cfe048bf583e50996579b02a2ad0e406 files/digest-freetds-0.63 65
+MD5 be75ebdf36add4f6df033ed4e06c1c4b freetds-0.61-r1.ebuild 734
+MD5 560c49b4a0c958a7d4606269661bc18e freetds-0.62.1.ebuild 808
+MD5 1c22c66863926b5619d9b30b08ab7cb3 freetds-0.62.3.ebuild 981
+MD5 cf0f10ac2069bc929c98b6654dd188b2 freetds-0.62.4.ebuild 993
+MD5 e56c6e414abcf834d1d2669934090fe9 freetds-0.63.ebuild 930
+MD5 328087fb5b0786dd8a0f27de74cf023d metadata.xml 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHWgUI1lqEGTUzyQRAmVeAKCGYMjXTYIZqbXYnPjOZuSkhEQYsACg3YyJ
+0g02O8gdjkb2PAWxkfL3rlk=
+=rLna
+-----END PGP SIGNATURE-----
diff --git a/dev-db/freetds/freetds-0.61-r1.ebuild b/dev-db/freetds/freetds-0.61-r1.ebuild
index faf76737d13f..85ca85082dbe 100644
--- a/dev-db/freetds/freetds-0.61-r1.ebuild
+++ b/dev-db/freetds/freetds-0.61-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/dev-db/freetds/freetds-0.61-r1.ebuild,v 1.1 2003/09/22 12:18:14 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.61-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 DESCRIPTION="Tabular Datastream Library"
 SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tgz"
@@ -8,13 +8,13 @@ HOMEPAGE="http://www.freetds.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc ~mips ~arm hppa ~alpha amd64"
+KEYWORDS="x86 sparc ppc ~mips hppa alpha amd64 ia64"
 
-DEPEND="virtual/glibc"
-S=${WORKDIR}/${P}
+DEPEND="virtual/libc"
+IUSE=""
 
 src_compile() {
-	econf --with-tdsver=7.0
+	econf --with-tdsver=7.0 || die "econf failed"
 	emake || die
 }
 
diff --git a/dev-db/freetds/freetds-0.62.1.ebuild b/dev-db/freetds/freetds-0.62.1.ebuild
index 5dda06528bc4..4a4a58d7ba73 100644
--- a/dev-db/freetds/freetds-0.62.1.ebuild
+++ b/dev-db/freetds/freetds-0.62.1.ebuild
@@ -1,19 +1,20 @@
-# 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/dev-db/freetds/freetds-0.62.1.ebuild,v 1.1 2004/02/10 19:21:49 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.62.1.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
 DESCRIPTION="Tabular Datastream Library"
 SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
 HOMEPAGE="http://www.freetds.org/"
 IUSE="odbc"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~mips ~arm ~hppa ~alpha amd64 ia64"
-DEPEND="virtual/glibc"
+KEYWORDS="~x86 ~sparc ~ppc ~mips ~hppa ~alpha amd64 ia64"
+DEPEND="virtual/libc"
 
 src_compile() {
 	local myconf
 	use odbc && myconf="--with-unixodbc=/usr"
-	econf --with-tdsver=7.0 ${myconf}
+	econf --with-tdsver=7.0 ${myconf} || die "econf failed"
 	emake || die
 }
 
diff --git a/dev-db/freetds/freetds-0.62.3.ebuild b/dev-db/freetds/freetds-0.62.3.ebuild
index bbc2c0085f46..d97051263db5 100644
--- a/dev-db/freetds/freetds-0.62.3.ebuild
+++ b/dev-db/freetds/freetds-0.62.3.ebuild
@@ -1,20 +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/dev-db/freetds/freetds-0.62.3.ebuild,v 1.1 2004/04/24 18:56:02 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.62.3.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+inherit gnuconfig
 
 DESCRIPTION="Tabular Datastream Library"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
 HOMEPAGE="http://www.freetds.org/"
-IUSE="odbc"
-SLOT="0"
+SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~mips ~hppa ~alpha amd64 ia64"
-DEPEND="virtual/glibc"
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
+IUSE="odbc mssql"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
 
 src_compile() {
 	local myconf
 	use odbc && myconf="--with-unixodbc=/usr"
-	econf --with-tdsver=7.0 ${myconf} --cache-file=${S}/config.cache
+	use mssql && myconf="${myconf} --enable-msdblib"
+	econf --with-tdsver=7.0 ${myconf} --cache-file=${S}/config.cache || die "econf failed"
 	emake || die
 }
 
diff --git a/dev-db/freetds/freetds-0.62.4.ebuild b/dev-db/freetds/freetds-0.62.4.ebuild
index 8837cc4a6d7a..4e0bf2e26217 100644
--- a/dev-db/freetds/freetds-0.62.4.ebuild
+++ b/dev-db/freetds/freetds-0.62.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/dev-db/freetds/freetds-0.62.4.ebuild,v 1.1 2005/02/18 11:48:25 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.62.4.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit gnuconfig
 
diff --git a/dev-db/freetds/freetds-0.63.ebuild b/dev-db/freetds/freetds-0.63.ebuild
index 8ed417a9627e..cccbda3b51c4 100644
--- a/dev-db/freetds/freetds-0.63.ebuild
+++ b/dev-db/freetds/freetds-0.63.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/dev-db/freetds/freetds-0.63.ebuild,v 1.1 2005/09/04 10:13:10 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.63.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
 IUSE="odbc mssql"
 
 DEPEND="virtual/libc
-		odbc? (dev-db/unixODBC)"
+		odbc? ( dev-db/unixODBC )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-db/gigabase/ChangeLog b/dev-db/gigabase/ChangeLog
index daa595fa2381..d6dcd217a613 100644
--- a/dev-db/gigabase/ChangeLog
+++ b/dev-db/gigabase/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for dev-db/gigabase
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/ChangeLog,v 1.1 2002/12/12 00:48:02 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/ChangeLog,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
+
+*gigabase-3.41 (27 Aug 2005)
+
+  27 Aug 2005; <rphillips@gentoo.org> +gigabase-3.41.ebuild:
+  Version bump and changed SRC_URI to mirror sourceforge site. Thanks to
+  Joshua Jackson
+
+  06 Jan 2005; <rphillips@gentoo.org> gigabase-3.31.ebuild:
+  version bump
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> gigabase-2.75.ebuild,
+  gigabase-2.76.ebuild, gigabase-2.79.ebuild, gigabase-3.02.ebuild:
+  Add die following econf for bug 48950
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> gigabase-3.02.ebuild:
+  adding s390 keywords
+
+*gigabase-3.02 (29 Mar 2004)
+
+  29 Mar 2004; Ryan Phillips <rphillips@gentoo.org> gigabase-3.02.ebuild:
+  Version bump
+
+*gigabase-2.79 (18 Feb 2003)
+
+  18 Feb 2003; Nick Hadaway <raker@gentoo.org> gigabase-2.79.ebuild,
+  files/digest-gigabase-2.79 :
+  Version bump
+
+*gigabase-2.76 (14 Dec 2002)
+
+  14 Dec 2002; Ryan Phillips <rphillips@gentoo.org> gigbase-2.76.ebuild :
+  New version
 
 *gigabase-2.75 (11 Dec 2002)
 
diff --git a/dev-db/gigabase/Manifest b/dev-db/gigabase/Manifest
index e69de29bb2d1..74418d24865f 100644
--- a/dev-db/gigabase/Manifest
+++ b/dev-db/gigabase/Manifest
@@ -0,0 +1,14 @@
+MD5 07c7ab00f8c699c61c9a6f16add3512b gigabase-3.02.ebuild 977
+MD5 95c2a0adc16e9ed39fda577f98adca00 gigabase-2.75.ebuild 982
+MD5 6c0a1533f053ae1b320f4921c6f2ec35 gigabase-3.31.ebuild 974
+MD5 8b96338c3344f5f6b642a31f32580c05 gigabase-2.79.ebuild 971
+MD5 de1d8ce40a86c2872198b4db2a1caf31 gigabase-2.76.ebuild 971
+MD5 7960421eed530d524596ecd54b19d2c4 gigabase-3.41.ebuild 976
+MD5 214a5c7fd397ddda0b068757f58033f4 ChangeLog 1237
+MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
+MD5 dc833cb1d5add73f0240ee5468db86d9 files/digest-gigabase-2.75 66
+MD5 89004ef344369717d00af826ef49d8e0 files/digest-gigabase-2.76 66
+MD5 6ba48786d87a9541840a640ca727b2c9 files/digest-gigabase-2.79 66
+MD5 94b80b292f6c8efb402ee2e7fb4b0e3d files/digest-gigabase-3.02 66
+MD5 feb9614069a2695ed474a7b0134d2b05 files/digest-gigabase-3.31 66
+MD5 5d0f1914cd7f14490a7ed6144ccfc153 files/digest-gigabase-3.41 66
diff --git a/dev-db/gigabase/gigabase-2.75.ebuild b/dev-db/gigabase/gigabase-2.75.ebuild
index b5e205eb0c3f..c7cb11f8a15b 100644
--- a/dev-db/gigabase/gigabase-2.75.ebuild
+++ b/dev-db/gigabase/gigabase-2.75.ebuild
@@ -1,13 +1,13 @@
-# 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/dev-db/gigabase/gigabase-2.75.ebuild,v 1.1 2002/12/12 00:48:02 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-2.75.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
 HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
 SRC_URI="http://www.garret.ru/~knizhnik/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=""
 RDEPEND=""
@@ -16,12 +16,12 @@ S=${WORKDIR}/gigabase
 
 src_compile() {
 	mf="${S}/Makefile"
-	
-	econf
+
+	econf || die "econf failed"
 
 	sed -r -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf} > ${mf}.tmp
 	mv ${mf}.tmp ${mf}
-	
+
 	emake || die
 }
 
@@ -31,7 +31,7 @@ src_install() {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
-	
+
 	dodoc CHANGES
 	dohtml GigaBASE.htm
 	dohtml -r docs/html/*
diff --git a/dev-db/gigabase/gigabase-2.76.ebuild b/dev-db/gigabase/gigabase-2.76.ebuild
index 0a69ba3ab871..02e94840133f 100644
--- a/dev-db/gigabase/gigabase-2.76.ebuild
+++ b/dev-db/gigabase/gigabase-2.76.ebuild
@@ -1,13 +1,13 @@
-# 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/dev-db/gigabase/gigabase-2.76.ebuild,v 1.1 2002/12/14 23:23:08 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-2.76.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
 HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
 SRC_URI="http://www.garret.ru/~knizhnik/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=""
 
@@ -15,12 +15,12 @@ S=${WORKDIR}/gigabase
 
 src_compile() {
 	mf="${S}/Makefile"
-	
-	econf
+
+	econf || die "econf failed"
 
 	sed -r -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf} > ${mf}.tmp
 	mv ${mf}.tmp ${mf}
-	
+
 	emake || die
 }
 
@@ -30,7 +30,7 @@ src_install() {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
-	
+
 	dodoc CHANGES
 	dohtml GigaBASE.htm
 	dohtml -r docs/html/*
diff --git a/dev-db/gigabase/gigabase-2.79.ebuild b/dev-db/gigabase/gigabase-2.79.ebuild
index 6f30134163ac..6b7383462aa2 100644
--- a/dev-db/gigabase/gigabase-2.79.ebuild
+++ b/dev-db/gigabase/gigabase-2.79.ebuild
@@ -1,13 +1,13 @@
-# 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/dev-db/gigabase/gigabase-2.79.ebuild,v 1.1 2003/02/18 12:52:30 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-2.79.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
 HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
 SRC_URI="http://www.garret.ru/~knizhnik/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=""
 
@@ -15,12 +15,12 @@ S=${WORKDIR}/gigabase
 
 src_compile() {
 	mf="${S}/Makefile"
-	
-	econf
+
+	econf || die "econf failed"
 
 	sed -r -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf} > ${mf}.tmp
 	mv ${mf}.tmp ${mf}
-	
+
 	emake || die
 }
 
@@ -30,7 +30,7 @@ src_install() {
 		mandir=${D}/usr/share/man \
 		infodir=${D}/usr/share/info \
 		install || die
-	
+
 	dodoc CHANGES
 	dohtml GigaBASE.htm
 	dohtml -r docs/html/*
diff --git a/dev-db/gigabase/gigabase-3.02.ebuild b/dev-db/gigabase/gigabase-3.02.ebuild
index c4a99d0c56a0..a59892db042d 100644
--- a/dev-db/gigabase/gigabase-3.02.ebuild
+++ b/dev-db/gigabase/gigabase-3.02.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/dev-db/gigabase/gigabase-3.02.ebuild,v 1.1 2004/03/29 17:49:58 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.02.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
 HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
 SRC_URI="http://www.garret.ru/~knizhnik/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 s390"
 IUSE=""
 DEPEND=""
 
@@ -16,7 +16,7 @@ S=${WORKDIR}/gigabase
 src_compile() {
 	mf="${S}/Makefile"
 
-	econf
+	econf || die "econf failed"
 
 	sed -r -e 's/subsql([^\.]|$)/subsql-gdb\1/' ${mf} > ${mf}.tmp
 	mv ${mf}.tmp ${mf}
diff --git a/dev-db/gigabase/gigabase-3.31.ebuild b/dev-db/gigabase/gigabase-3.31.ebuild
index 6db8558c0385..f76595e1548d 100644
--- a/dev-db/gigabase/gigabase-3.31.ebuild
+++ b/dev-db/gigabase/gigabase-3.31.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-db/gigabase/gigabase-3.31.ebuild,v 1.1 2005/01/06 22:16:22 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.31.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
 HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
diff --git a/dev-db/gigabase/gigabase-3.41.ebuild b/dev-db/gigabase/gigabase-3.41.ebuild
index 2dc96ac24527..5803fe80102c 100644
--- a/dev-db/gigabase/gigabase-3.41.ebuild
+++ b/dev-db/gigabase/gigabase-3.41.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/dev-db/gigabase/gigabase-3.41.ebuild,v 1.1 2005/08/27 20:19:52 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gigabase/gigabase-3.41.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 DESCRIPTION="OO-DBMS with interfaces for C/C++/Java/PHP/Perl"
 HOMEPAGE="http://www.garret.ru/~knizhnik/gigabase.html"
diff --git a/dev-db/gmyclient/ChangeLog b/dev-db/gmyclient/ChangeLog
index 87d0ed8f2e40..904b5b9a4317 100644
--- a/dev-db/gmyclient/ChangeLog
+++ b/dev-db/gmyclient/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-db/gmyclient
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/gmyclient/ChangeLog,v 1.1 2002/11/05 14:19:42 nall Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gmyclient/ChangeLog,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
+
+  28 Sep 2005; Daniel Black <dragonheart@gentoo.org> gmyclient-0.3.ebuild:
+  giflib added as a dependancy - bug #107535 thanks federico
+
+  18 Sep 2005; Jason Wever <weeve@gentoo.org> gmyclient-0.3.ebuild:
+  Added ~sparc keyword.
+
+  27 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gmyclient-0.3.ebuild:
+  ppc stable, bug #100480.
+
+  05 Dec 2004; Daniel Black <dragonheart@gentoo.org> files/0.3-fix.patch,
+  gmyclient-0.3.ebuild, +metadata.xml:
+  removed comments from a header file to make xgettext happy. Bug #72249 refers.
+  Thanks to Gary <gary@garylynn.net> for the bug report.
+
+  22 Nov 2004; Daniel Black <dragonheart@gentoo.org> +files/0.3-fix.patch,
+  gmyclient-0.3.ebuild:
+  added patch to fix compile problem. bug #71942. Thanks to Gary
+  <gary@garylynn.net> for the bug report.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> gmyclient-0.3.ebuild:
+  Add die following econf for bug 48950
+
+  25 May 2003; Alastair Tse <liquidx@gentoo.org> gmyclient-0.3.ebuild:
+  fixed gnome desktop shortcut installation (#13932)
 
 *gmyclient-0.3 (03 Nov 2002)
 
diff --git a/dev-db/gmyclient/Manifest b/dev-db/gmyclient/Manifest
index 846ee468b892..686ca0dbb807 100644
--- a/dev-db/gmyclient/Manifest
+++ b/dev-db/gmyclient/Manifest
@@ -1,3 +1,15 @@
-MD5 0164a44e7d96175054ada97b2523cb6e ChangeLog 495
-MD5 7da83329e9f865e3c6bcd97a46728576 gmyclient-0.3.ebuild 733
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0f98299b840a448f916d495be105abe9 ChangeLog 1401
+MD5 dbf4dacb0386a0bdffbfbb7ee18a786e gmyclient-0.3.ebuild 887
+MD5 5697c24b43814e3061d47356c4040ee4 metadata.xml 408
+MD5 e36d3c30335045d03c2c521a4ed0d4b5 files/0.3-fix.patch 1531
 MD5 9ce548600f5d9e1ffeb2347725a40bd9 files/digest-gmyclient-0.3 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDOwEpmdTrptrqvGERAq42AKCBqlFnHw6Mmey1a2X5PnhjVP0yUACfXOWT
+zg4tcwYKvLryP34q5ZIN/VI=
+=ZzZ/
+-----END PGP SIGNATURE-----
diff --git a/dev-db/gmyclient/files/0.3-fix.patch b/dev-db/gmyclient/files/0.3-fix.patch
index c07394efa24a..3453855e3663 100644
--- a/dev-db/gmyclient/files/0.3-fix.patch
+++ b/dev-db/gmyclient/files/0.3-fix.patch
@@ -29,3 +29,15 @@
  void gm_print (void * ignore, GmConnection * connection);
  void gm_print_preview (void * ignore, GmConnection * connection);
  
+--- plugins/exporter/csv/csv.glade.h.orig	2004-12-05 10:36:46.619777608 +0930
++++ plugins/exporter/csv/csv.glade.h	2004-12-05 10:36:56.183323728 +0930
+@@ -1,9 +1,3 @@
+-/*
+- * Datei f�r �bersetzbare Zeichenketten, erzeugt durch Glade.
+- * F�gen Sie diese Datei zur POTFILES.in Ihres Projektes hinzu.
+- * Compilieren Sie sie NICHT als Teil Ihrer Anwendung.
+- */
+-
+ gchar *s = N_("Csv-Plugin : Text structured export");
+ gchar *s = N_("Customize the export format. The line terminator is the character sequence used for terminating a line in the text file. Whether the quote character is placed around cells depends on the value chosen for quoting.");
+ gchar *s = N_("Line termination :");
diff --git a/dev-db/gmyclient/gmyclient-0.3.ebuild b/dev-db/gmyclient/gmyclient-0.3.ebuild
index 38469d83d381..a9a49680fbde 100644
--- a/dev-db/gmyclient/gmyclient-0.3.ebuild
+++ b/dev-db/gmyclient/gmyclient-0.3.ebuild
@@ -1,41 +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/dev-db/gmyclient/gmyclient-0.3.ebuild,v 1.1 2002/11/05 14:19:42 nall Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/gmyclient/gmyclient-0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
-IUSE="nls"
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome based mysql client"
 SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
-HOMEPAGE="http://gmyclient.sourceforge.net"
+HOMEPAGE="http://gmyclient.sourceforge.net/"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
+KEYWORDS="ppc ~sparc x86"
+IUSE="nls"
 
-DEPEND="( >=gnome-base/gnome-libs-1.2*
-		dev-db/mysql )"
+DEPEND=">=gnome-base/gnome-libs-1.2
+		>=dev-db/mysql-3
+		=gnome-base/libglade-0*
+		media-libs/giflib"
 
-RDEPEND="( >=gnome-base/gnome-libs-1.2* )"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-fix.patch || die "patch failed"
+}
 
 src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-		myconf="--disable-nls"
-	fi
-
-	econf $myconf || die
-
+	econf $(use_enable nls) || die "econf failed"
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-	sysconfdir=${D}/etc \
-	localstatedir=${D}/var/lib \
-	install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
+	make DESTDIR=${D} install || die "installed failed"
+	dodoc AUTHORS README
+	mv ${D}/usr/share/gmyclient/doc ${D}/usr/share/doc/${PF}/html
 }
-
-
diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index 36dcae8f1719..721c5899823f 100644
--- a/dev-db/henplus/ChangeLog
+++ b/dev-db/henplus/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for dev-db/henplus
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.1 2004/02/16 18:43:55 zx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
+
+  18 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  henplus-0.9.5-r2.ebuild:
+  ppc stable, #106194
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org> henplus-0.9.5-r2.ebuild:
+  Marking stable on x86
+
+*henplus-0.9.5-r2 (23 Jul 2004)
+
+  23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/henplus.patch,
+  +henplus-0.9.5-r2.ebuild:
+  Fixed patch to find readline thanks to Ole Langbehn <neurolabs@web.de> in 40197
+
+  19 Jul 2004; David Holm <dholm@gentoo.org> henplus-0.9.5-r1.ebuild:
+  Added to ~ppc.
+
+*henplus-0.9.5-r1 (18 Jul 2004)
+
+  18 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +henplus-0.9.5-r1.ebuild:
+  install wrapper bin script
+
+*henplus-0.9.5 (16 Feb 2004)
 
   16 Feb 2004; Chris Aniszczyk <zx@gentoo.org> :
   Initial Import.
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
index 051823201941..0d08fafc92b0 100644
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -1,2 +1,5 @@
-MD5 091a102a51f43e7eec3ecd8af172c5f2 henplus-0.9.5.ebuild 940
-MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5 65
+MD5 1cf470255ef2513fa2acbb89289d3269 henplus-0.9.5-r2.ebuild 1146
+MD5 02c7d2cc88df6ea3d04ecc6c9ed88c72 ChangeLog 1028
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 37806893919cdec72d86e859fb03c0ef files/henplus.patch 1301
+MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5-r2 65
diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch
index 4c6fa7038f45..a738f873d3b3 100644
--- a/dev-db/henplus/files/henplus.patch
+++ b/dev-db/henplus/files/henplus.patch
@@ -1,6 +1,14 @@
 --- bin/henplus	2004-02-02 14:53:28.000000000 +0100
-+++ bin/henplus	2004-07-18 15:56:40.061422352 +0200
-@@ -13,20 +13,9 @@
++++ /usr/bin/henplus	2004-07-23 11:21:11.518166136 +0200
+@@ -2,6 +2,7 @@
+ # $Id: henplus.patch,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
+ ##
+ 
++echo $(dirname $0)
+ # additional flags you might want to pass to the java interpreter
+ # like -Dfile.encoding=ISO-8859-1
+ JAVA_FLAGS=
+@@ -13,20 +14,8 @@
      JAVA=$JAVA_HOME/bin/java
  fi
  
@@ -12,22 +20,23 @@
 -if [ ! -d "$HENPLUSDIR" ] ; then
 -	HENPLUSDIR=$THISDIR/../build
 -fi
-+HENPLUSDIR=$(dirname $(java-config -p henplus))
- 
+-
 -# location of the readline lib.
 -# Modify this, if you installation stores this at a different
 -# position.
 -LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
 -CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
++HENPLUSDIR=$(dirname $(java-config -p henplus))
 +CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
  
  # you may just throw your own jar files in this dir.
  # (like additional JDBC-drivers, that are not in default
-@@ -66,6 +55,4 @@
+@@ -65,7 +54,4 @@
+         CLASSPATH=$CLASSPATH:$f
      fi
  done
- 
+-
 -export CLASSPATH LD_LIBRARY_PATH
 -
 -exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
-+exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
++LD_LIBRARY_PATH="/usr/lib:$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
diff --git a/dev-db/henplus/henplus-0.9.5-r2.ebuild b/dev-db/henplus/henplus-0.9.5-r2.ebuild
index 7ad3065500c7..f8803f540144 100644
--- a/dev-db/henplus/henplus-0.9.5-r2.ebuild
+++ b/dev-db/henplus/henplus-0.9.5-r2.ebuild
@@ -1,33 +1,35 @@
-# 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/dev-db/henplus/henplus-0.9.5-r2.ebuild,v 1.1 2004/07/23 09:25:20 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.5-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 inherit java-pkg eutils
 
 DESCRIPTION="HenPlus is a SQL shell that can handle multiple sessions in parallel. The commandline interface with the usual history functions features TAB-completion for commands, tables and columns. Database connect via JDBC."
-HOMEPAGE="http://www.sourceforge.net/projects/henplus"
+HOMEPAGE="http://henplus.sf.net"
 SRC_URI="mirror://sourceforge/henplus/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="ppc ~sparc x86"
 IUSE="jikes"
 
+RDEPEND=">=virtual/jre-1.3
+	dev-java/libreadline-java"
 DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
 	>=dev-java/ant-1.4.1
-	dev-java/libreadline-java
 	jikes? ( >=dev-java/jikes-1.17 )"
 
-RDEPEND=">=virtual/jdk-1.3"
 
 src_unpack() {
-	base_src_unpack && cd ${S}
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/henplus.patch
 }
 
 src_compile() {
 	local antflags="jar"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	export CLASSPATH="$CLASSPATH:`java-config --classpath=libreadline-java`"
+	export CLASSPATH="$CLASSPATH:$(java-pkg_getjars libreadline-java)"
 
 	ant ${antflags} || die "compile problem"
 }
diff --git a/dev-db/hk_classes/ChangeLog b/dev-db/hk_classes/ChangeLog
index 0b59e4c394cc..edf8ee19ccc9 100644
--- a/dev-db/hk_classes/ChangeLog
+++ b/dev-db/hk_classes/ChangeLog
@@ -1,9 +1,172 @@
 # ChangeLog for dev-db/hk_classes
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.1 2003/04/23 13:36:11 pauldv Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/ChangeLog,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
+
+  20 Nov 2005; Mark Loeser <halcy0n@gentoo.org> hk_classes-0.7.4a.ebuild:
+  Stable on x86; bug #112832
+
+  19 Nov 2005; Jason Wever <weeve@gentoo.org> hk_classes-0.7.4a.ebuild:
+  Stable on SPARC wrt bug #112832.
+
+  15 Oct 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/hk_classes-0.7.4-amd64.patch, +files/hk_classes-amd64.patch:
+  restore accidentally deleted wrong patch
+
+*hk_classes-0.7.4a (12 Oct 2005)
+
+  12 Oct 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/hk_classes-0.7.4a-amd64.patch, -files/hk_classes-amd64.patch,
+  -hk_classes-0.7.4.ebuild, +hk_classes-0.7.4a.ebuild:
+  version bump
+
+*hk_classes-0.7.4 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/hk_classes-0.7.4-amd64.patch, +hk_classes-0.7.4.ebuild:
+  version bump
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> hk_classes-0.7.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  hk_classes-0.7.1.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> hk_classes-0.7.1.ebuild:
+  stable on amd64
+
+*hk_classes-0.7.3 (22 Mar 2005)
+
+  22 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/hk_classes-0.7.3-amd64.patch, hk_classes-0.7.2-r1.ebuild,
+  +hk_classes-0.7.3.ebuild:
+  version bump and Python 2.4 compatibility thanks to Rob Cakebread, #85721
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> hk_classes-0.7.2-r1.ebuild:
+  Added ~sparc keyword.
+
+*hk_classes-0.7.2-r1 (09 Dec 2004)
+
+  09 Dec 2004; Simone Gotti <motaboy@gentoo.org>
+  +hk_classes-0.7.2-r1.ebuild:
+  Use the patch I sent to the author to selectively choose the db plugins to
+  compile depending on the useflag status instead of compiling the plugin also
+  if the flag is disabled but the DB is installed.
+
+*hk_classes-0.7.2 (06 Dec 2004)
+
+  06 Dec 2004; Caleb Tennis <caleb@gentoo.org> +hk_classes-0.7.2.ebuild,
+  -hk_classes-0.7.2_alpha3.ebuild:
+  version bump, remove old version
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> hk_classes-0.7.1.ebuild:
+  stable on x86
+
+  21 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  +files/hk_classes-amd64.patch, hk_classes-0.7.1.ebuild,
+  hk_classes-0.7.2_alpha3.ebuild:
+  Added to ~amd64, bug #70459
+
+*hk_classes-0.7.2_alpha3 (08 Nov 2004)
+
+  08 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  +hk_classes-0.7.2_alpha3.ebuild:
+  version bump
+
+*hk_classes-0.7.1 (19 Sep 2004)
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> +hk_classes-0.7.1.ebuild:
+  Version bump
+
+  12 Aug 2004; Carsten Lohrke <carlo@gentoo.org> hk_classes-0.7.ebuild:
+  stable on x86
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> hk_classes-0.7.ebuild:
+  Depend on version 2 of sqlite.
+
+*hk_classes-0.7 (13 Jul 2004)
+
+  13 Jul 2004; Carsten Lohrke <carlo@gentoo.org>
+  -hk_classes-0.6.3_alpha3.ebuild, +hk_classes-0.7.ebuild,
+  -hk_classes-0.7_alpha1.ebuild, -hk_classes-0.7_alpha3.ebuild:
+  ebuild clean up, fixed digest, version bump
+
+*hk_classes-0.7_alpha3 (04 Jul 2004)
+
+  04 Jul 2004; Carsten Lohrke <carlo@gentoo.org>
+  +hk_classes-0.7_alpha3.ebuild:
+  version bump
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> hk_classes-0.6.2a.ebuild:
+  Fix use invocation
+
+*hk_classes-0.7_alpha1 (17 May 2004)
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> -hk_classes-0.6.1.ebuild,
+  -hk_classes-0.6.3_alpha1.ebuild, +hk_classes-0.7_alpha1.ebuild:
+  Version bump, remove old versions
+  From bug #46758
+
+  16 May 2004; Dominik Stadler <centic@gentoo.org> hk_classes-0.6.2a.ebuild:
+  Remove unnecessary definition of S
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> hk_classes-0.6.1.ebuild,
+  hk_classes-0.6.2a.ebuild, hk_classes-0.6.3_alpha1.ebuild,
+  hk_classes-0.6.3_alpha3.ebuild:
+  fixing src_uri. closes 45630
+
+  18 Mar 2004; David Holm <dholm@gentoo.org> hk_classes-0.6.3_alpha3.ebuild:
+  Added to ~ppc.
+
+*hk_classes-0.6.3_alpha3 (15 Mar 2004)
+
+  15 Mar 2004; Caleb Tennis <caleb@gentoo.org> hk_classes-0.6.3_alpha3.ebuild:
+  Version bump
+
+*hk_classes-0.6.3_alpha1 (27 Dec 2003)
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> hk_classes-0.6.3_alpha1.ebuild:
+  New alpha version
+
+*hk_classes-0.6.2a (06 Dec 2003)
+
+  06 Dec 2003; Caleb Tennis <caleb@gentoo.org> hk_classes-0.6.1_alpha3.ebuild,
+  hk_classes-0.6.2a.ebuild, hk_classes-0.6.ebuild:
+  New version - by Peter Ruskin.  Bug #35161
+
+*hk_classes-0.6.1 (20 Oct 2003)
+
+  20 Oct 2003; Caleb Tennis <caleb@gentoo.org> hk_classes-0.6.1.ebuild:
+  Final version - provided by Peter Ruskin (bug 31523)
+
+*hk_classes-0.6.1_alpha3 (02 Oct 2003)
+
+  02 Oct 2003; Caleb Tennis <caleb@gentoo.org> hk_classes-0.6.1_alpha3.ebuild:
+  New version
+
+  20 Jul 2003; Caleb Tennis <caleb@gentoo.org> hk_classes.0.6.ebuild:
+  Added a few lines by Peter Ruskin to include documentation in ebuild. 
+  Closes bug #24335.
+
+  17 Jun 2003; Caleb Tennis <caleb@gentoo.org> hk_classes.0.6.ebuild:
+  Fixed a problem with the DEPEND string.  Closes bug #22472.
+  Also removed older ebuilds (0.5.6 and 0.6_pre3).
+
+*hk_classes-0.6 (28 May 2003)
+
+  28 May 2003; Caleb Tennis <caleb@gentoo.org> hk_classes.0.6.ebuild:
+  Version bump, slightly modified ebuild thanks to Peter Ruskin (bug #20980)
+
+*hk_classes-0.6_pre3 (24 Apr 2003)
+
+  24 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> Manifest,
+  hk_classes-0.6_pre3.ebuild:
+  New version of hk_classes for a new knoda that works around some bugs in kde.
+  It also corrects a python inclusion problem in the original pre3 (this is
+  pre3a) Courtessy of: Peter Ruskin <aoyu93@dsl.pipex.com>
 
 *hk_classes-0.5.6 (23 Apr 2003)
 
-  23 Apr 2003; Paul de Vrieze pauldv@gentoo.org hk_classes-0.5.6.ebuild:
+  23 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> hk_classes-0.5.6.ebuild:
   Initial import, courtessy of Peter Ruskin <aoyu93@dsl.pipex.com>
 
diff --git a/dev-db/hk_classes/Manifest b/dev-db/hk_classes/Manifest
index ead8b3e6dc69..dd340a4c0eb7 100644
--- a/dev-db/hk_classes/Manifest
+++ b/dev-db/hk_classes/Manifest
@@ -1,3 +1,18 @@
-MD5 cedde5d6f4c0c43cb7b4421db4480b02 hk_classes-0.5.6.ebuild 1369
-MD5 3907f30f0bae088586bb6e184b84c7c4 ChangeLog 390
-MD5 c5cc0649329cd6cc89fa51050ff34840 files/digest-hk_classes-0.5.6 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b32b8307fd1da1afa9d14b6fdfb31122 ChangeLog 5829
+MD5 85913ee0452ca03c30bc07640aa4926e files/digest-hk_classes-0.7.1 198
+MD5 c3161dc00351b9805b1ef1b53b6ca0ec files/digest-hk_classes-0.7.4a 158
+MD5 39ffc493157dcbdae7d9991cf29afb88 files/hk_classes-0.7.4a-amd64.patch 2997
+MD5 3986d92d3fe87dfac8646b3527e465cb files/hk_classes-amd64.patch 2569
+MD5 5626f8e0e7fc410ca9b10fa91aaa29df hk_classes-0.7.1.ebuild 1146
+MD5 12a6c640564c780780674928bd84b274 hk_classes-0.7.4a.ebuild 1930
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgC2FCRZPokWLroQRArILAKCTv6+ChF2hiMpE8F9y4i1geVvqOwCghMp2
+1LBmLnCRiF+PSXzJN2WOwFA=
+=/Gxx
+-----END PGP SIGNATURE-----
diff --git a/dev-db/hk_classes/hk_classes-0.7.1.ebuild b/dev-db/hk_classes/hk_classes-0.7.1.ebuild
index fe23433c5171..6ed24ef4627d 100644
--- a/dev-db/hk_classes/hk_classes-0.7.1.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.7.1.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/dev-db/hk_classes/hk_classes-0.7.1.ebuild,v 1.1 2004/09/20 02:50:28 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
+
+inherit eutils
 
 P_DOCS="hk_docs-0.7"
 
@@ -12,7 +14,7 @@ SRC_URI="mirror://sourceforge/hk-classes/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
 IUSE="mysql postgres sqlite odbc doc"
 
 # At least one of the following is required
@@ -21,6 +23,13 @@ DEPEND="mysql? ( >=dev-db/mysql-3.23.54a )
 	sqlite? ( =dev-db/sqlite-2* )
 	odbc? ( >=dev-db/unixODBC-2.0.6 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-amd64.patch
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die
diff --git a/dev-db/hk_classes/hk_classes-0.7.4a.ebuild b/dev-db/hk_classes/hk_classes-0.7.4a.ebuild
index a994d0efc233..ee714cc54c17 100644
--- a/dev-db/hk_classes/hk_classes-0.7.4a.ebuild
+++ b/dev-db/hk_classes/hk_classes-0.7.4a.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/dev-db/hk_classes/hk_classes-0.7.4a.ebuild,v 1.1 2005/10/12 14:12:47 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hk_classes/hk_classes-0.7.4a.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit eutils python
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/hk-classes/${MY_P}.tar.bz2
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="doc firebird mysql odbc postgres sqlite sqlite3"
 
 # pxlib is not in portage yet, but there's no reason not add paradox
diff --git a/dev-db/hk_classes/metadata.xml b/dev-db/hk_classes/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/dev-db/hk_classes/metadata.xml
+++ b/dev-db/hk_classes/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>kde-other</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/dev-db/hsqldb/ChangeLog b/dev-db/hsqldb/ChangeLog
index 51390aba60e7..ab80df9793c8 100644
--- a/dev-db/hsqldb/ChangeLog
+++ b/dev-db/hsqldb/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for dev-db/hsqldb
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.1 2004/10/30 20:58:31 axxo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
+
+  10 Jul 2005; Thomas Matthijs <axxo@gentoo.org> hsqldb-1.7.3.1-r1.ebuild:
+  dep fix, cleanup
+
+*hsqldb-1.7.3.1-r1 (04 Jun 2005)
+
+  04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -hsqldb-1.7.3.1.ebuild,
+  +hsqldb-1.7.3.1-r1.ebuild:
+  Updated reference to servletapi-2.3, we dont install a versioned servletapi
+  jar any longer.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> hsqldb-1.7.3.1.ebuild:
+  Stable on ppc64
+
+  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> hsqldb-1.7.3.1.ebuild:
+  Stable on sparc
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> -hsqldb-1.7.2.4.ebuild,
+  hsqldb-1.7.3.1.ebuild:
+  stable on amd64, x86 and ppc
+
+  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> hsqldb-1.7.3.1.ebuild:
+  Keyworded ~sparc wrt #84992
+
+  13 Mar 2005; Markus Rothe <corsair@gentoo.org> hsqldb-1.7.3.1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> hsqldb-1.7.2.4.ebuild,
+  hsqldb-1.7.3.1.ebuild:
+  added missing jikes dependency.
+
+*hsqldb-1.7.3.1 (19 Jan 2005)
+
+  19 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> +hsqldb-1.7.3.1.ebuild:
+  new upstream version. fixes bug #78640
+
+  18 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> hsqldb-1.7.2.4.ebuild:
+  minor dependency issue and a typo in pkg_postinst removed. fixes bug #78414.
+
+*hsqldb-1.7.2.4 (03 Nov 2004)
+
+  03 Nov 2004; Thomas Matthijs <axxo@gentoo.org> hsqldb-1.7.2.4.ebuild:
+  depend on app-arch/unzip
 
 *hsqldb-1.7.2 (30 Oct 2004)
 
diff --git a/dev-db/hsqldb/Manifest b/dev-db/hsqldb/Manifest
index 208f914213d4..2d5cb77fdf95 100644
--- a/dev-db/hsqldb/Manifest
+++ b/dev-db/hsqldb/Manifest
@@ -1,7 +1,17 @@
-MD5 f1249c317507f4edb7f155f18a63d215 hsqldb-1.7.2.4.ebuild 2461
-MD5 55539b6c1dcce862a0e4bb01947fe173 ChangeLog 395
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a02ad29d9dec0e875727ce6f1c2a2185 ChangeLog 1908
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+MD5 fdaba688267d398e70b0468d0b9fe3bb hsqldb-1.7.3.1-r1.ebuild 2484
 MD5 2298ddc531a6368d3a5c0f13148f9fe2 files/server.properties 153
-MD5 eb7b48e9b818783d80ec3b27816f52d4 files/digest-hsqldb-1.7.2.4 64
-MD5 62f03cb4cc0ac93b7e5eb66164e777cf files/hsqldb 477
+MD5 e49b3a828d2623b4b12e5546ee5c7da6 files/hsqldb 461
 MD5 392821346cd206b7b3060d45d2c6dd0f files/sqltool.rc 339
+MD5 bf129311ef11ab7952cef6512717408d files/digest-hsqldb-1.7.3.1-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJCAE/rLF9B432nYRAmNGAKCKEKBzYd4D1w1BoJx6t+3hmuLlPgCgxYix
+wgkObY9/L67eKdroosCYYLU=
+=5uEw
+-----END PGP SIGNATURE-----
diff --git a/dev-db/hsqldb/files/hsqldb b/dev-db/hsqldb/files/hsqldb
index b0c42698bf5a..698533132033 100644
--- a/dev-db/hsqldb/files/hsqldb
+++ b/dev-db/hsqldb/files/hsqldb
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/files/hsqldb,v 1.1 2004/10/30 20:58:31 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/files/hsqldb,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 depend() {
     use net
diff --git a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild b/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
index c9435ac29376..1622a51174b5 100644
--- a/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild
+++ b/dev-db/hsqldb/hsqldb-1.7.3.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/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild,v 1.1 2005/06/04 16:02:23 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/hsqldb/hsqldb-1.7.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 inherit java-pkg eutils
 
@@ -13,22 +13,28 @@ SLOT="0"
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
 IUSE="doc jikes source"
 
+RDEPEND=">=virtual/jre-1.4
+	=dev-java/servletapi-2.3*"
 DEPEND=">=virtual/jdk-1.4
 	app-arch/unzip
 	dev-java/ant-core
-	=dev-java/servletapi-2.3*
 	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.4"
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
+pkg_setup() {
+	enewgroup hsqldb
+	enewuser hsqldb -1 /bin/sh /dev/null hsqldb
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 		rm *.jar
 		java-pkg_jar-from servletapi-2.3
-	cd ..
+	cd ${S}
 	sed -i -r \
 		-e "s/etc\/sysconfig/etc\/conf.d/g" \
 			bin/hsqldb
@@ -37,9 +43,8 @@ src_unpack() {
 
 	einfo "Preparing configuration files..."
 	mkdir conf
-	JAVA_CMD=$(java-config -J)
 	HSQLDB_JAR=/usr/share/hsqldb/lib/hsqldb.jar
-	sed -e "s/^JAVA_EXECUTABLE=.*$/JAVA_EXECUTABLE=${JAVA_CMD//\//\\/}/g" \
+	sed -e 's:^JAVA_EXECUTABLE=.*$:JAVA_EXECUTABLE=$(which java 2>/dev/null):g' \
 		-e "s/^HSQLDB_JAR_PATH=.*$/HSQLDB_JAR_PATH=${HSQLDB_JAR//\//\\/}/g" \
 		-e "s/^SERVER_HOME=.*$/SERVER_HOME=\/var\/lib\/hsqldb/g" \
 		-e "s/^HSQLDB_OWNER=.*$/HSQLDB_OWNER=hsqldb/g" \
@@ -57,7 +62,7 @@ src_compile() {
 }
 
 src_install() {
-	dojar lib/hsql*.jar
+	java-pkg_dojar lib/hsql*.jar
 
 	if use doc; then
 		dodoc doc/*.txt
@@ -79,14 +84,7 @@ src_install() {
 	doexe bin/hsqldb
 	dosym /etc/hsqldb/server.properties /var/lib/hsqldb/server.properties
 	dosym /etc/hsqldb/sqltool.rc /var/lib/hsqldb/sqltool.rc
-}
-
-pkg_postinst() {
-	if ! enewgroup hsqldb || ! enewuser hsqldb -1 /bin/sh /dev/null hsqldb; then
-		die "Unable to add hsqldb user and hsqldb group."
-	fi
-
-	chown -R hsqldb:hsqldb /var/lib/hsqldb
-	chmod o-rwx /var/lib/hsqldb
+	chown -R hsqldb:hsqldb ${D}/var/lib/hsqldb
+	chmod o-rwx ${D}/var/lib/hsqldb
 }
 
diff --git a/dev-db/jxtray/ChangeLog b/dev-db/jxtray/ChangeLog
index da818bec1051..08877e2eb25b 100644
--- a/dev-db/jxtray/ChangeLog
+++ b/dev-db/jxtray/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-db/jxtray
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.1 2004/12/23 00:05:13 karltk Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/ChangeLog,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
+  cosmetic changes
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
+  stable on amd64 and x86, added ~ppc to KEYWORDS
+
+  04 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
+  depend on xml-commons readded
+
+  04 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
+  fixed a typo which broke postgresql support and changed xml-commons dependency
+  to xerces-2 dependency to fix #82561
+
+  03 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> jxtray-0.5.ebuild:
+  updated to reflect the new jdom slots
 
 *jxtray-0.5 (23 Dec 2004)
 
diff --git a/dev-db/jxtray/Manifest b/dev-db/jxtray/Manifest
index bf3c5a3d7007..6bfe25425e28 100644
--- a/dev-db/jxtray/Manifest
+++ b/dev-db/jxtray/Manifest
@@ -1,6 +1,16 @@
-MD5 f0da07704727ba32e5d23fb814b5393c jxtray-0.5.ebuild 2193
-MD5 263a074ca1dfc07a23bf4c57b685fa1f ChangeLog 343
-MD5 0637a933ecb6e8cedfc4ddfcf3491728 metadata.xml 310
-MD5 f22e8babdfdaf992bc35e20ab66ce9f5 files/default.properties 217
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4cd645107524554dbc8b864bcb242612 jxtray-0.5.ebuild 2360
+MD5 46914670b7c0631788ce983a7828b51b ChangeLog 1052
+MD5 f5ddd2d4a1069f3b3c4876d2be95eaff metadata.xml 581
+MD5 63dce73e99d8ec22a695238f0928b003 files/default.properties 109
 MD5 97bb388f459c454b06a8276c62609259 files/build.xml 1599
 MD5 f84f96f0c025c480d3404ee1ad22e3fc files/digest-jxtray-0.5 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2Tb7/rLF9B432nYRAlg6AKCGeoyMgrh+qd+aCKOQyOFNwWsubgCgwCSa
+OGQ8KnxjCaDkJL49vvdJKnE=
+=t5kR
+-----END PGP SIGNATURE-----
diff --git a/dev-db/jxtray/files/default.properties b/dev-db/jxtray/files/default.properties
index 2c2418d0adf2..fbcf7c235c99 100644
--- a/dev-db/jxtray/files/default.properties
+++ b/dev-db/jxtray/files/default.properties
@@ -7,5 +7,3 @@ packages=jxtray.*
 
 srcdir=${basedir}/src
 
-classpath=${basedir}/lib/jdom.jar:${basedir}/lib/xerces.jar:${basedir}/poi.jar:${basedir}/lib/xml-apis.jar
-
diff --git a/dev-db/jxtray/jxtray-0.5.ebuild b/dev-db/jxtray/jxtray-0.5.ebuild
index e451a9c0aa19..b9a90192e0b8 100644
--- a/dev-db/jxtray/jxtray-0.5.ebuild
+++ b/dev-db/jxtray/jxtray-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/dev-db/jxtray/jxtray-0.5.ebuild,v 1.1 2004/12/23 00:05:13 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/jxtray/jxtray-0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 inherit java-pkg
 
@@ -9,24 +9,25 @@ HOMEPAGE="http://jxtray.sourceforge.net"
 SRC_URI="mirror://sourceforge/jxtray/${PN}-src-${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE="doc jikes firebird mssql mysql postgres"
 
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	dev-java/jdom
-	dev-java/sax
+RDEPEND=">=virtual/jre-1.3
+	~dev-java/jdom-1.0_beta9
+	>=dev-java/kunststoff-2.0.2
 	dev-java/poi
-	>=dev-java/xerces-2.6.2
+	dev-java/sax
+	=dev-java/xerces-2.6*
 	dev-java/xml-commons
-	>=dev-java/kunststoff-2.0.2
-	jikes? ( >=dev-java/jikes-1.21 )
 	firebird? ( dev-java/jdbc3-firebird )
 	mssql? ( =dev-java/jtds-0.9* )
 	mysql? ( dev-java/jdbc-mysql )
 	postgres? ( dev-java/jdbc3-postgresql )
 	!firebird? ( !mssql? ( !postgres? ( dev-java/jdbc-mysql ) ) )"
-RDEPEND="${DEPEND}"
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )"
 
 S="${WORKDIR}/${PN}-src-${PV}"
 
@@ -37,49 +38,47 @@ src_unpack() {
 
 	cd ${S}/lib
 	rm *.jar
-	cp="${cp}:`java-config -p jdom`"
-	cp="${cp}:`java-config -p xerces-2`"
-	cp="${cp}:`java-config -p sax`"
-	cp="${cp}:`java-config -p poi`"
-	cp="${cp}:`java-config -p xml-commons`"
+	cp="${cp}:$(java-pkg_getjars jdom-1.0_beta9)"
+	cp="${cp}:$(java-pkg_getjars xerces-2)"
+	cp="${cp}:$(java-pkg_getjars xml-commons)"
+	cp="${cp}:$(java-pkg_getjars sax)"
+	cp="${cp}:$(java-pkg_getjars poi)"
 
 	cd ${S}/lib/lookandfeel
 	rm *.jar
-	cp="${cp}:`java-config -p kunststoff-2.0`"
+	cp="${cp}:$(java-pkg_getjars kunststoff-2.0)"
 
 	cd ${S}/lib/drivers
 	rm *.jar
-	use firebird && cp="${cp}:`java-config -p jdbc3-firebird`"
-	use mssql && cp="${cp}:`java-config -p jtds-0.9`"
-	use mysql && cp="${cp}:`java-config -p jdbc-mysql`"
-	use postgres && cp="${cp}:`java-config -p jdbc3-postgres`"
+	use firebird && cp="${cp}:$(java-pkg_getjars jdbc3-firebird)"
+	use mssql && cp="${cp}:$(java-pkg_getjars jtds-0.9)"
+	use mysql && cp="${cp}:$(java-pkg_getjars jdbc-mysql)"
+	use postgres && cp="${cp}:$(java-pkg_getjars jdbc3-postgresql)"
 
 	echo "classpath=${cp}" > ${S}/build.properties
 }
 
 src_compile() {
 	local antflags="jar"
-
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
-
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "Compile failed!"
 }
 
 src_install() {
-	local cp="java-config -p jxtray,jdom,xerces-2,sax,poi,xml-commons,kunststoff-2.0"
+	local cp="java-config -p jxtray,jdom-1.0_beta9,xerces-2,xml-commons,sax,poi,kunststoff-2.0"
 
 	use firebird && cp="${cp},jdbc3-firebird"
 	use mssql && cp="${cp},jtds-0.9"
 	use mysql && cp="${cp},jdbc-mysql"
-	use postgres && cp="${cp},jdbc3-postgres"
+	use postgres && cp="${cp},jdbc3-postgresql"
 
-	java-pkg_dojar ${S}/dist/${PN}-${PV}.jar
+	java-pkg_newjar ${S}/dist/${P}.jar ${PN}.jar
 
 	echo "#!/bin/sh" > ${PN}
 	echo "java -cp \$(${cp}) jxtray.Jxtray" >> ${PN}
 	dobin ${PN}
 
-	dodoc CHANGELOG.txt LICENSE.txt README.txt
+	dodoc CHANGELOG.txt README.txt
 	use doc && java-pkg_dohtml -r ${S}/javadoc/*
 }
diff --git a/dev-db/knoda/ChangeLog b/dev-db/knoda/ChangeLog
index 0dd94515b681..1c678dcc2a5d 100644
--- a/dev-db/knoda/ChangeLog
+++ b/dev-db/knoda/ChangeLog
@@ -1,9 +1,144 @@
 # ChangeLog for dev-db/knoda
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/ChangeLog,v 1.1 2003/04/23 13:38:28 pauldv Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/ChangeLog,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
+
+  20 Nov 2005; Mark Loeser <halcy0n@gentoo.org> knoda-0.7.4-r1.ebuild:
+  Stable on x86; bug #112832
+
+  19 Nov 2005; Jason Wever <weeve@gentoo.org> knoda-0.7.4-r1.ebuild:
+  Stable on SPARC wrt bug #112832.
+
+  12 Oct 2005; Carsten Lohrke <carlo@gentoo.org> knoda-0.7.4-r1.ebuild:
+  minor dependency fix
+
+*knoda-0.7.4-r1 (11 Oct 2005)
+
+  11 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/knoda-0.7.4-makefile.patch, +knoda-0.7.4-r1.ebuild:
+  Add patch to fix installation directory.
+
+*knoda-0.7.4 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> +knoda-0.7.4.ebuild:
+  version bump
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> knoda-0.7.1.ebuild:
+  Stable on ppc.
+
+*knoda-0.7.3 (22 Mar 2005)
+
+  22 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +knoda-0.7.3.ebuild:
+  version bump
+
+  10 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> knoda-0.7.2.ebuild:
+  added ~amd64 KEYWORD, fixes #70460
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> knoda-0.7.2.ebuild:
+  Added ~sparc keyword.
+
+*knoda-0.7.2 (06 Dec 2004)
+
+  06 Dec 2004; Caleb Tennis <caleb@gentoo.org> +knoda-0.7.2.ebuild,
+  -knoda-0.7.2_alpha3.ebuild:
+  version bump, remove old version
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> knoda-0.7.1.ebuild:
+  stable on x86, QA: missing "inherit eutils"
+
+*knoda-0.7.2_alpha3 (08 Nov 2004)
+
+  08 Nov 2004; Carsten Lohrke <carlo@gentoo.org> +knoda-0.7.2_alpha3.ebuild:
+  version bump
+
+  31 Oct 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/knoda-0.7.1-configure.patch, knoda-0.7.1.ebuild:
+  Added a patch to the configure script to honor the "arts" USE flag.
+
+*knoda-0.7.1 (19 Sep 2004)
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> +knoda-0.7.1.ebuild:
+  Version bump
+
+  12 Aug 2004; Carsten Lohrke <carlo@gentoo.org> knoda-0.7.ebuild:
+  stable on x86
+
+*knoda-0.7 (13 Jul 2004)
+
+  13 Jul 2004; Carsten Lohrke <carlo@gentoo.org> -knoda-0.6.3_alpha3.ebuild,
+  +knoda-0.7.ebuild, -knoda-0.7_alpha1.ebuild, -knoda-0.7_alpha3-r1.ebuild:
+  ebuild clean up, version bump
+
+*knoda-0.7_alpha3-r1 (04 Jul 2004)
+
+  04 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +knoda-0.7_alpha3-r1.ebuild:
+  version bump
+
+*knoda-0.7_alpha1 (29 Jun 2004)
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> knoda-0.6.2a.ebuild,
+  knoda-0.6.3_alpha3.ebuild, knoda-0.7_alpha1.ebuild:
+  QA: kde-base -> kde, need-kde after R/DEPEND, newdepend -> DEPEND
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> -knoda-0.6.1.ebuild,
+  -knoda-0.6.3_alpha1.ebuild:
+  Version bump, remove old versions
+
+  16 May 2004; Dominik Stadler <centic@gentoo.org> knoda-0.6.2a.ebuild:
+  Remove obsolete definition of Variable S.
+
+  25 Mar 2004; Martin Holzer <mholzer@gentoo.org> knoda-0.6.1.ebuild,
+  knoda-0.6.2a.ebuild, knoda-0.6.3_alpha1.ebuild, knoda-0.6.3_alpha3.ebuild:
+  fixing src_uri. closes 45629
+
+  18 Mar 2004; David Holm <dholm@gentoo.org> knoda-0.6.3_alpha3.ebuild:
+  Added to ~ppc.
+
+*knoda-0.6.3_alpha3 (15 Mar 2004)
+
+  15 Mar 2004; Caleb Tennis <caleb@gentoo.org> knoda-0.6.3_alpha3.ebuild:
+  Version bump
+
+*knoda-0.6.3_alpha1 (27 Dec 2003)
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> knoda-0.6.3_alpha1.ebuild:
+  new alpha version
+
+*knoda-0.6.2a (06 Dec 2003)
+
+  06 Dec 2003; Caleb Tennis <caleb@gentoo.org> knoda-0.6.1_alpha3.ebuild,
+  knoda-0.6.2a.ebuild, knoda-0.6.ebuild:
+  New version - by Peter Ruskin.  Bug #35161
+
+*knoda-0.6.1 (20 Oct 2003)
+
+  20 Oct 2003; Caleb Tennis <caleb@gentoo.org> knoda-0.6.1.ebuild:
+  Version bump - thanks to Peter Ruskin (bug #31523)
+
+*knoda-0.6.1_alpha3 (02 Oct 2003)
+
+  02 Oct 2003; Caleb Tennis <caleb@gentoo.org> knoda-0.6.1_alpha3.ebuild:
+  new version
+
+  17 Jun 2003; Caleb Tennis <caleb@gentoo.org> :
+  Removed older ebuilds (knoda-0.6_pre3 and knoda-0.5.6)
+
+*knoda-0.6 (28 May 2003)
+
+  28 May 2003; Caleb Tennis <caleb@gentoo.org> knoda-0.6.ebuild:
+  Version bump, ebuild with minor mods from Peter Ruskin (bug #20981)
+
+*knoda-0.6_pre3 (24 Apr 2003)
+
+  24 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> Manifest, knoda-0.5.6.ebuild,
+  knoda-0.6_pre3.ebuild:
+  New version of knoda that works around some segfaults caused by newer kde libs.
+  Courtessy of: Peter Ruskin <aoyu93@dsl.pipex.com>
 
 *knoda-0.5.6 (23 Apr 2003)
 
-  23 Apr 2003; Paul de Vrieze pauldv@gentoo.org knoda-0.5.6.ebuild:
+  24 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> Manifest, knoda-0.5.6.ebuild:
+  Changed the ebuild to depend on its own version of hk_classes
+
+  23 Apr 2003; Paul de Vrieze <pauldv@gentoo.org> knoda-0.5.6.ebuild:
   Initial import. Courtessy of: Peter Ruskin <aoyu93@dsl.pipex.com>
 
diff --git a/dev-db/knoda/Manifest b/dev-db/knoda/Manifest
index d1144b4c7cfb..f166f447f07c 100644
--- a/dev-db/knoda/Manifest
+++ b/dev-db/knoda/Manifest
@@ -1,3 +1,20 @@
-MD5 ad42f4315013d0e0f80bca9d7b49b3d2 knoda-0.5.6.ebuild 531
-MD5 959fe0ec2e929c3f54adee186a5a8504 ChangeLog 371
-MD5 99a728f94dab89af0ebd0640ce99ef1e files/digest-knoda-0.5.6 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77028569d4b8f91f280c5d78690291e4 ChangeLog 4647
+MD5 a2245fb5959a678c53a78647758df109 files/digest-knoda-0.7.1 64
+MD5 a9b1117eec883735adb0e1265fc0deca files/digest-knoda-0.7.4 65
+MD5 a9b1117eec883735adb0e1265fc0deca files/digest-knoda-0.7.4-r1 65
+MD5 5010947f33fe747c6d35a4aad7e01122 files/knoda-0.7.1-configure.patch 3567
+MD5 2bafad05024cb02600c6e2eb3de8c350 files/knoda-0.7.4-makefile.patch 3045
+MD5 6ccc05f7120be903fa688fd4b56ca7de knoda-0.7.1.ebuild 593
+MD5 0b4290b5e592803e84f75dd34199f36a knoda-0.7.4-r1.ebuild 685
+MD5 b1b6e6e28352e481af45ba03f3803cf3 knoda-0.7.4.ebuild 554
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgC2yCRZPokWLroQRAsgLAKDE2pY7AGrpuGi7lRyf41sbNN4WwgCcDMj8
+CN6AhhTZkqPeHJyr1p3R3m8=
+=Nljj
+-----END PGP SIGNATURE-----
diff --git a/dev-db/knoda/knoda-0.7.1.ebuild b/dev-db/knoda/knoda-0.7.1.ebuild
index dd602e91bc26..f5d7da32b661 100644
--- a/dev-db/knoda/knoda-0.7.1.ebuild
+++ b/dev-db/knoda/knoda-0.7.1.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/dev-db/knoda/knoda-0.7.1.ebuild,v 1.1 2004/09/20 02:51:39 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/knoda-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 DESCRIPTION="KDE database frontend based on the hk_classes library"
 HOMEPAGE="http://hk-classes.sourceforge.net/"
@@ -10,8 +10,14 @@ SRC_URI="mirror://sourceforge/knoda/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="x86 ppc"
+IUSE="arts"
 
 DEPEND=">=dev-db/hk_classes-${PV}"
 need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+
+	useq arts || epatch ${FILESDIR}/${P}-configure.patch
+}
diff --git a/dev-db/knoda/knoda-0.7.4-r1.ebuild b/dev-db/knoda/knoda-0.7.4-r1.ebuild
index 6cdb933293d2..7a6e7974eb43 100644
--- a/dev-db/knoda/knoda-0.7.4-r1.ebuild
+++ b/dev-db/knoda/knoda-0.7.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/dev-db/knoda/knoda-0.7.4-r1.ebuild,v 1.1 2005/10/11 13:32:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/knoda-0.7.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/knoda/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
-DEPEND=">=dev-db/hk_classes-${PV}"
+DEPEND="~dev-db/hk_classes-${PV}a"
 
 need-kde 3
 
diff --git a/dev-db/knoda/knoda-0.7.4.ebuild b/dev-db/knoda/knoda-0.7.4.ebuild
index 73b2ada38749..df298aae5eae 100644
--- a/dev-db/knoda/knoda-0.7.4.ebuild
+++ b/dev-db/knoda/knoda-0.7.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/dev-db/knoda/knoda-0.7.4.ebuild,v 1.1 2005/06/27 20:18:22 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/knoda/knoda-0.7.4.ebuild,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 inherit kde
 
diff --git a/dev-db/knoda/metadata.xml b/dev-db/knoda/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/dev-db/knoda/metadata.xml
+++ b/dev-db/knoda/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>kde-other</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/dev-db/kpogre/ChangeLog b/dev-db/kpogre/ChangeLog
index 78e875a3ec60..195f0041f22a 100644
--- a/dev-db/kpogre/ChangeLog
+++ b/dev-db/kpogre/ChangeLog
@@ -1,11 +1,63 @@
 # ChangeLog for dev-db/kpogre
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/kpogre/ChangeLog,v 1.1 2004/04/26 08:38:11 nakano Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kpogre/ChangeLog,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  22 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kpogre-1.3.5.ebuild:
+  Keyworded ~alpha
+
+*kpogre-1.3.5 (20 Mar 2005)
+
+  20 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +kpogre-1.3.5.ebuild:
+  Version bumped.
+  Added ~amd64.
+
+*kpogre-1.3.2 (09 Feb 2005)
+
+  09 Feb 2005; Masatomo Nakano <nakano@gentoo.org> +kpogre-1.3.2.ebuild:
+  Version bump.
+
+  09 Feb 2005; Masatomo Nakano <nakano@gentoo.org> kpogre-1.2.7.ebuild:
+  Marked stable on x86.
+
+*kpogre-1.2.7 (09 Dec 2004)
+
+  09 Dec 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/kpogre-1.2.7-configure-arts.patch, +kpogre-1.2.7.ebuild:
+  Version Bump. Closes bug #73736.
+
+  03 Oct 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/kpogre-0.97-gentoo.patch, -kpogre-0.97.ebuild, -kpogre-0.99.ebuild:
+  Removed old ebuilds.
+
+*kpogre-1.1.0 (23 Sep 2004)
+
+  28 Sep 2004; Masatomo Nakano <nakano@gentoo.org> +kpogre-1.1.0.ebuild:
+  Version bump.
+
+*kpogre-0.99 (22 Aug 2004)
+
+  22 Aug 2004; Masatomo Nakano <nakano@gentoo.org> +kpogre-0.99.ebuild:
+  Version bump. Ebuild submitted by Diego Pettenò <dgp85@users.sourceforge.net>
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> kpogre-0.97.ebuild:
+  Typo in DESCRIPTION: grafical -> graphical. Bug 59717.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kpogre-0.97.ebuild:
+  QA: kde-base -> kde, need-kde after R/DEPEND
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> kpogre-0.97.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kpogre-0.97.ebuild:
+  Add inherit eutils
 
 *kpogre-0.97 (26 Apr 2004)
 
   26 Apr 2004; Masatomo Nakano <nakano@gentoo.org>
   +files/kpogre-0.97-gentoo.patch, +kpogre-0.97.ebuild:
-  Initial import. Submitted by Diego Petteno <dgp85@users.sourceforge.net>.
+  Initial import. Submitted by Diego Pettenò <dgp85@users.sourceforge.net>.
   #48023
 
diff --git a/dev-db/kpogre/Manifest b/dev-db/kpogre/Manifest
index 050a9d26309f..54f3f104868c 100644
--- a/dev-db/kpogre/Manifest
+++ b/dev-db/kpogre/Manifest
@@ -1,2 +1,19 @@
-MD5 78d41f5b94aaa8d5d9b90cba3889392d kpogre-0.97.ebuild 478
-MD5 5244be185b552d41f9f45087be8b533d files/digest-kpogre-0.97 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f038952327e7c10687f01604a678c519 ChangeLog 2029
+MD5 19b82f1e823b611e98ffe041ac3f0f9b kpogre-1.2.7.ebuild 601
+MD5 e8b482cc6e0f54df0d61ba7885a1e3ad kpogre-1.3.2.ebuild 504
+MD5 57966fc64a4af84bff0af04cbff4dc1e kpogre-1.3.5.ebuild 519
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 edbd69435d270ab7e635ed391c1c470a files/digest-kpogre-1.3.5 65
+MD5 bf3cec4a37625413c32cd0f77ace3e32 files/digest-kpogre-1.2.7 65
+MD5 ecfbd891d7aead5b40113c68fc729065 files/digest-kpogre-1.3.2 65
+MD5 da5fc11e4cea8dd8e3100c840a3d9759 files/kpogre-1.2.7-configure-arts.patch 3567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLG3kj5H05b2HAEkRAgoiAJ9t9IKVz2LsS03GJabIQbid6NLIRACfTk5A
+avD+z11puYmLh5rcBpN8gwg=
+=ZTxG
+-----END PGP SIGNATURE-----
diff --git a/dev-db/kpogre/kpogre-1.2.7.ebuild b/dev-db/kpogre/kpogre-1.2.7.ebuild
index 403790b12a0e..0b3e38fab60a 100644
--- a/dev-db/kpogre/kpogre-1.2.7.ebuild
+++ b/dev-db/kpogre/kpogre-1.2.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/dev-db/kpogre/kpogre-1.2.7.ebuild,v 1.1 2004/12/09 15:06:48 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kpogre/kpogre-1.2.7.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/kpogre/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
+KEYWORDS="x86 ~ppc"
+IUSE="arts"
 
 DEPEND="dev-db/postgresql
 	>=dev-libs/libpqxx-2.2.1"
diff --git a/dev-db/kpogre/kpogre-1.3.2.ebuild b/dev-db/kpogre/kpogre-1.3.2.ebuild
index 57256ad8bf13..20a57c798341 100644
--- a/dev-db/kpogre/kpogre-1.3.2.ebuild
+++ b/dev-db/kpogre/kpogre-1.3.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/dev-db/kpogre/kpogre-1.3.2.ebuild,v 1.1 2005/02/09 23:49:14 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kpogre/kpogre-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit kde eutils
 
diff --git a/dev-db/kpogre/kpogre-1.3.5.ebuild b/dev-db/kpogre/kpogre-1.3.5.ebuild
index 3c07f68f7d01..073a504f1f01 100644
--- a/dev-db/kpogre/kpogre-1.3.5.ebuild
+++ b/dev-db/kpogre/kpogre-1.3.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/dev-db/kpogre/kpogre-1.3.5.ebuild,v 1.1 2005/03/20 01:44:48 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/kpogre/kpogre-1.3.5.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kpogre/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-db/postgresql
diff --git a/dev-db/libdbi-drivers/ChangeLog b/dev-db/libdbi-drivers/ChangeLog
index af929319f5f6..66aa12b9b86d 100644
--- a/dev-db/libdbi-drivers/ChangeLog
+++ b/dev-db/libdbi-drivers/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for dev-db/libdbi-drivers
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.1 2004/03/25 03:24:53 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/ChangeLog,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+  13 Nov 2005; Jason Wever <weeve@gentoo.org> libdbi-drivers-0.8.0.ebuild:
+  Added ~sparc keyword wrt bug #105447.
+
+  04 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  libdbi-drivers-0.8.0.ebuild:
+  Bug #104601 again. Make libdbi-drivers bring in both slots of sqlite.
+
+*libdbi-drivers-0.8.0 (03 Sep 2005)
+
+  03 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +libdbi-drivers-0.8.0.ebuild:
+  Version bump, bug #104601.
+
+  30 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  libdbi-drivers-0.7.1-r1.ebuild:
+  Stable on x86.
+
+*libdbi-drivers-0.7.1-r1 (27 Mar 2005)
+
+  27 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
+  +libdbi-drivers-0.7.1-r1.ebuild:
+  Bug #86514, fix DEPEND. Also add metadata.
+
+  28 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  libdbi-drivers-0.7.1.ebuild:
+  adding to ~amd64
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> libdbi-drivers-0.7.1.ebuild:
+  Add die following econf for bug 48950
+
+  25 Mar 2004; David Holm <dholm@gentoo.org> libdbi-drivers-0.7.1.ebuild:
+  Added to ~ppc.
 
 *libdbi-drivers-0.7.1 (24 Mar 2004)
 
diff --git a/dev-db/libdbi-drivers/Manifest b/dev-db/libdbi-drivers/Manifest
index 8b2840bde469..1d1343a20238 100644
--- a/dev-db/libdbi-drivers/Manifest
+++ b/dev-db/libdbi-drivers/Manifest
@@ -1,2 +1,8 @@
-MD5 5f7ec902fdfab6e8ac2ef06998d90020 libdbi-drivers-0.7.1.ebuild 863
+MD5 f0d7f6cd5b52d6fc0e281fed6b54d935 ChangeLog 1461
 MD5 773b07f27a69df8943d40fea56b1c36e files/digest-libdbi-drivers-0.7.1 72
+MD5 773b07f27a69df8943d40fea56b1c36e files/digest-libdbi-drivers-0.7.1-r1 72
+MD5 67784c601bf41d91bd5a3eab6746cd11 files/digest-libdbi-drivers-0.8.0 73
+MD5 fa1deb72ec0620c8351f745bf73474ec libdbi-drivers-0.7.1-r1.ebuild 1552
+MD5 7103af9e9682a1a17a1d458adb44fcc1 libdbi-drivers-0.7.1.ebuild 1241
+MD5 d6ad4647793365df68e8023264d4bfba libdbi-drivers-0.8.0.ebuild 1792
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.7.1-r1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.7.1-r1.ebuild
index b8c1be08a781..4b7c72846aed 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.7.1-r1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.7.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/dev-db/libdbi-drivers/libdbi-drivers-0.7.1-r1.ebuild,v 1.1 2005/03/28 00:48:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.7.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -12,7 +12,7 @@ DEPEND="dev-db/libdbi
 		sqlite? ( <dev-db/sqlite-3 )"
 
 IUSE="mysql postgres sqlite oci8"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT=0
 
 src_compile() {
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.7.1.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.7.1.ebuild
index 41c0199020b8..217b8aa71158 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.7.1.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.7.1.ebuild
@@ -1,5 +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/dev-db/libdbi-drivers/libdbi-drivers-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -7,7 +8,7 @@ HOMEPAGE="http://${PN}.sourceforge.net/"
 LICENSE="LGPL-2.1"
 DEPEND="dev-db/libdbi"
 IUSE="mysql postgres sqlite oci8"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 SLOT=0
 
 src_compile() {
@@ -22,7 +23,7 @@ src_compile() {
 		die "You have not specified any supported databases in your use flags (mysql, pgsql, sqlite, oracle)"
 	fi
 
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	emake
 }
 
diff --git a/dev-db/libdbi-drivers/libdbi-drivers-0.8.0.ebuild b/dev-db/libdbi-drivers/libdbi-drivers-0.8.0.ebuild
index 7095066e3646..17fb784a2b87 100644
--- a/dev-db/libdbi-drivers/libdbi-drivers-0.8.0.ebuild
+++ b/dev-db/libdbi-drivers/libdbi-drivers-0.8.0.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.0.ebuild,v 1.1 2005/09/03 18:55:27 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi-drivers/libdbi-drivers-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 DESCRIPTION="The libdbi-drivers project maintains drivers for libdbi."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://${PN}.sourceforge.net/"
+HOMEPAGE="http://libdbi-drivers.sourceforge.net/"
 LICENSE="LGPL-2.1"
-DEPEND="dev-db/libdbi
+DEPEND=">=dev-db/libdbi-0.8.0
 		mysql? ( dev-db/mysql )
 		postgres? ( dev-db/postgresql )
-		sqlite? ( dev-db/sqlite >=dev-db/sqlite-3 )
+		sqlite? ( <dev-db/sqlite-3 >=dev-db/sqlite-3 )
 		firebird? ( dev-db/firebird )"
 
 IUSE="mysql postgres sqlite oci8"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT=0
 
 src_compile() {
diff --git a/dev-db/libdbi/ChangeLog b/dev-db/libdbi/ChangeLog
index 52ef65574b61..1359c3d9419c 100644
--- a/dev-db/libdbi/ChangeLog
+++ b/dev-db/libdbi/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-db/libdbi
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.1 2004/03/25 03:22:28 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/ChangeLog,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+
+  13 Nov 2005; Jason Wever <weeve@gentoo.org> libdbi-0.8.0.ebuild:
+  Added ~sparc keyword wrt bug #105447.
+
+*libdbi-0.8.0 (03 Sep 2005)
+
+  03 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> +libdbi-0.8.0.ebuild:
+  Version bump, bug #104601.
+
+  30 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> libdbi-0.7.2-r1.ebuild:
+  Stable on x86.
+
+*libdbi-0.7.2-r1 (27 Mar 2005)
+
+  27 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
+  +libdbi-0.7.2-r1.ebuild:
+  Add metadata, cleanup ebuild.
+
+  28 Feb 2005; Christian Parpart <trapni@gentoo.org> libdbi-0.7.2.ebuild:
+  adding to ~amd64
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> libdbi-0.7.2.ebuild:
+  add sed-4 dep
+
+  25 Mar 2004; David Holm <dholm@gentoo.org> libdbi-0.7.2.ebuild:
+  Added to ~ppc.
 
 *libdbi-0.7.2 (24 Mar 2004)
 
diff --git a/dev-db/libdbi/Manifest b/dev-db/libdbi/Manifest
index 8bdbda59e473..efda4ad2a1c8 100644
--- a/dev-db/libdbi/Manifest
+++ b/dev-db/libdbi/Manifest
@@ -1,2 +1,8 @@
-MD5 70354607e4d5fbd1c982d85e508f6274 libdbi-0.7.2.ebuild 557
+MD5 68163ede04d171b3e6ac63638ebad3d8 ChangeLog 1155
 MD5 4134032b5381a34b9be39bb9bbd17ef8 files/digest-libdbi-0.7.2 64
+MD5 4134032b5381a34b9be39bb9bbd17ef8 files/digest-libdbi-0.7.2-r1 64
+MD5 bf4b065b7e01a9ac6188c755fd53d028 files/digest-libdbi-0.8.0 65
+MD5 a2dba78cc5b3eb0bd5a4c78e77ad076e libdbi-0.7.2-r1.ebuild 894
+MD5 cebc11b2a1419b708a1af8deefe958ec libdbi-0.7.2.ebuild 806
+MD5 0250739a9d759c0b01d390593ca3f612 libdbi-0.8.0.ebuild 968
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
diff --git a/dev-db/libdbi/libdbi-0.7.2-r1.ebuild b/dev-db/libdbi/libdbi-0.7.2-r1.ebuild
index 071696cd0a08..91c960093c20 100644
--- a/dev-db/libdbi/libdbi-0.7.2-r1.ebuild
+++ b/dev-db/libdbi/libdbi-0.7.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/dev-db/libdbi/libdbi-0.7.2-r1.ebuild,v 1.1 2005/03/28 01:08:41 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.7.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,7 +11,7 @@ DEPEND=">=sys-apps/sed-4
 		${RDEPEND}"
 PDEPEND="dev-db/libdbi-drivers"
 IUSE=""
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT=0
 
 src_compile() {
diff --git a/dev-db/libdbi/libdbi-0.7.2.ebuild b/dev-db/libdbi/libdbi-0.7.2.ebuild
index ff4057d47e6e..f3b785c3908b 100644
--- a/dev-db/libdbi/libdbi-0.7.2.ebuild
+++ b/dev-db/libdbi/libdbi-0.7.2.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/dev-db/libdbi/libdbi-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://${PN}.sourceforge.net/"
 LICENSE="LGPL-2.1"
-DEPEND=""
+DEPEND="
+	>=sys-apps/sed-4"
 RDEPEND=""
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 SLOT=0
 
 src_compile() {
diff --git a/dev-db/libdbi/libdbi-0.8.0.ebuild b/dev-db/libdbi/libdbi-0.8.0.ebuild
index f2696dbc8925..80f12c95a9b3 100644
--- a/dev-db/libdbi/libdbi-0.8.0.ebuild
+++ b/dev-db/libdbi/libdbi-0.8.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/dev-db/libdbi/libdbi-0.8.0.ebuild,v 1.1 2005/09/03 18:56:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libdbi/libdbi-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 DESCRIPTION="libdbi implements a database-independent abstraction layer in C, similar to the DBI/DBD layer in Perl."
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -11,7 +11,7 @@ DEPEND=">=sys-apps/sed-4
 		${RDEPEND}"
 PDEPEND=">=dev-db/libdbi-drivers-0.8.0"
 IUSE=""
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT=0
 
 src_unpack() {
diff --git a/dev-db/libiodbc/ChangeLog b/dev-db/libiodbc/ChangeLog
index 77f3d6a4eb07..a6031ec78e98 100644
--- a/dev-db/libiodbc/ChangeLog
+++ b/dev-db/libiodbc/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for dev-db/libiodbc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.1 2003/12/01 15:52:15 tantive Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/ChangeLog,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> libiodbc-3.51.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  09 Jun 2005; Markus Rothe <corsair@gentoo.org> libiodbc-3.51.2.ebuild:
+  added ~ppc64
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libiodbc-3.51.2.ebuild:
+  To ~sparc wrt #95380
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> libiodbc-3.51.2.ebuild:
+  glibc -> libc
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> libiodbc-3.51.1-r2.ebuild:
+  Add die following econf for bug 48950
+
+*libiodbc-3.51.2 (04 Mar 2004)
+
+  04 Mar 2004; Michael Imhof <tantive@gentoo.org> libiodbc-3.51.2.ebuild,
+  files/libiodbc-3.51.2_install_symlink.diff:
+  Version bumped. Closes #40045.
+
+*libiodbc-3.51.1-r2 (01 Feb 2004)
+
+  01 Feb 2004; Robin H. Johnson <robbat2@gentoo.org>
+  libiodbc-3.51.1-r2.ebuild:
+  try to fix #40045 better.
+
+*libiodbc-3.51.1-r1 (01 Feb 2004)
+
+  01 Feb 2004; Michael Imhof <tantive@gentoo.org> libiodbc-3.51.1-r1.ebuild,
+  libiodbc-3.51.1.ebuild:
+  Fixed my errors. Closes #40045.
 
 *libiodbc-3.51.1 (01 Dec 2003)
 
diff --git a/dev-db/libiodbc/Manifest b/dev-db/libiodbc/Manifest
index f86363e70229..49274e41adc3 100644
--- a/dev-db/libiodbc/Manifest
+++ b/dev-db/libiodbc/Manifest
@@ -1,2 +1,16 @@
-MD5 1fd6e6142847d82f924eae8279a8b05c libiodbc-3.51.1.ebuild 734
-MD5 bf083fadf4e1d7d36a3d0711631089b4 files/digest-libiodbc-3.51.1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 871c0b4ab3f02739b8a2f6629bf6b08a ChangeLog 1369
+MD5 bf083fadf4e1d7d36a3d0711631089b4 files/digest-libiodbc-3.51.1-r2 67
+MD5 8e6928061b056f72be3d9e7abbbc507c files/digest-libiodbc-3.51.2 67
+MD5 ece9aefd2a148885ecbc7d22ce7b23bd files/libiodbc-3.51.2_install_symlink.diff 978
+MD5 18fbcec8c2b07f0dc399113c62c302b2 libiodbc-3.51.1-r2.ebuild 1069
+MD5 04d4809912527464999b72d441ea7341 libiodbc-3.51.2.ebuild 1076
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZsfjgIKl8Uu19MoRAuMtAJ99PW4xG5lBDAqW0EZCYkTg7lRFzwCcDhMf
+zLB2mM+o63x0fuwJJdbL5mM=
+=Gr3T
+-----END PGP SIGNATURE-----
diff --git a/dev-db/libiodbc/libiodbc-3.51.1-r2.ebuild b/dev-db/libiodbc/libiodbc-3.51.1-r2.ebuild
index 3a8afe6bac4c..0fc57eef8b2d 100644
--- a/dev-db/libiodbc/libiodbc-3.51.1-r2.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.51.1-r2.ebuild
@@ -1,6 +1,7 @@
-# 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/dev-db/libiodbc/libiodbc-3.51.1-r2.ebuild,v 1.1 2004/02/02 01:29:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.51.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
 DESCRIPTION="iODBC is the acronym for Independent Open DataBase Connectivity, an Open Source platform independent implementation of both the ODBC and X/Open specifications. It is rapidly emerging as the industry standard for developing solutions that are language, platform and database independent."
 SRC_URI="http://www.iodbc.org/dist/${P}.tar.gz"
 HOMEPAGE="http://www.iodbc.org/"
@@ -13,7 +14,7 @@ SLOT=0
 src_compile() {
 	local myconf
 	use gtk || myconf="${myconf} --disable-gui --disable-gtktest"
-	econf ${myconf} --with-iodbc-inidir=/etc 
+	econf ${myconf} --with-iodbc-inidir=/etc || die "econf failed"
 	emake
 }
 
diff --git a/dev-db/libiodbc/libiodbc-3.51.2.ebuild b/dev-db/libiodbc/libiodbc-3.51.2.ebuild
index 92fd1b03b298..5b1ec1d33fbd 100644
--- a/dev-db/libiodbc/libiodbc-3.51.2.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.51.2.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/dev-db/libiodbc/libiodbc-3.51.2.ebuild,v 1.1 2004/03/04 13:18:59 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libiodbc/libiodbc-3.51.2.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.iodbc.org/"
@@ -8,26 +10,25 @@ SRC_URI="http://www.iodbc.org/downloads/iODBC/${P}.tar.gz"
 
 LICENSE="LGPL-2 BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	gtk? ( >=x11-libs/gtk+-1.2.10* )"
+	gtk? ( >=x11-libs/gtk+-1.2.10 )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/libiodbc-3.51.2_install_symlink.diff
-	cd ${S}
 }
 
 src_compile() {
 	local myconf
 	myconf="--with-layout=gentoo"
 
-	if [ "`use gtk`" ]
+	if use gtk
 	then
 		myconf="$myconf --enable-gui=yes"
 	else
@@ -41,7 +42,7 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	#dodoc AUTHORS COPYING ChangeLog NEWS README*
+	#dodoc AUTHORS ChangeLog NEWS README*
 	#find doc/ -name "Makefile*" -exec rm '{}' \;
 	#dohtml doc/*
 	#prepalldocs
diff --git a/dev-db/libodbc++/ChangeLog b/dev-db/libodbc++/ChangeLog
index 1ec71db8b88d..08b8449dc55b 100644
--- a/dev-db/libodbc++/ChangeLog
+++ b/dev-db/libodbc++/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-db/libodbc++
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.1 2003/11/16 11:57:27 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/ChangeLog,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+
+  19 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+  Adding to cpp herd
+
+*libodbc++-0.2.3-r1 (02 Jul 2005)
+
+  02 Jul 2005; Robin H. Johnson <robbat2@gentoo.org> 
+  +libodbc++-0.2.3-r1.ebuild:
+  Fix bug #97081, and also a lingering unnoticed bug that isql++ was not always
+  built. ccache is highly recommended now due to the braindead build method
+  that upstream uses.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> libodbc++-0.2.3.ebuild:
+  sync IUSE (+qt)
 
 *libodbc++-0.2.3 (16 Nov 2003)
 
diff --git a/dev-db/libodbc++/Manifest b/dev-db/libodbc++/Manifest
index 3594fec905d2..15875c97f6db 100644
--- a/dev-db/libodbc++/Manifest
+++ b/dev-db/libodbc++/Manifest
@@ -1,2 +1,16 @@
-MD5 9bc7aaadd8d342098710d6e16b5d4076 libodbc++-0.2.3.ebuild 888
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6700c98dced31e2934a36b472769844d ChangeLog 896
+MD5 f1d669f0715bb24791f15c96b9413849 libodbc++-0.2.3-r1.ebuild 1994
+MD5 c0d850ab79376dbc9aef722e2f88b242 libodbc++-0.2.3.ebuild 1393
+MD5 514696112b44a9f879fd54be4de53dc5 metadata.xml 219
 MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3 67
+MD5 76859551271b481b467298625eca2fbf files/digest-libodbc++-0.2.3-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLzl9CRZPokWLroQRAm8pAKDNCW+xSLSUcUAZqz1WjFmYDH78oQCdGNXY
+Zsyic3BxOz8HuzAFAUmjVTc=
+=pK4C
+-----END PGP SIGNATURE-----
diff --git a/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild b/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
index 6f2026bdcecb..6be4dcf8bb7b 100644
--- a/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.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/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild,v 1.1 2005/07/02 20:55:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 DESCRIPTION="Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
 SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.gz"
diff --git a/dev-db/libodbc++/libodbc++-0.2.3.ebuild b/dev-db/libodbc++/libodbc++-0.2.3.ebuild
index 4b1e45eb7c39..6b346c9c2f76 100644
--- a/dev-db/libodbc++/libodbc++-0.2.3.ebuild
+++ b/dev-db/libodbc++/libodbc++-0.2.3.ebuild
@@ -1,13 +1,13 @@
-# 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/dev-db/libodbc++/libodbc++-0.2.3.ebuild,v 1.1 2003/11/16 11:57:27 robbat2 Exp $
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libodbc++/libodbc++-0.2.3.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 DESCRIPTION="Libodbc++ is a c++ class library that provides a subset of the well-known JDBC 2.0(tm) and runs on top of ODBC."
 SRC_URI="mirror://sourceforge/libodbcxx/${P}.tar.gz"
 HOMEPAGE="http://libodbcxx.sourceforge.net/"
 LICENSE="LGPL-2.1"
 DEPEND="dev-db/unixODBC"
 KEYWORDS="~x86 ~ppc ~hppa ~alpha amd64"
+IUSE="qt"
 SLOT=0
 
 src_compile() {
diff --git a/dev-db/libodbc++/metadata.xml b/dev-db/libodbc++/metadata.xml
index 5d9f5be9d49d..bae6540556da 100644
--- a/dev-db/libodbc++/metadata.xml
+++ b/dev-db/libodbc++/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>cpp</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
diff --git a/dev-db/libpq/ChangeLog b/dev-db/libpq/ChangeLog
index 1e279048e3d7..4b77bb471074 100644
--- a/dev-db/libpq/ChangeLog
+++ b/dev-db/libpq/ChangeLog
@@ -1,6 +1,158 @@
 # ChangeLog for dev-db/libpq
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.1 2005/05/08 17:45:47 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/ChangeLog,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org> libpq-8.0.4.ebuild:
+  Stable on hppa.
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org> libpq-7.3.11.ebuild,
+  libpq-7.4.9.ebuild, libpq-8.0.4.ebuild:
+  Stable on x86; bug #111916
+
+  17 Nov 2005; Markus Rothe <corsair@gentoo.org> libpq-7.4.9.ebuild,
+  libpq-8.0.4.ebuild:
+  Stable on ppc64; bug #111916
+
+  12 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  files/libpq-8.1.0-gentoo.patch, libpq-7.3.10.ebuild,
+  libpq-7.3.10-r1.ebuild, libpq-7.3.11.ebuild, libpq-7.4.8.ebuild,
+  libpq-7.4.8-r1.ebuild, libpq-7.4.9.ebuild, libpq-8.0.1.ebuild,
+  libpq-8.0.1-r1.ebuild, libpq-8.0.3.ebuild, libpq-8.0.3-r1.ebuild,
+  libpq-8.0.4.ebuild, libpq-8.1.0.ebuild:
+  removed --with-gnu-ld (#108386).
+
+  12 Nov 2005; Masatomo Nakano <nakano@gentoo.org> Manifest:
+  readded patch with -kb.
+
+  08 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/libpq-8.1_beta3-gentoo.patch, -libpq-8.1_beta3.ebuild:
+  removed beta version.
+
+*libpq-8.1.0 (08 Nov 2005)
+
+  08 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/libpq-8.1.0-gentoo.patch, +libpq-8.1.0.ebuild:
+  version bump.
+
+  17 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/libpq-8.1_beta1-gentoo.patch, -files/libpq-8.1_beta2-gentoo.patch,
+  -libpq-8.1_beta1.ebuild, -libpq-8.1_beta2.ebuild:
+  removed old versions.
+
+*libpq-8.1_beta3 (15 Oct 2005)
+
+  15 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/libpq-8.1_beta3-gentoo.patch, +libpq-8.1_beta3.ebuild:
+  Version bump.
+
+  15 Oct 2005; Masatomo Nakano <nakano@gentoo.org> Manifest:
+  Fixed failed patch bug. #108855
+
+*libpq-8.1_beta2 (08 Oct 2005)
+*libpq-8.0.4 (08 Oct 2005)
+*libpq-7.4.9 (08 Oct 2005)
+*libpq-7.3.11 (08 Oct 2005)
+
+  08 Oct 2005; <nakano@gentoo.org> +files/libpq-7.3.11-gentoo.patch,
+  +files/libpq-7.4.9-gentoo.patch, +files/libpq-8.0.4-gentoo.patch,
+  +files/libpq-8.1_beta2-gentoo.patch, +libpq-7.3.11.ebuild,
+  +libpq-7.4.9.ebuild, +libpq-8.0.4.ebuild, +libpq-8.1_beta2.ebuild:
+  Version bump
+
+*libpq-8.1_beta1 (28 Aug 2005)
+
+  28 Aug 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/libpq-8.1_beta1-gentoo.patch, +libpq-8.1_beta1.ebuild:
+  Version bump.
+
+  17 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> libpq-8.0.3.ebuild:
+  Stable on sh.
+
+  03 Aug 2005; Masatomo Nakano <nakano@gentoo.org> libpq-7.3.10-r1.ebuild,
+  libpq-7.4.8-r1.ebuild, libpq-8.0.1-r1.ebuild, libpq-8.0.3-r1.ebuild:
+  Added ${ROOT} value.
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libpq-8.0.3.ebuild:
+  Stable on alpha.
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> libpq-8.0.3.ebuild:
+  ppc stable
+
+  28 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> libpq-8.0.3.ebuild:
+  Stable on amd64.
+
+*libpq-8.0.3-r1 (27 Jul 2005)
+*libpq-8.0.1-r1 (27 Jul 2005)
+*libpq-7.4.8-r1 (27 Jul 2005)
+*libpq-7.3.10-r1 (27 Jul 2005)
+
+  27 Jul 2005; Masatomo Nakano <nakano@gentoo.org> +libpq-7.3.10-r1.ebuild,
+  +libpq-7.4.8-r1.ebuild, +libpq-8.0.1-r1.ebuild, +libpq-8.0.3-r1.ebuild:
+  Version bump to make sure fixing previous bugs.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> libpq-8.0.3.ebuild:
+  Stable on ppc64
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> libpq-8.0.3.ebuild:
+  Stable on sparc
+
+  20 Jul 2005; Masatomo Nakano <nakano@gentoo.org> libpq-8.0.3.ebuild:
+  Stable on x86.
+
+  20 Jul 2005; Masatomo Nakano <nakano@gentoo.org> libpq-8.0.3.ebuild:
+  Marked stable on x86.
+
+  14 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> libpq-8.0.1.ebuild:
+  Stable on hppa.
+
+  12 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> libpq-8.0.1.ebuild:
+  Stable on sparc
+
+  09 Jul 2005; Markus Rothe <corsair@gentoo.org> libpq-8.0.1.ebuild:
+  Stable on ppc64
+
+  06 Jul 2005; Masatomo Nakano <nakano@gentoo.org> libpq-8.0.1.ebuild:
+  Marked stable on x86.
+
+  06 Jul 2005; Masatomo Nakano <nakano@gentoo.org> libpq-7.4.8.ebuild:
+  Marked stable on x86.
+
+  03 Jul 2005; Masatomo Nakano <nakano@gentoo.org> libpq-7.3.10.ebuild:
+  Marked stable on x86.
+
+  02 Jul 2005; Masatomo Nakano <nakano@gentoo.org> libpq-7.3.10.ebuild,
+  libpq-7.4.8.ebuild, libpq-8.0.1.ebuild, libpq-8.0.3.ebuild:
+  Fixed wrong symlink problem. (#97684).
+
+  19 May 2005; MATSUU Takuto <matsuu@gentoo.org> libpq-7.3.10.ebuild,
+  libpq-7.4.8.ebuild, libpq-8.0.1.ebuild, libpq-8.0.3.ebuild:
+  Fixed build errors, Bug 93103.
+
+*libpq-8.0.1 (16 May 2005)
+*libpq-7.4.8 (16 May 2005)
+*libpq-7.3.10 (16 May 2005)
+
+  16 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/libpq-3.2-gentoo.patch, -files/libpq-4.0-gentoo.patch,
+  +files/libpq-7.3.10-gentoo.patch, +files/libpq-7.4.8-gentoo.patch,
+  +files/libpq-8.0.1-gentoo.patch, -libpq-3.2.ebuild, -libpq-4.0.ebuild,
+  +libpq-7.3.10.ebuild, +libpq-7.4.8.ebuild, +libpq-8.0.1.ebuild:
+  Changed pacakge name to PostgreSQL version base.
+
+*libpq-8.0.3 (15 May 2005)
+
+  15 May 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/libpq-8.0.3-gentoo.patch, +libpq-8.0.3.ebuild:
+  Version bumped.
+  Clean up ebuild.
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org> libpq-3.2.ebuild,
+  libpq-4.0.ebuild:
+  Added missing include files.
+
+  08 May 2005; Masatomo Nakano <nakano@gentoo.org> libpq-3.2.ebuild,
+  libpq-4.0.ebuild:
+  Added header file.
 
 *libpq-4.0 (08 May 2005)
 *libpq-3.2 (08 May 2005)
diff --git a/dev-db/libpq/Manifest b/dev-db/libpq/Manifest
index 2bb23c0f39b2..e654d5ddad31 100644
--- a/dev-db/libpq/Manifest
+++ b/dev-db/libpq/Manifest
@@ -1,6 +1,44 @@
-MD5 7af35247f42930e966d43b25d1a51b30 libpq-3.2.ebuild 2282
-MD5 14fb58b52c0de32c555fb6422c5b5fd4 libpq-4.0.ebuild 2282
-MD5 637716f510743dd4c21c51980eb76659 files/libpq-3.2-gentoo.patch 2300
-MD5 5f9040f91914a9aba8ebee9bff295909 files/libpq-4.0-gentoo.patch 2300
-MD5 0540e6c42fdd652b981e236ea835c524 files/digest-libpq-3.2 75
-MD5 ed4897962e8062c29d0a6a2256597034 files/digest-libpq-4.0 75
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1b3a30d6d22118e36f1df7b9b23be356 ChangeLog 5575
+MD5 f7905db93301407b9caf37581e270d1f files/digest-libpq-7.3.10 76
+MD5 f7905db93301407b9caf37581e270d1f files/digest-libpq-7.3.10-r1 76
+MD5 f34efbb3e6de0d5c486266027f3d22bb files/digest-libpq-7.3.11 76
+MD5 582e557cd0b0ea25adf5798062de0f76 files/digest-libpq-7.4.8 75
+MD5 582e557cd0b0ea25adf5798062de0f76 files/digest-libpq-7.4.8-r1 75
+MD5 d94ecc0ac517255bd89be01c47b98965 files/digest-libpq-7.4.9 75
+MD5 0540e6c42fdd652b981e236ea835c524 files/digest-libpq-8.0.1 75
+MD5 0540e6c42fdd652b981e236ea835c524 files/digest-libpq-8.0.1-r1 75
+MD5 b8a68c8f7fbe4116f7d39a520a3da8c9 files/digest-libpq-8.0.3 75
+MD5 b8a68c8f7fbe4116f7d39a520a3da8c9 files/digest-libpq-8.0.3-r1 75
+MD5 367406ade9a1b166e72176820c668991 files/digest-libpq-8.0.4 75
+MD5 c65318050cafd5c0bdf6ed7d39862269 files/digest-libpq-8.1.0 75
+MD5 07e1154edfd02b73a7772384ce2238b2 files/libpq-7.3.10-gentoo.patch 2072
+MD5 7a29dc98f91e9ea7ee656e96625b0184 files/libpq-7.3.11-gentoo.patch 2072
+MD5 5256293555f24dec0d84734c19784174 files/libpq-7.4.8-gentoo.patch 2599
+MD5 e8e95e615347058623323c725b07d209 files/libpq-7.4.9-gentoo.patch 2599
+MD5 a29e8334813c549e8d3d7bcc2e364a66 files/libpq-8.0.1-gentoo.patch 2306
+MD5 91bb6f54ae3772de8b4b98ef69b79f95 files/libpq-8.0.3-gentoo.patch 2306
+MD5 a97e836d42666b53daf47fd332c0fafb files/libpq-8.0.4-gentoo.patch 2306
+MD5 4d194eeac76cacf47c7b941be2c27df9 files/libpq-8.1.0-gentoo.patch 2400
+MD5 80efa3f9be3dce96088f3fc626ae6bd6 libpq-7.3.10-r1.ebuild 3081
+MD5 9e8901b125ae6be1e446be72b9941ed5 libpq-7.3.10.ebuild 3061
+MD5 5017210c9929d68d3e7b6964f81ea119 libpq-7.3.11.ebuild 3078
+MD5 e61fa03ac49bf3408c6d4a4d7de58991 libpq-7.4.8-r1.ebuild 3080
+MD5 1977f9eded328f6d4d71a273c09b85f1 libpq-7.4.8.ebuild 3058
+MD5 9bc8bdc267f7116e1e96f4e22ed6bf4c libpq-7.4.9.ebuild 3076
+MD5 acf75c9f711c06465cfd4d12e10216bb libpq-8.0.1-r1.ebuild 3080
+MD5 9fa7935f972ecff47e88b5b055ae4bb7 libpq-8.0.1.ebuild 3057
+MD5 f34036f990aa5436290685ab57d22e10 libpq-8.0.3-r1.ebuild 3084
+MD5 c17282c317e8a3e992320ee79cae447b libpq-8.0.3.ebuild 3057
+MD5 956bcec95403b8aea0af0d59c6d76204 libpq-8.0.4.ebuild 3060
+MD5 2ceebd878aa111d3ab16bba5e945f7d2 libpq-8.1.0.ebuild 3071
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgBMmgIKl8Uu19MoRAliDAJ4qaOWtrPIehJ2IYTnvrIhXLWYmQACcCGAZ
+WFsl/OCF0Hq/CPHWn5ZGv5I=
+=0FM7
+-----END PGP SIGNATURE-----
diff --git a/dev-db/libpq/files/libpq-8.1.0-gentoo.patch b/dev-db/libpq/files/libpq-8.1.0-gentoo.patch
index 9061ba355ceb..f7b19210383c 100644
--- a/dev-db/libpq/files/libpq-8.1.0-gentoo.patch
+++ b/dev-db/libpq/files/libpq-8.1.0-gentoo.patch
@@ -1,7 +1,7 @@
-diff -Naur postgresql-8.1.0.orig/src/Makefile.shlib postgresql-8.1.0/src/Makefile.shlib
---- postgresql-8.1.0.orig/src/Makefile.shlib	2004-11-21 06:13:04.000000000 +0900
-+++ postgresql-8.1.0/src/Makefile.shlib	2005-05-15 13:30:59.000000000 +0900
-@@ -355,7 +355,7 @@
+diff -Naru postgresql-8.1.0.org/src/Makefile.shlib postgresql-8.1.0/src/Makefile.shlib
+--- postgresql-8.1.0.org/src/Makefile.shlib	2005-11-12 20:26:09.000000000 +0000
++++ postgresql-8.1.0/src/Makefile.shlib	2005-11-12 20:28:28.000000000 +0000
+@@ -363,10 +363,10 @@
  install-lib: install-lib-static install-lib-shared
  
  install-lib-static: lib$(NAME).a
@@ -9,20 +9,24 @@ diff -Naur postgresql-8.1.0.orig/src/Makefile.shlib postgresql-8.1.0/src/Makefil
 +	$(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
  ifeq ($(PORTNAME), darwin)
  	cd $(DESTDIR)$(libdir) && \
- 	ranlib lib$(NAME).a
-diff -Naur postgresql-8.1.0.orig/src/interfaces/libpq/Makefile postgresql-8.1.0/src/interfaces/libpq/Makefile
---- postgresql-8.1.0.orig/src/interfaces/libpq/Makefile	2005-04-29 23:07:34.000000000 +0900
-+++ postgresql-8.1.0/src/interfaces/libpq/Makefile	2005-05-15 13:33:14.000000000 +0900
+-	ranlib lib$(NAME).a
++	ranlib lib$(NAME_STATIC_LIB).a
+ endif
+ 
+ ifeq ($(enable_shared), yes)
+diff -Naru postgresql-8.1.0.org/src/interfaces/libpq/Makefile postgresql-8.1.0/src/interfaces/libpq/Makefile
+--- postgresql-8.1.0.org/src/interfaces/libpq/Makefile	2005-11-12 20:26:09.000000000 +0000
++++ postgresql-8.1.0/src/interfaces/libpq/Makefile	2005-11-12 20:28:02.000000000 +0000
 @@ -20,6 +20,8 @@
- SO_MINOR_VERSION= 0
+ SO_MINOR_VERSION= 1
  DLTYPE= library
  
 +NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
 +
  override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
+ ifneq ($(PORTNAME), win32)
  override CFLAGS += $(PTHREAD_CFLAGS)
- 
-@@ -136,7 +138,7 @@
+@@ -135,7 +137,7 @@
  	$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
  	$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
  	$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
@@ -31,13 +35,13 @@ diff -Naur postgresql-8.1.0.orig/src/interfaces/libpq/Makefile postgresql-8.1.0/
  
  installdirs:
  	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
-diff -Naur postgresql-8.1.0.orig/src/interfaces/libpq/nls.mk postgresql-8.1.0/src/interfaces/libpq/nls.mk
---- postgresql-8.1.0.orig/src/interfaces/libpq/nls.mk	2005-01-14 17:57:06.000000000 +0900
-+++ postgresql-8.1.0/src/interfaces/libpq/nls.mk	2005-05-15 13:30:32.000000000 +0900
+diff -Naru postgresql-8.1.0.org/src/interfaces/libpq/nls.mk postgresql-8.1.0/src/interfaces/libpq/nls.mk
+--- postgresql-8.1.0.org/src/interfaces/libpq/nls.mk	2005-11-12 20:26:09.000000000 +0000
++++ postgresql-8.1.0/src/interfaces/libpq/nls.mk	2005-11-12 20:28:02.000000000 +0000
 @@ -1,5 +1,5 @@
  # $PostgreSQL: pgsql/src/interfaces/libpq/nls.mk,v 1.20 2005/01/14 08:57:06 petere Exp $
 -CATALOG_NAME	:= libpq
-+CATALOG_NAME	:= libpq-3
++CATALOG_NAME	:= libpq-4
  AVAIL_LANGUAGES	:= af cs de es fr hr it ko nb pl pt_BR ru sk sl sv tr zh_CN zh_TW
  GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c
  GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
diff --git a/dev-db/libpq/libpq-7.3.10-r1.ebuild b/dev-db/libpq/libpq-7.3.10-r1.ebuild
index 19bc8f38ee8f..b11216924396 100644
--- a/dev-db/libpq/libpq-7.3.10-r1.ebuild
+++ b/dev-db/libpq/libpq-7.3.10-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/dev-db/libpq/libpq-7.3.10-r1.ebuild,v 1.1 2005/07/27 19:32:59 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.10-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -34,8 +34,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
 	# removing wrong symlink which is created by previous ebuild.
-	if [ -L /usr/include/libpq ]; then
-		rm /usr/include/libpq
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
 	fi
 }
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-7.3.10.ebuild b/dev-db/libpq/libpq-7.3.10.ebuild
index dc648bb8c559..ca0b505a5e0a 100644
--- a/dev-db/libpq/libpq-7.3.10.ebuild
+++ b/dev-db/libpq/libpq-7.3.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/dev-db/libpq/libpq-7.3.10.ebuild,v 1.1 2005/05/16 03:49:32 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.10.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="3"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -31,6 +31,14 @@ RDEPEND="virtual/libc
 	kerberos? ( virtual/krb5 )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L /usr/include/libpq ]; then
+		rm /usr/include/libpq
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -62,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
@@ -89,7 +96,7 @@ src_install() {
 	dodir /usr/include/libpq
 	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
 	do
-		dosym ../postgresql/libpq-${SLOT}/$(basename $f) /usr/include/libpq/
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
 	done
 
 	cd ${D}/usr/include/postgresql/libpq-${SLOT}
diff --git a/dev-db/libpq/libpq-7.3.11.ebuild b/dev-db/libpq/libpq-7.3.11.ebuild
index 595b8eda1efc..2e3e020f23e1 100644
--- a/dev-db/libpq/libpq-7.3.11.ebuild
+++ b/dev-db/libpq/libpq-7.3.11.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/dev-db/libpq/libpq-7.3.11.ebuild,v 1.1 2005/10/08 22:59:38 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.3.11.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-7.4.8-r1.ebuild b/dev-db/libpq/libpq-7.4.8-r1.ebuild
index 846e1f66c598..1861757aac68 100644
--- a/dev-db/libpq/libpq-7.4.8-r1.ebuild
+++ b/dev-db/libpq/libpq-7.4.8-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/dev-db/libpq/libpq-7.4.8-r1.ebuild,v 1.1 2005/07/27 19:32:59 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -34,8 +34,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
 	# removing wrong symlink which is created by previous ebuild.
-	if [ -L /usr/include/libpq ]; then
-		rm /usr/include/libpq
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
 	fi
 }
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-7.4.8.ebuild b/dev-db/libpq/libpq-7.4.8.ebuild
index 3e8f4c9f3d50..298831c26482 100644
--- a/dev-db/libpq/libpq-7.4.8.ebuild
+++ b/dev-db/libpq/libpq-7.4.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/dev-db/libpq/libpq-7.4.8.ebuild,v 1.1 2005/05/16 03:49:32 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.8.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="3"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -31,6 +31,14 @@ RDEPEND="virtual/libc
 	kerberos? ( virtual/krb5 )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L /usr/include/libpq ]; then
+		rm /usr/include/libpq
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -62,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
@@ -89,7 +96,7 @@ src_install() {
 	dodir /usr/include/libpq
 	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
 	do
-		dosym ../postgresql/libpq-${SLOT}/$(basename $f) /usr/include/libpq/
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
 	done
 
 	cd ${D}/usr/include/postgresql/libpq-${SLOT}
diff --git a/dev-db/libpq/libpq-7.4.9.ebuild b/dev-db/libpq/libpq-7.4.9.ebuild
index 6518905918b9..73027bcf7556 100644
--- a/dev-db/libpq/libpq-7.4.9.ebuild
+++ b/dev-db/libpq/libpq-7.4.9.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/dev-db/libpq/libpq-7.4.9.ebuild,v 1.1 2005/10/08 22:59:38 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-7.4.9.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-8.0.1-r1.ebuild b/dev-db/libpq/libpq-8.0.1-r1.ebuild
index 7aaa564bab92..0ce92a414ee3 100644
--- a/dev-db/libpq/libpq-8.0.1-r1.ebuild
+++ b/dev-db/libpq/libpq-8.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/dev-db/libpq/libpq-8.0.1-r1.ebuild,v 1.1 2005/07/27 19:32:59 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -34,8 +34,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
 	# removing wrong symlink which is created by previous ebuild.
-	if [ -L /usr/include/libpq ]; then
-		rm /usr/include/libpq
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
 	fi
 }
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-8.0.1.ebuild b/dev-db/libpq/libpq-8.0.1.ebuild
index d4a1f1faeb1e..9358ca47b1bf 100644
--- a/dev-db/libpq/libpq-8.0.1.ebuild
+++ b/dev-db/libpq/libpq-8.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/dev-db/libpq/libpq-8.0.1.ebuild,v 1.1 2005/05/16 03:49:32 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="3"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -31,6 +31,14 @@ RDEPEND="virtual/libc
 	kerberos? ( virtual/krb5 )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L /usr/include/libpq ]; then
+		rm /usr/include/libpq
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -62,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
@@ -89,7 +96,7 @@ src_install() {
 	dodir /usr/include/libpq
 	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
 	do
-		dosym ../postgresql/libpq-${SLOT}/$(basename $f) /usr/include/libpq/
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
 	done
 
 	cd ${D}/usr/include/postgresql/libpq-${SLOT}
diff --git a/dev-db/libpq/libpq-8.0.3-r1.ebuild b/dev-db/libpq/libpq-8.0.3-r1.ebuild
index 0619d793181a..109131d4e6ec 100644
--- a/dev-db/libpq/libpq-8.0.3-r1.ebuild
+++ b/dev-db/libpq/libpq-8.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/dev-db/libpq/libpq-8.0.3-r1.ebuild,v 1.1 2005/07/27 19:32:59 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -34,8 +34,8 @@ MAKEOPTS="${MAKEOPTS} -j1"
 
 pkg_preinst() {
 	# removing wrong symlink which is created by previous ebuild.
-	if [ -L /usr/include/libpq ]; then
-		rm /usr/include/libpq
+	if [ -L ${ROOT}/usr/include/libpq ]; then
+		rm ${ROOT}/usr/include/libpq
 	fi
 }
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-8.0.3.ebuild b/dev-db/libpq/libpq-8.0.3.ebuild
index a3cc6f087882..69b8046ecd10 100644
--- a/dev-db/libpq/libpq-8.0.3.ebuild
+++ b/dev-db/libpq/libpq-8.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/dev-db/libpq/libpq-8.0.3.ebuild,v 1.1 2005/05/15 04:36:55 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="4"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -31,6 +31,14 @@ RDEPEND="virtual/libc
 	kerberos? ( virtual/krb5 )"
 
 MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_preinst() {
+	# removing wrong symlink which is created by previous ebuild.
+	if [ -L /usr/include/libpq ]; then
+		rm /usr/include/libpq
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-gentoo.patch
@@ -62,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
@@ -89,7 +96,7 @@ src_install() {
 	dodir /usr/include/libpq
 	for f in ${D}/usr/include/postgresql/libpq-${SLOT}/libpq/*.h
 	do
-		dosym ../postgresql/libpq-${SLOT}/$(basename $f) /usr/include/libpq/
+		dosym ../postgresql/libpq-${SLOT}/libpq/$(basename $f) /usr/include/libpq/
 	done
 
 	cd ${D}/usr/include/postgresql/libpq-${SLOT}
diff --git a/dev-db/libpq/libpq-8.0.4.ebuild b/dev-db/libpq/libpq-8.0.4.ebuild
index 3de441bb08e6..b3b3c4c88c02 100644
--- a/dev-db/libpq/libpq-8.0.4.ebuild
+++ b/dev-db/libpq/libpq-8.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/dev-db/libpq/libpq-8.0.4.ebuild,v 1.1 2005/10/08 22:59:38 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/postgresql-base-${PV}.tar.bz2"
 
 LICENSE="POSTGRESQL"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh ~sparc x86"
 IUSE="ssl nls pam readline zlib kerberos"
 #pg-hier"
 
@@ -70,7 +70,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/libpq/libpq-8.1.0.ebuild b/dev-db/libpq/libpq-8.1.0.ebuild
index ec6d0bc2ce80..881b0ba04e2b 100644
--- a/dev-db/libpq/libpq-8.1.0.ebuild
+++ b/dev-db/libpq/libpq-8.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/dev-db/libpq/libpq-8.1.0.ebuild,v 1.1 2005/11/08 13:46:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/libpq/libpq-8.1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:37 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic toolchain-funcs
 
@@ -69,7 +69,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	cd ${S}/src/interfaces/libpq
diff --git a/dev-db/m17n-db/ChangeLog b/dev-db/m17n-db/ChangeLog
index 9ea3dcfd882e..4c768c61f4f4 100644
--- a/dev-db/m17n-db/ChangeLog
+++ b/dev-db/m17n-db/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for dev-db/m17n-db
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/ChangeLog,v 1.1 2004/05/16 12:32:15 usata Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> m17n-db-1.2.0.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> m17n-db-1.2.0.ebuild:
+  stable on amd64
+
+  15 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> m17n-db-1.2.0.ebuild:
+  Stable on sparc
+
+  10 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> m17n-db-1.2.0.ebuild:
+  Stable on x86, alpha and ppc.
+
+  12 Jan 2005; Guy Martin <gmsoft@gentoo.org> m17n-db-1.2.0.ebuild:
+  Stable on hppa.
+
+*m17n-db-1.2.0 (02 Jan 2005)
+
+  02 Jan 2005; Mamoru KOMACHI <usata@gentoo.org> +m17n-db-1.2.0.ebuild:
+  Version bumped.
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> m17n-db-1.1.0.ebuild:
+  Stable on sparc.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> m17n-db-1.1.0.ebuild:
+  Stable on amd64.
+
+  03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> m17n-db-1.1.0.ebuild:
+  Stable on x86, alpha and ppc.
+
+*m17n-db-1.1.0 (17 Aug 2004)
+
+  17 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +m17n-db-1.1.0.ebuild:
+  Version bumped.
+
+  01 Aug 2004; MATSUU Takuto <matsuu@gentoo.org> m17n-db-1.0.2.ebuild:
+  Marked amd64 as stable. Added to ~sparc.
+
+  01 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> m17n-db-1.0.2.ebuild:
+  Stable on ppc and alpha.
+
+  18 Jul 2004; Tom Gall <tgall@gentoo.org> m17n-db-1.0.2.ebuild:
+  stable on ppc64, bug #57120
+
+  03 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> m17n-db-1.0.2.ebuild:
+  Added to ~amd64.
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> m17n-db-1.0.2.ebuild:
+  Added to ~ppc.
+
+  15 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> m17n-db-1.0.2.ebuild:
+  Stable on x86 and added to ~alpha
 
 *m17n-db-1.0.2 (16 May 2004)
 
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 367332be3b5e..878199edd368 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1,2 +1,8 @@
-MD5 1648403e27a74604b7b1500c9f1c31d3 m17n-db-1.0.2.ebuild 404
+MD5 0ccc5bc172d67024e97b926d9e0448bc ChangeLog 1910
+MD5 8f84fbb7a6c70bce37561a1f2f1c3c10 m17n-db-1.0.2.ebuild 627
+MD5 c33390859c365ef61f5ed251d23032de m17n-db-1.1.0.ebuild 614
+MD5 80e542974f9600a8c929a80b003dfa33 m17n-db-1.2.0.ebuild 620
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 725519f1fcca0eaf1183d941fe5039da files/digest-m17n-db-1.0.2 65
+MD5 e82ced78997e50904210b5ad6be543c9 files/digest-m17n-db-1.1.0 65
+MD5 1a392872e80608720f5525cc6e7f628f files/digest-m17n-db-1.2.0 65
diff --git a/dev-db/m17n-db/m17n-db-1.0.2.ebuild b/dev-db/m17n-db/m17n-db-1.0.2.ebuild
index 6a778ecfe580..1a118d2b77f6 100644
--- a/dev-db/m17n-db/m17n-db-1.0.2.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.0.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/dev-db/m17n-db/m17n-db-1.0.2.ebuild,v 1.1 2004/05/16 12:32:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 DESCRIPTION="Database for the m17n library"
 HOMEPAGE="http://www.m17n.org/m17n-lib/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 alpha ppc amd64 ppc64 ~sparc"
 
 IUSE=""
 
diff --git a/dev-db/m17n-db/m17n-db-1.1.0.ebuild b/dev-db/m17n-db/m17n-db-1.1.0.ebuild
index ab11b732eea9..2c176c0e88e4 100644
--- a/dev-db/m17n-db/m17n-db-1.1.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.1.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/dev-db/m17n-db/m17n-db-1.1.0.ebuild,v 1.1 2004/08/17 12:51:35 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 DESCRIPTION="Database for the m17n library"
 HOMEPAGE="http://www.m17n.org/m17n-lib/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~ppc64 ~sparc"
+KEYWORDS="x86 alpha ppc amd64 ~ppc64 sparc"
 
 IUSE=""
 
diff --git a/dev-db/m17n-db/m17n-db-1.2.0.ebuild b/dev-db/m17n-db/m17n-db-1.2.0.ebuild
index fee1c421b32a..2d9da437a939 100644
--- a/dev-db/m17n-db/m17n-db-1.2.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.2.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/dev-db/m17n-db/m17n-db-1.2.0.ebuild,v 1.1 2005/01/01 16:01:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 DESCRIPTION="Database for the m17n library"
 HOMEPAGE="http://www.m17n.org/m17n-lib/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.m17n.org/m17n-lib/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~amd64 ~ppc64 ~sparc"
+KEYWORDS="x86 alpha ppc amd64 ppc64 sparc hppa"
 
 IUSE=""
 
diff --git a/dev-db/mergeant/ChangeLog b/dev-db/mergeant/ChangeLog
index 59842c9a1f60..5454269cc594 100644
--- a/dev-db/mergeant/ChangeLog
+++ b/dev-db/mergeant/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for dev-db/mergeant
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.1 2003/03/10 00:46:25 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
+
+*mergeant-0.52 (12 May 2005)
+
+  12 May 2005; Leonardo Boshell <leonardop@gentoo.org> mergeant-0.52.ebuild,
+  files/mergeant-0.52-include_fix.patch:
+  New release. Includes a patch to correct the location of a header file.
+  Added support for 'debug' and 'static' USE flags. Style corrections and
+  updated dependencies. Resolves bug #47347.
+
+  11 May 2005; Leonardo Boshell <leonardop@gentoo.org> mergeant-0.12.1.ebuild:
+  Stable on x86.
+
+*mergeant-0.12.1 (16 Jun 2003)
+
+  16 Jun 2003; Alastair Tse <liquidx@gentoo.org> mergeant-0.12.1.ebuild:
+  new gnomedb release
+
+*mergeant-0.12.0 (03 Jun 2003)
+
+  03 Jun 2003; Alastair Tse <liquidx@gentoo.org> mergeant-0.12.0.ebuild:
+  version bump. applied omf fi
+
+*mergeant-0.11.0 (15 Mar 2003)
+
+  09 Apr 2003; Alastair Tse <liquidx@gentoo.org> mergeant-0.11.0.ebuild:
+  bumped deps for mergeant
+
+  15 Mar 2003; Alastair Tse <liquidx@gentoo.org> mergeant-0.11.0.ebuild:
+  version bump
 
 *mergeant-0.10.0 (10 Mar 2003)
 
diff --git a/dev-db/mergeant/Manifest b/dev-db/mergeant/Manifest
index e69de29bb2d1..ffb8e7aed8e3 100644
--- a/dev-db/mergeant/Manifest
+++ b/dev-db/mergeant/Manifest
@@ -0,0 +1,7 @@
+MD5 e762872660006d6bfc315299ccd329a8 ChangeLog 1310
+MD5 f2b5e6c06f88b108d411d99ac3702992 mergeant-0.52.ebuild 1100
+MD5 68010de90524a3c0c89f125bf317ab0b mergeant-0.12.1.ebuild 1225
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 b437e811d4baf6bbb7a25bc2ad380da4 files/digest-mergeant-0.52 67
+MD5 42ef5f7f3f40c6ee11cac4ab5c0cf7a1 files/mergeant-0.52-include_fix.patch 443
+MD5 40c851ac355e64c4e94e52bbeabf5a2d files/digest-mergeant-0.12.1 69
diff --git a/dev-db/mergeant/mergeant-0.12.1.ebuild b/dev-db/mergeant/mergeant-0.12.1.ebuild
index 02d53cab6587..939ab2c95a19 100644
--- a/dev-db/mergeant/mergeant-0.12.1.ebuild
+++ b/dev-db/mergeant/mergeant-0.12.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/dev-db/mergeant/mergeant-0.12.1.ebuild,v 1.1 2003/06/16 09:43:23 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.12.1.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ DESCRIPTION="Database admin tool using libgnomedb and libgda"
 HOMEPAGE="http://www.gnome-db.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND=">=gnome-extra/libgnomedb-0.12.0
 	>=gnome-extra/libgda-0.12.0
@@ -35,6 +35,6 @@ src_unpack() {
 }
 
 src_install() {
-    # redefined libdir so plugins don't get installed in /usr/lib
+	# redefined libdir so plugins don't get installed in /usr/lib
 	gnome2_src_install "libdir=${D}/usr/share/mergeant/plugins" "dtddir=${D}/usr/share/mergeant/dtd/" "Mergeant_Lang_helpdir=${D}/usr/share/doc/mergeant/C" "scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/" "Pixmapdir=${D}/usr/share/pixmaps/mergeant"
 }
diff --git a/dev-db/mergeant/mergeant-0.52.ebuild b/dev-db/mergeant/mergeant-0.52.ebuild
index d48686df9b73..2cbdacceab9c 100644
--- a/dev-db/mergeant/mergeant-0.52.ebuild
+++ b/dev-db/mergeant/mergeant-0.52.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/dev-db/mergeant/mergeant-0.52.ebuild,v 1.1 2005/05/12 18:36:21 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.52.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils gnome2
 
diff --git a/dev-db/metadata.xml b/dev-db/metadata.xml
index 3314cd360563..bb3ec4e2bb05 100644
--- a/dev-db/metadata.xml
+++ b/dev-db/metadata.xml
@@ -5,5 +5,28 @@
 		The dev-db category contains libraries and utilities for database
 		related programming.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-db enhält Bibliotheken und Werkzeuge für die
+		Datenbank-Programmierung.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-db contiene librerias y utilidades para programación
+		referente a bases de datos.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-dbカテゴリーにはデータベース・プログラミングに関連したライブラリーと
+		ユーティリティが含まれます。
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-db categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+		van verschillende database-programmeertalen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-db chứa các thư viện và tiện ích liên quan
+		đến Cơ sở dữ liệu.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-db contiene librerie ed utilità per la programmazione di basi di dati.
+	</longdescription>
 </catmetadata>
 
diff --git a/dev-db/metakit/ChangeLog b/dev-db/metakit/ChangeLog
index e323cc409fae..f8f3e80e542a 100644
--- a/dev-db/metakit/ChangeLog
+++ b/dev-db/metakit/ChangeLog
@@ -1,9 +1,107 @@
 # ChangeLog for dev-db/metakit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.1 2002/08/05 03:28:41 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/ChangeLog,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
+
+  17 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  metakit-2.4.7.37.ebuild, metakit-2.4.9.2-r1.ebuild,
+  metakit-2.4.9.3-r2.ebuild:
+  Clean up LICENSE, bug 96173.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  metakit-2.4.9.3-r2.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  metakit-2.4.9.3-r2.ebuild:
+  Disable broken make test.
+
+  10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  metakit-2.4.9.3-r2.ebuild:
+  Added to ~ppc.
+
+  09 Apr 2005; Simon Stelling <blubb@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  fix for multilib-strict
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  metakit-2.4.9.3-r2.ebuild:
+  Stable amd64.
+
+  08 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> metakit-2.4.9.2.ebuild,
+  metakit-2.4.9.3-r1.ebuild, metakit-2.4.9.3.ebuild:
+  clean older ebuilds
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> metakit-2.4.7.37.ebuild,
+  metakit-2.4.9.2-r1.ebuild, metakit-2.4.9.2.ebuild,
+  metakit-2.4.9.3-r1.ebuild, metakit-2.4.9.3-r2.ebuild,
+  metakit-2.4.9.3.ebuild:
+  Fix use invocation
+
+  21 Apr 2004; Guy Martin <gmsoft@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  Marked stable on hppa.
+
+  18 Apr 2004; Michael McCabe <randy@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  Added s390 keywords
+
+  06 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  Stable on x86, close bug #46823.
+
+  24 Feb 2004; Sven Blumenstein <bazik@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  Stable on sparc, DEPEND of media-sound/zinf
+
+  22 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  Adding amd64 keyword.
+
+  20 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  metakit-2.4.9.3-r2.ebuild:
+  Fix annoying python2.3 paths which broke emerge on python2.2 systems. Closes
+  bug #42205.
+
+*metakit-2.4.9.3-r2 (14 Feb 2004)
+
+  14 Feb 2004; <kloeri@gentoo.org> metakit-2.4.9.3-r2.ebuild:
+  Fix broken include path.
+
+*metakit-2.4.9.3-r1 (13 Feb 2004)
+
+  13 Feb 2004; <kloeri@gentoo.org> metakit-2.4.9.3-r1.ebuild:
+  Change python-config usage to python_version.
+
+*metakit-2.4.9.3 (29 Jan 2004)
+
+  29 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> metakit-2.4.9.3.ebuild:
+  Added 2.4.9.3 version.
+
+  29 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  metakit-2.4.9.2-r1.ebuild:
+  Marked 2.4.9.2-r1 x86 as requested by author.
+
+  08 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org>
+  metakit-2.4.9.2-r1.ebuild:
+  Fix Python-2.3 issues, closes bug #35168
+
+*metakit-2.4.9.2-r1 (12 Jul 2003)
+
+  03 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Marked stable on hppa.
+
+  12 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to fix python support #23704.
+
+*metakit-2.4.9.2 (06 Apr 2003)
+
+  11 Jun 2003; Seemant Kulleen <seemant@gentoo.org> metakit-2.4.9.2.ebuild:
+  sandbox fix; sed -i being used
+
+  06 Apr 2003; Donny Davies <woodchip@gentoo.org> metakit-2.4.9.2.ebuild:
+  Bump, #18224.
 
 *metakit-2.4.7.37 (4 Aug 2002)
 
-  4 Aug 2002; Donny Davies <woodchip@gentoo.org> :
+  02 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> metakit-2.4.7.37.ebuild:
+  Resolving bug 23855 - einstall instead of make install
 
+  4 Aug 2002; Donny Davies <woodchip@gentoo.org> :
   #1315 comes from jherfurth@arafox.com (Julien Herfurth).
diff --git a/dev-db/metakit/Manifest b/dev-db/metakit/Manifest
index e69de29bb2d1..e1c611e62de0 100644
--- a/dev-db/metakit/Manifest
+++ b/dev-db/metakit/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 86ee030c6cbd46ef7c65f70265b45f67 metakit-2.4.9.2-r1.ebuild 1499
+MD5 37980159b537512d3f6b8779dcdca7d2 metakit-2.4.9.3-r2.ebuild 1620
+MD5 e265ae5e7565700b506264c21064d5c4 metakit-2.4.7.37.ebuild 1549
+MD5 f6527c93e0c64d83806041c255e17f95 ChangeLog 3489
+MD5 0f63d5f3d5f137464097c1539a07496d files/digest-metakit-2.4.9.2-r1 67
+MD5 00fc347ece0536a96f90ddf76d90bf51 files/digest-metakit-2.4.9.3-r2 67
+MD5 e045e605eab23d2201a5ba644558f6e7 files/digest-metakit-2.4.7.37 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCug7WBXaUFmZvwyMRAhuoAKCXHk3eBfAezpaAxmtplgvWa94O/ACg1LSa
+GAmpeDvdDxoMgbyvO/d1s7M=
+=93fT
+-----END PGP SIGNATURE-----
diff --git a/dev-db/metakit/files/digest-metakit-2.4.9.2-r1 b/dev-db/metakit/files/digest-metakit-2.4.9.2-r1
index b1c5a57c8f71..fe9590f9b348 100644
--- a/dev-db/metakit/files/digest-metakit-2.4.9.2-r1
+++ b/dev-db/metakit/files/digest-metakit-2.4.9.2-r1
@@ -1,2 +1 @@
-MD5 5cdd83f6584ab9b95a7c592c976db650 /metakit-2.4.9.2.ebuild 1630
 MD5 d436a49baed1a31d1ef01ea537e4ba63 metakit-2.4.9.2.tar.gz 869805
diff --git a/dev-db/metakit/metakit-2.4.7.37.ebuild b/dev-db/metakit/metakit-2.4.7.37.ebuild
index 154daaaf0e82..c20e9518e976 100644
--- a/dev-db/metakit/metakit-2.4.7.37.ebuild
+++ b/dev-db/metakit/metakit-2.4.7.37.ebuild
@@ -1,16 +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/dev-db/metakit/metakit-2.4.7.37.ebuild,v 1.1 2002/08/05 03:28:41 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.7.37.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 S=${WORKDIR}/${PN}-${PV%.*}
 DESCRIPTION="Embedded database library"
 HOMEPAGE="http://www.equi4.com/metakit/"
 SRC_URI="http://www.equi4.com/pub/mk/${PN}-${PV%.*}-${PV##*.}.tar.gz"
-DEPEND="python? ( >=dev-lang/python-2.2.1 ) tcltk? ( >=dev-lang/tcl-8.3.3-r2 )"
-RDEPEND="${DEPEND}"
-KEYWORDS="x86"
-LICENSE="MetaKit"
+
+LICENSE="MIT"
 SLOT="0"
+KEYWORDS="x86 ppc hppa"
+IUSE="python tcltk"
+
+DEPEND="python? ( >=dev-lang/python-2.2.1 )
+	tcltk? ( >=dev-lang/tcl-8.3.3-r2 )"
 
 src_unpack() {
 	unpack ${A} ; cd ${S}
@@ -38,15 +41,11 @@ src_install () {
 	local pydir
 	pydir=`python-config | cut -d" " -f1 | sed -e 's/-l//g'`/site-packages
 
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
+	einstall
 
-	if [ -n "`use python`" ]
+	if use python
 	then
-		mkdir -p ${D}/usr/lib/${pydir}
+		dodir /usr/lib/${pydir}
 		# Because libmk4py.so export Mk4pyinit, that Python will look for ...
 		# shouldn't do a mv instead of a cp ? Who needs libmk4py.so ?
 		cp ${D}/usr/lib/libmk4py.so ${D}/usr/lib/${pydir}/Mk4py.so
diff --git a/dev-db/metakit/metakit-2.4.9.2-r1.ebuild b/dev-db/metakit/metakit-2.4.9.2-r1.ebuild
index 5ceb524db88b..1ace2e552eca 100644
--- a/dev-db/metakit/metakit-2.4.9.2-r1.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.2-r1.ebuild
@@ -1,14 +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/dev-db/metakit/metakit-2.4.9.2-r1.ebuild,v 1.1 2003/07/13 00:28:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 DESCRIPTION="Embedded database library"
 HOMEPAGE="http://www.equi4.com/metakit/"
 SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
 
+LICENSE="MIT"
 SLOT="0"
-LICENSE="MetaKit"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc hppa"
 IUSE="python tcltk"
 
 DEPEND=">=sys-apps/sed-4
@@ -18,6 +18,12 @@ DEPEND=">=sys-apps/sed-4
 src_unpack() {
 	unpack ${A} ; cd ${S}
 	sed -i "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS}:" unix/Makefile.in
+	PY_VER="$(python -c 'import sys; print sys.version[0:3]')"
+	if [ ${PY_VER} == '2.3' ]; then
+		sed -i "s:/python2.2:/python${PY_VER}:" unix/configure
+		sed -i 's:LONG_LONG :PY_LONG_LONG :' python/scxx/PWONumber.h
+		sed -i 's:\(LONG_LONG\):\(PY_LONG_LONG\):' python/PyRowRef.cpp
+	fi
 }
 
 src_compile() {
@@ -39,7 +45,7 @@ src_install () {
 	local pydir
 	pydir=`python-config | cut -d" " -f1 | sed -e 's/-l//g'`/site-packages
 
-	[ `use python` ] && dodir /usr/lib/${pydir}
+	use python && dodir /usr/lib/${pydir}
 	make DESTDIR=${D} install || die
 
 	dodoc CHANGES README WHATSNEW
diff --git a/dev-db/metakit/metakit-2.4.9.3-r2.ebuild b/dev-db/metakit/metakit-2.4.9.3-r2.ebuild
index ecfd3da74281..ff2036747f00 100644
--- a/dev-db/metakit/metakit-2.4.9.3-r2.ebuild
+++ b/dev-db/metakit/metakit-2.4.9.3-r2.ebuild
@@ -1,36 +1,46 @@
-# 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/dev-db/metakit/metakit-2.4.9.3-r2.ebuild,v 1.1 2004/02/14 00:22:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/metakit/metakit-2.4.9.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
-inherit python
+inherit python multilib
 
 DESCRIPTION="Embedded database library"
 HOMEPAGE="http://www.equi4.com/metakit/"
 SRC_URI="http://www.equi4.com/pub/mk/${P}.tar.gz"
 
-LICENSE="MetaKit"
+LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 sparc s390 hppa ppc"
 IUSE="python tcltk"
 
 DEPEND=">=sys-apps/sed-4
 	python? ( >=dev-lang/python-2.2.1 )
 	tcltk? ( >=dev-lang/tcl-8.3.3-r2 )"
 
+RESTRICT="test"
+
 src_unpack() {
+	python_version
+
 	unpack ${A} ; cd ${S}
-	sed -i "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS}:" unix/Makefile.in
+	# Fix all hardcoded python2.3 paths
+	for name in python/scxx/PWOBase.h python/PyHead.h python/PyStorage.cpp ; do
+		sed -i -e "s:Python.h:python${PYVER}/Python.h:" ${name}
+	done
+	sed -i -e "s:python2.3:python${PYVER}:" unix/configure
+	sed -i -e "s:^\(CXXFLAGS = \).*:\1${CXXFLAGS}:" unix/Makefile.in
 }
 
 src_compile() {
 	local myconf
-	use python && myconf="--with-python"
-	use tcltk && myconf="${myconf} --with-tcl=/usr/include"
+	use python && myconf="--with-python=/usr/include/python${PYVER},/usr/$(get_libdir)/python${PYVER}/site-packages"
+	use tcltk && myconf="${myconf} --with-tcl=/usr/include,/usr/$(get_libdir)"
 
 	CXXFLAGS="${CXXFLAGS}" unix/configure \
 		${myconf} \
 		--host=${CHOST} \
 		--prefix=/usr \
+		--libdir=/usr/$(get_libdir) \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man || die "./configure failed"
 
@@ -40,7 +50,7 @@ src_compile() {
 src_install () {
 	python_version
 
-	[ `use python` ] && dodir /usr/lib/python${PYVER}/site-packages
+	use python && dodir /usr/$(get_libdir)/python${PYVER}/site-packages
 	make DESTDIR=${D} install || die
 
 	dodoc CHANGES README WHATSNEW
diff --git a/dev-db/monetdb/ChangeLog b/dev-db/monetdb/ChangeLog
index 107f7827abe0..de59d2cfcc95 100644
--- a/dev-db/monetdb/ChangeLog
+++ b/dev-db/monetdb/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-db/monetdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.1 2005/08/07 13:23:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
+
+*monetdb-4.8.2-r1 (16 Sep 2005)
+
+  16 Sep 2005; Fabian Groffen <grobian@gentoo.org> +monetdb-4.8.2-r1.ebuild:
+  Addding a first revision that removes files that have nothing to do with
+  MonetDB or even clash with other packages (such as /usr/bin/epsffit) before
+  installing.
+
+  10 Sep 2005; Fabian Groffen <grobian@gentoo.org> monetdb-4.8.2.ebuild:
+  Stable on x86
 
 *monetdb-4.8.2 (06 Aug 2005)
 
diff --git a/dev-db/monetdb/Manifest b/dev-db/monetdb/Manifest
index f4ae685f34a6..3cf5bbd215e9 100644
--- a/dev-db/monetdb/Manifest
+++ b/dev-db/monetdb/Manifest
@@ -1,5 +1,6 @@
-MD5 750fb8243ef2b8e842df256859661f65 monetdb-4.8.2.ebuild 6236
-MD5 ec0d944119322b8dd0dfb75b233912ee ChangeLog 556
+MD5 5b401347bd869ace7230323503aa0662 monetdb-4.8.2-r1.ebuild 6937
+MD5 74ff565ca22df33485befde441d66bd8 monetdb-4.8.2.ebuild 6331
+MD5 52e68e41d4b9946f7e7adebb69d98d98 ChangeLog 1011
 MD5 ca9ff61fbe7d29f666c1ffdc61bb168d metadata.xml 801
 MD5 a9a2dbac1941306b506077c635415e7e files/monetdb_config.sh 653
 MD5 739a372d2ff096d674002e3253eb4dad files/monetdb-4.8.2-startup.mil 929
@@ -7,6 +8,7 @@ MD5 e97ba2fc5180dac248822b8264841013 files/monetdb-start.sh 379
 MD5 be0eaed8b26f07c98efcbb9d59e15a64 files/monetdb-4.8.2-gentoo-conf.patch 1038
 MD5 cae0e46fdfa11ea1f0be120005076b83 files/monetdb.init-4.8.2 328
 MD5 09aa9eafe8a4c3073b669baa9ea6ea6d files/monetdb.conf-4.8.2 768
-MD5 ab73e512460465c2653accc427d52e37 files/digest-monetdb-4.8.2 299
+MD5 d952989ef380ae6c092f7ad1da16e77d files/digest-monetdb-4.8.2 299
 MD5 324a083e56c76f02a3ba9ac34c188066 files/monetdb-4.8.2-gentoo-MapiClient.patch 311
 MD5 07e71d02ee02ca4ebfbc4db68fa4f40e files/monetdb-stop.sh 626
+MD5 d952989ef380ae6c092f7ad1da16e77d files/digest-monetdb-4.8.2-r1 299
diff --git a/dev-db/monetdb/files/digest-monetdb-4.8.2 b/dev-db/monetdb/files/digest-monetdb-4.8.2
index ce79c605363a..d682e2e00cdd 100644
--- a/dev-db/monetdb/files/digest-monetdb-4.8.2
+++ b/dev-db/monetdb/files/digest-monetdb-4.8.2
@@ -1,4 +1,4 @@
-MD5 5504707be924ec2c283d2285f72444d5 MonetDB-4.8.2.tar.gz 21260095
+MD5 3fafd56f98a02859b04762ab3d601e37 MonetDB-4.8.2.tar.gz 21255788
 MD5 76d4d4005675b7ed18cf98579124dbfe MonetDB-SQL-2.8.2.tar.gz 1063441
 MD5 5dec7614cd1835e6c1898eb8bb337ac4 MonetDB-XQuery-0.8.2.tar.gz 873414
 MD5 436151071d03a7256a419b779d0c834c monetdb-pathfinder-bison-sources-0.8.2.tar.bz2 79380
diff --git a/dev-db/monetdb/monetdb-4.8.2-r1.ebuild b/dev-db/monetdb/monetdb-4.8.2-r1.ebuild
index 2c6ce7369783..d33d969fe261 100644
--- a/dev-db/monetdb/monetdb-4.8.2-r1.ebuild
+++ b/dev-db/monetdb/monetdb-4.8.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/dev-db/monetdb/monetdb-4.8.2-r1.ebuild,v 1.1 2005/09/16 22:08:49 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.8.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/dev-db/monetdb/monetdb-4.8.2.ebuild b/dev-db/monetdb/monetdb-4.8.2.ebuild
index 6c30c63dd760..66bf419d932b 100644
--- a/dev-db/monetdb/monetdb-4.8.2.ebuild
+++ b/dev-db/monetdb/monetdb-4.8.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/dev-db/monetdb/monetdb-4.8.2.ebuild,v 1.1 2005/08/07 13:23:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/monetdb/monetdb-4.8.2.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -14,15 +14,15 @@ SRC_URI="mirror://sourceforge/monetdb/MonetDB-${PV}.tar.gz
 		ppc-macos? ( mirror://gentoo/monetdb-pathfinder-bison-sources-0.8.2.tar.bz2 )"
 LICENSE="MonetDBPL-1.1 PathfinderPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc-macos"
+KEYWORDS="~ppc-macos x86"
 IUSE="java readline"
 
 DEPEND="virtual/libc
 		sys-devel/flex
 		ppc-macos? ( sys-devel/bison )
 		!ppc-macos? ( >=sys-devel/bison-1.33 )
-		>=sys-devel/gcc-3.3*
-		java? ( >=virtual/jdk-1.4* )
+		>=sys-devel/gcc-3.3
+		java? ( >=virtual/jdk-1.4 )
 		readline? ( >=sys-libs/readline-4.1 )
 		dev-libs/libxml2"
 
diff --git a/dev-db/mtop/ChangeLog b/dev-db/mtop/ChangeLog
index b4363f015cc7..905dd2c24b01 100644
--- a/dev-db/mtop/ChangeLog
+++ b/dev-db/mtop/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mtop
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mtop/ChangeLog,v 1.1 2004/09/13 18:29:05 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mtop/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> mtop-0.6.6.ebuild:
+  Added to ~ppc.
+
+  09 Oct 2004; Simon Stelling <blubb@gentoo.org> mtop-0.6.6.ebuild:
+  added ~amd64
+
+  15 Sep 2004; Thomas Matthijs <axxo@gentoo.org> mtop-0.6.6.ebuild:
+  fixed cvs header
 
 *mtop-0.6.6 (13 Sep 2004)
 
diff --git a/dev-db/mtop/Manifest b/dev-db/mtop/Manifest
index b68f710dddd7..cbf72d1b6467 100644
--- a/dev-db/mtop/Manifest
+++ b/dev-db/mtop/Manifest
@@ -1,4 +1,4 @@
-MD5 b5800581545b34d07f3438aa75faa2ad mtop-0.6.6.ebuild 769
-MD5 0b943d0690f7299fb9423b085a8e0f05 files/digest-mtop-0.6.4 61
-MD5 224251b948aa27536ad3c3a842af7efc files/digest-mtop-0.6.5 61
+MD5 8ba7b1239b77b1af3b66e51af8667528 mtop-0.6.6.ebuild 849
+MD5 5aa49ffb27b338972a57d71dddb691af ChangeLog 629
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 c6c3f43a75962f05aa2139baeb6a1da5 files/digest-mtop-0.6.6 61
diff --git a/dev-db/mtop/metadata.xml b/dev-db/mtop/metadata.xml
index dbfe84ca36cf..716e7d4301bd 100644
--- a/dev-db/mtop/metadata.xml
+++ b/dev-db/mtop/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>mysql-bugs</herd>
+<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/mtop/mtop-0.6.6.ebuild b/dev-db/mtop/mtop-0.6.6.ebuild
index efdebbe07674..250887dbaff8 100644
--- a/dev-db/mtop/mtop-0.6.6.ebuild
+++ b/dev-db/mtop/mtop-0.6.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 : $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mtop/mtop-0.6.6.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://mtop.sourceforge.net"
 SRC_URI="mirror://sourceforge/mtop/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 DEPEND="dev-perl/Curses
 		dev-perl/DBI
diff --git a/dev-db/myodbc/ChangeLog b/dev-db/myodbc/ChangeLog
index 48b4ffff5a47..6fbc6f76e194 100644
--- a/dev-db/myodbc/ChangeLog
+++ b/dev-db/myodbc/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-db/myodbc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.1 2003/10/27 01:59:20 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/ChangeLog,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+  16 Aug 2005; Francesco Riosa <vivo@gentoo.org> myodbc-3.51.11.ebuild:
+  Workaround for bug #102026, now configuring without samples and test
+
+  27 Jul 2005; Francesco Riosa <vivo@gentoo.org> myodbc-3.51.11.ebuild:
+  "unstable" to "stable" after testing on amd64 and x86.
+
+  28 Jun 2005; Simon Stelling <blubb@gentoo.org> myodbc-3.51.11.ebuild:
+  added ~amd64 keyword
+
+*myodbc-3.51.11 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> +metadata.xml,
+  +myodbc-3.51.11.ebuild:
+  Add metadata. New version for mysql-4.1 support.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> myodbc-3.51.06.ebuild:
+  sync IUSE (+debug, +doc, +static)
+
+  07 Dec 2003; Martin Holzer <mholzer@gentoo.org> myodbc-3.51.06.ebuild:
+  adding RESTRICT="nomirror"
 
   26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> myodbc-3.51.06.ebuild,
   files/odbc.ini.m4, files/odbcinst.ini.m4:
diff --git a/dev-db/myodbc/Manifest b/dev-db/myodbc/Manifest
index 523d12085c97..b80d87bbd70b 100644
--- a/dev-db/myodbc/Manifest
+++ b/dev-db/myodbc/Manifest
@@ -1,2 +1,8 @@
-MD5 eb858cfe47b1405f3d46ada3c81699d9 myodbc-3.51.06.ebuild 1475
+MD5 9e5495c7932575e1cb3ca5fef8233e21 myodbc-3.51.11.ebuild 2435
+MD5 0e442cf14faf52ff7cc880f1ee89d2e9 myodbc-3.51.06.ebuild 2366
+MD5 9e1b88e13c5a5108d210d160ac0ecbdc ChangeLog 1320
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
 MD5 af6071c0c469470111c00d957ccad675 files/digest-myodbc-3.51.06 66
+MD5 b305275bdb6622eccc8d3df6e5b59657 files/digest-myodbc-3.51.11 66
+MD5 ef517bf6e6fb65582a5198a63db3b786 files/odbcinst.ini.m4 233
+MD5 bdcd6e3e92526bd31f3dad197f3ff9e4 files/odbc.ini.m4 517
diff --git a/dev-db/myodbc/files/odbc.ini.m4 b/dev-db/myodbc/files/odbc.ini.m4
index f3db4e7463b3..eabd201f2506 100644
--- a/dev-db/myodbc/files/odbc.ini.m4
+++ b/dev-db/myodbc/files/odbc.ini.m4
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/files/odbc.ini.m4,v 1.1 2003/10/27 01:59:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/files/odbc.ini.m4,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 # vim:ts=4 noexpandtab ft=dosini:
 #
 [ODBC Data Sources]
diff --git a/dev-db/myodbc/files/odbcinst.ini.m4 b/dev-db/myodbc/files/odbcinst.ini.m4
index 20e1f996b5b4..de586c08cea4 100644
--- a/dev-db/myodbc/files/odbcinst.ini.m4
+++ b/dev-db/myodbc/files/odbcinst.ini.m4
@@ -1,4 +1,4 @@
-# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/files/odbcinst.ini.m4,v 1.1 2003/10/27 01:59:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/files/odbcinst.ini.m4,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 # vim:ts=4 noexpandtab ft=dosini:
 #
 [__PN__]
diff --git a/dev-db/myodbc/metadata.xml b/dev-db/myodbc/metadata.xml
index dbfe84ca36cf..716e7d4301bd 100644
--- a/dev-db/myodbc/metadata.xml
+++ b/dev-db/myodbc/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>mysql-bugs</herd>
+<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/myodbc/myodbc-3.51.06.ebuild b/dev-db/myodbc/myodbc-3.51.06.ebuild
index dc429ab77778..9840bfe7f37a 100644
--- a/dev-db/myodbc/myodbc-3.51.06.ebuild
+++ b/dev-db/myodbc/myodbc-3.51.06.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/dev-db/myodbc/myodbc-3.51.06.ebuild,v 1.1 2003/10/27 01:59:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-3.51.06.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 MY_PN="MyODBC"
 MY_P="${MY_PN}-${PV}"
@@ -9,10 +9,11 @@ HOMEPAGE="http://www.mysql.com/products/myodbc/"
 SRC_URI="mirror://mysql/Downloads/MyODBC3/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE="debug doc static"
 RDEPEND=">=dev-db/mysql-4 dev-db/unixODBC sys-devel/m4"
 # perl is required for building docs
-DEPEND="${RDEPEND} docs? ( dev-lang/perl )"
+DEPEND="${RDEPEND} doc? ( dev-lang/perl )"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
diff --git a/dev-db/myodbc/myodbc-3.51.11.ebuild b/dev-db/myodbc/myodbc-3.51.11.ebuild
index e91d8d3bb863..a754ddb2a3b8 100644
--- a/dev-db/myodbc/myodbc-3.51.11.ebuild
+++ b/dev-db/myodbc/myodbc-3.51.11.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/dev-db/myodbc/myodbc-3.51.11.ebuild,v 1.1 2005/05/17 09:17:19 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/myodbc/myodbc-3.51.11.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 MY_PN="MyODBC"
 MY_P="${MY_PN}-${PV}"
@@ -10,7 +10,7 @@ SRC_URI="mirror://mysql/Downloads/MyODBC3/${MY_P}.tar.gz"
 RESTRICT="primaryuri"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug doc static"
 RDEPEND=">=dev-db/mysql-4 dev-db/unixODBC sys-devel/m4"
 # perl is required for building docs
@@ -33,6 +33,8 @@ src_compile() {
 		--with-mysql-includes=/usr/include/mysql \
 		--with-odbc-ini=/etc/unixODBC/odbc.ini \
 		--with-unixODBC=/usr \
+		--disable-test \
+		--without-samples \
 		${myconf} || die "econf failed"
 
 	emake || die "emake failed"
diff --git a/dev-db/mysql++/ChangeLog b/dev-db/mysql++/ChangeLog
index 14de8ff4f967..204ad0b56aee 100644
--- a/dev-db/mysql++/ChangeLog
+++ b/dev-db/mysql++/ChangeLog
@@ -1,8 +1,144 @@
 # ChangeLog for dev-db/mysql++
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.1 2002/12/11 22:57:52 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
+*mysql++-2.0.4 (13 Sep 2005)
+
+  13 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-2.0.4.ebuild:
+  Bug #105554, version bump.
+
+*mysql++-1.7.26 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-1.7.34.ebuild, 
+  +files/patch-1.7.34-typo_correction:
+  version bump, bug #91311.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> mysql++-1.7.26.ebuild:
+  stable on amd64
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -files/mysql++-1.7.9-gcc_throw.patch, -files/mysql++-1.7.9-missing.patch,
+  -files/mysql++-1.7.9-mysql4-gcc295.patch,
+  -files/mysql++-1.7.9-mysql4-gcc3.patch,
+  -files/mysql++-1.7.9-r5_gcc333.patch, -files/mysql++-1.7.9_example.patch,
+  -files/mysql++-1.7.9_gcc333.patch, -mysql++-1.7.9-r3.ebuild,
+  -mysql++-1.7.9-r4.ebuild:
+  Remove old builds as they were broken in lots of cases on modern systems.
+
+  28 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> mysql++-1.7.26.ebuild:
+  Stable on ppc.
+
+  17 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> mysql++-1.7.26.ebuild:
+  Stable on alpha, bug 78029.
+
+  15 Jan 2005; Jason Wever <weeve@gentoo.org> mysql++-1.7.26.ebuild:
+  Stable on sparc wrt bug #78029.
+
+  14 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -mysql++-1.7.9-r2.ebuild, -mysql++-1.7.9-r5.ebuild,
+  -mysql++-1.7.9-r6.ebuild, -mysql++-1.7.9.ebuild:
+  Remove some broken old versions, and stabilize .26 on x86.
+
+*mysql++-1.7.26 (10 Jan 2005)
+
+  10 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql++-1.7.26.ebuild:
+  Bug #72069, a new upstream version finally (after 3 years), and we can now
+  rip out all of the nasty patching.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9.ebuild:
+  bug #60345.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysql++-1.7.9-r1.ebuild,
+  mysql++-1.7.9-r2.ebuild, mysql++-1.7.9-r3.ebuild, mysql++-1.7.9-r4.ebuild,
+  mysql++-1.7.9-r5.ebuild, mysql++-1.7.9-r6.ebuild, mysql++-1.7.9.ebuild:
+  sync IUSE (missing)
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> mysql++-1.7.9-r3.ebuild:
+  Stable on sparc.
+
+*mysql++-1.7.9-r6 (18 Jun 2004)
+
+  18 Jun 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r6.ebuild:
+  fix bug bug #54220, and bug #49823 hopefully.
+
+*mysql++-1.7.9-r5 (13 May 2004)
+
+  13 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r5.ebuild,
+  files/mysql++-1.7.9-r5_gcc333.patch:
+  fix bug #50442 in -r5.
+
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> mysql++-1.7.9-r4.ebuild:
+  Stable on alpha.
+
+*mysql++-1.7.9-r4 (03 May 2004)
+
+  03 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r4.ebuild,
+  files/mysql++-1.7.9_gcc333.patch:
+  patch for gcc3.3.3, bug #49590.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> mysql++-1.7.9-r1.ebuild,
+  mysql++-1.7.9-r2.ebuild, mysql++-1.7.9-r3.ebuild:
+  Add die following econf for bug 48950
+
+  12 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> mysql++-1.7.9-r3.ebuild:
+  added gnuconfig_update for amd64 only; marked ~amd64 (fixes bug #47296)
+
+*mysql++-1.7.9-r3 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r3.ebuild,
+  files/mysql++-1.7.9-missing.patch:
+  new revision to fix bug #29840
+
+  16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> mysql++-1.7.9-r2.ebuild:
+  compiles on gcc-3.3 now
+
+*mysql++-1.7.9-r2 (17 Aug 2003)
+
+  17 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r2.ebuild:
+  add latest patches, should fix #23621
+
+  02 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql++-1.7.9-r1.ebuild:
+  $A should NOT be quoted at all in an unpack call
+
+  12 Jun 2003; <msterret@gentoo.org> mysql++-1.7.9.ebuild:
+  fix Header
+
+*mysql++-1.7.9-r1 (08 May 2003)
+
+  11 May 2003; Robin Johnson <robbat2@gentoo.org> mysql++-1.7.9-r1.ebuild:
+  Moved to stable on x86.
+
+  08 May 2003; Robin Johnson <robbat2@gentoo.org> : mysql++-1.7.9-r1.ebuild,
+  files/mysql++-1.7.9-gcc_throw.patch,
+  files/mysql++-1.7.9-mysql4-gcc295.patch,
+  files/mysql++-1.7.9-mysql4-gcc3.patch, files/mysql++-gcc-3.2.patch:
+  Import many fixes for MySQL++ so it works with MySQLv4, as well as removing
+  warnings and other bumpf. Also made sure CFLAGS/CXXFLAGS get used in the
+  compile (they were not previously).
+  Moved the include directory to /usr/include/mysql++ due to breakage caused
+  by the large number of files put into it (it overwrote some other headers); 
+  This may break some other code, testing is needed!
+  Bugs #15688, #20635 resolved.
+  Now use epatch instead of patch to apply patches easier as well.
+  
 *mysql++-1.7.9 (11 Dec 2002)
+  
+  08 May 2003; Robin Johnson <robbat2@gentoo.org> mysql++-1.7.9.ebuild:
+  Moved files/mysql++-gcc-3.2.patch to DISTDIR and gzipped it.
+  Also changed mysql++-gcc-3.2.patch to use the gzipped version
+
+  09 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  mysql++-1.7.9.ebuild:
+  Patching only if gcc3. Closes #12773.
+
+  16 Mar 2003; <rac@gentoo.org> mysql++-1.7.9.ebuild:
+  Change DISTFILES to DISTDIR for gcc 3.0 patch - fix bug #17640
+
+  13 Jan 2003; Ryan Phillips <rphillips@gentoo.org> :
+  Removed gcc 3.0 and moved it to ibiblio... removing bloat
 
   11 Dec 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   Initial version
diff --git a/dev-db/mysql++/Manifest b/dev-db/mysql++/Manifest
index 0a6d328365dc..f77acd19dd0b 100644
--- a/dev-db/mysql++/Manifest
+++ b/dev-db/mysql++/Manifest
@@ -1,6 +1,9 @@
-MD5 da09be5b667366019db93ea42670c02c ChangeLog 554
-MD5 50887df9dae488f9721a7791af0810bb mysql++-1.7.9.ebuild 1543
-MD5 1ae3ec3d9b5337f7805820b0f2d4338c mysql++-1.7.9.ebuild.org 1540
-MD5 bfb4832312c6add08412a9367bab5d19 files/digest-mysql++-1.7.9 133
-MD5 29dd283bdc19e7542a9f50501d4eda70 files/mysql++-1.7.9_example.patch 1203
-MD5 f4467c7ece50c1e366a80887cc2618b1 files/mysql++-gcc-3.2.patch 12811
+MD5 88516f8b28e9cd9fb72310d2da338721 mysql++-1.7.34.ebuild 1778
+MD5 5e750c5bb811880fe4781cd2d8e7fe58 mysql++-2.0.4.ebuild 1321
+MD5 e896a14164f3557f60938f4874e9548f mysql++-1.7.26.ebuild 1722
+MD5 e226f2fbbc6ec167a1f9bf78f0504720 ChangeLog 5467
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
+MD5 3209530832d5be69aaf88e4c55ae8767 files/patch-1.7.34-typo_correction 558
+MD5 629a86ff2c7bff12eab3da2b4bc58dca files/digest-mysql++-2.0.4 66
+MD5 65084d7d1a78fed8de0e81c773c9eeab files/digest-mysql++-1.7.26 66
+MD5 4148208d24ae6b00dd0ccd48445903af files/digest-mysql++-1.7.34 67
diff --git a/dev-db/mysql++/metadata.xml b/dev-db/mysql++/metadata.xml
index dbfe84ca36cf..716e7d4301bd 100644
--- a/dev-db/mysql++/metadata.xml
+++ b/dev-db/mysql++/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>mysql-bugs</herd>
+<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/mysql++/mysql++-1.7.26.ebuild b/dev-db/mysql++/mysql++-1.7.26.ebuild
index 680a18adefa5..5f68be7ae578 100644
--- a/dev-db/mysql++/mysql++-1.7.26.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.26.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/dev-db/mysql++/mysql++-1.7.26.ebuild,v 1.1 2005/01/10 21:16:53 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.26.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
-inherit gcc eutils gnuconfig
+inherit eutils gnuconfig
 
 DESCRIPTION="C++ API interface to the MySQL database"
 # This is the download page but includes links to other places
@@ -11,7 +11,7 @@ SRC_URI="http://www.tangentsoft.net/mysql++/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~hppa ~mips ~sparc ~ppc ~amd64"
+KEYWORDS="x86 alpha ~hppa ~mips sparc ppc amd64"
 IUSE=""
 
 DEPEND=">=dev-db/mysql-4.0
@@ -33,7 +33,7 @@ src_compile() {
 	myconf="${myconf} --includedir=/usr/include/mysql++"
 	# not including the directives to where MySQL is because it seems to
 	# find it just fine without
-	
+
 	# force the cflags into place otherwise they get totally ignored by
 	# configure
 	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
diff --git a/dev-db/mysql++/mysql++-1.7.34.ebuild b/dev-db/mysql++/mysql++-1.7.34.ebuild
index 2905373dda77..3d2c300ad98e 100644
--- a/dev-db/mysql++/mysql++-1.7.34.ebuild
+++ b/dev-db/mysql++/mysql++-1.7.34.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/dev-db/mysql++/mysql++-1.7.34.ebuild,v 1.1 2005/05/17 19:15:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-1.7.34.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils gnuconfig
 
diff --git a/dev-db/mysql++/mysql++-2.0.4.ebuild b/dev-db/mysql++/mysql++-2.0.4.ebuild
index 32a6d1d442e6..b5bddd0bfed4 100644
--- a/dev-db/mysql++/mysql++-2.0.4.ebuild
+++ b/dev-db/mysql++/mysql++-2.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/dev-db/mysql++/mysql++-2.0.4.ebuild,v 1.1 2005/09/13 14:28:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql++/mysql++-2.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils gnuconfig
 
diff --git a/dev-db/mysql-administrator/ChangeLog b/dev-db/mysql-administrator/ChangeLog
index 1a397dc612bc..1923f019545c 100644
--- a/dev-db/mysql-administrator/ChangeLog
+++ b/dev-db/mysql-administrator/ChangeLog
@@ -1,6 +1,130 @@
 # ChangeLog for dev-db/mysql-administrator
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.1 2004/08/25 05:57:55 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/ChangeLog,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
+
+*mysql-administrator-1.1.4 (29 Oct 2005)
+
+  29 Oct 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-administrator-1.1.4.ebuild:
+  Version bump, bug #110507.
+
+*mysql-administrator-1.1.2 (06 Sep 2005)
+
+  06 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.2-optional-4.1-support.patch,
+  +mysql-administrator-1.1.2.ebuild:
+  Version bump.
+
+  12 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.20.ebuild:
+  Removed old ebuild.
+
+  25 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  mysql-administrator-1.0.20.ebuild, mysql-administrator-1.0.22a.ebuild:
+  Updated the common installation prefix to match the one from
+  mysql-query-browser.
+
+  17 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.0.22a-optional-4.1-support.patch,
+  mysql-administrator-1.0.22a.ebuild:
+  Added a patch that makes mysql-administrator work with mysql-4.0. Closes bug
+  #96347.
+
+*mysql-administrator-1.0.22a (16 Jun 2005)
+
+  16 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  -files/1.0.19-crontab.patch, -mysql-administrator-1.0.19-r1.ebuild,
+  mysql-administrator-1.0.20.ebuild, +mysql-administrator-1.0.22a.ebuild:
+  Version bump.
+
+*mysql-administrator-1.0.20 (13 Apr 2005)
+
+  13 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-administrator-1.0.20.ebuild:
+  Version bump.
+
+  11 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.18.ebuild, -mysql-administrator-1.0.19.ebuild:
+  Removed old ebuilds.
+
+*mysql-administrator-1.0.19-r1 (11 Jan 2005)
+
+  11 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.0.19-crontab.patch, +mysql-administrator-1.0.19-r1.ebuild:
+  Revision bump. Correctly check for errors when executing crontab. Should fix
+  bug #62505.
+
+*mysql-administrator-1.0.19 (11 Jan 2005)
+
+  11 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-administrator-1.0.19.ebuild:
+  Version bump, bug #77475.
+
+*mysql-administrator-1.0.18 (20 Dec 2004)
+
+  20 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/mysql-administrator, -mysql-administrator-1.0.13.ebuild,
+  -mysql-administrator-1.0.17a.ebuild, +mysql-administrator-1.0.18.ebuild:
+  Version bump. Removed old ebuilds.
+
+  17 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  mysql-administrator-1.0.13.ebuild, mysql-administrator-1.0.17a.ebuild:
+  Updated depdencies. mysql-administrator doesn't require mysql-4.1.
+
+*mysql-administrator-1.0.17a (12 Dec 2004)
+
+  12 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.16.ebuild, +mysql-administrator-1.0.17a.ebuild:
+  Version bump.
+
+*mysql-administrator-1.0.16 (04 Dec 2004)
+
+  04 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.15.ebuild, +mysql-administrator-1.0.16.ebuild:
+  Version bump.
+
+*mysql-administrator-1.0.15 (01 Dec 2004)
+
+  01 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.14.ebuild, +mysql-administrator-1.0.15.ebuild:
+  Version bump. No more need to use our own wrapper script.
+
+*mysql-administrator-1.0.14 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  mysql-administrator-1.0.13.ebuild, +mysql-administrator-1.0.14.ebuild:
+  Version bump. This version needs >=dev-db/mysql-4.1. Modified the 1.0.13
+  ebuild to depend on <dev-db/mysql-4.1.
+
+  23 Oct 2004; Simon Stelling <blubb@gentoo.org>
+  mysql-administrator-1.0.13.ebuild:
+  added ~amd64
+
+*mysql-administrator-1.0.13 (22 Oct 2004)
+
+  22 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.12.ebuild, +mysql-administrator-1.0.13.ebuild:
+  Version bump.
+
+  17 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-administrator-1.0.10.ebuild:
+  Removed old version.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org>
+  mysql-administrator-1.0.12.ebuild:
+  Added to ~ppc.
+
+*mysql-administrator-1.0.12 (01 Sep 2004)
+
+  01 Sep 2004; Sven Wegener <swegener@gentoo.org>
+  +mysql-administrator-1.0.12.ebuild:
+  Version bump.
+
+*mysql-administrator-1.0.10 (26 Aug 2004)
+
+  26 Aug 2004; Sven Wegener <swegener@gentoo.org>
+  +mysql-administrator-1.0.10.ebuild, -mysql-administrator-1.0.9.ebuild:
+  Version bump. Modified ebuild to install documentation.
 
 *mysql-administrator-1.0.9 (25 Aug 2004)
 
diff --git a/dev-db/mysql-administrator/Manifest b/dev-db/mysql-administrator/Manifest
index 8365602c5f74..9e428a9bf16d 100644
--- a/dev-db/mysql-administrator/Manifest
+++ b/dev-db/mysql-administrator/Manifest
@@ -1,3 +1,20 @@
-MD5 75066533744b2d00e18309d7a60161fb mysql-administrator-1.0.9.ebuild 992
-MD5 5fead5aa247e734c710aba35610e2c95 files/digest-mysql-administrator-1.0.9 78
-MD5 f4c5971bb3d7c7bbcf508e75e7918299 files/1.0.4_beta-gentoo.patch 3441
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f37b62e01cf7fdfea978ef86f0a6e65f ChangeLog 4493
+MD5 a86763ed63c1e913c62e1d3bf05758d7 files/1.0.22a-optional-4.1-support.patch 913
+MD5 60eb595eccb61a19e02a1861cc279ef3 files/1.1.2-optional-4.1-support.patch 901
+MD5 33ebdb0f3afc107d71706f4cfb9aaea6 files/digest-mysql-administrator-1.0.22a 80
+MD5 ec4abd81ff46189511e438f181d3a648 files/digest-mysql-administrator-1.1.2 79
+MD5 5e05a2bb40896075881fcb00588b2012 files/digest-mysql-administrator-1.1.4 79
+MD5 970601ab1b0fc8165fea73976d248ead metadata.xml 739
+MD5 036f53411259d7d8c93c04cbdac66d62 mysql-administrator-1.0.22a.ebuild 1370
+MD5 c12b85b58da32f7a1a7a41f28a826a1f mysql-administrator-1.1.2.ebuild 1301
+MD5 aa370840ac2cacf924ff109adafa04eb mysql-administrator-1.1.4.ebuild 1326
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYs6yI1lqEGTUzyQRAmCHAJ9LRZkLz9f160KPgdJ0QU9YF8ls3QCgom5M
+CPEHb6lSZJXOxfQFdxaMW1c=
+=aWZz
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
index be02ddc3bdea..6db8e22a4a3e 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.0.22a.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/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild,v 1.1 2005/06/16 16:04:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.0.22a.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="MySQL Administrator"
 HOMEPAGE="http://www.mysql.com/products/administrator/"
@@ -23,13 +23,20 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=app-text/scrollkeeper-0.3.11"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PV}-optional-4.1-support.patch
+}
+
 src_compile() {
 	cd "${S}"/mysql-gui-common
-	econf --with-commondirname=common-administrator || die "econf failed"
+	econf --with-commondirname=common/administrator || die "econf failed"
 	emake -j1 || die "emake failed"
 
 	cd "${S}"/mysql-administrator
-	econf --with-commondirname=common-administrator || die "econf failed"
+	econf --with-commondirname=common/administrator || die "econf failed"
 	emake -j1 || die "emake failed"
 }
 
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild
index 1db9dc286c19..ac825756ad5a 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.1.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/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild,v 1.1 2005/09/06 19:20:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild b/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild
index 434c8e32d6aa..47e164ed229e 100644
--- a/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild
+++ b/dev-db/mysql-administrator/mysql-administrator-1.1.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/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild,v 1.1 2005/10/29 01:21:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-administrator/mysql-administrator-1.1.4.ebuild,v 1.1.1.1 2005/11/30 10:11:42 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/dev-db/mysql-query-browser/ChangeLog b/dev-db/mysql-query-browser/ChangeLog
index 344bcfbb6d6d..beb00922d905 100644
--- a/dev-db/mysql-query-browser/ChangeLog
+++ b/dev-db/mysql-query-browser/ChangeLog
@@ -1,6 +1,126 @@
 # ChangeLog for dev-db/mysql-query-browser
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.1 2004/08/25 06:06:31 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/ChangeLog,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+*mysql-query-browser-1.1.17 (29 Oct 2005)
+
+  29 Oct 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-query-browser-1.1.17.ebuild:
+  Version bump.
+
+*mysql-query-browser-1.1.14 (06 Sep 2005)
+
+  06 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-query-browser-1.1.14.ebuild:
+  Version bump.
+
+  12 Aug 2005; Sven Wegener <swegener@gentoo.org>
+  -mysql-query-browser-1.1.7.ebuild, -mysql-query-browser-1.1.9.ebuild:
+  Removed old ebuilds.
+
+*mysql-query-browser-1.1.12 (23 Jun 2005)
+
+  23 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  -files/1.1.11-optional-4.1-support.patch,
+  +files/1.1.12-optional-4.1-support.patch,
+  -files/1.1.11-no-unkown-widgets.patch, -mysql-query-browser-1.1.11.ebuild,
+  +mysql-query-browser-1.1.12.ebuild:
+  Version bump.
+
+  17 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.11-optional-4.1-support.patch,
+  mysql-query-browser-1.1.11.ebuild:
+  Also apply the mysql-4.1 patch from mysql-administrator to
+  mysql-query-browser, bug #96399.
+
+  16 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.1.11-no-unkown-widgets.patch, mysql-query-browser-1.1.11.ebuild:
+  Added a patch that removes references to unknown widgets.
+
+*mysql-query-browser-1.1.11 (16 Jun 2005)
+
+  16 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-query-browser-1.1.11.ebuild:
+  Version bump.
+
+*mysql-query-browser-1.1.9 (02 Jun 2005)
+
+  02 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  -mysql-query-browser-1.1.6.ebuild, mysql-query-browser-1.1.7.ebuild,
+  +mysql-query-browser-1.1.9.ebuild:
+  Version bump, bug #94813.
+
+*mysql-query-browser-1.1.7 (29 Apr 2005)
+
+  29 Apr 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-query-browser-1.1.7.ebuild:
+  Version bump.
+
+  05 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  -mysql-query-browser-1.1.4.ebuild, -mysql-query-browser-1.1.5.ebuild:
+  Removed old ebuilds.
+
+*mysql-query-browser-1.1.6 (04 Mar 2005)
+
+  04 Mar 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-query-browser-1.1.6.ebuild:
+  Version bump.
+
+  21 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  mysql-query-browser-1.1.4.ebuild, mysql-query-browser-1.1.5.ebuild:
+  Bug #75220, fix deps.
+
+  12 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  mysql-query-browser-1.1.4.ebuild, mysql-query-browser-1.1.5.ebuild:
+  Updated HOMEPAGE.
+
+*mysql-query-browser-1.1.5 (07 Jan 2005)
+
+  07 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  +mysql-query-browser-1.1.5.ebuild:
+  Version bump.
+
+*mysql-query-browser-1.1.4 (20 Dec 2004)
+
+  20 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-query-browser-1.1.3a.ebuild, +mysql-query-browser-1.1.4.ebuild:
+  Version bump.
+
+*mysql-query-browser-1.1.3a (12 Dec 2004)
+
+  12 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -mysql-query-browser-1.1.2.ebuild, +mysql-query-browser-1.1.3a.ebuild:
+  Version bump.
+
+*mysql-query-browser-1.1.2 (01 Dec 2004)
+
+  01 Dec 2004; Sven Wegener <swegener@gentoo.org>
+  -files/mysql-query-browser, -mysql-query-browser-1.0.7a_beta.ebuild,
+  -mysql-query-browser-1.1.1.ebuild, +mysql-query-browser-1.1.2.ebuild:
+  Version bump. No more need to use our own wrapper script. Removed old beta
+  ebuilds.
+
+*mysql-query-browser-1.1.1 (22 Nov 2004)
+
+  22 Nov 2004; Sven Wegener <swegener@gentoo.org>
+  mysql-query-browser-1.0.7a_beta.ebuild, +mysql-query-browser-1.1.1.ebuild:
+  Version bump. This version needs >=dev-db/mysql-4.1. Modified the 1.0.7
+  ebuild to depend on <dev-db/mysql-4.1.
+
+  23 Oct 2004; Sven Wegener <swegener@gentoo.org>
+  mysql-query-browser-1.0.7a_beta.ebuild:
+  Added missing dependency on =gnome-extra/libgtkhtml-3.0*. Closes bug #63191.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org>
+  mysql-query-browser-1.0.7a_beta.ebuild:
+  Added to ~ppc.
+
+*mysql-query-browser-1.0.7a_beta (01 Sep 2004)
+
+  01 Sep 2004; Sven Wegener <swegener@gentoo.org> metadata.xml,
+  -mysql-query-browser-1.0.5_alpha.ebuild,
+  +mysql-query-browser-1.0.7a_beta.ebuild:
+  Version bump. Added longdescription to metadata.xml.
 
 *mysql-query-browser-1.0.5_alpha (25 Aug 2004)
 
diff --git a/dev-db/mysql-query-browser/Manifest b/dev-db/mysql-query-browser/Manifest
index dc8732e9a68f..5b6375c54d5d 100644
--- a/dev-db/mysql-query-browser/Manifest
+++ b/dev-db/mysql-query-browser/Manifest
@@ -1,2 +1,19 @@
-MD5 13e521c34c854c46ecaef2dbecf39ee3 mysql-query-browser-1.0.5_alpha.ebuild 1013
-MD5 3d4a2716c67e6adb52f8c7e0225e62ee files/digest-mysql-query-browser-1.0.5_alpha 84
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee720fb8c7c80c213cbafb20ae5d606a ChangeLog 4378
+MD5 60eb595eccb61a19e02a1861cc279ef3 files/1.1.12-optional-4.1-support.patch 901
+MD5 e0966e51958acdc3c52b44c721ea38ea files/digest-mysql-query-browser-1.1.12 79
+MD5 80663e572a70ca0c1744b60b33a63290 files/digest-mysql-query-browser-1.1.14 80
+MD5 5a9466771fd5b83e609c10bd35523c68 files/digest-mysql-query-browser-1.1.17 80
+MD5 28ed354a0713d1b36793acecb2193738 metadata.xml 687
+MD5 4ce6f7cadd3f6fa0f1c14f69649c0f0d mysql-query-browser-1.1.12.ebuild 1390
+MD5 888e8b9b0f9ab40966dce0da3e66e3bd mysql-query-browser-1.1.14.ebuild 1324
+MD5 ca516cc72efef9c11ac818d600145623 mysql-query-browser-1.1.17.ebuild 1225
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYs7sI1lqEGTUzyQRAjKvAJ4kq2mkU/ZH/UABDsmBcie+SL2B3ACguih7
+4QptADGG+MG82nXdy0Zx5A4=
+=r4eI
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysql-query-browser/metadata.xml b/dev-db/mysql-query-browser/metadata.xml
index caced96dcf55..0d45f503f9cf 100644
--- a/dev-db/mysql-query-browser/metadata.xml
+++ b/dev-db/mysql-query-browser/metadata.xml
@@ -7,4 +7,10 @@
   <name>Sven Wegener</name>
   <description>primary maintainer until someone from mysql takes over</description>
 </maintainer>
+<longdescription>
+The MySQL Query Browser is a graphical tool provided by MySQL AB for creating,
+executing, and optimizing queries in a graphical environment. Where the MySQL
+Administrator is designed to administer a MySQL server, the MySQL Query Browser
+is designed to help you query and analyze data stored within the MySQL DBMS.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild
index 067bcf2b1653..7459b2a5c303 100644
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.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/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild,v 1.1 2005/06/23 03:42:23 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.12.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild
index 0d2a2743d181..f30d01a10cbc 100644
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.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/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild,v 1.1 2005/09/06 19:28:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.14.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild b/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild
index ef8783ec1b25..ee5e83a8ff6b 100644
--- a/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild
+++ b/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.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/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild,v 1.1 2005/10/29 01:22:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-query-browser/mysql-query-browser-1.1.17.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/dev-db/mysql-super-smack/ChangeLog b/dev-db/mysql-super-smack/ChangeLog
index afe1f59ea4c0..872de100543a 100644
--- a/dev-db/mysql-super-smack/ChangeLog
+++ b/dev-db/mysql-super-smack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mysql-super-smack
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/ChangeLog,v 1.1 2004/02/24 04:04:37 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/ChangeLog,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
+
+  19 Jul 2004; Robin H. Johnson <robbat2@gentoo.org>
+  mysql-super-smack-1.2.ebuild:
+  stable, ebuild cleanup.
 
 *mysql-super-smack-1.2 (23 Feb 2004)
 
diff --git a/dev-db/mysql-super-smack/Manifest b/dev-db/mysql-super-smack/Manifest
index b4f8e45d025a..fc4ce0ae73db 100644
--- a/dev-db/mysql-super-smack/Manifest
+++ b/dev-db/mysql-super-smack/Manifest
@@ -1,2 +1,5 @@
-MD5 655ff2779368a23363b92304b5d760fe mysql-super-smack-1.2.ebuild 1352
+MD5 e03a1c0a4cb07373fd701bd15610e65d mysql-super-smack-1.2.ebuild 1280
+MD5 69d80f36a512cacad7e4602adc1b2aa2 ChangeLog 570
+MD5 62ae293ebc3602342f798f1b3b044eba metadata.xml 225
 MD5 ffe9980a4253d6b885b1c20fb2de06e5 files/digest-mysql-super-smack-1.2 66
+MD5 d070039b24303c845cbcbf72ed2e088f files/mysql-super-smack-1.2.destdir.patch 420
diff --git a/dev-db/mysql-super-smack/metadata.xml b/dev-db/mysql-super-smack/metadata.xml
index 290fc269207f..51ac8e7be178 100644
--- a/dev-db/mysql-super-smack/metadata.xml
+++ b/dev-db/mysql-super-smack/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>mysql-bugs</herd>
+    <herd>mysql</herd>
     <maintainer><email>robbat2@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild b/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild
index ec7bab4d289d..9f6ade36c463 100644
--- a/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild
+++ b/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild
@@ -1,20 +1,29 @@
-# 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/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild,v 1.1 2004/02/24 04:04:37 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-super-smack/mysql-super-smack-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
+
+inherit eutils
 
 MY_PN="super-smack"
 MY_P="${MY_PN}-${PV}"
 DESCRIPTION="MySQL Super Smack is a benchmarking, stress testing, and load generation tool for MySQL & PostGreSQL"
 HOMEPAGE="http://jeremy.zawodny.com/mysql/${MY_PN}/"
-SRC_URI="${HOMEPAGE}/${MY_P}.tar.gz"
+SRC_URI="http://jeremy.zawodny.com/mysql/${MY_PN}/${MY_P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="mysql postgres"
+
 DEPEND="mysql? ( dev-db/mysql )
-		postgres? ( dev-db/postgresql )"
+	postgres? ( dev-db/postgresql )"
+
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	use !mysql && use !postgres && die "You need to use at least one of USE=mysql or USE=postgres for benchmarking!"
+}
+
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}.destdir.patch
@@ -28,7 +37,6 @@ src_compile() {
 	use postgres && myconf="${myconf} --with-pgsql"
 	myconf="${myconf} --with-datadir=/var/tmp/${MY_PN}"
 	myconf="${myconf} --with-smacks-dir=/usr/share/${MY_PN}"
-	echo $myconf
 	econf ${myconf} || die
 	emake || die
 }
diff --git a/dev-db/mysql/ChangeLog b/dev-db/mysql/ChangeLog
index 65d5100ca20e..0b68413fe42b 100644
--- a/dev-db/mysql/ChangeLog
+++ b/dev-db/mysql/ChangeLog
@@ -1,11 +1,1233 @@
 # ChangeLog for dev-db/mysql
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/ChangeLog,v 1.1.1.1 2005/11/30 10:11:30 chriswhite Exp $
 
-*mysql-3.23.47 (1 Feb 2002)
+  20 Nov 2005; Francesco Riosa <vivo@gentoo.org> files/mysql-slot.rc6:
+  modified rc6 script for slotted server. Return status OK if at least on server
+  is started.
+
+  19 Nov 2005; Francesco Riosa <vivo@gentoo.org> +files/mysql-slot.conf.d,
+  +files/mysql-slot.rc6:
+  These two are born for slotted MySQL, however they work as is on normal MySQL
+  installations too. (require my_print_defaults)
+  Features added or changed
+  - Not using mysqld_safe anymore
+  - preparsing of my.cnf file, all options outed at startup
+  - (possible to) override my.cnf option from conf.d/mysql
+  - Start multiple server with different config files
+  - using new svc "--nicelevel" option, nice level may be specified on per
+    server basis
+  - stronger error handling
+  - some new warnings
+  - slotted mysql management
+
+  06 Nov 2005; Jason Wever <weeve@gentoo.org> mysql-5.0.15.ebuild:
+  Added ~sparc keyword.
+
+  04 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.1.14.ebuild:
+  Stable on sparc wrt #109301
+
+*mysql-5.0.15-r30 (28 Oct 2005)
+*mysql-4.1.15-r30 (28 Oct 2005)
+*mysql-4.0.26-r30 (28 Oct 2005)
+
+  28 Oct 2005; Francesco Riosa <vivo@gentoo.org> +mysql-4.0.26-r30.ebuild,
+  +mysql-4.1.15-r30.ebuild, +mysql-5.0.15-r30.ebuild:
+  pre - pre - pre alpha ebuilds for a slotted MySQL
+
+  27 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, mysql-4.1.14.ebuild, mysql-4.1.15.ebuild,
+  mysql-5.0.13_rc.ebuild, mysql-5.0.15.ebuild:
+  fix bug #110553, removed duplicate code
+
+  25 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.14.ebuild:
+  Backport fixes from 4.1.15, fix Bug 110442
+
+*mysql-5.0.15 (24 Oct 2005)
+
+  24 Oct 2005; Francesco Riosa <vivo@gentoo.org> +mysql-5.0.15.ebuild:
+  Version bump, 5.0.15 is the first version declared GA from upstream
+
+  24 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.15.ebuild:
+  fixed typo, readded /var/log/mysql to binpkg
+
+  24 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.14.ebuild,
+  mysql-4.1.15.ebuild, mysql-5.0.13_rc.ebuild:
+  Added revdep-rebuild --soname hint
+
+  22 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.26.ebuild,
+  -mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild, mysql-4.1.15.ebuild,
+  mysql-5.0.13_rc.ebuild:
+  less destructive zlib removal, still enforcing usage of the system zlib
+
+*mysql-4.1.15 (22 Oct 2005)
+
+  22 Oct 2005; Francesco Riosa <vivo@gentoo.org> -mysql-4.0.22.ebuild,
+  -mysql-4.0.22-r2.ebuild, -mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, -mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild,
+  +mysql-4.1.15.ebuild, -mysql-5.0.12_beta.ebuild, mysql-5.0.13_rc.ebuild:
+  - fix Bug #109951 and Bug #109881
+    Moved again creation of /var/log/mysql/* where it does not cause 
+    problems with FEATURES="collision-protect".
+    Side effect of the previous bug fix is that /var/log/mysql/* files
+    are not included anymore in the binpkg
+  - cleanup of old ebuilds
+  - version bump for 4.1.15
+    Disabling "raid" support with "static" use flag
+    test suite has inverted behaviour than 4.1.14, need to use the perl
+    based one here
+
+  21 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild,
+  mysql-5.0.13_rc.ebuild:
+  Reverted, fix Bug #109881
+
+  20 Oct 2005; Luca Barbato <lu_zero@gentoo.org> mysql-4.1.14.ebuild:
+  Marked ppc
+
+  20 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild,
+  mysql-5.0.13_rc.ebuild:
+  fix Bug #109881 collision-protect stops MySQL upgrade to 4.1.14
+
+  20 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild, mysql-5.0.13_rc.ebuild:
+  - changed upstream upgrade link, Andy Dustman bug #109301, c#10 
+  - unmasked MySQL 5.0, temporary removed keywords that don't have a stable 4.1
+
+  19 Oct 2005; Mark Loeser <halcy0n@gentoo.org> mysql-4.1.14.ebuild:
+  Stable on x86
+
+  19 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org> mysql-4.1.14.ebuild:
+  Marked stable on amd64, bug 109301.
+
+  18 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.14.ebuild:
+  Addressed problem in src_test() (reverted to bash mysql-test program)
+
+  17 Oct 2005; Francesco Riosa <vivo@gentoo.org> mysql-3.23.58-r1.ebuild,
+  mysql-4.0.22.ebuild, mysql-4.0.22-r2.ebuild, mysql-4.0.24.ebuild,
+  mysql-4.0.25-r2.ebuild, mysql-4.0.26.ebuild, mysql-4.1.13-r1.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild, mysql-5.0.13_rc.ebuild:
+  - Bugzilla Bug #109482 emerge --config` should be advised instead of `ebuild
+    ... config
+  - temporary dropped "sh" ARCH due to missing dependency chain on dev-perl/DBI
+
+  13 Oct 2005; Hardave Riar <hardave@gentoo.org> mysql-4.0.25-r2.ebuild:
+  Stable on mips.
+
+  30 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on sh.
+
+*mysql-5.0.13_rc (29 Sep 2005)
+
+  29 Sep 2005; Francesco Riosa <vivo@gentoo.org> +mysql-5.0.13_rc.ebuild,
+  -mysql-5.0.12_beta.ebuild:
+  MySQL-5.0 version bump, first relase candidate.
+  Removed "geometry" USE flag, it will disappear also from the other versions
+  at next bump.
+  Reason for this is recursive failures at compile time or in the test suite.
+  Note that "spatial extensions" (those affected by "geometry") are now always
+  on.
+
+  21 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  mysql_upgrade_warning() updated with hint on innodb logs
+
+  20 Sep 2005; Francesco Riosa <vivo@gentoo.org>
+  -files/mysql-3.23.52-install-db-sh.diff,
+  -files/mysql-3.23-safe-mysqld-sh.diff,
+  -files/mysql-4.0.14-r1-tcpd-vars-fix.diff,
+  -files/mysql-4.0.18-gentoo-nptl.diff,
+  -files/mysql-4.0.18-mysqld-safe-sh.diff,
+  -files/mysql-4.0.21-install-db-sh.diff, -files/mysql-4.0.21-thrssl.patch,
+  -files/mysql-4.0.23-install-db-sh.diff,
+  -files/mysql-4.0.24-manual.texi.patch,
+  -files/mysql-4.0.25-r2-asm-pic-fixes.patch,
+  -files/mysql-4.0-my-print-defaults.diff,
+  -files/mysql-4.0-mysqlhotcopy-security.patch,
+  -files/mysql-4.0-nisam.h.diff, -files/mysql-4.1.9-thrssl.patch,
+  -files/010_all_my-print-defaults-r2.patch,
+  -files/035_x86_asm-pic-fixes-r1.patch,
+  -files/035_x86_asm-pic-fixes-r2.patch,
+  -files/701_all_test-myisam-geometry.patch,
+  -files/mysql-3.23-my-print-defaults.diff,
+  -files/703_all_test-rpl_rotate_logs.patch, -files/mysql-3.23-nisam.h.diff,
+  -files/mysql-accesstmp.patch, -files/mysql-test-myisam-geometry.patch,
+  mysql-3.23.58-r1.ebuild, mysql-4.0.22.ebuild, mysql-4.0.22-r2.ebuild,
+  mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild, mysql-4.0.26.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  Finished the removal of patches from $FILESDIR. All the patches are downloaded
+  separately now.
+
+  20 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.26.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  - Fix Bug #106372, depend of sys-process/procps enabled only if userland_GNU.
+  - Enforced up/downgrade block for different versions.
+  - Using new mysql-extras, only added patches for old ebuilds.
+
+  16 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  disabled also "csv" test when extraengine not set
+  thanks to Marvin Vek, bug #105534, #c6
+
+  12 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  Temporary bug fix for bug #105534, disabling some test of the suite
+
+  12 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.22-r2.ebuild,
+  mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild, mysql-4.0.26.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  Fix for bug #105668 shame on me
+  Other ebuilds ported to the use of mysql-extras instead of $FILESDIR
+
+  11 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.26.ebuild:
+  Added discover of a previous $DATADIR like other recent ebuilds
+
+  11 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.0.26.ebuild, mysql-4.1.13-r1.ebuild, mysql-4.1.14.ebuild,
+  mysql-5.0.12_beta.ebuild:
+  Hidding passwords when requested in pkg_config().
+  Thanks to Martin Schlemmer <azarah@gentoo.org> to point out how to do.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> mysql-4.0.25-r2.ebuild:
+  Mark 4.0.25-r2 stable on alpha
+
+  09 Sep 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.26.ebuild,
+  mysql-4.1.14.ebuild, mysql-5.0.12_beta.ebuild:
+  - Added "MYSQL_STRAIGHT_UPGRADE" to MySQL 4.1 ebuilds, this permit to upgrade
+  plainly from 4.0 series. A similar patch for 5.0 will follow.
+  - Uniformation of mysql-4.1 ebuild to the 5.1 series one, now diff -Naur of the
+  two should be smaller
+  - fix for Bug #103975 dev-db/mysql shouldn't use enewuser and enewgroup in
+  src_install() The bug was introduced when fixing bug #95320.
+  - also mysql-4.1 now downloads mysql-extras-*.tar.bz2 from gentoo mirrors.
+
+*mysql-4.0.26 (08 Sep 2005)
+
+  08 Sep 2005; Francesco Riosa <vivo@gentoo.org> +mysql-4.0.26.ebuild,
+  mysql-5.0.12_beta.ebuild:
+  4.0 series bump to 4.0.26, gradually removing the needs of $FILESDIR
+  minor changes to 5.0 ebuild
+
+*mysql-5.0.12_beta (05 Sep 2005)
+
+  05 Sep 2005; Francesco Riosa <vivo@gentoo.org>
+  files/035_x86_asm-pic-fixes-r1.patch,
+  files/035_x86_asm-pic-fixes-r2.patch,
+  files/010_all_my-print-defaults-r2.patch,
+  files/701_all_test-myisam-geometry.patch, -mysql-5.0.9_beta-r2.ebuild,
+  -mysql-5.0.10_beta.ebuild, +mysql-5.0.12_beta.ebuild:
+  version bump for MySQL-5.0
+  changed comments in patches
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> mysql-4.0.25-r2.ebuild:
+  Stable on ppc64
+
+*mysql-4.1.14 (29 Aug 2005)
+
+  29 Aug 2005; Francesco Riosa <vivo@gentoo.org> +mysql-4.1.14.ebuild:
+  Version bump
+
+  29 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.22.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.24.ebuild, mysql-4.0.25-r2.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-5.0.9_beta-r2.ebuild,
+  mysql-5.0.10_beta.ebuild:
+  Added inheritance of eutils for mysql-5.0.*
+  Replaced shell from "/bin/false" to "-1" as per bug #103421
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mysql-4.0.25-r2.ebuild:
+  Stable on ppc.
+
+  18 Aug 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  mysql-4.0.25-r2.ebuild:
+  Stable on hppa.
+
+  18 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mysql-4.0.25-r2.ebuild:
+  Stable on sparc
+
+  18 Aug 2005; Francesco Riosa <vivo@gentoo.org>
+  -files/mysql-4.0.25-r1-asm-pic-fixes.patch, -mysql-3.23.58.ebuild,
+  -mysql-4.0.22-r1.ebuild, -mysql-4.0.23.ebuild, -mysql-4.0.23-r1.ebuild,
+  -mysql-4.0.23-r2.ebuild, -mysql-4.0.24-r1.ebuild, -mysql-4.0.24-r2.ebuild,
+  -mysql-4.0.25-r1.ebuild, -mysql-4.1.8.ebuild, -mysql-4.1.8-r1.ebuild:
+  Cleanup of dated unstable packages, backup at
+  http://dev.gentoo.org/~vivo/misc/BACKUP-mysql-20050818.tar.gz
+
+  18 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-5.0.9_beta-r2.ebuild,
+  mysql-5.0.10_beta.ebuild:
+  Fix permission of $DATADIR (again) bug #95320
+
+  17 Aug 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.0.25-r2.ebuild:
+  Stable on x86 and amd64, this fix bug #42968 too.
+  Thanks to Martin Mokrejs to pointing this out.
+
+  12 Aug 2005; Francesco Riosa <vivo@gentoo.org>
+  -files/mysql-3.23-db-3.2.3.diff, -files/mysql-3.23.51-tcpd.patch,
+  -files/mysql-3.23-install-db-sh.diff,
+  -files/mysql-4.0.4-install-db-sh.diff, -files/mysql-4.0.13-thrssl.patch,
+  -files/mysql-4.0-db-3.2.1.diff, -files/mysql-4.0.rc6,
+  -files/mysql-4.0.14-mysqld-safe-sh.diff,
+  -files/mysql-4.0.14-security-28394.patch,
+  -files/mysql-4.0.16-install-db-sh.diff,
+  -files/mysql-4.0.16-mysqld-safe-sh.diff, -files/mysql-4.0.17-thrssl.patch,
+  -files/mysql-4.0.18-install-db-sh.diff,
+  -files/mysql-4.0.18-mysqlbugsecurity.diff,
+  -files/mysql-4.0.18-mysqldmultisecurity.diff,
+  -files/mysql-4.0.18-thrssl.patch, -files/mysql-4.0.24-asm-pic-fixes.patch,
+  -files/mysql-4.0-install-db-sh.diff, -files/mysql-4.0-mysqld-safe-sh.diff,
+  -files/mysql-4.1.12-asm-pic-fixes.patch, -files/mysql-gentoo-nptl.diff,
+  -files/rebuilder.sh:
+  Cleanup, backup of removed files exist at
+  http://dev.gentoo.org/~vivo/misc/OBSOLETED_dev-db_mysql_20050804.tar.gz
+
+  29 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  mysql-4.0.25-r2.ebuild:
+  missing $DATADIR in src_install() .
+
+*mysql-5.0.10_beta (29 Jul 2005)
+
+  29 Jul 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.13-r1.ebuild,
+  mysql-5.0.9_beta-r2.ebuild, +mysql-5.0.10_beta.ebuild,
+  +files/035_x86_asm-pic-fixes-r2.patch:
+  New beta version of MySQL 5.0.10
+  This new versions use a different patch to avoid text relocations in the x86
+  assembler files. The new patch has been extracted from upstream one, in the
+  future will be applied to 4.1 series too.
+  
+  fix bug #99891 if datadir (usually "/var/lib/mysql") is in place don't touch
+  it. Applied to MySQL versions 4.1 and 5.0 this change defer to the user the
+  responsibility to manage his own datadir.
+
+  27 Jul 2005; Francesco Riosa <vivo@gentoo.org> mysql-3.23.58.ebuild,
+  mysql-3.23.58-r1.ebuild:
+  Bug 98210
+
+  26 Jul 2005; Francesco Riosa <vivo@gentoo.org> files/my.cnf-4.1,
+  mysql-3.23.58.ebuild, mysql-3.23.58-r1.ebuild, mysql-4.0.22.ebuild,
+  mysql-4.0.22-r1.ebuild, mysql-4.0.22-r2.ebuild, mysql-4.0.23.ebuild,
+  mysql-4.0.23-r1.ebuild, mysql-4.0.23-r2.ebuild, mysql-4.0.24.ebuild,
+  mysql-4.0.24-r1.ebuild, mysql-4.0.24-r2.ebuild, mysql-4.0.25-r1.ebuild,
+  mysql-4.0.25-r2.ebuild, mysql-4.1.8.ebuild, mysql-4.1.8-r1.ebuild,
+  mysql-4.1.13-r1.ebuild, mysql-5.0.9_beta-r2.ebuild:
+  bug #100220 mysqlbinlog my.cnf error, Temporary fix
+  bug #99922
+
+  22 Jul 2005; Francesco Riosa <vivo@gentoo.org> mysql-3.23.58.ebuild,
+  mysql-3.23.58-r1.ebuild, mysql-4.0.22.ebuild, mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.24.ebuild, mysql-4.0.24-r1.ebuild,
+  mysql-4.0.24-r2.ebuild, mysql-4.0.25-r1.ebuild, mysql-4.0.25-r2.ebuild,
+  mysql-4.1.8.ebuild, mysql-4.1.8-r1.ebuild:
+  bug #99922
+
+*mysql-5.0.9_beta-r2 (22 Jul 2005)
+*mysql-4.1.13-r1 (22 Jul 2005)
+
+  22 Jul 2005; Francesco Riosa <vivo@gentoo.org> -mysql-4.1.13.ebuild,
+  +mysql-4.1.13-r1.ebuild, -mysql-5.0.9_beta-r1.ebuild, 
+  +mysql-5.0.9_beta-r2.ebuild:
+  bug #99922
+
+*mysql-4.1.13 (22 Jul 2005)
+
+  22 Jul 2005; Francesco Riosa <vivo@gentoo.org> mysql-3.23.58.ebuild,
+  mysql-3.23.58-r1.ebuild, mysql-4.0.22.ebuild, mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.24.ebuild, mysql-4.0.24-r1.ebuild,
+  mysql-4.0.24-r2.ebuild, mysql-4.0.25-r1.ebuild, mysql-4.0.25-r2.ebuild,
+  mysql-4.1.8.ebuild, mysql-4.1.8-r1.ebuild, -mysql-4.1.12.ebuild,
+  -mysql-4.1.12-r2.ebuild, +mysql-4.1.13.ebuild:
+  Added sys-apps/ed to dependancies, it's used in configure phase of bdb storage
+  engine.
+  New version of 4.1 series
+
+*mysql-4.0.25-r2 (20 Jul 2005)
+
+  20 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysql-4.0.25-r2-asm-pic-fixes.patch, +mysql-4.0.25-r2.ebuild:
+  Gladly to add the upstream version of the patch against text-relocation.
+  Again many thanks to bug #42968 people.
+
+  16 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  -files/mysql-4.0.25-asm-pic-fixes.patch,
+  -files/035_x86_asm-pic-fixes-r2.patch, -mysql-4.0.25.ebuild,
+  -mysql-4.1.12-r1.ebuild, -mysql-5.0.9_beta.ebuild:
+  Removal of dangerous ebuilds
+
+*mysql-5.0.9_beta-r1 (16 Jul 2005)
+*mysql-4.1.12-r2 (16 Jul 2005)
+*mysql-4.0.25-r1 (16 Jul 2005)
+
+  16 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysql-4.0.25-r1-asm-pic-fixes.patch,
+  +files/035_x86_asm-pic-fixes-r1.patch, +mysql-4.0.25-r1.ebuild,
+  +mysql-4.1.12-r2.ebuild, +mysql-5.0.9_beta-r1.ebuild,
+  +010_all_my-print-defaults-r2.patch,  +701_all_test-myisam-geometry.patch,
+  +703_all_test-rpl_rotate_logs.patch:
+  Going back to patches from "PaX Team" since the upstream one give unexpected
+  results running the test suite.
+
+*mysql-5.0.9_beta (15 Jul 2005)
+*mysql-4.1.12-r1 (15 Jul 2005)
+
+  15 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysql-4.0.25-asm-pic-fixes.patch, +mysql-4.0.25.ebuild,
+  +mysql-4.1.12-r1.ebuild, +mysql-5.0.9_beta.ebuild,
+  +files/035_x86_asm-pic-fixes-r2.patch:
+  Added big-tables USE flag, the previous mysql-4.1.12 version had it
+  enabled by default.
+  Patches for hardened installations.
+  A brand new MySQL-5.0 ebuild to start play with it.
+
+*mysql-4.0.25 (15 Jul 2005)
+
+  15 Jul 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysql-4.0.25-asm-pic-fixes.patch, +mysql-4.0.25.ebuild:
+  MySQL-4.0.25, based off MySQL-4.0.24-r2. Added big-tables USE flag.
+  Added patches for hardened installations.
+
+  13 Jul 2005; Francesco Riosa <vivo@gentoo.org> mysql-4.1.12.ebuild:
+  Fix permissions, see bug #95320
+
+  17 May 2005; Markus Rothe <corsair@gentoo.org> mysql-4.1.12.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  18 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.1.12.ebuild:
+  we only need to do the unmerge of an old mysql if a local mysql database
+  exists.
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.24-r2.ebuild,
+  mysql-4.1.12.ebuild:
+  Cleanup a few minor things.
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.1.12.ebuild:
+  Add back ~sparc ~ia64 ~ppc as they had marked an earlier 4.1 release as
+  working.
+
+*mysql-4.1.12 (17 May 2005)
+*mysql-4.0.24-r2 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mysql-4.0.24-asm-pic-fixes.patch, +files/mysql-4.0.24-r2.rc6,
+  +files/my.cnf-4.1, +files/mysql-4.1.9-thrssl.patch,
+  +files/mysql-4.1.12-asm-pic-fixes.patch,
+  +files/mysql-test-myisam-geometry.patch, +mysql-4.0.24-r2.ebuild,
+  +mysql-4.1.12.ebuild:
+  Bug #83011, finally a new mysql-4.1, that is suitable for the main tree.
+  Many thanks to Francesco Riosa <BastianBalthazarBux@pnpitalia.it> for his
+  work on this. These are hardmasked for final testing still.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> mysql-4.1.8.ebuild,
+  mysql-4.1.8-r1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  23 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -mysql-3.23.52-r1.ebuild, -mysql-3.23.56.ebuild, -mysql-3.23.57.ebuild,
+  -mysql-3.23.57-r1.ebuild, -mysql-4.1.7.ebuild:
+  Remove old versions.
+
+  21 Apr 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.0.24-r1.ebuild,
+  mysql-4.0.24.ebuild, mysql-4.1.7.ebuild, mysql-4.1.8-r1.ebuild,
+  mysql-4.1.8.ebuild:
+  Remove nomirror restriction.
+
+  14 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on x86 now that I've throughly tested it.
+
+  14 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on alpha, bug 84819.
+
+  14 Mar 2005; Guy Martin <gmsoft@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on hppa. clamav-0.83.ebuild
+
+  14 Mar 2005; Hardave Riar <hardave@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on mips, bug #84819.
+
+  13 Mar 2005; Markus Rothe <corsair@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on ppc64; bug #84819
+
+  13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> mysql-4.0.24.ebuild:
+  stable on amd64 wrt #84819
+
+  13 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  files/mysql-4.0.24-r1.rc6:
+  Bug #85095, remember to commit the correct final copy of an init.d script
+  instead of an older one!
+
+  13 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.24-r1.ebuild,
+  mysql-4.0.24.ebuild:
+  There is one test case that tries to write outside the sandbox, so we need
+  to catch it better.
+
+  13 Mar 2005; Jason Wever <weeve@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on SPARC wrt security bug #84819.
+
+  13 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> mysql-4.0.24.ebuild:
+  Stable on ppc.
+
+*mysql-4.0.24-r1 (12 Mar 2005)
+
+  12 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/my.cnf-4.0.24-r1, +files/mysql-4.0.24-manual.texi.patch,
+  +files/mysql-4.0.24-r1.rc6, +mysql-4.0.24-r1.ebuild:
+  This new build implements upstream's requested changes as per bug #44592, as
+  well as resolves #79000, and #76194. Collectively, this now provides a
+  minimal MySQL build (note that the server is still built due to MySQL
+  compile process, just not installed).
+
+*mysql-4.0.24 (12 Mar 2005)
+
+  12 Mar 2005; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.0.24.ebuild:
+  MySQL-4.0.24, based strictly off MySQL-4.0.23-r2. Added error checking on
+  epatch statements and a new src_test function. Does not implement the
+  discussion from #44592.
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> mysql-3.23.52-r1.ebuild,
+  mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild, mysql-3.23.57.ebuild,
+  mysql-3.23.58-r1.ebuild, mysql-3.23.58.ebuild, mysql-4.0.22-r2.ebuild,
+  mysql-4.0.22.ebuild, mysql-4.0.23-r1.ebuild, mysql-4.0.23-r2.ebuild,
+  mysql-4.0.23.ebuild, mysql-4.1.7.ebuild, mysql-4.1.8-r1.ebuild,
+  mysql-4.1.8.ebuild:
+  Move sys-apps/procps -> sys-process/procps
+
+  03 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> mysql-4.0.22-r1.ebuild:
+  Dependency update: sys-apps/procps -> sys-process/procps.
+
+  28 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.1.7.ebuild,
+  mysql-4.1.8-r1.ebuild, mysql-4.1.8.ebuild:
+  Properly fix bug #83431, we missed something last time...
+
+  28 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> mysql-4.1.8-r1.ebuild:
+  Added to ~ppc.
+
+  26 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r1.ebuild,
+  mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild, mysql-4.0.23-r1.ebuild,
+  mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild, mysql-4.1.7.ebuild,
+  mysql-4.1.8-r1.ebuild, mysql-4.1.8.ebuild:
+  Bug #83431, fix since 4.0.24 seems to be a long time in releasing.
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> mysql-4.0.22-r2.ebuild,
+  mysql-4.1.8-r1.ebuild:
+  4.0.22-r2 stable on ia64 #77805.  Add ~ia64 to 4.1.8-r1
+
+  14 Feb 2005; Guy Martin <gmsoft@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Stable on hppa.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Marked stable on mips.
+
+  01 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> files/logrotate.mysql:
+  Bug #76909 redux.
+
+  01 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> files/logrotate.mysql:
+  Bug #80308.
+
+  29 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  mysql-3.23.52-r1.ebuild, mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild,
+  mysql-3.23.57.ebuild, mysql-3.23.58-r1.ebuild, mysql-3.23.58.ebuild,
+  mysql-4.0.22-r1.ebuild, mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild,
+  mysql-4.0.23-r1.ebuild, mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild,
+  mysql-4.1.7.ebuild, mysql-4.1.8-r1.ebuild, mysql-4.1.8.ebuild:
+  Add warning about InnoDB, bug #44592.
+
+  23 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  mysql-3.23.52-r1.ebuild, mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild,
+  mysql-3.23.57.ebuild, mysql-3.23.58-r1.ebuild, mysql-3.23.58.ebuild,
+  mysql-4.0.22-r1.ebuild, mysql-4.0.22-r2.ebuild, mysql-4.0.22.ebuild,
+  mysql-4.0.23-r1.ebuild, mysql-4.0.23-r2.ebuild, mysql-4.0.23.ebuild,
+  mysql-4.1.7.ebuild, mysql-4.1.8-r1.ebuild, mysql-4.1.8.ebuild:
+  Fix bug #79216.
+
+  21 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22-r2.ebuild,
+  mysql-4.0.23-r2.ebuild:
+  Stupid bug for older libtool versions, that leaves out .so again :-(.
+
+  21 Jan 2005; Simon Stelling <blubb@gentoo.org> mysql-4.0.22-r2.ebuild:
+  stable on amd64 wrt 77805
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Marked ppc
+
+  20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.1.8-r1.ebuild:
+  Keyworded ~sparc
+
+  20 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Stable on alpha, bug 77805.
+
+  20 Jan 2005; Olivier Crête <tester@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Stable on x86 wrt 77805
+
+  20 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Stable on sparc wrt #77805
+
+  20 Jan 2005; Markus Rothe <corsair@gentoo.org> mysql-4.0.22-r2.ebuild:
+  Stable on ppc64; bug #77805
+
+*mysql-4.0.23-r2 (19 Jan 2005)
+*mysql-4.0.22-r2 (19 Jan 2005)
+
+  19 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-4.0.22-r2.ebuild, +mysql-4.0.23-r2.ebuild:
+  Bug #77805 and #78678, roll out new versions of 4.0.22, 4.0.23. DO NOT USE
+  4.0.23 ON STABLE SYSTEMS, returns the incorrect value for from_unixtime(0).
+
+  19 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.23-r1.ebuild:
+  Undo stable masking on 4.0.23 for nasty upstream bug.
+  http://bugs.mysql.com/bug.php?id=7515. Patched 4.0.22 to come out shortly.
+
+  19 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.0.23-r1.ebuild:
+  Stable on sparc wrt #77805
+
+  19 Jan 2005; Markus Rothe <corsair@gentoo.org> mysql-4.0.23-r1.ebuild:
+  Stable on ppc64; bug #78620
+
+  19 Jan 2005; Olivier Crête <tester@gentoo.org> mysql-4.0.23-r1.ebuild:
+  Stable on x86 wrt security bug 77805
+
+*mysql-4.1.8-r1 (18 Jan 2005)
+
+  18 Jan 2005; Robert Coie <rac@gentoo.org> +files/mysql-accesstmp.patch,
+  +mysql-4.0.23-r1.ebuild, +mysql-4.1.8-r1.ebuild:
+  Fix tempfile handling in mysqlaccess, bug 77805
+
+  06 Jan 2005; Robin H. Johnson <robbat2@gentoo.org> files/logrotate.mysql:
+  Bug #76909, logrotate missingok.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  25 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.23.ebuild,
+  mysql-4.1.8.ebuild:
+  Bug #75524.
+
+*mysql-4.0.22-r1 (23 Dec 2004)
+
+  23 Dec 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +mysql-4.0.22-r1.ebuild:
+  Roll out a temp version of 4.0.22-r1 for testing with bug 65587.
+
+*mysql-4.1.8 (23 Dec 2004)
+*mysql-4.0.23 (23 Dec 2004)
+
+  23 Dec 2004; Robin H. Johnson <robbat2@gentoo.org> +files/logrotate.mysql,
+  +files/mysql-4.0.23-install-db-sh.diff, +mysql-4.0.23.ebuild,
+  +mysql-4.1.7.ebuild, +mysql-4.1.8.ebuild:
+  New versions, and bugs fixed 74248, 74742, 70122, 58469, 50921, 60869.
+
+*mysql-4.1.7 (17 Nov 2004)
+
+  17 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.1.7.ebuild:
+  bug #62582, new major version, package.masked.
+
+  12 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> -mysql-4.0.12.ebuild,
+  -mysql-4.0.13-r4.ebuild, -mysql-4.0.14-r1.ebuild, -mysql-4.0.14-r2.ebuild,
+  -mysql-4.0.14.ebuild, -mysql-4.0.15-r1.ebuild, -mysql-4.0.15.ebuild,
+  -mysql-4.0.16.ebuild, -mysql-4.0.17.ebuild, -mysql-4.0.18-r1.ebuild,
+  -mysql-4.0.18-r2.ebuild, -mysql-4.0.18.ebuild, -mysql-4.0.19.ebuild,
+  -mysql-4.0.20-r1.ebuild, -mysql-4.0.20.ebuild, -mysql-4.0.21.ebuild:
+  cleaned out old 4.0 ebuilds (ok'd by rac)
+
+  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> mysql-4.0.22.ebuild:
+  marked as stable on mips
+
+  02 Nov 2004; Markus Rothe <corsair@gentoo.org> mysql-4.0.22.ebuild:
+  Marked ppc64; bug #69668
+
+  02 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> mysql-4.0.22.ebuild:
+  Stable on alpha, bug 69668.
+
+  02 Nov 2004; Lars Weiler <pylon@gentoo.org> mysql-4.0.22.ebuild:
+  Stable on ppc.  Bug #69668.
+
+  01 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mysql-4.0.22.ebuild:
+  Stable amd64.  Bug #69668.
+
+  01 Nov 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22.ebuild:
+  added texinfo dep for bug #69701.
+
+  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.0.22.ebuild:
+  Stable on sparc
+
+  31 Oct 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.22.ebuild:
+  push 4.0.22 to x86, see bug #69668.
+
+*mysql-4.0.22 (30 Oct 2004)
+
+  30 Oct 2004; Robin H. Johnson <robbat2@gentoo.org> +mysql-4.0.22.ebuild:
+  Version bump.
+
+  26 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> mysql-4.0.21.ebuild:
+  Removed COPYING.LIB from dodoc as the file doesn't exist.
+
+  22 Oct 2004; Danny van Dyk <kugelfang@gentoo.org> mysql-4.0.21.ebuild:
+  Marked stable on amd64.
+
+  22 Oct 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.21.ebuild:
+  stabilize on x86.
+
+  20 Oct 2004; Hardave Riar <hardave@gentoo.org> mysql-4.0.21.ebuild:
+  Stable on mips, bug #67062.
+
+  19 Oct 2004; Guy Martin <gmsoft@gentoo.org> mysql-4.0.21.ebuild:
+  Stable on hppa.
+
+  18 Oct 2004; Tom Gall <tgall@gentoo.org> mysql-4.0.21.ebuild:
+  stable on ppc64, bug #67062
+
+  18 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> mysql-4.0.21.ebuild:
+  Stable on alpha, bug 67062.
+
+  18 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.0.21.ebuild:
+  Stable on sparc wrt #67062
+
+  18 Oct 2004; <SeJo@gentoo.org> mysql-4.0.21.ebuild:
+  stable on ppc : 67062
+
+*mysql-4.0.21 (12 Oct 2004)
+
+  12 Oct 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mysql-4.0.21-install-db-sh.diff, +files/mysql-4.0.21-thrssl.patch,
+  +mysql-4.0.21.ebuild:
+  Bug #63523, version bump.
+
+  26 Sep 2004; Tom Gall <tgall@gentoo.org> mysql-4.0.20-r1.ebuild:
+  stable on ppc64, bug #60744
+
+  06 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> files/mysql-4.0.15.rc6:
+  Use net, not need net.
+
+  06 Sep 2004; Robin H. Johnson <robbat2@gentoo.org> files/mysql-4.0.15.rc6:
+  Fix #62603, #62903.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> mysql-4.0.12.ebuild,
+  mysql-4.0.13-r4.ebuild, mysql-4.0.14-r1.ebuild, mysql-4.0.14-r2.ebuild,
+  mysql-4.0.14.ebuild, mysql-4.0.15-r1.ebuild, mysql-4.0.15.ebuild,
+  mysql-4.0.16.ebuild, mysql-4.0.17.ebuild, mysql-4.0.18-r1.ebuild,
+  mysql-4.0.18-r2.ebuild, mysql-4.0.18.ebuild, mysql-4.0.19.ebuild,
+  mysql-4.0.20-r1.ebuild, mysql-4.0.20.ebuild:
+  Switch to use epause and ebeep, bug #62950.
+
+  01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  get_libdir lovin'.
+
+  28 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-3.23.58-r1.ebuild,
+  mysql-4.0.20-r1.ebuild:
+  Stable on x86. Bug #60744.
+
+  25 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> mysql-3.23.58-r1.ebuild,
+  mysql-4.0.20-r1.ebuild:
+  Stable on alpha, bug 60744.
+
+  24 Aug 2004; Hardave Riar <hardave@gentoo.org> mysql-4.0.20-r1.ebuild:
+  Stable on mips. Bug #60744.
+
+  24 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> mysql-3.23.58-r1.ebuild,
+  mysql-4.0.20-r1.ebuild:
+  Stable on sparc wrt #60744
+
+*mysql-4.0.20-r1 (23 Aug 2004)
+*mysql-3.23.58-r1 (23 Aug 2004)
+
+  23 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mysql-4.0-mysqlhotcopy-security.patch, +mysql-3.23.58-r1.ebuild,
+  +mysql-4.0.20-r1.ebuild:
+  Bug #60744, security.
+
+  22 Aug 2004; Joshua Kinard <kumba@gentoo.org> mysql-4.0.20.ebuild:
+  Marked stable on mips.
+
+  21 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.20.ebuild:
+  Bug #60869, gnuconfig.
+
+  16 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> mysql-4.0.20.ebuild:
+  Stable on sparc and hppa
+
+  14 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> mysql-4.0.20.ebuild:
+  Stable on alpha.
+
+  10 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.20.ebuild:
+  4.0.20 stable on x86.
+
+*mysql-3.23.58 (04 Jul 2004)
+
+  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-3.23.58.ebuild:
+  version bump.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysql-3.23.52-r1.ebuild,
+  mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild, mysql-3.23.57.ebuild,
+  mysql-4.0.12.ebuild, mysql-4.0.13-r4.ebuild, mysql-4.0.14-r1.ebuild,
+  mysql-4.0.14-r2.ebuild, mysql-4.0.14.ebuild, mysql-4.0.15-r1.ebuild,
+  mysql-4.0.15.ebuild, mysql-4.0.16.ebuild, mysql-4.0.17.ebuild,
+  mysql-4.0.18-r1.ebuild, mysql-4.0.18-r2.ebuild, mysql-4.0.18.ebuild,
+  mysql-4.0.19.ebuild, mysql-4.0.20.ebuild:
+  remove bogus use sparc64
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysql-3.23.56.ebuild,
+  mysql-3.23.57-r1.ebuild, mysql-3.23.57.ebuild, mysql-4.0.12.ebuild:
+  sync IUSE (+perl)
+
+  06 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysql-4.0.17.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Tom Gall <tgall@gentoo.org> mysql-4.0.20.ebuild:
+  stable on ppc64, bug #52701
+
+  24 May 2004; Joshua Kinard <kumba@gentoo.org> mysql-4.0.18-r1.ebuild,
+  mysql-4.0.18-r2.ebuild, mysql-4.0.18.ebuild, mysql-4.0.19.ebuild,
+  mysql-4.0.20.ebuild:
+  Marked 4.0.18-r2 stable on mips, removed berkdb check on mips from pkg_setup,
+  and added mips to list of arches that need to build w/o berkdb.
+
+  19 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.18-r2.ebuild,
+  mysql-4.0.20.ebuild:
+  move to enewuser/enewgroup for bug #51533.
+
+*mysql-4.0.20 (19 May 2004)
+
+  19 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.20.ebuild:
+  version bump again, this is prefered over 4.0.19 due to some new upstream bugs.
+
+*mysql-4.0.19 (17 May 2004)
+*mysql-4.0.18-r2 (17 May 2004)
+
+  17 May 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.18-r2.ebuild,
+  mysql-4.0.19.ebuild, files/mysql-4.0.18-mysqldmultisecurity.diff:
+  bug #46242, fix a security hole in mysqld_multi. ansl new 4.0.19.
+
+  29 Apr 2004; Guy Martin <gmsoft@gentoo.org> mysql-4.0.18-r1.ebuild:
+  Marked stable on hppa.
+
+  29 Apr 2004; Jon Portnoy <avenj@gentoo.org> mysql-4.0.18-r1.ebuild :
+  Stable on AMD64 and x86.
+
+  14 Apr 2004; Jason Wever <weeve@gentoo.org> mysql-4.0.18-r1.ebuild:
+  Stable on sparc wrt bug #46242.
+
+  14 Apr 2004; Bryan Østergaard,,, <kloeri@gentoo.org> mysql-4.0.18-r1.ebuild:
+  Stable on Alpha.
+
+  14 Apr 2004; Michael McCabe <randy@gentoo.org> mysql-4.0.18-r1.ebuild:
+  Marking as stable on s390
+
+*mysql-4.0.18-r1 (13 Apr 2004)
+
+  13 Apr 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.18-r1.ebuild,
+  files/mysql-4.0.18-mysqlbugsecurity.diff:
+  add in -r1 for bug #46242, needs more testing first for the automake change
+
+  02 Apr 2004; <randy@gentoo.org> mysql-4.0.18.ebuild:
+  adding s390 keywords
+
+  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> mysql-4.0.17.ebuild:
+  Marked stable on mips.
+
+  10 Mar 2004; Robin Johnson <robbat2@gentoo.org>
+  mysql-4.0.18.ebuild:
+  bug #44308, bump 4.0.18 to same stable level as 4.0.17, strongly recommended
+  that ppc/alpha/mips move to 4.0.18 as well
+
+*mysql-4.0.18 (04 Mar 2004)
+
+  04 Mar 2004; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.18.ebuild,
+  files/mysql-4.0.18-gentoo-nptl.diff, files/mysql-4.0.18-install-db-sh.diff,
+  files/mysql-4.0.18-mysqld-safe-sh.diff, files/mysql-4.0.18-thrssl.patch:
+  Update to latest version from upstream, bug #41465.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> mysql-4.0.17.ebuild:
+  Stable on sparc.
+
+  25 Feb 2004; root <root@gentoo.org> mysql-4.0.17.ebuild:
+  Marked stable on hppa.
+
+  24 Feb 2004; Martin Holzer <mholzer@gentoo.org> mysql-4.0.17.ebuild:
+  x86 stable
+
+  07 Feb 2004; Brad House <brad_mssw@gentoo.org> mysql-4.0.17.ebuild,
+  files/mysql-gentoo-nptl.diff:
+  make mysql compile with nptl-enabled glibc
+
+  04 Feb 2004; Joshua Kinard <kumba@gentoo.org> mysql-4.0.17.ebuild:
+  Added ~mips to KEYWORDS and added a check for the berkdb USE flag if we're on
+  a mips system. MySQL apparently has issues when linked to berkeley db.
+
+*mysql-4.0.17 (10 Jan 2004)
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> mysql-4.0.16.ebuild,
+  mysql-4.0.17.ebuild:
+  add alpha/~alpha keywords
+
+  07 Jan 2004; Jason Wever <weeve@gentoo.org> mysql-4.0.16.ebuild:
+  Marked stable on sparc.
+
+  25 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> :
+  version bump
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> mysql-4.0.16.ebuild:
+  Marked stable on hppa.
+
+  16 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.15.ebuild,
+  mysql-4.0.16.ebuild:
+  move 4.0.16 and 4.0.15 to stable x86
+
+  05 Dec 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-3.23.52-r1.ebuild,
+  mysql-3.23.56.ebuild, mysql-3.23.57-r1.ebuild, mysql-3.23.57.ebuild,
+  mysql-4.0.12.ebuild, mysql-4.0.13-r4.ebuild, mysql-4.0.14-r1.ebuild,
+  mysql-4.0.14-r2.ebuild, mysql-4.0.14.ebuild:
+  fix all chown calls as per bug #35127
+
+  27 Oct 2003; Martin Holzer <mholzer@gentoo.org> metadata.xml,
+  mysql-4.0.13-r4.ebuild, mysql-4.0.14-r1.ebuild, mysql-4.0.14-r2.ebuild,
+  mysql-4.0.14.ebuild, mysql-4.0.15-r1.ebuild, mysql-4.0.15.ebuild,
+  mysql-4.0.16.ebuild:
+  metadata + nomirror
+
+*mysql-4.0.16 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.16.ebuild,
+  files/mysql-4.0.16-install-db-sh.diff,
+  files/mysql-4.0.16-mysqld-safe-sh.diff:
+  version bump as per bug 31806, re-did patching code to use epatch and
+  re-diffed some patches for the new version
+
+*mysql-4.0.15-r1 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.15-r1.ebuild:
+  bump revision and add docs patch from bug #31995
+
+  20 Oct 2003; Christian Birchinger <joker@gentoo.org> mysql-4.0.14-r2.ebuild:
+  Added sparc stable keyword
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> mysql-4.0.14-r1.ebuild,
+  mysql-4.0.14-r2.ebuild, mysql-4.0.14.ebuild, mysql-4.0.15.ebuild:
+  fixed MIRRORS dodoc
+
+  13 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r2.ebuild:
+  bump 4.0.14-r2 to stable
+
+  07 Oct 2003; John Mylchreest <johnm@gentoo.org>; mysql-4.0.15.ebuild:
+  fixing POSIX 1003.1-2001 chown change. '.' now ':'
+
+*mysql-4.0.15 (17 Sep 2003)
+
+  17 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  mysql-4.0.14-r2.ebuild, mysql-4.0.15.ebuild, files/mysql-4.0.15.rc6:
+  version bump to 4.0.15 (improved init.d script included).
+  properly install updated config file (>=4.0.14-r1).
+  ensure correct permissions on data directory after ebuild config (>=4.0.14-r1).
+
+*mysql-3.23.57-r1 (15 Sep 2003)
+
+  15 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> mysql-3.23.57-r1.ebuild:
+  Security update
+
+*mysql-4.0.14-r2 (11 Sep 2003)
+
+  11 Sep 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r2.ebuild:
+  fix bug #28421
+
+*mysql-4.0.13-r4 (10 Sep 2003)
+
+  10 Sep 2003; <solar@gentoo.org> mysql-4.0.13-r4.ebuild,
+  mysql-4.0.14-r2.ebuild, files/mysql-4.0.14-security-28394.patch:
+  secuirty fixes for stable and non stable branches of mysql, see bug 28394 for
+  more info
+
+  27 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild:
+  Fix bug  #27204, thanks to help from forums while I was away on holiday.
+
+  17 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  files/mysql-4.0.14-r1-tcpd-vars-fix.diff:
+  fix source on patch mysql-4.0.14-r1.ebuild
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  files/mysql-4.0.14-r2-tcpd-vars-fix.diff:
+  fix bug #22571
+
+*mysql-4.0.14-r1 (11 Aug 2003)
+
+  11 Aug 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14-r1.ebuild,
+  files/my.cnf-4.0.14-r1:
+  fix bugs #26131 and #24826
+
+  31 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14.ebuild:
+  Remove extraneous warning about a bug that was fixed between .13 and .14
+
+  28 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14.ebuild,
+  files/mysql-4.0.14-mysqld-safe-sh.diff:
+  Finish Fixing 4.0.14 and release
+
+*mysql-4.0.14 (23 Jul 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> mysql-4.0.14.ebuild :
+  Added ~hppa to KEYWORDS.
+
+  23 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.14.ebuild:
+  Version bump
+
+  16 Jul 2003; Christian Birchinger <joker@gentoo.org> mysql-4.0.13-r3.ebuild:
+  Added sparc stable keyword
+
+  12 Jul 2003; Donny Davies <woodchip@gentoo.org> mysql-4.0.13-r3.ebuild:
+  Marked x86 stable.
+
+  12 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-4.0.13-r3.ebuild:
+  Change note about rebuilder.sh to revdep-rebuild.
+
+*mysql-3.23.57 (17 Mar 2003)
+
+  12 Jun 2003; Robin H. Johnson <robbat2@gentoo.org> mysql-3.23.57.ebuild:
+  Version bump.
+
+*mysql-4.0.13-r3 (12 Jun 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> mysql-4.0.13-r3.ebuild :
+  Added hppa to KEYWORDS.
+
+  3 Jun 2003; Robin Johnson <robbat2@gentoo.org> mysql-4.0.13-r3.ebuild:
+  Add SSL warning as per bug #22964.
+
+  12 Jun 2003; Robin Johnson <robbat2@gentoo.org> mysql-4.0.13-r3.ebuild:
+  Show a sensible error message and die if the user has USE="static ssl" as
+  MySQLv4 doesn't support these simultanoeusly.
+
+  12 Jun 2003; <rac@gentoo.org> mysql-4.0.13-r3.ebuild,
+  files/mysql-4.0.13-thrssl.patch:
+  Attempt to make libmysqlclient_r.so link with -lssl
+
+*mysql-4.0.13-r2 (11 Jun 2003)
+
+  11 Jun 2003; <rac@gentoo.org> mysql-4.0.13-r2.ebuild:
+  Allow user CFLAGS to determine -O level, instead of imposing -O3
+
+*mysql-4.0.13-r1 (31 May 2003)
+
+  11 Jun 2003; Donny Davies <woodchip@gentoo.org> mysql-4.0.13-r1.ebuild:
+  Small housecleaning-type fixes.
+
+  31 May 2003; Robin Johnson <robbat2@gentoo.org> mysql-4.0.13-r1.ebuild:
+  Large ebuild cleanup.
+
+*mysql-4.0.13 (21 May 2003) 
+
+  09 May 2003; Robin Johnson <robbat2@gentoo.org> mysql-4.0.13.ebuild:
+  Version bump. Moved to to using mirror:// syntax to support all of the MySQL
+  mirrors.
+
+*mysql-4.0.12 (22 Mar 2003)
+
+  09 May 2003; Robin Johnson <robbat2@gentoo.org> mysql-4.0.12.ebuild,
+  file/rebuilder.sh:
+  Some users still complaining about rebuilder.sh not working. Adding
+  gentoolkit to DEPEND now.
+  rebuilder.sh has been modified to be significently faster and more accurate
+  now.
   
+  05 May 2003; Caleb Tennis <caleb@gentoo.org> files/rebuilder.sh:
+  Fix bug #17723 by posting a note to the user that they need to have
+  gentoolkit emerged before running this script.  Also fix bug #18605 by
+  having the script scan the qt directory too.
+
+  22 Apr 2003; Robin Johnson <robbat2@gentoo.org> files/mysql-4.0.rc6,
+  files/mysql.init:
+  Change dir=`awk...` line to use sed instead in a more reliable manner
+  fixes bug #18833
+
+  06 Apr 2003; Zach Welch <zwelch@gentoo.org> mysql-4.0.12.ebuild:
+  add arm keyword
+
+  22 Mar 2003; Donny Davies <woodchip@gentoo.org> : Version bump, removed
+  from package.mask.  If you're upgrading from MySQL-3.x you can use the
+  "/usr/portage/dev-db/mysql/files/rebuilder.sh" script to obtain the list
+  of packages you'll need to rebuild on your system.
+
+*mysql-3.23.56 (17 Mar 2003)
+
+  17 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+*mysql-4.0.11a-r1 (09 Mar 2003)
+
+  09 Mar 2003; Joshua Brindle <method@gentoo.org> mysql-4.0.11a-r1.ebuild:
+  bug fix for #15099 thanks to dragon
+
+*mysql-3.23.54a-r1 (04 Mar 2003)
+
+  04 Mar 2003; Robert Coie <rac@gentoo.org> mysql-3.23.54a-r1.ebuild:
+  Add PDEPENDs on dev-perl/DBI and dev-perl/DBD-mysql, contingent on
+  USE="perl".  If USE="-perl", take /usr/bin/mysql_setpermission out of
+  the installed files (bug #16301).
+
+*mysql-4.0.11a (01 Mar 2003)
+
+  01 Mar 2003; Donny Davies <woodchip@gentoo.org> : Version bump.
+  Add glibc-2.3.2_pre fix; -DHAVE_ERRNO_AS_DEFINE=1.  Fix readline
+  configure flags.  Add --enable-local-infile to configure.
+
+  23 Feb 2003; Guy Martin <gmsoft@gentoo.org> mysql-3.23.54a.ebuild,
+  mysql-3.23.55.ebuild :  Added --without-berkeley-db to configure for
+  hppa since it's not yet supported on this platform. Added hppa to
+  keywords too.
+
+*mysql-4.0.10 (17 Jan 2003)
+
+  17 Feb 2003; Joshua Brindle <method@gentoo.org> : Latest 'gamma' release.
+  Version bump.
+
+*mysql-3.23.55 (29 Jan 2003)
+
+  11 Mar 2003; Donny Davies <woodchip@gentoo.org> mysql-3.23.55.ebuild:
+  Fix CXXFLAGS; #16767.  Add the PDEPEND from #16301.
+
+  01 Mar 2003; Donny Davies <woodchip@gentoo.org> : mysql-3.23.55.ebuild :
+  Add a build fix for glibc-2.3.2_pre.  Fix readline configure flags, sigh.
+
+  06 Feb 2003; Will Woods <wwoods@gentoo.org>: mysql-3.23.54a.ebuild, mysql-3.23.54a.ebuild
+  Disable berkdb on alpha, since it's not supported there.
+
+  29 Jan 2003; Donny Davies <woodchip@gentoo.org> : New testing release.
+  Fix #12933, #13429.
+
+*mysql-4.0.7 (04 Jan 2003)
+
+  04 Jan 2003; Donny Davies <woodchip@gentoo.org> : Latest 'gamma' release.
+  Sync initscript.
+
+*mysql-3.23.54a (16 Dec 2002)
+
+  16 Dec 2002; Donny Davies <woodchip@gentoo.org> : Version bump.
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> mysql-3.23.52-r1.ebuild :
+  Add alpha to KEYWORDS
+
+*mysql-3.23.54 (13 Dec 2002)
+
+  13 Dec 2002; Donny Davies <woodchip@gentoo.org> : Update to latest.
+  This release fixes a remote DoS vulnerability; upgrade reccomended.
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> mysql-3.23.52-r1.ebuild : 
+  Changed sparc64 to sparc keyword
+ 
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> mysql-3.23.53.ebuildi, mysql-4.0.5_beta.ebuild :
+  Changed ~sparc64 to ~sparc keyword
+
+*mysql-4.0.5_beta (29 Nov 2002)
+
+  29 Nov 2002; Donny Davies <woodchip@gentoo.org> : Chase latest.
+  Closes #11011, #11233.  The new initscript still needs to be synced with
+  the old one.
+
+  03 Nov 2002; Nicholas Henke <roughneck@gentoo.org> mysql-3.23.52-r2.ebuild  :
+  added ppc to keywords
+
+  28 Oct 2002; Donny Davies <woodchip@gentoo.org> mysql.init :
+  Behave more carefully in stop().  Thanks psi-jack@myrealbox.com.
+
+*mysql-4.0.1 (19 Nov 2002)
+
+  19 Nov 2002; Ryan Phillips <rphillips@gentoo.org> mysql-4.0.1_alpha.ebuild :
+  Fixed DB dep. Fixes #10839
+
+*mysql-3.23.53 (27 Oct 2002)
+
+  27 Oct 2002; Donny Davies <woodchip@gentoo.org> : Chase latest release.
+  Close #9481, #9335.
+
+*mysql-3.23.52-r1 (29 Sep 2002)
+  
+  20 Oct 2002; Seemant Kulleen <seemant@gentoo.org> mysql-3.23.52-r1.ebuild :
+  Changed the sparc USE check per bug #9372 by torgeir@trenger.ro (Torgeir
+  Hansen)
+
+  15 Oct 2002; <mcummings@datanode.net> mysql-3.23.52-r1.ebuild :
+  Changed the BDB check due to a bug in BDB on sparc's. See notes in ebuild
+  for reference URL.
+
+  29 Sep 2002; Ryan Phillips <rphillips@gentoo.org> mysql-3.23.52-r1.ebuild :
+  Added thread-safe client support... MyODBC package needs this flag compiled
+  into mysql to work correctly.  Fixes #8411. Submitted by Peter Ruskin
+
+*mysql-3.23.52 (25 Aug 2002)
+
+  25 Aug 2002; Donny Davies <woodchip@gentoo.org> mysql-3.23.52.ebuild,
+  mysql-3.23.52-install-db-sh.diff :
+  Update to latest stable release.  Fix mysql_install_db patch.
+
+*mysql-3.23.51-r4 (28 Jul 2002)
+
+  28 Jul 2002; Jon Nelson <jnelson@gentoo.org> mysql-3.23.51-r4.ebuild:  
+  Add back in the tcpd patch -- seems to cause compile failure  
+
+*mysql-3.23.51-r3 (25 Jul 2002)
+
+  25 Jul 2002; Donny Davies <woodchip@gentoo.org> mysql-3.23.51-r3.ebuild :
+  Fix initscript install.  s/mysql.rc6/mysql.init/
+
+  25 Jul 2002; Jon Nelson <jnelson@gentoo.org> mysql-3.23.51-r3.ebuild files/digest-mysql-3.23.51-r3 files/mysql.init:
+  Fixed 5152 - used some fancy awk to extract the datadir from
+  /etc/mysql/my.cnf -- new init file is mysql.init
+
+*mysql-3.23.51-r2 (07 Jul 2002)
+
+  25 Jul 2002; Ryan Phillips <rphillips@gentoo.org> mysql-3.23.51-r2.ebuild :
+  The -tcpd- patch appears to have been fixed upstream.  It has been
+  removed from the ebuild
+
+  07 Jul 2002; Jon Nelson <jnelson@gentoo.org> mysql-3.23.51-r2.ebuild :
+  Attempt to fix problem with mysql compile *not* using provided bdb.
+  Also, add users in preinst, not pkg_setup, as per policy.
+
+*mysql-3.23.51-r1 (02 Jul 2002)
+
+  02 Jul 2002; Ryan Phillips <rphillips@gentoo.org> mysql-3.23.51-r1.ebuild :
+  Added symlink to libmysqlclient_r.so
+
+*mysql-4.0.1 (27 Jun 2002)
+
+  27 June 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Added the unreleased mysql for development purposes and testing.
+  Currently masked in portage.mask
+  
+*mysql-3.23.51 (22 Jun 2002)
+
+  22 June 2002; Donny Davies <woodchip@gentoo.org> :
+  Update to latest stable release; 3.23.51.
+  - Important!  On >=gentoo-1.3, the bundled 3.2.9a bezerkeley db will be
+    built if you have USE berkdb.  On <gentoo-1.3, the sys-libs/db-3.2.9
+    system version is used.
+  - added a small patch for tcpd; looks like an upstream bug?
+  - sync the compiler flags with their "official" spec ;)
+  - cleaned up the ebuild a little.
+
+*mysql-3.23.49-r2 (16 June 2002)
+
+  16 June 2002; Bart Verwilst <verwilst@gentoo.org> :
+  Made sure that mysql compiled on gentoo 1.3+ as well, where db 4.0.14 is 
+  the default... Stayed off 3.23.50, whoever updates mysql next, please 
+  take my changes here in account as well plz
+
+*mysql-3.23.49-r1 (3 May 2002)
+
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT, $Headers.
+
+*mysql-3.23.49 (18 Feb 2002)
+
+  18 Feb 2002; Donny Davies <woodchip@gentoo.org> mysql-3.23.49.ebuild,
+  files/mysql-3.23-db-3.2.3.diff :
+  Updated to latest release.  Tweaked the db patch to apply properly to
+  this version.  Some cosmetic fixies.
+
+*mysql-3.23.47 (1 Feb 2002)
+
+  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/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index 7c32069e9f7a..7d0686c790eb 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -1,42 +1,33 @@
-MD5 873cd30ebb693aa7732628e8d0e83789 mysql-3.23.56.ebuild 6624
-MD5 f70f1b50a6921cbddba0c7afa2e9ba4a mysql-4.0.12.ebuild 6840
-MD5 de1d42fa3fa2e13885845a690fc6d34d mysql-3.23.54a-r1.ebuild 7082
-MD5 24660eb38dccd2e55edc3cdc1e8968fb mysql-3.23.53.ebuild 6081
-MD5 bf749016181bc4529387ca0ce467d908 mysql-4.0.11a-r1.ebuild 6520
-MD5 8bd70e5ba5708e31ffc18c0d3fcce1fa mysql-3.23.52-r1.ebuild 5952
-MD5 1a867a1d48e2747dcc951bfe02f2691f mysql-3.23.55.ebuild 6631
-MD5 a8d09cf83655804c6e211814bd124bf4 mysql-4.0.5_beta.ebuild 6259
-MD5 85e5fc82532d42c912b7dd4cbd86a865 mysql-4.0.11a.ebuild 6377
-MD5 fd1035a55f2c4687c7949860e2658930 mysql-3.23.54a.ebuild 6452
-MD5 d0c3af49ea36f169de824e0fac5437a1 ChangeLog 7805
-MD5 912d5aff6850b334c88b18c0e37f2ef3 mysql-4.0.7.ebuild 6132
-MD5 b356cd7d6b5330724f0daa4c2a740f17 mysql-4.0.10.ebuild 6126
-MD5 4541e130a1b0fa90db8612973b0adb75 files/mysql-4.0-mysqld-safe-sh.diff 1477
-MD5 123826c210fa0cbdf24c3e6903212dbe files/digest-mysql-3.23.54a 68
-MD5 36aa23522b241aafdb833ac4f11c4fd1 files/mysql-4.0.4-install-db-sh.diff 1439
-MD5 707d18c98dd9d86533b53330a2daadd2 files/mysql-4.0.rc6 951
-MD5 015a823e06d7181373b0601e4a17c284 files/digest-mysql-3.23.52-r1 67
-MD5 8eaeb1372c41d2fef1622dd707a7a9d0 files/mysql-3.23-nisam.h.diff 452
-MD5 d3830060b3f74d6c0916ed85a6bbf02d files/mysql-3.23-install-db-sh.diff 1368
-MD5 58d02e723027d50612e41caad02adef7 files/rebuilder.sh 1105
-MD5 d3bc9aa573525019c4e9d9316f56556a files/digest-mysql-4.0.10 72
-MD5 a77a12a8e251ca0d82d3027b7b50c762 files/digest-mysql-4.0.12 1371
-MD5 ee578e3021841ef9dba4175403564136 files/mysql-4.0-db-3.2.1.diff 1047
-MD5 ff80a5d8d87212046e89f2f8ae779af4 files/mysql-4.0-nisam.h.diff 452
-MD5 5bfc671c63667e6f4c8d48f9edc6076e files/mysql.init 904
-MD5 123826c210fa0cbdf24c3e6903212dbe files/digest-mysql-3.23.54a-r1 68
-MD5 997090f9cbe3e18afeb84508171cedef files/digest-mysql-4.0.7 71
-MD5 04fcbc3263b6da10d038907979ee7f96 files/digest-mysql-4.0.11a-r1 73
-MD5 e68c5d7e3c48028c4cf7e55ea8396013 files/mysql-4.0-install-db-sh.diff 1271
-MD5 47c66444b6a1e2243eadf931d52d34b2 files/my.cnf 1229
-MD5 c960c30b32f42b00c92e32a07fa923a4 files/digest-mysql-4.0.5_beta 71
-MD5 50629599f478b26b4ca82c7c553feae0 files/mysql-3.23.52-install-db-sh.diff 1366
-MD5 d1e79f7a155e45c69558f083fcb1139d files/mysql-4.0-my-print-defaults.diff 240
-MD5 f49e58771365cb075ece153403811872 files/mysql-3.23.51-tcpd.patch 601
-MD5 8d51cbf3afa8349839380aa0986704c0 files/mysql-3.23-safe-mysqld-sh.diff 1557
-MD5 7a5badec9c28c2f4d434d6aed0a5103b files/mysql-3.23-my-print-defaults.diff 218
-MD5 917c1886c6f90d93178fdb3123d52458 files/digest-mysql-3.23.53 67
-MD5 a11b661dbb561774ad19036ecb2d1923 files/digest-mysql-3.23.55 67
-MD5 296a01da527263926d20aca0446bc87d files/digest-mysql-3.23.56 67
-MD5 57531ccd19e17ccca95e0e3bf833cd67 files/mysql-3.23-db-3.2.3.diff 1105
-MD5 04fcbc3263b6da10d038907979ee7f96 files/digest-mysql-4.0.11a 73
+MD5 795364b16ca7b9946fb04f079a8e115d ChangeLog 48649
+MD5 bd6b9a577a5647c86a61e04416d21be1 files/digest-mysql-3.23.58-r1 140
+MD5 0feb3b501c47708ea13707c8e4cdde9c files/digest-mysql-4.0.25-r2 139
+MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26 139
+MD5 201c8b31cd9eb58eec712e37d6f0c328 files/digest-mysql-4.0.26-r30 139
+MD5 4e6e76e3945e29b6795ce6d1a66bc98f files/digest-mysql-4.1.14 139
+MD5 b8eda6b8ec67faff78e5d01023e6eefb files/digest-mysql-4.1.15 139
+MD5 b8eda6b8ec67faff78e5d01023e6eefb files/digest-mysql-4.1.15-r30 139
+MD5 713dc46b7ffa15edda542a15508ce07c files/digest-mysql-5.0.13_rc 142
+MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15 139
+MD5 b9b44f65c775f650064022427ae52425 files/digest-mysql-5.0.15-r30 139
+MD5 d200345efa421d012cf858134d2c8884 files/logrotate.mysql 440
+MD5 f1fc8bfe540d6f1268b53b7cad275080 files/my.cnf 1231
+MD5 a8f89d11a0913332c5f8c1da5a21cc3f files/my.cnf-4.0.14-r1 2816
+MD5 9946a8f7163970ec4f6a713c97eadbe0 files/my.cnf-4.0.24-r1 4271
+MD5 277705080f05b5b98b815487e080e562 files/my.cnf-4.1 4068
+MD5 625b4007f035e3da9a4f1eeee1db6b9c files/mysql-4.0.15.rc6 1187
+MD5 d0fbdf4e41f2b52210eef6cb3a53e128 files/mysql-4.0.24-r1.rc6 1662
+MD5 08f1246e8107e4140378d429ff9773af files/mysql-4.0.24-r2.rc6 2123
+MD5 c8a9f17eb53cb46bd7ec6b3105cd8d23 files/mysql-slot.conf.d 3218
+MD5 05b7f9542728418c0f46d9037d32e0c7 files/mysql-slot.rc6 7758
+MD5 73be6460f548f6f73c70246a4cfd13a0 files/mysql.init 886
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
+MD5 eb11a08abb447b7a69b192a6f9be3dbf mysql-3.23.58-r1.ebuild 7219
+MD5 310c18100b92ec0786cf630ad0a17f94 mysql-4.0.25-r2.ebuild 14260
+MD5 e76952be1da3d57167807176d7f17760 mysql-4.0.26-r30.ebuild 15570
+MD5 a46e6cb73958dcc8919743ca5dbaf3c3 mysql-4.0.26.ebuild 14888
+MD5 254d35efbc36290aa378ed200619a570 mysql-4.1.14.ebuild 18854
+MD5 c0bd3a276b8102df31e2130b5a74e224 mysql-4.1.15-r30.ebuild 15747
+MD5 30d53356599a3edfe8eee21930f678d1 mysql-4.1.15.ebuild 18881
+MD5 662ccd43b0d8861cd0a7216828cceb76 mysql-5.0.13_rc.ebuild 18768
+MD5 74a34395d76d265b312feab60785ee94 mysql-5.0.15-r30.ebuild 15869
+MD5 ed292dce42e38a400c1f274b65c25296 mysql-5.0.15.ebuild 19008
diff --git a/dev-db/mysql/files/digest-mysql-3.23.58-r1 b/dev-db/mysql/files/digest-mysql-3.23.58-r1
index 36384becd475..70bf4d4b2767 100644
--- a/dev-db/mysql/files/digest-mysql-3.23.58-r1
+++ b/dev-db/mysql/files/digest-mysql-3.23.58-r1
@@ -1 +1,2 @@
 MD5 835a96c86132fbde0db36db60c5b34cd mysql-3.23.58.tar.gz 12039843
+MD5 c0c0a0e816f38bc6cbd2fa5c2ef82423 mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.25-r2 b/dev-db/mysql/files/digest-mysql-4.0.25-r2
index f75729166e27..38f31096918f 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.25-r2
+++ b/dev-db/mysql/files/digest-mysql-4.0.25-r2
@@ -1 +1,2 @@
 MD5 68a47ff8c1f0c24866a792f6b3bb59d6 mysql-4.0.25.tar.gz 11159288
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.0.26 b/dev-db/mysql/files/digest-mysql-4.0.26
index bf700d24baf8..0165f0321bce 100644
--- a/dev-db/mysql/files/digest-mysql-4.0.26
+++ b/dev-db/mysql/files/digest-mysql-4.0.26
@@ -1,2 +1,2 @@
 MD5 4e2060a3875470e0d853391e8647a019 mysql-4.0.26.tar.gz 11144366
-MD5 adaf3f0e5174f968bef0f910aff65f7d mysql-extras-20050908.tar.bz2 46663
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/digest-mysql-4.1.14 b/dev-db/mysql/files/digest-mysql-4.1.14
index d30c902ffc6e..530f960597fe 100644
--- a/dev-db/mysql/files/digest-mysql-4.1.14
+++ b/dev-db/mysql/files/digest-mysql-4.1.14
@@ -1 +1,2 @@
 MD5 98ba9caea24b0a48ee06bb242ff2e37f mysql-4.1.14.tar.gz 17074439
+MD5 5a936d382232f7b4b15fc7d025e9fa8e mysql-extras-20050920.tar.bz2 51007
diff --git a/dev-db/mysql/files/logrotate.mysql b/dev-db/mysql/files/logrotate.mysql
index 7f20baebe154..67417e433379 100644
--- a/dev-db/mysql/files/logrotate.mysql
+++ b/dev-db/mysql/files/logrotate.mysql
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/logrotate.mysql,v 1.1 2004/12/23 10:56:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/logrotate.mysql,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 /var/log/mysql/mysql.err /var/log/mysql/mysql.log /var/log/mysql/mysqld.err {
 monthly
 create 660 mysql mysql
 notifempty
 size 5M
 sharedscripts
+missingok
 postrotate
-/sbin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
+/bin/kill -HUP `cat /var/run/mysqld/mysqld.pid`
 endscript
 }
diff --git a/dev-db/mysql/files/my.cnf b/dev-db/mysql/files/my.cnf
index 0e09333d04d2..d7fe61e16273 100644
--- a/dev-db/mysql/files/my.cnf
+++ b/dev-db/mysql/files/my.cnf
@@ -1,40 +1,47 @@
-# Example mysql config file.
-# You can copy this to one of:
-# @sysconfdir@/my.cnf to set global options,
-# mysql-data-dir/my.cnf to set server-specific options (in this
-# installation this directory is @localstatedir@) or
-# ~/.my.cnf to set user-specific options.
-# 
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
+#
+# This file can be simultaneously placed in three places:
+# 1. /etc/mysql/my.cnf to set global options.
+# 2. /var/lib/mysql/my.cnf to set server-specific options.
+# 3. ~/.my.cnf to set user-specific options.
+#
 # One can use all long options that the program supports.
-# Run the program with --help to get a list of available options
+# Run the program with --help to get a list of them.
+#
+# The following values assume you have at least 32M RAM!
 
-# This will be passed to all mysql clients
 [client]
 #password	= my_password
 port		= 3306
-socket		= /tmp/mysql.sock
+socket		= /var/run/mysqld/mysqld.sock
 
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
+[safe_mysqld]
+err-log		= /var/log/mysql/mysql.err
 
-# The MySQL server
 [mysqld]
-port		= 3306
-socket		= /tmp/mysql.sock
+#skip-networking
+skip-innodb
 user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		= 3306
+log		= /var/log/mysql/mysql.log
+basedir		= /usr
+datadir		= /var/lib/mysql
+tmpdir		= /tmp
+language	= /usr/share/mysql/english
 skip-locking
 set-variable	= key_buffer=16M
 set-variable	= max_allowed_packet=1M
 set-variable	= thread_stack=128K
-# Start logging
-log
 
 [mysqldump]
 quick
-set-variable	= max_allowed_packet=16M
+set-variable	= max_allowed_packet=1M
 
 [mysql]
-no-auto-rehash
+#no-auto-rehash	# faster start of mysql but no tab completition
 
 [isamchk]
-set-variable	= key_buffer=16M
\ No newline at end of file
+set-variable	= key_buffer=16M
diff --git a/dev-db/mysql/files/my.cnf-4.0.14-r1 b/dev-db/mysql/files/my.cnf-4.0.14-r1
index e52d262ef4ab..83a8caa366b2 100644
--- a/dev-db/mysql/files/my.cnf-4.0.14-r1
+++ b/dev-db/mysql/files/my.cnf-4.0.14-r1
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0.14-r1,v 1.1 2003/08/11 10:40:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0.14-r1,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 #
 # This file can be simultaneously placed in three places:
 # 1. /etc/mysql/my.cnf to set global options.
diff --git a/dev-db/mysql/files/my.cnf-4.0.24-r1 b/dev-db/mysql/files/my.cnf-4.0.24-r1
index 7d7161015568..8d38118f5aff 100644
--- a/dev-db/mysql/files/my.cnf-4.0.24-r1
+++ b/dev-db/mysql/files/my.cnf-4.0.24-r1
@@ -1,5 +1,5 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0.24-r1,v 1.1 2005/03/13 05:54:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.0.24-r1,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 #
 # This file can be simultaneously placed in three places:
 # 1. /etc/mysql/my.cnf to set global options.
diff --git a/dev-db/mysql/files/my.cnf-4.1 b/dev-db/mysql/files/my.cnf-4.1
index f08e49263bf4..967f8df1d834 100644
--- a/dev-db/mysql/files/my.cnf-4.1
+++ b/dev-db/mysql/files/my.cnf-4.1
@@ -1,15 +1,42 @@
 # /etc/mysql/my.cnf: The global mysql configuration file.
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.1 2005/05/17 09:08:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/my.cnf-4.1,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 # The following options will be passed to all MySQL clients
 [client]
-character_set				= utf8
-default-character-set		= utf8
-
 #password					= your_password
 port						= 3306
 socket						= /var/run/mysqld/mysqld.sock
 
+[mysql]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=utf8
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=utf8
+
+[myisampack]
+character-sets-dir=utf8
+
 # use [safe_mysqld] with mysql-3
 [mysqld_safe]
 err-log						= /var/log/mysql/mysql.err
diff --git a/dev-db/mysql/files/mysql-4.0.15.rc6 b/dev-db/mysql/files/mysql-4.0.15.rc6
index 45b5c498c0f7..754371335f2c 100644
--- a/dev-db/mysql/files/mysql-4.0.15.rc6
+++ b/dev-db/mysql/files/mysql-4.0.15.rc6
@@ -1,22 +1,28 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.15.rc6,v 1.1 2003/09/17 07:10:37 robbat2 Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.15.rc6,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 depend() {
-	need net
-	use dns
+	use dns net
 }
 
 checkconfig() {
-	if [ ! -f /etc/mysql/my.cnf ] ; then
+	if [ ! -f /etc/mysql/my.cnf ]; then
 		eerror "No /etc/mysql/my.cnf file exists!"
 	fi
 
-    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
+    #dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
+	dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
 
-	if [ ! -d $dir/mysql ] ; then
-		eerror "You dont appear to have the mysql database installed yet."
+	if [ -z "$dir" ]; then
+		eerror "Your mysql doesn't have any datadir setting, default or specific"
+		eerror "Please check your my.cnf"
+		return 1
+	fi
+
+	if [ ! -d "$dir/mysql" ]; then
+		eerror "You don't appear to have the mysql database installed yet."
 		eerror "Please run /usr/bin/mysql_install_db to have this done..."
 		return 1
 	fi
diff --git a/dev-db/mysql/files/mysql-4.0.24-r1.rc6 b/dev-db/mysql/files/mysql-4.0.24-r1.rc6
index f55c45418b8a..7a0296605c7e 100644
--- a/dev-db/mysql/files/mysql-4.0.24-r1.rc6
+++ b/dev-db/mysql/files/mysql-4.0.24-r1.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r1.rc6,v 1.1 2005/03/13 05:54:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r1.rc6,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 depend() {
 	use dns net
@@ -9,9 +9,6 @@ depend() {
 
 
 getconfig() {
-	MY_NAME="(`basename $1`)"
-	[ -z "${MY_NAME/(mysql)}" ] && MY_NAME=""
-
 	MY_CNF=${MY_CNF=/etc/mysql/my.cnf}
 	if [ ! -f ${MY_CNF} ]; then
 		eerror "No ${MY_CNF} file exists! Using automatic defaults!"
@@ -20,16 +17,18 @@ getconfig() {
 	#dir=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
 	#dir=`my_print_defaults mysqld | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
 	local mysqld_cnf="`my_print_defaults --config-file=${MY_CNF} mysqld`"
-	dir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
-	pid_file=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1`
+	datadir=`echo "${mysqld_cnf}" | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+	pidfile=`echo "${mysqld_cnf}" | sed -ne '/pid-file/s|^--pid-file=||p' | tail -n1`
 	
 	# push these out to the script
-	export MY_NAME MY_CNF pid_file datadir 
+	export MY_CNF 
+	export pidfile
+	export datadir 
 }
 
 checkconfig() {
 	getconfig
-	if [ -z "$datadir" ]; then
+	if [ -z "${datadir}" ]; then
 		eerror "Your mysql doesn't have any datadir setting, default or specific"
 		eerror "Please check your my.cnf : ${MY_CNF}"
 		return 1
@@ -45,16 +44,16 @@ checkconfig() {
 start() {
 	getconfig
 	checkconfig || return 1
-	ebegin "Starting mysqld (${MY_NAME})"
-	start-stop-daemon --start --quiet --pidfile=${pid_file}
+	ebegin "Starting mysqld (${MY_CNF})"
+	start-stop-daemon --start --quiet --background \
 		--exec /usr/bin/mysqld_safe \
-		--background --defaults-file=${MY_CNF} -- >/dev/null 2>&1
+		-- --defaults-file=${MY_CNF} >/dev/null 2>&1
 	eend $?
 }
 
 stop () {
 	getconfig
-	ebegin "Stopping mysqld (${MY_NAME})"
-	start-stop-daemon --stop --retry 5 --quiet --pidfile=${pid_file}
+	ebegin "Stopping mysqld (${MY_CNF})"
+	start-stop-daemon --stop --retry 5 --quiet --pidfile=${pidfile}
 	eend $?
 }
diff --git a/dev-db/mysql/files/mysql-4.0.24-r2.rc6 b/dev-db/mysql/files/mysql-4.0.24-r2.rc6
index ec221775d6ef..ea86b56fcef5 100644
--- a/dev-db/mysql/files/mysql-4.0.24-r2.rc6
+++ b/dev-db/mysql/files/mysql-4.0.24-r2.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r2.rc6,v 1.1 2005/05/17 09:08:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-4.0.24-r2.rc6,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 depend() {
 	use dns net
diff --git a/dev-db/mysql/files/mysql-slot.rc6 b/dev-db/mysql/files/mysql-slot.rc6
index 1b9ceb963813..9b81ec380ce4 100644
--- a/dev-db/mysql/files/mysql-slot.rc6
+++ b/dev-db/mysql/files/mysql-slot.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.1 2005/11/19 03:58:41 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql-slot.rc6,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 # external binaryes used: which, sed, tac
 
@@ -13,6 +13,7 @@ depend() {
 function in_list() {
 	local elem=${1:-"none"}
 	local list=${2:-","}
+
 	[[ "${list}" == "${list/,${elem},/}" ]] \
 		&& return 1 \
 		|| return 0
@@ -99,24 +100,24 @@ get_slot_config() {
 	for my_default in ${my_defaults}; do
 		case "${my_default}" in
 			--basedir=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					basedir="${my_default#--basedir=}"
 				fi ;;
 			--datadir=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					datadir="${my_default#--datadir=}"
 				fi ;;
 			--pid-file=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					pidfile="${my_default#--pid-file=}"
 				fi ;;
 			--socket=*)
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					socket="${my_default#--socket=}"
 				fi ;;
 			*)
 				# check into the list of parameters we already have
-				if ! $(in_list "${my_default%%=*}" "${paramlist}") ; then
+				if ! in_list "${my_default%%=*}" "${paramlist}" ; then
 					paramlist="${paramlist}${my_default%%=*},"
 					unmanagedparams="${unmanagedparams} $(echo "${my_default}" | sed -e 's,\([^=/a-zA-Z0-9_.-]\),\\\1,g')"
 				fi
@@ -132,7 +133,7 @@ get_slot_config() {
 	done
 
 	for i in "server-id" "log-bin" ; do
-		if ! $(in_list "--${i}" "${paramlist}") ; then
+		if ! in_list "--${i}" "${paramlist}" ; then
 			ewarn "undefined $i, it's good practice set it"
 		fi
 	done
@@ -171,8 +172,7 @@ start() {
 	local globretstatus=1
 	local srv_slot srv_num
 	# server MUST NOT share same location for these
-	local pidfilelist=','
-	local datadirlist=','
+	local pidfilelist=',' datadirlist=',' socketlist=','
 
 	# additional security
 	rm -f "${MYSQL_GLOB_PID_FILE}" ; touch "${MYSQL_GLOB_PID_FILE}"
@@ -198,24 +198,28 @@ start() {
 		retstatus=0
 
 		get_slot_config "${srv_slot}" "${srv_num}" || retstatus=1
-
 		# pre_run checks
 		[[ "$retstatus" -eq 0 ]] && checkconfig "${datadir}" || retstatus=2
 		if [[ "$retstatus" -eq 0 ]] ; then
-			if $(in_list "${pidfile}" "${pidfilelist}"); then
+			if in_list "${pidfile}" "${pidfilelist}" ; then
 				retstatus=3
 				eerror "Cowardly refusing to start another server with same ${pidfile}"
 			fi
-			if $(in_list "${datadir}" "${datadirlist}"); then
+			if in_list "${datadir}" "${datadirlist}" ; then
 				retstatus=4
 				eerror "Cowardly refusing to start another server with same ${datadir}"
 			fi
+			if in_list "${socket}" "${socketlist}" ; then
+				retstatus=5
+				eerror "Cowardly refusing to start another server with same ${socket}"
+			fi
 		fi
 
 		if [[ $retstatus -eq 0 ]] ; then
 			# additional security
 			rm -f ${pidfile} ${socket}
 			ebegin "Starting mysqld${MY_SUFFIX:+"_"}${srv_slot}${srv_num:+"_"}${srv_num} (${MY_CNF})"
+
 			start-stop-daemon --start --quiet --background \
 				${NICE:+"--nicelevel="}${NICE} \
 				--pidfile="${pidfile}" \
@@ -235,6 +239,10 @@ start() {
 			if [[ ! -S "${socket}" ]] ; then
 				eerror "MySQL${MY_SUFFIX} NOT started (${retstatus})"
 				retstatus=1
+			else
+				pidfilelist="${pidfilelist}${pidfile},"
+				datadirlist="${datadirlist}${datadir},"
+				socketlist="${socketlist}${socket},"
 			fi
 		fi
 
@@ -244,7 +252,7 @@ start() {
 		fi
 	done
 	# successfull if at least one mysqld started
-	eend $retstatus
+	eend $globretstatus
 }
 
 stop () {
diff --git a/dev-db/mysql/files/mysql.init b/dev-db/mysql/files/mysql.init
index 8d1517022251..c2b74583a3b8 100644
--- a/dev-db/mysql/files/mysql.init
+++ b/dev-db/mysql/files/mysql.init
@@ -1,10 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.1 2002/07/26 03:01:13 jnelson Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/files/mysql.init,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 depend() {
 	need net
+	use dns
 }
 
 checkconfig() {
@@ -12,7 +13,7 @@ checkconfig() {
 		eerror "No /etc/mysql/my.cnf file exists!"
 	fi
 
-	dir=`awk '{ if ( $0 ~ /^datadir[ \t]+=/ ) { print $3 } }' < /etc/mysql/my.cnf`
+    dir=`my_print_defaults mysqld | grep -- --datadir | sed -e "s|^.*=\(.*\)|\1|"`
 
 	if [ ! -d $dir/mysql ] ; then
 		eerror "You dont appear to have the mysql database installed yet."
@@ -24,13 +25,13 @@ checkconfig() {
 start() {
 	checkconfig || return 1
 	ebegin "Starting mysqld"
-	start-stop-daemon --start --quiet --exec /usr/bin/safe_mysqld \
-		--background -- >/dev/null 2>&1
+	/usr/bin/safe_mysqld >/dev/null 2>&1 &
 	eend $?
 }
 
 stop () {
 	ebegin "Stopping mysqld"
-	start-stop-daemon --stop --quiet --pidfile=/var/run/mysqld/mysqld.pid
+	start-stop-daemon --stop --quiet \
+		--pidfile=/var/run/mysqld/mysqld.pid --retry 20
 	eend $?
 }
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index dbfe84ca36cf..716e7d4301bd 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/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>mysql-bugs</herd>
+<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/mysql/mysql-3.23.58-r1.ebuild b/dev-db/mysql/mysql-3.23.58-r1.ebuild
index 87b081a0fe4d..e2b9c11991a6 100644
--- a/dev-db/mysql/mysql-3.23.58-r1.ebuild
+++ b/dev-db/mysql/mysql-3.23.58-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/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.1 2004/08/23 20:31:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-3.23.58-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:29 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,47 +13,62 @@ SDIR=MySQL-${SVER}
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server."
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="ftp://ftp.sunet.se/pub/unix/databases/relational/mysql/Downloads/${SDIR}/${P}.tar.gz
-	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz"
+	ftp://mysql.valueclick.com/pub/mysql/Downloads/${SDIR}/${P}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~hppa ~ppc"
+KEYWORDS="x86 ppc sparc alpha hppa"
 IUSE="berkdb debug innodb perl readline ssl static tcpd"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
+	bdb? ( sys-apps/ed )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
-	>=sys-libs/zlib-1.1.3
+	>=sys-libs/zlib-1.2.3
 	dev-lang/perl
-	sys-apps/procps"
+	sys-process/procps"
 PDEPEND="perl? ( dev-perl/DBI dev-perl/DBD-mysql )"
 
 src_unpack() {
+	use innodb || ewarn "InnoDB support is not selected to be compiled in."
 	unpack ${A} || die
 	cd ${S} || die
+
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
 	# required for qmail-mysql
-	epatch ${FILESDIR}/mysql-3.23-nisam.h.diff
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23-nisam.h.diff || die
 	# zap startup script messages
-	epatch ${FILESDIR}/mysql-3.23.52-install-db-sh.diff
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23.52-install-db-sh.diff || die
 	# zap binary distribution stuff
-	epatch ${FILESDIR}/mysql-3.23-safe-mysqld-sh.diff
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23-safe-mysqld-sh.diff || die
 	# for correct hardcoded sysconf directory
-	epatch ${FILESDIR}/mysql-3.23-my-print-defaults.diff
-	#patch -p1 < ${FILESDIR}/mysql-3.23.51-tcpd.patch || die
-	#epatch ${FILESDIR}/mysql-4.0.14-security-28394.patch
+	epatch ${MY_PATCH_SOURCE}/mysql-3.23-my-print-defaults.diff || die
+	#patch -p1 < ${MY_PATCH_SOURCE}/mysql-3.23.51-tcpd.patch || die
+	#epatch ${MY_PATCH_SOURCE}/mysql-4.0.14-security-28394.patch
 
 	# security fix from http://lists.mysql.com/internals/15185
 	# gentoo bug #60744
-	EPATCH_OPTS="-p1 -d ${S}" epatch ${FILESDIR}/${PN}-4.0-mysqlhotcopy-security.patch
+	EPATCH_OPTS="-p1 -d ${S}" \
+	epatch ${MY_PATCH_SOURCE}/${PN}-4.0-mysqlhotcopy-security.patch || die
+
+	# upstream bug http://bugs.mysql.com/bug.php?id=7971
+	# names conflict with stuff in 2.6.10 kernel headers
+	echo ${S}/client/mysqltest.c ${S}/extra/replace.c | xargs -n1 \
+	sed -i \
+		-e "s/set_bit/my__set_bit/g" \
+		-e "s/clear_bit/my__clear_bit/g" \
+		|| die "Failed to fix bitops"
 
 }
 
 src_compile() {
 	# bug #11681; get b0rked code when using -march=k6 with this package.
-	replace-cpu-flags i586 k6 k6-2 k6-3
+	replace-cpu-flags k6 k6-2 k6-3 i586
 
 	local myconf
-	# The following fix is due to a bug with bdb on sparc's. See: 
+	# The following fix is due to a bug with bdb on sparc's. See:
 	# http://www.geocrawler.com/mail/msg.php3?msg_id=4754814&list=8
 	# same for alpha (see http://www.mysql.com/doc/en/BDB_portability.html)
 	# thanks to peter@icebear.net for noticing this.
@@ -169,7 +184,7 @@ pkg_preinst() {
 	fi
 
 	if ! id mysql; then
-		useradd -g mysql -s /dev/null -d /var/lib/mysql -c "mysql" mysql
+		useradd -g mysql -s /bin/false -d /var/lib/mysql -c "mysql" mysql
 		assert "problem adding user mysql"
 	fi
 }
@@ -188,7 +203,8 @@ pkg_postinst() {
 	# your friendly public service announcement...
 	einfo
 	einfo "You might want to run:"
-	einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
+	einfo "\"emerge --config =${PF}\""
 	einfo "if this is a new install."
 	einfo
+	use innodb || ewarn "InnoDB support is not selected to be compiled in."
 }
diff --git a/dev-db/mysql/mysql-4.0.25-r2.ebuild b/dev-db/mysql/mysql-4.0.25-r2.ebuild
index 1e95a2077302..cc36083b21c5 100644
--- a/dev-db/mysql/mysql-4.0.25-r2.ebuild
+++ b/dev-db/mysql/mysql-4.0.25-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/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.1 2005/07/20 09:12:11 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.25-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:32 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -14,19 +14,21 @@ S="${WORKDIR}/${PN}"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz"
+SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd big-tables"
 RESTRICT="primaryuri"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
+		bdb? ( sys-apps/ed )
 		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
 		ssl? ( >=dev-libs/openssl-0.9.6d )
 		perl? ( dev-lang/perl )
-		>=sys-libs/zlib-1.1.3
+		>=sys-libs/zlib-1.2.3
 		>=sys-apps/texinfo-4.7-r1
 		sys-process/procps
 		>=sys-apps/sed-4"
@@ -35,38 +37,58 @@ RDEPEND="${DEPEND}
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( dev-perl/DBD-mysql )"
 
+mysql_upgrade_warning() {
+	ewarn
+	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
+	ewarn "must recompile the other packages on your system that link with"
+	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
+	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
+	ewarn "app-portage/gentoolkit."
+	ewarn
+	epause 5
+}
+
 mysql_get_datadir() {
 	DATADIR=""
 	if [ -f '/etc/mysql/my.cnf' ] ; then
-		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
 		#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
 		#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
 		DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+		if [ -z "${DATADIR}" ]; then
+			DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+			einfo "Using default DATADIR"
+		fi
 	fi
 	if [ -z "${DATADIR}" ]; then
 		DATADIR="/var/lib/mysql/"
 		einfo "Using default DATADIR"
 	fi
 	einfo "MySQL DATADIR is ${DATADIR}"
-	export DATADIR
-}
 
-mysql_upgrade_warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
-	ewarn "must recompile the other packages on your system that link with"
-	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
-	ewarn
-	epause 5
+	if [ -z "${PREVIOUS_DATADIR}" ] ; then
+		if [ -a "${DATADIR}" ] ; then
+			ewarn "Previous datadir found, it's YOUR job to change"
+			ewarn "ownership and have care of it"
+			PREVIOUS_DATADIR="yes"
+			export PREVIOUS_DATADIR
+		else
+			PREVIOUS_DATADIR="no"
+			export PREVIOUS_DATADIR
+		fi
+	fi
+
+	export DATADIR
 }
 
 pkg_setup() {
 	mysql_upgrade_warning
 	mysql_get_datadir
-}
 
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+
+}
 src_unpack() {
 	if use static && use ssl; then
 		local msg="MySQL does not support building statically with SSL support"
@@ -79,44 +101,35 @@ src_unpack() {
 	mv "${WORKDIR}/${NEWP}" "${S}"
 	cd "${S}"
 
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
+
 	#zap startup script messages
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.23-install-db-sh.diff || die
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.23-install-db-sh.diff" || die
 	#zap binary distribution stuff
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-mysqld-safe-sh.diff || die
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-mysqld-safe-sh.diff" || die
 	#required for qmail-mysql
-	EPATCH_OPTS="-p0 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-nisam.h.diff || die
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0-nisam.h.diff" || die
 	#for correct hardcoded sysconf directory
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0-my-print-defaults.diff || die
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0-my-print-defaults.diff" || die
 	# NPTL support
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.18-gentoo-nptl.diff || die
-	# Merged upstream as of 4.0.24
-	# bad tmpfiles in mysqlaccess, see bug 77805
-	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/mysql-accesstmp.patch
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.18-gentoo-nptl.diff" || die
 
 	# fixed in 4.0.25
 	#EPATCH_OPTS="-p1 -d ${S}" \
-	#epatch ${FILESDIR}/${PN}-4.0.24-manual.texi.patch || die
+	#epatch ${MY_PATCH_SOURCE}/${PN}-4.0.24-manual.texi.patch || die
 
 	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
 	# i would really prefer to fix this at the Makefile.am level, but can't
 	# get the software to autoreconf as distributed - too many missing files
 	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.21-thrssl.patch || die
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.21-thrssl.patch" || die
 
 	# PIC fixes
 	# bug #42968
-	EPATCH_OPTS="-p1 -d ${S}" \
-	epatch ${FILESDIR}/${PN}-4.0.25-r2-asm-pic-fixes.patch || die
+	epatch "${MY_PATCH_SOURCE}/${PN}-4.0.25-r2-asm-pic-fixes.patch" || die
 
 	if use tcpd; then
-		EPATCH_OPTS="-p1 -d ${S}" \
-		epatch ${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff || die
+		epatch "${MY_PATCH_SOURCE}/${PN}-4.0.14-r1-tcpd-vars-fix.diff" || die
 	fi
 
 	for d in ${S} ${S}/innobase; do
@@ -234,19 +247,32 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-src_install() {
-	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		local retstatus
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+		make test
+		retstatus=$?
 
-	diropts "-m0750"
-	dodir "${DATADIR}" /var/log/mysql
+		# to be sure ;)
+		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
+		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
+		[[ $retstatus == 0 ]] || die "make test failed"
 
-	diropts "-m0755"
-	dodir /var/run/mysqld
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
 
-	keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql
-	chown -R mysql:mysql ${D}/var/lib/mysql \
-		${D}/var/run/mysqld \
-		${D}/var/log/mysql
+src_install() {
+	mysql_get_datadir
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
 	# move client libs, install a couple of missing headers
 	local lib=$(get_libdir)
@@ -299,6 +325,28 @@ src_install() {
 		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/logrotate.mysql" mysql
+
+		#empty dirs...
+		diropts "-m0750"
+		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+	        dodir "${DATADIR}"
+	        keepdir "${DATADIR}"
+	        chown -R mysql:mysql "${D}/${DATADIR}"
+		fi
+
+		#diropts "-m0755"
+		#dodir "/var/log/mysql"
+		#touch ${D}/var/log/mysql/mysql.{log,err}
+		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		#keepdir "/var/log/mysql"
+		#chown -R mysql:mysql "${D}/var/log/mysql"
+
+		diropts "-m0755"
+		dodir "/var/run/mysqld"
+
+		keepdir "/var/run/mysqld"
+		chown -R mysql:mysql \
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
@@ -313,27 +361,38 @@ src_install() {
 
 }
 
-src_test() {
-	cd ${S}
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! useq minimal; then
-		local retstatus
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-		make test
-		retstatus=$?
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+}
 
-		# to be sure ;)
-		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
-		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
-		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
-		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
-		[[ $retstatus == 0 ]] || die "make test failed"
+pkg_postinst() {
+	mysql_get_datadir
 
-	else
-		einfo "Skipping server tests due to minimal build."
+	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+	#secure the logfiles... does this bother anybody?
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+	chmod 0660 ${ROOT}/var/log/mysql/mysql*
+	# secure some directories
+	chmod 0750 ${ROOT}/var/log/mysql
+
+	if ! useq minimal; then
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"emerge --config =${PF}\""
+		einfo "if this is a new install."
+		einfo
 	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
 pkg_config() {
@@ -351,7 +410,7 @@ pkg_config() {
 	local pwd2="b"
 	local maxtry=5
 
-	if [[ -d "${DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
 		ewarn "Please rename it or delete it if you wish to replace it."
 		die "MySQL database already exists!"
@@ -361,20 +420,20 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "bug: avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
-	einfo "Repeat the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd1 ; echo
+	einfo "Check the password"
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  "x$pwd1" != "x$pwd2" )) ; then
+	if [[  "x$pwd1" != "x$pwd2" ]] ; then
 		die "Passwords are not the same"
 	fi
 
 	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
 	# MySQL 5.0 don't ned this
-	chown -R mysql:mysql ${DATADIR}
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
 	chmod 0750 ${ROOT}/${DATADIR}
 
 	# now we can set the password
@@ -382,7 +441,7 @@ pkg_config() {
 	local mysqld="${ROOT}/usr/sbin/mysqld \
 		--skip-grant-tables \
 		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
+		--datadir=${ROOT}/${DATADIR} \
 		--skip-innodb \
 		--skip-bdb \
 		--max_allowed_packet=8M \
@@ -414,36 +473,3 @@ pkg_config() {
 	einfo "done"
 }
 
-pkg_preinst() {
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 /bin/false /var/lib/mysql mysql \
-	|| die "problem adding user mysql"
-}
-
-pkg_postinst() {
-	mysql_get_datadir
-
-	if ! useq minimal; then
-		#empty dirs...
-		[ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
-		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-		[ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-		# secure the logfiles... does this bother anybody?
-		touch ${ROOT}/var/log/mysql/mysql.{log,err}
-		chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-		chmod 0660 ${ROOT}/var/log/mysql/mysql*
-		# secure some directories
-		chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
-
-		# your friendly public service announcement...
-		einfo
-		einfo "You might want to run:"
-		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-		einfo "if this is a new install."
-		einfo
-	fi
-
-	mysql_upgrade_warning
-	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}
diff --git a/dev-db/mysql/mysql-4.0.26-r30.ebuild b/dev-db/mysql/mysql-4.0.26-r30.ebuild
index 71e67ca8510d..dc381d922211 100644
--- a/dev-db/mysql/mysql-4.0.26-r30.ebuild
+++ b/dev-db/mysql/mysql-4.0.26-r30.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/dev-db/mysql/mysql-4.0.26-r30.ebuild,v 1.1 2005/10/28 15:42:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26-r30.ebuild,v 1.1.1.1 2005/11/30 10:11:31 chriswhite Exp $
 
 MYSQL_VERSION_ID=40026
 PROTOCOL_VERSION=8
diff --git a/dev-db/mysql/mysql-4.0.26.ebuild b/dev-db/mysql/mysql-4.0.26.ebuild
index f3fb20b13479..cfa8496a787c 100644
--- a/dev-db/mysql/mysql-4.0.26.ebuild
+++ b/dev-db/mysql/mysql-4.0.26.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/dev-db/mysql/mysql-4.0.26.ebuild,v 1.1 2005/09/08 14:57:22 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.0.26.ebuild,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}"
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
 SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
-	mirror://gentoo/mysql-extras-20050908.tar.bz2"
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,45 +28,91 @@ DEPEND="readline? ( >=sys-libs/readline-4.1 )
 		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
 		ssl? ( >=dev-libs/openssl-0.9.6d )
 		perl? ( dev-lang/perl )
+		userland_GNU? ( sys-process/procps )
 		>=sys-libs/zlib-1.2.3
 		>=sys-apps/texinfo-4.7-r1
-		sys-process/procps
 		>=sys-apps/sed-4"
 RDEPEND="${DEPEND}
 		selinux? ( sec-policy/selinux-mysql )"
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( dev-perl/DBD-mysql )"
 
+mysql_upgrade_error() {
+	ewarn "Sorry, plain up/downgrade between different version of MySQL is (still)"
+	ewarn "un-supported."
+}
+
+mysql_upgrade_warning() {
+	ewarn
+	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
+	ewarn "must recompile the other packages on your system that link with"
+	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
+	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
+	ewarn "app-portage/gentoolkit."
+	ewarn
+	epause 5
+}
+
 mysql_get_datadir() {
 	DATADIR=""
 	if [ -f '/etc/mysql/my.cnf' ] ; then
-		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
 		#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
 		#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
 		DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+		if [ -z "${DATADIR}" ]; then
+			DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+			einfo "Using default DATADIR"
+		fi
 	fi
 	if [ -z "${DATADIR}" ]; then
 		DATADIR="/var/lib/mysql/"
 		einfo "Using default DATADIR"
 	fi
 	einfo "MySQL DATADIR is ${DATADIR}"
-	export DATADIR
-}
 
-mysql_upgrade_warning() {
-	ewarn
-	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
-	ewarn "must recompile the other packages on your system that link with"
-	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
-	ewarn
-	epause 5
+	if [ -z "${PREVIOUS_DATADIR}" ] ; then
+		if [ -a "${DATADIR}" ] ; then
+			ewarn "Previous datadir found, it's YOUR job to change"
+			ewarn "ownership and have care of it"
+			PREVIOUS_DATADIR="yes"
+			export PREVIOUS_DATADIR
+		else
+			PREVIOUS_DATADIR="no"
+			export PREVIOUS_DATADIR
+		fi
+	fi
+
+	export DATADIR
 }
 
 pkg_setup() {
+
+	if [[ -z $MYSQL_STRAIGHT_UPGRADE ]] ; then
+		mysql_get_datadir
+		local curversion="dev-db/${PN}-${PV%.*}"
+		local oldversion="$(best_version dev-db/mysql)"
+		oldversion=${oldversion%.*}
+
+		# permit upgrade from old version if it's safe
+		useq minimal && oldversion=""
+		built_with_use dev-db/mysql minimal && oldversion=""
+		[[ -d "${DATADIR}/mysql" ]] || oldversion=""
+
+		if [[ -n "${oldversion}" ]] && [[ "${oldversion}" != "${curversion}" ]]
+		then
+			mysql_upgrade_error
+			eerror "MySQL-${oldversion} found, up/downgrade to \"${curversion}\" is unsupported"
+			eerror "export MYSQL_STRAIGHT_UPGRADE=1 to force"
+			die
+		fi
+	fi
+
 	mysql_upgrade_warning
-	mysql_get_datadir
+
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+
 }
 
 src_unpack() {
@@ -222,23 +268,32 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-src_install() {
-	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
-
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 -1 /dev/null mysql \
-	|| die "problem adding user mysql"
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		local retstatus
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		addpredict /this-dir-does-not-exist/t9.MYI
+		make test
+		retstatus=$?
 
-	diropts "-m0750"
-	dodir "${DATADIR}" /var/log/mysql
+		# to be sure ;)
+		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
+		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
+		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
+		[[ $retstatus == 0 ]] || die "make test failed"
 
-	diropts "-m0755"
-	dodir /var/run/mysqld
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
 
-	keepdir "${DATADIR}" /var/run/mysqld /var/log/mysql
-	chown -R mysql:mysql ${D}/${DATADIR} \
-		${D}/var/run/mysqld \
-		${D}/var/log/mysql
+src_install() {
+	mysql_get_datadir
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
 	# move client libs, install a couple of missing headers
 	local lib=$(get_libdir)
@@ -291,6 +346,28 @@ src_install() {
 		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/logrotate.mysql" mysql
+
+		#empty dirs...
+		diropts "-m0750"
+		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+	        dodir "${DATADIR}"
+	        keepdir "${DATADIR}"
+	        chown -R mysql:mysql "${D}/${DATADIR}"
+		fi
+
+		#diropts "-m0755"
+		#dodir "/var/log/mysql"
+		#touch ${D}/var/log/mysql/mysql.{log,err}
+		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		#keepdir "/var/log/mysql"
+		#chown -R mysql:mysql "${D}/var/log/mysql"
+
+		diropts "-m0755"
+		dodir "/var/run/mysqld"
+
+		keepdir "/var/run/mysqld"
+		chown -R mysql:mysql \
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
@@ -305,27 +382,38 @@ src_install() {
 
 }
 
-src_test() {
-	cd ${S}
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! useq minimal; then
-		local retstatus
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		addpredict /this-dir-does-not-exist/t9.MYI
-		make test
-		retstatus=$?
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+}
 
-		# to be sure ;)
-		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
-		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
-		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
-		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
-		[[ $retstatus == 0 ]] || die "make test failed"
+pkg_postinst() {
+	mysql_get_datadir
 
-	else
-		einfo "Skipping server tests due to minimal build."
+	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+	#secure the logfiles... does this bother anybody?
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+	chmod 0660 ${ROOT}/var/log/mysql/mysql*
+	# secure some directories
+	chmod 0750 ${ROOT}/var/log/mysql
+
+	if ! useq minimal; then
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"emerge --config =${PF}\""
+		einfo "if this is a new install."
+		einfo
 	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
 pkg_config() {
@@ -343,7 +431,7 @@ pkg_config() {
 	local pwd2="b"
 	local maxtry=5
 
-	if [[ -d "${DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
 		ewarn "Please rename it or delete it if you wish to replace it."
 		die "MySQL database already exists!"
@@ -353,20 +441,20 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "bug: avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
-	einfo "Repeat the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd1 ; echo
+	einfo "Check the password"
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  "x$pwd1" != "x$pwd2" )) ; then
+	if [[  "x$pwd1" != "x$pwd2" ]] ; then
 		die "Passwords are not the same"
 	fi
 
 	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
 	# MySQL 5.0 don't ned this
-	chown -R mysql:mysql ${DATADIR}
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
 	chmod 0750 ${ROOT}/${DATADIR}
 
 	# now we can set the password
@@ -374,7 +462,7 @@ pkg_config() {
 	local mysqld="${ROOT}/usr/sbin/mysqld \
 		--skip-grant-tables \
 		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
+		--datadir=${ROOT}/${DATADIR} \
 		--skip-innodb \
 		--skip-bdb \
 		--max_allowed_packet=8M \
@@ -405,31 +493,3 @@ pkg_config() {
 
 	einfo "done"
 }
-
-pkg_postinst() {
-	mysql_get_datadir
-
-	if ! useq minimal; then
-		#empty dirs...
-		[ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
-		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-		[ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-		# secure the logfiles... does this bother anybody?
-		touch ${ROOT}/var/log/mysql/mysql.{log,err}
-		chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-		chmod 0660 ${ROOT}/var/log/mysql/mysql*
-		# secure some directories
-		chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
-
-		# your friendly public service announcement...
-		einfo
-		einfo "You might want to run:"
-		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-		einfo "if this is a new install."
-		einfo
-	fi
-
-	mysql_upgrade_warning
-	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}
diff --git a/dev-db/mysql/mysql-4.1.14.ebuild b/dev-db/mysql/mysql-4.1.14.ebuild
index f6c3456a0c68..af57a618328f 100644
--- a/dev-db/mysql/mysql-4.1.14.ebuild
+++ b/dev-db/mysql/mysql-4.1.14.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.1 2005/08/29 12:55:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.14.ebuild,v 1.1.1.1 2005/11/30 10:11:30 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
 SVER=${PV%.*}
-PLV=""
-NEWP="${PN}-${SVER}.$( get_version_component_range 3-3 )${PLV}"
+NEWP="${PN}-${PV}"
+#NEWP="${NEWP/_beta/-beta}"
+
 
 # shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -14,59 +15,71 @@ S="${WORKDIR}/${PN}"
 
 DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
 HOMEPAGE="http://www.mysql.com/"
-SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz"
+SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
+	mirror://gentoo/mysql-extras-20050920.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
-IUSE="berkdb debug doc minimal perl readline selinux ssl static tcpd cluster utf8 geometry extraengine big-tables"
+KEYWORDS="~alpha amd64 arm ~ia64 ppc ~ppc64 s390 sparc x86"
+IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static tcpd"
 RESTRICT="primaryuri"
 
 DEPEND="readline? ( >=sys-libs/readline-4.1 )
-		bdb? ( sys-apps/ed )
-		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
-		ssl? ( >=dev-libs/openssl-0.9.6d )
-		perl? ( dev-lang/perl )
-		>=sys-libs/zlib-1.2.3
-		>=sys-apps/texinfo-4.7-r1
-		sys-process/procps
-		>=sys-apps/sed-4"
+	bdb? ( sys-apps/ed )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r6 )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( dev-lang/perl )
+	userland_GNU? ( sys-process/procps )
+	>=sys-libs/zlib-1.2.3
+	>=sys-apps/texinfo-4.7-r1
+	>=sys-apps/sed-4"
 RDEPEND="${DEPEND} selinux? ( sec-policy/selinux-mysql )"
 # dev-perl/DBD-mysql is needed by some scripts installed by MySQL
 PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
 
+if version_is_at_least "4.1.3" ; then
+	IUSE="${IUSE} cluster utf8 geometry extraengine"
+fi
+
 mysql_upgrade_error() {
-	mysql_get_datadir
-	ewarn "Sorry plain upgrade from version of MySQL before 4.1.4 is NOT supported."
-	ewarn "Be sure to read \"Upgrading from version 4.0 to 4.1\" section"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
-	ewarn "then unmerge previous version of MySQL with"
-	ewarn "#emerge -C dev-db/mysql"
-	ewarn "move your data out of \"${DATADIR}\""
-	ewarn "#emerge =dev-db/${P}"
-	ewarn "reload data you dumped with \"mysqldump\" Because you have read "
-	ewarn "the documentation on how to upgrade"
+	ewarn "Sorry, plain up/downgrade between different version of MySQL is (still)"
+	ewarn "un-supported."
+	ewarn "Some gentoo documentation on how to do it:"
+	ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
+	ewarn "Also on the MySQL website:"
+	ewarn "http://dev.mysql.com/doc/refman/4.1/en/upgrading-from-4-0.html"
 	ewarn ""
 	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
 	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
 	ewarn "into /etc/mysql/my.cnf (you need a recent MySQL version)"
+	ewarn ""
+
 }
 
 mysql_upgrade_warning() {
 	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
 	ewarn "must recompile the other packages on your system that link with"
 	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
+	ewarn "of packages for your system, you may use:"
+	ewarn "revdep-rebuild --soname=libmysqlclient.so.12"
+	ewarn "from app-portage/gentoolkit."
+	ewarn ""
+	ewarn "the value of \"innodb_log_file_size\" into /etc/mysql/my.cnf file "
+	ewarn "has changed size from \"8M\" to \"5M\"."
+	ewarn "To start mysql either revert the value back to \"8M\" or backup and"
+	ewarn "remove the old ib_logfile* from the datadir"
 }
 
 mysql_get_datadir() {
 	DATADIR=""
 	if [ -f '/etc/mysql/my.cnf' ] ; then
-		#DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
 		#DATADIR=`/usr/sbin/mysqld  --help |grep '^datadir' | awk '{print $2}'`
 		#DATADIR=`my_print_defaults mysqld | grep -- '^--datadir' | tail -n1 | sed -e 's|^--datadir=||'`
 		DATADIR=`my_print_defaults mysqld 2>/dev/null | sed -ne '/datadir/s|^--datadir=||p' | tail -n1`
+		if [ -z "${DATADIR}" ]; then
+			DATADIR=`grep ^datadir /etc/mysql/my.cnf | sed -e 's/.*= //'`
+			einfo "Using default DATADIR"
+		fi
 	fi
 	if [ -z "${DATADIR}" ]; then
 		DATADIR="/var/lib/mysql/"
@@ -90,26 +103,47 @@ mysql_get_datadir() {
 }
 
 pkg_setup() {
-	mysql_get_datadir
-	if ! useq minimal ; then
-		if has_version "<=dev-db/mysql-4.1.4" \
-		&& ! built_with_use dev-db/mysql minimal \
-		&& [ -d "${DATADIR}/mysql" ]; then
+
+	if [[ -z $MYSQL_STRAIGHT_UPGRADE ]] ; then
+		mysql_get_datadir
+		local curversion="dev-db/${PN}-${PV%.*}"
+		local oldversion="$(best_version dev-db/mysql)"
+		oldversion=${oldversion%.*}
+
+		# permit upgrade from old version if it's safe
+		useq minimal && oldversion=""
+		built_with_use dev-db/mysql minimal && oldversion=""
+		[[ -d "${DATADIR}/mysql" ]] || oldversion=""
+
+		if [[ -n "${oldversion}" ]] && [[ "${oldversion}" != "${curversion}" ]]
+		then
 			mysql_upgrade_error
+			eerror "MySQL-${oldversion} found, up/downgrade to \"${curversion}\" is unsupported"
+			eerror "export MYSQL_STRAIGHT_UPGRADE=1 to force"
 			die
 		fi
 	fi
+
 	mysql_upgrade_warning
+
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+
 }
 
 src_unpack() {
-	if use static && use ssl; then
+	if useq static && useq ssl; then
 		local msg="MySQL does not support building statically with SSL support"
 		eerror "${msg}"
 		die "${msg}"
 	fi
 
-	if useq cluster || useq geometry || useq extraengine && useq minimal; then
+	if version_is_at_least "4.1.3" \
+	&& useq cluster \
+	|| useq geometry \
+	|| useq extraengine \
+	&& useq minimal ; then
 		die "USEs cluster, geometry, extraengine conflicts with \"minimal\""
 	fi
 
@@ -117,27 +151,15 @@ src_unpack() {
 
 	mv "${WORKDIR}/${NEWP}" "${S}"
 	cd "${S}"
+	rm -rf "${S}/zlib/"*.[ch]
+	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 
-	# for correct hardcoded sysconf directory
-	epatch "${FILESDIR}/${PN}-4.0-my-print-defaults.diff"
-
-	# attempt to get libmysqlclient_r linked against ssl if USE="ssl" enabled
-	# i would really prefer to fix this at the Makefile.am level, but can't
-	# get the software to autoreconf as distributed - too many missing files
-	epatch "${FILESDIR}/${PN}-4.1.9-thrssl.patch"
-
-	# FIXED upstrem in 4.1.14
-	# PIC fixes
-	# bug #42968
-	#epatch "${FILESDIR}/035_x86_asm-pic-fixes-r3.patch"
+	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
 
-	if use tcpd; then
-		epatch "${FILESDIR}/${PN}-4.0.14-r1-tcpd-vars-fix.diff"
-	fi
-
-	# FIXED upstrem in 4.1.14
-	# avoid error running src_test and not enabling geometry USE flag
-	#useq geometry || epatch "${FILESDIR}/${PN}-test-myisam-geometry.patch"
+	epatch ${MY_PATCH_SOURCE}/010_all_my-print-defaults-r0.patch || die
+	epatch ${MY_PATCH_SOURCE}/030_all_thrssl-r1.patch || die
+	epatch ${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch || die
+	epatch ${MY_PATCH_SOURCE}/040_all_tcpd-vars-fix.patch || die
 
 	for d in ${S} ${S}/innobase; do
 		cd ${d}
@@ -152,14 +174,28 @@ src_unpack() {
 		gnuconfig_update
 	done
 
-	## Should be fixed in 4.1.12
-	# upstream bug http://bugs.mysql.com/bug.php?id=7971
-	# names conflict with stuff in 2.6.10 kernel headers
-	#sed -i.orig \
-	#	-e "s/\<set_bit\>/my__set_bit/g" \
-	#	-e "s/\<clear_bit\>/my__clear_bit/g" \
-	#	${S}/client/mysqltest.c || die "Failed to fix bitops"
+	# Temporary workaround for bug in test suite, a correct solution
+	# should work inside the include files to enable/disable the tests
+	# for the current configuration
 
+	if ! useq extraengine ; then
+		einfo "disabling unneded extraengine tests"
+		local disable_test="archive bdb blackhole federated view csv"
+		for i in $disable_test ; do
+			mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
+			&> /dev/null
+		done
+	fi
+
+
+	if ! useq berkdb ; then
+		einfo "disabling unneded berkdb tests"
+		local disable_test="auto_increment bdb-alter-table-1 bdb-alter-table-2 bdb-crash bdb-deadlock bdb bdb_cache binlog ctype_sjis ctype_utf8 heap_auto_increment index_merge_bdb multi_update mysqldump ps_1general ps_6bdb rowid_order_bdb"
+		for i in $disable_test ; do
+			mv "${S}/mysql-test/t/${i}.test" "${S}/mysql-test/t/${i}.disabled" \
+			&> /dev/null
+		done
+	fi
 }
 
 src_compile() {
@@ -168,24 +204,39 @@ src_compile() {
 	# readline pair reads backwards on purpose, DONT change it around, Ok?
 	# this is because it refers to the building of a bundled readline
 	# versus the system copy
-	use readline && myconf="${myconf} --without-readline"
-	use readline || myconf="${myconf} --with-readline"
+	useq readline && myconf="${myconf} --without-readline"
+	useq readline || myconf="${myconf} --with-readline"
 
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
+	if useq static ; then
+		myconf="${myconf} --with-mysqld-ldflags=-all-static"
+		myconf="${myconf} --with-client-ldflags=-all-static"
+		myconf="${myconf} --disable-shared"
+	else
+		myconf="${myconf} --enable-shared --enable-static"
+	fi
 
 	myconf="${myconf} `use_with tcpd libwrap`"
 
-	use ssl \
-		&& myconf="${myconf} --with-vio --with-openssl" \
-		|| myconf="${myconf} --without-openssl"
+	if useq ssl ; then
+		# --with-vio is not needed anymore, it's on by default and
+		# has been removed from configure
+		version_is_at_least "5.0.4_beta" || myconf="${myconf} --with-vio"
+		if version_is_at_least "5.0.6_beta" ; then
+			# yassl-0.96 is young break with gcc-4.0 || amd64
+			#myconf="${myconf} --with-yassl"
+			myconf="${myconf} --with-openssl"
+		else
+			myconf="${myconf} --with-openssl"
+		fi
+	else
+		myconf="${myconf} --without-openssl"
+	fi
 
-	if use debug; then
+	if useq debug; then
 		myconf="${myconf} --with-debug=full"
 	else
 		myconf="${myconf} --without-debug"
-		use cluster && myconf="${myconf} --without-ndb-debug"
+		version_is_at_least "4.1.3" && useq cluster && myconf="${myconf} --without-ndb-debug"
 	fi
 
 	# benchmarking stuff needs perl
@@ -199,16 +250,27 @@ src_compile() {
 	# these are things we exclude from a minimal build
 	# note that the server actually does get built and installed
 	# but we then delete it before packaging.
-	local minimal_exclude_list="server embedded-server extra-tools innodb raid"
+	local minimal_exclude_list="server embedded-server extra-tools innodb"
 	if ! useq minimal; then
 		for i in ${minimal_exclude_list}; do
 			myconf="${myconf} --with-${i}"
 		done
 
-		if useq utf8; then
-			myconf="${myconf} --with-charset=utf8 --with-collation=utf8_general_ci"
+		if useq static ; then
+			myconf="${myconf} --without-raid"
+			ewarn "disabling raid support, has problem with static"
 		else
-			myconf="${myconf} --with-charset=latin1 --with-collation=latin1_swedish_ci"
+			myconf="${myconf} --with-raid"
+		fi
+
+		if ! version_is_at_least "5.0_alpha" ; then
+			if version_is_at_least "4.1_alpha" && useq utf8; then
+				myconf="${myconf} --with-charset=utf8"
+				myconf="${myconf} --with-collation=utf8_general_ci"
+			else
+				myconf="${myconf} --with-charset=latin1"
+				myconf="${myconf} --with-collation=latin1_swedish_ci"
+			fi
 		fi
 
 		# lots of chars
@@ -221,12 +283,17 @@ src_compile() {
 		then
 			myconf="${myconf} --without-berkeley-db"
 		else
-			use berkdb \
+			useq berkdb \
 				&& myconf="${myconf} --with-berkeley-db=./bdb" \
 				|| myconf="${myconf} --without-berkeley-db"
 		fi
-		myconf="${myconf} $(use_with geometry) $(use_with cluster ndbcluster)"
-		myconf="${myconf} $(use_with big-tables)"
+
+		if version_is_at_least "4.1.3" ; then
+			myconf="${myconf} $(use_with geometry)"
+			myconf="${myconf} $(use_with cluster ndbcluster)"
+		fi
+
+		version_is_at_least "4.1.11_alpha20050403" &&  myconf="${myconf} --with-big-tables"
 	else
 		for i in ${minimal_exclude_list}; do
 			myconf="${myconf} --without-${i}"
@@ -238,27 +305,33 @@ src_compile() {
 	# documentation
 	myconf="${myconf} `use_with doc docs`"
 
-	if useq extraengine; then
+	if version_is_at_least "4.1.3" && useq extraengine; then
 		# http://dev.mysql.com/doc/mysql/en/archive-storage-engine.html
 		myconf="${myconf} --with-archive-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/csv-storage-engine.html
-		myconf="${myconf} --with-csv-storage-engine"
+		version_is_at_least "4.1.4" \
+		&& myconf="${myconf} --with-csv-storage-engine"
 		# http://dev.mysql.com/doc/mysql/en/federated-description.html
 		# http://dev.mysql.com/doc/mysql/en/federated-limitations.html
-		#if  version_is_at_least "5.1.3" ; then
-		#	einfo "before to use federated engine be sure to read"
-		#	einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
-		#	myconf="${myconf} --with-federated-storage-engine"
-		#fi
-		myconf="${myconf} --with-blackhole-storage-engine"
+		if version_is_at_least "5.0.3" ; then
+			einfo "before to use federated engine be sure to read"
+			einfo "http://dev.mysql.com/doc/mysql/en/federated-limitations.html"
+			myconf="${myconf} --with-federated-storage-engine"
+		fi
+		version_is_at_least "4.1.11_alpha20050403" \
+		&&  myconf="${myconf} --with-blackhole-storage-engine"
 	fi
 
+	myconf="${myconf} `use_with big-tables`"
+
 	#glibc-2.3.2_pre fix; bug #16496
 	append-flags "-DHAVE_ERRNO_AS_DEFINE=1"
 
 	#the compiler flags are as per their "official" spec ;)
 	#CFLAGS="${CFLAGS/-O?/} -O3" \
 	export CXXFLAGS="${CXXFLAGS} -felide-constructors -fno-exceptions -fno-rtti"
+	version_is_at_least "5.0_alpha" \
+	&& export CXXFLAGS="${CXXFLAGS} -fno-implicit-templates"
 
 	econf \
 		--libexecdir=/usr/sbin \
@@ -279,29 +352,40 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-src_install() {
-	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
-
-	enewgroup mysql 60 || die "problem adding group mysql"
-	enewuser mysql 60 -1 /dev/null mysql \
-	|| die "problem adding user mysql"
+src_test() {
+	cd ${S}
+	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
+	make check || die "make check failed"
+	if ! useq minimal; then
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus
+		addpredict /this-dir-does-not-exist/t9.MYI
 
-	diropts "-m0750"
-	if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
-		dodir "${DATADIR}"
-		keepdir "${DATADIR}"
-		chown -R mysql:mysql "${D}/${DATADIR}"
-	fi
+		# Temporary removed, 4.1.14 use mysql-test-run.pl instead
+		# of mysql-test-run, thus failing on test that should be
+		# skipped.
+		#version_is_at_least "5.0.6_beta" \
+		#&& make test-force \
+		#|| make test
 
-	dodir /var/log/mysql
+		# <replace me whenever possible>
+		cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol
+		retstatus=$?
+		cd ..
+		# </replace me whenever possible>
 
-	diropts "-m0755"
-	dodir /var/run/mysqld
+		# to be sure ;)
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		[[ $retstatus -eq 0 ]] || die "make test failed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}
 
-	keepdir /var/run/mysqld /var/log/mysql
-	chown -R mysql:mysql \
-		${D}/var/run/mysqld \
-		${D}/var/log/mysql
+src_install() {
+	mysql_get_datadir
+	make install DESTDIR="${D}" benchdir_root="/usr/share/mysql" || die
 
 	# move client libs, install a couple of missing headers
 	local lib=$(get_libdir)
@@ -328,7 +412,7 @@ src_install() {
 	rm -f ${D}/usr/share/mysql/my-*.cnf # Put them elsewhere
 
 	# All of these (ab)use Perl.
-	if ! use perl; then
+	if ! useq perl; then
 		rm -f ${D}/usr/bin/{mysqlhotcopy,mysql_find_rows,mysql_convert_table_format,mysqld_multi,mysqlaccess,mysql_fix_extensions,mysqldumpslow,mysql_zap,mysql_explain_log,mysql_tableinfo,mysql_setpermission}
 		rm -f ${D}/usr/bin/mysqlhotcopy
 		rm -rf ${D}/usr/share/mysql/sql-bench
@@ -349,8 +433,9 @@ src_install() {
 
 	newins "${FILESDIR}/my.cnf-4.1" my.cnf
 
-	if ! use utf8; then
-		sed -i -e "s/utf8/latin1/" ${D}/etc/mysql/my.cnf
+	if version_is_at_least "4.1.3" && ! useq utf8; then
+		sed --in-place -e "s/utf8/latin1/" \
+			${D}/etc/mysql/my.cnf
 	fi
 
 	# minimal builds don't have the server
@@ -359,6 +444,28 @@ src_install() {
 		newexe "${FILESDIR}/mysql-4.0.24-r2.rc6" mysql
 		insinto /etc/logrotate.d
 		newins "${FILESDIR}/logrotate.mysql" mysql
+
+		#empty dirs...
+		diropts "-m0750"
+		if [[ "${PREVIOUS_DATADIR}" != "yes" ]] ; then
+	        dodir "${DATADIR}"
+	        keepdir "${DATADIR}"
+	        chown -R mysql:mysql "${D}/${DATADIR}"
+		fi
+
+		diropts "-m0755"
+		dodir "/var/log/mysql"
+		#touch ${D}/var/log/mysql/mysql.{log,err}
+		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
+
+		diropts "-m0755"
+		dodir "/var/run/mysqld"
+
+		keepdir "/var/run/mysqld"
+		chown -R mysql:mysql \
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
@@ -372,26 +479,38 @@ src_install() {
 	fi
 }
 
-src_test() {
-	cd ${S}
-	einfo ">>> Test phase [check]: ${CATEGORY}/${PF}"
-	make check || die "make check failed"
-	if ! useq minimal; then
-		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		local retstatus
-		addpredict /this-dir-does-not-exist/t9.MYI
-		make test
-		retstatus=$?
+pkg_preinst() {
+	enewgroup mysql 60 || die "problem adding group mysql"
+	enewuser mysql 60 -1 /dev/null mysql \
+	|| die "problem adding user mysql"
+}
 
-		# to be sure ;)
-		pkill -9 -f ${S}/ndb/src/kernel/ndbd 2>/dev/null
-		pkill -9 -f ${S}/ndb/src/mgmsrv/ndb_mgmd 2>/dev/null
-		pkill -9 -f ${S}/ndb/src/mgmclient/ndb_mgm 2>/dev/null
-		pkill -9 -f ${S}/sql/mysqld 2>/dev/null
-		[[ $retstatus == 0 ]] || die "make test failed"
-	else
-		einfo "Skipping server tests due to minimal build."
+pkg_postinst() {
+	mysql_get_datadir
+
+	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+	#secure the logfiles... does this bother anybody?
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+	chmod 0660 ${ROOT}/var/log/mysql/mysql*
+	# secure some directories
+	chmod 0750 ${ROOT}/var/log/mysql
+
+	if ! useq minimal; then
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"emerge --config =${PF}\""
+		einfo "if this is a new install."
+		einfo
 	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
 pkg_config() {
@@ -409,7 +528,7 @@ pkg_config() {
 	local pwd2="b"
 	local maxtry=5
 
-	if [[ -d "${DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
 		ewarn "Please rename it or delete it if you wish to replace it."
 		die "MySQL database already exists!"
@@ -419,40 +538,47 @@ pkg_config() {
 	einfo "permissions on it..."
 
 	einfo "Insert a password for the mysql 'root' user"
-	ewarn "the password will be visible on the screen"
+	ewarn "Avoid [\"'\\_%] characters in the password"
 
-	echo -n "    >" && read -r pwd1
+	read -rsp "    >" pwd1 ; echo
 	einfo "Check the password"
-	echo -n "    >" && read -r pwd2
+	read -rsp "    >" pwd2 ; echo
 
-	if ((  pwd1 != pwd2 )) ; then
+	if [[ "x$pwd1" != "x$pwd2" ]] ; then
 		die "Passwords are not the same"
 	fi
 
 	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
 	# MySQL 5.0 don't need this
-	chown -R mysql:mysql ${DATADIR}
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
 	chmod 0750 ${ROOT}/${DATADIR}
 
+	local options=""
 	local sqltmp="$(emktemp)"
 	local help_tables="${ROOT}/usr/share/mysql/fill_help_tables.sql"
-	# Filling timezones, see
-	# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
-	${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo > "${sqltmp}"
 
-	if [[ -r "${help_tables}" ]] ; then
-		cat "${help_tables}" >> "${sqltmp}"
+	if version_is_at_least "4.1.3" ; then
+		options="--skip-ndbcluster"
+
+		# Filling timezones, see
+		# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
+		${ROOT}/usr/bin/mysql_tzinfo_to_sql ${ROOT}/usr/share/zoneinfo \
+		> "${sqltmp}"
+
+		if [[ -r "${help_tables}" ]] ; then
+			cat "${help_tables}" >> "${sqltmp}"
+		fi
 	fi
 
 	local socket=${ROOT}/var/run/mysqld/mysqld.sock
 	local mysqld="${ROOT}/usr/sbin/mysqld \
+		${options} \
 		--skip-grant-tables \
 		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
+		--datadir=${ROOT}/${DATADIR} \
 		--skip-innodb \
 		--skip-bdb \
-		--skip-ndbcluster \
 		--max_allowed_packet=8M \
 		--net_buffer_length=16K \
 		--socket=${socket} \
@@ -486,36 +612,3 @@ pkg_config() {
 	rm  "${sqltmp}"
 	einfo "done"
 }
-
-pkg_postinst() {
-	mysql_get_datadir
-
-	if ! useq minimal; then
-		#empty dirs...
-		[[ "${PREVIOUS_DATADIR}" != "yes" ]] \
-		&& [ -d "${ROOT}/${DATADIR}" ] || install -d -m0750 -o mysql -g mysql ${ROOT}/var/lib/mysql
-		[ -d "${ROOT}/var/run/mysqld" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/run/mysqld
-		[ -d "${ROOT}/var/log/mysql" ] || install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-		# secure the logfiles... does this bother anybody?
-		touch ${ROOT}/var/log/mysql/mysql.{log,err}
-		chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-		chmod 0660 ${ROOT}/var/log/mysql/mysql*
-		# secure some directories
-		chmod 0750 ${ROOT}/var/log/mysql ${ROOT}/${DATADIR}
-
-		# your friendly public service announcement...
-		einfo
-		einfo "You might want to run:"
-		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
-		einfo "if this is a new install."
-		einfo
-		if [[ "${PREVIOUS_DATADIR}" == "yes" ]] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-		fi
-	fi
-
-	mysql_upgrade_warning
-	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}
diff --git a/dev-db/mysql/mysql-4.1.15-r30.ebuild b/dev-db/mysql/mysql-4.1.15-r30.ebuild
index b0398245a7fe..442d1f917ab4 100644
--- a/dev-db/mysql/mysql-4.1.15-r30.ebuild
+++ b/dev-db/mysql/mysql-4.1.15-r30.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/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.1 2005/10/28 15:42:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15-r30.ebuild,v 1.1.1.1 2005/11/30 10:11:28 chriswhite Exp $
 
 MYSQL_VERSION_ID=40115
 PROTOCOL_VERSION=10
diff --git a/dev-db/mysql/mysql-4.1.15.ebuild b/dev-db/mysql/mysql-4.1.15.ebuild
index 42b581c3a37a..2268d37d879c 100644
--- a/dev-db/mysql/mysql-4.1.15.ebuild
+++ b/dev-db/mysql/mysql-4.1.15.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/dev-db/mysql/mysql-4.1.15.ebuild,v 1.1 2005/10/22 14:29:44 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-4.1.15.ebuild,v 1.1.1.1 2005/11/30 10:11:31 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic versionator
 
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static tcpd"
 RESTRICT="primaryuri"
 
@@ -41,7 +41,7 @@ if version_is_at_least "4.1.3" ; then
 	# 2005-09-29
 	#   geometry has been removed due to repeated compile problems _without_ it.
 	#   From now on it will be *always* enabled
-	#   if you need to compile *without it* take a look at 
+	#   if you need to compile *without it* take a look at
 	#	http://lists.mysql.com/internals/29559
 	IUSE="${IUSE} cluster utf8 extraengine"
 fi
@@ -65,8 +65,9 @@ mysql_upgrade_warning() {
 	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
 	ewarn "must recompile the other packages on your system that link with"
 	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
+	ewarn "of packages for your system, you may use:"
+	ewarn "revdep-rebuild --library=libmysqlclient.so.12"
+	ewarn "from app-portage/gentoolkit."
 	ewarn ""
 	ewarn "the value of \"innodb_log_file_size\" into /etc/mysql/my.cnf file "
 	ewarn "has changed size from \"8M\" to \"5M\"."
@@ -110,7 +111,7 @@ pkg_setup() {
 
 	if [[ -z $MYSQL_STRAIGHT_UPGRADE ]] ; then
 		mysql_get_datadir
-		local local curversion="dev-db/${PN}-${PV%.*}"
+		local curversion="dev-db/${PN}-${PV%.*}"
 		local oldversion="$(best_version dev-db/mysql)"
 		oldversion=${oldversion%.*}
 
@@ -154,13 +155,14 @@ src_unpack() {
 
 	mv "${WORKDIR}/${NEWP}" "${S}"
 	cd "${S}"
-	rm -rf "${S}/zlib"
+	rm -rf "${S}/zlib/"*.[ch]
 	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 
 	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
 
 	epatch ${MY_PATCH_SOURCE}/010_all_my-print-defaults-r0.patch || die
 	epatch ${MY_PATCH_SOURCE}/030_all_thrssl-r1.patch || die
+	epatch ${MY_PATCH_SOURCE}/035_x86_asm-pic-fixes-r7.patch || die
 	epatch ${MY_PATCH_SOURCE}/040_all_tcpd-vars-fix.patch || die
 
 	for d in ${S} ${S}/innobase; do
@@ -257,6 +259,7 @@ src_compile() {
 		for i in ${minimal_exclude_list}; do
 			myconf="${myconf} --with-${i}"
 		done
+
 		if useq static ; then
 			myconf="${myconf} --without-raid"
 			ewarn "disabling raid support, has problem with static"
@@ -290,7 +293,7 @@ src_compile() {
 		fi
 
 		if version_is_at_least "4.1.3" ; then
-			myconf="${myconf} -with-geometry"
+			myconf="${myconf} --with-geometry"
 			#myconf="${myconf} $(use_with geometry)"
 			myconf="${myconf} $(use_with cluster ndbcluster)"
 		fi
@@ -446,12 +449,13 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		#diropts "-m0755"
-		#dodir "/var/log/mysql"
+		diropts "-m0755"
+		dodir "/var/log/mysql"
+		# the following files fails with FEATURES="collision-protect"
 		#touch ${D}/var/log/mysql/mysql.{log,err}
 		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
-		#keepdir "/var/log/mysql"
-		#chown -R mysql:mysql "${D}/var/log/mysql"
+		keepdir "/var/log/mysql"
+		chown -R mysql:mysql "${D}/var/log/mysql"
 
 		diropts "-m0755"
 		dodir "/var/run/mysqld"
@@ -481,6 +485,18 @@ pkg_preinst() {
 pkg_postinst() {
 	mysql_get_datadir
 
+	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+	#secure the logfiles... does this bother anybody?
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+	chmod 0660 ${ROOT}/var/log/mysql/mysql*
+	# secure some directories
+	chmod 0750 ${ROOT}/var/log/mysql
+
 	if ! useq minimal; then
 		# your friendly public service announcement...
 		einfo
@@ -488,10 +504,6 @@ pkg_postinst() {
 		einfo "\"emerge --config =${PF}\""
 		einfo "if this is a new install."
 		einfo
-		if [[ "${PREVIOUS_DATADIR}" == "yes" ]] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-		fi
 	fi
 
 	mysql_upgrade_warning
@@ -513,7 +525,7 @@ pkg_config() {
 	local pwd2="b"
 	local maxtry=5
 
-	if [[ -d "${DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
 		ewarn "Please rename it or delete it if you wish to replace it."
 		die "MySQL database already exists!"
@@ -536,7 +548,7 @@ pkg_config() {
 	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
 	# MySQL 5.0 don't need this
-	chown -R mysql:mysql ${DATADIR}
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
 	chmod 0750 ${ROOT}/${DATADIR}
 
 	local options=""
@@ -561,7 +573,7 @@ pkg_config() {
 		${options} \
 		--skip-grant-tables \
 		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
+		--datadir=${ROOT}/${DATADIR} \
 		--skip-innodb \
 		--skip-bdb \
 		--max_allowed_packet=8M \
@@ -598,17 +610,3 @@ pkg_config() {
 	einfo "done"
 }
 
-pkg_postinst() {
-	# mind at FEATURES=collision-protect before to remove this
-	#empty dirs...
-	[ -d "${ROOT}/var/log/mysql" ] \
-		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
-
-	#secure the logfiles... does this bother anybody?
-	touch ${ROOT}/var/log/mysql/mysql.{log,err}
-	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
-	chmod 0660 ${ROOT}/var/log/mysql/mysql*
-	# secure some directories
-	chmod 0750 ${ROOT}/var/log/mysql
-}
-
diff --git a/dev-db/mysql/mysql-5.0.13_rc.ebuild b/dev-db/mysql/mysql-5.0.13_rc.ebuild
index 2e447f855d27..321df8130fa0 100644
--- a/dev-db/mysql/mysql-5.0.13_rc.ebuild
+++ b/dev-db/mysql/mysql-5.0.13_rc.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/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.1 2005/09/29 16:17:02 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.13_rc.ebuild,v 1.1.1.1 2005/11/30 10:11:30 chriswhite Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -21,7 +21,8 @@ SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+#KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static"
 RESTRICT="primaryuri"
 
@@ -50,7 +51,7 @@ mysql_upgrade_error() {
 	ewarn "Some gentoo documentation on how to do it:"
 	ewarn "http://www.gentoo.org/doc/en/mysql-upgrading.xml"
 	ewarn "Also on the MySQL website:"
-	ewarn "http://dev.mysql.com/doc/mysql/en/upgrading-from-4-0.html"
+	ewarn "http://dev.mysql.com/doc/refman/5.0/en/upgrading-from-4-1.html"
 	ewarn ""
 	ewarn "You can also choose to preview some new MySQL 4.1 behaviour"
 	ewarn "adding a section \"[mysqld-4.0]\" followed by the word \"new\""
@@ -61,8 +62,9 @@ mysql_upgrade_warning() {
 	ewarn "If you're upgrading from MySQL-3.x to 4.0, or 4.0.x to 4.1.x, you"
 	ewarn "must recompile the other packages on your system that link with"
 	ewarn "libmysqlclient after the upgrade completes.  To obtain such a list"
-	ewarn "of packages for your system, you may use 'revdep-rebuild' from"
-	ewarn "app-portage/gentoolkit."
+	ewarn "of packages for your system, you may use:"
+	ewarn "revdep-rebuild --soname=libmysqlclient.so.14"
+	ewarn "from app-portage/gentoolkit."
 	ewarn ""
 	ewarn "the value of \"innodb_log_file_size\" into /etc/mysql/my.cnf file "
 	ewarn "has changed size from \"8M\" to \"5M\"."
@@ -150,7 +152,7 @@ src_unpack() {
 
 	mv "${WORKDIR}/${NEWP}" "${S}"
 	cd "${S}"
-	rm -rf "${S}/zlib"
+	rm -rf "${S}/zlib/"*.[ch]
 	sed -i -e "s/zlib\/Makefile dnl/dnl zlib\/Makefile/" "${S}/configure.in"
 
 	local MY_PATCH_SOURCE="${WORKDIR}/mysql-extras"
@@ -447,17 +449,19 @@ src_install() {
 	        chown -R mysql:mysql "${D}/${DATADIR}"
 		fi
 
-		dodir "/var/log/mysql"
-		touch ${D}/var/log/mysql/mysql.{log,err}
-		chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		#diropts "-m0755"
+		#dodir "/var/log/mysql"
+		#touch ${D}/var/log/mysql/mysql.{log,err}
+		#chmod 0660 ${D}/var/log/mysql/mysql.{log,err}
+		#keepdir "/var/log/mysql"
+		#chown -R mysql:mysql "${D}/var/log/mysql"
 
 		diropts "-m0755"
 		dodir "/var/run/mysqld"
 
-		keepdir "/var/run/mysqld" "${D}/var/log/mysql"
+		keepdir "/var/run/mysqld"
 		chown -R mysql:mysql \
-	        "${D}/var/run/mysqld" \
-	        "${D}/var/log/mysql"
+	        "${D}/var/run/mysqld"
 	fi
 
 	# docs
@@ -480,17 +484,25 @@ pkg_preinst() {
 pkg_postinst() {
 	mysql_get_datadir
 
+	# mind at FEATURES=collision-protect before to remove this
+	#empty dirs...
+	[ -d "${ROOT}/var/log/mysql" ] \
+		|| install -d -m0755 -o mysql -g mysql ${ROOT}/var/log/mysql
+
+	#secure the logfiles... does this bother anybody?
+	touch ${ROOT}/var/log/mysql/mysql.{log,err}
+	chown mysql:mysql ${ROOT}/var/log/mysql/mysql*
+	chmod 0660 ${ROOT}/var/log/mysql/mysql*
+	# secure some directories
+	chmod 0750 ${ROOT}/var/log/mysql
+
 	if ! useq minimal; then
 		# your friendly public service announcement...
 		einfo
 		einfo "You might want to run:"
-		einfo "\"ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config\""
+		einfo "\"emerge --config =${PF}\""
 		einfo "if this is a new install."
 		einfo
-		if [[ "${PREVIOUS_DATADIR}" == "yes" ]] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-		fi
 	fi
 
 	mysql_upgrade_warning
@@ -512,7 +524,7 @@ pkg_config() {
 	local pwd2="b"
 	local maxtry=5
 
-	if [[ -d "${DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
 		ewarn "Please rename it or delete it if you wish to replace it."
 		die "MySQL database already exists!"
@@ -535,7 +547,7 @@ pkg_config() {
 	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
 	# MySQL 5.0 don't need this
-	chown -R mysql:mysql ${DATADIR}
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
 	chmod 0750 ${ROOT}/${DATADIR}
 
 	local options=""
@@ -560,7 +572,7 @@ pkg_config() {
 		${options} \
 		--skip-grant-tables \
 		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
+		--datadir=${ROOT}/${DATADIR} \
 		--skip-innodb \
 		--skip-bdb \
 		--max_allowed_packet=8M \
diff --git a/dev-db/mysql/mysql-5.0.15-r30.ebuild b/dev-db/mysql/mysql-5.0.15-r30.ebuild
index fd06dcab5892..95f4d404b013 100644
--- a/dev-db/mysql/mysql-5.0.15-r30.ebuild
+++ b/dev-db/mysql/mysql-5.0.15-r30.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/dev-db/mysql/mysql-5.0.15-r30.ebuild,v 1.1 2005/10/28 15:42:56 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.15-r30.ebuild,v 1.1.1.1 2005/11/30 10:11:28 chriswhite Exp $
 
 MYSQL_VERSION_ID=50015
 PROTOCOL_VERSION=10
diff --git a/dev-db/mysql/mysql-5.0.15.ebuild b/dev-db/mysql/mysql-5.0.15.ebuild
index 60afb78139de..36a045d99c49 100644
--- a/dev-db/mysql/mysql-5.0.15.ebuild
+++ b/dev-db/mysql/mysql-5.0.15.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/dev-db/mysql/mysql-5.0.15.ebuild,v 1.1 2005/10/24 17:00:19 vivo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql/mysql-5.0.15.ebuild,v 1.1.1.1 2005/11/30 10:11:32 chriswhite Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -22,7 +22,7 @@ SRC_URI="mirror://mysql/Downloads/MySQL-${SVER}/${NEWP}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 #KEYWORDS="~x86 ~amd64 ~sparc ~ia64 ~ppc ~ppc64"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86"
 IUSE="big-tables berkdb debug doc minimal perl readline selinux ssl static"
 RESTRICT="primaryuri"
 
@@ -491,24 +491,6 @@ pkg_preinst() {
 pkg_postinst() {
 	mysql_get_datadir
 
-	if ! useq minimal; then
-		# your friendly public service announcement...
-		einfo
-		einfo "You might want to run:"
-		einfo "\"emerge --config =${PF}\""
-		einfo "if this is a new install."
-		einfo
-		if [[ "${PREVIOUS_DATADIR}" == "yes" ]] ; then
-			ewarn "Previous datadir found, it's YOUR job to change"
-			ewarn "ownership and have care of it"
-		fi
-	fi
-
-	mysql_upgrade_warning
-	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
-}
-
-pkg_postinst() {
 	# mind at FEATURES=collision-protect before to remove this
 	#empty dirs...
 	[ -d "${ROOT}/var/log/mysql" ] \
@@ -520,6 +502,18 @@ pkg_postinst() {
 	chmod 0660 ${ROOT}/var/log/mysql/mysql*
 	# secure some directories
 	chmod 0750 ${ROOT}/var/log/mysql
+
+	if ! useq minimal; then
+		# your friendly public service announcement...
+		einfo
+		einfo "You might want to run:"
+		einfo "\"emerge --config =${PF}\""
+		einfo "if this is a new install."
+		einfo
+	fi
+
+	mysql_upgrade_warning
+	einfo "InnoDB is not optional as of MySQL-4.0.24, at the request of upstream."
 }
 
 pkg_config() {
@@ -537,7 +531,7 @@ pkg_config() {
 	local pwd2="b"
 	local maxtry=5
 
-	if [[ -d "${DATADIR}/mysql" ]] ; then
+	if [[ -d "${ROOT}/${DATADIR}/mysql" ]] ; then
 		ewarn "You have already a MySQL database in place."
 		ewarn "Please rename it or delete it if you wish to replace it."
 		die "MySQL database already exists!"
@@ -560,7 +554,7 @@ pkg_config() {
 	${ROOT}/usr/bin/mysql_install_db || die "MySQL databases not installed"
 
 	# MySQL 5.0 don't need this
-	chown -R mysql:mysql ${DATADIR}
+	chown -R mysql:mysql ${ROOT}/${DATADIR}
 	chmod 0750 ${ROOT}/${DATADIR}
 
 	local options=""
@@ -585,7 +579,7 @@ pkg_config() {
 		${options} \
 		--skip-grant-tables \
 		--basedir=${ROOT}/usr \
-		--datadir=${ROOT}/var/lib/mysql \
+		--datadir=${ROOT}/${DATADIR} \
 		--skip-innodb \
 		--skip-bdb \
 		--max_allowed_packet=8M \
@@ -621,4 +615,3 @@ pkg_config() {
 	rm  "${sqltmp}"
 	einfo "done"
 }
-
diff --git a/dev-db/mysqlnavigator/ChangeLog b/dev-db/mysqlnavigator/ChangeLog
index ed67fa3fe6db..672d3da73b2d 100644
--- a/dev-db/mysqlnavigator/ChangeLog
+++ b/dev-db/mysqlnavigator/ChangeLog
@@ -1,9 +1,69 @@
 # ChangeLog for dev-db/mysqlnavigator
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/ChangeLog,v 1.1 2002/10/24 20:41:08 hannes Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/ChangeLog,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
+
+  10 Oct 2005; Francesco Riosa <vivo@gentoo.org>
+  mysqlnavigator-1.4.1.ebuild, mysqlnavigator-1.4.2.ebuild:
+  fix Bug #108666 mysqlnavigator homepage isn't working
+
+  17 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mysqlnavigator-1.4.2.ebuild:
+  Stable on ppc.
+
+  17 Aug 2005; Francesco Riosa <vivo@gentoo.org>
+  mysqlnavigator-1.4.2.ebuild:
+  stable on x86 mainly to remove 1.4.1 without remove the entire package
+
+  17 Aug 2005; Francesco Riosa <vivo@gentoo.org>
+  +files/mysqlnavigator-1.4.1-about.patch,
+  +files/mysqlnavigator-1.4.1-mysql.patch,
+  +files/mysqlnavigator-1.4.2-mysql-gt-4.1.3.patch,
+  mysqlnavigator-1.4.1.ebuild, mysqlnavigator-1.4.2.ebuild:
+  Fix bug #40217, add support for >=mysql-4.1.3
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> mysqlnavigator-1.4.1.ebuild,
+  mysqlnavigator-1.4.2.ebuild:
+  Fix qt dep per bug #100235
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mysqlnavigator-1.4.1.ebuild:
+  Stable on ppc.
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  mysqlnavigator-1.4.2.ebuild:
+  added ~amd64 to KEYWORDS, fixes #89567
+
+  21 Dec 2004; <SeJo@gentoo.org> mysqlnavigator-1.4.2.ebuild:
+  added libtoolize --copy --force in src_compile
+
+  13 Nov 2004; <SeJo@gentoo.org> :
+  digest wrong
+
+  06 Oct 2004; <SeJo@gentoo.org> mysqlnavigator-1.4.2.ebuild:
+  added the patch of tcort@cs.ubishops.ca
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> mysqlnavigator-1.4.1.ebuild,
+  mysqlnavigator-1.4.2.ebuild:
+  Add die following econf for bug 48950
+
+  16 Jul 2003; Christian Birchinger <joker@gentoo.org>
+  mysqlnavigator-1.4.2.ebuild:
+  Added sparc stable keyword
+
+*mysqlnavigator-1.4.2 (21 Apr 2003)
+  
+  21 Apr 2003; Robin Johnson <robbat2@gentoo.org> mysqlnavigator-1.4.2.ebuild:
+  Rolled updated version (copied 1.4.1)
+  Added fix via 'sed' for MySQL4 and proper CXXFLAGS
 
 *mysqlnavigator-1.4.1 (24 Oct 2002)
 
+  03 Jan 2003; Hannes Mehnert <hannes@gentoo.org> mysqlnavigator-1.4.1.ebuild:
+  fixed to compile with qt-3.1.x. solves #12772
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> mysqlnavigator-1.4.1.ebuild :
+  set ~ppc in keywords
+
   24 Oct 2002; Hannes Mehnert <hannes@gentoo.org> mysqlnavigator-1.4.1.ebuild,
   ChangeLog: Initial ebuild. Thanks to malverian@hotmail.com (Philip Walls)
   and max@endesis.com (Max Meschia) for submission (#7014 and #8996).
diff --git a/dev-db/mysqlnavigator/Manifest b/dev-db/mysqlnavigator/Manifest
index 4e1696440b77..4941c9947eed 100644
--- a/dev-db/mysqlnavigator/Manifest
+++ b/dev-db/mysqlnavigator/Manifest
@@ -1,7 +1,9 @@
-MD5 e5a82c334d48ddee6ad3987b326af27b mysqlnavigator-1.4.2.ebuild~ 703
-MD5 bd35a8474fd3d9db3ba0763768d719b3 mysqlnavigator-1.4.2.ebuild 726
-MD5 85e3faeb8e68209b92538b17bc2bb9cd mysqlnavigator-1.4.1.ebuild 682
-MD5 d39dbdcb339cd416af61bc6eb085a9b7 ChangeLog~ 712
-MD5 352411023fc42651a87afaeb67644e54 ChangeLog 948
+MD5 5e7f4ffdb97e3fece1cfb66d5eb07e5d mysqlnavigator-1.4.2.ebuild 1363
+MD5 dfdadf235508a8b42fda830d1d0e9902 mysqlnavigator-1.4.1.ebuild 948
+MD5 82f53a5d714bf3c9a346890c6c711e83 ChangeLog 2535
+MD5 06d93604c72182bd53e046f4f6cefb52 metadata.xml 247
+MD5 a1c8222244bb028ab05c6abae74a70eb files/mysqlnavigator-1.4.1-about.patch 31554
+MD5 850d88298fe12c24a123d194231d5fce files/mysqlnavigator-1.4.2-mysql-gt-4.1.3.patch 1738
+MD5 e5d5793a432b6cb1c563845ddc344c63 files/mysqlnavigator-1.4.1-mysql.patch 535
 MD5 2ca75439ae281db9a0dd3e0aa0f2c1b5 files/digest-mysqlnavigator-1.4.1 72
-MD5 2c61d9267a3fcf7d12d94808d52aae15 files/digest-mysqlnavigator-1.4.2 72
+MD5 765311fbbc2c57958979e2de14bedc32 files/digest-mysqlnavigator-1.4.2 154
diff --git a/dev-db/mysqlnavigator/files/digest-mysqlnavigator-1.4.2 b/dev-db/mysqlnavigator/files/digest-mysqlnavigator-1.4.2
index 842700e65cff..6c92db0a8999 100644
--- a/dev-db/mysqlnavigator/files/digest-mysqlnavigator-1.4.2
+++ b/dev-db/mysqlnavigator/files/digest-mysqlnavigator-1.4.2
@@ -1 +1,2 @@
 MD5 976c5f0b397db9836b9a1561586a4a69 mysqlnavigator-1.4.2.tar.gz 779305
+MD5 4384e5b8417d6a0035dbe1033c1f5548 mysqlnavigator-1.4.2-gcc34.patch.tar.gz 6828
diff --git a/dev-db/mysqlnavigator/metadata.xml b/dev-db/mysqlnavigator/metadata.xml
index 908ea031820b..eb73a23a731d 100644
--- a/dev-db/mysqlnavigator/metadata.xml
+++ b/dev-db/mysqlnavigator/metadata.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd></herd>
+<herd>no-herd</herd>
 <maintainer>
 <email>vivo@gentoo.org</email>
 <name>Francesco Riosa</name>
 </maintainer>
-<longdescription lang="en">
-</longdescription>
 </pkgmetadata>
-
diff --git a/dev-db/mysqlnavigator/mysqlnavigator-1.4.1.ebuild b/dev-db/mysqlnavigator/mysqlnavigator-1.4.1.ebuild
index cf6c4c23dab4..38b950fa4e64 100644
--- a/dev-db/mysqlnavigator/mysqlnavigator-1.4.1.ebuild
+++ b/dev-db/mysqlnavigator/mysqlnavigator-1.4.1.ebuild
@@ -1,22 +1,34 @@
-# 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/dev-db/mysqlnavigator/mysqlnavigator-1.4.1.ebuild,v 1.1 2002/10/24 20:41:08 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/mysqlnavigator-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
+
+inherit eutils qt3
 
 IUSE=""
 DESCRIPTION="Advanced Qt based front end to mysql"
 SRC_URI="http://sql.kldp.org/snapshots/source/${P}.tar.gz"
-HOMEPAGE="http://sql.kldp.org/mysql"
+HOMEPAGE="http://sourceforge.net/projects/mysqlnavigator"
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="~x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
 DEPEND=">=dev-db/mysql-3.23.49
-	>=x11-libs/qt-3.0.3"
+	$(qt_min_version 3.1)"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-about.patch || die
+	epatch ${FILESDIR}/${P}-mysql.patch || die
+	#this permit to build against mysql >= 4.1.3       
+	epatch ${FILESDIR}/${PN}-1.4.2-mysql-gt-4.1.3.patch || die
+	cd ${S}/src/mysql
+	rm */*_moc.cpp
+}
 
 src_compile() {
 	myconf="--with-mysql-includes=/usr/include/mysql"
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	emake
 }
 
diff --git a/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild b/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild
index 506d1f3b31da..190acd3b80d5 100644
--- a/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild
+++ b/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild
@@ -1,21 +1,29 @@
-# 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/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild,v 1.1 2003/04/22 09:15:08 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqlnavigator/mysqlnavigator-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
+
+inherit eutils qt3
 
 IUSE=""
 DESCRIPTION="Advanced Qt based front end to mysql"
-SRC_URI="http://sql.kldp.org/snapshots/source/${P}.tar.gz"
-HOMEPAGE="http://sql.kldp.org/mysql"
+SRC_URI="http://sql.kldp.org/snapshots/source/${P}.tar.gz
+		mirror://gentoo/${P}-gcc34.patch.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/mysqlnavigator"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 DEPEND=">=dev-db/mysql-3.23.49
-		>=x11-libs/qt-3.0.3"
+		$(qt_min_version 3.1)"
 		#!=dev-db/mysql-4*
 
 src_unpack() {
 	unpack ${A}
+	#gcc 3.4 fix thanks to tcort@cs.ubishops.ca
+	epatch ${P}-gcc34.patch || die
+	#this permit to build against mysql >= 4.1.3
+	epatch ${FILESDIR}/${P}-mysql-gt-4.1.3.patch || die
+
 	#cleanup for QT
 	cd ${S}/src/mysql
 	rm */*_moc.cpp
@@ -30,8 +38,9 @@ src_unpack() {
 }
 
 src_compile() {
+	libtoolize --copy --force
 	myconf="--with-mysql-includes=/usr/include/mysql"
-	econf ${myconf}
+	econf ${myconf} || die "econf failed"
 	emake -DUSE_OLD_FUNCTIONS=1
 }
 
diff --git a/dev-db/mysqltool/ChangeLog b/dev-db/mysqltool/ChangeLog
index c7886b10841e..a7627e27de8c 100644
--- a/dev-db/mysqltool/ChangeLog
+++ b/dev-db/mysqltool/ChangeLog
@@ -1,10 +1,85 @@
 # ChangeLog for dev-db/mysqltool
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/ChangeLog,v 1.1 2002/04/18 00:30:53 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/ChangeLog,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mysqltool-0.95-r3.ebuild:
+  Don't use cp -a.
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org>
+  mysqltool-0.95-r1.ebuild, mysqltool-0.95-r2.ebuild,
+  mysqltool-0.95-r3.ebuild:
+  dev-perl/CGI => perl-core/CGI
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mysqltool-0.95-r2.ebuild:
+  Stable on ppc.
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  mysqltool-0.95-r1.ebuild, mysqltool-0.95-r2.ebuild,
+  mysqltool-0.95-r3.ebuild:
+  Bug #54609: Fix upstream location.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysqltool-0.95-r1.ebuild,
+  mysqltool-0.95-r2.ebuild, mysqltool-0.95-r3.ebuild:
+  sync IUSE (missing), glibc -> libc
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> mysqltool-0.95-r2.ebuild,
+  mysqltool-0.95-r3.ebuild:
+  Fix use invocation
+
+*mysqltool-0.95-r3 (23 Apr 2004)
+
+  23 Apr 2004; Stuart Herbert <stuart@gentoo.org> mysqltool-0.95-r3.ebuild,
+  files/90_mysqltool.conf.m4:
+  Config file fix; see bug #44748
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org> mysqltool-0.95-r2.ebuild:
+  Marked stable on sparc.
+
+  06 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> mysqltool-0.95-r1.ebuild,
+  mysqltool-0.95-r2.ebuild:
+  : instead of . for chown
+
+*mysqltool-0.95-r2 (04 May 2003)
+  
+  12 May 2003;  Robin Johnson <robbat2@gentoo.org> mysqltool-0.95-r2.ebuild:
+  Moved some dev-perl RDEPENDs to DEPEND instead, for bug 20845.
+  
+  11 May 2003; Robin Johnson <robbat2@gentoo.org> files/90_mysqltool.conf.m4:
+  Slight fix again now, also marked as stable.
+
+  04 May 2003; Robin Johnson <robbat2@gentoo.org> mysqltool-0.95-r2.ebuild,
+  files/90_mysqltool.conf.m4:
+  Rewrote the install/postinst sections to support apache2+mod_perl better, as
+  well as fixing bug #20119 at the same time. Also made it easier for the user
+  ;-).  Fixed some more bugs in my ebuilds now.
+
+*mysqltool-0.95-r1 (03 May 2002)
+
+  07 Dec 2002; Jack Morgan <jmorgan@gentoo.org> mysqltool-0.95-r1.ebuild :
+  Changed sparc64 to sparc keyword
+
+  26 Nov 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Added Apache:DBI dep and einfo.  Fixes #11150
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  09 Nov 2002; <rphillips@gentoo.org> :
+  Added Paul Belt's fixes for the installation paths
+
+  15 Oct 2002; <mucmmings@gentoo.org> :
+  Add sparc64 to keywords
+
+  09 Sep 2002; <mcummings@gentoo.org> :
+  Added perl-module eclass support properly.
+  
+  03 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT.
 
 *mysqltool-0.95 (17 Apr 2002)
 
   17 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
   Created an ebuild for mysqltool, a perl-based frontend for administering
   MySQL servers.  Similiar to phpMyAdmin.
diff --git a/dev-db/mysqltool/Manifest b/dev-db/mysqltool/Manifest
index 57cc34d4b5ab..e99899a2d012 100644
--- a/dev-db/mysqltool/Manifest
+++ b/dev-db/mysqltool/Manifest
@@ -1,6 +1,18 @@
-MD5 98e9aeeeb3bab4769a811541e28ffb00 mysqltool-0.95-r2.ebuild 3256
-MD5 3c384ea592e925a5ef7264c5699fbd73 mysqltool-0.95-r1.ebuild 2286
-MD5 3f948a5d828531b87b295056140a7012 ChangeLog 1260
-MD5 7c7ea28a4d6d8d49920c08d7129e6581 files/90_mysqltool.conf.m4 362
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 84d2773f410acd2a68d0ccf078290ead ChangeLog 2990
+MD5 36efe4888f751524bac28e261e377b9d mysqltool-0.95-r3.ebuild 3254
+MD5 93599d0dbb50482c6f91cddb9bde9448 mysqltool-0.95-r1.ebuild 2312
+MD5 014c5872ed9aa49f027e0771f9a157dd mysqltool-0.95-r2.ebuild 3250
+MD5 8f29dbd83bfe415fe9b3dff311ce9c20 files/90_mysqltool.conf.m4 363
+MD5 f19ea0fa37a19ab341ca96aacd0418c9 files/digest-mysqltool-0.95-r3 65
 MD5 f19ea0fa37a19ab341ca96aacd0418c9 files/digest-mysqltool-0.95-r1 65
 MD5 f19ea0fa37a19ab341ca96aacd0418c9 files/digest-mysqltool-0.95-r2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC2OQj5H05b2HAEkRAnu4AJ45DTL15a92N5FZDiw1podjF8HbGACeKN3C
+43E/pww/FfRFi3Vt2WY7Q3k=
+=tSdK
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mysqltool/files/90_mysqltool.conf.m4 b/dev-db/mysqltool/files/90_mysqltool.conf.m4
index 6c84b34ec809..ef7c44c7f8bc 100644
--- a/dev-db/mysqltool/files/90_mysqltool.conf.m4
+++ b/dev-db/mysqltool/files/90_mysqltool.conf.m4
@@ -1,11 +1,12 @@
 <IfDefine MYSQLTOOL>
   <IfDefine PERL>
-  PerlRequire __APACHE_SERVER_ROOT__/__APACHE_MODULES_CONF_DIR__/mysqltool.pl
+  PerlRequire __APACHE_MODULES_CONF_DIR__/mysqltool.pl
   </IfDefine>
-  <Directory __APACHE_DOCUMENT_ROOT__/htdocs/mysqltool>
+  <Directory __APACHE_DOCUMENT_ROOT__/mysqltool>
     Options ExecCGI
     <Files *.cgi>
-      SetHandler perl-script
+###      SetHandler perl-script
+      SetHandler cgi-script
       <IfDefine PERL>
       PerlHandler MysqlTool
       </IfDefine>
diff --git a/dev-db/mysqltool/mysqltool-0.95-r1.ebuild b/dev-db/mysqltool/mysqltool-0.95-r1.ebuild
index e9f443270ffc..b1d2de56d480 100644
--- a/dev-db/mysqltool/mysqltool-0.95-r1.ebuild
+++ b/dev-db/mysqltool/mysqltool-0.95-r1.ebuild
@@ -1,34 +1,39 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/mysqltool-0.95-r1.ebuild,v 1.1 2002/05/04 01:58:36 woodchip Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/mysqltool-0.95-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+
+inherit perl-module
 
 S=${WORKDIR}/MysqlTool-${PV}
 DESCRIPTION="Web interface for managing one or more mysql server installations"
-SRC_URI="http://www.dajoba.com/projects/mysqltool/MysqlTool-${PV}.tar.gz"
-HOMEPAGE="http://www.dajoba.com/projects/mysqltool/"
+SRC_URI="http://www.brouhaha.com/~eric/software/mysqltool/download/MysqlTool-${PV}.tar.gz"
+HOMEPAGE="http://www.brouhaha.com/~eric/software/mysqltool/"
 
-DEPEND="virtual/glibc sys-devel/perl"
-RDEPEND="${DEPEND} >=net-www/apache-1.3.24-r1 >=dev-db/mysql-3.23.38
-	dev-perl/CGI dev-perl/DBI dev-perl/DBD-mysql dev-perl/Crypt-Blowfish"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc"
+IUSE=""
 
-src_compile() {
-	perl Makefile.PL || die
-	make || die
-	make test || die
-}
+DEPEND="virtual/libc
+	dev-lang/perl"
+RDEPEND="${DEPEND}
+	>=net-www/apache-1.3.24-r1
+	>=dev-db/mysql-3.23.38
+	perl-core/CGI
+	dev-perl/Apache-DBI
+	dev-perl/DBI
+	dev-perl/DBD-mysql
+	dev-perl/Crypt-Blowfish"
 
 src_install() {
 	eval `perl '-V:installarchlib'`
-	mkdir -p ${D}/$installarchlib
+	dodir /$installarchlib
+
+	cp ${S}/Makefile ${S}/Makefile.orig
+	cat ${S}/Makefile | sed -e "s!INSTALLMAN1DIR = /usr/share/man/man1!INSTALLMAN1DIR = ${D}/usr/share/man/man1!" -e "s!INSTALLMAN3DIR = /usr/share/man/man3!INSTALLMAN3DIR = ${D}/usr/share/man/man3!" > ${S}/Makefile.gentoo
+	mv ${S}/Makefile.gentoo ${S}/Makefile
 
-	perl Makefile.PL
-	make \
-		PREFIX=${D}/usr \
-		INSTALLMAN3DIR=${D}/usr/share/man/man3 \
-		INSTALLMAN1DIR=${D}/usr/share/man/man1 \
-		install || die
+	make install || die
 
 	dodoc COPYING Changes MANIFEST README Upgrade
 
@@ -40,7 +45,7 @@ src_install() {
 	# the config file..
 	insinto /etc/apache/conf/addon-modules
 	doins htdocs/mysqltool.conf
-	fowners apache.apache /etc/apache/conf/addon-modules/mysqltool.conf
+	fowners apache:apache /etc/apache/conf/addon-modules/mysqltool.conf
 	fperms 0600 /etc/apache/conf/addon-modules/mysqltool.conf
 
 	# now fix its location in the main cgi..
@@ -51,3 +56,15 @@ src_install() {
 		${D}/home/httpd/htdocs/mysqltool/index.cgi
 	rm ${D}/home/httpd/htdocs/mysqltool/index.cgi.orig
 }
+
+pkg_postinst() {
+	einfo "Please add the following to commonapache.conf:"
+	einfo "PerlRequire {apache_root}/conf/mysqltool.conf"
+	einfo "<Directory {apache_document_root}/htdocs/mysqltool>"
+	einfo "Options ExecCGI"
+	einfo "<Files *.cgi>"
+	einfo "SetHandler perl-script"
+	einfo "PerlHandler MysqlTool"
+	einfo "</Files>"
+	einfo "</Directory>"
+}
diff --git a/dev-db/mysqltool/mysqltool-0.95-r2.ebuild b/dev-db/mysqltool/mysqltool-0.95-r2.ebuild
index d6589376249e..d02d764a29cc 100644
--- a/dev-db/mysqltool/mysqltool-0.95-r2.ebuild
+++ b/dev-db/mysqltool/mysqltool-0.95-r2.ebuild
@@ -1,30 +1,31 @@
-# 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/dev-db/mysqltool/mysqltool-0.95-r2.ebuild,v 1.1 2003/05/04 11:38:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/mysqltool-0.95-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 inherit perl-module
 
 S=${WORKDIR}/MysqlTool-${PV}
 DESCRIPTION="Web interface for managing one or more mysql server installations"
-SRC_URI="http://www.dajoba.com/projects/mysqltool/MysqlTool-${PV}.tar.gz"
-HOMEPAGE="http://www.dajoba.com/projects/mysqltool/"
+SRC_URI="http://www.brouhaha.com/~eric/software/mysqltool/download/MysqlTool-${PV}.tar.gz"
+HOMEPAGE="http://www.brouhaha.com/~eric/software/mysqltool/"
 IUSE="apache2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ppc ~alpha"
 
-DEPEND="virtual/glibc
-	dev-lang/perl"
-RDEPEND="${DEPEND}
-	>=net-www/apache-1.3.24-r1 
-	apache2? ( >=net-www/apache-2.0.45 )
+DEPEND="virtual/libc
+	dev-lang/perl
 	>=dev-db/mysql-3.23.38
-	dev-perl/CGI
+	perl-core/CGI
 	dev-perl/Apache-DBI
 	dev-perl/DBI
 	dev-perl/DBD-mysql
 	dev-perl/Crypt-Blowfish"
+RDEPEND="${DEPEND}
+	|| ( >=net-www/apache-1.3.24-r1
+		 apache2? ( >=net-www/apache-2.0.45 )
+	    )"
 
 src_install() {
 	eval `perl '-V:installarchlib'`
@@ -37,16 +38,21 @@ src_install() {
 	make install || die
 
 	dodoc COPYING Changes MANIFEST README Upgrade
-	
-	local __apache_server_root__ 
-	__apache_server_root__=`grep "^ServerRoot" /etc/apache2/conf/*.conf -h | cut -d' ' -f2`
+
+	local __apache_server_root__
+	if use apache2; then
+		__apache_server_root__="/etc/apache2"
+	else
+		__apache_server_root__="/etc/apache"
+	fi;
+	__apache_conf_dir__=${__apache_server_root__}/conf
 	local __apache_document_root__
-	__apache_document_root__=`grep "^DocumentRoot" /etc/apache2/conf/*.conf -h | cut -d' ' -f2`
+	__apache_document_root__=`grep "^DocumentRoot" ${__apache_conf_dir__}/*.conf -h | cut -d' ' -f2`
 	local __apache_modules_conf_dir__
-	if [ "`use apache2`" ]; then
-		__apache_modules_conf_dir__="conf/modules.d"
+	if use apache2; then
+		__apache_modules_conf_dir__="${__apache_conf_dir__}/modules.d"
 		else
-		__apache_modules_conf_dir__="conf/addon-modules"
+		__apache_modules_conf_dir__="${__apache_conf_dir__}/addon-modules"
 	fi;
 
 	# the cgi and images..
@@ -57,17 +63,17 @@ src_install() {
 	# the config file..
 	local apacheconfbase
 	apacheconfbase=${FILESDIR}/90_mysqltool.conf.m4
-	insinto ${__apache_server_root__}/${__apache_modules_conf_dir__}
+	insinto ${__apache_modules_conf_dir__}
 	cp ${S}/htdocs/mysqltool.conf ${S}/htdocs/mysqltool.pl
 	doins htdocs/mysqltool.pl
-	fowners apache.apache ${__apache_server_root__}/${__apache_modules_conf_dir__}/mysqltool.pl
-	fperms 0600 ${__apache_server_root__}/${__apache_modules_conf_dir__}/mysqltool.pl
-	m4 -D__APACHE_SERVER_ROOT__=${__apache_server_root__} -D__APACHE_DOCUMENT_ROOT__=${__apache_document_root__} -D__APACHE_MODULES_CONF_DIR__=${__apache_modules_conf_dir__} ${apacheconfbase} >${D}/${__apache_server_root__}/${__apache_modules_conf_dir__}/`basename ${apacheconfbase} .m4`
+	fowners apache:apache ${__apache_modules_conf_dir__}/mysqltool.pl
+	fperms 0600 ${__apache_modules_conf_dir__}/mysqltool.pl
+	m4 -D__APACHE_SERVER_ROOT__=${__apache_server_root__} -D__APACHE_DOCUMENT_ROOT__=${__apache_document_root__} -D__APACHE_MODULES_CONF_DIR__=${__apache_modules_conf_dir__} ${apacheconfbase} >${D}/${__apache_modules_conf_dir__}/`basename ${apacheconfbase} .m4`
 
 	# now fix its location in the main cgi..
 	cp ${D}/${__apache_document_root__}/mysqltool/index.cgi \
 		${D}/${__apache_document_root__}/mysqltool/index.cgi.orig
-	sed -e "s:^\(require\).*:\1 '${__apache_server_root__}/${__apache_modules_conf_dir__}/mysqltool.pl';:" \
+	sed -e "s:^\(require\).*:\1 '${__apache_modules_conf_dir__}/mysqltool.pl';:" \
 		${D}/${__apache_document_root__}/mysqltool/index.cgi.orig > \
 		${D}/${__apache_document_root__}/mysqltool/index.cgi
 	rm ${D}/${__apache_document_root__}/mysqltool/index.cgi.orig
@@ -75,9 +81,11 @@ src_install() {
 
 pkg_postinst() {
 	einfo "To have Apache support MySQLTool, please do the following:"
-	if [ "`use apache2`" ] ; then
-		einfo "Edit /etc/conf.d/apache2 and add \"-D MYSQLTOOL\""
+	local f
+	if use apache2 ; then
+		f='2'
 	else
-		einfo "Edit /etc/conf.d/apache and add \"-D MYSQLTOOL\""
+		f=''
 	fi
+	einfo "Edit /etc/conf.d/apache${f} and add \"-D MYSQLTOOL\" to APACHE${f}_OPTS"
 }
diff --git a/dev-db/mysqltool/mysqltool-0.95-r3.ebuild b/dev-db/mysqltool/mysqltool-0.95-r3.ebuild
index d483f2885517..3ccd7b66d5ca 100644
--- a/dev-db/mysqltool/mysqltool-0.95-r3.ebuild
+++ b/dev-db/mysqltool/mysqltool-0.95-r3.ebuild
@@ -1,23 +1,23 @@
-# 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/dev-db/mysqltool/mysqltool-0.95-r3.ebuild,v 1.1 2004/04/23 15:17:05 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysqltool/mysqltool-0.95-r3.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 inherit perl-module
 
 S=${WORKDIR}/MysqlTool-${PV}
 DESCRIPTION="Web interface for managing one or more mysql server installations"
-SRC_URI="http://www.dajoba.com/projects/mysqltool/MysqlTool-${PV}.tar.gz"
-HOMEPAGE="http://www.dajoba.com/projects/mysqltool/"
+SRC_URI="http://www.brouhaha.com/~eric/software/mysqltool/download/MysqlTool-${PV}.tar.gz"
+HOMEPAGE="http://www.brouhaha.com/~eric/software/mysqltool/"
 IUSE="apache2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~alpha"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-lang/perl
 	>=dev-db/mysql-3.23.38
-	dev-perl/CGI
+	perl-core/CGI
 	dev-perl/Apache-DBI
 	dev-perl/DBI
 	dev-perl/DBD-mysql
@@ -40,7 +40,7 @@ src_install() {
 	dodoc COPYING Changes MANIFEST README Upgrade
 
 	local __apache_server_root__
-	if [ "`use apache2`" ]; then
+	if use apache2; then
 		__apache_server_root__="/etc/apache2"
 	else
 		__apache_server_root__="/etc/apache"
@@ -49,7 +49,7 @@ src_install() {
 	local __apache_document_root__
 	__apache_document_root__=`grep "^DocumentRoot" ${__apache_conf_dir__}/*.conf -h | cut -d' ' -f2`
 	local __apache_modules_conf_dir__
-	if [ "`use apache2`" ]; then
+	if use apache2; then
 		__apache_modules_conf_dir__="${__apache_conf_dir__}/modules.d"
 		else
 		__apache_modules_conf_dir__="${__apache_conf_dir__}/addon-modules"
@@ -57,7 +57,7 @@ src_install() {
 
 	# the cgi and images..
 	dodir ${__apache_document_root__}/mysqltool
-	cp -a htdocs/* ${D}/${__apache_document_root__}/mysqltool
+	cp -pPR htdocs/* ${D}/${__apache_document_root__}/mysqltool
 	rm ${D}/${__apache_document_root__}/mysqltool/mysqltool.conf
 
 	# the config file..
@@ -82,7 +82,7 @@ src_install() {
 pkg_postinst() {
 	einfo "To have Apache support MySQLTool, please do the following:"
 	local f
-	if [ "`use apache2`" ] ; then
+	if use apache2 ; then
 		f='2'
 	else
 		f=''
diff --git a/dev-db/mytop/ChangeLog b/dev-db/mytop/ChangeLog
index 9863308f6579..70f64d668170 100644
--- a/dev-db/mytop/ChangeLog
+++ b/dev-db/mytop/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-db/mytop
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.1 2004/05/04 04:52:52 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> mytop-1.4.ebuild:
+  Mark 1.4 stable on alpha
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> mytop-1.4.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> mytop-1.4.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  23 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> mytop-1.4.ebuild:
+  stable on amd64, fixes #72953
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> mytop-1.4.ebuild:
+  add sed-4 dep
+
+  26 Jun 2004; Stuart Herbert <stuart@gentoo.org> mytop-1.4.ebuild:
+  Added missing dependencies; this can be marked stable when all the
+  dependencies are stable
 
 *mytop-1.4 (03 May 2004)
 
diff --git a/dev-db/mytop/Manifest b/dev-db/mytop/Manifest
index 792efe2f116b..02d58bf2e619 100644
--- a/dev-db/mytop/Manifest
+++ b/dev-db/mytop/Manifest
@@ -1,2 +1,4 @@
-MD5 6a546815f16b9f205ce6ab6caf78c5f8 mytop-1.4.ebuild 453
+MD5 0db52d663ac53845a7616a8f8e9b2de2 mytop-1.4.ebuild 765
+MD5 a2a9fdc7d010a7c04c96cb3b7c05f06b metadata.xml 158
+MD5 4070517e62aebd48f553c70094430927 ChangeLog 1107
 MD5 08416823e7c81816a0e424ae792e8926 files/digest-mytop-1.4 60
diff --git a/dev-db/mytop/metadata.xml b/dev-db/mytop/metadata.xml
index dbfe84ca36cf..716e7d4301bd 100644
--- a/dev-db/mytop/metadata.xml
+++ b/dev-db/mytop/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>mysql-bugs</herd>
+<herd>mysql</herd>
 </pkgmetadata>
diff --git a/dev-db/mytop/mytop-1.4.ebuild b/dev-db/mytop/mytop-1.4.ebuild
index 591a1274efe4..c2def4c62647 100644
--- a/dev-db/mytop/mytop-1.4.ebuild
+++ b/dev-db/mytop/mytop-1.4.ebuild
@@ -1,18 +1,24 @@
-# 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/dev-db/mytop/mytop-1.4.ebuild,v 1.1 2004/05/04 04:52:52 robbat2 Exp $
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mytop/mytop-1.4.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
+
 inherit perl-module
-IUSE=""
+
 DESCRIPTION="mytop - a top clone for mysql"
-SRC_URI="http://jeremy.zawodny.com/mysql/mytop/${P}.tar.gz"
 HOMEPAGE="http://jeremy.zawodny.com/mysql/mytop/"
+SRC_URI="http://jeremy.zawodny.com/mysql/mytop/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
+KEYWORDS="alpha amd64 ~ppc ~sparc ~x86"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha"
+IUSE=""
+
 DEPEND="dev-perl/DBD-mysql
-		dev-perl/Getopt-Long
-		dev-perl/TermReadKey"
+	perl-core/Getopt-Long
+	dev-perl/TermReadKey
+	dev-perl/Term-ANSIColor
+	perl-core/Time-HiRes
+	>=sys-apps/sed-4"
 
 src_install() {
 	perl-module_src_install
diff --git a/dev-db/octopus/ChangeLog b/dev-db/octopus/ChangeLog
index fd11ec0d1285..92468bfcce1d 100644
--- a/dev-db/octopus/ChangeLog
+++ b/dev-db/octopus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/octopus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.1 2005/01/22 17:28:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/ChangeLog,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
+
+  29 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> octopus-3.0.1.ebuild:
+  updated (R)DEPEND to reflect rhino SLOT changes.
 
 *octopus-3.0.1 (22 Jan 2005)
 
diff --git a/dev-db/octopus/Manifest b/dev-db/octopus/Manifest
index e487b51e4252..e76d3105ced8 100644
--- a/dev-db/octopus/Manifest
+++ b/dev-db/octopus/Manifest
@@ -1,3 +1,15 @@
-MD5 89950dc8b4d68012d6ce58320dd43688 octopus-3.0.1.ebuild 1575
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7bbfe5529e7716311942c9d3eba28827 octopus-3.0.1.ebuild 1662
+MD5 bf1ac18409b43ef6567046c0f89bc353 ChangeLog 528
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 24925210eca628235c1f8a498f261dc2 files/octopus-3.0.1-gentoo-build.xml 15173
 MD5 a634674c47f2213dc1b3903c4f9a1264 files/digest-octopus-3.0.1 141
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1Dgp/rLF9B432nYRAuiTAJ9OK8ufiN20OdqMka7u4VwBAk/lfACffcTA
+BqSwoGYyVj7Qj8dJ3dS1fIU=
+=aDrw
+-----END PGP SIGNATURE-----
diff --git a/dev-db/octopus/octopus-3.0.1.ebuild b/dev-db/octopus/octopus-3.0.1.ebuild
index ac518180c1c6..30c29f675add 100644
--- a/dev-db/octopus/octopus-3.0.1.ebuild
+++ b/dev-db/octopus/octopus-3.0.1.ebuild
@@ -1,32 +1,31 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1.ebuild,v 1.1 2005/01/22 17:28:32 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/octopus/octopus-3.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit java-pkg
 
 MY_PV=${PV//./-}
 MY_PV=${MY_PV/-/.}
-DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool. It
-may connect to any JDBC data sources and perform transformations defined in an
-XML file."
+DESCRIPTION="A Java-based Extraction, Transformation, and Loading (ETL) tool. It may connect to any JDBC data sources and perform transformations defined in an XML file."
 SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-${MY_PV}.src.tar.gz
 	mirror://gentoo/${PN}-xmls-${PV}.tar.bz2"
 HOMEPAGE="http://octopus.objectweb.org"
 LICENSE="LGPL-2.1"
 SLOT="3.0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 x86"
 IUSE="doc jikes source"
-DEPEND=">=virtual/jdk-1.4
-	jikes? ( >=dev-java/jikes-1.21 )
-	source?( app-arch/zip )
-	>=dev-java/ant-core-1.4
-	>=app-arch/unzip-5.50-r1"
 RDEPEND=">=virtual/jre-1.4
 	>=dev-java/xerces-2.6
 	>=dev-java/log4j-1.2.8
-	>=dev-java/rhino-1.6.1
+	=dev-java/rhino-1.6*
 	>=dev-java/fop-0.20.5
 	>=dev-db/hsqldb-1.7.2.4"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}
+	jikes? ( >=dev-java/jikes-1.21 )
+	source? ( app-arch/zip )
+	>=dev-java/ant-core-1.4
+	>=app-arch/unzip-5.50-r1"
 
 S=${WORKDIR}/${PN}-3.0/Octopus-src
 
@@ -50,7 +49,7 @@ src_compile() {
 }
 
 src_install() {
-	dodoc ChangeLog.txt LICENSE.txt ReleaseNotes.txt
+	dodoc ChangeLog.txt ReleaseNotes.txt
 
 	cd ${S}/modules
 	java-pkg_dojar dist/*.jar
diff --git a/dev-db/oracle-instantclient-basic/ChangeLog b/dev-db/oracle-instantclient-basic/ChangeLog
index f32b4e3aa9bd..513d84af3ab9 100644
--- a/dev-db/oracle-instantclient-basic/ChangeLog
+++ b/dev-db/oracle-instantclient-basic/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for dev-db/oracle-instantclient-basic
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.1 2004/03/22 21:24:54 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/ChangeLog,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
+
+  10 Jul 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  oracle-instantclient-basic-10.1.0.4.ebuild:
+  added unzip dependency
+
+*oracle-instantclient-basic-10.1.0.4 (21 Jun 2005)
+
+  21 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-basic-10.1.0.4.ebuild:
+  based on Gustavo Michels work, i did version bump which closes bug #96289
+
+*oracle-instantclient-basic-10.1.0.3 (22 Dec 2004)
+
+  22 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-basic-10.1.0.3.ebuild:
+  New version from upstream. ALso two big internal (gentoo) changes:
+  1. includes now sdk/devel packages (its small and almost always needed)
+  2. dont use -p1 ebuild version scheme, because it keeps ebuild simpler
+     and -1.rpm is de facto -rX for ebuild (kind of redundancy).
+
+*oracle-instantclient-basic-10.1.0.2_p1-r1 (19 Nov 2004)
+
+  19 Nov 2004; Don Seiler <rizzo@gentoo.org>
+  +oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild:
+  Adding lib path to LDPATH
+
+*oracle-instantclient-basic-10.1.0.2_p1 (21 Jun 2004)
+
+  21 Jun 2004; Don Seiler <rizzo@gentoo.org>
+  -oracle-instantclient-basic-10.1.0.2.ebuild,
+  +oracle-instantclient-basic-10.1.0.2_p1.ebuild:
+  New an improved version, using insinto to fix permissions problem from bug
+  #46338, and using proper patch numbering. Thanks to Chris Mayo for reporting
+  the bug.
 
 *oracle-instantclient-basic-10.1.0.2 (22 Mar 2004)
 
diff --git a/dev-db/oracle-instantclient-basic/Manifest b/dev-db/oracle-instantclient-basic/Manifest
index 0ac94b386ea2..fcd6b651d03c 100644
--- a/dev-db/oracle-instantclient-basic/Manifest
+++ b/dev-db/oracle-instantclient-basic/Manifest
@@ -1,2 +1,10 @@
-MD5 635cee1401aac008723e36573b5c1e90 oracle-instantclient-basic-10.1.0.2.ebuild 1056
-MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2 93
+MD5 10adce8ab331bfc635e617f48c2a2d51 oracle-instantclient-basic-10.1.0.3.ebuild 2846
+MD5 203d67d121be57d7114503d35119cdca oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild 1540
+MD5 6474a3c8a32a031c56cc632006c55377 oracle-instantclient-basic-10.1.0.4.ebuild 2672
+MD5 ec0dd84ca69c522cdd056f7366f33f36 oracle-instantclient-basic-10.1.0.2_p1.ebuild 1388
+MD5 7dd7a920f8ddf13a7939cb0261a86a35 ChangeLog 1808
+MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
+MD5 f34650dcfa5ddf5d3957f0c39dfd2978 files/digest-oracle-instantclient-basic-10.1.0.3 184
+MD5 2ae2e545ecb4e26117f7872200b0e95f files/digest-oracle-instantclient-basic-10.1.0.4 188
+MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1 93
+MD5 8531dff3174726242a9e9de77be6b595 files/digest-oracle-instantclient-basic-10.1.0.2_p1-r1 93
diff --git a/dev-db/oracle-instantclient-basic/metadata.xml b/dev-db/oracle-instantclient-basic/metadata.xml
index 634b161a6d3e..c8532c329d78 100644
--- a/dev-db/oracle-instantclient-basic/metadata.xml
+++ b/dev-db/oracle-instantclient-basic/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
+  <email>radek@gentoo.org</email>
 </maintainer>
 <longdescription>Instant Client Package - Basic: All files required to run OCI, OCCI, and JDBC-OCI applications</longdescription>
 </pkgmetadata>
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild
index c0e1db40eee6..52f331602265 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-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/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild,v 1.1 2004/11/19 16:33:52 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild
index 9825a66a96a0..d2db3b7d9263 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild
@@ -1,10 +1,9 @@
-# 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/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild,v 1.1 2004/06/21 18:04:18 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.2_p1.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit eutils
 
-#MY_PV="${P}-1.i386"
 MY_PV=${PV/_p/-}
 MY_P="${PN}-${MY_PV}.i386"
 
@@ -35,7 +34,6 @@ src_unpack() {
 }
 
 src_install() {
-	#mv ${S}/usr ${D}
 	dodir /usr/lib/oracle/10.1.0.2/client/lib
 	cd ${S}/usr/lib/oracle/10.1.0.2/client/lib
 	insinto /usr/lib/oracle/10.1.0.2/client/lib
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild
index 9b6403aec0ff..ea67bc789f8c 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.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/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild,v 1.1 2004/12/22 00:25:17 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit eutils
 
@@ -79,8 +79,8 @@ pkg_postinst() {
 	einfo "supplemental JDBC functionality with Oracle) and the"
 	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
 	einfo "packages as well."
-	einfo ""
+	einfo
 	einfo "Examples are located in /usr/share/doc/${PF}/"
-	einfo ""
+	einfo
 	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
 }
diff --git a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild
index fa45ee2d19d9..19442e9de6f4 100644
--- a/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild
+++ b/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.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/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild,v 1.1 2005/06/21 19:39:07 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-basic/oracle-instantclient-basic-10.1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:25 chriswhite Exp $
 
 inherit eutils
 
@@ -18,6 +18,9 @@ KEYWORDS="~x86"
 RESTRICT="fetch"
 IUSE=""
 
+DEPEND="app-arch/unzip"
+# RDEPEND does not needs unzip
+
 pkg_nofetch() {
 	eerror "Please go to:"
 	eerror "  ${HOMEPAGE}"
@@ -29,8 +32,8 @@ pkg_nofetch() {
 }
 
 src_unpack() {
-	unzip ${DISTDIR}/${MY_P}.zip
-	unzip ${DISTDIR}/${MY_PSDK}.zip
+	unzip ${DISTDIR}/${MY_P}.zip || die "unsuccesful unzip ${MY_P}.zip"
+	unzip ${DISTDIR}/${MY_PSDK}.zip || die "unsuccesful unzip ${MY_PSDK}.zip"
 }
 
 src_install() {
@@ -71,8 +74,8 @@ pkg_postinst() {
 	einfo "supplemental JDBC functionality with Oracle) and the"
 	einfo "oracle-instantclient-sqlplus (for running the SQL*Plus application)"
 	einfo "packages as well."
-	einfo ""
+	einfo
 	einfo "Examples are located in /usr/share/doc/${PF}/"
-	einfo ""
+	einfo
 	ewarn "ORACLE_HOME (and others) are set in /etc/env.d/50oracle-instantclient-basic"
 }
diff --git a/dev-db/oracle-instantclient-jdbc/ChangeLog b/dev-db/oracle-instantclient-jdbc/ChangeLog
index de8a68e1d096..3bd2b0c4258f 100644
--- a/dev-db/oracle-instantclient-jdbc/ChangeLog
+++ b/dev-db/oracle-instantclient-jdbc/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for dev-db/oracle-instantclient-jdbc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.1 2004/03/22 21:31:36 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/ChangeLog,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
+
+*oracle-instantclient-jdbc-10.1.0.4 (21 Jun 2005)
+
+  21 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-jdbc-10.1.0.4.ebuild:
+  based on Gustavo Michels work, i did version bump which closes bug #96289
+
+*oracle-instantclient-jdbc-10.1.0.3 (21 Dec 2004)
+
+  21 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-jdbc-10.1.0.3.ebuild:
+  Version bump. Also changed slightly number scheme to keep ebuild simpler.
+
+*oracle-instantclient-jdbc-10.1.0.2_p2 (21 Jun 2004)
+
+  21 Jun 2004; Don Seiler <rizzo@gentoo.org>
+  +oracle-instantclient-jdbc-10.1.0.2_p2.ebuild:
+  New an improved version, using insinto to fix permissions problem from bug
+  #46338, and using proper patch numbering.  Also closes Bug #52920, thanks to
+  Miles Grant for reporting that.
 
 *oracle-instantclient-jdbc-10.1.0.2 (22 Mar 2004)
 
diff --git a/dev-db/oracle-instantclient-jdbc/Manifest b/dev-db/oracle-instantclient-jdbc/Manifest
index dfd7cb7ac4fd..0aceb7e0fc68 100644
--- a/dev-db/oracle-instantclient-jdbc/Manifest
+++ b/dev-db/oracle-instantclient-jdbc/Manifest
@@ -1,2 +1,8 @@
-MD5 04bc7ed7c73828c0d5c3822b90e7c076 oracle-instantclient-jdbc-10.1.0.2.ebuild 1010
-MD5 2a2ab5b81985a1c6bbd57468f6c23cd4 files/digest-oracle-instantclient-jdbc-10.1.0.2 91
+MD5 be9bc6a14a8b106d699cbb1d25eaeb57 oracle-instantclient-jdbc-10.1.0.4.ebuild 1268
+MD5 f6fd68779ad5a0533253db89d8236312 oracle-instantclient-jdbc-10.1.0.2_p2.ebuild 1376
+MD5 c1e2ee3cc253ee357784775da7cd5034 oracle-instantclient-jdbc-10.1.0.3.ebuild 1321
+MD5 8ed4e626ca308cd4cd21431c521d5407 ChangeLog 1258
+MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
+MD5 71cef383c61956b0de73640fc392cc06 files/digest-oracle-instantclient-jdbc-10.1.0.3 91
+MD5 4c6dbc856c5695a71b9062919c35e3dc files/digest-oracle-instantclient-jdbc-10.1.0.4 94
+MD5 7d3e4c7886b1d1ff429ea98a8182faca files/digest-oracle-instantclient-jdbc-10.1.0.2_p2 91
diff --git a/dev-db/oracle-instantclient-jdbc/metadata.xml b/dev-db/oracle-instantclient-jdbc/metadata.xml
index 634b161a6d3e..c8532c329d78 100644
--- a/dev-db/oracle-instantclient-jdbc/metadata.xml
+++ b/dev-db/oracle-instantclient-jdbc/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
+  <email>radek@gentoo.org</email>
 </maintainer>
 <longdescription>Instant Client Package - Basic: All files required to run OCI, OCCI, and JDBC-OCI applications</longdescription>
 </pkgmetadata>
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.2_p2.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.2_p2.ebuild
index 13d76e0a290e..bfa9f9bd92bc 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.2_p2.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.2_p2.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/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.2_p2.ebuild,v 1.1 2004/06/21 18:35:12 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.2_p2.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild
index e0e9637d6928..203cb6ec90b2 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.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/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild,v 1.1 2004/12/22 00:26:12 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild
index 12edc4753b6c..87f286cba40f 100644
--- a/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild
+++ b/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.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/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild,v 1.1 2005/06/21 19:41:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-jdbc/oracle-instantclient-jdbc-10.1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/oracle-instantclient-sqlplus/ChangeLog b/dev-db/oracle-instantclient-sqlplus/ChangeLog
index b49eea4317ef..0d3c55facd3c 100644
--- a/dev-db/oracle-instantclient-sqlplus/ChangeLog
+++ b/dev-db/oracle-instantclient-sqlplus/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-db/oracle-instantclient-sqlplus
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.1 2004/03/22 21:35:34 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/ChangeLog,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+*oracle-instantclient-sqlplus-10.1.0.4 (21 Jun 2005)
+
+  21 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-sqlplus-10.1.0.4.ebuild:
+  based on Gustavo Michels work, i did version bump which closes bug #96289
+
+*oracle-instantclient-sqlplus-10.1.0.3 (21 Dec 2004)
+
+  21 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +oracle-instantclient-sqlplus-10.1.0.3.ebuild:
+  Version bump. Also changed slightly number scheme to keep ebuild simpler.
+
+*oracle-instantclient-sqlplus-10.1.0.2_p1 (21 Jun 2004)
+
+  21 Jun 2004; Don Seiler <rizzo@gentoo.org>
+  -oracle-instantclient-sqlplus-10.1.0.2.ebuild,
+  +oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild:
+  New an improved version, using insinto to fix permissions problem from bug
+  #46338, and using proper patch numbering. Thanks to Chris Mayo for reporting
+  the bug.
 
 *oracle-instantclient-sqlplus-10.1.0.2 (22 Mar 2004)
 
diff --git a/dev-db/oracle-instantclient-sqlplus/Manifest b/dev-db/oracle-instantclient-sqlplus/Manifest
index ddffa858c2d4..ab415db64727 100644
--- a/dev-db/oracle-instantclient-sqlplus/Manifest
+++ b/dev-db/oracle-instantclient-sqlplus/Manifest
@@ -1,2 +1,8 @@
-MD5 968c3c1686cfc68fca005a3e321c4133 oracle-instantclient-sqlplus-10.1.0.2.ebuild 1056
-MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2 93
+MD5 07be143f368b893ebef31e640d337ded oracle-instantclient-sqlplus-10.1.0.3.ebuild 1666
+MD5 5d2001386557c76a5baf50e0b34fd328 oracle-instantclient-sqlplus-10.1.0.4.ebuild 1587
+MD5 2fee274b7df94902d24814e749e298b7 oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild 1734
+MD5 0226b7bf3e98d4905f6a10a012758b01 ChangeLog 1314
+MD5 396aa9401cdf515a0d3c7fbf9c3e6d3a metadata.xml 351
+MD5 77c18d359283aaf49ec2636bae6693f2 files/digest-oracle-instantclient-sqlplus-10.1.0.2_p1 93
+MD5 0b0f6d200d7e375101ff9b829a3e8704 files/digest-oracle-instantclient-sqlplus-10.1.0.3 93
+MD5 671ba7486b7d55012869a7c0759f93c2 files/digest-oracle-instantclient-sqlplus-10.1.0.4 96
diff --git a/dev-db/oracle-instantclient-sqlplus/metadata.xml b/dev-db/oracle-instantclient-sqlplus/metadata.xml
index 634b161a6d3e..c8532c329d78 100644
--- a/dev-db/oracle-instantclient-sqlplus/metadata.xml
+++ b/dev-db/oracle-instantclient-sqlplus/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-<!--  <description>Description of the maintainership</description> -->
+  <email>radek@gentoo.org</email>
 </maintainer>
 <longdescription>Instant Client Package - Basic: All files required to run OCI, OCCI, and JDBC-OCI applications</longdescription>
 </pkgmetadata>
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild
index 9d3722e9cdf3..a01633418d14 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.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/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild,v 1.1 2004/06/21 18:27:18 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.2_p1.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ RESTRICT="fetch"
 IUSE=""
 
 DEPEND="app-arch/rpm2targz
-		>=dev-db/oracle-instantclient-basic-10.1.0.2"
+		>=dev-db/oracle-instantclient-basic-10.1.0.2_p1"
 
 pkg_nofetch() {
 	eerror "Please go to:"
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild
index 62918607f54e..0815254ef97a 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.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/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild,v 1.1 2004/12/22 00:28:30 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild
index f53baf866407..a4d59222faac 100644
--- a/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild
+++ b/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.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/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild,v 1.1 2005/06/21 19:42:58 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/oracle-instantclient-sqlplus/oracle-instantclient-sqlplus-10.1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/pgaccess/ChangeLog b/dev-db/pgaccess/ChangeLog
index d2b5009aa25a..ce30cfd95c1d 100644
--- a/dev-db/pgaccess/ChangeLog
+++ b/dev-db/pgaccess/ChangeLog
@@ -1,9 +1,49 @@
 # ChangeLog for dev-db/pgaccess
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgaccess/ChangeLog,v 1.1 2003/03/18 05:23:54 nakano Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgaccess/ChangeLog,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pgaccess-0.99.0.20040219.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  pgaccess-0.99.0.20040219.ebuild:
+  stable on amd64
+
+  09 Feb 2005; Masatomo Nakano <nakano@gentoo.org>
+  pgaccess-0.99.0.20040219.ebuild:
+  Makred stable on x86.
+
+*pgaccess-0.99.0.20040219 (23 Sep 2004)
+
+  23 Sep 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgaccess-0.99.0.20040219.patch, +pgaccess-0.99.0.20040219.ebuild:
+  Version bump.  Ebuild submitted by Daniel Black <dragonheart@gentoo.org>.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> pgaccess-0.98.8.ebuild:
+  Added to ~ppc.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> pgaccess-0.98.8.ebuild:
+  trim trailing whitespace
 
 *pgaccess-0.98.8 (18 Mar 2003)
 
+  06 Jun 2003; Masatomo Nakano <nakano@gentoo.org> pgaccess-0.98.8.ebuild:
+  added message.
+
+  27 Mar 2003; Masatomo Nakano <nakano@gentoo.org> pgaccess-0.98.8.ebuild
+
+  Marked as stable.
+
+  24 Mar 2003; Masatomo Nakano <nakano@gentoo.org> pgaccess-0.98.8.ebuild
+
+  Fixed bug. #17668
+
+  18 Mar 2003; Masatomo Nakano <nakano@gentoo.org> pgaccess-0.98.8.ebuild,
+  files/pgaccess-0.98.8.patch:
+
+  Fixed bug. #17668
+
   18 Mar 2003; Masatomo Nakano <nakano@gentoo.org> pgaccess-0.98.8.ebuild,
   files/pgaccess-0.98.8.patch:
 
diff --git a/dev-db/pgaccess/Manifest b/dev-db/pgaccess/Manifest
index e69de29bb2d1..643550c1096b 100644
--- a/dev-db/pgaccess/Manifest
+++ b/dev-db/pgaccess/Manifest
@@ -0,0 +1,8 @@
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 d538007b2c344fc370b187dce52f9e21 ChangeLog 1600
+MD5 90975a9d1ba300709d5e2eaf52e04d40 pgaccess-0.99.0.20040219.ebuild 1205
+MD5 95de9e1ec8a5ef1b973c6e7c649fdb5f pgaccess-0.98.8.ebuild 882
+MD5 969c7d76c76449b26d058169847a2099 files/digest-pgaccess-0.99.0.20040219 74
+MD5 96e92e9e2033587fead8db07f1aabfff files/digest-pgaccess-0.98.8 67
+MD5 24bd2deb1a8695930c0ac7bfd371ab6f files/pgaccess-0.99.0.20040219.patch 670
+MD5 0317d0f5bcf6d1c29a6b8457bb432962 files/pgaccess-0.98.8.patch 959
diff --git a/dev-db/pgaccess/pgaccess-0.98.8.ebuild b/dev-db/pgaccess/pgaccess-0.98.8.ebuild
index 4ee842833ee7..ab7eeccbf90c 100644
--- a/dev-db/pgaccess/pgaccess-0.98.8.ebuild
+++ b/dev-db/pgaccess/pgaccess-0.98.8.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/dev-db/pgaccess/pgaccess-0.98.8.ebuild,v 1.1 2003/03/18 05:23:54 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgaccess/pgaccess-0.98.8.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 DESCRIPTION="a database frontend for postgresql"
 HOMEPAGE="http://www.pgaccess.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.pgaccess.org/download/${P}.tar.gz"
 LICENSE="POSTGRESQL"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 
 # Build-time dependencies
@@ -16,14 +16,18 @@ DEPEND=">=dev-lang/tcl-8.3.4
 	>=dev-lang/tk-8.3.4
 	>=dev-db/postgresql-7.3"
 
-S=${WORKDIR}/${P}
 
 src_compile() {
 	cd ${S}
 	patch -p1 < ${FILESDIR}/${P}.patch || die
-	emake prefix=${D} || die
 }
 
 src_install() {
-	einstall || die
+	make prefix=${D} install || die
+}
+
+pkg_postinst() {
+	einfo "When running the program, if you encount the error "
+	einfo "\"Error: Shared library file: '/usr/lib/libpgtcl.so' does not exist.\","
+	einfo "you need to emerge postgresql with USE='tcltk' again"
 }
diff --git a/dev-db/pgaccess/pgaccess-0.99.0.20040219.ebuild b/dev-db/pgaccess/pgaccess-0.99.0.20040219.ebuild
index 6b7383367d90..1ac886919bcf 100644
--- a/dev-db/pgaccess/pgaccess-0.99.0.20040219.ebuild
+++ b/dev-db/pgaccess/pgaccess-0.99.0.20040219.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/dev-db/pgaccess/pgaccess-0.99.0.20040219.ebuild,v 1.1 2004/09/23 19:32:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgaccess/pgaccess-0.99.0.20040219.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pgaccess/${MY_P}.tgz"
 LICENSE="POSTGRESQL"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-db/pgadmin3/ChangeLog b/dev-db/pgadmin3/ChangeLog
index faab0250e45b..333c0ebabf0d 100644
--- a/dev-db/pgadmin3/ChangeLog
+++ b/dev-db/pgadmin3/ChangeLog
@@ -1,9 +1,97 @@
 # ChangeLog for dev-db/pgadmin3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.1 2003/11/06 16:42:25 nakano Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/ChangeLog,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
+
+*pgadmin3-1.4.0 (08 Nov 2005)
+
+  08 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pgadmin3-1.4.0-beta2-configure.patch,
+  +files/pgadmin3-1.4.0-configure.patch, -pgadmin3-1.4.0_beta2.ebuild,
+  +pgadmin3-1.4.0.ebuild:
+  version bump.
+
+*pgadmin3-1.4.0_beta2 (18 Oct 2005)
+
+  18 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgadmin3-1.4.0-beta2-configure.patch, +pgadmin3-1.4.0_beta2.ebuild:
+  Version bump.
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> pgadmin3-1.2.2.ebuild:
+  Mark 1.2.2 stable on alpha
+
+  21 Sep 2005; Jason Wever <weeve@gentoo.org> pgadmin3-1.2.2.ebuild:
+  Stable on SPARC.
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> pgadmin3-1.2.2.ebuild:
+  Stable on ppc.
+
+  16 Sep 2005; <dang@gentoo.org> pgadmin3-1.2.2.ebuild:
+  Marked stable on amd64
+
+  13 Sep 2005; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.2.2.ebuild:
+  Marked stable on x86.
+
+  07 Jul 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pgadmin3-1.2.1-configure.patch, -pgadmin3-1.2.0.ebuild,
+  -pgadmin3-1.2.1.ebuild, -pgadmin3-1.2.1-r1.ebuild:
+  Removed old ebuilds.
+
+  20 Jun 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgadmin3-1.2.2-configure.patch, pgadmin3-1.2.2.ebuild:
+  Fixed configure problem in specific environment. (#96520)
+
+*pgadmin3-1.2.2 (19 Jun 2005)
+
+  19 Jun 2005; Masatomo Nakano <nakano@gentoo.org> +pgadmin3-1.2.2.ebuild:
+  Version bump.
+
+  11 May 2005; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.2.1-r1.ebuild:
+  Fixed checking unicode USE flag in wxGTK logic. (#91703)
+
+*pgadmin3-1.2.1-r1 (09 May 2005)
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +pgadmin3-1.2.1-r1.ebuild:
+  Added depended libpq version.
+
+*pgadmin3-1.2.1 (03 May 2005)
+
+  03 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgadmin3-1.2.1-configure.patch, +pgadmin3-1.2.1.ebuild:
+  Version bump. Fixed ebuild by Rob Cakebread <pythonhead@gentoo.org>.
+
+  03 May 2005; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.2.0.ebuild:
+  Changed DEPEND from wxGTK-2.5 to wxGTK-2.6.
+
+*pgadmin3-1.2.0 (25 Mar 2005)
+
+  25 Mar 2005; Masatomo Nakano <nakano@gentoo.org> +pgadmin3-1.2.0.ebuild:
+  Version bumped. But this version is masked due to dependency masked
+  wxGTK-2.5.*.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> pgadmin3-1.0.2.ebuild:
+  add sed-4 dep
+
+  05 Mar 2004; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.2.ebuild:
+  Marked as stable.
+
+  17 Jan 2004; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.2.ebuild:
+  Fixed PostgreSQL library error. Closed #37803.
+
+  29 Dec 2003; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.1.ebuild,
+  pgadmin3-1.0.2.ebuild:
+  Fixed DEPEND
+
+*pgadmin3-1.0.2 (28 Dec 2003)
+
+  28 Dec 2003; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.2.ebuild:
+  Version bump.
 
 *pgadmin3-1.0.1 (06 Nov 2003)
 
+  18 Dec 2003; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.1.ebuild:
+  Removed KEYWORD "~hppa ~ia64 ~arm ~mips"
+
   06 Nov 2003; Masatomo Nakano <nakano@gentoo.org> pgadmin3-1.0.1.ebuild:
   Initial import. Thanks to Ray Russell Reese III <russ@zerotech.net>.
   Close #32674
diff --git a/dev-db/pgadmin3/Manifest b/dev-db/pgadmin3/Manifest
index b2989ff94c2d..d519ffb7b95c 100644
--- a/dev-db/pgadmin3/Manifest
+++ b/dev-db/pgadmin3/Manifest
@@ -1,2 +1,10 @@
-MD5 b21b1b1f01e94a0a530b0eb3d0ea7933 pgadmin3-1.0.1.ebuild 834
-MD5 bade05e7b6355fce1d2729c00dd30621 files/digest-pgadmin3-1.0.1 67
+MD5 26a98765425b2d0b35bc0a85979603b2 pgadmin3-1.4.0.ebuild 1932
+MD5 85d8072c5cd7a7f299a0367ad704611b pgadmin3-1.0.2.ebuild 1276
+MD5 dfbdc19bcfa7d9ae8d9ce9c1eba34ac2 ChangeLog 3261
+MD5 fda96699361e71e1f60886c745807ed8 pgadmin3-1.2.2.ebuild 1947
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 ea8ba09f3c984e557eb454fcf10b23aa files/pgadmin3-1.2.2-configure.patch 985
+MD5 ea8ba09f3c984e557eb454fcf10b23aa files/pgadmin3-1.4.0-configure.patch 985
+MD5 e69c2dd9e40469e9bc040a05e04054f1 files/digest-pgadmin3-1.0.2 67
+MD5 87c2509be27973faac529f94388b8180 files/digest-pgadmin3-1.2.2 67
+MD5 3c1cdfe5717665d77a36fbaaf2c7de84 files/digest-pgadmin3-1.4.0 67
diff --git a/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild
index 71e22fd89920..f2ff065083f9 100644
--- a/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild
@@ -1,23 +1,35 @@
-# 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/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild,v 1.1 2003/12/28 20:57:48 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
+RESTRICT="nomirror"
 DESCRIPTION="wxWindows GUI for PostgreSQL"
 HOMEPAGE="http://www.pgadmin.org/"
-SRC_URI="mirror://postgresql/pgadmin3/release/src/${P}.tar.gz"
+SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 # Need 2.4.1-r1 for the extras in contrib
-DEPEND=">=x11-libs/wxGTK-2.4.1-r1"
+DEPEND=">=x11-libs/wxGTK-2.4.1-r1
+	|| ( >=dev-db/postgresql-7.3.5 >=dev-db/postgresql-7.4.1-r2 )
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	if wx-config --cppflags | grep gtk2u >& /dev/null; then
+		einfo "${PN} will not build if wxGTK was compiled"
+		einfo "with unicode support.  If you are using a version of"
+		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
+		einfo "you must set USE=-unicode."
+		die "wxGTK must be re-emerged without unicode suport"
+	fi
+}
 
 src_compile() {
-	econf || die
+	LDFLAGS=-L/usr/lib/postgresql econf --with-pgsql-include=/usr/include/postgresql || die
 	cd ${S}/src
 	sed -i -e "s:^\(LIBS\).*:\1 = -lssl -lcrypto -lpq -lwx_gtk2-2.4	-lwx_gtk2_xrc-2.4 -lwx_gtk2_stc-2.4:" Makefile
 
diff --git a/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild b/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
index 3e3a72598ed6..bf30ffec1ad5 100644
--- a/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-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/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild,v 1.1 2005/06/19 09:13:15 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils libtool wxwidgets
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://postgresql/pgadmin3/release/v${PV}/src/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="alpha amd64 ppc sparc x86"
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
 	dev-db/libpq
@@ -25,11 +25,11 @@ pkg_setup() {
 	fi
 }
 
-#src_unpack() {
-#	unpack ${A}
-#	cd ${S} || die "Couldn't cd to ${S}"
-#	epatch ${FILESDIR}/${P}-configure.patch
-#}
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "Couldn't cd to ${S}"
+	epatch ${FILESDIR}/${P}-configure.patch
+}
 
 src_compile() {
 	export WX_GTK_VER=2.6
diff --git a/dev-db/pgadmin3/pgadmin3-1.4.0.ebuild b/dev-db/pgadmin3/pgadmin3-1.4.0.ebuild
index a051a98fe306..f2a52d3fa4e0 100644
--- a/dev-db/pgadmin3/pgadmin3-1.4.0.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.4.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/dev-db/pgadmin3/pgadmin3-1.4.0.ebuild,v 1.1 2005/11/08 16:37:01 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils libtool wxwidgets
 
diff --git a/dev-db/pgasync/ChangeLog b/dev-db/pgasync/ChangeLog
index ff6cb9104ab9..180956e8d5f5 100644
--- a/dev-db/pgasync/ChangeLog
+++ b/dev-db/pgasync/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pgasync
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/ChangeLog,v 1.1 2005/03/01 17:39:16 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/ChangeLog,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
+
+*pgasync-2.01 (15 Mar 2005)
+
+  15 Mar 2005; Masatomo Nakano <nakano@gentoo.org> +pgasync-2.01.ebuild:
+  Version bump.
 
 *pgasync-1.15b (01 Mar 2005)
 
diff --git a/dev-db/pgasync/Manifest b/dev-db/pgasync/Manifest
index 715e83b3464d..eec47734efe8 100644
--- a/dev-db/pgasync/Manifest
+++ b/dev-db/pgasync/Manifest
@@ -1,2 +1,6 @@
-MD5 011b2f7e1107580a3df5c4e79bd6b936 pgasync-1.15b.ebuild 572
+MD5 03b12b5099cb615ae5cbe07736da134f pgasync-2.01.ebuild 668
+MD5 f4af31ed50b0e2045c22d6b9e96342bb pgasync-1.15b.ebuild 669
+MD5 36de36a274dc53b438236206645c56de ChangeLog 527
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 d642505d299d0662a7ab78b519a34f72 files/digest-pgasync-1.15b 64
+MD5 e47e6beacaa2f2bca3e02a9cc82e947d files/digest-pgasync-2.01 63
diff --git a/dev-db/pgasync/pgasync-1.15b.ebuild b/dev-db/pgasync/pgasync-1.15b.ebuild
index 7c2e5d6fbd81..ac0377e6046e 100644
--- a/dev-db/pgasync/pgasync-1.15b.ebuild
+++ b/dev-db/pgasync/pgasync-1.15b.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/dev-db/pgasync/pgasync-1.15b.ebuild,v 1.1 2005/03/01 17:39:16 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/pgasync-1.15b.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-db/pgasync/pgasync-2.01.ebuild b/dev-db/pgasync/pgasync-2.01.ebuild
index 490d02046ad0..697711485b61 100644
--- a/dev-db/pgasync/pgasync-2.01.ebuild
+++ b/dev-db/pgasync/pgasync-2.01.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/dev-db/pgasync/pgasync-2.01.ebuild,v 1.1 2005/03/15 18:12:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgasync/pgasync-2.01.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-db/pgcluster/ChangeLog b/dev-db/pgcluster/ChangeLog
index f394743aedc0..5ae4dd587f39 100644
--- a/dev-db/pgcluster/ChangeLog
+++ b/dev-db/pgcluster/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-db/pgcluster
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/ChangeLog,v 1.1 2005/02/27 07:20:28 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/ChangeLog,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
+
+  24 Oct 2005; Masatomo Nakano <nakano@gentoo.org> pgcluster-1.3.0b.ebuild,
+  pgcluster-1.3.0c.ebuild:
+  Use emerge --config instead of ebuild ... config. #109482
+
+*pgcluster-1.3.0c (10 May 2005)
+
+  10 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pgcluster.conf-1.3.0c, +files/pgcluster.init-1.3.0c,
+  +files/pglb.conf-1.3.0c, +files/pglb.init-1.3.0c,
+  +files/pgreplicate.conf-1.3.0c, +files/pgreplicate.init-1.3.0c,
+  +files/pgcluster-1.3.0c-gentoo.patch, +pgcluster-1.3.0c.ebuild:
+  Version bump.
 
 *pgcluster-1.3.0b (27 Feb 2005)
 
diff --git a/dev-db/pgcluster/Manifest b/dev-db/pgcluster/Manifest
index e7724d7a58e3..a3bf813b142f 100644
--- a/dev-db/pgcluster/Manifest
+++ b/dev-db/pgcluster/Manifest
@@ -1,2 +1,20 @@
-MD5 5422b6a5091776b7dcfd63a1d78e3d25 pgcluster-1.3.0b.ebuild 7197
+MD5 a092d914d8ca016bd49d388a2377d6cf ChangeLog 1080
 MD5 6c9838e26eae25f8c03081b98dd62408 files/digest-pgcluster-1.3.0b 70
+MD5 c3f16a39a8ce23df03bc691c4a0b7533 files/digest-pgcluster-1.3.0c 70
+MD5 bda92770ca02e1e04a8ca4fed68e7271 files/pgcluster-1.3.0b-gentoo.patch 1853
+MD5 446f978a6ba60f3db6e5e72c51da03a0 files/pgcluster-1.3.0c-gentoo.patch 1853
+MD5 97ea3e76ea30ca5662d0b47de5036f01 files/pgcluster.conf-1.3.0b 392
+MD5 97ea3e76ea30ca5662d0b47de5036f01 files/pgcluster.conf-1.3.0c 392
+MD5 c16f1a05adaf4c554f5865f72ad1adf5 files/pgcluster.init-1.3.0b 1701
+MD5 36db72f70af827440f74d2c4b8aa0d15 files/pgcluster.init-1.3.0c 1701
+MD5 7f906690e9022c2c88c1e0165c5a66b5 files/pglb.conf-1.3.0b 49
+MD5 7f906690e9022c2c88c1e0165c5a66b5 files/pglb.conf-1.3.0c 49
+MD5 458e5022c67470ae49700fbf1bb4b915 files/pglb.init-1.3.0b 510
+MD5 befc4d100b36ec187d3997395ec4e6b7 files/pglb.init-1.3.0c 510
+MD5 c676056d10d63c6a517095cf993c9eb3 files/pgreplicate.conf-1.3.0b 47
+MD5 c676056d10d63c6a517095cf993c9eb3 files/pgreplicate.conf-1.3.0c 47
+MD5 4ec662a9b662261c08747eb222363214 files/pgreplicate.init-1.3.0b 669
+MD5 a7f52fea43e9a85bfc8d81c27ab760c9 files/pgreplicate.init-1.3.0c 669
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 3929651504be989ff69f230c4c42cb57 pgcluster-1.3.0b.ebuild 7780
+MD5 d4967086ba701b1376af369d8477316c pgcluster-1.3.0c.ebuild 7780
diff --git a/dev-db/pgcluster/files/pgcluster.init-1.3.0b b/dev-db/pgcluster/files/pgcluster.init-1.3.0b
index d22a67df84fe..bf77d9773b03 100644
--- a/dev-db/pgcluster/files/pgcluster.init-1.3.0b
+++ b/dev-db/pgcluster/files/pgcluster.init-1.3.0b
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgcluster.init-1.3.0b,v 1.1 2005/02/27 07:20:28 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgcluster.init-1.3.0b,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/pgcluster/files/pgcluster.init-1.3.0c b/dev-db/pgcluster/files/pgcluster.init-1.3.0c
index ad1f66f183fb..c97af9ddc0ad 100644
--- a/dev-db/pgcluster/files/pgcluster.init-1.3.0c
+++ b/dev-db/pgcluster/files/pgcluster.init-1.3.0c
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgcluster.init-1.3.0c,v 1.1 2005/05/10 06:40:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgcluster.init-1.3.0c,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/pgcluster/files/pglb.init-1.3.0b b/dev-db/pgcluster/files/pglb.init-1.3.0b
index 71527c13578d..966cf132769f 100755
--- a/dev-db/pgcluster/files/pglb.init-1.3.0b
+++ b/dev-db/pgcluster/files/pglb.init-1.3.0b
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pglb.init-1.3.0b,v 1.1 2005/02/27 07:20:28 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pglb.init-1.3.0b,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 depend() {
 	use net pgreplicate pgcluster
diff --git a/dev-db/pgcluster/files/pglb.init-1.3.0c b/dev-db/pgcluster/files/pglb.init-1.3.0c
index 0aadc3f8d2da..c1244713e531 100755
--- a/dev-db/pgcluster/files/pglb.init-1.3.0c
+++ b/dev-db/pgcluster/files/pglb.init-1.3.0c
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pglb.init-1.3.0c,v 1.1 2005/05/10 06:40:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pglb.init-1.3.0c,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 depend() {
 	use net pgreplicate pgcluster
diff --git a/dev-db/pgcluster/files/pgreplicate.init-1.3.0b b/dev-db/pgcluster/files/pgreplicate.init-1.3.0b
index 048123e78e8e..43e41e4410dd 100755
--- a/dev-db/pgcluster/files/pgreplicate.init-1.3.0b
+++ b/dev-db/pgcluster/files/pgreplicate.init-1.3.0b
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgreplicate.init-1.3.0b,v 1.1 2005/02/27 07:20:28 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgreplicate.init-1.3.0b,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/dev-db/pgcluster/files/pgreplicate.init-1.3.0c b/dev-db/pgcluster/files/pgreplicate.init-1.3.0c
index a9fc4df04a0b..855974767c6d 100755
--- a/dev-db/pgcluster/files/pgreplicate.init-1.3.0c
+++ b/dev-db/pgcluster/files/pgreplicate.init-1.3.0c
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgreplicate.init-1.3.0c,v 1.1 2005/05/10 06:40:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/files/pgreplicate.init-1.3.0c,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/dev-db/pgcluster/pgcluster-1.3.0b.ebuild b/dev-db/pgcluster/pgcluster-1.3.0b.ebuild
index cd244f171f92..dccd7407168d 100644
--- a/dev-db/pgcluster/pgcluster-1.3.0b.ebuild
+++ b/dev-db/pgcluster/pgcluster-1.3.0b.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/dev-db/pgcluster/pgcluster-1.3.0b.ebuild,v 1.1 2005/02/27 07:20:28 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/pgcluster-1.3.0b.ebuild,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/181/${P}.tar.gz"
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib pg-intdatetime"
+IUSE="doc libg++ nls pam perl pg-intdatetime python readline ssl tcltk xml2 zlib"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -182,16 +182,16 @@ pkg_postinst() {
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
 
 	if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
-		einfo ""
+		einfo
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 	fi
 
-	einfo ""
+	einfo
 	einfo "Python modules was removed from PostgreSQL package."
 	einfo "If you need it, please run \"emerge dev-db/pygresql\"."
-	einfo ""
+	einfo
 }
 
 pkg_config() {
@@ -226,17 +226,17 @@ pkg_config() {
 			ewarn "Restoring the SEMMNI value to the previous value"
 			ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
 			ewarn "and set it to at least ${SEMMNI_MIN}"
-			ewarn ""
+			ewarn
 			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-			ewarn ""
+			ewarn
 		fi
 
 		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
 			eerror "The current value of SHMMAX is too low for postgresql to run."
 			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
-			eerror ""
+			eerror
 			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-			eerror ""
+			eerror
 
 		fi
 	fi
diff --git a/dev-db/pgcluster/pgcluster-1.3.0c.ebuild b/dev-db/pgcluster/pgcluster-1.3.0c.ebuild
index d1c70166496e..a4c1147b101d 100644
--- a/dev-db/pgcluster/pgcluster-1.3.0c.ebuild
+++ b/dev-db/pgcluster/pgcluster-1.3.0c.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/dev-db/pgcluster/pgcluster-1.3.0c.ebuild,v 1.1 2005/05/10 06:40:37 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgcluster/pgcluster-1.3.0c.ebuild,v 1.1.1.1 2005/11/30 10:11:23 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/218/${P}.tar.gz"
 LICENSE="POSTGRESQL"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib pg-intdatetime"
+IUSE="doc libg++ nls pam perl pg-intdatetime python readline ssl tcltk xml2 zlib"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
@@ -182,16 +182,16 @@ pkg_postinst() {
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
 
 	if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
-		einfo ""
+		einfo
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 	fi
 
-	einfo ""
+	einfo
 	einfo "Python modules was removed from PostgreSQL package."
 	einfo "If you need it, please run \"emerge dev-db/pygresql\"."
-	einfo ""
+	einfo
 }
 
 pkg_config() {
@@ -226,17 +226,17 @@ pkg_config() {
 			ewarn "Restoring the SEMMNI value to the previous value"
 			ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
 			ewarn "and set it to at least ${SEMMNI_MIN}"
-			ewarn ""
+			ewarn
 			ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-			ewarn ""
+			ewarn
 		fi
 
 		if [ ${SHMMAX} -lt ${SHMMAX_MIN} ]; then
 			eerror "The current value of SHMMAX is too low for postgresql to run."
 			eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}."
-			eerror ""
+			eerror
 			eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-			eerror ""
+			eerror
 
 		fi
 	fi
diff --git a/dev-db/pgeasy/ChangeLog b/dev-db/pgeasy/ChangeLog
index c0f5e5d65d05..3d13da6d3c77 100644
--- a/dev-db/pgeasy/ChangeLog
+++ b/dev-db/pgeasy/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for dev-db/pgeasy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgeasy/ChangeLog,v 1.1 2003/04/04 19:51:27 mkennedy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgeasy/ChangeLog,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
-*pgeas-3.0.1 (04 Apr 2003)
+*pgeasy-3.0.4 (09 May 2005)
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org> +metadata.xml,
+  +pgeasy-3.0.4.ebuild:
+  Added depended libpq version.
+
+  01 Oct 2004; <pyrania@gentoo.org> pgeasy-3.0.1.ebuild:
+  Made epatch aware.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> pgeasy-3.0.1.ebuild:
+  Don't assign default to S; header fix
+
+*pgeasy-3.0.1 (04 Apr 2003)
 
   04 Apr 2003; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
   pgeasy-3.0.1.ebuild, files/digest-pgeasy-3.0.1 :
diff --git a/dev-db/pgeasy/Manifest b/dev-db/pgeasy/Manifest
index e69de29bb2d1..9132cd4c2d32 100644
--- a/dev-db/pgeasy/Manifest
+++ b/dev-db/pgeasy/Manifest
@@ -0,0 +1,7 @@
+MD5 3e691252508a6c3542f6af51322b4eb7 pgeasy-3.0.1.ebuild 915
+MD5 b814577d523ef7e60330fd5a66e85a69 ChangeLog 710
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 ab0bf8f1080fc2c140ec23a2dfb672a4 pgeasy-3.0.4.ebuild 976
+MD5 4016912a424a60d58ea0174086e3f6c9 files/digest-pgeasy-3.0.1 62
+MD5 8504ac825596c445ac6124207058eae0 files/digest-pgeasy-3.0.4 67
+MD5 bfe8974eeabbe4d6362d3949d33b70a8 files/Makefile-gentoo.patch 395
diff --git a/dev-db/pgeasy/pgeasy-3.0.1.ebuild b/dev-db/pgeasy/pgeasy-3.0.1.ebuild
index 8bbf518e8be4..09a85f64d66a 100644
--- a/dev-db/pgeasy/pgeasy-3.0.1.ebuild
+++ b/dev-db/pgeasy/pgeasy-3.0.1.ebuild
@@ -1,22 +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/dev-db/pgeasy/pgeasy-3.0.1.ebuild,v 1.1 2003/04/04 19:51:27 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgeasy/pgeasy-3.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="An easy-to-use C interface to PostgreSQL."
 HOMEPAGE="http://gborg.postgresql.org/project/pgeasy/projdisplay.php"
 SRC_URI="ftp://gborg.postgresql.org/pub/pgeasy/stable/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-db/postgresql-7.3.2"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
-	cd ${S} && patch -p0 <${FILESDIR}/Makefile-gentoo.patch || die
+	cd ${S}
+	epatch ${FILESDIR}/Makefile-gentoo.patch || die "epatch failed,"
 }
 
 src_compile() {
diff --git a/dev-db/pgeasy/pgeasy-3.0.4.ebuild b/dev-db/pgeasy/pgeasy-3.0.4.ebuild
index 1cfb417b5465..42b6fe14c31e 100644
--- a/dev-db/pgeasy/pgeasy-3.0.4.ebuild
+++ b/dev-db/pgeasy/pgeasy-3.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/dev-db/pgeasy/pgeasy-3.0.4.ebuild,v 1.1 2005/05/09 00:31:41 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgeasy/pgeasy-3.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:33 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/pgpool/ChangeLog b/dev-db/pgpool/ChangeLog
index d0c494df2b60..e8f738b045a7 100644
--- a/dev-db/pgpool/ChangeLog
+++ b/dev-db/pgpool/ChangeLog
@@ -1,6 +1,190 @@
 # ChangeLog for dev-db/pgpool
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/ChangeLog,v 1.1 2003/10/13 00:21:25 nakano Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/ChangeLog,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
+
+*pgpool-2.6.5 (12 Nov 2005)
+
+  12 Nov 2005; Masatomo Nakano <nakano@gentoo.org> +pgpool-2.6.5.ebuild:
+  version bump.
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> pgpool-2.6.3.ebuild:
+  Stable on ppc.
+
+*pgpool-2.6.4 (09 Nov 2005)
+
+  09 Nov 2005; Masatomo Nakano <nakano@gentoo.org> -pgpool-2.5.2.ebuild,
+  -pgpool-2.5.2-r1.ebuild, -pgpool-2.6.ebuild, +pgpool-2.6.4.ebuild:
+  version bump.
+
+  19 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> pgpool-2.6.3.ebuild:
+  Stable on sparc
+
+  18 Oct 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.6.3.ebuild:
+  Marked stable on x86/amd64
+
+*pgpool-2.6.3 (18 Sep 2005)
+
+  18 Sep 2005; Masatomo Nakano <nakano@gentoo.org> -pgpool-2.4.ebuild,
+  +pgpool-2.6.3.ebuild:
+  Version bump.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pgpool-2.6.2.ebuild:
+  Stable on ppc.
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> pgpool-2.6.2.ebuild:
+  Stable on sparc
+
+  12 Aug 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.6.2.ebuild:
+  Marked stable on x86.
+
+  31 Jul 2005; Masatomo Nakano <nakano@gentoo.org> -pgpool-2.5.ebuild,
+  -pgpool-2.5.1.ebuild:
+  removed old ebuilds.
+
+*pgpool-2.6.2 (31 Jul 2005)
+
+  31 Jul 2005; Masatomo Nakano <nakano@gentoo.org> +pgpool-2.6.2.ebuild:
+  Version bump.
+
+*pgpool-2.6 (07 Jul 2005)
+
+  07 Jul 2005; Masatomo Nakano <nakano@gentoo.org> +pgpool-2.6.ebuild:
+  Version bump.
+
+  20 Jun 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.5.2.ebuild:
+  Makred stable on amd64
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.5.2-r1.ebuild:
+  Fixed keywords.
+
+*pgpool-2.5.2-r1 (08 May 2005)
+
+  08 May 2005; Masatomo Nakano <nakano@gentoo.org> +pgpool-2.5.2-r1.ebuild:
+  Added libpq dependency version.
+
+  30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pgpool-2.5.2.ebuild:
+  Stable on ppc.
+
+  29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> pgpool-2.5.2.ebuild:
+  Stable on sparc
+
+  28 Apr 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.5.2.ebuild:
+  Marked stable on x86.
+
+*pgpool-2.5.2 (17 Mar 2005)
+
+  17 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.5.2.ebuild:
+  Version bumped.
+
+*pgpool-2.5.1 (01 Mar 2005)
+
+  01 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.3.3.ebuild,
+  pgpool-2.4.ebuild, +pgpool-2.5.1.ebuild:
+  Version bumped.
+  Marked stable on amd64 and ppc.
+  Removed old version.
+
+  11 Feb 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.4.ebuild:
+  Makred stable on x86.
+
+*pgpool-2.5 (11 Feb 2005)
+
+  11 Feb 2005; Masatomo Nakano <nakano@gentoo.org> pgpool-2.3.3.ebuild,
+  pgpool-2.4.ebuild, +pgpool-2.5.ebuild:
+  Version bump. Fixed HOMEPAGE.
+
+*pgpool-2.4 (05 Jan 2005)
+
+  05 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.4.ebuild:
+  Version bumped.
+
+*pgpool-2.3.3 (01 Jan 2005)
+
+  01 Jan 2005; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.2.1.ebuild,
+  +pgpool-2.3.3.ebuild:
+  Version bumped.
+  Remove old version.
+
+*pgpool-2.3.1 (16 Nov 2004)
+
+  16 Nov 2004; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.2.ebuild,
+  +pgpool-2.3.1.ebuild:
+  Version bumped.
+
+*pgpool-2.2.1 (28 Oct 2004)
+
+  28 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.1.ebuild,
+  +pgpool-2.2.1.ebuild:
+  Version bumped.
+
+*pgpool-2.2 (20 Oct 2004)
+
+  20 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.0.9.ebuild,
+  +pgpool-2.2.ebuild:
+  Version bumped.
+
+*pgpool-2.1 (27 Sep 2004)
+
+  27 Sep 2004; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.0.8.ebuild,
+  +pgpool-2.1.ebuild:
+  Version bumped.
+
+*pgpool-2.0.9 (07 Sep 2004)
+
+  07 Sep 2004; MATSUU Takuto <matsuu@gentoo.org> -pgpool-2.0.6.ebuild,
+  +pgpool-2.0.9.ebuild:
+  Version bumped.
+
+*pgpool-2.0.8 (19 Aug 2004)
+
+  19 Aug 2004; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.0.8.ebuild:
+  Version bumped.
+
+*pgpool-2.0.6 (26 Jul 2004)
+
+  26 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.0.6.ebuild:
+  Version bumped.
+
+*pgpool-2.0.5 (20 Jul 2004)
+
+  20 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.0.5.ebuild:
+  Version bumped.
+  Fixed some issues.
+
+*pgpool-2.0.4 (18 Jul 2004)
+
+  18 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.0.4.ebuild:
+  Version bumped.
+  Removed old versions.
+
+*pgpool-2.0.3 (17 Jul 2004)
+
+  17 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> +pgpool-2.0.3.ebuild:
+  Version bumped.
+  Added to ~sparc and ~amd64.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> pgpool-1.1.ebuild,
+  pgpool-1.2.3.ebuild:
+  trim trailing whitespace
+
+*pgpool-1.2.3 (13 Jun 2004)
+
+  13 Jun 2004; Masatomo Nakano <nakano@gentoo.org> :
+  Version bump.
+
+  02 May 2004; David Holm <dholm@gentoo.org> pgpool-1.1.ebuild:
+  Added to ~ppc.
+
+*pgpool-1.1 (01 May 2004)
+
+  01 May 2004; Masatomo Nakano <nakano@gentoo.org> -pgpool-0.1.5.ebuild,
+  -pgpool-0.1.6.ebuild, +pgpool-1.1.ebuild:
+  Version bump. Removed old ebuilds.
+
+*pgpool-0.1.6 (25 Dec 2003)
+
+  25 Dec 2003; Masatomo Nakano <nakano@gentoo.org> pgpool-0.1.6.ebuild:
+  Version bump.
 
 *pgpool-0.1.5 (13 Oct 2003)
 
diff --git a/dev-db/pgpool/Manifest b/dev-db/pgpool/Manifest
index ebf3ef59859c..0332ece3068f 100644
--- a/dev-db/pgpool/Manifest
+++ b/dev-db/pgpool/Manifest
@@ -1,5 +1,11 @@
+MD5 0628dfa42c43a779b7d488588dd5c920 pgpool-2.6.5.ebuild 869
+MD5 d8d7aaba0b36393f8c9d49e9ef563f6e pgpool-2.6.2.ebuild 866
+MD5 5fd8e429bc41a756816c73ca26644c91 pgpool-2.6.4.ebuild 869
+MD5 36c0b4c0a589768bafaa4f7abd061fb1 pgpool-2.6.3.ebuild 865
+MD5 917fe0cd3bcf084b968734a903a2aa03 ChangeLog 5208
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 9ce89705626ce2acff07f905f994abc2 pgpool-0.1.5.ebuild 765
-MD5 bda16948af4c356ab1f7abab11cdeb71 files/pgpool.init 530
-MD5 54db80148c25f93b81a29af2ac112af5 files/digest-pgpool-0.1.2 63
-MD5 d794dfe5841c5f91f4c6194b29c9afa6 files/digest-pgpool-0.1.5 63
+MD5 8a60b75889b4ce03b548a1f3b2ed9711 files/pgpool.init 522
+MD5 584d108782ab4bfa6c5d8b5a56cd1088 files/digest-pgpool-2.6.2 64
+MD5 98502f16e5ce229f62e73a8e147a5f7b files/digest-pgpool-2.6.3 64
+MD5 9f4434aa3e1d1d3091472446dcd9f332 files/digest-pgpool-2.6.4 64
+MD5 a28a918a68ddd396dd98cba95b78f63e files/digest-pgpool-2.6.5 64
diff --git a/dev-db/pgpool/files/pgpool.init b/dev-db/pgpool/files/pgpool.init
index 81d791c55e58..8a324abdd806 100644
--- a/dev-db/pgpool/files/pgpool.init
+++ b/dev-db/pgpool/files/pgpool.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/files/pgpool.init,v 1.1 2003/10/13 00:21:25 nakano Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/files/pgpool.init,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/dev-db/pgpool/pgpool-2.6.2.ebuild b/dev-db/pgpool/pgpool-2.6.2.ebuild
index c926fd96a3ad..a35c9ca98273 100644
--- a/dev-db/pgpool/pgpool-2.6.2.ebuild
+++ b/dev-db/pgpool/pgpool-2.6.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/dev-db/pgpool/pgpool-2.6.2.ebuild,v 1.1 2005/07/31 03:52:40 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-2.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/399/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-db/libpq"
diff --git a/dev-db/pgpool/pgpool-2.6.3.ebuild b/dev-db/pgpool/pgpool-2.6.3.ebuild
index fc632d1bd714..66056f51afa0 100644
--- a/dev-db/pgpool/pgpool-2.6.3.ebuild
+++ b/dev-db/pgpool/pgpool-2.6.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/dev-db/pgpool/pgpool-2.6.3.ebuild,v 1.1 2005/09/18 01:00:52 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-2.6.3.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://pgfoundry.org/frs/download.php/426/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-db/libpq"
diff --git a/dev-db/pgpool/pgpool-2.6.4.ebuild b/dev-db/pgpool/pgpool-2.6.4.ebuild
index f9737c3a1b2b..91300db0667f 100644
--- a/dev-db/pgpool/pgpool-2.6.4.ebuild
+++ b/dev-db/pgpool/pgpool-2.6.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/dev-db/pgpool/pgpool-2.6.4.ebuild,v 1.1 2005/11/09 12:36:50 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-2.6.4.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
diff --git a/dev-db/pgpool/pgpool-2.6.5.ebuild b/dev-db/pgpool/pgpool-2.6.5.ebuild
index 9fec3870c1c6..2f56915b411d 100644
--- a/dev-db/pgpool/pgpool-2.6.5.ebuild
+++ b/dev-db/pgpool/pgpool-2.6.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/dev-db/pgpool/pgpool-2.6.5.ebuild,v 1.1 2005/11/12 15:05:07 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgpool/pgpool-2.6.5.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 DESCRIPTION="Connection pool server for PostgreSQL"
 HOMEPAGE="http://pgpool.projects.postgresql.org/"
diff --git a/dev-db/pgst/ChangeLog b/dev-db/pgst/ChangeLog
index d2dc0daf18b1..6f0a1d76e56b 100644
--- a/dev-db/pgst/ChangeLog
+++ b/dev-db/pgst/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/pgst
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgst/ChangeLog,v 1.1 2004/11/06 19:44:04 nakano Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgst/ChangeLog,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
+
+*pgst-1.3 (09 May 2005)
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org> +pgst-1.3.ebuild:
+  Version bump.
 
 *pgst-1.2.2 (06 Nov 2004)
 
diff --git a/dev-db/pgst/Manifest b/dev-db/pgst/Manifest
index 854a0666b355..9fdbf7550cd6 100644
--- a/dev-db/pgst/Manifest
+++ b/dev-db/pgst/Manifest
@@ -1,3 +1,7 @@
-MD5 27050a1a3690d903bee000fbaebd7cf0 pgst-1.2.2.ebuild 889
+MD5 bdc5ee2d1672fc260a68e69574d3776f pgst-1.3.ebuild 1044
+MD5 a17aa37feaa2844c52b2cf1653274dbb pgst-1.2.2.ebuild 1055
+MD5 0634d45df1c02c58ccbed9e9d5b20979 ChangeLog 516
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
 MD5 c9c8144f5c54feda3828950e10192b2e files/digest-pgst-1.2.2 61
 MD5 cb792de3ff45cb8b2294b4be33654154 files/pgst-1.2.2.desktop 266
+MD5 9bae3e0071dd39734fcf287d6dbd4be0 files/digest-pgst-1.3 59
diff --git a/dev-db/pgst/pgst-1.2.2.ebuild b/dev-db/pgst/pgst-1.2.2.ebuild
index ecdd7e30cc1d..2719322f4d4c 100644
--- a/dev-db/pgst/pgst-1.2.2.ebuild
+++ b/dev-db/pgst/pgst-1.2.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/dev-db/pgst/pgst-1.2.2.ebuild,v 1.1 2004/11/06 19:44:04 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgst/pgst-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/dev-db/pgst/pgst-1.3.ebuild b/dev-db/pgst/pgst-1.3.ebuild
index 4c06e50076c1..96d501d42399 100644
--- a/dev-db/pgst/pgst-1.3.ebuild
+++ b/dev-db/pgst/pgst-1.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/dev-db/pgst/pgst-1.3.ebuild,v 1.1 2005/05/09 00:32:26 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgst/pgst-1.3.ebuild,v 1.1.1.1 2005/11/30 10:11:36 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 0af3a56e85c4..e2fc0fdfae30 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,23 +1,612 @@
 # ChangeLog for dev-db/phpmyadmin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.1 2002/04/27 16:58:10 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.1.1.1 2005/11/30 10:11:22 chriswhite Exp $
 
-*phpmyadmin-2.2.5 (27 Apr 2002)
+  20 Nov 2005; Simon Stelling <blubb@gentoo.org> phpmyadmin-2.6.4_p4.ebuild:
+  stable on amd64 wrt bug 112690
 
-  27 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  19 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.4_p4.ebuild:
+  Stable on ppc.
 
-  Re-added this package back without the CAPS in the name.
+  19 Nov 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  phpmyadmin-2.6.4_p4.ebuild:
+  Stable on alpha wrt security bug #112690
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  phpmyadmin-2.6.4_p4.ebuild:
+  Stable on hppa.
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org> phpmyadmin-2.6.4_p4.ebuild:
+  Stable on x86; bug #112690
+
+  18 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.4_p4.ebuild:
+  Stable on sparc wrt security #112690
+
+*phpmyadmin-2.6.4_p4 (17 Nov 2005)
+
+  17 Nov 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpmyadmin-2.6.4_p4.ebuild:
+  Security bump. See #112690
+
+  10 Nov 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2.7,
+  phpmyadmin-2.7.0_beta1.ebuild:
+  Fix reconfig hook wrt bug #112021.
+
+  09 Nov 2005; Renat Lumpau <rl03@gentoo.org> phpmyadmin-2.7.0_beta1.ebuild:
+  new version should be unstable on x86
+
+*phpmyadmin-2.7.0_beta1 (09 Nov 2005)
+
+  09 Nov 2005; Renat Lumpau <rl03@gentoo.org>
+  +files/config.default.php-2.7.0.patch, -files/phpmyadmin-config.patch,
+  phpmyadmin-2.6.4_p3.ebuild, +phpmyadmin-2.7.0_beta1.ebuild:
+  Version bump
+
+  24 Oct 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.4.ebuild,
+  -phpmyadmin-2.6.4_p1.ebuild, -phpmyadmin-2.6.4_p2.ebuild:
+  Removing old versions
+
+  24 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.4_p3.ebuild:
+  Stable on hppa, ppc.
+
+  24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.4_p3.ebuild:
+  Stable on sparc wrt #110146
+
+  24 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  phpmyadmin-2.6.4_p3.ebuild:
+  Stable on alpha wrt security bug #110146
+
+  23 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  phpmyadmin-2.6.4_p3.ebuild:
+  Stable on amd64, bug 110146.
+
+  23 Oct 2005; Mark Loeser <halcy0n@gentoo.org> phpmyadmin-2.6.4_p3.ebuild:
+  Stable on x86; bug #110146
+
+*phpmyadmin-2.6.4_p3 (23 Oct 2005)
+
+  23 Oct 2005; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.6.4_p3.ebuild:
+  Version bump wrt security bug #110146.
+
+  16 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  phpmyadmin-2.6.4_p2.ebuild:
+  Stable on amd64, bug 108939.
+
+  14 Oct 2005; Mark Loeser <halcy0n@gentoo.org> phpmyadmin-2.6.4_p2.ebuild:
+  Stable on x86; bug #108939
+
+  13 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  phpmyadmin-2.6.4_p2.ebuild:
+  Stable on alpha wrt security bug #108939
+
+  13 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.4_p2.ebuild:
+  Stable on sparc wrt #108939
+
+  13 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.4_p2.ebuild:
+  Stable on hppa, ppc.
+
+*phpmyadmin-2.6.4_p2 (12 Oct 2005)
+
+  12 Oct 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpmyadmin-2.6.4_p2.ebuild:
+  Revision bump for security bug 108939
+
+  15 Sep 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Added note to postinstall instructions wrt bug #104495.
+
+*phpmyadmin-2.6.4_p1 (15 Sep 2005)
+
+  15 Sep 2005; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.6.4_p1.ebuild:
+  Version bump
+
+  13 Sep 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.4_rc1.ebuild:
+  Removed old version
+
+*phpmyadmin-2.6.4 (11 Sep 2005)
+
+  11 Sep 2005; Renat Lumpau <rl03@gentoo.org> +phpmyadmin-2.6.4.ebuild:
+  Version bump wrt security bug #105598.
+
+  02 Sep 2005; Renat Lumpau <rl03@gentoo.org> files/reconfig:
+  Fix reconfig script wrt bug #104495.
+
+  30 Aug 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.2-r2.ebuild,
+  -phpmyadmin-2.6.3_p1.ebuild:
+  Removing old vulnerable versions
+
+  30 Aug 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  phpmyadmin-2.6.4_rc1.ebuild:
+  Stable on alpha due to security bug #104124
+
+  29 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  phpmyadmin-2.6.4_rc1.ebuild:
+  Stable on amd64, bug 104124.
+
+  29 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.4_rc1.ebuild:
+  Stable on hppa and ppc.
+
+  29 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.4_rc1.ebuild:
+  Stable on sparc wrt #104124
+
+  29 Aug 2005; Renat Lumpau <rl03@gentoo.org> phpmyadmin-2.6.4_rc1.ebuild:
+  x86 stable wrt security bug #104124
+
+*phpmyadmin-2.6.4_rc1 (28 Aug 2005)
+
+  28 Aug 2005; Renat Lumpau <rl03@gentoo.org> -phpmyadmin-2.6.2_rc1.ebuild,
+  +phpmyadmin-2.6.4_rc1.ebuild:
+  Version bump, removed old version
+
+  22 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt:
+  Housekeeping
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  files/reconfig, phpmyadmin-2.6.3_p1.ebuild:
+  Housekeeping
+
+*phpmyadmin-2.6.3_p1 (06 Jul 2005)
+
+  06 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +files/reconfig, +phpmyadmin-2.6.3_p1.ebuild:
+  Version bump (#94059). Update-related clean-up (#83614, #67859).
+
+*phpmyadmin-2.6.2-r2 (03 May 2005)
+
+  03 May 2005; Aaron Walker <ka0ttic@gentoo.org> -phpmyadmin-2.6.2.ebuild,
+  -phpmyadmin-2.6.2-r1.ebuild, +phpmyadmin-2.6.2-r2.ebuild:
+  Revision bump; fix perms on config.inc.php. Tidy old ebuilds.
+
+  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.2-r1.ebuild:
+  Stable on alpha, bug 88831.
+
+  25 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  phpmyadmin-2.6.2-r1.ebuild:
+  stable on amd64 wrt #88831
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.2-r1.ebuild:
+  Stable on hppa.
+
+  25 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.2-r1.ebuild:
+  Stable on sparc wrt #88831
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.2-r1.ebuild:
+  Stable on ppc.
+
+  25 Apr 2005; Elfyn McBratney <beu@gentoo.org> phpmyadmin-2.6.2-r1.ebuild:
+  Stable on x86, bug #88831.
+
+*phpmyadmin-2.6.2-r1 (25 Apr 2005)
+
+  25 Apr 2005; Elfyn McBratney <beu@gentoo.org>
+  -phpmyadmin-2.6.1_p2-r1.ebuild, phpmyadmin-2.6.2.ebuild,
+  +phpmyadmin-2.6.2-r1.ebuild:
+  Drop old version and version bump (make sure the 'mysql create' script is not
+  world readable - it contains the initial pma@localhost password), bug #88831.
+
+*phpmyadmin-2.6.2 (19 Apr 2005)
+
+  19 Apr 2005; Elfyn McBratney <beu@gentoo.org> files/postinstall-en.txt,
+  +phpmyadmin-2.6.2.ebuild:
+  Version bump, bug #89658.
+
+  09 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  phpmyadmin-2.6.2_rc1.ebuild:
+  stable on amd64 wrt bug #87952
+
+  09 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.2_rc1.ebuild:
+  Stable on sparc wrt #87952
+
+  08 Apr 2005; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.6.2_rc1.ebuild:
+  Stable on hppa.
+
+  08 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.2_rc1.ebuild:
+  Stable on alpha, bug 87952.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.2_rc1.ebuild:
+  Stable on ppc.
+
+*phpmyadmin-2.6.2_rc1 (08 Apr 2005)
+
+  08 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/phpmyadmin-mysql-setup.sql.in, metadata.xml,
+  -phpmyadmin-2.6.1_rc1.ebuild, -phpmyadmin-2.6.1.ebuild,
+  -phpmyadmin-2.6.1_p2.ebuild, +phpmyadmin-2.6.2_rc1.ebuild:
+  Revision bump for security bug 87952; tidy all the old versions from
+  previous vulnerabilities. Also updated metadata.xml since twp no longer
+  maintains this package.
+
+  29 Mar 2005; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.6.1_p2-r1.ebuild:
+  Stable on hppa.
+
+  07 Mar 2005; Stuart Herbert <stuart@gentoo.org>
+  phpmyadmin-2.6.1_p2-r1.ebuild:
+  Removed depend on apache; depend on mod_php/php-cgi rather than just mod_php
+
+  03 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.1_p2-r1.ebuild:
+  Stable on alpha, bug 83792.
+
+  02 Mar 2005; Jason Wever <weeve@gentoo.org> phpmyadmin-2.6.1_p2-r1.ebuild:
+  Stable on sparc wrt security bug #83792.
+
+  02 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> :
+  stable on amd64 wrt to bug #83792
+
+  02 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.1_p2-r1.ebuild:
+  Stable on ppc.
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/2.6.1_p2-no-wildcard-privs-for-you.patch,
+  phpmyadmin-2.6.1_p2-r1.ebuild:
+  Fix patch; added sed in src_unpack to automatically update the
+  postinst-en.txt that gets installed.
+
+*phpmyadmin-2.6.1_p2-r1 (02 Mar 2005)
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/2.6.1_p2-no-wildcard-privs-for-you.patch,
+  +phpmyadmin-2.6.1_p2-r1.ebuild:
+  Revision bump for security bug 83792.
+
+  01 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.1_p2.ebuild:
+  Stable on alpha.
+
+  28 Feb 2005; Simon Stelling <blubb@gentoo.org> phpmyadmin-2.6.1_p2.ebuild:
+  stable on amd64 wrt bug 83190
+
+  28 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phpmyadmin-2.6.1_p2.ebuild:
+  Stable on ppc.
+
+  28 Feb 2005; Olivier Crête <tester@gentoo.org> phpmyadmin-2.6.1_p2.ebuild:
+  Stable on x86 wrt security bug #83190
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> phpmyadmin-2.6.1_p2.ebuild:
+  Stable on sparc wrt security bug #83190.
+
+*phpmyadmin-2.6.1_p2 (27 Feb 2005)
+
+  27 Feb 2005; Martin Holzer <mholzer@gentoo.org>
+  +phpmyadmin-2.6.1_p2.ebuild:
+  Security update. See 83190
+
+*phpmyadmin-2.6.1 (26 Jan 2005)
+
+  26 Jan 2005; Tom Payne <twp@gentoo.org> +phpmyadmin-2.6.1.ebuild:
+  Version bump. Bug # 79305.
+
+  11 Jan 2005; Tom Payne <twp@gentoo.org> -phpmyadmin-2.6.0_p2.ebuild,
+  -phpmyadmin-2.6.0_p3.ebuild, phpmyadmin-2.6.1_rc1.ebuild:
+  Change dependency from mod_php to virtual/php. Bug # 76623. Removed old
+  versions.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Simon Stelling <blubb@gentoo.org>
+  phpmyadmin-2.6.1_rc1.ebuild:
+  stable on amd64; bug #74303
+
+  15 Dec 2004; <SeJo@gentoo.org> phpmyadmin-2.6.1_rc1.ebuild:
+  stable on ppc gsla: 74303
+
+  14 Dec 2004; Jason Wever <weeve@gentoo.org> phpmyadmin-2.6.1_rc1.ebuild:
+  Stable on sparc wrt security bug #74303.
+
+  14 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.1_rc1.ebuild:
+  Stable on alpha, bug 74303.
+
+  14 Dec 2004; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.6.1_rc1.ebuild:
+  Stable on hppa.
+
+*phpmyadmin-2.6.1_rc1 (14 Dec 2004)
+
+  14 Dec 2004; Tom Payne <twp@gentoo.org> +phpmyadmin-2.6.1_rc1.ebuild:
+  Version bump (security fix). Stable on x86. Bug # 74303.
+
+  06 Nov 2004; Joseph Jezak <josejx@gentoo.org> phpmyadmin-2.6.0_p3.ebuild:
+  Marked ppc stable for bug #71819
+
+  24 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.0_p3.ebuild:
+  Stable on alpha, bug 71819.
+
+  23 Nov 2004; Simon Stelling <blubb@gentoo.org> phpmyadmin-2.6.0_p3.ebuild:
+  stable on amd64; bug #71819
+
+  23 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  phpmyadmin-2.6.0_p3.ebuild:
+  Stable on sparc wrt #71819
+
+  23 Nov 2004; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.6.0_p3.ebuild:
+  Stable on hppa.
+
+*phpmyadmin-2.6.0_p3 (22 Nov 2004)
+
+  22 Nov 2004; Tom Payne <twp@gentoo.org> +phpmyadmin-2.6.0_p3.ebuild:
+  Version bump. Bug # 71819.
+
+  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> phpmyadmin-2.5.7.ebuild,
+  phpmyadmin-2.6.0_p2.ebuild:
+  added to ~mips for testing
+
+  16 Oct 2004; Danny van Dyk <kugelfang@gentoo.org>
+  phpmyadmin-2.6.0_p2.ebuild:
+  Marked stable on amd64.
+
+  15 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  phpmyadmin-2.6.0_p2.ebuild:
+  Stable on alpha, bug 67409.
+
+  14 Oct 2004; Jason Wever <weeve@gentoo.org> phpmyadmin-2.6.0_p2.ebuild:
+  Stable on sparc wrt security bug #67409.
+
+  14 Oct 2004; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.6.0_p2.ebuild:
+  Stable on hppa.
+
+  14 Oct 2004; Tom Payne <twp@gentoo.org> phpmyadmin-2.6.0_p2.ebuild:
+  Stable on x86.
+
+  14 Oct 2004; <SeJo@gentoo.org> phpmyadmin-2.6.0_p2.ebuild:
+  stable on ppc gsla: 67409
+
+*phpmyadmin-2.6.0_p2 (14 Oct 2004)
+
+  14 Oct 2004; Tom Payne <twp@gentoo.org> -phpmyadmin-2.6.0.ebuild,
+  +phpmyadmin-2.6.0_p2.ebuild:
+  Version bump (security fix). Bug # 67409.
+
+*phpmyadmin-2.6.0 (28 Sep 2004)
+
+  28 Sep 2004; Tom Payne <twp@gentoo.org> +phpmyadmin-2.6.0.ebuild:
+  Version bump. Bug # 65582.
+
+  23 Jul 2004; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.5.7_p1.ebuild:
+  Marked stable on hppa.
+
+  23 Jul 2004; <kloeri@gentoo.org> phpmyadmin-2.5.7_p1.ebuild:
+  Stable on alpha, see bug 57890.
+
+  22 Jul 2004; <twp@gentoo.org> phpmyadmin-2.5.6-r1.ebuild,
+  phpmyadmin-2.5.6.ebuild, phpmyadmin-2.5.7.ebuild,
+  phpmyadmin-2.5.7_p1.ebuild:
+  Updated homepage and dependencies.
+
+  21 Jul 2004; Jason Wever <weeve@gentoo.org> phpmyadmin-2.5.7_p1.ebuild:
+  Stable on sparc wrt security bug #57890.
+
+  21 Jul 2004; <twp@gentoo.org> phpmyadmin-2.5.7_p1.ebuild:
+  Stable on x86. Bug # 57890. Fixed dependencies. Bug # 57365.
+
+*phpmyadmin-2.5.7_p1 (04 Jul 2004)
+
+  04 Jul 2004; <twp@gentoo.org> +phpmyadmin-2.5.7_p1.ebuild:
+  Version bump (security fix). Bug # 56048.
+
+  27 Jun 2004; <twp@gentoo.org> files/mysql-setup.sql.in-2.5.6,
+  phpmyadmin-2.5.7.ebuild:
+  Bug # 53220.
+
+*phpmyadmin-2.5.7 (27 Jun 2004)
+
+  27 Jun 2004; <twp@gentoo.org> +phpmyadmin-2.5.7.ebuild:
+  Version bump. Bug # 53422.
+
+  08 May 2004; <twp@gentoo.org> phpmyadmin-2.5.6-r1.ebuild:
+  Mark ~all-ARCHs, block earlier versions to force uninstall pre-emerge.
+
+*phpmyadmin-2.5.6-r1 (08 May 2004)
+
+  08 May 2004; <twp@gentoo.org> +files/postinstall-en.txt,
+  +phpmyadmin-2.5.6-r1.ebuild:
+  Use webapp.eclass, merged from webapp-config example.
+
+  01 May 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.6.ebuild:
+  stable on all arches. Closes 48379
+
+  01 May 2004; Bryan Østergaard <kloeri@gentoo.org> phpmyadmin-2.5.6.ebuild:
+  Stable on alpha.
+
+  25 Apr 2004; <twp@gentoo.org> phpmyadmin-2.5.6.ebuild:
+  Added IUSE="apache2".
+
+  16 Apr 2004; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.5.6.ebuild:
+  Marked stable on hppa.
+
+  13 Apr 2004; Jason Wever <weeve@gentoo.org> phpmyadmin-2.5.6.ebuild:
+  Stable on sparc.
+
+  12 Apr 2004; <twp@gentoo.org> phpmyadmin-2.5.6.ebuild,
+  phpmyadmin-2.5.6_rc1.ebuild:
+  Added IUSE. 2.5.6 stable on x86.
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> phpmyadmin-2.5.6.ebuild,
+  phpmyadmin-2.5.6_rc1.ebuild:
+  Don't ever recall testing this package on mips, thus it causes a bunch of dep
+  issues with repoman. Removing mips keywords until this gets tested.
+
+*phpmyadmin-2.5.6 (01 Mar 2004)
+
+  01 Mar 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.6.ebuild,
+  files/config.inc.php-2.5.6.patch, files/mysql-setup.sql.in-2.5.6:
+  Version bumped.
+
+  09 Feb 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.6_rc1.ebuild:
+  Marked stable on all arches. Security Fix.
+
+*phpmyadmin-2.5.6_rc1 (04 Feb 2004)
+
+  04 Feb 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.6_rc1.ebuild,
+  files/config.inc.php-2.5.6_rc1.patch, files/mysql-setup.sql.in-2.5.6_rc1:
+  Version bumped.
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.5_p1.ebuild:
+  Marked stable on all ARCHes.
+
+*phpmyadmin-2.5.5_p1 (07 Jan 2004)
+
+  07 Jan 2004; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.5_p1.ebuild,
+  files/config.inc.php-2.5.5_p1.patch, files/mysql-setup.sql.in-2.5.5_p1:
+  Version bumped. Closes 37424
+
+*phpmyadmin-2.5.5 (29 Dec 2003)
+
+  29 Dec 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.5.ebuild :
+  Version bump.
+
+  15 Dec 2003; Stuart Herbert <stuart@gentoo.org> phpmyadmin-2.5.4.ebuild:
+  Fix for bug '32636'
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.0.ebuild,
+  phpmyadmin-2.5.3-r1.ebuild, files/config.inc.php-2.5.2.patch:
+  adding RESTRICT="nomirror"
+
+*phpmyadmin-2.5.4 (20 Oct 2003)
+
+  20 Oct 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.4.ebuild :
+  Version bump. Bug # 31537. Update MySQL dependency.
+
+  29 Sep 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.5.3-r1.ebuild:
+  Marked x86 stable.
+
+*phpmyadmin-2.5.3 (11 Sep 2003)
+
+  17 Sep 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.3-r1.ebuild :
+  Change ownership on config files. Bug # 28868. Thanks dju.
+
+  11 Sep 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.3.ebuild :
+  Version bump. Use webapp-apache.eclass. Bugs # 27741 & 28129. Thanks Ian Leitch.
+
+*phpmyadmin-2.5.2_p1 (09 Aug 2003)
+
+  09 Aug 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.2_p1.ebuild :
+  Version bump. Bug # 26158.
+
+*phpmyadmin-2.5.2 (24 Jul 2003)
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> phpmyadmin-2.5.2.ebuild :
+  Marked stable on hppa.
+
+  24 Jul 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.2.ebuild :
+  Version bump. Bug # 25145.
+
+*phpmyadmin-2.5.1 (03 Jun 2003)
+
+  03 Jun 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.1.ebuild :
+  Version bump, marked unstable. Bug # 22108.
+
+*phpmyadmin-2.5.0 (12 May 2003)
+
+  15 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.0.ebuild :
+  Marked stable on all ARCHes.
+
+  12 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.5.0.ebuild :
+  Version bump. Ebuild tidy. Improved src_install. Bug # 20874.
+
+*phpmyadmin-2.4.0 (08 Apr 2003)
+
+  10 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild :
+  Always install to /home/httpd/htdocs. Bug # 20642.
+
+  09 May 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild :
+  Allow user to override document root with DOCUMENT_ROOT env var. Bug # 20642.
+
+  09 Apr 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild :
+  Dynamically determine DocumentRoot. No bump to ebuild revision number since
+  existing users won't see a change.
+
+  08 Apr 2003; Tom Payne <twp@gentoo.org> phpmyadmin-2.4.0.ebuild files/phpmyadmin-config.patch files/phpmyadmin-mysql-setup.sql.in :
+  Version bump.  Improved config file handling (doesn't overwrite on upgrade,
+  now stores config file in /etc/phpmyadmin so it is config-protected).  Added
+  pkg_config to setup MySQL. Bug # 16521.
+
+*phpmyadmin-2.3.3 (11 Dec 2002)
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> phpmyadmin-2.3.3.ebuild:
+  Add ~alpha to KEYWORDS
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> phpmyadmin-2.3.2-r1.ebuild phpmyadmin-2.3.3.ebuild :
+  set ppc in keywords
+
+  31 Jan 2003; Martin Holzer <mholzer@gentoo.org> phpmyadmin-2.3.3.ebuild :
+  Change SRC_URI to use mirror://sourceforge.
+
+  31 Jan 2003; Ryan Phillips <rphillips@gentoo.org>:
+  restore old config file if it exists. fixes #12585
+
+  10 Jan 2003; Christian Birchinger <joker@gentoo.org> :
+  Added "sparc" keyword. It has been running productive on sparc for weeks.
+
+  11 Dec 2002; Ryan Phillips <rphillips@gentoo.org> phpmyadmin-2.3.3.ebuild :
+  New version. Includes Quequero's tweaks to the ebuild. Fixes #11990
+
+*phpmyadmin-2.3.2-r1 (05 Dec 2002)
+
+  05 Dec 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog phpmyadmin-2.3.2-r1.ebuild:
+  Added Arthur Ward's ebuild fixes to include the fpdf components.
+
+*phpmyadmin-2.3.3-rc1 (22 Nov 2002)
+
+  22 Nov 2002; Martin Holzer <mholzer@gentoo.org> ChangeLog phpmyadmin-2.3.3_rc1.ebuild
+  files/digest-phpmyadmin-2.3.3_rc1 :
+  New version.
+
+*phpmyadmin-2.3.2 (28 Aug 2002)
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  28 Aug 2002; Maik Schreiber <blizzy@gentoo.org> :
+  New version.
+
+*phpmyadmin-2.3.0 (18 Aug 2002)
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> :
+  New version
+
+*phpmyadmin-2.2.6 (27 Apr 2002)
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  16 Jul 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Repoman fixes
 
 *phpmyadmin-2.2.5 (10 Apr 2002)
 
-  10 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
 
+  27 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+  Re-added this package back without the CAPS in the name.
+
+  10 Apr 2002; Donny Davies <woodchip@gentoo.org> :
   Updated to latest release and fixed to match the new apache layout.
 
-*phpmyadmin-2.2.0 (1 Feb 2002)
+*phpmyadmin-2.2.0 (01 Feb 2002)
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
+  01 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/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 8183c9e7c4c5..f2e6956bd97c 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,9 +1,14 @@
-MD5 911852d3ad9bc19ea6bbeb6a126a025b ChangeLog 3511
-MD5 50116d5aa339dbdbfdec14a907416b36 phpmyadmin-2.3.2-r1.ebuild 1608
-MD5 d89ed894f4f2efad6e88ddcc1bbe4944 phpmyadmin-2.3.3.ebuild 2186
-MD5 7dd64b8260dc671bb6a984551f35798e phpmyadmin-2.4.0.ebuild 2500
-MD5 0ee9b66e7a73593103df05d91d31dc8d files/digest-phpmyadmin-2.3.2-r1 73
-MD5 fedff25cf01133c5bb8efd8d7f9da56e files/digest-phpmyadmin-2.3.3 76
-MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
-MD5 396133c1da8d8b716ad2da23aa0a5a30 files/phpmyadmin-mysql-setup.sql.in 2712
-MD5 b1d989c407c0399daff55f10d0dd822c files/digest-phpmyadmin-2.4.0 73
+MD5 370074931bdde8c24c311d1e06ed5456 ChangeLog 20512
+MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
+MD5 06ef9cf16f596c7eace1c9a7e6e54725 phpmyadmin-2.6.4_p3.ebuild 2093
+MD5 6e358909bac88b65fab218ee14a160c3 phpmyadmin-2.7.0_beta1.ebuild 2067
+MD5 8a8c80816c9dac5c4e0050b792130e04 phpmyadmin-2.6.4_p4.ebuild 2094
+MD5 0fb913f47fa22640fc0df136df21818c files/digest-phpmyadmin-2.6.4_p3 74
+MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
+MD5 03e1c16e02d105f6fcfb56c1bf734f6e files/reconfig-2.7 319
+MD5 a7201a857705dfcec9502fc7dd3a96db files/reconfig 315
+MD5 ab6e8b5ecc163d415aebb7d2c42238a3 files/config.default.php-2.7.0.patch 5533
+MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
+MD5 c9eb06723752a2bcafd88c3164e83ea2 files/postinstall-en.txt 593
+MD5 0cd8fc0cfff0431b90baeaa43ab92365 files/digest-phpmyadmin-2.7.0_beta1 76
+MD5 f9b280ad4bce0ff1073ad7692ae4ef27 files/digest-phpmyadmin-2.6.4_p4 74
diff --git a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6 b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
index 147c07f721b8..d5853baf01b4 100644
--- a/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
+++ b/dev-db/phpmyadmin/files/mysql-setup.sql.in-2.5.6
@@ -16,7 +16,7 @@ CREATE DATABASE IF NOT EXISTS pmadb;
 USE pmadb;
 
 CREATE TABLE IF NOT EXISTS `PMA_bookmark` (
-	`id` int(11) DEFAULT '0' NOT NULL auto_increment,
+	`id` int(11) DEFAULT NULL NOT NULL auto_increment,
 	`dbase` varchar(255) NOT NULL,
 	`user` varchar(255) NOT NULL,
 	`label` varchar(255) NOT NULL,
diff --git a/dev-db/phpmyadmin/files/postinstall-en.txt b/dev-db/phpmyadmin/files/postinstall-en.txt
index 4bd19f01b20d..a59740ab1731 100644
--- a/dev-db/phpmyadmin/files/postinstall-en.txt
+++ b/dev-db/phpmyadmin/files/postinstall-en.txt
@@ -1,13 +1,14 @@
 To complete installation, you must
 
 1. Update MySQL's grant tables and the pmadb database:
-     mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-2. Reload MySQL:
-     /etc/init.d/mysql restart
+     mysql -u root -p < /usr/share/webapps/phpmyadmin/VERSION/sqlscripts/mysql/VERSION_create.sql
 
 If you are upgrading from an earlier version and are using phpMyAdmin's
 features for master/foreign tables be sure to read
-  http://localhost/phpmyadmin/Documentation.html#col_com
+  http://${VHOST_HOSTNAME}${VHOST_APPDIR}/Documentation.html#col_com
 You will need to perform the ALTER TABLE step yourself.
 
-Finally, point your browser to http://localhost/phpmyadmin/.
+Finally, point your browser to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}
+
+Note that you may need to edit the config file:
+ ${MY_INSTALLDIR}/config.inc.php
diff --git a/dev-db/phpmyadmin/files/reconfig b/dev-db/phpmyadmin/files/reconfig
index 56998b47a1f2..dccd10442f73 100644
--- a/dev-db/phpmyadmin/files/reconfig
+++ b/dev-db/phpmyadmin/files/reconfig
@@ -1,8 +1,16 @@
 #!/bin/bash
+
+die() {
+	echo "#####"
+	echo $1
+	echo "#####"
+	exit 1
+}
+
 if [ $1 = "install" ]; then
 	cd ${MY_INSTALLDIR}
-	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}${VHOST_APPDIR}';|g" -i config.inc.php
-		
+	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.inc.php || die "sed failed"
+
 elif [ $1 = "clean" ]; then
 	echo $1
 fi
diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index 6adcb2a8639d..6632069b5aff 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -1,9 +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>twp@gentoo.org</email>
-  <name>Tom Payne</name> -->
-</maintainer>
+	<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
index dcf82de20a29..b9144e412261 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.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/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild,v 1.1 2005/10/23 16:32:41 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.4_p3.ebuild,v 1.1.1.1 2005/11/30 10:11:22 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -10,7 +10,7 @@ DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
 IUSE=""
 DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	virtual/httpd-php
@@ -39,7 +39,7 @@ src_compile() {
 src_install() {
 	webapp_src_preinst
 
-	local docs="CREDITS ChangeLog Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO"
+	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO"
 
 	# install the SQL scripts available to us
 	#
@@ -48,7 +48,7 @@ src_install() {
 
 	webapp_sqlscript mysql ${T}/mysql-setup.sql
 
-	dodoc ${docs}
+	dodoc ${docs} ChangeLog
 	dohtml Documentation.html
 
 	# Copy the app's main files
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild
index fe1fd21e645c..7fe2b2a0beeb 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.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/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild,v 1.1 2005/11/17 22:09:12 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.4_p4.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -10,7 +10,7 @@ DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
 IUSE=""
 DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	virtual/httpd-php
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild
index bbd898304b3c..205bce1a0b6f 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.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/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild,v 1.1 2005/11/09 19:10:18 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.7.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:11:22 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -10,7 +10,7 @@ DESCRIPTION="Web-based administration for MySQL database in PHP"
 HOMEPAGE="http://www.phpmyadmin.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
 IUSE=""
 DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	virtual/httpd-php
@@ -58,7 +58,7 @@ src_install() {
 
 	webapp_configfile ${MY_HTDOCSDIR}/config.default.php
 	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/reconfig
+	webapp_hook_script ${FILESDIR}/reconfig-2.7
 	webapp_src_install
 
 	fperms 0640 ${MY_HTDOCSDIR}/config.default.php
diff --git a/dev-db/phppgadmin/ChangeLog b/dev-db/phppgadmin/ChangeLog
index 98c4ab9eba60..46d792ad90c7 100644
--- a/dev-db/phppgadmin/ChangeLog
+++ b/dev-db/phppgadmin/ChangeLog
@@ -1,9 +1,208 @@
 # ChangeLog for dev-db/phppgadmin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.1 2002/04/27 16:44:51 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/ChangeLog,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
+
+*phppgadmin-4.0 (20 Nov 2005)
+
+  20 Nov 2005; Martin Holzer <mholzer@gentoo.org> +phppgadmin-4.0.ebuild:
+  Version bumped.
+
+*phppgadmin-3.5.6 (18 Oct 2005)
+
+  18 Oct 2005; Martin Holzer <mholzer@gentoo.org> +phppgadmin-3.5.6.ebuild:
+  Version bumped.
+
+*phppgadmin-3.5.5 (21 Aug 2005)
+
+  21 Aug 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +phppgadmin-3.5.5.ebuild:
+  Version bump
+
+  22 Jul 2005; Renat Lumpau <rl03@gentoo.org> -phppgadmin-3.5.1.ebuild,
+  -phppgadmin-3.5.2.ebuild, -phppgadmin-3.5.3.ebuild:
+  Removing old versions
+
+  20 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> ChangeLog:
+  Marked stable on amd64.
+
+  20 Jul 2005; Renat Lumpau <rl03@gentoo.org> phppgadmin-3.5.4.ebuild:
+  Stable on x86
+
+  19 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  phppgadmin-3.5.4.ebuild:
+  Stable on hppa. bug #98328
+
+  19 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  phppgadmin-3.5.4.ebuild:
+  ppc stable, #98328
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phppgadmin-3.5.4.ebuild:
+  Stable on sparc wrt #98328
+
+  15 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  phppgadmin-3.5.3.ebuild:
+  Stable on sparc
+
+*phppgadmin-3.5.4 (15 Jul 2005)
+
+  15 Jul 2005; Martin Holzer <mholzer@gentoo.org> +phppgadmin-3.5.4.ebuild:
+  Version bumped.
+
+  06 Jul 2005; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  phppgadmin-3.5.3.ebuild:
+  Fix location of config files (#55760)
+
+  07 May 2005; Elfyn McBratney <beu@gentoo.org> phppgadmin-3.5.1.ebuild,
+  phppgadmin-3.5.2.ebuild, phppgadmin-3.5.3.ebuild:
+  Change depend on dev-php/mod_php to virtual/httpd-php.
+
+*phppgadmin-3.5.3 (23 Apr 2005)
+
+  23 Apr 2005; Martin Holzer <mholzer@gentoo.org> +phppgadmin-3.5.3.ebuild:
+  Version bumped.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> phppgadmin-3.5.1.ebuild:
+  stable on amd64
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  phppgadmin-3.5.1.ebuild:
+  Stable on ppc.
+
+*phppgadmin-3.5.2 (02 Mar 2005)
+
+  02 Mar 2005; Masatomo Nakano <nakano@gentoo.org> +phppgadmin-3.5.2.ebuild:
+  Version bump.
+
+  13 Jan 2005; Guy Martin <gmsoft@gentoo.org> phppgadmin-3.5.1.ebuild:
+  Stable on hppa.
+
+  27 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> phppgadmin-3.5.1.ebuild:
+  Stable on sparc
+
+  26 Dec 2004; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.5.1.ebuild:
+  Marked stable on x86
+
+*phppgadmin-3.5.1 (13 Dec 2004)
+
+  13 Dec 2004; Masatomo Nakano <nakano@gentoo.org> +phppgadmin-3.5.1.ebuild:
+  Version bump. #74296
+
+*phppgadmin-3.5 (17 Nov 2004)
+
+  17 Nov 2004; MATSUU Takuto <matsuu@gentoo.org> +phppgadmin-3.5.ebuild:
+  Version bumped. Bug 66846.
+
+  05 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> phppgadmin-3.4.ebuild:
+  Added amd64 keyword, closing #58993.
+
+  18 Jul 2004; Masatomo Nakano <nakano@gentoo.org> -phppgadmin-3.1.ebuild,
+  -phppgadmin-3.3.ebuild:
+  Removed old ebuilds.
+
+  11 Jul 2004; Jason Wever <weeve@gentoo.org> phppgadmin-3.4.ebuild:
+  Stable on sparc.
+
+  03 Jul 2004; Guy Martin <gmsoft@gentoo.org> phppgadmin-3.4.ebuild:
+  Marked stable on hppa.
+
+  27 Jun 2004; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.4.ebuild:
+  Marked stable on x86.
+
+*phppgadmin-3.4 (13 Jun 2004)
+*phppgadmin-3.3.1-r1 (13 Jun 2004)
+
+  13 Jun 2004; Masatomo Nakano <nakano@gentoo.org> +files/postinstall-en.txt,
+  +phppgadmin-3.3.1-r1.ebuild, +phppgadmin-3.4.ebuild:
+  Version bump and changing to use webapp eclass. (#52972, #51319)
+
+  01 May 2004; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.3.1.ebuild:
+  Marked as stable.
+
+  16 Apr 2004; Guy Martin <gmsoft@gentoo.org> phppgadmin-3.3.1.ebuild:
+  Marked stable on hppa.
+
+  13 Apr 2004; Jason Wever <weeve@gentoo.org> phppgadmin-3.3.1.ebuild:
+  Added ~sparc keyword.
+
+*phppgadmin-3.3.1 (21 Mar 2004)
+
+  21 Mar 2004; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.2.1.ebuild,
+  phppgadmin-3.3.1.ebuild, phppgadmin-3.3.ebuild:
+  Version bumped phppgadmin-3.3.1 and marked as stable 3.3 and removed 3.2.1.
+
+*phppgadmin-3.3 (03 Mar 2004)
+
+  03 Mar 2004; Martin Holzer <mholzer@gentoo.org> phppgadmin-3.3.ebuild:
+  Version bumped.
+
+  03 Mar 2004; Martin Holzer <mholzer@gentoo.org> phppgadmin-3.1.ebuild,
+  phppgadmin-3.2.1.ebuild:
+  moving webapp-detect into functions
+
+*phppgadmin-3.2 (22 Dec 2003)
+*phppgadmin-3.2.1 (22 Dec 2003)
+
+  22 Dec 2003; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.2.ebuild:
+  Version bump.
+
+  15 Dec 2003; Stuart Herbert <stuart@gentoo.org> phppgadmin-3.1.ebuild:
+  Fix for bug #32636
+
+*phppgadmin-3.1 (05 Oct 2003)
+
+  22 Oct 2003; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.1.ebuild:
+  Marked as stable
+
+  05 Oct 2003; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.1.ebuild:
+  Version bump. Thanks to Doug Gorley <douggorley@shaw.ca>, Mark Gibson
+  <gibsonm@cromwell.co.uk> and Thomas R. (TRauMa) <trauma@web.de>.
+
+*phppgadmin-3.0.0-r4 (22 Jul 2003)
+
+  22 Jul 2003; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.0.0-r4.ebuild:
+  Fixed bug about install path.
+
+*phppgadmin-3.0.0-r3 (17 Jul 2003)
+	
+  17 Jul 2003; Thomas Raschbacher <lordvan@gentoo.org> phppgadmin-3.0.0-r3:
+  fixed download location (thanks to ska-fan)
+	
+*phppgadmin-3.0.0-r2 (11 May 2003)
+
+  11 May 2003; Masatomo Nakano <nakano@gentoo.org> phppgadmin-3.0.0-r2:
+
+  Version bump.
+
+*phppgadmin-3.0.0-r1 (10 Apr 2003)
+
+
+  10 Apr 2003; L. Boshell <leonardop@gentoo.org> : Fix the destination of
+  some files which were being incorrectly dodoc'ed.
+
+*phppgadmin-3.0.0 (29 Mar 2003)
+
+  29 Mar 2003; Masatomo Nakano <nakano@gentoo.org> :
+  Version bump as unstable. #17703
+
+*phppgadmin-2.4.2 (1 Mar 2003)
+
+  01 Mar 2003; Masatomo Nakano <nakano@gentoo.org> :
+  version bump. thanks to Miguel Revilla Rodriguez <yo@miguelrevilla.com>.
+	#9823
+
+*phppgadmin-2.4.1-r1 (3 May 2002)
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
+  2 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS
+
+  3 May 2002; Donny Davies <woodchip@gentoo.org> :
+  Added LICENSE, SLOT.
 
 *phppgadmin-2.4.1 (27 Apr 2002)
 
   27 Apr 2002; Donny Davies <woodchip@gentoo.org> :
-
   New package.  Contributed by Xavier Garcia <xavier@dospins.com>.
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
index e69de29bb2d1..b6121a4ff8bb 100644
--- a/dev-db/phppgadmin/Manifest
+++ b/dev-db/phppgadmin/Manifest
@@ -0,0 +1,11 @@
+MD5 0edf1a6673a3f2bcd7a70a4df750ab0a phppgadmin-3.5.6.ebuild 1072
+MD5 09f0448705577e30e8272b5e8daf4b30 phppgadmin-3.5.4.ebuild 1081
+MD5 8c05332043586029d9d1417154cda2fc metadata.xml 185
+MD5 d26abf6023ef3d5082300f5d495594d8 ChangeLog 6350
+MD5 d96912846fb0220e202dedbdfc51b944 phppgadmin-3.5.5.ebuild 1072
+MD5 7504c3208d0e6e00650e638a4ec42d40 phppgadmin-4.0.ebuild 1067
+MD5 2261f2781c16bb39eea8517c4edb1649 files/digest-phppgadmin-3.5.4 69
+MD5 0f2f49b835456b5715ad189abaf654a8 files/digest-phppgadmin-3.5.5 69
+MD5 39e8ebac0a944e684a8b721950db14a8 files/digest-phppgadmin-3.5.6 69
+MD5 bc0e13fa1609716e50360a260b98758e files/digest-phppgadmin-4.0 67
+MD5 502d9961e63f871ef1ddb5cd5da157d4 files/postinstall-en.txt 162
diff --git a/dev-db/phppgadmin/files/postinstall-en.txt b/dev-db/phppgadmin/files/postinstall-en.txt
index 9f0f647ac0a5..003fe5003bbd 100644
--- a/dev-db/phppgadmin/files/postinstall-en.txt
+++ b/dev-db/phppgadmin/files/postinstall-en.txt
@@ -1,6 +1,4 @@
-Make sure you edit /etc/phppgadmin/config.inc.php
-
-To use the reports-database, you have to manually
-execute
-psql -f /etc/phppgadmin/reports-pgsql.sql
+Make sure you edit ${MY_INSTALLDIR}/conf/config.inc.php
 
+To use the reports database, you have to manually execute
+psql -f ${MY_INSTALLDIR}/sql/reports-pgsql.sql
diff --git a/dev-db/phppgadmin/metadata.xml b/dev-db/phppgadmin/metadata.xml
index 309b51e9a965..0a3a1d3dde88 100644
--- a/dev-db/phppgadmin/metadata.xml
+++ b/dev-db/phppgadmin/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>postgresql</herd>
+<herd>web-apps</herd>
 </pkgmetadata>
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild
index 7541a97b72a5..4b38626a687f 100644
--- a/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-3.5.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/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild,v 1.1 2005/07/15 14:21:47 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.4.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -16,10 +16,9 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 HOMEPAGE="http://phppgadmin.sourceforge.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64"
+KEYWORDS="amd64 hppa ppc sparc x86"
 
-DEPEND=">=dev-db/postgresql-7.0.0
-	virtual/httpd-php"
+DEPEND="virtual/httpd-php"
 
 RDEPEND="${DEPEND}
 	!<=dev-db/phppgadmin-3.3.1"
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild
index 74c543a752e4..25bc0f214ad4 100644
--- a/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-3.5.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/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild,v 1.1 2005/08/21 15:03:48 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.5.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 inherit webapp
 
@@ -17,8 +17,7 @@ HOMEPAGE="http://phppgadmin.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
-DEPEND=">=dev-db/postgresql-7.0.0
-	virtual/httpd-php"
+DEPEND="virtual/httpd-php"
 
 RDEPEND="${DEPEND}
 	!<=dev-db/phppgadmin-3.3.1"
diff --git a/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild b/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild
index a92a1560a8be..68f9123d8355 100644
--- a/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-3.5.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/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild,v 1.1 2005/10/18 16:35:07 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-3.5.6.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 inherit webapp
 
@@ -17,8 +17,7 @@ HOMEPAGE="http://phppgadmin.sourceforge.net/"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
 
-DEPEND=">=dev-db/postgresql-7.0.0
-	virtual/httpd-php"
+DEPEND="virtual/httpd-php"
 
 RDEPEND="${DEPEND}
 	!<=dev-db/phppgadmin-3.3.1"
diff --git a/dev-db/phppgadmin/phppgadmin-4.0.ebuild b/dev-db/phppgadmin/phppgadmin-4.0.ebuild
index 24c6a33511d8..2fb84634458c 100644
--- a/dev-db/phppgadmin/phppgadmin-4.0.ebuild
+++ b/dev-db/phppgadmin/phppgadmin-4.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/dev-db/phppgadmin/phppgadmin-4.0.ebuild,v 1.1 2005/11/20 13:37:16 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phppgadmin/phppgadmin-4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 inherit webapp
 
diff --git a/dev-db/postgis/ChangeLog b/dev-db/postgis/ChangeLog
index 62b5b4a9ad33..b65b5d64e130 100644
--- a/dev-db/postgis/ChangeLog
+++ b/dev-db/postgis/ChangeLog
@@ -1,10 +1,61 @@
 # ChangeLog for dev-db/postgis
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.1 2002/12/16 21:13:29 george Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/ChangeLog,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
-*postgis-0.7.3.ebuild (16 ��� 2002)
+*postgis-1.0.1_p20050805 (27 Aug 2005)
 
-  16 ��� 2002; George Shapovalov <george@gentoo.org> ChangeLog, postgis-0.7.3.ebuild, files/\{postgis-0.7.3-gentoo.diff\} :
+  27 Aug 2005; Masatomo Nakano <nakano@gentoo.org>
+  +postgis-1.0.1_p20050805.ebuild:
+  Version bump.
+
+*postgis-1.0.0_p20050512 (14 May 2005)
+
+  14 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +postgis-1.0.0_p20050512.ebuild:
+  Version bump.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> postgis-0.7.5-r2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org>
+  postgis-0.7.5-r2.ebuild:
+  Dependency update: dev-libs/proj -> sci-libs/proj.
+
+  17 Jun 2004; Masatomo Nakano <nakano@gentoo.org> postgis-0.7.5-r2.ebuild:
+  Marked as stable on x86.
+
+  04 May 2004; David Holm <dholm@gentoo.org> postgis-0.7.5-r2.ebuild:
+  Added to ~ppc.
+
+*postgis-0.7.5-r2 (03 May 2004)
+
+  03 May 2004; Masatomo Nakano <nakano@gentoo.org> +postgis-0.7.5-r2.ebuild:
+  Fixed dependency.
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> postgis-0.7.5-r1.ebuild:
+  src_uri now uses mirror://postgresql
+
+  21 Mar 2004; Martin Holzer <mholzer@gentoo.org> postgis-0.7.5-r1.ebuild:
+  adding categorie. see 45110 for details
+
+  07 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgis-0.7.5.ebuild:
+  Clean up.
+
+*postgis-0.7.5-r1 (30 Sep 2003)
+  30 Sep 2003; Masatomo Nakano <nakano@gentoo.org> postgis-0.7.5-r1.ebuild :
+  Fixed library path and changed dependency to postgresql-7.3.4. #29226
+
+*postgis-0.7.5.ebuild (12 Jun 2003)
+
+  29 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> postgis-0.7.5.ebuild :
+  Added IUSE.
+
+  12 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> postgis-0.7.5.ebuild :
+  Version bump.
+
+*postgis-0.7.3.ebuild (16 Dec 2002)
+
+  16 Dec 2002; George Shapovalov <george@gentoo.org> ChangeLog, postgis-0.7.3.ebuild, files/\{postgis-0.7.3-gentoo.diff\} :
   initial release
   adds support for geographic objects to PostgreSQL
   ebuild submitted by Nathaniel C. Domingo <nathaniel.domingo@upd.edu.ph>
diff --git a/dev-db/postgis/Manifest b/dev-db/postgis/Manifest
index e69de29bb2d1..e8f4d1b07132 100644
--- a/dev-db/postgis/Manifest
+++ b/dev-db/postgis/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 14bf62145982fe2ad7a09d1d1675362f ChangeLog 2093
+MD5 e02da1081e84b4266aff297f0e422688 files/digest-postgis-0.7.5-r2 135
+MD5 45fbdc11a7887af6cbdb23256ede1cbf files/digest-postgis-1.0.0_p20050512 76
+MD5 166d20a82877d518f78081c596450b49 files/digest-postgis-1.0.1_p20050805 80
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 8557793e4877948f4c89f36a7d74db81 postgis-0.7.5-r2.ebuild 1822
+MD5 77268390221b16c76a842a5316186254 postgis-1.0.0_p20050512.ebuild 2375
+MD5 92a41ea65d8613f1af45507e21c742b1 postgis-1.0.1_p20050805.ebuild 2576
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEhkOI1lqEGTUzyQRAqehAKDMkaIQ8oGBRCTgfL1fxOy9G0TolwCgldCX
+V+ehWKdSvfxYuntwOaCeyQI=
+=qoaH
+-----END PGP SIGNATURE-----
diff --git a/dev-db/postgis/postgis-0.7.5-r2.ebuild b/dev-db/postgis/postgis-0.7.5-r2.ebuild
index 1b822c33f598..28353988b692 100644
--- a/dev-db/postgis/postgis-0.7.5-r2.ebuild
+++ b/dev-db/postgis/postgis-0.7.5-r2.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/dev-db/postgis/postgis-0.7.5-r2.ebuild,v 1.1 2004/05/03 22:15:02 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-0.7.5-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 MY_PGSQL="postgresql-7.3.6"
 DESCRIPTION="adds support for geographic objects to PostgreSQL"
@@ -10,12 +10,12 @@ SRC_URI="http://postgis.refractions.net/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE="tcltk python perl java ssl nls libg++"
 
 DEPEND="~dev-db/postgresql-7.3.6
-	dev-libs/proj
-	>=sys-apps/sed-4*"
+	sci-libs/proj
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack "${MY_PGSQL}.tar.gz"
diff --git a/dev-db/postgis/postgis-1.0.0_p20050512.ebuild b/dev-db/postgis/postgis-1.0.0_p20050512.ebuild
index 79e1c067fde8..f4e7752e7647 100644
--- a/dev-db/postgis/postgis-1.0.0_p20050512.ebuild
+++ b/dev-db/postgis/postgis-1.0.0_p20050512.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/dev-db/postgis/postgis-1.0.0_p20050512.ebuild,v 1.1 2005/05/24 21:18:52 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.0.0_p20050512.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="http://postgis.refractions.net"
@@ -26,7 +26,6 @@ src_compile(){
 	use ppc && CFLAGS="-pipe -fsigned-char"
 	myconf="${myconf} --enable-autoconf --with-maxbackends=1024"
 
-	cd ${S}
 	if use doc; then
 		local xslv=$(best_version app-text/docbook-xsl-stylesheets |\
 			cut -d'/' -f2 | sed s/"docbook-"//)
@@ -58,8 +57,6 @@ src_compile(){
 }
 
 src_install(){
-	into /usr
-	cd ${S}
 	einstall || die "Error: einstall failed"
 	dodir /usr/share/postgresql /usr/share/postgresql/contrib/
 	mv ${D}/usr/share/*.sql ${D}/usr/share/postgresql/contrib/
diff --git a/dev-db/postgis/postgis-1.0.1_p20050805.ebuild b/dev-db/postgis/postgis-1.0.1_p20050805.ebuild
index c550e2c2783d..33cac1cf2507 100644
--- a/dev-db/postgis/postgis-1.0.1_p20050805.ebuild
+++ b/dev-db/postgis/postgis-1.0.1_p20050805.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/dev-db/postgis/postgis-1.0.1_p20050805.ebuild,v 1.1 2005/08/27 22:28:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgis/postgis-1.0.1_p20050805.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 DESCRIPTION="Geographic Objects for PostgreSQL"
 HOMEPAGE="http://postgis.refractions.net"
@@ -12,14 +12,14 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="doc geos proj"
 
-DEPEND=">=dev-db/postgresql-8.0.0 \
-	geos? (sci-libs/geos) \
-	proj? (sci-libs/proj) \
-	doc? (app-text/docbook-xsl-stylesheets) \
-	sys-devel/autoconf "
-RDEPEND=">=dev-db/postgresql-8.0.0 \
-	geos? (sci-libs/geos) \
-	proj? (sci-libs/proj)"
+DEPEND=">=dev-db/postgresql-8.0.0
+	geos? ( sci-libs/geos )
+	proj? ( sci-libs/proj )
+	doc? ( app-text/docbook-xsl-stylesheets )
+	sys-devel/autoconf"
+RDEPEND=">=dev-db/postgresql-8.0.0
+	geos? ( sci-libs/geos )
+	proj? ( sci-libs/proj )"
 
 src_compile(){
 	local myconf
@@ -28,7 +28,6 @@ src_compile(){
 
 	myconf="${myconf} --enable-autoconf --with-maxbackends=1024"
 
-	cd ${S}
 	if use doc; then
 		local xslv="$(portageq match / app-text/docbook-xsl-stylesheets |\
 			cut -d'/' -f2 | sed s/"docbook-"//)"
@@ -65,8 +64,6 @@ src_compile(){
 }
 
 src_install(){
-	into /usr
-	cd ${S}
 	dodir /usr/libexec /usr/share/postgresql /usr/share/postgresql/contrib/
 	einstall || die "Error: einstall failed"
 	mv ${D}/usr/share/*.sql ${D}/usr/share/postgresql/contrib/
diff --git a/dev-db/postgresql/ChangeLog b/dev-db/postgresql/ChangeLog
index 7861b911f71a..32d669c4e60d 100644
--- a/dev-db/postgresql/ChangeLog
+++ b/dev-db/postgresql/ChangeLog
@@ -1,6 +1,1282 @@
 # ChangeLog for dev-db/postgresql
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/ChangeLog,v 1.1.1.1 2005/11/30 10:11:44 chriswhite Exp $
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  postgresql-8.0.4.ebuild:
+  Stable on hppa.
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org> postgresql-7.3.11.ebuild,
+  postgresql-7.4.9.ebuild, postgresql-8.0.4.ebuild:
+  Stable on x86; bug #111916
+
+  17 Nov 2005; Markus Rothe <corsair@gentoo.org> postgresql-7.4.9.ebuild,
+  postgresql-8.0.4.ebuild:
+  Stable on ppc64; bug #111916
+
+  12 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-7.3.6-r2.ebuild, postgresql-7.3.9-r1.ebuild,
+  postgresql-7.3.10.ebuild, postgresql-7.3.11.ebuild,
+  postgresql-7.4.7-r1.ebuild, postgresql-7.4.7-r2.ebuild,
+  postgresql-7.4.8.ebuild, postgresql-7.4.9.ebuild,
+  postgresql-8.0.1-r3.ebuild, postgresql-8.0.1-r4.ebuild,
+  postgresql-8.0.3.ebuild, postgresql-8.0.4.ebuild, postgresql-8.1.0.ebuild:
+  removed --with-gnu-ld. (#108386).
+
+  08 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/postgresql.conf-8.1_beta3, -files/postgresql.init-8.1_beta3,
+  -files/postgresql-8.1_beta3-gentoo.patch,
+  -files/postgresql-8.1_beta3-sh.patch, -postgresql-8.1_beta3.ebuild:
+  removed beta version.
+
+*postgresql-8.1.0 (08 Nov 2005)
+
+  08 Nov 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.conf-8.1.0, +files/postgresql.init-8.1.0,
+  +files/postgresql-8.1.0-gentoo.patch, +files/postgresql-8.1.0-sh.patch,
+  +postgresql-8.1.0.ebuild:
+  version bump.
+
+  22 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-7.3.6-r2.ebuild, postgresql-7.3.9-r1.ebuild,
+  postgresql-7.3.10.ebuild, postgresql-7.3.11.ebuild,
+  postgresql-7.4.7-r1.ebuild, postgresql-7.4.7-r2.ebuild,
+  postgresql-7.4.8.ebuild, postgresql-7.4.9.ebuild,
+  postgresql-8.0.1-r3.ebuild, postgresql-8.0.1-r4.ebuild,
+  postgresql-8.0.3.ebuild, postgresql-8.0.4.ebuild,
+  postgresql-8.1_beta3.ebuild:
+  Use emerge --config instead of ebuild ... config. #109482
+
+  17 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/postgresql.conf-8.1_beta1, -files/postgresql.init-8.1_beta1,
+  -files/postgresql.conf-8.1_beta2, -files/postgresql.init-8.1_beta2,
+  -files/postgresql-8.1_beta1-gentoo.patch,
+  -files/postgresql-8.1_beta1-sh.patch,
+  -files/postgresql-8.1_beta2-gentoo.patch,
+  -files/postgresql-8.1_beta2-sh.patch, -postgresql-8.1_beta1.ebuild,
+  -postgresql-8.1_beta2.ebuild:
+  Removed old versions.
+
+*postgresql-8.1_beta3 (15 Oct 2005)
+
+  15 Oct 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.conf-8.1_beta3, +files/postgresql.init-8.1_beta3,
+  +files/postgresql-8.1_beta3-gentoo.patch,
+  +files/postgresql-8.1_beta3-sh.patch, +postgresql-8.1_beta3.ebuild:
+  Version bump.
+
+*postgresql-8.0.4 (09 Oct 2005)
+*postgresql-7.4.9 (09 Oct 2005)
+*postgresql-7.3.11 (09 Oct 2005)
+
+  09 Oct 2005; <masatomo@gentoo.org> +files/postgresql.init-7.3.11,
+  +files/postgresql-7.3.11-gentoo.patch, +files/pg_autovacuum.conf-7.4.9,
+  +files/pg_autovacuum.init-7.4.9, +files/postgresql.conf-7.4.9,
+  +files/postgresql.init-7.4.9, +files/postgresql-7.4.9-gentoo.patch,
+  +files/postgresql-7.4.9-hppa-testandset.patch,
+  +files/postgresql-7.4.9-vacuum-delay.patch,
+  +files/pg_autovacuum.conf-8.0.4, +files/pg_autovacuum.init-8.0.4,
+  +files/postgresql.conf-8.0.4, +files/postgresql.init-8.0.4,
+  +files/postgresql-8.0.4-gentoo.patch, +files/postgresql-8.0.4-sh.patch,
+  +postgresql-7.3.11.ebuild, +postgresql-7.4.9.ebuild,
+  +postgresql-8.0.4.ebuild:
+  version bump
+
+  08 Oct 2005; Thomas Matthijs <axxo@gentoo.org> postgresql-7.3.6-r2.ebuild:
+  use java-pkg_dojar not dojar
+
+*postgresql-8.1_beta2 (21 Sep 2005)
+
+  21 Sep 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.conf-8.1_beta2, +files/postgresql.init-8.1_beta2,
+  +files/postgresql-8.1_beta2-gentoo.patch,
+  +files/postgresql-8.1_beta2-sh.patch, +postgresql-8.1_beta2.ebuild:
+  Version bump.
+
+*postgresql-8.1_beta1 (28 Aug 2005)
+
+  28 Aug 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.conf-8.1_beta1, +files/postgresql.init-8.1_beta1,
+  +files/postgresql-8.1_beta1-gentoo.patch,
+  +files/postgresql-8.1_beta1-sh.patch, +postgresql-8.1_beta1.ebuild:
+  Version bump.
+
+  17 Aug 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/postgresql-8.0.3-sh.patch, postgresql-8.0.3.ebuild:
+  Stable on sh.
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-8.0.3.ebuild:
+  Stable on alpha.
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  postgresql-8.0.3.ebuild:
+  ppc stable
+
+  29 Jul 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.10.ebuild,
+  postgresql-7.4.8.ebuild, postgresql-8.0.1-r4.ebuild,
+  postgresql-8.0.3.ebuild:
+  Fixed dependency bug. (#100631)
+
+  28 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> postgresql-8.0.3.ebuild:
+  Stable on amd64.
+
+  28 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  postgresql-8.0.3.ebuild:
+  Stable on hppa.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> postgresql-8.0.3.ebuild:
+  Stable on ppc64
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  postgresql-8.0.3.ebuild:
+  Stable on sparc
+
+  20 Jul 2005; Masatomo Nakano <nakano@gentoo.org>
+  -postgresql-8.0.1-r2.ebuild, postgresql-8.0.3.ebuild:
+  Marked stable on x86 and tidy up.
+
+  14 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  postgresql-8.0.1-r4.ebuild:
+  Stable on hppa.
+
+  12 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  postgresql-8.0.1-r4.ebuild:
+  Stable on sparc
+
+  11 Jul 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-8.0.2, -files/pg_autovacuum.init-8.0.2,
+  -files/postgresql.conf-8.0.2, -files/postgresql.init-8.0.2,
+  -files/postgresql-8.0.2-gentoo.patch, -postgresql-8.0.2.ebuild,
+  -postgresql-8.0.2-r1.ebuild:
+  Removed postgresql-8.0.2 packages.
+
+  09 Jul 2005; Markus Rothe <corsair@gentoo.org> postgresql-8.0.1-r4.ebuild:
+  Stable on ppc64
+
+  06 Jul 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.1-r4.ebuild:
+  Marked stable on x86.
+
+  06 Jul 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.8.ebuild:
+  Makred stable on x86.
+
+  03 Jul 2005; Masatomo Nakano <nakano@gentoo.org>
+  files/postgresql-7.4.8-gentoo.patch:
+  Removed unnecessary patch.
+
+  03 Jul 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.10.ebuild:
+  Marked stable on x86.
+
+*postgresql-8.0.3 (16 May 2005)
+*postgresql-7.4.8 (16 May 2005)
+*postgresql-7.3.10 (16 May 2005)
+
+  16 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.init-7.3.10, +files/postgresql-7.3.10-gentoo.patch,
+  +files/pg_autovacuum.conf-7.4.8, +files/pg_autovacuum.init-7.4.8,
+  +files/postgresql.conf-7.4.8, +files/postgresql.init-7.4.8,
+  +files/postgresql-7.4.8-gentoo.patch,
+  +files/postgresql-7.4.8-hppa-testandset.patch,
+  +files/postgresql-7.4.8-vacuum-delay.patch,
+  -files/postgresql-8.0.2-gentoo-libpq.patch,
+  +files/pg_autovacuum.conf-8.0.3, +files/pg_autovacuum.init-8.0.3,
+  +files/postgresql.conf-8.0.3, +files/postgresql.init-8.0.3,
+  +files/postgresql-8.0.3-gentoo.patch, +postgresql-7.3.10.ebuild,
+  +postgresql-7.4.8.ebuild, postgresql-8.0.1-r4.ebuild,
+  -postgresql-8.0.2-r2.ebuild, +postgresql-8.0.3.ebuild:
+  Version bump.
+
+  15 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-7.4.7-r2.ebuild, postgresql-8.0.1-r3.ebuild:
+  Marked stable on x86.
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  files/postgresql-8.0.1-gentoo-libpq.patch,
+  files/postgresql-8.0.2-gentoo-libpq.patch, postgresql-8.0.1-r4.ebuild,
+  postgresql-8.0.2-r2.ebuild:
+  Removed header files installed by libpq package.
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.1-r4.ebuild, postgresql-8.0.2-r2.ebuild:
+  Fixed include files.
+
+  08 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.1-r4.ebuild, postgresql-8.0.2-r1.ebuild,
+  postgresql-8.0.2-r2.ebuild:
+  Removed sudo dependency.
+
+*postgresql-8.0.2-r2 (08 May 2005)
+*postgresql-8.0.1-r4 (08 May 2005)
+
+  08 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.1-gentoo-libpq.patch,
+  +files/postgresql-8.0.2-gentoo-libpq.patch, +postgresql-8.0.1-r4.ebuild,
+  +postgresql-8.0.2-r2.ebuild:
+  Added ebuilds separated libpq version, which are still in package.mask.
+
+  07 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-8.0.1-r3.ebuild:
+  Stable on ia64, bug 91231.
+
+  07 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-7.4.7-r2.ebuild, postgresql-8.0.1-r3.ebuild:
+  Stable on alpha, bug 91231.
+
+  07 May 2005; Aron Griffis <agriffis@gentoo.org>
+  postgresql-7.4.7-r2.ebuild:
+  stable on ia64
+
+  07 May 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
+  postgresql-7.4.7-r2.ebuild, postgresql-8.0.1-r3.ebuild:
+  Stable on ppc64 wrt #91231
+
+  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  postgresql-7.4.7-r2.ebuild, postgresql-8.0.1-r3.ebuild:
+  Stable on hppa.
+
+  07 May 2005; Konstantin Arkhipov <voxus@gentoo.org>
+  postgresql-8.0.1-r3.ebuild, postgresql-7.4.7-r2.ebuild:
+  Stable on amd64.
+
+  07 May 2005; Jeffrey Forman <jforman@gentoo.org>
+  postgresql-8.0.1-r3.ebuild:
+  stable on sparc
+
+  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  postgresql-7.4.7-r2.ebuild, postgresql-8.0.1-r3.ebuild:
+  Stable on ppc.
+
+*postgresql-8.0.2-r1 (07 May 2005)
+*postgresql-8.0.1-r3 (07 May 2005)
+*postgresql-7.4.7-r2 (07 May 2005)
+
+  07 May 2005; MATSUU Takuto <matsuu@gentoo.org>
+  +files/CAN-2005-1409-doc.patch, +files/CAN-2005-1409.patch,
+  +files/CAN-2005-1410.patch, +postgresql-7.4.7-r2.ebuild,
+  +postgresql-8.0.1-r3.ebuild, +postgresql-8.0.2-r1.ebuild:
+  security bump - CAN-2005-1409, CAN-2005-1410 - bug 91231.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org>
+  postgresql-7.3.6-r2.ebuild, postgresql-7.3.9-r1.ebuild,
+  postgresql-7.4.7-r1.ebuild:
+  Removed trailing * from <, <=, >= and > dependencies.
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-8.0.1-r2.ebuild:
+  Stable on ia64.
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-8.0.1-r2.ebuild:
+  Stable on alpha.
+
+*postgresql-7.3.6-r2 (13 Apr 2005)
+
+  13 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql.init-7.3.6, +postgresql-7.3.6-r2.ebuild:
+  readded. (7.3.6 is used by postgis)
+
+  12 Apr 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-8.0.2.ebuild:
+  ~amd64 masked.
+
+  12 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/postgresql.init-7.3.6, -files/postgresql.init-7.3.7,
+  -files/postgresql-7.3.7-gentoo.patch,
+  -files/postgresql-7.3.7-tempfile.patch, -files/postgresql.init-7.3.8,
+  -files/postgresql-7.3.8-gentoo.patch, -files/pg_autovacuum.conf-7.4.3,
+  -files/pg_autovacuum.init-7.4.3, -files/postgresql.conf-7.4.3,
+  -files/postgresql.init-7.4.3, -files/postgresql-7.4.3-gentoo.patch,
+  -files/postgresql-7.4.3-hppa-testandset.patch,
+  -files/postgresql-7.4.3-vacuum-delay.patch,
+  -files/pg_autovacuum.conf-7.4.5, -files/pg_autovacuum.init-7.4.5,
+  -files/postgresql.conf-7.4.5, -files/postgresql.init-7.4.5,
+  -files/postgresql-7.4.5-gentoo.patch,
+  -files/postgresql-7.4.5-hppa-testandset.patch,
+  -files/postgresql-7.4.5-r1-gentoo.patch,
+  -files/postgresql-7.4.5-tempfile.patch,
+  -files/postgresql-7.4.5-vacuum-delay.patch,
+  -files/pg_autovacuum.conf-7.4.6, -files/pg_autovacuum.init-7.4.6,
+  -files/postgresql.conf-7.4.6, -files/postgresql.init-7.4.6,
+  -files/postgresql-7.4.6-gentoo.patch,
+  -files/postgresql-7.4.6-hppa-testandset.patch,
+  -files/postgresql-7.4.6-vacuum-delay.patch,
+  -files/pg_autovacuum.conf-8.0.0, -files/pg_autovacuum.init-8.0.0,
+  -files/postgresql.conf-8.0.0, -files/postgresql.init-8.0.0,
+  -files/postgresql-8.0.0-gentoo.patch, -postgresql-7.3.6-r1.ebuild,
+  -postgresql-7.3.7-r2.ebuild, -postgresql-7.3.8.ebuild,
+  -postgresql-7.3.9.ebuild, -postgresql-7.4.3.ebuild,
+  -postgresql-7.4.3-r1.ebuild, -postgresql-7.4.5.ebuild,
+  -postgresql-7.4.5-r1.ebuild, -postgresql-7.4.5-r2.ebuild,
+  -postgresql-7.4.6.ebuild, -postgresql-7.4.7.ebuild,
+  -postgresql-8.0.0.ebuild, -postgresql-8.0.1.ebuild,
+  -postgresql-8.0.1-r1.ebuild, postgresql-8.0.1-r2.ebuild,
+  postgresql-8.0.2.ebuild:
+  Tidy up.
+
+*postgresql-8.0.2 (12 Apr 2005)
+
+  12 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.2, +files/pg_autovacuum.init-8.0.2,
+  +files/postgresql.conf-8.0.2, +files/postgresql.init-8.0.2,
+  +files/postgresql-8.0.2-gentoo.patch, +postgresql-8.0.2.ebuild:
+  Version bump.
+
+  12 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  postgresql-8.0.1-r2.ebuild:
+  Stable on sparc
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org> postgresql-8.0.1-r2.ebuild:
+  stable on amd64
+
+  09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  postgresql-8.0.1-r2.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> postgresql-8.0.1-r2.ebuild:
+  Stable on ppc64
+
+  05 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.1-r2.ebuild:
+  removed blocking RDEPEND.
+
+  04 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.1-r2.ebuild:
+  Marked stable on x86.
+
+  23 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> postgresql-8.0.1-r2.ebuild:
+  filter-flags -feliminate-dwarf2-dups, #86878
+
+*postgresql-8.0.1-r2 (19 Mar 2005)
+
+  19 Mar 2005; MATSUU Takuto <matsuu@gentoo.org> +postgresql-8.0.1-r2.ebuild:
+  Added Kerberos support.
+  Update pg-hier URL.
+  Removed --with-maxbackends. It was removed in version 7.2(upstream).
+
+  08 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  postgresql-7.4.7-r1.ebuild, postgresql-8.0.1-r1.ebuild:
+  Multilib fixes for when DEFAULT_ABI is not the default of the toolchain.
+
+  24 Feb 2005; petre rodan <kaiowas@gentoo.org> postgresql-7.3.6-r1.ebuild,
+  postgresql-7.3.7-r2.ebuild, postgresql-7.3.8.ebuild,
+  postgresql-7.3.9-r1.ebuild, postgresql-7.3.9.ebuild,
+  postgresql-7.4.3-r1.ebuild, postgresql-7.4.3.ebuild,
+  postgresql-7.4.5-r1.ebuild, postgresql-7.4.5-r2.ebuild,
+  postgresql-7.4.5.ebuild, postgresql-7.4.6.ebuild,
+  postgresql-7.4.7-r1.ebuild, postgresql-7.4.7.ebuild,
+  postgresql-8.0.0.ebuild, postgresql-8.0.1-r1.ebuild,
+  postgresql-8.0.1.ebuild:
+  added selinux RDEPEND - bug 79747
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> postgresql-7.3.9-r1.ebuild,
+  postgresql-7.4.7-r1.ebuild:
+  stable on ia64 #81350
+
+  18 Feb 2005; Hardave Riar <hardave@gentoo.org> postgresql-7.3.9-r1.ebuild,
+  postgresql-7.4.7-r1.ebuild:
+  Stable on mips, bug #81350
+
+  16 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  postgresql-7.3.9-r1.ebuild, postgresql-7.4.7-r1.ebuild:
+  Stable on hppa.
+
+  14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  postgresql-7.3.9-r1.ebuild, postgresql-7.4.7-r1.ebuild:
+  Stable on sparc wrt #81350
+
+  14 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  postgresql-7.3.9-r1.ebuild, postgresql-7.4.7-r1.ebuild:
+  stable on amd64. see #81350
+
+  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-7.3.9-r1.ebuild, postgresql-7.4.7-r1.ebuild:
+  Stable on alpha, bug 81350.
+
+  13 Feb 2005; Markus Rothe <corsair@gentoo.org> postgresql-7.4.7-r1.ebuild:
+  Stable on ppc64; bug #81350
+
+  13 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  postgresql-7.3.9-r1.ebuild, postgresql-7.4.7-r1.ebuild:
+  Stable on ppc, bug 81350.
+
+*postgresql-7.4.7-r1 (11 Feb 2005)
+
+  11 Feb 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-7.3.9-securityfix.patch,
+  +files/postgresql-7.4.7-securityfix.patch,
+  +files/postgresql-8.0.1-securityfix.patch, +postgresql-7.3.9-r1.ebuild,
+  +postgresql-7.4.7-r1.ebuild, +postgresql-8.0.1-r1.ebuild:
+  Fixed security problem. (#81350)
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> postgresql-7.4.7.ebuild:
+  Marked stable on mips.
+
+  04 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  postgresql-7.4.7.ebuild:
+  Stable on ppc.
+
+  03 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> postgresql-7.3.9.ebuild:
+  Stable on sparc wrt #80342
+
+  02 Feb 2005; Markus Rothe <corsair@gentoo.org> postgresql-7.4.7.ebuild:
+  Stable on ppc64; bug #80342
+
+*postgresql-7.3.9 (01 Feb 2005)
+
+  01 Feb 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-7.4.7, +files/pg_autovacuum.conf-8.0.1,
+  +files/pg_autovacuum.init-7.4.7, +files/pg_autovacuum.init-8.0.1,
+  +files/postgresql-7.3.9-gentoo.patch,
+  +files/postgresql-7.4.7-gentoo.patch,
+  +files/postgresql-7.4.7-hppa-testandset.patch,
+  +files/postgresql-7.4.7-vacuum-delay.patch,
+  +files/postgresql-8.0.1-gentoo.patch, +files/postgresql.conf-7.4.7,
+  +files/postgresql.conf-8.0.1, +files/postgresql.init-7.3.9,
+  +files/postgresql.init-7.4.7, +files/postgresql.init-8.0.1,
+  +postgresql-7.3.9.ebuild, +postgresql-7.4.7.ebuild,
+  +postgresql-8.0.1.ebuild:
+  Version bump. (this is security fixed version. see #80342)
+
+  22 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  postgresql-7.4.6.ebuild, postgresql-8.0.0.ebuild:
+  Multilib fixes
+
+  21 Jan 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-8.0.0_rc4, -files/pg_autovacuum.conf-8.0.0_rc5,
+  -files/pg_autovacuum.init-8.0.0_rc4, -files/pg_autovacuum.init-8.0.0_rc5,
+  -files/postgresql-8.0.0_rc4-gentoo.patch,
+  -files/postgresql-8.0.0_rc5-gentoo.patch, -postgresql-8.0.0_rc4.ebuild,
+  -postgresql-8.0.0_rc5.ebuild:
+  removed old ebuilds.
+
+*postgresql-8.0.0 (19 Jan 2005)
+
+  19 Jan 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.0, +files/pg_autovacuum.init-8.0.0,
+  +files/postgresql-8.0.0-gentoo.patch, +postgresql-8.0.0.ebuild:
+  Version bump.
+
+*postgresql-8.0.0_rc5 (11 Jan 2005)
+
+  11 Jan 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.0_rc5, +files/pg_autovacuum.init-8.0.0_rc5,
+  +files/postgresql-8.0.0_rc5-gentoo.patch, +postgresql-8.0.0_rc5.ebuild:
+  Version bump.
+
+*postgresql-8.0.0_rc4 (07 Jan 2005)
+
+  07 Jan 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-8.0.0_rc2, -files/pg_autovacuum.conf-8.0.0_rc3,
+  +files/pg_autovacuum.conf-8.0.0_rc4, -files/pg_autovacuum.init-8.0.0_rc2,
+  -files/pg_autovacuum.init-8.0.0_rc3, +files/pg_autovacuum.init-8.0.0_rc4,
+  -files/postgresql-8.0.0_rc2-gentoo.patch,
+  -files/postgresql-8.0.0_rc3-gentoo.patch,
+  +files/postgresql-8.0.0_rc4-gentoo.patch, -postgresql-8.0.0_rc2.ebuild,
+  -postgresql-8.0.0_rc3.ebuild, +postgresql-8.0.0_rc4.ebuild:
+  Version bump.
+
+  07 Jan 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.6.ebuild,
+  postgresql-8.0.0_rc3.ebuild:
+  Added pkgconfig DEPEND. (#76784)
+
+  04 Jan 2005; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.6.ebuild:
+  Added xml support. (#75701)
+
+*postgresql-8.0.0_rc3 (04 Jan 2005)
+
+  04 Jan 2005; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.0_rc3, +files/pg_autovacuum.init-8.0.0_rc3,
+  +files/postgresql-8.0.0_rc3-gentoo.patch, +postgresql-8.0.0_rc3.ebuild:
+  Version bump.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Guy Martin <gmsoft@gentoo.org> postgresql-7.4.6.ebuild:
+  Stable on hppa.
+
+  22 Dec 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-8.0.0_beta5,
+  -files/pg_autovacuum.conf-8.0.0_rc1,
+  -files/pg_autovacuum.init-8.0.0_beta5,
+  -files/pg_autovacuum.init-8.0.0_rc1,
+  -files/postgresql-8.0.0_beta5-gentoo.patch,
+  -files/postgresql-8.0.0_rc1-gentoo.patch, -postgresql-8.0.0_beta5.ebuild,
+  -postgresql-8.0.0_rc1.ebuild:
+  Remove old ebuilds.
+
+*postgresql-8.0.0_rc2 (22 Dec 2004)
+
+  22 Dec 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.0_rc2, +files/pg_autovacuum.init-8.0.0_rc2,
+  +files/postgresql-8.0.0_rc2-gentoo.patch, +postgresql-8.0.0_rc2.ebuild:
+  Version bump.
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-7.4.6.ebuild:
+  Stable on alpha.
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> postgresql-7.4.6.ebuild:
+  Stable on amd64.
+
+  06 Dec 2004; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.0_rc1.ebuild:
+  Fixed missing libxslt dependency.
+
+*postgresql-8.0.0_rc1 (04 Dec 2004)
+
+  04 Dec 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.0_rc1-gentoo.patch, +postgresql-8.0.0_rc1.ebuild:
+  Version bump.
+
+  30 Nov 2004; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-8.0.0_beta5.ebuild:
+  Added xml2 support. (#72942)
+
+*postgresql-8.0.0_beta5 (23 Nov 2004)
+
+  23 Nov 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-8.0.0_beta3,
+  +files/pg_autovacuum.conf-8.0.0_beta5,
+  -files/pg_autovacuum.init-8.0.0_beta3,
+  +files/pg_autovacuum.init-8.0.0_beta5,
+  -files/postgresql-8.0.0_beta3-gentoo.patch,
+  +files/postgresql-8.0.0_beta5-gentoo.patch,
+  +postgresql-8.0.0_beta5.ebuild:
+  Version bump.
+
+  10 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> postgresql-7.4.6.ebuild:
+  Stable on sparc
+
+  06 Nov 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.8.ebuild,
+  postgresql-7.4.6.ebuild:
+  Marked stable on x86.
+
+  06 Nov 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-8.0.0_beta3,
+  +files/pg_autovacuum.init-8.0.0_beta3, postgresql-8.0.0_beta3.ebuild:
+  Added init script for autovacuum. (#68114)
+
+  05 Nov 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.8.ebuild,
+  postgresql-7.4.6.ebuild:
+  Added threads support.
+
+*postgresql-7.3.8 (24 Oct 2004)
+
+  24 Oct 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-7.4.6, +files/pg_autovacuum.init-7.4.6,
+  +files/postgresql-7.3.8-gentoo.patch,
+  +files/postgresql-7.4.6-gentoo.patch,
+  +files/postgresql-7.4.6-hppa-testandset.patch,
+  +files/postgresql-7.4.6-vacuum-delay.patch, +files/postgresql.conf-7.4.6,
+  +files/postgresql.init-7.3.8, +files/postgresql.init-7.4.6,
+  +postgresql-7.3.8.ebuild, +postgresql-7.4.6.ebuild:
+  Version bump.
+
+  23 Oct 2004; Masatomo Nakano <nakano@gentoo.org>
+  -postgresql-7.3.7-r1.ebuild, -postgresql-7.3.7.ebuild:
+  Removed old ebuilds.
+
+  17 Oct 2004; Akinori Hattori <hattya@gentoo.org>
+  postgresql-7.3.7-r2.ebuild:
+  stable on ia64, bug #66371
+
+  17 Oct 2004; Thomas Matthijs <axxo@gentoo.org> postgresql-7.3.6-r1.ebuild,
+  postgresql-7.3.7-r1.ebuild, postgresql-7.3.7-r2.ebuild,
+  postgresql-7.3.7.ebuild, postgresql-7.4.3-r1.ebuild,
+  postgresql-7.4.3.ebuild, postgresql-7.4.5-r1.ebuild,
+  postgresql-7.4.5-r2.ebuild, postgresql-7.4.5.ebuild:
+  dojar --> java-pkg_dojar
+
+  16 Oct 2004; Danny van Dyk <kugelfang@gentoo.org>
+  postgresql-7.3.7-r2.ebuild, postgresql-7.4.5-r2.ebuild:
+  Marked stable on amd64.
+
+  14 Oct 2004; Jason Wever <weeve@gentoo.org> postgresql-7.3.7-r2.ebuild:
+  Stable on sparc wrt security bug #66371.
+
+  14 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-7.3.7-r2.ebuild:
+  Stable on alpha, bug 66371.
+
+  13 Oct 2004; Guy Martin <gmsoft@gentoo.org> postgresql-7.3.7-r2.ebuild,
+  postgresql-7.4.5-r2.ebuild:
+  Stable on hppa.
+
+  13 Oct 2004; Akinori Hattori <hattya@gentoo.org>
+  postgresql-7.4.5-r2.ebuild:
+  stable on ia64, bug #66371
+
+  13 Oct 2004; <SeJo@gentoo.org> postgresql-7.3.7-r2.ebuild:
+  stable on ppc gsla: 66371
+
+*postgresql-7.3.7-r2 (13 Oct 2004)
+
+  13 Oct 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-7.3.7-tempfile.patch, +postgresql-7.3.7-r2.ebuild:
+  Security update. #66371.
+
+  13 Oct 2004; Masatomo Nakano <nakano@gentoo.org>
+  postgresql-7.4.5-r2.ebuild:
+  Marked stable on x86.
+
+  10 Oct 2004; Tom Gall <tgall@gentoo.org> postgresql-7.4.5-r1.ebuild:
+  stable on ppc64, bug #66371
+
+  10 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> postgresql-7.4.3-r1.ebuild,
+  postgresql-7.4.3.ebuild, postgresql-7.4.5-r1.ebuild,
+  postgresql-7.4.5-r2.ebuild, postgresql-7.4.5.ebuild,
+  postgresql-8.0.0_beta3.ebuild:
+  fixed typo. dev-db/pygresq -> dev-db/pygresql. #66887.
+
+  09 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-7.4.5-r2.ebuild:
+  Stable on alpha, bug 66371.
+
+  08 Oct 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  postgresql-7.4.5-r2.ebuild:
+  Stable on sparc wrt #66371
+
+*postgresql-7.4.5-r2 (08 Oct 2004)
+
+  08 Oct 2004; MATSUU Takuto <matsuu@gentoo.org> +postgresql-7.4.5-r2.ebuild:
+  Security update. #66371.
+
+  06 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> postgresql-7.4.5.ebuild:
+  Stable on alpha.
+
+*postgresql-7.3.7-r1 (03 Oct 2004)
+
+  03 Oct 2004; Masatomo Nakano <nakano@gentoo.org>
+  files/pg_autovacuum.init-7.4.5, +files/postgresql-7.3.7-gentoo.patch,
+  -files/postgresql-8.0.0_beta1-gentoo.patch,
+  -files/postgresql-8.0.0_beta2-gentoo.patch, +postgresql-7.3.7-r1.ebuild,
+  -postgresql-8.0.0_beta2.ebuild:
+  Fixed fail to start up pg_vacuum problem(#51503). Added patch not to use 
+  termcap library in 7.3.7. See #63073 and #63181.
+
+*postgresql-8.0.0_beta3 (28 Sep 2004)
+
+  28 Sep 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.0_beta3-gentoo.patch, +postgresql-8.0.0_beta3.ebuild:
+  Version bump.
+
+  17 Sep 2004; Jason Wever <weeve@gentoo.org> postgresql-7.4.5.ebuild:
+  Stable on sparc.
+
+*postgresql-7.4.5-r1 (15 Sep 2004)
+
+  15 Sep 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-7.4.5-r1-gentoo.patch, +postgresql-7.4.5-r1.ebuild:
+  Added patch not to use termcap library. See bug 63073 and 63181.
+
+  09 Sep 2004; Guy Martin <gmsoft@gentoo.org> postgresql-7.4.5.ebuild:
+  Stable on hppa.
+
+  06 Sep 2004; Masatomo Nakano <nakano@gentoo.org>
+  -postgresql-7.3.6-r2.ebuild, -postgresql-8.0.0_beta1.ebuild:
+  Removed old ebuilds.
+
+  06 Sep 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.5.ebuild:
+  Marked stable on x86.
+
+  06 Sep 2004; Bryan Østergaard <kloeri@gentoo.org>
+  postgresql-7.4.3-r1.ebuild:
+  Stable on alpha.
+
+*postgresql-8.0.0_beta2 (02 Sep 2004)
+
+  02 Sep 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.0_beta2-gentoo.patch, +postgresql-8.0.0_beta2.ebuild:
+  Version bump.
+
+  01 Sep 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.7.ebuild:
+  Marked stable on x86.
+
+  22 Aug 2004; Jason Wever <weeve@gentoo.org> postgresql-7.4.5.ebuild:
+  Marking ~sparc since it was insta-stablized.
+
+  22 Aug 2004; Joshua Kinard <kumba@gentoo.org> postgresql-7.4.3-r1.ebuild:
+  Marked stable on mips.
+
+  22 Aug 2004; Masatomo Nakano <nakano@gentoo.org> :
+  Fixed merging bug which happens with USE="java" because jdbc driver
+  has been removed from PostgreSQL core distribution since version 8.0.0.
+  This closes bug #61178.
+
+*postgresql-7.4.5 (21 Aug 2004)
+
+  21 Aug 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-7.4.5, +files/pg_autovacuum.init-7.4.5,
+  +files/postgresql-7.4.5-gentoo.patch,
+  +files/postgresql-7.4.5-hppa-testandset.patch,
+  +files/postgresql-7.4.5-vacuum-delay.patch, +files/postgresql.conf-7.4.5,
+  +files/postgresql.init-7.3.7, +files/postgresql.init-7.4.5,
+  +postgresql-7.3.7.ebuild, +postgresql-7.4.5.ebuild:
+  Version bump.
+
+  18 Aug 2004; Jason Wever <weeve@gentoo.org> postgresql-7.4.3-r1.ebuild:
+  Stable on sparc.
+
+  14 Aug 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.6-r2.ebuild,
+  postgresql-7.4.3-r1.ebuild:
+  Marked stable on x86.
+
+*postgresql-8.0.0_beta1 (10 Aug 2004)
+
+  10 Aug 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/postgresql-8.0.0_beta1-gentoo.patch, +files/postgresql.conf-8.0.0,
+  +files/postgresql.init-8.0.0, +postgresql-8.0.0_beta1.ebuild:
+  Version bump. But this is hard masked because of beta version.
+
+  27 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> postgresql-7.4.3-r1.ebuild:
+  Fixed SHMMAX_MIN to calculate from MAX_CONNECTIONS.
+
+  21 Jul 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.6-r2.ebuild,
+  postgresql-7.4.3-r1.ebuild:
+  Fixed header path. (#56091)
+
+*postgresql-7.3.6-r2 (18 Jul 2004)
+*postgresql-7.4.3-r1 (18 Jul 2004)
+
+  18 Jul 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-7.4.2, -files/pg_autovacuum.init-7.4.2,
+  -files/postgresql-7.4.1-hppa-testandset.patch,
+  -files/postgresql-7.4.2-gentoo.patch,
+  -files/postgresql-7.4.2-hppa-testandset.patch,
+  -files/postgresql-7.4.2-vacuum-delay.patch, -files/postgresql.conf-7.4.2,
+  -files/postgresql.init-7.4.2, +postgresql-7.3.6-r2.ebuild,
+  -postgresql-7.3.6.ebuild, -postgresql-7.4.2-r1.ebuild,
+  -postgresql-7.4.2-r2.ebuild, +postgresql-7.4.3-r1.ebuild:
+  Replaced sudo with su. Removed old ebuilds.
+
+  04 Jul 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.6-r1.ebuild:
+  Marked stable.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> postgresql-7.3.6-r1.ebuild,
+  postgresql-7.3.6.ebuild, postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild, postgresql-7.4.3.ebuild:
+  sync IUSE (+doc), glibc -> libc
+
+  03 Jul 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.3.ebuild:
+  Marked stable.
+
+*postgresql-7.4.3 (16 Jun 2004)
+
+  16 Jun 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pg_autovacuum.conf-7.4.3, +files/pg_autovacuum.init-7.4.3,
+  +files/postgresql-7.4.3-gentoo.patch,
+  +files/postgresql-7.4.3-hppa-testandset.patch,
+  +files/postgresql-7.4.3-vacuum-delay.patch, +files/postgresql.conf-7.4.3,
+  +files/postgresql.init-7.4.3, +postgresql-7.4.3.ebuild:
+  Version bump.
+
+  16 Jun 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild:
+  Fixed URL. (#54072)
+
+  13 Jun 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2-r2.ebuild:
+  Fixed RDEPEND bug. (#53598)
+
+  02 Jun 2004; Tom Gall <tgall@gentoo.org> postgresql-7.4.2-r2.ebuild:
+  stable on ppc64, bug #52709
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> postgresql-7.3.6-r1.ebuild,
+  postgresql-7.3.6.ebuild, postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild:
+  Fix use invocation and a couple bugs involving use, particularly involving
+  amd64 and ppc
+
+*postgresql-7.3.6-r1 (31 May 2004)
+
+  31 May 2004; Masatomo Nakano <nakano@gentoo.org>
+  +postgresql-7.3.6-r1.ebuild:
+  Fixed dependencies in ppc/amd64.
+
+  31 May 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2-r2.ebuild:
+  Modified for installing INSTALL and HISTORY file.
+
+  25 May 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2-r2.ebuild:
+  Fixed problem about installing jdbc driver.
+
+  25 May 2004; Masatomo Nakano <nakano@gentoo.org>
+  files/pg_autovacuum.init-7.4.2, postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild:
+  Fixed a reference to pg_autovacuum document(#51723). Fixed Java problem on
+  amd64.
+
+  14 May 2004; Guy Martin <gmsoft@gentoo.org> postgresql-7.4.2-r2.ebuild,
+  files/postgresql-7.4.1-hppa-testandset.patch:
+  Readded test and set support for hppa.
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> postgresql-7.4.2-r2.ebuild:
+  Added s390 keywords
+
+  04 May 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2-r2.ebuild:
+  Added message for python modules.
+
+*postgresql-7.4.2-r2 (03 May 2004)
+
+  03 May 2004; Masatomo Nakano <nakano@gentoo.org>
+  -files/pg_autovacuum.conf-7.4.1, -files/pg_autovacuum.init-7.4.1,
+  -files/postgresql-7.4.1-gentoo.patch,
+  -files/postgresql-7.4.1-hppa-testandset.patch,
+  -files/postgresql-7.4.1-vacuum-delay.patch, -files/postgresql.conf-7.4.1,
+  -files/postgresql.init-7.3.4, -files/postgresql.init-7.3.5,
+  -files/postgresql.init-7.4.1, -postgresql-7.3.4-r1.ebuild,
+  -postgresql-7.3.5.ebuild, -postgresql-7.4.1-r4.ebuild,
+  postgresql-7.4.2-r1.ebuild, +postgresql-7.4.2-r2.ebuild,
+  -postgresql-7.4.2.ebuild:
+  Marked stable on ppc/sparc/alpha/amd64/hppa/ia64/mips.
+  Updated pg-hier patch in postgresql-7.4.2-r2
+  Removed old files.
+
+*postgresql-7.4.2-r1 (01 May 2004)
+
+  01 May 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild,
+  postgresql-7.3.5.ebuild, postgresql-7.3.6.ebuild,
+  postgresql-7.4.1-r4.ebuild, +postgresql-7.4.2-r1.ebuild,
+  postgresql-7.4.2.ebuild:
+  Marked stable on x86.
+  Added managing kernel resources. (#48752)
+  Fixed some messages in post_install. (#43367, #44411)
+
+  21 Mar 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.6.ebuild:
+  Marked as stable.
+
+  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> postgresql-7.3.6.ebuild:
+  Marked 7.3.6 stable on mips (repoman deps).
+
+  21 Mar 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.1-r4.ebuild,
+  postgresql-7.4.2.ebuild:
+  Fixed trivial DESCRIPTION bug.
+
+*postgresql-7.4.2 (11 Mar 2004)
+
+  11 Mar 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.2.ebuild,
+  files/pg_autovacuum.conf-7.4.2, files/pg_autovacuum.init-7.4.2,
+  files/postgresql-7.4.2-gentoo.patch,
+  files/postgresql-7.4.2-hppa-testandset.patch,
+  files/postgresql-7.4.2-vacuum-delay.patch, files/postgresql.conf-7.4.2,
+  files/postgresql.init-7.4.2:
+  Version bump.
+
+*postgresql-7.3.6 (05 Mar 2004)
+
+  05 Mar 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.6.ebuild,
+  postgresql-7.4.1-r4.ebuild, files/postgresql.init-7.3.6:
+  Version bump and fixed dependency in 7.3.4-r1 on mips.
+
+*postgresql-7.3.6 (05 Mar 2004)
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> :
+  Added ~mips to KEYWORDS to satisfy repoman deps, and added gnuconfig to fix up
+  the configure to detect mips systems correctly.
+
+  27 Feb 2004; Masatomo Nakano <nakano@gentoo.org>
+  files/postgresql.init-7.3.4, files/postgresql.init-7.3.5,
+  files/postgresql.init-7.4.1:
+  Added 'reload' action to /etc/init.d/postgresql.
+
+  23 Feb 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5-r1.ebuild,
+  postgresql-7.3.5-r2.ebuild, postgresql-7.3.5.ebuild,
+  postgresql-7.4.1-r1.ebuild, postgresql-7.4.1-r2.ebuild,
+  postgresql-7.4.1-r3.ebuild, postgresql-7.4.1-r4.ebuild,
+  postgresql-7.4.1.ebuild, files/postgresql-7.4-gentoo.patch,
+  files/postgresql.env-7.3.5, files/postgresql.env-7.4.1,
+  files/postgresql.init:
+  Fixed pg-hier bug for 7.4.1. Removed pg-hier patch from 7.3.5 because 
+  the patch doesn't apply against it. And cleanup unnecessary files.
+  This should fix #39589.
+
+*postgresql-7.4.1-r4 (17 Feb 2004)
+
+  17 Feb 2004; <mkennedy@gentoo.org> postgresql-7.4.1-r4.ebuild:
+  Update pg-hier URL.  Resolves #39589
+
+*postgresql-7.4.1-r3 (18 Jan 2004)
+
+  18 Jan 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5-r2.ebuild,
+  postgresql-7.4.1-r3.ebuild:
+  Fixed include path.
+
+*postgresql-7.4.1-r2 (16 Jan 2004)
+
+  16 Jan 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5-r1.ebuild,
+  postgresql-7.4.1-r2.ebuild, files/postgresql.env-7.3.5,
+  files/postgresql.env-7.4.1:
+  Fixed library path and several issues.
+
+  15 Jan 2004; root <root@gentoo.org> postgresql-7.4.1-r1.ebuild,
+  files/postgresql-7.4.1-hppa-testandset.patch:
+  Added hppa implementation of test and set.
+
+  06 Jan 2004; <agriffis@gentoo.org> postgresql-7.3.5.ebuild,
+  postgresql-7.4.1-r1.ebuild:
+  add ia64 keywords
+
+  06 Jan 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5.ebuild,
+  postgresql-7.4-r1.ebuild, postgresql-7.4-r2.ebuild,
+  postgresql-7.4.1-r1.ebuild, files/postgresql.conf-7.4,
+  files/postgresql.init-7.4:
+  Fixed digest file and added a message for pg-hire.
+  This closes #35754,37345. And Clean up old ebuild.
+
+*postgresql-7.4.1-r1 (05 Jan 2004)
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> postgresql-7.4-r2.ebuild,
+  postgresql-7.4.1-r1.ebuild:
+  fix bug #34605. no response from postgres herd so fixing it myself
+
+  03 Jan 2004; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5.ebuild:
+  Marked as stable.
+
+  29 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild,
+  postgresql-7.3.5.ebuild, postgresql-7.4-r1.ebuild, postgresql-7.4.1.ebuild:
+  Fixed Java dependency. Close #36723.
+
+*postgresql-7.4.1 (25 Dec 2003)
+
+  25 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.1.ebuild,
+  files/pg_autovacuum.conf-7.4.1, files/pg_autovacuum.init-7.4.1,
+  files/postgresql-7.4.1-gentoo.patch,
+  files/postgresql-7.4.1-vacuum-delay.patch, files/postgresql.conf-7.4.1,
+  files/postgresql.init-7.4.1:
+  Version bump.
+  Included vacuum-delay.patch and added pg_autovacuum init script.
+  Thanks to Arthur Ward <award-gentoo-bugs@dominionsciences.com>.
+  Close #35152, #36449.
+
+*postgresql-7.3.5 (19 Dec 2003)
+
+  19 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.5.ebuild,
+  files/postgresql.init-7.3.5:
+  Version bump.
+
+*postgresql-7.4-r1 (25 Nov 2003)
+  19 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild,
+  postgresql-7.4-r1.ebuild:
+  Fixed SRC_URI. Close #36006
+
+  15 Dec 2003; Masatomo Nakano <nakano@gentoo.org> files/digest-postgresql-7.4-r1:
+  Updated digest file since pg-hier patch was updated in upstream.
+
+  06 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild,
+  postgresql-7.3.3.ebuild, postgresql-7.3.4.ebuild, postgresql-7.3.ebuild,
+  postgresql-7.4.ebuild, files/pgsql, files/postgres, files/postgresql,
+  files/postmaster-wrapper, files/7.3/postgresql, files/7.3.2/postgresql:
+  Removed old ebuilds/files.
+
+  25 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4-r1.ebuild,
+  files/postgresql.init-7.4:
+  Added hier patch(#34163). 
+  Changed download files to base/opt tar balls(#14258).
+  Modified init file from 'need net' to 'use net'(#33161).
+
+*postgresql-7.4 (20 Nov 2003)
+
+  21 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.ebuild:
+  Added bison dependency. close #33973
+
+  20 Nov 2003; Martin Holzer <mholzer@gentoo.org> postgresql-7.4.ebuild:
+  Adding RESTRICT="nomirror".
+
+  20 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.ebuild,
+  files/postgresql.env-7.4:
+  Removed postgresql.env file.
+
+  20 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.4.ebuild:
+  files/postgresql.conf-7.4, files/postgresql.init-7.4,
+  files/postgresql.env-7.4, postgresql-7.4-gentoo.patch:
+  Version bump as unstable.
+
+*postgresql-7.3.4-r1 (06 Nov 2003)
+  15 Dec 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild:
+  Fixed DEPEND/RDEPEND in amd64/hppa.
+
+  17 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild:
+  Marked as stable.
+
+  06 Nov 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4-r1.ebuild:
+  Enable recursive queries like Oracle's 'CONNECT BY' feature.
+  Thanks to Christian A. <chr@die.unipd.it>. Close #32248
+
+  07 Oct 2003; John Mylchreest <johnm@gentoo.org>; postgresql-7.3.4.ebuild:
+  fixing POSIX 1003.1-2001 chown change. '.' now ':'
+
+*postgresql-7.3.4 (31 Jul 2003)
+
+  10 Aug 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4.ebuild:
+  Marked as stable.
+
+  06 Aug 2003; Guy Martin <gmsoft@gentoo.org> postgresql-7.3.4.ebuild :
+  Added warning and fix for running postgresql and initdb on hppa.
+  Added hppa to KEYWORDS.
+
+  31 Jul 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.4.ebuild,
+  files/postgresql.init-7.3.4:
+  Version bumped and modified init script.
+
+*postgresql-7.3.3 (06 Jun 2003)
+  10 Jun 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.3.ebuild:
+  Marked as stable.
+
+  06 Jun 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.3.ebuild,
+  files/postgresql.conf, files/postgresql.init:
+  Version bump.
+
+*postgresql-7.3.2 (01 Mar 2003)
+  06 Jun 2003; Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild:
+  fixed bug #18035
+
+  31 Mar 2003: Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild:
+
+  Changed to use USE of readline, zlib and pam.
+  Removed obsoleted configure options.
+
+  23 Mar 2003: Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild:
+  Move to stable.
+
+  17 Mar 2003: Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild:
+  Fixed bug #14953
+
+  01 Mar 2003: Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.2.ebuild:
+
+  version bump. masked for test.
+
+*postgresql-7.3.1 (31 Dec 2002)
+  03 Feb 2003: Will Woods <wwoods@gentoo.org> postgresql-7.3.1.ebuild:
+  added ~alpha keyword
+
+  04 Dec 2002: Michael Cummings <mcummings@gentoo.org>
+  postgresql-7.3.ebuild: 
+
+  Added sparc64 keyword - installs and runs just fine
+
+  07 Feb 2003; Ryan Phillips <rphillisp@gentoo.org> postgresql-7.3.1.ebuild :
+  Added egenix-mx-base dep for python support
+
+  02 Feb 2003; Pieter Van den Abeele <pvdabeel@gentoo.org> postgresql-7.3.1.ebuild :
+  Changed java dep back to virtual/jdk because sun-jdk is x86-only. 
+  Uncomment the x86 ? keyword line if you want a sun-jdk dependency or emerge sun-jdk manually
+
+  31 Jan 2003; Ryan Phillips <rphillips@gentoo.org> postgresql-7.3.1.ebuild :
+  Changed java dep to be sun-jdk for compatibility
+
+
+  31 Dec 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.3.1.ebuild :
+  Version bump.. Masked for testing.
+
+*postgresql-7.3 (1 Dec 2002)
+  17 Mar 2003: Masatomo Nakano <nakano@gentoo.org> postgresql-7.3.ebuild:
+  Fixed bug #14953
+
+  21 Dec 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.3.ebuild:
+  Added an addwrite to the perl script
+
+  03 Dec 2002: Preston A. Elder <prez@gentoo.org> files/7.3/postgresql:
+  Forgot the init script, added now.
+
+  01 Dec 2002: Preston A. Elder <prez@gentoo.org> postgresql-7.3.ebuild:
+  Added new version, also stopped forcing Java 1.3, 1.4 works fine now.
+
+*postgresql-7.2.3-r1 (27 Oct 2002)
+
+  26 Nov 2002; Mark Guertin <gerk@gentoo.org> postgresql-7.2.3-r1.ebuild:
+  forced CFLAGS="-pipe -fsigned-char", any more aggressive optimizations
+  cause failures on ppc
+
+  26 Nov 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.3-r1.ebuild :
+  Notified the user to give the postgres user a /bin/bash or /bin/true account
+
+  25 Nov 2002; Mark Guertin <gerk@gentoo.org> portgresql-7.2.3.ebuild, 
+  portgresql-7.2.3-r1.ebuild:
+  Set -ppc to all the 7.2.3 builds, none of them even compile on
+  ppc, please please check with devs before upgrading new pkgs
+  that are untested to stable ;)
+
+  14 Nov 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.3-r1.ebuild :
+
+  Fixed location that is printed out
+
+  07 Nov 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.3-r1.ebuild :
+
+  Fixes a few bugs:
+    Log File (#10368)
+    Removed the check for the postgres user
+    
+
+  27 Oct 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.3-r1.ebuild :
+
+  added new init.d and conf.d scripts
+
+*postgresql-7.2.3 (08 Oct 2002)
+
+  18 Oct 2002; <mcummings@gentoo.org>
+
+  Added perl patch fix
+
+  08 Oct 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.3.ebuild :
+
+  *Security Fix*.  Submitted by Richard C.  Bug #8905
+  removed libperl-gentoo.diff patch, causing sandbox errors
+
+*postgresql-7.2.2 (26 Aug 2002)
+
+  25 Sep 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.2.ebuild :
+
+  Added perl patch because of sandbox violations
+
+  08 Sep 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.2.ebuild :
+  Minor tweak to SSL...
+
+  2 Sep 2002; Owen Stampflee <owen@gentoo.org> postgresql-7.2.2.ebuild :
+  Added PPC to KEYWORDS.
+
+  29 Aug 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.2.ebuild :
+
+  Changed java dep to 1.3.1
+
+  28 Aug 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.2.ebuild :
+
+  Some fixes to the dependency list
+
+  28 Aug 2002; Mark Guertin <gerk@gentoo.org> postgresql-7.2.2.ebuild :
+  Set the java?() depend to be x86 only (ant is currently broken on ppc)
+
+  26 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> postgresql-7.2.2.ebuild:
+  Moved message to postinst. Fixed .jar file installation.
+
+  26 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> postgresql-7.2.2.ebuild:
+  Small cleanups and fixes.
+
+  26 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> postgresql-7.2.2.ebuild:
+  Cleaned up ebuild. Removed tarballs of documentation and manpages from
+  docdir.  
+
+  26 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> postgresql-7.2.2.ebuild:
+  Security update.
+
+* postgresql-7.2.1-r2 (31 Jul 2002)                                      
+
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r2.ebuild :
+
+  Postgresql doesn't like emake due to multiple processor support.
+  Using make instead
+
+  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> postgresql-7.2.1-r2.ebuild:
+
+  Added ppc keyword
+
+  31 Jul 2002; Stuart Bouyer <stubear@gentoo.org> postgresql-7.2.1-r2.ebuild:
+
+  Moved --enable-multibyte to nls flag after it was pointed out that it
+  enables much more than just CJK support (ie unicode and latin1 etc).
+
+* postgresql-7.2.1-r2 (24 Jul 2002)
+
+  24 Jul 2002; Stuart Bouyer <stubear@gentoo.org> postgresql-7.2.1-r2.ebuild:
+
+  Added cjk flag to enable multibyte characters. Changed If [ "`use foo`" ] 
+  statement to use foo && ...
+  (CJK support suggested by Masamoto Nakano <nakano@mail.club.ne.jp>)
+
+*postgresql-7.2-r3 (02 Jul 2002)
+
+  08 Jul 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2-r3.ebuild :
+
+  Added creation of user and group
+
+  02 Jul 2002; Ryan Phillips <rphillips@gentoo.org> files/7.2/postgresql,
+  postgresql-7.2-r3.ebuild
+
+  Fixes to the path of the postmaster pidfile.
+  Fixes to the ebuild to disable java version checking if java
+  is not in the use vars.
+
+*postgresql-7.2.1-r1 (20 Jun 2002)
+
+  14 Jul 2002l Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r1.ebuild :
+
+  Added init.d startup file for 7.2.1
+  
+  13 Jul 2002l Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r1.ebuild :
+
+  Added sudo dependency
+  
+  13 Jul 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r1.ebuild :
+
+  Removed daemontools dep
+
+  12 Jul 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r1.ebuild :
+
+  Fixed user and group additions. Thx to Andy Dustman
+
+  08 Jul 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1-r1.ebuild :
+
+  Added creation of user and group
+
+  20 Jun 2002; Preston A. Elder <prez@gentoo.org> files/7.2.1/postgresql :
+
+  Changed the startup script to a) one that works, and b) to be in the
+  same style as all other startup scripts we use.
+
+*postgresql-7.2.1-r1 (20 Jun 2002)
+
+  20 Jun 2002; Preston A. Elder <prez@gentoo.org> postgresql-7.2.1-r1.ebuild :
+
+  Changed the arguments to configure to increase things such as max
+  simultaneous connections, etc.
+
+*postgresql-7.2.1 (16 Jun 2002)
+
+  16 Jun 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1.ebuild :
+
+  Doesn't check for java version if java is *not* in the USE vars.
+
+*postgresql-7.2.1 (14 Jun 2002)
+
+  14 Jun 2002; Ryan Phillips <rphillips@gentoo.org> postgresql-7.2.1.ebuild :
+
+  Updated package versionn
+
+*postgresql-7.2-r2 (10 Apr 2002)
+
+  10 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> postgresql-7.2-r2.ebuild files/digest-postgresql-7.2-r2:
+
+  Added proper code in pkg_setup() so that it will refuse to compile if the
+  user has JDK 1.4.0 as his system VM.
+
+  Removed postgresql-7.2-r1.ebuild files/digest-postgresql-7.2-r1
+
+*postgresql-7.2-r1 (18 Feb 2002)
+
+  18 Feb 2002; Karl Trygve Kalleberg <karltk@gentoo.org> postgresql-7.2-r1.ebuild files/digest-postgresql-7.2-r1:
+
+  Now requires a jdk-1.3 instead of >=1.3, as 1.4 blows up when compiling.
+
+*postgresql-7.2 (15 Feb 2002)
+
+  15 Feb 2002; G.Bevin <gbevin@gentoo.org> postgresql-7.2.ebuild ,
+  files/postgresql-7.2-dyn-libperl-gentoo.diff files/digest-postgresql-7.2:
+  Upgraded to version 7.2. Python now also works with python 2.2 and there
+  are less patches needed to make the perl install go smoothly ... nice :-)
+
+*postgresql-7.1.3-r4 (5 Feb 2002)
+
+  5 Feb 2002; G.Bevin <gbevin@gentoo.org> postgresql-7.1.3-r4.ebuild :
+  Changed data dirs to use a fixed path instead of determining it from the
+  package name. Also added a binary compatibility slot. Changed data dir to
+  /var/lib/postgresql/data to follow what has been done by the mysql ebuild.
+
+  5 Feb 2002; G.Bevin <gbevin@gentoo.org> files/7.1.3/postgresql :
+  Fixed wrong data dir in init script.
+
+*postgresql-7.1-r1 (1 Feb 2002)
+ 
+ 13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> postgresql-7.1-r1.ebuild :
+ removed broken jaxp dependency
 
 *postgresql-7.1.3-r3 (1 Feb 2002)
 
diff --git a/dev-db/postgresql/Manifest b/dev-db/postgresql/Manifest
index edd6709a7901..44a752244866 100644
--- a/dev-db/postgresql/Manifest
+++ b/dev-db/postgresql/Manifest
@@ -1,11 +1,95 @@
-MD5 f968d8ec03c1e78021222e6dd6a46525 ChangeLog 9228
-MD5 ef642371d0d41a8ce91799bdbba00cd1 postgresql-7.3.2.ebuild 5680
-MD5 b74ddef00a98e9d3a9ca05f73def5222 postgresql-7.3.ebuild 5542
-MD5 ed9c20d88bfaf8e24e28a79309a17a52 files/digest-postgresql-7.3 68
-MD5 7506f28d74e703211fb53ebd246b5791 files/digest-postgresql-7.3.2 70
-MD5 bc6938c5fbc47a864dddb0c885f0a6dd files/pgsql 613
-MD5 26e2c8e4978d59f58bf13e94bbdc446b files/postgres 851
-MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql 375
-MD5 a9021afba518a106483188ea60dadc7c files/postmaster-wrapper 445
-MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3/postgresql 678
-MD5 c6a4bb3c0ed81f48ad1d6b675c32842e files/7.3.2/postgresql 678
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c9fa87ca7731cc961f27db08fc7b2d76 ChangeLog 47678
+MD5 8ca6301197c0d45d7530d4117d087b15 files/CAN-2005-1409-doc.patch 1749
+MD5 90acacf5efb7b8a73ec5d34128358c32 files/CAN-2005-1409.patch 1698
+MD5 3c53278e59e16caa55429700c0da42f9 files/CAN-2005-1410.patch 2843
+MD5 314c9147f25d4676c60a4761bbe500e2 files/digest-postgresql-7.3.10 226
+MD5 419268f051162aee7f36e9c0b384fcc1 files/digest-postgresql-7.3.11 226
+MD5 3b4cbf59561d655b882ab335b892909d files/digest-postgresql-7.3.6-r2 223
+MD5 f96713c7df9eb83197d57a6e22cdeedf files/digest-postgresql-7.3.9-r1 223
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r1 290
+MD5 b6200bc7bb2b1078ce182692c618f8a5 files/digest-postgresql-7.4.7-r2 290
+MD5 4d7967107d2e9dbb6c097c637625023b files/digest-postgresql-7.4.8 290
+MD5 b368c73c1f3a16e6aacf7f83feba9873 files/digest-postgresql-7.4.9 290
+MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r3 293
+MD5 80e1a39d06466a396d8a2a1a5ff3b04a files/digest-postgresql-8.0.1-r4 293
+MD5 6eaf9ba52385d9fc515d84cc4246db62 files/digest-postgresql-8.0.3 293
+MD5 6b8a3129c9f85d8e97c5ee384c4c489b files/digest-postgresql-8.0.4 293
+MD5 8a85abe5618194b2492c6ea1064cdffa files/digest-postgresql-8.1.0 223
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.7 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.8 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-7.4.9 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.1 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.3 302
+MD5 999379432735e7e6a71ec6ccd5a784e1 files/pg_autovacuum.conf-8.0.4 302
+MD5 ffe7e2e6a0ae65238f2addcbbbba59d0 files/pg_autovacuum.init-7.4.7 1414
+MD5 50be58ef7b752834f53ae86c70f75d9a files/pg_autovacuum.init-7.4.8 1414
+MD5 b35f19cbbb6d2ef9cdc62a3a61faed52 files/pg_autovacuum.init-7.4.9 1414
+MD5 62959a2ffd56e0e360b1437467c573a7 files/pg_autovacuum.init-8.0.1 1414
+MD5 9b0d09ffaaa125d93a200e3783af23cc files/pg_autovacuum.init-8.0.3 1414
+MD5 3d69e95f9646cfacb2ba866b3b6bd2af files/pg_autovacuum.init-8.0.4 1414
+MD5 61b463e796709e035216374cb149d614 files/postgresql-7.3.10-gentoo.patch 1741
+MD5 7fad73889572ccdf114ce0024e7170c6 files/postgresql-7.3.11-gentoo.patch 1741
+MD5 4501816025cc701e272b5e57937d0de0 files/postgresql-7.3.9-gentoo.patch 529
+MD5 dbe0601754b798a4d08f080137a57c43 files/postgresql-7.3.9-securityfix.patch 1443
+MD5 e91e3b293273f041b209aa65ff6ceebc files/postgresql-7.4.7-gentoo.patch 1160
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.7-hppa-testandset.patch 1596
+MD5 df4fedbfa30df690a6f78da9f5a44196 files/postgresql-7.4.7-securityfix.patch 1773
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.7-vacuum-delay.patch 8918
+MD5 1b27a8ad9d652b6d292ff34ad385b208 files/postgresql-7.4.8-gentoo.patch 1729
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.8-hppa-testandset.patch 1596
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.8-vacuum-delay.patch 8918
+MD5 64cac596c308b19865f5738cc5af02b1 files/postgresql-7.4.9-gentoo.patch 1729
+MD5 bd8092be6ccc6918973d9654caacbfab files/postgresql-7.4.9-hppa-testandset.patch 1596
+MD5 2e87af398df0a957bf2f2dff754ac174 files/postgresql-7.4.9-vacuum-delay.patch 8918
+MD5 8ec4fecf36cf856f2d3afc97419c2f93 files/postgresql-8.0.1-gentoo-libpq.patch 1200
+MD5 3665230043dd69d562482d92f2d08286 files/postgresql-8.0.1-gentoo.patch 808
+MD5 4591d7bc6524b885854c18bb9b9ce23a files/postgresql-8.0.1-securityfix.patch 1850
+MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.3-gentoo.patch 1200
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.3-sh.patch 618
+MD5 01f69b667825048f2e9807555b79b73d files/postgresql-8.0.4-gentoo.patch 1200
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.0.4-sh.patch 618
+MD5 66ade3cf803c867e04bb2ab9dfde3dbf files/postgresql-8.1.0-gentoo.patch 1200
+MD5 fa95ac5bd802d7220fe9196de93fbe97 files/postgresql-8.1.0-sh.patch 618
+MD5 2b0c84d2c26622573d4e2b7e0518fdad files/postgresql.conf 375
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.7 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.8 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-7.4.9 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.1 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.3 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.0.4 390
+MD5 9787933dfca9cc3858468186231a9df1 files/postgresql.conf-8.1.0 390
+MD5 3273c43da88db8e7fa5fd9c413f651c5 files/postgresql.init-7.3.10 1280
+MD5 4165a3ef6d3e253340b56c719a866c87 files/postgresql.init-7.3.11 1280
+MD5 6237c18ae647e118e23425e3cb28c8aa files/postgresql.init-7.3.6 1279
+MD5 5d90779b8c5b7d63ea0846f2a534fc87 files/postgresql.init-7.3.9 1279
+MD5 8b2a2b4c8f40a1fdbe73d7a6fbcfb6fe files/postgresql.init-7.4.7 1279
+MD5 eae31db55e9908de6d955d3efc931bbc files/postgresql.init-7.4.8 1279
+MD5 37e9be11579a5dd887ea56898555a013 files/postgresql.init-7.4.9 1279
+MD5 fe44693b90eef9cf0b6118edb258da16 files/postgresql.init-8.0.1 1279
+MD5 b7252dad787e4e9f4d645a47d7f74ad8 files/postgresql.init-8.0.3 1279
+MD5 11eb946998d42bb657f9408b804b3099 files/postgresql.init-8.0.4 1279
+MD5 d41a81e2e89a457cd171237bab44c8a0 files/postgresql.init-8.1.0 1279
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 68b207bf92c9fb56d7911c0b5af6cc9b postgresql-7.3.10.ebuild 8138
+MD5 85f0a9ab50b9abe11e05e0e389595ad1 postgresql-7.3.11.ebuild 8308
+MD5 c25c9a7ffe3a89d13b05d6030f4d9889 postgresql-7.3.6-r2.ebuild 7837
+MD5 2265cba6143f2d8471e41be421367c5b postgresql-7.3.9-r1.ebuild 8028
+MD5 993f8413e91946fb334582c36b39afcb postgresql-7.4.7-r1.ebuild 10701
+MD5 08e125da5fd9e78854a2eb23f78274c3 postgresql-7.4.7-r2.ebuild 10854
+MD5 e04819f89769e06c3ff5d0019ea1f46c postgresql-7.4.8.ebuild 10569
+MD5 2ccfca15ee09fbbbe6ee8a5a4d7c98fb postgresql-7.4.9.ebuild 10742
+MD5 b0b94d20c7d268d602aa6c60e0ce5ce9 postgresql-8.0.1-r3.ebuild 7735
+MD5 99f4b845820fa12720b8eecec8085c56 postgresql-8.0.1-r4.ebuild 7824
+MD5 0ab1b6f2bce8c619c7824a648f44667b postgresql-8.0.3.ebuild 7510
+MD5 ffe0c42933a25694e21471f9fb321741 postgresql-8.0.4.ebuild 7682
+MD5 d622d522e0a17e7597b0b14f8dcdee17 postgresql-8.1.0.ebuild 7622
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgBNbgIKl8Uu19MoRAowoAJ4uqrHurXNkMP20bMp2fcZjcIhnJwCcCF2t
+FVxTquErHsk3Gr6ve6XUeos=
+=3IiF
+-----END PGP SIGNATURE-----
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.9 b/dev-db/postgresql/files/digest-postgresql-7.4.9
index 2256e0178a55..d383f35eddbf 100644
--- a/dev-db/postgresql/files/digest-postgresql-7.4.9
+++ b/dev-db/postgresql/files/digest-postgresql-7.4.9
@@ -1,4 +1,4 @@
+MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
 MD5 174761481d118d89f198d36afd1ca27d postgresql-base-7.4.9.tar.bz2 6601210
-MD5 c772b28f6b86efa10f707cc0b12d18fc postgresql-opt-7.4.9.tar.bz2 332379
 MD5 58da72c07bfbbcefb83fe96d701c3c2f postgresql-docs-7.4.9.tar.bz2 2426803
-MD5 16d037213b879963724da7809a0a1589 hier-Pg7.4-0.5.3.tar.gz 34662
+MD5 c772b28f6b86efa10f707cc0b12d18fc postgresql-opt-7.4.9.tar.bz2 332379
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.7 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.7
index c32a61302766..80d659eebea8 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.7
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.7,v 1.1 2005/02/01 19:58:31 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.7,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 depend() {
 	need postgresql logger
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.8 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.8
index 8c632270fe3c..a0e16707cebb 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.8
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.8
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.8,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.8,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 depend() {
 	need postgresql logger
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.9 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.9
index 77f918be80c3..b31439498881 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.9
+++ b/dev-db/postgresql/files/pg_autovacuum.init-7.4.9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.9,v 1.1 2005/10/08 23:06:24 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.9,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 depend() {
 	need postgresql logger
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0.1 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.1
index e2c92cc30fc4..a4410d77ecbb 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-8.0.1
+++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.1,v 1.1 2005/02/01 19:58:31 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.1,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 depend() {
 	need postgresql logger
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0.3 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.3
index 1df769eff6de..c1f7353f0e1a 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-8.0.3
+++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.3,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.3,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 depend() {
 	need postgresql logger
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-8.0.4 b/dev-db/postgresql/files/pg_autovacuum.init-8.0.4
index 494dd3e2f538..18836676ed70 100644
--- a/dev-db/postgresql/files/pg_autovacuum.init-8.0.4
+++ b/dev-db/postgresql/files/pg_autovacuum.init-8.0.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.4,v 1.1 2005/10/08 23:06:24 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-8.0.4,v 1.1.1.1 2005/11/30 10:11:46 chriswhite Exp $
 
 depend() {
 	need postgresql logger
diff --git a/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch
index 30c1a94ae9b0..91f26af4a4ed 100644
--- a/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch
+++ b/dev-db/postgresql/files/postgresql-7.4.8-gentoo.patch
@@ -10,22 +10,6 @@ diff -Naru postgresql-7.4.8.org/configure postgresql-7.4.8/configure
    for pgac_rllib in -lreadline -ledit ; do
      pgac_save_LIBS=$LIBS
      LIBS="${pgac_rllib}${pgac_lib} $LIBS"
-diff -Naru postgresql-7.4.8.org/src/bin/initdb/initdb.sh postgresql-7.4.8/src/bin/initdb/initdb.sh
---- postgresql-7.4.8.org/src/bin/initdb/initdb.sh	2004-05-05 17:09:56.000000000 +0100
-+++ postgresql-7.4.8/src/bin/initdb/initdb.sh	2004-09-15 20:28:35.507026977 +0100
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo "    $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--#  process writing to the terminal.)
--echo "    $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo "    /etc/init.d/postgresql start"
- echo
- 
- exit 0
 diff -Naru postgresql-7.4.8.org/src/interfaces/Makefile postgresql-7.4.8/src/interfaces/Makefile
 --- postgresql-7.4.8.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
 +++ postgresql-7.4.8/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
diff --git a/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch b/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
index 238dfb04f4f5..726db48e3c44 100644
--- a/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
+++ b/dev-db/postgresql/files/postgresql-8.0.1-gentoo-libpq.patch
@@ -1,6 +1,6 @@
 diff -Naru postgresql-8.0.1.org/src/interfaces/Makefile postgresql-8.0.1/src/interfaces/Makefile
 --- postgresql-8.0.1.org/src/interfaces/Makefile	2004-04-20 01:33:51.000000000 +0100
-+++ postgresql-8.0.1/src/interfaces/Makefile	2005-05-04 11:45:56.000000000 +0100
++++ postgresql-8.0.1/src/interfaces/Makefile	2005-05-09 21:59:15.000000000 +0100
 @@ -12,7 +12,7 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
@@ -10,3 +10,30 @@ diff -Naru postgresql-8.0.1.org/src/interfaces/Makefile postgresql-8.0.1/src/int
  
  ALLDIRS := $(DIRS) 
  
+diff -Naru postgresql-8.0.1.org/src/Makefile postgresql-8.0.1/src/Makefile
+--- postgresql-8.0.1.org/src/Makefile	2005-01-13 18:23:21.000000000 +0000
++++ postgresql-8.0.1/src/Makefile	2005-05-09 21:59:54.000000000 +0100
+@@ -18,7 +18,6 @@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+ 	$(MAKE) -C backend/utils/mb/conversion_procs $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -47,7 +46,6 @@
+ 	$(MAKE) -C port $@
+ 	$(MAKE) -C timezone $@
+ 	$(MAKE) -C backend $@
+-	$(MAKE) -C include $@
+ 	$(MAKE) -C interfaces $@
+ 	$(MAKE) -C bin $@
+ 	$(MAKE) -C pl $@
+@@ -61,7 +59,6 @@
+ 	-$(MAKE) -C port $@
+ 	-$(MAKE) -C timezone $@
+ 	-$(MAKE) -C backend $@
+-	-$(MAKE) -C include $@
+ 	-$(MAKE) -C interfaces $@
+ 	-$(MAKE) -C bin $@
+ 	-$(MAKE) -C pl $@
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.10 b/dev-db/postgresql/files/postgresql.init-7.3.10
index c32584e0eddc..588c1f3d2237 100644
--- a/dev-db/postgresql/files/postgresql.init-7.3.10
+++ b/dev-db/postgresql/files/postgresql.init-7.3.10
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.10,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.10,v 1.1.1.1 2005/11/30 10:11:47 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.11 b/dev-db/postgresql/files/postgresql.init-7.3.11
index 0930d133d050..fc7f9be14ecb 100644
--- a/dev-db/postgresql/files/postgresql.init-7.3.11
+++ b/dev-db/postgresql/files/postgresql.init-7.3.11
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.11,v 1.1 2005/10/08 23:06:24 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.11,v 1.1.1.1 2005/11/30 10:11:47 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.6 b/dev-db/postgresql/files/postgresql.init-7.3.6
index c977c0b1c7cf..3f4ed649887f 100644
--- a/dev-db/postgresql/files/postgresql.init-7.3.6
+++ b/dev-db/postgresql/files/postgresql.init-7.3.6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/dev-db/postgresql/files/postgresql.init-7.3.6,v 1.1 2004/03/05 16:11:14 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.6,v 1.1.1.1 2005/11/30 10:11:47 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.3.9 b/dev-db/postgresql/files/postgresql.init-7.3.9
index cfa1bb3e8821..8a88733b3181 100644
--- a/dev-db/postgresql/files/postgresql.init-7.3.9
+++ b/dev-db/postgresql/files/postgresql.init-7.3.9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.9,v 1.1 2005/02/01 19:58:31 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.3.9,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.7 b/dev-db/postgresql/files/postgresql.init-7.4.7
index a12daa4e8745..9d37c3f80469 100644
--- a/dev-db/postgresql/files/postgresql.init-7.4.7
+++ b/dev-db/postgresql/files/postgresql.init-7.4.7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.7,v 1.1 2005/02/01 19:58:31 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.7,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.8 b/dev-db/postgresql/files/postgresql.init-7.4.8
index e725650d7d10..323c3e059baa 100644
--- a/dev-db/postgresql/files/postgresql.init-7.4.8
+++ b/dev-db/postgresql/files/postgresql.init-7.4.8
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.8,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.8,v 1.1.1.1 2005/11/30 10:11:47 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.9 b/dev-db/postgresql/files/postgresql.init-7.4.9
index 7c0b57c3e76b..32d9b061a72d 100644
--- a/dev-db/postgresql/files/postgresql.init-7.4.9
+++ b/dev-db/postgresql/files/postgresql.init-7.4.9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.9,v 1.1 2005/10/08 23:06:24 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.9,v 1.1.1.1 2005/11/30 10:11:47 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-8.0.1 b/dev-db/postgresql/files/postgresql.init-8.0.1
index 6759ef00a4aa..4c6906fcf0b7 100644
--- a/dev-db/postgresql/files/postgresql.init-8.0.1
+++ b/dev-db/postgresql/files/postgresql.init-8.0.1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.1,v 1.1 2005/02/01 19:58:31 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.1,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-8.0.3 b/dev-db/postgresql/files/postgresql.init-8.0.3
index bd47a36e4957..98f15a835186 100644
--- a/dev-db/postgresql/files/postgresql.init-8.0.3
+++ b/dev-db/postgresql/files/postgresql.init-8.0.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.3,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.3,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-8.0.4 b/dev-db/postgresql/files/postgresql.init-8.0.4
index ea0b8ed3b931..ba6b63fd911f 100644
--- a/dev-db/postgresql/files/postgresql.init-8.0.4
+++ b/dev-db/postgresql/files/postgresql.init-8.0.4
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.4,v 1.1 2005/10/08 23:06:24 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.0.4,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/files/postgresql.init-8.1.0 b/dev-db/postgresql/files/postgresql.init-8.1.0
index 519ba3fe9fd7..36b23c82a261 100644
--- a/dev-db/postgresql/files/postgresql.init-8.1.0
+++ b/dev-db/postgresql/files/postgresql.init-8.1.0
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.1.0,v 1.1 2005/11/08 13:53:10 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-8.1.0,v 1.1.1.1 2005/11/30 10:11:48 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/dev-db/postgresql/postgresql-7.3.10.ebuild b/dev-db/postgresql/postgresql-7.3.10.ebuild
index 714b6b983777..d92d20258192 100644
--- a/dev-db/postgresql/postgresql-7.3.10.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.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/dev-db/postgresql/postgresql-7.3.10.ebuild,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.10.ebuild,v 1.1.1.1 2005/11/30 10:11:45 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -13,11 +13,11 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
 IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
 
 DEPEND="virtual/libc
-	=dev-db/libpq-7.3.10
+	=dev-db/libpq-7.3.10*
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
 	zlib? ( >=sys-libs/zlib-1.1.3 )
@@ -32,7 +32,7 @@ DEPEND="virtual/libc
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
-	=dev-db/libpq-7.3.10
+	=dev-db/libpq-7.3.10*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
@@ -107,7 +107,6 @@ src_compile() {
 		--libdir=/usr/lib \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=1024 \
 		$myconf || die
 
@@ -173,7 +172,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo "emerge --config =${PF}"
 	einfo "to setup the initial database environment."
 	einfo ""
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
diff --git a/dev-db/postgresql/postgresql-7.3.11.ebuild b/dev-db/postgresql/postgresql-7.3.11.ebuild
index 0216661b2680..de9233886b8e 100644
--- a/dev-db/postgresql/postgresql-7.3.11.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.11.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/dev-db/postgresql/postgresql-7.3.11.ebuild,v 1.1 2005/10/08 23:06:23 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.11.ebuild,v 1.1.1.1 2005/11/30 10:11:45 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
 IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
 
 DEPEND="virtual/libc
@@ -56,6 +56,10 @@ pkg_setup() {
 			exit 1
 		fi
 	fi
+	enewgroup postgres 70 \
+		|| die "problem adding group postgres"
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
+		|| die "problem adding user postgres"
 }
 
 check_java_config() {
@@ -107,7 +111,6 @@ src_compile() {
 		--libdir=/usr/lib \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=1024 \
 		$myconf || die
 
@@ -173,7 +176,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo "emerge --config =${PF}"
 	einfo "to setup the initial database environment."
 	einfo ""
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
diff --git a/dev-db/postgresql/postgresql-7.3.6-r2.ebuild b/dev-db/postgresql/postgresql-7.3.6-r2.ebuild
index 79277b12121f..91a2121e84ff 100644
--- a/dev-db/postgresql/postgresql-7.3.6-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.6-r2.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/dev-db/postgresql/postgresql-7.3.6-r2.ebuild,v 1.1 2004/07/18 08:42:36 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.6-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:43 chriswhite Exp $
 
-inherit flag-o-matic
+inherit gnuconfig flag-o-matic java-pkg
 
 DESCRIPTION="sophisticated Object-Relational DBMS"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
 IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib"
 
 DEPEND="virtual/libc
@@ -24,7 +24,7 @@ DEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
+	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )"
@@ -35,7 +35,7 @@ RDEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3* )
+	java? ( >=virtual/jdk-1.3 )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -50,14 +50,14 @@ pkg_setup() {
 			eerror "pg_restore to import them when you have upgraded completely."
 			eerror "You must remove your entire database directory to continue."
 			eerror "(database directory = ${PG_DIR})."
-			die
+			exit 1
 		fi
 	fi
 }
 
 check_java_config() {
 	JDKHOME="`java-config --jdk-home`"
-	if [[ -z ${JDKHOME} || ! -d ${JDKHOME} ]]; then
+	if [[ -z "${JDKHOME}" || ! -d "${JDKHOME}" ]]; then
 		NOJDKERROR="You need to use java-config to set your JVM to a JDK!"
 		eerror "${NOJDKERROR}"
 		die "${NOJDKERROR}"
@@ -93,13 +93,16 @@ src_compile() {
 	# Gerk - Nov 26, 2002
 	use ppc && CFLAGS="-pipe -fsigned-char"
 
+	# Detect mips systems properly
+	gnuconfig_update
+
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		--host=${CHOST} \
-		--docdir=/usr/share/doc/${P} \
+		--docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/lib \
+		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=1024 \
 		$myconf || die
 
@@ -109,10 +112,7 @@ src_compile() {
 }
 
 src_install() {
-	addwrite "/usr/share/man/man3/Pg.3pm"
-
-	if use perl
-	then
+	if use perl; then
 		mv ${S}/src/pl/plperl/Makefile ${S}/src/pl/plperl/Makefile_orig
 		sed -e "s:(INST_DYNAMIC) /usr/lib:(INST_DYNAMIC) ${D}/usr/lib:" \
 			${S}/src/pl/plperl/Makefile_orig > ${S}/src/pl/plperl/Makefile
@@ -121,8 +121,8 @@ src_install() {
 			${S}/src/pl/plperl/GNUmakefile_orig > ${S}/src/pl/plperl/GNUmakefile
 	fi
 
-	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
-	make DESTDIR=${D} install-all-headers || die
+	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal LIBDIR=${D}/usr/lib install || die
+	make DESTDIR=${D} includedir_server=/usr/include/postgresql/server includedir_internal=/usr/include/postgresql/internal install-all-headers || die
 	cd ${S}/contrib
 	make DESTDIR=${D} LIBDIR=${D}/usr/lib install || die
 	cd ${S}
@@ -130,12 +130,17 @@ src_install() {
 	dodoc contrib/adddepend/*
 
 	if use java; then
-		dojar ${D}/usr/share/postgresql/java/postgresql.jar
+		# we need to remove jar file after dojar; otherwise two same jar
+		# file are installed.
+		java-pkg_dojar ${D}/usr/share/postgresql/java/postgresql.jar
 		rm ${D}/usr/share/postgresql/java/postgresql.jar
 	fi
 
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
+	# backward compatibility
+	for i in ${D}/usr/include/postgresql/pgsql/*
+	do
+		ln -s ${i} ${D}/usr/include/
+	done
 
 	cd ${S}/doc
 	dodoc FAQ* README.* TODO bug.template
@@ -163,7 +168,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo "emerge --config =${PF}"
 	einfo "to setup the initial database environment."
 	einfo ""
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
@@ -183,7 +188,7 @@ pkg_config() {
 			eerror "Postgres ${PV} cannot upgrade your existing databases."
 			eerror "You must remove your entire database directory to continue."
 			eerror "(database directory = ${PG_DIR})."
-			die
+			exit 1
 		else
 			einfon "A postgres data directory already exists from version "; cat ${PG_DIR}/data/PG_VERSION
 			einfo "Read the documentation to check how to upgrade to version ${PV}."
diff --git a/dev-db/postgresql/postgresql-7.3.9-r1.ebuild b/dev-db/postgresql/postgresql-7.3.9-r1.ebuild
index 035ef4c20bda..b9b9957059b9 100644
--- a/dev-db/postgresql/postgresql-7.3.9-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.3.9-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/dev-db/postgresql/postgresql-7.3.9-r1.ebuild,v 1.1 2005/02/11 21:41:45 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.3.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:44 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
-IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads"
+KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64 mips"
+IUSE="doc java libg++ nls pam perl python readline ssl tcltk zlib threads selinux"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
@@ -24,7 +24,7 @@ DEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
+	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )"
@@ -35,7 +35,8 @@ RDEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3* )
+	java? ( >=virtual/jdk-1.3 )
+	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )"
 
 PG_DIR="/var/lib/postgresql"
@@ -106,7 +107,6 @@ src_compile() {
 		--libdir=/usr/lib \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=1024 \
 		$myconf || die
 
@@ -172,7 +172,7 @@ src_install() {
 
 pkg_postinst() {
 	einfo "Execute the following command"
-	einfo "ebuild  /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+	einfo "emerge --config =${PF}"
 	einfo "to setup the initial database environment."
 	einfo ""
 	einfo "Make sure the postgres user in /etc/passwd has an account setup with /bin/bash as the shell"
diff --git a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
index c0b93e279b22..298af1f17985 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-r1.ebuild
@@ -1,8 +1,8 @@
-## Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.1 2005/02/11 21:41:45 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:43 chriswhite Exp $
 
-inherit eutils gnuconfig flag-o-matic java-pkg multilib
+inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
 DESCRIPTION="sophisticated Object-Relational DBMS."
 HOMEPAGE="http://www.postgresql.org/"
@@ -14,8 +14,8 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
-IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 s390 ppc64"
+IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
 
 DEPEND="virtual/libc
 	sys-devel/autoconf
@@ -26,7 +26,7 @@ DEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 >=dev-lang/tk-8.3.3-r1 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 dev-python/egenix-mx-base )
-	java? ( >=virtual/jdk-1.3* >=dev-java/ant-1.3
+	java? ( >=virtual/jdk-1.3 >=dev-java/ant-1.3
 		dev-java/java-config )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	nls? ( sys-devel/gettext )
@@ -38,7 +38,8 @@ RDEPEND="virtual/libc
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
 	python? ( >=dev-lang/python-2.2 )
-	java? ( >=virtual/jdk-1.3* )
+	java? ( >=virtual/jdk-1.3 )
+	selinux? ( sec-policy/selinux-postgresql )
 	ssl? ( >=dev-libs/openssl-0.9.6-r1 )
 	xml2? ( dev-libs/libxml2 dev-libs/libxslt )"
 
@@ -130,15 +131,14 @@ src_compile() {
 		--libdir=/usr/$(get_libdir) \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
-	make || die
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	cd contrib
-	make || die
+	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	if use xml2; then
-		make -C xml || die
+		make -C xml LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
 	fi
 }
 
@@ -237,7 +237,7 @@ pkg_postinst() {
 	else
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-7.4.7-r2.ebuild b/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
index 252e05d5e2a6..753830633590 100644
--- a/dev-db/postgresql/postgresql-7.4.7-r2.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.7-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/dev-db/postgresql/postgresql-7.4.7-r2.ebuild,v 1.1 2005/05/07 08:35:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.7-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:46 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
 
 DEPEND="virtual/libc
@@ -136,7 +136,6 @@ src_compile() {
 		--libdir=/usr/$(get_libdir) \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
@@ -243,7 +242,7 @@ pkg_postinst() {
 	else
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-7.4.8.ebuild b/dev-db/postgresql/postgresql-7.4.8.ebuild
index 2c5db3616c80..b9b48167fb76 100644
--- a/dev-db/postgresql/postgresql-7.4.8.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.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/dev-db/postgresql/postgresql-7.4.8.ebuild,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.8.ebuild,v 1.1.1.1 2005/11/30 10:11:46 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -14,11 +14,11 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 ~sparc x86"
 IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
 
 DEPEND="virtual/libc
-	=dev-db/libpq-7.4.8
+	=dev-db/libpq-7.4.8*
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
 	>=sys-devel/bison-1.875
@@ -35,7 +35,7 @@ DEPEND="virtual/libc
 # java dep workaround for portage bug
 # x86? ( java? ( =dev-java/sun-jdk-1.3* >=dev-java/ant-1.3 ) )
 RDEPEND="virtual/libc
-	=dev-db/libpq-7.4.8
+	=dev-db/libpq-7.4.8*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
@@ -131,7 +131,6 @@ src_compile() {
 		--libdir=/usr/$(get_libdir) \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
@@ -238,7 +237,7 @@ pkg_postinst() {
 	else
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-7.4.9.ebuild b/dev-db/postgresql/postgresql-7.4.9.ebuild
index 2e6fa4c94534..ad77cb2795f5 100644
--- a/dev-db/postgresql/postgresql-7.4.9.ebuild
+++ b/dev-db/postgresql/postgresql-7.4.9.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/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.1 2005/10/08 23:06:23 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-7.4.9.ebuild,v 1.1.1.1 2005/11/30 10:11:46 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic java-pkg multilib toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
 IUSE="ssl nls java python tcltk perl libg++ pam readline zlib doc pg-hier pg-vacuumdelay pg-intdatetime threads xml2 selinux"
 
 DEPEND="virtual/libc
@@ -61,6 +61,10 @@ pkg_setup() {
 			exit 1
 		fi
 	fi
+	enewgroup postgres 70 \
+		|| die "problem adding group postgres"
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
+		|| die "problem adding user postgres"
 }
 
 check_java_config() {
@@ -131,7 +135,6 @@ src_compile() {
 		--libdir=/usr/$(get_libdir) \
 		--includedir=/usr/include/postgresql/pgsql \
 		--enable-depend \
-		--with-gnu-ld \
 		--with-maxbackends=${MAX_CONNECTIONS} \
 		$myconf || die
 
@@ -238,7 +241,7 @@ pkg_postinst() {
 	else
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.1-r3.ebuild b/dev-db/postgresql/postgresql-8.0.1-r3.ebuild
index cd170cb29858..b8fc324befbd 100644
--- a/dev-db/postgresql/postgresql-8.0.1-r3.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.1-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/dev-db/postgresql/postgresql-8.0.1-r3.ebuild,v 1.1 2005/05/07 08:35:01 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r3.ebuild,v 1.1.1.1 2005/11/30 10:11:45 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
@@ -104,7 +104,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
@@ -174,7 +173,7 @@ pkg_postinst() {
 	if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild b/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
index 040ec471d693..1ab790b9f5a9 100644
--- a/dev-db/postgresql/postgresql-8.0.1-r4.ebuild
+++ b/dev-db/postgresql/postgresql-8.0.1-r4.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/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.1 2005/05/08 20:39:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.1-r4.ebuild,v 1.1.1.1 2005/11/30 10:11:46 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -16,12 +16,12 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ~ppc ppc64 s390 sparc x86"
 IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	=dev-db/libpq-3.2
+	=dev-db/libpq-8.0.1*
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
 	>=sys-devel/bison-1.875
@@ -35,8 +35,7 @@ DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
-	=dev-db/libpq-3.2
-	app-admin/sudo
+	=dev-db/libpq-8.0.1*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
@@ -106,7 +105,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
@@ -142,9 +140,6 @@ src_install() {
 
 	exeinto /usr/bin
 
-	dodir /usr/include/postgresql/pgsql
-	cp ${D}/usr/include/*.h ${D}/usr/include/postgresql/pgsql
-
 	cd ${S}/doc
 	dodoc FAQ* README.* TODO bug.template
 	if use doc; then
@@ -168,6 +163,8 @@ src_install() {
 	insinto /etc/conf.d/
 	newins ${FILESDIR}/postgresql.conf-${PV} postgresql || die
 	newins ${FILESDIR}/pg_autovacuum.conf-${PV} pg_autovacuum || die
+
+	rm ${D}/usr/include/postgres_ext.h
 }
 
 pkg_postinst() {
@@ -176,7 +173,7 @@ pkg_postinst() {
 	if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
@@ -212,7 +209,7 @@ pkg_config() {
 			eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
 			echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
 		fi
-		sudo -u postgres /usr/bin/initdb --pgdata ${PG_DIR}/data
+		su postgres -c "/usr/bin/initdb --pgdata ${PG_DIR}/data"
 
 		if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
 			echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
diff --git a/dev-db/postgresql/postgresql-8.0.3.ebuild b/dev-db/postgresql/postgresql-8.0.3.ebuild
index b1bff4d05333..6887abe72d9e 100644
--- a/dev-db/postgresql/postgresql-8.0.3.ebuild
+++ b/dev-db/postgresql/postgresql-8.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/dev-db/postgresql/postgresql-8.0.3.ebuild,v 1.1 2005/05/16 06:54:44 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:43 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -16,12 +16,12 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	=dev-db/libpq-8.0.3
+	=dev-db/libpq-8.0.3*
 	sys-devel/autoconf
 	>=sys-libs/ncurses-5.2
 	>=sys-devel/bison-1.875
@@ -35,7 +35,7 @@ DEPEND="virtual/libc
 	nls? ( sys-devel/gettext )
 	kerberos? ( virtual/krb5 )"
 RDEPEND="virtual/libc
-	=dev-db/libpq-8.0.3
+	=dev-db/libpq-8.0.3*
 	zlib? ( >=sys-libs/zlib-1.1.3 )
 	tcltk? ( >=dev-lang/tcl-8 )
 	perl? ( >=dev-lang/perl-5.6.1-r2 )
@@ -67,6 +67,7 @@ src_unpack() {
 	cd ${S}
 	use pg-hier && epatch ${WORKDIR}/${P_HIERPG}.diff
 	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-sh.patch
 }
 
 src_compile() {
@@ -99,7 +100,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
@@ -168,7 +168,7 @@ pkg_postinst() {
 	if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-8.0.4.ebuild b/dev-db/postgresql/postgresql-8.0.4.ebuild
index d4e9e8da24c0..dccb8c3e4ddc 100644
--- a/dev-db/postgresql/postgresql-8.0.4.ebuild
+++ b/dev-db/postgresql/postgresql-8.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/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.1 2005/10/08 23:06:23 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:43 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://postgresql/source/v${PV}/${PN}-base-${MY_PV}.tar.bz2
 
 LICENSE="POSTGRESQL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm hppa ia64 ~mips ~ppc ppc64 s390 sh ~sparc x86"
 IUSE="ssl nls python tcltk perl libg++ pam readline xml2 zlib doc selinux kerberos pg-intdatetime pg-hier"
 
 S=${WORKDIR}/${MY_P}
@@ -60,6 +60,10 @@ pkg_setup() {
 			exit 1
 		fi
 	fi
+	enewgroup postgres 70 \
+		|| die "problem adding group postgres"
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
+		|| die "problem adding user postgres"
 }
 
 src_unpack() {
@@ -100,7 +104,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
@@ -169,7 +172,7 @@ pkg_postinst() {
 	if [ ! -f ${PG_DIR}/data/PG_VERSION ] ; then
 		einfo ""
 		einfo "Execute the following command"
-		einfo "ebuild /var/db/pkg/dev-db/${PF}/${PF}.ebuild config"
+		einfo "emerge --config =${PF}"
 		einfo "to setup the initial database environment."
 		einfo ""
 	fi
diff --git a/dev-db/postgresql/postgresql-8.1.0.ebuild b/dev-db/postgresql/postgresql-8.1.0.ebuild
index 0a8bb4cd5673..18ba4071ced8 100644
--- a/dev-db/postgresql/postgresql-8.1.0.ebuild
+++ b/dev-db/postgresql/postgresql-8.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/dev-db/postgresql/postgresql-8.1.0.ebuild,v 1.1 2005/11/08 13:53:10 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/postgresql-8.1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:46 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic multilib toolchain-funcs
 
@@ -58,6 +58,10 @@ pkg_setup() {
 			exit 1
 		fi
 	fi
+	enewgroup postgres 70 \
+		|| die "problem adding group postgres"
+	enewuser postgres 70 /bin/bash /var/lib/postgresql postgres \
+		|| die "problem adding user postgres"
 }
 
 src_unpack() {
@@ -98,7 +102,6 @@ src_compile() {
 		--with-docdir=/usr/share/doc/${PF} \
 		--libdir=/usr/$(get_libdir) \
 		--enable-depend \
-		--with-gnu-ld \
 		$myconf || die
 
 	make LD="$(tc-getLD) $(get_abi_LDFLAGS)" || die
diff --git a/dev-db/pygresql/ChangeLog b/dev-db/pygresql/ChangeLog
index da5b9f0a3c43..d436e0bb9b14 100644
--- a/dev-db/pygresql/ChangeLog
+++ b/dev-db/pygresql/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for dev-db/pygresql
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/ChangeLog,v 1.1 2004/05/04 07:25:37 nakano Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/ChangeLog,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> pygresql-3.6.2.ebuild:
+  stable on ia64
+
+  15 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> pygresql-3.6.2.ebuild:
+  Stable on hppa.
+
+  03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> pygresql-3.6.2.ebuild:
+  Stable on ppc.
+
+  03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pygresql-3.6.2.ebuild:
+  Stable on alpha.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> pygresql-3.6.2.ebuild:
+  Stable on sparc
+
+  19 May 2005; Guy Martin <gmsoft@gentoo.org> pygresql-3.6.1.ebuild:
+  Stable on hppa.
+
+  09 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  files/pygresql-3.6.2-gentoo.patch:
+  Fixed header include path.
+
+*pygresql-3.6.2-r1 (08 May 2005)
+
+  08 May 2005; Masatomo Nakano <nakano@gentoo.org>
+  +pygresql-3.6.2-r1.ebuild:
+  Added libpq dependency version.
+
+*pygresql-3.6.2 (24 Apr 2005)
+
+  24 Apr 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pygresql-3.4-gentoo.patch, +files/pygresql-3.6.2-gentoo.patch,
+  -pygresql-3.4.ebuild, +pygresql-3.6.2.ebuild:
+  Version bump.
+
+  09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pygresql-3.6.1.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> pygresql-3.6.1.ebuild:
+  stable on amd64
+
+  31 Mar 2005; Aron Griffis <agriffis@gentoo.org> pygresql-3.6.1.ebuild:
+  stable on ia64
+
+  27 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> pygresql-3.6.1.ebuild:
+  Stable on alpha.
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> pygresql-3.6.1.ebuild:
+  Stable on SPARC.
+
+  17 Mar 2005; Masatomo Nakano <nakano@gentoo.org> pygresql-3.6.1.ebuild:
+  Marked stable.
+
+  10 Feb 2005; Masatomo Nakano <nakano@gentoo.org>
+  -files/pygresql-3.6-gentoo.patch, +files/pygresql-3.6.1-gentoo.patch,
+  pygresql-3.6.1.ebuild:
+  Fixed server path error. (#81475)
+
+*pygresql-3.6.1 (09 Feb 2005)
+
+  09 Feb 2005; Masatomo Nakano <nakano@gentoo.org> +pygresql-3.6.1.ebuild,
+  -pygresql-3.6.ebuild:
+  Version bump.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> pygresql-3.5.ebuild:
+  Marked stable on mips.
+
+  28 Dec 2004; Guy Martin <gmsoft@gentoo.org> pygresql-3.5.ebuild:
+  Stable on hppa.
+
+  27 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> pygresql-3.5.ebuild:
+  Stable on sparc
+
+  22 Dec 2004; Dylan Carlson <absinthe@gentoo.org> :
+  Digest fix.
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> pygresql-3.5.ebuild:
+  Stable on alpha.
+
+  18 Dec 2004; Dylan Carlson <absinthe@gentoo.org> pygresql-3.5.ebuild:
+  Stable on amd64.
+
+  17 Dec 2004; Masatomo Nakano <nakano@gentoo.org> pygresql-3.5.ebuild:
+  Marked stable on x86.
+
+*pygresql-3.6 (17 Dec 2004)
+
+  17 Dec 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pygresql-3.6-gentoo.patch, +pygresql-3.6.ebuild:
+  Version bump.
+
+*pygresql-3.5 (30 Aug 2004)
+
+  30 Aug 2004; Masatomo Nakano <nakano@gentoo.org>
+  +files/pygresql-3.5-gentoo.patch, +pygresql-3.5.ebuild:
+  Version bump.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> pygresql-3.4.ebuild:
+  trim trailing whitespace
+
+  17 Jun 2004; Masatomo Nakano <nakano@gentoo.org> pygresql-3.4.ebuild:
+  Marked as stable.
+
+*pygresql-3.4 (04 May 2004)
 
   04 May 2004; Masatomo Nakano <nakano@gentoo.org> :
   Initial import. This modules was separated from PostgereSQL package.
diff --git a/dev-db/pygresql/Manifest b/dev-db/pygresql/Manifest
index 6524d4ca6cc8..7bfa72265e2e 100644
--- a/dev-db/pygresql/Manifest
+++ b/dev-db/pygresql/Manifest
@@ -1,2 +1,23 @@
-MD5 fb35633e47ce28c8e059c574fa7c3cc0 pygresql-3.4.ebuild 755
-MD5 e5e27a1cc9a1a83127c4e13e05caa5c1 files/digest-pygresql-3.4 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 05a1d5c849b7a82f1e01b660c54dd1b4 pygresql-3.6.1.ebuild 652
+MD5 b02af59d8fe3bf5a86f5d4f399b6d5a1 pygresql-3.5.ebuild 650
+MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
+MD5 05ae8c23ae3756eef38cdb40c9ea4ff6 ChangeLog 3422
+MD5 eb59b025eb4a1973e762dd39aa67dd9f pygresql-3.6.2.ebuild 655
+MD5 7d1f78a3f31d359fe5aa886bb706ef28 pygresql-3.6.2-r1.ebuild 651
+MD5 7379a932167b1ce99db37bf887a401b0 files/digest-pygresql-3.6.2 62
+MD5 b3cc0a635106665541248040917b9b1e files/pygresql-3.5-gentoo.patch 523
+MD5 7379a932167b1ce99db37bf887a401b0 files/digest-pygresql-3.6.2-r1 62
+MD5 1d02a4c75fc2e50259aab033cf22e4b6 files/digest-pygresql-3.5 60
+MD5 4197cad26a33686a31e08a2f86c585fb files/digest-pygresql-3.6.1 62
+MD5 18af1ef69d758794d3a95d48e00c38fa files/pygresql-3.6.1-gentoo.patch 531
+MD5 5325224fe3a370426933d64f51e82ebb files/pygresql-3.6.2-gentoo.patch 506
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDC0WVBXaUFmZvwyMRAs+XAJ4nrKoVorGHKe1JWi5LGOA5WFEhUQCgsctD
+22ULHAUIWQ9g1Y9Ji4/eLJk=
+=V0jJ
+-----END PGP SIGNATURE-----
diff --git a/dev-db/pygresql/files/pygresql-3.6.2-gentoo.patch b/dev-db/pygresql/files/pygresql-3.6.2-gentoo.patch
index 922bac78a631..c8f1dc9f2a24 100644
--- a/dev-db/pygresql/files/pygresql-3.6.2-gentoo.patch
+++ b/dev-db/pygresql/files/pygresql-3.6.2-gentoo.patch
@@ -6,7 +6,7 @@ diff -Naru PyGreSQL-3.6.2.org/setup.py PyGreSQL-3.6.2/setup.py
  	data_files = [ 'libpq.dll' ]
  else:
 -	include_dirs=[getconfig ('includedir'),getconfig('includedir-server')]
-+	include_dirs=[getconfig ('includedir'),"/usr/include/postgresql/server"]
++	include_dirs=["/usr/include/postgresql/server"]
  	library_dirs=[getconfig('libdir')]
  	optional_libs=['pq']
  	data_files = []
diff --git a/dev-db/pygresql/pygresql-3.5.ebuild b/dev-db/pygresql/pygresql-3.5.ebuild
index 88efac0bdbf3..99850c7d001d 100644
--- a/dev-db/pygresql/pygresql-3.5.ebuild
+++ b/dev-db/pygresql/pygresql-3.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/dev-db/pygresql/pygresql-3.5.ebuild,v 1.1 2004/08/30 16:23:46 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-3.5.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.druid.net/pygresql/"
 LICENSE="as-is"
 DEPEND=">=dev-db/postgresql-7.3
 	dev-lang/python"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="x86 ~ppc sparc alpha amd64 hppa ~ia64 mips"
 IUSE=""
 SLOT="0"
 
diff --git a/dev-db/pygresql/pygresql-3.6.1.ebuild b/dev-db/pygresql/pygresql-3.6.1.ebuild
index 7257d3229c6d..2b6c3fecfd8d 100644
--- a/dev-db/pygresql/pygresql-3.6.1.ebuild
+++ b/dev-db/pygresql/pygresql-3.6.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/dev-db/pygresql/pygresql-3.6.1.ebuild,v 1.1 2005/02/09 21:34:25 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-3.6.1.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.druid.net/pygresql/"
 LICENSE="as-is"
 DEPEND=">=dev-db/postgresql-7.3
 	dev-lang/python"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="x86 ppc sparc alpha amd64 hppa ia64 ~mips"
 IUSE=""
 SLOT="0"
 
@@ -19,6 +19,6 @@ S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
-#	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
diff --git a/dev-db/pygresql/pygresql-3.6.2-r1.ebuild b/dev-db/pygresql/pygresql-3.6.2-r1.ebuild
index beef9cf53f2b..54571b3087d5 100644
--- a/dev-db/pygresql/pygresql-3.6.2-r1.ebuild
+++ b/dev-db/pygresql/pygresql-3.6.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/dev-db/pygresql/pygresql-3.6.2-r1.ebuild,v 1.1 2005/05/09 00:33:35 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-3.6.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils distutils
 
diff --git a/dev-db/pygresql/pygresql-3.6.2.ebuild b/dev-db/pygresql/pygresql-3.6.2.ebuild
index c2f94709590e..19816cfd9784 100644
--- a/dev-db/pygresql/pygresql-3.6.2.ebuild
+++ b/dev-db/pygresql/pygresql-3.6.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/dev-db/pygresql/pygresql-3.6.2.ebuild,v 1.1 2005/04/24 06:50:27 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pygresql/pygresql-3.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.druid.net/pygresql/"
 LICENSE="as-is"
 DEPEND=">=dev-db/postgresql-7.3
 	dev-lang/python"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~ia64 ~mips"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
 SLOT="0"
 
diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index b415a69bf287..3fbf6a8ea993 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,11 +1,201 @@
 # ChangeLog for dev-db/qdbm
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.1 2004/07/25 07:43:23 hattya Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
+
+  01 Nov 2005; Brent Baude <ranger@gentoo.org> qdbm-1.8.33-r2.ebuild:
+  Remarking qdbm-1.8.33-r2 as ppc64 stable for 108534; didnt take the first time
+
+  31 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> qdbm-1.8.33-r2.ebuild:
+  Stable on ppc. See bug #108534.
+
+  31 Oct 2005; Brent Baude <ranger@gentoo.org> ChangeLog:
+  marking qdbm-1.8.33-r2 ppc64 for bug 108534
+
+  31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> qdbm-1.8.33-r2.ebuild:
+  Stable on alpha, bug 108534.
+
+  31 Oct 2005; Jason Wever <weeve@gentoo.org> qdbm-1.8.33-r2.ebuild:
+  Stable on SPARC wrt security bug #108534.
+
+  30 Oct 2005; Mark Loeser <halcy0n@gentoo.org> qdbm-1.8.33-r2.ebuild:
+  Stable on x86; bug #108534
+
+  30 Oct 2005; Simon Stelling <blubb@gentoo.org> qdbm-1.8.33-r2.ebuild:
+  stable on amd64 wrt bug 108534
+
+*qdbm-1.8.33-r2 (24 Oct 2005)
+
+  24 Oct 2005; Akinori Hattori <hattya@gentoo.org> files/qdbm-runpath.diff,
+  -qdbm-1.8.33-r1.ebuild, +qdbm-1.8.33-r2.ebuild:
+  fixes bug #108534.
+
+  15 Oct 2005; Akinori Hattori <hattya@gentoo.org> -qdbm-1.8.24.ebuild:
+  remove old ebuild.
+
+*qdbm-1.8.33-r1 (15 Oct 2005)
+
+  15 Oct 2005; Akinori Hattori <hattya@gentoo.org> +files/qdbm-runpath.diff,
+  -qdbm-1.8.33.ebuild, +qdbm-1.8.33-r1.ebuild:
+  fixes bug #108534.
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> qdbm-1.8.31.ebuild:
+  Mark 1.8.31 stable on alpha
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> qdbm-1.8.31.ebuild:
+  Mark 1.8.31 stable on ia64
+
+  08 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> qdbm-1.8.31.ebuild:
+  Stable on ppc.
+
+  06 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> qdbm-1.8.31.ebuild:
+  Stable on sparc
+
+  06 Oct 2005; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.31.ebuild:
+  stable on x86.
+
+*qdbm-1.8.33 (06 Oct 2005)
+
+  06 Oct 2005; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.33.ebuild:
+  new upstream release.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> qdbm-1.8.31.ebuild:
+  add ~ia64
+
+  08 Aug 2005; Markus Rothe <corsair@gentoo.org> qdbm-1.8.30.ebuild:
+  Stable on ppc64
+
+  03 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> qdbm-1.8.30.ebuild:
+  Stable on alpha.
+
+  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> qdbm-1.8.30.ebuild:
+  ppc stable
+
+  25 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> qdbm-1.8.30.ebuild:
+  Stable on sparc
+
+  24 Jul 2005; Akinori Hattori <hattya@gentoo.org> -qdbm-1.8.21.ebuild:
+  remove old ebuild.
+
+*qdbm-1.8.31 (24 Jul 2005)
+
+  24 Jul 2005; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.31.ebuild:
+  new upstream release.
+
+  24 Jul 2005; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.30.ebuild:
+  stable on x86.
+
+  03 Jul 2005; Michael Hanselmann <hansmi@gentoo.org> qdbm-1.8.24.ebuild:
+  Stable on ppc.
+
+  03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> qdbm-1.8.24.ebuild:
+  Stable on alpha.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> qdbm-1.8.24.ebuild:
+  Stable on ppc64
+
+  24 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> qdbm-1.8.24.ebuild:
+  Stable on sparc
+
+  24 Jun 2005; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.24.ebuild:
+  stable on x86.
+
+*qdbm-1.8.30 (24 Jun 2005)
+
+  24 Jun 2005; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.30.ebuild:
+  new upstream release.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> qdbm-1.8.21.ebuild:
+  Stable on ppc.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> qdbm-1.8.21.ebuild:
+  Stable on ppc64
+
+  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> qdbm-1.8.21.ebuild:
+  Stable on sparc
+
+  05 May 2005; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.21.ebuild:
+  stable on x86.
+
+*qdbm-1.8.24 (05 May 2005)
+
+  05 May 2005; Akinori Hattori <hattya@gentoo.org> -qdbm-1.8.13.ebuild,
+  -qdbm-1.8.14.ebuild, -qdbm-1.8.15.ebuild, +qdbm-1.8.24.ebuild:
+  new upstream release.
+
+*qdbm-1.8.21 (18 Feb 2005)
+
+  18 Feb 2005; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.21.ebuild:
+  new upstream release.
+
+  04 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> qdbm-1.8.17.ebuild:
+  Fixed multilib issues in src_install().
+
+  04 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org> qdbm-1.8.17.ebuild:
+  Stable on amd64
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> qdbm-1.8.17.ebuild:
+  Stable on alpha.
+
+  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> qdbm-1.8.17.ebuild:
+  Stable on sparc wrt #72440
+
+  05 Dec 2004; Jason Wever <weeve@gentoo.org> qdbm-1.8.17.ebuild:
+  Added ~sparc keyword wrt bug #73460.
+
+  06 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> qdbm-1.8.17.ebuild:
+  ~alpha keyword, bug 73460.
+
+  07 Nov 2004; Markus Rothe <corsair@gentoo.org> qdbm-1.8.17.ebuild:
+  Stable on ppc64; bug #60442
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> qdbm-1.8.17.ebuild:
+  Stable on ppc wrt PHP5.
+
+  17 Oct 2004; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.17.ebuild:
+  stable on x86.
+
+*qdbm-1.8.17 (27 Sep 2004)
+
+  27 Sep 2004; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.17.ebuild:
+  new upstream release.
+
+  22 Sep 2004; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.16.ebuild:
+  stable on x86.
+
+  19 Sep 2004; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.15.ebuild:
+  stable on x86.
+
+  07 Sep 2004; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.14.ebuild:
+  stable on x86.
+
+  28 Aug 2004; Akinori Hattori <hattya@gentoo.org> qdbm-1.8.13.ebuild:
+  stable on x86.
+
+*qdbm-1.8.16 (23 Aug 2004)
+
+  23 Aug 2004; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.16.ebuild:
+  new upstream release.
+
+*qdbm-1.8.15 (19 Aug 2004)
+
+  19 Aug 2004; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.15.ebuild:
+  new upstream release.
+
+  14 Aug 2004; David Holm <dholm@gentoo.org> qdbm-1.8.14.ebuild:
+  Added to ~ppc.
+
+*qdbm-1.8.14 (06 Aug 2004)
+
+  06 Aug 2004; Akinori Hattori <hattya@gentoo.org> +qdbm-1.8.14.ebuild:
+  new upstream release.
+
+  31 Jul 2004; MATSUU Takuto <matsuu@gentoo.org> qdbm-1.8.13.ebuild:
+  Added to ~amd64.
 
 *qdbm-1.8.13 (25 Jul 2004)
 
   25 Jul 2004; Akinori Hattori <hattya@gentoo.org> +metadata.xml,
   +qdbm-1.8.13.ebuild:
-  Initial revision. Based on the ebuild Atzm Watanabe <sitosito@p.chan.ne.jp>
-  in bug #55574, and modified by me.
+  Initial revision. Based on the ebuild from Atzm Watanabe
+  <sitosito@p.chan.ne.jp> in bug #55574, and modified by me.
 
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index ff0f36d3a261..16c2feb71890 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,2 +1,13 @@
-MD5 8f31c381b4a7453356d95c7bc49c4fa4 qdbm-1.8.13.ebuild 1072
-MD5 3162efb60c6bd5483bf56f2b5dd9396b files/digest-qdbm-1.8.13 63
+MD5 c928286428d46391a8ed041843a4aec4 ChangeLog 6218
+MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230
+MD5 baa34b4deb9f8a225a9751b44b1f2d71 qdbm-1.8.16.ebuild 1165
+MD5 da3f7a934564aae0528dbeec95c99fe1 qdbm-1.8.17.ebuild 1200
+MD5 358c12eedbb9ecdff61f17ae3f6aca73 qdbm-1.8.30.ebuild 1202
+MD5 35939dae282498c83fdfdd9316003774 qdbm-1.8.31.ebuild 1209
+MD5 339f703fef029ca9c40bdfbca91247f1 qdbm-1.8.33-r2.ebuild 1298
+MD5 5e73e3df7c9ba5df4312934edf80cd9a files/digest-qdbm-1.8.16 63
+MD5 340399145118f869822d6127294a3ebb files/digest-qdbm-1.8.17 63
+MD5 171bad7087326755b76957b5ffafc318 files/digest-qdbm-1.8.30 63
+MD5 c43f02bd9ab5d91d1db4789f70d6b3cd files/digest-qdbm-1.8.31 63
+MD5 83382b2a04b7b2532ac3246aa49a982f files/digest-qdbm-1.8.33-r2 63
+MD5 481bf1a867128b4b4f9b9f1949b40d66 files/qdbm-runpath.diff 1344
diff --git a/dev-db/qdbm/files/qdbm-runpath.diff b/dev-db/qdbm/files/qdbm-runpath.diff
index 42e0168fe3a6..d67e27c23e02 100644
--- a/dev-db/qdbm/files/qdbm-runpath.diff
+++ b/dev-db/qdbm/files/qdbm-runpath.diff
@@ -1,12 +1,34 @@
-diff -urN qdbm-1.8.33.orig/perl/Makefile.in qdbm-1.8.33/perl/Makefile.in
---- qdbm-1.8.33.orig/perl/Makefile.in	2005-06-19 08:12:23.000000000 +0900
-+++ qdbm-1.8.33/perl/Makefile.in	2005-10-10 18:24:00.420000000 +0900
-@@ -30,7 +30,7 @@
- OPTIMIZE = -O2
- LD = ld
- LIBS = -L../.. -L/usr/local/lib -lqdbm @LIBS@
--RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib
-+RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib LD_RUN_PATH=""
- 
+--- perl/Makefile.in.orig	2005-10-09 16:35:47.000000000 +1000
++++ perl/Makefile.in	2005-10-09 16:41:46.000000000 +1000
+@@ -43,15 +43,15 @@
+ 	cd depot && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+ 	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+-	  $(RUNENV) make
++	  $(RUNENV) make LD_RUN_PATH=""
+ 	cd curia && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+ 	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+-	  $(RUNENV) make
++	  $(RUNENV) make LD_RUN_PATH=""
+ 	cd villa && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+ 	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+-	  $(RUNENV) make
++	  $(RUNENV) make LD_RUN_PATH=""
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Ready to install.\n'
+@@ -69,9 +69,9 @@
  
  
+ install :
+-	cd depot && $(RUNENV) make install
+-	cd curia && $(RUNENV) make install
+-	cd villa && $(RUNENV) make install
++	cd depot && $(RUNENV) make LD_RUN_PATH="" install
++	cd curia && $(RUNENV) make LD_RUN_PATH="" install
++	cd villa && $(RUNENV) make LD_RUN_PATH="" install
+ 	mkdir -p $(DESTDIR)$(MYBINDIR)
+ 	cp -f $(MYBINS) $(DESTDIR)$(MYBINDIR)
+ 	mkdir -p $(DESTDIR)$(MYDATADIR)
diff --git a/dev-db/qdbm/qdbm-1.8.16.ebuild b/dev-db/qdbm/qdbm-1.8.16.ebuild
index 8afc91e74968..ba55b36a22f9 100644
--- a/dev-db/qdbm/qdbm-1.8.16.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.16.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/dev-db/qdbm/qdbm-1.8.16.ebuild,v 1.1 2004/08/23 10:38:37 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.16.ebuild,v 1.1.1.1 2005/11/30 10:11:26 chriswhite Exp $
 
 inherit java-pkg
 
@@ -10,9 +10,8 @@ DESCRIPTION="Quick Database Manager"
 HOMEPAGE="http://qdbm.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-RESTRICT="nomirror"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~s390 x86"
 SLOT="0"
 
 DEPEND="java? ( virtual/jdk )
diff --git a/dev-db/qdbm/qdbm-1.8.17.ebuild b/dev-db/qdbm/qdbm-1.8.17.ebuild
index 5487056679f9..5828f822e98f 100644
--- a/dev-db/qdbm/qdbm-1.8.17.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.17.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/dev-db/qdbm/qdbm-1.8.17.ebuild,v 1.1 2004/09/27 14:13:40 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.17.ebuild,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
 
-inherit java-pkg
+inherit java-pkg multilib
 
 IUSE="debug java perl ruby zlib"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qdbm.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ppc ppc64 alpha sparc"
 SLOT="0"
 
 DEPEND="java? ( virtual/jdk )
@@ -56,8 +56,8 @@ src_install() {
 	if use java; then
 		cd java
 		make DESTDIR=${D} install || die
-		java-pkg_dojar ${D}/usr/lib/*.jar
-		rm ${D}/usr/lib/*.jar
+		java-pkg_dojar ${D}/usr/$(get_libdir)/*.jar
+		rm ${D}/usr/$(get_libdir)/*.jar
 		cd -
 	fi
 
diff --git a/dev-db/qdbm/qdbm-1.8.30.ebuild b/dev-db/qdbm/qdbm-1.8.30.ebuild
index dd30e0a54d97..411ef746ef6a 100644
--- a/dev-db/qdbm/qdbm-1.8.30.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.30.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/dev-db/qdbm/qdbm-1.8.30.ebuild,v 1.1 2005/06/24 09:04:39 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.30.ebuild,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
 
 inherit java-pkg multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qdbm.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
 SLOT="0"
 
 DEPEND="java? ( virtual/jdk )
diff --git a/dev-db/qdbm/qdbm-1.8.31.ebuild b/dev-db/qdbm/qdbm-1.8.31.ebuild
index 5c6a5a30f385..753767e8a9cc 100644
--- a/dev-db/qdbm/qdbm-1.8.31.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.31.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/dev-db/qdbm/qdbm-1.8.31.ebuild,v 1.1 2005/07/24 14:14:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.31.ebuild,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
 
 inherit java-pkg multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qdbm.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ia64 ppc ~ppc64 sparc x86"
 SLOT="0"
 
 DEPEND="java? ( virtual/jdk )
diff --git a/dev-db/qdbm/qdbm-1.8.33-r2.ebuild b/dev-db/qdbm/qdbm-1.8.33-r2.ebuild
index 2cfa96479894..6ea74826ada7 100644
--- a/dev-db/qdbm/qdbm-1.8.33-r2.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.33-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/dev-db/qdbm/qdbm-1.8.33-r2.ebuild,v 1.1 2005/10/29 11:22:45 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.33-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:27 chriswhite Exp $
 
 inherit eutils java-pkg multilib
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://qdbm.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 
 DEPEND="java? ( virtual/jdk )
diff --git a/dev-db/qt-unixODBC/ChangeLog b/dev-db/qt-unixODBC/ChangeLog
index 3b926d904bbe..ca340d84eb23 100644
--- a/dev-db/qt-unixODBC/ChangeLog
+++ b/dev-db/qt-unixODBC/ChangeLog
@@ -1,9 +1,55 @@
 # ChangeLog for dev-db/qt-unixODBC
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.1 2004/10/23 21:19:15 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/ChangeLog,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org>
+  qt-unixODBC-3.3.4-r1.ebuild:
+  Stable on mips, dep of bug #105695.
+
+  22 Sep 2005; Mark Loeser <halcy0n@gentoo.org> qt-unixODBC-3.3.4-r1.ebuild:
+  Stable on x86; bug #105695.
+
+  20 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  qt-unixODBC-3.3.4-r1.ebuild:
+  Stable on amd64, bug 105695.
+
+  20 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  qt-unixODBC-3.3.4-r1.ebuild:
+  Stable on hppa, ppc.
+
+  20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  qt-unixODBC-3.3.4-r1.ebuild:
+  Stable on sparc wrt #105695
+
+*qt-unixODBC-3.3.4-r1 (20 Sep 2005)
+
+  20 Sep 2005; Caleb Tennis <caleb@gentoo.org> +files/qt-no-rpath.patch,
+  +qt-unixODBC-3.3.4-r1.ebuild, qt-unixODBC-3.3.5.ebuild:
+  Rev bump to add qt-no-rpatch.patch from qt ebuild to make the portage
+  RUNPATH error checker happy
+
+*qt-unixODBC-3.3.5 (17 Sep 2005)
+
+  17 Sep 2005; Caleb Tennis <caleb@gentoo.org> +qt-unixODBC-3.3.5.ebuild:
+  Version bump
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> qt-unixODBC-3.3.4.ebuild:
+  Mark 3.3.4 stable on ia64
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> qt-unixODBC-3.3.4.ebuild:
+  Mark 3.3.4 stable on alpha
+
+  09 Sep 2005; Tom Gall <tgall@gentoo.org> qt-unixODBC-3.3.4.ebuild:
+  stable on ppc64 bug #14178
+
+*qt-unixODBC-3.3.4 (01 Jul 2005)
+
+  01 Jul 2005; Dan Armak <danarmak@gentoo.org> -qt-unixODBC-3.3.3.ebuild,
+  +qt-unixODBC-3.3.4.ebuild:
+  Added 3.3.4 version. Unmasking. Cf bug 14178.
 
 *qt-ODBC-3.3.3 (23 Oct 2004)
 
   23 Oct 2004; Dan Armak <danarmak@gentoo.org> qt-ODBC-3.3.3.ebuild:
   First created. A separate ebuild for the QT unixODBC plugin to fix #14178.
-  
\ No newline at end of file
+  
diff --git a/dev-db/qt-unixODBC/Manifest b/dev-db/qt-unixODBC/Manifest
index 630b73d2207b..4e0d0f6f218a 100644
--- a/dev-db/qt-unixODBC/Manifest
+++ b/dev-db/qt-unixODBC/Manifest
@@ -1,2 +1,9 @@
-MD5 f4aa8d565ff76ea21db6bfd9f38ae61f qt-unixODBC-3.3.3.ebuild 1416
-MD5 4fc68ca52659787e90f0de57b43e943b files/digest-qt-unixODBC-3.3.3 72
+MD5 e896f236c422961d36c8e9b47b528341 ChangeLog 1848
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 2a1ae045ff7268b117acc2d64cfa5469 qt-unixODBC-3.3.4.ebuild 1575
+MD5 cf97247e5887c5605d2bde1aedab1bb1 qt-unixODBC-3.3.5.ebuild 1615
+MD5 6acfcc91ce7ffb564dd08069756040fd qt-unixODBC-3.3.4-r1.ebuild 1611
+MD5 07a5c97eddc68da556434cdd09a7a903 files/digest-qt-unixODBC-3.3.4 72
+MD5 d09855ad814a45f5c624cd6680628f96 files/digest-qt-unixODBC-3.3.5 72
+MD5 07a5c97eddc68da556434cdd09a7a903 files/digest-qt-unixODBC-3.3.4-r1 72
+MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
index 73fef28de44c..6fe344155def 100644
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.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/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild,v 1.1 2005/09/20 02:07:33 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 IUSE=""
 LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
-KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 
 DEPEND="~x11-libs/qt-$PV
 	dev-db/unixODBC"
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.4.ebuild
index dde2c0d42a56..286c48e9f61d 100644
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.4.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.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/dev-db/qt-unixODBC/qt-unixODBC-3.3.4.ebuild,v 1.1 2005/07/01 14:07:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.4.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.trolltech.com/qt/source/qt-x11-${SRCTYPE}-${PV}.tar.bz2"
 IUSE=""
 LICENSE="|| ( QPL-1.0 GPL-2 )"
 SLOT="3"
-KEYWORDS="~x86 ~amd64 ~hppa ~mips ~ppc ~ppc64 ~alpha ~sparc ~ia64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc ~x86"
 
 DEPEND="~x11-libs/qt-$PV
 	dev-db/unixODBC"
diff --git a/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild b/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild
index 8b9576d5e04c..ce8752b27c60 100644
--- a/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild
+++ b/dev-db/qt-unixODBC/qt-unixODBC-3.3.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/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild,v 1.1 2005/09/17 16:35:10 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qt-unixODBC/qt-unixODBC-3.3.5.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit eutils
 
@@ -24,8 +24,11 @@ export PLATFORM=linux-g++
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
+
+	epatch ${FILESDIR}/qt-no-rpath.patch
+
+
 	cp configure configure.orig
 	sed -e 's:read acceptance:acceptance=yes:' configure.orig > configure
 }
diff --git a/dev-db/rekall/ChangeLog b/dev-db/rekall/ChangeLog
index 050802253834..08258376ad95 100644
--- a/dev-db/rekall/ChangeLog
+++ b/dev-db/rekall/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for dev-db/rekall
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/rekall/ChangeLog,v 1.1 2004/07/20 16:59:17 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/rekall/ChangeLog,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
+
+*rekall-2.2.6 (12 Oct 2005)
+
+  12 Oct 2005; Carsten Lohrke <carlo@gentoo.org> +rekall-2.2.6.ebuild:
+  version bump
+
+  24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> rekall-2.2.4.ebuild:
+  Stable on ppc.
+
+  23 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> rekall-2.2.4.ebuild:
+  Stable on x86.
+
+  27 Jun 2005; Herbie Hopkins <herbs@gentoo.org> rekall-2.2.4.ebuild:
+  Marked ~amd64 wrt bug #97252.
+
+*rekall-2.2.4 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> rekall-2.2.3-r1.ebuild,
+  +rekall-2.2.4.ebuild:
+  version bump, removed invalid odbc flag
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> rekall-2.2.3-r1.ebuild:
+  stable on amd64
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> rekall-2.2.3-r1.ebuild:
+  stable on x86
+
+  24 Dec 2004; Simon Stelling <blubb@gentoo.org> rekall-2.2.3-r1.ebuild:
+  added ~amd64
+
+  24 Dec 2004; Simon Stelling <blubb@gentoo.org> rekall-2.2.3-r1.ebuild:
+  added ~amd64
+
+*rekall-2.2.3-r1 (17 Dec 2004)
+
+  17 Dec 2004; Carsten Lohrke <carlo@gentoo.org> -rekall-2.2.0.ebuild,
+  +rekall-2.2.3-r1.ebuild, -rekall-2.2.3.ebuild:
+  tarball fixes
+
+*rekall-2.2.3 (12 Dec 2004)
+
+  12 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +rekall-2.2.3.ebuild:
+  version bump
+
+  31 Oct 2004; Simone Gotti <motaboy@gentoo.org>
+  +files/rekall-2.2.1-configure.patch:
+  Added a patch to the configure script to honor the "arts" USE flag. Fixes
+  bug #65457.
+
+  15 Oct 2004; Carsten Lohrke <carlo@gentoo.org> rekall-2.2.1.ebuild:
+  stable on x86
+
+  15 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/rekall-2.2.1-gcc-3.4-compat.patch, rekall-2.2.1.ebuild:
+  gcc-3.4 patch, minor fixes
+
+*rekall-2.2.1 (13 Sep 2004)
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +rekall-2.2.1.ebuild:
+  version bump
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> rekall-2.2.0.ebuild:
+  fix depend syntax 58347
+
+  20 Aug 2004; Carsten Lohrke <carlo@gentoo.org> rekall-2.2.0.ebuild:
+  stable on x86
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> rekall-2.2.0.ebuild:
+  Added to ~ppc.
 
 *rekall-2.2.0 (20 Jul 2004)
 
diff --git a/dev-db/rekall/Manifest b/dev-db/rekall/Manifest
index ce206004588f..e2a82bdece0d 100644
--- a/dev-db/rekall/Manifest
+++ b/dev-db/rekall/Manifest
@@ -1,3 +1,8 @@
-MD5 1e9a027d0cdca4158c2e71a41cfc20ea rekall-2.2.0.ebuild 1246
-MD5 d225760167d9e5f4667bfc512d348e9e metadata.xml 223
-MD5 10a64bbfc569ae4806e63d8750f620d4 files/digest-rekall-2.2.0 65
+MD5 8dcc61818123aa129151653a36b69b0c rekall-2.2.4.ebuild 1433
+MD5 8481bbb6be2de37a452d412d6026ad18 rekall-2.2.6.ebuild 1432
+MD5 db3baa297123c5381dd83f7f0a41fdd3 rekall-2.2.3-r1.ebuild 1345
+MD5 2881a8ebe1a859df3d5284c8584a7249 ChangeLog 2372
+MD5 f16a3e9f7b22e2c204ad2e919cfd71f5 metadata.xml 217
+MD5 9ae4f2f54ccf7da85ff8a9d3f0e2306a files/digest-rekall-2.2.4 67
+MD5 122f6d9323c65180aced3587e11ad4c4 files/digest-rekall-2.2.6 65
+MD5 a65634bd4eee22dc6c63ad713231aa54 files/digest-rekall-2.2.3-r1 67
diff --git a/dev-db/rekall/metadata.xml b/dev-db/rekall/metadata.xml
index a469a870f7c1..ba1c49244b2d 100644
--- a/dev-db/rekall/metadata.xml
+++ b/dev-db/rekall/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>carlo@gentoo.org</email>
 </maintainer>
diff --git a/dev-db/rekall/rekall-2.2.3-r1.ebuild b/dev-db/rekall/rekall-2.2.3-r1.ebuild
index 8f001273ae3a..107716746a41 100644
--- a/dev-db/rekall/rekall-2.2.3-r1.ebuild
+++ b/dev-db/rekall/rekall-2.2.3-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/dev-db/rekall/rekall-2.2.3-r1.ebuild,v 1.1 2004/12/17 22:41:09 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/rekall/rekall-2.2.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit kde
 
@@ -10,8 +10,8 @@ SRC_URI="http://www.rekallrevealed.org/packages/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE="mysql odbc postgres xbase"
+KEYWORDS="x86 ~ppc amd64"
+IUSE="mysql postgres xbase"
 
 DEPEND="sys-apps/sed
 	virtual/python
@@ -33,9 +33,7 @@ src_compile() {
 	myconf="--with-gui=kde \
 		`use_enable mysql` \
 		`use_enable postgres pgsql` \
-		`use_enable xbase` \
-		`use_enable odbc` \
-		`use_enable odbc iodbc`"
+		`use_enable xbase`"
 	kde_src_compile
 }
 
diff --git a/dev-db/rekall/rekall-2.2.4.ebuild b/dev-db/rekall/rekall-2.2.4.ebuild
index ac1dc003a7c5..e460833ca6ac 100644
--- a/dev-db/rekall/rekall-2.2.4.ebuild
+++ b/dev-db/rekall/rekall-2.2.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/dev-db/rekall/rekall-2.2.4.ebuild,v 1.1 2005/06/27 20:12:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/rekall/rekall-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit kde
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.rekallrevealed.org/packages/${P}-2.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ppc x86"
 IUSE="mysql postgres xbase"
 
 DEPEND="sys-apps/sed
@@ -34,7 +34,6 @@ src_compile() {
 		`use_enable mysql` \
 		`use_enable postgres pgsql` \
 		`use_enable xbase`"
-	#use amd64 && myconf="${myconf} --enable-libsuffix=64"
 
 	kde_src_compile
 }
diff --git a/dev-db/rekall/rekall-2.2.6.ebuild b/dev-db/rekall/rekall-2.2.6.ebuild
index b0406287e98d..bc585ca70a40 100644
--- a/dev-db/rekall/rekall-2.2.6.ebuild
+++ b/dev-db/rekall/rekall-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/dev-db/rekall/rekall-2.2.6.ebuild,v 1.1 2005/10/12 14:09:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/rekall/rekall-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit kde
 
diff --git a/dev-db/slony1/ChangeLog b/dev-db/slony1/ChangeLog
index a0e91de8bc26..6312174268f8 100644
--- a/dev-db/slony1/ChangeLog
+++ b/dev-db/slony1/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for dev-db/slony1
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.1 2005/05/11 21:34:23 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/ChangeLog,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
+
+*slony1-1.1.1 (01 Oct 2005)
+
+  01 Oct 2005; Masatomo Nakano <nakano@gentoo.org> +slony1-1.1.1.ebuild:
+  Version bump.
+
+*slony1-1.1.0-r1 (13 Jul 2005)
+
+  13 Jul 2005; MATSUU Takuto <matsuu@gentoo.org> +slony1-1.1.0-r1.ebuild:
+  Added perl USE flag for --with-perltools. Bug 98200.
+
+  29 Jun 2005; Masatomo Nakano <nakano@gentoo.org> slony1-1.1.0_rc1.ebuild,
+  slony1-1.1.0.ebuild:
+  Fixed license. (#97348)
+
+*slony1-1.1.0 (27 Jun 2005)
+
+  27 Jun 2005; Masatomo Nakano <nakano@gentoo.org>
+  -slony1-1.1.0_beta4.ebuild, +slony1-1.1.0.ebuild:
+  Version bump.
+
+  16 Jun 2005; David Holm <dholm@gentoo.org> slony1-1.1.0_rc1.ebuild:
+  Added to ~ppc.
+
+*slony1-1.1.0_rc1 (15 Jun 2005)
+
+  15 Jun 2005; MATSUU Takuto <matsuu@gentoo.org> +slony1-1.1.0_rc1.ebuild:
+  Version bumped.  Added ~amd64.
 
 *slony1-1.1.0_beta4 (11 May 2005)
 
diff --git a/dev-db/slony1/Manifest b/dev-db/slony1/Manifest
index 570dcd34b652..ec4c8752ec7f 100644
--- a/dev-db/slony1/Manifest
+++ b/dev-db/slony1/Manifest
@@ -1,7 +1,9 @@
-MD5 6023df5c852c46e928ba877180835422 slony1-1.1.0_beta4.ebuild 1053
-MD5 0e7908553340bdeb1732c66bfce6c765 ChangeLog 339
+MD5 b108e943e69751b3d108e6340a9e4802 slony1-1.1.0-r1.ebuild 1309
+MD5 14644b0a1b3cf2e8dc6bca1f557e3e28 ChangeLog 1210
+MD5 b96d5e28321dd0ac2595115f91bc81ee slony1-1.1.1.ebuild 1306
 MD5 f8d3d207746da2a3cd14dcaab8daab76 metadata.xml 163
-MD5 7e0be4b4f25524dfd0d3118262a7b03c files/slony1.conf 245
-MD5 7b20d764f72e8e615bdad783d512971a files/slony1.init 614
-MD5 9b6f21cd1c27bef01c23ccfa2049b8cb files/digest-slony1-1.1.0_beta4 70
+MD5 e3bee18eaeddd92bd69aa0cf6ed87830 files/digest-slony1-1.1.1 65
+MD5 c2cc8353a0c2c29dbef6270a8d171456 files/slony1.conf 338
+MD5 49cfd44cfeff125989087bd693197d3d files/slony1.init 707
+MD5 6addf1df013f7a58d282b10d2ea18cfd files/digest-slony1-1.1.0-r1 66
 MD5 1e14c40195d02127e32f8369db843873 files/slony1_remove_jave.patch 1431
diff --git a/dev-db/slony1/files/slony1.conf b/dev-db/slony1/files/slony1.conf
index 8c82b1cde625..ab8c82da72bf 100644
--- a/dev-db/slony1/files/slony1.conf
+++ b/dev-db/slony1/files/slony1.conf
@@ -1,5 +1,5 @@
 # /etc/conf.d/slony1:
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/files/slony1.conf,v 1.1 2005/05/11 21:34:23 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/files/slony1.conf,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 # Configuration file for /etc/init.d/slony1
 
diff --git a/dev-db/slony1/files/slony1.init b/dev-db/slony1/files/slony1.init
index b6bb3d3614e6..df0606a9675b 100755
--- a/dev-db/slony1/files/slony1.init
+++ b/dev-db/slony1/files/slony1.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/files/slony1.init,v 1.1 2005/05/11 21:34:23 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/files/slony1.init,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 depend() {
 	need postgresql
diff --git a/dev-db/slony1/slony1-1.1.0-r1.ebuild b/dev-db/slony1/slony1-1.1.0-r1.ebuild
index d92822c72157..624350e587e9 100644
--- a/dev-db/slony1/slony1-1.1.0-r1.ebuild
+++ b/dev-db/slony1/slony1-1.1.0-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/dev-db/slony1/slony1-1.1.0-r1.ebuild,v 1.1 2005/07/13 15:17:20 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/slony1/slony1-1.1.1.ebuild b/dev-db/slony1/slony1-1.1.1.ebuild
index c19ba3eff364..116a12f7a540 100644
--- a/dev-db/slony1/slony1-1.1.1.ebuild
+++ b/dev-db/slony1/slony1-1.1.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/dev-db/slony1/slony1-1.1.1.ebuild,v 1.1 2005/10/01 09:56:16 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/slony1/slony1-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/sqlite/ChangeLog b/dev-db/sqlite/ChangeLog
index 12981429ee84..ab4042ef0c92 100644
--- a/dev-db/sqlite/ChangeLog
+++ b/dev-db/sqlite/ChangeLog
@@ -1,6 +1,426 @@
 # ChangeLog for dev-db/sqlite
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/ChangeLog,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
+
+  19 Nov 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  sqlite-2.8.16-r1.ebuild:
+  Stable on hppa.
+
+  17 Nov 2005; Guy Martin <gmsoft@gentoo.org> sqlite-2.8.15.ebuild,
+  sqlite-2.8.16-r1.ebuild, sqlite-2.8.16-r2.ebuild:
+  Added cd ${S} to fix patching on hppa.
+
+  07 Nov 2005; Anders Rune Jensen <arj@gentoo.org> sqlite-3.2.7.ebuild:
+  Removed stable mark on amd64. Has problems with multilib-strict
+
+  06 Nov 2005; Anders Rune Jensen <arj@gentoo.org>
+  +sqlite-3.2.7-r1.ebuild, +sqlite-2.8.16-r2.ebuild:
+  Fix #102117
+	
+  06 Nov 2005; Anders Rune Jensen <arj@gentoo.org> sqlite-3.2.7.ebuild:
+  Marked stable on amd64. Fixes #106703
+	
+  12 Oct 2005; Anders Rune Jensen <arj@gentoo.org> -sqlite-3.2.1-r1, 
+  -sqlite-3.2.1-r2, -sqlite-3.2.2, -sqlite-3.2.5, -sqlite-3.2.6, 
+  -sqlite-2.8.16:
+  Remove old versions
+
+*sqlite-3.2.7 (07 Oct 2005)
+
+  07 Oct 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.7.ebuild:
+  New release.
+
+  20 Sep 2005; Anders Rune Jensen <arj@gentoo.org> metadata.xml:
+  Remove coredumb since he has been inactive for quite a while.
+	
+*sqlite-3.2.6 (18 Sep 2005)
+
+  18 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.6.ebuild:
+  New release.
+
+*sqlite-3.2.5 (18 Sep 2005)
+
+  18 Sep 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.5.ebuild:
+  New release.
+
+  22 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> sqlite-3.2.1-r3.ebuild,
+  sqlite-3.2.2.ebuild:
+  Added ~mips.
+
+  03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> sqlite-3.2.1-r3.ebuild:
+  Stable on alpha.
+
+  18 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  sqlite-3.2.1-r3.ebuild:
+  Stable on ppc.
+
+*sqlite-3.2.2 (18 Jun 2005)
+
+  18 Jun 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.2.ebuild:
+  New release.
+
+  21 May 2005; Guy Martin <gmsoft@gentoo.org> sqlite-3.2.1-r3.ebuild:
+  Stable on hppa.
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> sqlite-3.2.1-r3.ebuild:
+  Stable on ppc64
+
+  26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sqlite-3.2.1-r3.ebuild:
+  Stable on sparc
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org>
+  sqlite-3.2.1-r3.ebuild:
+  Stable on x86 and amd64.
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org>
+  +sqlite-3.2.1-r3.ebuild, +files/sqlite-3.2.1-tcl-fix:
+  Fix #90258. Thanks to Ferris McCormick for suggestions.
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org> files/sqlite-3.2.1-data-corruption.patch:
+  Fix patch to work with cvs.
+	
+*sqlite-3.2.1-r2 (24 Apr 2005)
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.1-r2.ebuild:
+  Fix integer data corruption. Fixes #89504.
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  sqlite-3.2.1-r1.ebuild:
+  Stable on ppc.
+
+  18 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sqlite-3.2.1-r1.ebuild:
+  Stable on sparc
+
+  17 Apr 2005; Anders Rune Jensen <arj@gentoo.org> sqlite-3.2.1-r1.ebuild:
+  Stable on x86 and amd64.
+	
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  sqlite-2.8.16-r1.ebuild:
+  Stable on alpha.
+
+  09 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  sqlite-2.8.16-r1.ebuild:
+  Stable on ppc.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> sqlite-3.2.1-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> sqlite-2.8.16-r1.ebuild:
+  Stable on ppc64
+
+  05 Apr 2005; Anders Rune Jensen <arj@gentoo.org>
+  sqlite-2.8.16-r1.ebuild, sqlite-3.2.1-r1.ebuild:
+  Add useflag doc to install html documentation. This removes the
+  dependency on tcl by default. Thanks to Clinton James for the
+  suggestion. Add doc flag to 3.2.1-r1 as 3.2.1 now supports generating
+  documentation again.
+	
+  04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  sqlite-2.8.16-r1.ebuild:
+  Stable on sparc
+
+  02 Apr 2005; Anders Rune Jensen <arj@gentoo.org> -sqlite-3.2.1.ebuild,
+  -sqlite-3.1.6.ebuild, -sqlite-3.1.5.ebuild, -sqlite-3.1.3.ebuild,
+  -sqlite-3.1.2.ebuild, -sqlite-3.0.8-r1.ebuild, -sqlite-3.0.8.ebuild,
+  -sqlite-3.0.7.ebuild, -sqlite-3.0.6.ebuild, -sqlite-3.2.0.ebuild, 
+  +sqlite-2.8.16-r1, +sqlite-3.2.1-r1:
+  Mark 2.8.16-r1 stable on x86 and amd64. Fix #85744. Remove old broken 
+  sqlite3 versions. Fix manpage installation with sqlite3. Fix #36076 by
+  including patch from Sean Woods to build TCL libs.
+	
+*sqlite-3.2.1 (29 Mar 2005)
+
+  29 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.1.ebuild:
+  New version. Fixes #86858.
+
+*sqlite-3.2.0 (24 Mar 2005)
+
+  24 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.2.0.ebuild:
+  New version. Fixes #86395.
+
+*sqlite-3.1.6 (19 Mar 2005)
+
+  19 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.1.6.ebuild:
+  New version which fixes another corruption bug. I don't think 3.x
+  will be going stable anytime soon.
+
+*sqlite-3.1.5 (12 Mar 2005)
+
+  12 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.1.5.ebuild:
+  New version.
+
+  04 Mar 2005; Kito <kito@gentoo.org> sqlite-3.1.3.ebuild:
+  ~ppc-macos keyword
+
+*sqlite-3.1.3 (02 Mar 2005)
+
+  02 Mar 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.1.3.ebuild:
+  New version.
+	
+  19 Feb 2005; Anders Rune Jensen <arj@gentoo.org> sqlite-3.1.2.ebuild:
+  Fix #82438.
+
+  17 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/sqlite-2.8.16-multilib.patch, sqlite-2.8.16.ebuild,
+  sqlite-3.1.2.ebuild:
+  Stop using einstall.  Multilib fixes.
+
+*sqlite-3.1.2 (15 Feb 2005)
+
+  15 Feb 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.1.2.ebuild:
+  New stable release of the 3.1 series.
+	
+*sqlite-2.8.16 (15 Feb 2005)
+
+  15 Feb 2005; Anders Rune Jensen <arj@gentoo.org> +sqlite-2.8.16.ebuild:
+  new version. Fixes critical bug.
+	
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org> sqlite-2.8.15.ebuild:
+  Stable on amd64.
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> sqlite-2.8.15.ebuild:
+  Stable on alpha.
+
+*sqlite-3.0.8-r1 (04 Dec 2004)
+
+  04 Dec 2004; Armando Di Cianno <fafhrd@gentoo.org> +sqlite-3.0.8-r1.ebuild:
+  I have added a sqlite-3.0.8-r1 which incorporates a "nothreadsafe" USE flag,
+  and thus enables thread safety by default. I would have rather not have added
+  a "noflag" and bump the package, but this at least enforces proper behavior of
+  the library, if one where to upgrade sqlite. This had to be done as the
+  package was broken for me and many others without thread safety.
+
+  11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  sqlite-3.0.8.ebuild:
+  Readding archs that were mistakenly dropped during version bumps.
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> sqlite-3.0.8.ebuild:
+  add ~alpha and ~ia64
+
+  09 Nov 2004; Anders Rune Jensen <arj@gentoo.org> sqlite-2.8.15.ebuild:
+  Stable for x86.
+
+  09 Nov 2004; Anders Rune Jensen <arj@gentoo.org> -sqlite-3.0.5.ebuild,
+  -sqlite-2.8.11.ebuild, -sqlite-2.8.12.ebuild, -sqlite-2.8.3.ebuild:
+  Remove old versions.
+
+  09 Nov 2004; Ferris McCormick <fmccor@gentoo.org> sqlite-2.8.15.ebuild:
+  Stable for sparc.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> sqlite-2.8.15.ebuild:
+  Marked stable on mips.
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> sqlite-2.8.15.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+*sqlite-3.0.8 (29 Oct 2004)
+  29 Oct 2004; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.0.8.ebuild:
+  New release.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> sqlite-2.8.14.ebuild:
+  stable on amd64.
+
+  12 Oct 2004; Guy Martin <gmsoft@gentoo.org>
+  files/sqlite-2.8.15-alignement-fix.patch:
+  Woops, typo in the patch.
+
+  11 Oct 2004; Guy Martin <gmsoft@gentoo.org> sqlite-2.8.15.ebuild:
+  Added a alignement fix for hppa. Stable on hppa.
+
+  09 Oct 2004; Jason Wever <weeve@gentoo.org> sqlite-3.0.7.ebuild:
+  Added ~sparc keyword.
+
+*sqlite-3.0.7 (03 Oct 2004)
+  03 Oct 2004; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.0.7.ebuild:
+  New release. 3.0 is now considered stable by the sqlite hackers.
+
+  13 Sep 2004; David Holm <dholm@gentoo.org> sqlite-3.0.6.ebuild:
+  Added to ~ppc.
+
+  12 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> sqlite-3.0.6.ebuild:
+  Added ~amd64.
+
+  10 Sep 2004; Hasan Khalil <gongloo@gentoo.org> sqlite-2.8.15.ebuild:
+  Stable on macos.
+
+  06 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> sqlite-2.8.14.ebuild:
+  Stable on alpha.
+
+*sqlite-3.0.6 (05 Sep 2004)
+  05 Sep 2004; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.0.6.ebuild,
+  -sqlite-3.0.4.ebuild:
+  New beta release. 
+
+*sqlite-3.0.5 (02 Sep 2004)
+  02 Sep 2004; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.0.5.ebuild,
+  -sqlite-3.0.3.ebuild:
+  New beta release. 
+
+*sqlite-3.0.4 (23 Aug 2004)
+  23 Aug 2004; Anders Rune Jensen <arj@gentoo.org> +sqlite-3.0.4.ebuild:
+  New beta release. 
+
+  17 Aug 2004; Ferris McCormick <fmccor@gentoo.org> sqlite-2.8.14.ebuild:
+  stable for sparc.
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> metadata.xml:
+  Add myself as co-maintainer
+
+*sqlite-3.0.3 (05 Aug 2004)
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> sqlite-3.0.3.ebuild:
+  New beta release. Added to portage to help people upgrade their
+  programs to support the new branch. It's not backwards compatible with 
+  2.x, so I changed all ebuilds which depends on sqlite to
+  =dev-db/sqlite-2*. Removed all other archs than x86 as I suspect it
+  would be a good idea to let the arch people test it also. Many thanks
+  to Doug Gorley <douggorley@shaw.ca> for the bugreport and ebuild. 
+  Closes #58854.
+
+*sqlite-2.8.15 (05 Aug 2004)
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> sqlite-2.8.15.ebuild:
+  new version.
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> sqlite-2.8.14.ebuild:
+  mark as stable for x86.
+
+  03 Aug 2004; <agriffis@gentoo.org> sqlite-2.8.14.ebuild:
+  stable on ia64
+
+  08 Jul 2004; Travis Tilley <lv@gentoo.org> sqlite-2.8.14.ebuild:
+  adding back missing ~amd64 keyword
+
+*sqlite-2.8.14 (06 Jul 2004)
+
+  06 Jul 2004; Anders Rune Jensen <arj@gentoo.org> sqlite-2.8.14.ebuild:
+  new version.
+
+  06 Jul 2004; Anders Rune Jensen <arj@gentoo.org> sqlite-2.8.13.ebuild:
+  mark as stable on all platforms. Last stable was 2.8.11.
+	
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> sqlite-2.8.11.ebuild,
+  sqlite-2.8.12.ebuild, sqlite-2.8.13.ebuild, sqlite-2.8.3.ebuild:
+  sync IUSE (+nls), glibc -> libc, trim trailing whitespace
+
+  19 Jun 2004; Tom Gall <tgall@gentoo.org> sqlite-2.8.13.ebuild:
+  stable on ppc64 bug #54453
+
+  03 Jun 2004; Stephen P. Becker <geoman@gentoo.org> sqlite-2.8.11.ebuild:
+  Stable on mips.
+
+*sqlite-2.8.3 (25 May 2004)
+
+  25 May 2004; Michael Sterrett <mr_bones_@gentoo.org> sqlite-2.8.3.ebuild:
+  restore sqlite-2.8.3 for ppc
+
+  28 Mar 2004; Guy Martin <gmsoft@gentoo.org> sqlite-2.8.11.ebuild:
+  Marked stable on hppa.
+
+*sqlite-2.8.13 (16 Mar 2004)
+
+  16 Mar 2004; Tal Peer <coredumb@gentoo.org> sqlite-2.8.13.ebuild:
+  Version bump.
+
+  05 Mar 2004; <agriffis@gentoo.org> sqlite-2.8.11.ebuild,
+  sqlite-2.8.12.ebuild:
+  Mark 2.8.11 stable on alpha and ia64; add ~ia64 to 2.8.12
+
+  02 Mar 2004; Ciaran McCreesh <ciaranm@gentoo.org> sqlite-2.8.11.ebuild:
+  Stable on sparc
+
+*sqlite-2.8.12 (29 Feb 2004)
+
+  29 Feb 2004; <tal@gentoo.org> sqlite-2.8.11.ebuild, sqlite-2.8.12.ebuild:
+  Version bump, fixes bug #42242 (sorry for delay :)
+  Moved 2.8.11 to x86 stable.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> sqlite-2.8.6.ebuild:
+  stable on alpha and ia64
+
+*sqlite-2.8.11 (16 Jan 2004)
+
+  16 Jan 2004; Tal Peer <coredumb@gentoo.org> metadata.xml,
+  sqlite-2.8.11.ebuild:
+  Version bump, closes #35547
+
+  17 Dec 2003; Guy Martin <gmsoft@gentoo.org> sqlite-2.8.3.ebuild:
+  Marked stable on hppa.
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> sqlite-2.8.6.ebuild:
+  mark stable on amd64
+
+*sqlite-2.8.6 (30 Sep 2003)
+
+  30 Sep 2003; Masatomo Nakano <nakano@gentoo.org> sqlite-2.8.6.ebuild:
+  Version bump.
+
+*sqlite-2.8.5 (26 Jul 2003)
+
+  26 Jul 2003; Tal Peer <coredumb@gentoo.org> sqlite-2.8.5.ebuild:
+  Version bump.
+
+*sqlite-2.8.3 (18 Jun 2003)
+  
+  18 Jun 2003; Robin Johnson <robbat2@gentoo.org> sqlite-2.8.3.ebuild:
+  Version bump. 
+
+*sqlite-2.8.2 (20 May 2003)
+  
+  20 May 2003; Robin Johnson <robbat2@gentoo.org> sqlite-2.8.2.ebuild:
+  Version bump. Added some configure flags suggested by a user for stability.
+
+*sqlite-2.8.0 (22 Apr 2003)
+
+  22 Apr 2003: Robin Johnson <robbat2@gentoo.org> sqlite-2.8.0.ebuild:
+  bug #19477 - submission by Tal Peer <coredumb@gentoo.org>
+  Simplified ebuild a lot 
+  Added manpage installataion back into his ebuild
+ 
+*sqlite-2.7.3 (05 Nov 2002)
+  
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  11 Nov 2002: Stefan Jones <cretin@gentoo.org>:
+  Added sparc keywords
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*sqlite-2.6.3 (18 Aug 2002)
+
+  11 Nov 2002: Stefan Jones <cretin@gentoo.org>:
+  Added sparc keywords
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> sqlite-2.6.3.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  22 Jul 2002; Ryan Phillips <rphillips@gentoo.org> * :
+
+  Fixes for repoman
+  
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> sqlite-2.6.3.ebuild :
+
+  Updated version.  Submitted by Bardur Arantsson
+
+*sqlite-2.6.1 (30 Jul 2002)
+
+  30 Jul 2002; Ryan Phillips <rphillips@gentoo.org> sqlite-2.6.1.ebuild :
+
+  Updated version
+
+*sqlite-2.4.2 (21 Mar 2002)
+
+  21 Mar 2002; G.Bevin <gbevin@gentoo.org> sqlite-2.4.2.ebuild
+  files/digest-sqlite-2.4.2
+  
+  Version upgrade.
 
 *sqlite-2.2.5 (1 Feb 2002)
 
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 1f78e61db8ba..b90ee032f6d2 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -1,5 +1,23 @@
-MD5 e4ee1e59223317c18045a2859b058697 sqlite-2.8.0.ebuild 620
-MD5 c368bbd9770a4e52b33fb10fdfa8da8f sqlite-2.7.3.ebuild 964
-MD5 8c1c6f4bf69bf54fb9960efb8b67b7a6 ChangeLog 1593
-MD5 4f5e39f9c072788907392d423c0d1afe files/digest-sqlite-2.7.3 64
-MD5 b6d0c4a26df2632d5d158e7563de60c0 files/digest-sqlite-2.8.0 64
+MD5 f14f98e98aaf7459c93c28c7b4e47d39 ChangeLog 13946
+MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
+MD5 fdbecebdb331496cd81f02ea4487e430 sqlite-2.8.13.ebuild 843
+MD5 99bf2a671c91f7499255003439d5eac0 sqlite-2.8.14.ebuild 862
+MD5 6afc5fac20c52267be1b09c7b1cadfb1 sqlite-2.8.15.ebuild 979
+MD5 685abf9946c0a1d8488ce0bbf3eccc36 sqlite-2.8.16-r1.ebuild 1786
+MD5 87d575ca2d0ad2648300d9e2ac3862f1 sqlite-3.2.7.ebuild 1545
+MD5 a263109868b70b29ed7abaec05d28eed sqlite-2.8.16-r2.ebuild 1839
+MD5 2328b34bef313c5f4be5e780f9932dc3 sqlite-3.2.1-r3.ebuild 1574
+MD5 9d85746f36a561d7229a4d2652390fea sqlite-3.2.7-r1.ebuild 1597
+MD5 c35f34620d18893001720951f8ea0c73 files/digest-sqlite-2.8.13 65
+MD5 c9c200833c7c14eb4d750bb00455199e files/digest-sqlite-2.8.14 65
+MD5 b4031f19b8a32fa2b9dd4dfaf4b57ad0 files/digest-sqlite-2.8.15 65
+MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7 65
+MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r1 65
+MD5 3f0417272ef2e01ef38d27021a93aeaf files/digest-sqlite-2.8.16-r2 65
+MD5 b30bbb90979fff71122f08b8cbee4013 files/digest-sqlite-3.2.7-r1 65
+MD5 9dce926cc47853cb563ab467d1c5ba28 files/digest-sqlite-3.2.1-r3 65
+MD5 d0fc4c53a61d386992d16680140548d0 files/maketcllib.sh 879
+MD5 217c8f27a3185a30858423e31e1aa4d9 files/sqlite-2.8.15-alignement-fix.patch 538
+MD5 60fec205107aa53f0cf83d62c2300183 files/sqlite-2.8.16-multilib.patch 4038
+MD5 46cefa8dc3aa8a97c973f54cd08f0ace files/sqlite-3.2.1-data-corruption.patch 6529
+MD5 0473fa5a1fcc0a84af76122d016070e7 files/sqlite-3.2.1-tcl-fix.patch 915
diff --git a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch b/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
index 9420d1d277d1..7081ffd00323 100644
--- a/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
+++ b/dev-db/sqlite/files/sqlite-2.8.15-alignement-fix.patch
@@ -6,7 +6,7 @@ diff -uNr sqlite.orig/src/vdbeInt.h sqlite/src/vdbeInt.h
    double r;           /* Real value */
    char *z;            /* String value */
 -  char zShort[NBFS];  /* Space for short strings */
-+  char zShort[NBFS]; __attribute__ ((__aligned__(16))); /* Space for short strings */
++  char zShort[NBFS] __attribute__ ((__aligned__(16))); /* Space for short strings */
  };
  typedef struct Mem Mem;
  
diff --git a/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch b/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
index 36a6e9993411..1bfd859c9421 100644
--- a/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
+++ b/dev-db/sqlite/files/sqlite-3.2.1-data-corruption.patch
@@ -12,16 +12,7 @@ diff -uNr sqlite-3.2.1/src/vdbeaux.c sqlite-3.2.1-data-fix/src/vdbeaux.c
      if( u<=127 ) return 1;
 diff -uNr sqlite-3.2.1/test/misc5.test sqlite-3.2.1-data-fix/test/misc5.test
 --- sqlite-3.2.1/test/misc5.test	2005-03-17 04:15:40.000000000 +0100
-+++ sqlite-3.2.1-data-fix/test/misc5.test	2005-04-24 12:15:06.000000000 +0200
-@@ -13,7 +13,7 @@
- # This file implements tests for miscellanous features that were
- # left out of other test files.
- #
--# $Id: sqlite-3.2.1-data-corruption.patch,v 1.1 2005/04/24 10:27:19 arj Exp $
-+# $Id: sqlite-3.2.1-data-corruption.patch,v 1.1 2005/04/24 10:27:19 arj Exp $
- 
- set testdir [file dirname $argv0]
- source $testdir/tester.tcl
++++ sqlite-3.2.1-data-fix/test/misc5.test	2005-04-24 16:45:07.000000000 +0200
 @@ -41,4 +41,399 @@
    } {}
  }
diff --git a/dev-db/sqlite/metadata.xml b/dev-db/sqlite/metadata.xml
index dbfe84ca36cf..3963af9c6f8f 100644
--- a/dev-db/sqlite/metadata.xml
+++ b/dev-db/sqlite/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>mysql-bugs</herd>
+<herd>no-herd</herd>
+<maintainer><email>arj@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/dev-db/sqlite/sqlite-2.8.13.ebuild b/dev-db/sqlite/sqlite-2.8.13.ebuild
index 141f2ab45b98..18355cf30a33 100644
--- a/dev-db/sqlite/sqlite-2.8.13.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.13.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/dev-db/sqlite/sqlite-2.8.13.ebuild,v 1.1 2004/03/16 11:28:25 coredumb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.13.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 IUSE="nls"
 
@@ -8,11 +8,11 @@ S=${WORKDIR}/sqlite
 DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
 SRC_URI="http://www.sqlite.org/${P}.tar.gz"
 HOMEPAGE="http://www.sqlite.org"
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-lang/tcl"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+KEYWORDS="x86 ppc sparc alpha mips hppa ppc64"
 
 src_compile() {
 	local myconf
@@ -33,4 +33,3 @@ src_install () {
 	docinto html
 	dohtml doc/*.html doc/*.txt doc/*.png
 }
-
diff --git a/dev-db/sqlite/sqlite-2.8.14.ebuild b/dev-db/sqlite/sqlite-2.8.14.ebuild
index 8289a7d2504d..72cb0daff034 100644
--- a/dev-db/sqlite/sqlite-2.8.14.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.14.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/dev-db/sqlite/sqlite-2.8.14.ebuild,v 1.1 2004/07/06 15:11:47 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.14.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 IUSE="nls"
 
@@ -12,7 +12,7 @@ DEPEND="virtual/libc
 	dev-lang/tcl"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ppc64"
+KEYWORDS="x86 ~ppc sparc alpha arm ~mips ~hppa ~ppc64 amd64 ia64"
 
 src_compile() {
 	local myconf
diff --git a/dev-db/sqlite/sqlite-2.8.15.ebuild b/dev-db/sqlite/sqlite-2.8.15.ebuild
index 4ca154ec7ed6..7623f33f8fcd 100644
--- a/dev-db/sqlite/sqlite-2.8.15.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.15.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/dev-db/sqlite/sqlite-2.8.15.ebuild,v 1.1 2004/08/06 00:59:14 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.15.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+
+inherit eutils
 
 IUSE="nls"
 
@@ -12,7 +14,17 @@ DEPEND="virtual/libc
 	dev-lang/tcl"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~ppc64 ~amd64"
+KEYWORDS="x86 ppc sparc alpha arm mips hppa ~ppc64 amd64 ppc-macos"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+
+	use hppa && epatch ${FILESDIR}/${P}-alignement-fix.patch
+
+}
 
 src_compile() {
 	local myconf
diff --git a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
index dcfbc7293544..28ee841cc455 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-r1.ebuild
@@ -1,27 +1,32 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r1.ebuild,v 1.1 2005/04/02 20:11:34 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
-IUSE="nls"
-
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
 SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-HOMEPAGE="http://www.sqlite.org"
-DEPEND="virtual/libc
-	dev-lang/tcl"
-SLOT="0"
+
 LICENSE="as-is"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~arm ~mips ~hppa ~ppc64 amd64 ~ppc-macos"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sparc x86"
+IUSE="nls doc tcltk"
+
+DEPEND="doc? ( dev-lang/tcl )
+	tcltk? ( dev-lang/tcl )"
 
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+
 	use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
 
 	epatch ${FILESDIR}/${P}-multilib.patch
 
+	epunt_cxx
+
 	if use nls; then
 		ENCODING=${ENCODING-"UTF8"}
 	else
@@ -42,11 +47,17 @@ src_compile() {
 	myconf="--enable-incore-db --enable-tempdb-in-ram"
 	myconf="${myconf} `use_enable nls utf8`"
 	econf ${myconf} || die
-	emake all doc || die
+	emake all || die
 
+	if use doc; then
+	emake doc || die
+	fi
+
+	if use tcltk; then
 	cp -P ${FILESDIR}/maketcllib.sh ${S}
 	chmod +x ./maketcllib.sh
 	./maketcllib.sh
+	fi
 }
 
 src_install () {
@@ -57,10 +68,15 @@ src_install () {
 	dobin lemon
 	dodoc README VERSION
 	doman sqlite.1
+
+	if use doc; then
 	docinto html
 	dohtml doc/*.html doc/*.txt doc/*.png
+	fi
 
+	if use tcltk; then
 	mkdir ${D}/usr/lib/tclsqlite${PV}
 	cp ${S}/tclsqlite.so ${D}/usr/lib/tclsqlite${PV}/
 	cp ${S}/pkgIndex.tcl ${D}/usr/lib/tclsqlite${PV}/
+	fi
 }
diff --git a/dev-db/sqlite/sqlite-2.8.16-r2.ebuild b/dev-db/sqlite/sqlite-2.8.16-r2.ebuild
index 6cbae0aa5c40..c1a32d7e20c1 100644
--- a/dev-db/sqlite/sqlite-2.8.16-r2.ebuild
+++ b/dev-db/sqlite/sqlite-2.8.16-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/dev-db/sqlite/sqlite-2.8.16-r2.ebuild,v 1.1 2005/11/06 17:38:28 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-2.8.16-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -19,6 +19,8 @@ DEPEND="doc? ( dev-lang/tcl )
 src_unpack() {
 	unpack ${A}
 
+	cd ${S}
+
 	use hppa && epatch ${FILESDIR}/${PN}-2.8.15-alignement-fix.patch
 
 	epatch ${FILESDIR}/${P}-multilib.patch
diff --git a/dev-db/sqlite/sqlite-3.2.1-r3.ebuild b/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
index b5167b2cdcc3..2f5c1c5b93e3 100644
--- a/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.1-r3.ebuild
@@ -1,31 +1,27 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r3.ebuild,v 1.1 2005/04/24 20:53:44 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.1-r3.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils
 
-IUSE="nothreadsafe doc"
-
-DESCRIPTION="SQLite: An SQL Database Engine in a C Library."
+DESCRIPTION="SQLite: An SQL Database Engine in a C Library"
+HOMEPAGE="http://www.sqlite.org/"
 SRC_URI="http://www.sqlite.org/${P}.tar.gz"
-HOMEPAGE="http://www.sqlite.org"
 
-# Adding glibc as dependency for USE !nothreadsafe until someone can tell me
-#   if all virtual/libc's provide POSIX threads (pthread.h)
-#   - 20041203, Armando Di Cianno <fafhrd@gentoo.org>
-DEPEND="virtual/libc
-	!nothreadsafe? ( !ppc-macos? ( sys-libs/glibc ) )
-	doc? (dev-lang/tcl)"
-SLOT="3"
 LICENSE="as-is"
+SLOT="3"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ppc64 sparc x86"
+IUSE="nothreadsafe doc"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc-macos ~sparc ~x86 ~ppc64"
+DEPEND="virtual/libc
+	doc? ( dev-lang/tcl )"
 
 src_unpack() {
 	unpack ${A}
 
 	epatch ${FILESDIR}/${P}-data-corruption.patch
 	epatch ${FILESDIR}/${P}-tcl-fix.patch
+	epunt_cxx
 }
 
 src_compile() {
diff --git a/dev-db/sqlite/sqlite-3.2.7-r1.ebuild b/dev-db/sqlite/sqlite-3.2.7-r1.ebuild
index e09244819e93..6003209921ae 100644
--- a/dev-db/sqlite/sqlite-3.2.7-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.7-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/dev-db/sqlite/sqlite-3.2.7-r1.ebuild,v 1.1 2005/11/06 17:38:28 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:35 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/sqlite/sqlite-3.2.7.ebuild b/dev-db/sqlite/sqlite-3.2.7.ebuild
index f0d8a4725365..0415be430055 100644
--- a/dev-db/sqlite/sqlite-3.2.7.ebuild
+++ b/dev-db/sqlite/sqlite-3.2.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/dev-db/sqlite/sqlite-3.2.7.ebuild,v 1.1 2005/10/07 22:11:08 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.2.7.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/sqliteodbc/ChangeLog b/dev-db/sqliteodbc/ChangeLog
index b5a4aea5ca14..3c47bbb93cbf 100644
--- a/dev-db/sqliteodbc/ChangeLog
+++ b/dev-db/sqliteodbc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/sqliteodbc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.1 2005/04/22 20:27:44 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/ChangeLog,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
+
+  23 Apr 2005; Sven Wegener <swegener@gentoo.org> sqliteodbc-0.64.ebuild:
+  Fixed invalid atoms in *DEPEND.
 
 *sqliteodbc-0.64 (22 Apr 2005)
 
diff --git a/dev-db/sqliteodbc/Manifest b/dev-db/sqliteodbc/Manifest
index 65ebf4f03d48..ca40b58be8fa 100644
--- a/dev-db/sqliteodbc/Manifest
+++ b/dev-db/sqliteodbc/Manifest
@@ -1,3 +1,15 @@
-MD5 3c542be7668175839346cc26760c2c2d sqliteodbc-0.64.ebuild 724
-MD5 c0491eff8f0c25f53320c2fa4b009a1d files/digest-sqliteodbc-0.64 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8d009a4770e51e6ff124e18837a72dd0 sqliteodbc-0.64.ebuild 807
+MD5 a9f08a06353274c74d465a997340ae22 ChangeLog 456
+MD5 4948a42b1563d389b9bbbd1941e12934 metadata.xml 215
 MD5 f913bd86e7d47123636499d181ccddd8 files/sqliteodbc-0.64-gentoo.patch 1513
+MD5 c0491eff8f0c25f53320c2fa4b009a1d files/digest-sqliteodbc-0.64 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCakKfI1lqEGTUzyQRAsHSAKDTIM3GP7B437CPURKlQ5avNR153gCfdv42
+xT8q/rJqW4QbEfWXvAm5wlc=
+=EyVv
+-----END PGP SIGNATURE-----
diff --git a/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild b/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild
index cfa911b476ca..59a0fefe922c 100644
--- a/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild
+++ b/dev-db/sqliteodbc/sqliteodbc-0.64.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/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild,v 1.1 2005/04/22 20:27:44 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqliteodbc/sqliteodbc-0.64.ebuild,v 1.1.1.1 2005/11/30 10:11:41 chriswhite Exp $
 
 inherit eutils
 
@@ -14,9 +14,10 @@ KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="=dev-db/sqlite-2*
-	|| ( >=dev-db/unixODBC-2 >=libiodbc-3.0.6 )"
-
-RDEPEND=${DEPEND}
+	|| (
+		>=dev-db/unixODBC-2
+		>=dev-db/libiodbc-3.0.6
+	)"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-db/sqsh/ChangeLog b/dev-db/sqsh/ChangeLog
index 4388eba6e9be..60a2c5a7593b 100644
--- a/dev-db/sqsh/ChangeLog
+++ b/dev-db/sqsh/ChangeLog
@@ -1,9 +1,66 @@
 # ChangeLog for dev-db/sqsh
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.1 2002/12/11 23:32:48 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/ChangeLog,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> sqsh-2.1-r1.ebuild:
+  stable on amd64
+
+*sqsh-2.1.3-r1 (11 Apr 2005)
+
+  11 Apr 2005; Seemant Kulleen <seemant@gentoo.org> +sqsh-2.1.3-r1.ebuild:
+  Added patches from the new maintainer-by-proxy Richard Brown
+  <mynamewasgone@gmail.com> in bug #88343. These patches make the build system
+  a little saner, by recognising the difference between --with and --without
+  for motif. Additionally, he did a nice patch to make it obey mandir like
+  every other good package, and specify that the rc file goes into sysconfdir,
+  like every other good package.
+
+*sqsh-2.1.3 (06 Apr 2005)
+
+  06 Apr 2005; Seemant Kulleen <seemant@gentoo.org> sqsh-2.1-r1.ebuild,
+  +sqsh-2.1.3.ebuild:
+  more cleanups, and version bump thanks to: Richard Brown
+  <mynamewasgone@gmail.com> in bug #87243  Now, by the way, upstream (whoever
+  the hell they are) should invest an hour or two figuring out how to use the
+  autotools properly.  Possibly, if I'm steaming about this a little later on
+  this week/month, I'll fix it up a bit, but damn.
+
+  06 Apr 2005; Seemant Kulleen <seemant@gentoo.org> -files/config.patch,
+  sqsh-2.1-r1.ebuild:
+  cleanups and remove redundant/useless patch. Closes bug #87241 by Richard
+  Brown <mynamewasgone@gmail.com>"
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> sqsh-2.1-r1.ebuild,
+  sqsh-2.1.ebuild:
+  glibc -> libc
+
+  30 Mar 2004; Donnie Berkholz <spyderous@gentoo.org>; sqsh-2.1-r1.ebuild,
+  sqsh-2.1.ebuild:
+  Change x11-base/xfree dependency to virtual/x11.
+
+  09 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> sqsh-2.1-r1.ebuild:
+  Adding amd64 keyword. Closing #43599.
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> sqsh-2.1-r1.ebuild,
+  sqsh-2.1.ebuild:
+  fixed motif dep
+
+*sqsh-2.1-r1 (22 Sep 2003)
+
+  22 Sep 2003; Seemant Kulleen <seemant@gentoo.org> sqsh-2.1-r1.ebuild,
+  files/config.patch:
+  patched config.patch to define strcasecmp, which allows this to be used to
+  connect to a sybase database. Thanks much to: chris strom
+  <cstrom@speakeasy.net> in bug #28526
 
 *sqsh-2.1 (11 Dec 2002)
 
+  16 Apr 2003; Stefan Jones <cretin@gentoo.org> sqsh-2.1.ebuild:
+  sys-devel/ld.so is not needed in DEPEND, compiles fine without it
+
+  29 Mar 2003; Alastair Tse <liquidx@gentoo.org> sqsh-2.1.ebuild:
+  virtual/motif migration
+
   11 Dec 2002; Sean Summers <ebuild@generalprotectionfault.com> sqsh-2.1.ebuild :
 
   Initial package
diff --git a/dev-db/sqsh/Manifest b/dev-db/sqsh/Manifest
index e69de29bb2d1..bb650dfac55e 100644
--- a/dev-db/sqsh/Manifest
+++ b/dev-db/sqsh/Manifest
@@ -0,0 +1,8 @@
+MD5 ca45b9dc4752285afc55c4eb86248cd1 ChangeLog 2670
+MD5 1e775f96d6dfeba2439d8deb1b7e13cd sqsh-2.1-r1.ebuild 942
+MD5 848f7e962020305524f90eae3dff338c metadata.xml 586
+MD5 ac9a9acebef00c7a445fa7dcbb1dacd5 sqsh-2.1.3.ebuild 966
+MD5 b905a9e18256c329949a41772bab1da4 sqsh-2.1.3-r1.ebuild 970
+MD5 dd2d4502b402ce862b6f636d95e90f0a files/digest-sqsh-2.1.3 62
+MD5 19272f9055a78c6035e2f605dad0268c files/digest-sqsh-2.1-r1 64
+MD5 9e1d41d12a21ceabb8123c86b4d83d1e files/digest-sqsh-2.1.3-r1 135
diff --git a/dev-db/sqsh/metadata.xml b/dev-db/sqsh/metadata.xml
index d8b96be3c5cd..1b9d20bf4507 100644
--- a/dev-db/sqsh/metadata.xml
+++ b/dev-db/sqsh/metadata.xml
@@ -3,7 +3,16 @@
 <pkgmetadata>
 	<herd>no-herd</herd>
 	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
+		<email>mynamewasgone@gmail.com</email>
+		<name>Richard Brown</name>
+		<description>Richard is the maintainer-by-proxy for this package.
+			Bug-wranglers: please be sure to cc him on every bug report about
+			it.
+		</description>
+	</maintainer>
+	<maintainer>
+		<email>seemant@gentoo.org</email>
+		<name>Seemant Kulleen</name>
+		<description>Seemant is the proxy in question above.</description>
 	</maintainer>
 </pkgmetadata>
diff --git a/dev-db/sqsh/sqsh-2.1-r1.ebuild b/dev-db/sqsh/sqsh-2.1-r1.ebuild
index dc5178df2442..06659fd32f4b 100644
--- a/dev-db/sqsh/sqsh-2.1-r1.ebuild
+++ b/dev-db/sqsh/sqsh-2.1-r1.ebuild
@@ -1,58 +1,42 @@
-# 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/dev-db/sqsh/sqsh-2.1-r1.ebuild,v 1.1 2003/09/22 12:02:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Replacement for the venerable 'isql' program supplied by Sybase."
 HOMEPAGE="http://www.sqsh.org/"
+SRC_URI="http://www.sqsh.org/${P}-src.tar.gz"
+
 LICENSE="GPL-2"
-DEPEND="dev-db/freetds
-	readline? ( sys-libs/readline )
-	X? ( x11-base/xfree )
-	motif? ( virtual/motif )
-	virtual/glibc"
 SLOT="0"
-SRC_URI="http://www.sqsh.org/${P}-src.tar.gz"
-KEYWORDS="x86"
 IUSE="readline X motif"
+KEYWORDS="x86 amd64"
+
+DEPEND="dev-db/freetds
+	readline? ( sys-libs/readline )
+	X? ( virtual/x11 )
+	motif? ( x11-libs/openmotif )
+	virtual/libc"
 
 src_compile() {
 	export SYBASE=/usr
 
 	local myconf
 
-	use readline \
-		&& myconf="${myconf} --with-readline"
-
-	use X \
-		&& myconf="${myconf} --with-x"
-
-	use motif \
-		&& myconf="${myconf} --with-motif"
+	use motif && myconf="--with-motif"
 
-	./configure \
-		${myconf} \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+	econf \
+		$(use_with readline) \
+		$(use_with X x) \
+		${myconf} || die
 
-	patch src/config.h ${FILESDIR}/config.patch
 
 	emake SQSHRC_GLOBAL=/etc/sqshrc || die
 }
 
 src_install () {
-	make \
-		DESTDIR=${D} \
-		RPM_BUILD_ROOT=${D} \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install install.man || die
-	# fix the silly placement of sqshrc
-	mkdir -p ${D}/etc
-	mv ${D}/usr/etc/sqshrc ${D}/etc/
-	rmdir ${D}/usr/etc
+	einstall SQSHRC_GLOBAL=${D}/etc/sqshrc || die
+	make man_dir=${D}/usr/share/man install.man || die
 	dodoc COPYING INSTALL README doc/*
 }
diff --git a/dev-db/sqsh/sqsh-2.1.3-r1.ebuild b/dev-db/sqsh/sqsh-2.1.3-r1.ebuild
index 332d61a58699..4eaf1b609ff4 100644
--- a/dev-db/sqsh/sqsh-2.1.3-r1.ebuild
+++ b/dev-db/sqsh/sqsh-2.1.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/dev-db/sqsh/sqsh-2.1.3-r1.ebuild,v 1.1 2005/04/11 18:59:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 inherit eutils
 
diff --git a/dev-db/sqsh/sqsh-2.1.3.ebuild b/dev-db/sqsh/sqsh-2.1.3.ebuild
index 78fb76135b5d..37d9fb867c83 100644
--- a/dev-db/sqsh/sqsh-2.1.3.ebuild
+++ b/dev-db/sqsh/sqsh-2.1.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/dev-db/sqsh/sqsh-2.1.3.ebuild,v 1.1 2005/04/06 21:09:33 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqsh/sqsh-2.1.3.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ src_compile() {
 		$(use_with readline) \
 		$(use_with X x) \
 		${myconf} || die
-		
+
 	emake \
 		SQSHRC_GLOBAL=/etc/sqshrc || die
 }
@@ -40,5 +40,5 @@ src_install () {
 		SQSHRC_GLOBAL=${D}/etc/sqshrc || die
 
 	make man_dir=${D}/usr/share/man install.man || die
-	dodoc COPYING INSTALL README doc/*
+	dodoc INSTALL README doc/*
 }
diff --git a/dev-db/stldb4/ChangeLog b/dev-db/stldb4/ChangeLog
index 722f27b8f73b..83f454b05007 100644
--- a/dev-db/stldb4/ChangeLog
+++ b/dev-db/stldb4/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/stldb4
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/stldb4/ChangeLog,v 1.1 2004/04/13 04:27:39 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/stldb4/ChangeLog,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
+
+  21 Sep 2005; Mark Loeser <halcy0n@gentoo.org> metadata.xml:
+  Adding to cpp herd
+
+*stldb4-0.3.13 (06 Feb 2005)
+
+  06 Feb 2005; Mike Frysinger <vapier@gentoo.org> +stldb4-0.3.13.ebuild:
+  Version bump.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> stldb4-0.3.7.ebuild:
+  sync IUSE (missing)
 
 *stldb4-0.3.7 (13 Apr 2004)
 
diff --git a/dev-db/stldb4/Manifest b/dev-db/stldb4/Manifest
index 391dd6b57275..3c03eb3dae8b 100644
--- a/dev-db/stldb4/Manifest
+++ b/dev-db/stldb4/Manifest
@@ -1,4 +1,16 @@
-MD5 f057d166ea336ecbfdfebb59e7e3ea56 stldb4-0.3.7.ebuild 789
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 132abdbbac3ef47dbcf11d9d7baf413d ChangeLog 622
+MD5 92329f92aff2f9d589eb69df1fc2c9fe metadata.xml 283
+MD5 e775e6e30e72dd0129eb71cfcb7b4c68 stldb4-0.3.13.ebuild 825
+MD5 d557b4ce616f26188c6294d60b333929 stldb4-0.3.7.ebuild 817
+MD5 a0edb977afc428cf1eafc548adeaa723 files/digest-stldb4-0.3.13 67
 MD5 bc3215a0cbff8de4b5d788acc3752aa7 files/digest-stldb4-0.3.7 66
-MD5 e278aab9096d59677b60b477be54fec4 metadata.xml 287
-MD5 9e06089ae08d6c3dd54a60faeeb85f53 ChangeLog 332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMeycCRZPokWLroQRAuo0AJsHNA44MXsYe3uXf1z3qgkAC28FCACfcz0H
+HTohBRPYy3Rk9yv7aTBv84s=
+=OUl+
+-----END PGP SIGNATURE-----
diff --git a/dev-db/stldb4/metadata.xml b/dev-db/stldb4/metadata.xml
index 8d997c6fa998..e56b33c26072 100644
--- a/dev-db/stldb4/metadata.xml
+++ b/dev-db/stldb4/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>cpp</herd>
 <maintainer>
  <email>vapier@gentoo.org</email>
  <name>Mike Frysinger</name>
diff --git a/dev-db/stldb4/stldb4-0.3.13.ebuild b/dev-db/stldb4/stldb4-0.3.13.ebuild
index 322a90d4a5bc..d0c0dfa909bd 100644
--- a/dev-db/stldb4/stldb4-0.3.13.ebuild
+++ b/dev-db/stldb4/stldb4-0.3.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/dev-db/stldb4/stldb4-0.3.13.ebuild,v 1.1 2005/02/06 22:06:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/stldb4/stldb4-0.3.13.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=dev-libs/ferrisloki-2.0.3
diff --git a/dev-db/stldb4/stldb4-0.3.7.ebuild b/dev-db/stldb4/stldb4-0.3.7.ebuild
index e4b5e00123ae..1c5dba36a5dd 100644
--- a/dev-db/stldb4/stldb4-0.3.7.ebuild
+++ b/dev-db/stldb4/stldb4-0.3.7.ebuild
@@ -1,16 +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/dev-db/stldb4/stldb4-0.3.7.ebuild,v 1.1 2004/04/13 04:27:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/stldb4/stldb4-0.3.7.ebuild,v 1.1.1.1 2005/11/30 10:11:24 chriswhite Exp $
 
 inherit flag-o-matic
 
-DESCRIPTION=""
+DESCRIPTION="a nice C++ wrapper for db4"
 HOMEPAGE="http://witme.sourceforge.net/libferris.web/"
 SRC_URI="mirror://sourceforge/witme/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=dev-libs/ferrisloki-2.0.3
 	>=dev-libs/libferrisstreams-0.3.6
diff --git a/dev-db/tinycdb/ChangeLog b/dev-db/tinycdb/ChangeLog
index 58607f9107de..1720e74c1910 100644
--- a/dev-db/tinycdb/ChangeLog
+++ b/dev-db/tinycdb/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-db/tinycdb
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/ChangeLog,v 1.1 2004/08/19 08:46:00 hattya Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> tinycdb-0.74.ebuild:
+  Stable on ppc.
+
+  17 Oct 2004; Akinori Hattori <hattya@gentoo.org> tinycdb-0.74.ebuild:
+  stable on ia64.
+
+  19 Sep 2004; Akinori Hattori <hattya@gentoo.org> tinycdb-0.74.ebuild:
+  stable on x86.
+
+  17 Sep 2004; Akinori Hattori <hattya@gentoo.org> tinycdb-0.74.ebuild:
+  add ~ia64.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> tinycdb-0.74.ebuild:
+  Added to ~ppc.
 
 *tinycdb-0.74 (19 Aug 2004)
 
diff --git a/dev-db/tinycdb/Manifest b/dev-db/tinycdb/Manifest
index 8746aa181411..190fc2d13eca 100644
--- a/dev-db/tinycdb/Manifest
+++ b/dev-db/tinycdb/Manifest
@@ -1,2 +1,5 @@
-MD5 6860a2d5e17c74bee4c12ab019299bad tinycdb-0.74.ebuild 744
+MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230
+MD5 b5ec3055be8b732593158ee354b1d8e9 ChangeLog 814
+MD5 d035fdc4aa70a2bc69bdba98b115fe39 tinycdb-0.74.ebuild 766
+MD5 244663b6896ea4d20caec08ea5e0cba3 files/tinycdb-libbase.diff 385
 MD5 5135db2bb58eb563213ef9273329cd9f files/digest-tinycdb-0.74 63
diff --git a/dev-db/tinycdb/tinycdb-0.74.ebuild b/dev-db/tinycdb/tinycdb-0.74.ebuild
index 45d554f8b7bc..fec0cac9242d 100644
--- a/dev-db/tinycdb/tinycdb-0.74.ebuild
+++ b/dev-db/tinycdb/tinycdb-0.74.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/dev-db/tinycdb/tinycdb-0.74.ebuild,v 1.1 2004/08/19 08:46:00 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tinycdb/tinycdb-0.74.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.corpit.ru/mjt/tinycdb.html"
 SRC_URI="http://www.corpit.ru/mjt/tinycdb/${P}.tar.gz"
 
 LICENSE="public-domain"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ia64"
 SLOT="0"
 
 DEPEND=""
diff --git a/dev-db/tora/ChangeLog b/dev-db/tora/ChangeLog
index e77115b29158..7c45c3920ba4 100644
--- a/dev-db/tora/ChangeLog
+++ b/dev-db/tora/ChangeLog
@@ -1,8 +1,208 @@
 # ChangeLog for dev-db/tora
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.1 2002/08/06 08:04:42 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/ChangeLog,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
-*unixODBC-2.0.6 (6 Aug 2002)
+  14 Oct 2005; Aron Griffis <agriffis@gentoo.org> tora-1.3.18.ebuild:
+  Mark 1.3.18 stable on alpha
+
+  07 Oct 2005; Don Seiler <rizzo@gentoo.org> tora-1.3.18.ebuild:
+  Stable on x86
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> tora-1.3.16-r1.ebuild:
+  Mark 1.3.16-r1 stable on alpha
+
+*tora-1.3.18 (01 Sep 2005)
+
+  01 Sep 2005; Don Seiler <rizzo@gentoo.org> +tora-1.3.18.ebuild:
+  Version bump
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> tora-1.3.16.ebuild,
+  tora-1.3.16-r1.ebuild:
+  Fix qt dep
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> tora-1.3.16-r1.ebuild:
+  stable on amd64
+
+*tora-1.3.16-r1 (15 Apr 2005)
+
+  15 Apr 2005; Don Seiler <rizzo@gentoo.org>
+  +files/tora-1.3.16-configure-no_oracle.diff,
+  +files/tora-1.3.16-sh-no_oracle.diff, +tora-1.3.16-r1.ebuild:
+  Patch to allow tora building/running without Oracle.  Closes bug #85646.
+
+  08 Mar 2005; Don Seiler <rizzo@gentoo.org>
+  -files/tora-1.3.14.1-connection-memleak.diff,
+  -files/tora-1.3.14.1-invalidobjects.diff,
+  -files/tora-1.3.14.1-noblockquery.diff,
+  -files/tora-1.3.14.1-oracleextract.diff, -files/tora-1.3.14.1-race.patch,
+  -files/tora-1.3.14.1-resultcontent-dtor.diff,
+  -files/tora-1.3.14.1-tooltip-memleaks.diff,
+  -files/tora-1.3.14.1-triggers.diff, -files/tora-1.3.15-configure.diff,
+  -tora-1.3.14.1-r1.ebuild, -tora-1.3.14.1-r2.ebuild,
+  -tora-1.3.15-r1.ebuild, -tora-1.3.15.ebuild, tora-1.3.16.ebuild:
+  Stable on x86 and removing obsoletes
+
+*tora-1.3.16 (04 Mar 2005)
+
+  04 Mar 2005; Don Seiler <rizzo@gentoo.org> +tora-1.3.16.ebuild:
+  Version bump
+
+*tora-1.3.15-r1 (21 Feb 2005)
+
+  21 Feb 2005; Don Seiler <rizzo@gentoo.org>
+  +files/tora-1.3.15-configure.diff, +tora-1.3.15-r1.ebuild:
+  Configure patch for Bug #82550.  Thanks to Nuno Araujo.
+
+*tora-1.3.15 (17 Feb 2005)
+
+  17 Feb 2005; Don Seiler <rizzo@gentoo.org> +tora-1.3.15.ebuild:
+  Version bump
+
+  29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> tora-1.3.14.1-r1.ebuild,
+  tora-1.3.14.1-r2.ebuild:
+  Proper usage of kde eclasses, to make sure KDEDIR is defined (#33079).
+
+*tora-1.3.14.1-r2 (11 Nov 2004)
+
+  11 Nov 2004; Don Seiler <rizzo@gentoo.org>
+  +files/tora-1.3.14.1-connection-memleak.diff,
+  +files/tora-1.3.14.1-noblockquery.diff,
+  +files/tora-1.3.14.1-oracleextract.diff,
+  +files/tora-1.3.14.1-resultcontent-dtor.diff,
+  +files/tora-1.3.14.1-tooltip-memleaks.diff, +tora-1.3.14.1-r2.ebuild:
+  More patches.  Thanks Volker Goetz
+
+*tora-1.3.14.1-r1 (29 Oct 2004)
+
+  29 Oct 2004; Don Seiler <rizzo@gentoo.org>
+  +files/tora-1.3.14.1-invalidobjects.diff, +files/tora-1.3.14.1-race.patch,
+  +files/tora-1.3.14.1-triggers.diff, -tora-1.3.13.ebuild,
+  +tora-1.3.14.1-r1.ebuild, -tora-1.3.14.1.ebuild:
+  New revision with some patches for triggers and invalid objects. Pruning old
+  versions
+
+  21 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> tora-1.3.13.ebuild,
+  tora-1.3.14.1.ebuild:
+  fix inherit line
+
+  06 Jul 2004; Don Seiler <rizzo@gentoo.org> -tora-1.3.13-r1.ebuild,
+  -tora-1.3.14.ebuild:
+  Pruning obsoleteness
+
+*tora-1.3.14.1 (03 Jul 2004)
+
+  03 Jul 2004; Don Seiler <rizzo@gentoo.org> +tora-1.3.14.1.ebuild:
+  Version bump
+
+*tora-1.3.14 (29 Jun 2004)
+
+  29 Jun 2004; Don Seiler <rizzo@gentoo.org> +tora-1.3.14.ebuild:
+  Version bump
+
+*tora-1.3.13-r1 (28 Jun 2004)
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org> +tora-1.3.13-r1.ebuild:
+  Changing to 'oracle' USE flag and not using monolithic builds since it seems
+  to work without them.
+
+  10 Jun 2004; Don Seiler <rizzo@gentoo.org> tora-1.3.13.ebuild:
+  Fixing USE usage, thanks to agriffis and vapier for the science.
+
+  20 Apr 2004; Don Seiler <rizzo@gentoo.org>; tora-1.3.13.ebuild:
+  Adding debug support
+
+  03 Apr 2004; Don Seiler <rizzo@gentoo.org>; tora-1.3.13.ebuild:
+  Marking stable in x86
+
+  23 Jan 2004; Don Seiler <rizzo@gentoo.org>; tora-1.3.13.ebuild:
+  Fixes borrowed from KDE to avoid Qt errors.  Thanks to Volker Goetz
+
+  22 Jan 2004; Don Seiler <rizzo@gentoo.org>; tora-1.3.11-r2.ebuild,
+  tora-1.3.12.ebuild, tora-1.3.13.ebuild:
+  KDE support only requires kdelibs, not kdebase.
+
+*tora-1.3.13 (20 Jan 2004)
+
+  20 Jan 2004; Don Seiler <rizzo@gentoo.org>; tora-1.3.13.ebuild:
+  Version bump
+
+  09 Dec 2003; Seemant Kulleen <seemant@gentoo.org> tora-1.3.10.ebuild,
+  tora-1.3.11-r1.ebuild, tora-1.3.11-r2.ebuild, tora-1.3.11.ebuild,
+  tora-1.3.12.ebuild, tora-1.3.8.ebuild, tora-1.3.9.2.ebuild:
+  removed old crufty versions and added KEYWORDS
+
+  08 Dec 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.12.ebuild:
+  Bumping 1.3.12 to stable x86
+
+  11 Nov 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.11-r2.ebuild:
+  Added IUSE var for current stable version
+
+*tora-1.3.12 (11 Nov 2003)
+
+  11 Nov 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.12.ebuild:
+  Version bump
+
+  27 Aug 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.10.ebuild,
+  tora-1.3.11-r1.ebuild, tora-1.3.11-r2.ebuild, tora-1.3.11.ebuild,
+  tora-1.3.9.2.ebuild:
+  Adding dodoc for TOra documentation files.  tora-1.3.11-r2 is stable.
+
+*tora-1.3.11-r2 (26 Aug 2003)
+
+  26 Aug 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.11-r2.ebuild,
+  files/tora-clipboard.patch:
+  Adding patch for middle-mouse pasting from clipboard.
+
+*tora-1.3.11-r1 (19 Aug 2003)
+
+  19 Aug 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.11-r1.ebuild,
+  files/tora-index-segfault.patch:
+  Patch to fix tora index tab crashing bug.  TOra sf.net bug #784124
+
+*tora-1.3.11 (11 Aug 2003)
+
+  11 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>; tora-1-3-11.ebuild:
+  Version bump.
+
+*tora-1.3.10 (25 Jul 2003)
+
+  25 Jul 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.10.ebuild:
+  Version bump.
+
+  25 Jul 2003; Don Seiler <rizzo@gentoo.org>; tora-1.3.9.2.ebuild:
+  Depends only on kdebase, not full kde.  No version bump.
+
+  14 May 2003; Patrick Kursawe <phosphan@gentoo.org> tora-1.3.7.ebuild
+  tora-1.3.6.1.ebuild files/digest-tora-1.3.6.1 files/digest-tora-1.3.7
+  files/tora-1.3.6.1.patch :
+  Removed because of newer stable version and bug #17035.
+
+  12 May 2003; Patrick Kursawe <phosphan@gentoo.org> tora-1.3.9.2.ebuild:
+  Marked as stable for x86
+
+  22 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> :
+  Kicked out the mysql check which is supposed to have no effect with Qt 3.
+  No version bump.
+
+*tora-1.3.9.2 (22 Apr 2003)
+
+  22 Apr 2003; Patrick Kursawe <phosphan@gentoo.org> :
+  Version bump, cleaned up dependencies
+  Closing bug #15398
+
+*tora-1.3.8 (31 Oct 2002)
+
+  31 Oct 2002; Ryan Phillips <rphillips@gentoo.org> :
+  Version bump
+  x86 Masked
+
+*tora-1.3.7 (18 Aug 2002)
+
+  18 Aug 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  New version
+
+*tora-1.3.6.1 (6 Aug 2002)
 
   6 Aug 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
   
diff --git a/dev-db/tora/Manifest b/dev-db/tora/Manifest
index e27b473d3455..c5dc5de510d7 100644
--- a/dev-db/tora/Manifest
+++ b/dev-db/tora/Manifest
@@ -1,10 +1,20 @@
-MD5 d7773344200693e9ca9c64cd5c062a55 tora-1.3.6.1.ebuild 1183
-MD5 65310eabe1ad17c7f0a09fc99b134c3b tora-1.3.8.ebuild 1695
-MD5 a8a2a5d4cda270d1e3ec833aeaf9a694 tora-1.3.9.2.ebuild 1424
-MD5 b4746cf7a99db005e8a3c51b140fd271 ChangeLog 1063
-MD5 8f6e10065f5b2ee68338781b0cca4494 tora-1.3.7.ebuild 1182
-MD5 f3bd66e811bd9c38f24eb365baa508de files/digest-tora-1.3.6.1 71
-MD5 94ba94945d843ea598f9b63230f31e8d files/digest-tora-1.3.9.2 71
-MD5 9c98e02baefc21d09a69c6b92bcdbef4 files/digest-tora-1.3.7 69
-MD5 2423c0fe371fcafe2e4a978a8566afaa files/digest-tora-1.3.8 69
-MD5 9a07c66011e094255111073e6b8ae0a4 files/tora-1.3.6.1.patch 287
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8af3460a0d4e1da178788766914aa22e tora-1.3.18.ebuild 1693
+MD5 bda8803c4adc9cf0b308b71157891f05 metadata.xml 536
+MD5 c04d6ea9e8358a0642cd97c00aafe050 ChangeLog 7203
+MD5 9d61e3565065f86729ea6f2ec5fcd736 tora-1.3.16-r1.ebuild 1727
+MD5 c4b61bf1c5edd0b69d9ba4d977ab8e48 tora-1.3.16.ebuild 1576
+MD5 0b13d1a7a8370a01657623ade86d1c0b files/tora-1.3.16-sh-no_oracle.diff 611
+MD5 e7b421c2548859407e95274c02f11b70 files/digest-tora-1.3.18 64
+MD5 360385b94626738c4ea70afa2cc2ed56 files/digest-tora-1.3.16-r1 64
+MD5 360385b94626738c4ea70afa2cc2ed56 files/digest-tora-1.3.16 64
+MD5 515605f39cc89ed7f4e3efb14ae9bb59 files/tora-1.3.16-configure-no_oracle.diff 2153
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDTwAkJrHF4yAQTrARAqeaAKCoVsS8ZJDg4NbwyFmcmYmaQVXpvgCfd4UA
+/8Al9ChHgSIY3/jLWG981TE=
+=db+v
+-----END PGP SIGNATURE-----
diff --git a/dev-db/tora/tora-1.3.16-r1.ebuild b/dev-db/tora/tora-1.3.16-r1.ebuild
index 7dfcc781cfbf..c4b12865d6e1 100644
--- a/dev-db/tora/tora-1.3.16-r1.ebuild
+++ b/dev-db/tora/tora-1.3.16-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/dev-db/tora/tora-1.3.16-r1.ebuild,v 1.1 2005/04/15 14:23:22 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.16-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit debug eutils kde-functions
 
@@ -11,9 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="alpha amd64 ~hppa ~ppc ~sparc x86"
 
-DEPEND=">=x11-libs/qt-3.0.0
+DEPEND="=x11-libs/qt-3*
 	dev-lang/perl
 	kde? ( >=kde-base/kdelibs-3.1 )"
 
diff --git a/dev-db/tora/tora-1.3.16.ebuild b/dev-db/tora/tora-1.3.16.ebuild
index 4e893876e3ec..7dabb539f3ed 100644
--- a/dev-db/tora/tora-1.3.16.ebuild
+++ b/dev-db/tora/tora-1.3.16.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/dev-db/tora/tora-1.3.16.ebuild,v 1.1 2005/03/04 16:09:45 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.16.ebuild,v 1.1.1.1 2005/11/30 10:11:49 chriswhite Exp $
 
 inherit debug eutils kde-functions
 
@@ -11,9 +11,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 
-DEPEND=">=x11-libs/qt-3.0.0
+DEPEND="=x11-libs/qt-3*
 	dev-lang/perl
 	kde? ( >=kde-base/kdelibs-3.1 )"
 
diff --git a/dev-db/tora/tora-1.3.18.ebuild b/dev-db/tora/tora-1.3.18.ebuild
index b89c661858bd..f8ea00b2e1d8 100644
--- a/dev-db/tora/tora-1.3.18.ebuild
+++ b/dev-db/tora/tora-1.3.18.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/dev-db/tora/tora-1.3.18.ebuild,v 1.1 2005/09/01 03:21:20 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/tora/tora-1.3.18.ebuild,v 1.1.1.1 2005/11/30 10:11:50 chriswhite Exp $
 
 inherit debug eutils kde-functions
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="alpha ~amd64 ~hppa ~ppc ~sparc x86"
 
 DEPEND="=x11-libs/qt-3*
 	dev-lang/perl
diff --git a/dev-db/unixODBC/ChangeLog b/dev-db/unixODBC/ChangeLog
index 7a0c77cb1d9e..8db2c796af15 100644
--- a/dev-db/unixODBC/ChangeLog
+++ b/dev-db/unixODBC/ChangeLog
@@ -1,7 +1,189 @@
 # ChangeLog for dev-db/unixODBC
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/ChangeLog,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Mark 2.2.11-r1 stable on ia64
+
+  02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Stable on sh.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Stable on mips.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Mark 2.2.11-r1 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  Stable on ppc64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> unixODBC-2.2.11-r1.ebuild:
+  add ~ia64
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Stable on ppc.
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  unixODBC-2.2.11-r1.ebuild:
+  Stable on sparc
+
+  12 Aug 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild:
+  Bump to x86 stable
+
+*unixODBC-2.2.11-r1 (12 Aug 2005)
+
+  12 Aug 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/unixODBC-2.2.11-Makefile.am.patch, +unixODBC-2.2.11-r1.ebuild:
+  Add a patch to fix a compilation issue
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> unixODBC-2.2.11.ebuild:
+  Fix qt dep
+
+*unixODBC-2.2.11 (16 Jul 2005)
+
+  16 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/unixODBC-2.2.11-configure.in.patch, +unixODBC-2.2.11.ebuild:
+  Version bump thanks to Russell Chait. Fixes bug #77508
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
+  Fix qt dep
+
+  12 Jun 2005; Sven Wegener <swegener@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.2.6.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.8.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  29 May 2005; Danny van Dyk <kugelfang@gentoo.org> unixODBC-2.2.8.ebuild:
+  BUG #94262(multilib-strict) fixed as of unixODBC-2.2.8.
+
+  10 May 2005; Carsten Lohrke <carlo@gentoo.org> unixODBC-2.0.8.ebuild:
+  removed Qt 2 support
+
+  08 Apr 2005; Spider <spider@gentoo.org> unixODBC-2.2.6.ebuild:
+  Ugh, Dumb fix. Commited from the wrong overlay :(
+  -now- it works.
+
+  07 Apr 2005; Spider <spider@gentoo.org> unixODBC-2.2.6.ebuild:
+  Fix for bug 86936. ( X headers moved location )
+
+  06 Feb 2005; <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  added dusan cerhaty's fix for QT and finding X libraries. #79620
+
+  07 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> unixODBC-2.2.8.ebuild:
+  Fix libtool version mismatch for bug 74642.
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> unixODBC-2.2.8.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  glibc -> libc
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> unixODBC-2.2.8.ebuild:
+  stable on ppc64, bug# 53766
+
+  02 Jun 2004; Aron Griffis <agriffis@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  Fix use invocation
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> unixODBC-2.2.8.ebuild:
+  Added s390 keywords
+
+  23 Mar 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.0.8.ebuild,
+  unixODBC-2.2.2.ebuild, unixODBC-2.2.6-r1.ebuild, unixODBC-2.2.6.ebuild,
+  unixODBC-2.2.8.ebuild:
+  For 2.2.8, masked the qt/gnome-libs interface for unixODBC until qt stuff can
+  be sorted out on mips.
+
+  04 Apr 2004; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  I hope this fixes people's problems with the unixODBC build process. #42711
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.2.8.ebuild:
+  Forgot gnuconfig
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> unixODBC-2.2.8.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps (this package still needs
+  qt and gnome-libs, but I can't test those right now, will keyword later).
+
+*unixODBC-2.2.8 (19 Feb 2004)
+
+  19 Feb 2004; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.8.ebuild:
+  version bump
+
+  10 Feb 2004; root <root@gentoo.org> unixODBC-2.2.6-r1.ebuild:
+  changed USE var from gtk to gnome and tweaked dependency. Fixes #34916
+
+*unixODBC-2.2.6-r1 (10 Feb 2004)
+
+  10 Feb 2004; root <root@gentoo.org> unixODBC-2.2.6-r1.ebuild:
+  Added William Blew's patch. Bug #35570
+
+  08 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> unixODBC-2.2.6.ebuild:
+  bump to ppc stable
+
+  07 Jan 2004; <agriffis@gentoo.org> unixODBC-2.2.6.ebuild:
+  stable on ia64
+
+  16 Dec 2003; Guy Martin <gmsoft@gentoo.org> unixODBC-2.2.6.ebuild:
+  Marked stable on hppa.
+
+  19 Dec 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  Added Olivier fixes for gODBCConfig
+
+  15 Dec 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  added Cory Visi's modified ebuild to correct the dependecy problems with
+  gODBCconfig. #35889
+
+  04 Dec 2003; Jason Wever <weeve@gentoo.org> unixODBC-2.2.6.ebuild:
+  Marked stable to fix dependency borkage.
+
+  01 Dec 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  Added Jonathan Nall's gtk enabled ebuild.
+
+*unixODBC-2.2.6 (21 Nov 2003)
+
+  21 Nov 2003; <rphillips@gentoo.org> unixODBC-2.2.6.ebuild:
+  Version bump due to the QT version within portage
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> unixODBC-2.2.2.ebuild:
+  cleanup ebuild slightly
+
+  10 Jun 2003; Will Woods <wwoods@gentoo.org> unixODBC-2.0.6.ebuild,
+  unixODBC-2.0.8.ebuild, unixODBC-2.2.2.ebuild:
+  Added alpha to KEYWORDS
+
+  21 May 2003; Jason Wever <weeve@gentoo.org> unixODBC-2.0.6.ebuild:
+  Added sparc to keywords.
+
+*unixODBC-2.2.2 (9 Jul 2002)
+
+  31 Jul 2003; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.2.ebuild:
+  Fixes #23609. yac patch
+
+  11 Mar 2003; Guy Matrin <gmsoft@gentoo.org> unixODBC-2.2.2.ebuild,
+  unixODBC-2.0.8.ebuild, unixODBC-2.0.6.ebuild :
+  Added hppa to keywords.
+
+  07 Feb 2003; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.0.6.ebuild :
+  Fixes #13166
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> unixODBC-2.0.6.ebuild
+*unixODBC-2.0.8.ebuild : 
+ 
+  Added ppc to KEYWORDS.
+
+  19 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> unixODBC-2.2.2.ebuild :
+
+  Added ppc to KEYWORDS.
+
+  9 Jul 2002; Ryan Phillips <rphillips@gentoo.org> unixODBC-2.2.2.ebuild :
+
+  New version
+  
 *unixODBC-2.0.6 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index bdb1df0b0eb3..749ca809c38f 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,7 +1,20 @@
-MD5 70e96ca01d6ef64fd4e408c66286a139 ChangeLog 1264
-MD5 b2a3232384bcac11b5ef78a33b21f0b8 unixODBC-2.0.6.ebuild 1463
-MD5 858a3658e81a3c6bb02185edad0947a3 unixODBC-2.0.8.ebuild 1197
-MD5 a97aea0178c0c209a6a1258982ca7655 unixODBC-2.2.2.ebuild 1335
-MD5 c42b71d136e76c906ee32229e4ac81f8 files/digest-unixODBC-2.0.6 67
+MD5 83a56fac1dc29fabea067942e93f768f unixODBC-2.2.8.ebuild 2083
+MD5 059733ad92a101895ce18a1120b6eb55 metadata.xml 225
+MD5 7956dac74a0516140e437590070a0150 unixODBC-2.2.6-r1.ebuild 1638
+MD5 293042d0e3639d3f8a5ed27db8667aec ChangeLog 6948
+MD5 b9f4602957a14f85748533d4f1fcfd4b unixODBC-2.2.6.ebuild 1566
+MD5 eea61e477011ec918b75ba766aaad67a unixODBC-2.0.8.ebuild 969
+MD5 6b993e56b0c08a88fccb44abfc1ed502 unixODBC-2.2.2.ebuild 1282
+MD5 fa5c8601aa8d0ca9486efb4204c4b962 unixODBC-2.2.11.ebuild 1943
+MD5 6f1c205f0fdee076797c79ad0b232532 unixODBC-2.2.11-r1.ebuild 1991
+MD5 9e8b6228770e807090916883a6903351 files/unixODBC-2.2.11-Makefile.am.patch 1295
 MD5 f383c7806ba5f687ba55d5f1bc6a36aa files/digest-unixODBC-2.0.8 67
+MD5 a60388d8cb9cb0dca3df5429fb364051 files/digest-unixODBC-2.2.8 67
+MD5 ffd3cee4e2a1f6dffc130557ccda934b files/gentoo-yac.diff 316
 MD5 0f7614b93d6ede252ed2f7d7ff1aac90 files/digest-unixODBC-2.2.2 67
+MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6 67
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.11-configure.in.patch 239
+MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11 68
+MD5 89baf6f14a595b00635ca0b91ee525de files/unixODBC-2.2.6-configure.in.patch 239
+MD5 4baf7bca71abaad73ebb6a576517f435 files/digest-unixODBC-2.2.11-r1 68
+MD5 4eaaa819fc28ee784da166d14e9f7fad files/digest-unixODBC-2.2.6-r1 67
diff --git a/dev-db/unixODBC/files/digest-unixODBC-2.0.8 b/dev-db/unixODBC/files/digest-unixODBC-2.0.8
index 0462b8c50f1c..b4909ff2ba22 100644
--- a/dev-db/unixODBC/files/digest-unixODBC-2.0.8
+++ b/dev-db/unixODBC/files/digest-unixODBC-2.0.8
@@ -1 +1 @@
-MD5 8b86e29adc2f3ff0713cde9c1a20c5ec unixODBC-2.0.8.tar.gz
+MD5 8b86e29adc2f3ff0713cde9c1a20c5ec unixODBC-2.0.8.tar.gz 1626832
diff --git a/dev-db/unixODBC/unixODBC-2.0.8.ebuild b/dev-db/unixODBC/unixODBC-2.0.8.ebuild
index cc5309c95ca0..943ef4340582 100644
--- a/dev-db/unixODBC/unixODBC-2.0.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.0.8.ebuild
@@ -1,46 +1,43 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Your Name <your email>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.0.8.ebuild,v 1.1 2001/07/01 21:56:57 achim Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
 DESCRIPTION="ODBC Interface for Linux"
-SRC_URI="http://www.unixodbc.org/${A}"
-HOMEPAGE="http://www.unixodbc.org"
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 
-DEPEND="virtual/glibc
-        >=sys-libs/readline-4.1
-        >=sys-libs/ncurses-5.2
-        qt? ( >=x11-libs/qt-x11-2.3.0 )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa ~alpha"
+IUSE=""
 
-src_unpack() {
-
-    unpack ${A}
-    cd ${S}
-    cp Makefile.in Makefile.orig
-    sed -e "s:touch :touch \${DESTDIR}/:" Makefile.orig > Makefile.in
+DEPEND="virtual/libc
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	cp Makefile.in Makefile.orig
+	sed -e "s:touch :touch \${DESTDIR}/:" Makefile.orig > Makefile.in
 }
+
 src_compile() {
-    local myconf
-    if [ "`use qt`" ]
-    then
-      myconf="--enable-gui=yes"
-    else
-      myconf="--enable-gui=no"
-    fi
-    try ./configure --prefix=/usr --sysconfdir=/etc/unixODBC --host=${CHOST} ${myconf}
+	local myconf="--enable-gui=no"
 
-    try make
+	./configure --host=${CHOST} \
+		    --prefix=/usr \
+		    --sysconfdir=/etc/unixODBC	 \
+		    ${myconf} || die
 
+	make || die
 }
 
-src_install () {
+src_install() {
+	make DESTDIR=${D} install || die
 
-    try make DESTDIR=${D} install
-    dodoc AUTHORS COPYING ChangeLog NEWS README*
-    cp -a doc ${D}/usr/share/doc/${PF}/html
-    find ${D}/usr/share/doc/${PF}/html -name "Makefile*" -exec rm {} \;
-    prepalldocs
+	dodoc AUTHORS COPYING ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
+	prepalldocs
 }
diff --git a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
index 102756922669..64bcb924d72d 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.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/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.1 2005/08/12 13:25:50 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha ~amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE="qt gnome"
 
 DEPEND="virtual/libc
diff --git a/dev-db/unixODBC/unixODBC-2.2.11.ebuild b/dev-db/unixODBC/unixODBC-2.2.11.ebuild
index f7db36503e60..59271f62ab93 100644
--- a/dev-db/unixODBC/unixODBC-2.2.11.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.11.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/dev-db/unixODBC/unixODBC-2.2.11.ebuild,v 1.1 2005/07/16 00:10:47 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.11.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -10,14 +10,14 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~s390 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="qt gnome"
 
 DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
 	gnome? ( gnome-base/gnome-libs )
-	qt? ( >=x11-libs/qt-3.0* )"
+	qt? ( =x11-libs/qt-3* )"
 
 # the configure.in patch is required for 'use qt'
 src_unpack() {
@@ -27,8 +27,10 @@ src_unpack() {
 	# braindead check in configure fails - hack approach
 	epatch ${FILESDIR}/${P}-configure.in.patch
 
-	libtoolize --copy --force || die "libtoolize failed"
-	autoconf || die "autoconf failed"
+	aclocal && \
+	libtoolize -c -f && \
+	automake && \
+	autoconf || die "autotools failed"
 }
 
 src_compile() {
diff --git a/dev-db/unixODBC/unixODBC-2.2.2.ebuild b/dev-db/unixODBC/unixODBC-2.2.2.ebuild
index 42f110cb5283..8f4ad5cd3151 100644
--- a/dev-db/unixODBC/unixODBC-2.2.2.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.2.ebuild
@@ -1,16 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.2.ebuild,v 1.1 2002/07/09 18:41:21 rphillips Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.2.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="ODBC Interface for Linux"
+HOMEPAGE="http://www.unixodbc.org/"
 SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
-HOMEPAGE="http://www.unixodbc.org"
-DEPEND="virtual/glibc
-		>=sys-libs/readline-4.1
-		>=sys-libs/ncurses-5.2
-		qt? ( >=x11-libs/qt-3.0* )"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa ~alpha amd64"
+IUSE="qt"
+
+DEPEND="virtual/libc
+	>=sys-libs/readline-4.1
+	>=sys-libs/ncurses-5.2
+	qt? ( =x11-libs/qt-3* )"
 
 src_unpack() {
 	unpack ${A}
@@ -19,31 +25,31 @@ src_unpack() {
 	# need to edit the file to make it DESTDIR sensitive.
 	cp Makefile.in Makefile.orig
 	sed -e "s:touch :touch \${DESTDIR}/:" -e "s:mkdir -p :mkdir -p \${DESTDIR}/:" Makefile.orig > Makefile.in
+	epatch ${FILESDIR}/gentoo-yac.diff
 }
 
 src_compile() {
 	local myconf
-
-	if [ "`use qt`" ]
-	then
+	if use qt ; then
 		myconf="--enable-gui=yes"
 	else
 		myconf="--enable-gui=no"
 	fi
 
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc/unixODBC				\
-		    ${myconf} || die
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc/unixODBC \
+		${myconf} || die
 
 	make || die
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README*
-	cp -a doc ${D}/usr/share/doc/${PF}/html
-	find ${D}/usr/share/doc/${PF}/html -name "Makefile*" -exec rm {} \;
+	dodoc AUTHORS ChangeLog NEWS README*
+	find doc/ -name "Makefile*" -exec rm '{}' \;
+	dohtml doc/*
 	prepalldocs
 }
diff --git a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
index 6ea949529f3a..00b9dff8a99a 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild
@@ -1,6 +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/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.1 2004/02/11 05:18:55 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -9,48 +11,51 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc"
-IUSE="qt gtk"
+IUSE="qt gnome"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	qt? ( >=x11-libs/qt-3.0* )"
+	gnome? ( gnome-base/gnome-libs )
+	qt? ( =x11-libs/qt-3* )"
 
 # the configure.in patch is required for 'use qt'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
-						 
-# braindead check in configure fails - hack approach
+
+	# braindead check in configure fails - hack approach
 	epatch ${FILESDIR}/${P}-configure.in.patch
-												  
+
 	autoconf || die "autoconf failed"
 }
 
 src_compile() {
 	local myconf
 
-	if [ "`use qt`" ]
-	then
-		myconf="--enable-gui=yes"
+	if use qt ; then
+		myconf="--enable-gui=yes --x-libraries=/usr/lib "
 	else
 		myconf="--enable-gui=no"
 	fi
 
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc/unixODBC \
-		    ${myconf} || die
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--sysconfdir=/etc/unixODBC \
+		${myconf} || die
 
 	make || die
 
-	if [ "`use gtk`" ]
+	if use gnome
 	then
 		cd gODBCConfig
-		./configure --host=${CHOST} \
-				--prefix=/usr \
-				--sysconfdir=/etc/unixODBC \
-				${myconf} || die
+		./configure \
+			--host=${CHOST} \
+			--prefix=/usr \
+			--sysconfdir=/etc/unixODBC \
+			--x-libraries=/usr/lib \
+			${myconf} || die
 
 		# not sure why these symlinks are needed. busted configure, i guess...
 		ln -s ../depcomp .
@@ -63,14 +68,14 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if [ "`use gtk`" ]
+	if use gnome
 	then
 		cd gODBCConfig
 		make DESTDIR=${D} install || die
 		cd ..
 	fi
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README*
+	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
 	prepalldocs
diff --git a/dev-db/unixODBC/unixODBC-2.2.6.ebuild b/dev-db/unixODBC/unixODBC-2.2.6.ebuild
index 08104864729d..21f646ff6683 100644
--- a/dev-db/unixODBC/unixODBC-2.2.6.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.6.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/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.1 2003/11/21 19:16:19 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:11:40 chriswhite Exp $
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -8,20 +8,21 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~hppa ~alpha amd64"
-IUSE="qt"
+KEYWORDS="x86 ppc hppa alpha amd64 sparc ia64"
+IUSE="qt gnome"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	qt? ( >=x11-libs/qt-3.0* )"
+	qt? ( =x11-libs/qt-3* )
+	gnome? ( gnome-base/gnome-libs )"
 
 src_compile() {
 	local myconf
 
-	if [ "`use qt`" ]
+	if use qt
 	then
-		myconf="--enable-gui=yes"
+		myconf="--enable-gui=yes --x-libraries=/usr/lib --x-includes=/usr/include/X11"
 	else
 		myconf="--enable-gui=no"
 	fi
@@ -32,11 +33,39 @@ src_compile() {
 		    ${myconf} || die
 
 	make || die
+
+	if use gnome
+	then
+		# Symlink for configure
+		ln -s ${S}/odbcinst/.libs ./lib
+		# Symlink for libtool
+		ln -s ${S}/odbcinst/.libs ./lib/.libs
+		cd gODBCConfig
+		./configure --host=${CHOST} \
+				--with-odbc=${S} \
+				--prefix=/usr \
+				--x-libraries=/usr/lib \
+				--sysconfdir=/etc/unixODBC \
+				|| die
+
+		# not sure why these symlinks are needed. busted configure, i guess...
+		ln -s ../depcomp .
+		ln -s ../libtool .
+		make || die
+		cd ..
+	fi
 }
 
 src_install() {
 	make DESTDIR=${D} install || die
 
+	if use gnome
+	then
+		cd gODBCConfig
+		make DESTDIR=${D} install || die
+		cd ..
+	fi
+
 	dodoc AUTHORS COPYING ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
diff --git a/dev-db/unixODBC/unixODBC-2.2.8.ebuild b/dev-db/unixODBC/unixODBC-2.2.8.ebuild
index cdd4612dbe49..dd3a65a27c97 100644
--- a/dev-db/unixODBC/unixODBC-2.2.8.ebuild
+++ b/dev-db/unixODBC/unixODBC-2.2.8.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/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.1 2004/02/20 02:56:58 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/unixODBC/unixODBC-2.2.8.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
+
+inherit eutils gnuconfig multilib
 
 DESCRIPTION="ODBC Interface for Linux"
 HOMEPAGE="http://www.unixodbc.org/"
@@ -8,36 +10,45 @@ SRC_URI="http://www.unixodbc.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~hppa ~alpha ~amd64 ~sparc"
+KEYWORDS="~x86 ppc ~sparc mips ~alpha arm hppa ~amd64 s390 ppc64"
 IUSE="qt gnome"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=sys-libs/readline-4.1
 	>=sys-libs/ncurses-5.2
-	gnome? ( gnome-base/gnome-libs )
-	qt? ( >=x11-libs/qt-3.0* )"
+	!mips? (
+		gnome? ( gnome-base/gnome-libs )
+		qt? ( =x11-libs/qt-3* )
+	)"
 
 # the configure.in patch is required for 'use qt'
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
 
-# braindead check in configure fails - hack approach
+	# braindead check in configure fails - hack approach
 	epatch ${FILESDIR}/unixODBC-2.2.6-configure.in.patch
 
+	libtoolize --copy --force || die "libtoolize failed"
 	autoconf || die "autoconf failed"
 }
 
 src_compile() {
 	local myconf
 
-	if [ "`use qt`" ]
+	if use qt && ! use mips
 	then
-		myconf="--enable-gui=yes"
+		myconf="--enable-gui=yes --x-libraries=/usr/$(get_libdir) "
 	else
 		myconf="--enable-gui=no"
 	fi
 
+	# Fix multilib-strict BUG #94262
+	myconf="${myconf} --libdir=\${exec_prefix}/$(get_libdir)"
+
+	# Detect mips systems properly
+	gnuconfig_update
+
 	./configure --host=${CHOST} \
 		    --prefix=/usr \
 		    --sysconfdir=/etc/unixODBC \
@@ -45,11 +56,17 @@ src_compile() {
 
 	make || die
 
-	if [ "`use gnome`" ]
+	if use gnome
 	then
+		# Symlink for configure
+		ln -s ${S}/odbcinst/.libs ./lib
+		# Symlink for libtool
+		ln -s ${S}/odbcinst/.libs ./lib/.libs
 		cd gODBCConfig
 		./configure --host=${CHOST} \
+				--with-odbc=${S} \
 				--prefix=/usr \
+				--x-libraries=/usr/$(get_libdir) \
 				--sysconfdir=/etc/unixODBC \
 				${myconf} || die
 
@@ -64,14 +81,14 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	if [ "`use gnome`" ]
+	if use gnome
 	then
 		cd gODBCConfig
 		make DESTDIR=${D} install || die
 		cd ..
 	fi
 
-	dodoc AUTHORS COPYING ChangeLog NEWS README*
+	dodoc AUTHORS ChangeLog NEWS README*
 	find doc/ -name "Makefile*" -exec rm '{}' \;
 	dohtml doc/*
 	prepalldocs
diff --git a/dev-db/xbase/ChangeLog b/dev-db/xbase/ChangeLog
index 413e9cad0eb4..2975932dfa1b 100644
--- a/dev-db/xbase/ChangeLog
+++ b/dev-db/xbase/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for dev-db/xbase
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/ChangeLog,v 1.1 2004/07/20 16:19:25 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/ChangeLog,v 1.1.1.1 2005/11/30 10:11:28 chriswhite Exp $
+
+  02 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> xbase-2.0.0.ebuild:
+  Stable on hppa.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> xbase-2.0.0.ebuild:
+  Mark 2.0.0 stable on alpha
+
+  20 Jul 2005; Markus Rothe <corsair@gentoo.org> xbase-2.0.0.ebuild:
+  Stable on ppc64
+
+  04 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> xbase-2.0.0.ebuild:
+  Stable on sparc
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> xbase-2.0.0.ebuild:
+  Add ~alpha keyword.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> xbase-2.0.0.ebuild:
+  added ~ppc64
+
+  14 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> xbase-2.0.0.ebuild:
+  Keyworded ~sparc
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> xbase-2.0.0.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> xbase-2.0.0.ebuild:
+  stable on amd64
+
+  24 Dec 2004; Simon Stelling <blubb@gentoo.org> xbase-2.0.0.ebuild:
+  added ~amd64
+
+  20 Aug 2004; Carsten Lohrke <carlo@gentoo.org> xbase-2.0.0.ebuild:
+  stable on x86
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> xbase-2.0.0.ebuild:
+  Added to ~ppc.
 
 *xbase-2.0.0 (20 Jul 2004)
 
diff --git a/dev-db/xbase/Manifest b/dev-db/xbase/Manifest
index eee8f293114d..817b4f723950 100644
--- a/dev-db/xbase/Manifest
+++ b/dev-db/xbase/Manifest
@@ -1,3 +1,4 @@
-MD5 c461dac68ac8abc3fb48b2763167616f xbase-2.0.0.ebuild 698
-MD5 3203c4b87a1cfa76be0540b1bbb3c09b metadata.xml 221
+MD5 d16436bf94bba5161842e1ebdbcb70ac xbase-2.0.0.ebuild 824
+MD5 d6863e368bff32cb8dca1b8062fbc321 metadata.xml 221
+MD5 1aff7620ab6133dfb6328e77463230cb ChangeLog 1415
 MD5 b01379d61f349d62b1719edc1655c98b files/digest-xbase-2.0.0 60
diff --git a/dev-db/xbase/metadata.xml b/dev-db/xbase/metadata.xml
index 00e8555b51ff..823274b31531 100644
--- a/dev-db/xbase/metadata.xml
+++ b/dev-db/xbase/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-hers</herd>
+<herd>no-herd</herd>
 <maintainer>
   <email>carlo@gentoo.org</email>
 </maintainer>
diff --git a/dev-db/xbase/xbase-2.0.0.ebuild b/dev-db/xbase/xbase-2.0.0.ebuild
index 55bd7ab20068..b88e45a31b48 100644
--- a/dev-db/xbase/xbase-2.0.0.ebuild
+++ b/dev-db/xbase/xbase-2.0.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/dev-db/xbase/xbase-2.0.0.ebuild,v 1.1 2004/07/20 16:19:25 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbase/xbase-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:11:28 chriswhite Exp $
 
 inherit base
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND="sys-devel/automake
@@ -27,4 +27,4 @@ src_install() {
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*.cpp examples/Makefile.95
 	fi
-}
\ No newline at end of file
+}
diff --git a/dev-db/xbsql/ChangeLog b/dev-db/xbsql/ChangeLog
index 398b72d5ac91..067eb3452677 100644
--- a/dev-db/xbsql/ChangeLog
+++ b/dev-db/xbsql/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-db/xbsql
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/ChangeLog,v 1.1 2004/07/20 16:48:03 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/ChangeLog,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> xbsql-0.11.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> xbsql-0.11.ebuild:
+  stable on amd64
+
+  24 Dec 2004; Simon Stelling <blubb@gentoo.org> xbsql-0.11.ebuild:
+  added ~amd64
+
+  20 Aug 2004; Carsten Lohrke <carlo@gentoo.org> xbsql-0.11.ebuild:
+  stable on x86
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> xbsql-0.11.ebuild:
+  Added to ~ppc.
 
 *xbsql-0.11 (20 Jul 2004)
 
diff --git a/dev-db/xbsql/Manifest b/dev-db/xbsql/Manifest
index ee3a32254f29..b01b7ee9f8e5 100644
--- a/dev-db/xbsql/Manifest
+++ b/dev-db/xbsql/Manifest
@@ -1,4 +1,4 @@
-MD5 54f0bffb8a11dbd12cc451f9e2fe45c1 xbsql-0.11.ebuild 606
-MD5 7c04df935abeb50958d1c620d44647a1 ChangeLog 245
 MD5 d6863e368bff32cb8dca1b8062fbc321 metadata.xml 221
+MD5 534e0a081e0f34a4a197fa1cfacd0527 ChangeLog 758
+MD5 2a84e3a2d29c52c04d5381f9dbc41e2e xbsql-0.11.ebuild 707
 MD5 008c5254033b1b7f8c6e7466fa48f89f files/digest-xbsql-0.11 59
diff --git a/dev-db/xbsql/xbsql-0.11.ebuild b/dev-db/xbsql/xbsql-0.11.ebuild
index 9bf0543d7d4f..d0c2352e6e26 100644
--- a/dev-db/xbsql/xbsql-0.11.ebuild
+++ b/dev-db/xbsql/xbsql-0.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/dev-db/xbsql/xbsql-0.11.ebuild,v 1.1 2004/07/20 16:48:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xbsql/xbsql-0.11.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 inherit base
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.rekallrevealed.org/packages/${P}.tgz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="doc"
 
 DEPEND="sys-devel/automake
diff --git a/dev-db/xindice/ChangeLog b/dev-db/xindice/ChangeLog
index 601bdb74a8f2..d7274ef363af 100644
--- a/dev-db/xindice/ChangeLog
+++ b/dev-db/xindice/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for dev-db/xindice
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.1 2003/04/11 20:10:21 phosphan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/ChangeLog,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
+
+  05 Sep 2005; Patrick Kursawe <phosphan@gentoo.org> xindice-1.0-r3.ebuild:
+  Using POSIX options for cp
+
+*xindice-1.0-r3 (06 Oct 2004)
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> +metadata.xml,
+  -files/xindice, -files/xindice-1.0-r1.patch, -files/xindice-1.0-r2.patch,
+  +files/xindice-1.0-r3.patch, -files/xindice-1.0.patch, -files/xindice-r1,
+  +files/xindice-r2, -xindice-1.0-r1.ebuild, -xindice-1.0-r2.ebuild,
+  +xindice-1.0-r3.ebuild, -xindice-1.0.ebuild:
+  More cleanup: -r3 was a trivial change and -r2 was ok to got stable -> -r3 is
+  stable now.
+
+*xindice-1.0-r3 (06 Oct 2004)
+
+  06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org>
+  -files/xindice-1.0-r1.patch, -files/xindice-1.0-r2.patch,
+  +files/xindice-1.0-r3.patch, -files/xindice-r1, +files/xindice-r2,
+  -xindice-1.0-r1.ebuild, -xindice-1.0-r2.ebuild, +xindice-1.0-r3.ebuild:
+  Substituting "need net" by "use net" in init script. Cleanup.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> xindice-1.0-r2.ebuild:
+  Added to ~ppc.
+
+*xindice-1.0-r2 (27 Aug 2004)
+
+  27 Aug 2004; Patrick Kursawe <phosphan@gentoo.org>
+  +files/xindice-1.0-r2.patch, +files/xindice-r1, +xindice-1.0-r2.ebuild:
+  Compilation problems (bug #61131) force to use external ant.
+  Start script was referring to old location in /usr/lib.
+
+  23 Aug 2004; Patrick Kursawe <phosphan@gentoo.org> xindice-1.0-r1.ebuild:
+  Warning about JVM in setup now
+
+*xindice-1.0-r1 (24 Feb 2004)
+
+  24 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> xindice-1.0-r1.ebuild,
+  files/xindice, files/xindice-1.0-r1.patch:
+  Compile problem fixed, see bug #13244
+
+  07 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> xindice-1.0.ebuild:
+  chown x.y -> chown x:y (bug 35127)
 
 *xindice-1.0 (11 Apr 2003)	
 
diff --git a/dev-db/xindice/Manifest b/dev-db/xindice/Manifest
index e69de29bb2d1..fe321b72b480 100644
--- a/dev-db/xindice/Manifest
+++ b/dev-db/xindice/Manifest
@@ -0,0 +1,7 @@
+MD5 21c3cb6c5594b580644e735a42300421 xindice-1.0-r3.ebuild 1730
+MD5 91f181dd189815076bd7473115ec54bd ChangeLog 2184
+MD5 9e26b32bd67a45966dfcbaf1cade7e0a metadata.xml 290
+MD5 17e82f722249d0cc22d18fc8d4db378d files/xindice-r2 579
+MD5 c87c4724c3cbf94d7c0379589a13ad2b files/21xindice 26
+MD5 e15ba5cda4959873e75d236563c8d461 files/xindice-1.0-r3.patch 1309
+MD5 9118e012b53e1f982cf60417ff17f43c files/digest-xindice-1.0-r3 68
diff --git a/dev-db/xindice/files/xindice-r2 b/dev-db/xindice/files/xindice-r2
index 683ce9f82f3d..a4f850dfbc04 100644
--- a/dev-db/xindice/files/xindice-r2
+++ b/dev-db/xindice/files/xindice-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/files/xindice-r2,v 1.1 2004/10/06 06:58:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/files/xindice-r2,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/dev-db/xindice/xindice-1.0-r3.ebuild b/dev-db/xindice/xindice-1.0-r3.ebuild
index 108c3c17a18f..7652efefbb56 100644
--- a/dev-db/xindice/xindice-1.0-r3.ebuild
+++ b/dev-db/xindice/xindice-1.0-r3.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/dev-db/xindice/xindice-1.0-r3.ebuild,v 1.1 2004/10/06 06:58:49 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xindice/xindice-1.0-r3.ebuild,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
 
 inherit eutils
 
@@ -31,7 +31,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-${PVR}.patch
+	epatch ${FILESDIR}/${PF}.patch
 }
 
 src_compile() {
@@ -46,9 +46,9 @@ src_install() {
 	chown xindice:xindice ${D}/var/run/xindice
 	dodir ${TARGET}
 	dodir ${TARGET}/java
-	cp -Rvdp bin config icons docs logs idl ${D}${TARGET}
+	cp -pPR bin config icons docs logs idl ${D}${TARGET}
 	cd java
-	cp -Rvdp lib tests examples ${D}${TARGET}/java
+	cp -pPR lib tests examples ${D}${TARGET}/java
 	cd ..
 	dodoc docs/LICENSE docs/README docs/FAQ docs/TODO docs/VERSIONS docs/AUTHORS
 	dohtml docs/AdministratorsGuide.html docs/DevelopersGuide.html docs/UsersGuide.html docs/ToolsReference.html docs/feather.gif docs/index.html docs/xindice.jpg
diff --git a/dev-db/xmysqladmin/ChangeLog b/dev-db/xmysqladmin/ChangeLog
index ce2da7e1e702..7aff74c9523b 100644
--- a/dev-db/xmysqladmin/ChangeLog
+++ b/dev-db/xmysqladmin/ChangeLog
@@ -1,9 +1,30 @@
 # ChangeLog for dev-db/xmysqladmin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xmysqladmin/ChangeLog,v 1.1 2002/02/01 21:53:11 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xmysqladmin/ChangeLog,v 1.1.1.1 2005/11/30 10:11:38 chriswhite Exp $
+
+  10 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  xmysqladmin-1.0.ebuild:
+  Added ~amd64 keyword.
+
+  29 Jun 2004; Aron Griffis <agriffis@gentoo.org> xmysqladmin-1.0.ebuild:
+  sync IUSE (missing), trim trailing whitespace
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> xmysqladmin-1.0.ebuild:
+  Don't assign default to S; header fix
+
+  16 Jul 2003; Christian Birchinger <joker@gentoo.org> xmysqladmin-1.0.ebuild:
+  Added sparc stable keyword
 
 *xmysqladmin-1.0 (1 Feb 2002)
 
+  27 Nov 2002; Martin Holzer <mholzer@gentoo.org> xmysqladmin-1.0.ebuild :
+
+  Added mysql dependency. Fixes #5165.
+
+  12 Sep 2002; Ryan Phillips <rphillips@gentoo.org> xmysqladmin-1.0.ebuild :
+
+  Fixed sed statement.  Fixes #7797.  Submitted by David Morel
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/dev-db/xmysqladmin/Manifest b/dev-db/xmysqladmin/Manifest
index e69de29bb2d1..795eadc827c2 100644
--- a/dev-db/xmysqladmin/Manifest
+++ b/dev-db/xmysqladmin/Manifest
@@ -0,0 +1,13 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7ce3fc6a7c3eb803b31d2b0ed142a69c xmysqladmin-1.0.ebuild 1205
+MD5 7343813498d09d8a531848cac2b8523f ChangeLog 1393
+MD5 e8b38a933ffc688f0b58fc9800718b48 files/digest-xmysqladmin-1.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0HaJ8zY1VwezZiERAr3+AJwIQLyDUJNabFXFgpxmxngZmmRM9gCeLK7B
+JEuAWqE/BWND/ZODXE2/JZs=
+=2tek
+-----END PGP SIGNATURE-----
diff --git a/dev-db/xmysqladmin/files/digest-xmysqladmin-1.0 b/dev-db/xmysqladmin/files/digest-xmysqladmin-1.0
index b6300cadc623..adf6ce2e18a3 100644
--- a/dev-db/xmysqladmin/files/digest-xmysqladmin-1.0
+++ b/dev-db/xmysqladmin/files/digest-xmysqladmin-1.0
@@ -1 +1 @@
-MD5 d02b7e52d034f2f41b6f43ced3cb8e21 xmysqladmin-1.0.tar.gz
+MD5 d02b7e52d034f2f41b6f43ced3cb8e21 xmysqladmin-1.0.tar.gz 65673
diff --git a/dev-db/xmysqladmin/xmysqladmin-1.0.ebuild b/dev-db/xmysqladmin/xmysqladmin-1.0.ebuild
index 3b260fcc2418..0e4445a5c412 100644
--- a/dev-db/xmysqladmin/xmysqladmin-1.0.ebuild
+++ b/dev-db/xmysqladmin/xmysqladmin-1.0.ebuild
@@ -1,22 +1,26 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xmysqladmin/xmysqladmin-1.0.ebuild,v 1.1 2001/09/11 18:50:23 lamer Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xmysqladmin/xmysqladmin-1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:39 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="xforms based front end to mysql"
 SRC_URI="ftp://ftp.mysql.com/Contrib/${P}.tar.gz"
 HOMEPAGE="http://www.mysql.org"
-DEPEND="virtual/x11
-		 >=x11-libs/xforms-089"
 
-#RDEPEND=""
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc ~amd64"
+IUSE=""
+
+DEPEND="virtual/x11
+	x11-libs/xforms
+	dev-db/mysql"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -e 's:^INSTALLPATH.*:INSTALLPATH = /usr/bin:g' -e \
 	's:^PIXMAPPATH.*:PIXMAPPATH = /usr/share/pixmaps:g' -e \
+	's:-I/usr/X11R6/include:-I/usr/X11R6/include/X11:g' -e \
 	's:^MYSQLINC.*:MYSQLINC = -I/usr/include/mysql:g' -e \
 	's:^MYSQLDBDIR.*:MYSQLDBDIR = -DMYSQLDBDIR=\\\"/var/mysql\\\":g' -e \
 	's:^MYSQLLOAD.*:MYSQLLOAD = \-Wl\,\-R/usr/lib/mysql \-L/usr/lib/mysql \-lmysqlclient:g' -e \
@@ -24,15 +28,18 @@ src_unpack() {
 }
 
 src_compile() {
-	
+
 	make -f Makefile.gentoo || die
 }
 
 src_install () {
-	
+
 	dodir /usr/bin
 	dodir /usr/share/pixmaps
-    try make INSTALLPATH=${D}/usr/bin PIXMAPPATH=${D}/usr/share/pixmaps install
-	 dodoc README INSTALL CHANGES ANNOUNCE TODO
-}
+	make \
+		INSTALLPATH=${D}/usr/bin \
+		PIXMAPPATH=${D}/usr/share/pixmaps \
+		install || die
 
+	dodoc README INSTALL CHANGES ANNOUNCE TODO
+}
diff --git a/dev-db/xpg/ChangeLog b/dev-db/xpg/ChangeLog
index 23074976d8df..f138bcf64d5d 100644
--- a/dev-db/xpg/ChangeLog
+++ b/dev-db/xpg/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/xpg
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/ChangeLog,v 1.1 2004/08/05 09:13:32 sejo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/xpg/ChangeLog,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+
+  05 Aug 2004; <SeJo@gentoo.org> xpg-0.1.ebuild:
+  axxo showed me how the ebuild should be... thx
+
+*xpg-0.1 (05 Aug 2004)
+
+  05 Aug 2004; <SeJo@gentoo.org> xpg-0.1.ebuild:
+  cleaned out the ebuild, made sure install qa is ok
 
   05 Aug 2004; <SeJo@gentoo.org> :
   First Checkin
diff --git a/dev-db/xpg/Manifest b/dev-db/xpg/Manifest
index 89d8f6f04e8f..5e145cc4839d 100644
--- a/dev-db/xpg/Manifest
+++ b/dev-db/xpg/Manifest
@@ -1,3 +1,4 @@
-MD5 fa020c9fd159ae038743e57530537cd2 xpg-0.1.ebuild 528
+MD5 2dfa43471557cdf0784925663deb8877 ChangeLog 475
 MD5 a198c5f1913aa4b2b60b0e5cac1bdf64 metadata.xml 412
+MD5 3cea11f1034b8265bc5e45f424e1ca44 xpg-0.1.ebuild 930
 MD5 9e2a25c1c9e3a1835b7b7fcfca6ddb4a files/digest-xpg-0.1 123
diff --git a/dev-db/xpg/xpg-0.1.ebuild b/dev-db/xpg/xpg-0.1.ebuild
index bf68b9699b85..2086690a3ad7 100644
--- a/dev-db/xpg/xpg-0.1.ebuild
+++ b/dev-db/xpg/xpg-0.1.ebuild
@@ -1,7 +1,7 @@
-# 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/dev-db/xpg/xpg-0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:34 chriswhite Exp $
+inherit java-pkg
 
 DESCRIPTION="GUI for PostgreSQL written in Java"
 HOMEPAGE="http://www.kazak.ws/xpg/"
@@ -10,15 +10,22 @@ SRC_URI="mirror://gentoo/xpg-current.tar.gz
 S="${WORKDIR}/xpg-current"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc"
-IUSE="java"
-
+KEYWORDS="~ppc ~x86"
+IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 
 src_compile() {
 	make || die "make problems"
 }
 src_install () {
-	make install || die "install problems"
-	cp -Rdp ${WORKDIR}/*.jpg ${WORKDIR}/*.xpm /usr/share/pixmaps
+	cd ${S}
+	java-pkg_dojar bin/*.jar
+	dodir /usr/share/xpg /usr/share/pixmaps/
+	cp -Rdp styles ${D}/usr/share/xpg/
+	cp -Rdp ${WORKDIR}/*.jpg ${D}/usr/share/pixmaps/
+	cp -Rdp ${WORKDIR}/*.xpm ${D}/usr/share/pixmaps/
+	dohtml -r doc/*
+
+	echo -e "#!/bin/bash\nexport XPG_HOME=/usr/share/xpg\njava -Dxpghome=\${XPG_HOME} -jar \${XPG_HOME}/lib/xpg.jar" > xpg
+	dobin xpg
 }
diff --git a/dev-php5/creole/ChangeLog b/dev-php5/creole/ChangeLog
index 555d45a5760b..d47065d4bd09 100644
--- a/dev-php5/creole/ChangeLog
+++ b/dev-php5/creole/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-php5/creole
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/creole/ChangeLog,v 1.1 2005/09/18 14:27:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/creole/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 *creole-1.0.2 (18 Sep 2005)
 
diff --git a/dev-php5/creole/Manifest b/dev-php5/creole/Manifest
index 904b205b8ee9..ec110cead7f1 100644
--- a/dev-php5/creole/Manifest
+++ b/dev-php5/creole/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 42a97e385dc06c0dcf40f2dac4ea443f creole-1.0.2.ebuild 576
-MD5 60ebeb5e382d402373a323ff20be7c44 ChangeLog 253
+MD5 28a1976bcbab441436311910f14db419 creole-1.0.2.ebuild 673
+MD5 37f9f80aa1bbbfa1d0411b572541459e ChangeLog 340
 MD5 ab932cf9fc2348a6a4ccfb12ee0e19d3 files/digest-creole-1.0.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLXm1mPFBzbX68WERAn+dAJ0Vo8jRjzaDG3I59rq0tnhZlUvpGwCfayaO
+ynK/4Bvlk1WnWK90hq/iOMs=
+=y3h4
+-----END PGP SIGNATURE-----
diff --git a/dev-php5/creole/creole-1.0.2.ebuild b/dev-php5/creole/creole-1.0.2.ebuild
index f73c7d5585b9..ed474d75a873 100644
--- a/dev-php5/creole/creole-1.0.2.ebuild
+++ b/dev-php5/creole/creole-1.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/dev-php5/creole/creole-1.0.2.ebuild,v 1.1 2005/09/18 14:27:52 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/creole/creole-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 inherit php-lib-r1
 
diff --git a/dev-php5/jargon/ChangeLog b/dev-php5/jargon/ChangeLog
index 7e594bec02e7..766e635366c2 100644
--- a/dev-php5/jargon/ChangeLog
+++ b/dev-php5/jargon/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-php5/jargon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/jargon/ChangeLog,v 1.1 2005/09/18 14:28:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jargon/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 *jargon-1.0.2 (18 Sep 2005)
 
diff --git a/dev-php5/jargon/Manifest b/dev-php5/jargon/Manifest
index c753d5982409..facce3192542 100644
--- a/dev-php5/jargon/Manifest
+++ b/dev-php5/jargon/Manifest
@@ -1,4 +1,14 @@
-MD5 d582bbeb0d21786b1d670662e0d9fefc jargon-1.0.2.ebuild 627
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 03346b05ae16ac23d40c196573eee83e jargon-1.0.2.ebuild 724
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 04b12456b359bdca7464833dbdf9d72e ChangeLog 253
+MD5 ddfd3e015260b7998bffb3e4939108dd ChangeLog 340
 MD5 ab932cf9fc2348a6a4ccfb12ee0e19d3 files/digest-jargon-1.0.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDLXncmPFBzbX68WERAooeAJ0ZIzX9QFfIGfMSjiL1EypmvEdOswCfXXDr
+5z5XVQ7GHbxi2VCGFL0rR8A=
+=W7J7
+-----END PGP SIGNATURE-----
diff --git a/dev-php5/jargon/jargon-1.0.2.ebuild b/dev-php5/jargon/jargon-1.0.2.ebuild
index f3b6f393ea37..036be1d51a18 100644
--- a/dev-php5/jargon/jargon-1.0.2.ebuild
+++ b/dev-php5/jargon/jargon-1.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/dev-php5/jargon/jargon-1.0.2.ebuild,v 1.1 2005/09/18 14:28:31 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jargon/jargon-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 inherit php-lib-r1
 
diff --git a/dev-php5/jpgraph/ChangeLog b/dev-php5/jpgraph/ChangeLog
index 3bf47210884e..72a39cd7b6cd 100644
--- a/dev-php5/jpgraph/ChangeLog
+++ b/dev-php5/jpgraph/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php5/jpgraph
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.1 2005/09/18 14:30:09 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  24 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> jpgraph-2.0_beta.ebuild:
+  Marked ~amd64.
 
 *jpgraph-2.0_beta (18 Sep 2005)
 
diff --git a/dev-php5/jpgraph/Manifest b/dev-php5/jpgraph/Manifest
index 444fe778829d..54b33290437b 100644
--- a/dev-php5/jpgraph/Manifest
+++ b/dev-php5/jpgraph/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8fd4ab90b0ee557993081d36c38269ec jpgraph-2.0_beta.ebuild 2518
+MD5 8c2c68fa08728494503382b77858b185 ChangeLog 444
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 5cbee36805913aac0974ccd411774855 jpgraph-2.0_beta.ebuild 2410
-MD5 908c3ca6254aca286815b15609ca9e82 ChangeLog 262
 MD5 9c1a606f1b31c4a2d6806167e89860b6 files/digest-jpgraph-2.0_beta 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDNYtxntT9W3vfTuoRAn0zAKC0uhXCI/4vUGMRkvk5KtfbYG8I5QCgtIrg
+1pnNrd0rSo5QAlC1SibKcoo=
+=GGHk
+-----END PGP SIGNATURE-----
diff --git a/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild b/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild
index 055d44c13e5d..781f21a953eb 100644
--- a/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild
+++ b/dev-php5/jpgraph/jpgraph-2.0_beta.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/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild,v 1.1 2005/09/18 14:30:09 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/jpgraph/jpgraph-2.0_beta.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 inherit php-lib-r1
 
@@ -8,7 +8,7 @@ DESCRIPTION="fully OO graph drawing library for PHP"
 HOMEPAGE="http://www.aditus.nu/jpgraph/"
 LICENSE="QPL-1.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="truetype"
 
 MY_P=${P/_/}
diff --git a/dev-php5/metadata.xml b/dev-php5/metadata.xml
index ba7674a41dd6..36455a01e789 100644
--- a/dev-php5/metadata.xml
+++ b/dev-php5/metadata.xml
@@ -5,4 +5,12 @@
 		The dev-php5 category contains libraries, utilities and PECL
 		packages only for version 5 of the PHP programming language.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-php enth辰lt Bibliotheken, Werkzeuge und
+		PECL-Pakete f端r Version 5 der Programmiersprache PHP.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-php5カテゴリーにはPHPプログラミング言語のバージョン5だけに
+		関連したライブラリーとユーティリティとPECLパッケージが含まれます。
+	</longdescription>
 </catmetadata>
diff --git a/dev-php5/pecl-apc/ChangeLog b/dev-php5/pecl-apc/ChangeLog
index 9d3571277b18..d0a0182a7f3a 100644
--- a/dev-php5/pecl-apc/ChangeLog
+++ b/dev-php5/pecl-apc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-apc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.1 2005/09/04 16:20:56 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-apc-3.0.8.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-apc-3.0.8.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-apc/Manifest b/dev-php5/pecl-apc/Manifest
index 522ddc492db5..e4c163c7d9fe 100644
--- a/dev-php5/pecl-apc/Manifest
+++ b/dev-php5/pecl-apc/Manifest
@@ -1,4 +1,4 @@
+MD5 a7a0778fcd948d41531b686bdf4700fd ChangeLog 511
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 34a9c3529aa8a07514a3786fe5f0d53c ChangeLog 218
-MD5 eec841aa276d56ea72b8113760c7121a pecl-apc-3.0.8.ebuild 2066
+MD5 4e3eb7a4f84c081311fdaed26f275571 pecl-apc-3.0.8.ebuild 2182
 MD5 66795850fe4fb57f021182ccdd3e3203 files/digest-pecl-apc-3.0.8 57
diff --git a/dev-php5/pecl-apc/pecl-apc-3.0.8.ebuild b/dev-php5/pecl-apc/pecl-apc-3.0.8.ebuild
index 7f0d59a09a08..d0ed3887c287 100644
--- a/dev-php5/pecl-apc/pecl-apc-3.0.8.ebuild
+++ b/dev-php5/pecl-apc/pecl-apc-3.0.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/dev-php5/pecl-apc/pecl-apc-3.0.8.ebuild,v 1.1 2005/09/04 16:20:56 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apc/pecl-apc-3.0.8.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="APC"
@@ -13,7 +13,7 @@ IUSE="mmap"
 DESCRIPTION="The Alternative PHP Cache."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 DEPEND="${DEPEND}"
 
 need_php_by_category
diff --git a/dev-php5/pecl-apd/ChangeLog b/dev-php5/pecl-apd/ChangeLog
index 62ec453b957b..b245e9d3f9c9 100644
--- a/dev-php5/pecl-apd/ChangeLog
+++ b/dev-php5/pecl-apd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php5/pecl-apd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/ChangeLog,v 1.1 2005/09/10 13:59:53 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  15 Oct 2005; Jason Wever <weeve@gentoo.org> pecl-apd-1.0.1.ebuild:
+  Added ~sparc keyword.
 
 *pecl-apd-1.0.1 (10 Sep 2005)
 
diff --git a/dev-php5/pecl-apd/Manifest b/dev-php5/pecl-apd/Manifest
index 052bf676dda9..efad281d6120 100644
--- a/dev-php5/pecl-apd/Manifest
+++ b/dev-php5/pecl-apd/Manifest
@@ -1,3 +1,4 @@
-MD5 19b9b5e7256027e0e61d4fc1b55f58f0 pecl-apd-1.0.1.ebuild 478
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 b8406d93c9b0f225ac3f008aac0f9f09 ChangeLog 461
 MD5 3f5b44e18a6fc64c64ad6919e7192603 files/digest-pecl-apd-1.0.1 57
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 50aba09a9eee02ff04d76866973d0a3e pecl-apd-1.0.1.ebuild 623
diff --git a/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild b/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
index c9ad69c57756..440c44b09ef1 100644
--- a/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild
+++ b/dev-php5/pecl-apd/pecl-apd-1.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/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild,v 1.1 2005/09/10 13:59:53 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-apd/pecl-apd-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="yes"
 PHP_EXT_PECL_PKG="apd"
@@ -9,12 +9,13 @@ PHP_EXT_INI="yes"
 
 inherit php-ext-pecl-r1
 
-DESCRIPTION="pecl-pdo"
-
-LICENSE="PHP"
-SLOT="0"
-KEYWORDS="~x86"
 IUSE=""
+DESCRIPTION="A full-featured engine-level profiler/debugger."
+SLOT="0"
+LICENSE="PHP"
+KEYWORDS="~sparc ~x86"
+
+need_php_by_category
 
 src_install () {
 	sed -i 's:/usr/local:/usr:g' ${S}/pprofp || die #83612
@@ -22,5 +23,3 @@ src_install () {
 	dobin pprofp pprof2calltree
 	dodoc LICENSE README
 }
-
-need_php_by_category
diff --git a/dev-php5/pecl-crack/ChangeLog b/dev-php5/pecl-crack/ChangeLog
index 834c1a4ce1b1..4d89cdb1cc3b 100644
--- a/dev-php5/pecl-crack/ChangeLog
+++ b/dev-php5/pecl-crack/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for dev-php5/pecl-crack
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/ChangeLog,v 1.1 2005/09/04 16:22:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-crack-0.2.ebuild,
+  pecl-crack-0.3.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  24 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-crack-0.3.ebuild:
+  Added ~sparc keyword back into pecl-crack because it got dropped. :(
+
+  15 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  pecl-crack-0.2.ebuild:
+  dekeyword for amd64 until php5 is keyworded as well
+
+*pecl-crack-0.3 (10 Sep 2005)
+
+  10 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  +pecl-crack-0.3.ebuild:
+  Version bump, DEPEND on cracklib no longer needed.
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-crack-0.2.ebuild:
+  Added ~sparc keyword.
+
+  07 Sep 2005; Sebastian Bergmann <sebastian@gentoo.org>
+  pecl-crack-0.2.ebuild:
+  Marked ~amd64 per bug 99551.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-crack/Manifest b/dev-php5/pecl-crack/Manifest
index 3c72567107cb..ff8ceda67fdc 100644
--- a/dev-php5/pecl-crack/Manifest
+++ b/dev-php5/pecl-crack/Manifest
@@ -1,4 +1,6 @@
+MD5 791484db56725029250ca9ca3db2bb87 ChangeLog 1098
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 94258c0ca534f32cf1c422c1b1533ba7 ChangeLog 220
-MD5 4373f47df63838f47e6948d65f2d5a0b pecl-crack-0.2.ebuild 417
+MD5 e2cf94587349d0522d71b592e032bc07 pecl-crack-0.2.ebuild 535
+MD5 455564921cfd8547392f2ac1e58e202e pecl-crack-0.3.ebuild 485
 MD5 23b550fda581d450144e8ef0ca019082 files/digest-pecl-crack-0.2 56
+MD5 2ba367c254f48def392daa2084c1e6b7 files/digest-pecl-crack-0.3 57
diff --git a/dev-php5/pecl-crack/pecl-crack-0.2.ebuild b/dev-php5/pecl-crack/pecl-crack-0.2.ebuild
index 5c2ef60771c1..1c53b082122a 100644
--- a/dev-php5/pecl-crack/pecl-crack-0.2.ebuild
+++ b/dev-php5/pecl-crack/pecl-crack-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/dev-php5/pecl-crack/pecl-crack-0.2.ebuild,v 1.1 2005/09/04 16:22:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/pecl-crack-0.2.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="crack"
@@ -13,7 +13,7 @@ DESCRIPTION="PHP interface to the cracklib (libcrack) libraries"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-php5/pecl-crack/pecl-crack-0.3.ebuild b/dev-php5/pecl-crack/pecl-crack-0.3.ebuild
index 6e20331867ee..c987f4e05a9c 100644
--- a/dev-php5/pecl-crack/pecl-crack-0.3.ebuild
+++ b/dev-php5/pecl-crack/pecl-crack-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/dev-php5/pecl-crack/pecl-crack-0.3.ebuild,v 1.1 2005/09/10 07:50:08 sebastian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-crack/pecl-crack-0.3.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="crack"
@@ -13,7 +13,7 @@ DESCRIPTION="PHP interface to the cracklib (libcrack) libraries"
 
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc64 ~sparc ~x86"
 IUSE=""
 
 need_php_by_category
diff --git a/dev-php5/pecl-dbx/ChangeLog b/dev-php5/pecl-dbx/ChangeLog
index c88629c6987c..61d7bb3b9404 100644
--- a/dev-php5/pecl-dbx/ChangeLog
+++ b/dev-php5/pecl-dbx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-dbx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/ChangeLog,v 1.1 2005/09/04 16:23:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-dbx-1.1.0.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-dbx-1.1.0.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-dbx/Manifest b/dev-php5/pecl-dbx/Manifest
index c23d96f0aaee..19000689f734 100644
--- a/dev-php5/pecl-dbx/Manifest
+++ b/dev-php5/pecl-dbx/Manifest
@@ -1,4 +1,4 @@
+MD5 7ad2cdf032090eb30d8cd55ef6224576 ChangeLog 511
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 a653ea61c5db2ee5639a3afa9c122193 ChangeLog 218
-MD5 51283c61444f2004248a73d18b8e653b pecl-dbx-1.1.0.ebuild 465
+MD5 a8f73d6acd041da8cfb1114130010394 pecl-dbx-1.1.0.ebuild 561
 MD5 df51e95ca52b8517a61833b1afd699d1 files/digest-pecl-dbx-1.1.0 57
diff --git a/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild b/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild
index bd87100da420..1fc7bf7ee9e8 100644
--- a/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild
+++ b/dev-php5/pecl-dbx/pecl-dbx-1.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/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild,v 1.1 2005/09/04 16:23:03 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-dbx/pecl-dbx-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="dbx"
@@ -12,11 +12,9 @@ inherit php-ext-pecl-r1
 DESCRIPTION="The dbx module is a database abstraction layer."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="${DEPEND}"
-
 need_php_by_category
 
 src_compile() {
diff --git a/dev-php5/pecl-fileinfo/ChangeLog b/dev-php5/pecl-fileinfo/ChangeLog
index 93600ac72ae1..8638141013ca 100644
--- a/dev-php5/pecl-fileinfo/ChangeLog
+++ b/dev-php5/pecl-fileinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-fileinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/ChangeLog,v 1.1 2005/09/04 16:24:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-fileinfo-1.0.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-fileinfo-1.0.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-fileinfo/Manifest b/dev-php5/pecl-fileinfo/Manifest
index 087daf24289a..d9d94508ccb2 100644
--- a/dev-php5/pecl-fileinfo/Manifest
+++ b/dev-php5/pecl-fileinfo/Manifest
@@ -1,4 +1,4 @@
+MD5 8a2aaf44cb02d7015c2309d38898c36e ChangeLog 527
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 e417ef613873d21c606fcb1ee8f6f535 ChangeLog 223
-MD5 6e201584fde22c12d8786b5219e1e7ea pecl-fileinfo-1.0.ebuild 388
+MD5 ed0dc4265878d731d8b40d4d890871ca pecl-fileinfo-1.0.ebuild 512
 MD5 46ba777513035be7795811299fa8bf8c files/digest-pecl-fileinfo-1.0 59
diff --git a/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.ebuild b/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.ebuild
index 868975379292..41bb0d0ff9a9 100644
--- a/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.ebuild
+++ b/dev-php5/pecl-fileinfo/pecl-fileinfo-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/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.ebuild,v 1.1 2005/09/04 16:24:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-fileinfo/pecl-fileinfo-1.0.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="Fileinfo"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="libmagic bindings for PHP."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 DEPEND="${DEPEND}
 		sys-apps/file"
 
diff --git a/dev-php5/pecl-imagick/ChangeLog b/dev-php5/pecl-imagick/ChangeLog
index 481c496eabc7..428f40ffdeaf 100644
--- a/dev-php5/pecl-imagick/ChangeLog
+++ b/dev-php5/pecl-imagick/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-imagick
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/ChangeLog,v 1.1 2005/09/04 16:27:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-imagick-0.9.11.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-imagick-0.9.11.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-imagick/Manifest b/dev-php5/pecl-imagick/Manifest
index 73df766161f3..6f7a0796b04d 100644
--- a/dev-php5/pecl-imagick/Manifest
+++ b/dev-php5/pecl-imagick/Manifest
@@ -1,4 +1,4 @@
+MD5 5beedce30fc2edc0b351271997f1f8c6 ChangeLog 529
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 370283a38a0c93db1d6189131731607c ChangeLog 222
-MD5 4782819e7b21d6af3c011c99e63b5dc3 pecl-imagick-0.9.11.ebuild 696
+MD5 1dbb73358fe31b60762d747e88506c16 pecl-imagick-0.9.11.ebuild 829
 MD5 ed2047d765f8569bef894def860bc3be files/digest-pecl-imagick-0.9.11 62
diff --git a/dev-php5/pecl-imagick/pecl-imagick-0.9.11.ebuild b/dev-php5/pecl-imagick/pecl-imagick-0.9.11.ebuild
index 3027dc2bb127..eba166a1e518 100644
--- a/dev-php5/pecl-imagick/pecl-imagick-0.9.11.ebuild
+++ b/dev-php5/pecl-imagick/pecl-imagick-0.9.11.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/dev-php5/pecl-imagick/pecl-imagick-0.9.11.ebuild,v 1.1 2005/09/04 16:27:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-imagick/pecl-imagick-0.9.11.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_INI="yes"
@@ -12,11 +12,11 @@ DESCRIPTION="PHP wrapper for the ImageMagick library."
 HOMEPAGE="http://pecl.php.net/imagick"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="${DEPEND}
-		!graphicsmagick? >=media-gfx/imagemagick-6.2.0
-		graphicsmagick? >=media-gfx/graphicsmagick-1.0.0"
+		!graphicsmagick? ( >=media-gfx/imagemagick-6.2.0 )
+		graphicsmagick? ( >=media-gfx/graphicsmagick-1.0.0 )"
 
 need_php_by_category
 
diff --git a/dev-php5/pecl-mailparse/ChangeLog b/dev-php5/pecl-mailparse/ChangeLog
index 99086a1940a6..f53b019178fc 100644
--- a/dev-php5/pecl-mailparse/ChangeLog
+++ b/dev-php5/pecl-mailparse/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-php5/pecl-mailparse
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/ChangeLog,v 1.1 2005/09/04 16:29:32 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  pecl-mailparse-2.1.1.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-mailparse-2.1.1.ebuild:
+  Added ~sparc keyword.
+
+  06 Sep 2005; Stuart Herbert <stuart@gentoo.org>
+  +files/cvs-mailparse.c-fix.diff:
+  Replaced corrupted patch file
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-mailparse/Manifest b/dev-php5/pecl-mailparse/Manifest
index 45d53b15d96f..819d38f55b72 100644
--- a/dev-php5/pecl-mailparse/Manifest
+++ b/dev-php5/pecl-mailparse/Manifest
@@ -1,5 +1,5 @@
+MD5 67600d825adc47e35ac9615571ee488d ChangeLog 655
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 41cbaf97eed60a2203b5e6df55bc67dc ChangeLog 224
-MD5 a4796eb6573f855875667d2a18394daa pecl-mailparse-2.1.1.ebuild 593
-MD5 0e0417ccc35d51d676d71b0cf958ec46 files/digest-pecl-mailparse-2.1.1 63
+MD5 f32c06a39dbe5832772e4bb3d72556d9 pecl-mailparse-2.1.1.ebuild 721
 MD5 35dd19f4a7b42bb6210dc30fc9897d63 files/cvs-mailparse.c-fix.diff 1914
+MD5 0e0417ccc35d51d676d71b0cf958ec46 files/digest-pecl-mailparse-2.1.1 63
diff --git a/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1.ebuild b/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1.ebuild
index 035187275c93..c2d6459f5843 100644
--- a/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1.ebuild
+++ b/dev-php5/pecl-mailparse/pecl-mailparse-2.1.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/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1.ebuild,v 1.1 2005/09/04 16:29:32 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mailparse/pecl-mailparse-2.1.1.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_INI="yes"
@@ -11,7 +11,7 @@ IUSE=""
 DESCRIPTION="A PHP extension for parsing and working with RFC822 and RFC2045 (MIME) compliant messages."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 
 need_php_by_category
 
diff --git a/dev-php5/pecl-memcache/ChangeLog b/dev-php5/pecl-memcache/ChangeLog
index e53cb5a788cc..3736f2997fe9 100644
--- a/dev-php5/pecl-memcache/ChangeLog
+++ b/dev-php5/pecl-memcache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-memcache
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/ChangeLog,v 1.1 2005/09/04 16:30:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-memcache-1.5.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-memcache-1.5.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-memcache/Manifest b/dev-php5/pecl-memcache/Manifest
index 7aa2d6abf5ff..6cab5d266616 100644
--- a/dev-php5/pecl-memcache/Manifest
+++ b/dev-php5/pecl-memcache/Manifest
@@ -1,4 +1,4 @@
+MD5 b65fdf2cca51499b71ae193a5778349a ChangeLog 527
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 b598c12efda96c4924b981cc5c81765f ChangeLog 223
-MD5 39967b0de474b441c31343cda5d0714c pecl-memcache-1.5.ebuild 503
+MD5 43c8fcc95060d9a2fe06a976525221d0 pecl-memcache-1.5.ebuild 627
 MD5 5a0944dace5bba68eeeddcc69a730995 files/digest-pecl-memcache-1.5 60
diff --git a/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild b/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild
index 8c0b7ec652f6..9f2e7c5be0fa 100644
--- a/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild
+++ b/dev-php5/pecl-memcache/pecl-memcache-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/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild,v 1.1 2005/09/04 16:30:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-memcache/pecl-memcache-1.5.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="memcache"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP extension for using memcached."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 DEPEND="${DEPEND}
 		sys-libs/zlib"
 
diff --git a/dev-php5/pecl-pdflib/ChangeLog b/dev-php5/pecl-pdflib/ChangeLog
index a99df8f01476..cc44e8efc22f 100644
--- a/dev-php5/pecl-pdflib/ChangeLog
+++ b/dev-php5/pecl-pdflib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php5/pecl-pdflib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdflib/ChangeLog,v 1.1 2005/09/04 16:31:34 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdflib/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  pecl-pdflib-2.0.4-r1.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdflib-2.0.4-r1.ebuild:
+  Added ~sparc keyword.
+
+  06 Sep 2005; Stuart Herbert <stuart@gentoo.org> +files/ifgd-patch.diff:
+  Replaced corrupted patch file
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdflib/Manifest b/dev-php5/pecl-pdflib/Manifest
index 31425dae752f..a74068115175 100644
--- a/dev-php5/pecl-pdflib/Manifest
+++ b/dev-php5/pecl-pdflib/Manifest
@@ -1,5 +1,5 @@
+MD5 48e28e67d29b3312279d5de0ec63191d ChangeLog 638
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 1a89bb654f444a3a3a595a50b5509fad ChangeLog 221
-MD5 8907d897162afa8b1719d63dc2a9774d pecl-pdflib-2.0.4-r1.ebuild 528
+MD5 0c75b01ab7df8d4ed253aa44f78e0b41 pecl-pdflib-2.0.4-r1.ebuild 653
 MD5 1ffaf58e4d052d47b48b8490ca92efaf files/digest-pecl-pdflib-2.0.4-r1 60
 MD5 f1d1195704d3132b7878446eba109903 files/ifgd-patch.diff 5798
diff --git a/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild b/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild
index 46dfdd482b90..6b6de969cdcc 100644
--- a/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild
+++ b/dev-php5/pecl-pdflib/pecl-pdflib-2.0.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/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild,v 1.1 2005/09/04 16:31:34 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdflib/pecl-pdflib-2.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="pdflib"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP extension for creating PDF files."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 DEPEND="${DEPEND}
 		media-libs/pdflib"
 
diff --git a/dev-php5/pecl-pdo-dblib/ChangeLog b/dev-php5/pecl-pdo-dblib/ChangeLog
index 0459963fa3a0..cf7c91473f9f 100644
--- a/dev-php5/pecl-pdo-dblib/ChangeLog
+++ b/dev-php5/pecl-pdo-dblib/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-php5/pecl-pdo-dblib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-dblib/ChangeLog,v 1.1 2005/09/04 16:35:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-dblib/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-pdo-dblib-0.9.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-dblib-0.9.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-dblib-0.9.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-dblib/Manifest b/dev-php5/pecl-pdo-dblib/Manifest
index 5f349421864d..70b82879623e 100644
--- a/dev-php5/pecl-pdo-dblib/Manifest
+++ b/dev-php5/pecl-pdo-dblib/Manifest
@@ -1,4 +1,4 @@
+MD5 ab77b7c77baf423e164a91b45f5a5ba5 ChangeLog 700
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 e9b53675b4e4ef40dda4f108e684b9cf ChangeLog 224
-MD5 c362d67bf50ec272570ebe747a52beef pecl-pdo-dblib-0.9.ebuild 922
+MD5 884922d71b846cd690e594f47851246c pecl-pdo-dblib-0.9.ebuild 1079
 MD5 beff54166dfd24fab05f7b7ad61368d3 files/digest-pecl-pdo-dblib-0.9 60
diff --git a/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild b/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild
index df1420786af7..ae55ef6c5eb5 100644
--- a/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild
+++ b/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.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/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild,v 1.1 2005/09/04 16:35:16 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-dblib/pecl-pdo-dblib-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_DBLIB"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For Sybase/MSSQL Server"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo
 		dev-db/freetds"
diff --git a/dev-php5/pecl-pdo-firebird/ChangeLog b/dev-php5/pecl-pdo-firebird/ChangeLog
index 329371d7dcdb..928cabd4522a 100644
--- a/dev-php5/pecl-pdo-firebird/ChangeLog
+++ b/dev-php5/pecl-pdo-firebird/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-php5/pecl-pdo-firebird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-firebird/ChangeLog,v 1.1 2005/09/04 16:38:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-firebird/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-firebird-0.2.ebuild:
+  added to ~amd64
+
+  14 Sep 2005; Joseph Jezak <josejx@gentoo.org>
+  pecl-pdo-firebird-0.2.ebuild:
+  Removed ~ppc since firebird isn't building on ppc.
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-firebird-0.2.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-firebird/Manifest b/dev-php5/pecl-pdo-firebird/Manifest
index ad505f0e32c6..3bb7d69e2444 100644
--- a/dev-php5/pecl-pdo-firebird/Manifest
+++ b/dev-php5/pecl-pdo-firebird/Manifest
@@ -1,4 +1,4 @@
+MD5 40d9b63ed9ec34ca6642b5bcbba307cc ChangeLog 732
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 73a6147926b04cb837b03c0ca6056ffa ChangeLog 227
-MD5 6261bb21a0802a46a8f2d1088e4c0a99 pecl-pdo-firebird-0.2.ebuild 938
+MD5 3ee71589d842a89986902ca092af4a5e pecl-pdo-firebird-0.2.ebuild 1064
 MD5 4a58f4edd1173f8f6332e928708f1137 files/digest-pecl-pdo-firebird-0.2 64
diff --git a/dev-php5/pecl-pdo-firebird/pecl-pdo-firebird-0.2.ebuild b/dev-php5/pecl-pdo-firebird/pecl-pdo-firebird-0.2.ebuild
index 7004ca10c773..479952027f57 100644
--- a/dev-php5/pecl-pdo-firebird/pecl-pdo-firebird-0.2.ebuild
+++ b/dev-php5/pecl-pdo-firebird/pecl-pdo-firebird-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/dev-php5/pecl-pdo-firebird/pecl-pdo-firebird-0.2.ebuild,v 1.1 2005/09/04 16:38:01 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-firebird/pecl-pdo-firebird-0.2.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_FIREBIRD"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For Firebird/Interbase Server"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo
 		dev-db/firebird"
diff --git a/dev-php5/pecl-pdo-mysql/ChangeLog b/dev-php5/pecl-pdo-mysql/ChangeLog
index ed2aa9839bf5..239c5e0b9031 100644
--- a/dev-php5/pecl-pdo-mysql/ChangeLog
+++ b/dev-php5/pecl-pdo-mysql/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-php5/pecl-pdo-mysql
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.1 2005/09/04 16:39:58 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-pdo-mysql-0.9.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  17 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-mysql-0.9.ebuild:
+  added to ~amd64
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org> ChangeLog:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-mysql-0.9.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-mysql/Manifest b/dev-php5/pecl-pdo-mysql/Manifest
index b91ff56c6630..a49f89b1a3be 100644
--- a/dev-php5/pecl-pdo-mysql/Manifest
+++ b/dev-php5/pecl-pdo-mysql/Manifest
@@ -1,4 +1,4 @@
+MD5 ad594e3e9d2fcfff847026b294d21d12 ChangeLog 783
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 a1b9c493780e57ea7f782cb5a9fe45be ChangeLog 224
-MD5 df7399b0161906cf99347c7196e63eec pecl-pdo-mysql-0.9.ebuild 926
+MD5 4b0f9d07e21eec8356e19ec2a8333b7e pecl-pdo-mysql-0.9.ebuild 1083
 MD5 da9531689d4c2275b728c88c3b9401c8 files/digest-pecl-pdo-mysql-0.9 61
diff --git a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-0.9.ebuild b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-0.9.ebuild
index f39c0d41daef..bbbb0c859a63 100644
--- a/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-0.9.ebuild
+++ b/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-0.9.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/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-0.9.ebuild,v 1.1 2005/09/04 16:39:58 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-mysql/pecl-pdo-mysql-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_MYSQL"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For MySQL 3.X/4.X Server"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo
 		dev-db/mysql"
diff --git a/dev-php5/pecl-pdo-oci/ChangeLog b/dev-php5/pecl-pdo-oci/ChangeLog
index 509466ac1a8e..25af086c0b49 100644
--- a/dev-php5/pecl-pdo-oci/ChangeLog
+++ b/dev-php5/pecl-pdo-oci/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-php5/pecl-pdo-oci
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/ChangeLog,v 1.1 2005/09/04 16:41:54 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-oci-0.9.ebuild:
+  added to ~amd64
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-oci/Manifest b/dev-php5/pecl-pdo-oci/Manifest
index 2e9d4b9df3e1..860e67bc90f7 100644
--- a/dev-php5/pecl-pdo-oci/Manifest
+++ b/dev-php5/pecl-pdo-oci/Manifest
@@ -1,4 +1,14 @@
-MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 b611ac76342f2a33aaf0f1dbd4893b79 ChangeLog 222
-MD5 615bea1a5c40d723853326b439b2908a pecl-pdo-oci-0.9.ebuild 907
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0f725ffb180387a55bafaafe19884901 ChangeLog 414
 MD5 46efeed99abc481a1e2edfd1995dfec9 files/digest-pecl-pdo-oci-0.9 59
+MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
+MD5 3e70185ca72e233a6e64ffcc3ad87868 pecl-pdo-oci-0.9.ebuild 1034
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDc/4wgIKl8Uu19MoRApTAAJ440ppJbTUW1tOAx4DH17dj6NyG7ACZAT6t
+Lr0KjuCPmD5l/VXb2VIFDRc=
+=Y/oV
+-----END PGP SIGNATURE-----
diff --git a/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild b/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild
index bff28dd21786..d4351fba0828 100644
--- a/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild
+++ b/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.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/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild,v 1.1 2005/09/04 16:41:54 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-oci/pecl-pdo-oci-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_OCI"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For Oracle Call Interface (OCI)"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo"
 
diff --git a/dev-php5/pecl-pdo-odbc/ChangeLog b/dev-php5/pecl-pdo-odbc/ChangeLog
index daa70c618eb5..cfc152f27782 100644
--- a/dev-php5/pecl-pdo-odbc/ChangeLog
+++ b/dev-php5/pecl-pdo-odbc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-php5/pecl-pdo-odbc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/ChangeLog,v 1.1 2005/09/04 16:44:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-pdo-odbc-0.9.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-odbc-0.9.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-odbc-0.9.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-odbc/Manifest b/dev-php5/pecl-pdo-odbc/Manifest
index 1a0f12d5580a..271343a1365f 100644
--- a/dev-php5/pecl-pdo-odbc/Manifest
+++ b/dev-php5/pecl-pdo-odbc/Manifest
@@ -1,4 +1,4 @@
+MD5 860351a1be150046d49e4dc19c2c32f8 ChangeLog 695
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 1c7b4464324c3169bf4f12c0f0e36877 ChangeLog 223
-MD5 7fffbc81ca5e7929216592c14f8d5d6c pecl-pdo-odbc-0.9.ebuild 929
+MD5 2b4d1a21f5c75724f934a7e8574a168f pecl-pdo-odbc-0.9.ebuild 1084
 MD5 313194f0176da1889b4938a3bfd2489d files/digest-pecl-pdo-odbc-0.9 60
diff --git a/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-0.9.ebuild b/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-0.9.ebuild
index cabd4d4a5c70..8fbdf716f04e 100644
--- a/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-0.9.ebuild
+++ b/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-0.9.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/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-0.9.ebuild,v 1.1 2005/09/04 16:44:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-odbc/pecl-pdo-odbc-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_ODBC"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For ODBC Interface"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo
 		dev-db/unixODBC"
diff --git a/dev-php5/pecl-pdo-pgsql/ChangeLog b/dev-php5/pecl-pdo-pgsql/ChangeLog
index 1309772e006a..024cc1898834 100644
--- a/dev-php5/pecl-pdo-pgsql/ChangeLog
+++ b/dev-php5/pecl-pdo-pgsql/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-php5/pecl-pdo-pgsql
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/ChangeLog,v 1.1 2005/09/04 16:46:04 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/ChangeLog,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-pdo-pgsql-0.9.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-pgsql-0.9.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-pgsql-0.9.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-pgsql/Manifest b/dev-php5/pecl-pdo-pgsql/Manifest
index afd6481cfa5d..23730186ab8b 100644
--- a/dev-php5/pecl-pdo-pgsql/Manifest
+++ b/dev-php5/pecl-pdo-pgsql/Manifest
@@ -1,4 +1,4 @@
+MD5 8445a43b92194a26913d4b3be551f3b0 ChangeLog 700
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 37291f58dc9ab667c17410421f1636f1 ChangeLog 224
-MD5 0a0162d02b0434c2c2400db0b2699b20 pecl-pdo-pgsql-0.9.ebuild 923
+MD5 892d14ced558f4d080edca282b2f7e2f pecl-pdo-pgsql-0.9.ebuild 1080
 MD5 aaac3c00f864fff5c076a0b64d9ff739 files/digest-pecl-pdo-pgsql-0.9 61
diff --git a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-0.9.ebuild b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-0.9.ebuild
index 1ba8c5367d59..1d3505afc946 100644
--- a/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-0.9.ebuild
+++ b/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-0.9.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/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-0.9.ebuild,v 1.1 2005/09/04 16:46:04 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-pgsql/pecl-pdo-pgsql-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:41 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_PGSQL"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For PostgreSQL Server"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo
 		dev-db/postgresql"
diff --git a/dev-php5/pecl-pdo-sqlite/ChangeLog b/dev-php5/pecl-pdo-sqlite/ChangeLog
index 687cdec71426..09d32e23b1a5 100644
--- a/dev-php5/pecl-pdo-sqlite/ChangeLog
+++ b/dev-php5/pecl-pdo-sqlite/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-php5/pecl-pdo-sqlite
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-sqlite/ChangeLog,v 1.1 2005/09/04 16:48:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-sqlite/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-pdo-sqlite-0.9.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  pecl-pdo-sqlite-0.9.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-sqlite-0.9.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
+
+  06 Sep 2005; Stuart Herbert <stuart@gentoo.org> +files/config.m4.diff:
+  Replaced corrupted patch file
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo-sqlite/Manifest b/dev-php5/pecl-pdo-sqlite/Manifest
index c7c8c4dc1904..592b661869e7 100644
--- a/dev-php5/pecl-pdo-sqlite/Manifest
+++ b/dev-php5/pecl-pdo-sqlite/Manifest
@@ -1,5 +1,5 @@
+MD5 0a610437424a54ec05f2eb8cdc8f28fc ChangeLog 811
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 68a6b0d161e5ff12daf0094c47307341 ChangeLog 225
-MD5 df77ef32fb4b08ed0d2d8743a9070b27 pecl-pdo-sqlite-0.9.ebuild 932
-MD5 fdc2ae67c97ca2d64d214d9ddd2bef76 files/digest-pecl-pdo-sqlite-0.9 63
+MD5 a8ce6b71722f578a860c69ed3628b174 pecl-pdo-sqlite-0.9.ebuild 1092
 MD5 5e1445119b6f983cf8408a23839c3301 files/config.m4.diff 2048
+MD5 fdc2ae67c97ca2d64d214d9ddd2bef76 files/digest-pecl-pdo-sqlite-0.9 63
diff --git a/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-0.9.ebuild b/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-0.9.ebuild
index 68d53ad70437..598b12ea33e0 100644
--- a/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-0.9.ebuild
+++ b/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-0.9.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/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-0.9.ebuild,v 1.1 2005/09/04 16:48:08 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo-sqlite/pecl-pdo-sqlite-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO_SQLITE"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP Data Objects (PDO) Driver For SQLite Server"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-php5/pecl-pdo"
 
@@ -35,6 +35,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
+
 	cd ${S}
 
 	# Patches config to latest CVS sources
diff --git a/dev-php5/pecl-pdo/ChangeLog b/dev-php5/pecl-pdo/ChangeLog
index 74ff08ad2def..dde780818673 100644
--- a/dev-php5/pecl-pdo/ChangeLog
+++ b/dev-php5/pecl-pdo/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-php5/pecl-pdo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.1 2005/09/04 16:32:39 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-pdo-0.9.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  16 Sep 2005; Christian Parpart <trapni@gentoo.org> pecl-pdo-0.9.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-pdo-0.9.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
+
+  06 Sep 2005; Stuart Herbert <stuart@gentoo.org> +files/pdo_stmt.c.diff:
+  Replaced corrupt patch file
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-pdo/Manifest b/dev-php5/pecl-pdo/Manifest
index bfb96bb4710c..efdd237516ee 100644
--- a/dev-php5/pecl-pdo/Manifest
+++ b/dev-php5/pecl-pdo/Manifest
@@ -1,5 +1,5 @@
+MD5 65f155e390f7bb3b580f29d04c9576d0 ChangeLog 773
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 73c4cda1625ca38616ed976dfa5e584f ChangeLog 218
-MD5 b7238b5def2a948fc3ad53a5b5d7ac5c pecl-pdo-0.9.ebuild 1472
+MD5 f780dc77af4ec942b882a8e52cca9eaa pecl-pdo-0.9.ebuild 1598
 MD5 6279556cf34bf92200701c7a65f81ed9 files/digest-pecl-pdo-0.9 55
 MD5 c52b46703f8061eb524872fa24edc342 files/pdo_stmt.c.diff 915
diff --git a/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild b/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild
index 97d2a4e7715b..0aa6d92d9ed4 100644
--- a/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild
+++ b/dev-php5/pecl-pdo/pecl-pdo-0.9.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/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild,v 1.1 2005/09/04 16:32:39 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-pdo/pecl-pdo-0.9.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="PDO"
@@ -13,8 +13,7 @@ IUSE="firebird mssql mysql oci8 odbc postgres sqlite"
 DESCRIPTION="Core PHP Data Objects (PDO)"
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
-DEPEND="${DEPEND}"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 PDEPEND="${PDEPEND}
 		firebird? ( dev-php5/pecl-pdo-firebird )
 		mssql? ( dev-php5/pecl-pdo-dblib )
diff --git a/dev-php5/pecl-ps/ChangeLog b/dev-php5/pecl-ps/ChangeLog
index b3a573d6d906..6e28df46f9ac 100644
--- a/dev-php5/pecl-ps/ChangeLog
+++ b/dev-php5/pecl-ps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php5/pecl-ps
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ps/ChangeLog,v 1.1 2005/09/04 16:49:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ps/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-ps-1.3.1.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-ps-1.3.1.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-ps/Manifest b/dev-php5/pecl-ps/Manifest
index 1a64eedc1dc5..9c88b975f978 100644
--- a/dev-php5/pecl-ps/Manifest
+++ b/dev-php5/pecl-ps/Manifest
@@ -1,4 +1,4 @@
+MD5 6815f6265054ed78cf4af7e56276a923 ChangeLog 507
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 6c72f4996ac445bce14ba106361fdd28 pecl-ps-1.3.1.ebuild 395
-MD5 5075bbf4a5a4efcb503e404bd7674e85 ChangeLog 217
+MD5 3b6962e9588f1fd7e0169a3072f67c62 pecl-ps-1.3.1.ebuild 509
 MD5 30a9b9bc35b549888c2adaa4c850b989 files/digest-pecl-ps-1.3.1 57
diff --git a/dev-php5/pecl-ps/pecl-ps-1.3.1.ebuild b/dev-php5/pecl-ps/pecl-ps-1.3.1.ebuild
index 2a99f36c3d2d..7d36f8cf1591 100644
--- a/dev-php5/pecl-ps/pecl-ps-1.3.1.ebuild
+++ b/dev-php5/pecl-ps/pecl-ps-1.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/dev-php5/pecl-ps/pecl-ps-1.3.1.ebuild,v 1.1 2005/09/04 16:49:09 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-ps/pecl-ps-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="ps"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP extension for creating PostScript files."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc ~ppc64 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-libs/pslib"
 
diff --git a/dev-php5/pecl-yaz/ChangeLog b/dev-php5/pecl-yaz/ChangeLog
index 04da9bb56a69..f1cd20041fab 100644
--- a/dev-php5/pecl-yaz/ChangeLog
+++ b/dev-php5/pecl-yaz/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php5/pecl-yaz
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-yaz/ChangeLog,v 1.1 2005/09/04 16:50:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-yaz/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-yaz-1.0.4.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  17 Sep 2005; Christian Parpart <trapni@gentoo.org> pecl-yaz-1.0.4.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-yaz-1.0.4.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-yaz/Manifest b/dev-php5/pecl-yaz/Manifest
index 0dbec097b166..b457cfde7ef5 100644
--- a/dev-php5/pecl-yaz/Manifest
+++ b/dev-php5/pecl-yaz/Manifest
@@ -1,4 +1,4 @@
+MD5 8c7efb0f62b07493ca277a20c4bfe55f ChangeLog 674
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 bdc5f19b28936a8d8ef94390f33a9b77 ChangeLog 218
-MD5 06d278d049f587dc458eea0e8a5adadf pecl-yaz-1.0.4.ebuild 517
+MD5 ab25e41decc44de7b9e2d48fc19299b4 pecl-yaz-1.0.4.ebuild 664
 MD5 fa7c0d0ad55b381a4c8aebaa525434a9 files/digest-pecl-yaz-1.0.4 57
diff --git a/dev-php5/pecl-yaz/pecl-yaz-1.0.4.ebuild b/dev-php5/pecl-yaz/pecl-yaz-1.0.4.ebuild
index 5bab5acfbdde..0203d3e9ca97 100644
--- a/dev-php5/pecl-yaz/pecl-yaz-1.0.4.ebuild
+++ b/dev-php5/pecl-yaz/pecl-yaz-1.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/dev-php5/pecl-yaz/pecl-yaz-1.0.4.ebuild,v 1.1 2005/09/04 16:50:27 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-yaz/pecl-yaz-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="yaz"
@@ -12,7 +12,7 @@ inherit php-ext-pecl-r1
 DESCRIPTION="This extension implements a Z39.50 client for PHP using the YAZ toolkit."
 LICENSE="PHP"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-php5/pecl-zip/ChangeLog b/dev-php5/pecl-zip/ChangeLog
index fcad9773aaa5..ac59f7eb9343 100644
--- a/dev-php5/pecl-zip/ChangeLog
+++ b/dev-php5/pecl-zip/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-php5/pecl-zip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-zip/ChangeLog,v 1.1 2005/09/04 16:51:20 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-zip/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> pecl-zip-1.0.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  17 Sep 2005; Christian Parpart <trapni@gentoo.org> pecl-zip-1.0.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> pecl-zip-1.0.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/pecl-zip/Manifest b/dev-php5/pecl-zip/Manifest
index dea7f89d9e20..75c3f5cbe208 100644
--- a/dev-php5/pecl-zip/Manifest
+++ b/dev-php5/pecl-zip/Manifest
@@ -1,4 +1,4 @@
+MD5 18e85b0976b03f5ed583af92ccab6553 ChangeLog 668
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 e238e3c804608cdbb8c5bb9d53a9d581 pecl-zip-1.0.ebuild 384
-MD5 2c9e4f6d7e0ca82e02537f98a2ab5b33 ChangeLog 218
+MD5 47d82851c40fa8de96724a00fb3867ad pecl-zip-1.0.ebuild 529
 MD5 8e622d17c5cd06fa9b2da272281982b0 files/digest-pecl-zip-1.0 54
diff --git a/dev-php5/pecl-zip/pecl-zip-1.0.ebuild b/dev-php5/pecl-zip/pecl-zip-1.0.ebuild
index a49a1cdfaec2..03b509e0e41c 100644
--- a/dev-php5/pecl-zip/pecl-zip-1.0.ebuild
+++ b/dev-php5/pecl-zip/pecl-zip-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/dev-php5/pecl-zip/pecl-zip-1.0.ebuild,v 1.1 2005/09/04 16:51:20 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-zip/pecl-zip-1.0.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_PECL_PKG="zip"
@@ -13,7 +13,7 @@ IUSE=""
 DESCRIPTION="PHP zip management extension."
 SLOT="0"
 LICENSE="PHP"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 DEPEND="${DEPEND}
 		dev-libs/zziplib"
 
diff --git a/dev-php5/php-java-bridge/ChangeLog b/dev-php5/php-java-bridge/ChangeLog
index 1b872095655f..1e33fa6c6218 100644
--- a/dev-php5/php-java-bridge/ChangeLog
+++ b/dev-php5/php-java-bridge/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-php5/php-java-bridge
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/ChangeLog,v 1.1 2005/09/04 16:52:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  php-java-bridge-2.0.7.ebuild, php-java-bridge-2.0.8.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+*php-java-bridge-2.0.8 (19 Nov 2005)
+
+  19 Nov 2005; Luca Longinotti <chtekk@gentoo.org>
+  php-java-bridge-2.0.7.ebuild, +php-java-bridge-2.0.8.ebuild:
+  Add 2.0.8 to the tree, fix 2.0.7 to work with new PHP stuff.
+
+  17 Sep 2005; Christian Parpart <trapni@gentoo.org>
+  php-java-bridge-2.0.7.ebuild:
+  added to ~amd64
+
+  09 Sep 2005; Jason Wever <weeve@gentoo.org> php-java-bridge-2.0.7.ebuild:
+  Added ~sparc keyword to help fix the broken dependencies of
+  dev-php/PEAR-Date-1.4.3-r1.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/php-java-bridge/Manifest b/dev-php5/php-java-bridge/Manifest
index 307e7e8eb52a..f637d6a1a82d 100644
--- a/dev-php5/php-java-bridge/Manifest
+++ b/dev-php5/php-java-bridge/Manifest
@@ -1,4 +1,6 @@
+MD5 9bb18c6597c12c2b7e06e00cf0e98879 ChangeLog 959
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 4c1fbb5865b9b4d4581cfd5980492bdc ChangeLog 225
-MD5 d1d61acf9568bf5e862e8e0aa3685293 php-java-bridge-2.0.7.ebuild 1083
+MD5 85b48ee31761d684bf23b1c4c0ac301c php-java-bridge-2.0.7.ebuild 1247
+MD5 e6188fbac994dec5a3f1a59945122811 php-java-bridge-2.0.8.ebuild 1228
 MD5 f9772bb4b2696cabf6a11c123cf8060d files/digest-php-java-bridge-2.0.7 74
+MD5 8562d753d236eb755256a67623db0e81 files/digest-php-java-bridge-2.0.8 74
diff --git a/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild b/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild
index e8516ec95f79..afd5d79d61c2 100644
--- a/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild
+++ b/dev-php5/php-java-bridge/php-java-bridge-2.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/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild,v 1.1 2005/09/04 16:52:23 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/php-java-bridge-2.0.7.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_NAME="java"
@@ -14,7 +14,7 @@ HOMEPAGE="http://php-java-bridge.sourceforge.net/"
 DESCRIPTION="The PHP/Java bridge is a PHP module wich connects the PHP object system with the Java or ECMA 335 object system."
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="${DEPEND}
@@ -26,12 +26,13 @@ need_php_by_category
 
 pkg_setup() {
 	has_php
-	require_php_with_use java-external
+
+	# we need session support in PHP for this to compile
+	require_php_with_use session
 }
 
 src_compile() {
 	has_php
-	export WANT_AUTOCONF=2.5
 	my_conf="--disable-servlet --with-java=`java-config --jdk-home`"
 	php-ext-source-r1_src_compile
 }
@@ -43,5 +44,5 @@ src_install() {
 	doins modules/RunJavaBridge
 	doins modules/libnatcJavaBridge.a
 	doins modules/libnatcJavaBridge.so
-	dodoc ChangeLog README README.GNU_JAVA PROTOCOL.TXT
+	dodoc-php ChangeLog README README.GNU_JAVA PROTOCOL.TXT
 }
diff --git a/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild b/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild
index c94b62e3627f..1020c570d3dc 100644
--- a/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild
+++ b/dev-php5/php-java-bridge/php-java-bridge-2.0.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/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.1 2005/11/19 19:16:33 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-java-bridge/php-java-bridge-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_ZENDEXT="no"
 PHP_EXT_NAME="java"
@@ -14,7 +14,7 @@ HOMEPAGE="http://php-java-bridge.sourceforge.net/"
 DESCRIPTION="The PHP/Java bridge is a PHP module wich connects the PHP object system with the Java or ECMA 335 object system."
 LICENSE="PHP-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc64 ~x86"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-php5/phpdbg/ChangeLog b/dev-php5/phpdbg/ChangeLog
index 1aae2b0dc273..19149f115d90 100644
--- a/dev-php5/phpdbg/ChangeLog
+++ b/dev-php5/phpdbg/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-php5/phpdbg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/phpdbg/ChangeLog,v 1.1 2005/09/04 16:53:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/phpdbg/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> phpdbg-2.11.32.ebuild:
+  Added ~ppc64 keyword; bug #102649
+
+  12 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> phpdbg-2.11.32.ebuild:
+  Added ~amd64 keyword.
+
+  10 Sep 2005; Jason Wever <weeve@gentoo.org> phpdbg-2.11.32.ebuild:
+  Added ~sparc keyword.
 
   18 Aug 2005; <stuart@gentoo.org> ChangeLog:
   Initial version; replaces older dev-php/* packages
diff --git a/dev-php5/phpdbg/Manifest b/dev-php5/phpdbg/Manifest
index ccfbb02ac0e9..7008d495cef7 100644
--- a/dev-php5/phpdbg/Manifest
+++ b/dev-php5/phpdbg/Manifest
@@ -1,4 +1,4 @@
+MD5 43aa84dcac3c98f93149d7ebfb05fc0e ChangeLog 609
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
-MD5 e8f6e687afc69d8532e92d839ad43fcb ChangeLog 216
-MD5 3ac430bb29711af1d080dda4801d3801 phpdbg-2.11.32.ebuild 1378
+MD5 3c03562b9b22c0343a394c6287c15b21 phpdbg-2.11.32.ebuild 1499
 MD5 4f8b7e495c942a2fc4eb4722d0b2382d files/digest-phpdbg-2.11.32 66
diff --git a/dev-php5/phpdbg/phpdbg-2.11.32.ebuild b/dev-php5/phpdbg/phpdbg-2.11.32.ebuild
index c73f6cf1e3e3..da06b4bc660a 100644
--- a/dev-php5/phpdbg/phpdbg-2.11.32.ebuild
+++ b/dev-php5/phpdbg/phpdbg-2.11.32.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/dev-php5/phpdbg/phpdbg-2.11.32.ebuild,v 1.1 2005/09/04 16:53:21 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/phpdbg/phpdbg-2.11.32.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 PHP_EXT_NAME="dbg"
 PHP_EXT_ZENDEXT="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://dd.cron.ru/dbg/"
 LICENSE="dbgphp"
 SLOT="0"
 
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 need_php_by_category
 
diff --git a/dev-python/4suite/4suite-1.0_alpha3.ebuild b/dev-python/4suite/4suite-1.0_alpha3.ebuild
index 124be11e34a0..e60d6a309d6f 100644
--- a/dev-python/4suite/4suite-1.0_alpha3.ebuild
+++ b/dev-python/4suite/4suite-1.0_alpha3.ebuild
@@ -1,21 +1,21 @@
-# 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/dev-python/4suite/4suite-1.0_alpha3.ebuild,v 1.1 2004/01/18 11:02:36 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0_alpha3.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
-MY_P=${P/4s/4S}
-MY_P=${MY_P/_alpha/a}
+MY_P=${P/_alpha/a}
+MY_P=${MY_P/4s/4S}
 S=${WORKDIR}/4Suite
 DESCRIPTION="Python tools for XML processing and object-databases."
-SRC_URI="ftp://ftp.4suite.org/pub/4Suite/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/foursuite/${MY_P}.tar.gz"
 HOMEPAGE="http://www.4suite.org/"
 
 DEPEND=">=dev-python/pyxml-0.6.5"
-RDEPEND="${RDEPEND}"
 
+IUSE=""
 SLOT="0"
-KEYWORDS="x86 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 sparc alpha ppc"
 LICENSE="Apache-1.1"
 
 PYTHON_MODNAME="Ft"
diff --git a/dev-python/4suite/4suite-1.0_alpha4.ebuild b/dev-python/4suite/4suite-1.0_alpha4.ebuild
index 5d6f160dc35f..15688ff81da8 100644
--- a/dev-python/4suite/4suite-1.0_alpha4.ebuild
+++ b/dev-python/4suite/4suite-1.0_alpha4.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/dev-python/4suite/4suite-1.0_alpha4.ebuild,v 1.1 2005/01/20 03:56:58 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0_alpha4.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -16,7 +16,7 @@ DEPEND=">=dev-lang/python-2.3
 
 IUSE="doc"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 LICENSE="Apache-1.1"
 
 PYTHON_MODNAME="Ft"
diff --git a/dev-python/4suite/4suite-1.0_beta1.ebuild b/dev-python/4suite/4suite-1.0_beta1.ebuild
index 0f3cc4c587a7..fac1624b9dc5 100644
--- a/dev-python/4suite/4suite-1.0_beta1.ebuild
+++ b/dev-python/4suite/4suite-1.0_beta1.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/dev-python/4suite/4suite-1.0_beta1.ebuild,v 1.1 2005/04/18 11:11:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/4suite-1.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -16,7 +16,7 @@ DEPEND=">=dev-lang/python-2.3
 
 IUSE="doc"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ~sparc ~x86"
 LICENSE="Apache-1.1"
 
 PYTHON_MODNAME="Ft"
diff --git a/dev-python/4suite/ChangeLog b/dev-python/4suite/ChangeLog
index 9a5831705263..ea6b5f29b1fe 100644
--- a/dev-python/4suite/ChangeLog
+++ b/dev-python/4suite/ChangeLog
@@ -1,23 +1,77 @@
 # ChangeLog for dev-python/4suite
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/ChangeLog,v 1.1 2004/01/18 11:02:36 liquidx Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/4suite/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> 4suite-1.0_beta1.ebuild:
+  Mark 1.0_beta1 stable on ia64
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> 4suite-1.0_beta1.ebuild:
+  Mark 1.0_beta1 stable on alpha
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> 4suite-1.0_beta1.ebuild:
+  add ~ia64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  4suite-1.0_alpha3.ebuild:
+  Stable on ppc.
+
+*4suite-1.0_beta1 (18 Apr 2005)
+
+  18 Apr 2005; Alastair Tse <liquidx@gentoo.org> +4suite-1.0_beta1.ebuild:
+  version bump
+
+  20 Mar 2005; Heinrich Wendel <lanius@gentoo.org> 4suite-1.0_alpha4.ebuild:
+  add amd64 keyword
+
+*4suite-1.0_alpha4 (19 Jan 2005)
+
+  19 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +4suite-1.0_alpha4.ebuild:
+  Version bump. bug# 78517 Thanks for patches Jacob Smullyan
+  <smulloni@smullyan.org> and kutsya@gentoo.org
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> -4suite-0.11.1.ebuild:
+  Remove old version.
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> 4suite-1.0_alpha3.ebuild:
+  Stable on alpha.
+
+  04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> 4suite-1.0_alpha3.ebuild:
+  Fix broken ebuild, thanks to Jacob Smullyan, bug 52884.
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> 4suite-1.0_alpha3.ebuild:
+  Fix typo.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> 4suite-0.11.1.ebuild,
+  4suite-1.0_alpha3.ebuild:
+  Add missing IUSE.
+
+  23 Mar 2004; Alastair Tse <liquidx@gentoo.org> 4suite-0.11.1.ebuild,
+  4suite-1.0_alpha3.ebuild:
+  remove RDEPEND (#45343)
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> 4suite-1.0_alpha3.ebuild:
+  Stable on sparc.
 
   18 Jan 2004; Alastair Tse <liquidx@gentoo.org> 4suite-0.11.1.ebuild,
   4suite-1.0_alpha3.ebuild, metadata.xml:
   moved from dev-python/4Suite to dev-python/4suite, also revamped stable 0.11.1
   to use distutils
 
-*4Suite-1.0_alpha3 (03 Sep 2003)
+*4suite-1.0_alpha3 (03 Sep 2003)
 
   03 Sep 2003; Alastair Tse <liquidx@gentoo.org> 4Suite-1.0_alpha3.ebuild:
   version bump. changed . (#27199)
 
-*4Suite-1.0_alpha1 (20 Apr 2003)
+*4suite-1.0_alpha1 (20 Apr 2003)
 
   20 Apr 2003; Bart Lauwers <blauwers@gentoo.org> :
   Version bump per bug #12760 and ebuild clean-up
  
-*4Suite-0.11.1 (18 Mar 2002)
+*4suite-0.11.1 (18 Mar 2002)
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 
diff --git a/dev-python/4suite/Manifest b/dev-python/4suite/Manifest
index 371da9123657..959af7facdf5 100644
--- a/dev-python/4suite/Manifest
+++ b/dev-python/4suite/Manifest
@@ -1,6 +1,9 @@
-MD5 d591cfbc575a9dfb5f2f5ff178b70ac0 4suite-0.11.1.ebuild 753
-MD5 cdf4d4b245dc8f8e2ea5a23f3f6fdd7a 4suite-1.0_alpha3.ebuild 632
-MD5 7dc13a505c37cda5c4ce9c04199bc815 ChangeLog 1720
+MD5 9e6c97e3848323c3cce48fc5c0d4e74c 4suite-1.0_beta1.ebuild 923
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 6efecdfe62f1b8372e507862b023aff3 files/digest-4suite-0.11.1 66
+MD5 7362a63dea1b7dd9530015c7105c3cdb ChangeLog 3446
+MD5 cdc88b46e1863c72d516acaf912a5589 4suite-1.0_alpha4.ebuild 919
+MD5 bfcecb24a01ddb915991a258d19825ff 4suite-1.0_alpha3.ebuild 606
+MD5 4814d18b806331ba9c6ef9340ed67f74 files/4S-1.0_a4.addrootopt-gentoo.diff 464
+MD5 880f1fc88e78283a8665b8b0e45b95de files/digest-4suite-1.0_alpha4 66
+MD5 4accf062639961ade3688282243879b4 files/digest-4suite-1.0_beta1 66
 MD5 0724d222f5540595a368fb7acd27c1f9 files/digest-4suite-1.0_alpha3 65
diff --git a/dev-python/PyQt/ChangeLog b/dev-python/PyQt/ChangeLog
index a156999ac5e3..8c22dab2e109 100644
--- a/dev-python/PyQt/ChangeLog
+++ b/dev-python/PyQt/ChangeLog
@@ -1,6 +1,220 @@
 # ChangeLog for dev-python/PyQt
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/ChangeLog,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
+
+  11 Oct 2005; Chris Bainbridge <chrb@gentoo.org> PyQt-3.15.ebuild:
+  Fix finding qscintilla.
+
+  01 Oct 2005; Chris Bainbridge <chrb@gentoo.org> PyQt-3.15.ebuild:
+  Fix DEPEND to allow latest qscintilla.
+
+*PyQt-3.15 (26 Sep 2005)
+
+  26 Sep 2005; Chris Bainbridge <chrb@gentoo.org> +PyQt-3.15.ebuild:
+  Version bump for #107104
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> PyQt-3.13.ebuild:
+  Stable on ppc.
+
+  29 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> PyQt-3.14.ebuild,
+  PyQt-3.14.1.ebuild:
+  ~alpha keyword.
+
+*PyQt-3.14.1 (07 Mar 2005)
+
+  07 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +PyQt-3.14.1.ebuild:
+  version bump
+
+*PyQt-3.13-r1 (20 Feb 2005)
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +PyQt-3.13-r1.ebuild,
+  +PyQt-3.14.ebuild:
+  version bump
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> PyQt-3.13.ebuild:
+  Multilib fix for python.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Dec 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.13.ebuild:
+  debug support, minor fixes
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> PyQt-3.13.ebuild:
+  Stable on amd64.
+
+  07 Dec 2004; Jason Wever <weeve@gentoo.org> PyQt-3.13.ebuild:
+  Stable on sparc.
+
+  06 Dec 2004; Caleb Tennis <caleb@gentoo.org> PyQt-3.11.ebuild,
+  PyQt-3.12.ebuild, PyQt-3.13.ebuild, PyQt-3.8.1.ebuild:
+  Moving sys-devel/libtool out of RDEPEND and into DDEPEND
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.13.ebuild:
+  stable on x86
+
+  08 Nov 2004; Daniel Ostrow <dostrow@gentoo.org> PyQt-3.13.ebuild:
+  Marked ~ppc64
+
+*PyQt-3.13 (23 Sep 2004)
+
+  23 Sep 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.12.ebuild,
+  +PyQt-3.13.ebuild:
+  version bump, -alpha
+
+  21 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> PyQt-3.12.ebuild:
+  Marked stable on amd64.
+
+  18 Jul 2004; Jason Wever <weeve@gentoo.org> PyQt-3.12.ebuild:
+  Stable on sparc wrt bug #56712.
+
+  11 Jul 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.12.ebuild:
+  stable on x86
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> PyQt-3.11.ebuild,
+  PyQt-3.12.ebuild, PyQt-3.8.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  24 Jun 2004; Carsten Lohrke <carlo@gentoo.org>
+  -files/qt3.1.2-compilation-fix-3.5.diff, -PyQt-3.5.ebuild:
+  remove old ebuild
+
+*PyQt-3.12 (26 May 2004)
+
+  26 May 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.11.ebuild,
+  PyQt-3.12.ebuild, PyQt-3.5.ebuild, PyQt-3.8.1.ebuild:
+  mirror://gentoo fixes, version bump
+
+  25 May 2004; Carsten Lohrke <carlo@gentoo.org> PyQt-3.10.ebuild,
+  PyQt-3.8.1.ebuild, files/PyQt-3.10-qt-3.3.patch:
+  removed 3.10, marked 3.8.1 stable on alpha and ppc
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> PyQt-3.5.ebuild:
+  Add missing IUSE.
+
+  21 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> PyQt-3.11.ebuild:
+  Mark stable on amd64.
+
+*PyQt-3.11 (17 Mar 2004)
+
+  17 Mar 2004; Caleb Tennis <caleb@gentoo.org> PyQt-3.11.ebuild:
+  New bugfix version
+
+  14 Mar 2004; Jon Portnoy <avenj@gentoo.org> PyQt-3.8.1.ebuild :
+  AMD64 keywords.
+
+  03 Mar 2004; <kloeri@gentoo.org> PyQt-3.8.1.ebuild:
+  Move make around, close bug #43610.
+
+  02 Mar 2004; <kloeri@gentoo.org> PyQt-3.8.1.ebuild,
+  files/PyQt-3.8.1-qt-3.3.patch:
+  Fix qt-3.3 compile problem. Close bug #43475.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> PyQt-3.8.1.ebuild:
+  Stable on sparc.
+
+  26 Feb 2004; <kloeri@gentoo.org> PyQt-3.10.ebuild,
+  files/PyQt-3.10-qt-3.3.patch:
+  Fix qt-3.3 related compile errors.
+
+*PyQt-3.10 (17 Jan 2004)
+
+  17 Jan 2004; Rob Cakebread <pythonhead@gentoo.org> PyQt-3.10.ebuild:
+  Version bump. Bug# 38534. Thanks Carlo <current@myrealbox.com>
+
+  16 Dec 2003; Alastair Tse <liquidx@gentoo.org> PyQt-3.5-r1.ebuild,
+  PyQt-3.6-r1.ebuild, PyQt-3.6.ebuild, PyQt-3.7.ebuild, PyQt-3.8.1.ebuild,
+  PyQt-3.8.ebuild, files/license-3.5.diff, files/license-3.6.diff,
+  files/license-3.7.diff, files/license-3.8.diff:
+  change to Gentoo mirror for files
+
+  10 Nov 2003; Caleb Tennis <caleb@gentoo.org> PyQt-3.8.1.ebuild:
+  marking x86 stable
+
+*PyQt-3.8.1 (03 Oct 2003)
+
+  03 Oct 2003; Caleb Tennis <caleb@gentoo.org> PyQt-3.8.1.ebuild:
+  new version
+
+*PyQt-3.8 (27 Aug 2003)
+
+  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> PyQt-3.8.ebuild:
+  Version bump
+  
+  31 Jul 2003; Caleb Tennis <caleb@gentoo.org> PyQT-3.7.ebuild:
+  Upgrade dep on QScintilla-1.53
+
+*PyQt-3.7 (30 Jul 2003)
+
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org> PyQt-3.7.ebuild:
+  Version bump.  Removed version deps on qt and python as this product
+  can support almost all known (portage) version.
+
+*PyQt-3.6-r1 (29 Apr 2003)
+
+  29 Apr 2003; Michele Balistreri <brain@gentoo.org> PyQt-3.6-r1.ebuild :
+  Adding dependencie to qscintilla package
+
+*PyQt-3.6 (29 Apr 2003)
+
+  29 Apr 2003; Michele Balistreri <brain@gentoo.org> PyQt-3.6.ebuild :
+  Version bump
+
+  17 Apr 2003; Michele Balistreri <brain@gentoo.org> Changelog  :
+
+    Added IUSE flag for policy compliance
+      
+  17 Apr 2003; Michele Balistreri <brain@gentoo.org> Changelog  :
+
+    Marked as stable on x86
+    
+  12 Apr 2003; Michele Balistreri <brain@gentoo.org> ChangeLog  :
+
+    Fix compilation bug with QT 3.1.2 (bug #19008)
+
+    
+  26 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix possible sandbox error as per bug #12393.
+
+*PyQt-3.5-r1 (17 Feb 2003)
+
+  17 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Install the .sip files as well. They are placed in /usr/share/sip/qt. .sip
+  files are like headers for sip-based packages, such as PyQT and PyKDE. This
+  closes bug #10060.
+
+*PyQt-3.5 (14 Dec 2002) 
+
+  14 Dec 2002; Bart Verwilst <verwilst@gentoo.org>
+
+  New version, + changed license to GPL
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*PyQt-3.4 (18 Sep 2002) 
+
+  18 Sep 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+
+  Added ppc to keywords.
+
+*PyQt-3.4 (17 Sep 2002) 
+
+  17 Sep 2002; Bart Verwilst <verwilst@gentoo.org>
+
+*PyQt-3.3.2 (25 Jul 2002) 
+
+  25 Jul 2002; Bart Verwilst <verwilst@gentoo.org>
+ 
+  13 Aug 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  Added "-c" flag to build.py, so the compilation time will be 80% less
+  from what it was before. More CPU/MEM usage though during compilation!
+
+*PyQt-3.2.4 (5 Jul 2002) 
+
+  05 Jul 2002; Bart Verwilst <verwilst@gentoo.org>
 
 *PyQt-3.0 (1 Feb 2002)
 
diff --git a/dev-python/PyQt/Manifest b/dev-python/PyQt/Manifest
index 7972ea688382..14f85fb8ecad 100644
--- a/dev-python/PyQt/Manifest
+++ b/dev-python/PyQt/Manifest
@@ -1,7 +1,20 @@
-MD5 44eb7dbfe57434fb51f55a032492fdb8 ChangeLog 2067
-MD5 fbcf9e940591872c0e217613db07a2d9 PyQt-3.5.ebuild 1179
-MD5 391f28d02fadbc5276d09fec5c28798c PyQt-3.5-r1.ebuild 1377
-MD5 cfa5b5c9a44fc587bc3937b2d1335bb9 files/digest-PyQt-3.5 68
-MD5 ac2fc9d166ddfb0637781545e6d168c0 files/license-3.5.diff 972
-MD5 cfa5b5c9a44fc587bc3937b2d1335bb9 files/digest-PyQt-3.5-r1 68
-MD5 94164eef52f16b805d3c252c02100d11 files/qt3.1.2-compilation-fix-3.5.diff 2151
+MD5 3f3ba739628b42b45fde8141a64ddf72 ChangeLog 6952
+MD5 5839b01596e10f2cb747c3a15b56e5ae PyQt-3.11.ebuild 1472
+MD5 6d0db1c1bdefc35b47486d5e94c491a5 PyQt-3.12.ebuild 1175
+MD5 cb24fd8fac577b864a59b281a4088cb2 PyQt-3.13-r1.ebuild 1740
+MD5 9c0aa7a56928e518d28c25f94c4bfa0e PyQt-3.13.ebuild 1520
+MD5 a02b919efb1b54d05c1ca87d5121b2d5 PyQt-3.14.1.ebuild 1737
+MD5 6398473d6e2090b0371a4ead4870faaa PyQt-3.14.ebuild 1735
+MD5 780272ef9748281b9b87488aaf515dc5 PyQt-3.15.ebuild 1690
+MD5 7ae8c9ca1c90ced05dea52063e8730a8 PyQt-3.8.1.ebuild 1652
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 c5e3a3d6c377558ef966905f47c9c947 files/PyQt-3.8.1-qt-3.3.patch 280
+MD5 e548a5df6315f902d96d5b2d5afc2901 files/digest-PyQt-3.11 69
+MD5 1ce3d5a83afb717de48efb8050e66a1a files/digest-PyQt-3.12 69
+MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13 69
+MD5 d4df85b93d275ee8302e7ee33998008a files/digest-PyQt-3.13-r1 69
+MD5 c24fadea19e9b29218b912e3ae2be0df files/digest-PyQt-3.14 69
+MD5 b40db534b17bda39b6adaf85b0003404 files/digest-PyQt-3.15 69
+MD5 7323b7d1c141a1f065cb1b8646bec695 files/license-3.8.1.diff 960
+MD5 cd786c34663d5f5d09f27bb73551b6c9 files/digest-PyQt-3.14.1 71
+MD5 3fa2049e4d6038c8e02e2069f072cd60 files/digest-PyQt-3.8.1 70
diff --git a/dev-python/PyQt/PyQt-3.11.ebuild b/dev-python/PyQt/PyQt-3.11.ebuild
index f05a50509d2b..0fa759270fa6 100644
--- a/dev-python/PyQt/PyQt-3.11.ebuild
+++ b/dev-python/PyQt/PyQt-3.11.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/dev-python/PyQt/PyQt-3.11.ebuild,v 1.1 2004/03/18 01:44:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.11.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
@@ -8,18 +8,20 @@ IUSE=""
 MY_P="PyQt-x11-gpl-${PV}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="~x86 ppc ~sparc ~alpha amd64"
 
-DEPEND="virtual/glibc
-	sys-devel/libtool
+RDEPEND="virtual/libc
 	x11-libs/qt
 	dev-lang/python
 	>=dev-python/sip-3.10.1
-	>=dev-python/qscintilla-1.54"
+	<=dev-python/qscintilla-1.54"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
 
 src_compile() {
 	distutils_python_version
diff --git a/dev-python/PyQt/PyQt-3.12.ebuild b/dev-python/PyQt/PyQt-3.12.ebuild
index 3d35b20f792a..84d6819f4dc4 100644
--- a/dev-python/PyQt/PyQt-3.12.ebuild
+++ b/dev-python/PyQt/PyQt-3.12.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/dev-python/PyQt/PyQt-3.12.ebuild,v 1.1 2004/05/26 19:55:06 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.12.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
@@ -15,15 +15,18 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ppc sparc -alpha amd64"
 
-DEPEND="virtual/glibc
-	sys-devel/libtool
+RDEPEND="virtual/libc
 	x11-libs/qt
 	dev-lang/python
 	>=dev-python/sip-3.10.2
 	<=dev-python/qscintilla-1.60"
 
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+
 src_compile() {
 	distutils_python_version
 	addpredict ${QTDIR}/etc/settings
diff --git a/dev-python/PyQt/PyQt-3.13-r1.ebuild b/dev-python/PyQt/PyQt-3.13-r1.ebuild
index fb8da9817fd2..313eaeb39722 100644
--- a/dev-python/PyQt/PyQt-3.13-r1.ebuild
+++ b/dev-python/PyQt/PyQt-3.13-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/dev-python/PyQt/PyQt-3.13-r1.ebuild,v 1.1 2005/02/20 16:11:15 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/PyQt/PyQt-3.13.ebuild b/dev-python/PyQt/PyQt-3.13.ebuild
index 75bb24f6038b..f4a9e102ccd1 100644
--- a/dev-python/PyQt/PyQt-3.13.ebuild
+++ b/dev-python/PyQt/PyQt-3.13.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/dev-python/PyQt/PyQt-3.13.ebuild,v 1.1 2004/09/22 22:57:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.13.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
@@ -13,30 +13,44 @@ HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc -alpha ~amd64"
-IUSE="doc"
+KEYWORDS="x86 ppc sparc -alpha amd64 ~ppc64"
+IUSE="debug doc"
 
-DEPEND="virtual/libc
-	sys-devel/libtool
+RDEPEND="virtual/libc
 	x11-libs/qt
 	dev-lang/python
 	>=dev-python/sip-3.10.2
 	<=dev-python/qscintilla-1.61"
 
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
+
+src_unpack() {
+	unpack ${A}
+	sed -i -e "s/  check_license()/# check_license()/" ${S}/configure.py
+}
+
 src_compile() {
 	distutils_python_version
 	addpredict ${QTDIR}/etc/settings
-	sed -i -e "s/  check_license()/# check_license()/" configure.py
-	python configure.py \
-		-d /usr/lib/python${PYVER}/site-packages \
-		-b /usr/bin \
-		-v /usr/share/sip \
-		-c
-	emake || die
+
+	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -b /usr/bin -v /usr/share/sip"
+	use debug && myconf="${myconf} -u"
+	has distcc ${FEATURES} || myconf="${myconf} -c"
+
+	if [ "$(echo $(free -m | grep Mem) | cut -d' ' -f2)" -lt "257" ] ; then
+		echo ""
+		einfo "Low on memory?! Use distcc or get a coffee. :)"
+		echo ""
+	fi
+
+	python configure.py ${myconf}
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} || die
+	make DESTDIR=${D} install || die "install failed"
 	dodoc ChangeLog LICENSE NEWS README README.Linux THANKS
 	if use doc ; then
 		dohtml doc/PyQt.html
diff --git a/dev-python/PyQt/PyQt-3.14.1.ebuild b/dev-python/PyQt/PyQt-3.14.1.ebuild
index ae32a8340f76..e0a25728b16a 100644
--- a/dev-python/PyQt/PyQt-3.14.1.ebuild
+++ b/dev-python/PyQt/PyQt-3.14.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/dev-python/PyQt/PyQt-3.14.1.ebuild,v 1.1 2005/03/06 23:32:51 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.14.1.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc -alpha ~amd64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
 IUSE="debug doc"
 
 RDEPEND="virtual/libc
diff --git a/dev-python/PyQt/PyQt-3.14.ebuild b/dev-python/PyQt/PyQt-3.14.ebuild
index 5a871bd4fbf0..3992e4e616c8 100644
--- a/dev-python/PyQt/PyQt-3.14.ebuild
+++ b/dev-python/PyQt/PyQt-3.14.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/dev-python/PyQt/PyQt-3.14.ebuild,v 1.1 2005/02/20 16:11:15 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.14.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc -alpha ~amd64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
 IUSE="debug doc"
 
 RDEPEND="virtual/libc
diff --git a/dev-python/PyQt/PyQt-3.15.ebuild b/dev-python/PyQt/PyQt-3.15.ebuild
index 9d3199afe6a0..7d8906f43847 100644
--- a/dev-python/PyQt/PyQt-3.15.ebuild
+++ b/dev-python/PyQt/PyQt-3.15.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/dev-python/PyQt/PyQt-3.15.ebuild,v 1.1 2005/09/26 15:26:47 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.15.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 inherit distutils
 
@@ -22,7 +22,7 @@ RDEPEND="virtual/libc
 	x11-libs/qt
 	dev-lang/python
 	>=dev-python/sip-4.2
-	<dev-python/qscintilla-1.6"
+	dev-python/qscintilla"
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
@@ -37,7 +37,7 @@ src_compile() {
 	addpredict ${QTDIR}/etc/settings
 
 	local myconf="-d /usr/$(get_libdir)/python${PYVER}/site-packages -b /usr/bin \
-			-v /usr/share/sip -n /usr/include -o /usr/$(get_libdir)"
+			-v /usr/share/sip"
 	use debug && myconf="${myconf} -u"
 	has distcc ${FEATURES} || myconf="${myconf} -c"
 
diff --git a/dev-python/PyQt/PyQt-3.8.1.ebuild b/dev-python/PyQt/PyQt-3.8.1.ebuild
index fda3085c1421..3c0cd6610a75 100644
--- a/dev-python/PyQt/PyQt-3.8.1.ebuild
+++ b/dev-python/PyQt/PyQt-3.8.1.ebuild
@@ -1,32 +1,33 @@
-# 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/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.1 2003/10/03 14:10:31 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt/PyQt-3.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
-inherit eutils distutils
-
-IUSE=""
+inherit distutils eutils
 
 S="${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 DESCRIPTION="set of Python bindings for the QT 3.x Toolkit"
-SRC_URI="http://www.river-bank.demon.co.uk/download/PyQt/PyQt-x11-gpl-${PV}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/pyqt/"
-SLOT="0"
+SRC_URI="mirror://gentoo/PyQt-x11-gpl-${PV}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-RESTRICT="nomirror"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
 PV_MAJOR=${PV/.*/}
 PV_MINOR=${PV#${PV_MAJOR}.}
 PV_MINOR=${PV_MINOR/.*}
 
-DEPEND="virtual/glibc
-	sys-devel/libtool
+RDEPEND="virtual/libc
 	x11-libs/qt
 	dev-lang/python
 	=dev-python/sip-${PV_MAJOR}.${PV_MINOR}*
 	>=dev-python/qscintilla-1.53"
 
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
 src_unpack() {
 	unpack PyQt-x11-gpl-${PV}.tar.gz
 	cd ${S}
@@ -34,8 +35,13 @@ src_unpack() {
 }
 
 src_compile() {
-
 	distutils_python_version
+
+	# fix qt-3.3 compile problem
+	if has_version '=x11-libs/qt-3.3*' ; then
+		epatch "${FILESDIR}/${P}-qt-3.3.patch"
+	fi
+
 	# standard qt sandbox problem workaround
 	[ -d "$QTDIR/etc/settings" ] && addwrite "$QTDIR/etc/settings"
 	dodir /usr/lib/python${PYVER}/site-packages
@@ -45,14 +51,15 @@ src_compile() {
 		-e /usr/include/python${PYVER} \
 		-b ${D}/usr/bin \
 		-l qt-mt -c
-	make || die
 }
 
 src_install() {
+	make || die
+	distutils_python_version
+	dodir /usr/lib/python${PYVER}/site-packages
 	make DESTDIR=${D} install || die
 	dodoc README.Linux NEWS LICENSE README ChangeLog THANKS
 	dodir /usr/share/doc/${P}/
-	mv ${D}/usr/share/doc/* ${D}/usr/share/doc/${P}/
 	# I found out this location from the redhat rpm
 	insinto /usr/share/sip/qt
 	doins ${S}/sip/*
diff --git a/dev-python/PyQt/metadata.xml b/dev-python/PyQt/metadata.xml
index de483c53568f..a789e7bbe9ee 100644
--- a/dev-python/PyQt/metadata.xml
+++ b/dev-python/PyQt/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>qt</herd>
 </pkgmetadata>
diff --git a/dev-python/adns-python/ChangeLog b/dev-python/adns-python/ChangeLog
index 46c295fda5d4..7f27675e762d 100644
--- a/dev-python/adns-python/ChangeLog
+++ b/dev-python/adns-python/ChangeLog
@@ -1,8 +1,32 @@
 # ChangeLog for dev-python/adns-python
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/ChangeLog,v 1.1 2003/03/03 23:41:50 foser Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> adns-python-1.0.0.ebuild:
+  stable on amd64
+
+*adns-python-1.1.0 (12 Feb 2005)
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +adns-python-1.1.0.ebuild:
+  Version bump.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> adns-python-1.0.0.ebuild:
+  Adding amd64 keyword. Closing #43595.
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> adns-python-1.0.0.ebuild:
+  changed depend to >=net-libs/adns-1.0
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> adns-python-1.0.0.ebuild:
+  Added ~sparc keyword.
 
 *adns-python-1.0.0 (03 Mar 2003)
 
+  25 Apr 2003; Lars Weiler <pylon@gentoo.org> adns-python-1.0.0.ebuild:
+  Set ~ppc in KEYWORDS
+
+  25 Mar 2003; Alastair Tse <liquidx@gentoo.org> adns-python-1.0.0.ebuild:
+  Using distutils eclass and bumping to stable.
+  
   03 Mar 2003; foser <foser@gentoo.org> adns-python-1.0.0.ebuild, ChangeLog :
   Initial commit
diff --git a/dev-python/adns-python/Manifest b/dev-python/adns-python/Manifest
index e69de29bb2d1..57a904105db4 100644
--- a/dev-python/adns-python/Manifest
+++ b/dev-python/adns-python/Manifest
@@ -0,0 +1,6 @@
+MD5 bd763fe83e4495f9e844b64abb9cacbf ChangeLog 1122
+MD5 73a2de08cfa3ac50c71c8e70f61747a4 adns-python-1.0.0.ebuild 519
+MD5 03365bf8f22a259d8ac5f1439adc26e6 adns-python-1.1.0.ebuild 521
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 3baab9ec9dc37ebd421ed4e779b22bf0 files/digest-adns-python-1.0.0 68
+MD5 2126e791ad8c9ea825c4b8db97675060 files/digest-adns-python-1.1.0 68
diff --git a/dev-python/adns-python/adns-python-1.0.0.ebuild b/dev-python/adns-python/adns-python-1.0.0.ebuild
index fe3b67db84f6..d15df8434e29 100644
--- a/dev-python/adns-python/adns-python-1.0.0.ebuild
+++ b/dev-python/adns-python/adns-python-1.0.0.ebuild
@@ -1,24 +1,16 @@
-# 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/dev-python/adns-python/adns-python-1.0.0.ebuild,v 1.1 2003/03/03 23:41:50 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/adns-python-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+inherit distutils
 
 DESCRIPTION="Python bindings for ADNS"
 HOMEPAGE="http://dustman.net/andy/python/adns-python"
 SRC_URI="http://dustman.net/andy/python/${PN}/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~sparc amd64"
 IUSE=""
 
 DEPEND="virtual/python
-	=net-libs/adns-1.0*"
-
-src_compile() {
-	python setup.py build || die
-}
-
-src_install() {
-	python setup.py install --prefix=${D}/usr || die
-
-	dodoc README
-}
+	>=net-libs/adns-1.0"
diff --git a/dev-python/adns-python/adns-python-1.1.0.ebuild b/dev-python/adns-python/adns-python-1.1.0.ebuild
index defc85027c90..1648ed619558 100644
--- a/dev-python/adns-python/adns-python-1.1.0.ebuild
+++ b/dev-python/adns-python/adns-python-1.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/dev-python/adns-python/adns-python-1.1.0.ebuild,v 1.1 2005/02/12 10:40:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adns-python/adns-python-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/adodb-py/ChangeLog b/dev-python/adodb-py/ChangeLog
index 1d6d8fed34d9..62666079262d 100644
--- a/dev-python/adodb-py/ChangeLog
+++ b/dev-python/adodb-py/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-python/adodb-py
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/ChangeLog,v 1.1 2004/08/10 03:58:00 pythonhead Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Translated metadata.xml thanks to Yoshino-san.
+
+*adodb-py-1.13 (16 Oct 2005)
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> +adodb-py-1.13.ebuild:
+  Version bump, bug 102169.
+
+*adodb-py-1.10 (11 Feb 2005)
+
+  11 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> +adodb-py-1.10.ebuild:
+  Version bump, bug 81399.
+
+  08 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> adodb-py-1.0.1.ebuild:
+  Removed postgresql flag. Bug# 74568
+
+  04 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> adodb-py-1.0.1.ebuild:
+  depend on app-arch/unzip bug# 69831, marked stable x86
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> adodb-py-1.0.1.ebuild:
+  Added to ~ppc.
+
+  13 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> adodb-py-1.0.1.ebuild:
+  Added USE flags for mysql and postgresql support, changed homepage, dep
+  version of python
 
 *adodb-py-1.0.1 (09 Aug 2004)
 
diff --git a/dev-python/adodb-py/Manifest b/dev-python/adodb-py/Manifest
index ab3af0c7185f..e1fcb3888b4b 100644
--- a/dev-python/adodb-py/Manifest
+++ b/dev-python/adodb-py/Manifest
@@ -1,4 +1,18 @@
-MD5 3d9eaade8b42e400735ab705f2781324 adodb-py-1.0.1.ebuild 593
-MD5 3c8739250cd740951ca171f6b1c8d046 metadata.xml 234
-MD5 147c31bbc742cd515f7688f6d4fc6a9d ChangeLog 311
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b5572e0c3e11e5da5ab6e59a7c6872a7 ChangeLog 1296
+MD5 43cd7b30bc861355c7f81345a32c13da adodb-py-1.0.1.ebuild 757
+MD5 c534894361be82f038923158d3ed8a71 adodb-py-1.10.ebuild 753
+MD5 8239cb63e28770a4d9af56b3bc8cd2f6 adodb-py-1.13.ebuild 753
 MD5 450db37bc2cdb99957226a0f971b1cb3 files/digest-adodb-py-1.0.1 59
+MD5 3266987c7c92564c77b529bb10fd57dd files/digest-adodb-py-1.10 59
+MD5 0319cc534d13027c933ae109f7d46c4d files/digest-adodb-py-1.13 59
+MD5 7b46f44b322d2dfc86bdd3551c64e565 metadata.xml 348
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfvi8FdQwWVoAgN4RAkR3AJ9W5jXVSG3DiqRhIfcTWNBUaRtYQACgu7SW
+rRxVUpeLoRmDXv2v3XFi9Xg=
+=4RyK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/adodb-py/adodb-py-1.0.1.ebuild b/dev-python/adodb-py/adodb-py-1.0.1.ebuild
index 01681649479e..ae71b2f01b43 100644
--- a/dev-python/adodb-py/adodb-py-1.0.1.ebuild
+++ b/dev-python/adodb-py/adodb-py-1.0.1.ebuild
@@ -1,18 +1,21 @@
-# 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/dev-python/adodb-py/adodb-py-1.0.1.ebuild,v 1.1 2004/08/10 03:58:00 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${PN}${PV//./}
 DESCRIPTION="Active Data Objects Data Base library for Python"
-HOMEPAGE="http://php.weblogs.com/adodb_python"
+HOMEPAGE="http://adodb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/adodb/${MY_P}.zip"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="virtual/python"
+KEYWORDS="x86 ~ppc"
+IUSE="mysql postgres"
+RDEPEND=">=dev-lang/python-2.3
+	postgres? ( >=dev-python/psycopg-1.1.5.1 )
+	mysql? ( >=dev-python/mysql-python-0.9.2 )
+	app-arch/unzip"
 S="${WORKDIR}/${PN/-py/}"
 DOCS="LICENSE.txt README.txt"
 
diff --git a/dev-python/adodb-py/adodb-py-1.10.ebuild b/dev-python/adodb-py/adodb-py-1.10.ebuild
index 4b6948d668cd..c656c142916f 100644
--- a/dev-python/adodb-py/adodb-py-1.10.ebuild
+++ b/dev-python/adodb-py/adodb-py-1.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/dev-python/adodb-py/adodb-py-1.10.ebuild,v 1.1 2005/02/11 20:40:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-1.10.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/adodb-py/adodb-py-1.13.ebuild b/dev-python/adodb-py/adodb-py-1.13.ebuild
index c70e407312ae..2d2cc1813ac8 100644
--- a/dev-python/adodb-py/adodb-py-1.13.ebuild
+++ b/dev-python/adodb-py/adodb-py-1.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/dev-python/adodb-py/adodb-py-1.13.ebuild,v 1.1 2005/10/16 22:22:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/adodb-py/adodb-py-1.13.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/adodb-py/metadata.xml b/dev-python/adodb-py/metadata.xml
index d4883617b770..056fa57ad1d9 100644
--- a/dev-python/adodb-py/metadata.xml
+++ b/dev-python/adodb-py/metadata.xml
@@ -3,4 +3,7 @@
 <pkgmetadata>
 <herd>python</herd>
 <longdescription>Database abstraction library for Python</longdescription>
+<longdescription lang="ja">
+Python言語用データベース抽象化ライブラリです。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/apse/ChangeLog b/dev-python/apse/ChangeLog
index 96b806ccd6c8..9421c45f0c76 100644
--- a/dev-python/apse/ChangeLog
+++ b/dev-python/apse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/apse
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/ChangeLog,v 1.1 2005/01/24 17:58:59 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> apse-0.2.ebuild:
+  Added to ~ppc.
 
 *apse-0.2 (24 Jan 2005)
 
diff --git a/dev-python/apse/Manifest b/dev-python/apse/Manifest
index 55c83a38cb24..40198634e74e 100644
--- a/dev-python/apse/Manifest
+++ b/dev-python/apse/Manifest
@@ -1,3 +1,14 @@
-MD5 cb5185c718fa6e307450087ebb429f81 apse-0.2.ebuild 866
-MD5 8211e72b3f0c6d354100f269ca0181e5 metadata.xml 613
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 29865f1ff9a499cbec87402863d2338e ChangeLog 558
+MD5 360c9b65c7e1a799901ecd7b66c09853 apse-0.2.ebuild 842
 MD5 ab8530ab973b2219f8595b3855f627a8 files/digest-apse-0.2 59
+MD5 6eca5bb2ab30d80b8a433302d57d7b49 metadata.xml 1094
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfvp2FdQwWVoAgN4RAonOAKDaidozGqbeIM5mreYUXZhyD3le9wCfWHYu
+QP83JVZutXU9yx2Jk6fusyc=
+=o9MO
+-----END PGP SIGNATURE-----
diff --git a/dev-python/apse/apse-0.2.ebuild b/dev-python/apse/apse-0.2.ebuild
index db063b039822..1007e5cf5da1 100644
--- a/dev-python/apse/apse-0.2.ebuild
+++ b/dev-python/apse/apse-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/dev-python/apse/apse-0.2.ebuild,v 1.1 2005/01/24 17:58:59 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apse/apse-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 MY_PN="${PN/apse/Apse}"
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.personal.psu.edu/staff/i/u/iua1/python/apse/"
 SRC_URI="http://www.personal.psu.edu/staff/i/u/iua1/python/apse/dist/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 SLOT="0"
 IUSE=""
 
@@ -23,9 +23,8 @@ PYTHON_MODNAME="Apse"
 
 src_install() {
 	distutils_src_install
-	#dodir /usr/share/doc/${PF}
 	dodoc README* *agrep
-	insinto /usr/share/doc/test
+	insinto /usr/share/doc/${PF}/test
 	doins test/*
 }
 
diff --git a/dev-python/apse/metadata.xml b/dev-python/apse/metadata.xml
index b43ebb2e31f1..3b73a1c65898 100644
--- a/dev-python/apse/metadata.xml
+++ b/dev-python/apse/metadata.xml
@@ -9,4 +9,8 @@
 <longdescription>
 Approximate String Matching in Python: identifies typing and spelling errors, closely related vocabularies, genetic mutations (GAG ACT), abbreviations. While it implements the same algorithm as the agrep program, Apse lets the user choose how many edits (substitutions, deletions, additions) will be acceptable as 'match'.
 </longdescription>
+<longdescription lang="ja">
+Python言語に近似した文字列の一致を判断させます。タイピング・エラー、スペリング・
+エラー、ボキャブラリ的に近い単語、一般的な同意語(GAG ACT)、略語を同一視できます>。agrepプログラムと同一のアルゴリズムを用いて、Apseはユーザーに"一致する"と判断>した場合の処理(置換、削除、追加)を何回行うかを選ばせます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/bicyclerepair/ChangeLog b/dev-python/bicyclerepair/ChangeLog
index 3e2c2c924903..63a3edb46e37 100644
--- a/dev-python/bicyclerepair/ChangeLog
+++ b/dev-python/bicyclerepair/ChangeLog
@@ -1,9 +1,38 @@
 # ChangeLog for dev-python/bicyclerepair
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/ChangeLog,v 1.1 2003/03/08 18:23:07 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+  19 Nov 2005; <dang@gentoo.org> bicyclerepair-0.9.ebuild:
+  Marked ~amd64
+
+*bicyclerepair-0.9 (12 Feb 2005)
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +bicyclerepair-0.9.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  bicyclerepair-0.7.1.ebuild:
+  Remove default S.
+
+  15 Jan 2004; Rob Cakebread <pythonhead@gentoo.org>
+  bicyclerepair-0.7.1-r1.ebuild:
+  Added more einfo for [x]emacs users
+
+*bicyclerepair-0.7.1-r1 (15 Jan 2004)
+
+  15 Jan 2004; Rob Cakebread <pythonhead@gentoo.org>
+  bicyclerepair-0.7.1-r1.ebuild:
+  Added bike.el file for [x]emacs users and info for IDLE integration. Bug #38191
 
 *bicyclerepair-0.7.1 (08 Mar 2003)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> bicyclerepair-0.7.1.ebuild:
+  bump to stable
+
   08 Mar 2003; Alastair Tse <liquidx@gentoo.org> bicyclerepair-0.7.1.ebuild:
   initial ebuild. thanks to Lin Zhemin <ljm@ljm.idv.tw> (#16448)
 
diff --git a/dev-python/bicyclerepair/Manifest b/dev-python/bicyclerepair/Manifest
index e69de29bb2d1..1aa20983f946 100644
--- a/dev-python/bicyclerepair/Manifest
+++ b/dev-python/bicyclerepair/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e9f3ee5b43fe7ab0f54db283ede578c ChangeLog 1244
+MD5 a92dd7c2f4a7798a07968997e3c35923 bicyclerepair-0.7.1-r1.ebuild 1369
+MD5 eaafc19eef14024c9218dc9a91c5a8af bicyclerepair-0.7.1.ebuild 1023
+MD5 3c98a190916c0b4283ef1a9bff884138 bicyclerepair-0.9.ebuild 1370
+MD5 1929efd859e004d9dfe70dde4e1c8940 files/digest-bicyclerepair-0.7.1 70
+MD5 1929efd859e004d9dfe70dde4e1c8940 files/digest-bicyclerepair-0.7.1-r1 70
+MD5 a95d1f58d5a668d967f22340edd1686d files/digest-bicyclerepair-0.9 69
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf7WBomPajV0RnrERAmUkAJsGVWx3qHgsYDKp6ePiclUAt0oG0wCff5sM
+iieynMNrQeiOawVM2NJq+xo=
+=pG4L
+-----END PGP SIGNATURE-----
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.7.1-r1.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.7.1-r1.ebuild
index 286ecab5b490..fff64c9bff97 100644
--- a/dev-python/bicyclerepair/bicyclerepair-0.7.1-r1.ebuild
+++ b/dev-python/bicyclerepair/bicyclerepair-0.7.1-r1.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/dev-python/bicyclerepair/bicyclerepair-0.7.1-r1.ebuild,v 1.1 2004/01/16 01:24:23 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/bicyclerepair-0.7.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 mydoc="NEWS DESIGN"
@@ -37,6 +37,7 @@ pkg_postinst() {
 	fi
 	einfo " "
 	einfo "To use bicyclerepair with Xemacs or GNU Emacs you must be in Python"
-	einfo "mode and add /usr/share/bicyclerepair/bike.el to your .emacs or .init.el"
+	einfo "mode and add this to your .emacs or .init.el:"
+	einfo "(load-library '/usr/share/bicyclerepair/bike.el')"
 }
 
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.7.1.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.7.1.ebuild
index 898e5d01c3e4..c9e9398b92f5 100644
--- a/dev-python/bicyclerepair/bicyclerepair-0.7.1.ebuild
+++ b/dev-python/bicyclerepair/bicyclerepair-0.7.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/dev-python/bicyclerepair/bicyclerepair-0.7.1.ebuild,v 1.1 2003/03/08 18:23:07 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/bicyclerepair-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
@@ -10,27 +10,25 @@ SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND="virtual/python"
 
-S="${WORKDIR}/${P}"
-
 mydoc="NEWS DESIGN"
 
 src_install() {
-    distutils_src_install
-    rm -f ${D}/usr/bin/bikeemacs.bat
+	distutils_src_install
+	rm -f ${D}/usr/bin/bikeemacs.bat
 }
 
 pkg_postinst() {
-    # Enable IDLE integration if Python was compiled with tcltk.
-    PYTHON_VER=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')                                                                                
-    config_txt=/usr/lib/python${PYTHON_VER}/tools/idle/config.txt
-    if [ -f "${config_txt}" ]; then
-        if [ -z "`grep BicycleRepairMan_Idle ${config_txt}`" ]; then
-           einfo "Appending BicycleRepairman to IDLE.."
-           echo "[BicycleRepairMan_Idle]" >> ${config_txt}
-        fi
-    fi
+	# Enable IDLE integration if Python was compiled with tcltk.
+	PYTHON_VER=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
+	config_txt=/usr/lib/python${PYTHON_VER}/tools/idle/config.txt
+	if [ -f "${config_txt}" ]; then
+		if [ -z "`grep BicycleRepairMan_Idle ${config_txt}`" ]; then
+			einfo "Appending BicycleRepairman to IDLE.."
+			echo "[BicycleRepairMan_Idle]" >> ${config_txt}
+		fi
+	fi
 }
diff --git a/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild b/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild
index 47f139914720..30a89b11d0ac 100644
--- a/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild
+++ b/dev-python/bicyclerepair/bicyclerepair-0.9.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/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild,v 1.1 2005/02/12 10:50:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bicyclerepair/bicyclerepair-0.9.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 mydoc="NEWS DESIGN"
@@ -11,7 +11,7 @@ HOMEPAGE="http://bicyclerepair.sourceforge.net/"
 SRC_URI="mirror://sourceforge/bicyclerepair/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="virtual/python"
 
diff --git a/dev-python/bonobo-python/ChangeLog b/dev-python/bonobo-python/ChangeLog
index 53e46e7b29fd..8f656460f992 100644
--- a/dev-python/bonobo-python/ChangeLog
+++ b/dev-python/bonobo-python/ChangeLog
@@ -1,9 +1,61 @@
 # ChangeLog for dev-python/bonobo-python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  bonobo-python-0.2.0-r5.ebuild:
+  Stable on alpha.
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> bonobo-python-0.2.0-r5.ebuild:
+  Stable on sparc.
+
+  23 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org>
+  bonobo-python-0.2.0-r5.ebuild:
+  Stable on x86.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  bonobo-python-0.2.0-r3.ebuild, bonobo-python-0.2.0-r4.ebuild,
+  bonobo-python-0.2.0-r5.ebuild:
+  Remove default S.
+
+*bonobo-python-0.2.0-r5 (01 May 2004)
+
+  01 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +bonobo-python-0.2.0-r5.ebuild:
+  Added pygtk to dependencies, bug #48322.
+
+  12 Apr 2004; David Holm <dholm@gentoo.org> bonobo-python-0.2.0-r4.ebuild:
+  Added to ~ppc.
+
+*bonobo-python-0.2.0-r4 (12 Apr 2004)
+
+  12 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
+  bonobo-python-0.2.0-r4.ebuild:
+  Inherit virtualx and add some sed foo to configure, close bug #47102.
+
+*bonobo-python-0.2.0-r3 (10 Dec 2002)
+  10 Dec 2002; Thomas Raschbacher (lordvan@gentoo.org>:
+  fixed install bug in nautilus/Makefile (fixes bug #4779 finally!)
+  added IUSE
+
+  09 Dec 2002: foser@gentoo.org:
+  fixed DEPEND (gnome-python1 required)
+  fixed configure problem
+  and fixed dependency (gnome-python1)
+	
+* Autoupdate keywords (12-6-02)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *bonobo-python-0.2.0-r1 (1 Feb 2002)
 
+  26 Jul 2002; George Shapovalov <george@gentoo.org> bonobo-python-0.2.0-r1.ebuild :
+
+  added KEYWORDS,SLOT,LICENSE
+  general clean-up (whitespace, header, try->||die)
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/dev-python/bonobo-python/Manifest b/dev-python/bonobo-python/Manifest
index e69de29bb2d1..63cdf3878bb1 100644
--- a/dev-python/bonobo-python/Manifest
+++ b/dev-python/bonobo-python/Manifest
@@ -0,0 +1,8 @@
+MD5 f8f93e49c63791e7ba6c62fa763477cb bonobo-python-0.2.0-r3.ebuild 1321
+MD5 8e5b45d5df495009743b2ad01269993a ChangeLog 2337
+MD5 2379ccbfaa13e112d8bee73ca8ab314c bonobo-python-0.2.0-r5.ebuild 1371
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 fc866f776d304de89aa5cdfaf4c29235 bonobo-python-0.2.0-r4.ebuild 1352
+MD5 40e5326caea5a297e9e99af71f575dce files/digest-bonobo-python-0.2.0-r4 71
+MD5 40e5326caea5a297e9e99af71f575dce files/digest-bonobo-python-0.2.0-r5 71
+MD5 40e5326caea5a297e9e99af71f575dce files/digest-bonobo-python-0.2.0-r3 71
diff --git a/dev-python/bonobo-python/bonobo-python-0.2.0-r3.ebuild b/dev-python/bonobo-python/bonobo-python-0.2.0-r3.ebuild
index e3302e4a3de0..036c03c157cb 100644
--- a/dev-python/bonobo-python/bonobo-python-0.2.0-r3.ebuild
+++ b/dev-python/bonobo-python/bonobo-python-0.2.0-r3.ebuild
@@ -1,10 +1,9 @@
-# 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/dev-python/bonobo-python/bonobo-python-0.2.0-r3.ebuild,v 1.1 2002/12/10 19:13:00 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/bonobo-python-0.2.0-r3.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Bonobo bindings for Python"
 SRC_URI="http://bonobo-python.lajnux.nu/download/${P}.tar.gz"
 HOMEPAGE="http://bonobo-python.lajnux.nu/"
@@ -14,10 +13,9 @@ DEPEND="=x11-libs/gtk+-1.2*
 	<dev-python/gnome-python-1.99
 	=dev-python/orbit-python-0.3*
 	virtual/python"
-RDEPEND="${RDEPEND}"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc alpha"
 LICENSE="GPL-2"
 
 src_unpack() {
@@ -31,7 +29,7 @@ src_unpack() {
 }
 
 src_compile() {
-	PYTHON=/usr/bin/python	./configure --host=${CHOST} --prefix=/usr \
+	PYTHON="/usr/bin/python" econf \
 		--with-libIDL-prefix=/usr --with-orbit-prefix=/usr \
 		--with-oaf-prefix=/usr || die
 	make || die
@@ -39,12 +37,13 @@ src_compile() {
 
 src_install() {
 	# check if nautilus 1 was found
-	grep "#pysite_PYTHON" ${S}/nautilus/Makefile >& /dev/null && ( \
-	    mv ${S}/nautilus/Makefile ${S}/nautilus/Makefile.orig; \
-	    sed s/'install-data-am: install-pysitePYTHON'/'install-data-am:'/ ${S}/nautilus/Makefile.orig > ${S}/nautilus/Makefile; \
-	    rm ${S}/nautilus/Makefile.orig; )
-	
-	make DESTDIR=${D} install || die
+	grep "#pysite_PYTHON" ${S}/nautilus/Makefile >& /dev/null && \
+	( \
+		mv ${S}/nautilus/Makefile ${S}/nautilus/Makefile.orig; \
+		sed s/'install-data-am: install-pysitePYTHON'/'install-data-am:'/ ${S}/nautilus/Makefile.orig > ${S}/nautilus/Makefile; \
+	)
+
+	einstall || die
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
 
diff --git a/dev-python/bonobo-python/bonobo-python-0.2.0-r4.ebuild b/dev-python/bonobo-python/bonobo-python-0.2.0-r4.ebuild
index ca67603b4cc8..64cd8e198bc9 100644
--- a/dev-python/bonobo-python/bonobo-python-0.2.0-r4.ebuild
+++ b/dev-python/bonobo-python/bonobo-python-0.2.0-r4.ebuild
@@ -1,12 +1,11 @@
-# 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/dev-python/bonobo-python/bonobo-python-0.2.0-r4.ebuild,v 1.1 2004/04/12 01:41:12 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/bonobo-python-0.2.0-r4.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 inherit virtualx
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Bonobo bindings for Python"
 SRC_URI="http://bonobo-python.lajnux.nu/download/${P}.tar.gz"
 HOMEPAGE="http://bonobo-python.lajnux.nu/"
@@ -18,7 +17,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/dev-python/bonobo-python/bonobo-python-0.2.0-r5.ebuild b/dev-python/bonobo-python/bonobo-python-0.2.0-r5.ebuild
index cdf3f3055a04..751b9aaa9573 100644
--- a/dev-python/bonobo-python/bonobo-python-0.2.0-r5.ebuild
+++ b/dev-python/bonobo-python/bonobo-python-0.2.0-r5.ebuild
@@ -1,12 +1,11 @@
-# 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/dev-python/bonobo-python/bonobo-python-0.2.0-r5.ebuild,v 1.1 2004/05/01 20:17:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bonobo-python/bonobo-python-0.2.0-r5.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 inherit virtualx
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Bonobo bindings for Python"
 SRC_URI="http://bonobo-python.lajnux.nu/download/${P}.tar.gz"
 HOMEPAGE="http://bonobo-python.lajnux.nu/"
@@ -19,7 +18,7 @@ DEPEND="=x11-libs/gtk+-1.2*
 	virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 sparc alpha ~ppc"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/dev-python/bsddb3/ChangeLog b/dev-python/bsddb3/ChangeLog
index de986c165a61..978579de169d 100644
--- a/dev-python/bsddb3/ChangeLog
+++ b/dev-python/bsddb3/ChangeLog
@@ -1,9 +1,70 @@
 # ChangeLog for dev-python/bsddb3
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.1 2002/11/01 16:53:50 foser Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> bsddb3-4.1.3.ebuild,
+  bsddb3-4.2.4.ebuild:
+  marked 4.2.4 testing and 4.1.3 stable on amd64
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> bsddb3-3.4.0-r1.ebuild:
+  Fix failed patch, bug 64280.
+
+  26 Sep 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/bsddb3-4.1.3-setup.py.patch, bsddb3-4.1.3.ebuild,
+  bsddb3-4.2.4.ebuild:
+  fix problems with 4.2 incompatibility with bsddb3-4.1.3 (#62017)
+
+  26 Jun 2004; Alastair Tse <liquidx@gentoo.org> bsddb3-4.1.3.ebuild:
+  fix bsddb3 to use the stable db4.1 (#51951)
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> bsddb3-4.1.3.ebuild:
+  Adding amd64 keyword. Closing #43595.
+
+  17 Mar 2004; Seemant Kulleen <seemant@gentoo.org> bsddb3-3.4.0-r1.ebuild,
+  bsddb3-4.1.3.ebuild, bsddb3-4.2.4.ebuild:
+  spelling of Berkeley fixed, thanks to: Martin Rieder <bugs@martinrieder.de> in
+  bug #44927
+
+*bsddb3-4.2.4 (13 Feb 2004)
+
+  13 Feb 2004; Alastair Tse <liquidx@gentoo.org> bsddb3-3.4.0.ebuild,
+  bsddb3-4.1.3.ebuild, bsddb3-4.2.4.ebuild, files/bsddb3-4.1.3-db4.0.patch,
+  files/bsddb3-4.2.4-db4.2.patch:
+  version bump to work with db-4.2, peg bsddb3-4.1 at db-4.0 and bsddb3-4.2 at
+  db-4.2 and add patches to change references to version specific include files
+  and libraries.
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> bsddb3-3.4.0-r1.ebuild,
+  bsddb3-3.4.0.ebuild, bsddb3-4.1.3.ebuild:
+  Added ~sparc keyword.
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> bsddb3-3.4.0-r1.ebuild,
+  files/bsddb3-3.4.0-db3.patch:
+  fixed db-3 patch to point to db-3.2 instead of db-3. updated deps.
+
+*bsddb3-3.4.0-r1 (01 Jun 2003)
+
+  01 Jun 2003; Alastair Tse <liquidx@gentoo.org> bsddb3-3.4.0-r1.ebuild,
+  files/bsddb3-3.4.0-db3.patch:
+  make it compile with db-3 versioned libs in the presence of db-4
+
+*bsddb3-4.1.3 (21 May 2003)
+
+  21 May 2003; Michael Imhof <tantive@gentoo.org> bsddb3-4.1.3.ebuild:
+  Version bump. Submitted by Chris Fernandes de Sousa 
+  <cdesousa@faeldryn.net>.
 
 *bsddb3-3.4.0 (01 Nov 2002)
 
+  25 Apr 2003; Lars Weiler <pylon@gentoo.org> bsddb3-3.4.0.ebuild:
+  Set ~ppc in KEYWORDS
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> bsddb3-3.4.0.ebuild:
+  distutil-ize
+
   01 Nov 2002; foser <foser@gentoo.org> bsddb3-3.4.0.ebuild, ChangeLog :
   Initial import
 
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index e69de29bb2d1..cf2092462dc9 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -0,0 +1,12 @@
+MD5 3c041dde71cb698612f4ca3ef3548789 ChangeLog 2590
+MD5 efc84e4bd80db912406ec8c662cd8b90 bsddb3-3.4.0-r1.ebuild 655
+MD5 175b22e0afaa6d090d5d5390be70e919 bsddb3-4.1.3.ebuild 659
+MD5 6f1ed93b60b82aeed1641d8da1704b56 bsddb3-4.2.4.ebuild 741
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 bed99cc82d215b74251a47487d672d7b files/bsddb3-3.4.0-db3.patch 480
+MD5 479200184de9b7dd27f0c877ed257251 files/bsddb3-4.1.3-db4.0.patch 833
+MD5 b3d585f82f2f9c1963499350a5d30d77 files/bsddb3-4.1.3-setup.py.patch 1797
+MD5 94602fb2763177def5813577c667c15f files/bsddb3-4.2.4-db4.2.patch 835
+MD5 fda9c6c3eaa5d24eb3053e1c5cb68cda files/digest-bsddb3-3.4.0-r1 64
+MD5 9505fe6263c8c1d042f80d802f25c038 files/digest-bsddb3-4.1.3 64
+MD5 72d6a2d3e135d9e4ed16fac296a9a803 files/digest-bsddb3-4.2.4 64
diff --git a/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild b/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild
index 387e7c0f0f1e..649ffd2a05b4 100644
--- a/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild
+++ b/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild
@@ -1,29 +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/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild,v 1.1 2003/06/01 01:31:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-3.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
-DESCRIPTION="Python bindings for BerkelyDB"
+DESCRIPTION="Python bindings for BerkeleyDB"
 HOMEPAGE="http://pybsddb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pybsddb/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~sparc"
 IUSE=""
 
 DEPEND="virtual/python
-	=sys-libs/db-3*"
-
-S="${WORKDIR}/${P}"
+	=sys-libs/db-3.2*"
 
 DOCS="README.txt TODO.txt"
 
 src_unpack() {
 	unpack ${A}
-	einfo "Applying ${P}-db3.patch"
-	cd ${S}; patch -p0 < ${FILESDIR}/${P}-db3.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-db3.patch
 }
 
 src_install() {
diff --git a/dev-python/bsddb3/bsddb3-4.1.3.ebuild b/dev-python/bsddb3/bsddb3-4.1.3.ebuild
index d3410d7fb630..998b0d38f0f1 100644
--- a/dev-python/bsddb3/bsddb3-4.1.3.ebuild
+++ b/dev-python/bsddb3/bsddb3-4.1.3.ebuild
@@ -1,30 +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: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.1.3.ebuild,v 1.1 2003/05/21 12:12:40 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
-DESCRIPTION="Python bindings for BerkelyDB"
+DESCRIPTION="Python bindings for BerkeleyDB"
 HOMEPAGE="http://pybsddb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pybsddb/${P}.tar.gz"
-LICENSE="as-is"
+
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~sparc amd64"
 IUSE=""
 
 DEPEND="virtual/python
-	=sys-libs/db-4*"
-
-S="${WORKDIR}/${P}"
+	=sys-libs/db-4.1*"
 
-mydoc="README.txt TODO.txt"
+DOCS="README.txt TODO.txt"
 
-src_compile() {
-	distutils_src_compile "--berkeley-db=/usr"
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-setup.py.patch
 }
 
 src_install() {
-	distutils_src_install "--berkeley-db=/usr"
+	distutils_src_install
 	dohtml docs/*
 }
-
diff --git a/dev-python/bsddb3/bsddb3-4.2.4.ebuild b/dev-python/bsddb3/bsddb3-4.2.4.ebuild
index 48c6e8290f34..f55ea37b590a 100644
--- a/dev-python/bsddb3/bsddb3-4.2.4.ebuild
+++ b/dev-python/bsddb3/bsddb3-4.2.4.ebuild
@@ -1,16 +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/dev-python/bsddb3/bsddb3-4.2.4.ebuild,v 1.1 2004/02/13 10:06:01 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-4.2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
-DESCRIPTION="Python bindings for BerkelyDB"
+DESCRIPTION="Python bindings for BerkeleyDB"
 HOMEPAGE="http://pybsddb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pybsddb/${P}.tar.gz"
-LICENSE="BSD"
 
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86" # ~ppc ~sparc"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE=""
 
 DEPEND="virtual/python
@@ -20,8 +20,9 @@ DOCS="README.txt TODO.txt"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-db4.2.patch
-}	
+	cd ${S}
+	epatch ${FILESDIR}/${P}-db4.2.patch
+}
 
 src_compile() {
 	distutils_src_compile "--berkeley-db=/usr"
@@ -31,4 +32,3 @@ src_install() {
 	distutils_src_install "--berkeley-db=/usr"
 	dohtml docs/*
 }
-
diff --git a/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch b/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch
index c39f4cf177ce..2c98d2f1b02b 100644
--- a/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch
+++ b/dev-python/bsddb3/files/bsddb3-3.4.0-db3.patch
@@ -6,8 +6,8 @@
      if not libdir: libdir = os.path.join(BERKELEYDB_DIR, 'lib')
 -    if not '-ldb' in LIBS:
 -        libname = ['db']
-+    if not '-ldb-3' in LIBS:
-+        libname = ['db-3']
++    if not '-ldb-3.2' in LIBS:
++        libname = ['db-3.2']
      else:
          libname = []
      utils = []
diff --git a/dev-python/cddb-py/ChangeLog b/dev-python/cddb-py/ChangeLog
index 99cf7a4acfd2..2031c844303c 100644
--- a/dev-python/cddb-py/ChangeLog
+++ b/dev-python/cddb-py/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for dev-python/cddb-py
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cddb-py/ChangeLog,v 1.1 2003/04/19 01:07:15 blauwers Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cddb-py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> -cddb-py-1.3.ebuild:
+  Remove old version.
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> cddb-py-1.4.ebuild:
+  Stable sparc.
+
+  02 Aug 2004; Tom Gall <tgall@gentoo.org> cddb-py-1.4.ebuild:
+  stable on ppc64
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> cddb-py-1.4.ebuild:
+  stable on amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cddb-py-1.4.ebuild:
+  ~amd64.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> cddb-py-1.3.ebuild,
+  cddb-py-1.4.ebuild:
+  Add missing IUSE.
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> cddb-py-1.4.ebuild:
+  Stable on x86.
+
+*cddb-py-1.4 (12 Oct 2003)
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> cddb-py-1.4.ebuild:
+  version bump (#27788)
 
 *cddb-py-1.3 (19 APR 2003)
 
diff --git a/dev-python/cddb-py/Manifest b/dev-python/cddb-py/Manifest
index e69de29bb2d1..8e430ace6ef1 100644
--- a/dev-python/cddb-py/Manifest
+++ b/dev-python/cddb-py/Manifest
@@ -0,0 +1,4 @@
+MD5 1b2fbf2d71a12bd5a6586aebb1964adb cddb-py-1.4.ebuild 485
+MD5 833cd2a16ab33a10859eb49ed0c9bbe0 ChangeLog 1202
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 eb118fce3c5da84383380ea44c211166 files/digest-cddb-py-1.4 59
diff --git a/dev-python/cddb-py/cddb-py-1.4.ebuild b/dev-python/cddb-py/cddb-py-1.4.ebuild
index 11b97d3d65cf..0b2355d5cc86 100644
--- a/dev-python/cddb-py/cddb-py-1.4.ebuild
+++ b/dev-python/cddb-py/cddb-py-1.4.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/dev-python/cddb-py/cddb-py-1.4.ebuild,v 1.1 2003/10/12 07:37:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cddb-py/cddb-py-1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -10,9 +10,7 @@ HOMEPAGE="http://sourceforge.net/projects/cddb-py/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
 IUSE=""
 
 S=${WORKDIR}/CDDB-${PV}
-
-
diff --git a/dev-python/celementtree/ChangeLog b/dev-python/celementtree/ChangeLog
index c6a9a686d075..389eea7d5fef 100644
--- a/dev-python/celementtree/ChangeLog
+++ b/dev-python/celementtree/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for dev-python/celementtree
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/ChangeLog,v 1.1 2005/01/17 18:55:22 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  13 Nov 2005; Rob Cakebread <pythonhead@gentoo.org>
+  celementtree-1.0.2.ebuild:
+  Marked x86 stable added amd64 back
+
+  11 Nov 2005; Mark Loeser <halcy0n@gentoo.org> celementtree-1.0.ebuild:
+  Adding app-arch/unzip to depend
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> celementtree-1.0.2.ebuild:
+  Added to ~ppc.
+
+*celementtree-1.0.2 (19 Apr 2005)
+
+  19 Apr 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -celementtree-0.9.2.ebuild, -celementtree-0.9.3.ebuild,
+  -celementtree-0.9.8.ebuild, celementtree-1.0.ebuild,
+  +celementtree-1.0.2.ebuild:
+  Version bump. Removed versions not available upstream anymore.
+
+  25 Mar 2005; <blubb@gentoo.org> celementtree-1.0.ebuild:
+  added ~amd64
+
+*celementtree-1.0 (27 Jan 2005)
+
+  27 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +celementtree-1.0.ebuild:
+  Version bump.
+
+*celementtree-0.9.8 (23 Jan 2005)
+
+  23 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +celementtree-0.9.3.ebuild, +celementtree-0.9.8.ebuild:
+  Version bumps.
 
 *celementtree-0.9.2 (17 Jan 2005)
 
diff --git a/dev-python/celementtree/Manifest b/dev-python/celementtree/Manifest
index ee39ab638aae..fce76f2b96d4 100644
--- a/dev-python/celementtree/Manifest
+++ b/dev-python/celementtree/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 271ab4e4a2a370594e4dcfa92f534200 celementtree-0.9.2.ebuild 611
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 c5cb1c6bf843443b0d356e2dd2d47b8f ChangeLog 276
-MD5 c06f18827c4096ca2e52b39ef9d1059a files/digest-celementtree-0.9.2 75
+MD5 0fae9dd027028b93309e2b795e347f6b ChangeLog 1360
+MD5 87f65e0b38b04882636289543b545ff2 celementtree-1.0.ebuild 773
+MD5 3184a0248b5ec8f782a63f6b0b122c9d celementtree-1.0.2.ebuild 777
+MD5 f020095277e15dd11616d0ad527d59b6 files/digest-celementtree-1.0.2 78
+MD5 7114aac4b8ef9d62582c8aa90f1fe647 files/digest-celementtree-1.0 73
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFB7Aojz2gxt1z4IGYRAgygAKC9PlIA0FjdxZcWegfXrx4OQ9F0uQCgk+/l
-j6DiPe4iEjzpkRXQckKPsLo=
-=XFnu
+iD4DBQFDdtuJTry2jroju7wRAostAJicJDu1lipsmMi2u15LVEkAVX10AJ9pKK1P
+I7cA1zvvmLrGmPW5AalMug==
+=QNFv
 -----END PGP SIGNATURE-----
diff --git a/dev-python/celementtree/celementtree-1.0.2.ebuild b/dev-python/celementtree/celementtree-1.0.2.ebuild
index 2b37790d9c50..4d527e719499 100644
--- a/dev-python/celementtree/celementtree-1.0.2.ebuild
+++ b/dev-python/celementtree/celementtree-1.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/dev-python/celementtree/celementtree-1.0.2.ebuild,v 1.1 2005/04/19 01:05:18 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="doc"
 DEPEND=">=dev-lang/python-2.1.3-r1
diff --git a/dev-python/celementtree/celementtree-1.0.ebuild b/dev-python/celementtree/celementtree-1.0.ebuild
index 39788e68f5da..85228f8687a3 100644
--- a/dev-python/celementtree/celementtree-1.0.ebuild
+++ b/dev-python/celementtree/celementtree-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/dev-python/celementtree/celementtree-1.0.ebuild,v 1.1 2005/01/27 16:34:54 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/celementtree/celementtree-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -11,11 +11,12 @@ SRC_URI="http://effbot.org/downloads/${MY_P}.zip"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 IUSE="doc"
 DEPEND=">=dev-lang/python-2.1.3-r1
-	>=dev-python/elementtree-1.2"
+	>=dev-python/elementtree-1.2
+	app-arch/unzip"
 S=${WORKDIR}/${MY_P}
 
 src_install() {
diff --git a/dev-python/cgkit/ChangeLog b/dev-python/cgkit/ChangeLog
index 1024f88f5ed3..985b3e1c0dde 100644
--- a/dev-python/cgkit/ChangeLog
+++ b/dev-python/cgkit/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for dev-python/cgkit
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.1 2004/07/30 08:55:49 chrb Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org>
+  cgkit-2.0.0_alpha3-r2.ebuild:
+  Added missing parentheses to *DEPEND.
+
+  30 Apr 2005; Chris Bainbridge <chrb@gentoo.org>
+  cgkit-2.0.0_alpha3-r2.ebuild:
+  License change to LGPL.
+
+*cgkit-2.0.0_alpha3-r2 (30 Apr 2005)
+
+  30 Apr 2005; Chris Bainbridge <chrb@gentoo.org>
+  -cgkit-2.0.0_alpha3.ebuild, -cgkit-2.0.0_alpha3-r1.ebuild,
+  +cgkit-2.0.0_alpha3-r2.ebuild:
+  Fixed problems building with lib3ds and ogre support.
+
+*cgkit-2.0.0_alpha3-r1 (22 Apr 2005)
+
+  22 Apr 2005; Chris Bainbridge <chrb@gentoo.org>
+  +cgkit-2.0.0_alpha3-r1.ebuild:
+  Various fixes.
+
+*cgkit-2.0.0_alpha3 (21 Apr 2005)
+
+  21 Apr 2005; Chris Bainbridge <chrb@gentoo.org>
+  -cgkit-2.0.0_alpha2.ebuild, +cgkit-2.0.0_alpha3.ebuild:
+  Version bump.
+
+  10 Mar 2005; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+*cgkit-2.0.0_alpha2 (10 Mar 2005)
+
+  10 Mar 2005; Chris Bainbridge <chrb@gentoo.org> metadata.xml,
+  cgkit-1.2.0.ebuild, +cgkit-2.0.0_alpha2.ebuild:
+  Add 2.0.0_alpha2. Mark 1.2.0 stable on x86. Reenable doc flag in 1.2.0.
+
+*cgkit-1.2.0 (12 Feb 2005)
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> +cgkit-1.2.0.ebuild:
+  Version bump.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> cgkit-1.1.0.ebuild:
+  Added to ~ppc.
 
 *cgkit-1.1.0 (30 Jul 2004)
 
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index 6c2c5649e01f..04058de1e27a 100644
--- a/dev-python/cgkit/Manifest
+++ b/dev-python/cgkit/Manifest
@@ -1,2 +1,18 @@
-MD5 ae70a99b6d54e32f0965aa722b88a8f1 cgkit-1.1.0.ebuild 722
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 63be5858e6d2b18d1ad876a17026a10a ChangeLog 1736
+MD5 f9093463dd55946e4e458ac47703ab34 cgkit-1.1.0.ebuild 824
+MD5 e6d718e33908df222ca3ce670096596b cgkit-1.2.0.ebuild 821
+MD5 48812b598c45ec655d03a8c0cc663ac9 cgkit-2.0.0_alpha3-r2.ebuild 1353
 MD5 0dc9644564e6fe463b85fb42ed468ad3 files/digest-cgkit-1.1.0 123
+MD5 7d0cf9a35c0fe02d5a42ad636e5be31c files/digest-cgkit-1.2.0 123
+MD5 45a40e33a5e096f20eeb847570b7dab6 files/digest-cgkit-2.0.0_alpha3-r2 69
+MD5 5b1289401593e59600d2926af4fea0f6 metadata.xml 358
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfvw7FdQwWVoAgN4RAorSAKCOXZ1I7PumVj5n6p3udQ3w9fat5QCfTyoW
+/lvquPzgWRwTkUgCC3kyWVg=
+=BdOt
+-----END PGP SIGNATURE-----
diff --git a/dev-python/cgkit/cgkit-1.1.0.ebuild b/dev-python/cgkit/cgkit-1.1.0.ebuild
index aa13b142f80b..a95f74bb0e09 100644
--- a/dev-python/cgkit/cgkit-1.1.0.ebuild
+++ b/dev-python/cgkit/cgkit-1.1.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/dev-python/cgkit/cgkit-1.1.0.ebuild,v 1.1 2004/07/30 08:55:49 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ DEPEND="dev-lang/python
 	dev-python/pyrex"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
 src_install () {
diff --git a/dev-python/cgkit/cgkit-1.2.0.ebuild b/dev-python/cgkit/cgkit-1.2.0.ebuild
index 5c835d93f689..67ee7ebefc20 100644
--- a/dev-python/cgkit/cgkit-1.2.0.ebuild
+++ b/dev-python/cgkit/cgkit-1.2.0.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-1.2.0.ebuild,v 1.1 2005/02/12 11:17:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python library for creating 3D images"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-#	mirror://sourceforge/${PN}/${P}.doc.zip"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip
+	mirror://sourceforge/${PN}/${P}-doc.zip"
 HOMEPAGE="http://cgkit.sourceforge.net"
 DEPEND="dev-lang/python
 	dev-python/pyrex"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="doc"
 
 src_install () {
diff --git a/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild
index 9b72043fc548..90868c480e31 100644
--- a/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0_alpha3-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/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild,v 1.1 2005/04/30 17:32:11 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils flag-o-matic
 
@@ -17,10 +17,10 @@ DEPEND="dev-lang/python
 	dev-python/pyopengl
 	dev-python/pygame
 	dev-python/imaging
-	3ds? media-libs/lib3ds
-	ogre? dev-games/ogre"
+	3ds? ( media-libs/lib3ds )
+	ogre? ( dev-games/ogre )"
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~ppc"
 IUSE="3ds ogre"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/cgkit/files/digest-cgkit-1.2.0 b/dev-python/cgkit/files/digest-cgkit-1.2.0
index e748dbeb07c0..82a0e84f7614 100644
--- a/dev-python/cgkit/files/digest-cgkit-1.2.0
+++ b/dev-python/cgkit/files/digest-cgkit-1.2.0
@@ -1 +1,2 @@
 MD5 0d1e9f5feaf68c24d24addfe35fb046c cgkit-1.2.0.zip 231492
+MD5 e1e1e8639adcfe59d72a7d482e50fd52 cgkit-1.2.0-doc.zip 92290
diff --git a/dev-python/cgkit/metadata.xml b/dev-python/cgkit/metadata.xml
index a18bc6f4ebc5..26db0465444b 100644
--- a/dev-python/cgkit/metadata.xml
+++ b/dev-python/cgkit/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-          <email>chrb@gentoo.org</email>
-          <name>Chris Bainbridge</name>
-  </maintainer>
+  <herd>python</herd>
   <longdescription>Python library for creating 3D images</longdescription>
+  <longdescription lang="ja">
+  3D画像を作成するためのPython言語ライブラリです。
+  </longdescription>
 </pkgmetadata>
diff --git a/dev-python/cheetah-docs/ChangeLog b/dev-python/cheetah-docs/ChangeLog
index ea97ec0b764e..9fceb31e0cc9 100644
--- a/dev-python/cheetah-docs/ChangeLog
+++ b/dev-python/cheetah-docs/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for dev-python/cheetah-docs
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah-docs/ChangeLog,v 1.1 2004/01/18 13:01:53 liquidx Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah-docs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  cheetah-docs-0.9.16_alpha1.ebuild:
+  add ~ia64
+
+  11 Aug 2005; Luis Medinas <metalgod@gentoo.org>
+  cheetah-docs-0.9.16_alpha1.ebuild:
+  Added ~amd64 keywords.
+
+*cheetah-docs-0.9.16_alpha1 (12 Feb 2005)
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +cheetah-docs-0.9.16_alpha1.ebuild:
+  Version bump.
+
+*cheetah-docs-0.9.15_alpha1 (18 Apr 2004)
+
+  18 Apr 2004; David Holm <dholm@gentoo.org>
+  cheetah-docs-0.9.15_alpha1.ebuild:
+  Added to ~ppc.
 
   18 Jan 2004; Alastair Tse <liquidx@gentoo.org> :
   moved dev-python/Cheetah-docs to dev-python/cheetah-docs. also fixed
diff --git a/dev-python/cheetah-docs/Manifest b/dev-python/cheetah-docs/Manifest
index db21201ffcd0..4be704e02200 100644
--- a/dev-python/cheetah-docs/Manifest
+++ b/dev-python/cheetah-docs/Manifest
@@ -1,4 +1,6 @@
-MD5 8af0da78b0252e53b3d309e2e00165ba ChangeLog 356
-MD5 32156f72a90e8ffa1fc32e412242bb9a cheetah-docs-0.9.15_alpha1.ebuild 831
+MD5 004fbc936f8eac88828e40b26f66ab72 cheetah-docs-0.9.16_alpha1.ebuild 840
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 6295367084113ae92f888e4dc877539e ChangeLog 1000
+MD5 c9f2500b2cd0722eea785f4078ca4c6b cheetah-docs-0.9.15_alpha1.ebuild 824
 MD5 86d7932f68b06bda1d616cf2280036f4 files/digest-cheetah-docs-0.9.15_alpha1 70
+MD5 4656f7387faae8649dc2ed8064661e8e files/digest-cheetah-docs-0.9.16_alpha1 70
diff --git a/dev-python/cheetah-docs/cheetah-docs-0.9.15_alpha1.ebuild b/dev-python/cheetah-docs/cheetah-docs-0.9.15_alpha1.ebuild
index da56eaf54edd..3f2a88ae3c40 100644
--- a/dev-python/cheetah-docs/cheetah-docs-0.9.15_alpha1.ebuild
+++ b/dev-python/cheetah-docs/cheetah-docs-0.9.15_alpha1.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/dev-python/cheetah-docs/cheetah-docs-0.9.15_alpha1.ebuild,v 1.1 2004/01/18 13:01:53 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah-docs/cheetah-docs-0.9.15_alpha1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 DESCRIPTION="Documentation for Cheetah templates."
 HOMEPAGE="http://www.cheetahtemplate.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/cheetahtemplate/CheetahDocs-${PV/_alpha/a}.tgz"
 
 IUSE=""
 LICENSE="PSF-2.2"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 
 DEPEND=""
diff --git a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
index bdbcef819f77..9bd027a87ab4 100644
--- a/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild
+++ b/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.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/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild,v 1.1 2005/02/12 11:32:32 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah-docs/cheetah-docs-0.9.16_alpha1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 DESCRIPTION="Documentation for Cheetah templates."
 HOMEPAGE="http://www.cheetahtemplate.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/cheetahtemplate/CheetahDocs-${PV/_alpha/a}.tgz"
 
 IUSE=""
 LICENSE="PSF-2.2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
 SLOT="0"
 
 DEPEND=""
diff --git a/dev-python/cheetah/ChangeLog b/dev-python/cheetah/ChangeLog
index 326fe1a12f71..b396a2080f50 100644
--- a/dev-python/cheetah/ChangeLog
+++ b/dev-python/cheetah/ChangeLog
@@ -1,6 +1,74 @@
 # ChangeLog for dev-python/cheetah
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.1 2004/01/18 12:18:55 liquidx Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> cheetah-0.9.17.ebuild:
+  Mark 0.9.17 stable on ia64
+
+*cheetah-0.9.18 (28 Aug 2005)
+
+  28 Aug 2005; Rob Cakebread <pythonhead@gentoo.org> +cheetah-0.9.18.ebuild:
+  Version bump.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> cheetah-0.9.17.ebuild:
+  add ~ia64
+
+  11 Aug 2005; Luis Medinas <metalgod@gentoo.org> cheetah-0.9.17.ebuild:
+  Added ~amd64 keywords. Closes bug #102045.
+
+  16 Jun 2005; Rob Cakebread <pythonhead@gentoo.org> cheetah-0.9.17.ebuild:
+  Examples were removed upstream, cleaned up doc installation
+
+*cheetah-0.9.17 (15 Jun 2005)
+
+  15 Jun 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -cheetah-0.9.17_rc1.ebuild, +cheetah-0.9.17.ebuild:
+  Version bump. This is simply a version rename - no code changed according to
+  upstream. Thanks Tavis.
+
+*cheetah-0.9.17_rc1 (17 May 2005)
+
+  17 May 2005; Rob Cakebread <pythonhead@gentoo.org> -cheetah-0.9.15.ebuild,
+  -cheetah-0.9.16_alpha2.ebuild, -cheetah-0.9.16.ebuild,
+  +cheetah-0.9.17_rc1.ebuild:
+  Security bump. Removed vulnerable versions. bug#  92926
+
+*cheetah-0.9.16 (05 May 2005)
+
+  05 May 2005; Alastair Tse <liquidx@gentoo.org> +cheetah-0.9.16.ebuild:
+  version bump
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> cheetah-0.9.15.ebuild:
+  Stable on ppc.
+
+  19 Feb 2005; <gongloo@gentoo.org> cheetah-0.9.15.ebuild,
+  cheetah-0.9.16_alpha2.ebuild:
+  Stable on ppc-macos.
+
+*cheetah-0.9.16_alpha2 (12 Feb 2005)
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +cheetah-0.9.16_alpha2.ebuild:
+  Version bump.
+
+  19 Jan 2005; <gongloo@gentoo.org> cheetah-0.9.15.ebuild:
+  Keyworded ~ppc-macos.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> cheetah-0.9.15.ebuild:
+  Stable on alpha.
+
+  18 Apr 2004; David Holm <dholm@gentoo.org> cheetah-0.9.15.ebuild:
+  Added to ~ppc.
+
+  22 Mar 2004; <kloeri@gentoo.org> cheetah-0.9.14.ebuild,
+  cheetah-0.9.15.ebuild:
+  QA, bug #45343.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> cheetah-0.9.15.ebuild:
+  Stable on sparc.
 
   18 Jan 2004; Alastair Tse <liquidx@gentoo.org> cheetah-0.9.14.ebuild,
   cheetah-0.9.15.ebuild, metadata.xml:
@@ -9,7 +77,7 @@
   12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Added missing changelog entry.
 
-*Cheetah-0.9.15 (04 Apr 2003)
+*cheetah-0.9.15 (04 Apr 2003)
 
   22 May 2003; Arcady Genkin <agenkin@gentoo.org> :
   Marking stable on ~x86.
@@ -17,13 +85,13 @@
   04 Apr 2003; Alastair Tse <liquidx@gentoo.org> Cheetah-0.9.15.ebuild:
   version bump
 
-*Cheetah-0.9.15 (28 Jan 2003)
+*cheetah-0.9.15 (28 Jan 2003)
 
   28 Jan 2003; Arcady Genkin <agenkin@gentoo.org> :
   Updated to version 0.9.15a3.
   Sanified the ChangeLog.
  
-*Cheetah-0.9.14 (13 Aug 2002)
+*cheetah-0.9.14 (13 Aug 2002)
 
   13 Aug 2002; Joachim Blaabjerg <styx@gentoo.org> Cheetah-0.9.14.ebuild :
   Version bump.
diff --git a/dev-python/cheetah/Manifest b/dev-python/cheetah/Manifest
index 79ae4ea96a43..df1c238b5a37 100644
--- a/dev-python/cheetah/Manifest
+++ b/dev-python/cheetah/Manifest
@@ -1,6 +1,6 @@
-MD5 8b6a66415f81bf6629307523e4001b09 ChangeLog 1636
-MD5 1884602aa0a8464f4e636d20b45e33b6 cheetah-0.9.14.ebuild 751
-MD5 ff6cccc6faaa491a888b30de7ca225a9 cheetah-0.9.15.ebuild 770
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 396f381063c4bfd885d2142930d03f6c files/digest-cheetah-0.9.14 66
-MD5 346125593cce81eee8da56f014122de2 files/digest-cheetah-0.9.15 66
+MD5 0d1d53e4e4cf09dd19c37598fb7bd27a cheetah-0.9.18.ebuild 633
+MD5 619d21fa2c28636f9489a91ed32b4ade ChangeLog 3741
+MD5 476df8108995ab80c9a7f211f285b6b2 cheetah-0.9.17.ebuild 625
+MD5 8c06f8d0e3b94288407944199e356794 files/digest-cheetah-0.9.18 66
+MD5 4085c86d760d85b5948aa799ec6928fa files/digest-cheetah-0.9.17 66
diff --git a/dev-python/cheetah/cheetah-0.9.17.ebuild b/dev-python/cheetah/cheetah-0.9.17.ebuild
index a330c79dbbca..5d66ab1ed2b8 100644
--- a/dev-python/cheetah/cheetah-0.9.17.ebuild
+++ b/dev-python/cheetah/cheetah-0.9.17.ebuild
@@ -1,29 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.17.ebuild,v 1.1 2005/06/15 01:03:03 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.17.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/ch/Ch}
 
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="Python-powered template engine and code generator."
 HOMEPAGE="http://www.cheetahtemplate.org/"
 SRC_URI="mirror://sourceforge/cheetahtemplate/${MY_P}.tar.gz"
-
 LICENSE="PSF-2.2"
 IUSE=""
-KEYWORDS="x86 sparc alpha ppc ppc-macos"
+KEYWORDS="alpha ~amd64 ia64 ppc ppc-macos sparc x86"
 SLOT="0"
-
 DEPEND=">=dev-lang/python-2.2"
+S=${WORKDIR}/${MY_P}
 
 PYTHON_MODNAME="Cheetah"
+DOCS="README CHANGES TODO"
 
-src_install() {
-	DOCS="README CHANGES LICENSE TODO"
-	distutils_src_install
-
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/webware_examples/cheetahSite/*
-}
diff --git a/dev-python/cheetah/cheetah-0.9.18.ebuild b/dev-python/cheetah/cheetah-0.9.18.ebuild
index 9e5d6a3a0ccb..d4981a17ffca 100644
--- a/dev-python/cheetah/cheetah-0.9.18.ebuild
+++ b/dev-python/cheetah/cheetah-0.9.18.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/dev-python/cheetah/cheetah-0.9.18.ebuild,v 1.1 2005/08/28 04:51:34 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cheetah/cheetah-0.9.18.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/cherryflow/ChangeLog b/dev-python/cherryflow/ChangeLog
index 0961e228c505..189a5042bbb8 100644
--- a/dev-python/cherryflow/ChangeLog
+++ b/dev-python/cherryflow/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cherryflow
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherryflow/ChangeLog,v 1.1 2005/03/18 18:29:14 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherryflow/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> cherryflow-5.ebuild:
+  Added to ~ppc.
+
+  20 May 2005; Rob Cakebread <pythonhead@gentoo.org> cherryflow-5.ebuild:
+  Fixed documentation location
 
 *cherryflow-5 (18 Mar 2005)
 
diff --git a/dev-python/cherryflow/Manifest b/dev-python/cherryflow/Manifest
index 5bf6798ffa01..5b865807a5bc 100644
--- a/dev-python/cherryflow/Manifest
+++ b/dev-python/cherryflow/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8203e4e3a4193ea54501ded2d8edb49e cherryflow-5.ebuild 618
+MD5 fe0555ce91b081d354dc6d111d9de493 ChangeLog 527
+MD5 752c084fc59e7d208db471348e46ab0d cherryflow-5.ebuild 695
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 90b03a0a2e996b0eb5f64450e566b086 ChangeLog 245
 MD5 e457205fd65ba4b1d6cf3f29d070438c files/digest-cherryflow-5 59
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCOx3kz2gxt1z4IGYRAnpSAJ4n4ShlhEWNC+A8g611GLYyzBuGHgCeJCCi
-ads47K4TpE1hHYeJ7STdm88=
-=CvC3
------END PGP SIGNATURE-----
diff --git a/dev-python/cherryflow/cherryflow-5.ebuild b/dev-python/cherryflow/cherryflow-5.ebuild
index 7730f759f4e7..418b996aba24 100644
--- a/dev-python/cherryflow/cherryflow-5.ebuild
+++ b/dev-python/cherryflow/cherryflow-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/dev-python/cherryflow/cherryflow-5.ebuild,v 1.1 2005/03/18 18:29:14 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherryflow/cherryflow-5.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,7 @@ SRC_URI="http://gentooexperimental.org/~pythonhead/dist/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND="virtual/python"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 S=${WORKDIR}
@@ -19,7 +18,7 @@ S=${WORKDIR}
 src_install() {
 	distutils_python_version
 	distutils_src_install
-	dodir /usr/share/docs/${P}
+	dodir /usr/share/doc/${P}
 	cp devworksexample.py example.py wikiexample.py \
-		${D}/usr/share/docs/${P}
+		${D}/usr/share/doc/${P}
 }
diff --git a/dev-python/cherrypy/ChangeLog b/dev-python/cherrypy/ChangeLog
index 6aeababc89d8..3fe3368d78f6 100644
--- a/dev-python/cherrypy/ChangeLog
+++ b/dev-python/cherrypy/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for dev-python/cherrypy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.1 2005/03/15 16:11:45 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
+
+*cherrypy-2.1.0 (21 Oct 2005)
+
+  21 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/cherrypy-2.1.0-test-gentoo.patch,
+  -files/cherrypy-2.1.0_beta1-setup-gentoo.diff,
+  -files/cherrypy-2.1.0_beta1-test-gentoo.diff,
+  -cherrypy-2.1.0_beta1.ebuild, +cherrypy-2.1.0.ebuild:
+  Version bump. Removed obsolete beta1
+
+  28 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  cherrypy-2.1.0_beta1.ebuild:
+  added ~amd64 keyword
+
+  17 Jul 2005; Rob Cakebread <pythonhead@gentoo.org>
+  cherrypy-2.1.0_beta1.ebuild:
+  Added ppc back
+
+*cherrypy-2.1.0_beta1 (17 Jul 2005)
+
+  17 Jul 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/cherrypy-2.1.0_beta1-setup-gentoo.diff,
+  +files/cherrypy-2.1.0_beta1-test-gentoo.diff,
+  +cherrypy-2.1.0_beta1.ebuild:
+  Version bump.
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> cherrypy-2.0.0.ebuild:
+  Added to ~ppc.
+
+  18 Jun 2005; Rob Cakebread <pythonhead@gentoo.org> cherrypy-2.0.0.ebuild:
+  Marked x86 stable
+
+*cherrypy-2.0.0 (04 May 2005)
+
+  04 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/cherrypy-2.0.0-setup-gentoo.diff,
+  +files/cherrypy-2.0.0-test-gentoo.diff,
+  -files/cherrypy-2.0.0b-setup-gentoo.diff,
+  -files/cherrypy-2.0.0b-test-gentoo.diff, +cherrypy-2.0.0.ebuild,
+  -cherrypy-2.0.0b.ebuild:
+  Version bump, removed old version.
 
 *cherrypy-2.0.0b (15 Mar 2005)
 
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index f3ae25772fa5..642c698179a4 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 af70b4f47f9e0906eec66d9a59a1ec5d cherrypy-2.0.0b.ebuild 1029
+MD5 8d956752dc9ee356c9ca5916a497d0ca cherrypy-2.0.0.ebuild 1135
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 7215d836e44ac194a8c7dceb382084c6 ChangeLog 416
-MD5 00b933b3feab88df6acb0759dc1e5489 files/digest-cherrypy-2.0.0b 66
-MD5 be26281f90e26b8845866c92e2f8f36b files/cherrypy-2.0.0b-setup-gentoo.diff 259
-MD5 96acaf2aaa125815a4ee38d7af98ded7 files/cherrypy-2.0.0b-test-gentoo.diff 510
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNwkyz2gxt1z4IGYRAnTvAKDgjaVQvpCerwda/dZ5faEO25v3xgCgiVCb
-74vjhFSJ7JEniWbkJhSla1Q=
-=L7SW
------END PGP SIGNATURE-----
+MD5 5aff6b3ec9af13eac8f80d88a09d7550 ChangeLog 1801
+MD5 2939829591be16f1557b806710f3e96a cherrypy-2.1.0.ebuild 910
+MD5 4991e5ddb5d31fb149fdadc26b75f551 files/digest-cherrypy-2.0.0 65
+MD5 4cf9009699f529b3c7921c0e1ab0cc94 files/cherrypy-2.1.0-test-gentoo.patch 260
+MD5 c885c6173e005c060a73ecf836011132 files/cherrypy-2.0.0-setup-gentoo.diff 471
+MD5 f411ca60958e839619324a1a81b9af4d files/cherrypy-2.0.0-test-gentoo.diff 212
+MD5 a2ab81d963b17955e9d2eaeff314679c files/digest-cherrypy-2.1.0 66
diff --git a/dev-python/cherrypy/cherrypy-2.0.0.ebuild b/dev-python/cherrypy/cherrypy-2.0.0.ebuild
index 9b26116f3bc4..c89cab2d16d0 100644
--- a/dev-python/cherrypy/cherrypy-2.0.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-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/dev-python/cherrypy/cherrypy-2.0.0.ebuild,v 1.1 2005/05/04 23:16:10 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.cherrypy.org/"
 DEPEND=">=dev-lang/python-2.3"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 LICENSE="BSD"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/cherrypy/cherrypy-2.1.0.ebuild b/dev-python/cherrypy/cherrypy-2.1.0.ebuild
index e6f597a36296..2a1fe0e28e2f 100644
--- a/dev-python/cherrypy/cherrypy-2.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-2.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/dev-python/cherrypy/cherrypy-2.1.0.ebuild,v 1.1 2005/10/21 20:53:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrypy/cherrypy-2.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/cherrytemplate/ChangeLog b/dev-python/cherrytemplate/ChangeLog
index 4db659c383be..e3e9e0ce1b1f 100644
--- a/dev-python/cherrytemplate/ChangeLog
+++ b/dev-python/cherrytemplate/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/cherrytemplate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrytemplate/ChangeLog,v 1.1 2005/03/15 16:39:29 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrytemplate/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> cherrytemplate-1.0.0.ebuild:
+  Added to ~ppc.
 
 *cherrytemplate-1.0.0 (15 Mar 2005)
 
diff --git a/dev-python/cherrytemplate/Manifest b/dev-python/cherrytemplate/Manifest
index d55cf327e0e7..06f70cc8ce8f 100644
--- a/dev-python/cherrytemplate/Manifest
+++ b/dev-python/cherrytemplate/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 aa6e05ccf00d4ce35a411f0e110269cd cherrytemplate-1.0.0.ebuild 438
+MD5 5876f50286a59cca12e656d94119c614 ChangeLog 455
+MD5 dbf157e7ad3a901d8ebfd2b9f25b0406 cherrytemplate-1.0.0.ebuild 557
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 61eab520a9aa07c84e52321c30919bfd ChangeLog 267
 MD5 897a607d9821fa7f856cfae7008075e2 files/digest-cherrytemplate-1.0.0 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNw+zz2gxt1z4IGYRApONAKCOVX0r3+Q5TLnl3Ukns8VPZayHWACggXH8
-3YLxNL+isBJNxU2sNPLxY1A=
-=xgBT
------END PGP SIGNATURE-----
diff --git a/dev-python/cherrytemplate/cherrytemplate-1.0.0.ebuild b/dev-python/cherrytemplate/cherrytemplate-1.0.0.ebuild
index e362e45499c6..200d9baa270b 100644
--- a/dev-python/cherrytemplate/cherrytemplate-1.0.0.ebuild
+++ b/dev-python/cherrytemplate/cherrytemplate-1.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/dev-python/cherrytemplate/cherrytemplate-1.0.0.ebuild,v 1.1 2005/03/15 16:39:29 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cherrytemplate/cherrytemplate-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cherrypy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND=">=dev-lang/python-2.3"
diff --git a/dev-python/cjkcodecs/ChangeLog b/dev-python/cjkcodecs/ChangeLog
index 48465a203bf8..f81bfca3a8ca 100644
--- a/dev-python/cjkcodecs/ChangeLog
+++ b/dev-python/cjkcodecs/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for dev-python/cjkcodecs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/ChangeLog,v 1.1 2003/06/27 23:46:01 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> cjkcodecs-1.1.1.ebuild:
+  Mark 1.1.1 stable on ia64
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> cjkcodecs-1.1.1.ebuild:
+  Mark 1.1.1 stable on alpha
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> cjkcodecs-1.1.1.ebuild:
+  add ~ia64
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  cjkcodecs-1.1.1.ebuild:
+  Stable on ppc.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> cjkcodecs-1.1.1.ebuild:
+  Stable on ppc64
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
+  cjkcodecs-1.0.3.ebuild, cjkcodecs-1.1.1.ebuild:
+  Stable on x86.
+
+  01 Jul 2005; Simon Stelling <blubb@gentoo.org> cjkcodecs-1.1.1.ebuild:
+  added ~amd64 keyword
+
+  04 Mar 2005; Kito <kito@gentoo.org> cjkcodecs-1.1.1.ebuild:
+  ~ppc-macos keyword. closes Bug 81625
+
+  31 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  cjkcodecs-1.0.2.ebuild, cjkcodecs-1.0.3.ebuild, cjkcodecs-1.0.ebuild,
+  cjkcodecs-1.1.1.ebuild:
+  Changed LICENSE from LGPL-2.1 to BSD. Closes bug #80012
+
+*cjkcodecs-1.1.1 (06 Oct 2004)
+
+  06 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> +cjkcodecs-1.1.1.ebuild:
+  Version bumped; bug #62689. Added src_test().
+
+  12 Jul 2004; Tom Gall <tgall@gentoo.org> cjkcodecs-1.0.3.ebuild:
+  stable on ppc64 bug #56680
+
+  11 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> cjkcodecs-1.0.3.ebuild:
+  Added to ~alpha and ~ppc
+
+*cjkcodecs-1.0.3 (24 Feb 2004)
+
+  24 Feb 2004; Alastair Tse <liquidx@gentoo.org> cjkcodecs-1.0.3.ebuild:
+  version bump
+
+*cjkcodecs-1.0.2 (05 Dec 2003)
+
+  05 Dec 2003; Alastair Tse <liquidx@gentoo.org> cjkcodecs-1.0.2.ebuild:
+  version bump
+
+*cjkcodecs-1.0 (01 Aug 2003)
+
+  01 Aug 2003; <matsuu@gentoo.org> cjkcodecs-1.0.ebuild:
+  version bump. thanks to gna <gnagent2@yahoo.com.au>. #25225.
+
+*cjkcodecs-0.9 (27 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
 
   28 Jun 2003; Alastair Tse <liquidx@gentoo.org> :
   new package to replace chinesecodecs, japanesecodecs and koreancodecs
diff --git a/dev-python/cjkcodecs/Manifest b/dev-python/cjkcodecs/Manifest
index f7dc22fb7cf2..4ce18a9d0681 100644
--- a/dev-python/cjkcodecs/Manifest
+++ b/dev-python/cjkcodecs/Manifest
@@ -1,2 +1,10 @@
-MD5 8c0f92fbc58d7b2ff18f63c72d084b0b cjkcodecs-0.9.ebuild 592
-MD5 f536c77a66469edbaebbc33d582663f6 files/digest-cjkcodecs-0.9 65
+MD5 ffa1c95563247745f132bce911573500 cjkcodecs-1.0.2.ebuild 640
+MD5 6ac60b0f4345fe461dcf1c86ca459f68 metadata.xml 176
+MD5 bfa4461799a60a9a9efe3d05e8e8f0af ChangeLog 2226
+MD5 e6ec95440488dff7c374761498f15de8 cjkcodecs-1.0.ebuild 635
+MD5 cb2c1b8c8e3c420b7dbb8f96ab8d83cd cjkcodecs-1.1.1.ebuild 668
+MD5 c0b82d627a84ba3b75cde4bf3fae41ff cjkcodecs-1.0.3.ebuild 658
+MD5 28da2fd8f2ffb71386fc6dba8978277f files/digest-cjkcodecs-1.1.1 68
+MD5 ed462808d32026657155f1dff6cdd1e2 files/digest-cjkcodecs-1.0.2 68
+MD5 fe55aaf14f85bb1bca60f19f40e02e60 files/digest-cjkcodecs-1.0 65
+MD5 45fc7efdd09f88205d5a0a1bb4d20daa files/digest-cjkcodecs-1.0.3 68
diff --git a/dev-python/cjkcodecs/cjkcodecs-1.0.2.ebuild b/dev-python/cjkcodecs/cjkcodecs-1.0.2.ebuild
index 371590bb57b8..32c2c7da86ed 100644
--- a/dev-python/cjkcodecs/cjkcodecs-1.0.2.ebuild
+++ b/dev-python/cjkcodecs/cjkcodecs-1.0.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/dev-python/cjkcodecs/cjkcodecs-1.0.2.ebuild,v 1.1 2003/12/05 00:56:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/cjkcodecs-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,8 @@ HOMEPAGE="http://cjkpython.i18n.org/"
 
 IUSE=""
 SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+LICENSE="BSD"
+KEYWORDS="x86"
 
 DEPEND=">=dev-lang/python-2.1"
 DOCS="doc/*"
diff --git a/dev-python/cjkcodecs/cjkcodecs-1.0.3.ebuild b/dev-python/cjkcodecs/cjkcodecs-1.0.3.ebuild
index 6f15720eda06..3d73af35b313 100644
--- a/dev-python/cjkcodecs/cjkcodecs-1.0.3.ebuild
+++ b/dev-python/cjkcodecs/cjkcodecs-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: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/cjkcodecs-1.0.3.ebuild,v 1.1 2004/02/24 09:36:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/cjkcodecs-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,8 @@ HOMEPAGE="http://cjkpython.i18n.org/"
 
 IUSE=""
 SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+LICENSE="BSD"
+KEYWORDS="~alpha ~ppc x86 ppc64"
 
 DEPEND=">=dev-lang/python-2.1"
 DOCS="doc/*"
diff --git a/dev-python/cjkcodecs/cjkcodecs-1.0.ebuild b/dev-python/cjkcodecs/cjkcodecs-1.0.ebuild
index 062145cb6a6e..ed2a724a8811 100644
--- a/dev-python/cjkcodecs/cjkcodecs-1.0.ebuild
+++ b/dev-python/cjkcodecs/cjkcodecs-1.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/dev-python/cjkcodecs/cjkcodecs-1.0.ebuild,v 1.1 2003/08/01 05:44:19 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/cjkcodecs-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,8 @@ HOMEPAGE="http://sourceforge.net/projects/koco"
 
 IUSE=""
 SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+LICENSE="BSD"
+KEYWORDS="x86"
 
 DEPEND=">=dev-lang/python-2.1"
 DOCS="doc/*"
diff --git a/dev-python/cjkcodecs/cjkcodecs-1.1.1.ebuild b/dev-python/cjkcodecs/cjkcodecs-1.1.1.ebuild
index 17d3823939a3..4ae47374d0b3 100644
--- a/dev-python/cjkcodecs/cjkcodecs-1.1.1.ebuild
+++ b/dev-python/cjkcodecs/cjkcodecs-1.1.1.ebuild
@@ -1,17 +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/dev-python/cjkcodecs/cjkcodecs-1.1.1.ebuild,v 1.1 2004/10/06 08:10:07 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cjkcodecs/cjkcodecs-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python Codecs for CJK Encodings. Aimed at replacing ChineseCodecs, JapaneseCodecs and KoreanCodecs"
-SRC_URI="http://download.berlios.de/cjkpython/${P}.tar.bz2"
 HOMEPAGE="http://cjkpython.i18n.org/"
+SRC_URI="http://download.berlios.de/cjkpython/${P}.tar.bz2"
 
-IUSE=""
+LICENSE="BSD"
 SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~ppc ~x86 ~ppc64"
+KEYWORDS="alpha ~amd64 ~hppa ia64 ppc ~ppc-macos ppc64 x86"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.1"
 DOCS="doc/*"
diff --git a/dev-python/cjkcodecs/metadata.xml b/dev-python/cjkcodecs/metadata.xml
index de483c53568f..29fc2b804aec 100644
--- a/dev-python/cjkcodecs/metadata.xml
+++ b/dev-python/cjkcodecs/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>cjk</herd>
 </pkgmetadata>
diff --git a/dev-python/clientcookie/ChangeLog b/dev-python/clientcookie/ChangeLog
index 0afcc08ec7c3..f8888290a12a 100644
--- a/dev-python/clientcookie/ChangeLog
+++ b/dev-python/clientcookie/ChangeLog
@@ -1,6 +1,47 @@
 # ChangeLog for dev-python/clientcookie
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/ChangeLog,v 1.1 2003/10/02 22:55:50 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/ChangeLog,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+  13 Jun 2005; David Holm <dholm@gentoo.org> clientcookie-1.0.3.ebuild:
+  Added to ~ppc.
+
+*clientcookie-1.0.3 (13 Jun 2005)
+
+  13 Jun 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +clientcookie-1.0.3.ebuild:
+  Version bump. bug# 95832
+
+*clientcookie-1.0.2 (12 Feb 2005)
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +clientcookie-1.0.2.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Jun 2004; Rob Cakebread <pythonhead@gentoo.org>
+  clientcookie-0.4.19.ebuild:
+  Marked stable x86
+
+  15 Jun 2004; Rob Cakebread <pythonhead@gentoo.org>
+  clientcookie-0.4.18.ebuild:
+  Marked stable on x86
+
+*clientcookie-0.4.19 (24 May 2004)
+
+  24 May 2004; Rob Cakebread <pythonhead@gentoo.org>
+  +clientcookie-0.4.19.ebuild:
+  Version bump
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
+  clientcookie-0.4.4a.ebuild:
+  Stable on x86.
+
+*clientcookie-0.4.18 (10 Mar 2004)
+
+  10 Mar 2004; <kloeri@gentoo.org> clientcookie-0.4.18.ebuild:
+  Version bump.
 
 *clientcookie-0.4.4a (02 Oct 2003)
 
diff --git a/dev-python/clientcookie/Manifest b/dev-python/clientcookie/Manifest
index 34f831028be1..bc2969fd7988 100644
--- a/dev-python/clientcookie/Manifest
+++ b/dev-python/clientcookie/Manifest
@@ -1,2 +1,12 @@
-MD5 87778b05cb26e224b93e4b16f80216dc clientcookie-0.4.4a.ebuild 572
+MD5 fc1888761bbceb075e1d8afcb370a338 ChangeLog 1419
+MD5 73a30d6641f650dbf87c43bbe832b22d clientcookie-0.4.18.ebuild 675
+MD5 6310e369ed7b13bbb321ea86d55a00b1 clientcookie-0.4.4a.ebuild 675
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 15436ccada1efcb497ac1c69287789d5 clientcookie-0.4.19.ebuild 670
+MD5 b9decc077e66fb593f69dcc2b1149c19 clientcookie-1.0.2.ebuild 669
+MD5 3b7eaffd572a3738f4349eaedf026218 clientcookie-1.0.3.ebuild 673
+MD5 b6e7f493690e1fa8df7a8126312da11f files/digest-clientcookie-0.4.18 71
 MD5 df9071fd270dce926f984de95213a1fe files/digest-clientcookie-0.4.4a 70
+MD5 d12ea916436682e8423819ec56fade59 files/digest-clientcookie-0.4.19 71
+MD5 c39901948959299ce686212166b5d4be files/digest-clientcookie-1.0.2 70
+MD5 a9f132bcbdbf1ea5b99060373d37b3bb files/digest-clientcookie-1.0.3 70
diff --git a/dev-python/clientcookie/clientcookie-0.4.18.ebuild b/dev-python/clientcookie/clientcookie-0.4.18.ebuild
index f569290a0b40..89ab7ff98215 100644
--- a/dev-python/clientcookie/clientcookie-0.4.18.ebuild
+++ b/dev-python/clientcookie/clientcookie-0.4.18.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/dev-python/clientcookie/clientcookie-0.4.18.ebuild,v 1.1 2004/03/10 00:04:21 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-0.4.18.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/"
 SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DOCS="COPYING ChangeLog PKG-INFO README.txt TODO"
 
diff --git a/dev-python/clientcookie/clientcookie-0.4.19.ebuild b/dev-python/clientcookie/clientcookie-0.4.19.ebuild
index f5d3c98cdcc1..8374c67ce447 100644
--- a/dev-python/clientcookie/clientcookie-0.4.19.ebuild
+++ b/dev-python/clientcookie/clientcookie-0.4.19.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/dev-python/clientcookie/clientcookie-0.4.19.ebuild,v 1.1 2004/05/24 17:32:19 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-0.4.19.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/"
 SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DOCS="COPYING ChangeLog PKG-INFO README.txt"
 
diff --git a/dev-python/clientcookie/clientcookie-0.4.4a.ebuild b/dev-python/clientcookie/clientcookie-0.4.4a.ebuild
index 1ee9fb5eeaec..5c31ed582724 100644
--- a/dev-python/clientcookie/clientcookie-0.4.4a.ebuild
+++ b/dev-python/clientcookie/clientcookie-0.4.4a.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/dev-python/clientcookie/clientcookie-0.4.4a.ebuild,v 1.1 2003/10/02 22:55:50 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-0.4.4a.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/"
 SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DOCS="COPYING ChangeLog PKG-INFO README.txt TODO"
 
diff --git a/dev-python/clientcookie/clientcookie-1.0.2.ebuild b/dev-python/clientcookie/clientcookie-1.0.2.ebuild
index 3bdcfc196bc8..340ec497807d 100644
--- a/dev-python/clientcookie/clientcookie-1.0.2.ebuild
+++ b/dev-python/clientcookie/clientcookie-1.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/dev-python/clientcookie/clientcookie-1.0.2.ebuild,v 1.1 2005/02/12 11:36:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/clientcookie/clientcookie-1.0.3.ebuild b/dev-python/clientcookie/clientcookie-1.0.3.ebuild
index 7126b3239693..41b6df13ef34 100644
--- a/dev-python/clientcookie/clientcookie-1.0.3.ebuild
+++ b/dev-python/clientcookie/clientcookie-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/dev-python/clientcookie/clientcookie-1.0.3.ebuild,v 1.1 2005/06/13 02:19:43 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientcookie/clientcookie-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://wwwsearch.sourceforge.net/ClientCookie/"
 SRC_URI="http://wwwsearch.sourceforge.net/ClientCookie/src/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DOCS="COPYING ChangeLog PKG-INFO README.txt"
 
diff --git a/dev-python/clientform/ChangeLog b/dev-python/clientform/ChangeLog
index 97b544b076f6..8bc9620dc983 100644
--- a/dev-python/clientform/ChangeLog
+++ b/dev-python/clientform/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for dev-python/clientform
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/clientform/ChangeLog,v 1.1 2003/10/02 22:31:50 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientform/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+*clientform-0.1.17 (31 Jan 2005)
+
+  31 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +clientform-0.1.17.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> -clientform-0.1.15.ebuild,
+  -clientform-0.1.7b.ebuild:
+  Remove old version.
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> clientform-0.1.16.ebuild:
+  Added to ~ppc.
+
+  27 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> clientform-0.1.16.ebuild:
+  Marked stable x86
+
+  15 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> clientform-0.1.15.ebuild:
+  Marked stable on x86
+
+*clientform-0.1.16 (23 May 2004)
+
+  23 May 2004; Rob Cakebread <pythonhead@gentoo.org> clientform-0.1.15.ebuild,
+  +clientform-0.1.16.ebuild:
+  Version bump
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> clientform-0.1.7b.ebuild:
+  Stable on x86.
+
+*clientform-0.1.15 (10 Mar 2004)
+
+  10 Mar 2004; <kloeri@gentoo.org> clientform-0.1.15.ebuild:
+  Version bump.
 
 *clientform-0.1.7b (02 Oct 2003)
 
diff --git a/dev-python/clientform/Manifest b/dev-python/clientform/Manifest
index 2edde2845aa2..a186e5ce89b2 100644
--- a/dev-python/clientform/Manifest
+++ b/dev-python/clientform/Manifest
@@ -1,3 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ed6a4d4f64775947978158fc77f36702 ChangeLog 1405
+MD5 aff5ab0af4a5993a881a2f4e84099521 clientform-0.1.17.ebuild 669
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 a80ee56ed262da8c4da7d66dc7642e1d clientform-0.1.7b.ebuild 561
-MD5 1cf4f4109e09f7c877ff6891897f35ad files/digest-clientform-0.1.7b 68
+MD5 927e9d346dce0f6ddddc852607bb707e clientform-0.1.16.ebuild 668
+MD5 eb46ecba9f3f211d1febcd4dfb1ea06d files/digest-clientform-0.1.17 68
+MD5 11058f952c00365c9b21fdb3ea27356d files/digest-clientform-0.1.16 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.15 (GNU/Linux)
+
+iD8DBQFB/x7Bz2gxt1z4IGYRAisPAJ9M6VN+sgsXTZA3uLLVSH/aJ5NsewCfaKdy
+3SYz1bPONzGBASzu7H1Wf/s=
+=VPkh
+-----END PGP SIGNATURE-----
diff --git a/dev-python/clientform/clientform-0.1.16.ebuild b/dev-python/clientform/clientform-0.1.16.ebuild
index c3aec29dc20b..928c50b83b20 100644
--- a/dev-python/clientform/clientform-0.1.16.ebuild
+++ b/dev-python/clientform/clientform-0.1.16.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/dev-python/clientform/clientform-0.1.16.ebuild,v 1.1 2004/05/24 01:57:25 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientform/clientform-0.1.16.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://wwwsearch.sourceforge.net/ClientForm/"
 SRC_URI=http://wwwsearch.sourceforge.net/ClientForm/src/${MY_P}.tar.gz
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DOCS="COPYING README.txt PKG-INFO MANIFEST.in ChangeLog"
 
diff --git a/dev-python/clientform/clientform-0.1.17.ebuild b/dev-python/clientform/clientform-0.1.17.ebuild
index 09fcf23b0d62..7a3c637e67c3 100644
--- a/dev-python/clientform/clientform-0.1.17.ebuild
+++ b/dev-python/clientform/clientform-0.1.17.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/dev-python/clientform/clientform-0.1.17.ebuild,v 1.1 2005/02/01 06:11:13 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/clientform/clientform-0.1.17.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/cryptlib_py/ChangeLog b/dev-python/cryptlib_py/ChangeLog
index f00b78fbf925..36c73c796649 100644
--- a/dev-python/cryptlib_py/ChangeLog
+++ b/dev-python/cryptlib_py/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/cryptlib_py
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptlib_py/ChangeLog,v 1.1 2005/11/02 03:46:57 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptlib_py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 *cryptlib_py-3.2.2 (02 Nov 2005)
 
diff --git a/dev-python/cryptlib_py/Manifest b/dev-python/cryptlib_py/Manifest
index 0546730b0052..50f129ace0ef 100644
--- a/dev-python/cryptlib_py/Manifest
+++ b/dev-python/cryptlib_py/Manifest
@@ -1,3 +1,4 @@
-MD5 d19ae95bb8b465b330fdfe311c326931 cryptlib_py-3.2.2.ebuild 525
+MD5 1a3a2ce04933514763dae3d42c70ff79 ChangeLog 417
+MD5 285a02fcfff2708a8a5bdbedaddf98f7 cryptlib_py-3.2.2.ebuild 636
 MD5 02529b1ea693f56cc1a2e4f7c7e4b73a files/digest-cryptlib_py-3.2.2 55
 MD5 243594eeb2106bc851cb98b68fbd0b3c metadata.xml 217
diff --git a/dev-python/cryptlib_py/cryptlib_py-3.2.2.ebuild b/dev-python/cryptlib_py/cryptlib_py-3.2.2.ebuild
index 0725fb36e0ba..5ded98f9fe97 100644
--- a/dev-python/cryptlib_py/cryptlib_py-3.2.2.ebuild
+++ b/dev-python/cryptlib_py/cryptlib_py-3.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/dev-python/cryptlib_py/cryptlib_py-3.2.2.ebuild,v 1.1 2005/11/02 03:46:57 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptlib_py/cryptlib_py-3.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/csv/ChangeLog b/dev-python/csv/ChangeLog
index cf8f88cf758b..63af9e878d8e 100644
--- a/dev-python/csv/ChangeLog
+++ b/dev-python/csv/ChangeLog
@@ -1,7 +1,43 @@
 # ChangeLog for dev-python/csv
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/ChangeLog,v 1.1 2002/12/13 00:15:47 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> csv-1.0-r1.ebuild:
+  Mark 1.0-r1 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> csv-1.0-r1.ebuild:
+  add ~ia64
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Dec 2004; Yuta SATOH <nigoro@gentoo.org> csv-1.0-r1.ebuild:
+  added ~ppc64
+
+  20 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> csv-1.0-r1.ebuild:
+  Marked stable x86
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> csv-1.0-r1.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> csv-0.5.0.ebuild,
+  csv-1.0.ebuild:
+  Add missing IUSE.
+
+*csv-1.0-r1 (14 Feb 2004)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> :
+  renamed csv.so to csv2.so to avoid conflicts with python-2.3's built in csv
+  module. (#40429)
+
+*csv-1.0 (21 Mar 2003)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> csv-1.0.ebuild:
+  cleanup and bump to stable
+
+  21 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org> csv-1.0.ebuild :
+  new version
+	
 *csv-0.5.0 (13 Dec 2002)
 
   13 Dec 2002; B.Lauwers <blauwers@gentoo.org> :
diff --git a/dev-python/csv/Manifest b/dev-python/csv/Manifest
index e69de29bb2d1..22777b373938 100644
--- a/dev-python/csv/Manifest
+++ b/dev-python/csv/Manifest
@@ -0,0 +1,9 @@
+MD5 09bc73361668f585826859a6a90a1355 csv-1.0-r1.ebuild 741
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 401c291397c14d59bad6b342a5f5165b ChangeLog 1405
+MD5 df5f358cefe4a7d881c1130dec3d8363 csv-1.0.ebuild 494
+MD5 77a3249a99a1b7ea96fdf8e033a2fb99 csv-0.5.0.ebuild 606
+MD5 9e38ebb2987d5a487e73480d73dd3ead files/digest-csv-1.0-r1 58
+MD5 549e931ec64de357ae6d1a811cb460fb files/csv-1.0-rename.patch 4181
+MD5 9e38ebb2987d5a487e73480d73dd3ead files/digest-csv-1.0 58
+MD5 166ca7153bab968e71efabe99584402d files/digest-csv-0.5.0 57
diff --git a/dev-python/csv/csv-0.5.0.ebuild b/dev-python/csv/csv-0.5.0.ebuild
index e06ba76a4846..90b9f29d13d0 100644
--- a/dev-python/csv/csv-0.5.0.ebuild
+++ b/dev-python/csv/csv-0.5.0.ebuild
@@ -1,19 +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/dev-python/csv/csv-0.5.0.ebuild,v 1.1 2002/12/13 00:15:47 blauwers Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/csv-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
-S="${WORKDIR}/${PN}"
+inherit distutils
 
 DESCRIPTION="CSV Module for Python"
-SRC_URI="http://www.object-craft.com.au/projects/csv/download/csv-0.5.tar.gz"
 HOMEPAGE="http://www.object-craft.com.au/projects/csv/"
+SRC_URI="http://www.object-craft.com.au/projects/csv/download/csv-0.5.tar.gz"
 
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-DEPEND="virtual/python"
-LICENSE="python"
+LICENSE="PYTHON"
 SLOT="0"
+KEYWORDS="x86 ~alpha ~ppc ~sparc"
+IUSE=""
 
-inherit distutils
+DEPEND="virtual/python"
+
+S="${WORKDIR}/${PN}"
 
 src_compile() {
 	distutils_src_compile
diff --git a/dev-python/csv/csv-1.0-r1.ebuild b/dev-python/csv/csv-1.0-r1.ebuild
index f57036fc4869..61a10965efc0 100644
--- a/dev-python/csv/csv-1.0-r1.ebuild
+++ b/dev-python/csv/csv-1.0-r1.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/dev-python/csv/csv-1.0-r1.ebuild,v 1.1 2004/02/14 15:44:27 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/csv-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="CSV Module for Python"
 HOMEPAGE="http://www.object-craft.com.au/projects/csv/"
@@ -10,7 +10,7 @@ SRC_URI="http://www.object-craft.com.au/projects/csv/download/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="alpha ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 pkg_setup() {
@@ -21,6 +21,6 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	# patch thanks to David Grant <david.grant@telus.net> (#40429)
-	cd ${S}; epatch ${FILESDIR}/${P}-rename.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-rename.patch
 }
-	
diff --git a/dev-python/csv/csv-1.0.ebuild b/dev-python/csv/csv-1.0.ebuild
index ea870bb6d384..bac2d84849d0 100644
--- a/dev-python/csv/csv-1.0.ebuild
+++ b/dev-python/csv/csv-1.0.ebuild
@@ -1,25 +1,16 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/csv-1.0.ebuild,v 1.1 2003/03/21 18:29:11 lordvan Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/csv/csv-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
-S="${WORKDIR}/${P}"
+inherit distutils
 
 DESCRIPTION="CSV Module for Python"
-SRC_URI="http://www.object-craft.com.au/projects/csv/download/${P}.tar.gz"
 HOMEPAGE="http://www.object-craft.com.au/projects/csv/"
+SRC_URI="http://www.object-craft.com.au/projects/csv/download/${P}.tar.gz"
 
-IUSE=""
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-DEPEND="virtual/python"
 LICENSE="PYTHON"
 SLOT="0"
+KEYWORDS="x86 ~alpha ~ppc ~sparc"
+IUSE=""
 
-inherit distutils
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-}
+DEPEND="virtual/python"
diff --git a/dev-python/ctypes/ChangeLog b/dev-python/ctypes/ChangeLog
index d4bc26907148..aa6018563592 100644
--- a/dev-python/ctypes/ChangeLog
+++ b/dev-python/ctypes/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/ctypes
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ctypes/ChangeLog,v 1.1 2004/12/11 20:35:20 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ctypes/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+*ctypes-0.9.6 (28 Sep 2005)
+
+  28 Sep 2005; Hanno Boeck <hanno@gentoo.org> +files/ctypes-gcc4,
+  +ctypes-0.9.6.ebuild:
+  Version bump and gcc4 fix.
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> ctypes-0.9.2.ebuild:
+  Added to ~ppc.
 
 *ctypes-0.9.2 (11 Dec 2004)
 
diff --git a/dev-python/ctypes/Manifest b/dev-python/ctypes/Manifest
index e05dab86ae7c..a3dcefc84559 100644
--- a/dev-python/ctypes/Manifest
+++ b/dev-python/ctypes/Manifest
@@ -1,3 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1dd7030624e2671973a51ff01323b05e ChangeLog 643
+MD5 ba8f668462714d53fb8c56940979c03e ctypes-0.9.2.ebuild 571
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 d72d65c097ec8ed7c0bf46d81fca7f23 ctypes-0.9.2.ebuild 468
+MD5 f2643095c286001cbec6930760d37e38 ctypes-0.9.6.ebuild 634
 MD5 70d82ae089e593ea9b7ef3edf0888607 files/digest-ctypes-0.9.2 64
+MD5 a528c70556f9c8dcd802c86f66f2a599 files/digest-ctypes-0.9.6 64
+MD5 197165ec51d19517508ff731d0176faf files/ctypes-gcc4 341
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOnRWr2QksT29OyARAmHbAJ447br9z1Vr0ilU5N4bDCaHceJgQgCeKLzx
+nUnXqP9PNmKjghfK9nK44tw=
+=bYEG
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ctypes/ctypes-0.9.2.ebuild b/dev-python/ctypes/ctypes-0.9.2.ebuild
index 31db9721864d..168cdee78481 100644
--- a/dev-python/ctypes/ctypes-0.9.2.ebuild
+++ b/dev-python/ctypes/ctypes-0.9.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/dev-python/ctypes/ctypes-0.9.2.ebuild,v 1.1 2004/12/11 20:35:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ctypes/ctypes-0.9.2.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://starship.python.net/crew/theller/ctypes/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND=">=dev-lang/python-2.3.3"
 
diff --git a/dev-python/ctypes/ctypes-0.9.6.ebuild b/dev-python/ctypes/ctypes-0.9.6.ebuild
index a3198eb82b54..bdf655f6a549 100644
--- a/dev-python/ctypes/ctypes-0.9.6.ebuild
+++ b/dev-python/ctypes/ctypes-0.9.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/dev-python/ctypes/ctypes-0.9.6.ebuild,v 1.1 2005/09/28 10:20:32 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ctypes/ctypes-0.9.6.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit eutils distutils
 
diff --git a/dev-python/dnspython/ChangeLog b/dev-python/dnspython/ChangeLog
index b4585ab8477b..c468109c10e7 100644
--- a/dev-python/dnspython/ChangeLog
+++ b/dev-python/dnspython/ChangeLog
@@ -1,10 +1,91 @@
 # ChangeLog for dev-python/dnspython
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/ChangeLog,v 1.1 2004/05/02 00:55:23 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/ChangeLog,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+*dnspython-1.3.5 (12 Nov 2005)
+
+  12 Nov 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +dnspython-1.3.5.ebuild:
+  Version bump. Closing bug #112239.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> dnspython-1.3.4.ebuild:
+  Mark 1.3.4 stable on ia64
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> dnspython-1.3.4.ebuild:
+  Mark 1.3.4 stable on alpha
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  dnspython-1.3.4.ebuild:
+  Stable on ppc.
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  dnspython-1.3.3.ebuild:
+  Stable on sparc
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> dnspython-1.3.4.ebuild:
+  add ~ia64
+
+  09 Aug 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  dnspython-1.3.4.ebuild:
+  Added to ~hppa.
+
+*dnspython-1.3.4 (01 Aug 2005)
+
+  01 Aug 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +dnspython-1.3.4.ebuild:
+  Version bump. Closing bug #101021.
+
+  03 May 2005; Simon Stelling <blubb@gentoo.org> dnspython-1.3.3.ebuild:
+  stable on amd64
+
+  24 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> dnspython-1.3.3.ebuild:
+  Add ~alpha keyword, bug 86127.
+
+  21 Mar 2005; Jason Wever <weeve@gentoo.org> dnspython-1.3.3.ebuild:
+  Added ~sparc keyword wrt bug #86127.
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  -dnspython-1.3.0.ebuild, -dnspython-1.3.1.ebuild:
+  Remove old versions.
+
+*dnspython-1.3.3 (31 Jan 2005)
+
+  31 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  +dnspython-1.3.3.ebuild:
+  Version bump
+
+  26 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  dnspython-1.3.1.ebuild, dnspython-1.3.2.ebuild:
+  Marked stable on x86.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*dnspython-1.3.2 (07 Aug 2004)
+
+  07 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org> +dnspython-1.3.2.ebuild:
+  Version bump. Fixed dependency and typo in message in pkg_postinst.
+  Thanks to Martin Jackson, bug #59719.
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> dnspython-1.3.1.ebuild:
+  Added to ~ppc.
+
+*dnspython-1.3.1 (19 Jul 2004)
+
+  19 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +dnspython-1.3.1.ebuild:
+  Version bump. Added function src_test and removed informations
+  about tests from ebuild. Added description to metadata.
+
+  08 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> dnspython-1.3.0.ebuild:
+  Marked stable on x86
 
 *dnspython-1.3.0 (02 May 2004)
 
-  02 May 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  02 May 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +dnspython-1.3.0.ebuild:
   Initial import, bug #46500.
 
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index 1d244b2214ff..3ea70a7cd11c 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,2 +1,20 @@
-MD5 6611192eabd40bb871d73197455a058a dnspython-1.3.0.ebuild 828
-MD5 7646ca2488a54ff9a69d77a0a900ab75 files/digest-dnspython-1.3.0 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 10269c550001d50f26dd85612d79ac19 ChangeLog 2865
+MD5 5c6716def3b559f745ada456bf396a1d dnspython-1.3.2.ebuild 925
+MD5 ca73e71ae675e127b369c71f49495862 dnspython-1.3.3.ebuild 951
+MD5 536e71a68877293051ee0e58923375fe dnspython-1.3.4.ebuild 964
+MD5 1d3c75676e442f6f7742ac0ebbf62b65 dnspython-1.3.5.ebuild 965
+MD5 ec5b0f4a9cb24f7812f360d7aeae2f81 files/digest-dnspython-1.3.2 66
+MD5 3b52da045415784241fc9ae4d169de85 files/digest-dnspython-1.3.3 66
+MD5 e89e30abad80039c3811d50c3789bb73 files/digest-dnspython-1.3.4 66
+MD5 92a9a5780c78e70ffef19544cc1e9c9e files/digest-dnspython-1.3.5 66
+MD5 d543a62aa1a2072b30094dde66e1da79 metadata.xml 1301
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfv0vFdQwWVoAgN4RAmumAJ40r1cx0AHMToMchR4Q61rK1gdBWQCg5eWk
+71IfO8YCswy9tv+0L7o3m6c=
+=GS2p
+-----END PGP SIGNATURE-----
diff --git a/dev-python/dnspython/dnspython-1.3.2.ebuild b/dev-python/dnspython/dnspython-1.3.2.ebuild
index 37b5e37bfa32..612e80c0312e 100644
--- a/dev-python/dnspython/dnspython-1.3.2.ebuild
+++ b/dev-python/dnspython/dnspython-1.3.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/dev-python/dnspython/dnspython-1.3.2.ebuild,v 1.1 2004/08/07 21:50:01 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.dnspython.org/"
 SRC_URI="http://www.dnspython.org/kits/stable/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND="virtual/python
 	sys-devel/make"
diff --git a/dev-python/dnspython/dnspython-1.3.3.ebuild b/dev-python/dnspython/dnspython-1.3.3.ebuild
index a7c5329dded9..c3fe834f3b5c 100644
--- a/dev-python/dnspython/dnspython-1.3.3.ebuild
+++ b/dev-python/dnspython/dnspython-1.3.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/dev-python/dnspython/dnspython-1.3.3.ebuild,v 1.1 2005/01/31 02:12:08 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.dnspython.org/"
 SRC_URI="http://www.dnspython.org/kits/stable/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~alpha amd64 arm ~ppc sparc x86"
 IUSE=""
 DEPEND="virtual/python
 	sys-devel/make"
diff --git a/dev-python/dnspython/dnspython-1.3.4.ebuild b/dev-python/dnspython/dnspython-1.3.4.ebuild
index 090965e81656..d7a12b621eed 100644
--- a/dev-python/dnspython/dnspython-1.3.4.ebuild
+++ b/dev-python/dnspython/dnspython-1.3.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/dev-python/dnspython/dnspython-1.3.4.ebuild,v 1.1 2005/08/01 21:07:16 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.3.4.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.dnspython.org/"
 SRC_URI="http://www.dnspython.org/kits/stable/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ~sparc ~x86"
 IUSE=""
 DEPEND="virtual/python
 	sys-devel/make"
diff --git a/dev-python/dnspython/dnspython-1.3.5.ebuild b/dev-python/dnspython/dnspython-1.3.5.ebuild
index 5f074c09887e..0867a3ab1ac7 100644
--- a/dev-python/dnspython/dnspython-1.3.5.ebuild
+++ b/dev-python/dnspython/dnspython-1.3.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/dev-python/dnspython/dnspython-1.3.5.ebuild,v 1.1 2005/11/12 09:04:11 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/dnspython/dnspython-1.3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/dnspython/metadata.xml b/dev-python/dnspython/metadata.xml
index de483c53568f..e593ae87a7c5 100644
--- a/dev-python/dnspython/metadata.xml
+++ b/dev-python/dnspython/metadata.xml
@@ -2,4 +2,20 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+dnspython is a DNS toolkit for Python. It supports almost all of the record
+types. It can be used for queries, zone transfers, and dynamic updates. It
+supports TSIG authenticated messages and EDNS0.  dnspython provides both high
+and low level access to DNS. The high level classes perform queries for data
+of a given name, type, and class, and return an answer set. The low level
+classes allow direct manipulation of DNS zones, messages, names, and records.
+</longdescription>
+<longdescription lang="ja">
+DNSPythonはPython言語用のDNSツールキットです。ほとんどのレコード・タイプをサポー
+トします。クエリー、ゾーン・トランスファー、ダイナミック・アップデートができます
+。TSTGメッセージ認証とEDNS0をサポートします。DNSPythonは高水準でのアクセスと低水
+準でのアクセスの両方を提供します。高水準ではネーム、タイプ、クラスでクエリーを行
+い、その戻り値を使います。低水準はゾーン、メッセージ、ネーム、レコードを直接操作
+します。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog
index bdbe4b8a21b6..74a493a18ce0 100644
--- a/dev-python/docutils/ChangeLog
+++ b/dev-python/docutils/ChangeLog
@@ -1,6 +1,153 @@
 # ChangeLog for dev-python/docutils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.1 2003/05/30 16:31:57 g2boojum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.1.1.1 2005/11/30 10:10:24 chriswhite Exp $
+
+  19 Nov 2005; Markus Rothe <corsair@gentoo.org> docutils-0.3.7.ebuild,
+  docutils-0.3.9.ebuild:
+  Added ~ppc64; bug #102649
+
+  14 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> docutils-0.3.7.ebuild:
+  Stable on mips.
+
+  12 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> docutils-0.3.7.ebuild:
+  Stable on hppa, ppc.
+
+  10 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> docutils-0.3.7.ebuild:
+  Stable on sparc
+
+  09 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> docutils-0.3.7.ebuild,
+  docutils-0.3.9.ebuild:
+  Fix tests + stable 0.3.7 now that python-2.4 is in stable.
+
+  11 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> docutils-0.3.5.ebuild:
+  Added ~mips to 0.3.5 so we have something we can mark stable eventually.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> docutils-0.3.5.ebuild:
+  Mark 0.3.5 stable on alpha
+
+*docutils-0.3.9 (03 Sep 2005)
+
+  03 Sep 2005; Grant Goodyear <g2boojum@gentoo.org> +docutils-0.3.9.ebuild:
+  Version bump (bug # 95875), with new glep tarball.  Dropped "docutils-" prefix
+  for tools other than "docutils-glep.py", following the guidelines in the
+  docutils "distributing.html" file (bug #96856).  Thanks to Felix Wiemann, 
+  Fabian Neumann, and liquidx for contributions.  This latest ebuild lacks
+  proper PIL handling at the moment; if you're a distutils person please fix.
+
+  11 Jul 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/50docutils-gentoo.el, docutils-0.3.7.ebuild:
+  Support emacs USE flag.
+
+  04 Jun 2005; Stephen Bennett <spb@gentoo.org> docutils-0.3.7.ebuild:
+  ~mips keywords
+
+  15 May 2005; Guy Martin <gmsoft@gentoo.org> docutils-0.3.7.ebuild:
+  Added ~hppa to KEYWORDS.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> docutils-0.3.3-r1.ebuild,
+  docutils-0.3.7.ebuild:
+  marked 0.3.3-r1 stable and 0.3.7 testing on amd64
+
+  19 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> docutils-0.3.5.ebuild:
+  Stable on ppc.
+
+*docutils-0.3.7 (14 Mar 2005)
+
+  14 Mar 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/docutils-0.3.7-extramodules.patch, docutils-0.3-r1.ebuild,
+  docutils-0.3.3-r1.ebuild, docutils-0.3.5.ebuild, +docutils-0.3.7.ebuild,
+  docutils-0.3_pre20030530-r3.ebuild:
+  Fixed python 2.4 DEPENDs. Added src_test to 0.3.7. Marked 0.3.5 x86 bug# 79635
+
+  19 Feb 2005; <gongloo@gentoo.org> docutils-0.3.5.ebuild:
+  Stable on ppc-macos.
+
+  19 Jan 2005; <gongloo@gentoo.org> docutils-0.3.5.ebuild:
+  Keyworded ~ppc-macos.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> docutils-0.3.5.ebuild:
+  Added ~sparc keyword as it went missing in the version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Nov 2004; Grant Goodyear <g2boojum@gentoo.org> docutils-0.3.5.ebuild:
+  Fixing my glep booboo (bug # 69882).
+
+  01 Nov 2004; Jason Wever <weeve@gentoo.org> docutils-0.3.3-r1.ebuild:
+  Added ~sparc keyword.
+
+  01 Nov 2004; Dylan Carlson <absinthe@gentoo.org> :
+  Keywords ~amd64. 
+
+  31 Oct 2004; Grant Goodyear <g2boojum@gentoo.org>
+  +files/docutils-0.3.5-extramodules.patch, docutils-0.3.3-r1.ebuild,
+  +docutils-0.3.5.ebuild:
+  0.3.3-r1 is now stable on x86.
+  
+  Added 0.3.5, thanks to Stephen Boulet (bug #59140).
+
+*docutils-0.3.3-r1 (20 Jul 2004)
+
+  20 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> +files/glep-0.3.3/glep.py,
+  +files/glep-0.3.3/glep_htmlwrite.py, +files/glep-0.3.3/glepread.py,
+  +files/glep-0.3.3/glepstrans.py, +docutils-0.3.3-r1.ebuild,
+  -docutils-0.3.3.ebuild:
+  kloeri broke GLEP stuff w/ 0.3.3; bad boy!
+
+*docutils-0.3.3 (12 Jun 2004)
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +files/docutils-0.3.3-extramodules.patch, +docutils-0.3.3.ebuild:
+  Version bump, bug #51422.
+
+  27 Mar 2004; David Holm <dholm@gentoo.org> docutils-0.3-r1.ebuild:
+  Added to ~ppc.
+
+  20 Sep 2003; Alastair Tse <liquidx@gentoo.org> docutils-0.3-r1.ebuild,
+  docutils-0.3.ebuild, docutils-0.3_pre20030530.ebuild:
+  bumped to stable x86 and cleanups
+
+*docutils-0.3-r1 (08 Jul 2003)
+
+  08 Jul 2003; Alastair Tse <liquidx@gentoo.org> docutils-0.3-r1.ebuild,
+  files/docutils-0.3-extramodules.patch, files/glep-0.3-r1/glep.py,
+  files/glep-0.3-r1/glep_htmlwrite.py, files/glep-0.3-r1/glepread.py,
+  files/glep-0.3-r1/glepstrans.py:
+  fixed glep scripts for docutils 0.3, changed install script for optparse.py
+  and textwrap.py.
+
+*docutils-0.3 (01 Jul 2003)
+
+  01 Jul 2003; Alastair Tse <liquidx@gentoo.org> docutils-0.3.ebuild:
+  version bump
+
+*docutils-0.3_pre20030530-r3 (04 Jun 2003)
+
+  04 Jun 2003; Grant Goodyear <grant@grantgoodyear.org>
+  docutils-0.3_pre20030530-r2.ebuild, docutils-0.3_pre20030530-r3.ebuild,
+  files/glep_htmlwrite.py, files/glepstrans.py:
+  Numerous cleanings of the ebuild, entirely due to Ben Cornett
+  (whose bug I failed to look at before writing my ebuild).  I also updated
+  the Gentoo GLEP tools slightly so that they point to the new home
+  of GLEP: www.gentoo.org/proj/en/glep.
+
+*docutils-0.3_pre20030530-r2 (04 Jun 2003)
+
+  04 Jun 2003; Alastair Tse <liquidx@gentoo.org>
+  docutils-0.3_pre20030530-r2.ebuild, docutils-0.3_pre20030530.ebuild:
+  fix src_uri
+
+  01 Jun 2003; Grant Goodyear <g2boojum@gentoo.org>
+  docutils-0.3_pre20030530-r1.ebuild, files/glep_htmlwrite.py:
+  More GLEP fixes.
+
+*docutils-0.3_pre20030530-r1 (31 May 2003)
+
+  31 May 2003; Grant Goodyear <g2boojum@gentoo.org>
+  docutils-0.3_pre20030530-r1.ebuild:
+  New version that adds some GLEP files.
+  (Well, same version, just some new Gentoo functionality.)
 
 *docutils-0.3_pre20030530 (30 May 2003)
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index ca85135fe21c..5b7b6d26fa04 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,3 +1,31 @@
-MD5 8d2a56615726bc42b14a6a606528b8eb .docutils-0.3_pre20030530.ebuild.swp 12288
-MD5 be8543a935c6cf12ddc5b7744a3be6ec docutils-0.3_pre20030530.ebuild 730
-MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530 73
+MD5 19200ec4e8214ad09485270bbc19c40a ChangeLog 5931
+MD5 32c18f62ef442534b43d411bfd8c40a6 docutils-0.3-r1.ebuild 1770
+MD5 dddf09e76c6f943ebc4931e2ff794320 docutils-0.3.3-r1.ebuild 1903
+MD5 c45be82484f7cc076c69a559e3133d62 docutils-0.3.5.ebuild 1969
+MD5 d09689f126fcc5ba38a774163d4bfea2 docutils-0.3.7.ebuild 2496
+MD5 74a7b1584824888016191380b65cea31 docutils-0.3_pre20030530-r3.ebuild 1541
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 1663689e9b352ee1dd81b9d6d78b2238 docutils-0.3.9.ebuild 2472
+MD5 dac9480a7b5144f60cb48675c654f5a3 files/50docutils-gentoo.el 280
+MD5 694b883b9a8f714dc375a547cdf62b1d files/digest-docutils-0.3-r1 64
+MD5 d30e8a9c7f49c164696893c2f39f41ee files/digest-docutils-0.3.3-r1 72
+MD5 a88bbfee1135288043eeffcb178fab00 files/digest-docutils-0.3.5 124
+MD5 90906547cd2223248f6619d44b7fb688 files/digest-docutils-0.3.7 124
+MD5 8c6d9ea3ddd2e36b369112ee20b660fb files/digest-docutils-0.3_pre20030530-r3 73
+MD5 7c025532adb8b09116980747be7ccc61 files/docutils-0.3-extramodules.patch 1155
+MD5 fd7797bcc6dfaac58ec5408e4e3dac99 files/docutils-0.3.3-extramodules.patch 1159
+MD5 9d184e504ea5367a9309b9a1691d5147 files/docutils-0.3.5-extramodules.patch 1163
+MD5 4be747a533a3ba63b1cad7ced8b8ba04 files/docutils-0.3.7-extramodules.patch 1163
+MD5 4787b6c5e6678d3f211ec7f8ec71aa03 files/glep.py 699
+MD5 e3fa7c72245aae7d90beef3bf411583b files/glep_htmlwrite.py 4162
+MD5 0a2c7c1478f8b72f97b3d12534b4159e files/glepread.py 1647
+MD5 fded948d9eac24154eab24b2b56d15d6 files/glepstrans.py 10420
+MD5 25c0102e3a347e2b80d72a778ae0549d files/digest-docutils-0.3.9 124
+MD5 d6fc669e125324930e72f2421779a5c2 files/glep-0.3-r1/glepread.py 1647
+MD5 770e48a59980bce89ab956ab96396a7c files/glep-0.3-r1/glep.py 699
+MD5 a273d63de34b5da93a15764998c054d2 files/glep-0.3-r1/glep_htmlwrite.py 4168
+MD5 52f6ec87bfa6c5c8ec86c85e2a2ed58a files/glep-0.3-r1/glepstrans.py 10428
+MD5 f3c575d69568fafe2159283355e7efc0 files/glep-0.3.3/glepread.py 1833
+MD5 8a92d518608c84c83ce14ac840f96834 files/glep-0.3.3/glep.py 699
+MD5 bacb84b99614ef28729cb5adf4763242 files/glep-0.3.3/glep_htmlwrite.py 3246
+MD5 bba4f5a38311f907d4ddb4a5514099ea files/glep-0.3.3/glepstrans.py 10898
diff --git a/dev-python/docutils/docutils-0.3-r1.ebuild b/dev-python/docutils/docutils-0.3-r1.ebuild
index d7239c38ae13..d79314f62a6f 100644
--- a/dev-python/docutils/docutils-0.3-r1.ebuild
+++ b/dev-python/docutils/docutils-0.3-r1.ebuild
@@ -1,8 +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/dev-python/docutils/docutils-0.3-r1.ebuild,v 1.1 2003/07/07 23:39:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:25 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
 HOMEPAGE="http://docutils.sourceforge.net/"
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz"
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.1"
+DEPEND="<dev-lang/python-2.4"
 
 # GLEP version
 GLEP_SRC=${FILESDIR}/glep-${PVR}
@@ -56,7 +56,7 @@ src_install() {
 	do
 		install_txt_doc $doc
 	done
-	
+
 	# installing Gentoo GLEP tools. Uses versioned GLEP distribution
 	distutils_python_version
 	newbin ${GLEP_SRC}/glep.py docutils-glep.py
@@ -67,4 +67,3 @@ src_install() {
 	insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
 	newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py
 }
-
diff --git a/dev-python/docutils/docutils-0.3.3-r1.ebuild b/dev-python/docutils/docutils-0.3.3-r1.ebuild
index b26999769b76..e8629f11956a 100644
--- a/dev-python/docutils/docutils-0.3.3-r1.ebuild
+++ b/dev-python/docutils/docutils-0.3.3-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/dev-python/docutils/docutils-0.3.3-r1.ebuild,v 1.1 2004/07/20 18:23:59 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:24 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/docutils/${P}-alpha.tar.gz"
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="x86 ppc ~alpha amd64 ~sparc"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.1"
+DEPEND="<dev-lang/python-2.4"
 
 # GLEP version
 GLEP_SRC=${FILESDIR}/glep-${PV}
diff --git a/dev-python/docutils/docutils-0.3.5.ebuild b/dev-python/docutils/docutils-0.3.5.ebuild
index e9629a8a441b..b5e94f856068 100644
--- a/dev-python/docutils/docutils-0.3.5.ebuild
+++ b/dev-python/docutils/docutils-0.3.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/dev-python/docutils/docutils-0.3.5.ebuild,v 1.1 2004/11/01 00:13:09 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:25 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -11,10 +11,10 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha"
+KEYWORDS="alpha ~mips ppc ppc-macos ~sparc x86"
 IUSE="glep"
 
-DEPEND=">=dev-lang/python-2.1"
+DEPEND="<dev-lang/python-2.4"
 
 GLEP_SRC=${WORKDIR}/glep-${PV}
 
@@ -58,12 +58,15 @@ src_install() {
 	done
 
 	# installing Gentoo GLEP tools. Uses versioned GLEP distribution
-	distutils_python_version
-	newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
-	insinto /usr/lib/python${PYVER}/site-packages/docutils/readers
-	newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
-	insinto /usr/lib/python${PYVER}/site-packages/docutils/transforms
-	newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
-	insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
-	newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
+	if use glep
+	then
+		distutils_python_version
+		newbin ${GLEP_SRC}/glep.py docutils-glep.py || die "newbin failed"
+		insinto /usr/lib/python${PYVER}/site-packages/docutils/readers
+		newins ${GLEP_SRC}/glepread.py glep.py || die "newins reader failed"
+		insinto /usr/lib/python${PYVER}/site-packages/docutils/transforms
+		newins ${GLEP_SRC}/glepstrans.py gleps.py || "newins transform failed"
+		insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
+		newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
+	fi
 }
diff --git a/dev-python/docutils/docutils-0.3.7.ebuild b/dev-python/docutils/docutils-0.3.7.ebuild
index 774defe18926..487c4d1c5802 100644
--- a/dev-python/docutils/docutils-0.3.7.ebuild
+++ b/dev-python/docutils/docutils-0.3.7.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/dev-python/docutils/docutils-0.3.7.ebuild,v 1.1 2005/03/14 19:38:08 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.7.ebuild,v 1.1.1.1 2005/11/30 10:10:24 chriswhite Exp $
 
-inherit distutils eutils
+inherit distutils eutils elisp-common
 
 DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
 HOMEPAGE="http://docutils.sourceforge.net/"
@@ -11,9 +11,12 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~ppc-macos"
-IUSE="glep"
-DEPEND=">=dev-lang/python-2.2"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~m68k mips ppc ~ppc-macos ~ppc64 ~s390 ~sh sparc x86"
+IUSE="glep emacs"
+DEPEND=">=dev-lang/python-2.2
+	emacs? ( virtual/emacs )"
+
+SITEFILE=50docutils-gentoo.el
 
 GLEP_SRC=${WORKDIR}/glep-${PV}
 
@@ -29,6 +32,9 @@ src_compile() {
 	# Generate html docs from reStructured text sources
 	PYTHONPATH=${S}/build/lib ${python} \
 		tools/buildhtml.py --config=tools/docutils.conf
+	if use emacs; then
+		pushd tools/editors/emacs; elisp-compile *.el; popd
+	fi
 }
 
 
@@ -41,7 +47,7 @@ install_txt_doc() {
 
 src_test() {
 	cd ${S}/test
-	./alltests.py || die "alltests.py failed"
+	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
 }
 
 src_install() {
@@ -74,4 +80,17 @@ src_install() {
 		insinto /usr/lib/python${PYVER}/site-packages/docutils/writers
 		newins ${GLEP_SRC}/glep_htmlwrite.py glep_html.py || die "newins writer failed"
 	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/editors/emacs/*.{elc,el}
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/dev-python/docutils/docutils-0.3.9.ebuild b/dev-python/docutils/docutils-0.3.9.ebuild
index 276be76fe7ad..6b45e64b6a24 100644
--- a/dev-python/docutils/docutils-0.3.9.ebuild
+++ b/dev-python/docutils/docutils-0.3.9.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/dev-python/docutils/docutils-0.3.9.ebuild,v 1.1 2005/09/03 17:16:19 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3.9.ebuild,v 1.1.1.1 2005/11/30 10:10:25 chriswhite Exp $
 
 inherit distutils eutils elisp-common
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docutils/${P}.tar.gz
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 IUSE="glep emacs"
 DEPEND=">=dev-lang/python-2.3
 	emacs? ( virtual/emacs )"
@@ -49,7 +49,7 @@ install_txt_doc() {
 
 src_test() {
 	cd ${S}/test
-	./alltests.py || die "alltests.py failed"
+	PYTHONPATH="${S}" ./alltests.py || die "alltests.py failed"
 }
 
 src_install() {
diff --git a/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild b/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
index a25abcc08199..b5b447be1d43 100644
--- a/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild
+++ b/dev-python/docutils/docutils-0.3_pre20030530-r3.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/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.1 2003/06/04 19:39:20 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.3_pre20030530-r3.ebuild,v 1.1.1.1 2005/11/30 10:10:25 chriswhite Exp $
 
 DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc."
 HOMEPAGE="http://docutils.sourceforge.net/"
@@ -8,12 +8,12 @@ SRC_URI="mirror://gentoo/${P}.tgz"
 
 LICENSE="public-domain PYTHON BSD"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 inherit distutils
 
-DEPEND=">=dev-lang/python-2.1"
+DEPEND="<dev-lang/python-2.4"
 S=${WORKDIR}/${PN}
 
 src_compile() {
diff --git a/dev-python/docutils/files/glep-0.3-r1/glep.py b/dev-python/docutils/files/glep-0.3-r1/glep.py
index f023008f2bf7..7eb797396287 100644
--- a/dev-python/docutils/files/glep-0.3-r1/glep.py
+++ b/dev-python/docutils/files/glep-0.3-r1/glep.py
@@ -2,8 +2,8 @@
 
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/07/07 23:39:10 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep-0.3-r1/glep_htmlwrite.py b/dev-python/docutils/files/glep-0.3-r1/glep_htmlwrite.py
index 7d4b7f9bdf99..47cf82261da1 100644
--- a/dev-python/docutils/files/glep-0.3-r1/glep_htmlwrite.py
+++ b/dev-python/docutils/files/glep-0.3-r1/glep_htmlwrite.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/07/07 23:39:10 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep-0.3-r1/glepread.py b/dev-python/docutils/files/glep-0.3-r1/glepread.py
index ec3b4cb23592..cb5a5e697c83 100644
--- a/dev-python/docutils/files/glep-0.3-r1/glepread.py
+++ b/dev-python/docutils/files/glep-0.3-r1/glepread.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/07/07 23:39:10 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep-0.3-r1/glepstrans.py b/dev-python/docutils/files/glep-0.3-r1/glepstrans.py
index 8bd348371d91..9e9aeaebd739 100644
--- a/dev-python/docutils/files/glep-0.3-r1/glepstrans.py
+++ b/dev-python/docutils/files/glep-0.3-r1/glepstrans.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/07/07 23:39:10 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
@@ -33,8 +33,8 @@ class Headers(Transform):
     default_priority = 360
 
     pep_url = 'glep-%04d.html'
-    pep_cvs_url = ('http://cvs.gentoo.org/cgi-bin/viewcvs.cgi/gentoo/'
-                   'xml/htdocs/proj/en/glep/glep-%04d.txt')
+    pep_cvs_url = ('http://www.gentoo.org/cgi-bin/viewcvs.cgi/'
+                   'xml/htdocs/proj/en/glep/glep-%04d.txt?cvsroot=gentoo')
     rcs_keyword_substitutions = (
           (re.compile(r'\$' r'RCSfile: (.+),v \$$', re.IGNORECASE), r'\1'),
           (re.compile(r'\$[a-zA-Z]+: (.+) \$$'), r'\1'),)
diff --git a/dev-python/docutils/files/glep-0.3.3/glep.py b/dev-python/docutils/files/glep-0.3.3/glep.py
index e3fb18848833..7eb797396287 100644
--- a/dev-python/docutils/files/glep-0.3.3/glep.py
+++ b/dev-python/docutils/files/glep-0.3.3/glep.py
@@ -2,8 +2,8 @@
 
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2004/07/20 18:23:59 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep-0.3.3/glep_htmlwrite.py b/dev-python/docutils/files/glep-0.3.3/glep_htmlwrite.py
index 710c9d2264fa..a909380b27a6 100644
--- a/dev-python/docutils/files/glep-0.3.3/glep_htmlwrite.py
+++ b/dev-python/docutils/files/glep-0.3.3/glep_htmlwrite.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2004/07/20 18:23:59 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep-0.3.3/glepread.py b/dev-python/docutils/files/glep-0.3.3/glepread.py
index 807c13161839..2062c96f7937 100644
--- a/dev-python/docutils/files/glep-0.3.3/glepread.py
+++ b/dev-python/docutils/files/glep-0.3.3/glepread.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2004/07/20 18:23:59 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep-0.3.3/glepstrans.py b/dev-python/docutils/files/glep-0.3.3/glepstrans.py
index 64dafd174b03..1e449d9c0829 100644
--- a/dev-python/docutils/files/glep-0.3.3/glepstrans.py
+++ b/dev-python/docutils/files/glep-0.3.3/glepstrans.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2004/07/20 18:23:59 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep.py b/dev-python/docutils/files/glep.py
index b4a6c8517c8a..cf49d248fce4 100644
--- a/dev-python/docutils/files/glep.py
+++ b/dev-python/docutils/files/glep.py
@@ -2,8 +2,8 @@
 
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/06/01 03:57:44 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:25 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glep_htmlwrite.py b/dev-python/docutils/files/glep_htmlwrite.py
index 9b5c4e5138b9..c196fafd59a4 100644
--- a/dev-python/docutils/files/glep_htmlwrite.py
+++ b/dev-python/docutils/files/glep_htmlwrite.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/06/01 03:57:44 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:25 $
 # Copyright: This module has been placed in the public domain.
 
 """
@@ -69,7 +69,7 @@ class Writer(html4css1.Writer):
         if pyhome == '..':
             subs['pepindex'] = '.'
         else:
-            subs['pepindex'] = pyhome + '/peps/'
+            subs['pepindex'] = 'http://www.gentoo.org/proj/en/glep'
         index = self.document.first_child_matching_class(nodes.field_list)
         header = self.document[index]
         pepnum = header[0][1].astext()
diff --git a/dev-python/docutils/files/glepread.py b/dev-python/docutils/files/glepread.py
index ad1d6333c802..ea20e91da645 100644
--- a/dev-python/docutils/files/glepread.py
+++ b/dev-python/docutils/files/glepread.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/06/01 03:57:44 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:25 $
 # Copyright: This module has been placed in the public domain.
 
 """
diff --git a/dev-python/docutils/files/glepstrans.py b/dev-python/docutils/files/glepstrans.py
index 394376ad1927..b89ea9cc0bba 100644
--- a/dev-python/docutils/files/glepstrans.py
+++ b/dev-python/docutils/files/glepstrans.py
@@ -1,7 +1,7 @@
 # Author: David Goodger
 # Contact: goodger@users.sourceforge.net
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/06/01 03:57:44 $
+# Revision: $Revision: 1.1.1.1 $
+# Date: $Date: 2005/11/30 10:10:26 $
 # Copyright: This module has been placed in the public domain.
 
 """
@@ -33,8 +33,8 @@ class Headers(Transform):
     default_priority = 360
 
     pep_url = 'glep-%04d.html'
-    pep_cvs_url = ('http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/python/'
-                   'python/nondist/peps/pep-%04d.txt')
+    pep_cvs_url = ('http://cvs.gentoo.org/cgi-bin/viewcvs.cgi/gentoo/'
+                   'xml/htdocs/proj/en/glep/glep-%04d.txt')
     rcs_keyword_substitutions = (
           (re.compile(r'\$' r'RCSfile: (.+),v \$$', re.IGNORECASE), r'\1'),
           (re.compile(r'\$[a-zA-Z]+: (.+) \$$'), r'\1'),)
@@ -127,7 +127,7 @@ class Headers(Transform):
                     para[:] = [nodes.reference('', date, refuri=cvs_url)]
             elif name == 'content-type':
                 pep_type = para.astext()
-                uri = self.pep_url % 12
+                uri = self.pep_url % 2
                 para[:] = [nodes.reference('', pep_type, refuri=uri)]
             elif name == 'version' and len(body):
                 utils.clean_rcs_keywords(para, self.rcs_keyword_substitutions)
diff --git a/dev-python/drpython/ChangeLog b/dev-python/drpython/ChangeLog
index e914cae53632..d8ccb3e70566 100644
--- a/dev-python/drpython/ChangeLog
+++ b/dev-python/drpython/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for dev-python/drpython
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/ChangeLog,v 1.1 2004/11/14 12:05:41 lucass Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  09 Aug 2005; Luis Medinas <metalgod@gentoo.org> drpython-3.10.13.ebuild:
+  Added ~amd64 keywords. Closes bug #98439 .
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> drpython-3.10.13.ebuild:
+  Added to ~ppc.
+
+  20 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  drpython-3.10.13.ebuild:
+  setup.py only seems to work with python-2.4. Manually copy some files. bug#
+  91290
+
+*drpython-3.10.13 (04 May 2005)
+
+  04 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/drpython.py-3.10.13.patch, +drpython-3.10.13.ebuild:
+  Version bump.
+
+*drpython-3.10.12 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -files/drpython.py-3.6.10.patch, -files/drpython.py-3.10.6.patch,
+  +files/drpython.py-3.10.12.patch, -drpython-3.6.10.ebuild,
+  -drpython-3.10.6.ebuild, +drpython-3.10.12.ebuild:
+  Version bump. Removed old masked versions.
+
+*drpython-3.10.6 (19 Feb 2005)
+
+  19 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/drpython.py-3.10.6.patch, +drpython-3.10.6.ebuild:
+  Newest version.
 
 *drpython-3.6.10 (14 Nov 2004)
 
diff --git a/dev-python/drpython/Manifest b/dev-python/drpython/Manifest
index 4af9e368b63e..a0490e095565 100644
--- a/dev-python/drpython/Manifest
+++ b/dev-python/drpython/Manifest
@@ -1,3 +1,18 @@
-MD5 402fae22cd099d3e936062ce8e8ce017 drpython-3.6.10.ebuild 599
-MD5 fa7811eea5250f43772dc4601161c384 files/drpython.py-3.6.10.patch 403
-MD5 9c765d518e830b13bb56bd19d9fee8ae files/digest-drpython-3.6.10 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a4f52e789955b7510c0ab7d0fd9158a6 ChangeLog 1596
+MD5 e0398e4fe713935f5761036dde04b7dd drpython-3.10.12.ebuild 804
+MD5 a7d28c6c2e5d9adc70de123586359993 drpython-3.10.13.ebuild 1129
+MD5 1ad88fcbeefa623214abdbbbc5305509 files/digest-drpython-3.10.12 65
+MD5 d50979dcdc996758a4e570dc82d0a015 files/digest-drpython-3.10.13 65
+MD5 8f97fad63e509cc0537b92bedec9c731 files/drpython.py-3.10.12.patch 370
+MD5 8f97fad63e509cc0537b92bedec9c731 files/drpython.py-3.10.13.patch 370
+MD5 88f55e5d86d6886a75b1f13c95e3c8a2 metadata.xml 616
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfv7EFdQwWVoAgN4RAot2AKCBTe/P98qxXy06hQmWNrSY5roJ7ACeMDPW
+DYpc6sqn666v+MldkojNxdw=
+=EP3l
+-----END PGP SIGNATURE-----
diff --git a/dev-python/drpython/drpython-3.10.12.ebuild b/dev-python/drpython/drpython-3.10.12.ebuild
index b2ca33754f75..5b826a08a072 100644
--- a/dev-python/drpython/drpython-3.10.12.ebuild
+++ b/dev-python/drpython/drpython-3.10.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/dev-python/drpython/drpython-3.10.12.ebuild,v 1.1 2005/05/02 19:52:06 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-3.10.12.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit eutils distutils
 
diff --git a/dev-python/drpython/drpython-3.10.13.ebuild b/dev-python/drpython/drpython-3.10.13.ebuild
index 95a154c8dc7b..fa9f892196a9 100644
--- a/dev-python/drpython/drpython-3.10.13.ebuild
+++ b/dev-python/drpython/drpython-3.10.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/dev-python/drpython/drpython-3.10.13.ebuild,v 1.1 2005/05/04 02:22:37 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/drpython/drpython-3.10.13.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -9,10 +9,9 @@ HOMEPAGE="http://drpython.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-RDEPEND="virtual/python
-	>=dev-python/wxpython-2.5.3.1"
+RDEPEND=">=dev-python/wxpython-2.6"
 DEPEND="app-arch/unzip"
 
 src_unpack() {
@@ -22,9 +21,23 @@ src_unpack() {
 }
 
 src_install() {
-	distutils_src_install
 	distutils_python_version
-	echo -e "#!/bin/sh\n\npython /usr/lib/python${PYVER}/site-packages/drpython/drpython.py \$@" > drpython
+
+	local destdir="/usr/lib/python${PYVER}/site-packages/${PN}/"
+	dodir  ${destdir}/bitmaps/{16,24}
+	cp -R bitmaps ${D}/${destdir} || die "Failed to cp bitmaps"
+
+	distutils_src_install
+
+	#Windows-only setup script:
+	rm ${D}/usr/bin/postinst.py
+
+	echo -e "#!/bin/sh\n\npython ${destdir}/drpython.py \$@" > drpython
 	dobin drpython
 }
 
+pkg_postinst() {
+	einfo "See the DrPython homepage for 20+ available plugins:"
+	einfo "http://sourceforge.net/project/showfiles.php?group_id=83074"
+}
+
diff --git a/dev-python/drpython/metadata.xml b/dev-python/drpython/metadata.xml
index d5b3c40f633e..d5ca86088e75 100644
--- a/dev-python/drpython/metadata.xml
+++ b/dev-python/drpython/metadata.xml
@@ -8,4 +8,7 @@ editing environment for developing Python  programs. It
 is intended primarily for use in schools, and is a tribute to 
 DrScheme.
 </longdescription>
+<longdescription lang="ja">
+DrPythonはPython言語プログラム用の、柔軟で、簡単で、安定した開発環境です。DrSchemeに触発され、学校での教材となる事が念頭にあります。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/editobj/ChangeLog b/dev-python/editobj/ChangeLog
index f546cacecbba..250c10a4ecf5 100644
--- a/dev-python/editobj/ChangeLog
+++ b/dev-python/editobj/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for dev-python/editobj
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/editobj/ChangeLog,v 1.1 2003/05/10 18:43:23 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/editobj/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
+
+  10 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> editobj-0.5.6.ebuild:
+  x86 stable bump.
+
+*editobj-0.5.6 (04 Jan 2005)
+
+  04 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> +editobj-0.5.6.ebuild:
+  Version bump, bug 76129.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> editobj-0.5.3.ebuild:
+  Added to ~ppc.
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> editobj-0.4.2.ebuild,
+  editobj-0.5.2.ebuild, editobj-0.5.3.ebuild:
+  Mark 0.5.3 stable on x86. Remove old versions.
+
+*editobj-0.5.3 (21 Dec 2003)
+
+  21 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> editobj-0.5.3.ebuild:
+  Version bump.
+
+*editobj-0.5.2 (05 Dec 2003)
+
+  05 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> editobj-0.5.2.ebuild:
+  Version bump
 
 *editobj-0.4.2 (10 May 2003)
 
diff --git a/dev-python/editobj/Manifest b/dev-python/editobj/Manifest
index c49f5b7eaa4d..c24225753f15 100644
--- a/dev-python/editobj/Manifest
+++ b/dev-python/editobj/Manifest
@@ -1,2 +1,16 @@
-MD5 1e2689c1947f627d530ae5a8617c2da6 editobj-0.4.2.ebuild 574
-MD5 9d01ad9054c4d8fd46a9ba24b662c9b5 files/digest-editobj-0.4.2 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 faadcb37dbd98f5fb65b750459b18f3c editobj-0.5.6.ebuild 742
+MD5 1988c8ea3ffe9e30e70793e7d8cde88f ChangeLog 1257
+MD5 bbd26a676e1c924c7b9121c887be9953 editobj-0.5.3.ebuild 844
+MD5 edac8e6cc5f5f637002eadecb6a42da2 files/digest-editobj-0.5.3 64
+MD5 c33a49403ae47a38a607373e8ed34527 files/digest-editobj-0.5.6 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCCp29ugEuf3OQ0akRAg3wAJ9qfVOeKQhemliRsAgk7fGwXdtRJgCfQJ/E
+NCCDRTnJB1nHX4MGTqQ8K74=
+=82GL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/editobj/editobj-0.5.3.ebuild b/dev-python/editobj/editobj-0.5.3.ebuild
index 5e788f207c21..0fa91b14c4d4 100644
--- a/dev-python/editobj/editobj-0.5.3.ebuild
+++ b/dev-python/editobj/editobj-0.5.3.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/dev-python/editobj/editobj-0.5.3.ebuild,v 1.1 2003/12/21 16:26:13 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/editobj/editobj-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://oomadness.tuxfamily.org/downloads/${MY_P}.tar.gz
 	http://www.nectroom.homelinux.net/pkg/${MY_P}.tar.gz
 	http://nectroom.homelinux.net/pkg/${MY_P}.tar.gz"
 HOMEPAGE="http://oomadness.tuxfamily.org/en/editobj/"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/x11
diff --git a/dev-python/editobj/editobj-0.5.6.ebuild b/dev-python/editobj/editobj-0.5.6.ebuild
index ab512f108089..c141182a3683 100644
--- a/dev-python/editobj/editobj-0.5.6.ebuild
+++ b/dev-python/editobj/editobj-0.5.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/dev-python/editobj/editobj-0.5.6.ebuild,v 1.1 2005/01/04 10:49:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/editobj/editobj-0.5.6.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ IUSE=""
 DESCRIPTION="EditObj can create a dialog box to edit ANY Python object. It also includes a Tk tree widget, an event and a multiple undo-redo frameworks."
 SRC_URI="http://download.gna.org/songwrite/${MY_P}.tar.gz"
 HOMEPAGE="http://home.gna.org/oomadness/en/editobj/index.html"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND="virtual/x11
diff --git a/dev-python/egenix-mx-base/ChangeLog b/dev-python/egenix-mx-base/ChangeLog
index fa28a5bd8fb8..9aad2e63ca7d 100644
--- a/dev-python/egenix-mx-base/ChangeLog
+++ b/dev-python/egenix-mx-base/ChangeLog
@@ -1,9 +1,98 @@
 # ChangeLog for dev-python/egenix-mx-base
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
+  17 Aug 2005; MATSUU Takuto <matsuu@gentoo.org>
+  egenix-mx-base-2.0.5.ebuild:
+  Stable on sh.
+
+  13 Jan 2005; Alastair Tse <liquidx@gentoo.org>
+  egenix-mx-base-2.0.6.ebuild:
+  removing pytag.py as it breaks with -fstack-protector (#63762)
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -egenix-mx-base-2.0.3.ebuild, -egenix-mx-base-2.0.4.ebuild:
+  Remove old ebuilds.
+
+*egenix-mx-base-2.0.6 (29 Dec 2004)
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +egenix-mx-base-2.0.6.ebuild:
+  Version bump.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  egenix-mx-base-2.0.5.ebuild:
+  Stable on amd64.
+
+  01 Jun 2004; Tom Gall <tgall@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  stable on ppc64, bug #52709
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  egenix-mx-base-2.0.3.ebuild:
+  Add missing IUSE.
+
+  01 Apr 2004; Brian Jackson <iggy@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  add s390 to keywords
+
+  21 Mar 2004; Joshua Kinard <kumba@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  Marked stable on mips.
+
+  16 Mar 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  egenix-mx-base-2.0.3.ebuild, egenix-mx-base-2.0.4.ebuild,
+  egenix-mx-base-2.0.5.ebuild:
+  Corrected SRC_URI, bug #44788.
+
+  27 Feb 2004; Joshua Kinard <kumba@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  Added ~mips to KEYWORDS to satisfy repoman deps.
+
+  30 Jan 2004; <gustavoz@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  stable on sparc
+
+  09 Jan 2004; root <root@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  Marked stable on hppa.
+
+  06 Jan 2004; <agriffis@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  stable on ia64 and alpha
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  Make stable on ppc
+
+*egenix-mx-base-2.0.5 (06 Sep 2003)
+
+  06 Sep 2003; Alastair Tse <liquidx@gentoo.org> egenix-mx-base-2.0.5.ebuild:
+  version bump
+
+  19 Jul 2003; Alastair Tse <liquidx@gentoo.org> egenix-mx-base-2.0.3.ebuild,
+  egenix-mx-base-2.0.4.ebuild:
+  filter excessive optmisations thanks to bug #24168 by Priit Laes <amd@tt.ee>
+
+  11 Feb 2003; Bryon Roche <kain@kain.org> egenix-mx-base-2.0.4.ebuild :
+
+  ~ppcing this as it is required for blender
+
+*egenix-mx-base-2.0.4 (12 Dec 2002)
+
+  06 Aug 2003; Guy Martin <gmsoft@gentoo.org> egenix-mx-base-2.0.4.ebuild :
+  Added hppa to KEYWORDS.
+
+  05 Apr 2003; Alastair Tse <liquidx@gentoo.org> egenix-mx-base-2.0.4.ebuild:
+  bump to stable
+
+  12 Dec 2002; B.Lauwers <blauwers@gentoo.org> egenix-mx-base-2.0.4.ebuild, Changelog :
+
+  Version bump, cleanups
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *egenix-mx-base-2.0.3 (1 Feb 2002)
 
+  27 Jul 2002; George Shapovalov <george@gentoo.org> egenix-mx-base-2.0.2.ebuild, egenix-mx-base-2.0.3.ebuild :
+
+  added KEYWORDS,SLOT,LICENSE
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
@@ -11,3 +100,9 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
+*egenix-mx-base-2.0.2 (22 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
diff --git a/dev-python/egenix-mx-base/Manifest b/dev-python/egenix-mx-base/Manifest
index e69de29bb2d1..2b2c3a9e4281 100644
--- a/dev-python/egenix-mx-base/Manifest
+++ b/dev-python/egenix-mx-base/Manifest
@@ -0,0 +1,6 @@
+MD5 f36b67167f0b07894763ab742845d3b9 egenix-mx-base-2.0.5.ebuild 794
+MD5 7c8c4c04eb76d3e2436cb0e9c6f266c2 ChangeLog 3648
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 35bae7be436fa7ddcabcb235af6e5a46 egenix-mx-base-2.0.6.ebuild 805
+MD5 af47a948e9145473f867071766ddee18 files/digest-egenix-mx-base-2.0.5 72
+MD5 678bcf931e0d79b1625885bc71dcba7a files/digest-egenix-mx-base-2.0.6 72
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-2.0.5.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-2.0.5.ebuild
index 4d083e090791..ab75f8eb08bf 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-2.0.5.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-2.0.5.ebuild
@@ -1,20 +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/dev-python/egenix-mx-base/egenix-mx-base-2.0.5.ebuild,v 1.1 2003/09/09 17:04:10 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils flag-o-matic
 
-IUSE=""
-DESCRIPTION="egenix utils for Python."
-SRC_URI="http://www.lemburg.com/files/python/${P}.tar.gz"
+DESCRIPTION="egenix utils for Python"
 HOMEPAGE="http://www.egenix.com/"
+SRC_URI="http://www.egenix.com/files/python/${P}.tar.gz"
 
-DEPEND="virtual/python"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64 ~hppa"
 LICENSE="eGenixPublic"
-#please note, there is also a possibility to buy a commercial license
-#from egenix.com
+SLOT="0"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390 sh"
+IUSE=""
+
+DEPEND="virtual/python"
+
+src_unpack() {
+	unpack ${A}
+	# doesn't play well with -fstack-protector (#63762)
+	rm ${S}/mx/TextTools/Examples/pytag.py
+}
 
 src_compile() {
 	replace-flags "-O[3s]" "-O2"
diff --git a/dev-python/egenix-mx-base/egenix-mx-base-2.0.6.ebuild b/dev-python/egenix-mx-base/egenix-mx-base-2.0.6.ebuild
index aca9ecaecf9a..deaf4c1fee0a 100644
--- a/dev-python/egenix-mx-base/egenix-mx-base-2.0.6.ebuild
+++ b/dev-python/egenix-mx-base/egenix-mx-base-2.0.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/dev-python/egenix-mx-base/egenix-mx-base-2.0.6.ebuild,v 1.1 2004/12/29 22:57:05 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/egenix-mx-base/egenix-mx-base-2.0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils flag-o-matic
 
@@ -10,11 +10,17 @@ SRC_URI="http://www.egenix.com/files/python/${P}.tar.gz"
 
 LICENSE="eGenixPublic"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390 ~sh"
 IUSE=""
 
 DEPEND="virtual/python"
 
+src_unpack() {
+	unpack ${A}
+	# doesn't play well with -fstack-protector (#63762)
+	rm ${S}/mx/TextTools/Examples/pytag.py
+}
+
 src_compile() {
 	replace-flags "-O[3s]" "-O2"
 	distutils_src_compile
diff --git a/dev-python/elementtree/ChangeLog b/dev-python/elementtree/ChangeLog
index d91e5d93eab9..339fe14ed2ea 100644
--- a/dev-python/elementtree/ChangeLog
+++ b/dev-python/elementtree/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for dev-python/elementtree
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/ChangeLog,v 1.1 2004/06/05 17:18:26 lucass Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+  29 Oct 2005; Mark Loeser <halcy0n@gentoo.org> elementtree-1.2.6.ebuild:
+  Stable on x86
+
+  29 Oct 2005; Daniel Goller <morfic@gentoo.org> elementtree-1.2.6.ebuild:
+  Stable on amd64 and ppc
+
+  05 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> elementtree-1.2.6.ebuild:
+  Added ~mips.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> elementtree-1.2.6.ebuild:
+  add ~ia64
+
+*elementtree-1.2.6 (18 Apr 2005)
+
+  18 Apr 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -elementtree-1.2_beta3.ebuild, elementtree-1.2.ebuild,
+  -elementtree-1.2.1.ebuild, -elementtree-1.2.4.ebuild,
+  +elementtree-1.2.6.ebuild:
+  Version bump. Removed versions unavailable, switched from zip to tgz, thanks
+  Marien Zwart <m_zwart@123mail.org> bug# 89539
+
+*elementtree-1.2.4 (23 Jan 2005)
+
+  23 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +elementtree-1.2.4.ebuild:
+  Version bump.
+
+  04 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  elementtree-1.2.1.ebuild:
+  Added to ~amd64, bug #76319
+
+*elementtree-1.2.1 (10 Nov 2004)
+
+  10 Nov 2004; Lukasz Strzygowski <lucass@gentoo.org>
+  +elementtree-1.2.1.ebuild:
+  Version bump. Added src_test.
+
+  21 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> elementtree-1.2.ebuild,
+  elementtree-1.2_beta3.ebuild:
+  Marked stable on x86
+
+*elementtree-1.2 (25 Jun 2004)
+
+  25 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> +elementtree-1.2.ebuild:
+  Version bump. Removed unnecessary src_unpack, added commands
+  to install documentation in subdirectory docs/.
+
+*elementtree-1.2_beta3 (08 Jun 2004)
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> elementtree-1.2_beta3.ebuild:
+  Added to ~ppc.
 
   05 Jun 2004; <lucass@gentoo.org> :
   Initial commit. Bug #44870. Thanks for Martin Klaffenboeck and Jacob Smullyan.
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
index 5a0c3f7f5729..f4e05b7ba5a4 100644
--- a/dev-python/elementtree/Manifest
+++ b/dev-python/elementtree/Manifest
@@ -1,2 +1,16 @@
-MD5 477d0a8e06a7a3c2e0372be7b179ee75 elementtree-1.2_beta3.ebuild 660
-MD5 3e81ceee64db0c68cde60663ba5b1b4c files/digest-elementtree-1.2_beta3 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d2c865a2c1ed2ead7da5ed2352e6e6af ChangeLog 1953
+MD5 1796a931211b58e0cfcd34541848b146 elementtree-1.2.6.ebuild 668
+MD5 baf9f7c965149e653abce13e5230443a elementtree-1.2.ebuild 588
+MD5 02d3d673dcd875a82306445f62f5b232 files/digest-elementtree-1.2 75
+MD5 34ece01bd958e2f6c0a493fb1fcee254 files/digest-elementtree-1.2.6 77
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYxXVCRZPokWLroQRAoKQAJ9y33edsO6xZZLB0gz1D7L+ZHtfIQCgn7/f
+UYqoTbA78HSJmkEuSjZMSdg=
+=3/SQ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/elementtree/elementtree-1.2.6.ebuild b/dev-python/elementtree/elementtree-1.2.6.ebuild
index 794287d936f1..af81f596c370 100644
--- a/dev-python/elementtree/elementtree-1.2.6.ebuild
+++ b/dev-python/elementtree/elementtree-1.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/dev-python/elementtree/elementtree-1.2.6.ebuild,v 1.1 2005/04/18 17:59:05 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/elementtree-1.2.6.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
@@ -8,7 +8,7 @@ MY_P="${PN}-${PV}-20050316"
 DESCRIPTION="A light-weight XML object model for Python"
 HOMEPAGE="http://effbot.org/zone/element-index.htm"
 SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ~ia64 ~mips ppc x86"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/elementtree/elementtree-1.2.ebuild b/dev-python/elementtree/elementtree-1.2.ebuild
index 160173dbb044..ab5c76d2d8f9 100644
--- a/dev-python/elementtree/elementtree-1.2.ebuild
+++ b/dev-python/elementtree/elementtree-1.2.ebuild
@@ -1,17 +1,14 @@
-# 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/dev-python/elementtree/elementtree-1.2.ebuild,v 1.1 2004/06/24 23:00:30 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/elementtree/elementtree-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
 MY_P="${PN}-${PV}-20040618"
 DESCRIPTION="A light-weight XML object model for Python"
 HOMEPAGE="http://effbot.org/zone/element-index.htm"
-SRC_URI="http://effbot.org/downloads/${MY_P}.zip"
-KEYWORDS="~x86 ~ppc"
-DEPEND="virtual/python"
-RDEPEND="${DEPEND}
-	app-arch/unzip"
+SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
+KEYWORDS="x86 ~ppc"
 LICENSE="as-is"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/elementtree/files/digest-elementtree-1.2 b/dev-python/elementtree/files/digest-elementtree-1.2
index 0d435cf4668a..ac39e7539720 100644
--- a/dev-python/elementtree/files/digest-elementtree-1.2
+++ b/dev-python/elementtree/files/digest-elementtree-1.2
@@ -1 +1 @@
-MD5 1c7df3632a9a4f3f96bcb5629db015e3 elementtree-1.2-20040618.zip 58884
+MD5 5248475384dbbda2cfa976481c719e25 elementtree-1.2-20040618.tar.gz 37321
diff --git a/dev-python/empy/ChangeLog b/dev-python/empy/ChangeLog
index 20ebc9a5f4a7..3803ca287af6 100644
--- a/dev-python/empy/ChangeLog
+++ b/dev-python/empy/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-python/empy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/ChangeLog,v 1.1 2003/10/24 05:58:49 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> empy-3.3.ebuild:
+  Added to ~ppc.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> empy-3.3.ebuild:
+  stable on amd64
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Sep 2004; <blubb@gentoo.org> empy-3.3.ebuild:
+  added ~amd64 keyword
+
+  08 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> empy-3.3.ebuild:
+  Marked stable on x86
+
+*empy-3.3 (01 Apr 2004)
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> empy-3.2.ebuild,
+  empy-3.3.ebuild:
+  Mark 3.2 stable on x86, add new 3.3 version, fix homepage + src_uri.
 
 *empy-3.2 (23 Oct 2003)
 
diff --git a/dev-python/empy/Manifest b/dev-python/empy/Manifest
index d9aad716bf86..4f39a10a8ae7 100644
--- a/dev-python/empy/Manifest
+++ b/dev-python/empy/Manifest
@@ -1,4 +1,6 @@
-MD5 0bead182572e37a3a6f64ce3afbdd9a9 empy-3.2.ebuild 1016
+MD5 afb8e231cd6d4b7f00886560a00fd0e1 ChangeLog 1001
+MD5 735d31bbb24d7e5891d8e7f6cd94e3b0 empy-3.2.ebuild 1109
+MD5 d982f9ef6ca1c5822a5c66fa1af431db empy-3.3.ebuild 1118
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 ffa04350f93fa792912fcb704fd524e5 ChangeLog 298
 MD5 0b13c5b2640baae4c57cb472b6ccc74a files/digest-empy-3.2 60
+MD5 8e4b8947c17c6111b5e83b5d9eaadf7f files/digest-empy-3.3 60
diff --git a/dev-python/empy/empy-3.2.ebuild b/dev-python/empy/empy-3.2.ebuild
index b5a0ade822a2..80cddbc8d0d4 100644
--- a/dev-python/empy/empy-3.2.ebuild
+++ b/dev-python/empy/empy-3.2.ebuild
@@ -1,16 +1,15 @@
-# 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/dev-python/empy/empy-3.2.ebuild,v 1.1 2003/10/24 05:58:49 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.2.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
-
 DESCRIPTION="A powerful and robust templating system for Python"
-HOMEPAGE="http://www.alcyone.com/pyos/empy/"
-SRC_URI="http://www.alcyone.com/pyos/empy/${P}.tar.gz"
+HOMEPAGE="http://www.alcyone.com/software/empy/"
+SRC_URI="http://www.alcyone.com/software/empy/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="dev-lang/python"
 
diff --git a/dev-python/empy/empy-3.3.ebuild b/dev-python/empy/empy-3.3.ebuild
index 3df6f8a736c6..83686cd33b0f 100644
--- a/dev-python/empy/empy-3.3.ebuild
+++ b/dev-python/empy/empy-3.3.ebuild
@@ -1,15 +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/dev-python/empy/empy-3.3.ebuild,v 1.1 2004/04/01 01:15:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/empy/empy-3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
+
 DESCRIPTION="A powerful and robust templating system for Python"
 HOMEPAGE="http://www.alcyone.com/software/empy/"
 SRC_URI="http://www.alcyone.com/software/empy/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 DEPEND="dev-lang/python"
 
diff --git a/dev-python/epydoc/ChangeLog b/dev-python/epydoc/ChangeLog
index e474a1535b71..851015704362 100644
--- a/dev-python/epydoc/ChangeLog
+++ b/dev-python/epydoc/ChangeLog
@@ -1,8 +1,54 @@
-# ChangeLog for dev-lang/sather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/ChangeLog,v 1.1 2002/12/05 14:07:37 lordvan Exp $
+# ChangeLog for dev-python/epydoc
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+*epydoc-2.1-r2 (18 Sep 2005)
+
+  18 Sep 2005; Lukasz Strzygowski <lucass@gentoo.org> +epydoc-2.1-r2.ebuild:
+  Added doc use flag. Fixed bug in installation of HTML docs (#104920).
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> epydoc-2.1-r1.ebuild:
+  Added ~sparc keyword.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*epydoc-2.1-r1 (07 Aug 2004)
+
+  07 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org> +epydoc-2.1-r1.ebuild:
+  Added a new local use flag - pdf, which enables support for
+  exporting to pdf, by adding a dependency on virtual/tetex.
+
+  04 Aug 2004; David Holm <dholm@gentoo.org> epydoc-2.1.ebuild:
+  Added to ~ppc.
+
+*epydoc-2.1 (03 Aug 2004)
+
+  03 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> +epydoc-2.1.ebuild:
+  Version bump. bug
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> epydoc-1.1.ebuild:
+  Add missing IUSE.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> epydoc-2.0.ebuild:
+  Add missing IUSE.
+
+*epydoc-2.0 (17 Feb 2004)
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> epydoc-1.1.ebuild,
+  epydoc-2.0.ebuild:
+  stable on alpha and ia64
+
+  09 Jan 2004; Jason A Mobarak <aether@gentoo.org> :
+  Added epydoc version 2.0
 
 *epydoc-1.1 (05 Dec 2002)
 
+  25 Mar 2003; Alastair Tse <liquidx@gentoo.org> epydoc-1.1.ebuild:
+  Bumping to stable for x86
+
   05 Dec 2002; T.Raschbacher <lordvan@gentoo.org> epydoc-1.1.ebuild
   Initial ebuild
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index e69de29bb2d1..8327d3c8ee68 100644
--- a/dev-python/epydoc/Manifest
+++ b/dev-python/epydoc/Manifest
@@ -0,0 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5df609dcaa684ccbdcdc36ff3c571aeb ChangeLog 1776
+MD5 4d0aa84ce23c94f0874e8c3449d6350b epydoc-1.1.ebuild 680
+MD5 5c70b22aeb539bff010f261755fadb38 epydoc-2.0.ebuild 679
+MD5 4456cba6bb8b27cbb26391cebdd0b1e7 epydoc-2.1-r1.ebuild 721
+MD5 b02cbee57de29b2147792b27bbce3765 epydoc-2.1-r2.ebuild 654
+MD5 427ba96becc847c49a9a0c76a7469c51 epydoc-2.1.ebuild 684
+MD5 d21c286501b0192dd368d1f9476ab2cd files/digest-epydoc-1.1 62
+MD5 079c7f26b5e482c98875b8ad3f1826f7 files/digest-epydoc-2.0 62
+MD5 25de883fcadc3fadb6e3d3a7ad9239d0 files/digest-epydoc-2.1 62
+MD5 25de883fcadc3fadb6e3d3a7ad9239d0 files/digest-epydoc-2.1-r1 62
+MD5 25de883fcadc3fadb6e3d3a7ad9239d0 files/digest-epydoc-2.1-r2 62
+MD5 b7528c74e22361c21e6dd4cf0725dcb8 metadata.xml 1070
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfv/jFdQwWVoAgN4RAi9FAJ0cte5eF44ShhYJ4b3TR1Tw/dZvkgCcC5Er
+4g1cBw15XcnAphmluCJCVZ8=
+=NgwC
+-----END PGP SIGNATURE-----
diff --git a/dev-python/epydoc/epydoc-1.1.ebuild b/dev-python/epydoc/epydoc-1.1.ebuild
index 2ace9662b3fd..9f5e2e36c8aa 100644
--- a/dev-python/epydoc/epydoc-1.1.ebuild
+++ b/dev-python/epydoc/epydoc-1.1.ebuild
@@ -1,28 +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/dev-python/epydoc/epydoc-1.1.ebuild,v 1.1 2002/12/05 14:07:37 lordvan Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION=" Epydoc is a tool for generating API documentation for Python modules, based on their docstrings."
-SRC_URI="mirror://sourceforge/epydoc/${P}.tar.gz"
+inherit distutils
+
+DESCRIPTION="tool for generating API documentation for Python modules, based on their docstrings"
 HOMEPAGE="http://epydoc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/epydoc/${P}.tar.gz"
+
 LICENSE="MIT"
 SLOT="0"
-RDEPEND="virtual/python"
-DEPEND="$DEPEND"
-KEYWORDS="~x86"
+KEYWORDS="x86 alpha ia64"
 IUSE=""
 
-inherit distutils
+RDEPEND="virtual/python"
 
 src_install() {
-    distutils_src_install
+	distutils_src_install
 
-    # copy docs (using cp -r cuz of some sub-dirs)
-    cp -r ${S}/doc/* ${D}/usr/share/doc/${P}/
-    
-    # man-pages
-    doman ${S}/man/*
-   
+	# copy docs (using cp -r cuz of some sub-dirs)
+	cp -r ${S}/doc/* ${D}/usr/share/doc/${PF}/
+	prepalldocs
+	doman ${S}/man/*
 }
-
diff --git a/dev-python/epydoc/epydoc-2.0.ebuild b/dev-python/epydoc/epydoc-2.0.ebuild
index 60a9fa5bbe6c..ce652c607b48 100644
--- a/dev-python/epydoc/epydoc-2.0.ebuild
+++ b/dev-python/epydoc/epydoc-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/dev-python/epydoc/epydoc-2.0.ebuild,v 1.1 2004/01/10 04:48:49 aether Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,8 @@ SRC_URI="mirror://sourceforge/epydoc/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 alpha ia64"
+IUSE=""
 
 RDEPEND="virtual/python"
 
diff --git a/dev-python/epydoc/epydoc-2.1-r1.ebuild b/dev-python/epydoc/epydoc-2.1-r1.ebuild
index da8f3198881e..455b86c5fb56 100644
--- a/dev-python/epydoc/epydoc-2.1-r1.ebuild
+++ b/dev-python/epydoc/epydoc-2.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/dev-python/epydoc/epydoc-2.1-r1.ebuild,v 1.1 2004/08/07 14:47:55 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/epydoc/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64 ~ppc"
+KEYWORDS="~alpha ~ia64 ~ppc ~sparc ~x86"
 IUSE="pdf"
 
 RDEPEND="virtual/python
diff --git a/dev-python/epydoc/epydoc-2.1-r2.ebuild b/dev-python/epydoc/epydoc-2.1-r2.ebuild
index 0f032c815476..6c609d37a613 100644
--- a/dev-python/epydoc/epydoc-2.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-2.1-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/dev-python/epydoc/epydoc-2.1-r2.ebuild,v 1.1 2005/09/18 10:18:47 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-2.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/epydoc/epydoc-2.1.ebuild b/dev-python/epydoc/epydoc-2.1.ebuild
index 1f61b18568cd..3e5eea7396b0 100644
--- a/dev-python/epydoc/epydoc-2.1.ebuild
+++ b/dev-python/epydoc/epydoc-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/dev-python/epydoc/epydoc-2.1.ebuild,v 1.1 2004/08/03 21:29:06 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/epydoc/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64"
+KEYWORDS="~x86 ~alpha ~ia64 ~ppc"
 IUSE=""
 
 RDEPEND="virtual/python"
diff --git a/dev-python/epydoc/metadata.xml b/dev-python/epydoc/metadata.xml
index de483c53568f..9e0d8a4c95cc 100644
--- a/dev-python/epydoc/metadata.xml
+++ b/dev-python/epydoc/metadata.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>python</herd>
+  <herd>python</herd>
+  <longdescription>
+  Epydoc is a python documentation system without output similar to javadoc. 
+  Epydoc uses python doc-strings, importing modules, and introsepction in 
+  order to do its thing -- if your modules are not safe to import, you 
+  should look for another tool. Documentation mark-up is done with restructed
+  text (reST).
+  </longdescription>
+  <longdescription lang="ja">
+  Epydocは、Javadocに似た出力をする以外はPython言語のための
+  ドキュメンテーションシステムです。Epydocはdoc-stringsを使い、
+  モジュールをインポートし、それらが自己>分析したものを使います。
+  -- もしあなたが指定したモジュールがインポートするには安
+  全でないのだとしたら、他のツールを使うべきです。ドキュメンテーション
+  の書式は再構造的文章(reST)です。
+  </longdescription>
 </pkgmetadata>
diff --git a/dev-python/eyeD3/ChangeLog b/dev-python/eyeD3/ChangeLog
index f4bd22f5a5ae..ec90a4f5edee 100644
--- a/dev-python/eyeD3/ChangeLog
+++ b/dev-python/eyeD3/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-python/eyeD3
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/ChangeLog,v 1.1 2004/08/30 20:56:42 pkdawson Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+  17 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> eyeD3-0.6.4.ebuild:
+  Stable on sparc
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> eyeD3-0.6.4.ebuild:
+  Bump x86 stable to fix python dependency, bug 109207.
+
+*eyeD3-0.6.8 (12 Oct 2005)
+
+  12 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> +eyeD3-0.6.8.ebuild:
+  Version bump, closes bug 102280.
+
+*eyeD3-0.6.4 (07 Feb 2005)
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> eyeD3-0.6.2.ebuild,
+  +eyeD3-0.6.4.ebuild:
+  Version bump to have a version which works with python-2.4.
+
+  05 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org> eyeD3-0.6.2.ebuild:
+  Stable amd64, sparc, x86.
+
+  18 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> eyeD3-0.6.2.ebuild:
+  Added to ~sparc and ~amd64.
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> eyeD3-0.6.2.ebuild:
+  Added to ~ppc.
 
 *eyeD3-0.6.2 (30 Aug 2004)
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index af018299597a..6b20ab1067ff 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,4 +1,18 @@
-MD5 1681d3afd9a61b93144650780780fccf eyeD3-0.6.2.ebuild 494
-MD5 69d95ebd1923fb6b83c3b44c98f6232b ChangeLog 312
-MD5 72449c562b30ea2bb3f5570423673e8b metadata.xml 178
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a2ff8062e1298028b3f8de52c95775bc ChangeLog 1251
+MD5 934e43226b4872ededfc619b15a2e9b7 eyeD3-0.6.2.ebuild 615
+MD5 a825ecb12d1d24824af788fc30c77799 eyeD3-0.6.4.ebuild 614
+MD5 934a427090b2f8fda2f7aa4cbbb9d62e eyeD3-0.6.8.ebuild 614
 MD5 bce4e691a14a0c3f938260b863788103 files/digest-eyeD3-0.6.2 63
+MD5 fa45e4c8da5a8db7b0b85bf40c4783e9 files/digest-eyeD3-0.6.4 62
+MD5 4b98b613c0ef6bd3ed849a1643615c13 files/digest-eyeD3-0.6.8 63
+MD5 72449c562b30ea2bb3f5570423673e8b metadata.xml 178
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDU7hPKRy60XGEcJIRAqvwAJwPglBHmFBIgLRMsOhPnnhsfE5tbQCaA8Y2
+yMp3yHTdvw9Y0mprWmAAVnU=
+=ziU0
+-----END PGP SIGNATURE-----
diff --git a/dev-python/eyeD3/eyeD3-0.6.2.ebuild b/dev-python/eyeD3/eyeD3-0.6.2.ebuild
index 799d4a89ee6f..693edbe2f84d 100644
--- a/dev-python/eyeD3/eyeD3-0.6.2.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.6.2.ebuild
@@ -1,18 +1,20 @@
-# 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/dev-python/eyeD3/eyeD3-0.6.2.ebuild,v 1.1 2004/08/30 20:56:42 pkdawson Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+IUSE=""
 
 inherit distutils
 
 DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
 HOMEPAGE="http://eyed3.nicfit.net/"
 SRC_URI="http://eyed3.nicfit.net/releases/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=virtual/python-2.3"
+KEYWORDS="amd64 ~ppc sparc x86"
+
+DEPEND="=virtual/python-2.3*"
 
 src_compile() {
 	econf || die
@@ -20,5 +22,5 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 }
diff --git a/dev-python/eyeD3/eyeD3-0.6.4.ebuild b/dev-python/eyeD3/eyeD3-0.6.4.ebuild
index f0034c1e8d95..0517ed25524e 100644
--- a/dev-python/eyeD3/eyeD3-0.6.4.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.6.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/dev-python/eyeD3/eyeD3-0.6.4.ebuild,v 1.1 2005/02/08 05:50:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.6.4.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://eyed3.nicfit.net/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 
 DEPEND=">=virtual/python-2.3"
 
diff --git a/dev-python/eyeD3/eyeD3-0.6.8.ebuild b/dev-python/eyeD3/eyeD3-0.6.8.ebuild
index 18895b11aedf..eee649567c2f 100644
--- a/dev-python/eyeD3/eyeD3-0.6.8.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.6.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/dev-python/eyeD3/eyeD3-0.6.8.ebuild,v 1.1 2005/10/12 00:20:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.6.8.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 IUSE=""
 
diff --git a/dev-python/f2py/ChangeLog b/dev-python/f2py/ChangeLog
index 8bbf42d9f611..9104b7919267 100644
--- a/dev-python/f2py/ChangeLog
+++ b/dev-python/f2py/ChangeLog
@@ -1,8 +1,30 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/f2py/ChangeLog,v 1.1 2003/04/05 03:26:37 g2boojum Exp $
+# ChangeLog for dev-python/f2py
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/f2py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
-*f2py--2.32.225.1419 (4 Apr 2003)
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Jul 2004; Rob Cakebread <pythonhead@gentoo.org>
+  f2py-2.39.235.1693.ebuild:
+  Marked stable on x86
+
+  02 May 2004; David Holm <dholm@gentoo.org> f2py-2.39.235.1693.ebuild:
+  Added to ~ppc.
+
+*f2py-2.39.235.1693 (02 May 2004)
+
+  02 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +f2py-2.39.235.1693.ebuild:
+  Version bump, bug #48757.
+
+  17 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Version bump.
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> f2py-2.32.225.1419.ebuild:
+  moved dev-python/Numeric to dev-python/numeric
+
+*f2py-2.32.225.1419 (4 Apr 2003)
 
   04 Apr 2003; Grant Goodyear <g2boojum@gentoo.org> :
   Initial import.  
diff --git a/dev-python/f2py/Manifest b/dev-python/f2py/Manifest
index e69de29bb2d1..ae8d74d672d3 100644
--- a/dev-python/f2py/Manifest
+++ b/dev-python/f2py/Manifest
@@ -0,0 +1,6 @@
+MD5 549588ee6080633323a17515fc5e9711 f2py-2.39.235.1693.ebuild 758
+MD5 78bfe620012c4f32b2fbc8fff00b1b00 f2py-2.32.225.1419.ebuild 754
+MD5 e845a12953e8dcee577742eb8ae1ffa5 ChangeLog 960
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 2df968f4af02631d17ae3ae880cfffa8 files/digest-f2py-2.32.225.1419 70
+MD5 e2619e023fdb903616336638ad62ee1c files/digest-f2py-2.39.235.1693 70
diff --git a/dev-python/f2py/f2py-2.32.225.1419.ebuild b/dev-python/f2py/f2py-2.32.225.1419.ebuild
index 2bc384db443f..2c737b8ec075 100644
--- a/dev-python/f2py/f2py-2.32.225.1419.ebuild
+++ b/dev-python/f2py/f2py-2.32.225.1419.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-python/f2py/f2py-2.32.225.1419.ebuild,v 1.1 2003/04/05 03:26:37 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/f2py/f2py-2.32.225.1419.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+inherit distutils
 
 PN0="F2PY"
 PV0="2.32.225-1419"
@@ -10,14 +12,14 @@ SRC_URI="http://cens.ioc.ee/projects/f2py2e/2.x/${PN0}-${PV0}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
-DEPEND="dev-lang/python"
-S=${WORKDIR}/${PN0}-${PV0}
+DEPEND="dev-lang/python
+		dev-python/numeric"
 
-inherit distutils
+S=${WORKDIR}/${PN0}-${PV0}
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/f2py/f2py-2.39.235.1693.ebuild b/dev-python/f2py/f2py-2.39.235.1693.ebuild
index 05df14d2d7b5..485bb46b5a51 100644
--- a/dev-python/f2py/f2py-2.39.235.1693.ebuild
+++ b/dev-python/f2py/f2py-2.39.235.1693.ebuild
@@ -1,25 +1,22 @@
-# 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/dev-python/f2py/f2py-2.39.235.1693.ebuild,v 1.1 2004/05/02 00:30:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/f2py/f2py-2.39.235.1693.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
 PN0="F2PY"
 PV0="2.39.235_1693"
+
+S=${WORKDIR}/${PN0}-${PV0}
 DESCRIPTION="Fortran to Python interface generator"
 HOMEPAGE="http://cens.ioc.ee/projects/f2py2e/"
 SRC_URI="http://cens.ioc.ee/projects/f2py2e/2.x/${PN0}-${PV0}.tar.gz"
-
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="x86 ~ppc"
 IUSE=""
-
 DEPEND="dev-lang/python
-		dev-python/numeric"
-
-S=${WORKDIR}/${PN0}-${PV0}
+	dev-python/numeric"
 
 src_install() {
 	distutils_src_install
@@ -28,3 +25,4 @@ src_install() {
 	insinto /usr/share/doc/${P}/usersguide
 	doins ${S}/docs/usersguide/*
 }
+
diff --git a/dev-python/f2py/files/digest-f2py-2.32.225.1419 b/dev-python/f2py/files/digest-f2py-2.32.225.1419
index 2e1f4d801945..9129fc1dab06 100644
--- a/dev-python/f2py/files/digest-f2py-2.32.225.1419
+++ b/dev-python/f2py/files/digest-f2py-2.32.225.1419
@@ -1,2 +1 @@
-MD5 0cdaf820ef6577a8a1e7453bac632bac /f2py-2.32.225.1419.ebuild 636
 MD5 4c46443d36cb199a9c2ffe29e3b17d77 F2PY-2.32.225-1419.tar.gz 148478
diff --git a/dev-python/feedparser/ChangeLog b/dev-python/feedparser/ChangeLog
index 872d2e2d4cb3..2e98bae8f158 100644
--- a/dev-python/feedparser/ChangeLog
+++ b/dev-python/feedparser/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/feedparser
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/ChangeLog,v 1.1 2005/11/03 20:04:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 *feedparser-3.3 (03 Nov 2005)
 
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 6df5c75ac51b..5049fd9c30da 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,3 +1,14 @@
-MD5 53b7c6ab60dd9105e1b9cf4d820e3440 feedparser-3.3.ebuild 459
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 498d3571c41d50bff7af0b5db6c58fd1 ChangeLog 396
+MD5 9b18aef59e3434127d643002b1b40d6b feedparser-3.3.ebuild 529
 MD5 b0222ca706868c50f88eb300754aef0a files/digest-feedparser-3.3 63
 MD5 539454f93a140308dd2f8c03c20bf6ed metadata.xml 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDam759ZFPrqoILX8RAvW5AJ9g7Q9bb/RxsYqrucVbKwsShy2AJgCfWQyK
+3f1B9mQl1EMLQUkVF85XaVk=
+=KJrQ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/feedparser/feedparser-3.3.ebuild b/dev-python/feedparser/feedparser-3.3.ebuild
index a7481c8309b4..5e004bfc93e2 100644
--- a/dev-python/feedparser/feedparser-3.3.ebuild
+++ b/dev-python/feedparser/feedparser-3.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/dev-python/feedparser/feedparser-3.3.ebuild,v 1.1 2005/11/03 20:04:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/feedparser/feedparser-3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/fonttools/ChangeLog b/dev-python/fonttools/ChangeLog
index a68c4872ede8..4e28f4c26b46 100644
--- a/dev-python/fonttools/ChangeLog
+++ b/dev-python/fonttools/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-python/fonttools
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.1 2004/07/10 08:55:14 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> fonttools-2.0_beta1.ebuild:
+  added ~amd64
+
+  22 Mar 2005; Fernando Serboncini <fserb@gentoo.org>
+  fonttools-2.0_beta1.ebuild:
+  Added new doc files. Closes #85941.
+
+  16 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> fonttools-2.0_beta1.ebuild:
+  Corrected description; bug #73829. Marked as stable.
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> fonttools-2.0_beta1.ebuild:
+  Added to ~ppc.
 
 *fonttools-2.0_beta1 (10 Jul 2004)
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 5b4a6848ab00..d686af026a2b 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,4 @@
-MD5 17af600cd8b5c12b29a4f8f7c04107e2 fonttools-2.0_beta1.ebuild 506
+MD5 76c9e410ed0161e047924177a045940f ChangeLog 915
+MD5 61e0d3d8972b20659101b11b9314d202 fonttools-2.0_beta1.ebuild 717
+MD5 ce4646c9d4a69033796359bcaf7373a5 metadata.xml 178
 MD5 dd2826a5d1de9b5937fd50d2a0c8ba0e files/digest-fonttools-2.0_beta1 64
diff --git a/dev-python/fonttools/fonttools-2.0_beta1.ebuild b/dev-python/fonttools/fonttools-2.0_beta1.ebuild
index 22f642bc126c..305c361f96db 100644
--- a/dev-python/fonttools/fonttools-2.0_beta1.ebuild
+++ b/dev-python/fonttools/fonttools-2.0_beta1.ebuild
@@ -1,17 +1,17 @@
-# 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/dev-python/fonttools/fonttools-2.0_beta1.ebuild,v 1.1 2004/07/10 08:55:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/fonttools-2.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/_beta/b}
-DESCRIPTION="Multi-producer-multi-consumer signal dispatching mechanism for Python"
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts."
 HOMEPAGE="http://fonttools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 DEPEND="virtual/python
@@ -21,3 +21,10 @@ DEPEND="virtual/python
 S="${WORKDIR}/${PN}"
 
 DOCS="README.txt Doc/*.txt"
+
+src_install() {
+	distutils_src_install
+
+	insinto /usr/share/doc/${PF}/${DOCDESTTREE}
+	doins Doc/*.html
+}
\ No newline at end of file
diff --git a/dev-python/formencode/ChangeLog b/dev-python/formencode/ChangeLog
index 1adba8f8c636..d5cfb4bd8c73 100644
--- a/dev-python/formencode/ChangeLog
+++ b/dev-python/formencode/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/formencode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/ChangeLog,v 1.1 2005/10/17 20:30:57 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/ChangeLog,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
+
+*formencode-0.3 (13 Nov 2005)
+
+  13 Nov 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/formencode-0.3-setup-gentoo.patch, +formencode-0.3.ebuild:
+  Version bump.
+
+  24 Oct 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  formencode-0.2.2.ebuild:
+  Added to ~ppc, bug #109624
 
 *formencode-0.2.2 (17 Oct 2005)
 
diff --git a/dev-python/formencode/Manifest b/dev-python/formencode/Manifest
index 733687a74dee..7926a014ef7c 100644
--- a/dev-python/formencode/Manifest
+++ b/dev-python/formencode/Manifest
@@ -1,5 +1,18 @@
-MD5 3057d95d4d99261780978144153211fa formencode-0.2.2.ebuild 768
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2faecb81aa076864f85181b2309bbaaa formencode-0.2.2.ebuild 884
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 2c25f816674023347919495e92bc6483 ChangeLog 316
+MD5 dfce0fe5d5a0dde218ea39027f7c2893 ChangeLog 695
+MD5 5b03fa936737cd27f2e1e985d257fa71 formencode-0.3.ebuild 985
 MD5 b2bc4df3b59ec5949c4f9563ef49e289 files/formencode-0.2.2-setup-gentoo.patch 405
 MD5 682d58dd2af7c91480246df7bdcb1fda files/digest-formencode-0.2.2 67
+MD5 b2bc4df3b59ec5949c4f9563ef49e289 files/formencode-0.3-setup-gentoo.patch 405
+MD5 fed5a3e4d9c51dc110d278f52c774083 files/digest-formencode-0.3 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDdrBYTry2jroju7wRArNkAJ95AlpR+Zmm9jau33/gzVO+1pLK7ACeJz9M
+cIYeZIQnnCfJSjZkZz9ixmQ=
+=Qj1z
+-----END PGP SIGNATURE-----
diff --git a/dev-python/formencode/formencode-0.2.2.ebuild b/dev-python/formencode/formencode-0.2.2.ebuild
index 4ba03ec7f8e9..c5a87d92975c 100644
--- a/dev-python/formencode/formencode-0.2.2.ebuild
+++ b/dev-python/formencode/formencode-0.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/dev-python/formencode/formencode-0.2.2.ebuild,v 1.1 2005/10/17 20:30:57 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://formencode.org/"
 SRC_URI="http://cheeseshop.python.org/packages/source/F/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.3"
diff --git a/dev-python/formencode/formencode-0.3.ebuild b/dev-python/formencode/formencode-0.3.ebuild
index 18e0e8a6d980..0dbcf7c210b9 100644
--- a/dev-python/formencode/formencode-0.3.ebuild
+++ b/dev-python/formencode/formencode-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/dev-python/formencode/formencode-0.3.ebuild,v 1.1 2005/11/13 02:24:21 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formencode/formencode-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://formencode.org/"
 SRC_URI="http://cheeseshop.python.org/packages/source/F/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-lang/python-2.3"
diff --git a/dev-python/formkit/ChangeLog b/dev-python/formkit/ChangeLog
index cf5f4026d10b..7c9e86a5f934 100644
--- a/dev-python/formkit/ChangeLog
+++ b/dev-python/formkit/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/formkit
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/formkit/ChangeLog,v 1.1 2004/10/23 12:16:02 satya Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formkit/ChangeLog,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
 
 *formkit-0.6.1 (23 Oct 2004)
 
diff --git a/dev-python/formkit/Manifest b/dev-python/formkit/Manifest
index e7a97b5997cc..2ffe8df11629 100644
--- a/dev-python/formkit/Manifest
+++ b/dev-python/formkit/Manifest
@@ -1,4 +1,15 @@
-MD5 fe9f8d9cec18b0b75f70eb357b850aa6 formkit-0.6.1.ebuild 883
-MD5 e9bf2ba32d3446e17c5ca45cb3a3be8e metadata.xml 416
-MD5 e58bf5d7826fea7b9db7681854b3cade files/digest-formkit-0.6.1 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e02d064ed882d291e40cf0eede672a88 ChangeLog 509
 MD5 29586adf271b0975187ee25fc89451e2 files/0.6.1/setup.py 752
+MD5 e58bf5d7826fea7b9db7681854b3cade files/digest-formkit-0.6.1 66
+MD5 ac7f456d64ffdc117db97e0521048207 formkit-0.6.1.ebuild 908
+MD5 f9205ca1fd0a35c1d015e66dfdd25286 metadata.xml 651
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwA4FdQwWVoAgN4RAi82AJ9F534aFfjtPWVz7O4smIYkqvNmdgCg12/e
+sNkUxH0WAvipfjcap4qa2LE=
+=ovpL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/formkit/formkit-0.6.1.ebuild b/dev-python/formkit/formkit-0.6.1.ebuild
index 584e769d30c1..220194653737 100644
--- a/dev-python/formkit/formkit-0.6.1.ebuild
+++ b/dev-python/formkit/formkit-0.6.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/dev-python/formkit/formkit-0.6.1.ebuild,v 1.1 2004/10/23 12:16:02 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/formkit/formkit-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit python distutils
 
@@ -11,11 +11,13 @@ HOMEPAGE="http://dalchemy.com/opensource/formkit/"
 
 DEPEND="dev-lang/python"
 
+RDEPEND="${DEPEND}
+	www-servers/webware" #TODO
+
 IUSE=""
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
-#DOCS="Docs/* Examples/*"
+KEYWORDS="-*" #"~x86"
 
 src_compile() {
 	cp ${FILESDIR}/${PV}/setup.py . || die
diff --git a/dev-python/formkit/metadata.xml b/dev-python/formkit/metadata.xml
index c2ffa852e759..6255d0e74e50 100644
--- a/dev-python/formkit/metadata.xml
+++ b/dev-python/formkit/metadata.xml
@@ -9,4 +9,7 @@
 <longdescription>
 FormKit is a python library to handle server-side www forms. Written for Webware WebKit, it can be used stand-alone as well.
 </longdescription>
+<longdescription lang="ja">
+FormKitはサーバーサイドのWWWフォームを扱うためのPython言語ライブラリです。Webware Webkit で記述され、スタンドアローンとしても使えます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/fpconst/ChangeLog b/dev-python/fpconst/ChangeLog
index 5331e8c699d6..47a6b5eafbc2 100644
--- a/dev-python/fpconst/ChangeLog
+++ b/dev-python/fpconst/ChangeLog
@@ -1,10 +1,51 @@
 # ChangeLog for dev-python/fpconst
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/ChangeLog,v 1.1 2004/01/03 02:58:52 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/ChangeLog,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
+
+  29 Aug 2005; Lina Pezzella <j4rg0n@gentoo.org> fpconst-0.7.1.ebuild:
+  Stable ppc-macos
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> fpconst-0.7.1.ebuild:
+  Stable on ppc.
+
+*fpconst-0.7.2 (04 Jun 2005)
+
+  04 Jun 2005; Fernando Serboncini <fserb@gentoo.org> fpconst-0.7.1.ebuild,
+  +fpconst-0.7.2.ebuild:
+  Version bump. 0.7.1 stable on x86.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> fpconst-0.6.0.ebuild:
+  stable on amd64
+
+  24 Mar 2005; Lina Pezzella <j4rg0n@gentoo.org> fpconst-0.6.0.ebuild:
+  Stable ppc-macos
+
+*fpconst-0.7.1 (12 Feb 2005)
+
+  12 Feb 2005; Fernando Serboncini <fserb@gentoo.org> +fpconst-0.7.1.ebuild:
+  Version bump
+
+  09 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> fpconst-0.6.0.ebuild:
+  Unstable ppc-macos
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Dec 2004; Jason Wever <weeve@gentoo.org> fpconst-0.6.0.ebuild:
+  Added ~sparc keyword.
+
+  10 Oct 2004; Simon Stelling <blubb@gentoo.org> fpconst-0.6.0.ebuild:
+  added ~amd64
+
+  11 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> fpconst-0.6.0.ebuild:
+  Stable on x86.
+
+  10 Apr 2004; David Holm <dholm@gentoo.org> fpconst-0.6.0.ebuild:
+  Added to ~ppc.
 
 *fpconst-0.6.0 (03 Jan 2004)
 
-  03 Jan 2004; Bryan �stergaard,,, <kloeri@gentoo.org> fpconst-0.6.0.ebuild,
+  03 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> fpconst-0.6.0.ebuild,
   metadata.xml:
   Initial import
 
diff --git a/dev-python/fpconst/Manifest b/dev-python/fpconst/Manifest
index 98a380a80da6..cb617e165fcb 100644
--- a/dev-python/fpconst/Manifest
+++ b/dev-python/fpconst/Manifest
@@ -1,3 +1,8 @@
-MD5 ae0574c918b6847b1a83952ad5bab683 fpconst-0.6.0.ebuild 459
+MD5 23addf9a80bce81e818671e116b93caf ChangeLog 1566
+MD5 fc15a9196ef23e13929033fe45381a3c fpconst-0.6.0.ebuild 578
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 d8e4a4117f3423fc84375a0b3eef76a8 fpconst-0.7.1.ebuild 537
+MD5 33dfd1ea5ca2bba8046756a964bb028f fpconst-0.7.2.ebuild 537
 MD5 19fff1d23ee1fda3565c219e1ab833aa files/digest-fpconst-0.6.0 63
+MD5 a746f15f3843f6831c95b9ad6675a3ef files/digest-fpconst-0.7.1 63
+MD5 f1f9bcfa594fd2d28b3c54eee9aada52 files/digest-fpconst-0.7.2 63
diff --git a/dev-python/fpconst/fpconst-0.6.0.ebuild b/dev-python/fpconst/fpconst-0.6.0.ebuild
index 9037c6c78a20..138237676fa7 100644
--- a/dev-python/fpconst/fpconst-0.6.0.ebuild
+++ b/dev-python/fpconst/fpconst-0.6.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/dev-python/fpconst/fpconst-0.6.0.ebuild,v 1.1 2004/01/03 02:58:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
 HOMEPAGE="http://www.analytics.washington.edu/Zope/projects/fpconst/"
 SRC_URI="http://www.analytics.washington.edu/Zope/projects/fpconst/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64 ~sparc ppc-macos"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/dev-python/fpconst/fpconst-0.7.1.ebuild b/dev-python/fpconst/fpconst-0.7.1.ebuild
index fe5659383bf6..b34436a784b2 100644
--- a/dev-python/fpconst/fpconst-0.7.1.ebuild
+++ b/dev-python/fpconst/fpconst-0.7.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/dev-python/fpconst/fpconst-0.7.1.ebuild,v 1.1 2005/02/12 19:30:58 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="Python Module for handling IEEE 754 floating point special values"
 HOMEPAGE="http://research.warnes.net/projects/rzope/fpconst/"
 SRC_URI="http://research.warnes.net/~warnes/fpconst/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc-macos"
+KEYWORDS="~amd64 ppc ppc-macos ~sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/dev-python/fpconst/fpconst-0.7.2.ebuild b/dev-python/fpconst/fpconst-0.7.2.ebuild
index de9a5b0e3a12..69ced1a8909b 100644
--- a/dev-python/fpconst/fpconst-0.7.2.ebuild
+++ b/dev-python/fpconst/fpconst-0.7.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/dev-python/fpconst/fpconst-0.7.2.ebuild,v 1.1 2005/06/04 15:37:12 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fpconst/fpconst-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/fxpy/ChangeLog b/dev-python/fxpy/ChangeLog
index 4537eaf22899..80e502846177 100644
--- a/dev-python/fxpy/ChangeLog
+++ b/dev-python/fxpy/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for dev-python/fxpy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fxpy/ChangeLog,v 1.1 2003/10/06 00:18:40 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fxpy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> fxpy-1.0.5-r1.ebuild:
+  Added to ~ppc.
+
+*fxpy-1.0.5-r1 (07 May 2005)
+
+  07 May 2005; <rphillips@gentoo.org> +files/fxpy-1.0.5-r1-gentoo.diff,
+  +fxpy-1.0.5-r1.ebuild:
+  Added Yaakov Selkowitz's eclass based fox ebuilds for testing.
+  Fixes #88924
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> fxpy-1.0.5.ebuild:
+  dev-python/PyOpenGL is now dev-python/pyopengl - adjust dependencies
+  accordingly.
+
+  08 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> fxpy-1.0.5.ebuild:
+  Marked stable on x86
+
+  08 May 2004; Bryan Østergaard <kloeri@gentoo.org> fxpy-1.0.5.ebuild:
+  Use epatch.
 
 *fxpy-1.0.5 (05 Oct 2003)
 
diff --git a/dev-python/fxpy/Manifest b/dev-python/fxpy/Manifest
index f56214a293e6..e0ce39ae9b80 100644
--- a/dev-python/fxpy/Manifest
+++ b/dev-python/fxpy/Manifest
@@ -1,2 +1,8 @@
-MD5 55c745557ff35d96a60d6e4609248d0c fxpy-1.0.5.ebuild 834
+MD5 74316d2524ab896596eba8e5a1c2bf31 ChangeLog 1163
+MD5 d3d8329d4ff98cdf4886a64f3d1be613 fxpy-1.0.5.ebuild 926
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 3b22cc88fbdc34f5eb580b6bf72ceec3 fxpy-1.0.5-r1.ebuild 958
 MD5 4e32222847e02df6766794e0d55bc9d2 files/digest-fxpy-1.0.5 62
+MD5 ffa45c09d881621b0d98695f15f3d155 files/fxpy-1.0.5-gentoo.diff 462
+MD5 4e32222847e02df6766794e0d55bc9d2 files/digest-fxpy-1.0.5-r1 62
+MD5 6a9d948be752573ca136804e33ccbf59 files/fxpy-1.0.5-r1-gentoo.diff 862
diff --git a/dev-python/fxpy/fxpy-1.0.5-r1.ebuild b/dev-python/fxpy/fxpy-1.0.5-r1.ebuild
index 39546c2f9ebb..04ed95b97f22 100644
--- a/dev-python/fxpy/fxpy-1.0.5-r1.ebuild
+++ b/dev-python/fxpy/fxpy-1.0.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/dev-python/fxpy/fxpy-1.0.5-r1.ebuild,v 1.1 2005/05/07 19:59:51 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fxpy/fxpy-1.0.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fxpy/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE="doc opengl"
 
 DEPEND="virtual/python
diff --git a/dev-python/fxpy/fxpy-1.0.5.ebuild b/dev-python/fxpy/fxpy-1.0.5.ebuild
index 268ab4b298f5..26ffe5981f06 100644
--- a/dev-python/fxpy/fxpy-1.0.5.ebuild
+++ b/dev-python/fxpy/fxpy-1.0.5.ebuild
@@ -1,26 +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/dev-python/fxpy/fxpy-1.0.5.ebuild,v 1.1 2003/10/06 00:18:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fxpy/fxpy-1.0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="FXPy-${PV}"
+
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Fox Toolkit GUI bindings for Python."
 HOMEPAGE="http://fxpy.sourceforge.net"
 SRC_URI="mirror://sourceforge/fxpy/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="opengl"
 DEPEND=">=dev-lang/python-2.1
 	>=x11-libs/fox-1.0.17
-	opengl? ( >=dev-python/PyOpenGL-2.0.0.44 )"
+	opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff || die "Patch failed."
+	epatch ${FILESDIR}/${P}-gentoo.diff || die "Patch failed."
 }
 
 src_install() {
diff --git a/dev-python/gadfly/ChangeLog b/dev-python/gadfly/ChangeLog
index fa956fa2e50a..473380e9cf77 100644
--- a/dev-python/gadfly/ChangeLog
+++ b/dev-python/gadfly/ChangeLog
@@ -1,8 +1,26 @@
 # ChangeLog for dev-python/gadfly
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gadfly/ChangeLog,v 1.1 2002/12/17 21:18:25 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gadfly/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> gadfly-1.0.0.ebuild:
+  stable on amd64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gadfly-1.0.0.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> gadfly-1.0.0.ebuild:
+  Added to ~ppc.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> gadfly-1.0.0.ebuild:
+  Add missing IUSE.
 
 *gadfly-1.0.0 (17 Dec 2002)
 
+  25 Mar 2003; Alastair Tse <liquidx@gentoo.org> gadfly-1.0.0.ebuild:
+  bump to stable
+
   17 Dec 2002; B.Lauwers <blauwers@gentoo.org> :
   Initial submit per #8359, thanks Ollie Rutherfurd!
diff --git a/dev-python/gadfly/Manifest b/dev-python/gadfly/Manifest
index e69de29bb2d1..afdeee62989b 100644
--- a/dev-python/gadfly/Manifest
+++ b/dev-python/gadfly/Manifest
@@ -0,0 +1,4 @@
+MD5 7d2bec1a21f87f47e112cbbee914a5b5 ChangeLog 891
+MD5 06801cda77c254b90e15a9f3a145309e gadfly-1.0.0.ebuild 753
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 8e1128c918bb21f44497bb31c44949e6 files/digest-gadfly-1.0.0 64
diff --git a/dev-python/gadfly/gadfly-1.0.0.ebuild b/dev-python/gadfly/gadfly-1.0.0.ebuild
index 1a527e74cba2..57d1fd023b2c 100644
--- a/dev-python/gadfly/gadfly-1.0.0.ebuild
+++ b/dev-python/gadfly/gadfly-1.0.0.ebuild
@@ -1,29 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gadfly/gadfly-1.0.0.ebuild,v 1.1 2002/12/17 21:18:25 blauwers Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gadfly/gadfly-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Gadfly is a relational database system implemented in Python."
-SRC_URI="mirror://sourceforge/gadfly/${P}.tar.gz"
+DESCRIPTION="relational database system implemented in Python"
 HOMEPAGE="http://gadfly.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gadfly/${P}.tar.gz"
 
-DEPEND="virtual/python"
-
+KEYWORDS="x86 amd64 ppc"
 SLOT="0"
-KEYWORDS="~x86"
 LICENSE="BSD"
+IUSE=""
+
+DEPEND="virtual/python"
 
 src_compile() {
 	python setup.py build || die "gadfly compilation failed"
 	cd kjbuckets
 	python setup.py build || die "kjbuckets compilation failed"
-	cd ..
 }
 
 src_install() {
+	dodoc *.txt doc/*.txt
 	python setup.py install --root=${D} || die
 	cd kjbuckets
 	python setup.py install --root=${D} || die
-	cd ..
-	dodoc *.txt doc/*.txt
 }
diff --git a/dev-python/generator/ChangeLog b/dev-python/generator/ChangeLog
index 24dd91612539..507058a2cb32 100644
--- a/dev-python/generator/ChangeLog
+++ b/dev-python/generator/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for dev-python/generator
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/generator/ChangeLog,v 1.1 2003/10/11 06:11:00 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/generator/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> generator-1.2.3.ebuild:
+  Added to ~ppc.
+
+  22 Mar 2004; <kloeri@gentoo.org> generator-1.0.1.ebuild,
+  generator-1.2.3.ebuild:
+  QA, bug #45343.
+
+*generator-1.2.3 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> generator-1.0.1.ebuild,
+  generator-1.2.3.ebuild:
+  added homepage
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> generator-1.0.ebuild:
+  version bump
+
+*generator-1.0.1 (11 Oct 2003)
+
+  11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> generator-1.0.1.ebuild,
+  generator-1.0.ebuild:
+  version bump, source is now inside archetypes
 
 *generator-1.0 (10 Oct 2003)
 
diff --git a/dev-python/generator/Manifest b/dev-python/generator/Manifest
index 02eafeb58b01..1285c4ff0b0c 100644
--- a/dev-python/generator/Manifest
+++ b/dev-python/generator/Manifest
@@ -1,2 +1,6 @@
-MD5 904ede8176852bc5a8641ade12548b0c generator-1.0.ebuild 1071
-MD5 cf29d7e2d0bec4ed2c2fd54fcdd94af5 files/digest-generator-1.0 63
+MD5 923f44306e4d873adaac7e5f1fb46276 generator-1.2.3.ebuild 1285
+MD5 15174cbc77d4ea8a4e6272a6c634e42a ChangeLog 1015
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 cabdccd56d9e768fff90f3a2456e96cf generator-1.0.1.ebuild 1274
+MD5 223af5173c7341daf23e517d356b0a0e files/digest-generator-1.0.1 65
+MD5 bac38b349854782125c283ee177883cf files/digest-generator-1.2.3 71
diff --git a/dev-python/generator/generator-1.0.1.ebuild b/dev-python/generator/generator-1.0.1.ebuild
index d4e0a10db2fe..e4d2614fcd87 100644
--- a/dev-python/generator/generator-1.0.1.ebuild
+++ b/dev-python/generator/generator-1.0.1.ebuild
@@ -1,9 +1,10 @@
-# 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/dev-python/generator/generator-1.0.1.ebuild,v 1.1 2003/10/11 08:54:13 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/generator/generator-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 SLOT="0"
 IUSE=""
 DESCRIPTION="Widget generator for Archetypes"
+HOMEPAGE="http://www.sourceforge.net/projects/archetypes"
 SRC_PN=archetypes
 SRC_PV=1.0.1
 SRC_P=${SRC_PN}-${SRC_PV}
@@ -12,11 +13,10 @@ S=${WORKDIR}/${SRC_P}/${PN}
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-	RDEPEND="virtual/python"
+	DEPEND="virtual/python"
 else
-	RDEPEND="dev-lang/python"
+	DEPEND="dev-lang/python"
 fi
-DEPEND="${RDEPEND}"
 
 src_install() {
 	local python=""
diff --git a/dev-python/generator/generator-1.2.3.ebuild b/dev-python/generator/generator-1.2.3.ebuild
index b236468a9256..155bc58c97b5 100644
--- a/dev-python/generator/generator-1.2.3.ebuild
+++ b/dev-python/generator/generator-1.2.3.ebuild
@@ -1,22 +1,22 @@
-# 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/dev-python/generator/generator-1.2.3.ebuild,v 1.1 2004/01/19 13:14:18 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/generator/generator-1.2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 SLOT="0"
 IUSE=""
 DESCRIPTION="Widget generator for Archetypes"
+HOMEPAGE="http://www.sourceforge.net/projects/archetypes"
 SRC_PN=archetypes
 SRC_PV=1.2.3_final
 SRC_P=${SRC_PN}-${SRC_PV}
 SRC_URI="mirror://sourceforge/${SRC_PN}/${SRC_P}.tgz"
 S=${WORKDIR}/${SRC_P}/${PN}
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-	RDEPEND="virtual/python"
+	DEPEND="virtual/python"
 else
-	RDEPEND="dev-lang/python"
+	DEPEND="dev-lang/python"
 fi
-DEPEND="${RDEPEND}"
 
 src_install() {
 	local python=""
diff --git a/dev-python/geoip-python/ChangeLog b/dev-python/geoip-python/ChangeLog
index 5a2ac42bb74b..f90a1664dd08 100644
--- a/dev-python/geoip-python/ChangeLog
+++ b/dev-python/geoip-python/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for dev-python/geoip-python
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/ChangeLog,v 1.1 2003/08/30 08:08:57 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> geoip-python-1.2.0.ebuild:
+  Stable on SPARC.
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  geoip-python-1.2.0.ebuild:
+  ppc stable
+
+*geoip-python-1.2.1 (03 Jul 2005)
+
+  03 Jul 2005; Fernando Serboncini <fserb@gentoo.org>
+  geoip-python-1.2.0.ebuild, +geoip-python-1.2.1.ebuild:
+  Version bump
+  1.2.0 stable on x86
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> geoip-python-0.2.0.ebuild:
+  stable on amd64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  geoip-python-0.2.0.ebuild:
+  Stable on ppc.
+
+*geoip-python-1.2.0 (17 Dec 2004)
+
+  17 Dec 2004; Rob Cakebread <pythonhead@gentoo.org>
+  +geoip-python-1.2.0.ebuild:
+  Version bump, added docs.
+
+  11 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> geoip-python-0.2.0.ebuild:
+  Marked ~amd64.
+
+  24 Jan 2004; David Holm <dholm@gentoo.org> geoip-python-0.2.0.ebuild:
+  Added to ~ppc
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> geoip-python-0.2.0.ebuild:
+  Added ~sparc keyword.
 
 *geoip-python-0.2.0 (30 Aug 2003)
 
diff --git a/dev-python/geoip-python/Manifest b/dev-python/geoip-python/Manifest
index 2fedd2baf336..0ecb5bb7e22b 100644
--- a/dev-python/geoip-python/Manifest
+++ b/dev-python/geoip-python/Manifest
@@ -1,2 +1,8 @@
-MD5 5f3517364578e89f8e83eb5ff6ed9c26 geoip-python-0.2.0.ebuild 464
+MD5 0229d4a5a4c246eb1dfd0af1f070bd7a ChangeLog 1381
+MD5 2d3dda2779dec56f622b404dfae33b9f geoip-python-0.2.0.ebuild 582
+MD5 fbfd1a81e8c911e7fbd3399b7ee8e89b geoip-python-1.2.0.ebuild 639
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 b254e981b83da5ba4e659ef327fb733d geoip-python-1.2.1.ebuild 642
 MD5 1adcfc9e4dc3e78fec4c758943259516 files/digest-geoip-python-0.2.0 68
+MD5 536c80bf77311027d4f99ffe250f9def files/digest-geoip-python-1.2.0 68
+MD5 de86fe458d9ec055442bcd4355f9314e files/digest-geoip-python-1.2.1 68
diff --git a/dev-python/geoip-python/geoip-python-0.2.0.ebuild b/dev-python/geoip-python/geoip-python-0.2.0.ebuild
index be5d1d7132e6..b382c11d526d 100644
--- a/dev-python/geoip-python/geoip-python-0.2.0.ebuild
+++ b/dev-python/geoip-python/geoip-python-0.2.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/dev-python/geoip-python/geoip-python-0.2.0.ebuild,v 1.1 2003/08/30 08:08:57 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.maxmind.com/download/geoip/api/python/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ppc amd64"
 IUSE=""
 
 DEPEND=">=dev-libs/geoip-1.2.1
diff --git a/dev-python/geoip-python/geoip-python-1.2.0.ebuild b/dev-python/geoip-python/geoip-python-1.2.0.ebuild
index a1ab41c6190f..7a1f593946cf 100644
--- a/dev-python/geoip-python/geoip-python-1.2.0.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.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/dev-python/geoip-python/geoip-python-1.2.0.ebuild,v 1.1 2004/12/17 20:29:59 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.maxmind.com/download/geoip/api/python/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/geoip-1.2.1
diff --git a/dev-python/geoip-python/geoip-python-1.2.1.ebuild b/dev-python/geoip-python/geoip-python-1.2.1.ebuild
index 7c90c5a24747..d34ffa5426bb 100644
--- a/dev-python/geoip-python/geoip-python-1.2.1.ebuild
+++ b/dev-python/geoip-python/geoip-python-1.2.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/dev-python/geoip-python/geoip-python-1.2.1.ebuild,v 1.1 2005/07/03 03:52:28 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/geoip-python/geoip-python-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/gmpy/ChangeLog b/dev-python/gmpy/ChangeLog
index 442dac957914..15f6c42e492e 100644
--- a/dev-python/gmpy/ChangeLog
+++ b/dev-python/gmpy/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/gmpy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gmpy/ChangeLog,v 1.1 2005/11/02 12:48:54 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gmpy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 *gmpy-1.0 (02 Nov 2005)
 
diff --git a/dev-python/gmpy/Manifest b/dev-python/gmpy/Manifest
index 8891bd42d83e..850ebee11d2a 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,3 +1,4 @@
+MD5 1b86244898b58a335e4980b799aa086f ChangeLog 371
 MD5 8f4e986aa861a30bee52e72d8295610b files/digest-gmpy-1.0 63
-MD5 c655a1afe36fca391aaee699682fb57e gmpy-1.0.ebuild 858
+MD5 c1abe38e5681df983bb121f43509f415 gmpy-1.0.ebuild 953
 MD5 edfeced968244165de95fe65a73d45a2 metadata.xml 414
diff --git a/dev-python/gmpy/gmpy-1.0.ebuild b/dev-python/gmpy/gmpy-1.0.ebuild
index 160f90dcffcf..e60ea96e2e95 100644
--- a/dev-python/gmpy/gmpy-1.0.ebuild
+++ b/dev-python/gmpy/gmpy-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/dev-python/gmpy/gmpy-1.0.ebuild,v 1.1 2005/11/02 12:48:54 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gmpy/gmpy-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/gnome-python-extras/ChangeLog b/dev-python/gnome-python-extras/ChangeLog
index 550bf2306ec6..0f5ef2da1b75 100644
--- a/dev-python/gnome-python-extras/ChangeLog
+++ b/dev-python/gnome-python-extras/ChangeLog
@@ -1,6 +1,63 @@
 # ChangeLog for dev-python/gnome-python-extras
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-extras/ChangeLog,v 1.1 2005/07/02 18:13:00 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-extras/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+*gnome-python-extras-2.12.0 (21 Sep 2005)
+
+  21 Sep 2005; <dang@gentoo.org> -gnome-python-extras-2.11.4.ebuild,
+  +gnome-python-extras-2.12.0.ebuild:
+  Revbump to 2.12.0
+
+  16 Sep 2005; <dang@gentoo.org> gnome-python-extras-2.11.4.ebuild:
+  Make gnome-python-extras depend on the correct (slotted) versions of libgtkhtml
+
+  03 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  stable on alpha
+
+*gnome-python-extras-2.11.4 (27 Aug 2005)
+
+  27 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +gnome-python-extras-2.11.4.ebuild:
+  new version, disable gda module because it relies on python 2.4 API.
+  Re-enable if its necessary for a specific package in portage, or when python
+  2.4 becomes stable
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  Stable on sparc
+
+  01 Aug 2005; Simon Stelling <blubb@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  stable on amd64
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  ppc stable
+
+  16 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  marking stable on x86. ( needed for straw )
+
+  03 Jul 2005; Herbie Hopkins <herbs@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  Marked ~amd64 wrt bug #97822.
+
+  03 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  Add ~alpha keyword.
+
+  03 Jul 2005; David Holm <dholm@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  Added to ~ppc.
+
+  02 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  remove || make from src_compile
+
+  02 Jul 2005; Jason Wever <weeve@gentoo.org>
+  gnome-python-extras-2.10.2.ebuild:
+  Added ~sparc keyword.
 
 *gnome-python-extras-2.10.2 (02 Jul 2005)
 
diff --git a/dev-python/gnome-python-extras/Manifest b/dev-python/gnome-python-extras/Manifest
index bcdd37e1043c..e98244485acd 100644
--- a/dev-python/gnome-python-extras/Manifest
+++ b/dev-python/gnome-python-extras/Manifest
@@ -1,4 +1,17 @@
-MD5 e1dd59de55baf999e43f9a263c533656 gnome-python-extras-2.10.2.ebuild 1500
-MD5 54f42a7b4feb22bce23c92b1d6f18722 ChangeLog 316
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 88712a490b0551c8feb26f3e3162e7b0 gnome-python-extras-2.10.2.ebuild 1678
+MD5 07a01ab4160f5eeafeb5f521da7ff8fa gnome-python-extras-2.12.0.ebuild 2095
+MD5 0b50ed872f53c72156f8076d286b52b8 ChangeLog 2187
 MD5 7815efa8e3c1eece4b748785c644df85 metadata.xml 243
 MD5 dee99b75f4b766a4a588ddb6b8a086c0 files/digest-gnome-python-extras-2.10.2 79
+MD5 b7b0497a04f349977d259c76f5cc887b files/digest-gnome-python-extras-2.12.0 79
+MD5 7b23c53f1b63e82632bff46795e87506 files/gnome-python-extras-nogda.patch 469
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMdPromPajV0RnrERAm/kAJ9NU/yIQZ27mU3E+yF2PAMBTWUwowCeMXuX
+rdsV56VmUU31kzkiMUzm0E4=
+=BFdV
+-----END PGP SIGNATURE-----
diff --git a/dev-python/gnome-python-extras/gnome-python-extras-2.10.2.ebuild b/dev-python/gnome-python-extras/gnome-python-extras-2.10.2.ebuild
index af9748c3457c..fa4a7d9a9af7 100644
--- a/dev-python/gnome-python-extras/gnome-python-extras-2.10.2.ebuild
+++ b/dev-python/gnome-python-extras/gnome-python-extras-2.10.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/dev-python/gnome-python-extras/gnome-python-extras-2.10.2.ebuild,v 1.1 2005/07/02 18:13:00 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-extras/gnome-python-extras-2.10.2.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit eutils gnome2 python
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pygtk.org"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="doc firefox mozilla"
 
 RDEPEND=">=dev-lang/python-2.3
@@ -17,13 +17,13 @@ RDEPEND=">=dev-lang/python-2.3
 	>=dev-libs/glib-2.6.0
 	>=dev-python/gnome-python-2.10.0
 	>=dev-python/pygtk-2.4.0
-	>=libgtkhtml-2.3.1
-	>=libgnomeprint-2.2.0
-	>=libgnomeprintui-2.2.0
+	>=gnome-extra/libgtkhtml-2.3.1
+	>=gnome-base/libgnomeprint-2.2.0
+	>=gnome-base/libgnomeprintui-2.2.0
 	>=x11-libs/gtksourceview-1.1.90
 	>=gnome-base/gnome-panel-2.2.0
 	>=x11-libs/libwnck-2.9.92
-	firefox? ( >=www-client/mozilla-firefox-1.0)
+	firefox? ( >=www-client/mozilla-firefox-1.0 )
 	mozilla? ( >=www-client/mozilla-1.2 )
 	>=gnome-base/libgtop-2.9.5
 	>=gnome-extra/nautilus-cd-burner-2.9.4
@@ -48,7 +48,7 @@ src_compile() {
 
 	gnome2_src_configure ${G2CONF}
 
-	emake || make || die "make failed!"
+	emake || die "make failed!"
 }
 
 src_install() {
diff --git a/dev-python/gnome-python-extras/gnome-python-extras-2.12.0.ebuild b/dev-python/gnome-python-extras/gnome-python-extras-2.12.0.ebuild
index dc1146f983e9..05c61c9b91f7 100644
--- a/dev-python/gnome-python-extras/gnome-python-extras-2.12.0.ebuild
+++ b/dev-python/gnome-python-extras/gnome-python-extras-2.12.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/dev-python/gnome-python-extras/gnome-python-extras-2.12.0.ebuild,v 1.1 2005/09/21 21:42:50 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python-extras/gnome-python-extras-2.12.0.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit eutils gnome2 python
 
diff --git a/dev-python/gnome-python/ChangeLog b/dev-python/gnome-python/ChangeLog
index 441da0e5d9cf..ab63a870ba7b 100644
--- a/dev-python/gnome-python/ChangeLog
+++ b/dev-python/gnome-python/ChangeLog
@@ -1,13 +1,197 @@
 # ChangeLog for dev-python/gnome-python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
-
-*gnome-python-1.4.1-r3 (1 Feb 2002)
-
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
+
+*gnome-python-2.12.0 (11 Sep 2005)
+
+  11 Sep 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -gnome-python-2.11.3.ebuild, +gnome-python-2.12.0.ebuild:
+  2.12 release vbump
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  gnome-python-2.10.0.ebuild, gnome-python-2.11.3.ebuild:
+  add ~ia64
+
+*gnome-python-2.11.3 (18 Aug 2005)
+
+  18 Aug 2005; John N. Laliberte +gnome-python-2.11.3.ebuild:
+  new version 2.11.3
+
+  01 Aug 2005; Simon Stelling <blubb@gentoo.org> gnome-python-2.10.0.ebuild:
+  stable on amd64
+
+  26 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-python-2.10.0.ebuild:
+  Stable on alpha.
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-python-2.10.0.ebuild:
+  Stable on sparc
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gnome-python-2.10.0.ebuild:
+  ppc stable
+
+  16 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  gnome-python-2.10.0.ebuild:
+  marking stable on x86. ( necessary for gnome-python-extras and straw )
+
+*gnome-python-2.10.0 (22 Jun 2005)
+
+  22 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +gnome-python-2.10.0.ebuild:
+  Version bump, new ebuild by stefanie <amerei@gmail.com> in bug 88900.
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> gnome-python-2.0.0.ebuild,
+  gnome-python-2.0.0-r1.ebuild, gnome-python-2.0.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  23 Mar 2005; Alastair Tse <liquidx@gentoo.org> gnome-python-1.4.2.ebuild,
+  gnome-python-1.4.4.ebuild, gnome-python-1.4.4-r1.ebuild,
+  gnome-python-2.0.0.ebuild, gnome-python-2.0.0-r1.ebuild,
+  gnome-python-2.0.2.ebuild, gnome-python-2.6.1.ebuild:
+  change homepage to a valid one (eg. pygtk) (#86381)
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-python-2.6.1.ebuild:
+  Fix bug 72594, patch by Fernando Serboncini <fserb@terra.com.br>
+
+*gnome-python-2.6.1 (24 Nov 2004)
+
+  24 Nov 2004; Alastair Tse <liquidx@gentoo.org> +gnome-python-2.6.1.ebuild:
+  version bump (#68206)
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-python-2.0.0-r1.ebuild:
+  Stable on alpha.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnome-python-1.4.2.ebuild,
+  gnome-python-1.4.4.ebuild:
+  Fix use invocation
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> gnome-python-1.4.2.ebuild,
+  gnome-python-1.4.4.ebuild:
+  Remove default S.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  gnome-python-1.4.4-r1.ebuild:
+  Add die following econf for bug 48950
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> gnome-python-2.0.0-r1.ebuild:
+  Mark stable on amd64.
+
+  10 Apr 2004; Alastair Tse <liquidx@gentoo.org> gnome-python-2.0.0-r1.ebuild,
+  gnome-python-2.0.2.ebuild:
+  fix for byte-code compilation (#47103)
+
+*gnome-python-2.0.2 (06 Apr 2004)
+
+  06 Apr 2004; Alastair Tse <liquidx@gentoo.org> gnome-python-2.0.2.ebuild:
+  version bump
+
+  01 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-python-2.0.0-r1.ebuild:
+  stable on sparc
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-python-1.4.4-r1.ebuild, gnome-python-2.0.0-r1.ebuild:
+  Stable on x86.
+
+  23 Mar 2004; Alastair Tse <liquidx@gentoo.org> gnome-python-1.4.2.ebuild,
+  gnome-python-1.4.4.ebuild:
+  fix RDEPEND
+
+*gnome-python-2.0.0-r1 (24 Jan 2004)
+*gnome-python-1.4.4-r1 (24 Jan 2004)
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> gnome-python-1.4.4-r1.ebuild,
+  gnome-python-2.0.0-r1.ebuild:
+  fixed pyc/pyo cleanup issue. removed pygtk installs from gnome-python-1.4 and
+  add depend for pygtk-0.6. cleanup opengl dependencies.
+
+  09 Jan 2004; <gustavoz@gentoo.org> gnome-python-2.0.0.ebuild:
+  marked stable on sparc
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> gnome-python-2.0.0.ebuild:
+  stable on alpha
+
+  12 Nov 2003; Todd Sunderlin <todd@gentoo.org> gnome-python-2.0.0.ebuild:
+  added ~sparc
+
+  28 Sep 2003; Todd Sunderlin <todd@gentoo.org> gnome-python-1.99.18.ebuild:
+  added ~sparc keywords
+
+  17 Sep 2003; Aron Griffis <agriffis@gentoo.org> gnome-python-2.0.0.ebuild:
+  Add ~alpha
+
+  12 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnome-python-1.99.16.ebuild,
+  gnome-python-1.99.18.ebuild, gnome-python-2.0.0.ebuild:
+  removing bonobo-activation dep
+
+*gnome-python-2.0.0 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnome-python-2.0.0.ebuild:
+  version bump
+
+*gnome-python-1.99.18 (29 Aug 2003)
+
+  29 Aug 2003; foser <foser@gentoo.org> gnome-python-1.99.18.ebuild :
+  New version
+
+  10 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnome-python-1.99.16.ebuild:
+  fix libgtkhtml deps
+
+*gnome-python-1.99.16 (31 Mar 2003)
+
+  31 Mar 2003; foser <foser@gentoo.org> gnome-python-1.99.16.ebuild :
+  New version
+
+*gnome-python-1.99.15 (09 Feb 2003)
+
+  18 mar 2003; <spider@gentoo.org> gnome-python-1.99.15.ebuild:
+  added a missing ?, thanks to 
+  j_r_fonseca@yahoo.co.uk for patch and notification
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> gnome-python-1.99.15.ebuild :
+  set ~ppc in keywords
+
+  09 Feb 2003; foser <foser@gentoo.org> gnome-python-1.99.15.ebuild :
+  New version
+  fixed deps and IUSE, now using pyorbit
+
+*gnome-python-1.4.4 (09 Feb 2003)
+
+  09 Feb 2003; foser <foser@gentoo.org> gnome-python-1.4.4.ebuild :
+  New version, just a bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gnome-python-1.99.13 (01 Nov 2002)
+
+  01 Nov 2002; foser <foser@gentoo.org> gnome-python-1.99.13.ebuild :
+  New gnome 2 development bindings
+
+*gnome-python-1.4.2 (1 Aug 2002)
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  1 Aug 2002; Jon Nelson <jnelson@gentoo.org> gnome-python-1.4.2.ebuild:
+  New upstream
+  Fix repoman errors that are in 1.4.1* in 1.4.2 - if 1.4.2 goes
+  off OK, 1.4.1* should be removed.  
+
+*gnome-python-1.4.1-r4 (28 Feb 2002)
+
+  26 Jul 2002; George Shapovalov <george@gentoo.org> gnome-python-1.4.1-r3.ebuild, gnome-python-1.4.1-r4.ebuild :
+
+  added KEYWORDS,SLOT,LICENSE,
+  changed HOMEPAGE to point to the site of actual author
+
+  22 Feb 2002; Bruce A. Locke <blocke@shivan.org> gnome-python-1.4.1-r4.ebuild :
+
+  Hopefully fix bug #778 (capplet header issue)
+
diff --git a/dev-python/gnome-python/Manifest b/dev-python/gnome-python/Manifest
index e69de29bb2d1..01a153a15410 100644
--- a/dev-python/gnome-python/Manifest
+++ b/dev-python/gnome-python/Manifest
@@ -0,0 +1,20 @@
+MD5 1e2e39e780cb5a4348242df3ab9bcae5 gnome-python-1.4.4-r1.ebuild 1175
+MD5 a22d248c0215c66a6fd1eac6929a07e3 gnome-python-2.0.0-r1.ebuild 1293
+MD5 38234bd1d44ef57540d10c1b333d8f57 gnome-python-2.10.0.ebuild 1371
+MD5 088818e715d16d6b0e2b3ff0fa7a6bc7 gnome-python-2.0.0.ebuild 1086
+MD5 beaa7c0d8665ad4c48612a1127a1e16f gnome-python-1.4.2.ebuild 1261
+MD5 744a2b99b65118ec82f17842c1649113 gnome-python-2.6.1.ebuild 1561
+MD5 6abefe511c4eb0f08929376ad7249b58 gnome-python-2.0.2.ebuild 1295
+MD5 54b96012b8c9d68ff22f22fecb2ee06e gnome-python-1.4.4.ebuild 1206
+MD5 058c558f16b7650d40eb91def029b841 ChangeLog 6391
+MD5 aab7d8b8a9c5777f5acad94eb998f367 metadata.xml 178
+MD5 01c5aab406027b06c94f2884880ff1f9 gnome-python-2.12.0.ebuild 1387
+MD5 7fd6852037c022d0f0f2413aabae59b4 files/digest-gnome-python-1.4.2 70
+MD5 ba9ea8c1b972e53626b9ab2d6cab4225 files/digest-gnome-python-1.4.4 71
+MD5 aa76f5d8b6e152a3b22f18773e522f80 files/digest-gnome-python-2.0.0 71
+MD5 fef37468e0970ab54e2ee7d70deee9be files/digest-gnome-python-2.0.2 71
+MD5 78fc039ea7ba0b6a6b743078337acd9a files/digest-gnome-python-2.6.1 71
+MD5 ce53c6cf0fe7655ed7c57a31f4bb34a1 files/digest-gnome-python-2.10.0 72
+MD5 3e55320aadde8f4e5fbe4a611f6d339d files/digest-gnome-python-2.12.0 72
+MD5 aa76f5d8b6e152a3b22f18773e522f80 files/digest-gnome-python-2.0.0-r1 71
+MD5 ba9ea8c1b972e53626b9ab2d6cab4225 files/digest-gnome-python-1.4.4-r1 71
diff --git a/dev-python/gnome-python/gnome-python-1.4.2.ebuild b/dev-python/gnome-python/gnome-python-1.4.2.ebuild
index 8480e06345f5..b5974c1478de 100644
--- a/dev-python/gnome-python/gnome-python-1.4.2.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.4.2.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.2.ebuild,v 1.1 2002/08/02 02:08:11 jnelson Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
+
+IUSE="gnome opengl"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="gnome-python"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/${P}.tar.gz"
-HOMEPAGE="http://www.daa.com.au/~james/gnome/"
+HOMEPAGE="http://www.pygtk.org/"
 
 DEPEND="virtual/python
 	=x11-libs/gtk+-1.2*
 	>=media-libs/imlib-1.9.10-r1
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
 		 <gnome-base/libglade-1.90.0
 		 <gnome-base/control-center-1.90.0 )
 	opengl? ( <x11-libs/gtkglarea-1.99.0 )"
-RDEPEND="${RDEPEND}"
 
-SLOT="0"
-KEYWORDS="x86"
+SLOT="1"
+KEYWORDS="x86 ppc sparc alpha"
 LICENSE="GPL-2"
 
 src_compile() {
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		CFLAGS="${CFLAGS} `gnome-config capplet --cflags`" \
 		econf ${myopts} || die
@@ -34,7 +34,7 @@ src_compile() {
 
 src_install() {
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		cd ${S}/pygnome
 		make prefix=${D}/usr datadir=${D}/usr/share install || die
diff --git a/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild b/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild
index 11b8ad8fb9bb..929e68b08445 100644
--- a/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild
@@ -1,16 +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/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild,v 1.1 2004/01/24 17:02:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit gnome.org python
 
 DESCRIPTION="GNOME1 Python Bindings"
-HOMEPAGE="http://www.daa.com.au/~james/gnome/"
+HOMEPAGE="http://www.pygtk.org/"
 
-IUSE=""
-SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ia64 ppc ~sparc x86"
+IUSE=""
 
 DEPEND="virtual/python
 	=x11-libs/gtk+-1.2*
@@ -29,15 +29,14 @@ src_unpack() {
 
 src_compile() {
 	CFLAGS="${CFLAGS} `gnome-config capplet --cflags`" \
-		econf
+		econf || die "econf failed"
 
 	cd ${S}/pygnome
 	emake || die
 }
 
 src_install() {
-	dodoc AUTHORS COPYING* ChangeLog NEWS MAPPING
-	dodoc README*
+	dodoc AUTHORS ChangeLog NEWS MAPPING README*
 	cd ${S}/pygnome
 	make prefix=${D}/usr datadir=${D}/usr/share install || die " install failed"
 }
diff --git a/dev-python/gnome-python/gnome-python-1.4.4.ebuild b/dev-python/gnome-python/gnome-python-1.4.4.ebuild
index 1d66ee73b24d..65d52284e1c8 100644
--- a/dev-python/gnome-python/gnome-python-1.4.4.ebuild
+++ b/dev-python/gnome-python/gnome-python-1.4.4.ebuild
@@ -1,30 +1,28 @@
-# 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/dev-python/gnome-python/gnome-python-1.4.4.ebuild,v 1.1 2003/02/09 18:56:50 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-1.4.4.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit gnome.org
 
 IUSE="gnome opengl"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="gnome-python"
-HOMEPAGE="http://www.daa.com.au/~james/gnome/"
+HOMEPAGE="http://www.pygtk.org/"
+
+SLOT="1"
+KEYWORDS="x86 ppc ~sparc ~alpha"
+LICENSE="GPL-2"
 
 DEPEND="virtual/python
 	=x11-libs/gtk+-1.2*
 	>=media-libs/imlib-1.9.10-r1
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 
-		 <gnome-base/libglade-1.90.0
-		 <gnome-base/control-center-1.90.0 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1
+		<gnome-base/libglade-1.90.0
+		<gnome-base/control-center-1.90.0 )
 	opengl? ( <x11-libs/gtkglarea-1.99.0 )"
-RDEPEND="${RDEPEND}"
-
-SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
-LICENSE="GPL-2"
 
 src_compile() {
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		CFLAGS="${CFLAGS} `gnome-config capplet --cflags`" \
 		econf ${myopts} || die
@@ -37,7 +35,7 @@ src_compile() {
 
 src_install() {
 
-	if [ -n "`use gnome`" ]
+	if use gnome
 	then
 		cd ${S}/pygnome
 		make prefix=${D}/usr datadir=${D}/usr/share install || die
diff --git a/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild b/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild
index 98440158d2c1..cce9c696d628 100644
--- a/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild
@@ -1,19 +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/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild,v 1.1 2004/01/24 17:02:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit gnome2 python
 
 DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 
-IUSE="gtkhtml"
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="gtkhtml"
 
 RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-${PV}*
+	>=dev-python/pygtk-${PV}
 	>=dev-python/pyorbit-2.0
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
@@ -30,11 +30,10 @@ RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	gtkhtml? ( =gnome-extra/libgtkhtml-2* )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 
 src_unpack() {
 	unpack ${A}
@@ -45,11 +44,10 @@ src_unpack() {
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/gtk-2.0
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
 }
 
 pkg_postrm() {
 	python_version
 	python_mod_cleanup
 }
-
diff --git a/dev-python/gnome-python/gnome-python-2.0.0.ebuild b/dev-python/gnome-python/gnome-python-2.0.0.ebuild
index 162ab4fff4fa..1d117cee5189 100644
--- a/dev-python/gnome-python/gnome-python-2.0.0.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.0.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/dev-python/gnome-python/gnome-python-2.0.0.ebuild,v 1.1 2003/09/03 12:47:17 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 # devel version - debug
 inherit gnome2 debug
@@ -8,11 +8,11 @@ inherit gnome2 debug
 IUSE="gtkhtml"
 
 DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 LICENSE="LGPL-2"
 
 RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-${PV}*
+	>=dev-python/pygtk-${PV}
 	>=dev-python/pyorbit-2.0
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
@@ -22,7 +22,6 @@ RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/gnome-vfs-2
 	>=gnome-base/gconf-1.2
 	>=x11-libs/libzvt-2
-	>=gnome-base/bonobo-activation-1
 	>=gnome-base/libbonobo-2
 	>=gnome-base/libbonoboui-2
 	>=gnome-base/nautilus-2
@@ -31,11 +30,11 @@ RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	gtkhtml? ( =gnome-extra/libgtkhtml-2* )"
 
-DEPEND="${RDEPEND} 
+DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
 SLOT="2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc alpha sparc"
 
 # ugly, but necessary
 addwrite /usr/share/pygtk/2.0/codegen
diff --git a/dev-python/gnome-python/gnome-python-2.0.2.ebuild b/dev-python/gnome-python/gnome-python-2.0.2.ebuild
index 9c7ab2014943..0b71b1c8be50 100644
--- a/dev-python/gnome-python/gnome-python-2.0.2.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.0.2.ebuild
@@ -1,19 +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/dev-python/gnome-python/gnome-python-2.0.2.ebuild,v 1.1 2004/04/06 22:27:03 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit gnome2 python
 
 DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 
-IUSE="gtkhtml"
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gtkhtml"
 
 RDEPEND=">=dev-lang/python-2.2
-	>=dev-python/pygtk-${PV}*
+	>=dev-python/pygtk-${PV}
 	>=dev-python/pyorbit-2.0
 	>=dev-libs/glib-2
 	>=x11-libs/gtk+-2
@@ -30,11 +30,10 @@ RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	gtkhtml? ( =gnome-extra/libgtkhtml-2* )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 
 src_unpack() {
 	unpack ${A}
@@ -45,11 +44,10 @@ src_unpack() {
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/gtk-2.0
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
 }
 
 pkg_postrm() {
 	python_version
 	python_mod_cleanup
 }
-
diff --git a/dev-python/gnome-python/gnome-python-2.10.0.ebuild b/dev-python/gnome-python/gnome-python-2.10.0.ebuild
index 43c41b30ddba..118a50f3f960 100644
--- a/dev-python/gnome-python/gnome-python-2.10.0.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.10.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/dev-python/gnome-python/gnome-python-2.10.0.ebuild,v 1.1 2005/06/22 21:34:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.10.0.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit gnome2 python eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE="doc gtkhtml"
 
 RDEPEND=">=dev-lang/python-2.2
@@ -25,7 +25,7 @@ RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/libbonobo-2.8
 	>=gnome-base/libbonoboui-2.8
 	>=gnome-base/libgnomeprintui-2.8
-	gtkhtml? (>=gnome-extra/libgtkhtml-3.2.5)"
+	gtkhtml? ( >=gnome-extra/libgtkhtml-3.2.5 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
diff --git a/dev-python/gnome-python/gnome-python-2.12.0.ebuild b/dev-python/gnome-python/gnome-python-2.12.0.ebuild
index 34a3b7c2ecfc..6af01d021293 100644
--- a/dev-python/gnome-python/gnome-python-2.12.0.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.12.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/dev-python/gnome-python/gnome-python-2.12.0.ebuild,v 1.1 2005/09/11 22:56:44 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.12.0.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit gnome2 python eutils
 
diff --git a/dev-python/gnome-python/gnome-python-2.6.1.ebuild b/dev-python/gnome-python/gnome-python-2.6.1.ebuild
index 69df6cfd479f..92d4b656087a 100644
--- a/dev-python/gnome-python/gnome-python-2.6.1.ebuild
+++ b/dev-python/gnome-python/gnome-python-2.6.1.ebuild
@@ -1,16 +1,16 @@
-# 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/dev-python/gnome-python/gnome-python-2.6.1.ebuild,v 1.1 2004/11/24 15:48:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnome-python/gnome-python-2.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit gnome2 python eutils
 
 DESCRIPTION="GNOME 2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 
-IUSE="gtkhtml"
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="gtkhtml"
 
 RDEPEND=">=dev-lang/python-2.2
 	>=dev-python/pygtk-2.4
@@ -30,11 +30,12 @@ RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/libgnomeprint-2.2
 	>=gnome-base/libgnomeprintui-2.2
 	gtkhtml? ( =gnome-extra/libgtkhtml-2* )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
+# Skip test, to avoid gnome-python-2.0 block (fixes bug 72594)
+RESTRICT="test"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
 
 src_unpack() {
 	unpack ${A}
@@ -63,4 +64,3 @@ pkg_postrm() {
 	python_version
 	python_mod_cleanup
 }
-
diff --git a/dev-python/gnome-python/metadata.xml b/dev-python/gnome-python/metadata.xml
index de483c53568f..888e60bf6a90 100644
--- a/dev-python/gnome-python/metadata.xml
+++ b/dev-python/gnome-python/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/dev-python/gnosis-utils/ChangeLog b/dev-python/gnosis-utils/ChangeLog
index e0526d997a00..4ef5afc8da7e 100644
--- a/dev-python/gnosis-utils/ChangeLog
+++ b/dev-python/gnosis-utils/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-python/gnosis-utils
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/ChangeLog,v 1.1 2003/05/10 13:45:13 liquidx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Oct 2004; Rob Cakebread <pythonhead@gentoo.org>
+  gnosis-utils-1.1.1.ebuild:
+  Marked x86 stable
+
+*gnosis-utils-1.1.1 (28 Mar 2004)
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> gnosis-utils-1.0.6.ebuild,
+  gnosis-utils-1.1.1.ebuild:
+  Add new version, update SRC_URI.
 
 *gnosis-utils-1.0.6 (10 May 2003)
 
diff --git a/dev-python/gnosis-utils/Manifest b/dev-python/gnosis-utils/Manifest
index 37436a0b22a4..40df1c89bf65 100644
--- a/dev-python/gnosis-utils/Manifest
+++ b/dev-python/gnosis-utils/Manifest
@@ -1,3 +1,6 @@
-MD5 2b06a2b9b317c6058b7b35153635c334 gnosis-utils-1.0.6.ebuild 1128
-MD5 a786baa96c4f10410a9a88609374f24a ChangeLog 415
+MD5 934b14fa6ba354bc153810bd236a86c0 ChangeLog 794
+MD5 49d2fe4f6f3ed688f7cf5a0c8c962bae gnosis-utils-1.1.1.ebuild 863
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 a8c187131a3b11441908bb497319e5bb gnosis-utils-1.0.6.ebuild 1133
 MD5 d8ed548f398d1067e2611ebd0e590c23 files/digest-gnosis-utils-1.0.6 70
+MD5 44bd01304822dd4d890c68beed54c4d1 files/digest-gnosis-utils-1.1.1 70
diff --git a/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild b/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild
index cf7160ce85b4..5b4d668f6ee7 100644
--- a/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild
+++ b/dev-python/gnosis-utils/gnosis-utils-1.0.6.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/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild,v 1.1 2003/05/10 13:45:13 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/gnosis-utils-1.0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils
 
@@ -10,16 +10,15 @@ MY_P=${P/gnosis-utils/Gnosis_Utils}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="XML pickling and objectification with Python."
-SRC_URI="http://www.gnosis.cx/download/${MY_P}.tar.gz"
+SRC_URI="http://www.gnosis.cx/download/Gnosis_Utils.OLD/${MY_P}.tar.gz"
 HOMEPAGE="http://www.gnosis.cx/download/"
 
 DEPEND="virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="PYTHON"
 
-
 src_compile() {
 	python setup_gnosis.py build || die
 }
@@ -36,7 +35,7 @@ src_install() {
 		einfo "Moving documentation to correct location"
 		mv ${D}/usr/lib/python${PYVER}/site-packages/gnosis/doc ${D}/usr/share/doc/${PF}/doc
 	fi
-	
+
 	rm -f ${D}/usr/lib/python${PYVER}/site-packages/gnosis/{README,MANIFEST}
-	rm -f ${D}/usr/lib/python${PYVER}/site-packages/{README,MANIFEST}	
+	rm -f ${D}/usr/lib/python${PYVER}/site-packages/{README,MANIFEST}
 }
diff --git a/dev-python/gnosis-utils/gnosis-utils-1.1.1.ebuild b/dev-python/gnosis-utils/gnosis-utils-1.1.1.ebuild
index 08279a4188bb..e86b2a8c753f 100644
--- a/dev-python/gnosis-utils/gnosis-utils-1.1.1.ebuild
+++ b/dev-python/gnosis-utils/gnosis-utils-1.1.1.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/dev-python/gnosis-utils/gnosis-utils-1.1.1.ebuild,v 1.1 2004/03/28 11:17:12 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnosis-utils/gnosis-utils-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils
 
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.gnosis.cx/download/"
 DEPEND="virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="PYTHON"
 
 DOCS="README MANIFEST PKG-INFO"
diff --git a/dev-python/gnuplot-py/ChangeLog b/dev-python/gnuplot-py/ChangeLog
index 58791a366df0..629d2bbeef7c 100644
--- a/dev-python/gnuplot-py/ChangeLog
+++ b/dev-python/gnuplot-py/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for dev-python/gnuplot-py
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.1 2003/06/19 22:17:44 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
+
+*gnuplot-py-1.7-r1 (04 Jun 2005)
+
+  04 Jun 2005; Fernando Serboncini <fserb@gentoo.org>
+  +files/gnuplot-py-1.7-mousesupport.patch, gnuplot-py-1.7.ebuild,
+  +gnuplot-py-1.7-r1.ebuild:
+  Added mouse support patch. Closes #69250.
+  Marked 1.7 stable on x86.
+
+  02 Jun 2005; Luca Barbato <lu_zero@gentoo.org> gnuplot-py-1.7.ebuild:
+  Marked ppc
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*gnuplot-py-1.7 (03 Oct 2004)
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +gnuplot-py-1.7.ebuild:
+  Version bump, bug 66094.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> gnuplot-py-1.6.ebuild:
+  Added to ~ppc.
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnuplot-py-1.6.ebuild:
+  moved dev-python/Numeric to dev-python/numeric
 
 *gnuplot-py-1.6 (19 Jun 2003)
 
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
index ae10b51379da..7fb9ea5ba39c 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -1,3 +1,19 @@
-MD5 41e54634aa530274705a844f698336e1 gnuplot-py-1.6.ebuild 618
-MD5 d4868fc74bd39743db75ab6daf8412f8 ChangeLog 401
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 179a335bf88eb35ff06e77ee18aefca1 ChangeLog 1182
+MD5 5e1af2892d7c437f97ed0e124757547f gnuplot-py-1.6.ebuild 617
+MD5 6c866cb3c5147ee5a902301a77e4ed4f gnuplot-py-1.7.ebuild 623
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 342f68c4db6eb34ab4acca875cd7f47a gnuplot-py-1.7-r1.ebuild 713
 MD5 e78f98cfb3a978120690eb8cc84e5dda files/digest-gnuplot-py-1.6 65
+MD5 f9117dc8628a6185c7db33adeb171577 files/digest-gnuplot-py-1.7 66
+MD5 f9117dc8628a6185c7db33adeb171577 files/digest-gnuplot-py-1.7-r1 66
+MD5 a0f4c4e3e2040dfb4d982653ddd851d5 files/gnuplot-py-1.7-mousesupport.patch 2596
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCocaExtZcznfol0URAmEWAKCZoIWjXU2IeJXj21yv2Z/i9TTOxwCfctQe
+zJD/RrhV3z1NDkc9ApeSlj4=
+=leuK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.6.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.6.ebuild
index b38a3a99fb48..68a09b79fe5c 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.6.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.6.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/dev-python/gnuplot-py/gnuplot-py-1.6.ebuild,v 1.1 2003/06/19 22:17:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.6.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils
 
@@ -10,12 +10,12 @@ HOMEPAGE="http://gnuplot-py.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ~ppc"
 SLOT="0"
-DEPEND="virtual/python 
-	media-gfx/gnuplot 
-	dev-python/Numeric"
-	
+DEPEND="virtual/python
+	media-gfx/gnuplot
+	dev-python/numeric"
+
 src_install() {
 	distutils_src_install
 	dohtml doc/Gnuplot/*
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild
index 727672f71196..0da6cd86aedb 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.7-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/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild,v 1.1 2005/06/04 15:18:26 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild
index 53392efdc4f8..d57e08e1faf5 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild
@@ -1,17 +1,18 @@
-# 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/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild,v 1.1 2004/10/02 22:56:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.7.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
-IUSE=""
 DESCRIPTION="A python wrapper for Gnuplot"
 HOMEPAGE="http://gnuplot-py.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64 ~ppc"
 SLOT="0"
+KEYWORDS="~amd64 ppc s390 x86"
+IUSE=""
+
 DEPEND="virtual/python
 	media-gfx/gnuplot
 	dev-python/numeric"
diff --git a/dev-python/gst-python/ChangeLog b/dev-python/gst-python/ChangeLog
index 4978859abe36..94b4921dc549 100644
--- a/dev-python/gst-python/ChangeLog
+++ b/dev-python/gst-python/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-python/gst-python
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/ChangeLog,v 1.1 2005/03/16 00:07:32 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
+
+  06 Sep 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  gst-python-0.8.1.ebuild, gst-python-0.8.2.ebuild:
+  dont use cp -a, fixes bug
+
+*gst-python-0.8.2 (21 Jun 2005)
+
+  21 Jun 2005; Zaheer Abbas Merali <zaheerm@gentoo.org>
+  +gst-python-0.8.2.ebuild:
+  version bump
+
+*gst-python-0.8.1 (16 Mar 2005)
+
+  16 Mar 2005; <zaheerm@gentoo.org> gst-python-0.8.1.ebuild:
+  Cosmetic changes
 
   16 Mar 2005; <zaheerm@gentoo.org> :
   Initial Commit
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 69712052909e..e235bc0ff89e 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,2 +1,6 @@
-MD5 33d28a09deb77f2303cbc00794829ffb gst-python-0.8.1.ebuild 1169
+MD5 7bbf99f676a071a0585f7765f837d5ee gst-python-0.8.2.ebuild 1205
+MD5 6c3276170e63947eb0b880db71303096 gst-python-0.8.1.ebuild 1205
+MD5 c63067435b3889233e89bce166736b54 ChangeLog 723
+MD5 6050196ef420c3e4025029ebee5a813f metadata.xml 162
 MD5 039da23a793cf44bd7aa29fcc8d92bae files/digest-gst-python-0.8.1 68
+MD5 748805d980ac67b8fa34ce7ce8914846 files/digest-gst-python-0.8.2 68
diff --git a/dev-python/gst-python/gst-python-0.8.1.ebuild b/dev-python/gst-python/gst-python-0.8.1.ebuild
index ebb83d0997fd..d6748dd106a5 100644
--- a/dev-python/gst-python/gst-python-0.8.1.ebuild
+++ b/dev-python/gst-python/gst-python-0.8.1.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/dev-python/gst-python/gst-python-0.8.1.ebuild,v 1.1 2005/03/16 00:07:32 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/gst-python-0.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
-inherit python debug
+inherit python
 
 DESCRIPTION="A Python Interface to GStreamer"
 HOMEPAGE="http://gstreamer.freedesktop.org"
@@ -24,21 +24,18 @@ DEPEND="${RDEPEND}
 		doc? ( app-text/xmlto
 		       dev-libs/libxml2 )"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
-	use doc && myconf="--enable-docs" || myconf="--disable-docs"
-
+	myconf=`use_enable doc docs`
 	econf ${myconf} || die
 	emake || die
 }
 
 src_install() {
 
-	einstall || die
+	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 	docinto examples
-	cp -a examples/* ${D}usr/share/doc/${PF}/examples
+	cp -pPR examples/* ${D}usr/share/doc/${PF}/examples
 	prepalldocs
 }
 
diff --git a/dev-python/gst-python/gst-python-0.8.2.ebuild b/dev-python/gst-python/gst-python-0.8.2.ebuild
index 445a38f86b7d..fd36703e4794 100644
--- a/dev-python/gst-python/gst-python-0.8.2.ebuild
+++ b/dev-python/gst-python/gst-python-0.8.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/dev-python/gst-python/gst-python-0.8.2.ebuild,v 1.1 2005/06/22 14:09:42 zaheerm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/gst-python-0.8.2.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit python
 
@@ -35,7 +35,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
 	docinto examples
-	cp -a examples/* ${D}usr/share/doc/${PF}/examples
+	cp -pPR examples/* ${D}usr/share/doc/${PF}/examples
 	prepalldocs
 }
 
diff --git a/dev-python/happydoc/ChangeLog b/dev-python/happydoc/ChangeLog
index 0536f33e4fee..f11cf93e9d3d 100644
--- a/dev-python/happydoc/ChangeLog
+++ b/dev-python/happydoc/ChangeLog
@@ -1,11 +1,53 @@
 # ChangeLog for dev-python/happydoc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/ChangeLog,v 1.1 2002/05/15 02:53:21 jnelson Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> happydoc-2.1.ebuild:
+  Mark 2.1 stable on ia64
+
+  13 Sep 2005; <dang@gentoo.org> happydoc-2.1.ebuild:
+  Marked ~amd64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> happydoc-2.1.ebuild:
+  add ~ia64
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> happydoc-2.1.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> happydoc-2.1.ebuild:
+  Added to ~ppc.
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> happydoc-2.1.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> happydoc-2.0.1.ebuild,
+  happydoc-2.1.ebuild:
+  Add missing IUSE.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> happydoc-2.1.ebuild:
+  Stable on sparc.
+
+*happydoc-2.1 (04 Apr 2003)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> happydoc-2.1.ebuild:
+  version bump and cleanup
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 # Author Gontran Zepeda <gontran@gontran.net>
 
 *happydoc-2.0.1 (14 May 2002)
 
+  26 Apr 2003; Alastair Tse <liquidx@gentoo.org> happydoc-2.0.1.ebuild:
+  fix syntax error in happydoc
+
+  26 Jul 2002; George Shapovalov <george@gentoo.org> happydoc-2.0.1.ebuild :
+  
+  added KEYWORDS,SLOT,LICENSE,
+  
   14 May 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog happydoc-2.0.1.ebuild :
   
   Thanks to Gontran Zepeda <gontran at gontran.net> for the original ebuild
diff --git a/dev-python/happydoc/Manifest b/dev-python/happydoc/Manifest
index 8c57d268d3e6..48b001ee560f 100644
--- a/dev-python/happydoc/Manifest
+++ b/dev-python/happydoc/Manifest
@@ -1,5 +1,6 @@
-MD5 93098c9db1f819a2923bc98205514a94 ChangeLog 885
-MD5 84476eb937cf60f75499f4e0ebc053d1 happydoc-2.1.ebuild 924
-MD5 a2c9364a631942343de0072945e5e3ab happydoc-2.0.1.ebuild 778
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 500298b4bf1a8ff17fb488d4c5b9d3b7 ChangeLog 1719
+MD5 65a0c4ac5f9d2d7a70f477edc7300fe6 happydoc-2.0.1.ebuild 778
+MD5 74e727c0353dbc9c5a982bbd6bcebc5d happydoc-2.1.ebuild 938
 MD5 ff94dd4cc18291ab80ea2ecbdf87538f files/digest-happydoc-2.0.1 67
-MD5 8dac4d31c0d3c69095ea1a7486238ba6 files/digest-happydoc-2.1 127
+MD5 c59f336e6e9e7950b97b32aa34f59d69 files/digest-happydoc-2.1 65
diff --git a/dev-python/happydoc/files/digest-happydoc-2.1 b/dev-python/happydoc/files/digest-happydoc-2.1
index 3a2b364111e6..1a57d4daf4b6 100644
--- a/dev-python/happydoc/files/digest-happydoc-2.1
+++ b/dev-python/happydoc/files/digest-happydoc-2.1
@@ -1,2 +1 @@
-MD5 98b5819c51d891d19af3a949189c4276 /happydoc-2.1.ebuild 948
 MD5 7791988bb7498d4281636ab5f5852e67 HappyDoc_r2_1.tar.gz 523968
diff --git a/dev-python/happydoc/happydoc-2.0.1.ebuild b/dev-python/happydoc/happydoc-2.0.1.ebuild
index 77aa627661a5..a3f8803a4ec1 100644
--- a/dev-python/happydoc/happydoc-2.0.1.ebuild
+++ b/dev-python/happydoc/happydoc-2.0.1.ebuild
@@ -1,18 +1,20 @@
-# HappyDoc is a tool for extracting documentation from Python source code.
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-2.0.1.ebuild,v 1.1 2002/05/15 02:53:21 jnelson Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
-# HappyDoc version numbering is not very compatible with portage -- kludgeing
-S=${WORKDIR}/HappyDoc-r2_0_1/
-
-DESCRIPTION="HappyDoc is a tool for extracting documentation from Python sourcecode."
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/happydoc/HappyDoc_r2_0_1.tar.gz"
+MY_PN="HappyDoc"
+MY_PV=${PV//./_}
+S=${WORKDIR}/${MY_PN}-r${MY_PV}
+DESCRIPTION="tool for extracting documentation from Python sourcecode"
+SRC_URI="mirror://sourceforge/happydoc/${MY_PN}_r${MY_PV}.tar.gz"
 HOMEPAGE="http://happydoc.sourceforge.net/"
 
-DEPEND="virtual/python"
 SLOT="0"
-LICENSE=""
+LICENSE="as-is"
+KEYWORDS="x86 sparc alpha"
+IUSE=""
+
+DEPEND="virtual/python"
 
 src_compile() {
 	python setup.py build || die
@@ -20,5 +22,6 @@ src_compile() {
 
 src_install() {
 	python setup.py install --root=${D} --prefix=/usr || die
-	dodoc CHANGES.txt README.txt test_happydoc.py
+	dodoc INSTALL.txt LICENSE.txt CHANGES.txt README.txt test_happydoc.py
+	dohtml -r srcdocs/*
 }
diff --git a/dev-python/happydoc/happydoc-2.1.ebuild b/dev-python/happydoc/happydoc-2.1.ebuild
index fbf68695c2f5..9f8d4b4718ea 100644
--- a/dev-python/happydoc/happydoc-2.1.ebuild
+++ b/dev-python/happydoc/happydoc-2.1.ebuild
@@ -1,26 +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/dev-python/happydoc/happydoc-2.1.ebuild,v 1.1 2003/04/04 22:29:13 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/happydoc/happydoc-2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
-IUSE=""
 MY_PN="HappyDoc"
-MY_PV=${PV/./_}
+MY_PV=${PV//./_}
 S=${WORKDIR}/${MY_PN}-r${MY_PV}
-DESCRIPTION="HappyDoc is a tool for extracting documentation from Python sourcecode."
+DESCRIPTION="tool for extracting documentation from Python sourcecode"
 SRC_URI="mirror://sourceforge/${PN}/${MY_PN}_r${MY_PV}.tar.gz"
 HOMEPAGE="http://happydoc.sourceforge.net/"
 
-DEPEND="virtual/python"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="alpha ~amd64 ia64 ppc sparc x86"
+IUSE=""
+
+DEPEND="virtual/python"
 
 src_install() {
 	mydoc="INSTALL.txt LICENSE.txt CHANGES.txt README.txt"
 	distutils_src_install
-	
+
 	insinto /usr/share/doc/${PF}
 	doins test_happydoc.py
 
diff --git a/dev-python/htmlgen/ChangeLog b/dev-python/htmlgen/ChangeLog
index 52d75d0f9b00..6377481fb3df 100644
--- a/dev-python/htmlgen/ChangeLog
+++ b/dev-python/htmlgen/ChangeLog
@@ -1,9 +1,25 @@
 # ChangeLog for dev-python/htmlgen
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/ChangeLog,v 1.1 2003/03/08 14:47:42 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/ChangeLog,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org> htmlgen-2.2.2.ebuild:
+  Marked ppc stable.
+
+  31 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  htmlgen-2.2.2.ebuild:
+  mark ~ppc
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> htmlgen-2.2.2.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
 
 *htmlgen-2.2.2 (08 Mar 2003)
 
+  25 Mar 2003; Alastair Tse <liquidx@gentoo.org> htmlgen-2.2.2.ebuild:
+  bump to stable
+
   08 Mar 2003; Alastair Tse <liquidx@gentoo.org> htmlgen-2.2.2.ebuild:
   initial ebuild. solves #10653.
 
diff --git a/dev-python/htmlgen/Manifest b/dev-python/htmlgen/Manifest
index e69de29bb2d1..ad90135297e4 100644
--- a/dev-python/htmlgen/Manifest
+++ b/dev-python/htmlgen/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02dbad21c1218b3c03d7ebd282b188a5 ChangeLog 855
+MD5 bc6773afff54e8bd355ab8f8a73fc80f htmlgen-2.2.2.ebuild 1385
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 43b1948d8e565b8bfc50541f916b1311 files/digest-htmlgen-2.2.2 56
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2TPicsIHjyDViGQRAijnAKDDSTVrV2ZIEgdlNmUg8ZlZpLOrTQCgwmgp
+uKij7tUwXZX4lBEkl+vB6Pw=
+=906K
+-----END PGP SIGNATURE-----
diff --git a/dev-python/htmlgen/htmlgen-2.2.2.ebuild b/dev-python/htmlgen/htmlgen-2.2.2.ebuild
index 30f904ca5a60..48a7a223264f 100644
--- a/dev-python/htmlgen/htmlgen-2.2.2.ebuild
+++ b/dev-python/htmlgen/htmlgen-2.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/dev-python/htmlgen/htmlgen-2.2.2.ebuild,v 1.1 2003/03/08 14:47:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/htmlgen/htmlgen-2.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 IUSE=""
 MY_P="HTMLgen"
@@ -10,10 +10,10 @@ SRC_URI="http://starship.python.net/crew/friedrich/${MY_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 
 DEPEND="virtual/python
-		dev-python/Imaging"
+		dev-python/imaging"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -23,16 +23,16 @@ src_compile() {
 
 src_install() {
 	PYTHON_VER=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
-    # doing this manually because their build scripts suck
+	# doing this manually because their build scripts suck
 	dodir /usr/lib/python${PYTHON_VER}/site-packages
 	insinto /usr/lib/python${PYTHON_VER}/site-packages
-	doins HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py 
-	doins barchart.py colorcube.py imgsize.py NavLinks.py 
-	doins Formtools.py HTMLgen.pyc HTMLcolors.pyc HTMLutil.pyc 
-	doins HTMLcalendar.pyc barchart.pyc colorcube.pyc imgsize.pyc 
-	doins NavLinks.pyc Formtools.pyc ImageH.py ImageFileH.py 
-	doins ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py 
-	doins PngImagePluginH.py ImageH.pyc ImageFileH.pyc 
+	doins HTMLgen.py HTMLcolors.py HTMLutil.py HTMLcalendar.py
+	doins barchart.py colorcube.py imgsize.py NavLinks.py
+	doins Formtools.py HTMLgen.pyc HTMLcolors.pyc HTMLutil.pyc
+	doins HTMLcalendar.pyc barchart.pyc colorcube.pyc imgsize.pyc
+	doins NavLinks.pyc Formtools.pyc ImageH.py ImageFileH.py
+	doins ImagePaletteH.py GifImagePluginH.py JpegImagePluginH.py
+	doins PngImagePluginH.py ImageH.pyc ImageFileH.pyc
 	doins ImagePaletteH.pyc GifImagePluginH.pyc JpegImagePluginH.pyc
 	doins PngImagePluginH.pyc
 }
diff --git a/dev-python/iconvcodec/ChangeLog b/dev-python/iconvcodec/ChangeLog
index 1628e0ee2849..2309f21cbcb6 100644
--- a/dev-python/iconvcodec/ChangeLog
+++ b/dev-python/iconvcodec/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/iconvcodec
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/iconvcodec/ChangeLog,v 1.1 2003/06/27 23:49:04 liquidx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iconvcodec/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+*iconvcodec-1.1.2 (05 Dec 2003)
+
+  05 Dec 2003; Alastair Tse <liquidx@gentoo.org> iconvcodec-1.1.2.ebuild:
+  version bump
 
 *iconvcodec-1.1.1 (28 Jun 2003)
 
diff --git a/dev-python/iconvcodec/Manifest b/dev-python/iconvcodec/Manifest
index a67006205639..5543617b1b66 100644
--- a/dev-python/iconvcodec/Manifest
+++ b/dev-python/iconvcodec/Manifest
@@ -1,2 +1,6 @@
-MD5 241496cfad5eec6db10e6476c2a29ba3 iconvcodec-1.1.1.ebuild 500
+MD5 e8d2a294c1ba767f40a352f6977adaee iconvcodec-1.1.2.ebuild 532
+MD5 c29aa992281ce4cd77634e2cec8defce iconvcodec-1.1.1.ebuild 531
+MD5 ec664f112e575048868c78d04d663bd9 ChangeLog 474
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 c4f888f1be34eab8d39ac013f0e57913 files/digest-iconvcodec-1.1.1 67
+MD5 0283f098a009256482fe81f46930a4ff files/digest-iconvcodec-1.1.2 67
diff --git a/dev-python/iconvcodec/iconvcodec-1.1.1.ebuild b/dev-python/iconvcodec/iconvcodec-1.1.1.ebuild
index 78c2c452e46c..9892b80fc161 100644
--- a/dev-python/iconvcodec/iconvcodec-1.1.1.ebuild
+++ b/dev-python/iconvcodec/iconvcodec-1.1.1.ebuild
@@ -1,10 +1,9 @@
-# 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/dev-python/iconvcodec/iconvcodec-1.1.1.ebuild,v 1.1 2003/06/27 23:49:04 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iconvcodec/iconvcodec-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Python Codecs for Iconv Encodings"
 SRC_URI="mirror://sourceforge/koco/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/koco"
@@ -12,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/koco"
 IUSE=""
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND=">=dev-lang/python-1.6"
 
diff --git a/dev-python/iconvcodec/iconvcodec-1.1.2.ebuild b/dev-python/iconvcodec/iconvcodec-1.1.2.ebuild
index cc54e522e9ef..6a89fc573593 100644
--- a/dev-python/iconvcodec/iconvcodec-1.1.2.ebuild
+++ b/dev-python/iconvcodec/iconvcodec-1.1.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/dev-python/iconvcodec/iconvcodec-1.1.2.ebuild,v 1.1 2003/12/05 01:13:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/iconvcodec/iconvcodec-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://cjkpython.i18n.org/"
 IUSE=""
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND=">=dev-lang/python-1.6"
 
diff --git a/dev-python/id3-py/ChangeLog b/dev-python/id3-py/ChangeLog
index 194d808f6cb5..11268b36a705 100644
--- a/dev-python/id3-py/ChangeLog
+++ b/dev-python/id3-py/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for dev-python/id3-py
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/id3-py/ChangeLog,v 1.1 2003/04/19 00:56:25 blauwers Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/id3-py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> id3-py-1.2.ebuild:
+  Moved inherit up top bug# 71465
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> id3-py-1.2.ebuild:
+  Stable sparc.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> id3-py-1.2.ebuild:
+  stable on ppc64
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> id3-py-1.2.ebuild:
+  stable on amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> id3-py-1.2.ebuild:
+  ~amd64.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> id3-py-1.2.ebuild:
+  Add missing IUSE.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> id3-py-1.2.ebuild:
+  Added to ~ppc.
 
 *id3-py-1.2 (19 Apr 2003)
 
diff --git a/dev-python/id3-py/Manifest b/dev-python/id3-py/Manifest
index b87671bfc25b..b4438cbad17f 100644
--- a/dev-python/id3-py/Manifest
+++ b/dev-python/id3-py/Manifest
@@ -1,3 +1,4 @@
-MD5 5c37bef97ce05795b74134e382b2c047 id3-py-1.2.ebuild 523
-MD5 5575ab4404fca818e2de6b43b958fca8 ChangeLog 383
+MD5 3d46734a31562ff89fd6fcb4c671056f id3-py-1.2.ebuild 548
+MD5 e5e51e604c9ffe354e464d51ce043657 ChangeLog 1110
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 67d86e5ba530b2d98c6bd8b459911251 files/digest-id3-py-1.2 54
diff --git a/dev-python/id3-py/id3-py-1.2.ebuild b/dev-python/id3-py/id3-py-1.2.ebuild
index 7bb710ebf955..bf7820340644 100644
--- a/dev-python/id3-py/id3-py-1.2.ebuild
+++ b/dev-python/id3-py/id3-py-1.2.ebuild
@@ -1,18 +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/dev-python/id3-py/id3-py-1.2.ebuild,v 1.1 2003/04/19 00:56:25 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/id3-py/id3-py-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+inherit distutils
 
 DESCRIPTION="Module for manipulating ID3 tags in Python"
 SRC_URI="http://id3-py.sourceforge.net/ID3.tar.gz"
 HOMEPAGE="http://id3-py.sourceforge.net/"
 
-LICENSE="GPL2"
 SLOT="0"
-KEYWORDS="~x86"
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
+IUSE=""
 
 DEPEND="virtual/python"
 
-inherit distutils
 
 src_install() {
 	mydoc="CHANGES"
diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index 9e0ad5b9b76d..da5e31f314ac 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,19 +1,82 @@
-# ChangeLog for dev-python/Imaging
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.1 2004/07/19 21:50:44 kloeri Exp $
+# ChangeLog for dev-python/imaging
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> imaging-1.1.5.ebuild:
+  add ~ia64
+
+  13 Jul 2005; Herbie Hopkins <herbs@gentoo.org> imaging-1.1.5.ebuild:
+  Multilib fix.
+
+*imaging-1.1.5 (11 Jun 2005)
+
+  11 Jun 2005; Fernando Serboncini <fserb@gentoo.org> +imaging-1.1.5.ebuild:
+  Version bump.
+  Added sane support.
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> imaging-1.1.4-r1.ebuild:
+  Stable on ppc64; dependency for bug #92995
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> imaging-1.1.4-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  imaging-1.1.4-r1.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> imaging-1.1.4-r1.ebuild:
+  stable on amd64
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> imaging-1.1.4.ebuild:
+  stable on amd64 again since media-sound/albumart needs it and xv had been
+  keyworded.
+
+  22 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> imaging-1.1.4.ebuild:
+  Marked ~amd64 as xv is
+
+*imaging-1.1.4-r1 (22 Nov 2004)
+
+  22 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  imaging-1.1.2-r2.ebuild, imaging-1.1.3-r1.ebuild, imaging-1.1.3-r2.ebuild,
+  imaging-1.1.3.ebuild, imaging-1.1.4-r1.ebuild, imaging-1.1.4.ebuild:
+  Added X to IUSE. Closes bug# 72094
+
+  21 Nov 2004; Chris Bainbridge <chrb@gentoo.org> :
+  xv is required by Image.show(). marked ~amd64 as xv is.
+
+  01 Nov 2004; Joseph Jezak <josejx@gentoo.org> imaging-1.1.3-r2.ebuild:
+  Marked ppc stable.
+
+  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +files/imaging-1.1.4-ft-2.1.9.patch, imaging-1.1.4.ebuild:
+  Fix bug 66040.
+
+  14 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> imaging-1.1.4.ebuild:
+  Stable amd64
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  20 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> imaging-1.1.2-r2.ebuild,
+  imaging-1.1.3-r1.ebuild, imaging-1.1.3-r2.ebuild, imaging-1.1.3.ebuild,
+  imaging-1.1.4.ebuild:
+  Added DEPEND on media-libs/freetype
 
 *imaging-1.1.4 (19 Jul 2004)
 
-  19 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +files/imaging-1.1.4-fPIC.patch, +files/imaging-1.1.4-setup.py.patch,
   +imaging-1.1.2-r2.ebuild, +imaging-1.1.3-r1.ebuild,
   +imaging-1.1.3-r2.ebuild, +imaging-1.1.3.ebuild, +imaging-1.1.4.ebuild:
   Renamed dev-python/Imaging to dev-python/imaging.
 
-  31 May 2004; Bryan �stergaard <kloeri@gentoo.org> Imaging-1.1.4.ebuild:
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> Imaging-1.1.4.ebuild:
   Stable on alpha.
 
-  04 May 2004; Bryan �stergaard <kloeri@gentoo.org> Imaging-1.1.2-r2.ebuild,
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> Imaging-1.1.2-r2.ebuild,
   Imaging-1.1.3.ebuild:
   Remove default S.
 
@@ -24,7 +87,7 @@
   18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> Imaging-1.1.4.ebuild:
   Created -fPIC patch instead of adding fPIC to CFLAGS.
 
-  28 Mar 2004; Bryan �stergaard <kloeri@gentoo.org> Imaging-1.1.2-r2.ebuild,
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> Imaging-1.1.2-r2.ebuild,
   Imaging-1.1.3-r1.ebuild, Imaging-1.1.3-r2.ebuild, Imaging-1.1.3.ebuild:
   Update SRC_URI.
 
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index 4027dd2fdaa0..92073721ef1e 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -1,14 +1,19 @@
-MD5 a9d277c4acfbfab6f9fc13fe951ce619 Imaging-1.1.3-r2.ebuild 1236
-MD5 e824fb2cdff69cebd7a4a8fded8a24ad Imaging-1.1.4.ebuild 1281
-MD5 8b82c925adb75118fb5668df61a27917 Imaging-1.1.2-r2.ebuild 2581
-MD5 4fe82104933583512dd6d94ad12d457e Imaging-1.1.3-r1.ebuild 1181
-MD5 967f9737df390ed660620d4dc5b893dd ChangeLog 2847
-MD5 d8cae66edec22abeda49397cc9f9fe94 Imaging-1.1.3.ebuild 2589
+MD5 97b3f8a53ac6b8b6a6e7c3f2083cb8ad imaging-1.1.3-r1.ebuild 1280
+MD5 cacf4592204ac0154746bbf881c2d73f imaging-1.1.5.ebuild 1473
+MD5 348cf7ff1984552bb48a1ee8791fd83c imaging-1.1.4-r1.ebuild 1430
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 7e1eafa229aad0303d6d04c88c1f89e6 files/digest-Imaging-1.1.2-r2 65
-MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3-r1 65
-MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3-r2 65
-MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3 65
-MD5 171777970922938dc6a815dd2b6a85de files/digest-Imaging-1.1.4 65
-MD5 d0b3528fb0e74be99cf9ac5e9372e317 files/Imaging-1.1.4-setup.py.patch 374
-MD5 8f3dd92ea003765c3f18202e3ee6be14 files/Imaging-1.1.4-fPIC.patch 373
+MD5 49932cad00d3e7633bfc27c52c1663f5 imaging-1.1.2-r2.ebuild 2675
+MD5 638b7aa7f780616d7fd845731772e8f9 ChangeLog 5306
+MD5 eff4ab65622885554082eef13071ed27 imaging-1.1.3.ebuild 2672
+MD5 11f5da5f34dca45b7ac112e40ee1c8af imaging-1.1.4.ebuild 1419
+MD5 0d7e51a402015d9e3ee03c166109fab7 imaging-1.1.3-r2.ebuild 1334
+MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-imaging-1.1.3-r2 65
+MD5 171777970922938dc6a815dd2b6a85de files/digest-imaging-1.1.4-r1 65
+MD5 7e1eafa229aad0303d6d04c88c1f89e6 files/digest-imaging-1.1.2-r2 65
+MD5 171777970922938dc6a815dd2b6a85de files/digest-imaging-1.1.4 65
+MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-imaging-1.1.3-r1 65
+MD5 d0b3528fb0e74be99cf9ac5e9372e317 files/imaging-1.1.4-setup.py.patch 374
+MD5 3a82b0a4dedf814db88057b586b6e91a files/digest-imaging-1.1.5 65
+MD5 e937d8e178744db225745000b4e42128 files/imaging-1.1.4-ft-2.1.9.patch 301
+MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-imaging-1.1.3 65
+MD5 8f3dd92ea003765c3f18202e3ee6be14 files/imaging-1.1.4-fPIC.patch 373
diff --git a/dev-python/imaging/imaging-1.1.2-r2.ebuild b/dev-python/imaging/imaging-1.1.2-r2.ebuild
index dc326b42b368..fbe34f18dc65 100644
--- a/dev-python/imaging/imaging-1.1.2-r2.ebuild
+++ b/dev-python/imaging/imaging-1.1.2-r2.ebuild
@@ -1,11 +1,11 @@
-# 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/dev-python/imaging/imaging-1.1.2-r2.ebuild,v 1.1 2004/07/19 21:50:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 MY_P=${P/imaging/Imaging}
 S=${WORKDIR}/${MY_P}
 
-IUSE="tcltk"
+IUSE="X tcltk"
 
 DESCRIPTION="Python Imaging Library (PIL)."
 SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
@@ -14,7 +14,9 @@ HOMEPAGE="http://www.pythonware.com/downloads/#pil"
 DEPEND=">=dev-lang/python-2.0
 	>=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tk )"
+	>=media-libs/freetype-2.1.5
+	tcltk? ( dev-lang/tk )
+	X? ( media-gfx/xv )"
 
 SLOT="0"
 KEYWORDS="x86 sparc alpha ppc"
diff --git a/dev-python/imaging/imaging-1.1.3-r1.ebuild b/dev-python/imaging/imaging-1.1.3-r1.ebuild
index 7a58b038b07b..f6e2fc142028 100644
--- a/dev-python/imaging/imaging-1.1.3-r1.ebuild
+++ b/dev-python/imaging/imaging-1.1.3-r1.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/dev-python/imaging/imaging-1.1.3-r1.ebuild,v 1.1 2004/07/19 21:50:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/imaging/Imaging}
 S=${WORKDIR}/${MY_P}
 
-IUSE="tcltk"
+IUSE="X tcltk"
 
 DESCRIPTION="Python Imaging Library (PIL)."
 SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
@@ -15,7 +15,9 @@ HOMEPAGE="http://www.pythonware.com/downloads/#pil"
 
 DEPEND=">=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tk )"
+	>=media-libs/freetype-2.1.5
+	tcltk? ( dev-lang/tk )
+	X? ( media-gfx/xv )"
 
 SLOT="0"
 KEYWORDS="x86 ~sparc ~alpha ~ppc"
diff --git a/dev-python/imaging/imaging-1.1.3-r2.ebuild b/dev-python/imaging/imaging-1.1.3-r2.ebuild
index e4d02176c4dd..79340dd6f4d4 100644
--- a/dev-python/imaging/imaging-1.1.3-r2.ebuild
+++ b/dev-python/imaging/imaging-1.1.3-r2.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/dev-python/imaging/imaging-1.1.3-r2.ebuild,v 1.1 2004/07/19 21:50:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/imaging/Imaging}
 S=${WORKDIR}/${MY_P}
 
-IUSE="tcltk"
+IUSE="X tcltk"
 
 DESCRIPTION="Python Imaging Library (PIL)."
 SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
@@ -15,10 +15,12 @@ HOMEPAGE="http://www.pythonware.com/downloads/#pil"
 
 DEPEND=">=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tk )"
+	>=media-libs/freetype-2.1.5
+	tcltk? ( dev-lang/tk )
+	X? ( media-gfx/xv )"
 
 SLOT="0"
-KEYWORDS="x86 ~sparc ~alpha ~ppc"
+KEYWORDS="x86 ~sparc ~alpha ppc"
 LICENSE="as-is"
 
 src_compile() {
diff --git a/dev-python/imaging/imaging-1.1.3.ebuild b/dev-python/imaging/imaging-1.1.3.ebuild
index f2f823931a67..158c021749e0 100644
--- a/dev-python/imaging/imaging-1.1.3.ebuild
+++ b/dev-python/imaging/imaging-1.1.3.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/dev-python/imaging/imaging-1.1.3.ebuild,v 1.1 2004/07/19 21:50:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
-IUSE="tcltk"
+IUSE="X tcltk"
 
 MY_P=${P/imaging/Imaging}
 S=${WORKDIR}/${MY_P}
@@ -14,9 +14,10 @@ HOMEPAGE="http://www.pythonware.com/downloads/#pil"
 DEPEND=">=dev-lang/python-2.0
 	>=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tk )"
+	>=media-libs/freetype-2.1.5
+	tcltk? ( dev-lang/tk )
+	X? ( media-gfx/xv )"
 
-RDEPEND=""
 
 SLOT="0"
 KEYWORDS="x86 sparc alpha ppc"
diff --git a/dev-python/imaging/imaging-1.1.4-r1.ebuild b/dev-python/imaging/imaging-1.1.4-r1.ebuild
index cbd22e8d0d6a..fe6754dda022 100644
--- a/dev-python/imaging/imaging-1.1.4-r1.ebuild
+++ b/dev-python/imaging/imaging-1.1.4-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/dev-python/imaging/imaging-1.1.4-r1.ebuild,v 1.1 2004/11/21 18:03:32 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -13,17 +13,16 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
-IUSE="tcltk"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="X tcltk"
 
 DEPEND="virtual/python
 	>=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
 	>=media-libs/freetype-2.1.5
-	tcltk? ( dev-lang/tk )"
+	tcltk? ( dev-lang/tk )
+	X? ( media-gfx/xv )"
 
-RDEPEND="${DEPEND}
-	media-gfx/xv"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-python/imaging/imaging-1.1.4.ebuild b/dev-python/imaging/imaging-1.1.4.ebuild
index 28b9f0817f2e..702d226531ce 100644
--- a/dev-python/imaging/imaging-1.1.4.ebuild
+++ b/dev-python/imaging/imaging-1.1.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/dev-python/imaging/imaging-1.1.4.ebuild,v 1.1 2004/07/19 21:50:44 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -13,19 +13,22 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc alpha ~amd64"
-IUSE="tcltk"
+KEYWORDS="x86 ~ppc sparc alpha amd64"
+IUSE="X tcltk"
 
 DEPEND="virtual/python
 	>=media-libs/jpeg-6a
 	>=sys-libs/zlib-0.95
-	tcltk? ( dev-lang/tk )"
+	>=media-libs/freetype-2.1.5
+	tcltk? ( dev-lang/tk )
+	X? ( media-gfx/xv )"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${P}-setup.py.patch
 	epatch ${FILESDIR}/${P}-fPIC.patch
+	epatch ${FILESDIR}/${P}-ft-2.1.9.patch
 }
 
 src_compile() {
diff --git a/dev-python/imaging/imaging-1.1.5.ebuild b/dev-python/imaging/imaging-1.1.5.ebuild
index c8bc9cdb5f12..8746d828954a 100644
--- a/dev-python/imaging/imaging-1.1.5.ebuild
+++ b/dev-python/imaging/imaging-1.1.5.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/dev-python/imaging/imaging-1.1.5.ebuild,v 1.1 2005/06/11 14:06:06 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
-inherit distutils eutils
+inherit distutils eutils multilib
 
 MY_P=${P/imaging/Imaging}
 S=${WORKDIR}/${MY_P}
@@ -13,7 +13,7 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="X tcltk scanner doc"
 
 DEPEND="virtual/python
@@ -24,6 +24,13 @@ DEPEND="virtual/python
 	scanner? ( media-gfx/sane-backends )
 	X? ( media-gfx/xv )"
 
+src_unpack() {
+	unpack ${A}
+	# look for 64bit libs in lib64
+	sed -i -e "s:\"/usr/lib\":\"/usr/$(get_libdir)\":" \
+		${S}/setup.py || die "sed failed"
+}
+
 src_compile() {
 	distutils_src_compile
 	if use scanner ; then
diff --git a/dev-python/ipython/ChangeLog b/dev-python/ipython/ChangeLog
index bfcc213edf55..3f59c6616741 100644
--- a/dev-python/ipython/ChangeLog
+++ b/dev-python/ipython/ChangeLog
@@ -1,6 +1,103 @@
 # ChangeLog for dev-python/ipython
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.1 2003/06/13 22:56:28 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  26 Sep 2005; Alastair Tse <liquidx@gentoo.org> -ipython-0.5.0.ebuild,
+  -ipython-0.6.6.ebuild, -ipython-0.6.10.ebuild, -ipython-0.6.11.ebuild,
+  -ipython-0.6.12.ebuild, ipython-0.6.13.ebuild, ipython-0.6.14.ebuild,
+  ipython-0.6.15.ebuild:
+  license updated to BSD for 0.6.x series. (#105801)
+
+  04 Jun 2005; Marcus D. Hanwell <marcus@gentoo.org> ipython-0.6.13.ebuild:
+  Stable on amd64, bug 94750.
+
+*ipython-0.6.15 (03 Jun 2005)
+
+  03 Jun 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +ipython-0.6.15.ebuild:
+  Version bump.
+
+  02 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ipython-0.6.13.ebuild:
+  Marked ppc
+
+*ipython-0.6.14 (31 May 2005)
+
+  31 May 2005; Lukasz Strzygowski <lucass@gentoo.org> ipython-0.6.11.ebuild,
+  ipython-0.6.12.ebuild, ipython-0.6.13.ebuild, +ipython-0.6.14.ebuild:
+  Version bump. Older releases marked stable on x86.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> ipython-0.6.10.ebuild:
+  stable on amd64
+
+*ipython-0.6.13 (15 Apr 2005)
+
+  15 Apr 2005; Fernando Serboncini <fserb@gentoo.org>
+  +ipython-0.6.13.ebuild:
+  Version bump.
+
+*ipython-0.6.12 (03 Mar 2005)
+
+  03 Mar 2005; Lukasz Strzygowski <lucass@gentoo.org> ipython-0.6.10.ebuild,
+  +ipython-0.6.12.ebuild:
+  Version bump. Version 0.6.10 marked stable on x86.
+
+*ipython-0.6.11 (23 Feb 2005)
+
+  23 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
+  +ipython-0.6.11.ebuild:
+  Version Bump.
+
+  29 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> -ipython-0.6.0.ebuild,
+  -ipython-0.6.3.ebuild, -ipython-0.6.5.ebuild:
+  Fix bad digest and remove old ebuilds.
+
+*ipython-0.6.10 (28 Jan 2005)
+
+  28 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> +ipython-0.6.10.ebuild:
+  Version bump.
+
+  25 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org> ipython-0.6.0.ebuild,
+  ipython-0.6.3.ebuild, ipython-0.6.5.ebuild, ipython-0.6.6.ebuild:
+  Marked stable on x86.
+
+*ipython-0.6.6 (20 Dec 2004)
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +ipython-0.6.6.ebuild:
+  Version bump, new ebuild by Fernando Serboncini <fserb@terra.com.br>
+
+*ipython-0.6.5 (05 Dec 2004)
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +ipython-0.6.5.ebuild:
+  Version bump, bug 71395.
+
+*ipython-0.6.3 (10 Sep 2004)
+
+  10 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +ipython-0.6.3.ebuild:
+  Version bump. Thanks for information about new release to Christopher
+  Knox in bug #63328. Replaced dependency on ">=dev-lang/python-2.2"
+  with "virtual/python". Added description to metadata.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> ipython-0.6.0.ebuild:
+  Added to ~ppc.
+
+*ipython-0.6.0 (03 Jun 2004)
+
+  03 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> +ipython-0.6.0.ebuild:
+  Version bump. Closing #51207, thanks for Jeff Kowalczyk for the info.
+  Marked testing on x86 and amd64. New local use flag -- gnuplot, enables
+  support for gnuplot. My first commit, by the way.
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> ipython-0.5.0.ebuild:
+  adding s390 keywords
+
+*ipython-0.5.0 (06 Sep 2003)
+
+  06 Sep 2003; Alastair Tse <liquidx@gentoo.org> ipython-0.5.0.ebuild:
+  version bump
 
 *ipython-0.4.0 (13 Jun 2003)
 
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 300517929baa..a751fc696422 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,2 +1,18 @@
-MD5 c66625dd06c1248b6bd7b6cd8650eec6 ipython-0.4.0.ebuild 435
-MD5 18bb316eea4b9f454c9ad402b773bc4a files/digest-ipython-0.4.0 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9fa792e7553203fafa7da58b99cff199 ChangeLog 3597
+MD5 3a97850f5f76e1bd8fe6082fc70e091d files/digest-ipython-0.6.13 66
+MD5 7631bba5e54a813acc27c705fd86f421 files/digest-ipython-0.6.14 66
+MD5 ba1f7f14c7a2ab29ed1844b33d1c386b files/digest-ipython-0.6.15 66
+MD5 41da284cfee60d5a59274e429ad7a808 ipython-0.6.13.ebuild 560
+MD5 d35091ccc91d50ef92c780b8633b6b80 ipython-0.6.14.ebuild 564
+MD5 58551d9da14b64782451689223444e0f ipython-0.6.15.ebuild 564
+MD5 06bf581552d6f6debd761e5135c4cc68 metadata.xml 2253
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwC7FdQwWVoAgN4RAgArAKDRJ40qd/PMUm8+IAi+gg68KsCpqQCgjReQ
+sjNeHrLH6I4s/haUI9HoTTk=
+=teJV
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ipython/ipython-0.6.13.ebuild b/dev-python/ipython/ipython-0.6.13.ebuild
index 29dd388963e5..c10e9aa645b4 100644
--- a/dev-python/ipython/ipython-0.6.13.ebuild
+++ b/dev-python/ipython/ipython-0.6.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/dev-python/ipython/ipython-0.6.13.ebuild,v 1.1 2005/04/15 23:59:28 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.6.13.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -8,9 +8,9 @@ DESCRIPTION="An advanced interactive shell for Python."
 HOMEPAGE="http://ipython.scipy.org/"
 SRC_URI="http://ipython.scipy.org/dist/${P}.tar.gz"
 
-LICENSE="PYTHON"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc s390 ~x86"
+KEYWORDS="amd64 ppc s390 x86"
 IUSE="gnuplot"
 
 DEPEND="virtual/python"
diff --git a/dev-python/ipython/ipython-0.6.14.ebuild b/dev-python/ipython/ipython-0.6.14.ebuild
index 50af6cd03891..51ff7a54cd57 100644
--- a/dev-python/ipython/ipython-0.6.14.ebuild
+++ b/dev-python/ipython/ipython-0.6.14.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/dev-python/ipython/ipython-0.6.14.ebuild,v 1.1 2005/05/31 13:18:57 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.6.14.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="An advanced interactive shell for Python."
 HOMEPAGE="http://ipython.scipy.org/"
 SRC_URI="http://ipython.scipy.org/dist/${P}.tar.gz"
 
-LICENSE="PYTHON"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~s390 ~x86"
 IUSE="gnuplot"
diff --git a/dev-python/ipython/ipython-0.6.15.ebuild b/dev-python/ipython/ipython-0.6.15.ebuild
index 9578348bf171..be7bd67ad05d 100644
--- a/dev-python/ipython/ipython-0.6.15.ebuild
+++ b/dev-python/ipython/ipython-0.6.15.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/dev-python/ipython/ipython-0.6.15.ebuild,v 1.1 2005/06/03 21:03:12 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-0.6.15.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="An advanced interactive shell for Python."
 HOMEPAGE="http://ipython.scipy.org/"
 SRC_URI="http://ipython.scipy.org/dist/${P}.tar.gz"
 
-LICENSE="PYTHON"
+LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~s390 ~x86"
 IUSE="gnuplot"
diff --git a/dev-python/ipython/metadata.xml b/dev-python/ipython/metadata.xml
index de483c53568f..c79ff593f267 100644
--- a/dev-python/ipython/metadata.xml
+++ b/dev-python/ipython/metadata.xml
@@ -2,4 +2,42 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+IPython provides a replacement for the interactive Python interpreter with
+extra functionality.
+
+Main features:
+* Comprehensive object introspection.
+* Input history, persistent across sessions.
+* Caching of output results during a session with automatically generated
+  references.
+* Readline based name completion.
+* Extensible system of 'magic' commands for controlling the environment and
+  performing many tasks related either to IPython or the operating system.
+* Configuration system with easy switching between different setups (simpler
+  than changing $PYTHONSTARTUP environment variables every time).
+* Session logging and reloading.
+* Extensible syntax processing for special purpose situations.
+* Access to the system shell with user-extensible alias system.
+* Easily embeddable in other Python programs.
+* Integrated access to the pdb debugger and the Python profiler.
+</longdescription>
+<longdescription lang="ja">
+対話的に利用する場合にPythonインタープリタから、より機能が豊富なIPythonへ置き換>える事ができます。
+
+主機能：
+* 内包的オブジェクトの分析。
+* 入力ヒストリーはセッションを越えて記憶し続けます。
+* 出力は自動作成されるリファレンスのセッション間はキャッシュします。
+* Readlineを利用した名前補完。
+* 環境管理とIPythonまたはOSのどちらかに関係するタスク実行のためのmagic
+  コマンドを拡張可能なシステム。
+* 異なるセットアップを簡単に交換できるコンフィグレーション・システム。
+  (毎回起動時に、$PYTHONSTARTUP環境変数を指定するよりも簡単です。)
+* セッション・ロギングとセッション・リローディング。
+* 特別な状況時のための拡張可能な構文解析。
+* ユーザー定義できるエイリアス・システムでシステム・シェルにアクセス。
+* 他のPython言語プログラムを組み込むのが簡単。
+* pdbデバッガとprofilerへの統合アクセス。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/irman-python/ChangeLog b/dev-python/irman-python/ChangeLog
index bc8889395592..087c6e67963a 100644
--- a/dev-python/irman-python/ChangeLog
+++ b/dev-python/irman-python/ChangeLog
@@ -1,8 +1,26 @@
 # ChangeLog for dev-python/irman-python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/ChangeLog,v 1.1 2002/08/08 02:32:50 chouser Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> irman-python-0.1.ebuild:
+  Mark 0.1 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> irman-python-0.1.ebuild:
+  add ~ia64
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> irman-python-0.1.ebuild:
+  stable on amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  irman-python-0.1.ebuild:
+  ~amd64.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *irman-python-0.1 (07 Aug 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> irman-python-0.1.ebuild:
+  ebuild cleanups
+
   07 Aug 2002; Chris Houser <chouser@gentoo.org> irman-python-0.1.ebuild,
   files/digest-irman-python-0.1, ChangeLog: New ebuild.
diff --git a/dev-python/irman-python/Manifest b/dev-python/irman-python/Manifest
index e69de29bb2d1..e581cbbecdc3 100644
--- a/dev-python/irman-python/Manifest
+++ b/dev-python/irman-python/Manifest
@@ -0,0 +1,4 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 d049d49f0c218874c0510620ae5c5b47 ChangeLog 937
+MD5 958a2bcaa3d642c5677c44fda30bf938 irman-python-0.1.ebuild 622
+MD5 13932e568255b0d63d8ca107bddd572c files/digest-irman-python-0.1 67
diff --git a/dev-python/irman-python/irman-python-0.1.ebuild b/dev-python/irman-python/irman-python-0.1.ebuild
index bf47b077fb88..0a8e061de437 100644
--- a/dev-python/irman-python/irman-python-0.1.ebuild
+++ b/dev-python/irman-python/irman-python-0.1.ebuild
@@ -1,23 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/irman-python-0.1.ebuild,v 1.1 2002/08/08 02:32:50 chouser Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/irman-python/irman-python-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
+inherit distutils
+
+IUSE=""
 DESCRIPTION="A minimal set of Python bindings for libirman."
 SRC_URI="http://bluweb.com/chouser/proj/${PN}/${P}.tar.gz"
 HOMEPAGE="http://bluweb.com/chouser/proj/irman-python/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="alpha amd64 ia64 sparc x86"
 
 DEPEND="media-libs/libirman"
-#RDEPEND=""
-
-src_compile() {
-	python setup.py build || die
-}
 
-src_install () {
-	python setup.py install --root=${D} || die
-	dodoc README test_name.py
+src_install() {
+	distutils_src_install
+	insinto /usr/share/doc/${PF}
+	doins test_name.py
 }
diff --git a/dev-python/japanesecodecs/ChangeLog b/dev-python/japanesecodecs/ChangeLog
index 85c6e7873700..b391622c5c1b 100644
--- a/dev-python/japanesecodecs/ChangeLog
+++ b/dev-python/japanesecodecs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/japanesecodecs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/japanesecodecs/ChangeLog,v 1.1 2003/06/24 23:58:43 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/japanesecodecs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> japanesecodecs-1.4.9.ebuild:
+  Added to ~ppc.
 
 *japanesecodecs-1.4.9 (25 Jun 2003)
 
diff --git a/dev-python/japanesecodecs/Manifest b/dev-python/japanesecodecs/Manifest
index e65e69acf51e..4972c4e56553 100644
--- a/dev-python/japanesecodecs/Manifest
+++ b/dev-python/japanesecodecs/Manifest
@@ -1,2 +1,14 @@
-MD5 76b16d97fdd5889008b0aa053c19bb9a japanesecodecs-1.4.9.ebuild 722
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bed0ead0ef1b85bf43d6c81859882ea2 ChangeLog 444
+MD5 4456add8246e61e0cc5e1d22d1023fdd japanesecodecs-1.4.9.ebuild 728
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 1faa4ac09ca67207df0649df30e461f7 files/digest-japanesecodecs-1.4.9 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCBvhZxtZcznfol0URAkGoAKD/Ez8ewdt95D9F3Ca+SWgvoXPwdgCgz+UI
+wu9XPZeODKCoAGnN54P+tiw=
+=TLcl
+-----END PGP SIGNATURE-----
diff --git a/dev-python/japanesecodecs/japanesecodecs-1.4.9.ebuild b/dev-python/japanesecodecs/japanesecodecs-1.4.9.ebuild
index d9554f55b1bc..de67492be7b7 100644
--- a/dev-python/japanesecodecs/japanesecodecs-1.4.9.ebuild
+++ b/dev-python/japanesecodecs/japanesecodecs-1.4.9.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/dev-python/japanesecodecs/japanesecodecs-1.4.9.ebuild,v 1.1 2003/06/24 23:58:43 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/japanesecodecs/japanesecodecs-1.4.9.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.asahi-net.or.jp/~rd6t-kjym/python/"
 IUSE=""
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=dev-lang/python-1.6"
 
diff --git a/dev-python/jaxml/ChangeLog b/dev-python/jaxml/ChangeLog
index 6db7dc371c94..3cb6301349ff 100644
--- a/dev-python/jaxml/ChangeLog
+++ b/dev-python/jaxml/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-python/jaxml
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jaxml/ChangeLog,v 1.1 2004/08/23 06:17:43 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jaxml/ChangeLog,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
+
+  29 Dec 2004; Joseph Jezak <josejx@gentoo.org> jaxml-3.01.ebuild:
+  Marked ppc stable.
+
+  20 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> jaxml-3.01.ebuild:
+  Marked stable x86
+
+  05 Oct 2004; Dylan Carlson <absinthe@gentoo.org> jaxml-3.01.ebuild:
+  KEYWORDS ~amd64
+
+*jaxml-3.01 (03 Sep 2004)
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> jaxml-3.01.ebuild:
+  Added to ~ppc.
 
   22 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> :
   Initial commit
diff --git a/dev-python/jaxml/Manifest b/dev-python/jaxml/Manifest
index 22f3a76c1c16..89836a8c0feb 100644
--- a/dev-python/jaxml/Manifest
+++ b/dev-python/jaxml/Manifest
@@ -1,4 +1,4 @@
-MD5 299c48494cc5c1c42f236b807e40a6a5 jaxml-3.01.ebuild 578
+MD5 527edd926b8e0585f097abee798904cb ChangeLog 658
+MD5 c07fe43ee4dd41b5826b483fcbdbc2e6 jaxml-3.01.ebuild 616
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 c21d9cc4871b1f1090f1ed17a6820431 ChangeLog 190
 MD5 913397ce32a9514abaf4d40c257756f5 files/digest-jaxml-3.01 61
diff --git a/dev-python/jaxml/jaxml-3.01.ebuild b/dev-python/jaxml/jaxml-3.01.ebuild
index 55552a85dfe5..83be1c542327 100644
--- a/dev-python/jaxml/jaxml-3.01.ebuild
+++ b/dev-python/jaxml/jaxml-3.01.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/dev-python/jaxml/jaxml-3.01.ebuild,v 1.1 2004/08/23 06:17:43 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jaxml/jaxml-3.01.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.librelogiciel.com/software/jaxml/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64"
 
 IUSE=""
 DEPEND="virtual/python"
diff --git a/dev-python/jonpy/ChangeLog b/dev-python/jonpy/ChangeLog
index 3db7993cfd81..919def3b23a9 100644
--- a/dev-python/jonpy/ChangeLog
+++ b/dev-python/jonpy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/jonpy
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/ChangeLog,v 1.1 2004/12/20 21:52:00 port001 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
+
+  31 May 2005; Ian Leitch <port001@gentoo.org> jonpy-0.06.ebuild:
+  Stable on x86
+
+  19 Dec 2004; Ian Leitch <port001@gentoo.org> jonpy-0.06.ebuild:
+  Minor fixes
 
 *jonpy-0.06 (19 Dec 2004)
 
diff --git a/dev-python/jonpy/Manifest b/dev-python/jonpy/Manifest
index 9816136cc0c2..f35715c21fb7 100644
--- a/dev-python/jonpy/Manifest
+++ b/dev-python/jonpy/Manifest
@@ -1,2 +1,4 @@
-MD5 603e35076f41ff62741f288e33a81b99 jonpy-0.06.ebuild 1016
+MD5 a52b6159573bb67796908b92f5615b8a jonpy-0.06.ebuild 968
+MD5 eaecc79ee39e48e3c8a9dc7eb0f79e5f ChangeLog 499
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 eb196cd700a10300226f3854009cd800 files/digest-jonpy-0.06 61
diff --git a/dev-python/jonpy/jonpy-0.06.ebuild b/dev-python/jonpy/jonpy-0.06.ebuild
index 216f37a36a46..cf712cc62fe8 100644
--- a/dev-python/jonpy/jonpy-0.06.ebuild
+++ b/dev-python/jonpy/jonpy-0.06.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/dev-python/jonpy/jonpy-0.06.ebuild,v 1.1 2004/12/20 21:52:00 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jonpy/jonpy-0.06.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND=">=dev-lang/python-2.2"
 RDEPEND="${DEPEND}"
@@ -20,17 +20,13 @@ RDEPEND="${DEPEND}"
 src_install() {
 	distutils_src_install
 
-	dodir /usr/share/${P}/wt-examples
 	insinto /usr/share/${P}/wt-examples
 	doins ${S}/example/printenv.html ${S}/example/wt/printenv.html.py
-	dodir /usr/share/${P}/wt-examples/cgi-bin
 	insinto /usr/share/${P}/wt-examples/cgi-bin
 	doins ${S}/example/cgi-bin/wt.py
 
-	dodir /usr/share/doc/${P}/html/
-	insinto /usr/share/doc/${P}/html
 	for file in `ls ${S}/doc/`; do
-		doins ${S}/doc/${file}
+		dohtml ${S}/doc/${file}
 	done
 
 	dodoc LICENCE README
diff --git a/dev-python/kinterbasdb/ChangeLog b/dev-python/kinterbasdb/ChangeLog
index 6aa7e6c76d3f..9f6627877edb 100644
--- a/dev-python/kinterbasdb/ChangeLog
+++ b/dev-python/kinterbasdb/ChangeLog
@@ -1,7 +1,71 @@
 # ChangeLog for dev-python/kinterbasdb
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/ChangeLog,v 1.1 2002/07/29 09:48:10 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> kinterbasdb-3.1.2.ebuild:
+  fix docs installation (#107955)
+
+*kinterbasdb-3.1.2 (30 Sep 2005)
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +kinterbasdb-3.1.2.ebuild:
+  version bump
+
+*kinterbasdb-3.1.1 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> +kinterbasdb-3.1.1.ebuild:
+  version bump
+
+*kinterbasdb-3.1 (21 Jan 2005)
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +kinterbasdb-3.1.ebuild,
+  -kinterbasdb-3.1_pre7.ebuild, -kinterbasdb-3.1_pre8.ebuild,
+  -kinterbasdb-3.1_pre9.ebuild:
+  version bump
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*kinterbasdb-3.1_pre9 (07 Dec 2004)
+
+  07 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +kinterbasdb-3.1_pre9.ebuild:
+  version bump
+
+*kinterbasdb-3.1_pre8 (11 Oct 2004)
+
+  11 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +kinterbasdb-3.1_pre8.ebuild:
+  version bump
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kinterbasdb-3.0.1_pre3.ebuild:
+  Clean up IUSE and S.
+
+*kinterbasdb-3.1_pre7 (17 Apr 2004)
+
+  17 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +kinterbasdb-3.1_pre7.ebuild:
+  Bump version.
+
+  19 Feb 2004; Aron Griffis <agriffis@gentoo.org>
+  kinterbasdb-3.0.1_pre3.ebuild, kinterbasdb-3.0.2.ebuild:
+  Remove ~alpha since firebird isn't supported here
+
+  25 Dec 2003; Jason Wever <weeve@gentoo.org> kinterbasdb-3.0.1_pre3.ebuild,
+  kinterbasdb-3.0.2.ebuild:
+  As the dependency dev-db/firebird can only be emerged on x86, this is being
+  masked on sparc.
+
+  02 Oct 2003; Alastair Tse <liquidx@gentoo.org>
+  kinterbasdb-3.0.1_pre3.ebuild, kinterbasdb-3.0.2.ebuild,
+  files/kinterbasdb-3.0.2-py23.patch:
+  add patch for python2.3 support
+
+*kinterbasdb-3.0.2 (04 Apr 2003)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> kinterbasdb-3.0.2.ebuild:
+  version bump. about time we have a stable ver in portage.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *kinterbasdb-3.0.1_pre3 (29 Jul 2002)
 
   29 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
diff --git a/dev-python/kinterbasdb/Manifest b/dev-python/kinterbasdb/Manifest
index e69de29bb2d1..e3ce1ca17516 100644
--- a/dev-python/kinterbasdb/Manifest
+++ b/dev-python/kinterbasdb/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d1a03561a9202b124f4bd2d59ae61621 ChangeLog 2412
+MD5 c73dc01ac8a7c1d8e03eb1dfad1f64b8 files/digest-kinterbasdb-3.0.2 72
+MD5 309a78d0dd430cf2f63f9066227428ae files/digest-kinterbasdb-3.1 71
+MD5 f46da879814d964b500193d1615b4a3a files/digest-kinterbasdb-3.1.1 73
+MD5 2e8919cff19451711a360beffc123e1a files/digest-kinterbasdb-3.1.2 73
+MD5 1efb7ccd6e6d24df8da73638b1f9d443 files/kinterbasdb-3.0.2-py23.patch 2518
+MD5 8d69c72143e7e48c7d5c1387bbf05d18 kinterbasdb-3.0.2.ebuild 933
+MD5 06437059915d57fd32f5f35c989c7321 kinterbasdb-3.1.1.ebuild 784
+MD5 5ea882b369cdf19729b9816da52d5eaf kinterbasdb-3.1.2.ebuild 786
+MD5 8b138113e7cbfe22d8d1bc96d6f75fbf kinterbasdb-3.1.ebuild 782
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDanlg9ZFPrqoILX8RAi6AAKDWG4BPW4K5XI6wVcAjAu7XNIzjfgCgsE57
+97HZ7+kDT2iZnry1/nU/7Wo=
+=ABLL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/kinterbasdb/files/digest-kinterbasdb-3.0.2 b/dev-python/kinterbasdb/files/digest-kinterbasdb-3.0.2
index 83e3e08ac743..eff9bc4c7244 100644
--- a/dev-python/kinterbasdb/files/digest-kinterbasdb-3.0.2
+++ b/dev-python/kinterbasdb/files/digest-kinterbasdb-3.0.2
@@ -1,2 +1 @@
-MD5 7bdef2cf25823401f0d654d7b55a7f38 /kinterbasdb-3.0.2.ebuild 824
 MD5 8089670e2b57b7e59f984a744de24e1e kinterbasdb-3.0.2-src.tar.gz 86287
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild
index 7c5e9847c4d2..68bd9ea0cfad 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-3.0.2.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/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild,v 1.1 2003/04/04 21:54:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
-IUSE=""
-S=${WORKDIR}/${P}
-DESCRIPTION="kinterbasdb - firebird/interbase interface for Python."
+DESCRIPTION="firebird/interbase interface for Python"
+HOMEPAGE="http://kinterbasdb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/kinterbasdb/${P}-src.tar.gz"
-HOMEPAGE="http://kinterbasdb.sourceforge.net"
+
 LICENSE="kinterbasdb"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 -sparc"
+IUSE=""
 
-DEPEND="virtual/python
-	>=dev/db/firebird-1.0_rc1
+DEPEND="dev-lang/python
+	>=dev-db/firebird-1.0_rc1
 	>=dev-python/egenix-mx-base-2.0.1"
 
+src_unpack() {
+	distutils_python_version
+	unpack ${A}
+	if [ ${PYVER_MINOR} -gt 2 ]; then
+		EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-py23.patch
+	fi
+}
+
 src_install() {
 	mydoc="docs/*.txt"
 	distutils_src_install --install-data=/usr/share/doc/${PF}
-	
+
 	# we put docs in properly ourselves
 	rm -rf ${D}/usr/share/doc/${PF}/kinterbasdb
 	dohtml docs/*.html docs/*.css
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.1.1.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.1.1.ebuild
index 69b4dd5aa2d6..cf8888ff2e65 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.1.1.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-3.1.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/dev-python/kinterbasdb/kinterbasdb-3.1.1.ebuild,v 1.1 2005/06/27 10:51:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.1.2.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.1.2.ebuild
index ef3ab930c638..d5e0cedd20fc 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.1.2.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-3.1.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/dev-python/kinterbasdb/kinterbasdb-3.1.2.ebuild,v 1.1 2005/09/30 23:45:28 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -19,7 +19,7 @@ DEPEND="virtual/python
 
 src_install() {
 	mydoc="docs/*.txt"
-	distutils_src_install --install-data=${ROOT}/usr/share/doc/${PF}
+	distutils_src_install --install-data=/usr/share/doc/${PF}
 
 	# we put docs in properly ourselves
 	rm -rf ${D}/usr/share/doc/${PF}/kinterbasdb
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.1.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.1.ebuild
index 10e94f59b535..87f4b8a2bf27 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.1.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-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/dev-python/kinterbasdb/kinterbasdb-3.1.ebuild,v 1.1 2005/01/21 16:24:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/koreancodecs/ChangeLog b/dev-python/koreancodecs/ChangeLog
index 30e79c0bc6a7..98bb56915929 100644
--- a/dev-python/koreancodecs/ChangeLog
+++ b/dev-python/koreancodecs/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/koreancodecs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/koreancodecs/ChangeLog,v 1.1 2003/06/24 23:58:11 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/koreancodecs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 *koreancodecs-2.0.5 (25 Jun 2003)
 
diff --git a/dev-python/koreancodecs/Manifest b/dev-python/koreancodecs/Manifest
index 60fd1239c9cc..e26fb7d67e13 100644
--- a/dev-python/koreancodecs/Manifest
+++ b/dev-python/koreancodecs/Manifest
@@ -1,2 +1,14 @@
-MD5 d7f27be884761653950d59ed24580de1 koreancodecs-2.0.5.ebuild 657
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea58e0e4d9851ef217efb7d718348581 ChangeLog 344
+MD5 35afaf531e155137caa3d0b13b7025f8 koreancodecs-2.0.5.ebuild 654
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 149cb8b1332753c2ebf5b5b275aa86eb files/digest-koreancodecs-2.0.5 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCBviXxtZcznfol0URAp97AKDKIqk3CcYKhLHB01kVTyHx2uVLpQCfVddx
+R4967IQfNAljGd6VEYxg07A=
+=e8es
+-----END PGP SIGNATURE-----
diff --git a/dev-python/koreancodecs/koreancodecs-2.0.5.ebuild b/dev-python/koreancodecs/koreancodecs-2.0.5.ebuild
index 5d5c315b9a8f..4e745b8be945 100644
--- a/dev-python/koreancodecs/koreancodecs-2.0.5.ebuild
+++ b/dev-python/koreancodecs/koreancodecs-2.0.5.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/dev-python/koreancodecs/koreancodecs-2.0.5.ebuild,v 1.1 2003/06/24 23:58:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/koreancodecs/koreancodecs-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/ldaptor/ChangeLog b/dev-python/ldaptor/ChangeLog
index 71aaccc9fd5b..e75b0185c415 100644
--- a/dev-python/ldaptor/ChangeLog
+++ b/dev-python/ldaptor/ChangeLog
@@ -1,7 +1,36 @@
 # ChangeLog for dev-python/ldaptor
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.1 2002/12/13 16:50:56 lordvan Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> ldaptor-0.0.6.ebuild:
+  add ~ia64
+
+*ldaptor-0.0.41 (04 Jul 2005)
+
+  04 Jul 2005; Thomas Raschbacher <lordvan@gentoo.org>
+  +ldaptor-0.0.41.ebuild:
+  Updated version for twisted-2.
+  Fixes Bug #83182; Thanks to Marien Zwart <m_zwart@123mail.org>
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> ldaptor-0.0.6.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> ldaptor-0.0.6.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> ldaptor-0.0.6.ebuild:
+  Add missing IUSE.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> ldaptor-0.0.6.ebuild:
+  Added to ~ppc.
 
 *ldaptor-0.0.6 (12 Dec 2002)
-	12 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org>
-	initial ebuild
\ No newline at end of file
+
+  05 Apr 2003; Alastair Tse <liquidx@gentoo.org> ldaptor-0.0.6.ebuild:
+  bump to stable
+
+  12 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org> :
+  initial ebuild
diff --git a/dev-python/ldaptor/Manifest b/dev-python/ldaptor/Manifest
index e69de29bb2d1..e2219c023ef2 100644
--- a/dev-python/ldaptor/Manifest
+++ b/dev-python/ldaptor/Manifest
@@ -0,0 +1,6 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 f9fbcba8544e83a1d52fc2a1ce250bdf ChangeLog 1176
+MD5 c791de3cfca7aa2ac58ff95787146e90 ldaptor-0.0.6.ebuild 1261
+MD5 1386b13c98e416060b9fae1cd955bf87 ldaptor-0.0.41.ebuild 1880
+MD5 f1a50bdcead4cc02050cb4bcc614b1a0 files/digest-ldaptor-0.0.41 66
+MD5 43feb7d34a8c766f9dc97801fb2a7ce5 files/digest-ldaptor-0.0.6 64
diff --git a/dev-python/ldaptor/ldaptor-0.0.41.ebuild b/dev-python/ldaptor/ldaptor-0.0.41.ebuild
index edd55adc87e0..e18241e89324 100644
--- a/dev-python/ldaptor/ldaptor-0.0.41.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.41.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/dev-python/ldaptor/ldaptor-0.0.41.ebuild,v 1.1 2005/07/04 16:01:15 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.41.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/ldaptor/ldaptor-0.0.6.ebuild b/dev-python/ldaptor/ldaptor-0.0.6.ebuild
index c64b75cd8fe3..9025a26f1bff 100644
--- a/dev-python/ldaptor/ldaptor-0.0.6.ebuild
+++ b/dev-python/ldaptor/ldaptor-0.0.6.ebuild
@@ -1,33 +1,32 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.6.ebuild,v 1.1 2002/12/13 16:50:56 lordvan Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ldaptor/ldaptor-0.0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Ldaptor" 
-SRC_URI="http://twistedmatrix.com/users/tv/ldaptor/${PN}_${PV}.tar.gz"
+DESCRIPTION="set of LDAP utilities for use from the command line"
 HOMEPAGE="http://twistedmatrix.com/users/tv/ldaptor/"
+SRC_URI="http://twistedmatrix.com/users/tv/ldaptor/${PN}_${PV}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-DEPEND=">=dev-python/twisted-1.0.1-r1"
-RDEPEND="$DEPEND"
-KEYWORDS="~x86 ~alpha ~sparc"
+KEYWORDS="alpha ~ia64 ppc ~sparc x86"
 IUSE=""
 
-#inherit distutils
+DEPEND=">=dev-python/twisted-1.0.1-r1"
 
 src_compile() {
 	python setup-ldaptor-utils.py build || \
-	    die "compilation of ldaptor-utils failed"
+		die "compilation of ldaptor-utils failed"
 	python setup-ldaptor-webui.py build || \
-	    die "compilation of ldaptor-webui failed"
+		die "compilation of ldaptor-webui failed"
 	python setup-python-ldaptor.py build || \
-	    die "compilation of python-ldaptor failed"
+		die "compilation of python-ldaptor failed"
 }
+
 src_install() {
 	python setup-ldaptor-utils.py install --root=${D} || die
 	python setup-ldaptor-webui.py install --root=${D} || die
 	python setup-python-ldaptor.py install --root=${D} || die
-	
+
 	dodoc README TODO rfc2251-status.txt
 
 	# install examples
@@ -38,6 +37,5 @@ src_install() {
 	# install tests
 	dodir /usr/share/doc/${PF}/tests
 	insinto /usr/share/doc/${PF}/tests
-       	doins tests/*
+	doins tests/*
 }
-
diff --git a/dev-python/log4py/ChangeLog b/dev-python/log4py/ChangeLog
index dfd239279efc..ebfe9ec96e33 100644
--- a/dev-python/log4py/ChangeLog
+++ b/dev-python/log4py/ChangeLog
@@ -1,7 +1,38 @@
 # ChangeLog for dev-python/log4py
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/log4py/ChangeLog,v 1.1 2002/11/03 21:17:49 roughneck Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/log4py/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
+  19 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> log4py-1.3.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Oct 2004; Jason Wever <weeve@gentoo.org> log4py-1.3.ebuild:
+  Stable on sparc.
+
+  21 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> log4py-1.3.ebuild:
+  Marked stable on x86
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> log4py-1.1.ebuild,
+  log4py-1.3.ebuild:
+  Add missing IUSE.
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> log4py-1.1.ebuild:
+  Update SRC_URI.
+
+*log4py-1.3 (10 Mar 2004)
+
+  10 Mar 2004; Bryan Østergaard,,, <kloeri@gentoo.org> log4py-1.3.ebuild:
+  Version bump.
+
+*log4py-1.1 (22 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   03 Nov 2002; Nicholas Henke <roughneck@gentoo.org> ChangeLog  :
 
   Initial import. Thanks to Eivind Tagseth <eivindt-gentoo@multinet.no>
diff --git a/dev-python/log4py/Manifest b/dev-python/log4py/Manifest
index e69de29bb2d1..34597299dbcf 100644
--- a/dev-python/log4py/Manifest
+++ b/dev-python/log4py/Manifest
@@ -0,0 +1,6 @@
+MD5 e6930dde7bb518f0b3dad50ef9c1f130 log4py-1.1.ebuild 692
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 aadfe1b78b7d53c36910552901d2089a ChangeLog 1259
+MD5 d84d3905c153bafb147cd403e680dce5 log4py-1.3.ebuild 639
+MD5 d6230afef2a760646cfe22b07aa86d68 files/digest-log4py-1.3 61
+MD5 a820c38660b8c987de0c9e71a7786846 files/digest-log4py-1.1 61
diff --git a/dev-python/log4py/log4py-1.1.ebuild b/dev-python/log4py/log4py-1.1.ebuild
index 1542b81a28f7..83279501f4d1 100644
--- a/dev-python/log4py/log4py-1.1.ebuild
+++ b/dev-python/log4py/log4py-1.1.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/dev-python/log4py/log4py-1.1.ebuild,v 1.1 2002/11/03 21:17:49 roughneck Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/log4py/log4py-1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A python logging module similar to log4j"
-SRC_URI="http://www.its4you.at/downloads/files/${P}.tar.gz"
 HOMEPAGE="http://www.its4you.at/english/log4py.html"
+#SRC_URI="http://www.its4you.at/downloads/files/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/log4py/${P}.tar.gz"
 
-DEPEND="virtual/python"
-RDEPEND=""
-IUSE=""
-
-SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64"
 LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
-inherit distutils
+DEPEND="virtual/python"
+RDEPEND=""
 
 src_install() {
 	mydoc="doc/*.* database/* log4py-test.py"
@@ -25,4 +25,3 @@ src_install() {
 	insinto /etc
 	doins log4py.conf
 }
-
diff --git a/dev-python/log4py/log4py-1.3.ebuild b/dev-python/log4py/log4py-1.3.ebuild
index 0365c77dc19d..3298b5d6c923 100644
--- a/dev-python/log4py/log4py-1.3.ebuild
+++ b/dev-python/log4py/log4py-1.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/dev-python/log4py/log4py-1.3.ebuild,v 1.1 2004/03/10 00:40:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/log4py/log4py-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,8 @@ SRC_URI="http://www.its4you.at/downloads/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
 DEPEND="virtual/python"
 RDEPEND=""
diff --git a/dev-python/logging/ChangeLog b/dev-python/logging/ChangeLog
index 505b31692687..18d522ea5726 100644
--- a/dev-python/logging/ChangeLog
+++ b/dev-python/logging/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for dev-python/logging
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logging/ChangeLog,v 1.1 2003/11/12 19:01:14 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logging/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> logging-0.4.7.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> logging-0.4.7.ebuild:
+  stable on amd64
+
+*logging-0.4.9.5 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +logging-0.4.9.5.ebuild:
+  Version bump.
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> logging-0.4.7.ebuild:
+  stable on x86
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> logging-0.4.7.ebuild:
+  Added to ~ppc.
+
+  09 Oct 2004; Tom Martin <slarti@gentoo.org> logging-0.4.7.ebuild:
+  Marked ~amd64.
 
 *logging-0.4.7 (12 Nov 2003)
 
diff --git a/dev-python/logging/Manifest b/dev-python/logging/Manifest
index 07788a9c047d..e22e91213216 100644
--- a/dev-python/logging/Manifest
+++ b/dev-python/logging/Manifest
@@ -1,4 +1,6 @@
-MD5 1442c7f81ff5fa3f6d1dd965aae4497f logging-0.4.7.ebuild 556
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 13a43decb5208691ad41961e1ee568f0 ChangeLog 309
+MD5 fbdeed345fd7ef14c3360dad89616738 ChangeLog 968
+MD5 ae687b09c259e02f3566e644da372031 logging-0.4.7.ebuild 658
+MD5 65544a030fa86fb65a099e3605119b4b logging-0.4.9.5.ebuild 663
+MD5 5f6e062176313ce8144ce5483c107171 files/digest-logging-0.4.9.5 66
 MD5 6f782707ef56c8f21234aac23074feff files/digest-logging-0.4.7 64
diff --git a/dev-python/logging/logging-0.4.7.ebuild b/dev-python/logging/logging-0.4.7.ebuild
index f8c5e6cad7d1..a6fc4e391b3f 100644
--- a/dev-python/logging/logging-0.4.7.ebuild
+++ b/dev-python/logging/logging-0.4.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/dev-python/logging/logging-0.4.7.ebuild,v 1.1 2003/11/12 19:01:14 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logging/logging-0.4.7.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.red-dove.com/python_logging.html"
 SRC_URI="http://www.red-dove.com/logging-${PV}.tar.gz"
 LICENSE="logging"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc"
 IUSE=""
 DEPEND="virtual/python"
 DOCS="liblogging.tex"
diff --git a/dev-python/logging/logging-0.4.9.5.ebuild b/dev-python/logging/logging-0.4.9.5.ebuild
index 56e7bba81e88..9c368581f4f7 100644
--- a/dev-python/logging/logging-0.4.9.5.ebuild
+++ b/dev-python/logging/logging-0.4.9.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/dev-python/logging/logging-0.4.9.5.ebuild,v 1.1 2005/04/14 20:16:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logging/logging-0.4.9.5.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog
index 72d4baeffbe2..3c90a24aa682 100644
--- a/dev-python/logilab-common/ChangeLog
+++ b/dev-python/logilab-common/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for dev-python/logilab-common
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.1 2003/10/14 18:21:54 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+*logilab-common-0.12.0 (05 Nov 2005)
+
+  05 Nov 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +logilab-common-0.12.0.ebuild:
+  Version bump. Added optional dependency on optik. Closing bug #108711.
+
+*logilab-common-0.10.0 (27 May 2005)
+
+  27 May 2005; Alastair Tse <liquidx@gentoo.org>
+  -logilab-common-0.4.4.ebuild, -logilab-common-0.9.0.ebuild,
+  -logilab-common-0.9.1.ebuild, logilab-common-0.9.3.ebuild,
+  +logilab-common-0.10.0.ebuild:
+  version bump
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> logilab-common-0.9.3.ebuild:
+  Added ~sparc keyword.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  logilab-common-0.5.0.ebuild:
+  stable on amd64
+
+*logilab-common-0.9.3 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +logilab-common-0.9.3.ebuild:
+  Version bump.
+
+*logilab-common-0.9.1 (19 Mar 2005)
+
+  19 Mar 2005; Fernando Serboncini <fserb@gentoo.org>
+  -logilab-common-0.3.4.ebuild, +logilab-common-0.9.1.ebuild:
+  Version bump. Removed old version.
+
+*logilab-common-0.9.0 (24 Jan 2005)
+
+  24 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +logilab-common-0.9.0.ebuild:
+  Version bump.
+
+  24 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> :
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  logilab-common-0.5.0.ebuild:
+  Bump x86 stable.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  logilab-common-0.5.0.ebuild:
+  keywords ~amd64; closes #60986.
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> logilab-common-0.3.4.ebuild,
+  logilab-common-0.4.4.ebuild, logilab-common-0.5.0.ebuild:
+  Typo in DESCRIPTION: developped -> developed; functionnalities ->
+  functionality. Bug 59717.
+
+  12 May 2004; David Holm <dholm@gentoo.org> logilab-common-0.5.0.ebuild:
+  Added to ~ppc.
+
+*logilab-common-0.5.0 (12 May 2004)
+
+  12 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +logilab-common-0.5.0.ebuild:
+  Version bump.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  logilab-common-0.3.4.ebuild, logilab-common-0.4.4.ebuild:
+  Add missing IUSE.
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org>
+  logilab-common-0.4.4.ebuild:
+  adding s390 keywords
+
+*logilab-common-0.4.4 (17 Feb 2004)
+
+  17 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  logilab-common-0.4.4.ebuild:
+  Version bump.
 
 *logilab-common-0.3.4 (14 Oct 2003)
 
diff --git a/dev-python/logilab-common/Manifest b/dev-python/logilab-common/Manifest
index 6b940bca4696..eb381db5f8d5 100644
--- a/dev-python/logilab-common/Manifest
+++ b/dev-python/logilab-common/Manifest
@@ -1,2 +1,20 @@
-MD5 5ec2a0a48e1e71966a5f7e4c7765f2f1 logilab-common-0.3.4.ebuild 611
-MD5 188ecf8b51f1761687a48e3c41c0218c files/digest-logilab-common-0.3.4 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7f2b20883f9d0690c4fc3dbde72f5068 ChangeLog 2762
+MD5 3d47855a9c3abeeaacd705ff63e2499d files/digest-logilab-common-0.10.0 65
+MD5 af0e585126bf2c86e2be032d330c7368 files/digest-logilab-common-0.12.0 65
+MD5 229d5c1c48d6d7a481231e941be3abc6 files/digest-logilab-common-0.5.0 63
+MD5 532c5af1f9cb47abbf7283f6ba517826 files/digest-logilab-common-0.9.3 64
+MD5 a55d8a892bae77097273d31368d8f02c logilab-common-0.10.0.ebuild 723
+MD5 7601e2d066dcdaa761b5e8c7660cc9ce logilab-common-0.12.0.ebuild 773
+MD5 49e47ae120639f7eaed252393cd57f9c logilab-common-0.5.0.ebuild 627
+MD5 3545fd8d38016d3e7aa7ce59ec1ca6a6 logilab-common-0.9.3.ebuild 719
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbRL32jLqHNfbg2URAsUGAJ0Sf6ebBTj3gbi0UoawptWC/WDH5wCdEI1U
+LcZGZ3BJRw9ptnKfFdmF/GE=
+=ERHD
+-----END PGP SIGNATURE-----
diff --git a/dev-python/logilab-common/logilab-common-0.10.0.ebuild b/dev-python/logilab-common/logilab-common-0.10.0.ebuild
index 1b2848acf26d..d07bb9be1159 100644
--- a/dev-python/logilab-common/logilab-common-0.10.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.10.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/dev-python/logilab-common/logilab-common-0.10.0.ebuild,v 1.1 2005/05/27 17:40:13 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.10.0.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/logilab-common/logilab-common-0.12.0.ebuild b/dev-python/logilab-common/logilab-common-0.12.0.ebuild
index 029fb2e0f06d..437b7febcbe3 100644
--- a/dev-python/logilab-common/logilab-common-0.12.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.12.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/dev-python/logilab-common/logilab-common-0.12.0.ebuild,v 1.1 2005/11/05 20:15:10 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.12.0.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/logilab-common/logilab-common-0.5.0.ebuild b/dev-python/logilab-common/logilab-common-0.5.0.ebuild
index 80d53319d90b..be693fb1eb5b 100644
--- a/dev-python/logilab-common/logilab-common-0.5.0.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.5.0.ebuild
@@ -1,19 +1,20 @@
-# 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/dev-python/logilab-common/logilab-common-0.5.0.ebuild,v 1.1 2004/05/12 08:58:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
-DESCRIPTION="Several modules providing low level functionnalities shared among some python projects developped by logilab."
-SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
+DESCRIPTION="Several modules providing low level functionality shared among some python projects developed by logilab."
 HOMEPAGE="http://www.logilab.org/projects/common/"
+SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
 
-SLOT="0"
-KEYWORDS="~x86 ~s390"
 LICENSE="GPL-2"
-DEPEND=""
+SLOT="0"
+KEYWORDS="amd64 ~ppc s390 x86"
 IUSE=""
 
+DEPEND=""
+
 S=${WORKDIR}/${P#logilab-}
 
 PYTHON_MODNAME="logilab"
diff --git a/dev-python/logilab-common/logilab-common-0.9.3.ebuild b/dev-python/logilab-common/logilab-common-0.9.3.ebuild
index ae103bc7a3ee..bfccc3c1aa90 100644
--- a/dev-python/logilab-common/logilab-common-0.9.3.ebuild
+++ b/dev-python/logilab-common/logilab-common-0.9.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/dev-python/logilab-common/logilab-common-0.9.3.ebuild,v 1.1 2005/04/14 18:17:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.9.3.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.logilab.org/pub/common/${P#logilab-}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86"
+KEYWORDS="~amd64 ~ppc s390 ~sparc x86"
 IUSE="doc"
 
 DEPEND=""
diff --git a/dev-python/lupy/ChangeLog b/dev-python/lupy/ChangeLog
index 81e7f84cc4b1..c7fbb2536cc1 100644
--- a/dev-python/lupy/ChangeLog
+++ b/dev-python/lupy/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-python/lupy
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/ChangeLog,v 1.1 2004/02/17 14:37:48 lordvan Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+*lupy-0.2.1-r1 (03 Nov 2005)
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> +lupy-0.2.1-r1.ebuild:
+  added examples (#72183)
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> lupy-0.1.5.5.1.ebuild:
+  stable on x86
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> lupy-0.2.1.ebuild:
+  Added to ~ppc.
+
+*lupy-0.2.1 (07 Jun 2004)
+
+  07 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org> +lupy-0.2.1.ebuild:
+  version bump
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> lupy-0.1.5.5.1.ebuild:
+  adding s390 keywords
 
 *lupy-0.1.5.5.1 (17 Feb 2004)
   
diff --git a/dev-python/lupy/Manifest b/dev-python/lupy/Manifest
index c682d7fbd1b1..bf89e4783a37 100644
--- a/dev-python/lupy/Manifest
+++ b/dev-python/lupy/Manifest
@@ -1,5 +1,18 @@
-MD5 c7ae422546cd361aaa3f48acebc33441 lupy-0.1.5.5.1.ebuild 595
-MD5 d0a41451691829049fd5325cdb9972c7 lupy-0.1.5.5.1.ebuild~ 524
-MD5 f023b3df68620196635841749ebaefa4 ChangeLog 221
-MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cd19dbb161b4a0ee3660b0166ae754ec ChangeLog 851
 MD5 0f60e060b28ea362d83860a419037ac5 files/digest-lupy-0.1.5.5.1 65
+MD5 fc06876de6c00000062b0458ac1a4be2 files/digest-lupy-0.2.1 61
+MD5 fc06876de6c00000062b0458ac1a4be2 files/digest-lupy-0.2.1-r1 61
+MD5 3864d8be41281f533d86005b487129d4 lupy-0.1.5.5.1.ebuild 569
+MD5 5647f3be95657481dffb281c578ec1ec lupy-0.2.1-r1.ebuild 754
+MD5 6a8c093ffea10c4afe499069cd40771f lupy-0.2.1.ebuild 572
+MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDamkR9ZFPrqoILX8RAhvwAKDAD0+m/b4VnuXB1pf2XSBdtFjTUwCg0Qdr
+Ev63RyzJCNMaSlvPwmQUMeU=
+=fsKk
+-----END PGP SIGNATURE-----
diff --git a/dev-python/lupy/lupy-0.1.5.5.1.ebuild b/dev-python/lupy/lupy-0.1.5.5.1.ebuild
index 7a24c11a8a01..696be3c5c632 100644
--- a/dev-python/lupy/lupy-0.1.5.5.1.ebuild
+++ b/dev-python/lupy/lupy-0.1.5.5.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/dev-python/lupy/lupy-0.1.5.5.1.ebuild,v 1.1 2004/02/17 14:37:48 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/lupy-0.1.5.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 s390"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2"
diff --git a/dev-python/lupy/lupy-0.2.1-r1.ebuild b/dev-python/lupy/lupy-0.2.1-r1.ebuild
index e8c2113e2c10..37bc260a49d4 100644
--- a/dev-python/lupy/lupy-0.2.1-r1.ebuild
+++ b/dev-python/lupy/lupy-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/dev-python/lupy/lupy-0.2.1-r1.ebuild,v 1.1 2005/11/03 19:22:44 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/lupy-0.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/lupy/lupy-0.2.1.ebuild b/dev-python/lupy/lupy-0.2.1.ebuild
index 36e5f133587c..a968b3569d8b 100644
--- a/dev-python/lupy/lupy-0.2.1.ebuild
+++ b/dev-python/lupy/lupy-0.2.1.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/dev-python/lupy/lupy-0.2.1.ebuild,v 1.1 2004/06/07 14:51:35 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lupy/lupy-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lupy/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~s390"
+KEYWORDS="~x86 ~s390 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2"
diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index 413fb7fe2c84..72af712df1be 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.1 2005/06/01 18:45:56 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
+
+*lxml-0.7 (19 Jul 2005)
+
+  19 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org> lxml-0.6.ebuild,
+  +lxml-0.7.ebuild:
+  Version bump. lxml-0.6 marked stable on x86.
 
 *lxml-0.6 (01 Jun 2005)
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 91c19248ac57..317664f32992 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,2 +1,16 @@
-MD5 c51c7816bc1a924ed846ff25d7f57e0b lxml-0.6.ebuild 569
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7e8e9e49fbf3787b24a5e87557ba365b ChangeLog 540
+MD5 06d5d64e5842e4de1bb14a6450670560 lxml-0.6.ebuild 1100
+MD5 b1eb20e565b930da070ca35524c24c12 lxml-0.7.ebuild 1101
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 415567e1fbba918281e869680c0d4b58 files/digest-lxml-0.6 56
+MD5 17c885161b048d03fb4ca42cb4254153 files/digest-lxml-0.7 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3XFn2jLqHNfbg2URAiC8AKC4I4VFLjtX0AxxdzAsUsT0ZZgT9ACglMXl
+HEJC/IUm+Ek1rKrCrFVaPA8=
+=sI0D
+-----END PGP SIGNATURE-----
diff --git a/dev-python/lxml/lxml-0.6.ebuild b/dev-python/lxml/lxml-0.6.ebuild
index d16dd39daac1..5d52e63c449b 100644
--- a/dev-python/lxml/lxml-0.6.ebuild
+++ b/dev-python/lxml/lxml-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/dev-python/lxml/lxml-0.6.ebuild,v 1.1 2005/06/01 18:45:56 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://codespeak.net/lxml/${P}.tgz"
 
 LICENSE="BSD GPL-2 as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-libs/libxml2-2.2.16
diff --git a/dev-python/lxml/lxml-0.7.ebuild b/dev-python/lxml/lxml-0.7.ebuild
index 3d054ade3b28..a994c945d3da 100644
--- a/dev-python/lxml/lxml-0.7.ebuild
+++ b/dev-python/lxml/lxml-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/dev-python/lxml/lxml-0.7.ebuild,v 1.1 2005/07/19 21:30:51 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index c1ca2f08ca1f..1cffcdbfe19f 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,55 @@
 # ChangeLog for dev-python/m2crypto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.1 2002/12/16 23:51:38 jrray Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+*m2crypto-0.13.1 (02 Nov 2005)
+
+  02 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +files/m2crypto-0.13-gentoo.patch, +m2crypto-0.13.1.ebuild:
+  version bump (patch only), fixing SWIG errors with latest python/openssl
+  (made patch for it), added 'doc' use-flag (pulls api-docs, installs
+  examples), general ebuild cleanup.
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  m2crypto-0.07_alpha3.ebuild, m2crypto-0.12.ebuild,
+  m2crypto-0.12-r1.ebuild, m2crypto-0.13.ebuild:
+  Fix HOMEPAGE.
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  m2crypto-0.07_alpha3.ebuild, m2crypto-0.12.ebuild,
+  m2crypto-0.12-r1.ebuild, m2crypto-0.13.ebuild:
+  Fix cp -a stuff, bug 103487.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  m2crypto-0.07_alpha3.ebuild, m2crypto-0.12-r1.ebuild,
+  m2crypto-0.12.ebuild, m2crypto-0.13.ebuild:
+  depend on app-arch/unzip bug# 69831
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> m2crypto-0.13.ebuild:
+  Added to ~ppc.
+
+*m2crypto-0.13 (31 Mar 2004)
+
+  31 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> m2crypto-0.13.ebuild:
+  Version bump.
+
+*m2crypto-0.12-r1 (26 Feb 2004)
+
+  26 Feb 2004; <kloeri@gentoo.org> m2crypto-0.12-r1.ebuild:
+  Add missing dependency, close bug #42761.
+
+  02 Feb 2004; Alastair Tse <liquidx@gentoo.org> m2crypto-0.12.ebuild:
+  stable bump to match python2.3 (#33971)
+
+*m2crypto-0.12 (23 Nov 2003)
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org> m2crypto-0.12.ebuild:
+  version bump. major cleanups to ebuild, changed SRC_URI and LICENSE
+
+  07 Jan 2003; J Robert Ray <jrray@gentoo.org> : unmasking for x86.
 
 *m2crypto-0.07_alpha3 (16 Dec 2002)
 
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index e69de29bb2d1..299721e3a357 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -0,0 +1,13 @@
+MD5 f6d03d3af0aaecea8e311f0535258129 ChangeLog 2059
+MD5 7601c8dba6f5d47b6abd298e4aa754c1 files/digest-m2crypto-0.07_alpha3 68
+MD5 7861e3954b04c975b4c51806c167389b files/digest-m2crypto-0.12 62
+MD5 7861e3954b04c975b4c51806c167389b files/digest-m2crypto-0.12-r1 62
+MD5 0dde9c7574cf4a141183111f8c3f97dd files/digest-m2crypto-0.13 62
+MD5 f88a0ced38ccaf267115763f8b183d78 files/digest-m2crypto-0.13.1 186
+MD5 bcc28d831719f7777f745bd96ab35865 files/m2crypto-0.13-gentoo.patch 5874
+MD5 509c817f2a2805cc8a3e6b9a4aef8547 m2crypto-0.07_alpha3.ebuild 775
+MD5 4f3f393a3f7a9d5f7c19931d4bce6004 m2crypto-0.12-r1.ebuild 789
+MD5 ff91b3dd02995b40b890b286df854125 m2crypto-0.12.ebuild 769
+MD5 424fc290163485275ac63b128d3c1d02 m2crypto-0.13.1.ebuild 1452
+MD5 a1e3a3225d43f188faccca237d5baa54 m2crypto-0.13.ebuild 792
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
diff --git a/dev-python/m2crypto/m2crypto-0.07_alpha3.ebuild b/dev-python/m2crypto/m2crypto-0.07_alpha3.ebuild
index 578df76f6510..3dd1658ff391 100644
--- a/dev-python/m2crypto/m2crypto-0.07_alpha3.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.07_alpha3.ebuild
@@ -1,15 +1,16 @@
-# 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/dev-python/m2crypto/m2crypto-0.07_alpha3.ebuild,v 1.1 2002/12/16 23:51:38 jrray Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.07_alpha3.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://www.post1.com/home/ngps/m2/"
+HOMEPAGE="http://sandbox.rulemaker.net/ngps/m2/"
 MY_P=${P/_alpha/-snap}
-SRC_URI="http://www.post1.com/home/ngps/m2/${MY_P}.zip"
+SRC_URI="http://sandbox.rulemaker.net/ngps/m2/${MY_P}.zip"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND="dev-libs/openssl"
+KEYWORDS="x86"
+DEPEND="dev-libs/openssl
+	app-arch/unzip"
 S=${WORKDIR}/${MY_P}
 IUSE=""
 
@@ -20,7 +21,7 @@ src_install () {
 	distutils_src_install
 	# can't dodoc, doesn't handle subdirs
 	dodir /usr/share/doc/${PF}/example
-	cp -a demo/* ${D}/usr/share/doc/${PF}/example
+	cp -pPR demo/* ${D}/usr/share/doc/${PF}/example
 	dodoc BUGS CHANGES STORIES
 	dohtml -r doc/*
 }
diff --git a/dev-python/m2crypto/m2crypto-0.12-r1.ebuild b/dev-python/m2crypto/m2crypto-0.12-r1.ebuild
index 9654bc2c23b8..12e8a19b0b98 100644
--- a/dev-python/m2crypto/m2crypto-0.12-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.12-r1.ebuild
@@ -1,11 +1,11 @@
-# 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/dev-python/m2crypto/m2crypto-0.12-r1.ebuild,v 1.1 2004/02/26 02:33:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://www.post1.com/home/ngps/m2/"
+HOMEPAGE="http://sandbox.rulemaker.net/ngps/m2/"
 SRC_URI="http://sandbox.rulemaker.net/ngps/Dist/${P}.zip"
 
 LICENSE="BSD"
@@ -14,7 +14,8 @@ KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.7
-		dev-lang/swig"
+		dev-lang/swig
+		app-arch/unzip"
 
 PYTHON_MODNAME="M2Crypto"
 
@@ -23,6 +24,6 @@ src_install () {
 	distutils_src_install
 	# can't dodoc, doesn't handle subdirs
 	dodir /usr/share/doc/${PF}/example
-	cp -a demo/* ${D}/usr/share/doc/${PF}/example
+	cp -pPR demo/* ${D}/usr/share/doc/${PF}/example
 	dohtml -r doc/*
 }
diff --git a/dev-python/m2crypto/m2crypto-0.12.ebuild b/dev-python/m2crypto/m2crypto-0.12.ebuild
index a37dd1260325..fd6d09945397 100644
--- a/dev-python/m2crypto/m2crypto-0.12.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.12.ebuild
@@ -1,19 +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/dev-python/m2crypto/m2crypto-0.12.ebuild,v 1.1 2003/11/23 12:01:04 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://www.post1.com/home/ngps/m2/"
+HOMEPAGE="http://sandbox.rulemaker.net/ngps/m2/"
 SRC_URI="http://sandbox.rulemaker.net/ngps/Dist/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=dev-libs/openssl-0.9.7"
+DEPEND=">=dev-libs/openssl-0.9.7
+	app-arch/unzip"
 
 PYTHON_MODNAME="M2Crypto"
 
@@ -22,6 +23,6 @@ src_install () {
 	distutils_src_install
 	# can't dodoc, doesn't handle subdirs
 	dodir /usr/share/doc/${PF}/example
-	cp -a demo/* ${D}/usr/share/doc/${PF}/example
+	cp -pPR demo/* ${D}/usr/share/doc/${PF}/example
 	dohtml -r doc/*
 }
diff --git a/dev-python/m2crypto/m2crypto-0.13.1.ebuild b/dev-python/m2crypto/m2crypto-0.13.1.ebuild
index e37d0f32e7ef..6a3218edf6ce 100644
--- a/dev-python/m2crypto/m2crypto-0.13.1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.13.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/dev-python/m2crypto/m2crypto-0.13.1.ebuild,v 1.1 2005/11/02 16:29:47 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.13.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils portability
 
diff --git a/dev-python/m2crypto/m2crypto-0.13.ebuild b/dev-python/m2crypto/m2crypto-0.13.ebuild
index e3580553448d..6ca59438d132 100644
--- a/dev-python/m2crypto/m2crypto-0.13.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.13.ebuild
@@ -1,20 +1,21 @@
-# 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/dev-python/m2crypto/m2crypto-0.13.ebuild,v 1.1 2004/03/31 01:18:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.13.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="A python wrapper for the OpenSSL crypto library"
-HOMEPAGE="http://www.post1.com/home/ngps/m2/"
+HOMEPAGE="http://sandbox.rulemaker.net/ngps/m2/"
 SRC_URI="http://sandbox.rulemaker.net/ngps/Dist/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-libs/openssl-0.9.7
-		dev-lang/swig"
+		dev-lang/swig
+		app-arch/unzip"
 
 PYTHON_MODNAME="M2Crypto"
 
@@ -23,6 +24,6 @@ src_install () {
 	distutils_src_install
 	# can't dodoc, doesn't handle subdirs
 	dodir /usr/share/doc/${PF}/example
-	cp -a demo/* ${D}/usr/share/doc/${PF}/example
+	cp -pPR demo/* ${D}/usr/share/doc/${PF}/example
 	dohtml -r doc/*
 }
diff --git a/dev-python/matplotlib/ChangeLog b/dev-python/matplotlib/ChangeLog
index ef653b860faa..a138ce4109d0 100644
--- a/dev-python/matplotlib/ChangeLog
+++ b/dev-python/matplotlib/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for dev-python/matplotlib
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.1 2004/12/05 12:16:30 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/ChangeLog,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
+
+  26 Sep 2005; Alastair Tse <liquidx@gentoo.org> matplotlib-0.73.1.ebuild,
+  matplotlib-0.80-r1.ebuild, matplotlib-0.81.ebuild, matplotlib-0.82.ebuild:
+  change license to PYTHON rather than as-is. (#105802)
+
+*matplotlib-0.82 (02 Jul 2005)
+
+  02 Jul 2005; Fernando Serboncini <fserb@gentoo.org>
+  -matplotlib-0.71.ebuild, -matplotlib-0.80.ebuild,
+  matplotlib-0.80-r1.ebuild, +matplotlib-0.82.ebuild:
+  Version bump. Made 0.80-r1 stable.
+  Removed 0.80 and 0.71 versions.
+  New ebuild assures that non portage extensions are always installed
+  and use correct deps.
+
+  13 Jun 2005; Fernando Serboncini <fserb@gentoo.org>
+  matplotlib-0.81.ebuild:
+  Fixed dependencies. Closes #95905.
+
+  11 Jun 2005; David Holm <dholm@gentoo.org> matplotlib-0.81.ebuild:
+  Added to ~ppc.
+
+*matplotlib-0.81 (11 Jun 2005)
+
+  11 Jun 2005; Fernando Serboncini <fserb@gentoo.org>
+  matplotlib-0.73.1.ebuild, +matplotlib-0.81.ebuild:
+  Version bump.
+  0.73.1 stable on x86.
+
+*matplotlib-0.80-r1 (26 May 2005)
+
+  26 May 2005; Fernando Serboncini <fserb@gentoo.org>
+  +matplotlib-0.80-r1.ebuild:
+  Removed need for virtualx on new matplotlib. Fixes #91553.
+
+  26 May 2005; Fernando Serboncini <fserb@gentoo.org>
+  -matplotlib-0.64.ebuild, -matplotlib-0.65.ebuild, matplotlib-0.71.ebuild:
+  Removed old version.
+  Marked 0.71 as stable.
+
+  23 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> matplotlib-0.64.ebuild,
+  matplotlib-0.65.ebuild:
+  Remove RESTRICT="nomirror".
+
+*matplotlib-0.80 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +matplotlib-0.80.ebuild:
+  Version bump.
+
+  07 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> matplotlib-0.73.1.ebuild:
+  added ~amd64 to KEYWORDS, fixes #87950
+
+*matplotlib-0.73.1 (22 Mar 2005)
+
+  22 Mar 2005; Fernando Serboncini <fserb@gentoo.org>
+  matplotlib-0.71.ebuild, +matplotlib-0.73.1.ebuild:
+  Version bump. Removed nomirror restriction from newer ebuilds.
+
+*matplotlib-0.64 (11 Feb 2005)
+
+  11 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> matplotlib-0.64.ebuild,
+  matplotlib-0.65.ebuild, matplotlib-0.71.ebuild:
+  gtk should be optional, bug 81506.
+
+*matplotlib-0.71 (24 Jan 2005)
+
+  24 Jan 2005; <fserb@gentoo.org> +matplotlib-0.71.ebuild:
+  Version bump
+
+*matplotlib-0.65 (20 Dec 2004)
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +matplotlib-0.65.ebuild:
+  Version bump, new ebuild by Fernando Serboncini <fserb@terra.com.br>
 
   05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> :
   Initial import, ebuild by Fernando A. Serboncini <fserb@terra.com.br> in bug
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index 6646300e7d74..68bbfa552026 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -1,2 +1,20 @@
-MD5 26f5f08305f1d8fd19d2caf47ec64e3a matplotlib-0.64.ebuild 906
-MD5 cd423139ef7e6085b17b6a145259e4c3 files/digest-matplotlib-0.64 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 180b113d18879b53242e6e9d6b135906 ChangeLog 2751
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 eeb1b847846a589e5f39e97446729136 matplotlib-0.73.1.ebuild 1020
+MD5 da49507babaeb6c7222bc7f70d4e39d9 matplotlib-0.80-r1.ebuild 872
+MD5 3051b351ff7549577247f6547bd2535e matplotlib-0.81.ebuild 963
+MD5 129a03d23c673ffa8d6d6bda3b90e723 matplotlib-0.82.ebuild 1201
+MD5 29e58690d4283dec939607bc0cc32e44 files/digest-matplotlib-0.73.1 70
+MD5 c0167eaa6285560f9d7be0cefac5b7c3 files/digest-matplotlib-0.80-r1 68
+MD5 3285002ad0f706582bee43a5a6eae419 files/digest-matplotlib-0.81 68
+MD5 0c147de52e946a218085b30cd23ee1e2 files/digest-matplotlib-0.82 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDN/8RTM53OX+9xmMRAvciAJ99h6l5qxg0uiiaGpbNFXufa+IZYACgvS8J
+uMbY9AfmV1D6vy1H4wuWOdY=
+=BOy0
+-----END PGP SIGNATURE-----
diff --git a/dev-python/matplotlib/matplotlib-0.73.1.ebuild b/dev-python/matplotlib/matplotlib-0.73.1.ebuild
index 4dcbc12162ee..0487d9d80cea 100644
--- a/dev-python/matplotlib/matplotlib-0.73.1.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.73.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/dev-python/matplotlib/matplotlib-0.73.1.ebuild,v 1.1 2005/03/22 15:51:44 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.73.1.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils virtualx
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 IUSE="doc gtk"
 SLOT="0"
-KEYWORDS="~x86"
-LICENSE="as-is"
+KEYWORDS="~amd64 x86"
+LICENSE="PYTHON"
 
 DEPEND="virtual/python
 		>=dev-python/numeric-22
diff --git a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild b/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
index dfdd95e30c4b..710e2801c099 100644
--- a/dev-python/matplotlib/matplotlib-0.80-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.80-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/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.1 2005/05/26 18:03:42 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.80-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 IUSE="doc gtk"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-LICENSE="as-is"
+KEYWORDS="~amd64 x86"
+LICENSE="PYTHON"
 
 DEPEND="virtual/python
 		>=dev-python/numeric-22
diff --git a/dev-python/matplotlib/matplotlib-0.81.ebuild b/dev-python/matplotlib/matplotlib-0.81.ebuild
index 1d921532af12..af81d57c8c85 100644
--- a/dev-python/matplotlib/matplotlib-0.81.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.81.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/dev-python/matplotlib/matplotlib-0.81.ebuild,v 1.1 2005/06/11 13:21:09 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.81.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -10,11 +10,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 IUSE="doc gtk"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="as-is"
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="PYTHON"
 
 DEPEND="virtual/python
 		>=dev-python/numeric-22
+		dev-python/numarray
+		>=media-libs/freetype-2.1.7
+		media-libs/libpng
+		sys-libs/zlib
 		gtk? ( >=dev-python/pygtk-1.99.16 )"
 
 src_install() {
diff --git a/dev-python/matplotlib/matplotlib-0.82.ebuild b/dev-python/matplotlib/matplotlib-0.82.ebuild
index 5c08b61737f8..d62b749272c9 100644
--- a/dev-python/matplotlib/matplotlib-0.82.ebuild
+++ b/dev-python/matplotlib/matplotlib-0.82.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/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.1 2005/07/02 15:51:39 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/matplotlib/matplotlib-0.82.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 IUSE="doc gtk"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-LICENSE="as-is"
+LICENSE="PYTHON"
 
 DEPEND="virtual/python
 		|| (
diff --git a/dev-python/medusa/ChangeLog b/dev-python/medusa/ChangeLog
index ced02175cf42..882a3042b290 100644
--- a/dev-python/medusa/ChangeLog
+++ b/dev-python/medusa/ChangeLog
@@ -1,9 +1,40 @@
 # ChangeLog for dev-python/medusa
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/ChangeLog,v 1.1 2002/12/17 07:45:56 tad Exp $
-  
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/ChangeLog,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
+
+  18 Feb 2005; <gongloo@gentoo.org> medusa-0.5.4.ebuild:
+  Stable on ppc-macos.
+
+  19 Jan 2005; <gongloo@gentoo.org> medusa-0.5.4.ebuild:
+  Keyworded ~ppc-macos.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> medusa-0.5.4.ebuild:
+  Marked stable on x86
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> medusa-0.5.3.ebuild:
+  Remove default S.
+
+  18 Apr 2004; David Holm <dholm@gentoo.org> medusa-0.5.4.ebuild:
+  Added to ~ppc.
+
+*medusa-0.5.4 (22 Nov 2003)
+
+  22 Nov 2003; Alastair Tse <liquidx@gentoo.org> medusa-0.5.4.ebuild:
+  version bump (#33878)
+
+*medusa-0.5.3 (22 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  16 May 2003; Alastair Tse <liquidx@gentoo.org> medusa-0.5.2.ebuild:
+  version bump. mirroring locally because of fetch problems on authors site
+
   16 Dec 2002; Troy Dack <tad@gentoo.org> medusa-0.5.2.ebuild ChangeLog :
 
-* medusa-0.5.2 (16 Dec 2002)
+*medusa-0.5.2 (16 Dec 2002)
 
   Initial ebuild thanks to Chris Bainbridge <chrb@dcs.ed.ac.uk>
diff --git a/dev-python/medusa/Manifest b/dev-python/medusa/Manifest
index 79d8b6607f0d..8f063763050d 100644
--- a/dev-python/medusa/Manifest
+++ b/dev-python/medusa/Manifest
@@ -1,5 +1,8 @@
-MD5 b2bf951c033d73d815a62daf7d243d46 ChangeLog 387
-MD5 290dbe729e3f142c554203f64fb509ec medusa-0.5.2.ebuild 797
-MD5 d2590971db202044430aa4f80a2f26aa medusa-0.5.3.ebuild 860
+MD5 8bbe436f75543643f7bfa61edc2e76a3 ChangeLog 1307
+MD5 4e03394b3543bc51aaa4d02787b98937 medusa-0.5.2.ebuild 771
+MD5 5a15d7939e9c6aedf1a8a0ada010b83c medusa-0.5.3.ebuild 872
+MD5 2fb0dc4dd9989c314e650f3fe5415d6e medusa-0.5.4.ebuild 867
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 28445bd59504cc35ce0bb3ca9743d7b0 files/digest-medusa-0.5.2 63
 MD5 d691bc35269852cdce6e521d40c93a23 files/digest-medusa-0.5.3 63
+MD5 80e8d5a4e8f446da3e78174609b50960 files/digest-medusa-0.5.4 64
diff --git a/dev-python/medusa/medusa-0.5.2.ebuild b/dev-python/medusa/medusa-0.5.2.ebuild
index c16e2bde831f..416c3ffcef3f 100644
--- a/dev-python/medusa/medusa-0.5.2.ebuild
+++ b/dev-python/medusa/medusa-0.5.2.ebuild
@@ -1,7 +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/dev-python/medusa/medusa-0.5.2.ebuild,v 1.1 2002/12/17 07:45:56 tad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/medusa-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
+inherit distutils
+
+IUSE=""
 DESCRIPTION="Medusa is a framework for writing long-running, high-performance network servers in Python, using asynchronous sockets"
 HOMEPAGE="http://oedipus.sourceforge.net/medusa/"
 SRC_URI="http://www.amk.ca/files/python/medusa-0.5.2.tar.gz"
@@ -9,16 +12,12 @@ LICENSE="PYTHON"
 SLOT="0"
 KEYWORDS="x86"
 DEPEND="virtual/python"
-S=${WORKDIR}/${P}
-
-src_compile() {
-	python setup.py build || die
-}
 
 src_install () {
-	python setup.py install --prefix=${D}/usr || die
-	mkdir -p ${D}/usr/share/doc/${PF}/example
-	cp -R demo/* ${D}/usr/share/doc/${PF}/example
-	dodoc CHANGES.txt LICENSE.txt README.txt docs/*.txt 
+	mydoc="CHANGES.txt LICENSE.txt README.txt docs/*.txt"
+	distutils_src_install
+
+	dodir /usr/share/doc/${PF}/example
+	cp -r demo/* ${D}/usr/share/doc/${PF}/example
 	dohtml docs/*.html docs/*.gif
 }
diff --git a/dev-python/medusa/medusa-0.5.3.ebuild b/dev-python/medusa/medusa-0.5.3.ebuild
index cdbbe25bab6e..71ccabcbe830 100644
--- a/dev-python/medusa/medusa-0.5.3.ebuild
+++ b/dev-python/medusa/medusa-0.5.3.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/dev-python/medusa/medusa-0.5.3.ebuild,v 1.1 2003/05/16 09:31:23 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/medusa-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -12,14 +12,13 @@ HOMEPAGE="http://oedipus.sourceforge.net/medusa/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="-x86"
+KEYWORDS="x86"
 DEPEND="virtual/python"
-S=${WORKDIR}/${P}
 
 src_install () {
 	mydoc="CHANGES.txt LICENSE.txt README.txt docs/*.txt"
 	distutils_src_install
-	
+
 	dodir /usr/share/doc/${PF}/example
 	cp -r demo/* ${D}/usr/share/doc/${PF}/example
 	dohtml docs/*.html docs/*.gif
diff --git a/dev-python/medusa/medusa-0.5.4.ebuild b/dev-python/medusa/medusa-0.5.4.ebuild
index 4a409679cf28..d87d9cb340a5 100644
--- a/dev-python/medusa/medusa-0.5.4.ebuild
+++ b/dev-python/medusa/medusa-0.5.4.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/dev-python/medusa/medusa-0.5.4.ebuild,v 1.1 2003/11/22 14:21:41 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/medusa/medusa-0.5.4.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.amk.ca/files/python/${P}.tar.gz"
 IUSE=""
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ppc ppc-macos"
 
 src_install() {
 	DOCS="CHANGES.txt LICENSE.txt README.txt docs/*.txt"
diff --git a/dev-python/metadata.xml b/dev-python/metadata.xml
index 6edf05535be6..76b4768a37d9 100644
--- a/dev-python/metadata.xml
+++ b/dev-python/metadata.xml
@@ -2,8 +2,35 @@
 <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
-		The dev-python category contains libraries and utilities relevant to the
-		Python programming language.
+		The dev-python category contains libraries, utilities or
+		bindings written in or for the Python programming language. 
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie dev-python enthält Bibliotheken und Werkzeuge für die
+		Programmiersprache Python.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría dev-python contiene librerias y utilidades referentes al
+		lenguaje de programación Python.
+	</longdescription>
+	<longdescription lang="ja">
+		dev-pythonカテゴリーにはPythonプログラミング言語で記述された/のために
+		記述されたライブラリーと>ユーティリティとバインディングが含まれます。
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria dev-python zawiera biblioteki oraz narzędzia związane
+		z językiem programowania Python.
+	</longdescription>
+	<longdescription lang="nl">
+		De dev-python categorie bevat bibliotheken en hulpmiddelen voor het gebruik
+		van de programmeertaal Python.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm dev-python chứa các thư viện và tiện ích liên quan
+		đến ngôn ngữ lập trình Python.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria dev-python contiene librerie ed utilità per il linguaggio di programmazione Python.
 	</longdescription>
 </catmetadata>
 
diff --git a/dev-python/mmpython/ChangeLog b/dev-python/mmpython/ChangeLog
index 10b0f5556897..d7507652ecf1 100644
--- a/dev-python/mmpython/ChangeLog
+++ b/dev-python/mmpython/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for dev-python/mmpython
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mmpython/ChangeLog,v 1.1 2003/09/10 18:50:32 max Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mmpython/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> mmpython-0.4.7.ebuild:
+  Stable on ppc.
+
+*mmpython-0.4.9 (23 Jul 2005)
+
+  23 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +mmpython-0.4.9.ebuild:
+  Version bump. Closing bug 100030.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> mmpython-0.4.7.ebuild:
+  stable on amd64
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> -mmpython-0.4.5.ebuild,
+  -mmpython-0.4.6.ebuild:
+  Remove old versions.
+
+*mmpython-0.4.8 (29 Jan 2005)
+
+  29 Jan 2005; Brian Jackson <iggy@gentoo.org> +mmpython-0.4.8.ebuild:
+  version bump
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*mmpython-0.4.7 (31 Oct 2004)
+
+  31 Oct 2004; <iggy@gentoo.org> -mmpython-0.2.ebuild, -mmpython-0.3.ebuild,
+  -mmpython-0.4.2.ebuild, -mmpython-0.4.3-r1.ebuild, -mmpython-0.4.3.ebuild,
+  -mmpython-0.4.4.ebuild, mmpython-0.4.5.ebuild, +mmpython-0.4.7.ebuild:
+  a little cleanup, and mark 0.4.5 x86
+
+*mmpython-0.4.6 (11 Sep 2004)
+
+  11 Sep 2004; <iggy@gentoo.org> +mmpython-0.4.6.ebuild:
+  version bump for freevo-1.5.1
+
+  11 Sep 2004; <blubb@gentoo.org> mmpython-0.4.5.ebuild:
+  added ~amd64
+
+*mmpython-0.4.5 (18 Aug 2004)
+
+  18 Aug 2004; Seemant Kulleen <seemant@gentoo.org> +mmpython-0.4.5.ebuild:
+  version bump as required by freevo-1.5.0. Thanks to: Benjamin Schleinzer
+  <thor@4players.de> in bug #58398
+
+*mmpython-0.4.4 (03 Jul 2004)
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +mmpython-0.4.4.ebuild:
+  Version bump, closes bug #55878.
+
+*mmpython-0.4.3-r1 (21 Jun 2004)
+
+  21 Jun 2004; Rob Cakebread <pythonhead@gentoo.org>
+  +mmpython-0.4.3-r1.ebuild:
+  Added dvd use flag, thanks Benjamin Schleinzer bug# 54621
+
+*mmpython-0.4.3 (20 Jun 2004)
+
+  20 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> +mmpython-0.4.3.ebuild:
+  Version bump. Closes bug# 54567 Thanks Benjamin Schleinzer
+
+  27 May 2004; Bryan Østergaard <kloeri@gentoo.org> mmpython-0.4.2.ebuild:
+  Add lsdvd dependency. Thanks to Dirk Meyer <dischi@tzi.de> (mmpython and
+  freevo developer) for reporting this.
+
+*mmpython-0.4.2 (25 May 2004)
+
+  25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +mmpython-0.4.2.ebuild:
+  Version bump, bug 50845.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> mmpython-0.2.ebuild,
+  mmpython-0.3.ebuild:
+  Add missing IUSE.
+
+  16 Nov 2003; <max@gentoo.org> mmpython-0.2.ebuild, mmpython-0.3.ebuild:
+  Move inherit line to the top so it doesn't stomp DEPENDs.
+
+*mmpython-0.3 (03 Nov 2003)
+
+  03 Nov 2003; Max Kalika <max@gentoo.org> mmpython-0.3.ebuild:
+  Bump to version 0.3.
+
+  19 Oct 2003; Max Kalika <max@gentoo.org> mmpython-0.2.ebuild:
+  Add quotes and CVS header.
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> mmpython-0.2.ebuild:
+  Added S=${WORKDIR}/${PN}.
+  Now it compiles.
+
+*mmpython-0.2 (22 Sep 2003)
+
+  22 Sep 2003; Max Kalika <max@gentoo.org> mmpython-0.1.ebuild,
+  mmpython-0.2.ebuild, files/less-debug.patch:
+  Bump to version 0.2 and remove stale version.
 
 *mmpython-0.1 (10 Sep 2003)
 
diff --git a/dev-python/mmpython/Manifest b/dev-python/mmpython/Manifest
index e69de29bb2d1..a7818d4151d1 100644
--- a/dev-python/mmpython/Manifest
+++ b/dev-python/mmpython/Manifest
@@ -0,0 +1,8 @@
+MD5 41f63b6b0b9df0e5293ce7496fbe1922 mmpython-0.4.9.ebuild 564
+MD5 9db51e255f9e3f2b4fd0a20136dd4ded mmpython-0.4.8.ebuild 562
+MD5 ae750297e34c9a0c4929184c72684260 metadata.xml 181
+MD5 0185ff6bf8fc503a31d51344e04894c7 ChangeLog 3336
+MD5 e403f58e01512a817967f171c5ed0d3f mmpython-0.4.7.ebuild 561
+MD5 287823425bfb710ec6983e0e337a13f1 files/digest-mmpython-0.4.8 66
+MD5 84dd4700bcfc22c0b2169ebdd61e74a0 files/digest-mmpython-0.4.7 66
+MD5 d11979d4293466257881b95a5291205a files/digest-mmpython-0.4.9 66
diff --git a/dev-python/mmpython/metadata.xml b/dev-python/mmpython/metadata.xml
index a6b9e38a1b93..9d5f34d67bd7 100644
--- a/dev-python/mmpython/metadata.xml
+++ b/dev-python/mmpython/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
+<herd>python</herd>
 </pkgmetadata>
diff --git a/dev-python/mmpython/mmpython-0.4.7.ebuild b/dev-python/mmpython/mmpython-0.4.7.ebuild
index a250138a7a42..43d656ff3da2 100644
--- a/dev-python/mmpython/mmpython-0.4.7.ebuild
+++ b/dev-python/mmpython/mmpython-0.4.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/dev-python/mmpython/mmpython-0.4.7.ebuild,v 1.1 2004/10/31 16:56:19 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mmpython/mmpython-0.4.7.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="dvd"
 
 DEPEND="${DEPEND}
diff --git a/dev-python/mmpython/mmpython-0.4.8.ebuild b/dev-python/mmpython/mmpython-0.4.8.ebuild
index 716431c4a173..3edde35867cb 100644
--- a/dev-python/mmpython/mmpython-0.4.8.ebuild
+++ b/dev-python/mmpython/mmpython-0.4.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/dev-python/mmpython/mmpython-0.4.8.ebuild,v 1.1 2005/01/29 17:59:33 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mmpython/mmpython-0.4.8.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/mmpython/mmpython-0.4.9.ebuild b/dev-python/mmpython/mmpython-0.4.9.ebuild
index a46a8678f754..020f0de5b3de 100644
--- a/dev-python/mmpython/mmpython-0.4.9.ebuild
+++ b/dev-python/mmpython/mmpython-0.4.9.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/dev-python/mmpython/mmpython-0.4.9.ebuild,v 1.1 2005/07/23 19:18:04 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mmpython/mmpython-0.4.9.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/mod_python/ChangeLog b/dev-python/mod_python/ChangeLog
index e3dc54f63c83..e62ae20772f3 100644
--- a/dev-python/mod_python/ChangeLog
+++ b/dev-python/mod_python/ChangeLog
@@ -1,10 +1,161 @@
 # ChangeLog for dev-python/mod_python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.1 2002/10/21 12:43:23 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  14 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  mod_python-3.1.4-r1.ebuild:
+  Mark 3.1.4-r1 stable on alpha
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mod_python-3.1.4-r1.ebuild:
+  Stable on sparc
+
+  06 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mod_python-3.1.4-r1.ebuild:
+  Stable on ppc.
+
+  27 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  mod_python-3.1.4-r1.ebuild:
+  Stable for new apache layout.
+
+*mod_python-3.1.4-r1 (06 Jul 2005)
+
+  06 Jul 2005; Alastair Tse <liquidx@gentoo.org>
+  -mod_python-2.7.10-r1.ebuild, -mod_python-3.1.3.ebuild,
+  +mod_python-3.1.4-r1.ebuild:
+  replaced ./configure with econf to force search paths to /usr rather than
+  /usr/local (#97992)
+
+  05 May 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
+  Add apache herd as maintainers.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> mod_python-3.1.3-r1.ebuild:
+  stable on amd64
+
+  27 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +files/16_mod_python-r1.conf, mod_python-2.7.11.ebuild,
+  mod_python-3.1.4.ebuild:
+  Fix broken configuration.
+
+*mod_python-2.7.11 (26 Feb 2005)
+
+  26 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +mod_python-2.7.11.ebuild, +mod_python-3.1.4.ebuild:
+  Version bump + uses new apache-module eclass. All changes by Benedikt Boehm
+  <hollow@gentoo.org>.
+
+  11 Feb 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/publisher-2.diff, mod_python-3.1.3.ebuild:
+  Bumped and patched security bug# 80109 CAN-2005-0088
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> mod_python-3.1.3.ebuild:
+  keywords ~amd64; closes #66176.
+
+*mod_python-2.7.10-r1 (04 Sep 2004)
+
+  04 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +mod_python-2.7.10-r1.ebuild:
+  Fixed issue with detecting if python is compiled with threads.
+  Added description to metadata.
+
+  14 Jul 2004; Jason Wever <weeve@gentoo.org> mod_python-3.1.3.ebuild:
+  Added ~sparc keyword, resolves bug #57102.
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -mod_python-3.0.4-r1.ebuild, -mod_python-3.0.4-r2.ebuild,
+  mod_python-3.1.3.ebuild:
+  Remove old versions, stable on alpha.
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-3.1.3.ebuild:
+  Keyworded ~alpha, requested in bug #51550.
+
+  24 May 2004; Chuck Short <zul@gentoo.org> mod_python-3.1.3.ebuild:
+  Marked stable as requested by #51420.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-2.7.10.ebuild,
+  mod_python-3.0.4-r1.ebuild, mod_python-3.0.4-r2.ebuild,
+  mod_python-3.1.3.ebuild:
+  Change SRC_URI to mirror://..
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> mod_python-2.7.10.ebuild:
+  Add die following econf for bug 48950
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> mod_python-2.7.10.ebuild,
+  mod_python-3.0.4-r2.ebuild, mod_python-3.0.4.ebuild:
+  Stable on x86.
+
+*mod_python-3.1.3 (29 Feb 2004)
+
+  29 Feb 2004; <kloeri@gentoo.org> mod_python-3.1.3.ebuild:
+  Version bump.
+
+*mod_python-3.0.4-r2 (29 Jan 2004)
+
+  29 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  mod_python-3.0.4-r2.ebuild:
+  Fix installation paths, closing bug #39757 and #39758.
+
+*mod_python-3.0.4-r1 (28 Jan 2004)
+
+  28 Jan 2004; Alastair Tse <liquidx@gentoo.org> mod_python-3.0.4-r1.ebuild:
+  fix missing mod_python.so, add python postinst pyc/pyo generation (#39627)
+
+*mod_python-2.7.10 (24 Jan 2004)
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> mod_python-2.7.8.ebuild,
+  mod_python-2.7.9.ebuild, mod_python-3.0.3.ebuild,
+  files/mod_python-3.0.3-dest1.diff, files/mod_python-3.0.3-dest2.diff,
+  files/patch-2.7.8.diff:
+  cleanup vunerable versions, bump 2.7 series due to security update (#39154)
+
+  13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org>
+  mod_python-3.0.3.ebuild, mod_python-3.0.4.ebuild:
+  Install icons needed for html documentation, closing bug #29271
+
+*mod_python-2.7.9 (12 Dec 2003)
+*mod_python-3.0.4 (12 Dec 2003)
+
+  12 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org>
+  mod_python-2.7.9.ebuild, mod_python-3.0.0_beta4.ebuild,
+  mod_python-3.0.1.ebuild, mod_python-3.0.4.ebuild,
+  files/mod_python-3.0.0_beta4-destdir.diff:
+  Bump versions and remove some old versions.
+
+  28 Oct 2003; Bryan Østergaard <kloeri@gentoo.org>
+  mod_python-3.0.3.ebuild:
+  Fix bug when using Python-2.3 closing bug #32018.
+
+  05 Oct 2003; Rob Cakebread <pythonhead@gentoo.org>
+  mod_python-3.0.0_beta4.ebuild, mod_python-3.0.1.ebuild:
+  Added pkg_postinst to tell users to add -D PYTHON to /etc/conf.d/apache2
+
+*mod_python-3.0.3 (05 Oct 2003)
+
+  05 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> mod_python-3.0.3.ebuild:
+  Version bump. Thanks Bryan Østergaard <kloeri@mailme.dk>
+
+  09 Jul 2003; Donny Davies <woodchip@gentoo.org> mod_python-2.7.8.ebuild:
+  Description clarify.
+
+*mod_python-3.0.1 (2 Feb 2003)
+
+  2 Feb 2003; Grant Goodyear <g2boojum@gentoo.org> : Beyond the beta!
+
+*mod_python-3.0.0_beta4 (29 Nov 2002)
+
+  29 Nov 2002; Donny Davies <woodchip@gentoo.org> : Updated for Apache2.
 
 *mod_python-2.7.8 (21 Oct 2002)
 
+  27 Nov 2002; phoen][x <phoenix@gentoo.org> ChangeLog, files/mod_python.conf: 
+  Fixed a typo in files/mod_python.conf.
+
   21 Oct 2002; phoen][x <phoenix@gentoo.org> ChangeLog, mod_python-2.7.8.ebuild,
   files/digest-mod_python-2.7.8, files/mod_python.conf, files/patch-2.7.8.diff : 
-
   Initial import. Use this ebuild to add python support to your apache webserver.
diff --git a/dev-python/mod_python/Manifest b/dev-python/mod_python/Manifest
index e69de29bb2d1..5af644908900 100644
--- a/dev-python/mod_python/Manifest
+++ b/dev-python/mod_python/Manifest
@@ -0,0 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb750ae3f9c0891d05bda53f11c03d54 ChangeLog 5801
+MD5 fc933df167083c6c8abc4d2e28c6274d files/16_mod_python-r1.conf 1101
+MD5 05bbbfafd26dcf70f83fcc2b015751dc files/16_mod_python.conf 1106
+MD5 eedde8a8dd90829d24fdb18cc86054f6 files/digest-mod_python-2.7.10 66
+MD5 f9aea2b5454c22f2e134e3698099f890 files/digest-mod_python-2.7.11 66
+MD5 67e42121ddce856c5d7021b3eca7abdb files/digest-mod_python-3.1.3-r1 65
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4 65
+MD5 c4619f17df8352dc648c0f89b61e17b6 files/digest-mod_python-3.1.4-r1 65
+MD5 01ce560a5062d990e685e78b756fa5ba files/mod_python.conf 70
+MD5 0779383c65d90a5161e7a11ab5bbbbec files/publisher-2.diff 1383
+MD5 4238f8266f49d6a9dbe435b27aa5cbb2 metadata.xml 1061
+MD5 67997ffb188bf18507f6a2ac093227a6 mod_python-2.7.10.ebuild 2466
+MD5 3cd9a71487590f5789bcb43c74698602 mod_python-2.7.11.ebuild 1712
+MD5 c21328b1a8879707a158196fc9caa5c2 mod_python-3.1.3-r1.ebuild 1875
+MD5 6a4a3a0a3dc093f503de9ca57611fb9a mod_python-3.1.4-r1.ebuild 1529
+MD5 7014ce279d11b10e01891e484d5e6486 mod_python-3.1.4.ebuild 1534
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwGnFdQwWVoAgN4RArzTAJ4zgW5xuewa5hGfzr2A1OCHR43dPACeJqnq
+lNxNQI05JU4dbbKjVt/TuyA=
+=GTrq
+-----END PGP SIGNATURE-----
diff --git a/dev-python/mod_python/files/mod_python.conf b/dev-python/mod_python/files/mod_python.conf
index 82c6f81c5625..1300a59a90c6 100644
--- a/dev-python/mod_python/files/mod_python.conf
+++ b/dev-python/mod_python/files/mod_python.conf
@@ -1,4 +1,4 @@
-<IfModule mod_phyton.c>
+<IfModule mod_python.c>
 
 	AddHandler python-program .py 
 
diff --git a/dev-python/mod_python/metadata.xml b/dev-python/mod_python/metadata.xml
index de483c53568f..65fe83770a56 100644
--- a/dev-python/mod_python/metadata.xml
+++ b/dev-python/mod_python/metadata.xml
@@ -2,4 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>apache</herd>
+<longdescription>
+Mod_python is an Apache module that embeds the Python interpreter within
+the server. With mod_python you can write web-based applications in Python
+that will run many times faster than traditional CGI and will have access
+to advanced features such as ability to retain database connections and
+other data between hits and access to Apache internals.
+</longdescription>
+<longdescription lang="ja">
+Mod_PythonはウェブサーバーにPythonインタープリタを埋め込むApacheモジュールです。
+Mod_PythonはPython言語のウェブベース・アプリケーションを従来のCGIよりも何倍も高>
+速に走らせることができ、データデータベースのコネクション保持に関するより高度なア
+クセス機能やヒット間の他のデータやApache内部へのアクセス機能を持ちます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/mod_python/mod_python-2.7.10.ebuild b/dev-python/mod_python/mod_python-2.7.10.ebuild
index b23d01703cdd..555ff873d080 100644
--- a/dev-python/mod_python/mod_python-2.7.10.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.10.ebuild
@@ -1,15 +1,15 @@
-# 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/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.1 2004/01/24 21:06:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.10.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit python
 
 DESCRIPTION="Python module for Apache 1.x, not for Apache 2.x"
-SRC_URI="http://www.apache.org/dist/httpd/modpython/${P}.tgz"
+SRC_URI="mirror://apache/modpython/${P}.tgz"
 HOMEPAGE="http://www.modpython.org/"
 
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE=""
 
@@ -29,7 +29,7 @@ src_compile() {
 	echo 'echo "configure done"' >> configure
 
 	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
-	econf --with-apxs=/usr/sbin/apxs
+	econf --with-apxs=/usr/sbin/apxs || die "econf failed"
 
 	sed -e 's/LIBEXECDIR=\/usr\/lib\/apache/LIBEXECDIR=${D}\/usr\/lib\/apache-extramodules/' \
 		-e 's/PY_STD_LIB=/PY_STD_LIB=${D}/' \
diff --git a/dev-python/mod_python/mod_python-2.7.11.ebuild b/dev-python/mod_python/mod_python-2.7.11.ebuild
index 4452b6868e18..35d4c5655fd9 100644
--- a/dev-python/mod_python/mod_python-2.7.11.ebuild
+++ b/dev-python/mod_python/mod_python-2.7.11.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/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.1 2005/02/26 12:27:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-2.7.11.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit python apache-module
 
@@ -13,7 +13,7 @@ KEYWORDS="~x86"
 SLOT="0"
 IUSE=""
 
-APACHE1_MOD_CONF="${PV}/16_${PN}"
+#APACHE1_MOD_CONF="16_${PN}-r1"
 APACHE1_MOD_DEFINE="PYTHON"
 
 DOCFILES="COPYRIGHT CREDITS NEWS README"
@@ -21,11 +21,15 @@ DOCFILES="COPYRIGHT CREDITS NEWS README"
 need_apache1
 
 src_compile() {
+	# If we dont add that, ./configure breaks this ebuild
+	# because the last task (make depend) is somehow borked
+	echo 'echo "configure done"' >> configure
+
 	sed -ie 's:OPT=:OPT=$(OPTFLAGS):' ${S}/src/Makefile.in
 	sed -ie 's/\(\\"thread\\" in sys.builtin_module_names\)/int(\1)/' ${S}/configure
 
 	export OPTFLAGS="`/usr/sbin/apxs -q CFLAGS`"
-	econf --with-apxs=${APXS1} || die "econf failed"
+	econf --with-apxs=${APXS1}
 
 	sed -ie 's:LIBEXECDIR=:LIBEXECDIR=${D}:' Makefile
 	sed -ie 's:PY_STD_LIB=:PY_STD_LIB=${D}:' Makefile
@@ -51,4 +55,6 @@ src_install() {
 	doins doc-html/icons/*
 
 	apache-module_src_install
+	insinto ${APACHE1_MODULES_CONFDIR}
+	newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf
 }
diff --git a/dev-python/mod_python/mod_python-3.1.3-r1.ebuild b/dev-python/mod_python/mod_python-3.1.3-r1.ebuild
index 3ab58055735c..597ef037fda0 100644
--- a/dev-python/mod_python/mod_python-3.1.3-r1.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.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/dev-python/mod_python/mod_python-3.1.3-r1.ebuild,v 1.1 2005/02/11 19:45:40 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit python eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.modpython.org/"
 SRC_URI="mirror://apache/modpython/${P}.tgz"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 alpha ppc ~sparc ~amd64"
+KEYWORDS="x86 alpha ppc ~sparc amd64"
 IUSE=""
 DEPEND="dev-lang/python
 	>=net-www/apache-2.0"
diff --git a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild b/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
index ba0c07bc0918..26ed6195d054 100644
--- a/dev-python/mod_python/mod_python-3.1.4-r1.ebuild
+++ b/dev-python/mod_python/mod_python-3.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/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.1 2005/07/06 10:50:26 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit python eutils apache-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://apache/httpd/modpython/${P}.tgz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64"
+KEYWORDS="alpha ~amd64 ppc sparc x86"
 IUSE=""
 DEPEND="dev-lang/python"
 
diff --git a/dev-python/mod_python/mod_python-3.1.4.ebuild b/dev-python/mod_python/mod_python-3.1.4.ebuild
index 9b61a09b5f10..6be3788ed3a3 100644
--- a/dev-python/mod_python/mod_python-3.1.4.ebuild
+++ b/dev-python/mod_python/mod_python-3.1.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/dev-python/mod_python/mod_python-3.1.4.ebuild,v 1.1 2005/02/26 12:27:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mod_python/mod_python-3.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit python eutils apache-module
 
@@ -10,11 +10,11 @@ SRC_URI="mirror://apache/httpd/modpython/${P}.tgz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="x86 alpha ppc ~sparc ~amd64"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64"
 IUSE=""
 DEPEND="dev-lang/python"
 
-APACHE2_MOD_CONF="2.7.11/16_${PN}"
+#APACHE2_MOD_CONF="2.7.11/16_${PN}"
 APACHE2_MOD_DEFINE="PYTHON"
 
 DOCFILES="README NEWS CREDITS COPYRIGHT"
@@ -40,8 +40,6 @@ src_compile() {
 }
 
 src_install() {
-	#dodir ${APACHE2_MODULESDIR}
-	#make install DESTDIR=${D} LIBEXECDIR=/usr/lib/apache2-extramodules || die
 	emake DESTDIR=${D} install || die
 
 	dohtml doc-html/*
@@ -49,6 +47,8 @@ src_install() {
 	doins doc-html/icons/*
 
 	apache-module_src_install
+	insinto ${APACHE2_MODULES_CONFDIR}
+	newins ${FILESDIR}/16_${PN}-r1.conf 16_${PN}.conf
 }
 
 pkg_postinst() {
diff --git a/dev-python/mysql-python/ChangeLog b/dev-python/mysql-python/ChangeLog
index d06ba7dffcf4..5e4f452546aa 100644
--- a/dev-python/mysql-python/ChangeLog
+++ b/dev-python/mysql-python/ChangeLog
@@ -1,7 +1,102 @@
 # ChangeLog for dev-python/mysql-python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.1 2002/11/03 23:32:33 roughneck Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> mysql-python-1.2.0.ebuild:
+  Mark 1.2.0 stable on ia64
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> mysql-python-1.2.0.ebuild:
+  add ~ia64
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mysql-python-1.2.0.ebuild:
+  Stable on ppc.
+
+  10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mysql-python-1.2.0.ebuild:
+  Stable on sparc
+
+  07 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  mysql-python-1.2.0.ebuild:
+  Stable on x86, fixes bug 90074.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> mysql-python-1.0.0.ebuild:
+  stable on amd64
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mysql-python-1.0.0.ebuild:
+  Stable on ppc.
+
+  15 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  mysql-python-1.0.0.ebuild:
+  Stable on sparc
+
+*mysql-python-1.2.0 (12 Feb 2005)
+
+  12 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
+  -mysql-python-0.9.2.ebuild, mysql-python-1.0.0.ebuild,
+  -mysql-python-1.1.7.ebuild, +mysql-python-1.2.0.ebuild:
+  Version bump. 1.0.0 stable on x86
+
+  26 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  mysql-python-1.1.9.ebuild:
+  Removed useless ssl USE flag
+
+  25 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  mysql-python-1.1.9.ebuild:
+  Removed old thread_safe_client code from new ebuild
+
+*mysql-python-1.1.9 (25 Jan 2005)
+
+  25 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  mysql-python-1.1.7.ebuild, +mysql-python-1.1.9.ebuild:
+  Version bump, added ssl USE flag
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*mysql-python-1.1.7 (05 Dec 2004)
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +mysql-python-1.1.7.ebuild:
+  Version bump, bug 71965.
+
+  08 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> :
+  Marked ~amd64.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> mysql-python-0.9.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> mysql-python-1.0.0.ebuild:
+  Marked ~amd64.
+
+*mysql-python-1.0.0 (12 Jun 2004)
+
+  12 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +mysql-python-1.0.0.ebuild:
+  Bump version, bug #53381.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  mysql-python-0.9.2-r1.ebuild, mysql-python-0.9.2.ebuild:
+  Add missing IUSE.
+
+*mysql-python-0.9.2-r1 (22 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+  28 Apr 2003; Alastair Tse <liquidx@gentoo.org> mysql-python-0.9.2-r1.ebuild,
+  mysql-python-0.9.2.ebuild:
+  remove redundant python-1.5.2 dep
+
+*mysql-python-0.9.2 (03 Nov 2002)
+
+  05 Apr 2003; Thomas Raschbacher <lordvan@gentoo.org> mysql-python-0.9.2-r1.ebuild:
+  compiling with non-threadsafe libmysqlclient if mysql4 is installed
+  (commiting this non ~arch since otherwise it won't work with mysql4!)
+	
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   03 Nov 2002; Nicholas Henke <roughneck@gentoo.org> mysql-python-0.9.2.ebuild,Changelog  :
 
   Initial import. Thanks to Thomas Raschbacher <lordvan@lordvan.com> for
diff --git a/dev-python/mysql-python/Manifest b/dev-python/mysql-python/Manifest
index 4ad6b6e3c6bd..b7d44f39b874 100644
--- a/dev-python/mysql-python/Manifest
+++ b/dev-python/mysql-python/Manifest
@@ -1,5 +1,10 @@
-MD5 78a257b88f598bf5eb1200b53d527469 ChangeLog 965
-MD5 bcd57f13da43770bae3f8a56bf96f3e2 mysql-python-0.9.2.ebuild 670
-MD5 4c4513cea09e89f3d2388108af2d3412 mysql-python-0.9.2-r1.ebuild 889
-MD5 dec65a6be280c6066b2a5decfa636c5a files/digest-mysql-python-0.9.2 69
+MD5 48af54066702cc243bc9225d9253259c mysql-python-1.0.0.ebuild 797
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 596f72d9352d777bbf34636819319491 mysql-python-0.9.2-r1.ebuild 795
+MD5 ef8a72002045f53edc2ff44c286a2a97 ChangeLog 3385
+MD5 e20b871746f64f37be527194fd150465 mysql-python-1.1.9.ebuild 700
+MD5 75126d9088fea759bdbcd2ec37ab2df6 mysql-python-1.2.0.ebuild 705
 MD5 dec65a6be280c6066b2a5decfa636c5a files/digest-mysql-python-0.9.2-r1 69
+MD5 b1dca80b5330985b577712c067a33096 files/digest-mysql-python-1.0.0 69
+MD5 88531e3c04872ef98f13969b2ef06c4f files/digest-mysql-python-1.2.0 70
+MD5 d4c5bb267574a73ad065250341113a2e files/digest-mysql-python-1.1.9 70
diff --git a/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild b/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild
index 70e14ed202cd..90f5dff2dc79 100644
--- a/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild
+++ b/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild
@@ -1,36 +1,30 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild,v 1.1 2003/04/05 07:20:53 lordvan Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-0.9.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+inherit distutils
 
 S=${WORKDIR}/MySQL-python-${PV}
-DESCRIPTION="MySQL Module for python" 
-SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
+DESCRIPTION="MySQL Module for python"
 HOMEPAGE="http://sourceforge.net/projects/mysql-python/"
+SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-DEPEND="virtual/python
-	virtual/glibc
-	>=dev-lang/python-1.5.2
-	>=dev-db/mysql-3.22.19"
-RDEPEND=""
-KEYWORDS="ppc x86 sparc "
+KEYWORDS="ppc x86 sparc"
 IUSE=""
 
-inherit distutils
+DEPEND="virtual/python
+	>=dev-db/mysql-3.22.19"
 
 src_compile() {
-    if has_version '>=dev-db/mysql-4.0.10' >& /dev/null
-	then
-	mv setup.py setup.orig
-	sed -e 's/thread_safe_library = YES/thread_safe_library = NO/' \
-	    setup.orig > setup.py
-    fi
-    distutils_src_compile
+	if has_version '>=dev-db/mysql-4.0.10' >& /dev/null ; then
+		sed -i 's/thread_safe_library = YES/thread_safe_library = NO/' setup.py
+	fi
+	distutils_src_compile
 }
 
 src_install() {
-    distutils_src_install
-    
-    dohtml doc/*
+	distutils_src_install
+	dohtml doc/*
 }
-
diff --git a/dev-python/mysql-python/mysql-python-1.0.0.ebuild b/dev-python/mysql-python/mysql-python-1.0.0.ebuild
index 5db1b55f9092..783467ee6373 100644
--- a/dev-python/mysql-python/mysql-python-1.0.0.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.0.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/dev-python/mysql-python/mysql-python-1.0.0.ebuild,v 1.1 2004/06/12 20:04:48 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc"
+KEYWORDS="ppc x86 sparc amd64"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/mysql-python/mysql-python-1.1.9.ebuild b/dev-python/mysql-python/mysql-python-1.1.9.ebuild
index 819b91298405..342fcfc0238d 100644
--- a/dev-python/mysql-python/mysql-python-1.1.9.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.1.9.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/dev-python/mysql-python/mysql-python-1.1.9.ebuild,v 1.1 2005/01/25 14:31:50 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.1.9.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -12,20 +12,14 @@ SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86 ~sparc ~amd64"
-IUSE="ssl"
+
+IUSE=""
 
 DEPEND="virtual/python
-	>=dev-db/mysql-3.22.19
-	ssl? ( dev-libs/openssl )"
+	>=dev-db/mysql-3.22.19"
 
 src_compile() {
-	if has_version '>=dev-db/mysql-4.0.10' >& /dev/null ; then
-		sed -i 's/thread_safe_library = YES/thread_safe_library = NO/' setup.py
-	fi
-
-	if use ssl; then
-		export mysqloptlibs="ssl crypto"
-	fi
+	export mysqlclient="mysqlclient_r"
 	distutils_src_compile
 }
 
@@ -33,14 +27,3 @@ src_install() {
 	distutils_src_install
 	dohtml doc/*
 }
-
-pkg_postinst()
-{
-	if ! use ssl; then
-		echo
-		einfo "ssl support may be needed depending on your MySQL server configuration"
-		einfo "to re-emerge with ssl support use the ssl USE flag, like:"
-		einfo "USE='ssl' emerge ${PN}"
-		echo
-	fi
-}
\ No newline at end of file
diff --git a/dev-python/mysql-python/mysql-python-1.2.0.ebuild b/dev-python/mysql-python/mysql-python-1.2.0.ebuild
index ec3e5f97f4b2..9c3f77c7ddd6 100644
--- a/dev-python/mysql-python/mysql-python-1.2.0.ebuild
+++ b/dev-python/mysql-python/mysql-python-1.2.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/dev-python/mysql-python/mysql-python-1.2.0.ebuild,v 1.1 2005/02/12 02:15:03 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/mysql-python/mysql-python-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/mysql-python/MySQL-python-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ia64 ppc sparc x86"
 
 IUSE=""
 
diff --git a/dev-python/nevow/ChangeLog b/dev-python/nevow/ChangeLog
index 0a65bfb3fa12..2d064b5909f8 100644
--- a/dev-python/nevow/ChangeLog
+++ b/dev-python/nevow/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for dev-python/nevow
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/ChangeLog,v 1.1 2004/05/06 18:29:02 lordvan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/ChangeLog,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> nevow-0.4.1.ebuild:
+  Added ~sparc keyword.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> nevow-0.2.0.ebuild:
+  add ~ia64
+
+  30 Apr 2005; David Holm <dholm@gentoo.org> nevow-0.4.1.ebuild:
+  Readded to ~ppc
+
+*nevow-0.4.1 (22 Apr 2005)
+
+  22 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> +nevow-0.4.1.ebuild:
+  version bump
+  removed twisted dependency since it can be run without twisted
+
+*nevow-0.2.0 (07 Jun 2004)
+
+  07 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org> +nevow-0.2.0.ebuild:
+  version bump
 
 *nevow-0.1 (06 May 2004)
 
diff --git a/dev-python/nevow/Manifest b/dev-python/nevow/Manifest
index 1be6cfaf54a0..f4b56284f358 100644
--- a/dev-python/nevow/Manifest
+++ b/dev-python/nevow/Manifest
@@ -1,4 +1,8 @@
-MD5 c84ecb47474d81106f18e6ccaa6d06f6 nevow-0.1.ebuild 593
-MD5 455983f7af7fbf537763af5ea08a8c20 ChangeLog 124
+MD5 3e4670af7b30047badd2ad35af4ec208 ChangeLog 902
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 8175847cff1da68f68bb009949b375cd nevow-0.1.ebuild 874
+MD5 4088d1e239078c09d13a0481903fca02 nevow-0.2.0.ebuild 1001
+MD5 7c59c07a935a79c355203a60f8959899 nevow-0.4.1.ebuild 923
 MD5 8a2fdcf3b007798083d424c0a4bf9c67 files/digest-nevow-0.1 61
+MD5 a8b25c9050527be54829343c1c21910a files/digest-nevow-0.2.0 63
+MD5 2998dda354834e366da7bd2e8fafc8be files/digest-nevow-0.4.1 63
diff --git a/dev-python/nevow/nevow-0.1.ebuild b/dev-python/nevow/nevow-0.1.ebuild
index 3ed6c24a41e6..1df7b35eae78 100644
--- a/dev-python/nevow/nevow-0.1.ebuild
+++ b/dev-python/nevow/nevow-0.1.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/dev-python/nevow/nevow-0.1.ebuild,v 1.1 2004/05/06 18:29:02 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -17,17 +17,15 @@ IUSE=""
 
 DEPEND=">=dev-python/twisted-1.2.0"
 
-S=${WORKDIR}/${P}
-
 src_install() {
-    distutils_src_install
-    
-    dodoc README
-    
-    # other docs are in subdirs so i use cp -r instead of insinto
-    cp -r ${S}/doc ${D}/usr/share/doc/${PF}/
-    cp -r ${S}/examples ${D}/usr/share/doc/${PF}/
-    
-    # FIXME:
-    # should i install tutorial,pdfs,.. when USE="doc"?
-}
\ No newline at end of file
+	distutils_src_install
+
+	dodoc README
+
+	# other docs are in subdirs so i use cp -r instead of insinto
+	cp -r ${S}/doc ${D}/usr/share/doc/${PF}/
+	cp -r ${S}/examples ${D}/usr/share/doc/${PF}/
+
+	# FIXME:
+	# should i install tutorial,pdfs,.. when USE="doc"?
+}
diff --git a/dev-python/nevow/nevow-0.2.0.ebuild b/dev-python/nevow/nevow-0.2.0.ebuild
index 29a3c50d8b94..403a15b5d281 100644
--- a/dev-python/nevow/nevow-0.2.0.ebuild
+++ b/dev-python/nevow/nevow-0.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/dev-python/nevow/nevow-0.2.0.ebuild,v 1.1 2004/06/07 14:54:37 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.divmod.org/users/release/divmod/Nevow-${MY_PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-python/twisted-1.3.0"
diff --git a/dev-python/nevow/nevow-0.4.1.ebuild b/dev-python/nevow/nevow-0.4.1.ebuild
index ddf441b9fbbd..db3572457439 100644
--- a/dev-python/nevow/nevow-0.4.1.ebuild
+++ b/dev-python/nevow/nevow-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/dev-python/nevow/nevow-0.4.1.ebuild,v 1.1 2005/04/22 16:25:05 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nevow/nevow-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.nevow.org/releases/${PV}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2"
@@ -31,4 +31,4 @@ src_install() {
 
 	# FIXME:
 	# should i install tutorial,pdfs,.. when USE="doc"?
-}
\ No newline at end of file
+}
diff --git a/dev-python/numarray/ChangeLog b/dev-python/numarray/ChangeLog
index 845ca3a99cf2..850b864fe28e 100644
--- a/dev-python/numarray/ChangeLog
+++ b/dev-python/numarray/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for dev-python/numarray
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.1 2003/09/16 15:05:46 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/ChangeLog,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> numarray-1.3.1.ebuild:
+  Mark 1.3.1 stable on alpha
+
+*numarray-1.3.1 (21 Apr 2005)
+
+  21 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> +numarray-1.3.1.ebuild:
+  Version bump, fixes some 64-bit issues and a hang on x86.
+
+  12 Jan 2005; Mike Doty <kingtaco@gentoo.org> numarray-1.1.1.ebuild:
+  ~amd64 keyword added
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*numarray-1.1.1 (07 Dec 2004)
+
+  07 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +numarray-1.1.1.ebuild:
+  version bump
+
+*numarray-1.0 (06 Jul 2004)
+
+  06 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +numarray-1.0.ebuild:
+  Version bump. Added commands to install whole documentation and examples.
+  Added long description to metadata.xml.
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> numarray-0.9.ebuild:
+  adding s390 keywords
+
+  28 Mar 2004; David Holm <dholm@gentoo.org> numarray-0.9.ebuild:
+  Added to ~ppc.
+
+*numarray-0.9 (28 Mar 2004)
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> numarray-0.9.ebuild:
+  Version bump.
+
+*numarray-0.8 (13 Dec 2003)
+
+  13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> numarray-0.8.ebuild:
+  Version bump.
 
 *numarray-0.7 (16 Sep 2003)
 
diff --git a/dev-python/numarray/Manifest b/dev-python/numarray/Manifest
index e6796b6369a2..27bad0d928f7 100644
--- a/dev-python/numarray/Manifest
+++ b/dev-python/numarray/Manifest
@@ -1,2 +1,22 @@
-MD5 a80d1485d5a0289af1a6c7a3008f1503 numarray-0.7.ebuild 570
-MD5 4ddabc1435a9a4996d01c9985c885694 files/digest-numarray-0.7 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77a433e9e01126aab4328498021f86b7 ChangeLog 1717
+MD5 5c95280b58164f97854a8807e94ddee3 files/digest-numarray-0.8 64
+MD5 4756d5a71aa315d2e2e695d0af41fac1 files/digest-numarray-0.9 64
+MD5 8952cb84bd61761dcb08feb920425d0f files/digest-numarray-1.0 65
+MD5 6d1fc561f9f1f99fcd00c7a8ec9f3521 files/digest-numarray-1.1.1 67
+MD5 0fabd12486f274cbf365e338e91daaf6 files/digest-numarray-1.3.1 67
+MD5 1ffa32cfa3e5c763b32594feb8047497 metadata.xml 923
+MD5 89b52cf72505529ab87a376af4a3a857 numarray-0.8.ebuild 562
+MD5 6ad7145a123adab20d62654ef82cea29 numarray-0.9.ebuild 573
+MD5 4c79c155049eed9eb80854ae4b811ab0 numarray-1.0.ebuild 723
+MD5 d5c7a5f486801dfbe179578b1cef2782 numarray-1.1.1.ebuild 732
+MD5 ab44d96e9af176fb325732f8fa751019 numarray-1.3.1.ebuild 741
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwIrFdQwWVoAgN4RAot0AKDK5Aqr/9V5WN0nDMhFj5jSiKTX5gCg3+EQ
+Ky63Ulp/qxaBKdlYIkQ6idY=
+=vOhu
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numarray/metadata.xml b/dev-python/numarray/metadata.xml
index de483c53568f..255a5187017b 100644
--- a/dev-python/numarray/metadata.xml
+++ b/dev-python/numarray/metadata.xml
@@ -2,4 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+Numarray is an array processing package designed to efficiently
+manipulate large multi-dimensional arrays.  Numarray is modelled after
+Numeric and features c-code generated from python template scripts,
+the capacity to operate directly on arrays in files, and improved type
+promotions.
+</longdescription>
+<longdescription lang="ja">
+Numarrayは巨大な多次元配列効果的に操作するためにデザインされた配列処理を提供する
+パッケージです。NumarrayはNumericをモデルにし、Python言語のテンプレート・スクリ>プトから作られたC言語コード、複数ファイルの複数配列を直接操作する収容力、より強>く型付けを求める辺りが特徴です。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/numarray/numarray-0.8.ebuild b/dev-python/numarray/numarray-0.8.ebuild
index 117206b356bf..8158bdd15f2d 100644
--- a/dev-python/numarray/numarray-0.8.ebuild
+++ b/dev-python/numarray/numarray-0.8.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/dev-python/numarray/numarray-0.8.ebuild,v 1.1 2003/12/13 06:16:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils
 
@@ -12,5 +12,5 @@ DEPEND=">=dev-lang/python-2.2.2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="BSD"
diff --git a/dev-python/numarray/numarray-0.9.ebuild b/dev-python/numarray/numarray-0.9.ebuild
index 2a54ea2fa8fa..d3ef71119bd2 100644
--- a/dev-python/numarray/numarray-0.9.ebuild
+++ b/dev-python/numarray/numarray-0.9.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/dev-python/numarray/numarray-0.9.ebuild,v 1.1 2004/03/28 16:35:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-0.9.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils
 
@@ -12,5 +12,5 @@ DEPEND=">=dev-lang/python-2.2.2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc s390"
 LICENSE="BSD"
diff --git a/dev-python/numarray/numarray-1.0.ebuild b/dev-python/numarray/numarray-1.0.ebuild
index e37fd4e61404..c7a0d66fe731 100644
--- a/dev-python/numarray/numarray-1.0.ebuild
+++ b/dev-python/numarray/numarray-1.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/dev-python/numarray/numarray-1.0.ebuild,v 1.1 2004/07/06 07:36:37 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/numarray/numarray-1.1.1.ebuild b/dev-python/numarray/numarray-1.1.1.ebuild
index 4436d5ce07cc..6dc89c3aa671 100644
--- a/dev-python/numarray/numarray-1.1.1.ebuild
+++ b/dev-python/numarray/numarray-1.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/dev-python/numarray/numarray-1.1.1.ebuild,v 1.1 2004/12/07 00:04:17 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray"
 DEPEND=">=dev-lang/python-2.2.2"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~s390"
+KEYWORDS="~x86 ~ppc ~s390 ~amd64"
 LICENSE="BSD"
 
 src_install() {
diff --git a/dev-python/numarray/numarray-1.3.1.ebuild b/dev-python/numarray/numarray-1.3.1.ebuild
index 268789b25d9e..32e5e6b57928 100644
--- a/dev-python/numarray/numarray-1.3.1.ebuild
+++ b/dev-python/numarray/numarray-1.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/dev-python/numarray/numarray-1.3.1.ebuild,v 1.1 2005/04/21 18:15:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numarray/numarray-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.stsci.edu/resources/software_hardware/numarray"
 DEPEND=">=dev-lang/python-2.2.2"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~s390 ~amd64 ~alpha ~ia64"
+KEYWORDS="alpha ~amd64 ia64 ~ppc s390 x86"
 LICENSE="BSD"
 
 src_install() {
diff --git a/dev-python/numeric/ChangeLog b/dev-python/numeric/ChangeLog
index 2b5679dd9ee4..f33c3e1a1cef 100644
--- a/dev-python/numeric/ChangeLog
+++ b/dev-python/numeric/ChangeLog
@@ -1,19 +1,96 @@
 # ChangeLog for dev-python/numeric
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.1 2003/09/02 22:24:02 liquidx Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/ChangeLog,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
+
+  22 Aug 2005; Lukasz Strzygowski <lucass@gentoo.org> numeric-22.0.ebuild,
+  numeric-23.1.ebuild, numeric-23.7.ebuild, numeric-23.8.ebuild:
+  Fixed homepage. Closing bug #103371.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> numeric-23.7.ebuild:
+  Stable on ppc64
+
+  11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> numeric-23.7.ebuild,
+  numeric-23.8.ebuild:
+  added mips keywords to satisfy gnome repoman deps
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> numeric-23.7.ebuild:
+  Stable on alpha.
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org> numeric-23.7.ebuild:
+  Stable on ppc.
+
+  11 May 2005; Marcus D. Hanwell <cryos@gentoo.org> numeric-23.7.ebuild:
+  Stable on amd64.
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> numeric-23.7.ebuild:
+  stable on ia64
+
+  01 May 2005; Guy Martin <gmsoft@gentoo.org> numeric-23.7.ebuild:
+  Stable on hppa.
+
+  26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> numeric-23.7.ebuild:
+  Stable on sparc
+
+*numeric-23.8 (25 Apr 2005)
+
+  25 Apr 2005; Carsten Lohrke <carlo@gentoo.org> -files/numeric-23.3.patch,
+  -numeric-23.0.ebuild, -numeric-23.3.ebuild, -numeric-23.6.ebuild,
+  +numeric-23.8.ebuild:
+  version bump, clean up
+
+  25 Apr 2005; Carsten Lohrke <carlo@gentoo.org> numeric-23.7.ebuild:
+  stable on x86
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> numeric-23.1.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> numeric-23.7.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*numeric-23.7 (21 Jan 2005)
+
+  21 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/numeric-23.7.patch,
+  +numeric-23.7.ebuild:
+  version bump
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*numeric-23.6 (07 Dec 2004)
+
+  07 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +numeric-23.6.ebuild:
+  version bump
+
+*numeric-23.3 (18 Aug 2004)
+
+  18 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> +files/numeric-23.3.patch,
+  +numeric-23.3.ebuild:
+  Version bump, ebuild by S.Caglar Onur <caglar.onur@tubitak.gov.tr>
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> numeric-23.1.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> numeric-22.0.ebuild:
+  Add missing IUSE.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> numeric-23.1.ebuild:
+  Stable on sparc.
 
 *numeric-23.1 (02 Sep 2003)
 
+  20 Jan 2004; Guy Martin <gmsoft@gentoo.org> numeric-23.1.ebuild :
+  Marked stable on hppa.
+
   02 Sep 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml,
   numeric-22.0.ebuild, numeric-23.0.ebuild, numeric-23.1.ebuild:
   moved from dev-python/Numeric to dev-python/numeric
 
-*Numeric-23.0 (03 Apr 2003)
+*numeric-23.0 (03 Apr 2003)
 
   03 Apr 2003; Alastair Tse <liquidx@gentoo.org> Numeric-23.0.ebuild:
   version bump
 
-*Numeric-22.0 (17 Dec 2002)
+*numeric-22.0 (17 Dec 2002)
 
   17 Dec 2002; B.Lauwers <blauwers@gentoo.org> :
   Version bump.
diff --git a/dev-python/numeric/Manifest b/dev-python/numeric/Manifest
index 189c337d4a89..fb45b3935854 100644
--- a/dev-python/numeric/Manifest
+++ b/dev-python/numeric/Manifest
@@ -1,7 +1,21 @@
-MD5 c439a21c456a4bd7830e3dbbda5de872 ChangeLog 1343
-MD5 98ef718374a4c0a2f9655318a24c4379 numeric-22.0.ebuild 825
-MD5 c55753a734e80ec6a561607eb19b5788 numeric-23.0.ebuild 828
-MD5 c55753a734e80ec6a561607eb19b5788 numeric-23.1.ebuild 828
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 29561e5bbbd7c13e9f5615abe1a43d38 ChangeLog 3959
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 e3d5095f77a67728f076a7e7f9abddcc numeric-22.0.ebuild 808
+MD5 612753ac1e044abc11a29c465a97becb numeric-23.1.ebuild 792
+MD5 598f1b5f5e58079150ed166f9abac372 numeric-23.7.ebuild 885
+MD5 1eea5e4c951a1cf20434e116fe8661cf numeric-23.8.ebuild 859
+MD5 b962c2f9fe39159f4c6025bb24cdf701 files/numeric-23.7.patch 2311
 MD5 543b62c79215183872d1f43ee1033c0b files/digest-numeric-22.0 64
-MD5 1bbfd6024c1a372499b3774b2b91b5ab files/digest-numeric-23.0 64
 MD5 a52c0be4669341bbf82129377ca75f2e files/digest-numeric-23.1 64
+MD5 f7fae5c73c85e5d2038f4b1c7d634d7b files/digest-numeric-23.7 64
+MD5 6c2043e258fdbea77284f56bae42b32a files/digest-numeric-23.8 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDClNs2jLqHNfbg2URAvnIAJ9NI1O5o8htKQD7sFtR9TdvqKqiRgCfSjKg
+coq4U+2Ol6i9YhqWGo9CCLc=
+=e8+Z
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numeric/numeric-22.0.ebuild b/dev-python/numeric/numeric-22.0.ebuild
index 99d086873091..ca6f90b2323f 100644
--- a/dev-python/numeric/numeric-22.0.ebuild
+++ b/dev-python/numeric/numeric-22.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/dev-python/numeric/numeric-22.0.ebuild,v 1.1 2003/09/02 22:24:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-22.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -8,28 +8,22 @@ MY_P=${P/n/N}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
+HOMEPAGE="http://numeric.scipy.org/"
 SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pfdubois.com/numpy/"
 
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha hppa"
+IUSE=""
 
 # 2.1 gave sandbox violations see #21
 DEPEND=">=dev-lang/python-2.2"
 
 src_install() {
-
 	distutils_src_install
-	distutils_python_version    
+	distutils_python_version
 
 	#Numerical Tutorial is nice for testing and learning
 	insinto /usr/lib/python${PYVER}/site-packages/NumTut
 	doins Demo/NumTut/*
-
 }
-
-
-
-
diff --git a/dev-python/numeric/numeric-23.1.ebuild b/dev-python/numeric/numeric-23.1.ebuild
index 3c7d63b0df9d..206ff35a44ce 100644
--- a/dev-python/numeric/numeric-23.1.ebuild
+++ b/dev-python/numeric/numeric-23.1.ebuild
@@ -1,35 +1,29 @@
-# 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/dev-python/numeric/numeric-23.1.ebuild,v 1.1 2003/09/02 22:24:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.1.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/n/N}
 S=${WORKDIR}/${MY_P}
 
-DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
+DESCRIPTION="a fast, compact, multidimensional array language facility"
+HOMEPAGE="http://numeric.scipy.org/"
 SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pfdubois.com/numpy/"
 
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc s390 sparc x86"
+IUSE=""
 
 # 2.1 gave sandbox violations see #21
 DEPEND=">=dev-lang/python-2.2"
 
 src_install() {
-
 	distutils_src_install
-	distutils_python_version    
+	distutils_python_version
 
 	#Numerical Tutorial is nice for testing and learning
 	insinto /usr/lib/python${PYVER}/site-packages/NumTut
 	doins Demo/NumTut/*
-
 }
-
-
-
-
diff --git a/dev-python/numeric/numeric-23.7.ebuild b/dev-python/numeric/numeric-23.7.ebuild
index 21558af73d0a..dfc24cd470f7 100644
--- a/dev-python/numeric/numeric-23.7.ebuild
+++ b/dev-python/numeric/numeric-23.7.ebuild
@@ -1,38 +1,35 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.7.ebuild,v 1.1 2005/01/21 16:49:57 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.7.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils eutils
 
 MY_P=${P/n/N}
 S=${WORKDIR}/${MY_P}
 
-DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
+DESCRIPTION="a fast, compact, multidimensional array language facility"
+HOMEPAGE="http://numeric.scipy.org/"
 SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pfdubois.com/numpy/"
 
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
 LICENSE="as-is"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE=""
 
 # 2.1 gave sandbox violations see #21
 DEPEND=">=dev-lang/python-2.2"
 
 src_unpack() {
 	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}.patch
 }
 
 src_install() {
-
 	distutils_src_install
 	distutils_python_version
 
 	#Numerical Tutorial is nice for testing and learning
 	insinto /usr/lib/python${PYVER}/site-packages/NumTut
 	doins Demo/NumTut/*
-
 }
diff --git a/dev-python/numeric/numeric-23.8.ebuild b/dev-python/numeric/numeric-23.8.ebuild
index 3599f763b837..fde5a984524a 100644
--- a/dev-python/numeric/numeric-23.8.ebuild
+++ b/dev-python/numeric/numeric-23.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/dev-python/numeric/numeric-23.8.ebuild,v 1.1 2005/04/25 17:20:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numeric/numeric-23.8.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -9,11 +9,11 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="Numerical Python adds a fast, compact, multidimensional array language facility to Python."
 SRC_URI="mirror://sourceforge/numpy/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pfdubois.com/numpy/"
+HOMEPAGE="http://numeric.scipy.org/"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 LICENSE="as-is"
 
 # 2.1 gave sandbox violations see #21
diff --git a/dev-python/omniorbpy/ChangeLog b/dev-python/omniorbpy/ChangeLog
index a8ec8fc5b4d4..f002c787cff9 100644
--- a/dev-python/omniorbpy/ChangeLog
+++ b/dev-python/omniorbpy/ChangeLog
@@ -1,17 +1,56 @@
-# ChangeLog for dev-python/omniORBpy
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.1 2004/07/17 00:40:43 kloeri Exp $
+# ChangeLog for dev-python/omniorbpy
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> omniorbpy-2.5.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> omniorbpy-2.5.ebuild:
+  stable on amd64
+
+*omniorbpy-2.6 (20 Apr 2005)
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> omniorbpy-2.3.ebuild,
+  omniorbpy-2.5.ebuild, +omniorbpy-2.6.ebuild:
+  version bump. also fix ssl useflag typo (#82820). fixed hardcoding of python
+  version in 2.3 (#89794)
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Nov 2004; Alastair Tse <liquidx@gentoo.org> omniorbpy-2.5.ebuild:
+  changed install paths for CORBA.py and PortableServer.py will not collide
+  with pyorbit. Most (if not all) programs specifiy which CORBA implementation
+  to use anyway.
+
+*omniorbpy-2.5 (16 Nov 2004)
+
+  16 Nov 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/omniorbpy-2.4-newstyleobj.patch, -omniorbpy-2.0.ebuild,
+  -omniorbpy-2.2.ebuild, omniorbpy-2.3.ebuild, +omniorbpy-2.5.ebuild:
+  add newstyle python class support patch. version bump
+
+*omniorbpy-2.4 (04 Oct 2004)
+
+  04 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +omniorbpy-2.4.ebuild:
+  Version bump.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> omniorbpy-2.3.ebuild:
+  Added to ~ppc.
 
 *omniorbpy-2.2 (17 Jul 2004)
 
-  17 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  17 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +omniorbpy-2.0.ebuild, +omniorbpy-2.2.ebuild, +omniorbpy-2.3.ebuild:
   Rename to omniorbpy.
 
   10 May 2004; Travis Tilley <lv@gentoo.org> omniORBpy-2.3.ebuild:
   added ~amd64 keyword
 
-  04 May 2004; Bryan �stergaard <kloeri@gentoo.org> omniORBpy-2.0.ebuild,
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> omniORBpy-2.0.ebuild,
   omniORBpy-2.2.ebuild, omniORBpy-2.3.ebuild:
   Remove default S.
 
@@ -21,7 +60,7 @@
 
 *omniORBpy-2.3 (15 Dec 2003)
 
-  15 Dec 2003; Bryan �stergaard,,, <kloeri@gentoo.org> omniORBpy-2.3.ebuild:
+  15 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> omniORBpy-2.3.ebuild:
   Version bump.
 
 *omniORBpy-2.2 (03 Oct 2003)
diff --git a/dev-python/omniorbpy/Manifest b/dev-python/omniorbpy/Manifest
index d036053a703b..9bcefcc53a47 100644
--- a/dev-python/omniorbpy/Manifest
+++ b/dev-python/omniorbpy/Manifest
@@ -1,8 +1,10 @@
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 b8d2146de791b88b8288d98dfc2a2102 omniorbpy-2.0.ebuild 2023
-MD5 505f41a1393c5c42db89f314d3394109 omniorbpy-2.2.ebuild 2023
-MD5 3b8ba7d0f1da3dfb13373918c62772e8 ChangeLog 1012
-MD5 abe6c5b1dc3d5982769ed7dce55da462 omniorbpy-2.3.ebuild 2030
-MD5 3b2f7d612501c7be35937d732281147a files/digest-omniorbpy-2.0 65
-MD5 e5b594489f3bb0ca7f36138194697abe files/digest-omniorbpy-2.2 65
+MD5 c1a6c8c4b69ffd89440791152d802fea ChangeLog 2550
+MD5 64781b6a3d18dd9a189d47d224a66e14 omniorbpy-2.3.ebuild 1944
+MD5 b5f2d648cc4992146a66e11e0863a644 omniorbpy-2.5.ebuild 2766
+MD5 6e01a95c6f11714345a1657e1ec070ee omniorbpy-2.4.ebuild 2033
+MD5 9ddb3486aa7623c204d4a5e6cd400629 omniorbpy-2.6.ebuild 2794
+MD5 af7d67adb7657fe0cbf30d2f773cac25 files/digest-omniorbpy-2.4 65
 MD5 83c93e6e67ee905f02269466a4f296fd files/digest-omniorbpy-2.3 65
+MD5 5a4a58b66c4fa989a62d00605eec2d25 files/digest-omniorbpy-2.6 143
+MD5 8fe97fa28de50ac6eb2a16622687c0a2 files/digest-omniorbpy-2.5 143
diff --git a/dev-python/omniorbpy/omniorbpy-2.3.ebuild b/dev-python/omniorbpy/omniorbpy-2.3.ebuild
index d0b2c2f0e643..5068c4404069 100644
--- a/dev-python/omniorbpy/omniorbpy-2.3.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.3.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/dev-python/omniorbpy/omniorbpy-2.3.ebuild,v 1.1 2004/07/17 00:40:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
+
+inherit python
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
@@ -11,7 +13,7 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="ssl"
 
 DEPEND=">=net-misc/omniORB-4.0.3
@@ -22,10 +24,8 @@ src_compile() {
 
 	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
 
-	MY_PY=/usr/bin/python`python -c "import sys; print sys.version[:3]"`
-	# install modules for python which is default python interpreter in
-	# the system
-
+	python_version
+	MY_PY=/usr/bin/python${PYVER}
 	PYTHON=${MY_PY} ./configure ${MY_CONF} || die "./configure failed"
 	emake || die
 }
diff --git a/dev-python/omniorbpy/omniorbpy-2.4.ebuild b/dev-python/omniorbpy/omniorbpy-2.4.ebuild
index 7a1ff6691418..e49e32eb5a21 100644
--- a/dev-python/omniorbpy/omniorbpy-2.4.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-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/dev-python/omniorbpy/omniorbpy-2.4.ebuild,v 1.1 2004/10/04 21:50:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 MY_P=${P/omniorb/omniORB}
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/omniorbpy/omniorbpy-2.5.ebuild b/dev-python/omniorbpy/omniorbpy-2.5.ebuild
index e44b760191ed..90ce67d1eed2 100644
--- a/dev-python/omniorbpy/omniorbpy-2.5.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-2.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/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.1 2004/11/17 13:23:34 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.5.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit eutils python
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/omniorb/${MY_P}.tar.gz http://www-lce.eng.cam.ac.u
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE="ssl"
 
 DEPEND=">=net-misc/omniORB-4.0.5
@@ -24,19 +24,26 @@ src_unpack() {
 	sed -i -e "s/^CXXDEBUGFLAGS.*/CXXDEBUGFLAGS = ${CXXFLAGS}/" \
 		-e "s/^CDEBUGFLAGS.*/CDEBUGFLAGS = ${CFLAGS}/" \
 		${S}/mk/beforeauto.mk.in
+	sed -i -e 's#^.*compileall[^\\]*#/bin/true;#' \
+		${S}/python/dir.mk \
+		${S}/python/omniORB/dir.mk \
+		${S}/python/COS/dir.mk \
+		${S}/python/CosNaming/dir.mk \
+		${S}/CosNaming__POA/dir.mk
+
 	cd ${S}
 	epatch ${DISTDIR}/omniORBpy-2.4-newstyleobjs02.patch
 }
 
 src_compile() {
-	use ssl && MY_CONF="${MY_CONF} --with-openssl=/usr"
+	use ssl && MY_CONF="--with-openssl=/usr"
 
 	python_version
-	MY_PY=/usr/bin/python$PYVER
+	MY_PY=/usr/bin/python${PYVER}
 
 	PYTHON=${MY_PY} econf \
 		--with-omniorb=/usr \
-		${MYCONF} || die "./configure failed"
+		${MY_CONF} || die "./configure failed"
 
 	emake || die " make failed"
 }
@@ -46,11 +53,12 @@ src_install() {
 	sed -i -e "s/'prefix[\t ]*:= \/usr'/'prefix := \${DESTDIR}\/usr'/" \
 		mk/beforeauto.mk
 
-	# won't work without these really very ugly hack... 
-    # maybe someone can do better..
+	# won't work without these really very ugly hack...
+	# maybe someone can do better..
 
 	mv python/omniORB/dir.mk python/omniORB/dir.mk_orig
 	awk -v STR="ir\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/omniORB/dir.mk_orig > python/omniORB/dir.mk
+
 	mv python/dir.mk python/dir.mk_orig
 	awk -v STR="Naming\\\.idl" '{ if (/^[[:space:]]*$/) flag = 0; tmpstr = $0; if (gsub(STR, "", tmpstr)) flag = 1; if (flag) print "#" $0; else print $0; }' python/dir.mk_orig > python/dir.mk
 
@@ -62,6 +70,22 @@ src_install() {
 	dodoc doc/tex/* # .bib, .tex
 
 	dodir /usr/share/doc/${P}/examples
-	cp -r examples/* ${D}/usr/share/doc/${P}/examples # doins doesn't do recursive
+	cp -r examples/* ${D}/usr/share/doc/${P}/examples
+
+	mv ${D}/usr/lib/python${PYVER}/site-packages/PortableServer.py \
+		${D}/usr/lib/python${PYVER}/site-packages/omniorbpy_PortableServer.py
+
+	mv ${D}/usr/lib/python${PYVER}/site-packages/CORBA.py \
+		${D}/usr/lib/python${PYVER}/site-packages/omniorbpy_CORBA.py
+
 }
 
+pkg_postinst() {
+	python_version
+	python_mod_optimize ${ROOT}usr/lib/python${PYVER}/site-packages
+}
+
+pkg_postrm() {
+	python_version
+	python_mod_cleanup ${ROOT}usr/lib/python${PYVER}/site-packages
+}
diff --git a/dev-python/omniorbpy/omniorbpy-2.6.ebuild b/dev-python/omniorbpy/omniorbpy-2.6.ebuild
index 88a5b9ff17c1..db2ad0c8a9ca 100644
--- a/dev-python/omniorbpy/omniorbpy-2.6.ebuild
+++ b/dev-python/omniorbpy/omniorbpy-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/dev-python/omniorbpy/omniorbpy-2.6.ebuild,v 1.1 2005/04/20 15:31:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/omniorbpy/omniorbpy-2.6.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit eutils python
 
diff --git a/dev-python/optik/ChangeLog b/dev-python/optik/ChangeLog
index f136274d2e29..95a593352f6e 100644
--- a/dev-python/optik/ChangeLog
+++ b/dev-python/optik/ChangeLog
@@ -1,6 +1,78 @@
 # ChangeLog for dev-python/optik
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/ChangeLog,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> optik-1.5.ebuild:
+  Mark 1.5 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> optik-1.5.ebuild:
+  add ~ia64
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> optik-1.5.ebuild:
+  Stable on alpha.
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> optik-1.5.ebuild:
+  Stable on SPARC.
+
+  15 May 2005; Bryan Østergaard <kloeri@gentoo.org> optik-1.5.ebuild:
+  Stable on x86.
+
+*optik-1.5 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> +optik-1.5.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> optik-1.4.1.ebuild:
+  keywords ~amd64; closes #60987.
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> optik-1.4.1.ebuild:
+  Stable on alpha.
+
+  12 May 2004; David Holm <dholm@gentoo.org> optik-1.4.1.ebuild:
+  Added to ~ppc.
+
+*optik-1.4.1 (12 May 2004)
+
+  12 May 2004; Bryan Østergaard <kloeri@gentoo.org> +optik-1.4.1.ebuild:
+  Version bump.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> optik-1.2.ebuild,
+  optik-1.3.ebuild:
+  Add missing IUSE.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> optik-1.4.ebuild:
+  Stable on sparc.
+
+  12 Jun 2003; <msterret@gentoo.org> optik-1.2.ebuild:
+  fix Header
+
+*optik-1.4 (11 Dec 2002)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> optik-1.4.ebuild:
+  ebuild cleanups and bump to stable
+
+  11 Dec 2002; B.Lauwers <blauwers@gentoo.org> optik-1.4.ebuild, Changelog :
+
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*optik-1.3 (28 Apr 2002)
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> optik-1.2.ebuild, optik-1.3.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE
+  headers clean-up
+  field removed from header: Ollie Rutherfurd <oliver@rutherfurd.net>
+
+  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog option-1.3.ebuild
+  
+  Update to latest upstream
+  Update build procedure
+  Closes #1975
 
 *optik-1.2 (1 Feb 2002)
 
diff --git a/dev-python/optik/Manifest b/dev-python/optik/Manifest
index e69de29bb2d1..c6e3c69535c9 100644
--- a/dev-python/optik/Manifest
+++ b/dev-python/optik/Manifest
@@ -0,0 +1,12 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 c0232efc2454db724c029f44af37bf74 optik-1.4.1.ebuild 673
+MD5 f832987e8f1ec5e57b07b520748c715c ChangeLog 2687
+MD5 830eb339b0062ab3312858df63229a03 optik-1.3.ebuild 677
+MD5 6e0dcc9dd604e5d3a64cd198142c3390 optik-1.2.ebuild 616
+MD5 d04852dbf11c71cb06ab403e9e61353f optik-1.5.ebuild 640
+MD5 c0e36d71bb8aaa99e5f4081471a0eba6 optik-1.4.ebuild 658
+MD5 90a11d2a7f6c3f50647b6d155648cf85 files/digest-optik-1.3 60
+MD5 a1483f9e10bc484a5e40cef019ac85dd files/digest-optik-1.5 60
+MD5 0c72b3003a13ea3464fd47aaf05f0ec3 files/digest-optik-1.4 60
+MD5 bb68abf1eea4219f67c7c24b1505512e files/digest-optik-1.4.1 62
+MD5 b757aba98cf0cbbfe8121044ce96437a files/digest-optik-1.2 60
diff --git a/dev-python/optik/files/digest-optik-1.2 b/dev-python/optik/files/digest-optik-1.2
index af98fb94e4b0..2bdc43f4193d 100644
--- a/dev-python/optik/files/digest-optik-1.2
+++ b/dev-python/optik/files/digest-optik-1.2
@@ -1 +1 @@
-MD5 93de9c3e331b9dd2a79d1d404214696e Optik-1.2.tar.gz 32768
+MD5 93de9c3e331b9dd2a79d1d404214696e Optik-1.2.tar.gz 32322
diff --git a/dev-python/optik/optik-1.2.ebuild b/dev-python/optik/optik-1.2.ebuild
index 626dcdb09f32..b2bbc215b020 100644
--- a/dev-python/optik/optik-1.2.ebuild
+++ b/dev-python/optik/optik-1.2.ebuild
@@ -1,21 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Ollie Rutherfurd <oliver@rutherfurd.net>
-# $Header $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/optik-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 S="${WORKDIR}/Optik-1.2"
 
 DESCRIPTION="Optik is a powerful, flexible, easy-to-use command-line parsing library for Python."
-SRC_URI="http://prdownloads.sourceforge.net/optik/Optik-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/optik/Optik-${PV}.tar.gz"
 HOMEPAGE="http://optik.sourceforge.net/"
 
 DEPEND="virtual/python"
 
+SLOT="0"
+KEYWORDS="x86 sparc alpha"
+LICENSE="BSD"
+IUSE=""
+
 src_install () {
 	cd ${S}
 	python setup.py install --prefix=${D}/usr || die
 	dodoc *.txt
 }
-
-
-
diff --git a/dev-python/optik/optik-1.3.ebuild b/dev-python/optik/optik-1.3.ebuild
index 3feec40e70b1..813b60a95d1c 100644
--- a/dev-python/optik/optik-1.3.ebuild
+++ b/dev-python/optik/optik-1.3.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Ollie Rutherfurd <oliver@rutherfurd.net>
-# Maintainer: Jon Nelson <jnelson@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/optik-1.3.ebuild,v 1.1 2002/04/28 17:18:23 jnelson Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/optik-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 S="${WORKDIR}/Optik-${PV}"
 
 DESCRIPTION="Optik is a powerful, flexible, easy-to-use command-line parsing library for Python."
-SRC_URI="http://prdownloads.sourceforge.net/optik/Optik-${PV}.tar.gz"
+SRC_URI="mirror://sourceforge/optik/Optik-${PV}.tar.gz"
 HOMEPAGE="http://optik.sourceforge.net/"
 
 DEPEND="virtual/python"
-RDEPEND="${DEPEND}"
+
+SLOT="0"
+KEYWORDS="x86 sparc alpha"
+LICENSE="BSD"
+IUSE=""
 
 src_compile() {
 	python setup.py build || die
diff --git a/dev-python/optik/optik-1.4.1.ebuild b/dev-python/optik/optik-1.4.1.ebuild
index b50d5b3797e3..4e6e8f84cf2c 100644
--- a/dev-python/optik/optik-1.4.1.ebuild
+++ b/dev-python/optik/optik-1.4.1.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/dev-python/optik/optik-1.4.1.ebuild,v 1.1 2004/05/12 09:06:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/optik-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://optik.sourceforge.net/"
 DEPEND="virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="~x86 ~sparc alpha ~ppc ~amd64"
 LICENSE="BSD"
 
 mydoc="*.txt"
diff --git a/dev-python/optik/optik-1.4.ebuild b/dev-python/optik/optik-1.4.ebuild
index 7df0d77127a8..387bc519f36f 100644
--- a/dev-python/optik/optik-1.4.ebuild
+++ b/dev-python/optik/optik-1.4.ebuild
@@ -1,9 +1,11 @@
-# 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/dev-python/optik/optik-1.4.ebuild,v 1.1 2002/12/11 22:51:08 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/optik-1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
-S="${WORKDIR}/Optik-${PV}"
+inherit distutils
 
+IUSE=""
+S="${WORKDIR}/Optik-${PV}"
 DESCRIPTION="Optik is a powerful, flexible, easy-to-use command-line parsing library for Python."
 SRC_URI="mirror://sourceforge/optik/Optik-${PV}.tar.gz"
 HOMEPAGE="http://optik.sourceforge.net/"
@@ -11,15 +13,13 @@ HOMEPAGE="http://optik.sourceforge.net/"
 DEPEND="virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc ~alpha"
 LICENSE="BSD"
 
+mydoc="*.txt"
 
-src_compile() {
-	python setup.py build || die
-}
-
-src_install () {
-	python setup.py install --root=${D} --prefix=/usr || die
-	dodoc *.txt examples/*
+src_install() {
+	distutils_src_install
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
 }
diff --git a/dev-python/optik/optik-1.5.ebuild b/dev-python/optik/optik-1.5.ebuild
index f46dd4628903..f6e28626467c 100644
--- a/dev-python/optik/optik-1.5.ebuild
+++ b/dev-python/optik/optik-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/dev-python/optik/optik-1.5.ebuild,v 1.1 2005/04/14 18:26:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/optik/optik-1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://optik.sourceforge.net/"
 DEPEND="virtual/python"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="alpha ~amd64 ia64 ~ppc sparc x86"
 LICENSE="BSD"
 
 mydoc="*.txt"
diff --git a/dev-python/orbit-python/ChangeLog b/dev-python/orbit-python/ChangeLog
index 9cbaf8b8ac60..7abbd4b8ea98 100644
--- a/dev-python/orbit-python/ChangeLog
+++ b/dev-python/orbit-python/ChangeLog
@@ -1,6 +1,63 @@
 # ChangeLog for dev-python/orbit-python
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/ChangeLog,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  orbit-python-1.99.0-r1.ebuild:
+  Mark 1.99.0-r1 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  orbit-python-1.99.0-r1.ebuild:
+  add ~ia64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  orbit-python-1.99.0-r1.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  orbit-python-1.99.0-r1.ebuild:
+  Stable on alpha.
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  orbit-python-0.3.0-r1.ebuild, orbit-python-0.3.1.ebuild,
+  orbit-python-1.99.0.ebuild:
+  Clean up IUSE and S.
+
+  12 Apr 2004; David Holm <dholm@gentoo.org> orbit-python-0.3.1.ebuild,
+  orbit-python-1.99.0-r1.ebuild:
+  Added to ~ppc.
+
+  30 Jan 2004; <gustavoz@gentoo.org> orbit-python-1.99.0-r1.ebuild:
+  keyworded sparc
+
+*orbit-python-1.99.0-r1 (17 Sep 2003)
+
+  17 Sep 2003; Alastair Tse <liquidx@gentoo.org>
+  orbit-python-1.99.0-r1.ebuild:
+  orbit-python-1.99 has now been superceded by pyorbit-1.99. introducing a
+  placeholder while we transistion the deps to pyorbit
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*orbit-python-1.99.0 (01 Nov 2002)
+
+  01 Nov 2002; foser <foser@gentoo.org> orbit-python-1.99.0.ebuild :
+  New ORBit2 development bindings
+
+*orbit-python-0.3.1 (11 Apr 2002)
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> orbit-python-0.3.0-r1.ebuild, orbit-python-0.3.1.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE
+  headers clean-up
+
+  11 Apr 2002; Spider <spider@gentoo.org>
+  Update all glib dependencies to use glib-1.2*  in preparation of
+unmasking the glib-2.0.1 packages
+
 
 *orbit-python-0.3.1 (1 Feb 2002)
 
@@ -11,3 +68,9 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
+*orbit-python-0.3.0-r1 (22 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
diff --git a/dev-python/orbit-python/Manifest b/dev-python/orbit-python/Manifest
index e69de29bb2d1..9417bd693677 100644
--- a/dev-python/orbit-python/Manifest
+++ b/dev-python/orbit-python/Manifest
@@ -0,0 +1,6 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 aa1eb6a2b3f86891778d3c1ed7b0aa4a ChangeLog 2531
+MD5 056382ed3698f4bf3f548191356d62af orbit-python-1.99.0-r1.ebuild 612
+MD5 01c74599f5b8332f2200a5c02321c42d orbit-python-0.3.1.ebuild 864
+MD5 1126d3c89677d7bbee27ba9d3c6b8f7f files/digest-orbit-python-0.3.1 70
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-orbit-python-1.99.0-r1 0
diff --git a/dev-python/orbit-python/files/digest-orbit-python-0.3.1 b/dev-python/orbit-python/files/digest-orbit-python-0.3.1
index 59850edc59e9..2068136779c7 100644
--- a/dev-python/orbit-python/files/digest-orbit-python-0.3.1
+++ b/dev-python/orbit-python/files/digest-orbit-python-0.3.1
@@ -1 +1 @@
-MD5 104a33e3285ecffd7b437599d3b3612f orbit-python-0.3.1.tar.gz 299008
+MD5 104a33e3285ecffd7b437599d3b3612f orbit-python-0.3.1.tar.gz 291028
diff --git a/dev-python/orbit-python/orbit-python-0.3.1.ebuild b/dev-python/orbit-python/orbit-python-0.3.1.ebuild
index 412148d3d877..ae7de90a0297 100644
--- a/dev-python/orbit-python/orbit-python-0.3.1.ebuild
+++ b/dev-python/orbit-python/orbit-python-0.3.1.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <micke@hallendal.net>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/orbit-python-0.3.1.ebuild,v 1.1 2001/11/15 21:42:01 hallski Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/orbit-python-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="ORBit bindings for Python"
 SRC_URI="http://orbit-python.sault.org/files/${P}.tar.gz"
 HOMEPAGE="http://orbit-python.sault.org/"
 
-DEPEND=">=dev-libs/glib-1.2.10
-	>=gnome-base/ORBit-0.5.10-r1
+DEPEND="=dev-libs/glib-1.2*
+	=gnome-base/orbit-0*
 	virtual/python"
 
+SLOT="0"
+KEYWORDS="x86 sparc alpha ~ppc"
+IUSE=""
+LICENSE="GPL-2"
+
 src_compile() {
 	CFLAGS="$CFLAGS `gnome-config --cflags libIDL`"
-	
+
 	PYTHON="/usr/bin/python" ./configure --host=${CHOST} 		\
 				   	     --prefix=/usr 		\
 					     --with-libIDL-prefix=/usr 	\
@@ -26,6 +29,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	
+
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/dev-python/orbit-python/orbit-python-1.99.0-r1.ebuild b/dev-python/orbit-python/orbit-python-1.99.0-r1.ebuild
index 418ff706d9f6..bf796945c844 100644
--- a/dev-python/orbit-python/orbit-python-1.99.0-r1.ebuild
+++ b/dev-python/orbit-python/orbit-python-1.99.0-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/dev-python/orbit-python/orbit-python-1.99.0-r1.ebuild,v 1.1 2003/09/17 08:46:34 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orbit-python/orbit-python-1.99.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
 # This is just a placeholder for >=dev-python/orbit-python-1.99
 # The package has been renamed to pyorbit since 1.99
@@ -14,7 +14,7 @@ DEPEND=">=dev-python/pyorbit-1.99"
 IUSE=""
 SLOT="2"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+KEYWORDS="alpha ia64 ppc sparc x86"
 
 src_compile() {
 	return
diff --git a/dev-python/orm/ChangeLog b/dev-python/orm/ChangeLog
index fe4a5450c092..2da6e4a8d941 100644
--- a/dev-python/orm/ChangeLog
+++ b/dev-python/orm/ChangeLog
@@ -1,10 +1,21 @@
 # ChangeLog for dev-python/orm
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/ChangeLog,v 1.1 2004/05/01 23:32:52 kloeri Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*orm-1.0.1 (14 Oct 2004)
+
+  14 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +orm-1.0.1.ebuild:
+  version bump
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> orm-0.15.ebuild:
+  Don't use  in SRC_URI..
 
 *orm-0.15 (02 May 2004)
 
-  02 May 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  02 May 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +orm-0.15.ebuild:
   Initial import, bug #47255.
 
diff --git a/dev-python/orm/Manifest b/dev-python/orm/Manifest
index 8e5f4b0a8614..a95df5b48312 100644
--- a/dev-python/orm/Manifest
+++ b/dev-python/orm/Manifest
@@ -1,2 +1,6 @@
-MD5 411e00aefcf747492bb1fdf6817034f1 orm-0.15.ebuild 796
+MD5 525d565f60162578dff3c70e3839c02a orm-1.0.1.ebuild 903
+MD5 cf84af95bf705d538c805969e52fd39c ChangeLog 658
+MD5 6f4a49d96c386d910308d5e3d61bea6f orm-0.15.ebuild 915
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 eb7246d138539ca34dd9de2aad653368 files/digest-orm-0.15 60
+MD5 f5e28d829338a21e5a9cbaeb67450d88 files/digest-orm-1.0.1 61
diff --git a/dev-python/orm/orm-0.15.ebuild b/dev-python/orm/orm-0.15.ebuild
index 6b2168e360b4..bb4628dbacc5 100644
--- a/dev-python/orm/orm-0.15.ebuild
+++ b/dev-python/orm/orm-0.15.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/dev-python/orm/orm-0.15.ebuild,v 1.1 2004/05/01 23:32:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/orm-0.15.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 IUSE="firebird mysql postgres"
 
@@ -8,7 +8,7 @@ inherit distutils
 
 DESCRIPTION="The Object Relational Membrane is an attempt to write an Object Relational Layer that is as thin as possible."
 HOMEPAGE="http://www.tux4web.de/computer/software/orm/"
-SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
+SRC_URI="http://www.tux4web.de/computer/software/orm/download/${P}.tar.gz"
 
 DEPEND=">=dev-lang/python-2.2.3
 	dev-python/egenix-mx-base
diff --git a/dev-python/orm/orm-1.0.1.ebuild b/dev-python/orm/orm-1.0.1.ebuild
index 292a80cfc8a6..92a9d8fa377a 100644
--- a/dev-python/orm/orm-1.0.1.ebuild
+++ b/dev-python/orm/orm-1.0.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/dev-python/orm/orm-1.0.1.ebuild,v 1.1 2004/10/14 00:23:52 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/orm/orm-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/paramiko/ChangeLog b/dev-python/paramiko/ChangeLog
index d7eae71e36c0..4f5274b3fc43 100644
--- a/dev-python/paramiko/ChangeLog
+++ b/dev-python/paramiko/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-python/paramiko
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/ChangeLog,v 1.1 2004/08/15 19:18:52 lucass Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+*paramiko-1.5 (28 Oct 2005)
+
+  28 Oct 2005; Lukasz Strzygowski <lucass@gentoo.org> +paramiko-1.5.ebuild:
+  Version bump. Closing bug #110592.
+
+*paramiko-1.3 (25 May 2005)
+
+  25 May 2005; Alastair Tse <liquidx@gentoo.org> +paramiko-1.3.ebuild:
+  version bump. added examples (#88584)
+
+  04 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> paramiko-0.9h.ebuild:
+  depend on app-arch/unzip bug# 69831, marked stable x86
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> paramiko-0.9h.ebuild:
+  Added to ~ppc.
 
 *paramiko-0.9h (15 Aug 2004)
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index f8fe9ca46b9b..b7045311262a 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,2 +1,18 @@
-MD5 06395a401d4c3852774e3fce1c53b9cf paramiko-0.9h.ebuild 443
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b647fabe6370a8c748583cc3b205654a ChangeLog 1041
 MD5 c117912a6af93099a7e2bc82fb50526f files/digest-paramiko-0.9h 68
+MD5 1d11d85c9926b3c9d029aab756fa3f3f files/digest-paramiko-1.3 61
+MD5 3b3cb92a8ee9a548558763e6867dcd06 files/digest-paramiko-1.5 61
+MD5 4d5b7b5bcf6a70511e46ad6a06420b39 metadata.xml 897
+MD5 9c163bc4e197fd29a23d8a5307f73abc paramiko-0.9h.ebuild 640
+MD5 078cab01271cc77d09396ab492a900da paramiko-1.3.ebuild 629
+MD5 5c712f4fd7f628b4dbc60bf0745e7e7d paramiko-1.5.ebuild 639
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwKMFdQwWVoAgN4RAnrIAJ4oXnhNg/t/oBol7+Fy+rQpbfkHLQCfeOYe
+euiEfq/rRmlsRvMyejmFFcg=
+=zDAA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/paramiko/metadata.xml b/dev-python/paramiko/metadata.xml
index b6c634e7b821..b2e171480b03 100644
--- a/dev-python/paramiko/metadata.xml
+++ b/dev-python/paramiko/metadata.xml
@@ -8,4 +8,10 @@ Emphasis is on using SSH2 as an alternative to SSL for making secure
 connections between python scripts.  All major ciphers and hash methods
 are supported. SFTP client mode is now supported too.
 </longdescription>
+<longdescription lang="ja">
+これはSSH2コネクション(クライアントとサーバー)を作り出すためのライブラリです。注
+目点はPython言語スクリプト間のセキュアなコネクションを作り出すSSLの代用にSSHを利
+用している所です。有名なCipherとHash処理の全てがサポートされています。SFTPクライ
+アントもサポートされています。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/paramiko/paramiko-0.9h.ebuild b/dev-python/paramiko/paramiko-0.9h.ebuild
index 6341e82cf044..ed75a268becc 100644
--- a/dev-python/paramiko/paramiko-0.9h.ebuild
+++ b/dev-python/paramiko/paramiko-0.9h.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/dev-python/paramiko/paramiko-0.9h.ebuild,v 1.1 2004/08/15 19:18:52 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-0.9h.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
@@ -10,10 +10,11 @@ HOMEPAGE="http://www.lag.net/~robey/paramiko"
 SRC_URI="http://www.lag.net/~robey/paramiko/${PN}-${MY_PV}.zip"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND="virtual/python
-	>=dev-python/pycrypto-1.9_alpha6"
+	>=dev-python/pycrypto-1.9_alpha6
+	app-arch/unzip"
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 src_install() {
diff --git a/dev-python/paramiko/paramiko-1.3.ebuild b/dev-python/paramiko/paramiko-1.3.ebuild
index 0471082ff15e..b827403ef81d 100644
--- a/dev-python/paramiko/paramiko-1.3.ebuild
+++ b/dev-python/paramiko/paramiko-1.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/dev-python/paramiko/paramiko-1.3.ebuild,v 1.1 2005/05/25 00:20:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/paramiko/paramiko-1.5.ebuild b/dev-python/paramiko/paramiko-1.5.ebuild
index b1c2c0a10c08..d51d95d28f94 100644
--- a/dev-python/paramiko/paramiko-1.5.ebuild
+++ b/dev-python/paramiko/paramiko-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/dev-python/paramiko/paramiko-1.5.ebuild,v 1.1 2005/10/28 04:49:14 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pexpect/ChangeLog b/dev-python/pexpect/ChangeLog
index 1507eeef01d4..a2f0fe3154d7 100644
--- a/dev-python/pexpect/ChangeLog
+++ b/dev-python/pexpect/ChangeLog
@@ -1,10 +1,73 @@
 # ChangeLog for dev-python/pexpect
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/ChangeLog,v 1.1 2002/10/27 20:51:04 phoenix Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/ChangeLog,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
-*pexpect-0.94.ebuild (27 Oct 2002)
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pexpect-0.999.ebuild:
+  Mark 0.999 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pexpect-0.999.ebuild:
+  add ~ia64
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pexpect-0.999.ebuild:
+  Stable on ppc.
+
+  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> pexpect-0.999.ebuild:
+  Marked stable on amd64, bug 59045.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> pexpect-0.999.ebuild:
+  Stable on alpha.
+
+  28 Oct 2004; Jason Wever <weeve@gentoo.org> pexpect-0.999.ebuild:
+  Stable on sparc.
+
+  20 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> pexpect-0.999.ebuild:
+  Marked stable x86
+
+  02 Oct 2004; Hasan Khalil <gongloo@gentoo.org> pexpect-0.999.ebuild:
+  Keyworded ~ppc-macos.
+
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org> pexpect-0.97.ebuild:
+  Stable on alpha.
+
+*pexpect-0.999 (25 May 2004)
+
+  25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +pexpect-0.999.ebuild:
+  Version bump.
+
+  13 May 2004; Jason Eric Huebel <jhuebel@gentoo.org> pexpect-0.97.ebuild:
+  ~amd64
+
+  15 Apr 2004; Michael McCabe <randy@gentoo.org> pexpect-0.97.ebuild:
+  adding s390 keywords
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> pexpect-0.97.ebuild:
+  Stable on sparc.
+
+*pexpect-0.97 (04 Apr 2003)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pexpect-0.97.ebuild:
+  version bump
+
+*pexpect-0.94 (27 Oct 2002)
+
+  25 Mar 2003; Aron Griffis <agriffis@gentoo.org> pexpect-0.94.ebuild:
+  Add ~alpha to KEYWORDS
+
+  12 Mar 2003; Jason Wever <weeve@gentoo.org> pexpect-0.94.ebuild:
+  Added sparc to keywords.
+
+  10 Mar 2003; Aron Griffis <agriffis@gentoo.org> pexpect-0.94.ebuild:
+  Mark stable on alpha
+
+  20 Nov 2002; Jon Nall <nall@gentoo.org> pexpect-0.94.ebuild :
+  added ppc to KEYWORDS
+
+  18 Nov 2002; phoen][x <phoenix@gentoo.org> pexpect-0.94.ebuild :
+  Put this ebuild into the stable profile. 
 
   27 Oct 2002; phoen][x <phoenix@gentoo.org> pexpect-0.94.ebuild, 
   files/digest-pexpect-0.94, ChangeLog :
-
   Initial import. This is an expect-like interface for python.
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index e69de29bb2d1..5b50290f58ef 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -0,0 +1,8 @@
+MD5 8ae67dafda05780333f8a598a6f02ea4 pexpect-0.94.ebuild 821
+MD5 5353b36c0be133200140ee07be731211 pexpect-0.999.ebuild 623
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 2e4ae5bd523a3010e08669b58c4aa935 ChangeLog 2372
+MD5 1637902ffb4b93b13e88de7675f4ed33 pexpect-0.97.ebuild 603
+MD5 fb352214176fea02a668d398661cfac1 files/digest-pexpect-0.999 61
+MD5 2f70d9ae8e39a6fbbf30b9d0f8166c23 files/digest-pexpect-0.94 60
+MD5 fb41687454b293cdcdf8585270645776 files/digest-pexpect-0.97 60
diff --git a/dev-python/pexpect/files/digest-pexpect-0.97 b/dev-python/pexpect/files/digest-pexpect-0.97
index cb3f61f873f9..0a34121498e1 100644
--- a/dev-python/pexpect/files/digest-pexpect-0.97
+++ b/dev-python/pexpect/files/digest-pexpect-0.97
@@ -1,2 +1 @@
-MD5 337d6adb097a7daa0da0fbe03e78acf9 /pexpect-0.97.ebuild 605
 MD5 040241c3433079a109589274d5235de0 pexpect-0.97.tgz 18646
diff --git a/dev-python/pexpect/pexpect-0.94.ebuild b/dev-python/pexpect/pexpect-0.94.ebuild
index 03928aa65473..760206d38eae 100644
--- a/dev-python/pexpect/pexpect-0.94.ebuild
+++ b/dev-python/pexpect/pexpect-0.94.ebuild
@@ -1,23 +1,25 @@
-# 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/dev-python/pexpect/pexpect-0.94.ebuild,v 1.1 2002/10/27 20:51:04 phoenix Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-0.94.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
+
+IUSE=""
 
 DESCRIPTION="Pexpect is a pure Python module for spawning child applications; controlling them; and responding to expected patterns in their output"
 HOMEPAGE="http://pexpect.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pexpect/pexpect-0.94.tgz"
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~alpha sparc"
 DEPEND="dev-lang/python"
 
 src_compile() {
-    python -c 'import compileall; compileall.compile_dir(".",force=1)'
+	python -c 'import compileall; compileall.compile_dir(".",force=1)'
 }
 
 src_install () {
-    local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
-    insinto "/usr/lib/python${pv}/site-packages"
+	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
+	insinto "/usr/lib/python${pv}/site-packages"
 
-    doins pexpect.py*
-    dodoc README.txt
+	doins pexpect.py*
+	dodoc README.txt
 }
diff --git a/dev-python/pexpect/pexpect-0.97.ebuild b/dev-python/pexpect/pexpect-0.97.ebuild
index 25545cae50b7..4cfe0348ca43 100644
--- a/dev-python/pexpect/pexpect-0.97.ebuild
+++ b/dev-python/pexpect/pexpect-0.97.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/dev-python/pexpect/pexpect-0.97.ebuild,v 1.1 2003/04/04 19:19:39 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-0.97.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://pexpect.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pexpect/${P}.tgz"
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 ~ppc alpha sparc s390 ~amd64"
 DEPEND="dev-lang/python"
 
 mydoc="README.txt"
diff --git a/dev-python/pexpect/pexpect-0.999.ebuild b/dev-python/pexpect/pexpect-0.999.ebuild
index 0bdff57eb062..561747ae2d97 100644
--- a/dev-python/pexpect/pexpect-0.999.ebuild
+++ b/dev-python/pexpect/pexpect-0.999.ebuild
@@ -1,16 +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/dev-python/pexpect/pexpect-0.999.ebuild,v 1.1 2004/05/25 08:36:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pexpect/pexpect-0.999.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit distutils
 
-IUSE=""
 DESCRIPTION="Pexpect is a pure Python module for spawning child applications; controlling them; and responding to expected patterns in their output"
 HOMEPAGE="http://pexpect.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pexpect/${P}.tgz"
+
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~s390 ~amd64"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc-macos s390 sparc x86"
+IUSE=""
+
 DEPEND="dev-lang/python"
 
 mydoc="README.txt"
diff --git a/dev-python/piddle/ChangeLog b/dev-python/piddle/ChangeLog
index a1ce5eab4feb..65deefb0dbb1 100644
--- a/dev-python/piddle/ChangeLog
+++ b/dev-python/piddle/ChangeLog
@@ -1,8 +1,20 @@
 # ChangeLog for dev-python/piddle
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/piddle/ChangeLog,v 1.1 2003/10/01 16:34:58 karltk Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/piddle/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
-*piddle-1.0.5 (30 Sep 2003)
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> piddle-1.0.15.ebuild:
+  Stable on x86
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> piddle-1.0.15.ebuild:
+  Remove default S.
+
+*piddle-1.0.15 (30 Sep 2003)
 
   30 Sep 2003; Karl Trygve Kalleberg <karltk@gentoo.org> piddle-1.0.5.ebuild:
   Initial import. 
diff --git a/dev-python/piddle/Manifest b/dev-python/piddle/Manifest
index 57753a3cbadb..739ab51cc7f8 100644
--- a/dev-python/piddle/Manifest
+++ b/dev-python/piddle/Manifest
@@ -1,5 +1,14 @@
-MD5 2d4f32e41d6c7b1f89bbea7ea58da444 piddle-1.0.15.ebuild 544
-MD5 d7fa1143572bfd8df5f14ba3c127b309 piddle-1.0.15.ebuild~ 543
-MD5 125ee013081b112d56a1d15507d72ef2 ChangeLog~ 3674
-MD5 3bd28b17ee8673d0a08da92dfeccdf5c ChangeLog 514
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cea6069c7f82ae4b86d5336dc5ce02e1 ChangeLog 1024
 MD5 60531cf044365817fc0b7e748799e27b files/digest-piddle-1.0.15 65
+MD5 900189c2415d75eb646d98a8d154067f metadata.xml 1723
+MD5 2e5a82a48596c34ff377fa4afcfa80c5 piddle-1.0.15.ebuild 625
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwLgFdQwWVoAgN4RAtP0AKCYKGoHZRlqUfJcJTzKX63IBYbQ1gCg38p6
+VzOq5i9uTPJz5bBWKK7yeoI=
+=NtWy
+-----END PGP SIGNATURE-----
diff --git a/dev-python/piddle/metadata.xml b/dev-python/piddle/metadata.xml
index 78048f79dfee..8b08b95feaf5 100644
--- a/dev-python/piddle/metadata.xml
+++ b/dev-python/piddle/metadata.xml
@@ -13,5 +13,11 @@ supported drawing primitives. A particular drawing context is provided
 in the form of a derived class. PIDDLE applications will be able to
 automatically select an appropriate backend for the user's environment. 
 </longdescription>
-
+<longdescription lang="ja">
+PIDDLEはクロスプラットフォームとクロスメディアの両方のマナーに沿った二次元画像を
+作成するためのPython言語モジュールです。つまり、これはファイル出力(Postscript, PDF, GIFなど)と同じ様にスクリーン・グラフィック(例えばQuickDraw, TK)をサポートし>ます。最大限の効果と品質のため、ネイティブ2D描画を各バックエンドの呼出しのように
+します。これは原始的なサポートされた描画方法を指すメソッドを持ったベース・クラス
+(Paddle.Canvas)を明確にする事で働きます。特別のドロー・コンテキストは派生元クラ>スのフォームで提供されます。PIDDLEアプリケーションはユーザー環境に適切なバックエ
+ンドを自動的に選択するでしょう。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/piddle/piddle-1.0.15.ebuild b/dev-python/piddle/piddle-1.0.15.ebuild
index dc5e95c9a248..79323b9b826e 100644
--- a/dev-python/piddle/piddle-1.0.15.ebuild
+++ b/dev-python/piddle/piddle-1.0.15.ebuild
@@ -1,17 +1,15 @@
-# 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/dev-python/piddle/piddle-1.0.15.ebuild,v 1.1 2003/10/01 16:34:58 karltk Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/dev-python/piddle/piddle-1.0.15.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 DESCRIPTION="Cross-media, cross-platform 2D graphics package"
 HOMEPAGE="http://piddle.sourceforge.net/"
 SRC_URI="mirror://sourceforge/piddle/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=">=dev-lang/python-1.5.2"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	python setup.py build || die
diff --git a/dev-python/ply/ChangeLog b/dev-python/ply/ChangeLog
index 8176aac1005a..6f20d6088302 100644
--- a/dev-python/ply/ChangeLog
+++ b/dev-python/ply/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/ply
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.1 2004/06/27 14:58:17 lucass Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  02 Sep 2004; Travis Tilley <lv@gentoo.org> ply-1.5.ebuild:
+  added ~amd64 keyword
+
+  28 Jun 2004; David Holm <dholm@gentoo.org> ply-1.5.ebuild:
+  Added to ~ppc.
 
 *ply-1.5 (27 Jun 2004)
 
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 8b70de2fef74..50c27e53b341 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,2 +1,14 @@
-MD5 1f63e6ea1e2c63b95f23329d65dfbaa5 ply-1.5.ebuild 500
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f374b8a958dbdcdbb5d807a0325f30d5 ChangeLog 650
 MD5 c599af08601e51fff11b9fd1193f2086 files/digest-ply-1.5 58
+MD5 d559ecd1c8ad63739a8f7453f7220e2b metadata.xml 1273
+MD5 1910b615f22432d8643a20c068a44f03 ply-1.5.ebuild 574
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwNPFdQwWVoAgN4RAnzLAKDOMbf8riFnEyJZZKk7gIhavAoVwACfVwjM
+zS+zx0TXlz+cPR5ud5c/j3E=
+=vc6t
+-----END PGP SIGNATURE-----
diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index 1b7d0e07991a..db613d2ec0a2 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -11,4 +11,8 @@ the C version of lex and yacc. The other significant feature of PLY is
 that it provides extensive input validation and error reporting--much 
 more so than other Python parsing tools.
 </longdescription>
+<longdescription lang="ja">
+PLYはLexとYaccの有名なコンパイラ・コンストラクション・ツールのPython言語実装です
+。この実装は以前の試みから幾つものアイディアを借りています。そのほとんどがJohn AycockのSPARKツールキットからです。しかしながら、実装の全体像はC言語によるLexとYaccにより近いモデルです。PLYの他の重要点は幅広い入力バリデーションとエラー報告を>提供する点です。 -- その二点は他のPython言語パーサーより優れています。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/ply/ply-1.5.ebuild b/dev-python/ply/ply-1.5.ebuild
index 0c9abf721fcd..fd3e4e17dc44 100644
--- a/dev-python/ply/ply-1.5.ebuild
+++ b/dev-python/ply/ply-1.5.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/dev-python/ply/ply-1.5.ebuild,v 1.1 2004/06/27 14:58:17 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://systems.cs.uchicago.edu/ply/"
 DEPEND="virtual/python"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/pmw/ChangeLog b/dev-python/pmw/ChangeLog
index cf2b6fb1c75e..80b294963237 100644
--- a/dev-python/pmw/ChangeLog
+++ b/dev-python/pmw/ChangeLog
@@ -1,9 +1,60 @@
 # ChangeLog for dev-python/pmw
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/ChangeLog,v 1.1 2002/03/19 17:45:32 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
-*pmw-0.8.5 (<Mar 19, 2002>)
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pmw-1.2.ebuild:
+  Mark 1.2 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pmw-1.2.ebuild:
+  add ~ia64
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> pmw-1.2.ebuild:
+  stable on amd64
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pmw-1.2.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  09 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pmw-1.2.ebuild:
+  Stable on alpha.
+
+  17 May 2004; Bryan Østergaard <kloeri@gentoo.org> pmw-1.2.ebuild:
+  Add ~alpha.
+
+  15 May 2004; Danny van Dyk <kugelfang@gentoo.org> pmw-1.2.ebuild:
+  Marked ~amd64.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pmw-0.8.5.ebuild:
+  Add missing IUSE.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> pmw-1.2.ebuild:
+  Stable on sparc.
+
+*pmw-1.2 (12 Oct 2003)
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> pmw-1.2.ebuild:
+  version bump
+
+  28 Apr 2003; Alastair Tse <liquidx@gentoo.org> pmw-1.1.ebuild:
+  be verbose about missing tk
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pmw-1.1 (24 Oct 2002)
+
+  24 Oct 2002; Arcady Genkin <agenkin@gentoo.org> pmw-1.1.ebuild :
+
+  Updated to version 1.1
+
+*pmw-0.8.5 (Mar 19 2002)
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> pmw-0.8.5.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE
+  headers clean-up
 
   19 Mar 2002; Arcady Genkin <agenkin@thpoon.com> pmw-0.8.5.ebuild :
   
-  Initial version of the package.
\ No newline at end of file
+  Initial version of the package.
diff --git a/dev-python/pmw/Manifest b/dev-python/pmw/Manifest
index 8a7bcf1e9786..461bbe366628 100644
--- a/dev-python/pmw/Manifest
+++ b/dev-python/pmw/Manifest
@@ -1,5 +1,8 @@
-MD5 f733b2e492911c93a899a4c40da08a86 ChangeLog 765
-MD5 9fd716ac798dd7dd715b4f710d3c12c5 pmw-0.8.5.ebuild 1508
-MD5 862c5b4027c1a688c717adaee4cdeb29 pmw-1.1.ebuild 1458
-MD5 068778ac365cde0694d7ea0c78ff939d files/digest-pmw-0.8.5 61
+MD5 33d8121dd1bff5a08126b72114f524c8 pmw-1.1.ebuild 1450
+MD5 81904d4e2b38a24f4329d8af08717669 pmw-0.8.5.ebuild 1363
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 66f2db41a590dc7c90a63a1671d447bf ChangeLog 1746
+MD5 ffc36f87ea5f1fe6a2504e102a44cc34 pmw-1.2.ebuild 1353
+MD5 635a2916c304a229f3e576f9413cb664 files/digest-pmw-1.2 59
 MD5 c9fe948e037016e8a1a6b9d57c4ae674 files/digest-pmw-1.1 59
+MD5 068778ac365cde0694d7ea0c78ff939d files/digest-pmw-0.8.5 61
diff --git a/dev-python/pmw/pmw-0.8.5.ebuild b/dev-python/pmw/pmw-0.8.5.ebuild
index 5716dd2246d5..51ef0af7d2f7 100644
--- a/dev-python/pmw/pmw-0.8.5.ebuild
+++ b/dev-python/pmw/pmw-0.8.5.ebuild
@@ -1,50 +1,54 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Arcady Genkin <agenkin@thpoon.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-0.8.5.ebuild,v 1.1 2002/03/19 17:45:32 agenkin Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-0.8.5.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 DESCRIPTION="A toolkit for building high-level compound widgets in Python using the Tkinter module."
 HOMEPAGE="http://pmw.sourceforge.net/"
 
 DEPEND=">=dev-lang/python-2.1"
 
-SRC_URI="http://prdownloads.sourceforge.net/pmw/Pmw.${PV}.tar.gz"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha"
+LICENSE="MIT"
+IUSE=""
+
+SRC_URI="mirror://sourceforge/pmw/Pmw.${PV}.tar.gz"
 S="${WORKDIR}"/Pmw
 
 src_compile() {
-    if ! python -c "import Tkinter" >/dev/null 2>&1
-        then
-        die "You need to recompile Python with Tkinter support"
-    fi
-    python -c 'import compileall; compileall.compile_dir(".",force=1)'
+	if ! python -c "import Tkinter" >/dev/null 2>&1
+	then
+		die "You need to recompile Python with Tkinter support"
+	fi
+	python -c 'import compileall; compileall.compile_dir(".",force=1)'
 }
 
 src_install () {
-    # Figures out the destination directory, based on Python's version
-    # installed.
-    local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
-    local pmwdir="/usr/lib/python${pv}/site-packages/Pmw"
-
-    local dir
-    for dir in `find . -type d`
-    do
-        # Skip the doc directory
-        if [ `basename "${dir}"` = "doc" ]
-        then
-            continue
-        fi
-        insinto "${pmwdir}/${dir}"
-        cd "${dir}"
-        # Install all regular files in this dir
-        local file
-        for file in *
-        do
-            [ -f "${file}" ] && doins "${file}"
-        done
-        cd "${S}"
-    done
-
-    dodoc README
-    local docdir=`find . -type d -name doc`
-    dohtml -a html,gif,py "${docdir}"/*
+	# Figures out the destination directory, based on Python's version
+	# installed.
+	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
+	local pmwdir="/usr/lib/python${pv}/site-packages/Pmw"
+
+	local dir
+	for dir in `find . -type d`
+	do
+		# Skip the doc directory
+		if [ `basename "${dir}"` = "doc" ]
+		then
+			continue
+		fi
+		insinto "${pmwdir}/${dir}"
+		cd "${dir}"
+		# Install all regular files in this dir
+		local file
+		for file in *
+		do
+			[ -f "${file}" ] && doins "${file}"
+		done
+		cd "${S}"
+	done
+
+	dodoc README
+	local docdir=`find . -type d -name doc`
+	dohtml -a html,gif,py "${docdir}"/*
 }
diff --git a/dev-python/pmw/pmw-1.1.ebuild b/dev-python/pmw/pmw-1.1.ebuild
index 3cbbea73b08c..6ee49864591d 100644
--- a/dev-python/pmw/pmw-1.1.ebuild
+++ b/dev-python/pmw/pmw-1.1.ebuild
@@ -1,55 +1,51 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.1.ebuild,v 1.1 2002/10/24 22:02:22 agenkin Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 DESCRIPTION="A toolkit for building high-level compound widgets in Python using the Tkinter module."
 HOMEPAGE="http://pmw.sourceforge.net/"
-
-DEPEND=">=dev-lang/python-2.1"
-RDEPEND="${DEPEND}"
+SRC_URI="mirror://sourceforge/pmw/Pmw.${PV}.tar.gz"
 
 SLOT="0"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc"
 LICENSE="MIT"
+IUSE=""
 
-
-SRC_URI="mirror://sourceforge/pmw/Pmw.${PV}.tar.gz"
-S="${WORKDIR}"/Pmw
+DEPEND=">=dev-lang/python-2.1"
+S="${WORKDIR}/Pmw"
 
 src_compile() {
-    if ! python -c "import Tkinter" >/dev/null 2>&1
-        then
-        die "You need to recompile Python with Tkinter support"
-    fi
-    python -c 'import compileall; compileall.compile_dir(".",force=1)'
+	if ! python -c "import Tkinter" >/dev/null 2>&1
+	then
+		eerror "You need to recompile python with Tkinter support."
+		eerror "That means: USE='tcltk' emerge python"
+		echo
+		die "missing tkinter support with installed python"
+	fi
+	python -c 'import compileall; compileall.compile_dir(".",force=1)'
 }
 
-src_install () {
-    # Figures out the destination directory, based on Python's version
-    # installed.
-    local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
-    local pmwdir="/usr/lib/python${pv}/site-packages/Pmw"
-
-    local dir
-    for dir in `find . -type d`
-    do
-        # Skip the doc directory
-        if [ `basename "${dir}"` = "doc" ]
-        then
-            continue
-        fi
-        insinto "${pmwdir}/${dir}"
-        cd "${dir}"
-        # Install all regular files in this dir
-        local file
-        for file in *
-        do
-            [ -f "${file}" ] && doins "${file}"
-        done
-        cd "${S}"
-    done
-
-    dodoc README
-    local docdir=`find . -type d -name doc`
-    dohtml -a html,gif,py "${docdir}"/*
+src_install() {
+	# Figures out the destination directory, based on Python's version installed.
+	local pv=`python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:'`
+	local pmwdir="/usr/lib/python${pv}/site-packages/Pmw"
+
+	local dir
+	for dir in `find . -type d` ; do
+		# Skip the doc directory
+		[ `basename "${dir}"` = "doc" ] && continue
+
+		insinto "${pmwdir}/${dir}"
+		cd "${dir}"
+		# Install all regular files in this dir
+		local file
+		for file in * ; do
+			[ -f "${file}" ] && doins "${file}"
+		done
+		cd "${S}"
+	done
+
+	dodoc README
+	local docdir=`find . -type d -name doc`
+	dohtml -a html,gif,py "${docdir}"/*
 }
diff --git a/dev-python/pmw/pmw-1.2.ebuild b/dev-python/pmw/pmw-1.2.ebuild
index 71969a0744cf..484d1bf22747 100644
--- a/dev-python/pmw/pmw-1.2.ebuild
+++ b/dev-python/pmw/pmw-1.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/dev-python/pmw/pmw-1.2.ebuild,v 1.1 2003/10/12 11:26:31 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pmw/pmw-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils python
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pmw.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pmw/Pmw.${PV}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 LICENSE="MIT"
 IUSE=""
 
@@ -23,7 +23,7 @@ pkg_setup() {
 		eerror "to recompile Python with:"
 		eerror "USE=\"tcltk\" emerge python"
 		die "Tkinter support missing"
-	fi		
+	fi
 }
 
 src_compile() {
@@ -32,7 +32,7 @@ src_compile() {
 
 src_install() {
 	python_version
-	
+
 	local pmwdir="/usr/lib/python${PYVER}/site-packages/Pmw"
 
 	local dir
diff --git a/dev-python/psyco/ChangeLog b/dev-python/psyco/ChangeLog
index e8e768cd590d..7dd7a9e32dd4 100644
--- a/dev-python/psyco/ChangeLog
+++ b/dev-python/psyco/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for dev-python/psyco
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psyco/ChangeLog,v 1.1 2003/04/20 02:53:39 blauwers Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psyco/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> psyco-1.4.ebuild:
+  Stable 1.4 as 1.2 doesn't support python-2.4, bug 109207.
+
+*psyco-1.4 (12 Jan 2005)
+
+  12 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> +psyco-1.4.ebuild:
+  Version bump. Changed deps for python 2.4
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  -psyco-1.0.0_beta1.ebuild, -psyco-1.0.ebuild, -psyco-1.1.1.ebuild:
+  Clean out old ebuilds.
+
+*psyco-1.3 (07 Dec 2004)
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +psyco-1.3.ebuild:
+  Version bump, bug 73601.
+
+  30 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  psyco-1.0.0_beta1.ebuild, psyco-1.0.ebuild, psyco-1.1.1.ebuild,
+  psyco-1.2.ebuild:
+  Changed DEPEND to <python2.4
+
+  20 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> psyco-1.2.ebuild:
+  Marked stable x86
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> psyco-1.0.0_beta1.ebuild:
+  Add missing IUSE.
+
+*psyco-1.2 (28 Mar 2004)
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> psyco-1.2.ebuild:
+  Version bump.
+
+*psyco-1.1.1 (12 Oct 2003)
+
+  23 Oct 2003; Bart Lauwers <blauwers@gentoo.org> psyco-1.1.1.ebuild, psyco-1.0.ebuild:
+  Correcting license listed to actual license used.
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> psyco-1.1.1.ebuild:
+  version bump (#30661)
+
+*psyco-1.0 (23 Jun 2003)
+
+  23 Jun 2003; Alastair Tse <liquidx@gentoo.org> psyco-1.0.0_beta1.ebuild,
+  psyco-1.0.ebuild:
+  version bump
 
 *psyco-1.0.0_beta1 (20 Apr 2003)
 
diff --git a/dev-python/psyco/Manifest b/dev-python/psyco/Manifest
index e69de29bb2d1..1dd597c076a3 100644
--- a/dev-python/psyco/Manifest
+++ b/dev-python/psyco/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3259733f27789f446c22ccf698522d77 ChangeLog 1872
+MD5 ee2d6ae386d5817870d5f23b36d90129 files/digest-psyco-1.2 65
+MD5 10e3e0a6c88e96eecb3c45d840c5c51f files/digest-psyco-1.3 66
+MD5 3a838fea67bb4691f1954f8e506fc630 files/digest-psyco-1.4 65
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 2da5719a9fe4692551435e532d2341a0 psyco-1.2.ebuild 623
+MD5 42e58ed4569bc766b072d1d13bbcbb78 psyco-1.3.ebuild 646
+MD5 42ae15338f38b0ac239ab909a430f5b3 psyco-1.4.ebuild 619
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUs16Kf2g/qXtneoRAiz0AJ47oCXQ0A3mHafsMi+fBi9M0VLBBgCfQZBG
+UIYltddlfDar1rzdxHw7mI4=
+=MDjy
+-----END PGP SIGNATURE-----
diff --git a/dev-python/psyco/psyco-1.2.ebuild b/dev-python/psyco/psyco-1.2.ebuild
index 9ba74dc94eb4..7c011cd19206 100644
--- a/dev-python/psyco/psyco-1.2.ebuild
+++ b/dev-python/psyco/psyco-1.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/dev-python/psyco/psyco-1.2.ebuild,v 1.1 2004/03/28 16:09:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psyco/psyco-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -11,10 +11,12 @@ SRC_URI="mirror://sourceforge/psyco/${P}-src.tar.gz"
 IUSE=""
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+DEPEND="<dev-lang/python-2.4"
 
 src_install() {
 	distutils_src_install
 	insinto /usr/share/doc/${PF}/examples
 	doins ${S}/test/*
 }
+
diff --git a/dev-python/psyco/psyco-1.3.ebuild b/dev-python/psyco/psyco-1.3.ebuild
index 87faaed27c57..181d1925f688 100644
--- a/dev-python/psyco/psyco-1.3.ebuild
+++ b/dev-python/psyco/psyco-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/dev-python/psyco/psyco-1.3.ebuild,v 1.1 2004/12/07 01:58:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psyco/psyco-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/psyco/psyco-1.4.ebuild b/dev-python/psyco/psyco-1.4.ebuild
index 1255def78d81..ca2966251fd2 100644
--- a/dev-python/psyco/psyco-1.4.ebuild
+++ b/dev-python/psyco/psyco-1.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/dev-python/psyco/psyco-1.4.ebuild,v 1.1 2005/01/12 16:33:30 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psyco/psyco-1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/psyco/${P}-src.tar.gz"
 IUSE=""
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 DEPEND=">=dev-lang/python-2.1"
 
 src_install() {
diff --git a/dev-python/psycopg/ChangeLog b/dev-python/psycopg/ChangeLog
index dbf000cbc999..ba319ce4569c 100644
--- a/dev-python/psycopg/ChangeLog
+++ b/dev-python/psycopg/ChangeLog
@@ -1,7 +1,125 @@
 # ChangeLog for dev-python/psycopg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
+  14 Nov 2005; Seemant Kulleen <seemant@gentoo.org> psycopg-1.1.15.ebuild,
+  psycopg-1.1.18.ebuild, psycopg-1.1.21.ebuild, psycopg-2.0_beta5.ebuild:
+  the language is Python, not the Python
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> psycopg-1.1.18.ebuild:
+  Stable on ppc.
+
+  10 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> psycopg-1.1.18.ebuild:
+  Stable on sparc
+
+  06 Nov 2005; Alastair Tse <liquidx@gentoo.org> psycopg-2.0_beta5.ebuild:
+  add examples to development version
+
+*psycopg-2.0_beta5 (06 Nov 2005)
+*psycopg-1.1.21 (06 Nov 2005)
+
+  06 Nov 2005; Alastair Tse <liquidx@gentoo.org> psycopg-1.1.18.ebuild,
+  +psycopg-1.1.21.ebuild, +psycopg-2.0_beta5.ebuild:
+  version bump stable version, and also introduce hard-masked development
+  version.
+
+  02 Sep 2005; <dang@gentoo.org> psycopg-1.1.18.ebuild:
+  Marked ~amd64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> psycopg-1.1.18.ebuild:
+  add ~ia64
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> psycopg-1.1.15.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Simon Stelling <blubb@gentoo.org> psycopg-1.1.15.ebuild:
+  added ~amd64
+
+*psycopg-1.1.18 (20 Apr 2005)
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> -psycopg-1.1.5.1.ebuild,
+  -psycopg-1.1.11.ebuild, +psycopg-1.1.18.ebuild:
+  version bump (#84033)
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> psycopg-1.1.15.ebuild:
+  Stable on alpha.
+
+  28 Oct 2004; Jason Wever <weeve@gentoo.org> psycopg-1.1.15.ebuild:
+  Stable on sparc.
+
+  21 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> psycopg-1.1.15.ebuild:
+  Marked stable on x86
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org> psycopg-1.1.11.ebuild:
+  Stable on sparc.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> -psycopg-1.0.1.ebuild,
+  -psycopg-1.0.12.ebuild, -psycopg-1.0.13.ebuild, psycopg-1.1.11.ebuild,
+  -psycopg-1.1.2.ebuild, -psycopg-1.1.9.ebuild:
+  x86 stable, clean out old ebuilds.
+
+*psycopg-1.1.15 (02 Oct 2004)
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +psycopg-1.1.15.ebuild:
+  Version bump, closes bug 64437.
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> psycopg-1.1.11.ebuild:
+  Stable on alpha.
+
+*psycopg-1.1.11 (08 May 2004)
+
+  08 May 2004; Bryan Østergaard <kloeri@gentoo.org> +psycopg-1.1.11.ebuild:
+  Version bump.
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> psycopg-1.0.1.ebuild,
+  psycopg-1.0.12.ebuild, psycopg-1.0.13.ebuild, psycopg-1.1.2.ebuild,
+  psycopg-1.1.5.1.ebuild, psycopg-1.1.9.ebuild:
+  Clean up IUSE and S.
+
+  02 May 2004; David Holm <dholm@gentoo.org> psycopg-1.1.9.ebuild:
+  Added to ~ppc.
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> psycopg-1.0.1.ebuild,
+  psycopg-1.0.12.ebuild, psycopg-1.0.13.ebuild, psycopg-1.1.2.ebuild,
+  psycopg-1.1.5.1.ebuild, psycopg-1.1.9.ebuild:
+  Update SRC_URI.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> psycopg-1.1.5.1.ebuild:
+  Stable on sparc.
+
+*psycopg-1.1.9 (18 Oct 2003)
+
+  18 Oct 2003; Alastair Tse <liquidx@gentoo.org> psycopg-1.1.9.ebuild:
+  version bump. moving to python eclass because we don't need distutils for this
+  package. also fix examples
+
+*psycopg-1.1.5.1 (19 Jul 2003)
+
+  19 Jul 2003; Alastair Tse <liquidx@gentoo.org> psycopg-1.1.5.1.ebuild:
+  version bump
+
+*psycopg-1.1.2 (08 Mar 2003)
+
+  08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> psycopg-1.1.2.ebuild:
+  Version bump.
+
+*psycopg-1.0.13 (12 Dec 2002)
+
+  12 Dec 2002; B.Lauwers <blauwers@gentoo.org> psycopg-1.0.13.ebuild Changelog :
+
+  Version bump, cleanups
+
+*psycopg-1.0.12 (12 Dec 2002)
+
+  12 Dec 2002; B.Lauwers <blauwers@gentoo.org> psycopg-1.0.12.ebuild Changelog :
+
+  Version bump + bugfix for Bug #8936
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *psycopg-1.0.1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index e69de29bb2d1..8f9c767d7872 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -0,0 +1,10 @@
+MD5 ceeb770097f1789245b80b48b96f5323 ChangeLog 4478
+MD5 8ebd6298fe5d6837e93909612aecf857 files/digest-psycopg-1.1.15 66
+MD5 54e5dba3d18c0154107fc72b20fdb16c files/digest-psycopg-1.1.18 66
+MD5 9d8d5b9e83c27d9aaa657531bc0fd326 files/digest-psycopg-1.1.21 66
+MD5 ad48f20eabd11d29c2c865e4f1dcf3d2 files/digest-psycopg-2.0_beta5 66
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 b80c8e407ccbe56a77368d5ecb52c4de psycopg-1.1.15.ebuild 1230
+MD5 d7f0dc3d78136726e749a5fe2b0afa7e psycopg-1.1.18.ebuild 1237
+MD5 def9cb9999c646d8f118c8cc39d7db8a psycopg-1.1.21.ebuild 1240
+MD5 5c2430ced8abc5d0a5a60411f9ed873c psycopg-2.0_beta5.ebuild 747
diff --git a/dev-python/psycopg/psycopg-1.1.15.ebuild b/dev-python/psycopg/psycopg-1.1.15.ebuild
index dc3e48c1620f..968c8803f037 100644
--- a/dev-python/psycopg/psycopg-1.1.15.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.15.ebuild
@@ -1,10 +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/dev-python/psycopg/psycopg-1.1.15.ebuild,v 1.1 2004/10/02 16:04:37 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.15.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit python
 
-DESCRIPTION="PostgreSQL database adapter for the Python" # best one
+DESCRIPTION="PostgreSQL database adapter for Python" # best one
 SRC_URI="http://initd.org/pub/software/psycopg/${P}.tar.gz"
 HOMEPAGE="http://www.initd.org/software/psycopg"
 
@@ -13,7 +13,7 @@ DEPEND="virtual/python
 	>=dev-db/postgresql-7.1.3"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="alpha ~amd64 ppc sparc x86"
 LICENSE="GPL-2"
 IUSE=""
 
diff --git a/dev-python/psycopg/psycopg-1.1.18.ebuild b/dev-python/psycopg/psycopg-1.1.18.ebuild
index 24fb7aa390ac..0a1457e74040 100644
--- a/dev-python/psycopg/psycopg-1.1.18.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.18.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/dev-python/psycopg/psycopg-1.1.18.ebuild,v 1.1 2005/04/20 17:12:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.18.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit python
 
-DESCRIPTION="PostgreSQL database adapter for the Python" # best one
+DESCRIPTION="PostgreSQL database adapter for Python" # best one
 SRC_URI="http://initd.org/pub/software/psycopg/${P}.tar.gz"
 HOMEPAGE="http://www.initd.org/software/psycopg"
 
@@ -13,7 +13,7 @@ DEPEND="virtual/python
 	>=dev-db/postgresql-7.1.3"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc sparc x86"
 LICENSE="GPL-2"
 IUSE=""
 
diff --git a/dev-python/psycopg/psycopg-1.1.21.ebuild b/dev-python/psycopg/psycopg-1.1.21.ebuild
index 2f10912d5d31..b02515716f23 100644
--- a/dev-python/psycopg/psycopg-1.1.21.ebuild
+++ b/dev-python/psycopg/psycopg-1.1.21.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/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.1 2005/11/06 01:32:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-1.1.21.ebuild,v 1.1.1.1 2005/11/30 10:10:32 chriswhite Exp $
 
 inherit python
 
-DESCRIPTION="PostgreSQL database adapter for the Python" # best one
+DESCRIPTION="PostgreSQL database adapter for Python" # best one
 SRC_URI="http://initd.org/pub/software/psycopg/${P}.tar.gz"
 HOMEPAGE="http://www.initd.org/software/psycopg"
 
diff --git a/dev-python/psycopg/psycopg-2.0_beta5.ebuild b/dev-python/psycopg/psycopg-2.0_beta5.ebuild
index aced9cc96b52..e7d1e59a079d 100644
--- a/dev-python/psycopg/psycopg-2.0_beta5.ebuild
+++ b/dev-python/psycopg/psycopg-2.0_beta5.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0_beta5.ebuild,v 1.1 2005/11/06 01:32:06 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/psycopg/psycopg-2.0_beta5.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
 MY_PV=${PV/_beta/b}
-DESCRIPTION="PostgreSQL database adapter for the Python."
+DESCRIPTION="PostgreSQL database adapter for Python."
 SRC_URI="http://initd.org/pub/software/psycopg/${PN}2-${MY_PV}.tar.gz"
 HOMEPAGE="http://initd.org/projects/psycopg2"
 
@@ -24,5 +24,5 @@ DOCS="AUTHORS ChangeLog COPYING CREDITS INSTALL README NEWS docs/*"
 src_install () {
 	distutils_src_install
 	insinto /usr/share/doc/${PF}/examples
-	doins   doc/examples/*
+	doins   examples/*
 }
diff --git a/dev-python/py-gnupg/ChangeLog b/dev-python/py-gnupg/ChangeLog
index dcb45c49278a..5ef578303882 100644
--- a/dev-python/py-gnupg/ChangeLog
+++ b/dev-python/py-gnupg/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/py-gnupg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/ChangeLog,v 1.1 2003/09/17 08:14:35 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+  30 Oct 2005; Jason Wever <weeve@gentoo.org> py-gnupg-0.3.2.ebuild:
+  Stable on SPARC.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> py-gnupg-0.3.2.ebuild:
+  Stable on ppc.
+
+  29 Mar 2005; Joseph Jezak <josejx@gentoo.org> py-gnupg-0.3.2.ebuild:
+  Marked ~ppc for bug #86473.
+
+  31 Oct 2004; Jason Wever <weeve@gentoo.org> py-gnupg-0.3.2.ebuild:
+  Added ~sparc keyword.
 
 *py-gnupg-0.3.2 (17 Sep 2003)
 
diff --git a/dev-python/py-gnupg/Manifest b/dev-python/py-gnupg/Manifest
index 635931370ce9..e5ecad0ad899 100644
--- a/dev-python/py-gnupg/Manifest
+++ b/dev-python/py-gnupg/Manifest
@@ -1,2 +1,4 @@
-MD5 79ab729d31cdf7422e1b6bdba63f6d61 py-gnupg-0.3.2.ebuild 485
+MD5 4592e9d0354f9948ebf513bf9d7cfd0b ChangeLog 800
 MD5 73273e5d53d66eafc2baf3054c073e0e files/digest-py-gnupg-0.3.2 71
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 d2f758ba9cbd81bb53c362e3034d2e32 py-gnupg-0.3.2.ebuild 588
diff --git a/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild b/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild
index 603cd7b2914b..fcd43c64dbab 100644
--- a/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild
+++ b/dev-python/py-gnupg/py-gnupg-0.3.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/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild,v 1.1 2003/09/17 08:14:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-gnupg/py-gnupg-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/py-gnupg/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc sparc x86"
 IUSE=""
 DEPEND="virtual/python
 	>=app-crypt/gnupg-1.2.1-r1"
diff --git a/dev-python/py-rrdtool/ChangeLog b/dev-python/py-rrdtool/ChangeLog
index bc82b24484bb..55a8d2871ca9 100644
--- a/dev-python/py-rrdtool/ChangeLog
+++ b/dev-python/py-rrdtool/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-python/py-rrdtool
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/ChangeLog,v 1.1 2004/09/04 18:45:00 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+*py-rrdtool-0.2.1-r1 (27 Jul 2005)
+
+  27 Jul 2005; Benjamin Smee <strerror@gentoo.org> metadata.xml,
+  +py-rrdtool-0.2.1-r1.ebuild:
+  Changed to reflect that it won't compile with > rrdtool-1.2.
+
+  28 Nov 2004; Eldad Zack <eldad@gentoo.org> py-rrdtool-0.2.1.ebuild:
+  x86 stable
+
+  14 Oct 2004; David Holm <dholm@gentoo.org> py-rrdtool-0.2.1.ebuild:
+  Added to ~ppc.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> py-rrdtool-0.2.1.ebuild:
+  Remove src_compile and src_install (thanks lucass).
 
 *py-rrdtool-0.2.1 (04 Sep 2004)
 
diff --git a/dev-python/py-rrdtool/Manifest b/dev-python/py-rrdtool/Manifest
index 04ac6cce67a4..a900b7b4e8a3 100644
--- a/dev-python/py-rrdtool/Manifest
+++ b/dev-python/py-rrdtool/Manifest
@@ -1,2 +1,6 @@
-MD5 758544b467b515f0e38147b83886b946 py-rrdtool-0.2.1.ebuild 428
+MD5 e338c6bb512752dbdf2e016359e958c2 py-rrdtool-0.2.1-r1.ebuild 541
+MD5 2b83c4820c2e2533cf5d59152c608f8d py-rrdtool-0.2.1.ebuild 500
+MD5 a3fb0c6b8ac50ed66ef716198d79027f ChangeLog 941
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 MD5 7c39c6d40c0cc6a40fd3809a9ea3a7e9 files/digest-py-rrdtool-0.2.1 67
+MD5 7c39c6d40c0cc6a40fd3809a9ea3a7e9 files/digest-py-rrdtool-0.2.1-r1 67
diff --git a/dev-python/py-rrdtool/metadata.xml b/dev-python/py-rrdtool/metadata.xml
index 5716453670e6..03aa50bab7e3 100644
--- a/dev-python/py-rrdtool/metadata.xml
+++ b/dev-python/py-rrdtool/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild b/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
index 21c43b63fc30..8db622442270 100644
--- a/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
+++ b/dev-python/py-rrdtool/py-rrdtool-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/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild,v 1.1 2005/07/27 14:03:42 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/py-rrdtool/py-rrdtool-0.2.1.ebuild b/dev-python/py-rrdtool/py-rrdtool-0.2.1.ebuild
index 1d878cbe1e6b..6446eeb50c2d 100644
--- a/dev-python/py-rrdtool/py-rrdtool-0.2.1.ebuild
+++ b/dev-python/py-rrdtool/py-rrdtool-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/dev-python/py-rrdtool/py-rrdtool-0.2.1.ebuild,v 1.1 2004/09/04 18:45:00 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -9,17 +9,9 @@ DESCRIPTION="Python wrapper for RRDtool"
 SRC_URI="mirror://sourceforge/py-rrdtool/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/py-rrdtool/"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 LICENSE="LGPL-2.1"
 SLOT="0"
 
 DEPEND="virtual/python
 	net-analyzer/rrdtool"
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-}
diff --git a/dev-python/py-smbpasswd/ChangeLog b/dev-python/py-smbpasswd/ChangeLog
index 19f763c4daef..f49cc798e187 100644
--- a/dev-python/py-smbpasswd/ChangeLog
+++ b/dev-python/py-smbpasswd/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-python/py-smbpasswd
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-smbpasswd/ChangeLog,v 1.1 2004/07/17 13:35:25 carlo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-smbpasswd/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+  04 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  py-smbpasswd-1.0.ebuild:
+  Added ~amd64.
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> py-smbpasswd-1.0.ebuild:
+  Added ~sparc keyword.
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> py-smbpasswd-1.0.ebuild:
+  stable on x86
+
+  03 Nov 2004; <SeJo@gentoo.org> py-smbpasswd-1.0.ebuild:
+  added ppc keyword
+
+*py-smbpasswd-1.0 (18 Jul 2004)
+
+  18 Jul 2004; David Holm <dholm@gentoo.org> py-smbpasswd-1.0.ebuild:
+  Added to ~ppc.
 
   17 Jul 2004; Carsten Lohrke <carlo@gentoo.org> :
   Initial ebuild.
diff --git a/dev-python/py-smbpasswd/Manifest b/dev-python/py-smbpasswd/Manifest
index 30317aea5a42..e76596b456ce 100644
--- a/dev-python/py-smbpasswd/Manifest
+++ b/dev-python/py-smbpasswd/Manifest
@@ -1,4 +1,14 @@
-MD5 0ac5815664628e888eccf0203cc9244b py-smbpasswd-1.0.ebuild 451
-MD5 716129bca7896f8fd6d0c8fa0d318ebb ChangeLog 194
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1884f9777d3e9145a91be91680e6a896 ChangeLog 781
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 fcbf77cc90713d221dc06e61f29cd9e8 py-smbpasswd-1.0.ebuild 581
 MD5 5d1586d01a35977df500eb0ffced7385 files/digest-py-smbpasswd-1.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGzu3ArHZZzCEUG0RAjdwAJ0UBi3bjF7R42igNv635eQOXud6qACfen9C
+Vu2VDq6g7ih44OqOI5MD2wU=
+=Lsjf
+-----END PGP SIGNATURE-----
diff --git a/dev-python/py-smbpasswd/py-smbpasswd-1.0.ebuild b/dev-python/py-smbpasswd/py-smbpasswd-1.0.ebuild
index 6791cf9488f8..c2372181d23e 100644
--- a/dev-python/py-smbpasswd/py-smbpasswd-1.0.ebuild
+++ b/dev-python/py-smbpasswd/py-smbpasswd-1.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/dev-python/py-smbpasswd/py-smbpasswd-1.0.ebuild,v 1.1 2004/07/17 13:35:25 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-smbpasswd/py-smbpasswd-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://barryp.org/software/py-smbpasswd/files/py-smbpasswd-1.0.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/python"
diff --git a/dev-python/py-xmlrpc/ChangeLog b/dev-python/py-xmlrpc/ChangeLog
index 968dd510adb0..0035a7557fb4 100644
--- a/dev-python/py-xmlrpc/ChangeLog
+++ b/dev-python/py-xmlrpc/ChangeLog
@@ -1,7 +1,55 @@
 # ChangeLog for dev-python/py-xmlrpc
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-xmlrpc/ChangeLog,v 1.1 2002/04/13 21:18:16 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-xmlrpc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  Mark 0.8.8.3 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  add ~ia64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  py-xmlrpc-0.8.8.3.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  Added to ~ppc.
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  Stable on sparc.
+
+  20 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  Marked stable x86
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> py-xmlrpc-0.8.8.2.ebuild:
+  Change SRC_URI to mirror://..
+
+*py-xmlrpc-0.8.8.3 (06 Oct 2003)
+
+  06 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> py-xmlrpc-0.8.8.3.ebuild:
+  Version bump (bug #28487)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*py-xmlrpc-0.8.8.2 (23 Apr 2002)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> py-xmlrpc-0.8.8.2.ebuild:
+  ebuild cleanups
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> py-xmlrpc-0.8.7.ebuild, py-xmlrpc-0.8.8.2.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE
+
+  23 Apr 2002; Ryan Phillips <rphillips@gentoo.org> py-xmlrpc-0.8.8.2.ebuild :
+
+  Updated package
+  
 *py-xmlrpc-0.8.7 (13 Apr 2002)
 
   13 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> py-xmlrpc-0.8.7.ebuild files/py-xmlrpc-0.8.7 :
diff --git a/dev-python/py-xmlrpc/Manifest b/dev-python/py-xmlrpc/Manifest
index e69de29bb2d1..636783b28d62 100644
--- a/dev-python/py-xmlrpc/Manifest
+++ b/dev-python/py-xmlrpc/Manifest
@@ -0,0 +1,6 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 29feae3dbe3c941c77e5692961433d25 ChangeLog 2086
+MD5 1147808bdb2d840fe504abada226aba1 py-xmlrpc-0.8.8.3.ebuild 710
+MD5 4ca90eb2b138bf24e175ad82c58705f0 py-xmlrpc-0.8.8.2.ebuild 702
+MD5 c7793788c79cbd25c05c263985049e59 files/digest-py-xmlrpc-0.8.8.3 68
+MD5 8c7781ddbeaa772ab26f1578d5cf7022 files/digest-py-xmlrpc-0.8.8.2 68
diff --git a/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.2.ebuild b/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.2.ebuild
index aa2f2db7847e..2737b66c5bb0 100644
--- a/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.2.ebuild
+++ b/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.2.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Julien Herfurth <jherfurth@arafox.com>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.2.ebuild,v 1.1 2002/05/24 06:20:58 rphillips Exp $
-S=${WORKDIR}/${P}
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.2.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+inherit distutils
+
+IUSE=""
 DESCRIPTION="Fast xml-rpc implementation for Python"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/py-xmlrpc/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/py-xmlrpc/"
-DEPEND="virtual/python"
-RDEPEND="$DEPEND"
-LICENSE="LGPL"
 
-src_compile() {
-	python setup.py build || die
-}
+DEPEND="virtual/python"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 sparc alpha"
 
 src_install () {
-	python setup.py install --prefix=${D}/usr || die
-	dodoc CHANGELOG COPYING INSTALL README
-	docinto examples
-	dodoc examples/*
-	docinto examples/crj
-	dodoc examples/crj/*
+	mydoc="CHANGELOG COPYING INSTALL README"
+	distutils_src_install
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+	insinto /usr/share/doc/${PF}/examples/crj
+	doins examples/crj/*
 }
 
diff --git a/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.3.ebuild b/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.3.ebuild
index 079fc54c83db..8df7e18271cc 100644
--- a/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.3.ebuild
+++ b/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.3.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/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.3.ebuild,v 1.1 2003/10/06 17:34:50 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-xmlrpc/py-xmlrpc-0.8.8.3.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://sourceforge.net/projects/py-xmlrpc/"
 DEPEND="virtual/python"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="alpha ia64 ppc sparc x86"
 
 src_install () {
 	mydoc="CHANGELOG COPYING INSTALL README"
diff --git a/dev-python/py2play/ChangeLog b/dev-python/py2play/ChangeLog
index 7ae657082548..60eca3faf3c2 100644
--- a/dev-python/py2play/ChangeLog
+++ b/dev-python/py2play/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for dev-python/py2play
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/ChangeLog,v 1.1 2003/05/10 18:44:02 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> py2play-0.1.7.ebuild:
+  Stable on ppc.
+
+  10 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> py2play-0.1.7.ebuild:
+  x86 stable bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*py2play-0.1.7 (16 Oct 2004)
+
+  16 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +py2play-0.1.7.ebuild:
+  Version bump.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> py2play-0.1.6.ebuild:
+  Added to ~ppc.
+
+  12 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> py2play-0.1.6.ebuild:
+  stablize since there have been no bugs reported.
+
+  12 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> py2play-0.1.5.ebuild:
+  clean older ebuild
+
+  12 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> metadata.xml:
+  py2play is only used by slune right now so adding games to the metadata file
+
+  12 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> py2play-0.1.6.ebuild:
+  use distutils src_install(); tidy
+
+*py2play-0.1.6 (21 Dec 2003)
+
+  21 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> py2play-0.1.6.ebuild:
+  Version bump
+
+*py2play-0.1.5 (05 Dec 2003)
+
+  05 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> py2play-0.1.5.ebuild:
+  New version
 
 *py2play-0.1.2 (10 May 2003)
 
diff --git a/dev-python/py2play/Manifest b/dev-python/py2play/Manifest
index 3621b5a7cc46..67b304c508d6 100644
--- a/dev-python/py2play/Manifest
+++ b/dev-python/py2play/Manifest
@@ -1,2 +1,8 @@
-MD5 0f4c54be16af2de9ed743d89244c5552 py2play-0.1.2.ebuild 449
+MD5 77b3606970c7d600dddb48f95bdd621f metadata.xml 178
+MD5 29bab974d42e0c90ecf0f7d635961965 ChangeLog 1659
+MD5 8687e0ea6123093059aabfa59b14a15f py2play-0.1.6.ebuild 649
+MD5 ac14ad5ae1d1afc425a0e43e474e41de py2play-0.1.2.ebuild 741
+MD5 1926e8d636a6bed622c3274d3c69c1f3 py2play-0.1.7.ebuild 532
+MD5 5584d2cf8eb44b1d98d591460a36a794 files/digest-py2play-0.1.7 64
 MD5 3f936eac8da4ba9519fa216a323ec969 files/digest-py2play-0.1.2 64
+MD5 db69982f29f44b02ae35c0bf7795e208 files/digest-py2play-0.1.6 64
diff --git a/dev-python/py2play/metadata.xml b/dev-python/py2play/metadata.xml
index de483c53568f..9b2fd781c1d0 100644
--- a/dev-python/py2play/metadata.xml
+++ b/dev-python/py2play/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>games</herd>
 </pkgmetadata>
diff --git a/dev-python/py2play/py2play-0.1.2.ebuild b/dev-python/py2play/py2play-0.1.2.ebuild
index 4e37416805d6..e5c5465c0192 100644
--- a/dev-python/py2play/py2play-0.1.2.ebuild
+++ b/dev-python/py2play/py2play-0.1.2.ebuild
@@ -1,22 +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/dev-python/py2play/py2play-0.1.2.ebuild,v 1.1 2003/05/10 18:44:02 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/py2play-0.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/py2play/Py2Play}
-IUSE="" 
+IUSE=""
 DESCRIPTION="A Peer To Peer network game engine"
 SRC_URI="http://oomadness.tuxfamily.org/downloads/${MY_P}.tar.gz
-         http://www.nectroom.homelinux.net/pkg/${MY_P}.tar.gz
-         http://nectroom.homelinux.net/pkg/${MY_P}.tar.gz"
+	http://www.nectroom.homelinux.net/pkg/${MY_P}.tar.gz
+	http://nectroom.homelinux.net/pkg/${MY_P}.tar.gz"
 
 HOMEPAGE="http://oomadness.tuxfamily.org/en/py2play/"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 DEPEND=">=dev-lang/python-2.2.2"
-        
+
 S=${WORKDIR}/${MY_P}
 
 src_install() {
diff --git a/dev-python/py2play/py2play-0.1.6.ebuild b/dev-python/py2play/py2play-0.1.6.ebuild
index 1a9762885006..f54ef3fd8fb3 100644
--- a/dev-python/py2play/py2play-0.1.6.ebuild
+++ b/dev-python/py2play/py2play-0.1.6.ebuild
@@ -1,25 +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/dev-python/py2play/py2play-0.1.6.ebuild,v 1.1 2003/12/21 16:28:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/py2play-0.1.6.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/py2play/Py2Play}
-IUSE=""
 DESCRIPTION="A Peer To Peer network game engine"
+HOMEPAGE="http://oomadness.nekeme.net/en/py2play/"
 SRC_URI="http://oomadness.tuxfamily.org/downloads/${MY_P}.tar.gz
 	http://www.nectroom.homelinux.net/pkg/${MY_P}.tar.gz
 	http://nectroom.homelinux.net/pkg/${MY_P}.tar.gz"
 
-HOMEPAGE="http://oomadness.tuxfamily.org/en/py2play/"
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="GPL-2"
-DEPEND=">=dev-lang/python-2.2.2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
-S=${WORKDIR}/${MY_P}
+DEPEND=">=dev-lang/python-2.2.2"
 
-src_install() {
-	distutils_src_install
-	mv ${D}/usr/bin/startdemo* ${D}/usr/share/doc/${PF}/
-}
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/py2play/py2play-0.1.7.ebuild b/dev-python/py2play/py2play-0.1.7.ebuild
index 72232ef7436d..202f887bfb0a 100644
--- a/dev-python/py2play/py2play-0.1.7.ebuild
+++ b/dev-python/py2play/py2play-0.1.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/dev-python/py2play/py2play-0.1.7.ebuild,v 1.1 2004/10/16 14:01:45 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/py2play-0.1.7.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://download.gna.org/slune/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.2"
diff --git a/dev-python/pyao/ChangeLog b/dev-python/pyao/ChangeLog
index b6fb11f05692..2ca69e2b3c1c 100644
--- a/dev-python/pyao/ChangeLog
+++ b/dev-python/pyao/ChangeLog
@@ -1,9 +1,23 @@
 # ChangeLog for dev-python/pyao
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyao/ChangeLog,v 1.1 2003/03/02 17:33:30 liquidx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyao/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  06 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> pyao-0.82.ebuild:
+  -amd64 -sparc
+
+  14 Aug 2003; Lars Weiler <pylon@gentoo.org> pyao-0.82.ebuild:
+  Added keyword ~ppc
+
+*pyao-0.82 (05 Aug 2003)
+
+  05 Aug 2003; Alastair Tse <liquidx@gentoo.org> pyao-0.82.ebuild:
+  version bump
 
 *pyao-0.81 (02 Mar 2003)
 
+  25 Mar 2003; Alastair Tse <liquidx@gentoo.org> pyao-0.81.ebuild:
+  stable bump
+
   02 Mar 2003; Alastair Tse <liquidx@gentoo.org> pyao-0.81.ebuild files/digest-pyao-0.81 :
   Initial Ebuild. Thanks to mike wakerly <mikew@wakerly.com>. Resolves #15979.
 
diff --git a/dev-python/pyao/Manifest b/dev-python/pyao/Manifest
index e69de29bb2d1..883ac29d76b9 100644
--- a/dev-python/pyao/Manifest
+++ b/dev-python/pyao/Manifest
@@ -0,0 +1,6 @@
+MD5 0836d1efd3ad423bd014501d6bf9de96 ChangeLog 773
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 3b972d6f8f55282b4b769ba180f8fa2f pyao-0.81.ebuild 569
+MD5 b2f910caefb4d715c5d8238cd3c131c1 pyao-0.82.ebuild 590
+MD5 840f0333fedc2ec9ff656156d1e90776 files/digest-pyao-0.81 60
+MD5 818576b127dad06b54ff767199a30067 files/digest-pyao-0.82 60
diff --git a/dev-python/pyao/pyao-0.81.ebuild b/dev-python/pyao/pyao-0.81.ebuild
index a8ed69bf0d7f..6381aa02cd3b 100644
--- a/dev-python/pyao/pyao-0.81.ebuild
+++ b/dev-python/pyao/pyao-0.81.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/dev-python/pyao/pyao-0.81.ebuild,v 1.1 2003/03/02 17:33:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyao/pyao-0.81.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -11,10 +11,10 @@ SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/python
-		>=media-libs/libao-0.8.3"
+	>=media-libs/libao-0.8.3"
 
 src_compile() {
 	./config_unix.py || die
diff --git a/dev-python/pyao/pyao-0.82.ebuild b/dev-python/pyao/pyao-0.82.ebuild
index 8699d7f493d5..16d1d2e818de 100644
--- a/dev-python/pyao/pyao-0.82.ebuild
+++ b/dev-python/pyao/pyao-0.82.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/dev-python/pyao/pyao-0.82.ebuild,v 1.1 2003/08/05 13:03:04 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyao/pyao-0.82.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc -amd64 -sparc"
 
 DEPEND="virtual/python
 	>=media-libs/libao-0.8.3"
diff --git a/dev-python/pybluez/ChangeLog b/dev-python/pybluez/ChangeLog
index e92d4019b52a..d8ebfddbec40 100644
--- a/dev-python/pybluez/ChangeLog
+++ b/dev-python/pybluez/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pybluez
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pybluez/ChangeLog,v 1.1 2005/11/03 20:56:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pybluez/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+*pybluez-0.4 (18 Nov 2005)
+
+  18 Nov 2005; Alastair Tse <liquidx@gentoo.org> +pybluez-0.4.ebuild:
+  version bump (#112288)
 
 *pybluez-0.3 (03 Nov 2005)
 
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index 9d91f7e93161..62c874434940 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -1,3 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ec0c3c91dc040873dfeb0a1337e427ef ChangeLog 510
 MD5 a5da0ea2340563c4545fe43f103eafd3 files/digest-pybluez-0.3 66
+MD5 c982780ff137c0ec2a0c76efb272ed9e files/digest-pybluez-0.4 66
 MD5 539454f93a140308dd2f8c03c20bf6ed metadata.xml 262
-MD5 86457f0897f1719ef996542e56459a2a pybluez-0.3.ebuild 795
+MD5 b6544e59ef8977ecadfcf4341c94cac8 pybluez-0.3.ebuild 889
+MD5 be17e1e6ebf1c3ee9c038af2e43c7b2d pybluez-0.4.ebuild 887
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDffko9ZFPrqoILX8RAoedAKDCIHxjlntTqczLoRJ6qOyIJA83jQCffajk
+ZQoO+z9fn4RS54WIrr7ua9c=
+=e8Aa
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pybluez/pybluez-0.3.ebuild b/dev-python/pybluez/pybluez-0.3.ebuild
index 03273d778955..cf4b37d3c3e0 100644
--- a/dev-python/pybluez/pybluez-0.3.ebuild
+++ b/dev-python/pybluez/pybluez-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/dev-python/pybluez/pybluez-0.3.ebuild,v 1.1 2005/11/03 20:56:56 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pybluez/pybluez-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils python
 
@@ -14,7 +14,7 @@ KEYWORDS="~x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/python-2.3
-         >=net-wireless/bluez-libs-2.10"
+	>=net-wireless/bluez-libs-2.10"
 
 PYTHON_MODNAME="pybluez"
 
diff --git a/dev-python/pybluez/pybluez-0.4.ebuild b/dev-python/pybluez/pybluez-0.4.ebuild
index 2b7fa9c69040..14e08028f1e3 100644
--- a/dev-python/pybluez/pybluez-0.4.ebuild
+++ b/dev-python/pybluez/pybluez-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/dev-python/pybluez/pybluez-0.4.ebuild,v 1.1 2005/11/18 15:50:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pybluez/pybluez-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils python
 
diff --git a/dev-python/pycairo/ChangeLog b/dev-python/pycairo/ChangeLog
index 4ae8fd2ab158..06faa89c4a42 100644
--- a/dev-python/pycairo/ChangeLog
+++ b/dev-python/pycairo/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for dev-python/pycairo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.1 2005/02/05 00:34:08 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
+
+  31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> pycairo-0.9.0.ebuild:
+  ~ia64 keyword.
+
+  19 Oct 2005; Tom Gall <tgall@gentoo.org> pycairo-0.9.0.ebuild:
+  added ~ppc64, bug #108808
+
+  25 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  pycairo-0.9.0.ebuild:
+  Added to ~ppc
+
+  20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-0.9.0.ebuild:
+  Keyworded ~sparc
+
+  30 Aug 2005; <dang@gentoo.org> pycairo-0.9.0.ebuild:
+  Marked ~amd64
+
+*pycairo-0.9.0 (26 Aug 2005)
+
+  26 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +pycairo-0.9.0.ebuild:
+  new version, needed for pygtk. approved by kloeri
 
 *pycairo-0.1.4 (04 Feb 2005)
 
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index b295a1276a30..eef6440cc9ac 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,16 @@
-MD5 73ba9acd24345470457468c6cee45490 metadata.xml 160
-MD5 f7315cb868bd7d99768aaa2853b954e4 pycairo-0.1.4.ebuild 903
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7102be86f2472050d7d508570e1abcc3 ChangeLog 967
 MD5 197f8f1d3b3932ad729ffd62de589135 files/digest-pycairo-0.1.4 65
+MD5 58ef26ed3b878a1c07a7736189bac202 files/digest-pycairo-0.9.0 65
+MD5 73ba9acd24345470457468c6cee45490 metadata.xml 160
+MD5 155eb7cb92d1f8892b5d24a2e47ef62c pycairo-0.1.4.ebuild 1003
+MD5 897725a123a2e8d45c1eab850f68253a pycairo-0.9.0.ebuild 1033
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZdRrKf2g/qXtneoRAhpvAJ9P9bsnc3t4GTsMjArRMRDvdqXrWgCfTEAt
+m2p4AqKH8O8ExHmo2LxMH4I=
+=dvHt
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pycairo/pycairo-0.1.4.ebuild b/dev-python/pycairo/pycairo-0.1.4.ebuild
index 931498915044..26f11da33c8f 100644
--- a/dev-python/pycairo/pycairo-0.1.4.ebuild
+++ b/dev-python/pycairo/pycairo-0.1.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/dev-python/pycairo/pycairo-0.1.4.ebuild,v 1.1 2005/02/05 00:34:08 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-0.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 #inherit distutils
 
diff --git a/dev-python/pycairo/pycairo-0.9.0.ebuild b/dev-python/pycairo/pycairo-0.9.0.ebuild
index 13961e44b9bc..ff10952a2ebe 100644
--- a/dev-python/pycairo/pycairo-0.9.0.ebuild
+++ b/dev-python/pycairo/pycairo-0.9.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/dev-python/pycairo/pycairo-0.9.0.ebuild,v 1.1 2005/08/26 00:04:54 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 #inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://cairographics.org/pycairo"
 SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gtk numeric svg"
 
 DEPEND=">=virtual/python-2.2
diff --git a/dev-python/pycdf/ChangeLog b/dev-python/pycdf/ChangeLog
index 52ef2df526eb..5bf69193c8da 100644
--- a/dev-python/pycdf/ChangeLog
+++ b/dev-python/pycdf/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for dev-python/pycdf
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycdf/ChangeLog,v 1.1 2004/05/25 09:17:39 kloeri Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycdf/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
-  25 May 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml:
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pycdf-0.5.2 (05 Dec 2004)
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> pycdf-0.5.2.ebuild:
+  Fix missing dependency, bug 67874.
+
+  25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml:
   Initial import, bug #46691.
 
diff --git a/dev-python/pycdf/Manifest b/dev-python/pycdf/Manifest
index 0c52baac82af..f88434c5d5bd 100644
--- a/dev-python/pycdf/Manifest
+++ b/dev-python/pycdf/Manifest
@@ -1,2 +1,4 @@
-MD5 ef9cb2b1770918839c144458f9c8a6eb pycdf-0.5.2.ebuild 691
+MD5 dacf211142e51d23574b436a421cf471 ChangeLog 549
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 0f5e42a050c4a60f59d859c83947061d pycdf-0.5.2.ebuild 805
 MD5 21a94dfa5dfdd3fc5cbc23d21a5bbd75 files/digest-pycdf-0.5.2 62
diff --git a/dev-python/pycdf/pycdf-0.5.2.ebuild b/dev-python/pycdf/pycdf-0.5.2.ebuild
index 436417426ac9..f46707d4f601 100644
--- a/dev-python/pycdf/pycdf-0.5.2.ebuild
+++ b/dev-python/pycdf/pycdf-0.5.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/dev-python/pycdf/pycdf-0.5.2.ebuild,v 1.1 2004/05/25 09:17:39 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycdf/pycdf-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
@@ -17,7 +17,8 @@ KEYWORDS="~x86"
 IUSE="doc"
 
 DEPEND="virtual/python
-	>=app-sci/netcdf-3.5.0-r3"
+		>=sci-libs/netcdf-3.5.0-r3
+		dev-python/numeric"
 
 DOCS="CHANGES doc/pycdf.txt"
 
diff --git a/dev-python/pychart/ChangeLog b/dev-python/pychart/ChangeLog
index 70f84ca89e40..eb7682d7b4d1 100644
--- a/dev-python/pychart/ChangeLog
+++ b/dev-python/pychart/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for dev-python/pychart
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychart/ChangeLog,v 1.1 2003/09/17 08:30:42 liquidx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychart/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+*pychart-1.36 (07 Dec 2004)
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +pychart-1.36.ebuild:
+  Version bump.
+
+  17 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> pychart-1.33.ebuild:
+  Marked 1.33 stable x86 and version bump, bug# 60664
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> pychart-1.33.ebuild:
+  Added to ~ppc.
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> pychart-1.33.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  19 Sep 2003; Michael Sterrett <msterret@gentoo.org> pychart-1.33.ebuild:
+  sed -i requires sed >= 4; repoman: whitespace cleanup
 
 *pychart-1.33 (17 Sep 2003)
 
diff --git a/dev-python/pychart/Manifest b/dev-python/pychart/Manifest
index 1704d182160c..1e7b9cdea987 100644
--- a/dev-python/pychart/Manifest
+++ b/dev-python/pychart/Manifest
@@ -1,2 +1,14 @@
-MD5 aa9ad3807ff653664bae3da283950666 pychart-1.33.ebuild 757
-MD5 f4ec51043dad23f9cf8cf038be6df822 files/digest-pychart-1.33 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 63639eb2aebae570a6b7635baf6765c2 ChangeLog 1014
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 1fc0815f4544a6c236ef3fca5fbfec60 pychart-1.37.ebuild 814
+MD5 83aa0eb64f507550e1768ead86b82fea files/digest-pychart-1.37 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCbipsTM53OX+9xmMRAv+6AJ92AdToJzCJLP72x4eCKotPO97beQCgx0G5
++QWfwuPuhoFWl7VXWWRGixM=
+=SfKo
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pychart/pychart-1.37.ebuild b/dev-python/pychart/pychart-1.37.ebuild
index d041dbb0c486..eaa7e6a6bfe5 100644
--- a/dev-python/pychart/pychart-1.37.ebuild
+++ b/dev-python/pychart/pychart-1.37.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/dev-python/pychart/pychart-1.37.ebuild,v 1.1 2005/04/18 16:51:02 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychart/pychart-1.37.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 
 inherit distutils
@@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/pychart/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.2
diff --git a/dev-python/pychecker/ChangeLog b/dev-python/pychecker/ChangeLog
index 98ef32769876..42d097a2f7a6 100644
--- a/dev-python/pychecker/ChangeLog
+++ b/dev-python/pychecker/ChangeLog
@@ -1,10 +1,104 @@
 # ChangeLog for dev-python/pychecker
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pychecker-0.8.14.ebuild:
+  Mark 0.8.14 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pychecker-0.8.14.ebuild:
+  add ~ia64
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pychecker-0.8.14.ebuild:
+  Stable on ppc.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pychecker-0.8.14.ebuild:
+  Stable on alpha.
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> pychecker-0.8.14.ebuild:
+  Stable on SPARC.
+
+  14 May 2005; Heinrich Wendel <lanius@gentoo.org> pychecker-0.8.14.ebuild:
+  stable on amd64 / x86
+
+  23 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pychecker-0.8.14.ebuild:
+  Remove RESTRICT="nomirror".
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> pychecker-0.8.14.ebuild:
+  keywords ~amd64; closes #60997.
+
+  20 Aug 2004; Jason Wever <weeve@gentoo.org> pychecker-0.8.13.ebuild:
+  Stable on sparc.
+
+  12 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> -pychecker-0.8.11.ebuild,
+  pychecker-0.8.13.ebuild:
+  Stable on x86, remove old ebuild.
+
+*pychecker-0.8.14 (07 Jun 2004)
+
+  07 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> pychecker-0.8.14.ebuild:
+  Version bump. Marked testing on ~alpha, added RESTRICT='nomirror' and
+  replaced mydocs with DOCS.
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pychecker-0.8.13.ebuild:
+  Stable on alpha.
+
+  24 May 2004; David Holm <dholm@gentoo.org> pychecker-0.8.13.ebuild:
+  Added to ~ppc.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pychecker-0.8.11.ebuild,
+  pychecker-0.8.12.ebuild, pychecker-0.8.13.ebuild:
+  Add missing IUSE.
+
+*pychecker-0.8.13 (29 Feb 2004)
+
+  29 Feb 2004; <kloeri@gentoo.org> pychecker-0.8.13.ebuild:
+  Version bump.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> pychecker-0.8.12.ebuild:
+  Stable on sparc.
+
+*pychecker-0.8.12 (04 Apr 2003)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pychecker-0.8.12.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pychecker-0.8.11 (24 Sep 2002)
+  24 Sep 2002; Jon Nelson <jnelson@gentoo.org> pychecker-0.8.11.ebuild:
+
+  Update to 0.8.11 to resolve 8278
+  Use distutils eclass
+
+*pychecker-0.8.10-r1 (28 Apr 2002)
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> pychecker-0.8.3.ebuild, pychecker-0.8.7.ebuild, pychecker-0.8.10.ebuild, pychecker-0.8.10-r1.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE
+
+  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> pychecker-0.8.10-r1.ebuild :
+
+  Use '--root=' instead of --prefix for proper install via DistUtils
+  Allows unmasking of pychecker
+ 
+*pychecker-0.8.10 (13 Apr 2002)
+
+  13 Apr 2002; Karl Trygve Kalleberg <karltk@gentoo.org> pychecker-0.8.3.ebuild files/digest-pychecker-0.8.3 pychecker-0.8.7.ebuild files/digest-pychecker-0.8.7 pychecker-0.8.10.ebuild files/digest-pychecker-0.8.10 :
+
+  New upstream version.
+
+  Removed old versions.
 
 *pychecker-0.8.7 (1 Feb 2002)
 
   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
diff --git a/dev-python/pychecker/Manifest b/dev-python/pychecker/Manifest
index e69de29bb2d1..7745373de38b 100644
--- a/dev-python/pychecker/Manifest
+++ b/dev-python/pychecker/Manifest
@@ -0,0 +1,8 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 47574efc77d0e4d0d16ee7ad9bf857b1 ChangeLog 3654
+MD5 020639d57f048c90fa70ab1d359e26c6 pychecker-0.8.13.ebuild 521
+MD5 7c376d71a0ba8faee220c8663e6cd21c pychecker-0.8.14.ebuild 532
+MD5 ab670763853ad401079b97002ffad754 pychecker-0.8.12.ebuild 520
+MD5 7696260fce8dd1520d08b5793ea79594 files/digest-pychecker-0.8.12 68
+MD5 0731fa83dc882055232c283f9aed177a files/digest-pychecker-0.8.13 68
+MD5 40b672e778ce575ce651188541f32aa6 files/digest-pychecker-0.8.14 68
diff --git a/dev-python/pychecker/files/digest-pychecker-0.8.12 b/dev-python/pychecker/files/digest-pychecker-0.8.12
index db0cf24f6205..429f38106b39 100644
--- a/dev-python/pychecker/files/digest-pychecker-0.8.12
+++ b/dev-python/pychecker/files/digest-pychecker-0.8.12
@@ -1,2 +1 @@
-MD5 0d20e8a00b61c3c3d1452fef3dc84be6 /pychecker-0.8.12.ebuild 547
 MD5 aedbfe99ed1f540cc27243ec22b913c7 pychecker-0.8.12.tar.gz 115719
diff --git a/dev-python/pychecker/pychecker-0.8.12.ebuild b/dev-python/pychecker/pychecker-0.8.12.ebuild
index ee663a9ef8d6..d53d8f342fe2 100644
--- a/dev-python/pychecker/pychecker-0.8.12.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.12.ebuild
@@ -1,20 +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/dev-python/pychecker/pychecker-0.8.12.ebuild,v 1.1 2003/04/04 19:11:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.12.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
-IUSE=""
-DESCRIPTION="PyChecker is a tool for finding common bugs in python source code."
+DESCRIPTION="tool for finding common bugs in python source code"
 SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
 HOMEPAGE="http://pychecker.sourceforge.net/"
 
-DEPEND="virtual/python"
-
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc ~alpha"
 LICENSE="BSD"
+IUSE=""
 
-mydoc="pycheckrc TODO"
-
+DEPEND="virtual/python"
 
+mydoc="pycheckrc TODO"
diff --git a/dev-python/pychecker/pychecker-0.8.13.ebuild b/dev-python/pychecker/pychecker-0.8.13.ebuild
index 3ed6c6218139..d59177436414 100644
--- a/dev-python/pychecker/pychecker-0.8.13.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.13.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/dev-python/pychecker/pychecker-0.8.13.ebuild,v 1.1 2004/02/29 00:45:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.13.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -9,8 +9,9 @@ SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
 HOMEPAGE="http://pychecker.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 sparc alpha ~ppc"
 LICENSE="BSD"
+IUSE=""
 
 DEPEND="virtual/python"
 
diff --git a/dev-python/pychecker/pychecker-0.8.14.ebuild b/dev-python/pychecker/pychecker-0.8.14.ebuild
index 56f567c262b2..76049f897cc6 100644
--- a/dev-python/pychecker/pychecker-0.8.14.ebuild
+++ b/dev-python/pychecker/pychecker-0.8.14.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/dev-python/pychecker/pychecker-0.8.14.ebuild,v 1.1 2004/06/07 12:56:26 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychecker/pychecker-0.8.14.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -8,10 +8,9 @@ DESCRIPTION="tool for finding common bugs in python source code"
 SRC_URI="mirror://sourceforge/pychecker/${P}.tar.gz"
 HOMEPAGE="http://pychecker.sourceforge.net/"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 LICENSE="BSD"
 IUSE=""
-RESTRICT="nomirror"
 DEPEND="virtual/python"
 DOCS="pycheckrc TODO"
 
diff --git a/dev-python/pychm/ChangeLog b/dev-python/pychm/ChangeLog
index 7720299a4d44..8b4e7a09edbd 100644
--- a/dev-python/pychm/ChangeLog
+++ b/dev-python/pychm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pychm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pychm/ChangeLog,v 1.1 2005/02/14 19:39:12 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychm/ChangeLog,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
 
 *pychm-0.8.2 (14 Feb 2005)
 
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index 4467097a0f87..60ef8ad6036d 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,2 +1,14 @@
-MD5 c2d6092f7e56aa3382263bbc2a934de8 pychm-0.8.2.ebuild 435
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4b1d4e57155a92c39b033493fec0dae2 ChangeLog 482
 MD5 322865f0ddcda68a3e8923b4cb050d94 files/digest-pychm-0.8.2 62
+MD5 219fb95bd17aef226050a53cba8a47c7 metadata.xml 822
+MD5 8fa9fd8fb7d66d9b789ff22bef4d989b pychm-0.8.2.ebuild 518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwOcFdQwWVoAgN4RAjHYAJsFqlDwimOOehuiowRqwsNTofvmUACfYzbN
+DQWTzrQboYfAU8pow7GHH5w=
+=Hgw2
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pychm/metadata.xml b/dev-python/pychm/metadata.xml
index ad56e6c27185..4b598b4c2265 100644
--- a/dev-python/pychm/metadata.xml
+++ b/dev-python/pychm/metadata.xml
@@ -8,4 +8,9 @@ provide access to the API implemented by the C library chmlib and some
 additional classes and functions. They are used to access MS-ITSS
 encoded files - Compressed Html Help files (.chm).
 </longdescription>
+<longdescription lang="ja">
+Chmパッケージは、C言語ライブラリChmのAPI実装とそれに幾つか拡張されたクラスと関数
+にアクセスする手段のchm, chmlib, extraの3つのモジュールを提供します。MS-ITSSエン
+コード・ファイルに使われています。-- Compressed Html Help ファイル (.chm)。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pychm/pychm-0.8.2.ebuild b/dev-python/pychm/pychm-0.8.2.ebuild
index e7aa96905f60..74257cf88216 100644
--- a/dev-python/pychm/pychm-0.8.2.ebuild
+++ b/dev-python/pychm/pychm-0.8.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/dev-python/pychm/pychm-0.8.2.ebuild,v 1.1 2005/02/14 19:39:12 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pychm/pychm-0.8.2.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyclamav/ChangeLog b/dev-python/pyclamav/ChangeLog
index ff972e38d342..afc2ecae6c2a 100644
--- a/dev-python/pyclamav/ChangeLog
+++ b/dev-python/pyclamav/ChangeLog
@@ -1,9 +1,32 @@
 # ChangeLog for dev-python/pyclamav
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclamav/ChangeLog,v 1.1 2004/06/05 13:49:50 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclamav/ChangeLog,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
+
+*pyclamav-0.3.1 (24 Jul 2005)
+
+  24 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org> pyclamav-0.1.ebuild,
+  pyclamav-0.2.1.ebuild, +pyclamav-0.3.1.ebuild:
+  Version bump. Older versions marked stable on x86.
+
+  18 May 2005; Alastair Tse <liquidx@gentoo.org> :
+  remove dependencies on versioned virtuals (#93028)
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyclamav-0.2.1 (05 Dec 2004)
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +pyclamav-0.2.1.ebuild:
+  Version bump, bug 71391.
+
+  26 Oct 2004; Tom Martin <slarti@gentoo.org> pyclamav-0.1.ebuild:
+  Marked ~amd64, resolves bug 68967.
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> pyclamav-0.1.ebuild:
+  Added to ~ppc.
 
 *pyclamav-0.1 (05 Jun 2004)
 
-  05 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> +pyclamav-0.1.ebuild:
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +pyclamav-0.1.ebuild:
   Initial commit, bug #52089.
 
diff --git a/dev-python/pyclamav/Manifest b/dev-python/pyclamav/Manifest
index 0b61f35ad556..d20b62297140 100644
--- a/dev-python/pyclamav/Manifest
+++ b/dev-python/pyclamav/Manifest
@@ -1,3 +1,18 @@
-MD5 f478014cc46fa180cb3ec1c4a6dd9549 pyclamav-0.1.ebuild 515
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f8d9bc211a6ebc3e529c41c1ed064e5d ChangeLog 1090
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 27fee4bf51c0758275fe1adb75bda6a0 pyclamav-0.1.ebuild 620
+MD5 c3558148be40d445d9b305d875626dca pyclamav-0.2.1.ebuild 622
+MD5 8ccd12fe5c0456ca081a7caae1a8a618 pyclamav-0.3.1.ebuild 623
 MD5 db27786d8dbdd667042c5aac7e5dd1a0 files/digest-pyclamav-0.1 62
+MD5 02e3cc7499b0aabc2c0446747a2af320 files/digest-pyclamav-0.2.1 65
+MD5 f178c5a3bcbcc48f704c7e6a7d152168 files/digest-pyclamav-0.3.1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC45Id2jLqHNfbg2URAmMlAJ92A5idoFA5oajhjFcEMuhDRJh2eACg0gNa
+RSI1c0jxOBEjKVrxPRJFE5w=
+=Tysj
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyclamav/pyclamav-0.1.ebuild b/dev-python/pyclamav/pyclamav-0.1.ebuild
index 26933ef9b543..f023fa23e6df 100644
--- a/dev-python/pyclamav/pyclamav-0.1.ebuild
+++ b/dev-python/pyclamav/pyclamav-0.1.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/dev-python/pyclamav/pyclamav-0.1.ebuild,v 1.1 2004/06/05 13:49:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclamav/pyclamav-0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
@@ -8,8 +8,8 @@ DESCRIPTION="Python binding for libclamav"
 HOMEPAGE="http://norman.free.fr/norman/python/pyclamav/"
 SRC_URI="http://norman.free.fr/norman/python/pyclamav/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-DEPEND=">=virtual/python-2.1
+KEYWORDS="x86 ~ppc ~amd64"
+DEPEND=">=dev-lang/python-2.2
 	>=app-antivirus/clamav-0.70"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/pyclamav/pyclamav-0.2.1.ebuild b/dev-python/pyclamav/pyclamav-0.2.1.ebuild
index c6a0b29deeec..ef05619766e0 100644
--- a/dev-python/pyclamav/pyclamav-0.2.1.ebuild
+++ b/dev-python/pyclamav/pyclamav-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/dev-python/pyclamav/pyclamav-0.2.1.ebuild,v 1.1 2004/12/05 16:27:43 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclamav/pyclamav-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
@@ -8,8 +8,8 @@ DESCRIPTION="Python binding for libclamav"
 HOMEPAGE="http://norman.free.fr/norman/python/pyclamav/"
 SRC_URI="http://norman.free.fr/norman/python/pyclamav/${P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-DEPEND=">=virtual/python-2.1
+KEYWORDS="x86 ~ppc ~amd64"
+DEPEND=">=dev-lang/python-2.2
 	>=app-antivirus/clamav-0.70"
 SLOT="0"
 IUSE=""
diff --git a/dev-python/pyclamav/pyclamav-0.3.1.ebuild b/dev-python/pyclamav/pyclamav-0.3.1.ebuild
index 2173982e336d..c035c8fa9647 100644
--- a/dev-python/pyclamav/pyclamav-0.3.1.ebuild
+++ b/dev-python/pyclamav/pyclamav-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/dev-python/pyclamav/pyclamav-0.3.1.ebuild,v 1.1 2005/07/24 13:03:28 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclamav/pyclamav-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyclimate/ChangeLog b/dev-python/pyclimate/ChangeLog
index 02f0a3842ee4..dd68fd9c2853 100644
--- a/dev-python/pyclimate/ChangeLog
+++ b/dev-python/pyclimate/ChangeLog
@@ -1,10 +1,33 @@
-# ChangeLog for dev-python/PyClimate
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclimate/ChangeLog,v 1.1 2004/06/21 00:42:20 kloeri Exp $
+# ChangeLog for dev-python/pyclimate
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclimate/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyclimate-1.2.1-r1.ebuild:
+  add ~ia64
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  24 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pyclimate-1.2.1-r1.ebuild,
+  pyclimate-1.2.1.ebuild:
+  Correct S.
+
+  24 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pyclimate-1.2.1-r1.ebuild:
+  Fix SRC_URI typo.
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pyclimate-1.2.1-r1.ebuild,
+  pyclimate-1.2.1.ebuild:
+  ScientificPython is now scientificpython - adjust dependencies accordingly.
 
 *pyclimate-1.2.1-r1 (21 Jun 2004)
 
-  21 Jun 2004; Bryan �stergaard <kloeri@gentoo.org>
+  21 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
   +pyclimate-1.2.1-r1.ebuild, +pyclimate-1.2.1.ebuild:
   Moved from dev-python/PyClimate.
 
diff --git a/dev-python/pyclimate/Manifest b/dev-python/pyclimate/Manifest
index c5f294b6184f..ede5cd5d54c3 100644
--- a/dev-python/pyclimate/Manifest
+++ b/dev-python/pyclimate/Manifest
@@ -1,6 +1,16 @@
-MD5 314b32fec97ba2657cbd68e1e1a88219 pyclimate-1.2.1.ebuild 955
-MD5 8ade15525083a6f7897018147fca52fd pyclimate-1.2.1-r1.ebuild 1324
-MD5 16e096b7d58707e5ef188412a37585aa ChangeLog 570
-MD5 5711f48155e6a9f7f569dab40265e627 metadata.xml 729
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6fd93e2466c8d962bbd76fdf29c14729 ChangeLog 1555
 MD5 f8ee275409815fba5c7c815d370748bf files/digest-pyclimate-1.2.1 67
 MD5 f8ee275409815fba5c7c815d370748bf files/digest-pyclimate-1.2.1-r1 67
+MD5 d7108b803a0f457ac3c9b5ba864bc6e3 metadata.xml 1320
+MD5 01799ba6a411cc03e10374eecebdf007 pyclimate-1.2.1-r1.ebuild 1348
+MD5 566f620536ac538dca1181125c8c1d1e pyclimate-1.2.1.ebuild 971
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwQXFdQwWVoAgN4RAq5NAJ0ehZI5V5W0wbKaeZp0yAQHSME8hQCgzXJ3
+Y3VI5kQSwTkHwhQJHh/1iLg=
+=WjR/
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyclimate/metadata.xml b/dev-python/pyclimate/metadata.xml
index 823827079d0b..881bc026103f 100644
--- a/dev-python/pyclimate/metadata.xml
+++ b/dev-python/pyclimate/metadata.xml
@@ -15,4 +15,10 @@
  filters, kernel based probability density function estimation and access 
  to DCDFLIB.C library.
 </longdescription>
+<longdescription lang="ja">
+このパッケージはPython言語を使った気候の変化を分析する必要なタスクを終えるために
+デザインされました。幾つかの単純なI/O操作、COARDS-compliant netCDFファイルの操作
+、EOF解析、カップル・データのSVDとCCA解析、幾つかのリニア・デジタル・フィルター>、カーネル・ベースのプロバビリティ・デンシティ・ファンクション・エスティメーショ
+ンとDCDFLIB.Cライブラリへのアクセス等の機能を提供します。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pyclimate/pyclimate-1.2.1-r1.ebuild b/dev-python/pyclimate/pyclimate-1.2.1-r1.ebuild
index 396384e35dbf..5f7fe1f88113 100644
--- a/dev-python/pyclimate/pyclimate-1.2.1-r1.ebuild
+++ b/dev-python/pyclimate/pyclimate-1.2.1-r1.ebuild
@@ -1,22 +1,24 @@
-# 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/dev-python/pyclimate/pyclimate-1.2.1-r1.ebuild,v 1.1 2004/06/21 00:42:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclimate/pyclimate-1.2.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit eutils distutils
 
-MY_P="${P/pyclimate/PyCLimate}"
+MY_P="${P/pyclimate/PyClimate}"
+S="${WORKDIR}/${MY_P}"
+
 IUSE=""
 DESCRIPTION="Climate Data Analysis Module for Python"
 SRC_URI="http://starship.python.net/crew/jsaenz/pyclimate/downloads/${MY_P}.tar.gz"
 HOMEPAGE="http://starship.python.net/crew/jsaenz/pyclimate/index.html"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~alpha ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
-	dev-python/ScientificPython
-	>=app-sci/netcdf-3.0"
+	dev-python/scientificpython
+	>=sci-libs/netcdf-3.0"
 
 src_install() {
 
diff --git a/dev-python/pyclimate/pyclimate-1.2.1.ebuild b/dev-python/pyclimate/pyclimate-1.2.1.ebuild
index f6c3a9372af8..82c5b391fc04 100644
--- a/dev-python/pyclimate/pyclimate-1.2.1.ebuild
+++ b/dev-python/pyclimate/pyclimate-1.2.1.ebuild
@@ -1,10 +1,12 @@
-# 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/dev-python/pyclimate/pyclimate-1.2.1.ebuild,v 1.1 2004/06/21 00:42:20 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyclimate/pyclimate-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit eutils
 
 MY_P="${P/pyclimate/PyClimate}"
+S=${WORKDIR}/${MY_P}
+
 IUSE=""
 DESCRIPTION="Climate Data Analysis Module for Python"
 SRC_URI="http://starship.python.net/crew/jsaenz/pyclimate/downloads/${MY_P}.tar.gz"
@@ -15,8 +17,8 @@ KEYWORDS="~x86 ~sparc ~alpha ~ppc"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
-	dev-python/ScientificPython
-	>=app-sci/netcdf-3.0"
+	dev-python/scientificpython
+	>=sci-libs/netcdf-3.0"
 
 src_install() {
 	python setup.py install --prefix=${D}/usr || die "Python Install Failed"
diff --git a/dev-python/pycrash/ChangeLog b/dev-python/pycrash/ChangeLog
index 67599746455d..b91f9511ca3f 100644
--- a/dev-python/pycrash/ChangeLog
+++ b/dev-python/pycrash/ChangeLog
@@ -1,10 +1,32 @@
 # ChangeLog for dev-python/pycrash
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrash/ChangeLog,v 1.1 2004/05/08 15:51:35 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrash/ChangeLog,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  30 Oct 2005; Jason Wever <weeve@gentoo.org> pycrash-0.4_pre3.ebuild:
+  Added ~sparc keyword.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Nov 2004; Marius Mauch <genone@gentoo.org> pycrash-0.4_pre3.ebuild:
+  Marked ~amd64.
+
+*pycrash-0.4_pre3 (25 Aug 2004)
+
+  25 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  pycrash-0.4_pre2.ebuild, +pycrash-0.4_pre3.ebuild:
+  pycrash-0.4_pre2 marked stable on x86. Added with some fixes
+  pycrash-0.4_pre3. Added description to metadata.
+
+  09 May 2004; David Holm <dholm@gentoo.org> pycrash-0.4_pre2.ebuild:
+  Added to ~ppc.
 
 *pycrash-0.4_pre2 (08 May 2004)
 
-  08 May 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  08 May 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +pycrash-0.4_pre2.ebuild:
   Initial import, bug #49010.
 
diff --git a/dev-python/pycrash/Manifest b/dev-python/pycrash/Manifest
index 172cfea5f4a3..0cb2674a9ba1 100644
--- a/dev-python/pycrash/Manifest
+++ b/dev-python/pycrash/Manifest
@@ -1,2 +1,16 @@
-MD5 f07b489a1dd7137c87237dc668d88350 pycrash-0.4_pre2.ebuild 455
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9c44daabe9d04f490b3756fd1da58802 ChangeLog 1153
 MD5 46404d56ce59a154184f3c8544c8065b files/digest-pycrash-0.4_pre2 67
+MD5 426895b78c68fcdd4d3ef690dbaa7458 files/digest-pycrash-0.4_pre3 67
+MD5 53869687dbf6f219f4be365e4b8d3fcf metadata.xml 1398
+MD5 1ba3f5796c275fec7fa169d534827293 pycrash-0.4_pre2.ebuild 555
+MD5 6bf4864e9fb84b24399313741df23b82 pycrash-0.4_pre3.ebuild 656
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwSdFdQwWVoAgN4RAnnYAKCVhOjNGBwSN3Yl3fM1RtCcqOfKngCeJ+yB
+zQm0+CNOJD5MXGRDKXcL1cI=
+=W5Mu
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pycrash/metadata.xml b/dev-python/pycrash/metadata.xml
index de483c53568f..cd2e1ca12766 100644
--- a/dev-python/pycrash/metadata.xml
+++ b/dev-python/pycrash/metadata.xml
@@ -2,4 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+PyCrash is a Run-Time Exception Dumper which handles uncaught exceptions
+during the execution of Python programs and collects information about
+the program context. PyCrash can be very useful in report bug information,
+because the programmer can easily analyse the program execution context
+of the crashed application. The format of the crash dump file generated 
+by PyCrash is XML, so the programmer can easily read this file to understand
+why the program is crashed.
+</longdescription>
+<longdescription lang="ja">
+PyCrashは、Python言語プログラム実行中に未キャッチの例外処理を管理したりプログラ>ム・コンテキスト情報を集めたりするランライム・エクスセプション・ダンパーです。PyCrashはバグ報告に使えますが、その理由はクラッシュしたアプリケーションのプログラ>ム・エキュゼキューション・コンテキストをプログラマーが解析するのを容易にするから
+です。PyCrashにより作成されるクラッシュ・ダンプ・ファイルの形式はXMLで、何故プロ
+グラムがクラッシュしたのかをプログラマが理解しやすくなるでしょう。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pycrash/pycrash-0.4_pre2.ebuild b/dev-python/pycrash/pycrash-0.4_pre2.ebuild
index 0e3d88740215..09443e15bac9 100644
--- a/dev-python/pycrash/pycrash-0.4_pre2.ebuild
+++ b/dev-python/pycrash/pycrash-0.4_pre2.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/dev-python/pycrash/pycrash-0.4_pre2.ebuild,v 1.1 2004/05/08 15:51:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrash/pycrash-0.4_pre2.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 DOCS="NEWS TODO"
 
 DEPEND=">=virtual/python-2.3"
diff --git a/dev-python/pycrash/pycrash-0.4_pre3.ebuild b/dev-python/pycrash/pycrash-0.4_pre3.ebuild
index cb6dc91df484..163b62c141ba 100644
--- a/dev-python/pycrash/pycrash-0.4_pre3.ebuild
+++ b/dev-python/pycrash/pycrash-0.4_pre3.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/dev-python/pycrash/pycrash-0.4_pre3.ebuild,v 1.1 2004/08/25 17:31:46 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrash/pycrash-0.4_pre3.ebuild,v 1.1.1.1 2005/11/30 10:10:26 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 DOCS="NEWS TODO THANKS"
 DEPEND=">=virtual/python-2.3"
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pycrypto/ChangeLog b/dev-python/pycrypto/ChangeLog
index 12481cb0c29a..4a714d2f6a06 100644
--- a/dev-python/pycrypto/ChangeLog
+++ b/dev-python/pycrypto/ChangeLog
@@ -1,6 +1,71 @@
 # ChangeLog for dev-python/pycrypto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.1 2002/09/04 03:51:30 agenkin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  02 Sep 2005; <dang@gentoo.org> pycrypto-2.0-r1.ebuild:
+  Marked stable on amd64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pycrypto-2.0.1.ebuild:
+  add ~ia64
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pycrypto-2.0-r1.ebuild:
+  Stable on ppc.
+
+  26 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pycrypto-2.0-r1.ebuild:
+  Stable on alpha.
+
+*pycrypto-2.0.1 (19 Jul 2005)
+
+  19 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  pycrypto-2.0-r1.ebuild, +pycrypto-2.0.1.ebuild:
+  Version bump. pycrypto-2.0-r1 marked stable on x86.
+
+*pycrypto-2.0-r1 (25 Jan 2005)
+
+  25 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +pycrypto-2.0-r1.ebuild:
+  Added dependency on dev-libs/gmp (bug #78172).
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pycrypto-2.0 (14 Aug 2004)
+
+  14 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +pycrypto-2.0.ebuild:
+  Version bump. Some cleanup in the ebuild. Added description to metadata.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> pycrypto-1.9_alpha4.ebuild,
+  pycrypto-1.9_alpha6.ebuild:
+  change virtual/glibc to virtual/libc
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  pycrypto-1.9_alpha6.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  pycrypto-1.9_alpha4.ebuild, pycrypto-1.9_alpha6.ebuild:
+  Add missing IUSE.
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org>
+  pycrypto-1.9_alpha4.ebuild, pycrypto-1.9_alpha6.ebuild:
+  Update SRC_URI.
+
+  06 Mar 2004; David Holm <dholm@gentoo.org> pycrypto-1.9_alpha6.ebuild:
+  Added to ~ppc.
+
+  16 Dec 2003; Jason Wever <weeve@gentoo.org> pycrypto-1.9_alpha6.ebuild:
+  Added ~sparc to keywords to fix the broken dependencies of dev-python/twisted.
+
+*pycrypto-1.9_alpha6 (16 May 2003)
+
+  16 May 2003; Alastair Tse <liquidx@gentoo.org> pycrypto-1.9_alpha6.ebuild:
+  version bump and mirroring files locally on gentoo mirrors because of
+  referrer restriction on author's mirror (?)
 
 *pycrypto-1.9_alpha4 (03 Sep 2002)
 
diff --git a/dev-python/pycrypto/Manifest b/dev-python/pycrypto/Manifest
index a951231894f4..62eab5349879 100644
--- a/dev-python/pycrypto/Manifest
+++ b/dev-python/pycrypto/Manifest
@@ -1,5 +1,22 @@
-MD5 150f11d3499a0884e2d04133ed7bc424 ChangeLog 348
-MD5 bb9e15e9122a289eb009ed6f62ab358f pycrypto-1.9_alpha4.ebuild 708
-MD5 8eb16aa98944ea20cc2352025e07d4f4 pycrypto-1.9_alpha6.ebuild 784
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9a9f05fb111ad9ec8781460e75530756 ChangeLog 2483
 MD5 88124038f9bc0fb6771c9d12f9bcbac9 files/digest-pycrypto-1.9_alpha4 66
 MD5 b59c388eacd676d40313043ecea7841e files/digest-pycrypto-1.9_alpha6 66
+MD5 d204e299027be7fac9649389cf925a46 files/digest-pycrypto-2.0 64
+MD5 d204e299027be7fac9649389cf925a46 files/digest-pycrypto-2.0-r1 64
+MD5 b9e6cee737dea02a879ca7f8927b769a files/digest-pycrypto-2.0.1 66
+MD5 5b03cb0967f5fb96991f2463fa415797 metadata.xml 1774
+MD5 44877b6ed99242a7cab50a1941a19351 pycrypto-1.9_alpha4.ebuild 710
+MD5 3172f23539eb54a31ad3a7d8321d4557 pycrypto-1.9_alpha6.ebuild 622
+MD5 f9385559bb015b37c9e2ff2863e25eee pycrypto-2.0-r1.ebuild 594
+MD5 8de27bc518f75ebaba8b048aec87f02b pycrypto-2.0.1.ebuild 593
+MD5 1ff484937e9f3be035fe383ea160e8ad pycrypto-2.0.ebuild 573
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwT/FdQwWVoAgN4RAuSQAKDC6qHGQXxvw6JT8X5lL0blZ0qDKgCg4Xmf
+tljIN0FnCWLdgfmWZ4UdlaI=
+=pS0i
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pycrypto/metadata.xml b/dev-python/pycrypto/metadata.xml
index de483c53568f..a07fbd59d943 100644
--- a/dev-python/pycrypto/metadata.xml
+++ b/dev-python/pycrypto/metadata.xml
@@ -2,4 +2,37 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+The Python Cryptography Toolkit is a collection of cryptographic
+algorithms and protocols, implemented for use from Python. Among
+the contents of the package:
+
+	* Hash functions: MD2, MD4, RIPEMD, SHA256.
+	* Block encryption algorithms: AES, ARC2, Blowfish, CAST, DES,
+		Triple-DES, IDEA, RC5.
+	* Stream encryption algorithms: ARC4, simple XOR.
+	* Public-key algorithms: RSA, DSA, ElGamal, qNEW.
+	* Protocols: All-or-nothing transforms, chaffing/winnowing.
+	* Miscellaneous: RFC1751 module for converting 128-key keys into
+		a set of English words, primality testing.
+	* Some demo programs (currently all quite old and outdated).
+
+</longdescription>
+<longdescription lang="ja">
+このPython言語のクリプトグラフィー・ツールキットは、暗号手法のアルゴリズムとプロ
+トコルの集合で、Python言語から利用されるための実装です。このパッケージ内容は以下
+です。
+
+
+        * Hash ファンクション: MD2, MD4, RIPEMD, SHA256.
+        * ブロック・エンクリプション・アルゴリズム: AES, ARC2, Blowfish, CAST, DES,
+                Triple-DES, IDEA, RC5.
+        * ストリーム・エンクリプション・アルゴリズム: ARC4, simple XOR.
+        * 公開鍵アルゴリズム: RSA, DSA, ElGamal, qNEW.
+        * プロトコル: All-or-nothing transforms, chaffing/winnowing.
+        * その他: RFC1751 module for converting 128-key keys into
+                a set of English words, primality testing.
+        * デモ・プログラム(現在では完全に古く時代遅れなもの)
+
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pycrypto/pycrypto-1.9_alpha4.ebuild b/dev-python/pycrypto/pycrypto-1.9_alpha4.ebuild
index 6244dbf07b1e..0e17d2c73a7c 100644
--- a/dev-python/pycrypto/pycrypto-1.9_alpha4.ebuild
+++ b/dev-python/pycrypto/pycrypto-1.9_alpha4.ebuild
@@ -1,18 +1,18 @@
-# Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-1.9_alpha4.ebuild,v 1.1 2002/09/04 03:51:30 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-1.9_alpha4.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 DESCRIPTION="Python cryptography toolkit."
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
 LICENSE="freedist"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-lang/python"
-RDEPEND="${DEPEND}"
 
 SLOT="0"
-KEYWORDS="x86"
-SRC_URI="http://www.amk.ca/files/python/${P/_alpha/a}.tar.gz"
+KEYWORDS="x86 alpha"
+SRC_URI="http://www.amk.ca/files/python/crypto/${P/_alpha/a}.tar.gz"
+IUSE=""
 
 S="${WORKDIR}/${P/_alpha/a}"
 
diff --git a/dev-python/pycrypto/pycrypto-1.9_alpha6.ebuild b/dev-python/pycrypto/pycrypto-1.9_alpha6.ebuild
index a1d30d716aa3..a225d5a2cea9 100644
--- a/dev-python/pycrypto/pycrypto-1.9_alpha6.ebuild
+++ b/dev-python/pycrypto/pycrypto-1.9_alpha6.ebuild
@@ -1,23 +1,20 @@
-# Copyright 2002 Arcady Genkin <agenkin@thpoon.com>
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-1.9_alpha6.ebuild,v 1.1 2003/05/16 09:01:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-1.9_alpha6.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
-IUSE=""
 
 DESCRIPTION="Python cryptography toolkit."
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
-## NOTE: I'm getting 403's with this link, but it works if the
-##        referrer is his homepage. Grr! Mirroring on Gentoo
-# SRC_URI="http://www.amk.ca/files/python/${P/_alpha/a}.tar.gz"
-SRC_URI="mirror://gentoo/${P/_alpha/a}.tar.gz"
+SRC_URI="http://www.amk.ca/files/python/crypto/${P/_alpha/a}.tar.gz"
 LICENSE="freedist"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-lang/python"
 
 SLOT="0"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 alpha ~sparc amd64 ppc"
 S="${WORKDIR}/${P/_alpha/a}"
+IUSE=""
 
 mydoc="ACKS ChangeLog LICENSE MANIFEST PKG-INFO README TODO"
diff --git a/dev-python/pycrypto/pycrypto-2.0-r1.ebuild b/dev-python/pycrypto/pycrypto-2.0-r1.ebuild
index ab61fee11e1e..c023ac6298ea 100644
--- a/dev-python/pycrypto/pycrypto-2.0-r1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.0-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0-r1.ebuild,v 1.1 2005/01/25 01:54:54 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
 SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-KEYWORDS="~x86 ~alpha ~sparc ~amd64 ~ppc"
+KEYWORDS="alpha amd64 arm hppa ppc ~sparc x86"
 LICENSE="freedist"
 DEPEND="dev-libs/gmp
 	virtual/python"
diff --git a/dev-python/pycrypto/pycrypto-2.0.1.ebuild b/dev-python/pycrypto/pycrypto-2.0.1.ebuild
index 6d34cae686b5..17218ff4388b 100644
--- a/dev-python/pycrypto/pycrypto-2.0.1.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.0.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1.ebuild,v 1.1 2005/07/19 10:36:01 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
 SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-KEYWORDS="~x86 ~alpha ~sparc ~amd64 ~ppc"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
 LICENSE="freedist"
 DEPEND="virtual/python"
 SLOT="0"
diff --git a/dev-python/pycrypto/pycrypto-2.0.ebuild b/dev-python/pycrypto/pycrypto-2.0.ebuild
index 954d5689dcf3..e0c3061bbba4 100644
--- a/dev-python/pycrypto/pycrypto-2.0.ebuild
+++ b/dev-python/pycrypto/pycrypto-2.0.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/dev-python/pycrypto/pycrypto-2.0.ebuild,v 1.1 2004/08/14 16:23:47 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycrypto/pycrypto-2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python Cryptography Toolkit"
 HOMEPAGE="http://www.amk.ca/python/code/crypto.html"
 SRC_URI="http://www.amk.ca/files/python/crypto/${P}.tar.gz"
-KEYWORDS="~x86 ~alpha ~sparc ~amd64 ~ppc"
+KEYWORDS="~x86 ~alpha ~sparc ~amd64 ppc"
 LICENSE="freedist"
 DEPEND="virtual/python"
 SLOT="0"
diff --git a/dev-python/pycurl/ChangeLog b/dev-python/pycurl/ChangeLog
index 4936ea0a485a..e71ee2dbd3d6 100644
--- a/dev-python/pycurl/ChangeLog
+++ b/dev-python/pycurl/ChangeLog
@@ -1,6 +1,98 @@
-# ChangeLog for net-ftp/pycurl
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.1 2003/06/13 22:21:27 liquidx Exp $
+# ChangeLog for dev-python/pycurl
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+*pycurl-7.15.0 (18 Oct 2005)
+
+  18 Oct 2005; Daniel Black <dragonheart@gentoo.org> +pycurl-7.15.0.ebuild:
+  version bump as instructed in net-misc/curl
+
+  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> pycurl-7.13.2.ebuild:
+  Marked ppc stable.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> pycurl-7.13.2.ebuild:
+  Stable on ppc64
+
+*pycurl-7.14.0 (25 Jun 2005)
+
+  25 Jun 2005; Alastair Tse <liquidx@gentoo.org> -pycurl-7.11.0.ebuild,
+  -pycurl-7.12.ebuild, -pycurl-7.12.3.ebuild, pycurl-7.13.2.ebuild,
+  +pycurl-7.14.0.ebuild:
+  version bump
+
+*pycurl-7.13.2 (05 May 2005)
+
+  05 May 2005; Alastair Tse <liquidx@gentoo.org> +pycurl-7.13.2.ebuild:
+  version bump. remove requirement to stick to exact version of curl.
+
+  10 Mar 2005; Markus Rothe <corsair@gentoo.org> pycurl-7.13.1.ebuild:
+  Stable on ppc64; bug #82534
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> pycurl-7.13.1.ebuild:
+  stable on amd64 wrt to #82534
+
+  09 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> pycurl-7.13.1.ebuild:
+  Stable on ppc.
+
+*pycurl-7.13.1 (08 Mar 2005)
+
+  08 Mar 2005; Alastair Tse <liquidx@gentoo.org> +pycurl-7.13.1.ebuild:
+  version bump
+
+*pycurl-7.12.3 (17 Jan 2005)
+
+  17 Jan 2005; Alastair Tse <liquidx@gentoo.org> +pycurl-7.12.3.ebuild:
+  version bump (#77926)
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> -pycurl-7.10.4.ebuild,
+  pycurl-7.11.0.ebuild, pycurl-7.12.ebuild:
+  Removed version with no corresponding version of curl, changed DEPEND to
+  match exact version of net-misc/curl, marked stable X86
+
+  18 Oct 2004; Tom Martin <slarti@gentoo.org> pycurl-7.12.ebuild:
+  Marked ~amd64, bug 68027.
+
+*pycurl-7.12 (27 Jul 2004)
+
+  27 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +pycurl-7.12.ebuild:
+  Version bump. Added description to metadata.xml. Changed python dependency to
+  virtual/python.
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> pycurl-7.11.0.ebuild:
+  Added to ~ppc.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pycurl-7.10.4.ebuild,
+  pycurl-7.11.0.ebuild:
+  Add missing IUSE.
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> pycurl-7.10.4.ebuild:
+  Updated SRC_URI.
+
+*pycurl-7.11.0 (14 Feb 2004)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> pycurl-0.4.5.ebuild,
+  pycurl-7.10.3.ebuild, pycurl-7.10.6.ebuild, pycurl-7.11.0.ebuild:
+  version bump
+
+  26 Jan 2004; <gustavoz@gentoo.org> pycurl-7.10.4.ebuild:
+  stable on sparc
+
+*pycurl-7.10.8 (13 Nov 2003)
+
+  13 Nov 2003; Alastair Tse <liquidx@gentoo.org> pycurl-7.10.8.ebuild:
+  version bump
+
+*pycurl-7.10.6 (02 Nov 2003)
+
+  02 Nov 2003; Alastair Tse <liquidx@gentoo.org> pycurl-7.10.6.ebuild:
+  version bump
 
 *pycurl-7.10.4 (09 Apr 2003)
 
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 17469fe53d1b..8431be8cb6d0 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,7 +1,20 @@
-MD5 e67c24c63e8ae8e1e79be3c4fefb21cb ChangeLog 1029
-MD5 8be8ff787016b48fe79056d059d14586 pycurl-0.4.5.ebuild 606
-MD5 260e31d04e428d2afd0ec63f77ef6f2d pycurl-7.10.3.ebuild 804
-MD5 fb0b79359b9acf560dc90fc2a6e973a9 pycurl-7.10.4.ebuild 804
-MD5 163a02baffda306a7965e007324b2fb2 files/digest-pycurl-0.4.5 63
-MD5 249d6fc38f60f070566d83bbfa159350 files/digest-pycurl-7.10.3 64
-MD5 e493742a164b22b91b7b552c2620e3c1 files/digest-pycurl-7.10.4 127
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7246539a1efdd6a078b15633f43a454f ChangeLog 3896
+MD5 d88bfd11107d1df30445377db73ca867 files/digest-pycurl-7.13.1 64
+MD5 fa269820c9c11f6b2b632cb56f364902 files/digest-pycurl-7.13.2 64
+MD5 506fd62ffad819edf770382a8c19cadc files/digest-pycurl-7.14.0 64
+MD5 dcb3a8b83809bdc9efee3db755dfb38d files/digest-pycurl-7.15.0 64
+MD5 29c3779a6b75d2d0d489a0569c1491d7 metadata.xml 827
+MD5 cd0919219f2ab75e27ef378fb071a269 pycurl-7.13.1.ebuild 809
+MD5 ec703331188617d5a9b252faae390df2 pycurl-7.13.2.ebuild 809
+MD5 99f0087c8643f11e839bf6576e758b21 pycurl-7.14.0.ebuild 813
+MD5 8c6f4c43867abe9825cc5777a490a02d pycurl-7.15.0.ebuild 817
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwVgFdQwWVoAgN4RAouYAJ9pnTRbaqklZV7c54XbRlj0a7iOOACgp0oc
+ihP0BTbb0TEZYJo2bzNfoVw=
+=EO55
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pycurl/metadata.xml b/dev-python/pycurl/metadata.xml
index de483c53568f..00f707325323 100644
--- a/dev-python/pycurl/metadata.xml
+++ b/dev-python/pycurl/metadata.xml
@@ -2,4 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+PycURL is a Python interface to libcurl. PycURL can be used to fetch
+objects identified by a URL from a Python program, similar to the urllib
+Python module. All the functionality provided by libcurl can used through
+the pycurl interface. 
+</longdescription>
+<longdescription lang="ja">
+PycURLはLibcurlへのパイソン・インターフェイスです。PycURLはPython言語モジュール>の様に、Python言語プログラムからURLで指定されたオブジェクトをダウンロードするに>も使えます。Libcurlで利用できる機能全てはPycURLインターフェイスを通して利用でき>ます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pycurl/pycurl-7.13.1.ebuild b/dev-python/pycurl/pycurl-7.13.1.ebuild
index 7e00584e36b0..9b63e7b41997 100644
--- a/dev-python/pycurl/pycurl-7.13.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.13.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/dev-python/pycurl/pycurl-7.13.1.ebuild,v 1.1 2005/03/08 13:25:09 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.13.1.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/pycurl/pycurl-7.13.2.ebuild b/dev-python/pycurl/pycurl-7.13.2.ebuild
index 6cff76e92e40..6712d303774a 100644
--- a/dev-python/pycurl/pycurl-7.13.2.ebuild
+++ b/dev-python/pycurl/pycurl-7.13.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/dev-python/pycurl/pycurl-7.13.2.ebuild,v 1.1 2005/05/05 07:51:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.13.2.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://pycurl.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/pycurl/pycurl-7.14.0.ebuild b/dev-python/pycurl/pycurl-7.14.0.ebuild
index 7687c867eac1..deb254bfaf3f 100644
--- a/dev-python/pycurl/pycurl-7.14.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.14.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/dev-python/pycurl/pycurl-7.14.0.ebuild,v 1.1 2005/06/25 15:06:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.14.0.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pycurl/pycurl-7.15.0.ebuild b/dev-python/pycurl/pycurl-7.15.0.ebuild
index 608506f83d65..11fd489fb5d7 100644
--- a/dev-python/pycurl/pycurl-7.15.0.ebuild
+++ b/dev-python/pycurl/pycurl-7.15.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/dev-python/pycurl/pycurl-7.15.0.ebuild,v 1.1 2005/10/18 20:09:27 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.15.0.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pydispatcher/ChangeLog b/dev-python/pydispatcher/ChangeLog
index eb42dd386a26..207fda2e8a4c 100644
--- a/dev-python/pydispatcher/ChangeLog
+++ b/dev-python/pydispatcher/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for dev-python/pydispatcher
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pydispatcher/ChangeLog,v 1.1 2004/07/22 06:32:24 pythonhead Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydispatcher/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+  17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> pydispatcher-1.0.1.ebuild:
+  added ~amd64 to KEYWORDS, fixes #89370
+
+*pydispatcher-1.0.1 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +pydispatcher-1.0.1.ebuild:
+  Version bump.
+
+  27 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> :
+  Fixed malformed CVS header
+
+  22 Jul 2004; David Holm <dholm@gentoo.org> pydispatcher-1.0.0.ebuild:
+  Added to ~ppc.
 
 *pydispatcher-1.0.0 (21 Jul 2004)
 
diff --git a/dev-python/pydispatcher/Manifest b/dev-python/pydispatcher/Manifest
index d77fac26e568..2d8c963b5100 100644
--- a/dev-python/pydispatcher/Manifest
+++ b/dev-python/pydispatcher/Manifest
@@ -1,4 +1,16 @@
-MD5 69c12f55309f26a1a94f8d9f920d7a83 pydispatcher-1.0.0.ebuild 656
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 15f9a1840f5f0371073ced3168a3cf08 pydispatcher-1.0.1.ebuild 783
+MD5 7059abb339782b02382d90cce939adbf pydispatcher-1.0.0.ebuild 776
+MD5 e8ab529239f547b2ebc5b028f3c97e81 ChangeLog 854
 MD5 2a86b25b37ee0d26eb5b30ce68fbdd27 metadata.xml 158
-MD5 4bf7360c736cffc80f8fd7c31dffcfb0 ChangeLog 325
 MD5 112d0f90d5bde3dabf675e265f5fb570 files/digest-pydispatcher-1.0.0 69
+MD5 9ddba755ab0b68b0b2bd496694c0fdc8 files/digest-pydispatcher-1.0.1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCYrug06ebR+OMO78RAoh6AJ9TW0WxtRikuBYShiwubnrwdTJOrgCfQwUT
+SzeQl2f7KzHGY7frx01UFoo=
+=XyuQ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pydispatcher/pydispatcher-1.0.0.ebuild b/dev-python/pydispatcher/pydispatcher-1.0.0.ebuild
index 0170da6a0f57..70eaeb32a7a5 100644
--- a/dev-python/pydispatcher/pydispatcher-1.0.0.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-1.0.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/dev-python/pydispatcher/pydispatcher-1.0.0.ebuild,v 1.1 2004/07/22 06:32:24 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydispatcher/pydispatcher-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 DEPEND="virtual/python"
@@ -24,4 +24,4 @@ src_install() {
 	distutils_python_version
 	dohtml -r ${D}/usr/lib/python${PYVER}/site-packages/dispatch/docs/*
 	rm -r ${D}/usr/lib/python${PYVER}/site-packages/dispatch/docs
-}
\ No newline at end of file
+}
diff --git a/dev-python/pydispatcher/pydispatcher-1.0.1.ebuild b/dev-python/pydispatcher/pydispatcher-1.0.1.ebuild
index 37129d26d6cf..6deb0a2fa41c 100644
--- a/dev-python/pydispatcher/pydispatcher-1.0.1.ebuild
+++ b/dev-python/pydispatcher/pydispatcher-1.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/dev-python/pydispatcher/pydispatcher-1.0.1.ebuild,v 1.1 2005/04/14 19:32:58 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pydispatcher/pydispatcher-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 IUSE=""
 DEPEND="virtual/python"
diff --git a/dev-python/pyds/ChangeLog b/dev-python/pyds/ChangeLog
index a399e7154b08..e210ee9934f0 100644
--- a/dev-python/pyds/ChangeLog
+++ b/dev-python/pyds/ChangeLog
@@ -1,9 +1,57 @@
 # ChangeLog for dev-python/pyds
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/ChangeLog,v 1.1 2004/01/03 03:16:10 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> pyds-0.6.5.ebuild:
+  stable on x86
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pyds-0.6.5.ebuild,
+  pyds-0.7.0.ebuild, pyds-0.7.1.ebuild, pyds-0.7.2.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+*pyds-0.7.2 (25 May 2004)
+
+  25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +pyds-0.7.2.ebuild:
+  Version bump, bug #50754.
+
+  01 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyds-0.7.1.ebuild:
+  Corrected soappy dependency, bug #48984.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pyds-0.7.1.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Alastair Tse <liquidx@gentoo.org> pyds-0.6.5.ebuild,
+  pyds-0.7.0.ebuild, pyds-0.7.1.ebuild:
+  fix license (#48982)
+
+  18 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> pyds-0.7.0.ebuild:
+  need all stable deps before marking stable for x86
+
+  18 Apr 2004; David Holm <dholm@gentoo.org> pyds-0.7.1.ebuild:
+  Added to ~ppc.
+
+*pyds-0.7.1 (17 Apr 2004)
+
+  17 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pyds-0.7.0.ebuild,
+  +pyds-0.7.1.ebuild:
+  Version bump.
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> pyds-0.7.0.ebuild:
+  also add patch to 0.7.0
+
+*pyds-0.7.0 (14 Feb 2004)
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> pyds-0.7.0.ebuild:
+  version bump. also add patch (#41254) thanks to <jerf jerf.org>
+
+  18 Jan 2004; Alastair Tse <liquidx@gentoo.org> pyds-0.6.5.ebuild:
+  moving dev-python/Cheetah to dev-python/cheetah
 
 *pyds-0.6.5 (03 Jan 2004)
 
-  03 Jan 2004; Bryan �stergaard,,, <kloeri@gentoo.org> pyds-0.6.5.ebuild:
+  03 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pyds-0.6.5.ebuild:
   Initial import
 
diff --git a/dev-python/pyds/Manifest b/dev-python/pyds/Manifest
index 4533a73c862e..60e48c8be651 100644
--- a/dev-python/pyds/Manifest
+++ b/dev-python/pyds/Manifest
@@ -1,2 +1,21 @@
-MD5 7acfc1f9856530454c3423cfb5dc7fce pyds-0.6.5.ebuild 648
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0c7c6390bae7fead4003c9fcdabf4191 ChangeLog 1894
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 60f0da64665b53aa180e2816603be39f pyds-0.6.5.ebuild 820
+MD5 4ce1e48988b3f476e8c1bdd45c11286d pyds-0.7.0.ebuild 828
+MD5 2395d57c877d3fcc6ae509854164dbd2 pyds-0.7.1.ebuild 833
+MD5 4b6523a78f5b84ad963901fa0f620061 pyds-0.7.2.ebuild 833
 MD5 0cfd4d73a24797f841459714fb787030 files/digest-pyds-0.6.5 62
+MD5 3a582b6b5901641f1a0165b05c3fc78b files/digest-pyds-0.7.0 62
+MD5 57698d6235f4518eb671a92a0970adcc files/digest-pyds-0.7.1 62
+MD5 1b935abc4d9b1f3bd63a03cdec82da05 files/digest-pyds-0.7.2 62
+MD5 94e7c2cab795b8d9754f8f58efe71178 files/pyds-0.6.5-py2.3.patch 614
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCBvWyxtZcznfol0URAje/AJ9UnmxmG3ZGVIVX4rglVWgQvwfcPwCg0Ma+
+P9fhKwBPHyArzzcoW3RLrck=
+=naj1
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyds/pyds-0.6.5.ebuild b/dev-python/pyds/pyds-0.6.5.ebuild
index fbed58ce3745..038c7b236279 100644
--- a/dev-python/pyds/pyds-0.6.5.ebuild
+++ b/dev-python/pyds/pyds-0.6.5.ebuild
@@ -1,8 +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/dev-python/pyds/pyds-0.6.5.ebuild,v 1.1 2004/01/03 03:16:10 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/pyds-0.6.5.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="PyDS-${PV}"
 
@@ -10,9 +10,9 @@ DESCRIPTION="Python Desktop Server"
 HOMEPAGE="http://pyds.muensterland.org/"
 SRC_URI="http://simon.bofh.ms/~gb/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
 SLOT="0"
-LICENSE="GPL-2"
+KEYWORDS="x86"
+LICENSE="MIT"
 IUSE=""
 
 RDEPEND="media-libs/jpeg
@@ -20,11 +20,17 @@ RDEPEND="media-libs/jpeg
 	>=dev-lang/python-2.2.2
 	>=dev-python/medusa-0.5.4
 	>=dev-db/metakit-2.4.9.2
-	>=dev-python/Cheetah-0.9.15
+	>=dev-python/cheetah-0.9.15
 	>=dev-python/pyxml-0.8.2
 	>=dev-python/pyrex-0.5
 	>=dev-python/docutils-0.3
-	>=dev-python/Imaging-1.1.3
+	>=dev-python/imaging-1.1.3
 	>=dev-python/soappy-0.10.1"
 
 S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/PyDS
+	epatch ${FILESDIR}/${P}-py2.3.patch
+}
diff --git a/dev-python/pyds/pyds-0.7.0.ebuild b/dev-python/pyds/pyds-0.7.0.ebuild
index b40e6731bcb5..ed58315dd4d6 100644
--- a/dev-python/pyds/pyds-0.7.0.ebuild
+++ b/dev-python/pyds/pyds-0.7.0.ebuild
@@ -1,8 +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/dev-python/pyds/pyds-0.7.0.ebuild,v 1.1 2004/02/14 12:57:15 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/pyds-0.7.0.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="PyDS-${PV}"
 
@@ -10,9 +10,9 @@ DESCRIPTION="Python Desktop Server"
 HOMEPAGE="http://pyds.muensterland.org/"
 SRC_URI="http://simon.bofh.ms/~gb/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
 SLOT="0"
-LICENSE="GPL-2"
+KEYWORDS="~x86"
+LICENSE="MIT"
 IUSE=""
 
 RDEPEND="media-libs/jpeg
@@ -24,7 +24,13 @@ RDEPEND="media-libs/jpeg
 	>=dev-python/pyxml-0.8.2
 	>=dev-python/pyrex-0.5
 	>=dev-python/docutils-0.3
-	>=dev-python/Imaging-1.1.3
+	>=dev-python/imaging-1.1.3
 	>=dev-python/soappy-0.10.1"
 
 S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/PyDS
+	epatch ${FILESDIR}/${PN}-0.6.5-py2.3.patch
+}
diff --git a/dev-python/pyds/pyds-0.7.1.ebuild b/dev-python/pyds/pyds-0.7.1.ebuild
index cf0e1a55fc24..be94dd67e568 100644
--- a/dev-python/pyds/pyds-0.7.1.ebuild
+++ b/dev-python/pyds/pyds-0.7.1.ebuild
@@ -1,8 +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/dev-python/pyds/pyds-0.7.1.ebuild,v 1.1 2004/04/17 12:02:58 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/pyds-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
 MY_P="PyDS-${PV}"
 
@@ -10,9 +10,9 @@ DESCRIPTION="Python Desktop Server"
 HOMEPAGE="http://pyds.muensterland.org/"
 SRC_URI="http://simon.bofh.ms/~gb/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
-LICENSE="GPL-2"
+LICENSE="MIT"
 IUSE=""
 
 RDEPEND="media-libs/jpeg
@@ -24,8 +24,8 @@ RDEPEND="media-libs/jpeg
 	>=dev-python/pyxml-0.8.2
 	>=dev-python/pyrex-0.5
 	>=dev-python/docutils-0.3
-	>=dev-python/Imaging-1.1.3
-	>=dev-python/soappy-0.10.1"
+	>=dev-python/imaging-1.1.3
+	>=dev-python/soappy-0.11.1"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/pyds/pyds-0.7.2.ebuild b/dev-python/pyds/pyds-0.7.2.ebuild
index 58c8c09222f9..a4e805ad2831 100644
--- a/dev-python/pyds/pyds-0.7.2.ebuild
+++ b/dev-python/pyds/pyds-0.7.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/dev-python/pyds/pyds-0.7.2.ebuild,v 1.1 2004/05/25 08:55:06 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyds/pyds-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -24,7 +24,7 @@ RDEPEND="media-libs/jpeg
 	>=dev-python/pyxml-0.8.2
 	>=dev-python/pyrex-0.5
 	>=dev-python/docutils-0.3
-	>=dev-python/Imaging-1.1.3
+	>=dev-python/imaging-1.1.3
 	>=dev-python/soappy-0.11.1"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyframer/ChangeLog b/dev-python/pyframer/ChangeLog
index ec9086bfba2c..a6db6ace0854 100644
--- a/dev-python/pyframer/ChangeLog
+++ b/dev-python/pyframer/ChangeLog
@@ -1,7 +1,22 @@
-# ChangeLog for dev-lang/sather
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyframer/ChangeLog,v 1.1 2002/12/05 16:31:45 lordvan Exp $
+# ChangeLog for dev-python/pyframer
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyframer/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyframer-0.2.ebuild:
+  Add missing IUSE.
+
+*pyframer-0.2 (12 Dec 2002)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pyframer-0.1.ebuild,
+  pyframer-0.1.ebuild, pyframer-0.2.ebuild:
+  stable bump
+
+  12 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org> pyframer-0.2.ebuild
+  new version
+	
 *pyframer-0.1 (05 Dec 2002)
 
   05 Dec 2002; T.Raschbacher <lordvan@gentoo.org> pyframer-0.1.ebuild
diff --git a/dev-python/pyframer/Manifest b/dev-python/pyframer/Manifest
index 88562883fe87..f414b308f632 100644
--- a/dev-python/pyframer/Manifest
+++ b/dev-python/pyframer/Manifest
@@ -1,3 +1,4 @@
-MD5 02a9dade60bf19c30e789cd90210d3dc ChangeLog 586
-MD5 3e528f4bffe19ccee2098a1601d68a4f pyframer-0.2.ebuild 597
+MD5 4751e89020dcf42b16e8ea654bf7aba9 ChangeLog 777
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 082f4f5fcfa5fdc4a93d778d1e71fb7b pyframer-0.2.ebuild 537
 MD5 8d394c267868a5cf2302311301a8b0aa files/digest-pyframer-0.2 63
diff --git a/dev-python/pyframer/pyframer-0.2.ebuild b/dev-python/pyframer/pyframer-0.2.ebuild
index 930181f0f92a..c4efadcc6053 100644
--- a/dev-python/pyframer/pyframer-0.2.ebuild
+++ b/dev-python/pyframer/pyframer-0.2.ebuild
@@ -1,23 +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/dev-python/pyframer/pyframer-0.2.ebuild,v 1.1 2002/12/12 14:03:25 lordvan Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyframer/pyframer-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+inherit distutils
 
-IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="Python interface for framerd"
-SRC_URI="http://twistedmatrix.com/users/washort/pyframer/${P}.tar.gz"
 HOMEPAGE="http://twistedmatrix.com/users/washort/pyframer/"
+SRC_URI="http://twistedmatrix.com/users/washort/pyframer/${P}.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-RDEPEND="virtual/python
-	>=dev-db/framerd-2.4.3"
-DEPEND="$RDEPEND"
-KEYWORDS="~x86"
-
-inherit distutils
+KEYWORDS="x86"
+IUSE=""
 
-src_install() {
-    distutils_src_install
-    dodoc README.txt
-}
+DEPEND="virtual/python
+	>=dev-db/framerd-2.4.3"
 
+DOCS="README.txt"
diff --git a/dev-python/pygame/ChangeLog b/dev-python/pygame/ChangeLog
index 4f758822b964..44d69cbd2783 100644
--- a/dev-python/pygame/ChangeLog
+++ b/dev-python/pygame/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for dev-python/pygame
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/ChangeLog,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pygame-1.7.1.ebuild:
+  add ~ia64
+
+*pygame-1.7.1 (21 Aug 2005)
+
+  21 Aug 2005; Fernando Serboncini <fserb@gentoo.org>
+  -files/mixer.c-pause.patch, -files/music.c-pause.patch,
+  +pygame-1.7.1.ebuild:
+  Version bump
+
+  15 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> pygame-1.6.2.ebuild:
+  Stable on hppa.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pygame-1.6.2.ebuild:
+  Stable on alpha.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> pygame-1.6.2.ebuild:
+  Stable on ppc.
+
+  16 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> pygame-1.6.2.ebuild:
+  Stable on sparc
+
+  15 Jun 2005; Rob Cakebread <pythonhead@gentoo.org> pygame-1.6.2.ebuild:
+  Marked x86
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> pygame-1.5.3.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*pygame-1.6.2 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> +pygame-1.6.2.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  02 Jun 2004; David Holm <dholm@gentoo.org> pygame-1.6.ebuild:
+  Added to ~ppc, again.
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> pygame-1.5.3.ebuild,
+  pygame-1.6.ebuild:
+  Add missing IUSE, remove default S.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pygame-1.5.5.ebuild:
+  Remove default S.
+
+  30 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> pygame-1.6.ebuild:
+  Adding amd64 keyword, closing #46025.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> pygame-1.6.ebuild:
+  Stable on sparc.
+
+*pygame-1.6 (13 Dec 2003)
+
+  13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> pygame-1.6.ebuild:
+  Bumped version.
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> pygame-1.5.3.ebuild,
+  pygame-1.5.5.ebuild, pygame-1.5.6.ebuild:
+  moved dev-python/Numeric to dev-python/numeric
+
+*pygame-1.5.6 (11 Jun 2003)
+
+  11 Jun 2003; Graham Forest <vladimir@gentoo.org> Manifest,
+  pygame-1.5.6.ebuild:
+  Version bump
+
+*pygame-1.5.5 (04 Mar 2003)
+
+  26 Mar 2003; Alastair Tse <liquidx@gentoo.org> pygame-1.5.5.ebuild:
+  bump to stable
+
+  04 Mar 2003; Alastair Tse <liquidx@gentoo.org> pygame-1.5.5.ebuild files/digest-pygame-1.5.5 :
+  version bump. resolves #13415.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pygame-1.5.3 (4 Sep 2002)
+  
+  4 Sep 2002; Jon Nelson <jnelson@gentoo.org> pygame-1.5.3.ebuild, ChangeLog
+  New upstream fixes some licensing issues and closes some bugs
+  
+*pygame-1.5 (30 May 2002)
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> pygame-1.2.ebuild, pygame-1.4.ebuild, pygame-1.4.9.ebuild, pygame-1.5.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE
+
+  30 May 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog pygame-1.5.ebuild:
+  
+  New upstream
+  
+*pygame-1.4.9 (25 May 2002)
+
+  25 May 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog pygame-1.4.9.ebuild
+  
+  New upstream
+  Closes bug #2855
+  Took headers out of ebuild and placed here:
+  Original Author: David Creswick <davidc@sat.net>
+
+*pygame-1.4 (28 Apr 2002)
+
+  28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog pygame-1.4.ebuild
+  
+  New upstream
+  ebuild should build properly - next version won't need the patches,
+    CVS pygame already has them fixed.
+  Closes bug 1865  
 
 *pygame-1.2 (1 Feb 2002)
 
diff --git a/dev-python/pygame/Manifest b/dev-python/pygame/Manifest
index e69de29bb2d1..b558f9a2079b 100644
--- a/dev-python/pygame/Manifest
+++ b/dev-python/pygame/Manifest
@@ -0,0 +1,14 @@
+MD5 0c878f997edf727d1fc36fb4cf580575 pygame-1.6.ebuild 891
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 26d0c50dc92b5306c950bdf8d1924622 pygame-1.6.2.ebuild 896
+MD5 ec819b25bb0cce3af00fc23e5a6ca1a0 ChangeLog 3961
+MD5 9a363118bb4e12fd718443bec704da06 pygame-1.5.5.ebuild 880
+MD5 20bae1e31604ababe3f777ce5d7f68e2 pygame-1.7.1.ebuild 988
+MD5 1e6ea111c9e32afb259d75b6b136ff09 pygame-1.5.6.ebuild 888
+MD5 12c821610bf4c843dc08b83a870782dd pygame-1.5.3.ebuild 830
+MD5 9f93b8b80ed5e7919c6e718c08c74b2b files/digest-pygame-1.6.2 66
+MD5 bcc21545f0d3a09c4bf9beb344d39535 files/digest-pygame-1.5.3 64
+MD5 45f0f41f844c4bb4e9dc4e5a786988ba files/digest-pygame-1.6 62
+MD5 a0a1443e65c63b895d64a478953de7c7 files/digest-pygame-1.5.5 64
+MD5 d1c30894515e75913caea764cf381ea3 files/digest-pygame-1.7.1 72
+MD5 cfc28c49f2b91b67623bee4ba4bdb54e files/digest-pygame-1.5.6 64
diff --git a/dev-python/pygame/pygame-1.5.3.ebuild b/dev-python/pygame/pygame-1.5.3.ebuild
index 32137afd9816..3bb6559418d2 100644
--- a/dev-python/pygame/pygame-1.5.3.ebuild
+++ b/dev-python/pygame/pygame-1.5.3.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.5.3.ebuild,v 1.1 2002/09/04 15:25:26 jnelson Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.5.3.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
 SRC_URI="http://www.pygame.org/ftp/${P}.tar.gz"
 HOMEPAGE="http://www.pygame.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 sparc sparc64"
+KEYWORDS="x86 sparc alpha"
+IUSE=""
 
 DEPEND="virtual/python
 	>=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-ttf-2.0.5
 	>=media-libs/sdl-image-1.2.0
 	>=media-libs/sdl-mixer-1.2.3
-	>=dev-python/Numeric-21.0.0
+	>=dev-python/numeric-21.0
 	>=media-libs/smpeg-0.4.4-r1"
-RDEPEND="${DEPEND}"
-
-inherit distutils
 
 src_install () {
 	mydoc=WHATSNEW
 	distutils_src_install
-        
+
 	dohtml -r docs/*
 	dodir /usr/share/doc/${PF}/examples
 	cp -r ${S}/examples ${D}usr/share/doc/${PF}/
diff --git a/dev-python/pygame/pygame-1.5.5.ebuild b/dev-python/pygame/pygame-1.5.5.ebuild
index 32578a99bbe7..8e297818ecb8 100644
--- a/dev-python/pygame/pygame-1.5.5.ebuild
+++ b/dev-python/pygame/pygame-1.5.5.ebuild
@@ -1,8 +1,9 @@
-# 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/dev-python/pygame/pygame-1.5.5.ebuild,v 1.1 2003/03/04 13:06:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.5.5.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
 SRC_URI="http://www.pygame.org/ftp/${P}.tar.gz"
 HOMEPAGE="http://www.pygame.org/"
@@ -10,24 +11,24 @@ HOMEPAGE="http://www.pygame.org/"
 IUSE=""
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 ~sparc ~alpha"
 
 DEPEND="virtual/python
 	>=media-libs/libsdl-1.2.5
 	>=media-libs/sdl-ttf-2.0.5
 	>=media-libs/sdl-image-1.2.2
 	>=media-libs/sdl-mixer-1.2.4
-	>=dev-python/Numeric-22.0.0
+	>=dev-python/numeric-22.0
 	>=media-libs/smpeg-0.4.4-r1"
 
-inherit distutils
-
 src_install () {
 	mydoc=WHATSNEW
 	distutils_src_install
-        
+
 	dohtml -r docs/*
-	dodir /usr/share/doc/${PF}/examples
-	cp -r ${S}/examples ${D}usr/share/doc/${PF}/
+	insinto /usr/share/doc/${PF}/examples
+	doins ${S}/examples/*
+	insinto /usr/share/doc/${PF}/examples/data
+	doins ${S}/examples/data/*
 }
 
diff --git a/dev-python/pygame/pygame-1.5.6.ebuild b/dev-python/pygame/pygame-1.5.6.ebuild
index d4354e1bd61c..24a642b1f21c 100644
--- a/dev-python/pygame/pygame-1.5.6.ebuild
+++ b/dev-python/pygame/pygame-1.5.6.ebuild
@@ -1,8 +1,9 @@
-# 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/dev-python/pygame/pygame-1.5.6.ebuild,v 1.1 2003/06/11 07:00:43 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.5.6.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
+
+inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
 SRC_URI="http://www.pygame.org/ftp/${P}.tar.gz"
 HOMEPAGE="http://www.pygame.org/"
@@ -10,22 +11,21 @@ HOMEPAGE="http://www.pygame.org/"
 IUSE=""
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~alpha"
+KEYWORDS="~ppc x86 ~sparc ~alpha"
 
 DEPEND="virtual/python
 	>=media-libs/libsdl-1.2.5
 	>=media-libs/sdl-ttf-2.0.6
 	>=media-libs/sdl-image-1.2.2
 	>=media-libs/sdl-mixer-1.2.4
-	>=dev-python/Numeric-22.0*
+	>=dev-python/numeric-22.0
 	>=media-libs/smpeg-0.4.4-r1"
 
-inherit distutils
 
 src_install () {
 	mydoc=WHATSNEW
 	distutils_src_install
-        
+
 	dohtml -r docs/*
 	insinto /usr/share/doc/${PF}/examples
 	doins ${S}/examples/*
diff --git a/dev-python/pygame/pygame-1.6.2.ebuild b/dev-python/pygame/pygame-1.6.2.ebuild
index 4f0e23eb2d9a..df9ee3916c39 100644
--- a/dev-python/pygame/pygame-1.6.2.ebuild
+++ b/dev-python/pygame/pygame-1.6.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/dev-python/pygame/pygame-1.6.2.ebuild,v 1.1 2005/04/14 18:41:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.6.2.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.pygame.org/ftp/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+KEYWORDS="alpha ~amd64 hppa ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/pygame/pygame-1.6.ebuild b/dev-python/pygame/pygame-1.6.ebuild
index 12ffcbed20a8..49228ca2549d 100644
--- a/dev-python/pygame/pygame-1.6.ebuild
+++ b/dev-python/pygame/pygame-1.6.ebuild
@@ -1,17 +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/dev-python/pygame/pygame-1.6.ebuild,v 1.1 2003/12/13 06:57:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.6.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="python bindings to sdl and other libs that facilitate game production"
-SRC_URI="http://www.pygame.org/ftp/${P}.tar.gz"
 HOMEPAGE="http://www.pygame.org/"
+SRC_URI="http://www.pygame.org/ftp/${P}.tar.gz"
 
-IUSE=""
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
+IUSE=""
 
 DEPEND="virtual/python
 	>=media-libs/libsdl-1.2.5
@@ -21,8 +21,7 @@ DEPEND="virtual/python
 	>=dev-python/numeric-22.0
 	>=media-libs/smpeg-0.4.4-r1"
 
-
-src_install () {
+src_install() {
 	mydoc=WHATSNEW
 	distutils_src_install
 
@@ -32,4 +31,3 @@ src_install () {
 	insinto /usr/share/doc/${PF}/examples/data
 	doins ${S}/examples/data/*
 }
-
diff --git a/dev-python/pygame/pygame-1.7.1.ebuild b/dev-python/pygame/pygame-1.7.1.ebuild
index 3196150ce655..7f0d6e8e7035 100644
--- a/dev-python/pygame/pygame-1.7.1.ebuild
+++ b/dev-python/pygame/pygame-1.7.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/dev-python/pygame/pygame-1.7.1.ebuild,v 1.1 2005/08/21 17:23:00 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygame/pygame-1.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:02 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.pygame.org/ftp/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/python
diff --git a/dev-python/pygoogle/ChangeLog b/dev-python/pygoogle/ChangeLog
index 93b3a4b04092..ae8e596a7f21 100644
--- a/dev-python/pygoogle/ChangeLog
+++ b/dev-python/pygoogle/ChangeLog
@@ -1,9 +1,50 @@
 # ChangeLog for dev-python/pygoogle
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/ChangeLog,v 1.1 2003/03/02 18:15:43 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/ChangeLog,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  02 Jul 2005; Fernando Serboncini <fserb@gentoo.org>
+  -pygoogle-0.5.2.ebuild, pygoogle-0.6.ebuild:
+  Added SOAPpy dependency. Closes #96326.
+  Removed old 0.5.2 version.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> pygoogle-0.6.ebuild:
+  added ~amd64
+
+  09 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> pygoogle-0.6.ebuild:
+  Unstable ppc-macos
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> pygoogle-0.5.2.ebuild:
+  depend on app-arch/unzip
+
+*pygoogle-0.6 (30 Oct 2004)
+
+  30 Oct 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +pygoogle-0.6.ebuild:
+  Version bump. Added commands to install documentation and added description
+  to metadata.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pygoogle-0.5.3.ebuild:
+  Remove default S.
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> pygoogle-0.5.3.ebuild:
+  updated SRC_URI and HOMEPAGE
+
+*pygoogle-0.5.3 (09 Sep 2003)
+
+  09 Sep 2003; Alastair Tse <liquidx@gentoo.org> pygoogle-0.5.3.ebuild:
+  version bump
 
 *pygoogle-0.5.2 (02 Mar 2003)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pygoogle-0.5.2.ebuild:
+  bump to stable
+
   02 Mar 2003; Alastair Tse <liquidx@gentoo.org> pygoogle-0.5.2.ebuild files/digest-pygoogle-0.5.2 :
   Initial Ebuild. Bug #11925.
 
diff --git a/dev-python/pygoogle/Manifest b/dev-python/pygoogle/Manifest
index e69de29bb2d1..93ba38a68cda 100644
--- a/dev-python/pygoogle/Manifest
+++ b/dev-python/pygoogle/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d69aae395df83a2764d2b30ca4fdb7b6 ChangeLog 1695
+MD5 aa353cf606bfde1768c1a901945db39a files/digest-pygoogle-0.5.3 65
+MD5 71ede93ad8ae366e1dbf32e8158f7589 files/digest-pygoogle-0.6 63
+MD5 8819182e46fa9001833ab09264c0fa41 metadata.xml 640
+MD5 126ffe69e1feb6b303fb84799d4cd531 pygoogle-0.5.3.ebuild 468
+MD5 b2095060114d07b3a85e56836cb41895 pygoogle-0.6.ebuild 604
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwW0FdQwWVoAgN4RAjEwAJ91Wn3lIYL73RZIuW8kQhWkZx35YgCfZT9A
+7VHyF4SR/QbshXI4vTJoKHM=
+=VOMC
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygoogle/files/digest-pygoogle-0.5.3 b/dev-python/pygoogle/files/digest-pygoogle-0.5.3
index 67bb5379d959..db28ddfdea5c 100644
--- a/dev-python/pygoogle/files/digest-pygoogle-0.5.3
+++ b/dev-python/pygoogle/files/digest-pygoogle-0.5.3
@@ -1 +1 @@
-MD5 e2c6d051aa9908eb7fdffca40a4cb692 pygoogle-0.5.3.zip 35862
+MD5 24c7aac779b59386e1b8cbf8b022516a pygoogle-0.5.3.tar.gz 33590
diff --git a/dev-python/pygoogle/metadata.xml b/dev-python/pygoogle/metadata.xml
index de483c53568f..c01704a779b6 100644
--- a/dev-python/pygoogle/metadata.xml
+++ b/dev-python/pygoogle/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+A Python wrapper for the Google web API. Allows you to do Google searches,
+retrieve pages from the Google cache, and ask Google for spelling suggestions.
+</longdescription>
+<longdescription lang="ja">
+GoogleのウェブAPIのパイソン・ラッパーです。グーグル・サーチ、グーグル・キャッシ>ュからのページ検索、スペリング・サジェスチョンをGoogleに尋ねる事をあなたに許可し
+ます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pygoogle/pygoogle-0.5.3.ebuild b/dev-python/pygoogle/pygoogle-0.5.3.ebuild
index d46461c094cf..bd3886c23aa3 100644
--- a/dev-python/pygoogle/pygoogle-0.5.3.ebuild
+++ b/dev-python/pygoogle/pygoogle-0.5.3.ebuild
@@ -1,17 +1,16 @@
-# 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/dev-python/pygoogle/pygoogle-0.5.3.ebuild,v 1.1 2003/09/09 17:08:39 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/pygoogle-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A Python wrapper for the Google web API"
-SRC_URI="http://diveintomark.org/projects/${PN}/${P}.zip"
-HOMEPAGE="http://diveintomark.org/projects/pygoogle/"
+SRC_URI="mirror://sourceforge/pygoogle/${P}.tar.gz"
+HOMEPAGE="http://pygoogle.sourceforge.net/"
 
 IUSE=""
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/python"
diff --git a/dev-python/pygoogle/pygoogle-0.6.ebuild b/dev-python/pygoogle/pygoogle-0.6.ebuild
index 8480caf38c9b..03d20d865612 100644
--- a/dev-python/pygoogle/pygoogle-0.6.ebuild
+++ b/dev-python/pygoogle/pygoogle-0.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/dev-python/pygoogle/pygoogle-0.6.ebuild,v 1.1 2004/10/30 14:24:33 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygoogle/pygoogle-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -11,9 +11,10 @@ HOMEPAGE="http://pygoogle.sourceforge.net/"
 IUSE=""
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc-macos ~amd64"
 
-DEPEND="virtual/python"
+DEPEND="virtual/python
+	>=dev-python/soappy-0.11.3"
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/pygtk/ChangeLog b/dev-python/pygtk/ChangeLog
index cef1bea04cc1..6b17f126d68d 100644
--- a/dev-python/pygtk/ChangeLog
+++ b/dev-python/pygtk/ChangeLog
@@ -1,6 +1,361 @@
 # ChangeLog for dev-python/pygtk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/ChangeLog,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.8.2.ebuild:
+  ~ia64 keyword.
+
+*pygtk-2.8.2 (29 Oct 2005)
+
+  29 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> +pygtk-2.8.2.ebuild:
+  new version, #109385
+
+  20 Oct 2005; Tom Gall <tgall@gentoo.org> pygtk-2.8.0-r2:
+  added ~ppc64, bug #108808
+
+*pygtk-2.8.0-r2 (15 Oct 2005)
+
+  15 Oct 2005; John N. Laliberte <allanonjl@gentoo.org>
+  +pygtk-2.8.0-r2.ebuild:
+  remove gnome useflag for libglade, fixes #103056
+
+  14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> pygtk-2.8.0.ebuild:
+  make pycairo >=0.9.0 due to bug #107331
+
+  11 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> pygtk-2.8.0.ebuild:
+  remove support for alpha, arm, hppa, ia64, mips, ppc64, filed bugs.
+
+  03 Oct 2005; Hardave Riar <hardave@gentoo.org> pygtk-2.6.1.ebuild:
+  Stable on mips.
+
+*pygtk-2.8.0 (12 Sep 2005)
+
+  12 Sep 2005; John N. Laliberte <allanonjl@gentoo.org> -pygtk-2.7.4.ebuild,
+  +pygtk-2.8.0.ebuild:
+  2.12 release vbump, fix where gtk-docs get installed #105511, thanks to Ed
+  Catmur.
+
+*pygtk-2.7.4 (26 Aug 2005)
+
+  26 Aug 2005; John N. Laliberte <allanonjl@gentoo.org> +pygtk-2.7.4.ebuild:
+  new version
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> pygtk-2.6.1.ebuild:
+  stable on ia64
+
+  01 Aug 2005; Simon Stelling <blubb@gentoo.org> pygtk-2.6.1.ebuild:
+  stable on amd64
+
+  26 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.6.1.ebuild:
+  Stable on alpha.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> pygtk-2.6.1.ebuild:
+  Stable on ppc64
+
+*pygtk-2.6.2 (19 Jul 2005)
+
+  19 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.6.2.ebuild:
+  Version bump.
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> pygtk-2.6.1.ebuild:
+  Stable on sparc
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org> pygtk-2.6.1.ebuild:
+  ppc stable
+
+  16 Jul 2005; John N. Laliberte <allanonjl@gentoo.org> pygtk-2.6.1.ebuild:
+  marking 2.6.1 stable on x86
+
+  11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> pygtk-2.4.1.ebuild,
+  pygtk-2.6.1.ebuild:
+  added mips keywords to satisfy gnome repoman deps
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> pygtk-2.4.1.ebuild,
+  pygtk-2.6.0.ebuild, pygtk-2.6.1.ebuild:
+  Stable on ppc64/added ~ppc64 to KEYWORDS
+
+*pygtk-2.6.1 (16 Mar 2005)
+
+  16 Mar 2005; Alastair Tse <liquidx@gentoo.org> +pygtk-2.6.1.ebuild:
+  version bump
+
+  15 Mar 2005; Alastair Tse <liquidx@gentoo.org> pygtk-2.4.1.ebuild,
+  pygtk-2.6.0.ebuild:
+  more multilib fixes
+
+  08 Mar 2005; Alastair Tse <liquidx@gentoo.org> pygtk-2.6.0.ebuild:
+  add python numeric dep
+
+*pygtk-2.6.0 (08 Mar 2005)
+
+  08 Mar 2005; Alastair Tse <liquidx@gentoo.org> -pygtk-2.4.0.ebuild,
+  +pygtk-2.6.0.ebuild:
+  version bump, now requires gtk+-2.6. fix get_libdir in pkg_postinst and
+  pkg_postrm. (#76791)
+
+  26 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> pygtk-2.4.1.ebuild:
+  Multilib fixes.
+
+  04 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.4.1.ebuild:
+  Stable on alpha.
+
+  26 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org> -pygtk-2.3.92.ebuild,
+  -pygtk-2.3.93.ebuild, -pygtk-2.3.94.ebuild, -pygtk-2.3.96.ebuild,
+  -pygtk-2.3.97.ebuild:
+  Removed old unstable branch.
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> pygtk-2.4.1.ebuild:
+  Added missing digest entries. Added missing parentheses in SRC_URI.
+
+  08 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.4.1.ebuild:
+  Add doc USE flag, patch by Fernando Serboncini in bug 75308.
+
+  03 Jan 2005; Joseph Jezak <josejx@gentoo.org> pygtk-2.4.1.ebuild:
+  Marked ppc stable for bug #74333.
+
+  22 Dec 2004; Dylan Carlson <absinthe@gentoo.org> pygtk-2.4.1.ebuild:
+  Stable on amd64, bug 74333.
+
+  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> pygtk-2.4.1.ebuild:
+  Stable on sparc
+
+  22 Dec 2004; Lukasz Strzygowski <lucass@gentoo.org> pygtk-2.4.0.ebuild,
+  pygtk-2.4.1.ebuild:
+  Marked stable on x86.
+
+*pygtk-2.4.1 (05 Nov 2004)
+
+  05 Nov 2004; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.4.1.ebuild:
+  Version bump.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> pygtk-2.2.0.ebuild:
+  stable on amd64.
+
+  12 Oct 2004; Guy Martin <gmsoft@gentoo.org> pygtk-2.2.0.ebuild:
+  Stable on hppa.
+
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.2.0.ebuild:
+  Stable on alpha.
+
+*pygtk-2.4.0 (03 Oct 2004)
+
+  03 Oct 2004; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.4.0.ebuild:
+  Version bump. Updated dependencies.
+
+*pygtk-2.3.97 (28 Sep 2004)
+
+  28 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.3.97.ebuild:
+  Version bump.
+
+  30 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> pygtk-2.2.0.ebuild:
+  Stable on sparc
+
+*pygtk-2.3.96 (24 Aug 2004)
+
+  24 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.3.96.ebuild:
+  Version bump.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.2.0.ebuild:
+  Stable on x86.
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> pygtk-2.2.0.ebuild:
+  stable on ppc64, bug #57015
+
+*pygtk-2.3.94 (29 Jul 2004)
+
+  29 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.3.94.ebuild:
+  Version bump.
+
+*pygtk-2.3.93 (25 Jul 2004)
+
+  25 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> +pygtk-2.3.93.ebuild:
+  Version bump. Now it install also examples. Added src_test.
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pygtk-0.6.11-r1.ebuild,
+  pygtk-1.99.13-r1.ebuild, pygtk-2.0.0-r1.ebuild, pygtk-2.0.0.ebuild,
+  pygtk-2.2.0.ebuild, pygtk-2.3.92.ebuild:
+  dev-python/PyOpenGL is now dev-python/pyopengl - adjust dependencies
+  accordingly.
+
+*pygtk-2.3.92 (10 Jul 2004)
+
+  10 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  pygtk-0.6.11-r1.ebuild, pygtk-2.0.0.ebuild, pygtk-2.2.0.ebuild, pygtk-0.6.11.ebuild,
+  pygtk-1.99.13-r1.ebuild, pygtk-2.0.0-r1.ebuild, pygtk-2.3.92.ebuild:
+  Added and hardmasked ebuild for 2.3.92 (unstable branch). Added
+  long description to metadata.xml. Updated homepage's url to http://www.pygtk.org/.
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pygtk-2.0.0-r1.ebuild:
+  Stable on alpha.
+
+  13 May 2004; Stephen P. Becker <geoman@gentoo.org> pygtk-2.0.0-r1.ebuild:
+  Stable on mips.
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> pygtk-0.6.11.ebuild,
+  pygtk-1.99.13-r1.ebuild:
+  Add missing IUSE.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> pygtk-0.6.11-r1.ebuild:
+  Add die following econf for bug 48950
+
+  18 Apr 2004; Guy Martin <gmsoft@gentoo.org> pygtk-2.0.0-r1.ebuild,
+  pygtk-2.2.0.ebuild:
+  Marked stable on hppa.
+
+  10 Apr 2004; Alastair Tse <liquidx@gentoo.org> pygtk-2.0.0-r1.ebuild,
+  pygtk-2.2.0.ebuild:
+  restrict parallel builds (#45776)
+
+  16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> pygtk-2.0.0-r1.ebuild:
+  Added ~mips keyword.
+
+  12 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> pygtk-2.0.0-r1.ebuild:
+  stable on sparc
+
+*pygtk-2.2.0_rc1 (11 Mar 2004)
+
+  11 Mar 2004; Alastair Tse <liquidx@gentoo.org> pygtk-0.6.11-r1.ebuild,
+  pygtk-2.0.0-r1.ebuild, pygtk-2.2.0.ebuild, pygtk-2.2.0_rc1.ebuild:
+  bump x11-libs/gtk+ dep to 2.2
+
+*pygtk-2.2.0 (11 Mar 2004)
+
+  11 Mar 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pygtk-2.2.0.ebuild:
+  Version bump, bug #44378.
+
+  09 Mar 2004; <agriffis@gentoo.org> pygtk-2.0.0.ebuild:
+  stable on alpha and ia64
+
+*pygtk-2.0.0-r1 (24 Jan 2004)
+*pygtk-0.6.11-r1 (24 Jan 2004)
+	
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> pygtk-0.6.11-r1.ebuild,
+  pygtk-2.0.0-r1.ebuild:
+  fix pyc/pyo cleanup, fix pygtk.{py,pth} conflicts when installing
+  pygtk-2.0 and pygtk-0.6 in different orders using alternatives.eclass. 
+  add pyopengl dependencies instead of einfo at the end.
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> pygtk-0.6.11.ebuild:
+  stable on alpha for bug 31858
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> pygtk-1.99.16.ebuild,
+  pygtk-2.0.0.ebuild:
+  stable on alpha
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> pygtk-2.0.0.ebuild:
+  mark stable on amd64
+
+  25 Nov 2003; Jason Wever <weeve@gentoo.org> pygtk-2.0.0.ebuild:
+  Marked stable on sparc, resolves bug #31858.
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> pygtk-1.99.13-r1.ebuild:
+  Stable on ia64
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> pygtk-0.6.11.ebuild:
+  Marked stable for sparc in regards to bug #31858.
+
+  24 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> pygtk-0.6.11.ebuild:
+  set ppc in keywords
+
+  24 Oct 2003; Alastair Tse <liquidx@gentoo.org> pygtk-2.0.0.ebuild:
+  stable bump for x86
+
+  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> pygtk-2.0.0.ebuild:
+  set ppc in keywords
+
+  07 Oct 2003; Alastair Tse <liquidx@gentoo.org> pygtk-2.0.0.ebuild:
+  remove inherit debug
+
+  27 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> pygtk-1.99.16.ebuild:
+  set ppc in keywords
+
+*pygtk-2.0.0 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> pygtk-1.99.17.ebuild,
+  pygtk-2.0.0.ebuild:
+  version bump
+
+  29 Aug 2003; Mike Gardiner <obz@gentoo.org> pygtk-1.99.13-r1.ebuild,
+  pygtk-1.99.16.ebuild:
+  Corrected SLOT to 2
+
+*pygtk-1.99.18 (28 Aug 2003)
+
+  28 Aug 2003; Mike Gardiner <obz@gentoo.org> pygtk-1.99.18.ebuild:
+  New version
+
+  28 Aug 2003; Mike Gardiner <obz@gentoo.org> pygtk-1.99.16.ebuild,
+  pygtk-1.99.17.ebuild:
+  Added >=pkgconfig-0.9 to depends, see bug #26573
+
+*pygtk-1.99.17 (01 Aug 2003)
+
+  01 Aug 2003; foser <foser@gentoo.org> pygtk-1.99.17.ebuild,metadata.xml :
+  New version, added gnome as herd
+
+  12 Jun 2003; <msterret@gentoo.org> pygtk-1.99.13-r1.ebuild,
+  pygtk-1.99.16.ebuild:
+  fix Header
+
+*pygtk-1.99.16 (31 Mar 2003)
+
+  31 Mar 2003; foser <foser@gentoo.org> pygtk-1.99.16.ebuild :
+  New version
+
+*pygtk-1.99.15 (09 Feb 2003)
+
+  09 Feb 2003; foser <foser@gentoo.org> pygtk-1.99.15.ebuild :
+  New version
+
+*pygtk-0.6.11 (06 Dec 2002)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  06 Dec 2002; foser <foser@gentoo.org> pygtk-0.6.11.ebuild :
+  New version
+
+*pygtk-1.99.13-r1 (01 Nov 2002)
+
+  13 Nov 2002; Mark Guertin <gerk@gentoo.org> pygtk-1.99.13-r1.ebuild :
+  backed down to ~ppc.  Don't want dev builds of this sort which are 
+  not backwards compatible overwriting the proper relase.
+
+  01 Nov 2002; foser <foser@gentoo.org> pygtk-1.99.13-r1.ebuild :
+  Enabled threads support
+
+*pygtk-1.99.13 (23 Oct 2002) 
+
+  24 Oct 2002; foser <foser@gentoo.org> pygtk-1.99.13.ebuild :
+  removed the author line, it made emerge ignore the ebuild  
+
+  23 Oct 2002; Spider <spider@gentoo.org> pygtk-1.99.13.ebuild :
+  finally got this in, closing bug #3700. thanks foser@gentoo.org for the actual work
+  
+*pygtk-0.6.9 (19 Jun 2002)
+
+  29 Jul 2002; George Shapovalov <george@gentoo.org> pygtk-0.6.8-r1.ebuild, pygtk-0.6.8-r2.ebuild, pygtk-0.6.9.ebuild, pygtk-1.99.9.ebuild, pygtk-1.99.10.ebuild :
+
+  Added KEYWORDS,SLOT,LICENSE (where missing),
+  header clean-ups
+
+  19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> pygtk-0.6.9.ebuild
+  New version, updated dependencies. Close bug #3891
+
+*pygtk-1.99.10 (13 Jun 2002)
+  21 Aug 2002; Mark Guertin <gerk@gentoo.org> pygtk-1.99.10.ebuild :
+  Added ppc to keywords  
+
+  13 Jun 2002; Spider <spider@gentoo.org> pygtk-1.99.10.ebuild :
+  I've got a headache so this is a simple bump to the next level.  and remember kids dont play in the playgrounds.
+  
+*pygtk-1.99.9 (24 Apr 2002)
+  24 Apr 2002; Spider <spider@gentoo.org> pygtk-1.99.9.ebuild pygtk-0.6.8-r2.ebuild
+  Add SLOT
+  update to gtk2
+  
 
 *pygtk-0.6.8-r1 (1 Feb 2002)
 
diff --git a/dev-python/pygtk/Manifest b/dev-python/pygtk/Manifest
index e69de29bb2d1..5ae8cfd0f083 100644
--- a/dev-python/pygtk/Manifest
+++ b/dev-python/pygtk/Manifest
@@ -0,0 +1,38 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fa8590828d6cdb9858d95e7a62e562d1 ChangeLog 12118
+MD5 f7476a916a6add9b10800b1f5bf31e98 files/digest-pygtk-0.6.11 64
+MD5 f7476a916a6add9b10800b1f5bf31e98 files/digest-pygtk-0.6.11-r1 64
+MD5 24c9de51067b362e1e30dd1d3019e1b0 files/digest-pygtk-1.99.13-r1 65
+MD5 f0923e335952213318838067c14df0a0 files/digest-pygtk-2.0.0 64
+MD5 f0923e335952213318838067c14df0a0 files/digest-pygtk-2.0.0-r1 64
+MD5 a6372d851a8b936f2df258b93a5bc719 files/digest-pygtk-2.2.0 64
+MD5 39ecd0ee60f11eff2a596002e0ddf34d files/digest-pygtk-2.4.1 129
+MD5 19690d7b7578eaf46c0ce7d12936dac3 files/digest-pygtk-2.6.0 129
+MD5 305e4c07dfd9d7d6969fd60f0d3941fc files/digest-pygtk-2.6.1 129
+MD5 7ef10e46829de61df5659a3982a83991 files/digest-pygtk-2.6.2 129
+MD5 da8cbe73131502e22369f56775a63cb5 files/digest-pygtk-2.8.0-r1 129
+MD5 da8cbe73131502e22369f56775a63cb5 files/digest-pygtk-2.8.0-r2 129
+MD5 d674d40f2f302c849e4404649418986e files/digest-pygtk-2.8.2 129
+MD5 72046b076a995f9b14882970d4e8b677 metadata.xml 934
+MD5 45543d429e90ce33b89f93daf796ea3c pygtk-0.6.11-r1.ebuild 1874
+MD5 0320b3883c761bc3e567cc1f04a30e53 pygtk-0.6.11.ebuild 590
+MD5 914a078d84c0a269013e6524a52e6220 pygtk-1.99.13-r1.ebuild 993
+MD5 84fb207ffe10ecd3be8502f0449556a2 pygtk-2.0.0-r1.ebuild 2062
+MD5 7ffd433ac94020e9547ed67c93806054 pygtk-2.0.0.ebuild 925
+MD5 5d2c87676a6ea4abbff3e7d05936c8fd pygtk-2.2.0.ebuild 2171
+MD5 f4ee17cab3eeaa73ead5470486323fda pygtk-2.4.1.ebuild 2570
+MD5 631eb3861c893f6e316971584131cffb pygtk-2.6.0.ebuild 2548
+MD5 c98fd03000b9e5894521c5e818946aa7 pygtk-2.6.1.ebuild 2550
+MD5 6ca640c60a9234eb828592edfa896b2e pygtk-2.6.2.ebuild 2558
+MD5 508fe919fc62bb994522447a300b2512 pygtk-2.8.0-r1.ebuild 2660
+MD5 95c5edd167295a3eb9f3799bcfde09e9 pygtk-2.8.0-r2.ebuild 2646
+MD5 d0a6730534615e1b71d2c21a01b2fb30 pygtk-2.8.2.ebuild 2651
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwZJFdQwWVoAgN4RAh5GAJ4wo16vefjBKun39f1/X+mUGXLGSACfen+F
+TGHGNS/e3pUAeQVtjwBDteE=
+=YA12
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pygtk/files/digest-pygtk-2.4.1 b/dev-python/pygtk/files/digest-pygtk-2.4.1
index 109b2ef04299..714189516dca 100644
--- a/dev-python/pygtk/files/digest-pygtk-2.4.1
+++ b/dev-python/pygtk/files/digest-pygtk-2.4.1
@@ -1 +1,2 @@
 MD5 a926ffbc8cb3e0b7ddbfdbccd879a28d pygtk-2.4.1.tar.bz2 714469
+MD5 b7c7f1aaaf24165d4cb2a5f4e2225d34 pygtk2reference.tbz2 604463
diff --git a/dev-python/pygtk/metadata.xml b/dev-python/pygtk/metadata.xml
index de483c53568f..6d9588ff59c9 100644
--- a/dev-python/pygtk/metadata.xml
+++ b/dev-python/pygtk/metadata.xml
@@ -1,5 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>gnome</herd>
 <herd>python</herd>
+<longdescription>
+PyGTK provides a convenient wrapper for the GTK+ library for use in
+Python programs, taking care of many of the boring details such as
+managing memory and type casting. When combined with PyORBit and
+gnome-python, it can be used to write full featured Gnome applications.
+</longdescription>
+<longdescription lang="ja">
+PyGTKは、Python言語プログラムでGTK+ライブラリを使うための、マネージング・メモリ>やタイプ・キャスティングの様な詰まらない事柄の世話をしてくれる便利なラッパーを提
+供します。PyORBitとgnome-pythonと組みあわせると、GNOMEのアプリケーションの特性を
+完全に抑えるものにすることができます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pygtk/pygtk-0.6.11-r1.ebuild b/dev-python/pygtk/pygtk-0.6.11-r1.ebuild
index f4a36d2a2e90..804b8800803c 100644
--- a/dev-python/pygtk/pygtk-0.6.11-r1.ebuild
+++ b/dev-python/pygtk/pygtk-0.6.11-r1.ebuild
@@ -1,24 +1,24 @@
-# 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/dev-python/pygtk/pygtk-0.6.11-r1.ebuild,v 1.1 2004/01/24 16:56:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-0.6.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit python
 
 DESCRIPTION="GTK+ bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/python/v1.2/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="1.2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-IUSE=""
+KEYWORDS="~alpha amd64 arm hppa ia64 ~ppc ~sparc x86"
+IUSE="opengl"
 
 DEPEND="virtual/python
 	>=gnome-base/libglade-0.17-r6
 	>=media-libs/imlib-1.8
 	>=media-libs/gdk-pixbuf-0.9.0
 	=x11-libs/gtk+-1.2*
-	opengl? ( virtual/opengl dev-python/PyOpenGL )"
+	opengl? ( virtual/opengl dev-python/pyopengl )"
 
 src_unpack() {
 	unpack ${A}
@@ -27,14 +27,9 @@ src_unpack() {
 	ln -s /bin/true ${S}/py-compile
 }
 
-src_compile() {
-	econf
-	emake || die "make failed"
-}
-
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL MAPPING NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README TODO
 
 	python_version
 	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.py \
diff --git a/dev-python/pygtk/pygtk-0.6.11.ebuild b/dev-python/pygtk/pygtk-0.6.11.ebuild
index 90dbf0c5f5cd..5a216140b4d4 100644
--- a/dev-python/pygtk/pygtk-0.6.11.ebuild
+++ b/dev-python/pygtk/pygtk-0.6.11.ebuild
@@ -1,32 +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/dev-python/pygtk/pygtk-0.6.11.ebuild,v 1.1 2002/12/06 19:39:02 foser Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-0.6.11.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 DESCRIPTION="GTK+ bindings for Python"
-
+HOMEPAGE="http://www.pygtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/python/v1.2/${P}.tar.gz"
 
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+LICENSE="LGPL-2.1"
+SLOT="1.2"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
 DEPEND="virtual/python
-        >=gnome-base/libglade-0.17-r6
+	>=gnome-base/libglade-0.17-r6
 	>=media-libs/imlib-1.8
 	>=media-libs/gdk-pixbuf-0.9.0
-        =x11-libs/gtk+-1.2*"
-
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64 ~alpha"
-LICENSE="LGPL-2.1"
-SLOT="1.2"
+	=x11-libs/gtk+-1.2*"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install () {
-#	make prefix=${D}/usr install || die
+src_install() {
 	einstall || die
 }
-
diff --git a/dev-python/pygtk/pygtk-1.99.13-r1.ebuild b/dev-python/pygtk/pygtk-1.99.13-r1.ebuild
index cd277b185229..cb3a91cf28d4 100644
--- a/dev-python/pygtk/pygtk-1.99.13-r1.ebuild
+++ b/dev-python/pygtk/pygtk-1.99.13-r1.ebuild
@@ -1,41 +1,37 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-1.99.10.ebuild,v 1.1 2002/06/13 16:17:12 spider Exp
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-1.99.13-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 # since its a development version
-inherit debug 
+inherit debug
 
-S=${WORKDIR}/${P}
-DESCRIPTION="GTK+2  bindings for Python"
+DESCRIPTION="GTK+2 bindings for Python"
+HOMEPAGE="http://www.pygtk.org/"
 SRC_URI="ftp://ftp.gtk.org/pub/gtk/python/v2.0/${P}.tar.gz"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
-LICENSE="LGPL-2.1"
-
-KEYWORDS="x86 ppc sparc sparc64 alpha"
 
+LICENSE="LGPL-2.1"
+SLOT="2"
+KEYWORDS="x86 ~ppc sparc alpha ia64"
+IUSE="opengl"
 
 DEPEND=">=dev-lang/python-2.2
 	>=x11-libs/pango-1.0.0
 	>=gnome-base/libglade-2.0.0
 	opengl? ( >=x11-libs/gtkglarea-1.99.0 )"
 
-SLOT="2.0"
-
 src_compile() {
-
 	./configure --prefix=/usr/ \
 		--enable-thread \
-	            --host=${CHOST} || die
+		--host=${CHOST} || die
 	emake || die
 }
 
-src_install () {
+src_install() {
 	make prefix=${D}/usr install || die
-
 	dodoc AUTHORS COPYING ChangeLog INSTALL MAPPING NEWS README THREADS TODO
 }
 
 pkg_postinst() {
 	einfo 'If you built pygtk with OpenGL support you still need to emerge'
-	einfo 'PyOpenGL to actually be able to use it. '
+	einfo 'pyopengl to actually be able to use it. '
 }
diff --git a/dev-python/pygtk/pygtk-2.0.0-r1.ebuild b/dev-python/pygtk/pygtk-2.0.0-r1.ebuild
index 25545da90435..4cca7b2b3530 100644
--- a/dev-python/pygtk/pygtk-2.0.0-r1.ebuild
+++ b/dev-python/pygtk/pygtk-2.0.0-r1.ebuild
@@ -1,15 +1,15 @@
-# 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/dev-python/pygtk/pygtk-2.0.0-r1.ebuild,v 1.1 2004/01/24 16:56:05 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit gnome.org python
 
 DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha amd64 mips hppa"
 IUSE="gnome opengl"
 
 RDEPEND=">=dev-lang/python-2.2
@@ -19,12 +19,15 @@ RDEPEND=">=dev-lang/python-2.2
 	>=dev-libs/glib-2
 	gnome? ( >=gnome-base/libglade-2 )
 	opengl? ( virtual/opengl
-		dev-python/PyOpenGL
+		dev-python/pyopengl
 		>=x11-libs/gtkglarea-1.99 )"
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
+# possible parallel build problems (#45776)
+MAKEOPTS="${MAKEOPTS} -j1"
+
 src_unpack() {
 	unpack ${A}
 	# disable pyc compiling
diff --git a/dev-python/pygtk/pygtk-2.0.0.ebuild b/dev-python/pygtk/pygtk-2.0.0.ebuild
index 2fba75b786b0..f647ea2893c4 100644
--- a/dev-python/pygtk/pygtk-2.0.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.0.0.ebuild
@@ -1,16 +1,15 @@
-# 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/dev-python/pygtk/pygtk-2.0.0.ebuild,v 1.1 2003/09/03 12:39:01 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
-# since its a development version
-inherit debug gnome.org
+inherit gnome.org
 
 DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="gnome opengl"
 
 RDEPEND=">=dev-lang/python-2.2
@@ -35,5 +34,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo 'If you built pygtk with OpenGL support you still need to emerge PyOpenGL to use it. '
+	einfo 'If you built pygtk with OpenGL support you still need to emerge pyopengl to use it. '
 }
diff --git a/dev-python/pygtk/pygtk-2.2.0.ebuild b/dev-python/pygtk/pygtk-2.2.0.ebuild
index e5494f8e9a2c..bb43697b96b3 100644
--- a/dev-python/pygtk/pygtk-2.2.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.2.0.ebuild
@@ -1,28 +1,27 @@
-# 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/dev-python/pygtk/pygtk-2.2.0.ebuild,v 1.1 2004/03/11 19:56:25 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
-inherit gnome.org python
+inherit gnome.org python flag-o-matic
 
 DESCRIPTION="GTK+2 bindings for Python"
-HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
+HOMEPAGE="http://www.pygtk.org/"
 SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.2/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ppc64 arm"
 IUSE="gnome opengl"
 
 RDEPEND=">=dev-lang/python-2.2
 	>=x11-libs/pango-1
-	>=x11-libs/gtk+-2
+	>=x11-libs/gtk+-2.2
 	>=dev-libs/atk-1
 	>=dev-libs/glib-2
 	gnome? ( >=gnome-base/libglade-2 )
 	opengl? ( virtual/opengl
-		dev-python/PyOpenGL
+		dev-python/pyopengl
 		>=x11-libs/gtkglarea-1.99 )"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9"
 
@@ -34,13 +33,15 @@ src_unpack() {
 }
 
 src_compile() {
+	use hppa && append-flags -ffunction-sections
 	econf --enable-thread || die
-	emake || die
+	# possible problems with parallel builds (#45776)
+	emake -j1 || die
 }
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog INSTALL MAPPING NEWS README THREADS TODO
+	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
 
 	python_version
 	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.py \
diff --git a/dev-python/pygtk/pygtk-2.4.1.ebuild b/dev-python/pygtk/pygtk-2.4.1.ebuild
index 6dd0351d35bf..9cb375afecd2 100644
--- a/dev-python/pygtk/pygtk-2.4.1.ebuild
+++ b/dev-python/pygtk/pygtk-2.4.1.ebuild
@@ -1,17 +1,18 @@
-# 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/dev-python/pygtk/pygtk-2.4.1.ebuild,v 1.1 2004/11/05 18:18:17 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
 DESCRIPTION="GTK+2 bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
-SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.4/${P}.tar.bz2"
+SRC_URI="ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.4/${P}.tar.bz2
+		doc? ( http://www.pygtk.org/dist/pygtk2reference.tbz2 )"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
-IUSE="gnome opengl"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="gnome opengl doc"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.4.0
@@ -25,6 +26,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	if use doc; then
+		unpack pygtk2reference.tbz2
+	fi
 	# disable pyc compiling
 	mv ${S}/py-compile ${S}/py-compile.orig
 	ln -s /bin/true ${S}/py-compile
@@ -38,16 +42,21 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog INSTALL MAPPING NEWS README THREADS TODO
 	rm examples/Makefile*
 	cp -r examples ${D}/usr/share/doc/${PF}/
 
 	python_version
-	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.py \
-		${D}/usr/lib/python${PYVER}/site-packages/pygtk.py-2.0
-	mv ${D}/usr/lib/python${PYVER}/site-packages/pygtk.pth \
-		${D}/usr/lib/python${PYVER}/site-packages/pygtk.pth-2.0
+	mv ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \
+		${D}/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0
+	mv ${D}/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \
+		${D}/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0
+
+	if use doc; then
+		cd ${S}/../pygtk2reference
+		dohtml -r *
+	fi
 }
 
 src_test() {
@@ -57,17 +66,18 @@ src_test() {
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/lib/python${PYVER}/site-packages/gtk-2.0
-	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
-	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
-	python_mod_compile /usr/lib/python${PYVER}/site-packages/pygtk.py
+	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
 }
 
 pkg_postrm() {
 	python_version
 	python_mod_cleanup /usr/share/pygtk/2.0/codegen
 	python_mod_cleanup
-	rm -f ${ROOT}/usr/lib/python${PYVER}/site-packages/pygtk.{py,pth}
-	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
-	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	rm -f ${ROOT}/usr$(get_libdir)/python${PYVER}/site-packages/pygtk.{py,pth}
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
 }
+
diff --git a/dev-python/pygtk/pygtk-2.6.0.ebuild b/dev-python/pygtk/pygtk-2.6.0.ebuild
index f38c45ff8cfd..9273770ffd1d 100644
--- a/dev-python/pygtk/pygtk-2.6.0.ebuild
+++ b/dev-python/pygtk/pygtk-2.6.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/dev-python/pygtk/pygtk-2.6.0.ebuild,v 1.1 2005/03/08 13:39:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.6.0.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
@@ -11,12 +11,13 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86 ~ppc64"
 IUSE="gnome opengl doc"
 
 RDEPEND=">=dev-lang/python-2.3
 	>=x11-libs/gtk+-2.6.0
 	>=dev-libs/glib-2.4.0
+	!arm? ( dev-python/numeric )
 	gnome? ( >=gnome-base/libglade-2.3.6 )
 	opengl? ( virtual/opengl
 		dev-python/pyopengl
@@ -66,7 +67,7 @@ src_test() {
 
 pkg_postinst() {
 	python_version
-	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/lib/python${PYVER}/site-packages/gtk-2.0
+	python_mod_optimize /usr/share/pygtk/2.0/codegen /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
 	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
 	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
 	python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
@@ -76,7 +77,7 @@ pkg_postrm() {
 	python_version
 	python_mod_cleanup /usr/share/pygtk/2.0/codegen
 	python_mod_cleanup
-	rm -f ${ROOT}/usr/lib/python${PYVER}/site-packages/pygtk.{py,pth}
-	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
-	alternatives_auto_makesym /usr/lib/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
+	rm -f ${ROOT}/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.{py,pth}
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
+	alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
 }
diff --git a/dev-python/pygtk/pygtk-2.6.1.ebuild b/dev-python/pygtk/pygtk-2.6.1.ebuild
index 47c1d644c88e..b3f658471144 100644
--- a/dev-python/pygtk/pygtk-2.6.1.ebuild
+++ b/dev-python/pygtk/pygtk-2.6.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.6.1.ebuild,v 1.1 2005/03/16 10:39:14 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
 DESCRIPTION="GTK+2 bindings for Python"
 HOMEPAGE="http://www.pygtk.org/"
 SRC_URI="${SRC_URI}
-		doc? ( http://www.pygtk.org/dist/pygtk2reference.tbz2 )"
+	doc? ( http://www.pygtk.org/dist/pygtk2reference.tbz2 )"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="gnome opengl doc"
 
 RDEPEND=">=dev-lang/python-2.3
diff --git a/dev-python/pygtk/pygtk-2.6.2.ebuild b/dev-python/pygtk/pygtk-2.6.2.ebuild
index c2f5dd088944..021eeab733d9 100644
--- a/dev-python/pygtk/pygtk-2.6.2.ebuild
+++ b/dev-python/pygtk/pygtk-2.6.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/dev-python/pygtk/pygtk-2.6.2.ebuild,v 1.1 2005/07/19 09:55:20 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.6.2.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
diff --git a/dev-python/pygtk/pygtk-2.8.0-r1.ebuild b/dev-python/pygtk/pygtk-2.8.0-r1.ebuild
index 9b03922e9f68..fd65e35d0098 100644
--- a/dev-python/pygtk/pygtk-2.8.0-r1.ebuild
+++ b/dev-python/pygtk/pygtk-2.8.0-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/dev-python/pygtk/pygtk-2.8.0-r1.ebuild,v 1.1 2005/10/14 12:43:17 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.8.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
diff --git a/dev-python/pygtk/pygtk-2.8.0-r2.ebuild b/dev-python/pygtk/pygtk-2.8.0-r2.ebuild
index 66dadd61315b..2dab7e5c4146 100644
--- a/dev-python/pygtk/pygtk-2.8.0-r2.ebuild
+++ b/dev-python/pygtk/pygtk-2.8.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/dev-python/pygtk/pygtk-2.8.0-r2.ebuild,v 1.1 2005/10/15 02:10:45 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.8.0-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64"
 IUSE="opengl doc"
 
 RDEPEND=">=dev-lang/python-2.3
diff --git a/dev-python/pygtk/pygtk-2.8.2.ebuild b/dev-python/pygtk/pygtk-2.8.2.ebuild
index 6f67d00ecbd8..eb14f87b1b87 100644
--- a/dev-python/pygtk/pygtk-2.8.2.ebuild
+++ b/dev-python/pygtk/pygtk-2.8.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/dev-python/pygtk/pygtk-2.8.2.ebuild,v 1.1 2005/10/29 22:12:18 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtk/pygtk-2.8.2.ebuild,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 inherit gnome.org python flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="opengl doc"
 
 RDEPEND=">=dev-lang/python-2.3
diff --git a/dev-python/pygtkglext/ChangeLog b/dev-python/pygtkglext/ChangeLog
index bcc8f3491e18..b955ed29b4c6 100644
--- a/dev-python/pygtkglext/ChangeLog
+++ b/dev-python/pygtkglext/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for dev-python/pygtkglext
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtkglext/ChangeLog,v 1.1 2003/04/26 20:23:42 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtkglext/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+  09 Jun 2005; Seemant Kulleen <seemant@gentoo.org> pygtkglext-1.0.1.ebuild:
+  mask for testing on amd64 -- using it here
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> pygtkglext-1.0.1.ebuild:
+  Marked stable x86
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pygtkglext-1.0.0.ebuild,
+  pygtkglext-1.0.1.ebuild:
+  dev-python/PyOpenGL is now dev-python/pyopengl - adjust dependencies
+  accordingly.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> pygtkglext-1.0.0.ebuild:
+  Add die following econf for bug 48950
+
+  14 Feb 2004; Alastair Tse <liquidx@gentoo.org> pygtkglext-1.0.1.ebuild,
+  files/pygtkglext-1.0.1-gentoo.diff:
+  add fixes to pygtkglext examples (#38406)
+
+  04 Jan 2004; Alastair Tse <liquidx@gentoo.org> pygtkglext-1.0.0.ebuild,
+  pygtkglext-1.0.1.ebuild:
+  add python2.3 support
+
+*pygtkglext-1.0.1 (06 Dec 2003)
+
+  06 Dec 2003; foser <foser@gentoo.org> pygtkglext-1.0.{0,1}.ebuild :
+  New release, add PyOpenGL dep (#34391)
+
+*pygtkglext-1.0.0 (21 Sep 2003)
+
+  21 Sep 2003; Alastair Tse <liquidx@gentoo.org> pygtkglext-0.0.2.ebuild,
+  pygtkglext-0.1.0.ebuild, pygtkglext-0.99.0.ebuild, pygtkglext-1.0.0.ebuild:
+  fix sandbox issues, version bump and cleanup
+
+*pygtkglext-0.99.0 (26 May 2003)
+
+  26 May 2003; Alastair Tse <liquidx@gentoo.org> pygtkglext-0.99.0.ebuild:
+  version bump
+
+*pygtkglext-0.1.0 (05 May 2003)
+
+  05 May 2003; Alastair Tse <liquidx@gentoo.org> pygtkglext-0.1.0.ebuild:
+  version bump
 
 *pygtkglext-0.0.2 (26 Apr 2003)
 
diff --git a/dev-python/pygtkglext/Manifest b/dev-python/pygtkglext/Manifest
index cef0fb84f968..9855f0a21c75 100644
--- a/dev-python/pygtkglext/Manifest
+++ b/dev-python/pygtkglext/Manifest
@@ -1,3 +1,7 @@
-MD5 31e6fc6362ff290669c0ab5159ed650f pygtkglext-0.0.2.ebuild 746
-MD5 d6290b5a39eab213569151c6308e27d0 ChangeLog 350
-MD5 99d2e1b04bac765293d73dddab37f0c1 files/digest-pygtkglext-0.0.2 69
+MD5 337fa16d8c017f913965837912d6ae4b ChangeLog 1886
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 5e6b6d52dea5c94e225e73653dcf488f pygtkglext-1.0.0.ebuild 979
+MD5 390df7c6a17922c6beebc7ba81823060 pygtkglext-1.0.1.ebuild 1001
+MD5 d075b04f52c6cf3b2079fbe4b93b9b36 files/digest-pygtkglext-1.0.0 69
+MD5 c8846a912c477160cd7c8048f45e0974 files/digest-pygtkglext-1.0.1 69
+MD5 f80ded0efbdb1b2b18b06a96be350c7e files/pygtkglext-1.0.1-gentoo.diff 1985
diff --git a/dev-python/pygtkglext/pygtkglext-1.0.0.ebuild b/dev-python/pygtkglext/pygtkglext-1.0.0.ebuild
index 7e9f199006be..51efee7b29b4 100644
--- a/dev-python/pygtkglext/pygtkglext-1.0.0.ebuild
+++ b/dev-python/pygtkglext/pygtkglext-1.0.0.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-python/pygtkglext/pygtkglext-1.0.0.ebuild,v 1.1 2003/09/21 14:22:58 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtkglext/pygtkglext-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+inherit python
 
 DESCRIPTION="Python bindings to GtkGLExt"
 HOMEPAGE="http://gtkglext.sourceforge.net/"
@@ -8,22 +10,20 @@ SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-DEPEND=">=dev-lang/python-2.2
+DEPEND=">=dev-lang/python-2.2.3-r3
 	>=dev-python/pygtk-2
 	>=dev-libs/glib-2.0
 	>=x11-libs/gtk+-2.0
 	>=x11-libs/gtkglext-1.0.0
+	dev-python/pyopengl
 	virtual/x11
 	virtual/opengl
 	virtual/glu"
 
 src_compile() {
-	# ugly hack for sandbox (opens file readwrite, but only really reads)
-	addwrite /usr/share/pygtk/2.0/codegen
-
-	econf
+	econf || die "econf failed"
 	emake || die
 }
 
@@ -33,3 +33,12 @@ src_install() {
 	insinto /usr/share/doc/${PF}/examples
 	doins examples/*.py
 }
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}
diff --git a/dev-python/pygtkglext/pygtkglext-1.0.1.ebuild b/dev-python/pygtkglext/pygtkglext-1.0.1.ebuild
index 3af32d1fce9c..3f799d983b7a 100644
--- a/dev-python/pygtkglext/pygtkglext-1.0.1.ebuild
+++ b/dev-python/pygtkglext/pygtkglext-1.0.1.ebuild
@@ -1,41 +1,46 @@
-# 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/dev-python/pygtkglext/pygtkglext-1.0.1.ebuild,v 1.1 2003/12/06 13:43:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygtkglext/pygtkglext-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+inherit python eutils
 
 DESCRIPTION="Python bindings to GtkGLExt"
 HOMEPAGE="http://gtkglext.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gtkglext/${P}.tar.bz2"
-LICENSE="LGPL-2.1 GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.2
+DEPEND=">=dev-lang/python-2.2.3-r3
 	>=dev-python/pygtk-2
 	>=dev-libs/glib-2.0
 	>=x11-libs/gtk+-2.0
 	>=x11-libs/gtkglext-1.0.0
-	dev-python/PyOpenGL
+	dev-python/pyopengl
 	virtual/x11
 	virtual/opengl
 	virtual/glu"
 
-src_compile() {
-
-	# ugly hack for sandbox (opens file readwrite, but only really reads)
-	addwrite /usr/share/pygtk/2.0/codegen
-
-	econf
-	emake || die
-
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_install() {
-
 	make DESTDIR=${D} install || die
-	dodoc README COPYING* AUTHORS ChangeLog
+	dodoc README AUTHORS ChangeLog
 	insinto /usr/share/doc/${PF}/examples
 	doins examples/*.py
+}
+
+pkg_postinst() {
+	python_version
+	python_mod_optimize /usr/lib/python${PYVER}/site-packages/gtk-2.0
+}
 
+pkg_postrm() {
+	python_mod_cleanup
 }
diff --git a/dev-python/pyid3lib/ChangeLog b/dev-python/pyid3lib/ChangeLog
index 2f52e6d633e1..33efae859293 100644
--- a/dev-python/pyid3lib/ChangeLog
+++ b/dev-python/pyid3lib/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for dev-python/pyid3lib
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyid3lib/ChangeLog,v 1.1 2004/06/05 15:09:56 lucass Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyid3lib/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pyid3lib-0.5.1.ebuild:
+  Stable sparc.
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> pyid3lib-0.5.1.ebuild:
+  stable on ppc64
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> pyid3lib-0.5.1.ebuild:
+  stable on amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pyid3lib-0.5.1.ebuild:
+  Stable x86.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pyid3lib-0.5.1.ebuild:
+  ~sparc.
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pyid3lib-0.5.1.ebuild:
+  ~amd64.
+
+*pyid3lib-0.5.1 (08 Jun 2004)
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> pyid3lib-0.5.1.ebuild:
+  Added to ~ppc.
 
   05 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> :
   Initial commit. Bug #35905. Thanks for Brock Filer and Rob Kruus.
diff --git a/dev-python/pyid3lib/Manifest b/dev-python/pyid3lib/Manifest
index 8dcc1f6bdfd3..609db2931155 100644
--- a/dev-python/pyid3lib/Manifest
+++ b/dev-python/pyid3lib/Manifest
@@ -1,2 +1,4 @@
-MD5 1fe3c3efc0b18dfe436445979fb4939d pyid3lib-0.5.1.ebuild 453
+MD5 38e1b00c02f16cfd351cbb436d71bc6f ChangeLog 1011
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 125f37c00e8046dbcf36f46b88b20a42 pyid3lib-0.5.1.ebuild 575
 MD5 954c4fdd7b57f3b41aa117d00dde0bfc files/digest-pyid3lib-0.5.1 66
diff --git a/dev-python/pyid3lib/pyid3lib-0.5.1.ebuild b/dev-python/pyid3lib/pyid3lib-0.5.1.ebuild
index b38bf4b19e62..f6b89c70696f 100644
--- a/dev-python/pyid3lib/pyid3lib-0.5.1.ebuild
+++ b/dev-python/pyid3lib/pyid3lib-0.5.1.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/dev-python/pyid3lib/pyid3lib-0.5.1.ebuild,v 1.1 2004/06/05 15:09:56 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyid3lib/pyid3lib-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://pyid3lib.sourceforge.net/"
 IUSE=""
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64 sparc ppc64"
 DEPEND="virtual/python
 	media-libs/id3lib"
 
diff --git a/dev-python/pykde/ChangeLog b/dev-python/pykde/ChangeLog
index 9edb0b54f708..31b560f2fed5 100644
--- a/dev-python/pykde/ChangeLog
+++ b/dev-python/pykde/ChangeLog
@@ -1,9 +1,97 @@
 # ChangeLog for dev-python/pykde
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/ChangeLog,v 1.1 2003/04/17 12:25:27 liquidx Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Dec 2004; Caleb Tennis <caleb@gentoo.org> pykde-3.11.1.ebuild,
+  pykde-3.11.3.ebuild:
+  Move sys-devel/libtool out of RDEPEND and into DEPEND
+
+  25 Nov 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11.3.ebuild:
+  minor depend fix, #72436
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11.3.ebuild:
+  stable on x86
+
+  26 Oct 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11.3.ebuild:
+  >=kde-3.3.1 unsupported, adjusted dependency
+
+*pykde-3.11.3 (30 Aug 2004)
+
+  30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11.1.ebuild,
+  +pykde-3.11.3.ebuild:
+  version bump
+
+  12 Aug 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11.1.ebuild:
+  fixed kdelibs dependency, #60015
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> pykde-3.11.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  18 Jun 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11_rc1.ebuild:
+  rm rc1
+
+*pykde-3.11.1 (15 Jun 2004)
+
+  15 Jun 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11.1.ebuild:
+  version bump
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> pykde-3.11_rc1.ebuild:
+  Added to ~ppc.
+
+*pykde-3.11_rc1 (07 Jun 2004)
+
+  07 Jun 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.11_rc1.ebuild,
+  pykde-3.7.4-r2.ebuild:
+  version bump, removed outdated ebuild
+
+  25 May 2004; Carsten Lohrke <carlo@gentoo.org> pykde-3.7.4-r1.ebuild,
+  pykde-3.7.4-r2.ebuild, files/pykde-3.5.2-sandbox-patch.diff,
+  files/pykde-3.7.4-sandbox-patch.diff:
+  fixing #33210, #44121 and cleanup
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pykde-3.7.4-r1.ebuild,
+  pykde-3.7.4-r2.ebuild:
+  Add missing IUSE.
+
+  17 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> pykde-3.5.2.ebuild,
+  pykde-3.7.4.ebuild:
+  Remove old versions with broken dependencies
+
+*pykde-3.7.4-r2 (10 Nov 2003)
+
+  10 Nov 2003; Caleb Tennis <caleb@gentoo.org> pykde-3.7.4-r2.ebuild:
+  x86 stable
+
+  09 Oct 2003; Caleb Tennis <caleb@gentoo.org> pykde-3.7.4-r1.ebuild:
+  fix a typo in the ebuild, revision bump (See Bug 30757)
+
+*pykde-3.7.4-r1 (02 Oct 2003)
+
+  02 Oct 2003; Caleb Tennis <caleb@gentoo.org> pykde-3.7.4-r1.ebuild:
+  revision to work with PyQt 3.8 - thanks Carlo! (bug #27401)
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> pykde-3.7.4.ebuild:
+  make python modules dir otherwise make install will fail (#27619)
+
+*pykde-3.7.4 (26 Aug 2003)
+
+  26 Aug 2003; Caleb Tennis <caleb@gentoo.org> pykde-3.7.4.ebuild:
+  Version bump, ebuild thanks to Carlo (bug #26554).
+  Removed sandbox patch until someone comes up with a new fix.
 
 *pykde-3.5.2 (14 Apr 2003)
 
+  29 Apr 2003; Michele Balistreri <brain@gentoo.org> pykde-3.5.2.ebuild:
+  fixing some dependancies (this verions of pykde doesn't work with newer 
+  version of SIP and PyQt)
+
+  26 Apr 2003; Hannes Mehnert <hannes@gentoo.org> pykde-3.5.2.ebuild:
+  fixed the epatch, thanks to Paul Pacheco <paul.pacheco@wavecode.com> (bug
+  #19552)
+
   14 Apr 2003; Michele Balistreri <brain@gentoo.org> PyKDE-3.5.2.ebuild:
   Initial import. Ebuild submitted by Paul Pacheco <paul.pacheco@wavecode.com>
 
diff --git a/dev-python/pykde/Manifest b/dev-python/pykde/Manifest
index e04d426e8701..e58fe8ebb55d 100644
--- a/dev-python/pykde/Manifest
+++ b/dev-python/pykde/Manifest
@@ -1,4 +1,6 @@
-MD5 8ab00eaeb5d7b73c6c02b7c3d133396b pykde-3.5.2.ebuild 1262
-MD5 0a9ffdba20886e43d0ffcf889fc5dfdb ChangeLog 396
-MD5 87cf4dfaa7eb6c2dc39268151690e347 files/pykde-3.5.2-sandbox-patch.diff 763
-MD5 0724bcacc7dc67d7071ec4a38828db1a files/digest-pykde-3.5.2 63
+MD5 7c196d0ac2595665272cb95149bfa6ba metadata.xml 176
+MD5 45dc3331c252c180ce5a8f60ef55f64e pykde-3.11.1.ebuild 1294
+MD5 8178d6d2fc288c1385ba993022ea5b8b ChangeLog 3320
+MD5 006eb873be45f4bf66e5fb5c5af3e1e1 pykde-3.11.3.ebuild 1317
+MD5 4a0e79b969e293169428a0bacd0469d5 files/digest-pykde-3.11.3 65
+MD5 3a2a73f66c31347be4e4e90502c61130 files/digest-pykde-3.11.1 65
diff --git a/dev-python/pykde/metadata.xml b/dev-python/pykde/metadata.xml
index de483c53568f..cad53819b410 100644
--- a/dev-python/pykde/metadata.xml
+++ b/dev-python/pykde/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/dev-python/pykde/pykde-3.11.1.ebuild b/dev-python/pykde/pykde-3.11.1.ebuild
index 8037ed878fb6..92dc06f311be 100644
--- a/dev-python/pykde/pykde-3.11.1.ebuild
+++ b/dev-python/pykde/pykde-3.11.1.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/dev-python/pykde/pykde-3.11.1.ebuild,v 1.1 2004/06/15 18:23:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.11.1.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -17,12 +17,15 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 IUSE="debug doc kjs"
 
-DEPEND="virtual/glibc
-	sys-devel/libtool
+REPEND="virtual/libc
 	virtual/python
-	>=dev-python/sip-3.10.2
+	>=dev-python/sip-4.0.1
 	>=dev-python/PyQt-3.12
-	<=kde-base/kdelibs-3.2.3"
+	<kde-base/kdelibs-3.3"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
 
 src_compile() {
 	cd ${S}
diff --git a/dev-python/pykde/pykde-3.11.3.ebuild b/dev-python/pykde/pykde-3.11.3.ebuild
index 3dfc5a768c9d..eed9b598370a 100644
--- a/dev-python/pykde/pykde-3.11.3.ebuild
+++ b/dev-python/pykde/pykde-3.11.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/dev-python/pykde/pykde-3.11.3.ebuild,v 1.1 2004/08/30 15:22:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pykde/pykde-3.11.3.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -14,15 +14,19 @@ HOMEPAGE="http://www.riverbankcomputing.co.uk/pykde/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="debug doc kjs"
 
-DEPEND="virtual/libc
-	sys-devel/libtool
+RDEPEND="virtual/libc
 	virtual/python
 	>=dev-python/sip-3.10.2
 	>=dev-python/PyQt-3.12
-	<kde-base/kdelibs-3.4"
+	kde-base/kdelibs
+	!>=kde-base/kdelibs-3.3.1"
+
+DEPEND="${RDEPEND}
+	sys-devel/libtool"
+
 
 src_compile() {
 	cd ${S}
diff --git a/dev-python/pylibacl/ChangeLog b/dev-python/pylibacl/ChangeLog
index 25bda37162d2..d5d0a3df2a30 100644
--- a/dev-python/pylibacl/ChangeLog
+++ b/dev-python/pylibacl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pylibacl
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibacl/ChangeLog,v 1.1 2005/09/21 16:48:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibacl/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+  28 Oct 2005; Mark Loeser <halcy0n@gentoo.org> pylibacl-0.2.1.ebuild:
+  Stable on x86; bug #110331
+
+  25 Sep 2005; Jason Wever <weeve@gentoo.org> pylibacl-0.2.1.ebuild:
+  Added ~sparc keyword.
 
 *pylibacl-0.2.1 (21 Sep 2005)
 
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index f2c15909c13d..68a8edd322cd 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,3 +1,14 @@
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 8de8e7d7ed31b9251d8f4baf400221ac pylibacl-0.2.1.ebuild 545
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a6b3c33aab219d70bdfea6a7e2c2acd7 ChangeLog 648
 MD5 fa3dde6186f2073a90965c77030f7e1e files/digest-pylibacl-0.2.1 65
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 4c56bfe8feb5e72bda1d525d8e0cdfc7 pylibacl-0.2.1.ebuild 510
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYcQcCRZPokWLroQRAgG7AJ9DMKyBvL8G3sRilPSRXYUfYdgqbgCfbSVS
+gpnyJOkBRyEgaQc0Vd5QKts=
+=Dxf/
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pylibacl/pylibacl-0.2.1.ebuild b/dev-python/pylibacl/pylibacl-0.2.1.ebuild
index 7f126bba8c39..afba4fbe87a5 100644
--- a/dev-python/pylibacl/pylibacl-0.2.1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.2.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/dev-python/pylibacl/pylibacl-0.2.1.ebuild,v 1.1 2005/09/21 16:48:39 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibacl/pylibacl-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/pylibpcap/ChangeLog b/dev-python/pylibpcap/ChangeLog
index b195b9294b78..ab3d6d99669a 100644
--- a/dev-python/pylibpcap/ChangeLog
+++ b/dev-python/pylibpcap/ChangeLog
@@ -1,9 +1,30 @@
 # ChangeLog for dev-python/pylibpcap
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/ChangeLog,v 1.1 2003/03/09 17:32:43 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+*pylibpcap-0.5.1 (19 Nov 2005)
+
+  19 Nov 2005; Alastair Tse <liquidx@gentoo.org> +files/0.4-swig.patch,
+  pylibpcap-0.4.ebuild, +pylibpcap-0.5.1.ebuild:
+  added patch so 0.4 compiles with newer swig (#112464). version bump
+
+  03 Apr 2005; Simon Stelling <blubb@gentoo.org> pylibpcap-0.4.ebuild:
+  added ~amd64
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> pylibpcap-0.4.ebuild:
+  Transition dependancy from net-libs/libpcap to virtual/libpcap
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pylibpcap-0.4.ebuild:
+  Add missing IUSE.
 
 *pylibpcap-0.4 (09 Mar 2003)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pylibpcap-0.4.ebuild:
+  bump to stable
+
   09 Mar 2003; Alastair Tse <liquidx@gentoo.org> pylibpcap-0.4.ebuild:
   initial ebuild
 
diff --git a/dev-python/pylibpcap/Manifest b/dev-python/pylibpcap/Manifest
index e69de29bb2d1..921666aa3648 100644
--- a/dev-python/pylibpcap/Manifest
+++ b/dev-python/pylibpcap/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39b7fc774beb7adf07cc08786e567bdc ChangeLog 1075
+MD5 9aaf9fc9de75199bc7959bd72e723b83 files/0.4-swig.patch 423
+MD5 7f72dd0e8422b038631633864940cd56 files/digest-pylibpcap-0.4 64
+MD5 4465e8717c4517331dac28d6e80e775c files/digest-pylibpcap-0.5.1 66
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 2f5466570c2fd641d4ff96fc29c5e630 pylibpcap-0.4.ebuild 657
+MD5 355c17fac40817151545b22f7c5ce899 pylibpcap-0.5.1.ebuild 583
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf29a9ZFPrqoILX8RApcIAJ97cOTiw7eu9Qt4oTpDp2u5T9SruACdGsnJ
+1KYMZBcaZ+10H+7UpLe3Lvw=
+=N5EX
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pylibpcap/pylibpcap-0.4.ebuild b/dev-python/pylibpcap/pylibpcap-0.4.ebuild
index a8dba8e9320e..745dcab89785 100644
--- a/dev-python/pylibpcap/pylibpcap-0.4.ebuild
+++ b/dev-python/pylibpcap/pylibpcap-0.4.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/pylibpcap-0.4.ebuild,v 1.1 2003/03/09 17:32:43 liquidx Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/pylibpcap-0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Python interface to libpcap"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/${PN}/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
+IUSE=""
 
 DEPEND="virtual/python
-        net-libs/libpcap"
+	virtual/libpcap"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-swig.patch
+}
 src_install() {
-   distutils_src_install
-   insinto /usr/share/doc/${P}/examples
-   doins examples/*
-}   
-
+	distutils_src_install
+	insinto /usr/share/doc/${PF}/examples
+	doins examples/*
+}
diff --git a/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild b/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild
index 7b4da6bdf31f..a4b2e9d2835e 100644
--- a/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild
+++ b/dev-python/pylibpcap/pylibpcap-0.5.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/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild,v 1.1 2005/11/19 18:30:28 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibpcap/pylibpcap-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pylint/ChangeLog b/dev-python/pylint/ChangeLog
index bf8ffa5a7357..827cc1b3e04a 100644
--- a/dev-python/pylint/ChangeLog
+++ b/dev-python/pylint/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for dev-python/pylint
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.1 2003/10/14 18:23:58 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/ChangeLog,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
+
+  10 Nov 2005; Rob Cakebread <pythonhead@gentoo.org> pylint-0.8.1.ebuild:
+  Changed dep to logilab-common-0.12.0. bug# 112090
+
+  08 Nov 2005; Ferris McCormick <fmccor@gentoo.org> pylint-0.8.1.ebuild:
+  Add ~sparc keyword at developer's request.  This version (and
+  dev-python/astng) build and install fine, and initial indications
+  are that pylint does what it is supposed to do.  Tlis closes
+  Bug #111891.
+
+  08 Nov 2005; Rob Cakebread <pythonhead@gentoo.org> pylint-0.8.1.ebuild:
+  Added new dependency on dev-python/astng.
+
+*pylint-0.8.1 (07 Nov 2005)
+
+  07 Nov 2005; Rob Cakebread <pythonhead@gentoo.org> +pylint-0.8.1.ebuild:
+  Version bump.
+
+*pylint-0.7.0 (27 May 2005)
+
+  27 May 2005; Alastair Tse <liquidx@gentoo.org> -pylint-0.4.2.ebuild,
+  -pylint-0.6.0.ebuild, -pylint-0.6.3.ebuild, pylint-0.6.4.ebuild,
+  +pylint-0.7.0.ebuild:
+  version bump
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> pylint-0.6.4.ebuild:
+  Added ~sparc keyword.
+
+*pylint-0.6.4 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> +pylint-0.6.4.ebuild:
+  Version bump.
+
+*pylint-0.6.3 (19 Mar 2005)
+
+  19 Mar 2005; Fernando Serboncini <fserb@gentoo.org> +pylint-0.6.3.ebuild:
+  Version bump.
+
+*pylint-0.6.0 (24 Jan 2005)
+
+  24 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> +pylint-0.6.0.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> -pylint-0.3.3.ebuild,
+  pylint-0.4.0.ebuild:
+  Clean out old ebuild and bump x86 stable.
+
+*pylint-0.4.2 (20 Dec 2004)
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +pylint-0.4.2.ebuild:
+  Version bump, updated ebuild by Marien Zwart <m_zwart@123mail.org> in bug
+  74371.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> pylint-0.4.0.ebuild:
+  keywords ~amd64; closes #60988.
+
+  12 May 2004; David Holm <dholm@gentoo.org> pylint-0.4.0.ebuild:
+  Added to ~ppc.
+
+*pylint-0.4.0 (12 May 2004)
+
+  12 May 2004; Bryan Østergaard <kloeri@gentoo.org> +pylint-0.4.0.ebuild:
+  Version bump.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pylint-0.3.3.ebuild:
+  Add missing IUSE.
+
+  17 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> -pylint-0.2.1.ebuild,
+  -pylint-0.3.2.ebuild, pylint-0.3.3.ebuild:
+  Pylint-0.3.3 stable on x86, remove old ebuilds.
+
+*pylint-0.3.3 (22 Feb 2004)
+
+  22 Feb 2004; Alastair Tse <liquidx@gentoo.org> pylint-0.3.3.ebuild:
+  version bump. bumped logilab-common dep
+
+*pylint-0.3.2 (17 Feb 2004)
+
+  17 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pylint-0.3.2.ebuild:
+  Version bump.
+
+  06 Nov 2003; Alastair Tse <liquidx@gentoo.org> pylint-0.2.1.ebuild:
+  oops, forgot the deps in my moment of madness. adding logilab-common and optik
+  to deps (#32820)
 
 *pylint-0.2.1 (14 Oct 2003)
 
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index a693f370ae59..34b9cc9aa2aa 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,2 +1,20 @@
-MD5 1072b5d55959a9d0fcd811280a8938a3 pylint-0.2.1.ebuild 508
-MD5 06d7e2ad54115c6365b7edff39960f2b files/digest-pylint-0.2.1 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 079e7ead49c0df4c1ba360f3d6507a2d ChangeLog 3118
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 71029c2683e4c6292583fa2a51b055d4 pylint-0.4.0.ebuild 561
+MD5 9133bf532408e4246fdef24fd5457038 pylint-0.7.0.ebuild 618
+MD5 d9a91fed6a42978b802726257927e674 pylint-0.8.1.ebuild 637
+MD5 edddecc290a5a1f3dbfc2e19ec4a2af2 pylint-0.6.4.ebuild 617
+MD5 7dc504c0fc2deb503cde73e6c3b60578 files/digest-pylint-0.4.0 63
+MD5 2a7e58da5e8b5efe228c4a1775b21698 files/digest-pylint-0.7.0 64
+MD5 417bed66e335a218f5a651136604725c files/digest-pylint-0.8.1 64
+MD5 09d4c3f716af850083a78c62dde806ed files/digest-pylint-0.6.4 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDc6CjTry2jroju7wRAsxTAJ4jvihE+oQ21JGPWq86n3OA+BFxHQCcDaus
+Omhr2AiSxHCHnVwVVoutqac=
+=szmA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pylint/pylint-0.4.0.ebuild b/dev-python/pylint/pylint-0.4.0.ebuild
index ff610a1a4bca..65ff4079a1cf 100644
--- a/dev-python/pylint/pylint-0.4.0.ebuild
+++ b/dev-python/pylint/pylint-0.4.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/dev-python/pylint/pylint-0.4.0.ebuild,v 1.1 2004/05/12 09:01:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.4.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.logilab.org/projects/pylint/"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 DEPEND=">=dev-python/optik-1.4
 	>=dev-python/logilab-common-0.5.0"
diff --git a/dev-python/pylint/pylint-0.6.4.ebuild b/dev-python/pylint/pylint-0.6.4.ebuild
index 6633fa8d305b..2a60ae52cccf 100644
--- a/dev-python/pylint/pylint-0.6.4.ebuild
+++ b/dev-python/pylint/pylint-0.6.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/dev-python/pylint/pylint-0.6.4.ebuild,v 1.1 2005/04/14 18:19:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.6.4.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.logilab.org/projects/pylint/"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 LICENSE="GPL-2"
 DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )
 		>=dev-python/logilab-common-0.9.3"
diff --git a/dev-python/pylint/pylint-0.7.0.ebuild b/dev-python/pylint/pylint-0.7.0.ebuild
index dfea4d96d859..88ec68ea58f3 100644
--- a/dev-python/pylint/pylint-0.7.0.ebuild
+++ b/dev-python/pylint/pylint-0.7.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/dev-python/pylint/pylint-0.7.0.ebuild,v 1.1 2005/05/27 17:42:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.7.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pylint/pylint-0.8.1.ebuild b/dev-python/pylint/pylint-0.8.1.ebuild
index 62dbe047ec34..641e873b1a29 100644
--- a/dev-python/pylint/pylint-0.8.1.ebuild
+++ b/dev-python/pylint/pylint-0.8.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/dev-python/pylint/pylint-0.8.1.ebuild,v 1.1 2005/11/07 18:05:52 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylint/pylint-0.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -10,10 +10,11 @@ HOMEPAGE="http://www.logilab.org/projects/pylint/"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~sparc ~x86"
 LICENSE="GPL-2"
 DEPEND="|| ( >=dev-python/optik-1.4 >=dev-lang/python-2.3 )
-		>=dev-python/logilab-common-0.9.3"
+		>=dev-python/logilab-common-0.12.0
+		>=dev-python/astng-0.13.1"
 
 DOCS="doc/*.txt"
 
diff --git a/dev-python/pylirc/ChangeLog b/dev-python/pylirc/ChangeLog
index 28d3f5c62171..eb578e63124a 100644
--- a/dev-python/pylirc/ChangeLog
+++ b/dev-python/pylirc/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-python/pylirc
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/ChangeLog,v 1.1 2003/09/10 18:51:32 max Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pylirc-0.0.4.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> pylirc-0.0.4.ebuild:
+  stable on amd64
+
+*pylirc-0.0.5 (22 Mar 2005)
+
+  22 Mar 2005; Fernando Serboncini <fserb@gentoo.org> +pylirc-0.0.5.ebuild:
+  Version bump
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  31 Oct 2004; <iggy@gentoo.org> pylirc-0.0.4.ebuild:
+  marking 0.0.4 x86 as a dep of freevo
+
+  11 Sep 2004; <blubb@gentoo.org> pylirc-0.0.4.ebuild:
+  added ~amd64
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pylirc-0.0.4.ebuild:
+  Add missing IUSE.
+
+  16 Nov 2003; <max@gentoo.org> pylirc-0.0.4.ebuild:
+  Move inherit line to the top so it doesn't stomp DEPENDs.
 
 *pylirc-0.0.4 (10 Sep 2003)
 
diff --git a/dev-python/pylirc/Manifest b/dev-python/pylirc/Manifest
index e69de29bb2d1..e0258279064f 100644
--- a/dev-python/pylirc/Manifest
+++ b/dev-python/pylirc/Manifest
@@ -0,0 +1,6 @@
+MD5 ec560c781ab2ffd3b814ea4a56762563 pylirc-0.0.4.ebuild 471
+MD5 ae750297e34c9a0c4929184c72684260 metadata.xml 181
+MD5 d06605e9021114e884a5a7425532699f ChangeLog 1103
+MD5 3a5dd5439af4fc3d67923c3c85d5b415 pylirc-0.0.5.ebuild 473
+MD5 277f7e64610bf8dc60e7132e06f7b36d files/digest-pylirc-0.0.4 62
+MD5 120ae444ef1435e4f52439f1a22dda89 files/digest-pylirc-0.0.5 62
diff --git a/dev-python/pylirc/pylirc-0.0.4.ebuild b/dev-python/pylirc/pylirc-0.0.4.ebuild
index ba1a296f64ed..46b17177e8bd 100644
--- a/dev-python/pylirc/pylirc-0.0.4.ebuild
+++ b/dev-python/pylirc/pylirc-0.0.4.ebuild
@@ -1,6 +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/dev-python/pylirc/pylirc-0.0.4.ebuild,v 1.1 2003/09/10 18:51:32 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/pylirc-0.0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+inherit distutils
 
 DESCRIPTION="lirc module for Python."
 HOMEPAGE="http://sourceforge.net/projects/pylirc/"
@@ -8,8 +10,8 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc amd64"
+IUSE=""
 
-DEPEND="app-misc/lirc"
-
-inherit distutils
+DEPEND="${DEPEND}
+	app-misc/lirc"
diff --git a/dev-python/pylirc/pylirc-0.0.5.ebuild b/dev-python/pylirc/pylirc-0.0.5.ebuild
index 2ac240360aa9..b53df183b78a 100644
--- a/dev-python/pylirc/pylirc-0.0.5.ebuild
+++ b/dev-python/pylirc/pylirc-0.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/dev-python/pylirc/pylirc-0.0.5.ebuild,v 1.1 2005/03/22 15:34:15 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylirc/pylirc-0.0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND="${DEPEND}
diff --git a/dev-python/pyltxml/ChangeLog b/dev-python/pyltxml/ChangeLog
index d51c50582af5..3670cfb20e95 100644
--- a/dev-python/pyltxml/ChangeLog
+++ b/dev-python/pyltxml/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for dev-python/pyltxml
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyltxml/ChangeLog,v 1.1 2003/10/30 01:40:37 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyltxml/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyltxml-1.3-r1.ebuild:
+  Stable on ppc.
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> pyltxml-1.3-r1.ebuild,
+  pyltxml-1.3.ebuild:
+  stable on x86
+
+  26 Jun 2004; David Holm <dholm@gentoo.org> pyltxml-1.3-r1.ebuild:
+  Added to ~ppc.
+
+*pyltxml-1.3-r1 (25 Jun 2004)
+
+  25 Jun 2004; Rob Cakebread <pythonhead@gentoo.org> +pyltxml-1.3-r1.ebuild:
+  Fixed dependency on ltxml. Bug# 55009
+
+  30 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> pyltxml-1.3.ebuild:
+  Fixed DEPEND
 
 *pyltxml-1.3 (29 Oct 2003)
 
diff --git a/dev-python/pyltxml/Manifest b/dev-python/pyltxml/Manifest
index 4975534bbca9..70137ab81241 100644
--- a/dev-python/pyltxml/Manifest
+++ b/dev-python/pyltxml/Manifest
@@ -1,4 +1,6 @@
-MD5 21f2a635b5cc3d89c08a7629cf4722e6 pyltxml-1.3.ebuild 623
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 56b19ab0b8d310c91c647758eccb0964 ChangeLog 262
+MD5 0e2f6b76ccce948314d6de4463ddd8e3 ChangeLog 879
+MD5 3651bf3bb3cf20fc1d3f57e90eb7de47 pyltxml-1.3.ebuild 769
+MD5 d777bd85b5a6acda1ecc0371d0fe9efe pyltxml-1.3-r1.ebuild 776
 MD5 c70a065d577606158efd80c0d7510187 files/digest-pyltxml-1.3 62
+MD5 c70a065d577606158efd80c0d7510187 files/digest-pyltxml-1.3-r1 62
diff --git a/dev-python/pyltxml/pyltxml-1.3-r1.ebuild b/dev-python/pyltxml/pyltxml-1.3-r1.ebuild
index d13c5ff222b3..b415077f0b9a 100644
--- a/dev-python/pyltxml/pyltxml-1.3-r1.ebuild
+++ b/dev-python/pyltxml/pyltxml-1.3-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/dev-python/pyltxml/pyltxml-1.3-r1.ebuild,v 1.1 2004/06/25 18:32:01 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyltxml/pyltxml-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/"
 SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/PyLTXML-${PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 DEPEND=">=dev-lang/python-2.2.2
 	=dev-libs/ltxml-1.2.5"
diff --git a/dev-python/pyltxml/pyltxml-1.3.ebuild b/dev-python/pyltxml/pyltxml-1.3.ebuild
index c4af2f0b5ad5..74daaec06f9e 100644
--- a/dev-python/pyltxml/pyltxml-1.3.ebuild
+++ b/dev-python/pyltxml/pyltxml-1.3.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/dev-python/pyltxml/pyltxml-1.3.ebuild,v 1.1 2003/10/30 01:40:37 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyltxml/pyltxml-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,10 @@ HOMEPAGE="http://www.ltg.ed.ac.uk/software/xml/"
 SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/PyLTXML-${PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
+DEPEND=">=dev-lang/python-2.2.2
+	>=dev-libs/ltxml-1.2.5"
 DOCS="00README"
 
 src_unpack() {
diff --git a/dev-python/pymad/ChangeLog b/dev-python/pymad/ChangeLog
index 1ecd01f5a93e..aebe22b59bad 100644
--- a/dev-python/pymad/ChangeLog
+++ b/dev-python/pymad/ChangeLog
@@ -1,9 +1,55 @@
 # ChangeLog for dev-python/pymad
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymad/ChangeLog,v 1.1 2003/03/13 22:57:40 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymad/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pymad-0.5.2.ebuild:
+  Stable on ppc.
+
+*pymad-0.5.4 (24 Jul 2005)
+
+  24 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org> pymad-0.5.1.ebuild,
+  pymad-0.5.2.ebuild, +pymad-0.5.4.ebuild:
+  Version bump. Older versions marked stable on x86.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pymad-0.4.1.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> pymad-0.5.2.ebuild:
+  Added ~amd64, ~sparc.
+
+*pymad-0.5.2 (07 Dec 2004)
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +pymad-0.5.2.ebuild:
+  Version bump.
+
+  03 May 2004; Jeremy Huddleston <eradicator@gentoo.org> pymad-0.4.1.ebuild,
+  pymad-0.5.1.ebuild:
+  Changing mad dep to madplay.
+
+*pymad-0.5.1 (19 Feb 2004)
+
+  19 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pymad-0.5.1.ebuild:
+  Version bump.
+
+  14 Aug 2003; Lars Weiler <pylon@gentoo.org> pymad-0.4.1.ebuild:
+  Added keyword ~ppc
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org>:
+  Reverted back to 0.4.1
+
+*pymad-0.4.1-r1 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> pymad-0.4.1-r1.ebuild:
+  Changed from media-sound/mad to media-libs/{libmad,libid3tag}
 
 *pymad-0.4.1 (13 Mar 2003)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pymad-0.4.1.ebuild:
+  bump to stable
+
   13 Mar 2003; Alastair Tse <liquidx@gentoo.org> pymad-0.4.1.ebuild:
   initial ebuild. Thanks to Mike Wakerly <mikew@wakerly.com> in bug #17270.
 
diff --git a/dev-python/pymad/Manifest b/dev-python/pymad/Manifest
index e69de29bb2d1..1ce42743a9bc 100644
--- a/dev-python/pymad/Manifest
+++ b/dev-python/pymad/Manifest
@@ -0,0 +1,10 @@
+MD5 993eedb51923bbaa1d07cf13d3412eb5 pymad-0.4.1.ebuild 624
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 1f83fd71876a0b19f78e22c049234a1c pymad-0.5.4.ebuild 640
+MD5 0bee9f6082bc5fee21df94ff7ed2460b ChangeLog 1756
+MD5 f10c36d05baf7600f15df3908932bd2e pymad-0.5.2.ebuild 638
+MD5 6b6fe9a1dea8a65f3b8deb1501e270d1 pymad-0.5.1.ebuild 625
+MD5 bab00ec8c0fcaa25bfd3f43ab2a6f822 files/digest-pymad-0.4.1 62
+MD5 625c9af2b6fc0c6542d16365a8bd499c files/digest-pymad-0.5.4 62
+MD5 46fc0da4ef94a1fec49dd693a125a644 files/digest-pymad-0.5.1 62
+MD5 50db971afa39ae785474d20aa98ee4cb files/digest-pymad-0.5.2 62
diff --git a/dev-python/pymad/pymad-0.4.1.ebuild b/dev-python/pymad/pymad-0.4.1.ebuild
index 67922d3cdd57..b95d170998ab 100644
--- a/dev-python/pymad/pymad-0.4.1.ebuild
+++ b/dev-python/pymad/pymad-0.4.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/dev-python/pymad/pymad-0.4.1.ebuild,v 1.1 2003/03/13 22:57:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymad/pymad-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -11,10 +11,10 @@ SRC_URI="http://www.spacepants.org/src/pymad/download/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/python
-	media-sound/mad"
+	media-sound/madplay"
 
 src_compile() {
 	./config_unix.py --prefix /usr || die
diff --git a/dev-python/pymad/pymad-0.5.1.ebuild b/dev-python/pymad/pymad-0.5.1.ebuild
index e161f7152832..501af819ac13 100644
--- a/dev-python/pymad/pymad-0.5.1.ebuild
+++ b/dev-python/pymad/pymad-0.5.1.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/dev-python/pymad/pymad-0.5.1.ebuild,v 1.1 2004/02/19 01:38:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymad/pymad-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -11,10 +11,10 @@ SRC_URI="http://www.spacepants.org/src/pymad/download/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/python
-	media-sound/mad"
+	media-sound/madplay"
 
 src_compile() {
 	./config_unix.py --prefix /usr || die
diff --git a/dev-python/pymad/pymad-0.5.2.ebuild b/dev-python/pymad/pymad-0.5.2.ebuild
index a2aa6ce15378..20b58893079a 100644
--- a/dev-python/pymad/pymad-0.5.2.ebuild
+++ b/dev-python/pymad/pymad-0.5.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/dev-python/pymad/pymad-0.5.2.ebuild,v 1.1 2004/12/07 03:14:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymad/pymad-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.spacepants.org/src/pymad/download/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 
 DEPEND="virtual/python
 	media-sound/madplay"
diff --git a/dev-python/pymad/pymad-0.5.4.ebuild b/dev-python/pymad/pymad-0.5.4.ebuild
index 2fb1d3bc787d..e7ac56036460 100644
--- a/dev-python/pymad/pymad-0.5.4.ebuild
+++ b/dev-python/pymad/pymad-0.5.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/dev-python/pymad/pymad-0.5.4.ebuild,v 1.1 2005/07/24 13:40:35 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymad/pymad-0.5.4.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyme/ChangeLog b/dev-python/pyme/ChangeLog
index c53338cc4e2b..c94b860bcc52 100644
--- a/dev-python/pyme/ChangeLog
+++ b/dev-python/pyme/ChangeLog
@@ -1,8 +1,42 @@
 # ChangeLog for dev-python/pyme
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/ChangeLog,v 1.1 2002/11/27 04:27:05 jrray Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+*pyme-0.7.0 (04 Jun 2005)
+
+  04 Jun 2005; Fernando Serboncini <fserb@gentoo.org> +pyme-0.7.0.ebuild:
+  Version bump.
+
+  10 May 2005; Alastair Tse <liquidx@gentoo.org> :
+  fixed SRC_URI for 0.5.1
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> pyme-0.5.1.ebuild:
+  stable on x86
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> pyme-0.5.1.ebuild,
+  pyme-0.6.0.ebuild:
+  Moved inherit up top bug# 71466
+
+*pyme-0.6.0 (23 Sep 2004)
+
+  23 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> pyme-0.5.1.ebuild,
+  pyme-0.6.0.ebuild:
+  Keyworded ~sparc, related to #64485
+
+  07 Sep 2004; Rob Cakebread <pythonhead@gentoo.org> pyme-0.5.1.ebuild:
+  Version bump. Fixed 0.5.1 to compile against gpgme-0.9.0-r1. Added src_test().
+  Thanks Daniel Black <dragonheart@gentoo.org> Closes bug #59702.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyme-0.5.1.ebuild:
+  Remove default S.
 
 *pyme-0.5.1 (26 Nov 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pyme-0.5.1.ebuild:
+  bump to stable
+
   26 Nov 2002; J Robert Ray <jrray@gentoo.org> :
   New ebuild.
diff --git a/dev-python/pyme/Manifest b/dev-python/pyme/Manifest
index e69de29bb2d1..3f733792dce2 100644
--- a/dev-python/pyme/Manifest
+++ b/dev-python/pyme/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 828f63a056bfed82ca88e9099f66aee1 ChangeLog 1371
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 bded4b36d59dbf9ae6221ecc34d1846a pyme-0.5.1.ebuild 846
+MD5 d8082382de1fc58ffc2b8eea45b304c0 pyme-0.6.0.ebuild 800
+MD5 d6572e8331458f6bbaf6bc1139f8cb31 pyme-0.7.0.ebuild 871
+MD5 ea2a010c31e7739c292d9f2863b89011 files/digest-pyme-0.5.1 62
+MD5 1efe3c48516f11592d4c741b8bd065d2 files/digest-pyme-0.6.0 61
+MD5 40e2b01b611f5b15b3b538b46bc5b0e4 files/digest-pyme-0.7.0 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCoc60xtZcznfol0URAhhJAJ0QWbkynbH51n0p8XdL30KRPC2rHwCgrt4A
+miCskrrpLwKSLDjZvqAfMSE=
+=9tnc
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyme/pyme-0.5.1.ebuild b/dev-python/pyme/pyme-0.5.1.ebuild
index 243ea00e6e69..c866e6f567f9 100644
--- a/dev-python/pyme/pyme-0.5.1.ebuild
+++ b/dev-python/pyme/pyme-0.5.1.ebuild
@@ -1,23 +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/dev-python/pyme/pyme-0.5.1.ebuild,v 1.1 2002/11/27 04:27:05 jrray Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/pyme-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
-IUSE=""
-
-S=${WORKDIR}/${P}
+inherit distutils
 
-DESCRIPTION="GPGME Interface for Python"
 MY_P=${P/-/_}
-SRC_URI="http://gopher.quux.org:70/devel/pyme/${MY_P}.tar.gz"
-HOMEPAGE="http://gopher.quux.org:70/devel/pyme"
-
-DEPEND=">=app-crypt/gpgme-0.3.9"
-
+DESCRIPTION="GPGME Interface for Python"
+SRC_URI="http://quux.org/devel/pyme/${MY_P}.tar.gz"
+HOMEPAGE="http://pyme.sf.net/"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ppc"
 LICENSE="GPL-2"
+IUSE=""
+DEPEND="=app-crypt/gpgme-0.3.14-r1
+	>=sys-apps/sed-4"
+RDEPEND="=app-crypt/gpgme-0.3.14-r1
+	dev-lang/swig"
 
-inherit distutils
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:gpgme-config:gpgme3-config:" \
+		Makefile setup.py
+}
+
+src_test() {
+	cd ${S}
+	env PYTHONPATH=$(echo build/lib.*) \
+	${python} examples/genkey.py || die "genkey test failed"
+}
 
 src_install() {
 	mydoc="examples/*"
diff --git a/dev-python/pyme/pyme-0.6.0.ebuild b/dev-python/pyme/pyme-0.6.0.ebuild
index c89793d14edf..1f9a162bc670 100644
--- a/dev-python/pyme/pyme-0.6.0.ebuild
+++ b/dev-python/pyme/pyme-0.6.0.ebuild
@@ -1,20 +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/dev-python/pyme/pyme-0.6.0.ebuild,v 1.1 2004/09/07 22:04:29 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/pyme-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
-IUSE=""
+inherit distutils
 
 DESCRIPTION="GPGME Interface for Python"
 SRC_URI="mirror://sourceforge/pyme/${P}.tar.gz"
 HOMEPAGE="http://pyme.sourceforge.net"
-
 DEPEND=">=app-crypt/gpgme-0.9.0"
-
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ppc"
 LICENSE="GPL-2"
-
-inherit distutils
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-python/pyme/pyme-0.7.0.ebuild b/dev-python/pyme/pyme-0.7.0.ebuild
index df2bea6f90a1..a7f8ed09ba6a 100644
--- a/dev-python/pyme/pyme-0.7.0.ebuild
+++ b/dev-python/pyme/pyme-0.7.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/dev-python/pyme/pyme-0.7.0.ebuild,v 1.1 2005/06/04 15:53:48 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyme/pyme-0.7.0.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pymetar/ChangeLog b/dev-python/pymetar/ChangeLog
index acfd8ebf2496..e20801dcbc71 100644
--- a/dev-python/pymetar/ChangeLog
+++ b/dev-python/pymetar/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for dev-python/pymetar
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymetar/ChangeLog,v 1.1 2004/07/09 09:44:19 lucass Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymetar/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pymetar-0.8.ebuild:
+  Stable on ppc.
+
+  03 Oct 2004; Tom Martin <slarti@gentoo.org> pymetar-0.12.ebuild:
+  Marked ~amd64.
+
+*pymetar-0.12 (05 Sep 2004)
+
+  05 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> +pymetar-0.12.ebuild:
+  Version bump.
+
+*pymetar-0.10 (09 Aug 2004)
+
+  09 Aug 2004; Lukasz Strzygowski <lucass@gentoo.org> +pymetar-0.10.ebuild,
+  pymetar-0.8.ebuild:
+  Version bump. Thanks for Tobias Klausmann in bug #59176. Removed
+  function src_install, added DOCS=...
+  pymetar-0.8 marked stable on x86.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> pymetar-0.8.ebuild:
+  Added to ~ppc.
 
 *pymetar-0.8 (09 Jul 2004)
 
diff --git a/dev-python/pymetar/Manifest b/dev-python/pymetar/Manifest
index b81b7b756efb..c964185ae4e4 100644
--- a/dev-python/pymetar/Manifest
+++ b/dev-python/pymetar/Manifest
@@ -1,2 +1,18 @@
-MD5 65445f7188457de5dc8a066e031a5735 pymetar-0.8.ebuild 555
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1d4c42dd20cb1e5773c0b6085ad61aa2 ChangeLog 1178
+MD5 3f0f2906c19c340032771201f035dc40 files/digest-pymetar-0.10 63
+MD5 862e5b24162434fa7a005774deb49f18 files/digest-pymetar-0.12 63
 MD5 e9de4b7454094ffc8836c1a4f12990a9 files/digest-pymetar-0.8 62
+MD5 c09832502b5739e4efdf3d9eec42ce91 metadata.xml 882
+MD5 86cc7e1ce80df75a189bf637d2fda4bb pymetar-0.10.ebuild 641
+MD5 ff28abc58acf6b7684201b8bcc61eba3 pymetar-0.12.ebuild 648
+MD5 6f0a92f2c490aa0043fa646c01e6ddea pymetar-0.8.ebuild 658
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwadFdQwWVoAgN4RApSVAKD4XCnei05PPoDpMARg68YOlqm4rACghTOy
+ur1hfkmRNeAq+I8Am8rJ11I=
+=IBwO
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pymetar/metadata.xml b/dev-python/pymetar/metadata.xml
index 48f4620a5cdc..110abde3a93a 100644
--- a/dev-python/pymetar/metadata.xml
+++ b/dev-python/pymetar/metadata.xml
@@ -8,4 +8,9 @@ ID (get yours from http://www.nws.noaa.gov/tg/siteloc.shtml),
 decodes it and provides easy access to all the data found in the
 report. Documentation and a small example app are inside the tarball.
 </longdescription>
+<longdescription lang="ja">
+このライブラリは指定したステーションID( http://www.nws.noaa.gov/tg/siteloc.shtml で入手)から天気予報結果をダウンロードし、解読し、予報データから検索するのに簡単
+なアクセス手段を提供します。ドキュメンテーションと単純なサンプル・アプリケーショ
+ンはtarballファイルの中です。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pymetar/pymetar-0.10.ebuild b/dev-python/pymetar/pymetar-0.10.ebuild
index a76d206e63a8..c55f8cd29805 100644
--- a/dev-python/pymetar/pymetar-0.10.ebuild
+++ b/dev-python/pymetar/pymetar-0.10.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/dev-python/pymetar/pymetar-0.10.ebuild,v 1.1 2004/08/09 17:48:11 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymetar/pymetar-0.10.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pymetar/pymetar-0.12.ebuild b/dev-python/pymetar/pymetar-0.12.ebuild
index 56039a02e8d4..b8b46709386a 100644
--- a/dev-python/pymetar/pymetar-0.12.ebuild
+++ b/dev-python/pymetar/pymetar-0.12.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/dev-python/pymetar/pymetar-0.12.ebuild,v 1.1 2004/09/04 23:04:02 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymetar/pymetar-0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="PyMETAR downloads the weather report for a given station ID, decode
 SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 DEPEND="virtual/python"
 DOCS="librarydoc.txt THANKS TODO bin/example.py README"
diff --git a/dev-python/pymetar/pymetar-0.8.ebuild b/dev-python/pymetar/pymetar-0.8.ebuild
index b69499513926..b3d470f7566a 100644
--- a/dev-python/pymetar/pymetar-0.8.ebuild
+++ b/dev-python/pymetar/pymetar-0.8.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/dev-python/pymetar/pymetar-0.8.ebuild,v 1.1 2004/07/09 09:44:19 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymetar/pymetar-0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ DESCRIPTION="PyMETAR downloads the weather report for a given station ID, decode
 SRC_URI="http://www.schwarzvogel.de/pkgs/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc"
 IUSE=""
 DEPEND="virtual/python"
 
diff --git a/dev-python/pymssql/ChangeLog b/dev-python/pymssql/ChangeLog
index 45886f34cd5c..f89f1124d11e 100644
--- a/dev-python/pymssql/ChangeLog
+++ b/dev-python/pymssql/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pymssql
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pymssql/ChangeLog,v 1.1 2005/02/02 11:28:58 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymssql/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pymssql-0.6.0.ebuild:
+  add ~ia64
 
   02 Feb 2005; Thomas Raschbacher <lordvan@gentoo.org> :
   initial import
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index 5064321e32d3..9bb73ebb224a 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,4 +1,4 @@
-MD5 407756c54007f44cf31dc36b8ee051d9 pymssql-0.6.0.ebuild 568
-MD5 d41d8cd98f00b204e9800998ecf8427e ChangeLog 0
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 7a9493ae8913f624ef0f94dff3bcfc6e ChangeLog 371
+MD5 5ba69bbbac0c2d1851a3ff3f70d044b7 pymssql-0.6.0.ebuild 606
 MD5 eee2a500ca76d8637e9f5f67b2186ced files/digest-pymssql-0.6.0 63
diff --git a/dev-python/pymssql/pymssql-0.6.0.ebuild b/dev-python/pymssql/pymssql-0.6.0.ebuild
index 98b227467818..1611662c788f 100644
--- a/dev-python/pymssql/pymssql-0.6.0.ebuild
+++ b/dev-python/pymssql/pymssql-0.6.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/dev-python/pymssql/pymssql-0.6.0.ebuild,v 1.1 2005/02/02 11:28:58 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pymssql/pymssql-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pymssql/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
@@ -18,6 +18,3 @@ DEPEND=">=dev-lang/python-2.2
 		>=dev-db/unixODBC-2.2.8"
 
 ## freetds needs to be emerged with USE='mssql'
-
-S=${WORKDIR}/${P}
-
diff --git a/dev-python/pyndex/ChangeLog b/dev-python/pyndex/ChangeLog
index 74d49bdb24b3..b8cb7fc2fd44 100644
--- a/dev-python/pyndex/ChangeLog
+++ b/dev-python/pyndex/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyndex
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyndex/ChangeLog,v 1.1 2004/02/17 15:21:16 lordvan Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyndex/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> pyndex-0.3.2a.ebuild:
+  stable on x86
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> pyndex-0.3.2a.ebuild:
+  adding s390 keywords
 
 *pyndex-0.3.2a (17 Feb 2004)
   
diff --git a/dev-python/pyndex/Manifest b/dev-python/pyndex/Manifest
index eb26d75ce043..1187b5f4650e 100644
--- a/dev-python/pyndex/Manifest
+++ b/dev-python/pyndex/Manifest
@@ -1,5 +1,14 @@
-MD5 d7e23960784a1c7b453f733c9684593b pyndex-0.3.2a.ebuild 642
-MD5 079b9e1d8e9c1ed4dd5c2e0b5ddb8298 ChangeLog 341
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9113c1cc539ccc3f638c5367cb8167b ChangeLog 520
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
-MD5 2d16af0cbb2310ee916154cf5fc0eb86 pyndex-0.3.2a.ebuild~ 660
+MD5 551a2418b0a34c069eb5050e8567ace6 pyndex-0.3.2a.ebuild 662
 MD5 38fb2be4d52d98d9a3ed8a80219f1f0f files/digest-pyndex-0.3.2a 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCBvOrxtZcznfol0URApudAJ9Uc0fGKizWN8YNTwfy5LogDk1LkwCfWVQH
+q0ILgfTjB9mPNahwVwNZLNE=
+=SC2X
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyndex/pyndex-0.3.2a.ebuild b/dev-python/pyndex/pyndex-0.3.2a.ebuild
index 8d60d6cf8b67..a4087040d4b9 100644
--- a/dev-python/pyndex/pyndex-0.3.2a.ebuild
+++ b/dev-python/pyndex/pyndex-0.3.2a.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/dev-python/pyndex/pyndex-0.3.2a.ebuild,v 1.1 2004/02/17 15:21:16 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyndex/pyndex-0.3.2a.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pyndex/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 s390"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
diff --git a/dev-python/pyode/ChangeLog b/dev-python/pyode/ChangeLog
index abdfdbaef8c7..308df0b9d84e 100644
--- a/dev-python/pyode/ChangeLog
+++ b/dev-python/pyode/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for dev-python/pyode
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/ChangeLog,v 1.1 2004/12/30 00:20:41 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+  04 Aug 2005; David Holm <dholm@gentoo.org> pyode-1.1.0.ebuild:
+  Added to ~ppc.
+
+*pyode-1.1.0 (03 Aug 2005)
+
+  03 Aug 2005; Chris Bainbridge <chrb@gentoo.org> +pyode-1.1.0.ebuild:
+  Version bump. If you have compile problems rebuild ode.
+
+  26 Feb 2005; Lukasz Strzygowski <lucass@gentoo.org> pyode-1.0.0.ebuild:
+  Marked stable.
+
+  25 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org> +files/odepath.patch:
+  Added missing odepath.patch. Closing bug #77792.
 
 *pyode-1.0.0 (30 Dec 2004)
 
diff --git a/dev-python/pyode/Manifest b/dev-python/pyode/Manifest
index 173a8f07d027..808e2fff1aed 100644
--- a/dev-python/pyode/Manifest
+++ b/dev-python/pyode/Manifest
@@ -1,3 +1,17 @@
-MD5 81e772c0233c130939af545d6513cb3d ChangeLog 293
-MD5 287972498fbc08c77cb3314c2caf3c7d pyode-1.0.0.ebuild 536
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dd98a30f3d3813ff3c3ada858875f26d ChangeLog 841
 MD5 28319c1ee83741ae44d70c2d45f71178 files/digest-pyode-1.0.0 63
+MD5 4ec18c02e226fd64ce9e7121ed4e817b files/digest-pyode-1.1.0 64
+MD5 7e9af3d258e2ec74950c8a970c37fcfe files/odepath.patch 720
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 76cec8c1f6757e829c128897da993059 pyode-1.0.0.ebuild 627
+MD5 7c267e321cb1eb025694b0920c6ed596 pyode-1.1.0.ebuild 917
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWdTRgIKl8Uu19MoRAoSDAJ9jxp7neZim6qDT4M/5AuwmzbY4GACfWAGK
+zCB/lG17TytI6DZg9fnXiOQ=
+=b4/O
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyode/pyode-1.0.0.ebuild b/dev-python/pyode/pyode-1.0.0.ebuild
index 25a22bf5f3ee..932c7e2fa771 100644
--- a/dev-python/pyode/pyode-1.0.0.ebuild
+++ b/dev-python/pyode/pyode-1.0.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/dev-python/pyode/pyode-1.0.0.ebuild,v 1.1 2004/12/30 00:20:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/pyode/pyode-1.1.0.ebuild b/dev-python/pyode/pyode-1.1.0.ebuild
index a83944c0429a..0d8a75816e10 100644
--- a/dev-python/pyode/pyode-1.1.0.ebuild
+++ b/dev-python/pyode/pyode-1.1.0.ebuild
@@ -1,26 +1,36 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.1.0.ebuild,v 1.1 2005/08/03 10:27:54 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyode/pyode-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
-MY_P="${P/pyode/PyODE}"
+MY_P=${P/pyode/PyODE}
 DESCRIPTION="python bindings to the ode physics engine"
 HOMEPAGE="http://pyode.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pyode/${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="virtual/python
-		>=dev-games/ode-0.5
-		>=dev-python/pyrex-0.9.3"
+	>=dev-games/ode-0.5
+	>=dev-python/pyrex-0.9.3"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	sed -i -e  "s:#ODE_BASE = .*:ODE_BASE = '/usr/share/ode-0.5':" setup.py
+	cd "${S}"
+	sed -i \
+		-e "s:#ODE_BASE = .*:ODE_BASE = '/usr/share/ode-0.5':" \
+		setup.py || die
+}
+
+src_install() {
+	distutils_src_install
+	# The build system doesnt error if it fails to build
+	# the ode library so we need our own sanity check
+	[[ -z $(find "${D}" -name ode.so) ]] && die "failed to build/install :("
 }
diff --git a/dev-python/pyogg/ChangeLog b/dev-python/pyogg/ChangeLog
index 997c9748c6dc..2e7cc63a87b4 100644
--- a/dev-python/pyogg/ChangeLog
+++ b/dev-python/pyogg/ChangeLog
@@ -1,6 +1,53 @@
-# ChangeLog for media-libs/pyogg
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/ChangeLog,v 1.1 2003/06/13 22:35:01 liquidx Exp $
+# ChangeLog for dev-python/pyogg
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pyogg-1.3-r1.ebuild:
+  Mark 1.3-r1 stable on ia64
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> pyogg-1.3-r1.ebuild:
+  Mark 1.3-r1 stable on alpha
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyogg-1.3-r1.ebuild:
+  add ~ia64
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyogg-1.3-r1.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  26 Oct 2004; Steve Arnold <nerdboy@gentoo.org> pyogg-1.3-r1.ebuild:
+  added ~mips and ~alpha keywords (same as libogg) to support edna
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> pyogg-1.3-r1.ebuild:
+  stable on ppc64
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> pyogg-1.3-r1.ebuild:
+  stable on amd64
+
+*pyogg-1.3-r1 (25 May 2004)
+
+  25 May 2004; Bryan Østergaard <kloeri@gentoo.org> +pyogg-1.3-r1.ebuild:
+  Fix digest, see bug #51187.
+
+  12 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> pyogg-1.3.ebuild:
+  Adding amd64 keyword. Part of closing #37550.
+
+  29 Dec 2003; Guy Martin <gmsoft@gentoo.org> pyogg-1.3.ebuild:
+  Marked stable on hppa.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> pyogg-1.3.ebuild:
+  Marked stable on sparc to fix the broken dependencies of net-p2p/pysoulseek.
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> pyogg-1.1.ebuild,
+  pyogg-1.3.ebuild:
+  Added ~sparc keyword.
+
+*pyogg-1.3 (05 Aug 2003)
+
+  05 Aug 2003; Alastair Tse <liquidx@gentoo.org> pyogg-1.3.ebuild:
+  version bump
 
 *pyogg-1.1 (13 Jun 2003)
 
diff --git a/dev-python/pyogg/Manifest b/dev-python/pyogg/Manifest
index 4e7a65b5a6b0..f62251909a07 100644
--- a/dev-python/pyogg/Manifest
+++ b/dev-python/pyogg/Manifest
@@ -1,3 +1,8 @@
-MD5 08c08e00ee7b1f09522f96dac4ca9d74 ChangeLog 433
-MD5 624ab41ed319bc3a4479e80272ff562f pyogg-1.1.ebuild 662
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 a79d009225f3931add07015234d10d8c ChangeLog 2068
+MD5 524c54dd3100a37a5e5f906ec37b9eae pyogg-1.3.ebuild 638
+MD5 e6e77940ba7c106774bb14b844ef805f pyogg-1.3-r1.ebuild 782
+MD5 69bc3aef17680187d2dcb791bc4fedd9 pyogg-1.1.ebuild 626
 MD5 c47d79403646e6d551d5e3e774d75dbc files/digest-pyogg-1.1 60
+MD5 a645af18ebeffa90402b0c743ea5cd8a files/digest-pyogg-1.3 60
+MD5 306c207e3d4f6dd1132bcef2eae510a5 files/digest-pyogg-1.3-r1 63
diff --git a/dev-python/pyogg/pyogg-1.1.ebuild b/dev-python/pyogg/pyogg-1.1.ebuild
index 094f0dade412..4539c12e649c 100644
--- a/dev-python/pyogg/pyogg-1.1.ebuild
+++ b/dev-python/pyogg/pyogg-1.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/dev-python/pyogg/pyogg-1.1.ebuild,v 1.1 2003/06/13 22:35:01 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/pyogg-1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
 IUSE=""
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc ~sparc"
 
 DEPEND="dev-lang/python
 	>=media-libs/libogg-1.0"
diff --git a/dev-python/pyogg/pyogg-1.3-r1.ebuild b/dev-python/pyogg/pyogg-1.3-r1.ebuild
index 8830c8bc1395..a85460357f48 100644
--- a/dev-python/pyogg/pyogg-1.3-r1.ebuild
+++ b/dev-python/pyogg/pyogg-1.3-r1.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/dev-python/pyogg/pyogg-1.3-r1.ebuild,v 1.1 2004/05/25 08:14:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/pyogg-1.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://dev.gentoo.org/~kloeri/${P}-r1.tar.gz"
 IUSE=""
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc hppa ~amd64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="dev-lang/python
 	>=media-libs/libogg-1.0"
diff --git a/dev-python/pyogg/pyogg-1.3.ebuild b/dev-python/pyogg/pyogg-1.3.ebuild
index eef3a738ff50..1249fe404201 100644
--- a/dev-python/pyogg/pyogg-1.3.ebuild
+++ b/dev-python/pyogg/pyogg-1.3.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/dev-python/pyogg/pyogg-1.3.ebuild,v 1.1 2003/08/05 12:57:38 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyogg/pyogg-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
 IUSE=""
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc sparc hppa ~amd64"
 
 DEPEND="dev-lang/python
 	>=media-libs/libogg-1.0"
diff --git a/dev-python/pyopenal/ChangeLog b/dev-python/pyopenal/ChangeLog
index 823e6546f354..07ca1bcfa073 100644
--- a/dev-python/pyopenal/ChangeLog
+++ b/dev-python/pyopenal/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for dev-python/pyopenal
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/ChangeLog,v 1.1 2003/05/10 18:44:51 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyopenal-0.1.4.ebuild:
+  Stable on ppc.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyopenal-0.1.4 (16 Oct 2004)
+
+  16 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +pyopenal-0.1.4.ebuild:
+  Version bump.
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pyopenal-0.1.1.ebuild,
+  pyopenal-0.1.3.ebuild:
+  Stable on x86.
+
+  30 Mar 2004; David Holm <dholm@gentoo.org> pyopenal-0.1.3.ebuild:
+  Added to ~ppc.
+
+  06 Mar 2004; <kloeri@gentoo.org> pyopenal-0.1.3.ebuild,
+  files/pyopenal-1.3.patch:
+  Add patch for bug #43768.
+
+*pyopenal-0.1.3 (21 Dec 2003)
+
+  21 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> pyopenal-0.1.3.ebuild:
+  Version bump
+
+*pyopenal-0.1.2 (05 Dec 2003)
+
+  05 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> pyopenal-0.1.2.ebuild:
+  Version bump
+
+  13 Jun 2003; Alastair Tse <liquidx@gentoo.org> pyopenal-0.1.1.ebuild:
+  updated deps for pyvorbis and pyogg move
 
 *pyopenal-0.1.1 (10 May 2003)
 
diff --git a/dev-python/pyopenal/Manifest b/dev-python/pyopenal/Manifest
index 6dcb70e01736..f00c45d40d0e 100644
--- a/dev-python/pyopenal/Manifest
+++ b/dev-python/pyopenal/Manifest
@@ -1,2 +1,9 @@
-MD5 3729d9bf5f7d0ad50f82e7956806d577 pyopenal-0.1.1.ebuild 593
-MD5 d23500eb10707155f10ead85996b65bb files/digest-pyopenal-0.1.1 65
+MD5 4b3d1581bd5cb70f4cfb17957babfd83 pyopenal-0.1.3.ebuild 804
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 8a6ae60148c5b1fd000e07becdcd53e4 pyopenal-0.1.4.ebuild 692
+MD5 d61a7daa437f45479f4676bdc57b2a68 ChangeLog 1436
+MD5 d400bdaf820208b0f070c989648127ce pyopenal-0.1.2.ebuild 724
+MD5 3a5189b3d11d95eab8a9fbfb7e0b3261 files/digest-pyopenal-0.1.3 65
+MD5 7b6d71c414f6d07e85a1b40c09580510 files/pyopenal-1.3.patch 763
+MD5 277f35655b8bae2d0039e7d1b2c29938 files/digest-pyopenal-0.1.2 65
+MD5 baf45438da59220889afb7e444d49f22 files/digest-pyopenal-0.1.4 65
diff --git a/dev-python/pyopenal/pyopenal-0.1.2.ebuild b/dev-python/pyopenal/pyopenal-0.1.2.ebuild
index 3e238de480be..abeb23eca034 100644
--- a/dev-python/pyopenal/pyopenal-0.1.2.ebuild
+++ b/dev-python/pyopenal/pyopenal-0.1.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/dev-python/pyopenal/pyopenal-0.1.2.ebuild,v 1.1 2003/12/05 06:37:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/pyopenal-0.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyopenal/pyopenal-0.1.3.ebuild b/dev-python/pyopenal/pyopenal-0.1.3.ebuild
index 7f47ac9d141b..09fb63287ebd 100644
--- a/dev-python/pyopenal/pyopenal-0.1.3.ebuild
+++ b/dev-python/pyopenal/pyopenal-0.1.3.ebuild
@@ -1,21 +1,21 @@
-# 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/dev-python/pyopenal/pyopenal-0.1.3.ebuild,v 1.1 2003/12/21 16:31:23 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/pyopenal-0.1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
-IUSE=""
 MY_P=${P/pyopenal/PyOpenAL}
 
 DESCRIPTION="OpenAL library port for Python"
+HOMEPAGE="http://oomadness.tuxfamily.org/en/pyopenal/"
 SRC_URI="http://oomadness.tuxfamily.org/downloads/${MY_P}.tar.gz
 	http://www.nectroom.homelinux.net/pkg/${MY_P}.tar.gz
 	http://nectroom.homelinux.net/pkg/${MY_P}.tar.gz"
-HOMEPAGE="http://oomadness.tuxfamily.org/en/pyopenal/"
 
-KEYWORDS="~x86"
-SLOT="0"
 LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.2
 	media-libs/openal
@@ -24,3 +24,7 @@ DEPEND=">=dev-lang/python-2.2.2
 
 S=${WORKDIR}/${MY_P}
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/pyopenal-1.3.patch
+}
diff --git a/dev-python/pyopenal/pyopenal-0.1.4.ebuild b/dev-python/pyopenal/pyopenal-0.1.4.ebuild
index 483d7c3bca6c..664eb2846da5 100644
--- a/dev-python/pyopenal/pyopenal-0.1.4.ebuild
+++ b/dev-python/pyopenal/pyopenal-0.1.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/dev-python/pyopenal/pyopenal-0.1.4.ebuild,v 1.1 2004/10/16 13:48:19 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenal/pyopenal-0.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://download.gna.org/pyopenal/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.2
diff --git a/dev-python/pyopengl/ChangeLog b/dev-python/pyopengl/ChangeLog
index 07827fda5f87..62edad3fd5b8 100644
--- a/dev-python/pyopengl/ChangeLog
+++ b/dev-python/pyopengl/ChangeLog
@@ -1,10 +1,56 @@
-# ChangeLog for dev-python/PyOpenGL
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.1 2004/07/20 19:52:08 kloeri Exp $
+# ChangeLog for dev-python/pyopengl
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/ChangeLog,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
+
+  08 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
+  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
+  Fixed lib vars. Thanks to Tom Payne <twp@gentoo.org> for the diff. Closes
+  #81217
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
+  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
+  Fixed SED expression. Closes #81164
+
+  31 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  -files/pyopengl-2.0.0.44-disable_togl.patch,
+  +files/pyopengl-2.0.0.44-fix_togl.patch, pyopengl-2.0.0.44.ebuild,
+  pyopengl-2.0.1.09.ebuild:
+  removed virtualx eclass dependency on both ebuilds. Closes #80090.
+
+  28 Jan 2005; Mike Frysinger <vapier@gentoo.org> pyopengl-2.0.0.44.ebuild,
+  pyopengl-2.0.1.09.ebuild:
+  Remove opengl-update cruft.
+
+  25 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
+  Fixed opengl-update switch on both ebuilds. Fixes #76928
+
+  25 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  pyopengl-2.0.0.44.ebuild, pyopengl-2.0.1.09.ebuild:
+  Use proper env.d file.
+
+*pyopengl-2.0.1.09 (25 Jan 2005)
+
+  25 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  +pyopengl-2.0.1.09.ebuild:
+  Version bump, closes #68921.
+  Thanks to Keith Lyon <kglyon@uwyo.edu> for the ebuild.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  13 Aug 2004; Alastair Tse <liquidx@gentoo.org> pyopengl-2.0.0.44.ebuild:
+  stop unary warnings
+
+  29 Jul 2004; Tom Gall <tgall@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
+  stable on ppc64, bug #57015
 
 *pyopengl-2.0.0.44 (20 Jul 2004)
 
-  20 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +files/config.diff, +files/pyopengl-2.0.0.44-disable_togl.patch,
   +pyopengl-2.0.0.44.ebuild:
   Rename dev-python/PyOpenGL to dev-python/pyopengl.
@@ -12,7 +58,7 @@
   13 May 2004; Stephen P. Becker <geoman@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
   Stable on mips.
 
-  07 May 2004; Bryan �stergaard <kloeri@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> PyOpenGL-2.0.0.44.ebuild:
   Add missing IUSE.
 
   11 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>;
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index 8a9b4ff0f6b4..5bc252a43223 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,6 +1,18 @@
-MD5 ec0ea084fdb916164b3df9b388e17e52 PyOpenGL-2.0.0.44.ebuild 1532
-MD5 50f1635efa2f5d93ae3023769fb8629f ChangeLog 2949
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c848da6670d15bc6f902ace1165939ac ChangeLog 4836
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 8917900a36bd56b70e5428b8cfb5fc40 pyopengl-2.0.0.44.ebuild 1423
+MD5 02a600002851e147c0f74f6b4ead8de9 pyopengl-2.0.1.09.ebuild 1361
 MD5 67d2ad027cfd6d411a585b0e346606a8 files/config.diff 1175
-MD5 ba0f0760a4a22fa7666205b8a5f4f514 files/PyOpenGL-2.0.0.44-disable_togl.patch 406
-MD5 9feca450998c720327067463fea8cdc0 files/digest-PyOpenGL-2.0.0.44 70
+MD5 9feca450998c720327067463fea8cdc0 files/digest-pyopengl-2.0.0.44 70
+MD5 1160aa70c95cda6bac58711ef532c929 files/digest-pyopengl-2.0.1.09 70
+MD5 c3e4064cdb5f7ab59c2e27e91f7ed4c0 files/pyopengl-2.0.0.44-fix_togl.patch 946
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCCKqwxtZcznfol0URAkXeAKCCWrRa7weXdHuCkHqwUk34lSeZfACg6epx
+t33cpZCRSkrXyvS2nUiNbtA=
+=Bq9g
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild b/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
index 1d77ec658d1b..32086b0b53d2 100644
--- a/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
+++ b/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild
@@ -1,11 +1,11 @@
-# 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/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.1 2004/07/20 19:52:08 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.0.44.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 MY_P=${P/pyopengl/PyOpenGL}
 S=${WORKDIR}/${MY_P}
 
-inherit eutils distutils virtualx
+inherit eutils distutils
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyopengl/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/python
@@ -23,47 +23,27 @@ DEPEND="virtual/python
 
 src_unpack() {
 	unpack ${A}
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/config.diff
-	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/${P}-disable_togl.patch
-}
-
-src_compile() {
-	export maketype="python"
-	export python="virtualmake"
-	distutils_src_compile
-}
-
-src_install() {
-	export maketype="python"
-	export python="virtualmake"
-	distutils_src_install
-}
-
-pkg_setup () {
-	if [ -e /etc/env.d/09opengl ]
-	then
-		# Set up X11 implementation
-		X11_IMPLEM_P="$(portageq best_version "${ROOT}" virtual/x11)"
-		X11_IMPLEM="${X11_IMPLEM_P%-[0-9]*}"
-		X11_IMPLEM="${X11_IMPLEM##*\/}"
-		einfo "X11 implementation is ${X11_IMPLEM}."
-
-		VOID=$(cat /etc/env.d/09opengl | grep ${X11_IMPLEM})
-
-		USING_X11=$?
-		if [ ${USING_X11} -eq 1 ]
-		then
-			GL_IMPLEM=$(cat /etc/env.d/09opengl | cut -f5 -d/)
-			opengl-update ${X11_IMPLEM}
-		fi
+	cd ${S}
+	epatch ${FILESDIR}/config.diff
+	epatch ${FILESDIR}/${P}-fix_togl.patch
+
+	if built_with_use dev-lang/python tcltk; then
+		tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+		TKLIBRARY="'\/usr\/$(get_libdir)\/tk${tkv}'"
+		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
+		TCLLIBRARY="'\/usr\/$(get_libdir)\/tcl${tclv}'"
+		TKEQ="True"
 	else
-		die "Could not find /etc/env.d/09opengl. Please run opengl-update."
-	fi
-}
-
-pkg_postinst () {
-	if [ ${USING_X11} -eq 1 ]
-	then
-		opengl-update ${GL_IMPLEM}
+		TKLIBRARY="'/usr/lib/'"
+		TCLLIBRARY="'/usr/lib/'"
+		TKEQ="None"
 	fi
+	SEDED="""
+s:tk = Tkinter.Tk():tk = ${TKEQ}:;
+s:tk.getvar('tk_version'):str(Tkinter.TkVersion):g;
+s:tk.getvar( 'tk_version' ):str(Tkinter.TkVersion):g;
+s:tk.getvar('tcl_version'):str(Tkinter.TclVersion):g;
+s:tk.getvar('tk_library'):${TKLIBRARY}:g;
+s:tk.getvar('tcl_library'):${TCLLIBRARY}:g;"""
+	sed -i -e "${SEDED}" setup/togl_setup.py
 }
diff --git a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
index 9946fc46010a..fc36b2e3fcf3 100644
--- a/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
+++ b/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.1 2005/01/25 02:27:51 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopengl/pyopengl-2.0.1.09.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 MY_P=${P/pyopengl/PyOpenGL}
 S=${WORKDIR}/${MY_P}
 
-inherit eutils distutils virtualx
+inherit eutils distutils
 
 DESCRIPTION="Python OpenGL bindings"
 HOMEPAGE="http://pyopengl.sourceforge.net/"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyopengl/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/python
@@ -21,15 +21,29 @@ DEPEND="virtual/python
 	virtual/x11
 	virtual/opengl"
 
-src_compile() {
-	export maketype="python"
-	export python="virtualmake"
-	distutils_src_compile
-}
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}/setup
+
+	if built_with_use dev-lang/python tcltk; then
+		tkv=$(grep TK_VER /usr/include/tk.h | sed 's/^.*"\(.*\)".*/\1/')
+		TKLIBRARY="'\/usr\/$(get_libdir)\/tk${tkv}'"
+		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
+		TCLLIBRARY="'\/usr\/$(get_libdir)\/tcl${tclv}'"
+		TKEQ="True"
+	else
+		TKLIBRARY="'/usr/lib/'"
+		TCLLIBRARY="'/usr/lib/'"
+		TKEQ="None"
+	fi
+	SEDED="""
+s:tk = Tkinter.Tk():tk = ${TKEQ}:;
+s:tk.getvar('tk_version'):str(Tkinter.TkVersion):g;
+s:tk.getvar( 'tk_version' ):str(Tkinter.TkVersion):g;
+s:tk.getvar('tcl_version'):str(Tkinter.TclVersion):g;
+s:tk.getvar('tk_library'):${TKLIBRARY}:g;
+s:tk.getvar('tcl_library'):${TCLLIBRARY}:g;"""
+	sed -i -e "${SEDED}" togl_setup.py
 
-src_install() {
-	export maketype="python"
-	export python="virtualmake"
-	distutils_src_install
 }
-
diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog
index c3722b07c1ad..ed4d098f61af 100644
--- a/dev-python/pyopenssl/ChangeLog
+++ b/dev-python/pyopenssl/ChangeLog
@@ -1,20 +1,55 @@
-# ChangeLog for dev-python/pyOpenSSL
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.1 2004/07/16 23:29:31 kloeri Exp $
+# ChangeLog for dev-python/pyopenssl
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> pyopenssl-0.6.ebuild:
+  Mark 0.6 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyopenssl-0.6.ebuild:
+  add ~ia64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyopenssl-0.6.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> pyopenssl-0.6.ebuild:
+  stable on amd64
+
+  18 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> pyopenssl-0.6.ebuild:
+  Stable on alpha.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Dec 2004; Rob Cakebread <pythonhead@gentoo.org> pyopenssl-0.6.ebuild:
+  Marked stable x86
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> pyopenssl-0.6.ebuild:
+  Added ~sparc keyword.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  20 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> pyopenssl-0.6.ebuild:
+  Fix sandbox violation.
+
+*pyopenssl-0.6 (18 Aug 2004)
+
+  18 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> +pyopenssl-0.6.ebuild:
+  Version bump.
 
 *pyopenssl-0.5.1 (17 Jul 2004)
 
-  17 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  17 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +pyopenssl-0.5.1.ebuild:
   Renamed to pyopenssl.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> pyOpenSSL-0.5.1.ebuild:
   Fix use invocation
 
-  02 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> pyOpenSSL-0.5.1.ebuild:
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pyOpenSSL-0.5.1.ebuild:
   Stable on alpha.
 
-  22 Apr 2004; Bryan �stergaard <kloeri@gentoo.org> pyOpenSSL-0.5.1.ebuild:
+  22 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pyOpenSSL-0.5.1.ebuild:
   Added ~alpha to keywords.
 
   06 Mar 2004; David Holm <dholm@gentoo.org> pyOpenSSL-0.5.1.ebuild:
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 0707c5cae02a..206036492d24 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,4 +1,6 @@
-MD5 c9baaa048ed85a09db5b16c8f2cfbd5d pyopenssl-0.5.1.ebuild 1081
+MD5 47b4f60bc1bf2ef89ef84d6889cd4f87 pyopenssl-0.6.ebuild 1148
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 4b787a4522b6c41a7e52f324816864b2 ChangeLog 1081
+MD5 3f2bf9738854349af19db99031c66f03 ChangeLog 2295
+MD5 b3bb4c11a04e687c897a1dc7476d8ab2 pyopenssl-0.5.1.ebuild 1099
+MD5 f499a98f975a425b5df71055e2c4aadb files/digest-pyopenssl-0.6 65
 MD5 3c24379240e464df5a860ce0413832eb files/digest-pyopenssl-0.5.1 67
diff --git a/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild b/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild
index 5bc40d0d3933..01f9fd5961fa 100644
--- a/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.5.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/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild,v 1.1 2004/07/16 23:29:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyopenssl/pyopenssl-0.6.ebuild b/dev-python/pyopenssl/pyopenssl-0.6.ebuild
index b16bdf11b159..a1ea9a180b4e 100644
--- a/dev-python/pyopenssl/pyopenssl-0.6.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-0.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/dev-python/pyopenssl/pyopenssl-0.6.ebuild,v 1.1 2004/08/18 17:31:47 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyopenssl/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha"
+KEYWORDS="alpha amd64 ia64 ppc ~sparc x86"
 IUSE="tetex"
 
 RDEPEND="virtual/python
@@ -25,6 +25,8 @@ src_compile() {
 	distutils_src_compile
 	if use tetex ; then
 		addwrite /var/cache/fonts
+		addwrite /usr/share/texmf/fonts/pk
+
 		cd ${S}/doc
 		make html ps dvi
 	fi
diff --git a/dev-python/pyorbit/ChangeLog b/dev-python/pyorbit/ChangeLog
index 78424d2b7775..29e392ef9298 100644
--- a/dev-python/pyorbit/ChangeLog
+++ b/dev-python/pyorbit/ChangeLog
@@ -1,8 +1,81 @@
 # ChangeLog for dev-python/pyorbit
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.1 2003/02/09 18:29:21 foser Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyorbit-2.0.1.ebuild:
+  stable on ia64
+
+  01 Aug 2005; Simon Stelling <blubb@gentoo.org> pyorbit-2.0.1.ebuild:
+  stable on amd64
+
+  26 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pyorbit-2.0.1.ebuild:
+  Stable on alpha.
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> pyorbit-2.0.1.ebuild:
+  Stable on sparc
+
+  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  pyorbit-2.0.1.ebuild:
+  ppc stable
+
+  16 Jul 2005; John N. Laliberte <allanonjl@gentoo.org>
+  pyorbit-2.0.1.ebuild:
+  marking 2.0.1 stable on x86
+
+*pyorbit-2.0.1 (23 Nov 2004)
+
+  23 Nov 2004; Alastair Tse <liquidx@gentoo.org> +pyorbit-2.0.1.ebuild:
+  version bump, moving CORBA.py and PortableServer.py to avoid colliding with
+  omniorbpy
+
+  23 Mar 2004; Chris Aniszczyk <zx@gentoo.org> pyorbit-2.0.0.ebuild:
+  Added ~hppa
+
+  09 Jan 2004; <gustavoz@gentoo.org> pyorbit-2.0.0.ebuild:
+  marked stable on sparc
+
+  09 Jan 2004; Aron Griffis <agriffis@gentoo.org> pyorbit-2.0.0.ebuild:
+  stable on alpha
+
+  24 Oct 2003; Alastair Tse <liquidx@gentoo.org> pyorbit-1.99.5.ebuild,
+  pyorbit-1.99.6.ebuild, pyorbit-1.99.7.ebuild, pyorbit-2.0.0.ebuild:
+  cleanup and bump to x86 stable
+
+  24 Sep 2003; Todd Sunderlin <todd@gentoo.org> pyorbit-2.0.0.ebuild:
+  added ~sparc keyword
+
+  17 Sep 2003; Aron Griffis <agriffis@gentoo.org> pyorbit-2.0.0.ebuild:
+  Add ~alpha
+
+*pyorbit-2.0.0 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> pyorbit-2.0.0.ebuild:
+  version bump
+
+*pyorbit-1.99.7 (29 Aug 2003)
+
+  29 Aug 2003; foser <foser@gentoo.org> pyorbit-1.99.7.ebuild :
+  New version
+
+*pyorbit-1.99.6 (31 Jul 2003)
+
+  31 Jul 2003; foser <foser@gentoo.org> pyorbit-1.99.6.ebuild :
+  New version
+
+*pyorbit-1.99.5 (20 Jul 2003)
+
+  20 Jul 2003; Alastair Tse <liquidx@gentoo.org> pyorbit-1.99.5.ebuild:
+  version bump
+
+*pyorbit-1.99.4 (31 Mar 2003)
+
+  31 Mar 2003; foser <foser@gentoo.org> pyorbit-1.99.4.ebuild :
+  New version
 
 *pyorbit-1.99.3 (09 Feb 2003)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> pyorbit-1.99.3.ebuild :
+  set ~ppc in keywords
+
   09 Feb 2003; foser <foser@gentoo.org> pyorbit-1.99.3 :
   Initial commit
diff --git a/dev-python/pyorbit/Manifest b/dev-python/pyorbit/Manifest
index e69de29bb2d1..c5df3c1a0cc7 100644
--- a/dev-python/pyorbit/Manifest
+++ b/dev-python/pyorbit/Manifest
@@ -0,0 +1,6 @@
+MD5 298bd2018001959da4c10fbdae381be0 pyorbit-2.0.0.ebuild 614
+MD5 7f4b1ac767214657b085c4951227af02 metadata.xml 178
+MD5 a846f0f9c5054b9618da56e4ce3316ac ChangeLog 2361
+MD5 cc9f4f6bd5fe7c87db41d93f43f6898b pyorbit-2.0.1.ebuild 1169
+MD5 9d3297219d639bea2af5b40eac57dd24 files/digest-pyorbit-2.0.0 66
+MD5 e95549f9bb22fc658bfede9a5690dd2a files/digest-pyorbit-2.0.1 66
diff --git a/dev-python/pyorbit/metadata.xml b/dev-python/pyorbit/metadata.xml
index de483c53568f..9b1bc26a9df2 100644
--- a/dev-python/pyorbit/metadata.xml
+++ b/dev-python/pyorbit/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>gnome</herd>
 <herd>python</herd>
 </pkgmetadata>
diff --git a/dev-python/pyorbit/pyorbit-2.0.0.ebuild b/dev-python/pyorbit/pyorbit-2.0.0.ebuild
index 4ec39345c01c..81227c593027 100644
--- a/dev-python/pyorbit/pyorbit-2.0.0.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.0.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/dev-python/pyorbit/pyorbit-2.0.0.ebuild,v 1.1 2003/09/03 12:45:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 # debug since its a devel release
 inherit gnome2 debug
@@ -10,13 +10,12 @@ HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
-	>=gnome-base/ORBit2-2.4.4"
-
+	>=gnome-base/orbit-2.4.4"
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
diff --git a/dev-python/pyorbit/pyorbit-2.0.1.ebuild b/dev-python/pyorbit/pyorbit-2.0.1.ebuild
index 005deb466afa..7437b384d9f0 100644
--- a/dev-python/pyorbit/pyorbit-2.0.1.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.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/dev-python/pyorbit/pyorbit-2.0.1.ebuild,v 1.1 2004/11/23 15:52:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit python gnome2
 
@@ -9,16 +9,15 @@ HOMEPAGE="http://www.daa.com.au/~james/pygtk/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64 ~hppa"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2
 	>=gnome-base/orbit-2.4.4"
-
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0"
 
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
+DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
 src_unpack() {
 	unpack ${A}
@@ -46,4 +45,4 @@ pkg_postinst() {
 pkg_postrm() {
 	python_version
 	python_mod_cleanup
-}
\ No newline at end of file
+}
diff --git a/dev-python/pyosd/ChangeLog b/dev-python/pyosd/ChangeLog
index a39562dd6e8b..67fab49ff2ba 100644
--- a/dev-python/pyosd/ChangeLog
+++ b/dev-python/pyosd/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for dev-python/pyosd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/ChangeLog,v 1.1 2004/01/20 01:55:57 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/ChangeLog,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyosd-0.2.12.ebuild:
+  Stable on ppc.
+
+  27 Feb 2005; Lukasz Strzygowski <lucass@gentoo.org> pyosd-0.2.11.ebuild,
+  pyosd-0.2.12.ebuild:
+  Marked stable on x86.
+
+*pyosd-0.2.12 (27 Jan 2005)
+
+  27 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org> +pyosd-0.2.12.ebuild:
+  Version bump. Closing bug #79717.
+
+*pyosd-0.2.11 (25 Jan 2005)
+
+  25 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org> +pyosd-0.2.11.ebuild:
+  Version bump. Added commands to install all docs and modules (thanks
+  to James Rowe for bug #79188).
+
+  21 Oct 2004; Rob Cakebread <pythonhead@gentoo.org> pyosd-0.2.7.ebuild,
+  pyosd-0.2.9.ebuild:
+  Marked stable on x86
+
+  16 Apr 2004; David Holm <dholm@gentoo.org> pyosd-0.2.9.ebuild:
+  Added to ~ppc.
+
+*pyosd-0.2.9 (15 Apr 2004)
+
+  15 Apr 2004; Rob Cakebread <pythonhead@gentoo.org> +pyosd-0.2.9.ebuild:
+  Version bump thanks to Jonathan Hitchcock <vhata-gentoo@rucus.ru.ac.za> bug#
+  45396
 
 *pyosd-0.2.7 (19 Jan 2004)
 
diff --git a/dev-python/pyosd/Manifest b/dev-python/pyosd/Manifest
index 559eee5689bc..190bfe2ae52a 100644
--- a/dev-python/pyosd/Manifest
+++ b/dev-python/pyosd/Manifest
@@ -1,4 +1,10 @@
-MD5 f421610dfa632041737270fbc6676128 pyosd-0.2.7.ebuild 357
+MD5 086aa4fdd6ae100acbd6a7534da6b5ed pyosd-0.2.9.ebuild 563
+MD5 dd7f2ff6ed499eca4b965cd9e1b0e0fe pyosd-0.2.11.ebuild 680
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 40d9b2606ab5628db4fc51f34c173dd7 ChangeLog 306
+MD5 498499842e64d3de033c0a68182ae248 pyosd-0.2.12.ebuild 679
+MD5 2bf90aff21faf59a5fb6ed1515204a42 ChangeLog 1346
+MD5 9dc42337a0ec0ae211193e44b87ea5f5 pyosd-0.2.7.ebuild 445
+MD5 867bcf8d25171edf4b39c8e39e633fe0 files/digest-pyosd-0.2.12 63
+MD5 5faed8cbf3d2487a3c25d518b238f034 files/digest-pyosd-0.2.11 63
 MD5 57d4a1fd113f5073ef010c3757ad5699 files/digest-pyosd-0.2.7 62
+MD5 3b3dbbf7fa4c12a0db45ec1e68bd98af files/digest-pyosd-0.2.9 62
diff --git a/dev-python/pyosd/pyosd-0.2.11.ebuild b/dev-python/pyosd/pyosd-0.2.11.ebuild
index acaae95646f3..e2989218ac37 100644
--- a/dev-python/pyosd/pyosd-0.2.11.ebuild
+++ b/dev-python/pyosd/pyosd-0.2.11.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/dev-python/pyosd/pyosd-0.2.11.ebuild,v 1.1 2005/01/25 20:22:42 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/pyosd-0.2.11.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://repose.cx/pyosd/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/python
 	>=x11-libs/xosd-2.2.4"
diff --git a/dev-python/pyosd/pyosd-0.2.12.ebuild b/dev-python/pyosd/pyosd-0.2.12.ebuild
index d600e78cbf27..e02dc3dc0797 100644
--- a/dev-python/pyosd/pyosd-0.2.12.ebuild
+++ b/dev-python/pyosd/pyosd-0.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/dev-python/pyosd/pyosd-0.2.12.ebuild,v 1.1 2005/01/27 15:35:32 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/pyosd-0.2.12.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://repose.cx/pyosd/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 
 DEPEND="virtual/python
 	>=x11-libs/xosd-2.2.4"
diff --git a/dev-python/pyosd/pyosd-0.2.7.ebuild b/dev-python/pyosd/pyosd-0.2.7.ebuild
index 36596e390438..54ef77a1ded3 100644
--- a/dev-python/pyosd/pyosd-0.2.7.ebuild
+++ b/dev-python/pyosd/pyosd-0.2.7.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/dev-python/pyosd/pyosd-0.2.7.ebuild,v 1.1 2004/01/20 01:55:57 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/pyosd-0.2.7.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://repose.cx/pyosd/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="virtual/python
 	>=x11-libs/xosd-2.2.4"
diff --git a/dev-python/pyosd/pyosd-0.2.9.ebuild b/dev-python/pyosd/pyosd-0.2.9.ebuild
index 08c0ad1826aa..59144eeb365b 100644
--- a/dev-python/pyosd/pyosd-0.2.9.ebuild
+++ b/dev-python/pyosd/pyosd-0.2.9.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/dev-python/pyosd/pyosd-0.2.9.ebuild,v 1.1 2004/04/15 21:02:55 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyosd/pyosd-0.2.9.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://repose.cx/pyosd/${P}.tar.gz"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 DEPEND="virtual/python
 	>=x11-libs/xosd-2.2.4"
diff --git a/dev-python/pyparsing/ChangeLog b/dev-python/pyparsing/ChangeLog
index 1f56889d93ae..67ce32d361b0 100644
--- a/dev-python/pyparsing/ChangeLog
+++ b/dev-python/pyparsing/ChangeLog
@@ -1,10 +1,46 @@
 # ChangeLog for dev-python/pyparsing
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.1 2004/03/29 01:22:32 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/ChangeLog,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> pyparsing-1.3.1.ebuild:
+  Added ~sparc keyword.
+
+  14 Jun 2005; David Holm <dholm@gentoo.org> pyparsing-1.3.1.ebuild:
+  Added to ~ppc.
+
+*pyparsing-1.3.1 (13 Jun 2005)
+
+  13 Jun 2005; Alastair Tse <liquidx@gentoo.org> -pyparsing-1.1.2.ebuild,
+  +pyparsing-1.3.1.ebuild:
+  version bump
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> pyparsing-1.2.2.ebuild:
+  stable on amd64
+
+*pyparsing-1.3 (02 Apr 2005)
+
+  02 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> pyparsing-1.2.2.ebuild,
+  +pyparsing-1.3.ebuild:
+  Bump version, bug 86893 + stable 1.2.2 on x86.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyparsing-1.2.2 (07 Dec 2004)
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +pyparsing-1.2.2.ebuild:
+  Version bump.
+
+  02 Sep 2004; Travis Tilley <lv@gentoo.org> pyparsing-1.1.2.ebuild:
+  added ~amd64 keyword
+
+  30 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Add missing Manifest.
 
 *pyparsing-1.1.2 (29 Mar 2004)
 
-  29 Mar 2004; Bryan �stergaard <kloeri@gentoo.org> metadata.xml,
+  29 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> metadata.xml,
   pyparsing-1.1.2.ebuild:
   Initial import, ebuild submitted by Bardur Arantsson <gentoo@scientician.org>
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index 8031fff79645..2b2fd496350a 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,4 +1,8 @@
-MD5 d4a9be94e1b6b3f615a2f5e33f53de34 ChangeLog 427
+MD5 0bc4da08c3f636973eddfed494642ec9 ChangeLog 1431
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 631c6f363db1ec1cd5b8b8ff21032492 pyparsing-1.1.2.ebuild 629
-MD5 6dcae7f668af18f48e66aa8af99ace33 files/digest-pyparsing-1.1.2 67
+MD5 8e2e856b9b77ec24a9daa2aff977dcd2 pyparsing-1.2.2.ebuild 624
+MD5 59c3ea089ca047df9a62a7578f8ec4b0 pyparsing-1.3.1.ebuild 646
+MD5 81534ade3c2b4b3042ed6f89b5e020e9 pyparsing-1.3.ebuild 633
+MD5 3442c5888263e1b113c24c00fd545bca files/digest-pyparsing-1.2.2 67
+MD5 8832dcfe78c5e16564a520717c76af27 files/digest-pyparsing-1.3 65
+MD5 93c721a4ccf6fdfc9e7923b25bf7690d files/digest-pyparsing-1.3.1 67
diff --git a/dev-python/pyparsing/pyparsing-1.2.2.ebuild b/dev-python/pyparsing/pyparsing-1.2.2.ebuild
index 88afb1634a95..ee9ff4ece76d 100644
--- a/dev-python/pyparsing/pyparsing-1.2.2.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.2.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/dev-python/pyparsing/pyparsing-1.2.2.ebuild,v 1.1 2004/12/07 03:05:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://pyparsing.sourceforge.net/"
 LICENSE="MIT"
 SLOT="0"
 DEPEND="dev-lang/python"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 src_install() {
diff --git a/dev-python/pyparsing/pyparsing-1.3.1.ebuild b/dev-python/pyparsing/pyparsing-1.3.1.ebuild
index fb89bf0deec5..c577eb1e481a 100644
--- a/dev-python/pyparsing/pyparsing-1.3.1.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.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/dev-python/pyparsing/pyparsing-1.3.1.ebuild,v 1.1 2005/06/13 17:23:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://pyparsing.sourceforge.net/"
 LICENSE="MIT"
 SLOT="0"
 DEPEND=">=dev-lang/python-2.3.2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 src_install() {
diff --git a/dev-python/pyparsing/pyparsing-1.3.ebuild b/dev-python/pyparsing/pyparsing-1.3.ebuild
index 0bd37dc51287..5be63243aab7 100644
--- a/dev-python/pyparsing/pyparsing-1.3.ebuild
+++ b/dev-python/pyparsing/pyparsing-1.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/dev-python/pyparsing/pyparsing-1.3.ebuild,v 1.1 2005/04/02 10:12:27 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparsing/pyparsing-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyparted/ChangeLog b/dev-python/pyparted/ChangeLog
index c58af9df50fc..fb35d0a4515a 100644
--- a/dev-python/pyparted/ChangeLog
+++ b/dev-python/pyparted/ChangeLog
@@ -1,6 +1,62 @@
 # ChangeLog for dev-python/pyparted
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/ChangeLog,v 1.1 2004/04/23 05:44:32 npmccallum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+  12 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  pyparted-1.6.9-r1.ebuild:
+  Stable on hppa, ppc.
+
+  10 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pyparted-1.6.9-r1.ebuild:
+  Stable on sparc
+
+  08 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pyparted-1.6.9-r1.ebuild:
+  Stabling due to python-2.4 stabling.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyparted-1.6.9.ebuild:
+  Stable on ppc.
+
+  05 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> pyparted-1.6.9.ebuild,
+  pyparted-1.6.9-r1.ebuild:
+  Fedora mess... locked to specific python versions
+
+*pyparted-1.6.9-r1 (04 Apr 2005)
+
+  04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  +pyparted-1.6.9-r1.ebuild:
+  New upstream vesion, fixes python 2.4 build issues
+
+  04 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> pyparted-1.6.9.ebuild:
+  Keyworded ~sparc and ~hppa
+
+  21 Jan 2005; Marcus D. Hanwell <cryos@gentoo.org> pyparted-1.6.9.ebuild:
+  Added append-flags -fPIC as this is needed for compilation on amd64. Applied
+  globally as this package only produces one shared object.
+
+  04 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> pyparted-1.6.9.ebuild:
+  Marking stable on x86 and amd64 in preparation for 2005.0's release.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> pyparted-1.6.6.ebuild:
+  Marking stable on x86 and amd64.
+
+*pyparted-1.6.9 (16 Dec 2004)
+
+  16 Dec 2004; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml,
+  +pyparted-1.6.9.ebuild:
+  Changing ownership to livecd herd, bumping to version 1.6.9, and closing bug
+  #67312.
+
+  08 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyparted-1.6.6.ebuild:
+  Remove default S and RDEPEND.
+
+*pyparted-1.6.6 (05 May 2004)
+
+  05 May 2004; Daniel Black <dragonheart@gentoo.org> pyparted-1.6.6.ebuild:
+  QA Fix - inherit before DESCRIPTION
 
   23 Apr 2004; Nathaniel McCallum <npmccallum@gentoo.org> :
   new ebuild
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index 0ce910043f71..5dcd482471e4 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,2 +1,8 @@
-MD5 bfa26491aa4eb0d3704ec66d612fa47a pyparted-1.6.6.ebuild 685
+MD5 78d6a8da57e223762302dad3e1beeaab ChangeLog 2197
 MD5 1c3b5c95a85ac9c079423549c7922a84 files/digest-pyparted-1.6.6 69
+MD5 d0b426a010ec790060151f6c56b4aaa6 files/digest-pyparted-1.6.9 69
+MD5 870e184dc826576ff5943b1e39586621 files/digest-pyparted-1.6.9-r1 69
+MD5 2b0b0623d889932d22c276713b4b8d7d metadata.xml 223
+MD5 3e969922cc9b62c92a80cd5a108eeb9c pyparted-1.6.6.ebuild 878
+MD5 d70bec673369af11d59fee435e6eb90c pyparted-1.6.9-r1.ebuild 1059
+MD5 e60ac629923dab401918fc86d7a6a207 pyparted-1.6.9.ebuild 1057
diff --git a/dev-python/pyparted/metadata.xml b/dev-python/pyparted/metadata.xml
index de483c53568f..779904a349b8 100644
--- a/dev-python/pyparted/metadata.xml
+++ b/dev-python/pyparted/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>python</herd>
+<herd>livecd</herd>
+<maintainer>
+	<email>allanonjl@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyparted/pyparted-1.6.6.ebuild b/dev-python/pyparted/pyparted-1.6.6.ebuild
index 095573c08720..4fbbe5723985 100644
--- a/dev-python/pyparted/pyparted-1.6.6.ebuild
+++ b/dev-python/pyparted/pyparted-1.6.6.ebuild
@@ -1,26 +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/dev-python/pyparted/pyparted-1.6.6.ebuild,v 1.1 2004/04/23 05:44:32 npmccallum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/pyparted-1.6.6.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 RH_EXTRAVERSION="2"
 
+inherit eutils rpm
+
 DESCRIPTION="Python bindings for parted"
 HOMEPAGE="http://fedora.redhat.com"
 SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -*"
+KEYWORDS="x86 amd64 ~ppc -*"
 IUSE=""
 
 # Needed to build...
 DEPEND=">=sys-apps/parted-1.6.9"
 
-RDEPEND="${DEPEND}"
-
-inherit eutils rpm
-
-S="${WORKDIR}/${P}"
-
 src_unpack() {
 	rpm_src_unpack
 }
diff --git a/dev-python/pyparted/pyparted-1.6.9-r1.ebuild b/dev-python/pyparted/pyparted-1.6.9-r1.ebuild
index 821feaf56a6e..26825a95ebe4 100644
--- a/dev-python/pyparted/pyparted-1.6.9-r1.ebuild
+++ b/dev-python/pyparted/pyparted-1.6.9-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/dev-python/pyparted/pyparted-1.6.9-r1.ebuild,v 1.1 2005/04/04 22:57:38 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/pyparted-1.6.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 RH_EXTRAVERSION="3"
 
@@ -11,11 +11,12 @@ HOMEPAGE="http://fedora.redhat.com"
 SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 hppa ppc sparc x86"
 IUSE=""
 
 # Needed to build...
-DEPEND=">=sys-apps/parted-1.6.9"
+DEPEND="=dev-lang/python-2.4*
+	>=sys-apps/parted-1.6.9"
 
 src_unpack() {
 	rpm_src_unpack
diff --git a/dev-python/pyparted/pyparted-1.6.9.ebuild b/dev-python/pyparted/pyparted-1.6.9.ebuild
index 30602cfda17b..c8ed1473022b 100644
--- a/dev-python/pyparted/pyparted-1.6.9.ebuild
+++ b/dev-python/pyparted/pyparted-1.6.9.ebuild
@@ -1,21 +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/dev-python/pyparted/pyparted-1.6.9.ebuild,v 1.1 2004/12/16 20:26:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyparted/pyparted-1.6.9.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 RH_EXTRAVERSION="2"
 
-inherit eutils rpm
+inherit eutils rpm flag-o-matic
 
 DESCRIPTION="Python bindings for parted"
 HOMEPAGE="http://fedora.redhat.com"
 SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RH_EXTRAVERSION}.src.rpm"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc -*"
+KEYWORDS="x86 ppc amd64 ~sparc ~hppa"
 IUSE=""
 
 # Needed to build...
-DEPEND=">=sys-apps/parted-1.6.9"
+DEPEND="=dev-lang/python-2.3*
+	>=sys-apps/parted-1.6.9"
 
 src_unpack() {
 	rpm_src_unpack
@@ -24,6 +25,10 @@ src_unpack() {
 src_compile() {
 	cd ${S}
 
+	# -fPIC needed for compilation on amd64, applied globally as only one shared
+	# lib is produced by this package.
+	append-flags -fPIC
+
 	# This is needed otherwise it won't build
 	# If anyone wants to figure out why... go ahead!
 	export LDFLAGS="-ldl"
diff --git a/dev-python/pypgsql/ChangeLog b/dev-python/pypgsql/ChangeLog
index fa85c49669bf..d21fb43ba08a 100644
--- a/dev-python/pypgsql/ChangeLog
+++ b/dev-python/pypgsql/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for dev-python/pypgsql
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypgsql/ChangeLog,v 1.1 2002/12/18 01:51:13 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypgsql/ChangeLog,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
+
+  09 Jan 2005; Marcus Hanwell <cryos@gentoo.org> pypgsql-2.4.ebuild:
+  Marked stable on amd64, bug 59045.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> pypgsql-2.4.ebuild:
+  Added amd64 keyword, closing #63514.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> pypgsql-2.3.ebuild:
+  change virtual/glibc to virtual/libc
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> pypgsql-2.3.ebuild:
+  Add missing IUSE.
+
+  25 Jan 2004; Alastair Tse <liquidx@gentoo.org> pypgsql-2.4.ebuild:
+  bumped 2.4 to stable because this is compatible with py2.3
+
+*pypgsql-2.4 (12 Oct 2003)
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> pypgsql-2.4.ebuild:
+  version bump (#30398)
 
 *pypgsql-2.3 (18 Dec 2002)
 
diff --git a/dev-python/pypgsql/Manifest b/dev-python/pypgsql/Manifest
index e69de29bb2d1..f6cac387cd28 100644
--- a/dev-python/pypgsql/Manifest
+++ b/dev-python/pypgsql/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 259a1078f09f0eef8a558c226f1092fc ChangeLog 1082
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 f79f4562e29b9944f25fba025f19f482 pypgsql-2.3.ebuild 703
+MD5 ce4b4f95a90c153efbbd006ce9cbc30b pypgsql-2.4.ebuild 640
+MD5 8ba85a072c6fa7661c25fd47f134281c files/digest-pypgsql-2.3 63
+MD5 990f5f467539ed2c71f62a6eaa9fbe44 files/digest-pypgsql-2.4 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFB4MxpntT9W3vfTuoRAttmAJ48DY8J/SDOHpfPlvfg8Hdh8Wkn7QCfVRnU
+VUOwQ+gRiv77NFf1Dy/8OI0=
+=Kl7i
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pypgsql/pypgsql-2.3.ebuild b/dev-python/pypgsql/pypgsql-2.3.ebuild
index 48c99038e2c5..5cd92ddb586d 100644
--- a/dev-python/pypgsql/pypgsql-2.3.ebuild
+++ b/dev-python/pypgsql/pypgsql-2.3.ebuild
@@ -1,14 +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/dev-python/pypgsql/pypgsql-2.3.ebuild,v 1.1 2002/12/12 01:08:16 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypgsql/pypgsql-2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 DESCRIPTION="Python Interface to PostgreSQL"
 HOMEPAGE="http://pypgsql.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pypgsql/pyPgSQL-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-DEPEND="virtual/glibc dev-db/postgresql dev-lang/python"
+KEYWORDS="x86"
+DEPEND="virtual/libc dev-db/postgresql virtual/python"
 S=${WORKDIR}/${PN}
+IUSE=""
+
+SLOT="0"
 
 src_compile() {
 	cd ${S}
diff --git a/dev-python/pypgsql/pypgsql-2.4.ebuild b/dev-python/pypgsql/pypgsql-2.4.ebuild
index d236d8b99897..6e18d7ac078e 100644
--- a/dev-python/pypgsql/pypgsql-2.4.ebuild
+++ b/dev-python/pypgsql/pypgsql-2.4.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/dev-python/pypgsql/pypgsql-2.4.ebuild,v 1.1 2003/10/12 07:40:54 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypgsql/pypgsql-2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pypgsql.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pypgsql/pyPgSQL-${PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
 SLOT="0"
 IUSE=""
 
@@ -17,6 +17,8 @@ DEPEND="dev-db/postgresql"
 
 S=${WORKDIR}/${PN}
 
+PYTHON_MODNAME="pyPgSQL"
+
 src_install() {
 	distutils_src_install
 	dodir /usr/share/doc/${PF}
diff --git a/dev-python/pyprotocols/ChangeLog b/dev-python/pyprotocols/ChangeLog
index 0e7071c41875..959dc66b32f3 100644
--- a/dev-python/pyprotocols/ChangeLog
+++ b/dev-python/pyprotocols/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for dev-python/pyprotocols
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/ChangeLog,v 1.1 2004/07/16 21:25:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyprotocols-0.9.3 (05 Dec 2004)
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +pyprotocols-0.9.3.ebuild:
+  Version bump.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> pyprotocols-0.9.2.ebuild:
+  Added to ~ppc.
 
 *pyprotocols-0.9.2 (16 Jul 2004)
 
-  16 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  16 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +pyprotocols-0.9.2.ebuild:
   Initial import, ebuild courtesy of Sourav Mandal <sourav@sourav.net>.
 
diff --git a/dev-python/pyprotocols/Manifest b/dev-python/pyprotocols/Manifest
index eb45976095ce..d8f865d8a985 100644
--- a/dev-python/pyprotocols/Manifest
+++ b/dev-python/pyprotocols/Manifest
@@ -1,2 +1,6 @@
-MD5 8db3c43775248ef1f1b9b36b4eeed851 pyprotocols-0.9.2.ebuild 656
+MD5 e1df2777fb5c48c3c338e03c35c6ba19 pyprotocols-0.9.3.ebuild 687
+MD5 fc3e9a02cb617d57708630914cc7f163 ChangeLog 749
+MD5 d029bbbc57d94977c99b24b0dc8d25a4 pyprotocols-0.9.2.ebuild 771
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 db9e24356b5b4e2ff2efdc4851d95843 files/digest-pyprotocols-0.9.2 69
+MD5 234e732efa26c81b4229527220c39636 files/digest-pyprotocols-0.9.3 69
diff --git a/dev-python/pyprotocols/pyprotocols-0.9.2.ebuild b/dev-python/pyprotocols/pyprotocols-0.9.2.ebuild
index ca9c57fb609b..caf2bfba383d 100644
--- a/dev-python/pyprotocols/pyprotocols-0.9.2.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-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/dev-python/pyprotocols/pyprotocols-0.9.2.ebuild,v 1.1 2004/07/16 21:25:50 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-0.9.2.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ LICENSE="ZPL"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND="sys-devel/gcc
 		>=dev-lang/python-2.2"
diff --git a/dev-python/pyprotocols/pyprotocols-0.9.3.ebuild b/dev-python/pyprotocols/pyprotocols-0.9.3.ebuild
index 97b4265877ca..b12eb9362a3d 100644
--- a/dev-python/pyprotocols/pyprotocols-0.9.3.ebuild
+++ b/dev-python/pyprotocols/pyprotocols-0.9.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/dev-python/pyprotocols/pyprotocols-0.9.3.ebuild,v 1.1 2004/12/05 16:02:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprotocols/pyprotocols-0.9.3.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyqwt/ChangeLog b/dev-python/pyqwt/ChangeLog
index 5a4864e57a70..a811833bc244 100644
--- a/dev-python/pyqwt/ChangeLog
+++ b/dev-python/pyqwt/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/pyqwt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.1 2005/02/28 23:05:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/ChangeLog,v 1.1.1.1 2005/11/30 10:10:05 chriswhite Exp $
 
 *pyqwt-4.2 (01 Mar 2005)
 
diff --git a/dev-python/pyqwt/Manifest b/dev-python/pyqwt/Manifest
index aca992e4144d..f276733c9602 100644
--- a/dev-python/pyqwt/Manifest
+++ b/dev-python/pyqwt/Manifest
@@ -1,4 +1,4 @@
-MD5 c570d9da65cc9a81e0bae8c77e329a3b pyqwt-4.2.ebuild 1136
-MD5 3e3b4c9a2bdfa208421543af154135fb ChangeLog 280
+MD5 951138135f4acbef4352be9283eb1a6f ChangeLog 367
 MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 ba13dd26d571f15756eb9bb0dae998cf pyqwt-4.2.ebuild 1233
 MD5 5f65fedd7bab477d2b60b91281d10d9a files/digest-pyqwt-4.2 62
diff --git a/dev-python/pyqwt/pyqwt-4.2.ebuild b/dev-python/pyqwt/pyqwt-4.2.ebuild
index 2b8b4369a5cc..a26998d2e672 100644
--- a/dev-python/pyqwt/pyqwt-4.2.ebuild
+++ b/dev-python/pyqwt/pyqwt-4.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-4.2.ebuild,v 1.1 2005/02/28 23:05:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyqwt/pyqwt-4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 
-inherit distutils eutils 
+inherit distutils eutils
 
 MY_P=PyQwt-${PV}
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyreverse/ChangeLog b/dev-python/pyreverse/ChangeLog
index dbe031905674..7f9de54e6dfe 100644
--- a/dev-python/pyreverse/ChangeLog
+++ b/dev-python/pyreverse/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for dev-python/pyreverse
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyreverse/ChangeLog,v 1.1 2004/02/17 21:17:57 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyreverse/ChangeLog,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+*pyreverse-0.5.1 (27 May 2005)
+
+  27 May 2005; Alastair Tse <liquidx@gentoo.org> +pyreverse-0.5.1.ebuild:
+  version bump
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> pyreverse-0.4.2-r1.ebuild:
+  Added ~sparc keyword.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  08 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  pyreverse-0.4.2-r1.ebuild, -pyreverse-0.4.2.ebuild:
+  Marked stable x86, removed obsolete
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> pyreverse-0.4.2-r1.ebuild:
+  Added to ~ppc.
+
+*pyreverse-0.4.2-r1 (27 Jul 2004)
+
+  27 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +pyreverse-0.4.2-r1.ebuild:
+  Fixed dependencies, added description to metadata.xml.
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyreverse-0.4.2.ebuild:
+  Add missing IUSE.
 
 *pyreverse-0.4.2 (17 Feb 2004)
 
-  17 Feb 2004; Bryan �stergaard,,, <kloeri@gentoo.org> pyreverse-0.4.2.ebuild:
+  17 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pyreverse-0.4.2.ebuild:
   Initial import.
 
diff --git a/dev-python/pyreverse/Manifest b/dev-python/pyreverse/Manifest
index d6d778083456..c43e143a2737 100644
--- a/dev-python/pyreverse/Manifest
+++ b/dev-python/pyreverse/Manifest
@@ -1,4 +1,16 @@
-MD5 7c5658f1ad90f125cd69096c371aae5a files/digest-pyreverse-0.4.2 66
-MD5 e250b521e870573ab4b82cef7bcd1a65 pyreverse-0.4.2.ebuild 546
-MD5 4fd8afba39e73d5317d5b55e065a0e59 ChangeLog 352
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 54c34862c798cb86a5e586aee2674be8 ChangeLog 1330
+MD5 7c5658f1ad90f125cd69096c371aae5a files/digest-pyreverse-0.4.2-r1 66
+MD5 7200337769d44edaecff3e7834cb7c88 files/digest-pyreverse-0.5.1 67
+MD5 7d3cd53d0cd90ce598d5f9539407c86f metadata.xml 968
+MD5 6921e1897588866bec2399c4340983e8 pyreverse-0.4.2-r1.ebuild 656
+MD5 d7a4fbc20d772d110d5fde4eeac5b24a pyreverse-0.5.1.ebuild 666
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwb7FdQwWVoAgN4RAia+AJ9EeR60bXro9/LUwGtmmCcIXt8dPQCfRxOY
+GZ88d3F8cnP8lzLnqXYJ0ik=
+=kKZL
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyreverse/metadata.xml b/dev-python/pyreverse/metadata.xml
index de483c53568f..500395f29102 100644
--- a/dev-python/pyreverse/metadata.xml
+++ b/dev-python/pyreverse/metadata.xml
@@ -2,4 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+PyReverse is a set of tools for reverse engineering Python code. So far,
+it features dependency analysis tools, documentation generation, and XMI
+generation for importation in a UML modeling tool. A special module can
+be used to generate files readable by Argo UML.
+</longdescription>
+<longdescription lang="ja">
+PyReverseはPython言語コードのリバース・エンジニアリングのためのツール集です。今>
+迄のところ、これの特徴はアナリシス・ツールやドキュメンテーション・ジェネレーショ
+ンやUMLモデリング・ツールへ移入するXMIジェネレーションに依存しています。特別なモ
+ジュールはArgoUMLで読み込めるジェネレート・ファイルに使うことができます。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pyreverse/pyreverse-0.4.2-r1.ebuild b/dev-python/pyreverse/pyreverse-0.4.2-r1.ebuild
index c9f425bd498d..af5fa6dee208 100644
--- a/dev-python/pyreverse/pyreverse-0.4.2-r1.ebuild
+++ b/dev-python/pyreverse/pyreverse-0.4.2-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/dev-python/pyreverse/pyreverse-0.4.2-r1.ebuild,v 1.1 2004/07/27 09:39:00 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyreverse/pyreverse-0.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.logilab.org/projects/pyreverse/"
 
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~sparc x86"
 LICENSE="GPL-2"
 DEPEND="virtual/python"
 RDEPEND="${DEPEND}
diff --git a/dev-python/pyreverse/pyreverse-0.5.1.ebuild b/dev-python/pyreverse/pyreverse-0.5.1.ebuild
index c88716201ae2..b7ecd313f303 100644
--- a/dev-python/pyreverse/pyreverse-0.5.1.ebuild
+++ b/dev-python/pyreverse/pyreverse-0.5.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/dev-python/pyreverse/pyreverse-0.5.1.ebuild,v 1.1 2005/05/27 17:42:50 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyreverse/pyreverse-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyrex/ChangeLog b/dev-python/pyrex/ChangeLog
index 79393da3ab5a..a5dfc8125d42 100644
--- a/dev-python/pyrex/ChangeLog
+++ b/dev-python/pyrex/ChangeLog
@@ -1,6 +1,137 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.1 2002/10/24 04:08:50 roughneck Exp $
+# ChangeLog for dev-python/pyrex
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/ChangeLog,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
+
+*pyrex-0.9.3.1 (02 Nov 2005)
+
+  02 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org>
+  +pyrex-0.9.3.1.ebuild:
+  version bump (patches are not needed anymore), fixing PYTHON_MODNAME
+  handling (modules are now correctly compiled), ebuild cleanup.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  Stable on hppa.
+
+  22 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  Stable on sparc
+
+  14 May 2005; Rene Nussbaumer <killerfox@gentoo.org> pyrex-0.9.3-r1.ebuild,
+  pyrex-0.9.3-r2.ebuild:
+  added ~hppa
+
+*pyrex-0.9.3-r2 (24 Apr 2005)
+
+  24 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/pyrex-0.9.2.1-gcc4.patch, +pyrex-0.9.3-r2.ebuild:
+  Support for generating gcc4 compatible code (patch from Fedora).
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  stable on ia64
+
+  26 Feb 2005; Lukasz Strzygowski <lucass@gentoo.org> pyrex-0.9.3-r1.ebuild:
+  Marked stable on x86.
+
+  20 Jan 2005; Aron Griffis <agriffis@gentoo.org> pyrex-0.9.3.ebuild:
+  stable on ia64
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> pyrex-0.9.3.ebuild:
+  Stable on amd64.
+
+*pyrex-0.9.3-r1 (07 Jan 2005)
+
+  07 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/pyrex-0.9.3-python24_distutils.patch, +pyrex-0.9.3-r1.ebuild:
+  Added distutils patch for Python2.4. Thanks Jacob Smullyan
+  <smulloni@smullyan.org> bug# 77042
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> pyrex-0.9.3.ebuild:
+  Stable on ppc64
+
+  11 Nov 2004; Mike Gardiner <obz@gentoo.org> pyrex-0.9.3.ebuild:
+  Keyworded ppc, as a dependency of dbus, in marking GNOME 2.8
+
+  08 Nov 2004; Markus Rothe <corsair@gentoo.org> pyrex-0.9.3.ebuild:
+  Marked ~ppc64
+
+  20 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> pyrex-0.9.3.ebuild:
+  Added to ~sparc.
+
+  21 Oct 2004; Aron Griffis <agriffis@gentoo.org> pyrex-0.9.3.ebuild:
+  add ~ia64
+
+  30 Sep 2004; Stephen P. Becker <geoman@gentoo.org> pyrex-0.9.3.ebuild:
+  added ~mips keyword
+
+  05 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> pyrex-0.9.3.ebuild:
+  Added amd64 keyword, closing #58467.
+
+  08 Aug 2004; David Holm <dholm@gentoo.org> pyrex-0.9.3.ebuild:
+  Added to ~ppc.
+
+*pyrex-0.9.3 (11 Jul 2004)
+
+  11 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> -pyrex-0.9.1.1.ebuild,
+  pyrex-0.9.2.1.ebuild, +pyrex-0.9.3.ebuild:
+  Bump version, stable 0.9.2.1 on x86 and remove old ebuild.
+
+*pyrex-0.9.2.1 (08 May 2004)
+
+  08 May 2004; Bryan Østergaard <kloeri@gentoo.org> -pyrex-0.7.1.ebuild,
+  +pyrex-0.9.2.1.ebuild, -pyrex-0.9.ebuild:
+  Version bump, remove old versions.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyrex-0.5.ebuild,
+  pyrex-0.7.1.ebuild, pyrex-0.8.2.ebuild, pyrex-0.9.ebuild:
+  Add missing IUSE.
+
+*pyrex-0.9.1.1 (03 May 2004)
+
+  03 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +files/pyrex-0.9.1.1-gentoo.patch, +pyrex-0.9.1.1.ebuild:
+  Version bump, bug #49734.
+
+*pyrex-0.9 (03 Apr 2004)
+
+  03 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pyrex-0.9.ebuild:
+  Version bump, bug #46679.
+
+*pyrex-0.8.2 (08 Jul 2003)
+
+  08 Jul 2003; Alastair Tse <liquidx@gentoo.org> pyrex-0.8.2.ebuild:
+  version bump
+
+*pyrex-0.8 (25 Jun 2003)
+
+  25 Jun 2003; Alastair Tse <liquidx@gentoo.org> pyrex-0.8.ebuild:
+  version bump
+
+*pyrex-0.7.1 (19 Apr 2003)
+
+  19 Apr 2003; Alastair Tse <liquidx@gentoo.org> pyrex-0.7.1.ebuild:
+  version bump
+
+*pyrex-0.6.1 (04 Apr 2003)
+
+  04 Apr 2002; Alastair Tse <liquidx@gentoo.org> pyrex-0.6.1.ebuild:
+  Version Bump
+
+*pyrex-0.5 (11 Dec 2002)
+
+ 11 Dec 2002; B.Lauwers <blauwers@gentoo.org> pyrex-0.5.ebuild, Changelog :
+
+ Version bump per Bug#11751
 
 *pyrex-0.4.5 (23 Oct 2002)
 
diff --git a/dev-python/pyrex/Manifest b/dev-python/pyrex/Manifest
index 3a3a0bd44138..5bd131305240 100644
--- a/dev-python/pyrex/Manifest
+++ b/dev-python/pyrex/Manifest
@@ -1,9 +1,20 @@
-MD5 6b26ae5ca5a773bff64dcdb278b116f5 ChangeLog 763
-MD5 b28bcc8eb07915e0b66c02782efd2775 pyrex-0.4.5.ebuild 898
-MD5 672cd0df90d72164adb80df347420f28 pyrex-0.5.ebuild 835
-MD5 4a96f2ccf41b6e1b77f1e24277201c9b pyrex-0.6.1.ebuild 819
-MD5 8e6a19c0df640198d2aeeb91da8a7487 pyrex-0.7.1.ebuild 819
-MD5 d31b6db3929b1b1e47003f4ec3a9308a files/digest-pyrex-0.4.5 63
-MD5 0b6119a106d045a4cfa4647d3d12e5cc files/digest-pyrex-0.5 120
-MD5 b6a951b8004d9a6ef7b88027f2ddd9ca files/digest-pyrex-0.6.1 124
-MD5 063768a9ab68fa42e5c4477c1703a791 files/digest-pyrex-0.7.1 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39b2f6ea85f03ca99b83a2da774104c3 ChangeLog 4357
+MD5 1bbfae8705264d80f234c7e386329e56 files/digest-pyrex-0.9.3-r1 63
+MD5 1bbfae8705264d80f234c7e386329e56 files/digest-pyrex-0.9.3-r2 63
+MD5 e16277e2e6a0398b090274b47e9ae7fe files/digest-pyrex-0.9.3.1 65
+MD5 b5bb4ba679c6de2f55651b7c6af8f013 files/pyrex-0.9.2.1-gcc4.patch 2877
+MD5 c587d86c063eda8fb02e18b9b1c83aec files/pyrex-0.9.3-python24_distutils.patch 622
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 d08c9ca7453de3d3f1520a83830e794b pyrex-0.9.3-r1.ebuild 988
+MD5 f17d1977aeaf8245f9d7a45a9f23dcc1 pyrex-0.9.3-r2.ebuild 1062
+MD5 c8637ba60c601e666afc5a9e70fbb085 pyrex-0.9.3.1.ebuild 819
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaGwMI1lqEGTUzyQRAtZeAKCT3/L6uadyfHwyLZgtvclsEEMjcQCeIUEd
+PPX2DJABrHZ7MVcYI6VWBB4=
+=F+9y
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyrex/pyrex-0.9.3-r1.ebuild b/dev-python/pyrex/pyrex-0.9.3-r1.ebuild
index f6df4c9d3b5f..fc8f3f3f9665 100644
--- a/dev-python/pyrex/pyrex-0.9.3-r1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.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/dev-python/pyrex/pyrex-0.9.3-r1.ebuild,v 1.1 2005/01/07 20:53:12 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="amd64 ia64 ~mips ppc sparc x86 ppc64 hppa"
 IUSE=""
 
 DEPEND="virtual/python"
diff --git a/dev-python/pyrex/pyrex-0.9.3-r2.ebuild b/dev-python/pyrex/pyrex-0.9.3-r2.ebuild
index 874d42e6e8ab..12c4df00ba96 100644
--- a/dev-python/pyrex/pyrex-0.9.3-r2.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.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/dev-python/pyrex/pyrex-0.9.3-r2.ebuild,v 1.1 2005/04/24 19:03:31 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
+KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64 ~hppa"
 IUSE=""
 
 DEPEND="virtual/python"
diff --git a/dev-python/pyrex/pyrex-0.9.3.1.ebuild b/dev-python/pyrex/pyrex-0.9.3.1.ebuild
index 4e44a1e7e737..4512b8373bcb 100644
--- a/dev-python/pyrex/pyrex-0.9.3.1.ebuild
+++ b/dev-python/pyrex/pyrex-0.9.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/dev-python/pyrex/pyrex-0.9.3.1.ebuild,v 1.1 2005/11/02 03:14:07 sbriesen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrex/pyrex-0.9.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils portability
 
@@ -15,8 +15,6 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64 ~hppa"
 IUSE=""
 
-DEPEND="virtual/python"
-
 PYTHON_MODNAME="Pyrex"
 
 src_install() {
diff --git a/dev-python/pyro/ChangeLog b/dev-python/pyro/ChangeLog
index 463558848bdc..7431f5728fb6 100644
--- a/dev-python/pyro/ChangeLog
+++ b/dev-python/pyro/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for dev-python/pyro
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.1 2004/02/16 00:13:18 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/ChangeLog,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
+
+  18 Sep 2005; Simon Stelling <blubb@gentoo.org> pyro-3.4.ebuild:
+  stable on amd64
+
+  17 Sep 2005; Lukasz Strzygowski <lucass@gentoo.org> pyro-3.3-r1.ebuild,
+  pyro-3.4.ebuild:
+  Marked stable on x86.
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> pyro-3.3.ebuild:
+  stable on x86
+
+*pyro-3.4 (28 Jan 2005)
+
+  28 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/pyro-3.4-unattend.patch, +pyro-3.4.ebuild:
+  Version bump.
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> pyro-3.3-r1.ebuild:
+  added ~amd64
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> pyro-3.3-r1.ebuild:
+  Added to ~ppc.
+
+*pyro-3.3-r1 (07 Jul 2004)
+
+  07 Jul 2004; Alastair Tse <liquidx@gentoo.org> +pyro-3.3-r1.ebuild,
+  pyro-3.3.ebuild:
+  fix overwriting /usr/bin/esd temporarily be renaming esd to pyroesd. (#56096)
+
+  17 Feb 2004; <kloeri@gentoo.org> pyro-3.3.ebuild:
+  Add missing SLOT.
 
 *pyro-3.3 (16 Feb 2004)
 
diff --git a/dev-python/pyro/Manifest b/dev-python/pyro/Manifest
index b336d487153a..5dcd3c0a9ef6 100644
--- a/dev-python/pyro/Manifest
+++ b/dev-python/pyro/Manifest
@@ -1,5 +1,10 @@
-MD5 be577bdd9f14e88c46a0227afe100a0e pyro-3.3.ebuild 737
-MD5 01b076ea419caeec0772940c0977f0b8 ChangeLog 341
+MD5 2b7f6c9c7488a53dd83bcc1f5a196d9e ChangeLog 1209
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 7aab08bb63b43487c72f57c323a501fc pyro-3.3-r1.ebuild 977
+MD5 2de9bc90123850fcb6205463c023736d pyro-3.3.ebuild 792
+MD5 c9ea7bb1318f1517b15b1b9e722d14e9 pyro-3.4.ebuild 972
 MD5 cdae824e917caf8378aaa36510f771b5 files/digest-pyro-3.3 60
+MD5 cdae824e917caf8378aaa36510f771b5 files/digest-pyro-3.3-r1 60
+MD5 2f6380f548ae4fc0a299f034c247cde0 files/digest-pyro-3.4 60
 MD5 8415324a478ba3479fe4422e81739853 files/pyro-3.3-unattend.patch 419
+MD5 7652e1163c0529b0b4f6c6d0088767c9 files/pyro-3.4-unattend.patch 419
diff --git a/dev-python/pyro/pyro-3.3-r1.ebuild b/dev-python/pyro/pyro-3.3-r1.ebuild
index 7f60d37bbd99..fd332f72bd58 100644
--- a/dev-python/pyro/pyro-3.3-r1.ebuild
+++ b/dev-python/pyro/pyro-3.3-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/dev-python/pyro/pyro-3.3-r1.ebuild,v 1.1 2004/07/07 02:34:39 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pyro/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND="virtual/python"
@@ -36,4 +36,4 @@ src_install() {
 pkg_postinst() {
 	einfo "Pyro's Event Service Daemon, /usr/bin/esd has been renamed to"
 	einfo " /usr/bin/pyroesd to avoid conflict with media-sound/esound."
-}
\ No newline at end of file
+}
diff --git a/dev-python/pyro/pyro-3.3.ebuild b/dev-python/pyro/pyro-3.3.ebuild
index 6f6564236b18..b28e98fed0a4 100644
--- a/dev-python/pyro/pyro-3.3.ebuild
+++ b/dev-python/pyro/pyro-3.3.ebuild
@@ -1,29 +1,34 @@
-# 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/dev-python/pyro/pyro-3.3.ebuild,v 1.1 2004/02/16 00:13:18 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
-inherit distutils
-
-DESCRIPTION="Pyro is an advanced and powerful Distributed Object Technology system written entirely in Python"
+inherit distutils eutils
 
 MY_P="Pyro-${PV}"
-S=${WORKDIR}/${MY_P}
-HOMEPAGE="http://pyro.sourceforge.net"
-LICENSE="MIT"
+DESCRIPTION="advanced and powerful Distributed Object Technology system written entirely in Python"
+HOMEPAGE="http://pyro.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pyro/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
-src_unpack () {
+DEPEND="virtual/python"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/${P}-unattend.patch
 }
 
-src_install () {
+src_install() {
 	distutils_src_install
 
 	dodir /usr/share/doc/${PF}/examples
-	cp -r ${S}/examples $D/usr/share/doc/${PF}
+	cp -r ${S}/examples ${D}/usr/share/doc/${PF}
 	dohtml -r docs/*
+
+	mv /usr/bin/esd /usr/bin/pyroesd
 }
diff --git a/dev-python/pyro/pyro-3.4.ebuild b/dev-python/pyro/pyro-3.4.ebuild
index 15189e24e083..0fca5a52143a 100644
--- a/dev-python/pyro/pyro-3.4.ebuild
+++ b/dev-python/pyro/pyro-3.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/dev-python/pyro/pyro-3.4.ebuild,v 1.1 2005/01/28 17:15:58 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyro/pyro-3.4.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pyro/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="virtual/python"
diff --git a/dev-python/pyrtf/ChangeLog b/dev-python/pyrtf/ChangeLog
index d248298d17e3..fb91a25578ba 100644
--- a/dev-python/pyrtf/ChangeLog
+++ b/dev-python/pyrtf/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/pyrtf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrtf/ChangeLog,v 1.1 2005/06/19 15:31:59 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrtf/ChangeLog,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 *pyrtf-0.45 (19 Jun 2005)
 
diff --git a/dev-python/pyrtf/Manifest b/dev-python/pyrtf/Manifest
index 8dfe8273215f..94ec389a9618 100644
--- a/dev-python/pyrtf/Manifest
+++ b/dev-python/pyrtf/Manifest
@@ -1,4 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 200d2077b117f7634e50c0635f49f66a pyrtf-0.45.ebuild 465
-MD5 01caf25a693b08ade9735d13864660e2 ChangeLog 311
+MD5 9e023ac72267e158ae2bb65b795bf549 pyrtf-0.45.ebuild 560
+MD5 408d0a3d1e9ba425ebd80e1b3976ebb7 ChangeLog 398
 MD5 10a94cc182772d9e503df22342302977 files/digest-pyrtf-0.45 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtZAOxtZcznfol0URAndyAKDlJgpvVPqDqYWrtWeN7yKTcnSFDgCgliww
+Ynyj8BP/olKCTHY53jnd1ic=
+=0sh6
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyrtf/pyrtf-0.45.ebuild b/dev-python/pyrtf/pyrtf-0.45.ebuild
index e00f2bb02b4c..761ffa0961fd 100644
--- a/dev-python/pyrtf/pyrtf-0.45.ebuild
+++ b/dev-python/pyrtf/pyrtf-0.45.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/dev-python/pyrtf/pyrtf-0.45.ebuild,v 1.1 2005/06/19 15:31:59 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyrtf/pyrtf-0.45.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyserial/ChangeLog b/dev-python/pyserial/ChangeLog
index a46cfac4ad0b..37872dce2856 100644
--- a/dev-python/pyserial/ChangeLog
+++ b/dev-python/pyserial/ChangeLog
@@ -1,7 +1,49 @@
 # ChangeLog for dev-python/pyserial
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/ChangeLog,v 1.1 2003/02/27 02:24:53 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/ChangeLog,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyserial-2.1.ebuild:
+  add ~ia64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyserial-2.0.ebuild:
+  Stable on ppc.
+
+*pyserial-2.1 (20 Feb 2005)
+
+  20 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> +pyserial-2.1.ebuild:
+  Version bump, changed keywords to ~
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> pyserial-2.0.ebuild:
+  Added ~sparc keyword.
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pyserial-2.0.ebuild:
+  Stable on alpha.
+
+  22 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pyserial-2.0.ebuild:
+  Added ~alpha to keywords.
+
+  16 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> pyserial-1.18.ebuild,
+  pyserial-2.0.ebuild:
+  add app-arch/unzip to DEPEND to fix bug #48009
+
+  06 Mar 2004; David Holm <dholm@gentoo.org> pyserial-2.0.ebuild:
+  Added to ~ppc.
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> pyserial-2.0.ebuild:
+  bump pyserial 2.0 to stable, for py2.3 changes
+
+*pyserial-2.0 (12 Nov 2003)
+
+  12 Nov 2003; Alastair Tse <liquidx@gentoo.org> pyserial-2.0.ebuild:
+  version bump, added PYTHON_MODNAME
 
 *pyserial-1.18 (27 Feb 2002)
+
+  25 Mar 2003; Alastair Tse <liquidx@gentoo.org> pyserial-1.18.ebuild:
+  bump to stable
+
   27 Feb 2002; Alastair Tse <liquidx@gentoo.org> pyserial-1.18.ebuild:
   Initial Import. Bug #11928
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index e69de29bb2d1..a00eb11e0f21 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -0,0 +1,8 @@
+MD5 f097db4a56037fd6a334ff3b1cb3fa8c pyserial-1.18.ebuild 463
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 961d2f21acd7b1af5d5026606f2465b8 ChangeLog 1639
+MD5 51da7de9c655a339cc61193c520b6444 pyserial-2.1.ebuild 507
+MD5 8b29dc951e33f991d729355341814a69 pyserial-2.0.ebuild 496
+MD5 e9357a610f14dd701ef8f69bb7e0dedf files/digest-pyserial-2.1 60
+MD5 2113c1cafc4d908581e1e3d38e2f0a8d files/digest-pyserial-1.18 61
+MD5 b7667a4a031f4c96a953e61a5dc48d53 files/digest-pyserial-2.0 60
diff --git a/dev-python/pyserial/pyserial-1.18.ebuild b/dev-python/pyserial/pyserial-1.18.ebuild
index b173e6b8760b..dab34243bd3a 100644
--- a/dev-python/pyserial/pyserial-1.18.ebuild
+++ b/dev-python/pyserial/pyserial-1.18.ebuild
@@ -1,15 +1,16 @@
-# 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/dev-python/pyserial/pyserial-1.18.ebuild,v 1.1 2003/02/27 02:24:53 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-1.18.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
+
 inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Python Serial Port Extension"
 SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 HOMEPAGE="http://pyserial.sourceforge.net"
 IUSE=""
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
-DEPEND="virtual/python"
+DEPEND="virtual/python
+	app-arch/unzip"
diff --git a/dev-python/pyserial/pyserial-2.0.ebuild b/dev-python/pyserial/pyserial-2.0.ebuild
index 362fcf49a2d4..bdc1e15e09bd 100644
--- a/dev-python/pyserial/pyserial-2.0.ebuild
+++ b/dev-python/pyserial/pyserial-2.0.ebuild
@@ -1,16 +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/dev-python/pyserial/pyserial-2.0.ebuild,v 1.1 2003/11/12 00:48:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python Serial Port Extension"
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 HOMEPAGE="http://pyserial.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 IUSE=""
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64 ppc alpha ~sparc"
 
 PYTHON_MODNAME="serial"
+DEPEND="app-arch/unzip"
diff --git a/dev-python/pyserial/pyserial-2.1.ebuild b/dev-python/pyserial/pyserial-2.1.ebuild
index 21f491e60754..4b787c8cdba5 100644
--- a/dev-python/pyserial/pyserial-2.1.ebuild
+++ b/dev-python/pyserial/pyserial-2.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/dev-python/pyserial/pyserial-2.1.ebuild,v 1.1 2005/02/20 09:56:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyserial/pyserial-2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 IUSE=""
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 
 PYTHON_MODNAME="serial"
 DEPEND="app-arch/unzip"
diff --git a/dev-python/pysnmp/ChangeLog b/dev-python/pysnmp/ChangeLog
index a87ee72394a6..1a10043297c7 100644
--- a/dev-python/pysnmp/ChangeLog
+++ b/dev-python/pysnmp/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for dev-python/pysnmp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/ChangeLog,v 1.1 2003/07/03 09:08:47 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  15 Nov 2005; <dang@gentoo.org> pysnmp-3.4.2.ebuild:
+  Marked ~amd64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pysnmp-2.0.8.ebuild:
+  Stable on ppc.
+
+*pysnmp-4.0.1a (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> +pysnmp-4.0.1a.ebuild:
+  Version bump.
+
+  30 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pysnmp-3.4.2 (23 Jun 2004)
+
+  23 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> pysnmp-3.4.2.ebuild, metadata.xml:
+  Version bump. Thanks for info to Mike C. Fletcher in bug #54869. 
+  Marked testing on x86, sparc and ppc. Added commands to install 
+  whole documentation and examples. Added longdescription to metadata.xml.
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> pysnmp-2.0.8.ebuild:
+  Added to ~ppc.
+
+  21 May 2004; Jason Wever <weeve@gentoo.org> pysnmp-2.0.8.ebuild:
+  Added ~sparc keyword.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pysnmp-2.0.8.ebuild:
+  Remove default S.
 
 *pysnmp-2.0.8 (03 Jul 2003)
 
diff --git a/dev-python/pysnmp/Manifest b/dev-python/pysnmp/Manifest
index 90802eddffea..2840ac772f02 100644
--- a/dev-python/pysnmp/Manifest
+++ b/dev-python/pysnmp/Manifest
@@ -1,3 +1,18 @@
-MD5 7955198f00a483133301ddd676dd86bc pysnmp-3.3.4.ebuild 353
-MD5 7955198f00a483133301ddd676dd86bc pysnmp-2.0.8.ebuild 353
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 269487196e3f1fc1025d4cf21e731241 ChangeLog 1508
 MD5 b30937ff6795e9c21197fb0f017b65ce files/digest-pysnmp-2.0.8 63
+MD5 f1302fe6c3ae374b76578a63ed08b9ba files/digest-pysnmp-3.4.2 63
+MD5 cdfb4b386b7d03da6b594f975f0f9b8e files/digest-pysnmp-4.0.1a 64
+MD5 580899131a738dbb440a5b1584cc0fad metadata.xml 1199
+MD5 abefa6bac069de678b5b4d683cc9b17d pysnmp-2.0.8.ebuild 434
+MD5 833e36cea93e9ee8674df70dd93c2db4 pysnmp-3.4.2.ebuild 571
+MD5 290041af2524a11c1b13c6e0671d080e pysnmp-4.0.1a.ebuild 567
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwdIFdQwWVoAgN4RAm/8AJ9kkzpZIHAJDaWMwcsFxCnVCtII7QCfWIi+
+W73jFKzwap2Evgd8BEMrms8=
+=kSi6
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index de483c53568f..e4a7b1480a1b 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -2,4 +2,22 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+This is a Python implementation of SNMP v.1/v.2c engine. Its general
+functionality is to assemble/disassemble SNMP messages from/into
+given SNMP Object IDs along with associated values. PySNMP also provides
+a few transport methods specific to TCP/IP networking.
+
+PySNMP is written entirely in Python and is self-sufficient in terms
+that it does not rely on any third party tool (it is not a wrapper!).
+</longdescription>
+<longdescription lang="ja">
+これは SNMP v.1/v.2 エンジンのPython言語での実装です。関連値に沿ったSNMPオブジェ
+クトIDから/へSNMPメッセージをアセンブル/ディスアセンブルするのが一般的な機能です
+。PySNMPは幾つかのTCP/IPネットワーキングを特定するトランスポート・メソッドも提供
+します。
+
+PySNMPは全体をPython言語で記述され、どのサードパーティ製ツールも信用しない立場で
+自給自足します。(これはラッパー・ツールではありません。)
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pysnmp/pysnmp-2.0.8.ebuild b/dev-python/pysnmp/pysnmp-2.0.8.ebuild
index b4f9d4b51845..799ad71aa984 100644
--- a/dev-python/pysnmp/pysnmp-2.0.8.ebuild
+++ b/dev-python/pysnmp/pysnmp-2.0.8.ebuild
@@ -1,14 +1,13 @@
-# 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/dev-python/pysnmp/pysnmp-2.0.8.ebuild,v 1.1 2003/07/03 09:08:47 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/pysnmp-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
-S="${WORKDIR}/${P}"
 DESCRIPTION="SNMP framework in Python. Not a wrapper."
 HOMEPAGE="http://pysnmp.sf.net/"
 SRC_URI="mirror://sourceforge/pysnmp/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc ppc"
 IUSE=""
diff --git a/dev-python/pysnmp/pysnmp-3.4.2.ebuild b/dev-python/pysnmp/pysnmp-3.4.2.ebuild
index f7e273aba4dc..0a1750e7cee8 100644
--- a/dev-python/pysnmp/pysnmp-3.4.2.ebuild
+++ b/dev-python/pysnmp/pysnmp-3.4.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/dev-python/pysnmp/pysnmp-3.4.2.ebuild,v 1.1 2004/06/23 11:03:47 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/pysnmp-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pysnmp.sf.net/"
 SRC_URI="mirror://sourceforge/pysnmp/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 src_install(){
diff --git a/dev-python/pysnmp/pysnmp-4.0.1a.ebuild b/dev-python/pysnmp/pysnmp-4.0.1a.ebuild
index 3c6b3bdcaa5f..b33aa5757e7e 100644
--- a/dev-python/pysnmp/pysnmp-4.0.1a.ebuild
+++ b/dev-python/pysnmp/pysnmp-4.0.1a.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/dev-python/pysnmp/pysnmp-4.0.1a.ebuild,v 1.1 2005/04/14 20:06:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysnmp/pysnmp-4.0.1a.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pysqlite/ChangeLog b/dev-python/pysqlite/ChangeLog
index 8b648e2a2032..2ecb2d72ea58 100644
--- a/dev-python/pysqlite/ChangeLog
+++ b/dev-python/pysqlite/ChangeLog
@@ -1,6 +1,140 @@
 # ChangeLog for dev-python/pysqlite
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/ChangeLog,v 1.1 2002/07/30 08:32:24 rphillips Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/ChangeLog,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
+
+  20 Nov 2005; <dang@gentoo.org> pysqlite-1.0.1.ebuild:
+  Marked stable on amd64
+
+*pysqlite-2.0.5 (06 Nov 2005)
+
+  06 Nov 2005; Alastair Tse <liquidx@gentoo.org> -pysqlite-2.0.2.ebuild,
+  -pysqlite-2.0.3.ebuild, +pysqlite-2.0.5.ebuild:
+  version bump
+
+*pysqlite-2.0.4 (30 Sep 2005)
+
+  30 Sep 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +pysqlite-2.0.4.ebuild:
+  Version bump. Closing bug #105696.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pysqlite-2.0.3.ebuild:
+  add ~ia64
+
+*pysqlite-2.0.3 (01 Aug 2005)
+
+  01 Aug 2005; Rob Cakebread <pythonhead@gentoo.org> pysqlite-0.5.1.ebuild,
+  pysqlite-1.0.1.ebuild, pysqlite-2.0.2.ebuild, +pysqlite-2.0.3.ebuild:
+  Version bump, fixed deps for dev-lang/python.
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org> pysqlite-2.0.2.ebuild:
+  Marked ~ppc for bug #98814.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> pysqlite-2.0.2.ebuild:
+  Add ~alpha keyword.
+
+  27 May 2005; Jason Wever <weeve@gentoo.org> pysqlite-1.0.1.ebuild:
+  Stable on SPARC.
+
+*pysqlite-2.0.2 (26 May 2005)
+
+  26 May 2005; Fernando Serboncini <fserb@gentoo.org>
+  -pysqlite-0.3.1.ebuild, -pysqlite-0.4.1.ebuild, -pysqlite-0.4.3.ebuild,
+  -pysqlite-0.5.0.ebuild, -pysqlite-1.0.ebuild, pysqlite-1.0.1.ebuild,
+  +pysqlite-2.0.2.ebuild:
+  Removed old versions
+  marked 1.0.1 stable on x86
+  2.0.2 version bump
+
+*pysqlite-1.0.1 (24 Apr 2005)
+
+  24 Apr 2005; Anders Rune Jensen <arj@gentoo.org> +pysqlite-1.0.1.ebuild,
+  pysqlite-1.0.1.ebuild:
+  New version, works on amd64.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> pysqlite-1.0.ebuild:
+  Added ~sparc keyword.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> pysqlite-0.5.1.ebuild:
+  stable on amd64.
+
+*pysqlite-1.0 (10 Oct 2004)
+
+  10 Oct 2004; Anders Rune Jensen <arj@gentoo.org> pysqlite-1.0.ebuild:
+  New version, minor changes.
+
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> pysqlite-0.5.1.ebuild:
+  Stable on alpha.
+
+  03 Oct 2004; Anders Rune Jensen <arj@gentoo.org> pysqlite-0.5.1.ebuild:
+  Stable on x86.
+
+  23 Sep 2004; Ferris McCormick <fmccor@gentoo.org> pysqlite-0.5.1.ebuild:
+  Stable for sparc.
+
+  10 Sep 2004; Hasan Khalil <gongloo@gentoo.org> pysqlite-0.5.1.ebuild:
+  Stable macos.
+
+  07 Sep 2004; Ferris McCormick <fmccor@gentoo.org> pysqlite-0.5.1.ebuild:
+  Add ~sparc keyword. Builds and runs tests, examples on sparc with
+  sqlite-2.8.14.
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> pysqlite-0.3.1.ebuild,
+  pysqlite-0.4.1.ebuild, pysqlite-0.4.3.ebuild, pysqlite-0.5.0.ebuild,
+  pysqlite-0.5.1.ebuild:
+  Depend on version 2 of sqlite.
+
+*pysqlite-0.5.1 (06 Jul 2004)
+
+  06 Jul 2004; Anders Rune Jensen <arj@gentoo.org> pysqlite-0.5.1.ebuild:
+  New version
+
+  06 Jul 2004; Anders Rune Jensen <arj@gentoo.org> pysqlite-0.5.0.ebuild:
+  Mark as stable
+
+  02 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pysqlite-0.5.0.ebuild:
+  Stable on alpha.
+
+  20 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pysqlite-0.5.0.ebuild:
+  Added ~alpha to keywords.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> pysqlite-0.4.3.ebuild:
+  Stable on sparc.
+
+*pysqlite-0.5.0 (30 Jan 2004)
+
+  30 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pysqlite-0.5.0.ebuild:
+  New version
+
+*pysqlite-0.4.3 (26 Jun 2003)
+
+  26 Jun 2003; Alastair Tse <liquidx@gentoo.org> pysqlite-0.4.3.ebuild:
+  version bump
+
+*pysqlite-0.4.1 (16 May 2003)
+
+  16 May 2003; Alastair Tse <liquidx@gentoo.org> pysqlite-0.4.1.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*pysqlite-0.3.1 (23 Nov 2002)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pysqlite-0.3.1.ebuild:
+  distutil-ize
+
+  23 Nov 2003; Bart Verwilst <verwilst@gentoo.org> :
+  New version
+
+*pysqlite-0.2.0-r1 (03 Nov 2002)
+
+  03 Nov 2002; Nicholas Henke <roughneck@gentoo.org> pysqlite-0.2.0-r1.ebuild files/digest-pysqlite-0.2.0-r1:\
+  old ebuild did not install examples correctly. Thanks to Bardur Arantsson <bardur-gta@odense.kollegienet.dk> for bug fix.
+  Removed pysqlite-0.2.0.ebuild files/digest-pysqlite-0.2.0
+  
+  Added ppc to keywords
 
 *pysqlite-0.2.0 (30 Jul 2002)
 
diff --git a/dev-python/pysqlite/Manifest b/dev-python/pysqlite/Manifest
index d4a5acaa7bdc..389038a42ef4 100644
--- a/dev-python/pysqlite/Manifest
+++ b/dev-python/pysqlite/Manifest
@@ -1,7 +1,20 @@
-MD5 7e1b24cb7739e83ef52eb943ff062022 ChangeLog 980
-MD5 fdb332521b5e7a2ce1b66e5f0028762b pysqlite-0.2.0-r1.ebuild 834
-MD5 53f45b7768e5afde0283f6edc7b02950 pysqlite-0.3.1.ebuild 760
-MD5 e1beee195d65e7799e1d6e4f550b26dc pysqlite-0.4.1.ebuild 764
-MD5 a698d92790a57551420d82611a3520c6 files/digest-pysqlite-0.2.0-r1 65
-MD5 e553eec3bb40bcfc1ace7fc8f2e60806 files/digest-pysqlite-0.3.1 129
-MD5 2358ec1e5d6c50a9b165a50d31c0e5a8 files/digest-pysqlite-0.4.1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea52fab86d75da9fe033d4c8da46c42f ChangeLog 4498
+MD5 c27bf7af6842480285e9a1bc6422480a files/digest-pysqlite-0.5.1 65
+MD5 8474697be6f1f182b2e727ae06f3714c files/digest-pysqlite-1.0.1 65
+MD5 dd51c2919dfa483fcfc70c4c331f4a43 files/digest-pysqlite-2.0.4 65
+MD5 d3a68b39767346805785855ab9169ffd files/digest-pysqlite-2.0.5 65
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 1a1bd270218fb545aaa20212213645f3 pysqlite-0.5.1.ebuild 889
+MD5 7e8ab9fa1b878c10c7c78acc8e45042e pysqlite-1.0.1.ebuild 862
+MD5 77cc3cab9ea1cc4a5ebc3b5be7cda4a3 pysqlite-2.0.4.ebuild 1006
+MD5 36b72b749593cb46e00fd6cfe294e2c0 pysqlite-2.0.5.ebuild 1007
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgNU5omPajV0RnrERAuncAJ4ysGJOSLWAW9wNgm7JIfvQp8lgFACeO0Lo
+cjeJRRoXT/qFTcdMr14FPow=
+=48Ud
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pysqlite/pysqlite-0.5.1.ebuild b/dev-python/pysqlite/pysqlite-0.5.1.ebuild
index 768123478c07..506bb3dbbe4e 100644
--- a/dev-python/pysqlite/pysqlite-0.5.1.ebuild
+++ b/dev-python/pysqlite/pysqlite-0.5.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/dev-python/pysqlite/pysqlite-0.5.1.ebuild,v 1.1 2004/07/06 15:18:49 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -9,12 +9,12 @@ DESCRIPTION="Python wrapper for the local database Sqlite"
 SRC_URI="mirror://sourceforge/pysqlite/pysqlite-${PV}.tar.gz"
 HOMEPAGE="http://pysqlite.sourceforge.net/"
 
-KEYWORDS="~x86 ~alpha ~amd64"
+KEYWORDS="x86 alpha amd64 ppc sparc ppc-macos"
 LICENSE="pysqlite"
 SLOT="0"
 
-DEPEND="virtual/python
-	dev-db/sqlite"
+DEPEND=">=dev-lang/python-2.2
+	=dev-db/sqlite-2*"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-python/pysqlite/pysqlite-1.0.1.ebuild b/dev-python/pysqlite/pysqlite-1.0.1.ebuild
index 42f4d8a60a61..ff0d4a5ac1c1 100644
--- a/dev-python/pysqlite/pysqlite-1.0.1.ebuild
+++ b/dev-python/pysqlite/pysqlite-1.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/dev-python/pysqlite/pysqlite-1.0.1.ebuild,v 1.1 2005/04/24 10:47:30 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
@@ -9,11 +9,11 @@ DESCRIPTION="Python wrapper for the local database Sqlite"
 SRC_URI="mirror://sourceforge/pysqlite/pysqlite-${PV}.tar.gz"
 HOMEPAGE="http://pysqlite.sourceforge.net/"
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="amd64 sparc x86"
 LICENSE="pysqlite"
 SLOT="0"
 
-DEPEND="virtual/python
+DEPEND=">=dev-lang/python-2.2
 	=dev-db/sqlite-2*"
 
 src_unpack() {
diff --git a/dev-python/pysqlite/pysqlite-2.0.4.ebuild b/dev-python/pysqlite/pysqlite-2.0.4.ebuild
index f523e5d81480..94be14d80365 100644
--- a/dev-python/pysqlite/pysqlite-2.0.4.ebuild
+++ b/dev-python/pysqlite/pysqlite-2.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/dev-python/pysqlite/pysqlite-2.0.4.ebuild,v 1.1 2005/09/30 09:22:51 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pysqlite/pysqlite-2.0.5.ebuild b/dev-python/pysqlite/pysqlite-2.0.5.ebuild
index 59e04b1acfaf..d99251a0658d 100644
--- a/dev-python/pysqlite/pysqlite-2.0.5.ebuild
+++ b/dev-python/pysqlite/pysqlite-2.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/dev-python/pysqlite/pysqlite-2.0.5.ebuild,v 1.1 2005/11/06 00:30:01 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pystatgrab/ChangeLog b/dev-python/pystatgrab/ChangeLog
index 46d9c8529b3e..5d678e2eda40 100644
--- a/dev-python/pystatgrab/ChangeLog
+++ b/dev-python/pystatgrab/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pystatgrab
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pystatgrab/ChangeLog,v 1.1 2005/04/19 14:37:27 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pystatgrab/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+  02 Sep 2005; Luis Medinas <metalgod@gentoo.org> pystatgrab-0.3.ebuild:
+  Added ~amd64 keywords. Closes bug #98166.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pystatgrab-0.3.ebuild:
+  Stable on ppc.
 
 *pystatgrab-0.3 (19 Apr 2005)
 
diff --git a/dev-python/pystatgrab/Manifest b/dev-python/pystatgrab/Manifest
index 79c235c8d3ac..7f0983ba8add 100644
--- a/dev-python/pystatgrab/Manifest
+++ b/dev-python/pystatgrab/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc5b72808c8d4a1c9d749a16a5fd4fa0 ChangeLog 565
 MD5 8a487db2af4fee760b23e1ac102047b0 metadata.xml 240
-MD5 4e8ef7c2196d251485ed326fcde02c5a pystatgrab-0.3.ebuild 519
+MD5 c2ae80c97bc064584b3ca666a3d9c750 pystatgrab-0.3.ebuild 588
 MD5 5ddd8627cb6d33a7b8a7bc6025df8424 files/digest-pystatgrab-0.3 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDF9h+wUpWvClEHQoRAqKcAJ94CrtTgDclbAQXiYfzagOa1jPE0wCeIu3+
+hlNFba+7pm6Ggjv1KPRauEk=
+=N9x9
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pystatgrab/pystatgrab-0.3.ebuild b/dev-python/pystatgrab/pystatgrab-0.3.ebuild
index eaab9c2d93d0..50f29c49598b 100644
--- a/dev-python/pystatgrab/pystatgrab-0.3.ebuild
+++ b/dev-python/pystatgrab/pystatgrab-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/dev-python/pystatgrab/pystatgrab-0.3.ebuild,v 1.1 2005/04/19 14:37:27 dams Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pystatgrab/pystatgrab-0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/pystat
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~amd64 ppc x86"
 
 DEPEND="virtual/python
 	>=sys-libs/libstatgrab-0.9"
diff --git a/dev-python/pytables/ChangeLog b/dev-python/pytables/ChangeLog
index da1672081e56..512228628648 100644
--- a/dev-python/pytables/ChangeLog
+++ b/dev-python/pytables/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for dev-python/pytables
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/ChangeLog,v 1.1 2004/02/15 15:50:22 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  21 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> :
+  Fix broken digest.
+
+  20 Apr 2005; Alastair Tse <liquidx@gentoo.org> pytables-0.9.1.ebuild:
+  fix numarray dep (#72327)
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> pytables-0.7.2.ebuild,
+  pytables-0.8.ebuild:
+  stable on x86
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+  Dependency update: dev-libs/hdf5 -> sci-libs/hdf5.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+  Dependency update: dev-libs/hdf5 -> sci-libs/hdf5.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+  Dependency update: dev-libs/hdf5 -> sci-libs/hdf5.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> :
+  Dependency update: dev-libs/hdf5 -> sci-libs/hdf5.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> pytables-0.8.ebuild:
+  Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> pytables-0.9.1.ebuild:
+  Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> pytables-0.8.1.ebuild:
+  Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> pytables-0.7.2.ebuild:
+  Dependency update: dev-libs/hdf -> sci-libs/hdf.
+
+*pytables-0.9.1 (07 Dec 2004)
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +pytables-0.9.1.ebuild:
+  Version bump.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> pytables-0.8.1.ebuild:
+  Added to ~ppc.
+
+*pytables-0.8.1 (16 Jul 2004)
+
+  16 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +pytables-0.8.1.ebuild:
+  Version bump.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pytables-0.7.2.ebuild,
+  pytables-0.8.ebuild:
+  Add missing IUSE.
+
+*pytables-0.8 (10 Mar 2004)
+
+  10 Mar 2004; <kloeri@gentoo.org> pytables-0.8.ebuild:
+  Version bump.
+
+  16 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> pytables-0.7.2.ebuild:
+  don't set S to default; repoman: Fix leading whitespace
 
 *pytables-0.7.2 (15 Feb 2004)
 
diff --git a/dev-python/pytables/Manifest b/dev-python/pytables/Manifest
index e648dafcf58d..5aaafab30474 100644
--- a/dev-python/pytables/Manifest
+++ b/dev-python/pytables/Manifest
@@ -1,3 +1,20 @@
-MD5 01add9a3cb48ca47fa45083268833653 pytables-0.7.2.ebuild 552
-MD5 28df53d6b9eeab83c34729ecfb531c3e ChangeLog 328
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a7e3e676434ccd740ca1d742e2da0dd6 pytables-0.8.1.ebuild 528
+MD5 c36665ad30aa37bd7322a00225d2e88e ChangeLog 2361
+MD5 0d508cfae59a14b100c113029021b732 pytables-0.9.1.ebuild 536
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 ab78ac37a87e443155a6718fe13b6581 pytables-0.7.2.ebuild 522
+MD5 17c1213be156b60e0e58f637f90aa08d pytables-0.8.ebuild 520
+MD5 521927168459d6ba58e49fb73e536857 files/digest-pytables-0.8 65
 MD5 215625681422b404c7b499e6ec664314 files/digest-pytables-0.7.2 66
+MD5 666811c77fb131983a32904d33c5bc3e files/digest-pytables-0.8.1 67
+MD5 fd8c69b76c15d2bec91326d54c2cad8f files/digest-pytables-0.9.1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCZ3cnKf2g/qXtneoRApbiAKCxdxXG0hzr7LE6dIwajG9XJ7GuxACgnCDf
+qwT1Dc3eZOMVWUn7OJfSc4A=
+=QVrY
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pytables/files/digest-pytables-0.8 b/dev-python/pytables/files/digest-pytables-0.8
index 92d35ae4c06a..7651c76c8f80 100644
--- a/dev-python/pytables/files/digest-pytables-0.8
+++ b/dev-python/pytables/files/digest-pytables-0.8
@@ -1 +1 @@
-MD5 20e6709d1bf29143ac7766479e48a8f4 pytables-0.8.tar.gz 1878023
+MD5 e54c29a16d90a7772716ff9781826ec0 pytables-0.8.tar.gz 2068483
diff --git a/dev-python/pytables/pytables-0.7.2.ebuild b/dev-python/pytables/pytables-0.7.2.ebuild
index 1d7b60701889..c3c98163350c 100644
--- a/dev-python/pytables/pytables-0.7.2.ebuild
+++ b/dev-python/pytables/pytables-0.7.2.ebuild
@@ -1,19 +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/dev-python/pytables/pytables-0.7.2.ebuild,v 1.1 2004/02/15 15:50:22 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Module for Python that use HDF5"
 SRC_URI="mirror://sourceforge/pytables/${P}.tar.gz"
 HOMEPAGE="http://pytables.sourceforge.net/"
 
 DEPEND=">=dev-lang/python-2.2
-        >=sys-devel/gcc-3.2
-		dev-libs/hdf5
-		dev-python/numarray"
+	>=sys-devel/gcc-3.2
+	sci-libs/hdf5
+	dev-python/numarray"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="as-is"
+IUSE=""
diff --git a/dev-python/pytables/pytables-0.8.1.ebuild b/dev-python/pytables/pytables-0.8.1.ebuild
index 6b08b69ed5f6..b07e28b9666e 100644
--- a/dev-python/pytables/pytables-0.8.1.ebuild
+++ b/dev-python/pytables/pytables-0.8.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/dev-python/pytables/pytables-0.8.1.ebuild,v 1.1 2004/07/16 20:31:00 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-0.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -10,10 +10,10 @@ HOMEPAGE="http://pytables.sourceforge.net/"
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-devel/gcc-3.2
-	dev-libs/hdf5
+	sci-libs/hdf5
 	dev-python/numarray"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 LICENSE="as-is"
 IUSE=""
diff --git a/dev-python/pytables/pytables-0.8.ebuild b/dev-python/pytables/pytables-0.8.ebuild
index d3211ef04544..8c8db1511b76 100644
--- a/dev-python/pytables/pytables-0.8.ebuild
+++ b/dev-python/pytables/pytables-0.8.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/dev-python/pytables/pytables-0.8.ebuild,v 1.1 2004/03/09 23:05:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -10,9 +10,10 @@ HOMEPAGE="http://pytables.sourceforge.net/"
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-devel/gcc-3.2
-	dev-libs/hdf5
+	sci-libs/hdf5
 	dev-python/numarray"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="as-is"
+IUSE=""
diff --git a/dev-python/pytables/pytables-0.9.1.ebuild b/dev-python/pytables/pytables-0.9.1.ebuild
index 6507a0ce27ef..1481254aae52 100644
--- a/dev-python/pytables/pytables-0.9.1.ebuild
+++ b/dev-python/pytables/pytables-0.9.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/dev-python/pytables/pytables-0.9.1.ebuild,v 1.1 2004/12/07 02:59:52 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pytables/pytables-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -10,8 +10,8 @@ HOMEPAGE="http://pytables.sourceforge.net/"
 
 DEPEND=">=dev-lang/python-2.2
 	>=sys-devel/gcc-3.2
-	dev-libs/hdf5
-	dev-python/numarray"
+	sci-libs/hdf5
+	>=dev-python/numarray-1.0"
 
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
diff --git a/dev-python/python-bibtex/ChangeLog b/dev-python/python-bibtex/ChangeLog
index de25dfc327bf..358112a883c8 100644
--- a/dev-python/python-bibtex/ChangeLog
+++ b/dev-python/python-bibtex/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for dev-python/python-bibtex
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/ChangeLog,v 1.1 2004/10/17 10:36:44 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org> python-bibtex-1.2.1.ebuild:
+  Marked ppc stable.
+
+  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> python-bibtex-1.2.1.ebuild:
+  Stable on x86.
+
+  11 Apr 2005; Simon Stelling <blubb@gentoo.org> python-bibtex-1.2.1.ebuild:
+  added ~amd64
+
+  13 Nov 2004; Michael Hanselmann <hansmi@gentoo.org>
+  python-bibtex-1.2.1.ebuild:
+  Added to ~ppc.
 
 *python-bibtex-1.2.1 (17 Oct 2004)
 
diff --git a/dev-python/python-bibtex/Manifest b/dev-python/python-bibtex/Manifest
index e9d339986762..25a8341986b3 100644
--- a/dev-python/python-bibtex/Manifest
+++ b/dev-python/python-bibtex/Manifest
@@ -1,2 +1,14 @@
-MD5 0e6e575f2c61adffca57d41bd2a19bef python-bibtex-1.2.1.ebuild 375
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a05a550fe12b6af58e16a9c8a0d21ffb python-bibtex-1.2.1.ebuild 517
+MD5 856a38c490a6f88dd7e6b0cf173a3220 ChangeLog 912
+MD5 684b7118ace06f88d4bdca2407ddc818 metadata.xml 184
 MD5 c9ebfddac7d413cd7217fa4840aac1f7 files/digest-python-bibtex-1.2.1 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2SbtcsIHjyDViGQRAibMAJ9B0Ecz/fZQBgGzGVWBriJKOrEuNwCgngRF
+9OmF6L5YsN41FTK/yCey3fA=
+=+4f2
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-bibtex/python-bibtex-1.2.1.ebuild b/dev-python/python-bibtex/python-bibtex-1.2.1.ebuild
index bcf401c26277..8d13843ecb76 100644
--- a/dev-python/python-bibtex/python-bibtex-1.2.1.ebuild
+++ b/dev-python/python-bibtex/python-bibtex-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/dev-python/python-bibtex/python-bibtex-1.2.1.ebuild,v 1.1 2004/10/17 10:36:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/python-bibtex-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc x86"
 
 IUSE=""
 
diff --git a/dev-python/python-biggles/ChangeLog b/dev-python/python-biggles/ChangeLog
index 1bf1e33199ca..ed256aa18ff9 100644
--- a/dev-python/python-biggles/ChangeLog
+++ b/dev-python/python-biggles/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/python-biggles
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/ChangeLog,v 1.1 2003/04/20 02:32:19 blauwers Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*python-biggles-1.6.4 (05 Apr 2004)
+
+  05 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-biggles-1.6.4.ebuild:
+  Version bump, don't compress examples.
+
+  02 Sep 2003; Alastair Tse <liquidx@gentoo.org> python-biggles-1.6.3.ebuild:
+  moved dev-python/Numeric to dev-python/numeric
 
 *python-biggles-1.6.3 (20 Apr 2003)
 
diff --git a/dev-python/python-biggles/Manifest b/dev-python/python-biggles/Manifest
index 83ac96a48d87..3805540b2bea 100644
--- a/dev-python/python-biggles/Manifest
+++ b/dev-python/python-biggles/Manifest
@@ -1,3 +1,6 @@
-MD5 ca2c904f5bf491bdf9f081d6e037f3a8 python-biggles-1.6.3.ebuild 568
-MD5 1d49e779e148ae8ff1edc755431e5d3d ChangeLog 354
+MD5 74707226062838efab19ac81e66e07de python-biggles-1.6.3.ebuild 561
+MD5 f169d073d4aba437ba357c937c7b8c87 ChangeLog 740
+MD5 2fa35d7386ed644579750e877dfe84ae python-biggles-1.6.4.ebuild 724
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 b0b88b10acbbbe211ce7065db44d901b files/digest-python-biggles-1.6.3 72
+MD5 790e6940ca51bbf95039c59d62e900f9 files/digest-python-biggles-1.6.4 73
diff --git a/dev-python/python-biggles/python-biggles-1.6.3.ebuild b/dev-python/python-biggles/python-biggles-1.6.3.ebuild
index 2d1c81d5f964..e9b7df435581 100644
--- a/dev-python/python-biggles/python-biggles-1.6.3.ebuild
+++ b/dev-python/python-biggles/python-biggles-1.6.3.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/dev-python/python-biggles/python-biggles-1.6.3.ebuild,v 1.1 2003/04/20 02:32:19 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/python-biggles-1.6.3.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
@@ -9,9 +9,11 @@ SRC_URI="mirror://sourceforge/biggles/${P}.tar.gz"
 HOMEPAGE="http://biggles.sourceforge.net"
 
 DEPEND="~media-libs/plotutils-2.4.1
-        dev-python/Numeric"
+	dev-python/numeric"
+
+IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
-LICENSE="GPL2"
+KEYWORDS="x86"
+LICENSE="GPL-2"
 
 mydoc="examples/*"
diff --git a/dev-python/python-biggles/python-biggles-1.6.4.ebuild b/dev-python/python-biggles/python-biggles-1.6.4.ebuild
index b433e690c861..4de83599f722 100644
--- a/dev-python/python-biggles/python-biggles-1.6.4.ebuild
+++ b/dev-python/python-biggles/python-biggles-1.6.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/dev-python/python-biggles/python-biggles-1.6.4.ebuild,v 1.1 2004/04/04 22:42:49 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-biggles/python-biggles-1.6.4.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/python-cdb/ChangeLog b/dev-python/python-cdb/ChangeLog
index 73b267b7dfab..6650085c1b1c 100644
--- a/dev-python/python-cdb/ChangeLog
+++ b/dev-python/python-cdb/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for dev-python/python-cdb
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cdb/ChangeLog,v 1.1 2003/07/12 15:54:44 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cdb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+  28 Aug 2005; Fabian Groffen <grobian@gentoo.org> python-cdb-0.32.ebuild:
+  Marking ~ppc-macos (bug #87701)
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-cdb-0.32.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Joseph Jezak <josejx@gentoo.org> python-cdb-0.32.ebuild:
+  Marked ~ppc for bug #87349.
+
+  27 Mar 2005; Tom Martin <slarti@gentoo.org> python-cdb-0.32.ebuild:
+  Stable on amd64, testing on sparc.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Dec 2004; Dylan Carlson <absinthe@gentoo.org> python-cdb-0.32.ebuild:
+  Keywords ~amd64.
+
+  11 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> python-cdb-0.32.ebuild:
+  Fix header.
 
 *python-cdb-0.32 (12 Jul 2003)
 
diff --git a/dev-python/python-cdb/Manifest b/dev-python/python-cdb/Manifest
index c1d287c0d10e..42c247f8f492 100644
--- a/dev-python/python-cdb/Manifest
+++ b/dev-python/python-cdb/Manifest
@@ -1,2 +1,4 @@
-MD5 395f6969bc83c3c0024c29fe0dcefba6 python-cdb-0.32.ebuild 485
+MD5 e9d3fee24ce197c032eacd0c66ce6689 python-cdb-0.32.ebuild 525
+MD5 f617d0d114be1589c0aeef1917fa9fee ChangeLog 1097
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 29c2e3ed79bc08215e725c7844377668 files/digest-python-cdb-0.32 66
diff --git a/dev-python/python-cdb/python-cdb-0.32.ebuild b/dev-python/python-cdb/python-cdb-0.32.ebuild
index ccaed0d6c9ed..140932d23ed3 100644
--- a/dev-python/python-cdb/python-cdb-0.32.ebuild
+++ b/dev-python/python-cdb/python-cdb-0.32.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: /home/cvsroot/gentoo-x86/dev-db/freecdb/freecdb-0.62.ebuild,v 1.1 
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-cdb/python-cdb-0.32.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -11,10 +11,7 @@ HOMEPAGE="http://pilcrow.madison.wi.us/#pycdb"
 SLOT="0"
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ppc ~ppc-macos ~sparc x86"
 
 DEPEND=">=dev-lang/python-2.2
 	dev-db/cdb"
-
-
-
diff --git a/dev-python/python-docs/ChangeLog b/dev-python/python-docs/ChangeLog
index 636da8a7744b..cb8b37fc42bc 100644
--- a/dev-python/python-docs/ChangeLog
+++ b/dev-python/python-docs/ChangeLog
@@ -1,6 +1,266 @@
 # ChangeLog for dev-python/python-docs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
+
+  21 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> python-docs-2.4.2.ebuild:
+  Stable on mips.
+
+  15 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> python-docs-2.4.2.ebuild:
+  Stable on sh.
+
+  15 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-docs-2.4.2.ebuild:
+  Stable on hppa, ppc.
+
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-docs-2.4.2.ebuild:
+  Stable on sparc
+
+  14 Oct 2005; Aron Griffis <agriffis@gentoo.org> python-docs-2.4.2.ebuild:
+  Mark 2.4.2 stable on alpha
+
+  13 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-docs-2.4.2.ebuild:
+  Marked Stable on amd64.
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> python-docs-2.4.2.ebuild:
+  Mark 2.4.2 stable on ia64
+
+  13 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  python-docs-2.4.2.ebuild:
+  Marked x86 stable
+
+  10 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-docs-2.4.1.ebuild:
+  Stable on sparc
+
+  10 Oct 2005; Luis Medinas <metalgod@gentoo.org> python-docs-2.4.1.ebuild:
+  Marked Stable on amd64.
+
+  10 Oct 2005; Markus Rothe <corsair@gentoo.org> python-docs-2.4.1.ebuild:
+  Stable on ppc64
+
+  09 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-docs-2.4.1.ebuild:
+  Stable on hppa, ppc.
+
+  08 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-docs-2.4.1.ebuild:
+  Stable python-2.4 on alpha, ia64 and x86.
+
+*python-docs-2.4.2 (28 Sep 2005)
+
+  28 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +python-docs-2.4.2.ebuild:
+  Bump version to 2.4.2.
+
+  14 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> python-docs-2.3.5.ebuild:
+  2.3.5 stable on mips.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> python-docs-2.3.5.ebuild:
+  Stable on ppc64
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> python-docs-2.4.1.ebuild:
+  added ~ppc64
+
+  16 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-docs-2.4.1.ebuild:
+  Add ~m68k keyword.
+
+  30 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-docs-2.3.5.ebuild:
+  Stable on alpha.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> python-docs-2.3.5.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  01 May 2005; Tom Martin <slarti@gentoo.org> python-docs-2.3.5.ebuild:
+  Stable on amd64.
+
+  30 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-docs-2.3.5.ebuild:
+  Stable on ppc.
+
+  28 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-docs-2.3.5.ebuild:
+  Stable on sparc
+
+*python-docs-2.4.1 (26 Apr 2005)
+
+  26 Apr 2005; Alastair Tse <liquidx@gentoo.org> +python-docs-2.4.1.ebuild:
+  version bump. added info docs
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> python-docs-2.3.4.ebuild:
+  Stable on ppc64
+
+*python-docs-2.3.5 (17 Feb 2005)
+
+  17 Feb 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +python-docs-2.3.5.ebuild:
+  Version bump.
+
+  09 Feb 2005; Luca Barbato <lu_zero@gentoo.org> python-docs-2.3.4.ebuild:
+  Marked ppc
+
+*python-docs-2.4 (04 Jan 2005)
+
+  04 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +python-docs-2.4.ebuild:
+  Version bump.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Nov 2004; Joshua Kinard <kumba@gentoo.org> python-docs-2.3.4.ebuild:
+  Marked stable on mips.
+
+  19 Oct 2004; Guy Martin <gmsoft@gentoo.org> python-docs-2.3.4.ebuild:
+  Stable on hppa.
+
+  17 Oct 2004; Jason Wever <weeve@gentoo.org> python-docs-2.3.4.ebuild:
+  Stable on sparc.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> python-docs-2.3.4.ebuild:
+  stable on amd64.
+
+  17 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Stable on alpha.
+
+  16 Oct 2004; Carsten Lohrke <carlo@gentoo.org> python-docs-2.3.4.ebuild:
+  stable on x86
+
+  18 Aug 2004; Aron Griffis <agriffis@gentoo.org> python-docs-2.3.4.ebuild:
+  stable on alpha and ia64
+
+  12 Jun 2004; Tom Gall <tgall@gentoo.org> python-docs-2.3.3.ebuild:
+  stable on ppc64, bug #53575
+
+  04 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  python-docs-2.3.4_rc1.ebuild:
+  add back missing keywords
+
+*python-docs-2.3.4 (04 Jun 2004)
+
+  04 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +python-docs-2.3.4.ebuild:
+  Bump version.
+
+  30 May 2004; Guy Martin <gmsoft@gentoo.org> python-docs-2.3.4_rc1.ebuild:
+  Added ~hppa to satisfy depend with python.
+
+  23 May 2004; Travis Tilley <lv@gentoo.org> python-docs-2.3.4_rc1.ebuild:
+  adding amd64 keyword...
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> python-docs-2.3.3-r1.ebuild,
+  python-docs-2.3.4_rc1.ebuild:
+  Marked 2.3.3 stable on mips, and 2.3.4 unstable on mips.
+
+  15 May 2004; Luca Barbato <lu_zero@gentoo.org> python-docs-2.3.4_rc1.ebuild:
+  Marked ~ppc
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> python-docs-2.3.4_rc1.ebuild:
+  Added ~sparc keyword.
+
+*python-docs-2.3.4_rc1 (14 May 2004)
+
+  14 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +python-docs-2.3.4_rc1.ebuild:
+  Bump version.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> python-docs-2.2.2.ebuild,
+  python-docs-2.2.3.ebuild, python-docs-2.3.3-r1.ebuild,
+  python-docs-2.3.3.ebuild:
+  Add missing IUSE.
+
+*python-docs-2.3.3-r1 (30 Mar 2004)
+
+  30 Mar 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-docs-2.3.3-r1.ebuild:
+  Fix install path, bug #45753.
+
+  14 Mar 2004; Tom Gall <tgall@gentoo.org> python-docs-2.2.3.ebuild:
+  stable on ppc64
+
+  09 Mar 2004; <agriffis@gentoo.org> python-docs-2.3.3.ebuild:
+  stable on alpha and ia64
+
+  02 Mar 2004; Brian Jackson <iggy@gentoo.org> python-docs-2.2.3.ebuild,
+  python-docs-2.3.3.ebuild:
+  added s390 to keywords
+
+  10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org>
+  python-docs-2.3.3.ebuild:
+  set ppc in keywords
+
+  06 Feb 2004; <gustavoz@gentoo.org> python-docs-2.3.3.ebuild:
+  stable on sparc
+
+  03 Feb 2004; Guy Martin <gmsoft@gentoo.org> python-docs-2.3.3.ebuild :
+  Marked stable on hppa.
+
+  24 Jan 2004; <gustavoz@gentoo.org> python-docs-2.3.3.ebuild:
+  keyworded ~sparc
+
+  12 Jan 2004; Luca Barbato <lu_zero@gentoo.org> python-docs-2.2.3.ebuild:
+  Marked mips
+
+*python-docs-2.3.3 (03 Jan 2004)
+
+  03 Jan 2004; Alastair Tse <liquidx@gentoo.org> python-docs-2.2.3.ebuild,
+  python-docs-2.3.3.ebuild:
+  version bump, added arm to 2.2.3 keywords
+
+  13 Dec 2003; Luca Barbato <lu_zero@gentoo.org> python-docs-2.3.2.ebuild:
+  Marked ~ppc
+
+  05 Dec 2003; Alastair Tse <liquidx@gentoo.org> python-docs-2.3.2.ebuild:
+  keep KEYWORDS insync with dev-lang/python-2.3
+
+*python-docs-2.3.2 (01 Nov 2003)
+
+  01 Nov 2003; Alastair Tse <liquidx@gentoo.org> python-docs-2.3.2.ebuild:
+  adding 2.3 docs, and cleanup for ebuild. currently masked awaiting python-2.3
+  to exit p.mask
+
+  09 Oct 2003; Brad House <brad_mssw@gentoo.org> python-docs-2.2.3.ebuild:
+  add amd64 flag
+
+*python-docs-2.2.3 (13 Jul 2003)
+
+  23 Jul 2003; Guy Martin <gmsoft@gentoo.org> python-docs-2.2.3.ebuild :
+  Added hppa to KEYWORDS.
+
+  13 Jul 2003; Alastair Tse <liquidx@gentoo.org> python-docs-2.2.3.ebuild:
+  version bump
+
+*python-docs-2.2.2 (22 Jan 2003)
+
+  22 Jan 2003; Arcady Genkin <agenkin@gentoo.org> :
+  Updated to version 2.2.2.
+  Removed the chmod statements, as the portage takes care of the permissions.
+
+*python-docs-2.2.1-r1 (20 Dec 2002)
+
+  20 Dec 2002; J Robert Ray <jrray@gentoo.org> python-docs-2.2.1-r1.ebuild :
+  Create an env variable PYTHONDOCS pointing to the installation path of the
+  docs, fixing bug 12139.  Also, changed ${P} to ${PF} in the destination path,
+  to match the actual location created by docinto().
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  1 Aug 2002; Jon Nelson <jnelson@gentoo.org> 
+  
+  Remove python-docs-2.0.1.ebuild, python-docs-2.2.ebuild
+
+*python-docs-2.2.1 (1 Jul 2002)
+
+  1 Jul 2002; Jon Nelson <jnelson@gentoo.org> python-docs-2.2.1.ebuild
+  
+  Added ebuild for 2.2.1 docs  
+
+*python-docs-2.2 (6 Apr 2002)
+
+  6 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog, python-docs-2.2.ebuild
+  
+  Added ebuild for 2.2 docs  
 
 *python-docs-2.0.1 (1 Feb 2002)
 
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index e69de29bb2d1..ef272510987f 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -0,0 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b04ef2aabe8533b93c94929db1217e66 ChangeLog 8488
+MD5 f228bfc10d3eb9dfb215177275b0e1c9 files/digest-python-docs-2.2.2 63
+MD5 e9b50e3077ea663db9a42bc42b725ef1 files/digest-python-docs-2.2.3 63
+MD5 d7a3f8363864425c84dcd47a1524035d files/digest-python-docs-2.3.3 64
+MD5 d7a3f8363864425c84dcd47a1524035d files/digest-python-docs-2.3.3-r1 64
+MD5 66c81236c330ecb9b8508fba0c9bb09f files/digest-python-docs-2.3.4 64
+MD5 6442ccc306fc93be4e97a913d9e237a1 files/digest-python-docs-2.3.4_rc1 66
+MD5 0b6f89623676279b95ea4b2b8f80f3b8 files/digest-python-docs-2.3.5 64
+MD5 bafc5cef1c486da8c6dc28cd7e62b36b files/digest-python-docs-2.4 62
+MD5 af11c94a8398380027dce3dc7b27c1aa files/digest-python-docs-2.4.1 127
+MD5 79855f0ce1bfef98b7091543cd0d2182 files/digest-python-docs-2.4.2 127
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 44c0b2369601927ba5d36ddc39c60158 python-docs-2.2.2.ebuild 706
+MD5 d0c7dadcfc4671c1d1587cf2cd9e07c6 python-docs-2.2.3.ebuild 738
+MD5 0f7725b4275458e599fb4334bcad0373 python-docs-2.3.3-r1.ebuild 683
+MD5 53ad8e0e14c1e149d9a3f8bebbad184c python-docs-2.3.3.ebuild 701
+MD5 5c9ada1759a31887ace8ad6b94b3d26c python-docs-2.3.4.ebuild 723
+MD5 6c70f7744f89efe8c8fdae59de2514f6 python-docs-2.3.4_rc1.ebuild 758
+MD5 33a51f99fd5e8f791fdfb9c1d49c484d python-docs-2.3.5.ebuild 728
+MD5 e71014cff126ef82530de785dc5be905 python-docs-2.4.1.ebuild 971
+MD5 80525da85ab3c705bfb945a3aece2e23 python-docs-2.4.2.ebuild 967
+MD5 2626303164a38e62cf35b175bfdbc5d9 python-docs-2.4.ebuild 728
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWL2+EZCkKN40op4RAoJ9AKCEGkWATJqCTp4oIKEVqDaZALwEOgCggNSh
+9UYTL3EPClUa61RvOnZGd9M=
+=iFLK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-docs/python-docs-2.2.2.ebuild b/dev-python/python-docs/python-docs-2.2.2.ebuild
index 7615e25cee33..98d82627fe00 100644
--- a/dev-python/python-docs/python-docs-2.2.2.ebuild
+++ b/dev-python/python-docs/python-docs-2.2.2.ebuild
@@ -1,8 +1,7 @@
-# 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/dev-python/python-docs/python-docs-2.2.2.ebuild,v 1.1 2003/01/22 21:23:50 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="HTML documentation for Python"
 SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 HOMEPAGE="http://www.python.org/doc/2.2/"
@@ -10,21 +9,19 @@ DEPEND=""
 RDEPEND=""
 SLOT="2.2"
 LICENSE="PSF-2.2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
 src_unpack() {
 	mkdir ${S}
-	cd ${S} 
-	unpack ${A} 
+	cd ${S}
+	unpack ${A}
 }
 
 
 src_install() {
 	docinto html
 	cp -R ${S}/* ${D}/usr/share/doc/${PF}/html
-	chown -R root.root ${D}/usr/share/doc/${PF}/html
-	find ${D}/usr/share/doc/${PF}/html -type d -exec chmod 0755 \{\} \;
-	find ${D}/usr/share/doc/${PF}/html -type f -exec chmod 0644 \{\} \;
 	dodir /etc/env.d
 	echo "PYTHONDOCS=/usr/share/doc/${PF}/html" > ${D}/etc/env.d/50python-docs
 }
diff --git a/dev-python/python-docs/python-docs-2.2.3.ebuild b/dev-python/python-docs/python-docs-2.2.3.ebuild
index cbca5d05a7f5..4a9ac8ae6d75 100644
--- a/dev-python/python-docs/python-docs-2.2.3.ebuild
+++ b/dev-python/python-docs/python-docs-2.2.3.ebuild
@@ -1,8 +1,7 @@
-# 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/dev-python/python-docs/python-docs-2.2.3.ebuild,v 1.1 2003/07/13 01:38:01 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="HTML documentation for Python"
 SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 HOMEPAGE="http://www.python.org/doc/2.2/"
@@ -10,12 +9,13 @@ DEPEND=""
 RDEPEND=""
 SLOT="2.2"
 LICENSE="PSF-2.2"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64 mips s390 ppc64"
+IUSE=""
 
 src_unpack() {
 	mkdir ${S}
-	cd ${S} 
-	unpack ${A} 
+	cd ${S}
+	unpack ${A}
 }
 
 
diff --git a/dev-python/python-docs/python-docs-2.3.3-r1.ebuild b/dev-python/python-docs/python-docs-2.3.3-r1.ebuild
index c0df4e6c13d1..0c8a783a709c 100644
--- a/dev-python/python-docs/python-docs-2.3.3-r1.ebuild
+++ b/dev-python/python-docs/python-docs-2.3.3-r1.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/dev-python/python-docs/python-docs-2.3.3-r1.ebuild,v 1.1 2004/03/29 22:43:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/2.3/"
@@ -8,7 +8,8 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-KEYWORDS="~x86"
+KEYWORDS="~x86 mips arm"
+IUSE=""
 
 DEPEND=""
 RDEPEND=""
diff --git a/dev-python/python-docs/python-docs-2.3.3.ebuild b/dev-python/python-docs/python-docs-2.3.3.ebuild
index add5c10276f6..0150f968a6af 100644
--- a/dev-python/python-docs/python-docs-2.3.3.ebuild
+++ b/dev-python/python-docs/python-docs-2.3.3.ebuild
@@ -1,18 +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/dev-python/python-docs/python-docs-2.3.3.ebuild,v 1.1 2004/01/03 03:47:40 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.3.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
-SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 HOMEPAGE="http://www.python.org/doc/2.3/"
+SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 
-IUSE=""
-SLOT="2.3"
-KEYWORDS="~x86 ~ppc" # ~sparc ~alpha ~hppa ~ia64 ~amd64"
 LICENSE="PSF-2.2"
+SLOT="2.3"
+KEYWORDS="x86 ppc sparc hppa amd64 s390 alpha ia64 mips ppc64"
+IUSE=""
 
 DEPEND=""
 RDEPEND=""
+
 S=${WORKDIR}
 
 src_install() {
diff --git a/dev-python/python-docs/python-docs-2.3.4.ebuild b/dev-python/python-docs/python-docs-2.3.4.ebuild
index 96ffcfd5fe80..3ae9a433f8d6 100644
--- a/dev-python/python-docs/python-docs-2.3.4.ebuild
+++ b/dev-python/python-docs/python-docs-2.3.4.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/dev-python/python-docs/python-docs-2.3.4.ebuild,v 1.1 2004/06/04 19:17:01 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.4.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/2.3/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~amd64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc s390 sh sparc x86 ppc64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/python-docs/python-docs-2.3.4_rc1.ebuild b/dev-python/python-docs/python-docs-2.3.4_rc1.ebuild
index ab16dd5acb7c..c9b131d48c0c 100644
--- a/dev-python/python-docs/python-docs-2.3.4_rc1.ebuild
+++ b/dev-python/python-docs/python-docs-2.3.4_rc1.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/dev-python/python-docs/python-docs-2.3.4_rc1.ebuild,v 1.1 2004/05/14 14:56:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.4_rc1.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 MY_PV=${PV/_rc/c}
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${MY_PV}/html-${MY_PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm amd64 ~hppa ~ia64 ~s390"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/python-docs/python-docs-2.3.5.ebuild b/dev-python/python-docs/python-docs-2.3.5.ebuild
index 4b80bd048080..82f982dea788 100644
--- a/dev-python/python-docs/python-docs-2.3.5.ebuild
+++ b/dev-python/python-docs/python-docs-2.3.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/dev-python/python-docs/python-docs-2.3.5.ebuild,v 1.1 2005/02/17 18:17:41 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/2.3/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.python.org/ftp/python/doc/${PV}/html-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/python-docs/python-docs-2.4.1.ebuild b/dev-python/python-docs/python-docs-2.4.1.ebuild
index 5070f05e3a60..fe711141b550 100644
--- a/dev-python/python-docs/python-docs-2.4.1.ebuild
+++ b/dev-python/python-docs/python-docs-2.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/dev-python/python-docs/python-docs-2.4.1.ebuild,v 1.1 2005/04/26 16:01:33 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/${PV}/"
@@ -9,7 +9,7 @@ http://www.python.org/ftp/python/doc/${PV}/info-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
@@ -29,8 +29,8 @@ src_install() {
 	docinto html
 	cp -R ${S}/Python-Docs-${PV}/* ${D}/usr/share/doc/${PF}/html
 
-    insinto /usr/share/info
-    doins ${S}/info/*
+	insinto /usr/share/info
+	doins ${S}/info/*
 
 	dodir /etc/env.d
 	echo "PYTHONDOCS=/usr/share/doc/${PF}/html" > ${D}/etc/env.d/50python-docs
diff --git a/dev-python/python-docs/python-docs-2.4.2.ebuild b/dev-python/python-docs/python-docs-2.4.2.ebuild
index 44dbc7d131b4..3cff9b19a4a2 100644
--- a/dev-python/python-docs/python-docs-2.4.2.ebuild
+++ b/dev-python/python-docs/python-docs-2.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/dev-python/python-docs/python-docs-2.4.2.ebuild,v 1.1 2005/09/28 18:12:26 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/${PV}/"
@@ -9,7 +9,7 @@ http://www.python.org/ftp/python/doc/${PV}/info-${PV}.tar.bz2"
 
 LICENSE="PSF-2.2"
 SLOT="2.4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/python-docs/python-docs-2.4.ebuild b/dev-python/python-docs/python-docs-2.4.ebuild
index 1fc297a70ed7..22eba3e1ae1c 100644
--- a/dev-python/python-docs/python-docs-2.4.ebuild
+++ b/dev-python/python-docs/python-docs-2.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/dev-python/python-docs/python-docs-2.4.ebuild,v 1.1 2005/01/05 00:33:28 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-docs/python-docs-2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:12 chriswhite Exp $
 
 DESCRIPTION="HTML documentation for Python"
 HOMEPAGE="http://www.python.org/doc/2.4/"
diff --git a/dev-python/python-fchksum/ChangeLog b/dev-python/python-fchksum/ChangeLog
index 775384e689bc..ea98dc932bec 100644
--- a/dev-python/python-fchksum/ChangeLog
+++ b/dev-python/python-fchksum/ChangeLog
@@ -1,9 +1,91 @@
 # ChangeLog for dev-python/python-fchksum
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/ChangeLog,v 1.1 2002/04/25 01:58:43 jnelson Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+  26 Sep 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-fchksum-1.7.1.ebuild:
+  Add python to DEPEND which should fix bug 88777 again.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Nov 2004; Kito <kito@gentoo.org> python-fchksum-1.7.1.ebuild:
+  stable on ppc-macos
+
+  22 Aug 2004; Michael Hanselmann <hansmi@gentoo.org>
+  python-fchksum-1.7.1.ebuild:
+  Added to ~macos.
+
+  03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-fchksum-1.7.1.ebuild:
+  Stable on alpha.
+
+  15 May 2004; Joshua Kinard <kumba@gentoo.org> python-fchksum-1.7.1.ebuild:
+  Marked stable on mips.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-fchksum-1.6.1-r1.ebuild:
+  Add missing IUSE.
+
+  29 Apr 2004; Guy Martin <gmsoft@gentoo.org> python-fchksum-1.7.1.ebuild:
+  Marked stable on hppa.
+
+  27 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-fchksum-1.7.1.ebuild:
+  Stable on sparc
+
+  26 Apr 2004; Alastair Tse <liquidx@gentoo.org>
+  python-fchksum-1.6.1-r1.ebuild, python-fchksum-1.7.1.ebuild:
+  stable x86 bump, fixed SRC_URI (#48912)
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> python-fchksum-1.7.1.ebuild:
+  marked stable on amd64
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-fchksum-1.6.1-r1.ebuild, python-fchksum-1.7.1.ebuild:
+  Update SRC_URI and HOMEPAGE.
+
+*python-fchksum-1.7.1 (02 Oct 2003)
+
+  02 Oct 2003; Alastair Tse <liquidx@gentoo.org> python-fchksum-1.7.1.ebuild:
+  version bump. nothing changed with fmd5t() so it should be safe for all
+  archs. needs testing though.
+
+  17 Sep 2003; Jon Portnoy <avenj@gentoo.org> :
+  ia64 keywords.
+
+  07 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*python-fchksum-1.6.1-r1 (1 Aug 2002)
+
+  04 Apr 2003; Jan Seidel <tuxus@gentoo.org>
+  python-fchksum-1.6.1-r1.ebuild:
+  Added mips to keywords
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org>
+  python-fchksum-1.6.1-r1.ebuild:
+  remove use of distutils
+
+  26 Feb 2003; Zach Welch <zwelch@gentoo.org> python-fchksum-1.6.1-r1.ebuild:
+  Add arm keyword
+
+  1 Aug 2002; Jon Nelson <jnelson@gentoo.org> python-fchksum-1.6.1-r1.ebuild:
+  Use distutils eclass
+  Add KEYWORDS, LICENSE, and SLOT to 1.6.1 as well
 
 *python-fchksum-1.6.1 (24 Apr 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org>
+  python-fchksum-1.6.1-r1.ebuild, python-fchksum-1.6.1.ebuild,
+  python-fchksum-1.6.1.ebuild:
+  added IUSE
+
+  19 Jan 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to keywords
+
   24 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog 
    python-fchksum-1.6.1.ebuild:
   
diff --git a/dev-python/python-fchksum/Manifest b/dev-python/python-fchksum/Manifest
index e69de29bb2d1..06e1e0a663b7 100644
--- a/dev-python/python-fchksum/Manifest
+++ b/dev-python/python-fchksum/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c31b4f305631a09720104c7bed2b463b ChangeLog 2909
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 0c922525060996da103ec5a007d9278c python-fchksum-1.6.1-r1.ebuild 762
+MD5 577b3356a2e4ae7873e89d7b69e06dc6 python-fchksum-1.7.1.ebuild 808
+MD5 d385f87a09888e9614199dfe5e129862 files/digest-python-fchksum-1.6.1-r1 71
+MD5 71d0d6422a7854aabce965fa4891fa0d files/digest-python-fchksum-1.7.1 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOG6gKf2g/qXtneoRAkCuAKCLz/alw9MZDXqLJGnIijtcbfvYrQCgh7AG
+shT9y1X/vaISaWBPB21cU60=
+=65z1
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-fchksum/python-fchksum-1.6.1-r1.ebuild b/dev-python/python-fchksum/python-fchksum-1.6.1-r1.ebuild
index 0aeefdb7c61c..9652f135fa17 100644
--- a/dev-python/python-fchksum/python-fchksum-1.6.1-r1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.6.1-r1.ebuild
@@ -1,16 +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/dev-python/python-fchksum/python-fchksum-1.6.1-r1.ebuild,v 1.1 2002/08/02 02:05:54 jnelson Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/python-fchksum-1.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="fchksum is a Python module to find the checksum of files."
-SRC_URI="http://www.azstarnet.com/~donut/programs/fchksum/${P}.tar.gz"
-HOMEPAGE="http://www.azstarnet.com/~donut/programs/fchksum.html"
+# DON'T inherit distutils because it will cause a circular dependency with python
+#inherit distutils
 
-DEPEND="sys-libs/zlib"
-RDEPEND="${DEPEND}"
-KEYWORDS="x86 ppc"
+DESCRIPTION="Python module to find the checksum of files"
+SRC_URI="http://www.dakotacom.net/~donut/programs/fchksum/${P}.tar.gz"
+HOMEPAGE="http://www.dakotacom.net/~donut/programs/fchksum.html"
+
+KEYWORDS="amd64 x86 ppc sparc alpha hppa mips ia64"
 LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
+
+DEPEND="sys-libs/zlib"
+
+src_compile() {
+	python setup.py build || die
+}
 
-inherit distutils
+src_install() {
+	python setup.py install --root=${D} || die
+}
diff --git a/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild b/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild
index f66c09377874..a8fe579579c2 100644
--- a/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild
+++ b/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild
@@ -1,25 +1,26 @@
-# 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/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild,v 1.1 2003/10/02 22:38:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-fchksum/python-fchksum-1.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 # DON'T inherit distutils because it will cause a circular dependency with python
 #inherit distutils
 
 DESCRIPTION="Python module to find the checksum of files"
-SRC_URI="http://www.azstarnet.com/~donut/programs/fchksum/${P}.tar.gz"
-HOMEPAGE="http://www.azstarnet.com/~donut/programs/fchksum.html"
+HOMEPAGE="http://www.dakotacom.net/~donut/programs/fchksum.html"
+SRC_URI="http://www.dakotacom.net/~donut/programs/fchksum/${P}.tar.gz"
 
-IUSE=""
-KEYWORDS="~amd64 ~x86 ~ppc ~sparc ~alpha ~hppa ~arm ~mips ~ia64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 ppc-macos s390 sh sparc x86"
+IUSE=""
 
-DEPEND="sys-libs/zlib"
+DEPEND="dev-lang/python
+		sys-libs/zlib"
 
 src_compile() {
 	python setup.py build || die
 }
 
 src_install() {
-	python setup.py install --root=${D} || die
+	python setup.py install --root="${D}" || die
 }
diff --git a/dev-python/python-gammu/ChangeLog b/dev-python/python-gammu/ChangeLog
index bc3cb7ccdc86..712f8f5b4420 100644
--- a/dev-python/python-gammu/ChangeLog
+++ b/dev-python/python-gammu/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-python/python-gammu
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gammu/ChangeLog,v 1.1 2004/11/11 18:26:08 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gammu/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  17 Jul 2005; David Holm <dholm@gentoo.org> python-gammu-0.8.ebuild:
+  Added to ~ppc.
+
+*python-gammu-0.8 (16 Jul 2005)
+
+  16 Jul 2005; Alin Nastac <mrness@gentoo.org> python-gammu-0.7.ebuild,
+  +python-gammu-0.8.ebuild:
+  Version bump (#98978).
+
+  17 May 2005; Carlos Silva <r3pek@gentoo.org> python-gammu-0.7.ebuild:
+  Closing bug #92931
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  -python-gammu-0.6.ebuild, python-gammu-0.7.ebuild:
+  Remove 0.6 as it fails and mark 0.7 stable instead.
+
+  12 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-gammu-0.6.ebuild:
+  Stable on x86, requested by mrness.
+
+*python-gammu-0.7 (24 Jan 2005)
+
+  24 Jan 2005; Fernando Serboncini <fserb@gentoo.org>
+  +python-gammu-0.7.ebuild:
+  Version bump, needed for bug #79287
 
 *python-gammu-0.6 (11 Nov 2004)
 
diff --git a/dev-python/python-gammu/Manifest b/dev-python/python-gammu/Manifest
index 7124b39683a3..26d17bd94647 100644
--- a/dev-python/python-gammu/Manifest
+++ b/dev-python/python-gammu/Manifest
@@ -1,2 +1,6 @@
-MD5 f0a197d2ca470bcd33a3c9cc9109e923 python-gammu-0.6.ebuild 560
-MD5 92f3b9101db8223f756d85749ba8f650 files/digest-python-gammu-0.6 68
+MD5 a9f4f464e32cbe245bd8ff499640616e ChangeLog 1148
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 ff2e00efc5b936fde9c4a3badc901211 python-gammu-0.7.ebuild 692
+MD5 02426ba8ca25e1b7d0d14260b729074d python-gammu-0.8.ebuild 686
+MD5 3715ff8f9fe4cb1cf036e989fc870aea files/digest-python-gammu-0.7 68
+MD5 595803fd24aa71caf59cffe598196a38 files/digest-python-gammu-0.8 68
diff --git a/dev-python/python-gammu/python-gammu-0.7.ebuild b/dev-python/python-gammu/python-gammu-0.7.ebuild
index 00801d4ea430..d1b29c4753c9 100644
--- a/dev-python/python-gammu/python-gammu-0.7.ebuild
+++ b/dev-python/python-gammu/python-gammu-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/dev-python/python-gammu/python-gammu-0.7.ebuild,v 1.1 2005/01/25 01:25:12 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gammu/python-gammu-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -8,13 +8,13 @@ IUSE="doc"
 
 DESCRIPTION="Python bindings for Gammu"
 HOMEPAGE="http://www.cihar.com/gammu/python/"
-SRC_URI="http://www.cihar.com/gammu/python/${P}.tar.bz2"
+SRC_URI="http://www.cihar.com/gammu/python/older/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
-RDEPEND=">=net-dialup/gammu-0.97.7"
+RDEPEND=">=app-mobilephone/gammu-0.97.7"
 DEPEND="dev-util/pkgconfig
 		${RDEPEND}"
 
diff --git a/dev-python/python-gammu/python-gammu-0.8.ebuild b/dev-python/python-gammu/python-gammu-0.8.ebuild
index 2dff7bbd3857..eb6dcbec76a8 100644
--- a/dev-python/python-gammu/python-gammu-0.8.ebuild
+++ b/dev-python/python-gammu/python-gammu-0.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/dev-python/python-gammu/python-gammu-0.8.ebuild,v 1.1 2005/07/16 10:40:45 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gammu/python-gammu-0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.cihar.com/gammu/python/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=app-mobilephone/gammu-1.00.04"
 DEPEND="dev-util/pkgconfig
diff --git a/dev-python/python-gtkextra/ChangeLog b/dev-python/python-gtkextra/ChangeLog
index cdfb40908c58..7993ed2872fd 100644
--- a/dev-python/python-gtkextra/ChangeLog
+++ b/dev-python/python-gtkextra/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/python-gtkextra
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gtkextra/ChangeLog,v 1.1 2003/10/25 18:50:15 pythonhead Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gtkextra/ChangeLog,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
+
+  19 Nov 2005; Chris White <chriswhite@gentoo.org> metadata.xml:
+  Added japanese metadata.xml translation thanks to Yoshino-san.
+
+  23 Jan 2005; Simon Stelling <blubb@gentoo.org>
+  python-gtkextra-0.22.ebuild:
+  added ~amd64
+
+  21 Oct 2004; Rob Cakebread <pythonhead@gentoo.org>
+  python-gtkextra-0.22.ebuild:
+  Marked stable on x86
 
 *python-gtkextra-0.22 (25 Oct 2003)
 
diff --git a/dev-python/python-gtkextra/Manifest b/dev-python/python-gtkextra/Manifest
index 7cc5c0f8bcec..6f4abf36d23e 100644
--- a/dev-python/python-gtkextra/Manifest
+++ b/dev-python/python-gtkextra/Manifest
@@ -1,4 +1,14 @@
-MD5 e8935aa6ad8c5018e061802986310940 metadata.xml 260
-MD5 899912bcefe931181fac5c7b5e963363 python-gtkextra-0.22.ebuild 637
-MD5 333d53ae98af123222939df47821b01d ChangeLog 288
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7d84f20e594c9f09500fb2677c89d016 ChangeLog 717
 MD5 83f8c6fb63d47de4f5d7d1ab2147bd68 files/digest-python-gtkextra-0.22 72
+MD5 33646ebd8a5bc28674ded2e95ed2a59e metadata.xml 409
+MD5 c52be1b67e99f5f694a7f5de54106445 python-gtkextra-0.22.ebuild 750
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfwefFdQwWVoAgN4RAuC4AJ9yOthCRwhAgYkULvY/qUlHPprQ6ACdH2MI
+bJS+7mXePRVzXyvLJ3kHg9A=
+=k0pS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-gtkextra/metadata.xml b/dev-python/python-gtkextra/metadata.xml
index 0d1702ca41e0..2b810c8232b8 100644
--- a/dev-python/python-gtkextra/metadata.xml
+++ b/dev-python/python-gtkextra/metadata.xml
@@ -5,5 +5,7 @@
 <longdescription>
 python-gtkextra is Python bindings for the gtk+extra libraries
 </longdescription>
-
+<longdescription lang="ja">
+Python-GTKextraはGTK+extraライブラリを目的としたPython言語バインディングです。
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/python-gtkextra/python-gtkextra-0.22.ebuild b/dev-python/python-gtkextra/python-gtkextra-0.22.ebuild
index 8e4c36511679..9088edbb5799 100644
--- a/dev-python/python-gtkextra/python-gtkextra-0.22.ebuild
+++ b/dev-python/python-gtkextra/python-gtkextra-0.22.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/dev-python/python-gtkextra/python-gtkextra-0.22.ebuild,v 1.1 2003/10/25 18:50:15 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-gtkextra/python-gtkextra-0.22.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://python-gtkextra.sourceforge.net/"
 SRC_URI="mirror://sourceforge/python-gtkextra/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 DEPEND="=x11-libs/gtk+-1.2.10*
 	=dev-python/pygtk-0.6*
diff --git a/dev-python/python-ldap/ChangeLog b/dev-python/python-ldap/ChangeLog
index e61ea6546750..90d486de0559 100644
--- a/dev-python/python-ldap/ChangeLog
+++ b/dev-python/python-ldap/ChangeLog
@@ -1,11 +1,141 @@
 # ChangeLog for dev-python/python-ldap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.1 2002/04/04 02:43:30 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  -python-ldap-2.0.0_pre05-r1.ebuild, -python-ldap-2.0.0_pre06.ebuild,
+  -python-ldap-2.0.0_pre13.ebuild, -python-ldap-2.0.0_pre15.ebuild,
+  -python-ldap-2.0.1.ebuild, -python-ldap-2.0.7.ebuild,
+  -python-ldap-2.0.8.ebuild, +python-ldap-2.0.10.ebuild:
+  clean up
+
+*python-ldap-2.0.10 (30 Sep 2005)
+
+  30 Sep 2005; Carsten Lohrke <carlo@gentoo.org> +python-ldap-2.0.10.ebuild:
+  version bump
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> python-ldap-2.0.8.ebuild:
+  add ~ia64
+
+  14 Jul 2005; Simon Stelling <blubb@gentoo.org> python-ldap-2.0.8.ebuild:
+  added ~amd64 keyword
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.6.ebuild:
+  Stable on alpha.
+
+*python-ldap-2.0.8 (27 Jun 2005)
+
+  27 Jun 2005; Carsten Lohrke <carlo@gentoo.org> +python-ldap-2.0.8.ebuild:
+  version bump
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  python-ldap-2.0.6.ebuild:
+  Stable on ppc.
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> python-ldap-2.0.6.ebuild:
+  Stable on SPARC.
+
+*python-ldap-2.0.7 (15 May 2005)
+
+  15 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.6.ebuild, +python-ldap-2.0.7.ebuild:
+  Version bump + x86 stable bump.
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  python-ldap-2.0.1.ebuild:
+  Stable on sparc
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.1.ebuild:
+  Stable on alpha.
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> python-ldap-2.0.6.ebuild:
+  err, whitespace
+
+*python-ldap-2.0.6 (14 Dec 2004)
+
+  14 Dec 2004; Carsten Lohrke <carlo@gentoo.org> python-ldap-2.0.1.ebuild,
+  +python-ldap-2.0.6.ebuild:
+  stable on x86, version bump
+
+  03 Nov 2004; <SeJo@gentoo.org> python-ldap-2.0.1.ebuild:
+  added ppc keyword
+
+  04 Jul 2004; David Holm <dholm@gentoo.org> python-ldap-2.0.1.ebuild:
+  Added to ~ppc.
+
+*python-ldap-2.0.1 (03 Jul 2004)
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +python-ldap-2.0.1.ebuild:
+  Version bump.
+
+  03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.0_pre15.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  python-ldap-2.0.0_pre05-r1.ebuild:
+  Add missing IUSE.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  Stable on sparc.
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre05-r1.ebuild, python-ldap-2.0.0_pre06.ebuild,
+  python-ldap-2.0.0_pre13.ebuild, python-ldap-2.0.0_pre15.ebuild:
+  fix license. it isn't public-domain
+
+*python-ldap-2.0.0_pre15 (13 Nov 2003)
+
+  13 Nov 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild, python-ldap-2.0.0_pre15.ebuild:
+  version bump
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  fix sasl header (#25693), updated compile/optimise options, made compatible
+  with python-2.3
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  added sasl dep and tweaked the usage of ldap and ldap_r in mylibs (#25143)
+
+*python-ldap-2.0.0_pre13 (01 Jul 2003)
+
+  01 Jul 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre13.ebuild:
+  version bump. adds sasl and ssl USE flags to correspond with openldap's USE
+  flags
+
+  22 May 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre06.ebuild:
+  uses distutils, dynamically patch setup.cfg
+
+*python-ldap-2.0.0_pre06 (15 Mar 2003)
+
+  15 Mar 2003; Alastair Tse <liquidx@gentoo.org>
+  python-ldap-2.0.0_pre06.ebuild:
+  version bump. thanks to Andy Dustman. #17519.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*python-ldap-2.0.0_pre05-r1 (24 Sep 2002)
+  24 Sep 2002; Jon Nelson <jnelson@gentoo.org> python-ldap-2.0.0_pre05-r1.ebuild:
+  Fix for bug 8275
+  Thanks to jason at penguinsolutions.com (Jason Jeremias)
+
+*python-ldap-2.0.0_pre05 (1 Aug 2002)
+
+  1 Aug 2002; Jon Nelson <jnelson@gentoo.org> python-ldap-2.0.0pre05.ebuild:
+  Update to pre05 and fix repoman errors in *this* release
+  
 *python-ldap-2.0.0pre04 (3 Apr 2002)
 
   3 Apr 2002; Bruce A. Locke <blocke@shivan.org> python-ldap-2.0.0pre04.ebuild :
 
   Initial Version
-
-
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index dac73092744d..0a96d065fcdf 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1,7 +1,6 @@
-MD5 579ddf61f11ad6e487cc2c1650763275 ChangeLog 997
-MD5 72d4257c512b0e04eddd4d258909d1f8 python-ldap-2.0.0_pre05-r1.ebuild 920
-MD5 04a02e1280b6422bf3381c9a84e00d76 python-ldap-2.0.0_pre05.ebuild 846
-MD5 2697635afe1503bd0cf589b826679efe python-ldap-2.0.0_pre06.ebuild 875
-MD5 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05 73
-MD5 870f1b1ecea4f738da0ba65fb5a0a661 files/digest-python-ldap-2.0.0_pre05-r1 73
-MD5 aaef21adf6aa58c8fc0a0627f3ceae5f files/digest-python-ldap-2.0.0_pre06 73
+MD5 a42b1bf591212834005bfc07fae44dc9 python-ldap-2.0.10.ebuild 1537
+MD5 0d58c818214b1bc1e5c4f0fd7c93749e python-ldap-2.0.6.ebuild 1499
+MD5 65dac36da7b16efc7099b0ad3a6c3aa3 ChangeLog 4482
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 69d713e85c4b770343fa03ed0e8c01b7 files/digest-python-ldap-2.0.10 147
+MD5 a817aea8eb27cfeb4925d7aef1a0df05 files/digest-python-ldap-2.0.6 146
diff --git a/dev-python/python-ldap/python-ldap-2.0.10.ebuild b/dev-python/python-ldap/python-ldap-2.0.10.ebuild
index 0544e9d39ccc..c1d8ed7f46ad 100644
--- a/dev-python/python-ldap/python-ldap-2.0.10.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.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/dev-python/python-ldap/python-ldap-2.0.10.ebuild,v 1.1 2005/09/30 23:50:19 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.10.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/python-ldap/python-ldap-2.0.6.ebuild b/dev-python/python-ldap/python-ldap-2.0.6.ebuild
index 3ef9746d6bdf..45c6d889dfcc 100644
--- a/dev-python/python-ldap/python-ldap-2.0.6.ebuild
+++ b/dev-python/python-ldap/python-ldap-2.0.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/dev-python/python-ldap/python-ldap-2.0.6.ebuild,v 1.1 2004/12/14 19:58:11 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-ldap/python-ldap-2.0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ P_DOC="html-python-ldap-docs-2.0.3" # no newer docs available
 
 DESCRIPTION="Various LDAP-related Python modules"
 SRC_URI="mirror://sourceforge/python-ldap/${P}.tar.gz
-	doc? ( mirror://sourceforge/python-ldap/${P_DOC}.tar.gz )" 
+	doc? ( mirror://sourceforge/python-ldap/${P_DOC}.tar.gz )"
 HOMEPAGE="http://python-ldap.sourceforge.net/"
 
 DEPEND="virtual/python
@@ -19,7 +19,7 @@ DEPEND="virtual/python
 
 SLOT="0"
 LICENSE="PYTHON"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="alpha ppc sparc x86"
 IUSE="doc sasl ssl"
 
 PYTHON_MODNAME="ldap"
@@ -33,15 +33,15 @@ src_unpack() {
 		-i setup.cfg || die "error fixing setup.cfg"
 
 	local mylibs="ldap"
-	if use sasl ; then 
+	if use sasl ; then
 		use ssl && mylibs="ldap_r"
 		mylibs="${mylibs} sasl2"
 	fi
 	use ssl && mylibs="${mylibs} ssl crypto"
-	
+
 	# Fixes bug #25693
 	sed -e "s|<sasl.h>|<sasl/sasl.h>|" -i Modules/LDAPObject.c
-	
+
 	sed -e "s:^libs = .*:libs = lber resolv ${mylibs}:" \
 		-e "s:^compile.*:compile = 0:" \
 		-e "s:^optimize.*:optimize = 0:" \
diff --git a/dev-python/python-levenshtein/ChangeLog b/dev-python/python-levenshtein/ChangeLog
index bb7b99af0c47..c71c04cd52c8 100644
--- a/dev-python/python-levenshtein/ChangeLog
+++ b/dev-python/python-levenshtein/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/python-levenshtein
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/ChangeLog,v 1.1 2004/05/25 11:13:23 carlo Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
   25 May 2004; Carsten Lohrke <carlo@gentoo.org> files/genextdoc.py:
   Initial import.
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 001d3ad3ccbe..05941ef71a19 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,5 +1,5 @@
-MD5 2f086b96bd53aebcd0792454cc2083cc ChangeLog 226
+MD5 dd6d735465bf2f19f85fafd33025c9ad ChangeLog 321
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 3ac73c98c2e9c4c3d35095dfec26ed6c python-levenshtein-0.10.ebuild 732
-MD5 32012c2c53f04d48c81bddb4f980e409 files/genextdoc.py 7029
+MD5 1344aa752bae586d3c108b5f74ecb0df python-levenshtein-0.10.ebuild 848
+MD5 9386c7a55d7d4bd7aa2d653baac0e31a files/genextdoc.py 7030
 MD5 b70cf5172bba268fb303713db9f5dd3e files/digest-python-levenshtein-0.10 75
diff --git a/dev-python/python-levenshtein/files/genextdoc.py b/dev-python/python-levenshtein/files/genextdoc.py
index f6918ba3e4f8..280447d3b8dc 100644
--- a/dev-python/python-levenshtein/files/genextdoc.py
+++ b/dev-python/python-levenshtein/files/genextdoc.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # Simple Python extension module doc generator.
-# @(#) $Id: genextdoc.py,v 1.1 2004/05/25 11:13:23 carlo Exp $
+# @(#) $Id: genextdoc.py,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 # Written by Yeti <yeti@physics.muni.cz>
 # This program is in the public domain.
 import re, sys, types, inspect
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild
index 464b6b7346cd..ed494e3474a2 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.10.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/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild,v 1.1 2004/05/25 11:13:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-levenshtein/python-levenshtein-0.10.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/python-mhash/ChangeLog b/dev-python/python-mhash/ChangeLog
index d92162fb376f..42bfc73130f1 100644
--- a/dev-python/python-mhash/ChangeLog
+++ b/dev-python/python-mhash/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/python-mhash
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/ChangeLog,v 1.1 2004/05/24 06:39:18 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+  18 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> :
+  Add in 1.3, 1.2 in stable x86.
 
 *python-mhash-1.2 (23 May 2004)
 
diff --git a/dev-python/python-mhash/Manifest b/dev-python/python-mhash/Manifest
index 1942e213e478..179f4e48b4ba 100644
--- a/dev-python/python-mhash/Manifest
+++ b/dev-python/python-mhash/Manifest
@@ -1,2 +1,17 @@
-MD5 2d90d66f2ba3da4cde589956b2c8601f python-mhash-1.2.ebuild 565
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b182f1ad9b2e72bcf2bd2f3e3e8f395a python-mhash-1.3.ebuild 906
+MD5 07665d7f6b31029861a70ee22d2a6892 python-mhash-1.2.ebuild 663
+MD5 8f40372169ed1c9c306524418e5e2673 ChangeLog 467
+MD5 44961c613f0cb57d9691674769131003 metadata.xml 257
 MD5 9417a3d58c7f0afd909ef0a77a022d31 files/digest-python-mhash-1.2 67
+MD5 99c7931120e2b7915e4dd6f3784673ed files/digest-python-mhash-1.3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
+
+iD8DBQFCFlktPpIsIjIzwiwRAhvqAJ9LmqyKF5o1JxroAONHRjfmrS2HJwCaA1Qx
+W+ZR6fEtp47gfO47aqvW62E=
+=PabG
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-mhash/python-mhash-1.2.ebuild b/dev-python/python-mhash/python-mhash-1.2.ebuild
index 84a7ae7d4d6e..e477eb5a2f50 100644
--- a/dev-python/python-mhash/python-mhash-1.2.ebuild
+++ b/dev-python/python-mhash/python-mhash-1.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/dev-python/python-mhash/python-mhash-1.2.ebuild,v 1.1 2004/05/24 06:39:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/python-mhash-1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ DEPEND="virtual/python
 		app-crypt/mhash"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="GPL-2"
 
 src_unpack() {
diff --git a/dev-python/python-mhash/python-mhash-1.3.ebuild b/dev-python/python-mhash/python-mhash-1.3.ebuild
index c49be0e7ce42..9a8de80bcc28 100644
--- a/dev-python/python-mhash/python-mhash-1.3.ebuild
+++ b/dev-python/python-mhash/python-mhash-1.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/dev-python/python-mhash/python-mhash-1.3.ebuild,v 1.1 2005/02/18 21:07:45 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-mhash/python-mhash-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/python-musicbrainz/ChangeLog b/dev-python/python-musicbrainz/ChangeLog
index aad951334d1e..00721493f788 100644
--- a/dev-python/python-musicbrainz/ChangeLog
+++ b/dev-python/python-musicbrainz/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/python-musicbrainz
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz/ChangeLog,v 1.1 2005/01/16 06:29:11 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz/ChangeLog,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 *python-musicbrainz-20050108 (15 Jan 2005)
 
diff --git a/dev-python/python-musicbrainz/Manifest b/dev-python/python-musicbrainz/Manifest
index 9c187b116683..0795876fc52b 100644
--- a/dev-python/python-musicbrainz/Manifest
+++ b/dev-python/python-musicbrainz/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b2a918bca3e7bab6c7d4d22198d2c443 python-musicbrainz-20050108.ebuild 573
-MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 1f50126bbab7b72c860307d9824e3365 ChangeLog 311
+MD5 7fd08d88152a2b8a53b40c09fdd54b2b ChangeLog 416
 MD5 965a70e773083e4c3a10f8e5e45af454 files/digest-python-musicbrainz-20050108 76
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFB6gnEz2gxt1z4IGYRAl3IAKCwDhC2XgRViD6vNhhd40XPdnyIuQCgrh+U
-YiESVjsQjOw7x00Y4lwR5iY=
-=G/Kf
------END PGP SIGNATURE-----
+MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
+MD5 92924437e3054fccf4bb8702c1ae466c python-musicbrainz-20050108.ebuild 702
diff --git a/dev-python/python-musicbrainz/python-musicbrainz-20050108.ebuild b/dev-python/python-musicbrainz/python-musicbrainz-20050108.ebuild
index dd66e9e91bea..0ccd4ffcfecb 100644
--- a/dev-python/python-musicbrainz/python-musicbrainz-20050108.ebuild
+++ b/dev-python/python-musicbrainz/python-musicbrainz-20050108.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/dev-python/python-musicbrainz/python-musicbrainz-20050108.ebuild,v 1.1 2005/01/16 06:29:11 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-musicbrainz/python-musicbrainz-20050108.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python bindings for musicbrainz client library"
 HOMEPAGE="http://musicbrainz.org/"
-SRC_URI="miror://gentoo/${P}.tbz2"
+SRC_URI="mirror://gentoo/${P}.tbz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-python/python-selinux/ChangeLog b/dev-python/python-selinux/ChangeLog
index af4f3c4cc84b..04220c559620 100644
--- a/dev-python/python-selinux/ChangeLog
+++ b/dev-python/python-selinux/ChangeLog
@@ -1,6 +1,119 @@
 # ChangeLog for dev-python/python-selinux
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-selinux/ChangeLog,v 1.1 2003/07/04 01:05:44 method Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-selinux/ChangeLog,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
+
+*python-selinux-2.16 (30 Oct 2005)
+
+  30 Oct 2005; Chris PeBenito <pebenito@gentoo.org>
+  +files/python-selinux-2.16.c.bz2, +python-selinux-2.16.ebuild:
+  Overhaul error handling and SELinux-enable handling.
+
+  10 May 2005; Stephen Bennett <spb@gentoo.org> python-selinux-2.15.ebuild:
+  mips stable
+
+  01 May 2005; Stephen Bennett <spb@gentoo.org> python-selinux-2.15.ebuild:
+  Added ~mips.
+
+  21 Oct 2004; petre rodan <kaiowas@gentoo.org> python-selinux-2.15.ebuild:
+  Mark stable.
+
+*python-selinux-2.15 (21 Sep 2004)
+
+  21 Sep 2004; Chris PeBenito <pebenito@gentoo.org>
+  +files/python-selinux-2.15.c.bz2, +python-selinux-2.15.ebuild:
+  Add secure_mkdir from kaiowas.
+
+  05 May 2004; Chris PeBenito <pebenito@gentoo.org>
+  -files/python-selinux-2.10.c.bz2, -files/python-selinux-2.12.c.bz2,
+  -python-selinux-2.10.ebuild, -python-selinux-2.12.ebuild,
+  python-selinux-2.14.ebuild:
+  Mark stable.
+
+*python-selinux-2.14 (30 Apr 2004)
+
+  30 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  -files/python-selinux-2.13.c.bz2, +files/python-selinux-2.14.c.bz2,
+  -python-selinux-2.13.ebuild, +python-selinux-2.14.ebuild:
+  Fix reset of exec context.
+
+*python-selinux-2.13 (26 Apr 2004)
+
+  26 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  +python-selinux-2.13.ebuild:
+  Add getcon and setexec functions.
+
+  08 Apr 2004; Chris PeBenito <pebenito@gentoo.org>
+  python-selinux-2.12.ebuild:
+  Mark stable for 2004.1
+
+*python-selinux-2.12 (15 Mar 2004)
+
+  15 Mar 2004; Chris PeBenito <pebenito@gentoo.org>
+  python-selinux-2.12.ebuild, files/python-selinux-2.12.c.bz2:
+  New release.  Fixes for newer is_selinux_enabled() behavior.
+
+  06 Dec 2003; Chris PeBenito <pebenito@gentoo.org>
+  python-selinux-2.10.ebuild:
+  Add missing python DEP. Fix to use python eclass, to work with different
+  versions of python.
+
+*python-selinux-2.10 (20 Nov 2003)
+
+  20 Nov 2003; Chris PeBenito <pebenito@gentoo.org>
+  python-selinux-2.10.ebuild, files/python-selinux-2.10.c.bz2:
+  Revision of error handling. Now it will work correctly if SELinux happens to
+  be disabled.
+
+*python-selinux-2.9 (13 Nov 2003)
+
+  13 Nov 2003; Joshua Brindle <method@gentoo.org> python-selinux-2.8.ebuild,
+  python-selinux-2.9.ebuild:
+  fixed symlink problem maybe
+
+*python-selinux-2.8 (09 Nov 2003)
+
+  09 Nov 2003; Joshua Brindle <method@gentoo.org> python-selinux-2.8.ebuild:
+  fixed getfilecon() error handling
+
+  29 Oct 2003; Joshua Brindle <method@gentoo.org> python-selinux-1.2.ebuild,
+  python-selinux-1.2.ebuild, python-selinux-2.7.ebuild:
+  made 2.7 x86, ppc, sparc stable
+
+  13 Oct 2003; Chris PeBenito <pebenito@gentoo.org> python-selinux-2.7.ebuild:
+  Make the ebuild fail if the compile fails.
+
+*python-selinux-2.7 (13 Oct 2003)
+
+  13 Oct 2003; Joshua Brindle <method@gentoo.org> python-selinux-2.6.ebuild,
+  python-selinux-2.6.ebuild, python-selinux-2.7.ebuild:
+  major fixes, doesn't use shutil for copies anymore
+
+*python-selinux-2.6 (06 Oct 2003)
+
+  06 Oct 2003; Joshua Brindle <method@gentoo.org> python-selinux-2.5.ebuild,
+  python-selinux-2.5.ebuild, python-selinux-2.6.ebuild:
+  fixed file in use problem
+
+*python-selinux-2.5 (02 Oct 2003)
+
+  02 Oct 2003; Joshua Brindle <method@gentoo,org> python-selinux-2.5.ebuild:
+  new api version
+
+*python-selinux-1.2 (29 Jul 2003)
+
+  29 Jul 2003; Joshua Brindle <method@gentoo.org> python-selinux-1.2.ebuild:
+  new version that throws correct exception
+
+*python-selinux-1.1 (29 Jul 2003)
+
+  29 Jul 2003; Joshua Brindle <method@gentoo.org> python-selinux-1.1.ebuild:
+  fixed it so that it will throw an exception on load if no selinux kernel
+
+*python-selinux-1.0-r1 (09 Jul 2003)
+
+  09 Jul 2003; Joshua Brindle <method@gentoo.org>
+  python-selinux-1.0-r1.ebuild: 
+  wow, what was i thinking with that ebuild, this one should really work
 
 *python-selinux-1.0 (03 Jul 2003)
 
diff --git a/dev-python/python-selinux/Manifest b/dev-python/python-selinux/Manifest
index 59f448d95c97..9815664d7893 100644
--- a/dev-python/python-selinux/Manifest
+++ b/dev-python/python-selinux/Manifest
@@ -1,3 +1,18 @@
-MD5 cfcf0531681c016a3e6a1439f637ffea python-selinux-1.0.ebuild 583
-MD5 3c854e24c135383faef5f0fe74b62632 ChangeLog 310
-MD5 41ce3631984a8e2bf2dc1a9ea66a7315 files/digest-python-selinux-1.0 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7e9124e45ea6ad95495161106fc8b040 ChangeLog 4158
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-python-selinux-2.15 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-python-selinux-2.16 0
+MD5 135bcb03bcb0dbed4e8bc354e1ff38f3 files/python-selinux-2.15.c.bz2 6831
+MD5 d5dc9417a58fe239af4d9e126be2ceff files/python-selinux-2.16.c.bz2 8500
+MD5 c998c579cfc08c6860f78304a67cfce9 metadata.xml 525
+MD5 c614ac830f5ecad17c6be55f351af604 python-selinux-2.15.ebuild 852
+MD5 301684f44998e3b41437cf5449a32967 python-selinux-2.16.ebuild 899
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZFRJJ+ChZlpDtAoRAiTgAJ9pHPG66dp8fdEtV5OzBurL6NbcTgCgjTqT
+F5xiIlVaOgqBBbzP+JvYZPw=
+=T8iF
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-selinux/metadata.xml b/dev-python/python-selinux/metadata.xml
index c08f4803b57f..a63095b4dbf3 100644
--- a/dev-python/python-selinux/metadata.xml
+++ b/dev-python/python-selinux/metadata.xml
@@ -3,9 +3,14 @@
 <pkgmetadata>
 <herd>hardened</herd>
 <maintainer>
+  <email>method@gentoo.org</email>
+  <name>Joshua Brindle</name>
+  <description>Primary Maintainer</description>
+</maintainer>
+<maintainer>
   <email>pebenito@gentoo.org</email>
   <name>Chris PeBenito</name>
-  <description>Primary Maintainer</description>
+  <description>Backup Maintainer</description>
 </maintainer>
-<longdescription>Python bindings for sid related libsecure fuctions, donated by torbenh@freenode</longdescription>
+<longdescription>Python bindings for SELinux libselinux fuctions</longdescription>
 </pkgmetadata>
diff --git a/dev-python/python-selinux/python-selinux-2.15.ebuild b/dev-python/python-selinux/python-selinux-2.15.ebuild
index bae4dfa41d17..645e70c4f92a 100644
--- a/dev-python/python-selinux/python-selinux-2.15.ebuild
+++ b/dev-python/python-selinux/python-selinux-2.15.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/dev-python/python-selinux/python-selinux-2.15.ebuild,v 1.1 2004/09/21 23:15:02 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-selinux/python-selinux-2.15.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit python
 python_version
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.gentoo.org/proj/en/hardened/selinux/"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64 mips"
 IUSE=""
 
 DEPEND="dev-lang/python
diff --git a/dev-python/python-selinux/python-selinux-2.16.ebuild b/dev-python/python-selinux/python-selinux-2.16.ebuild
index 7bdec977a0d9..42d03b18b4de 100644
--- a/dev-python/python-selinux/python-selinux-2.16.ebuild
+++ b/dev-python/python-selinux/python-selinux-2.16.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/dev-python/python-selinux/python-selinux-2.16.ebuild,v 1.1 2005/10/30 05:03:46 pebenito Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-selinux/python-selinux-2.16.ebuild,v 1.1.1.1 2005/11/30 10:10:34 chriswhite Exp $
 
 inherit python
 python_version
diff --git a/dev-python/python-xlib/ChangeLog b/dev-python/python-xlib/ChangeLog
index f8d9e86e18fd..0cbdbf76452c 100644
--- a/dev-python/python-xlib/ChangeLog
+++ b/dev-python/python-xlib/ChangeLog
@@ -1,8 +1,35 @@
 # ChangeLog for dev-python/python-xlib
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-xlib/ChangeLog,v 1.1 2002/12/17 23:09:38 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-xlib/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> python-xlib-0.12-r1.ebuild:
+  stable on amd64
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Dec 2004; Tom Martin <slarti@gentoo.org> python-xlib-0.12-r1.ebuild:
+  Marked ~amd64.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> python-xlib-0.12.ebuild:
+  Remove default S.
+
+  03 Apr 2004; Lars Weiler <pylon@gentoo.org> python-xlib-0.12-r1.ebuild:
+  stable on ppc
+
+*python-xlib-0.12-r1 (02 Mar 2004)
+
+  02 Mar 2004; <kloeri@gentoo.org> python-xlib-0.12-r1.ebuild,
+  files/python-xlib-0.12-info.patch:
+  Fix missing info dir entries, closing bug #43424.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> python-xlib-0.12.ebuild:
+  stable on alpha and ia64
 
 *python-xlib-0.12 (17 Dec 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> python-xlib-0.12.ebuild:
+  stable bump
+
   17 Dec 2002; B.Lauwers <blauwers@gentoo.org> :
   Initial submit. Ebuild submitted by Tom von Schwerdtner.
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index e69de29bb2d1..99832411d906 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -0,0 +1,7 @@
+MD5 0a51ece39af17278080c5d1e87483044 ChangeLog 1222
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 981a64da40f9916246719f87b638e76c python-xlib-0.12-r1.ebuild 686
+MD5 eb05ef08acfb13dbc26100f9f022ea0a python-xlib-0.12.ebuild 639
+MD5 716ec6da435f0eac82444eefdd7ae0d8 files/digest-python-xlib-0.12 68
+MD5 716ec6da435f0eac82444eefdd7ae0d8 files/digest-python-xlib-0.12-r1 68
+MD5 b19a4b8209587ec222338c3ef3bd3ea7 files/python-xlib-0.12-info.patch 3003
diff --git a/dev-python/python-xlib/python-xlib-0.12-r1.ebuild b/dev-python/python-xlib/python-xlib-0.12-r1.ebuild
index 73c236cdd990..df2aad9d4faa 100644
--- a/dev-python/python-xlib/python-xlib-0.12-r1.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.12-r1.ebuild
@@ -1,21 +1,20 @@
-# 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/dev-python/python-xlib/python-xlib-0.12-r1.ebuild,v 1.1 2004/03/02 15:11:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-xlib/python-xlib-0.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
-inherit distutils
+inherit distutils eutils
 
-S=${WORKDIR}/${P}
-DESCRIPTION="A fully functional X client library for Python, written in Python."
-SRC_URI="mirror://sourceforge/python-xlib/${P}.tar.gz"
+DESCRIPTION="A fully functional X client library for Python, written in Python"
 HOMEPAGE="http://python-xlib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/python-xlib/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc alpha ia64"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha ia64 amd64"
 IUSE=""
 
 src_install () {
-	epatch "${FILESDIR}/${P}-info.patch"
+	epatch ${FILESDIR}/${P}-info.patch
 	mydoc="doc/ps/python-xlib.ps PKG-INFO TODO"
 	distutils_src_install
 	dohtml -r doc/html/
diff --git a/dev-python/python-xlib/python-xlib-0.12.ebuild b/dev-python/python-xlib/python-xlib-0.12.ebuild
index 9e611e74489c..3268d6c29a92 100644
--- a/dev-python/python-xlib/python-xlib-0.12.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.12.ebuild
@@ -1,21 +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/dev-python/python-xlib/python-xlib-0.12.ebuild,v 1.1 2002/12/17 23:09:38 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-xlib/python-xlib-0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
+
+inherit distutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A fully functional X client library for Python, written in Python."
 SRC_URI="mirror://sourceforge/python-xlib/${P}.tar.gz"
 HOMEPAGE="http://python-xlib.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-
-inherit distutils
-
-src_compile() {
-	distutils_src_compile
-}
+KEYWORDS="x86 ~ppc ~sparc alpha ia64"
+IUSE=""
 
 src_install () {
 	mydoc="doc/ps/python-xlib.ps PKG-INFO TODO"
diff --git a/dev-python/pythoncard/ChangeLog b/dev-python/pythoncard/ChangeLog
index beedf163703d..f8ff80335884 100644
--- a/dev-python/pythoncard/ChangeLog
+++ b/dev-python/pythoncard/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for dev-python/pythoncard
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/ChangeLog,v 1.1 2002/12/18 01:52:30 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  26 Aug 2005; Rob Cakebread <pythonhead@gentoo.org>
+  pythoncard-0.7.3.1.ebuild:
+  Marked x86 stable
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> pythoncard-0.6.9.ebuild,
+  pythoncard-0.7.1.ebuild, pythoncard-0.7.2.ebuild, pythoncard-0.7.3.1.ebuild,
+  pythoncard-0.7.ebuild:
+  Change wxPython to wxpython.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pythoncard-0.6.9.ebuild,
+  pythoncard-0.7.ebuild:
+  Add missing IUSE.
+
+  16 Apr 2004; David Holm <dholm@gentoo.org> pythoncard-0.7.3.1.ebuild:
+  Added to ~ppc.
+
+  15 Apr 2004; Rob Cakebread <pythonhead@gentoo.org>
+  pythoncard-0.7.3.1.ebuild:
+  Changed license to BSD
+
+*pythoncard-0.7.3.1 (15 Apr 2004)
+
+  15 Apr 2004; Rob Cakebread <pythonhead@gentoo.org>
+  +pythoncard-0.7.3.1.ebuild:
+  Version bump (bug #47864) thanks Stephen Boulet <stephen@theboulets.net>
+
+  02 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> pythoncard-0.7.2.ebuild:
+  Stable on x86.
+
+*pythoncard-0.7.2 (02 Oct 2003)
+
+  02 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> pythoncard-0.7.2.ebuild:
+  Version bump (#29868) thanks Stephen Boulet <stephen@theboulets.net>
+
+*pythoncard-0.7.1 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> pythoncard-0.7.1.ebuild:
+  version bump
+
+*pythoncard-0.7 (20 Apr 2003)
+
+  20 Apr 2003; B.Lauwers <blauwers@gentoo.org> :
+  Version bump per Bug#14344
 
 *pythoncard-0.6.9 (12 Dec 2002)
 
diff --git a/dev-python/pythoncard/Manifest b/dev-python/pythoncard/Manifest
index e69de29bb2d1..51bbd34faeb4 100644
--- a/dev-python/pythoncard/Manifest
+++ b/dev-python/pythoncard/Manifest
@@ -0,0 +1,12 @@
+MD5 5e86c35e9d77e1fe7505adbf02f0e5d7 ChangeLog 1845
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 65f83515b280e9c2a7c2641442c0b9c9 pythoncard-0.6.9.ebuild 746
+MD5 b727a2a67f310e1fa851dedb1fb9d428 pythoncard-0.7.1.ebuild 623
+MD5 20dabbf1a5ef0463d606e00f1703612c pythoncard-0.7.2.ebuild 619
+MD5 1435354b8d2d7d56f0b48fff7f4fbb67 pythoncard-0.7.ebuild 620
+MD5 601e60b82a6a714bfcad89402ff27d6c pythoncard-0.7.3.1.ebuild 628
+MD5 957d2417ddade01f1afa3f6124935ad1 files/digest-pythoncard-0.6.9 77
+MD5 9f40f8907935b4a4eb86384e8da45eba files/digest-pythoncard-0.7 76
+MD5 25da3b4db49c23933345f6302358fef1 files/digest-pythoncard-0.7.1 78
+MD5 a60f14ea4e1ad758d4363ee3e0706778 files/digest-pythoncard-0.7.2 78
+MD5 18a345d3cc1c9ddb7d51de7be7c3213e files/digest-pythoncard-0.7.3.1 80
diff --git a/dev-python/pythoncard/pythoncard-0.6.9.ebuild b/dev-python/pythoncard/pythoncard-0.6.9.ebuild
index 57381388828e..5d7e01aea163 100644
--- a/dev-python/pythoncard/pythoncard-0.6.9.ebuild
+++ b/dev-python/pythoncard/pythoncard-0.6.9.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.6.9.ebuild,v 1.1 2002/12/11 23:55:41 blauwers Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.6.9.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 DESCRIPTION="Cross-platform GUI construction kit for python"
-SRC_URI="mirror://sourceforge/pythoncard/PythonCardPrototype-${PV}.tar.gz"
 HOMEPAGE="http://pythoncard.sourceforge.net/index.html"
+SRC_URI="mirror://sourceforge/pythoncard/PythonCardPrototype-${PV}.tar.gz"
+
 LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/python
-	>=dev-python/wxPython-2.3.2.1-r2"
-SLOT="0"
-KEYWORDS="~x86"
+	>=dev-python/wxpython-2.3.2.1-r2"
+
 S=${WORKDIR}/PythonCardPrototype-${PV}
 
 src_compile() {
-	python setup.py build || die    
+	python setup.py build || die
 }
 
 src_install() {
 	python setup.py install --prefix=${D}/usr || die "Install Failed"
 	dodoc README.txt README_StyleEditor.txt
 }
-
-
-
-
diff --git a/dev-python/pythoncard/pythoncard-0.7.1.ebuild b/dev-python/pythoncard/pythoncard-0.7.1.ebuild
index 480bb1b62835..b383f4e3668f 100644
--- a/dev-python/pythoncard/pythoncard-0.7.1.ebuild
+++ b/dev-python/pythoncard/pythoncard-0.7.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/dev-python/pythoncard/pythoncard-0.7.1.ebuild,v 1.1 2003/09/02 23:28:16 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
 
-DEPEND=">=dev-python/wxPython-2.3.2.1-r2"
+DEPEND=">=dev-python/wxpython-2.3.2.1-r2"
 
 S=${WORKDIR}/PythonCardPrototype-${PV}
 
diff --git a/dev-python/pythoncard/pythoncard-0.7.2.ebuild b/dev-python/pythoncard/pythoncard-0.7.2.ebuild
index d7b24713c33f..68a65bf92ee7 100644
--- a/dev-python/pythoncard/pythoncard-0.7.2.ebuild
+++ b/dev-python/pythoncard/pythoncard-0.7.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/dev-python/pythoncard/pythoncard-0.7.2.ebuild,v 1.1 2003/10/03 03:51:17 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/pythoncard/PythonCardPrototype-${PV}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
-DEPEND=">=dev-python/wxPython-2.4.1.2"
+DEPEND=">=dev-python/wxpython-2.4.1.2"
 
 S=${WORKDIR}/PythonCardPrototype-${PV}
 
diff --git a/dev-python/pythoncard/pythoncard-0.7.3.1.ebuild b/dev-python/pythoncard/pythoncard-0.7.3.1.ebuild
index bbc06590a33c..8ed15c66d58f 100644
--- a/dev-python/pythoncard/pythoncard-0.7.3.1.ebuild
+++ b/dev-python/pythoncard/pythoncard-0.7.3.1.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/dev-python/pythoncard/pythoncard-0.7.3.1.ebuild,v 1.1 2004/04/15 23:30:09 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.7.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -8,12 +8,12 @@ DESCRIPTION="Cross-platform GUI construction kit for python"
 HOMEPAGE="http://pythoncard.sourceforge.net/index.html"
 SRC_URI="mirror://sourceforge/pythoncard/PythonCardPrototype-${PV}.tar.gz"
 
-LICENSE="PYTHON"
+LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~ppc"
 IUSE=""
 
-DEPEND=">=dev-python/wxPython-2.4.2.4"
+DEPEND="=dev-python/wxpython-2.4.2.4*"
 
 S=${WORKDIR}/PythonCardPrototype-${PV}
 
diff --git a/dev-python/pythoncard/pythoncard-0.7.ebuild b/dev-python/pythoncard/pythoncard-0.7.ebuild
index f47863602edf..669d2e0d0195 100644
--- a/dev-python/pythoncard/pythoncard-0.7.ebuild
+++ b/dev-python/pythoncard/pythoncard-0.7.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.7.ebuild,v 1.1 2003/04/20 01:59:03 blauwers Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythoncard/pythoncard-0.7.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Cross-platform GUI construction kit for python"
-SRC_URI="mirror://sourceforge/pythoncard/PythonCardPrototype-${PV}.tar.gz"
 HOMEPAGE="http://pythoncard.sourceforge.net/index.html"
-LICENSE="PYTHON"
+SRC_URI="mirror://sourceforge/pythoncard/PythonCardPrototype-${PV}.tar.gz"
 
-DEPEND=">=dev-python/wxPython-2.3.2.1-r2"
+LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
+IUSE=""
+
+DEPEND=">=dev-python/wxpython-2.3.2.1-r2"
 
 S=${WORKDIR}/PythonCardPrototype-${PV}
 
diff --git a/dev-python/pythondialog/ChangeLog b/dev-python/pythondialog/ChangeLog
index 017efef57e52..fe91d0ecfbec 100644
--- a/dev-python/pythondialog/ChangeLog
+++ b/dev-python/pythondialog/ChangeLog
@@ -1,8 +1,47 @@
 # ChangeLog for dev-python/pythondialog
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythondialog/ChangeLog,v 1.1 2003/02/07 22:55:41 gerk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythondialog/ChangeLog,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
-*pythongdialog-1.0 (07 Feb 2003)
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pythondialog-2.7.ebuild:
+  Mark 2.7 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pythondialog-2.7.ebuild:
+  add ~ia64
+
+  08 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  pythondialog-2.7.ebuild:
+  Stable on sparc
+
+  21 Jan 2005; Marcus D. Hanwell <cryos@gentoo.org> pythondialog-2.7.ebuild:
+  Marked stable on amd64.
+
+  04 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  pythondialog-2.7.ebuild:
+  Stable on x86 and alpha.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  pythondialog-2.7.ebuild:
+  Fix keywords dropped by mistake.
+
+  13 Nov 2004; Jason Wever <weeve@gentoo.org> pythondialog-2.7.ebuild:
+  Added ~sparc keyword.
+
+*pythondialog-2.7 (06 Nov 2004)
+
+  06 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  +pythondialog-2.7.ebuild:
+  Version bump, bug 69857.
+
+  03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> pythondialog-1.0.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pythondialog-1.0.ebuild:
+  Add missing IUSE.
+
+*pythondialog-1.0 (07 Feb 2003)
   07 Feb 2003; Mark Guertin <gerk@gentoo.org> pythondialog-1.0.ebuild :
   Initial build entry.  Set as ~ for all arches, should work fine.  Thanks
   to Matt Tucker for the new ebuild, bug # 15238.
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index e69de29bb2d1..b76c5b648d9a 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -0,0 +1,7 @@
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 800dd286bf0ada6e36a05d2c79f8ab13 ChangeLog 1610
+MD5 0bb4efe678ea41782079d0b20d3b08ea pythondialog-2.7.ebuild 648
+MD5 772698871c39e023b03346527b0d96eb pythondialog-1.0.ebuild 775
+MD5 8d47d64d3782fd31b429258c21b66dc5 files/digest-pythondialog-1.0 53
+MD5 c7d5806c7aa14d3ef98bf70ac8e773fc files/digest-pythondialog-2.7 68
+MD5 80e5ace6de9868fe7574d8f566d85cdf files/00_all_setup.py.patch.bz2 322
diff --git a/dev-python/pythondialog/pythondialog-1.0.ebuild b/dev-python/pythondialog/pythondialog-1.0.ebuild
index c80f191eb91d..74743476bba8 100644
--- a/dev-python/pythondialog/pythondialog-1.0.ebuild
+++ b/dev-python/pythondialog/pythondialog-1.0.ebuild
@@ -1,24 +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/dev-python/pythondialog/pythondialog-1.0.ebuild,v 1.1 2003/02/07 22:55:41 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythondialog/pythondialog-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
+
+inherit eutils distutils
+EPATCH_SOURCE="${FILESDIR}"
 
-IUSE=""
-S=${WORKDIR}/${P}
 DESCRIPTION="A Python module for making simple text/console-mode user interfaces."
 HOMEPAGE="http://pythondialog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pythondialog/dialog.py"
 
-DEPEND="virtual/python"
-RDEPEND="dev-util/dialog"
-
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ~ppc ~sparc alpha ~amd64"
 LICENSE="LGPL-2"
+IUSE=""
 
-inherit eutils distutils
-EPATCH_SOURCE="${FILESDIR}"
+DEPEND="virtual/python
+	dev-util/dialog"
 
-src_unpack(){
+src_unpack() {
 	mkdir "${S}"
 	cp "${DISTDIR}/dialog.py" "${S}"
 	cd "${S}"
@@ -28,7 +27,3 @@ src_unpack(){
 	rm setup.py.orig
 }
 
-src_install(){
-	distutils_src_install
-}
-
diff --git a/dev-python/pythondialog/pythondialog-2.7.ebuild b/dev-python/pythondialog/pythondialog-2.7.ebuild
index de802c6101c2..5169b4aa2ed0 100644
--- a/dev-python/pythondialog/pythondialog-2.7.ebuild
+++ b/dev-python/pythondialog/pythondialog-2.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/dev-python/pythondialog/pythondialog-2.7.ebuild,v 1.1 2004/11/06 10:50:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythondialog/pythondialog-2.7.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit eutils distutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://pythondialog.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pythondialog/${PF}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 LICENSE="LGPL-2"
 IUSE=""
 
diff --git a/dev-python/pythong/ChangeLog b/dev-python/pythong/ChangeLog
index 360e61f5c286..a3f5b4c49743 100644
--- a/dev-python/pythong/ChangeLog
+++ b/dev-python/pythong/ChangeLog
@@ -1,9 +1,58 @@
 # ChangeLog for dev-python/pythong
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.1 2003/05/10 16:28:39 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
-*pythong-2.0.21.0 (10 May 2003)
+  23 Mar 2005; <blubb@gentoo.org> pythong-2.1.5.ebuild:
+  added ~amd64
 
-  10 May 2003; Alastair Tse <liquidx@gentoo.org> pythong-2.0.21.0.ebuild:
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> pythong-2.1.2.ebuild,
+  pythong-2.1.4.ebuild, pythong-2.1.5.ebuild:
+  Remove sed from global scope.
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> pythong-2.1.2.ebuild,
+  pythong-2.1.4.ebuild, pythong-2.1.5.ebuild:
+  Typo in DESCRIPTION: enviroment -> environment. Bug 59717.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> pythong-2.1.2.ebuild,
+  pythong-2.1.4.ebuild, pythong-2.1.5.ebuild:
+  Fix use invocation
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> pythong-2.1.2.ebuild,
+  pythong-2.1.4.ebuild:
+  Updated SRC_URI.
+
+*pythong-2.1.5 (24 Jan 2004)
+
+  24 Jan 2004; Alastair Tse <liquidx@gentoo.org> pythong-2.1.5.ebuild:
+  version bump, modified various bits and pieces to be compatible with
+  python2.3 (#35364)
+
+*pythong-2.1.4 (23 Nov 2003)
+
+  23 Nov 2003; Alastair Tse <liquidx@gentoo.org> pythong-2.1.2.ebuild,
+  pythong-2.1.4.ebuild:
+  version bump
+
+*pythong-2.1.2 (30 Oct 2003)
+
+  30 Oct 2003; Alastair Tse <liquidx@gentoo.org> pythong-2.1.2.ebuild:
+  version bump
+
+*pythong-2.1 (12 Oct 2003)
+
+  12 Oct 2003; Alastair Tse <liquidx@gentoo.org> pythong-2.1.ebuild:
+  version bump (#29904)
+
+*pythong-2.1_pre8 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> pythong-2.1_pre8.ebuild:
+  version bump. #25918
+
+*pythong-2.0.21.2 (10 May 2003)
+
+  10 May 2003; Alastair Tse <liquidx@gentoo.org> pythong-2.0.21.2.ebuild:
   initial ebuild. thanks to Federico Moro <zayer@frikis.org>. Bug #20113.
 
diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest
index f0f5910f2085..c0e844600211 100644
--- a/dev-python/pythong/Manifest
+++ b/dev-python/pythong/Manifest
@@ -1,3 +1,8 @@
-MD5 6e8cc8f015b1c4966caedf261e298e10 pythong-2.0.21.0.ebuild 1507
-MD5 5756b695e04af9a536456b9d96ced5d7 ChangeLog 401
-MD5 ef6104b1ca6dd2b5346eccd49c837859 files/digest-pythong-2.0.21.0 119
+MD5 bcd5e896baf026d8acf071c1a8199d96 pythong-2.1.2.ebuild 1367
+MD5 fe8610a0a6197e47ea00c4805bf9a81e ChangeLog 1862
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 0b2c21454fdc84f4efd04fadd59fc505 pythong-2.1.4.ebuild 1368
+MD5 e5f60e19b77491180ba7b8e70eb2baa3 pythong-2.1.5.ebuild 1484
+MD5 aecd04a659effc9a32ca3902a49188d6 files/digest-pythong-2.1.2 118
+MD5 3cb7c33302175dfbabf5cf6f867a462a files/digest-pythong-2.1.4 118
+MD5 b10350e00fdd2e7de21f9b1145fe96cb files/digest-pythong-2.1.5 118
diff --git a/dev-python/pythong/pythong-2.1.2.ebuild b/dev-python/pythong/pythong-2.1.2.ebuild
index 0828d1123747..9e6b3f76e93f 100644
--- a/dev-python/pythong/pythong-2.1.2.ebuild
+++ b/dev-python/pythong/pythong-2.1.2.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/dev-python/pythong/pythong-2.1.2.ebuild,v 1.1 2003/10/30 10:08:20 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit python distutils
 
 MY_PN="pythonG"
 MY_PV=${PV/_/-}
-MY_PV=$(echo $MY_PV | sed -e 's:\.:_:g')
+MY_PV=${MY_PV//\./_}
 
-DESCRIPTION="Nice and powerful spanish development enviroment for Python"
-SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
+DESCRIPTION="Nice and powerful spanish development environment for Python"
+SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/old/${MY_PN}-${MY_PV}.tgz
 	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
 HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 IUSE="doc"
 
@@ -51,7 +51,7 @@ src_install() {
 	cp -r ${S}/{LICENCIA,MANUAL,demos} ${D}/usr/share/doc/${PF}
 	rm -f ${D}/usr/share/doc/${PF}/demos/modulepythong.py
 
-	if [ -n "`use doc`" ]; then
+	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins ${DISTDIR}/python.pdf
 	fi
diff --git a/dev-python/pythong/pythong-2.1.4.ebuild b/dev-python/pythong/pythong-2.1.4.ebuild
index b13719a09278..56850968c54f 100644
--- a/dev-python/pythong/pythong-2.1.4.ebuild
+++ b/dev-python/pythong/pythong-2.1.4.ebuild
@@ -1,15 +1,15 @@
-# 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/dev-python/pythong/pythong-2.1.4.ebuild,v 1.1 2003/11/23 12:25:37 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit python distutils
 
 MY_PN="pythonG"
 MY_PV=${PV/_/-}
-MY_PV=$(echo $MY_PV | sed -e 's:\.:_:g')
+MY_PV=${MY_PV//\./_}
 
-DESCRIPTION="Nice and powerful spanish development enviroment for Python"
-SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
+DESCRIPTION="Nice and powerful spanish development environment for Python"
+SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/old/${MY_PN}-${MY_PV}.tgz
 	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
 HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
 
@@ -51,7 +51,7 @@ src_install() {
 	cp -r ${S}/{LICENCIA,MANUAL,demos} ${D}/usr/share/doc/${PF}
 	rm -f ${D}/usr/share/doc/${PF}/demos/modulepythong.py
 
-	if [ -n "`use doc`" ]; then
+	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins ${DISTDIR}/python.pdf
 	fi
diff --git a/dev-python/pythong/pythong-2.1.5.ebuild b/dev-python/pythong/pythong-2.1.5.ebuild
index d381d511d180..594036fb0509 100644
--- a/dev-python/pythong/pythong-2.1.5.ebuild
+++ b/dev-python/pythong/pythong-2.1.5.ebuild
@@ -1,20 +1,20 @@
-# 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/dev-python/pythong/pythong-2.1.5.ebuild,v 1.1 2004/01/24 21:38:51 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythong/pythong-2.1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit python distutils
 
 MY_PN="pythonG"
 MY_PV=${PV/_/-}
-MY_PV=$(echo $MY_PV | sed -e 's:\.:_:g')
+MY_PV=${MY_PV//\./_}
 
-DESCRIPTION="Nice and powerful spanish development enviroment for Python"
+DESCRIPTION="Nice and powerful spanish development environment for Python"
 SRC_URI="http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
 	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
 HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 SLOT="0"
 IUSE="doc"
 
@@ -42,8 +42,8 @@ src_install() {
 	python_version
 
 	sed -e  "s#^fullpath = .*#fullpath = '/usr/lib/python${PYVER}/site-packages/'#" \
-		-i pythong.py 
-	
+		-i pythong.py
+
 	insinto /usr/lib/python${PYVER}/site-packages/
 	doins modulepythong.py
 	dodir /usr/lib/python${PYVER}/site-packages/libpythong/
@@ -56,7 +56,7 @@ src_install() {
 	cp -r ${S}/{LICENCIA,MANUAL,demos} ${D}/usr/share/doc/${PF}
 	rm -f ${D}/usr/share/doc/${PF}/demos/modulepythong.py
 
-	if [ -n "`use doc`" ]; then
+	if use doc; then
 		insinto /usr/share/doc/${PF}
 		doins ${DISTDIR}/python.pdf
 	fi
diff --git a/dev-python/pythonmagick/ChangeLog b/dev-python/pythonmagick/ChangeLog
index 88553e229228..5680c43c5cc9 100644
--- a/dev-python/pythonmagick/ChangeLog
+++ b/dev-python/pythonmagick/ChangeLog
@@ -1,10 +1,17 @@
 # ChangeLog for dev-python/pythonmagick
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.1 2004/06/05 22:44:24 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/ChangeLog,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
+
+  02 Apr 2005; Fernando Serboncini <fserb@gentoo.org> +files/Jamfile,
+  +files/Jamrules, +files/boost-build.jam:
+  Added missing files. Bug #35279.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
 *pythonmagick-0.5-r1 (06 Jun 2004)
 
-  06 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  06 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +pythonmagick-0.5-r1.ebuild:
   Initial commit, bug #35279. Ebuild by Chris Mayo <mayo@clara.co.uk>.
 
diff --git a/dev-python/pythonmagick/Manifest b/dev-python/pythonmagick/Manifest
index 74af951ca231..2c348a4a0606 100644
--- a/dev-python/pythonmagick/Manifest
+++ b/dev-python/pythonmagick/Manifest
@@ -1,2 +1,17 @@
-MD5 ee7e506d34db94e867128b0d189b566e pythonmagick-0.5-r1.ebuild 1084
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fee0979fd50cc19e56e644542bfcba39 ChangeLog 679
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 58e90c21173ed4a29db77039fca02f74 pythonmagick-0.5-r1.ebuild 1198
 MD5 1d9347346738216ca13fbed79caf2790 files/digest-pythonmagick-0.5-r1 67
+MD5 a4d7bf1371445f799f0be802d9b97ce1 files/boost-build.jam 76
+MD5 95b6569c575aabe4ae12d9a10654ea0f files/Jamfile 5718
+MD5 8036dc2f4f11efbbf0927ab541c5e4fe files/Jamrules 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCTtPHxtZcznfol0URAhcvAJwJSrUcHR29f7BpwWPgDINLOyGQ9ACgmzN2
+xZq6qvrrvP3jZtUZ1Y8sbSU=
+=z2GK
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pythonmagick/pythonmagick-0.5-r1.ebuild b/dev-python/pythonmagick/pythonmagick-0.5-r1.ebuild
index 521ae5dc19a2..f9f42f148c58 100644
--- a/dev-python/pythonmagick/pythonmagick-0.5-r1.ebuild
+++ b/dev-python/pythonmagick/pythonmagick-0.5-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/dev-python/pythonmagick/pythonmagick-0.5-r1.ebuild,v 1.1 2004/06/05 22:44:24 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonmagick/pythonmagick-0.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
@@ -17,6 +17,7 @@ HOMEPAGE="http://www.procoders.net/moinmoin/PythonMagick"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="~x86"
+IUSE=""
 
 DEPEND=">=dev-lang/python-2.2
 	>=media-gfx/graphicsmagick-1.0.5
diff --git a/dev-python/pythonutils/ChangeLog b/dev-python/pythonutils/ChangeLog
index a2e53beea22f..6f7c385baa7d 100644
--- a/dev-python/pythonutils/ChangeLog
+++ b/dev-python/pythonutils/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/pythonutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonutils/ChangeLog,v 1.1 2005/09/03 18:27:42 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonutils/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+*pythonutils-0.2.3 (18 Oct 2005)
+
+  18 Oct 2005; Grant Goodyear <g2boojum@gentoo.org>
+  +pythonutils-0.2.3.ebuild:
+  Version bump by request of author; added ~amd64 keyword.
+
+*pythonutils-0.2.2 (17 Sep 2005)
+
+  17 Sep 2005; Grant Goodyear <g2boojum@gentoo.org>
+  +pythonutils-0.2.2.ebuild:
+  Version bump requested from upstream.
 
 *pythonutils-0.2.0 (03 Sep 2005)
 
diff --git a/dev-python/pythonutils/Manifest b/dev-python/pythonutils/Manifest
index 489904c4beb8..24b2a06176e6 100644
--- a/dev-python/pythonutils/Manifest
+++ b/dev-python/pythonutils/Manifest
@@ -1,2 +1,8 @@
-MD5 faa1cd6bab26981d3764152676e19423 pythonutils-0.2.0.ebuild 620
+MD5 878a20ea8a6e87bf0405e27467395272 ChangeLog 696
 MD5 30e5d743b45d15cee2eed77e8762690b files/digest-pythonutils-0.2.0 82
+MD5 2fa01d26a34c5e18786aeff254cba72a files/digest-pythonutils-0.2.2 82
+MD5 3b7f7e9e8328b7314d8703c2b60b9c6d files/digest-pythonutils-0.2.3 82
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 f3b536c3be851ba1bf964daf48c011d7 pythonutils-0.2.0.ebuild 734
+MD5 5cc9c672b260891002f7c4e5f024131d pythonutils-0.2.2.ebuild 734
+MD5 ea06ce594c7cf588d0546966d3ac99b5 pythonutils-0.2.3.ebuild 741
diff --git a/dev-python/pythonutils/pythonutils-0.2.0.ebuild b/dev-python/pythonutils/pythonutils-0.2.0.ebuild
index 704510712db8..3786f55478a9 100644
--- a/dev-python/pythonutils/pythonutils-0.2.0.ebuild
+++ b/dev-python/pythonutils/pythonutils-0.2.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/dev-python/pythonutils/pythonutils-0.2.0.ebuild,v 1.1 2005/09/03 18:27:42 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonutils/pythonutils-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit eutils distutils
 DESCRIPTION="Voidspace python modules"
diff --git a/dev-python/pythonutils/pythonutils-0.2.2.ebuild b/dev-python/pythonutils/pythonutils-0.2.2.ebuild
index 8e2e44bcac5d..17100ff88b4b 100644
--- a/dev-python/pythonutils/pythonutils-0.2.2.ebuild
+++ b/dev-python/pythonutils/pythonutils-0.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/dev-python/pythonutils/pythonutils-0.2.2.ebuild,v 1.1 2005/09/17 00:17:25 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonutils/pythonutils-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit eutils distutils
 DESCRIPTION="Voidspace python modules"
diff --git a/dev-python/pythonutils/pythonutils-0.2.3.ebuild b/dev-python/pythonutils/pythonutils-0.2.3.ebuild
index b8dc2e95b045..114aa4bd0388 100644
--- a/dev-python/pythonutils/pythonutils-0.2.3.ebuild
+++ b/dev-python/pythonutils/pythonutils-0.2.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/dev-python/pythonutils/pythonutils-0.2.3.ebuild,v 1.1 2005/10/18 19:03:20 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pythonutils/pythonutils-0.2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit eutils distutils
 DESCRIPTION="Voidspace python modules"
diff --git a/dev-python/pyunit/ChangeLog b/dev-python/pyunit/ChangeLog
index 4af4154f3cdf..7a4f1dea1d85 100644
--- a/dev-python/pyunit/ChangeLog
+++ b/dev-python/pyunit/ChangeLog
@@ -1,9 +1,24 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyunit/ChangeLog,v 1.1 2002/10/28 18:44:13 roughneck Exp $
+# ChangeLog for dev-python/pyunit
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyunit/ChangeLog,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
+
+  28 Oct 2005; Jason Wever <weeve@gentoo.org> pyunit-1.4.1.ebuild:
+  Added ~sparc keyword.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> pyunit-1.4.1.ebuild:
+  Readded ~amd64 keyword. Probably was a cvs issue.
+
+  19 Aug 2005; Luis Medinas <metalgod@gentoo.org> ChangeLog:
+  Added ~amd64 keywords.
 
 *pyunit-1.4.1 (28 Oct 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pyunit-1.4.1.ebuild:
+  slight rearranging
+
+  27 Feb 2003; Alastair Tse <liquidx@gentoo.org> pyunit-1.4.1.ebuild:
+  SRC_URI to use sf mirror. Fixed invalid DEPEND.
+  
   28 Oct 2002; Nicholas Henke <roughneck@gentoo.org> pyunit-1.4.1.ebuild: 
   Initial import. Ebuild submitted by Eivind Tagseth
   <eivindt-gentoo@multinet.no>
diff --git a/dev-python/pyunit/Manifest b/dev-python/pyunit/Manifest
index e69de29bb2d1..7d20b74e80fa 100644
--- a/dev-python/pyunit/Manifest
+++ b/dev-python/pyunit/Manifest
@@ -0,0 +1,4 @@
+MD5 30e5d25b33bcc7389b3ccc96cfb61997 ChangeLog 912
+MD5 351f50b78d59c43f43258940b6b03cb1 files/digest-pyunit-1.4.1 63
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 23761afb668f45ceaf47806ef9e11be3 pyunit-1.4.1.ebuild 597
diff --git a/dev-python/pyunit/pyunit-1.4.1.ebuild b/dev-python/pyunit/pyunit-1.4.1.ebuild
index 29b7b9efcd48..a69292a05ce1 100644
--- a/dev-python/pyunit/pyunit-1.4.1.ebuild
+++ b/dev-python/pyunit/pyunit-1.4.1.ebuild
@@ -1,23 +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/dev-python/pyunit/pyunit-1.4.1.ebuild,v 1.1 2002/10/28 18:44:13 roughneck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyunit/pyunit-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
-DESCRIPTION="PyUnit - the standard unit testing framework for Python"
 
-HOMEPAGE="http://pyunit.sourceforge.net/"
-SRC_URI="http://unc.dl.sourceforge.net/sourceforge/pyunit/${P}.tar.gz"
+inherit distutils
 
+DESCRIPTION="PyUnit - the standard unit testing framework for Python"
+HOMEPAGE="http://pyunit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyunit/${P}.tar.gz"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
-DEPEND=">=python-2.0"
-RDEPEND=""
-
-S="${WORKDIR}/${P}"
-
-inherit distutils
+DEPEND=">=dev-lang/python-2.0"
 
 src_install() {
 	mydoc="CHANGES examples/*"
diff --git a/dev-python/pyvorbis/ChangeLog b/dev-python/pyvorbis/ChangeLog
index 16570415a2cb..b909d738ed94 100644
--- a/dev-python/pyvorbis/ChangeLog
+++ b/dev-python/pyvorbis/ChangeLog
@@ -1,6 +1,71 @@
-# ChangeLog for media-libs/pyvorbis
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.1 2003/06/13 22:30:21 liquidx Exp $
+# ChangeLog for dev-python/pyvorbis
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/ChangeLog,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
+
+*pyvorbis-1.4-r1 (13 Nov 2005)
+
+  13 Nov 2005; Ian Leitch <port001@gentoo.org>
+  +files/pyvorbisfile.c-1.4.patch, +pyvorbis-1.4-r1.ebuild:
+  Included a patch which fixes a bug where pyvorbis attempts to close a
+  previously closed file descriptor. PyVorbis uses the ov_open libvorbis
+  function which requires you call ov_clear to close all open descriptors, yet
+  pyvrobis continues to call flcose on the descriptor after the call to
+  ov_clear. Bug #101059.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> pyvorbis-1.3.ebuild:
+  Mark 1.3 stable on alpha
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyvorbis-1.4.ebuild:
+  add ~ia64
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyvorbis-1.4 (07 Dec 2004)
+
+  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +pyvorbis-1.4.ebuild:
+  Version bump, bug 66837.
+
+  26 Oct 2004; Steve Arnold <nerdboy@gentoo.org> pyvorbis-1.3.ebuild:
+  added ~mips and ~alpha keywords (same as libvorbis, etc) to support edna
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> pyvorbis-1.3.ebuild:
+  stable on ppc64
+
+  29 Aug 2004; Travis Tilley <lv@gentoo.org> pyvorbis-1.3.ebuild:
+  stable on amd64
+
+  04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  Remade digest.
+
+  26 Jun 2004; Alastair Tse <liquidx@gentoo.org> pyvorbis-1.3.ebuild:
+  fix SRC_URI to gentoo mirrors because upstream changes without name updates
+  (#54771)
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyvorbis-1.1.ebuild,
+  pyvorbis-1.3.ebuild:
+  Add missing IUSE.
+
+  12 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> :
+  Adding amd64 keyword. Part of closing #37550.
+
+  29 Dec 2003; Guy Martin <gmsoft@gentoo.org> pyvorbis-1.3.ebuild:
+  Marked stable on hppa.
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> pyvorbis-1.3.ebuild:
+  Marked stable on sparc to fix the broken dependencies of net-p2p/pysoulseek.
+
+  01 Nov 2003; Jason Wever <weeve@gentoo.org> pyvorbis-1.1.ebuild,
+  pyvorbis-1.3.ebuild:
+  Added ~sparc keyword.
+
+*pyvorbis-1.3 (05 Aug 2003)
+
+  05 Aug 2003; Alastair Tse <liquidx@gentoo.org> pyvorbis-1.3.ebuild:
+  version bump
+
+  13 Jun 2003; Alastair Tse <liquidx@gentoo.org> pyvorbis-1.1.ebuild:
+  distutil-ize and cleanups
 
 *pyvorbis-1.1 (30 Nov 2002)
 
diff --git a/dev-python/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
index e4e43ff790c3..6719affc08d1 100644
--- a/dev-python/pyvorbis/Manifest
+++ b/dev-python/pyvorbis/Manifest
@@ -1,3 +1,11 @@
-MD5 2634025d4c8ec9f8da35a0ba807a0645 ChangeLog 448
-MD5 9d1df2fef4d8a31ff34a2d081ff649b5 pyvorbis-1.1.ebuild 704
+MD5 2af55b4593084e88d98536d920894477 ChangeLog 2659
 MD5 28ec3622a17a96ac8cc3ef8427ac3e45 files/digest-pyvorbis-1.1 63
+MD5 9cbd7d4ece2e640dc19e9110b51b5128 files/digest-pyvorbis-1.3 63
+MD5 0f3ffbc95f303e2b3aee01b3be77d513 files/digest-pyvorbis-1.4 63
+MD5 0f3ffbc95f303e2b3aee01b3be77d513 files/digest-pyvorbis-1.4-r1 63
+MD5 dd05077a480799edc7a1912053b6cc6a files/pyvorbisfile.c-1.4.patch 564
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 68e27b8fffc1489df6b58a652aac3881 pyvorbis-1.1.ebuild 691
+MD5 4d25842e6ad9295991cdb2703aff023e pyvorbis-1.3.ebuild 759
+MD5 150b6ccc48e156c553260e41f5937d40 pyvorbis-1.4-r1.ebuild 819
+MD5 4069e08113b65ee5705e07e63e3a1b5f pyvorbis-1.4.ebuild 732
diff --git a/dev-python/pyvorbis/files/digest-pyvorbis-1.3 b/dev-python/pyvorbis/files/digest-pyvorbis-1.3
index 38f3620bbf02..2a2629cf6a14 100644
--- a/dev-python/pyvorbis/files/digest-pyvorbis-1.3
+++ b/dev-python/pyvorbis/files/digest-pyvorbis-1.3
@@ -1 +1 @@
-MD5 c7e31c4b1711b5eec7c45fbc9b87438e pyvorbis-1.3.tar.gz 37768
+MD5 3ddd0dc996b57827c324910cc899d40b pyvorbis-1.3.tar.gz 38165
diff --git a/dev-python/pyvorbis/pyvorbis-1.1.ebuild b/dev-python/pyvorbis/pyvorbis-1.1.ebuild
index 2eaffdb90161..ccd3e52f616d 100644
--- a/dev-python/pyvorbis/pyvorbis-1.1.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.1.ebuild
@@ -1,6 +1,8 @@
-# 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/dev-python/pyvorbis/pyvorbis-1.1.ebuild,v 1.1 2003/06/13 22:30:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
+
+inherit distutils
 
 DESCRIPTION="Python bindings for the ogg.vorbis library"
 HOMEPAGE="http://www.andrewchatham.com/pyogg/"
@@ -8,18 +10,18 @@ SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc ~sparc"
+IUSE=""
 
 DEPEND="dev-lang/python
-	media-libs/libogg
-	>=media-libs/pyogg-1.1"
+	>=media-libs/libogg-1.0
+	>=media-libs/libvorbis-1.0
+	>=dev-python/pyogg-1.1"
 
 src_compile() {
 	./config_unix.py || die
-	python setup.py build || die
+	distutils_src_compile
 }
 
-src_install() {
-	python setup.py install --prefix ${D}/usr || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
+DOCS="AUTHORS COPYING ChangeLog NEWS README"
+
diff --git a/dev-python/pyvorbis/pyvorbis-1.3.ebuild b/dev-python/pyvorbis/pyvorbis-1.3.ebuild
index fec189aedac1..e7f65367a5cd 100644
--- a/dev-python/pyvorbis/pyvorbis-1.3.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.3.ebuild
@@ -1,16 +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/dev-python/pyvorbis/pyvorbis-1.3.ebuild,v 1.1 2003/08/05 13:01:08 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python bindings for the ogg.vorbis library"
 HOMEPAGE="http://www.andrewchatham.com/pyogg/"
-SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+#SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE=""
 
 DEPEND="dev-lang/python
 	>=media-libs/libogg-1.0
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
index 59d4a7b03260..17feee44404d 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-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/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild,v 1.1 2005/11/13 17:55:42 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyvorbis/pyvorbis-1.4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4.ebuild
index fa7b153efa4c..431496539553 100644
--- a/dev-python/pyvorbis/pyvorbis-1.4.ebuild
+++ b/dev-python/pyvorbis/pyvorbis-1.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/dev-python/pyvorbis/pyvorbis-1.4.ebuild,v 1.1 2004/12/07 02:41:46 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyvorbis/pyvorbis-1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.andrewchatham.com/pyogg/download/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~amd64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-lang/python
diff --git a/dev-python/pyx/ChangeLog b/dev-python/pyx/ChangeLog
index 25c15a1240e3..45a2402662d1 100644
--- a/dev-python/pyx/ChangeLog
+++ b/dev-python/pyx/ChangeLog
@@ -1,6 +1,53 @@
 # ChangeLog for dev-python/pyx
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.1 2003/05/10 20:31:25 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+*pyx-0.8.1 (03 Nov 2005)
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> +files/pyx-0.8.1.patch,
+  +pyx-0.8.1.ebuild:
+  version bump (#103036)
+
+  03 Sep 2005; <dang@gentoo.org> pyx-0.7.1.ebuild:
+  Marked ~amd64
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyx-0.7.1 (20 Dec 2004)
+
+  20 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +files/pyx-0.7.1.patch,
+  -pyx-0.3.1.ebuild, -pyx-0.5.1.ebuild, +pyx-0.7.1.ebuild:
+  Remove old ebuilds and bump version, new ebuild by Fernando Serboncini
+  <fserb@terra.com.br>.
+
+*pyx-0.6.3 (12 Sep 2004)
+
+  12 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  pyx-0.5.1.ebuild, pyx-0.6.1.ebuild, +pyx-0.6.3.ebuild:
+  Version bump, thanks for information to Christopher Knox in bug #63604.
+  Some minor changes in the ebuild. Added description to metadata.xml.
+  Versions 0.5.1 and 0.6.1 marked stable on x86.
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> pyx-0.3.1.ebuild,
+  pyx-0.5.1.ebuild, pyx-0.6.1.ebuild:
+  Changed app-text/tetex to virtual/tetex, see bug #50865
+
+  07 Apr 2004; David Holm <dholm@gentoo.org> pyx-0.6.1.ebuild:
+  Added to ~ppc.
+
+*pyx-0.6.1 (04 Apr 2004)
+
+  04 Apr 2004; Alastair Tse <liquidx@gentoo.org> pyx-0.6.1.ebuild:
+  version bump
+
+*pyx-0.5.1 (28 Mar 2004)
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> pyx-0.5.1.ebuild:
+  Version bump.
+
+  05 Aug 2003; Alastair Tse <liquidx@gentoo.org> pyx-0.3.1.ebuild:
+  added tetex dep (#25512)
 
 *pyx-0.3.1 (10 May 2003)
 
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 4093cb4e575e..1611e23d2db0 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,4 +1,22 @@
-MD5 f6a830b434f4371b5070c17bc24fd7d9 pyx-0.3.1.ebuild 564
-MD5 9bb3bfd9aa9557f0b85857cfd3b5cd2f ChangeLog 214
-MD5 46a94096ae827068a9488dbb0a2e4197 files/digest-PyX-0.3.1 61
-MD5 46a94096ae827068a9488dbb0a2e4197 files/digest-pyx-0.3.1 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 785209b60a091a21ec0745afd0d0a60b ChangeLog 1852
+MD5 709e65698a4cd367d0a7260414515a6a files/digest-pyx-0.6.1 61
+MD5 38b4424ad0a10c8e987231286f2edcaa files/digest-pyx-0.6.3 62
+MD5 b1f9c1c64dfbbc629a354643a0dae13e files/digest-pyx-0.7.1 61
+MD5 3f544696b1bfdeda213a4fa0d6afaccb files/digest-pyx-0.8.1 61
+MD5 1e8ad4caf14ac87fdda7709c2d3330df files/pyx-0.7.1.patch 3768
+MD5 5fd2d4c28b2be8d5b4c3cd64fc1774a6 files/pyx-0.8.1.patch 7431
+MD5 efb565b5394bcf6412b0389c86261a92 metadata.xml 445
+MD5 c3b3bba4d2a4191bec9eef885bbf4151 pyx-0.6.1.ebuild 672
+MD5 9be0a9b000a254e04f1e54f4f173e294 pyx-0.6.3.ebuild 686
+MD5 a6954e3959a109ab2e74d5044c8532e0 pyx-0.7.1.ebuild 982
+MD5 8bc7d37a833c9a08a63b2288624c1f5c pyx-0.8.1.ebuild 985
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDanvv9ZFPrqoILX8RAgnsAKC1dkG137RZW2fpShH4IX3fTufnPQCfbBxi
+ORys/Wmpk8fExiRhKOYQYm8=
+=d/oc
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyx/metadata.xml b/dev-python/pyx/metadata.xml
index de483c53568f..14c6bfd99a49 100644
--- a/dev-python/pyx/metadata.xml
+++ b/dev-python/pyx/metadata.xml
@@ -2,4 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+PyX is a Python package for the creation of encapsulated PostScript figures.
+It provides both an abstraction of PostScript and a TeX/LaTeX interface.
+Complex tasks like 2d and 3d plots in publication-ready quality are built out
+of these primitives.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/pyx/pyx-0.6.1.ebuild b/dev-python/pyx/pyx-0.6.1.ebuild
index 4b6de026025a..cd9922851556 100644
--- a/dev-python/pyx/pyx-0.6.1.ebuild
+++ b/dev-python/pyx/pyx-0.6.1.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/dev-python/pyx/pyx-0.6.1.ebuild,v 1.1 2004/04/06 22:03:36 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 IUSE=""
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
 HOMEPAGE="http://pyx.sourceforge.net/"
 
 DEPEND=">=dev-lang/python-2.2
-		>=app-text/tetex-1"
+	virtual/tetex"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 src_install() {
diff --git a/dev-python/pyx/pyx-0.6.3.ebuild b/dev-python/pyx/pyx-0.6.3.ebuild
index 177854edd848..c1665a1fd2a2 100644
--- a/dev-python/pyx/pyx-0.6.3.ebuild
+++ b/dev-python/pyx/pyx-0.6.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/dev-python/pyx/pyx-0.6.3.ebuild,v 1.1 2004/09/11 22:21:27 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.6.3.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyx/pyx-0.7.1.ebuild b/dev-python/pyx/pyx-0.7.1.ebuild
index 34263f61db7d..538154c06c7c 100644
--- a/dev-python/pyx/pyx-0.7.1.ebuild
+++ b/dev-python/pyx/pyx-0.7.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/dev-python/pyx/pyx-0.7.1.ebuild,v 1.1 2004/12/20 14:10:17 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
 HOMEPAGE="http://pyx.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc"
 DEPEND="virtual/python
 	virtual/tetex"
diff --git a/dev-python/pyx/pyx-0.8.1.ebuild b/dev-python/pyx/pyx-0.8.1.ebuild
index b2b471cbb964..caf8ab0a056b 100644
--- a/dev-python/pyx/pyx-0.8.1.ebuild
+++ b/dev-python/pyx/pyx-0.8.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/dev-python/pyx/pyx-0.8.1.ebuild,v 1.1 2005/11/03 21:05:35 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyxattr/ChangeLog b/dev-python/pyxattr/ChangeLog
index c1a69d4a6bd7..47745895eace 100644
--- a/dev-python/pyxattr/ChangeLog
+++ b/dev-python/pyxattr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyxattr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/ChangeLog,v 1.1 2005/09/21 16:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+  28 Oct 2005; Mark Loeser <halcy0n@gentoo.org> pyxattr-0.2.ebuild:
+  Stable on x86; bug #110332
+
+  25 Sep 2005; Jason Wever <weeve@gentoo.org> pyxattr-0.2.ebuild:
+  Added ~sparc keyword.
 
 *pyxattr-0.2 (21 Sep 2005)
 
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index 146a5621ddee..9db13f79c35e 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,2 +1,13 @@
-MD5 6496e89eb5d9cd3fe64cfce714c297f1 pyxattr-0.2.ebuild 600
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 041f6862bec0efa0c82f18c66a866169 ChangeLog 617
 MD5 0beae7b52d1e4edc0efc5bd00d5dca1d files/digest-pyxattr-0.2 61
+MD5 6ba61fa77894059355155874b2416967 pyxattr-0.2.ebuild 505
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYcRYCRZPokWLroQRApHOAJwPap2Vccon1FuDX64Ekiend+KIbACfdjtz
+DUuNl+yCJRswcR3dJP7KAHc=
+=LECO
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyxattr/pyxattr-0.2.ebuild b/dev-python/pyxattr/pyxattr-0.2.ebuild
index fccc006ac456..6e76c791245a 100644
--- a/dev-python/pyxattr/pyxattr-0.2.ebuild
+++ b/dev-python/pyxattr/pyxattr-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/dev-python/pyxattr/pyxattr-0.2.ebuild,v 1.1 2005/09/21 16:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxattr/pyxattr-0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/pyxdg/ChangeLog b/dev-python/pyxdg/ChangeLog
index 8aa9923dd6ec..9bbefce4b27e 100644
--- a/dev-python/pyxdg/ChangeLog
+++ b/dev-python/pyxdg/ChangeLog
@@ -1,9 +1,115 @@
 # ChangeLog for dev-python/pyxdg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/ChangeLog,v 1.1 2003/08/08 15:27:40 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+*pyxdg-0.15 (11 Aug 2005)
+
+  11 Aug 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.15.ebuild:
+  version bump
+
+*pyxdg-0.14 (07 Jun 2005)
+
+  07 Jun 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.14.ebuild:
+  version bump
+
+*pyxdg-0.13 (01 Jun 2005)
+
+  01 Jun 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.13.ebuild:
+  version bump
+
+*pyxdg-0.8 (30 May 2005)
+
+  30 May 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.8.ebuild,
+  -pyxdg-0.10.ebuild, -pyxdg-0.11.ebuild:
+  cleanups
+
+*pyxdg-0.12 (30 May 2005)
+
+  30 May 2005; Heinrich Wendel <lanius@gentoo.org> -pyxdg-0.8.ebuild,
+  -pyxdg-0.9.ebuild, +pyxdg-0.12.ebuild:
+  version bump, cleanups
+
+*pyxdg-0.11 (23 May 2005)
+
+  23 May 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.11.ebuild:
+  version bump
+
+  10 May 2005; Bart Lauwers <blauwers@gentoo.org> pyxdg-0.8.ebuild, pyxdg-0.9.ebuild, pyxdg-0.10.ebuild:
+  Corrected homepage references per report in Bug#92115
+
+*pyxdg-0.10 (25 Apr 2005)
+
+  25 Apr 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.10.ebuild:
+  version bump
+
+*pyxdg-0.9 (24 Mar 2005)
+
+  24 Mar 2005; Heinrich Wendel <lanius@gentoo.org> +pyxdg-0.9.ebuild:
+  version bump
+
+  14 Feb 2005; Heinrich Wendel <lanius@gentoo.org> -pyxdg-0.6.ebuild,
+  -pyxdg-0.7.ebuild, pyxdg-0.8.ebuild:
+  mark pyxdg-0.8 stable, remove old versions
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*pyxdg-0.7 (18 Oct 2004)
+
+  18 Oct 2004; Heinrich Wendel <lanius@gentoo.org> pyxdg-0.7.ebuild,
+  +pyxdg-0.8.ebuild:
+  version bump; mark 0.7 stable on x86
+
+  04 Sep 2004; Heinrich Wendel <lanius@gentoo.org> -pyxdg-0.5.ebuild,
+  pyxdg-0.6.ebuild:
+  version bump
+
+  04 Aug 2004; Heinrich Wendel <lanius@gentoo.org> pyxdg-0.1.ebuild,
+  pyxdg-0.2.ebuild, pyxdg-0.3.ebuild, pyxdg-0.4.ebuild, pyxdg-0.5.ebuild,
+  pyxdg-0.6.ebuild:
+  remove old ebuilds; bump to 0.6; mark 0.5 x86
+
+  18 Apr 2004; Heinrich Wendel <lanius@gentoo.org> pyxdg-0.5.ebuild:
+  fix license, bug #48147
+
+  07 Apr 2004; David Holm <dholm@gentoo.org> pyxdg-0.5.ebuild:
+  Added to ~ppc.
+
+*pyxdg-0.5 (29 Mar 2004)
+
+  29 Mar 2004; Heinrich Wendel <lanius@gentoo.org> pyxdg-0.5.ebuild:
+  version bump
+
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> pyxdg-0.1.ebuild,
+  pyxdg-0.2.ebuild, pyxdg-0.3.ebuild:
+  Update SRC_URI.
+
+*pyxdg-0.4 (15 Mar 2004)
+
+  15 Mar 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pyxdg-0.4.ebuild:
+  Version bump, bug #44715.
+
+*pyxdg-0.3 (13 Sep 2003)
+
+  13 Sep 2003; Heinrich Wendel <lanius@gentoo.org> pyxdg-0.3.ebuild:
+  version bump
+
+  06 Sep 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml:
+  claim this for python herd, unless a better herd comes up
+
+*pyxdg-0.2 (04 Sep 2003)
+*pyxdg-0.1 (04 Sep 2003)
+
+  04 Sep 2003; Heinrich Wendel <lanius@gentoo.org> pyxdg-0.1.ebuild,
+  pyxdg-0.2.ebuild, pyxdg-1.0.ebuild:
+  version change, version bump
+
+  09 Aug 2003; Heinrich Wendel <lanius@gentoo.org> pyxdg-1.0.ebuild:
+  fixed src_uri
 
 *pyxdg-1.0 (08 Aug 2003)
 
-  08 Aug 2003; lanius@gentoo.org metadata.xml, pyxdg-1.0.ebuild:
+  08 Aug 2003; Heinrich Wendel <lanius@gentoo.org> metadata.xml,
+  pyxdg-1.0.ebuild:
   initial ebuild
 
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index f4797c6790f1..1551b9242ee6 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,3 +1,24 @@
-MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 8472017b8a55f09f2cba99c31d73a365 pyxdg-1.0.ebuild 469
-MD5 29431761993484c6656b2d92b6f40447 files/digest-pyxdg-1.0 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 674ce9e65f9226c93dceed97a9e821f5 pyxdg-0.11.ebuild 659
+MD5 dc823c38af10cffe8c1977301d035a2f pyxdg-0.8.ebuild 654
+MD5 1d79e672bfeba97d4ceb7f8d59a9a81f pyxdg-0.13.ebuild 665
+MD5 34b92f59dcd2df08dbcfd9c9026fccdf pyxdg-0.15.ebuild 665
+MD5 40ee8e4d7e85b05cf82b0614b02b246e pyxdg-0.12.ebuild 665
+MD5 d3b5d569f59cfbc30e59c90988d0a3c4 ChangeLog 3283
+MD5 58ac13388568f6d0f05ee2af5d047ab6 metadata.xml 252
+MD5 47fe613cd75e292c0dd679696d1187b8 pyxdg-0.14.ebuild 665
+MD5 94906d1c001ebe64a7b5d9f25fd4d702 files/digest-pyxdg-0.8 60
+MD5 c3d73e85b09df8948254c0b90f432a84 files/digest-pyxdg-0.11 61
+MD5 7107f915628966d456a210356ad9b2d4 files/digest-pyxdg-0.12 61
+MD5 9349d60364fcd3fdbcb32baa7da37cd2 files/digest-pyxdg-0.13 61
+MD5 9fcb47007f2b5d48e88103d8461afd5c files/digest-pyxdg-0.14 61
+MD5 785b0810e5c9ec8538755353824dfa9a files/digest-pyxdg-0.15 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC+zpnevY57Fted3ERAkuaAJ4nfVdCAJ8rWSUVd0V1KyRPqW8SJgCgl966
+mjN98kiHDcbrplMmMMbpkQ0=
+=Y0Wd
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyxdg/files/digest-pyxdg-0.11 b/dev-python/pyxdg/files/digest-pyxdg-0.11
index e88a6f62c8e0..1462c974971f 100644
--- a/dev-python/pyxdg/files/digest-pyxdg-0.11
+++ b/dev-python/pyxdg/files/digest-pyxdg-0.11
@@ -1 +1 @@
-MD5 8f21cbc9a39808f501d83aa11b64e9e1 pyxdg-0.11.tar.gz 32496
+MD5 55b4f5b2aa3c781cea686285dab8b6b5 pyxdg-0.11.tar.gz 32510
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index c3504b40c506..ef16eb946760 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/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>python</herd>
 <maintainer>
   <email>lanius@gentoo.org</email>
   <name>Heinrich Wendel</name>
diff --git a/dev-python/pyxdg/pyxdg-0.11.ebuild b/dev-python/pyxdg/pyxdg-0.11.ebuild
index 14187bb34326..201dd173e4f0 100644
--- a/dev-python/pyxdg/pyxdg-0.11.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.11.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/dev-python/pyxdg/pyxdg-0.11.ebuild,v 1.1 2005/05/23 17:32:26 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.11.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
@@ -9,9 +9,9 @@ SRC_URI="http://www.freedesktop.org/~lanius/${P}.tar.gz"
 HOMEPAGE="http://pyxdg.freedesktop.org/"
 LICENSE="LGPL-2"
 
-DEPEND="virtual/python"
-SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
+DEPEND="dev-lang/python"
+SLOT="0"
 IUSE=""
 
 src_install () {
diff --git a/dev-python/pyxdg/pyxdg-0.12.ebuild b/dev-python/pyxdg/pyxdg-0.12.ebuild
index c3207fa113b5..34ee0b6903fa 100644
--- a/dev-python/pyxdg/pyxdg-0.12.ebuild
+++ b/dev-python/pyxdg/pyxdg-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/dev-python/pyxdg/pyxdg-0.12.ebuild,v 1.1 2005/05/30 15:42:45 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.12.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
@@ -9,9 +9,9 @@ SRC_URI="http://www.freedesktop.org/~lanius/${P}.tar.gz"
 HOMEPAGE="http://pyxdg.freedesktop.org/"
 LICENSE="LGPL-2"
 
-DEPEND="virtual/python"
-SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
+DEPEND=">=dev-lang/python-2.4"
+SLOT="0"
 IUSE=""
 
 src_install () {
diff --git a/dev-python/pyxdg/pyxdg-0.13.ebuild b/dev-python/pyxdg/pyxdg-0.13.ebuild
index c66c2cbb7f08..aeb4405fd42b 100644
--- a/dev-python/pyxdg/pyxdg-0.13.ebuild
+++ b/dev-python/pyxdg/pyxdg-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/dev-python/pyxdg/pyxdg-0.13.ebuild,v 1.1 2005/06/01 15:49:19 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.13.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyxdg/pyxdg-0.14.ebuild b/dev-python/pyxdg/pyxdg-0.14.ebuild
index 13e1f2999bc7..5b5353a06889 100644
--- a/dev-python/pyxdg/pyxdg-0.14.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.14.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/dev-python/pyxdg/pyxdg-0.14.ebuild,v 1.1 2005/06/07 22:29:42 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.14.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyxdg/pyxdg-0.15.ebuild b/dev-python/pyxdg/pyxdg-0.15.ebuild
index ffb544b60644..0e96d984f96a 100644
--- a/dev-python/pyxdg/pyxdg-0.15.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.15.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/dev-python/pyxdg/pyxdg-0.15.ebuild,v 1.1 2005/08/11 11:45:02 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.15.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyxdg/pyxdg-0.8.ebuild b/dev-python/pyxdg/pyxdg-0.8.ebuild
index 00409879e4dd..9888058f60ff 100644
--- a/dev-python/pyxdg/pyxdg-0.8.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.8.ebuild
@@ -1,17 +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/dev-python/pyxdg/pyxdg-0.8.ebuild,v 1.1 2004/10/18 17:50:39 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxdg/pyxdg-0.8.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="a python module to deal with freedesktop.org specifications."
-SRC_URI="http://www.freedesktop.org/software/pyxdg/releases/${P}.tar.gz"
-HOMEPAGE="pyxdg.freedesktop.org"
+SRC_URI="http://www.freedesktop.org/~lanius/${P}.tar.gz"
+HOMEPAGE="http://pyxdg.freedesktop.org/"
 LICENSE="LGPL-2"
 
 DEPEND="virtual/python"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 IUSE=""
 
 src_install () {
diff --git a/dev-python/pyxml/ChangeLog b/dev-python/pyxml/ChangeLog
index 43078a28892c..38cc62a1971f 100644
--- a/dev-python/pyxml/ChangeLog
+++ b/dev-python/pyxml/ChangeLog
@@ -1,6 +1,98 @@
-# ChangeLog for dev-python/PyXML
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.1 2003/08/29 17:14:21 liquidx Exp $
+# ChangeLog for dev-python/pyxml
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/ChangeLog,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> pyxml-0.8.4.ebuild:
+  Stable on ppc.
+
+  14 Oct 2005; Aron Griffis <agriffis@gentoo.org> pyxml-0.8.4.ebuild:
+  Mark 0.8.4 stable on alpha
+
+  13 Oct 2005; Aron Griffis <agriffis@gentoo.org> pyxml-0.8.4.ebuild:
+  Mark 0.8.4 stable on ia64
+
+  12 Oct 2005; Rob Cakebread <pythonhead@gentoo.org> pyxml-0.8.4.ebuild:
+  Marking 0.8.4 stable on x86 amd64 and sparc per gustavoz
+
+  11 Jun 2005; Rob Cakebread <pythonhead@gentoo.org> pyxml-0.8.1.ebuild,
+  pyxml-0.8.2.ebuild, pyxml-0.8.3.ebuild, pyxml-0.8.3-r1.ebuild,
+  pyxml-0.8.4.ebuild:
+  Versions <=0.8.3 don't work with python2.4 - fixed deps
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Simon Stelling <blubb@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  stable on amd64
+
+  09 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> pyxml-0.8.4.ebuild:
+  Unstable ppc-macos
+
+  07 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Stable on alpha.
+
+  06 Feb 2005; Joshua Kinard <kumba@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Marked stable on mips.
+
+  26 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Stable on sparc
+
+  25 Jan 2005; Lukasz Strzygowski <lucass@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Marked stable on x86.
+
+*pyxml-0.8.4 (30 Nov 2004)
+
+  30 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> +pyxml-0.8.4.ebuild:
+  Version bump
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> pyxml-0.8.3.ebuild:
+  stable on amd64.
+
+*pyxml-0.8.3-r1 (17 Jun 2004)
+
+  17 Jun 2004; Lukasz Strzygowski <lucass@gentoo.org> pyxml-0.8.3-r1.ebuild:
+  Fixing bug 54174. Thanks for Roger Luethi. Now it install also 
+  tests, demos, all docs and man pages. Marking testing on all archs.
+
+  13 May 2004; Stephen P. Becker <geoman@gentoo.org> pyxml-0.8.3.ebuild:
+  Stable on mips.
+
+  12 Apr 2004; Guy Martin <gmsoft@gentoo.org> pyxml-0.8.3.ebuild:
+  Marked stable on hppa.
+
+  14 Mar 2004; Stephen P. Becker <geoman@gentoo.org> pyxml-0.8.3.ebuild:
+  Added ~mips keyword.
+
+  09 Mar 2004; <agriffis@gentoo.org> pyxml-0.8.3.ebuild:
+  stable on alpha and ia64
+
+  02 Mar 2004; Jason Wever <weeve@gentoo.org> pyxml-0.8.3.ebuild:
+  Marked stable on sparc.
+
+*pyxml-0.8.3 (28 Feb 2004)
+
+  28 Feb 2004; Alastair Tse <liquidx@gentoo.org> pyxml-0.8.3.ebuild:
+  stable bump. fixes charset provlems with py2.3 (#41548)
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> pyxml-0.8.2.ebuild:
+  stable on alpha and ia64
+
+  25 Jan 2004; <gustavoz@gentoo.org> pyxml-0.8.2.ebuild:
+  stable on sparc
+
+*pyxml-0.8.2 (18 Jan 2004)
+
+  18 Jan 2004; Alastair Tse <liquidx@gentoo.org> pyxml-0.8.2.ebuild,
+  pyxml-0.8.3.ebuild:
+  fix 4suite after renaming
+
+*pyxml-0.8.1 (14 Nov 2003)
+
+  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> pyxml-0.8.1.ebuild:
+  Stable on ia64
 
   12 Jun 2003; <msterret@gentoo.org> PyXML-0.7.1.ebuild, PyXML-0.7.ebuild:
   fix Header
diff --git a/dev-python/pyxml/Manifest b/dev-python/pyxml/Manifest
index f0ff17220789..8e3974b9d95b 100644
--- a/dev-python/pyxml/Manifest
+++ b/dev-python/pyxml/Manifest
@@ -1,8 +1,12 @@
-MD5 b96667754e49685c3ebe2fb485d751c5 ChangeLog 2143
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 628b999dcb2b31328de21f2886e8f767 pyxml-0.8.1.ebuild 644
-MD5 a3afe10c0209f093276550d3bc826773 pyxml-0.8.2.ebuild 921
-MD5 a3afe10c0209f093276550d3bc826773 pyxml-0.8.3.ebuild 921
+MD5 5536ce12da2b80b622785e83fb08afd2 ChangeLog 5043
 MD5 b83e36b4dc90c3ce5840f0d2e432b7b2 files/digest-pyxml-0.8.1 63
 MD5 6a14eefbf90c139b1f9b058131cb211f files/digest-pyxml-0.8.2 63
 MD5 7d09f52601eefbf60eb70af6516bd302 files/digest-pyxml-0.8.3 63
+MD5 7d09f52601eefbf60eb70af6516bd302 files/digest-pyxml-0.8.3-r1 63
+MD5 8d74fb8f5666f5ca295d21908b4912b0 files/digest-pyxml-0.8.4 63
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 51e936111b8f233294927db592963086 pyxml-0.8.1.ebuild 649
+MD5 ca1eaa65fe8ae61e804accfbb319d803 pyxml-0.8.2.ebuild 923
+MD5 23a4a741f98c9185705fdf8e1cf7cef8 pyxml-0.8.3-r1.ebuild 1136
+MD5 f7a99d5b12e0d068483228a17f5e65da pyxml-0.8.3.ebuild 938
+MD5 36b9bb86ab618d8093678bbb2c11f4e0 pyxml-0.8.4.ebuild 1119
diff --git a/dev-python/pyxml/pyxml-0.8.1.ebuild b/dev-python/pyxml/pyxml-0.8.1.ebuild
index fd394cb4965d..d8f850517a4d 100644
--- a/dev-python/pyxml/pyxml-0.8.1.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.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/dev-python/pyxml/pyxml-0.8.1.ebuild,v 1.1 2003/08/29 17:14:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.1.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -10,11 +10,11 @@ DESCRIPTION="A collection of libraries to process XML with Python."
 SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
 HOMEPAGE="http://pyxml.sourceforge.net/"
 
-DEPEND="virtual/python"
+DEPEND="<dev-lang/python-2.4"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha amd64"
+KEYWORDS="x86 ppc sparc alpha amd64 ia64"
 LICENSE="PYTHON"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/pyxml/pyxml-0.8.2.ebuild b/dev-python/pyxml/pyxml-0.8.2.ebuild
index 282f8885e281..e29ec2fc0fb3 100644
--- a/dev-python/pyxml/pyxml-0.8.2.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.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/dev-python/pyxml/pyxml-0.8.2.ebuild,v 1.1 2003/08/29 17:14:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.2.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
@@ -10,24 +10,24 @@ DESCRIPTION="A collection of libraries to process XML with Python."
 SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
 HOMEPAGE="http://pyxml.sourceforge.net/"
 
-DEPEND="virtual/python
+DEPEND="<dev-lang/python-2.4
 	>=dev-libs/expat-1.95.6"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa amd64"
+KEYWORDS="x86 ~ppc sparc alpha hppa amd64 ia64"
 LICENSE="PYTHON"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	local myconf
-	
+
 	# if you want to use 4Suite, then their XSLT/XPATH is
 	# better according to the docs
-	if has_version "dev-python/4Suite"; then
+	if has_version "dev-python/4suite"; then
 		myconf="--without-xslt --without-xpath"
 	fi
-	
+
 	distutils_src_compile ${myconf}
 }
 
diff --git a/dev-python/pyxml/pyxml-0.8.3-r1.ebuild b/dev-python/pyxml/pyxml-0.8.3-r1.ebuild
index cbbfd7d76c5d..ffbc8fcb164b 100644
--- a/dev-python/pyxml/pyxml-0.8.3-r1.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.3-r1.ebuild
@@ -1,25 +1,27 @@
-# 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/dev-python/pyxml/pyxml-0.8.3-r1.ebuild,v 1.1 2004/06/17 21:39:22 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit python distutils
 
 MY_P=${P/pyxml/PyXML}
 
-DESCRIPTION="A collection of libraries to process XML with Python."
-SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
+DESCRIPTION="A collection of libraries to process XML with Python"
 HOMEPAGE="http://pyxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
 
-DEPEND="virtual/python
+DEPEND="<dev-lang/python-2.4
 	>=dev-libs/expat-1.95.6"
 
-IUSE=""
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ppc64 ~ia64 ~mips"
-LICENSE="PYTHON"
-DOCS="ANNOUNCE CREDITS PKG-INFO LICENCE TODO doc/*.txt"
 S=${WORKDIR}/${MY_P}
 
+DOCS="ANNOUNCE CREDITS PKG-INFO TODO doc/*.txt"
+
 src_compile() {
 	local myconf
 
diff --git a/dev-python/pyxml/pyxml-0.8.3.ebuild b/dev-python/pyxml/pyxml-0.8.3.ebuild
index 1cf5b3e6afc8..d21a6e0aba97 100644
--- a/dev-python/pyxml/pyxml-0.8.3.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.3.ebuild
@@ -1,33 +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/dev-python/pyxml/pyxml-0.8.3.ebuild,v 1.1 2003/08/29 17:14:21 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.3.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit distutils
 
 MY_P=${P/pyxml/PyXML}
 
-DESCRIPTION="A collection of libraries to process XML with Python."
-SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
+DESCRIPTION="A collection of libraries to process XML with Python"
 HOMEPAGE="http://pyxml.sourceforge.net/"
+SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE=""
 
-DEPEND="virtual/python
+DEPEND="<dev-lang/python-2.4
 	>=dev-libs/expat-1.95.6"
 
-IUSE=""
-SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha hppa amd64"
-LICENSE="PYTHON"
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	local myconf
-	
+
 	# if you want to use 4Suite, then their XSLT/XPATH is
 	# better according to the docs
-	if has_version "dev-python/4Suite"; then
+	if has_version "dev-python/4suite"; then
 		myconf="--without-xslt --without-xpath"
 	fi
-	
+
 	distutils_src_compile ${myconf}
 }
 
diff --git a/dev-python/pyxml/pyxml-0.8.4.ebuild b/dev-python/pyxml/pyxml-0.8.4.ebuild
index 218ea58ebd9d..f7eee691dfc7 100644
--- a/dev-python/pyxml/pyxml-0.8.4.ebuild
+++ b/dev-python/pyxml/pyxml-0.8.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/dev-python/pyxml/pyxml-0.8.4.ebuild,v 1.1 2004/11/30 23:35:29 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxml/pyxml-0.8.4.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 inherit python distutils
 
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/pyxml/${MY_P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc-macos ~ppc64 sparc x86"
 IUSE=""
 
-DEPEND="virtual/python
-	>=dev-libs/expat-1.95.6"
+DEPEND=">=dev-libs/expat-1.95.6"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/pyxmms/ChangeLog b/dev-python/pyxmms/ChangeLog
index ea41772b9ce1..8ffd23d5b11a 100644
--- a/dev-python/pyxmms/ChangeLog
+++ b/dev-python/pyxmms/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for dev-python/pyxmms
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxmms/ChangeLog,v 1.1 2003/04/07 15:05:27 chouser Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxmms/ChangeLog,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
+
+*pyxmms-2.06 (27 Oct 2005)
+
+  27 Oct 2005; Luis Medinas <metalgod@gentoo.org> +pyxmms-2.06.ebuild:
+  Version bump. Closes bug #110647.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> pyxmms-2.02.ebuild:
+  Mark 2.02 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> pyxmms-2.02.ebuild:
+  add ~ia64
+
+  21 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> -pyxmms-1.06.ebuild,
+  -pyxmms-1.07.ebuild:
+  Remove old versions.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> pyxmms-2.02.ebuild:
+  Stable on alpha.
+
+  10 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> pyxmms-2.02.ebuild:
+  Add ~alpha keyword.
+
+  15 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> pyxmms-2.02.ebuild:
+  Stable on sparc
+
+  28 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> pyxmms-2.02.ebuild:
+  Stable x86.
+
+  12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> pyxmms-2.02.ebuild:
+  Stable on amd64.
+
+  26 Jan 2004; <gustavoz@gentoo.org> pyxmms-1.07.ebuild:
+  stable on sparc
+
+*pyxmms-2.02 (25 Jan 2004)
+
+  25 Jan 2004; Jeremy Huddleston <eradicator@gentoo.org> pyxmms-1.06.ebuild,
+  pyxmms-1.07.ebuild, pyxmms-2.01.ebuild, pyxmms-2.02.ebuild:
+  Added ~ppc to close bug #31700.  Version bump for 2.02
+
+  20 Nov 2003; David Holm <dholm@gentoo.org> pyxmms-2.01.ebuild:
+  Added to ~ppc.
+
+*pyxmms-2.01 (12 Nov 2003)
+
+  12 Nov 2003; Alastair Tse <liquidx@gentoo.org> pyxmms-1.07.ebuild,
+  pyxmms-2.01.ebuild:
+  version bump, added PYTHON_MODNAME and using newer sed expression
+
+  30 Sep 2003; Todd Sunderlin <todd@gentoo.org> pyxmms-1.07.ebuild:
+  added ~sparc keyword
+
+  21 Sep 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml:
+  added sound to herds
+
+*pyxmms-1.07 (20 Sep 2003)
+
+  20 Sep 2003; jje <jje@gentoo.org> pyxmms-1.07.ebuild:
+  Version bump. ~x86 masked.
 
 *pyxmms-1.06 (07 Apr 2003)
 
diff --git a/dev-python/pyxmms/Manifest b/dev-python/pyxmms/Manifest
index e69de29bb2d1..a6657a521dfc 100644
--- a/dev-python/pyxmms/Manifest
+++ b/dev-python/pyxmms/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6de434730cbbec0ac4a2a313ba3fff2d ChangeLog 2191
+MD5 be942fd3af551a40337b4c27fbd80fce files/digest-pyxmms-2.01 63
+MD5 dd205861a4c28a4363fc26a3f01ddde3 files/digest-pyxmms-2.02 63
+MD5 e19f6339ff654d27adcef645f3c31096 files/digest-pyxmms-2.06 63
+MD5 72449c562b30ea2bb3f5570423673e8b metadata.xml 178
+MD5 47d499a95ae7c4423047e453bacbf5e1 pyxmms-2.01.ebuild 753
+MD5 df9e74926b4a1c200baf4c65fd6273ba pyxmms-2.02.ebuild 768
+MD5 a4c4e6b23291a99fa3a6d80bd1bd5439 pyxmms-2.06.ebuild 773
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDYVwBwUpWvClEHQoRAgBGAJ9qmPGwzytGTRQxO1kv5+Zt8jRfcQCeJrs2
+eHM3ETPoDJB3pkD/WpZNlF0=
+=Eq8w
+-----END PGP SIGNATURE-----
diff --git a/dev-python/pyxmms/metadata.xml b/dev-python/pyxmms/metadata.xml
index de483c53568f..2e4c1b251376 100644
--- a/dev-python/pyxmms/metadata.xml
+++ b/dev-python/pyxmms/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>sound</herd>
 </pkgmetadata>
diff --git a/dev-python/pyxmms/pyxmms-2.01.ebuild b/dev-python/pyxmms/pyxmms-2.01.ebuild
index ac3d7268aaa6..23de26863a82 100644
--- a/dev-python/pyxmms/pyxmms-2.01.ebuild
+++ b/dev-python/pyxmms/pyxmms-2.01.ebuild
@@ -1,16 +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/dev-python/pyxmms/pyxmms-2.01.ebuild,v 1.1 2003/11/12 00:51:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxmms/pyxmms-2.01.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python interface to XMMS"
-HOMEPAGE="http://www.via.ecp.fr/~flo/2002/PyXMMS/xmms.html"
-SRC_URI="http://www.via.ecp.fr/~flo/2002/PyXMMS/dist/${P}.tar.bz2"
+HOMEPAGE="http://people.via.ecp.fr/~flo/2002/PyXMMS/xmms.html"
+SRC_URI="http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc"
 IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2.2
diff --git a/dev-python/pyxmms/pyxmms-2.02.ebuild b/dev-python/pyxmms/pyxmms-2.02.ebuild
index 094e173722e7..fb62721fa60e 100644
--- a/dev-python/pyxmms/pyxmms-2.02.ebuild
+++ b/dev-python/pyxmms/pyxmms-2.02.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/dev-python/pyxmms/pyxmms-2.02.ebuild,v 1.1 2004/01/25 10:50:21 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxmms/pyxmms-2.02.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.via.ecp.fr/~flo/2002/PyXMMS/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/python-2.2.2
diff --git a/dev-python/pyxmms/pyxmms-2.06.ebuild b/dev-python/pyxmms/pyxmms-2.06.ebuild
index b0758e503d27..74d0cdb364ef 100644
--- a/dev-python/pyxmms/pyxmms-2.06.ebuild
+++ b/dev-python/pyxmms/pyxmms-2.06.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/dev-python/pyxmms/pyxmms-2.06.ebuild,v 1.1 2005/10/27 22:00:58 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyxmms/pyxmms-2.06.ebuild,v 1.1.1.1 2005/11/30 10:10:14 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/pyzor/ChangeLog b/dev-python/pyzor/ChangeLog
index 5b45dfbe5b7b..388b6749ee3c 100644
--- a/dev-python/pyzor/ChangeLog
+++ b/dev-python/pyzor/ChangeLog
@@ -1,8 +1,43 @@
 # ChangeLog for dev-python/pyzor
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.1 2002/12/12 23:01:30 blauwers Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  12 Nov 2005; Brent Baude <ranger@gentoo.org> pyzor-0.4.0-r1.ebuild:
+  Marking pyzor-0.4.0-r1 ~ppc64 for bug# 112220
+
+  12 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> pyzor-0.4.0-r1.ebuild:
+  marked ~alpha as per bug #112220
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pyzor-0.4.0-r1.ebuild:
+  Stable sparc and amd64.
+
+  22 Jul 2004; David Holm <dholm@gentoo.org> pyzor-0.4.0-r1.ebuild:
+  Added to ~ppc.
+
+  30 Jun 2004; Ferris McCormick <fmccor@gentoo.org> pyzor-0.4.0-r1.ebuild:
+  Add ~sparc keyword at user request, closing 53481. It passes its internal
+  tests.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> pyzor-0.4.0-r1.ebuild,
+  pyzor-0.4.0.ebuild:
+  Add missing IUSE.
+
+  02 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> pyzor-0.4.0-r1.ebuild:
+  Mark 0.4.0-r1 x86, fixing bug #36962
+
+*pyzor-0.4.0-r1 (28 Oct 2003)
+
+  28 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> pyzor-0.4.0-r1.ebuild:
+  fix permissions bug #31848
 
 *pyzor-0.4.0 (12 Dec 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> pyzor-0.4.0.ebuild:
+  small touchups
+
   12 Dec 2002; B.Lauwers <blauwers@gentoo.org> pyzor-0.4.0.ebuild, Changelog :
   Initial import. Ebuild submitted by Marcelo Fontenele S Santos <msantos@pobox.com>.
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index e69de29bb2d1..f96eedff6686 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -0,0 +1,6 @@
+MD5 de7fd6116ffba813725cf4ffce2a454f ChangeLog 1553
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 4dd40a91442aabc2cf2e923c67608e55 pyzor-0.4.0-r1.ebuild 846
+MD5 3c170e1cf94bfddbe3588e4b6e231510 pyzor-0.4.0.ebuild 656
+MD5 3f779e11cd93d820e75567bf24ab2e37 files/digest-pyzor-0.4.0 63
+MD5 3f779e11cd93d820e75567bf24ab2e37 files/digest-pyzor-0.4.0-r1 63
diff --git a/dev-python/pyzor/pyzor-0.4.0-r1.ebuild b/dev-python/pyzor/pyzor-0.4.0-r1.ebuild
index 01b1656d455b..3827eb31c52c 100644
--- a/dev-python/pyzor/pyzor-0.4.0-r1.ebuild
+++ b/dev-python/pyzor/pyzor-0.4.0-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/dev-python/pyzor/pyzor-0.4.0-r1.ebuild,v 1.1 2003/10/28 18:52:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.4.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,8 @@ SRC_URI="mirror://sourceforge/pyzor/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc x86"
+IUSE=""
 
 DEPEND="virtual/python
 	sys-libs/gdbm"
diff --git a/dev-python/pyzor/pyzor-0.4.0.ebuild b/dev-python/pyzor/pyzor-0.4.0.ebuild
index ba97eb144db6..28c0a2a37650 100644
--- a/dev-python/pyzor/pyzor-0.4.0.ebuild
+++ b/dev-python/pyzor/pyzor-0.4.0.ebuild
@@ -1,6 +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/dev-python/pyzor/pyzor-0.4.0.ebuild,v 1.1 2002/12/12 23:01:30 blauwers Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyzor/pyzor-0.4.0.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+inherit distutils
 
 DESCRIPTION="Pyzor is a distributed, collaborative spam detection and filtering network"
 HOMEPAGE="http://pyzor.sourceforge.net/"
@@ -8,24 +10,15 @@ SRC_URI="mirror://sourceforge/pyzor/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/python
 	sys-libs/gdbm"
-RDEPEND=${DEPEND}
-
-inherit distutils
 
 src_install () {
-	mydoc="INSTALL NEWS PKG-INFO THANKS UPGRADING docs/usage.html"
+	mydoc="INSTALL NEWS PKG-INFO THANKS UPGRADING"
 	distutils_src_install
-
+	dohtml docs/usage.html
 	rm -rf ${D}/usr/share/doc/pyzor
-
-	#chmod -R a+rX \
-		#${D}/usr/share/doc/pyzor \
-        	#${D}/usr/lib/python2.2/site-packages/pyzor \
-                #${D}/usr/bin/pyzor \
-		#${D}/usr/bin/pyzord
-
 }
diff --git a/dev-python/qscintilla/ChangeLog b/dev-python/qscintilla/ChangeLog
index fa66938cc995..4d76d2026e72 100644
--- a/dev-python/qscintilla/ChangeLog
+++ b/dev-python/qscintilla/ChangeLog
@@ -1,8 +1,179 @@
-# ChangeLog for dev-python/PyQt
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.1 2002/12/19 20:32:10 verwilst Exp $
+# ChangeLog for dev-python/qscintilla
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
-*qscintilla-1.49 (19 December 2002) Bart Verwilst <verwilst@gentoo.org>
+  07 Oct 2005; Simon Stelling <blubb@gentoo.org> qscintilla-1.65.ebuild:
+  make multilib-strict happy
+
+*qscintilla-1.65 (26 Sep 2005)
+
+  26 Sep 2005; Chris Bainbridge <chrb@gentoo.org>
+  +files/qscintilla-1.65-sandbox.patch, +qscintilla-1.65.ebuild:
+  Version bump for #107104
+
+  18 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  qscintilla-1.5.1.ebuild:
+  Stable on ppc.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> qscintilla-1.4-r1.ebuild,
+  qscintilla-1.5-r1.ebuild, qscintilla-1.5.1.ebuild, qscintilla-1.54.ebuild,
+  qscintilla-1.60.ebuild, qscintilla-1.61.ebuild:
+  Fix qt deps
+
+  02 Jul 2005; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.4-r1.ebuild,
+  qscintilla-1.5.1.ebuild:
+  stable on x86
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> qscintilla-1.4-r1.ebuild,
+  qscintilla-1.5-r1.ebuild, qscintilla-1.5.1.ebuild, qscintilla-1.54.ebuild,
+  qscintilla-1.60.ebuild, qscintilla-1.61.ebuild:
+  Fix qmake dir per bug #97535
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  qscintilla-1.61.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> qscintilla-1.61.ebuild:
+  stable on ia64
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> qscintilla-1.61.ebuild:
+  Stable on alpha.
+
+*qscintilla-1.5.1 (07 Mar 2005)
+
+  07 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +qscintilla-1.5.1.ebuild:
+  version bump
+
+*qscintilla-1.4-r1 (21 Feb 2005)
+
+  21 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +qscintilla-1.4-r1.ebuild,
+  -qscintilla-1.4.ebuild, +qscintilla-1.5-r1.ebuild, -qscintilla-1.5.ebuild:
+  fixed stupid ebuild error, #82808
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.4.ebuild,
+  qscintilla-1.5.ebuild:
+  dropped  ppc64 keyword by accident
+
+*qscintilla-1.5 (20 Feb 2005)
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/qscintilla-1.4-sandbox.patch, +files/qscintilla-1.5-sandbox.patch,
+  +qscintilla-1.4.ebuild, +qscintilla-1.5.ebuild:
+  correcting versioning and bump
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> qscintilla-1.61.ebuild:
+  Stable on amd64.
+
+  09 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> qscintilla-1.61.ebuild:
+  Stable on sparc
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.61.ebuild:
+  stable on x86
+
+  08 Nov 2004; Daniel Ostrow <dostrow@gentoo.org> qscintilla-1.61.ebuild:
+  Marked ~ppc64
+
+  26 Sep 2004; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.61.ebuild:
+  the lib should really be compiled...
+
+*qscintilla-1.61 (16 Sep 2004)
+
+  16 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/qscintilla-1.61-sandbox.patch, +qscintilla-1.61.ebuild:
+  version bump
+
+  21 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> qscintilla-1.60.ebuild:
+  Marked stable on amd64.
+
+  18 Jul 2004; Jason Wever <weeve@gentoo.org> qscintilla-1.60.ebuild:
+  Stable on sparc wrt bug #56712.
+
+  18 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> qscintilla-1.60.ebuild:
+  Stable on alpha.
+
+  11 Jul 2004; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.60.ebuild:
+  stable on x86
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> qscintilla-1.54.ebuild,
+  qscintilla-1.60.ebuild:
+  change virtual/glibc to virtual/libc
+
+  25 May 2004; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.54.ebuild:
+  marked 1.54 stable on ppc
+
+  25 May 2004; Carsten Lohrke <carlo@gentoo.org> qscintilla-1.49-r1.ebuild,
+  qscintilla-1.49.ebuild, qscintilla-1.52.ebuild, qscintilla-1.53.ebuild,
+  qscintilla-1.54.ebuild, qscintilla-1.60.ebuild,
+  files/qscintilla-1.49-sandbox.patch, files/qscintilla-1.52-sandbox.patch,
+  files/qscintilla-1.53-sandbox.patch:
+  mirror://gentoo, cleanup
+
+*qscintilla-1.60 (21 May 2004)
+
+  21 May 2004; <carsten@gentoo.org> qscintilla-1.60.ebuild,
+  files/qscintilla-1.60-sandbox.patch:
+  Version bump
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> qscintilla-1.49-r1.ebuild,
+  qscintilla-1.49.ebuild, qscintilla-1.52.ebuild, qscintilla-1.53.ebuild:
+  Add missing IUSE.
+
+  21 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> qscintilla-1.54.ebuild:
+  Mark stable on amd64.
+
+  14 Mar 2004; Jon Portnoy <avenj@gentoo.org> qscintilla-1.54.ebuild :
+  AMD64 keywords.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> qscintilla-1.54.ebuild:
+  Stable on sparc.
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> qscintilla-1.54.ebuild:
+  stable on alpha and ia64
+
+  16 Dec 2003; Jason Wever <weeve@gentoo.org> qscintilla-1.54.ebuild:
+  Added ~sparc keyword to keywords to fix broken dependencies of dev-python/PyQt.
+
+*qscintilla-1.54 (14 Oct 2003)
+
+  14 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> qscintilla-1.54.ebuild,
+  files/qscintilla-1.54-sandbox.patch:
+  Version bump
+
+  31 Jul 2003; Caleb Tennis <caleb@gentoo.org> qscintilla-1.53.ebuild:
+  Moved to x86 stable, and remove dep on any specific qt version.
+
+*qscintilla-1.53 (16 Jun 2003)
+  16 Jun 2003; Michele Balistreri <brain@gentoo.org> qscintilla-1.53.ebuild :
+  Version bump
+
+  09 May 2003; Luca Barbato <lu_zero@gentoo.org> qscintilla-1.52.ebuild :
+  Keyworded ~ppc 
+
+*qscintilla-1.52 (29 Apr 2003)
+
+  29 Apr 2003; Michele Balistreri <brain@gentoo.org> qscintilla-1.52.ebuild :
+  Version bump
+
+*qscintilla-1.49-r1 (1 Feb 2003) 
+
+  01 Feb 2003; Joachim Blaabjerg <styx@gentoo.org>
+
+  1 Feb 2003; Joachim Blaabjerg <styx@gentoo.org> qscintilla-1.49-r1.ebuild,
+  files/qscintilla-1.49-sandbox.patch, files/digest-qscintilla-1.49-r1 :
+
+  Made the ebuild install libqscintilla.a as well, by request of John Landahl.
+
+  21 Jan 2003; Joachim Blaabjerg <styx@gentoo.org> qscintilla-1.49.ebuild,
+  files/qscintilla-1.49-sandbox.patch :
+
+  Fixed the ebuild a little, sandbox violations etc.
+
+*qscintilla-1.49 (19 Dec 2002) 
+
+  19 Dec 2002; Bart Verwilst <verwilst@gentoo.org>
  
   initial ebuild.
 
diff --git a/dev-python/qscintilla/Manifest b/dev-python/qscintilla/Manifest
index c9bf3b7b52d6..88059852af91 100644
--- a/dev-python/qscintilla/Manifest
+++ b/dev-python/qscintilla/Manifest
@@ -1,9 +1,17 @@
-MD5 58153d3aaac88372dd30946afa439d38 ChangeLog 914
-MD5 5aad667ea07c2cda3ac72edf15cc1fe3 qscintilla-1.49-r1.ebuild 1073
-MD5 961d7fbc08f645ed448b3b8a7c5fdd1d qscintilla-1.49.ebuild 1020
-MD5 109b4884e46c8caf7b9d7ad8c693b713 qscintilla-1.52.ebuild 1073
-MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49 79
-MD5 00d628534c7077582526546d18c716e1 files/digest-qscintilla-1.49-r1 79
-MD5 55d83f96c8adfcf599166b6f21cae03e files/qscintilla-1.49-sandbox.patch 783
-MD5 4c2437213d7057e8d7b89d2d2242d70a files/qscintilla-1.52-sandbox.patch 777
-MD5 fc9cabb48b0b994d26803b8a5cfd9e63 files/digest-qscintilla-1.52 79
+MD5 fba3e495bc25a55be4d4b3bdf9a20739 ChangeLog 5996
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 87273eb2e416d2e2b9f226ade799e9b3 qscintilla-1.65.ebuild 1375
+MD5 a58f7a05c3ca36fe816b384fc8a426f9 qscintilla-1.5.1.ebuild 1902
+MD5 b31d285bc2996e4f58bf417fb5364aa0 qscintilla-1.54.ebuild 1063
+MD5 289dc572dec644ad8feb52b317834f8e qscintilla-1.60.ebuild 1259
+MD5 e15e08e9b7961e8f67815880840bc945 qscintilla-1.61.ebuild 1331
+MD5 4f3a81db5affa3915e5d35de77364e97 files/digest-qscintilla-1.65 75
+MD5 b3387e20eba70b27a4290523e89753e4 files/digest-qscintilla-1.5.1 77
+MD5 367f1bef2c17aa8fbc890fa134776db0 files/digest-qscintilla-1.54 79
+MD5 a9d71d6103367fa01a62735815dbe6ca files/digest-qscintilla-1.60 75
+MD5 3e38fc9aaa4fc7b9ab49400211086e08 files/digest-qscintilla-1.61 75
+MD5 bacbcf22f2420b5d982a6d04f171b44a files/qscintilla-1.5-sandbox.patch 1041
+MD5 680820a26d1487ebc8330eaa923f3599 files/qscintilla-1.54-sandbox.patch 783
+MD5 dc22cd37e5a193d127ad169db2cf6753 files/qscintilla-1.60-sandbox.patch 710
+MD5 e2ef183d503f0d553f92c182d655be67 files/qscintilla-1.61-sandbox.patch 710
+MD5 f5f01b5ca1b6758b69a04a4897c0a370 files/qscintilla-1.65-sandbox.patch 710
diff --git a/dev-python/qscintilla/metadata.xml b/dev-python/qscintilla/metadata.xml
index de483c53568f..a789e7bbe9ee 100644
--- a/dev-python/qscintilla/metadata.xml
+++ b/dev-python/qscintilla/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>qt</herd>
 </pkgmetadata>
diff --git a/dev-python/qscintilla/qscintilla-1.5.1.ebuild b/dev-python/qscintilla/qscintilla-1.5.1.ebuild
index 691f9daaeab7..133f6ea8b6ff 100644
--- a/dev-python/qscintilla/qscintilla-1.5.1.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.5.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/dev-python/qscintilla/qscintilla-1.5.1.ebuild,v 1.1 2005/03/06 23:21:49 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.5.1.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit eutils
 
@@ -18,12 +18,12 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
 	sys-apps/sed
-	x11-libs/qt"
+	=x11-libs/qt-3*"
 
 LIBDIR="/usr/$(get_libdir)"
 
@@ -32,7 +32,7 @@ src_unpack() {
 	sed -i -e "s:DESTDIR = \$(QTDIR)/lib:DESTDIR = \${destdir}:" qscintilla.pro
 	echo -e "\nQMAKE_CFLAGS_RELEASE=${CFLAGS} -w\nQMAKE_CXXFLAGS_RELEASE=${CXXFLAGS} -w\nQMAKE_LFLAGS_RELEASE=${LDFLAGS}" >> qscintilla.pro
 
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	epatch ${FILESDIR}/${PN}-1.5-sandbox.patch
 }
 
diff --git a/dev-python/qscintilla/qscintilla-1.54.ebuild b/dev-python/qscintilla/qscintilla-1.54.ebuild
index b1438d4b4090..8a699b44827d 100644
--- a/dev-python/qscintilla/qscintilla-1.54.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.54.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/dev-python/qscintilla/qscintilla-1.54.ebuild,v 1.1 2003/10/14 18:06:06 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.54.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 
 inherit eutils
@@ -8,19 +8,19 @@ inherit eutils
 S="${WORKDIR}/${P}-x11-gpl-1.2"
 DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
 HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
-SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${P}-x11-gpl-1.2.tar.gz"
+SRC_URI="mirror://gentoo/${P}-x11-gpl-1.2.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ppc sparc alpha ia64 amd64"
 IUSE=""
-DEPEND="virtual/glibc
-	x11-libs/qt"
+DEPEND="virtual/libc
+	=x11-libs/qt-3*"
 
 src_unpack() {
 
 	unpack ${P}-x11-gpl-1.2.tar.gz
 	cd ${S}/qt
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	epatch ${FILESDIR}/${P}-sandbox.patch
 	mkdir -p ${D}/${QTDIR}/lib
 
diff --git a/dev-python/qscintilla/qscintilla-1.60.ebuild b/dev-python/qscintilla/qscintilla-1.60.ebuild
index 0fde00c352a8..2029308f4e05 100644
--- a/dev-python/qscintilla/qscintilla-1.60.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.60.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/dev-python/qscintilla/qscintilla-1.60.ebuild,v 1.1 2004/05/21 17:31:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.60.ebuild,v 1.1.1.1 2005/11/30 10:10:06 chriswhite Exp $
 
 inherit eutils
 
@@ -8,20 +8,20 @@ MY_P=${P}-gpl-1.3
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor class."
-SRC_URI="http://www.river-bank.demon.co.uk/download/QScintilla/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+KEYWORDS="x86 ppc sparc alpha ~ia64 amd64"
 IUSE="doc"
 
-DEPEND="virtual/glibc
-	x11-libs/qt"
+DEPEND="virtual/libc
+	=x11-libs/qt-3*"
 
 src_compile() {
 	cd ${S}/qt
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
 	sed -i -e "s/CXXFLAGS = -pipe -w -O2/CXXFLAGS = ${CXXFLAGS} -w/" Makefile
 	epatch ${FILESDIR}/${P}-sandbox.patch
diff --git a/dev-python/qscintilla/qscintilla-1.61.ebuild b/dev-python/qscintilla/qscintilla-1.61.ebuild
index 79d53cbbe7e4..020f7d0b6d88 100644
--- a/dev-python/qscintilla/qscintilla-1.61.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.61.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/dev-python/qscintilla/qscintilla-1.61.ebuild,v 1.1 2004/09/16 18:01:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.61.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit eutils
 
@@ -13,23 +13,24 @@ HOMEPAGE="http://www.riverbankcomputing.co.uk/qscintilla/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+KEYWORDS="x86 ppc sparc alpha ia64 amd64 ~ppc64"
 IUSE="doc"
 
 DEPEND="virtual/libc
 	sys-apps/sed
-	x11-libs/qt"
+	=x11-libs/qt-3*"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/qt
-	qmake -o Makefile qscintilla.pro
+	${QTDIR}/bin/qmake -o Makefile qscintilla.pro
 	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
 	sed -i -e "s/CXXFLAGS = -pipe -w -O2/CXXFLAGS = ${CXXFLAGS} -w/" Makefile
 	epatch ${FILESDIR}/${P}-sandbox.patch
 }
 
 src_compile() {
+	cd ${S}/qt
 	make all staticlib
 }
 
@@ -41,7 +42,9 @@ src_install() {
 	cp qscintilla*.qm ${D}/$QTDIR/translations
 	cp libqscintilla.a* ${D}/$QTDIR/lib
 	cp -d libqscintilla.so.* ${D}/$QTDIR/lib
-	use doc && ( dohtml ${S}/doc/html/*
+	if use doc ; then
+		dohtml ${S}/doc/html/*
 		insinto /usr/share/doc/${PF}/Scintilla
-		doins ${S}/doc/Scintilla/* )
+		doins ${S}/doc/Scintilla/*
+	fi
 }
diff --git a/dev-python/qscintilla/qscintilla-1.65.ebuild b/dev-python/qscintilla/qscintilla-1.65.ebuild
index 67f6c773eb56..ca1a091bad9c 100644
--- a/dev-python/qscintilla/qscintilla-1.65.ebuild
+++ b/dev-python/qscintilla/qscintilla-1.65.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/dev-python/qscintilla/qscintilla-1.65.ebuild,v 1.1 2005/09/26 15:24:07 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla/qscintilla-1.65.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
-inherit eutils
+inherit eutils multilib
 
 MY_P=${P}-gpl-1.6
 S=${WORKDIR}/${MY_P}
@@ -36,12 +36,12 @@ src_compile() {
 
 src_install() {
 	dodoc ChangeLog LICENSE NEWS README
-	dodir ${QTDIR}/{include,translations,lib}
+	dodir ${QTDIR}/{include,translations,$(get_libdir)}
 	cd ${S}/qt
 	cp qextscintilla*.h ${D}/$QTDIR/include
 	cp qscintilla*.qm ${D}/$QTDIR/translations
-	cp libqscintilla.a* ${D}/$QTDIR/lib
-	cp -d libqscintilla.so.* ${D}/$QTDIR/lib
+	cp libqscintilla.a* ${D}/$QTDIR/$(get_libdir)
+	cp -d libqscintilla.so.* ${D}/$QTDIR/$(get_libdir)
 	if use doc ; then
 		dohtml ${S}/doc/html/*
 		insinto /usr/share/doc/${PF}/Scintilla
diff --git a/dev-python/quixote/ChangeLog b/dev-python/quixote/ChangeLog
index 77de4f0cac73..dccff656824b 100644
--- a/dev-python/quixote/ChangeLog
+++ b/dev-python/quixote/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for dev-python/quixote
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/ChangeLog,v 1.1 2003/04/26 21:14:31 g2boojum Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+  19 Feb 2005; <gongloo@gentoo.org> quixote-1.0.ebuild:
+  Stable on ppc-macos.
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> quixote-0.6.1.ebuild,
+  quixote-1.0.ebuild:
+  moved 'inherit' to the right place
+
+  19 Jan 2005; <gongloo@gentoo.org> quixote-1.0.ebuild:
+  Keyworded ~ppc-macos.
+
+  03 Jul 2004; David Holm <dholm@gentoo.org> quixote-1.0.ebuild:
+  Added to ~ppc.
+
+*quixote-1.0 (02 Jul 2004)
+
+  02 Jul 2004; Grant Goodyear <g2boojum@gentoo.org> +quixote-1.0.ebuild:
+  Version bump
+
+*quixote-0.7_alpha3 (05 Dec 2003)
+
+  05 Dec 2003; Grant Goodyear <g2boojum@gentoo.org> quixote-0.7_alpha3.ebuild:
+  New version
+
+*quixote-0.7_alpha2 (12 Nov 2003)
+
+  12 Nov 2003; Grant Goodyear <g2boojum@gentoo.org> quixote-0.7_alpha2.ebuild:
+  New version (still the dev branch).  Being bad, I somehow forgot
+  to update the changelog for marking 0.6.1 as x86 as well as adding
+  0.7_alpha1 (and marking it ~x86), as it's part of quixote's development
+  branch.  
+
+*quixote-0.7_alpha1 (23 Oct 2003)
+
+*quixote-0.6.1 (11 Aug 2003)
+
+  11 Aug 2003; Grant Goodyear <g2boojum@gentoo.org> quixote-0.6.1.ebuild:
+  Version bump; marking ~x86 for now.
+
+*quixote-0.6 (02 May 2003)
+
+  02 May 2003; Grant Goodyear <g2boojum@gentoo.org> quixote-0.6.ebuild,
+  quixote-0.6_beta2.ebuild, quixote-0.6_beta2.ebuild,
+  quixote-0.6_beta6.ebuild, quixote-0.6_beta6.ebuild:
+  New version.  Removed old betas.
 
 *quixote-0.6_beta2 (21 Apr 2003)
 
@@ -12,3 +57,8 @@
   use the latest beta, as there have been some significant changes.
   (If it's good enough for LWN, it's good enough for me.)
 
+*quixote-0.5.1 (22 Jun 2003)
+ 
+  12 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
diff --git a/dev-python/quixote/Manifest b/dev-python/quixote/Manifest
index e69de29bb2d1..b0de6e14187e 100644
--- a/dev-python/quixote/Manifest
+++ b/dev-python/quixote/Manifest
@@ -0,0 +1,6 @@
+MD5 21726b27f8db2434cf672412779f0d62 ChangeLog 2209
+MD5 a2cfe785f6ad94c61071fa71dbe89aeb metadata.xml 244
+MD5 08c258c3dc13ce92d8bdd6dee0413cc2 quixote-0.6.1.ebuild 785
+MD5 4c48246f07509fbdd89b5d82fc491be1 quixote-1.0.ebuild 791
+MD5 f0b85ab0bd5e039d101c49571e31286f files/digest-quixote-0.6.1 65
+MD5 d0fe64af7a033c96a95874b7c81439a9 files/digest-quixote-1.0 63
diff --git a/dev-python/quixote/metadata.xml b/dev-python/quixote/metadata.xml
index de483c53568f..f4be22319d82 100644
--- a/dev-python/quixote/metadata.xml
+++ b/dev-python/quixote/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>web-apps</herd>
 <herd>python</herd>
+<maintainer>
+	<email>g2boojum@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-python/quixote/quixote-0.6.1.ebuild b/dev-python/quixote/quixote-0.6.1.ebuild
index 0b61f87aec61..097682c75d07 100644
--- a/dev-python/quixote/quixote-0.6.1.ebuild
+++ b/dev-python/quixote/quixote-0.6.1.ebuild
@@ -1,6 +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/dev-python/quixote/quixote-0.6.1.ebuild,v 1.1 2003/08/12 00:38:21 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+inherit distutils
 
 PN0="Quixote"
 DESCRIPTION="Python HTML templating framework for developing web applications."
@@ -9,11 +11,9 @@ SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${PN0}-${PV}.tar.gz"
 
 LICENSE="CNRI"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-inherit distutils
-
 DEPEND=">=dev-lang/python-2.2"
 S=${WORKDIR}/${PN0}-${PV}
 
diff --git a/dev-python/quixote/quixote-1.0.ebuild b/dev-python/quixote/quixote-1.0.ebuild
index db4704ba4407..9fc4211268fd 100644
--- a/dev-python/quixote/quixote-1.0.ebuild
+++ b/dev-python/quixote/quixote-1.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/dev-python/quixote/quixote-1.0.ebuild,v 1.1 2004/07/02 20:15:04 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/quixote/quixote-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+inherit distutils
 
 MY_P=${P/q/Q}
 DESCRIPTION="Python HTML templating framework for developing web applications."
@@ -9,11 +11,9 @@ SRC_URI="http://www.mems-exchange.org/software/files/${PN}/${MY_P}.tar.gz"
 
 LICENSE="CNRI"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ppc-macos"
 IUSE=""
 
-inherit distutils
-
 DEPEND=">=dev-lang/python-2.2"
 S=${WORKDIR}/${MY_P}
 
diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index 0939beb3ef6d..746b6ef7da09 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,12 +1,83 @@
-# ChangeLog for dev-python/ReportLab
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.1 2003/07/04 12:16:11 liquidx Exp $
+# ChangeLog for dev-python/reportlab
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> reportlab-1.20.ebuild:
+  Stable on ppc.
+
+  14 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> reportlab-1.20.ebuild:
+  Stable on sparc
+
+  11 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> reportlab-1.20.ebuild:
+  Stable on x86, fixes python-2.4 issues, bug 108649.
+
+  01 Oct 2005; Fernando Serboncini <fserb@gentoo.org> reportlab-1.20.ebuild:
+  Removed tar hack on src_install(). Closes #101936.
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> reportlab-1.20.ebuild:
+  Mark 1.20 stable on alpha
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> reportlab-1.20.ebuild:
+  add ~ia64
+
+  05 Jun 2005; Markus Rothe <corsair@gentoo.org> reportlab-1.20.ebuild:
+  Stable on ppc64; dependency for bug #92995
+
+  21 May 2005; Markus Rothe <corsair@gentoo.org> reportlab-1.20.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> reportlab-1.18.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> reportlab-1.18.ebuild:
+  stable on amd64
+
+*reportlab-1.20 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> +reportlab-1.20.ebuild:
+  Version bump.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*reportlab-1.19 (16 Oct 2004)
+
+  16 Oct 2004; Christian Andreetta <satya@gentoo.org> +reportlab-1.19.ebuild:
+  Version bump
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> reportlab-1.14.ebuild,
+  reportlab-1.17-r1.ebuild, reportlab-1.18.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+  03 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> reportlab-1.18.ebuild:
+  Stable on alpha.
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> reportlab-1.14.ebuild,
+  reportlab-1.17-r1.ebuild:
+  Add missing IUSE.
+
+  18 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> reportlab-1.18.ebuild:
+  Adding amd64 keyword, closing #48058.
+
+  14 Mar 2004; Jason Wever <weeve@gentoo.org> reportlab-1.18.ebuild:
+  Marked stable on sparc.
+
+*reportlab-1.18 (14 Dec 2003)
+
+  14 Dec 2003; Alastair Tse <liquidx@gentoo.org> reportlab-1.18.ebuild:
+  version bump
+
+  02 Mar 2004: Peter Bienstman <pbienst@gentoo.org> reportlab-1.18.ebuild:
+  marked stable on x86
 
 *reportlab-1.17-r1 (04 Jul 2003)
 
   04 Jul 2003; Alastair Tse <liquidx@gentoo.org> reportlab-1.17-r1.ebuild:
   moved from ReportLab to reportlab and fixed paths problem with installation
 
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> reportlab-1.17-r1.ebuild:
+  Stable on sparc.
+
 *ReportLab-1.17 (02 Mar 2003)
 
   04 Apr 2003; Alastair Tse <liquidx@gentoo.org> ReportLab-1.17.ebuild:
@@ -18,7 +89,7 @@
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
- *ReportLab-1.14 (29 Jun 2002)
+*reportlab-1.14 (29 Jun 2002)
 
  26 Jul 2002; George Shapovalov <george@gentoo.org> ReportLab-1.11.ebuild, ReportLab-1.14.ebuild :
  added KEYWORDS,SLOT,LICENSE
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index de09c4178c29..e09141d6b12b 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,4 +1,14 @@
-MD5 02f36d81e1d02f495adaa15b38a4d404 reportlab-1.14.ebuild 823
-MD5 b47ab544904cccb71b25a71c02d1802a reportlab-1.17.ebuild 793
-MD5 d5f5c0582f5df6e146b770ba6262cae9 files/digest-reportlab-1.17 64
+MD5 eeb9ed96d2f4794b126acbed12c1567b ChangeLog 3864
+MD5 f8fae2ab18041c7466c36685624a2192 files/1.14/setup.py 2887
+MD5 cdbafc7e047b69becba3bddfef8a61da files/1.17/setup.py 2887
 MD5 ae52d6e28f68d0a56dad9fdc2c295b92 files/digest-reportlab-1.14 64
+MD5 d5f5c0582f5df6e146b770ba6262cae9 files/digest-reportlab-1.17-r1 64
+MD5 9331d627b77ad16c57c78fe9f40f56df files/digest-reportlab-1.18 64
+MD5 1a0dfff787c5347b40acdab713d5c613 files/digest-reportlab-1.19 64
+MD5 cfacdbb1031922fe26d82130652169c7 files/digest-reportlab-1.20 64
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 c31328a75a20407ff0661b07a3952ead reportlab-1.14.ebuild 807
+MD5 f2a79ba699fea793dda74658f46e4a0e reportlab-1.17-r1.ebuild 1018
+MD5 89620654000c1db5f2df5294af90bebd reportlab-1.18.ebuild 1015
+MD5 98e6c6a7451162270ca26c4f8f13175e reportlab-1.19.ebuild 1280
+MD5 14ab2150db4992f995efe694062f851a reportlab-1.20.ebuild 1088
diff --git a/dev-python/reportlab/reportlab-1.14.ebuild b/dev-python/reportlab/reportlab-1.14.ebuild
index fe60514b9219..c45d61f4aec3 100644
--- a/dev-python/reportlab/reportlab-1.14.ebuild
+++ b/dev-python/reportlab/reportlab-1.14.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/dev-python/reportlab/reportlab-1.14.ebuild,v 1.1 2003/07/04 12:16:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.14.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 #goofy tarball versioning
 vmaj=${PV%%.*}
@@ -14,21 +14,18 @@ HOMEPAGE="http://www.reportlab.com/"
 DEPEND=">=dev-lang/python-1.5"
 RDEPEND="${DEPEND}
 	>=sys-libs/zlib-0.95
-	dev-python/Imaging"
+	dev-python/imaging"
 SLOT="0"
 LICENSE="as-is"
 KEYWORDS="x86 sparc alpha"
+IUSE=""
 
 src_compile() {
-	cp ${FILESDIR}/${PV}/setup.py .        
+	cp ${FILESDIR}/${PV}/setup.py .
 	python setup.py build
 }
-	
+
 src_install() {
 	python setup.py install --root=${D}
 	dodoc  README license.txt docs/*
 }
-
-
-
-
diff --git a/dev-python/reportlab/reportlab-1.17-r1.ebuild b/dev-python/reportlab/reportlab-1.17-r1.ebuild
index 190c694588bc..f590c9958805 100644
--- a/dev-python/reportlab/reportlab-1.17-r1.ebuild
+++ b/dev-python/reportlab/reportlab-1.17-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/dev-python/reportlab/reportlab-1.17-r1.ebuild,v 1.1 2003/07/04 12:16:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.17-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 #goofy tarball versioning
 vmaj=${PV%%.*}
@@ -15,16 +15,17 @@ HOMEPAGE="http://www.reportlab.com/"
 
 DEPEND="virtual/python
 	>=sys-libs/zlib-0.95
-	dev-python/Imaging
-	sys-apps/sed-4"
+	dev-python/imaging
+	>=sys-apps/sed-4"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="x86 ~ppc sparc ~alpha"
+IUSE=""
 
 src_install() {
 	distutils_python_version
 	distutils_src_install
-	
+
 	# crube hack to fix data files in the right dir
 	cd ${D}/usr/lib/python${PYVER}
 	tar -cv reportlab | tar -C ${D}/usr/lib/python${PYVER}/site-packages -x
@@ -32,7 +33,7 @@ src_install() {
 
 	# docs
 	cd ${S}
-	dodoc README license.txt 
+	dodoc README license.txt
 	insinto /usr/share/doc/${PF}
 	doins docs/*
 }
diff --git a/dev-python/reportlab/reportlab-1.18.ebuild b/dev-python/reportlab/reportlab-1.18.ebuild
index ff4e10c71bfd..367fdb53df4f 100644
--- a/dev-python/reportlab/reportlab-1.18.ebuild
+++ b/dev-python/reportlab/reportlab-1.18.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/dev-python/reportlab/reportlab-1.18.ebuild,v 1.1 2003/12/14 02:42:11 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.18.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 #goofy tarball versioning
 vmaj=${PV%%.*}
@@ -14,14 +14,14 @@ SRC_URI="http://www.reportlab.org/ftp/ReportLab_${vmaj}_${vmin}.tgz"
 HOMEPAGE="http://www.reportlab.org/"
 
 DEPEND=">=sys-libs/zlib-0.95
-	dev-python/Imaging
+	dev-python/imaging
 	>=sys-apps/sed-4
 	app-arch/tar"
 
 IUSE=""
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha amd64"
 
 src_install() {
 	python_version
diff --git a/dev-python/reportlab/reportlab-1.19.ebuild b/dev-python/reportlab/reportlab-1.19.ebuild
index 6f1cc279569d..39aa66c59dd9 100644
--- a/dev-python/reportlab/reportlab-1.19.ebuild
+++ b/dev-python/reportlab/reportlab-1.19.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/dev-python/reportlab/reportlab-1.19.ebuild,v 1.1 2004/10/16 09:27:44 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.19.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 #goofy tarball versioning
 vmaj=${PV%%.*}
diff --git a/dev-python/reportlab/reportlab-1.20.ebuild b/dev-python/reportlab/reportlab-1.20.ebuild
index 71430702b8fb..8215945c12fc 100644
--- a/dev-python/reportlab/reportlab-1.20.ebuild
+++ b/dev-python/reportlab/reportlab-1.20.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/dev-python/reportlab/reportlab-1.20.ebuild,v 1.1 2005/04/14 19:48:36 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.20.ebuild,v 1.1.1.1 2005/11/30 10:10:20 chriswhite Exp $
 
 #goofy tarball versioning
 vmaj=${PV%%.*}
@@ -21,7 +21,7 @@ DEPEND=">=sys-libs/zlib-0.95
 IUSE=""
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ia64 ppc ppc64 sparc x86"
 
 src_unpack() {
 	unpack ${A} || die
@@ -34,11 +34,6 @@ src_install() {
 	python_version
 	distutils_src_install
 
-	# crude hack to fix data files in the right dir
-	cd ${D}/usr/lib/python${PYVER}
-	tar -cv reportlab | tar -C ${D}/usr/lib/python${PYVER}/site-packages -x
-	rm -rf ${D}/usr/lib/python${PYVER}/reportlab
-
 	# docs
 	cd ${S}
 	dodoc README license.txt
diff --git a/dev-python/rlcompleter2/ChangeLog b/dev-python/rlcompleter2/ChangeLog
index 756af42bd89a..08ee47f861b0 100644
--- a/dev-python/rlcompleter2/ChangeLog
+++ b/dev-python/rlcompleter2/ChangeLog
@@ -1,9 +1,24 @@
 # ChangeLog for dev-python/rlcompleter2
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rlcompleter2/ChangeLog,v 1.1 2003/03/30 00:39:19 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rlcompleter2/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+*rlcompleter2-0.96 (14 Apr 2005)
+
+  14 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  +rlcompleter2-0.96.ebuild:
+  Version bump.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> rlcompleter2-0.95.ebuild:
+  Add missing IUSE.
 
 *rlcompleter2-0.95 (29 Mar 2003)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> rlcompleter2-0.95.ebuild:
+  touchups with src_install
+
   29 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> rlcompleter2-0.95.ebuild:
   Initial import. #17595
 
diff --git a/dev-python/rlcompleter2/Manifest b/dev-python/rlcompleter2/Manifest
index e69de29bb2d1..93d97a4c0490 100644
--- a/dev-python/rlcompleter2/Manifest
+++ b/dev-python/rlcompleter2/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 65274f45994af10db3f066eae630b3cf rlcompleter2-0.95.ebuild 616
+MD5 d297498e934f71de287d9d5839f5735a ChangeLog 799
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 da8438b5e84265d9e7f656594b56d182 rlcompleter2-0.96.ebuild 615
+MD5 ec23d6d199038354c3192ec18cef4359 files/digest-rlcompleter2-0.96 68
+MD5 396be63d62788796fe338ee140acdbdf files/digest-rlcompleter2-0.95 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCXsr2Kf2g/qXtneoRAgr+AJ97HOHh34TEHkDuON5l9unGpTqNeACff7VD
+Upe7ZJNdjLFU44bBHz1HlC8=
+=QznM
+-----END PGP SIGNATURE-----
diff --git a/dev-python/rlcompleter2/rlcompleter2-0.95.ebuild b/dev-python/rlcompleter2/rlcompleter2-0.95.ebuild
index 5444b133807b..f20afc4f5359 100644
--- a/dev-python/rlcompleter2/rlcompleter2-0.95.ebuild
+++ b/dev-python/rlcompleter2/rlcompleter2-0.95.ebuild
@@ -1,25 +1,21 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rlcompleter2/rlcompleter2-0.95.ebuild,v 1.1 2003/03/30 00:39:19 kutsuya Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rlcompleter2/rlcompleter2-0.95.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
 DESCRIPTION="Python command line completion."
 HOMEPAGE="http://codespeak.net/rlcompleter2/"
-SRC_URI="${HOMEPAGE}download/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
+SRC_URI="http://codespeak.net/rlcompleter2/download/${P}.tar.gz"
+
 LICENSE="PSF-2.2"
+SLOT="0"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
-src_install()
-{
-	mydoc="PKG-INFO ${mydoc}"
-	distutils_src_install
-}
+DOCS="PKG-INFO"
 
-pkg_postinst()
-{
+pkg_postinst() {
 	ewarn "Please read the README, and follow instructions in order to"
 	ewarn "execute and configure rlcompleter2."
 }
diff --git a/dev-python/rlcompleter2/rlcompleter2-0.96.ebuild b/dev-python/rlcompleter2/rlcompleter2-0.96.ebuild
index 78b03a00ebf1..d4ef8c21e063 100644
--- a/dev-python/rlcompleter2/rlcompleter2-0.96.ebuild
+++ b/dev-python/rlcompleter2/rlcompleter2-0.96.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/dev-python/rlcompleter2/rlcompleter2-0.96.ebuild,v 1.1 2005/04/14 19:56:16 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rlcompleter2/rlcompleter2-0.96.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/rpy/ChangeLog b/dev-python/rpy/ChangeLog
index 95f26c8de737..9277ef4d5899 100644
--- a/dev-python/rpy/ChangeLog
+++ b/dev-python/rpy/ChangeLog
@@ -1,10 +1,52 @@
 # ChangeLog for dev-python/rpy
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.1 2004/02/21 18:56:04 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+  08 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/rpy-0.3.5-cvs_backport.patch, -rpy-0.3.5-r1.ebuild:
+  clean old ebuild
+
+*rpy-0.4.6 (03 Nov 2005)
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> +rpy-0.4.6.ebuild:
+  version bump (#102729)
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> -rpy-0.3.5.ebuild:
+  Remove version 0.3.5, requested by Marcus Hanwell <cryos@gentoo.org> in bug
+  95881.
+
+*rpy-0.4.1 (26 Apr 2005)
+
+  26 Apr 2005; Alastair Tse <liquidx@gentoo.org> +files/90rpy,
+  +rpy-0.4.1.ebuild:
+  version bump. added env.d file to add libpath for R libraries (needed for
+  rpy to work properly)
+
+*rpy-0.3.5-r1 (26 Apr 2005)
+
+  26 Apr 2005; Alastair Tse <liquidx@gentoo.org>
+  +files/rpy-0.3.5-cvs_backport.patch, rpy-0.3.5.ebuild,
+  +rpy-0.3.5-r1.ebuild:
+  revision bump to compile with R-2.0.0 via some ugly hack
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Oct 2004; Alastair Tse <liquidx@gentoo.org> rpy-0.3.5.ebuild:
+  pegging dep on dev-lang/R-1.91 because 2.0.0 doesn't work with these bindings
+
+  18 Oct 2004; Alastair Tse <liquidx@gentoo.org> rpy-0.3.5.ebuild:
+  fix problem with undefined reference to MAIN__ if using libf2c
+
+  18 Oct 2004; Alastair Tse <liquidx@gentoo.org> rpy-0.3.5.ebuild:
+  added dev-lang/R dep and fix to find libR properly
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> rpy-0.3.5.ebuild:
+  Remove default S.
 
 *rpy-0.3.5 (21 Feb 2004)
 
-  21 Feb 2004; Bryan �stergaard,,, <kloeri@gentoo.org> metadata.xml,
+  21 Feb 2004; Bryan Østergaard,,, <kloeri@gentoo.org> metadata.xml,
   rpy-0.3.5.ebuild:
   Initial import.
 
diff --git a/dev-python/rpy/Manifest b/dev-python/rpy/Manifest
index 5287824a80e2..6aa6b5c01fa3 100644
--- a/dev-python/rpy/Manifest
+++ b/dev-python/rpy/Manifest
@@ -1,4 +1,7 @@
-MD5 b53c313e4c3102ddcbf44080e0094391 ChangeLog 344
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 5f2fdae4bd12b47fab4558d746ad57cc rpy-0.3.5.ebuild 514
-MD5 179eb32e38a74c76d927b363d99e7327 files/digest-rpy-0.3.5 60
+MD5 06aabfe7a9b5130115431ccdbd6bef60 rpy-0.4.6.ebuild 673
+MD5 1437ab731ca2a32c1c7163c654ad321d ChangeLog 1785
+MD5 8f05933a41fd0b74ff73496e73b4e349 rpy-0.4.1.ebuild 673
+MD5 cba240ff421fed6562ae8d4bfa8d1ea4 files/digest-rpy-0.4.1 61
+MD5 49ceece8f3e5c2c176ab0ef8fe3bf02a files/digest-rpy-0.4.6 60
+MD5 2790be0dc37abd8a240661c8e9b4d4fe files/90rpy 21
diff --git a/dev-python/rpy/rpy-0.4.1.ebuild b/dev-python/rpy/rpy-0.4.1.ebuild
index 6982b5a587e7..0a13042a8df9 100644
--- a/dev-python/rpy/rpy-0.4.1.ebuild
+++ b/dev-python/rpy/rpy-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/dev-python/rpy/rpy-0.4.1.ebuild,v 1.1 2005/04/26 15:03:01 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/rpy/rpy-0.4.6.ebuild b/dev-python/rpy/rpy-0.4.6.ebuild
index ad4fc7b8ced7..6bfa4fcd07f9 100644
--- a/dev-python/rpy/rpy-0.4.6.ebuild
+++ b/dev-python/rpy/rpy-0.4.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/dev-python/rpy/rpy-0.4.6.ebuild,v 1.1 2005/11/03 20:25:42 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rpy/rpy-0.4.6.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/rtgraph/ChangeLog b/dev-python/rtgraph/ChangeLog
index c7609c06f8a3..6329418b4790 100644
--- a/dev-python/rtgraph/ChangeLog
+++ b/dev-python/rtgraph/ChangeLog
@@ -1,10 +1,22 @@
 # ChangeLog for dev-python/rtgraph
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rtgraph/ChangeLog,v 1.1 2004/04/02 22:02:29 kloeri Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rtgraph/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  26 Oct 2004; Tom Martin <slarti@gentoo.org> rtgraph-0.70.ebuild:
+  Marked ~amd64.
+
+  10 May 2004; Bryan Østergaard <kloeri@gentoo.org> rtgraph-0.70.ebuild:
+  Remove default RDEPEND.
+
+  04 Apr 2004; David Holm <dholm@gentoo.org> rtgraph-0.70.ebuild:
+  Added to ~ppc.
 
 *rtgraph-0.70 (03 Apr 2004)
 
-  03 Apr 2004; Bryan �stergaard <kloeri@gentoo.org> metadata.xml,
+  03 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> metadata.xml,
   rtgraph-0.70.ebuild:
   Initial import, ebuild by Lukasz Strzygowski <lucass@gentoo.pl>.
 
diff --git a/dev-python/rtgraph/Manifest b/dev-python/rtgraph/Manifest
index 7c637c65f5de..5512493845f3 100644
--- a/dev-python/rtgraph/Manifest
+++ b/dev-python/rtgraph/Manifest
@@ -1,2 +1,4 @@
-MD5 fdadbee84752c4e5f15363be4c7fa765 rtgraph-0.70.ebuild 747
+MD5 4d67468560163130f6aadc7d0da5b5dc ChangeLog 772
+MD5 6fb8c92bd6d6a66415b96029004bca78 rtgraph-0.70.ebuild 841
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 MD5 72b9c47b878289b2a6c072cfe5046e66 files/digest-rtgraph-0.70 63
diff --git a/dev-python/rtgraph/rtgraph-0.70.ebuild b/dev-python/rtgraph/rtgraph-0.70.ebuild
index 84d4bde44d77..9f7bb18e276f 100644
--- a/dev-python/rtgraph/rtgraph-0.70.ebuild
+++ b/dev-python/rtgraph/rtgraph-0.70.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/dev-python/rtgraph/rtgraph-0.70.ebuild,v 1.1 2004/04/02 22:02:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rtgraph/rtgraph-0.70.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -10,10 +10,9 @@ SRC_URI="http://navi.picogui.org/releases/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 DEPEND="virtual/python
 	>=dev-python/pygtk-2"
-RDEPEND=${DEPEND}
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/scientificpython/ChangeLog b/dev-python/scientificpython/ChangeLog
index 31e91fac8fd9..4f0bc85655d6 100644
--- a/dev-python/scientificpython/ChangeLog
+++ b/dev-python/scientificpython/ChangeLog
@@ -1,15 +1,41 @@
-# ChangeLog for dev-python/ScientificPython
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.1 2004/07/20 19:20:07 kloeri Exp $
+# ChangeLog for dev-python/scientificpython
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/ChangeLog,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
+
+  30 Oct 2005; Jason Wever <weeve@gentoo.org> scientificpython-2.4.9.ebuild:
+  Stable on SPARC.
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
+  scientificpython-2.4.9.ebuild:
+  Stable on alpha, ia64 and x86, fixes bug 109122.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  scientificpython-2.4.9.ebuild:
+  add ~ia64
+
+*scientificpython-2.4.9 (09 May 2005)
+
+  09 May 2005; Alastair Tse <liquidx@gentoo.org>
+  scientificpython-2.4.6.ebuild, +scientificpython-2.4.9.ebuild:
+  version bump
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  15 Sep 2004; <blubb@gentoo.org> scientificpython-2.4.6.ebuild:
+  added ~amd64
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *scientificpython-2.4.3 (20 Jul 2004)
 
-  20 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +scientificpython-2.2-r1.ebuild, +scientificpython-2.4.3.ebuild,
   +scientificpython-2.4.5.ebuild, +scientificpython-2.4.6.ebuild:
   Rename dev-python/ScientificPython to dev-python/scientificpython.
 
-  31 May 2004; Bryan �stergaard <kloeri@gentoo.org>
+  31 May 2004; Bryan Østergaard <kloeri@gentoo.org>
   ScientificPython-2.4.5.ebuild:
   Stable on alpha.
 
@@ -24,7 +50,7 @@
 
 *ScientificPython-2.4.5 (17 Apr 2004)
 
-  17 Apr 2004; Bryan �stergaard <kloeri@gentoo.org>
+  17 Apr 2004; Bryan Østergaard <kloeri@gentoo.org>
   +ScientificPython-2.4.5.ebuild:
   Version bump.
 
diff --git a/dev-python/scientificpython/Manifest b/dev-python/scientificpython/Manifest
index e7a16f77b68f..978759665619 100644
--- a/dev-python/scientificpython/Manifest
+++ b/dev-python/scientificpython/Manifest
@@ -1,10 +1,12 @@
-MD5 af7b4228809d63372d4efa53379bce9f ScientificPython-2.4.5.ebuild 785
-MD5 319d6dd9011a31dde5fef3309715d8fa ScientificPython-2.2-r1.ebuild 769
-MD5 72442740dd3ab319b714aed51f5c7806 ScientificPython-2.4.6.ebuild 786
-MD5 b9a480060bf588736ca2247126042b67 ChangeLog 2309
+MD5 94ff9479f3c318ce7a434531b1c7c1f2 ChangeLog 3382
+MD5 dfa7ad22fed0bcb416294783fb84bb6c files/digest-scientificpython-2.2-r1 72
+MD5 79c71d20dabb984dca635936b7736c0a files/digest-scientificpython-2.4.3 74
+MD5 18849ce82bbffddae7acaefd7c21f3fa files/digest-scientificpython-2.4.5 74
+MD5 859be03e658844a15192a1557882bc71 files/digest-scientificpython-2.4.6 74
+MD5 b8a5e0f845aaf56bf7db33d16384887a files/digest-scientificpython-2.4.9 74
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 34af8a86784466e29afeb40dd204e0a3 ScientificPython-2.4.3.ebuild 781
-MD5 dfa7ad22fed0bcb416294783fb84bb6c files/digest-ScientificPython-2.2-r1 72
-MD5 79c71d20dabb984dca635936b7736c0a files/digest-ScientificPython-2.4.3 74
-MD5 18849ce82bbffddae7acaefd7c21f3fa files/digest-ScientificPython-2.4.5 74
-MD5 859be03e658844a15192a1557882bc71 files/digest-ScientificPython-2.4.6 74
+MD5 ff59939d28b0261f00a55c95d53e6ae5 scientificpython-2.2-r1.ebuild 838
+MD5 1d27fa6f9c07018c95a9fef68c85824e scientificpython-2.4.3.ebuild 851
+MD5 950931f991d0e7fe6a8b61c73ddfbbaa scientificpython-2.4.5.ebuild 855
+MD5 a181ec6b4aeafb1874071f8fd4143df9 scientificpython-2.4.6.ebuild 862
+MD5 9e972d386cb029fdc1c0407d1a51890b scientificpython-2.4.9.ebuild 862
diff --git a/dev-python/scientificpython/scientificpython-2.2-r1.ebuild b/dev-python/scientificpython/scientificpython-2.2-r1.ebuild
index d58c8cfb6d40..323e4ce68f17 100644
--- a/dev-python/scientificpython/scientificpython-2.2-r1.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.2-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/dev-python/scientificpython/scientificpython-2.2-r1.ebuild,v 1.1 2004/07/20 19:20:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 MY_P=${P/scientificpython/ScientificPython}
 S=${WORKDIR}/${MY_P}
@@ -17,7 +17,7 @@ KEYWORDS="x86 ~sparc alpha"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
-	>=app-sci/netcdf-3.0"
+	>=sci-libs/netcdf-3.0"
 
 
 src_install() {
diff --git a/dev-python/scientificpython/scientificpython-2.4.3.ebuild b/dev-python/scientificpython/scientificpython-2.4.3.ebuild
index b4d31398e131..94c63f220d76 100644
--- a/dev-python/scientificpython/scientificpython-2.4.3.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.4.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/dev-python/scientificpython/scientificpython-2.4.3.ebuild,v 1.1 2004/07/20 19:20:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.4.3.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 MY_P=${P/scientificpython/ScientificPython}
 S=${WORKDIR}/${MY_P}
@@ -17,7 +17,7 @@ KEYWORDS="x86 ~sparc ~alpha"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
-	>=app-sci/netcdf-3.0"
+	>=sci-libs/netcdf-3.0"
 
 
 src_install() {
diff --git a/dev-python/scientificpython/scientificpython-2.4.5.ebuild b/dev-python/scientificpython/scientificpython-2.4.5.ebuild
index ed2fbd45e185..3c5149abd8ba 100644
--- a/dev-python/scientificpython/scientificpython-2.4.5.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.4.5.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/dev-python/scientificpython/scientificpython-2.4.5.ebuild,v 1.1 2004/07/20 19:20:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.4.5.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 MY_P=${P/scientificpython/ScientificPython}
 S=${WORKDIR}/${MY_P}
@@ -17,7 +17,7 @@ KEYWORDS="~x86 ~sparc alpha ~ppc"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
-	>=app-sci/netcdf-3.0"
+	>=sci-libs/netcdf-3.0"
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/scientificpython/scientificpython-2.4.6.ebuild b/dev-python/scientificpython/scientificpython-2.4.6.ebuild
index 83e47bb82f70..fc152fc0a0fc 100644
--- a/dev-python/scientificpython/scientificpython-2.4.6.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.4.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/dev-python/scientificpython/scientificpython-2.4.6.ebuild,v 1.1 2004/07/20 19:20:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.4.6.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 MY_P=${P/scientificpython/ScientificPython}
 S=${WORKDIR}/${MY_P}
@@ -13,11 +13,11 @@ SRC_URI="http://starship.python.net/~hinsen/ScientificPython/${MY_P}.tar.gz"
 HOMEPAGE="http://starship.python.net/crew/hinsen/scientific.html"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
-	>=app-sci/netcdf-3.0"
+	>=sci-libs/netcdf-3.0"
 
 src_install() {
 	distutils_src_install
diff --git a/dev-python/scientificpython/scientificpython-2.4.9.ebuild b/dev-python/scientificpython/scientificpython-2.4.9.ebuild
index 320c76a3738f..b02495dbae94 100644
--- a/dev-python/scientificpython/scientificpython-2.4.9.ebuild
+++ b/dev-python/scientificpython/scientificpython-2.4.9.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/dev-python/scientificpython/scientificpython-2.4.9.ebuild,v 1.1 2005/05/09 15:27:19 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/scientificpython/scientificpython-2.4.9.ebuild,v 1.1.1.1 2005/11/30 10:10:31 chriswhite Exp $
 
 MY_P=${P/scientificpython/ScientificPython}
 S=${WORKDIR}/${MY_P}
@@ -13,7 +13,7 @@ SRC_URI="http://starship.python.net/~hinsen/ScientificPython/${MY_P}.tar.gz"
 HOMEPAGE="http://starship.python.net/crew/hinsen/scientific.html"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="alpha ~amd64 ia64 ~ppc sparc x86"
 
 DEPEND="virtual/python
 	>=dev-python/numeric-19.0
diff --git a/dev-python/setuptools/ChangeLog b/dev-python/setuptools/ChangeLog
index 3e374e281577..1ea90b3ec6a8 100644
--- a/dev-python/setuptools/ChangeLog
+++ b/dev-python/setuptools/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/setuptools
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.1 2005/10/15 05:41:59 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 *setuptools-0.6_alpha5 (15 Oct 2005)
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 167cbeb494c0..437c472d5b14 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,4 +1,4 @@
-MD5 7aec433394e96e5e02d0481b2d348b8a setuptools-0.6_alpha5.ebuild 875
+MD5 11345df562d028a9089cb4c73602bfd9 setuptools-0.6_alpha5.ebuild 991
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 817d2e51dbad203111a160ed5afb03ed ChangeLog 405
+MD5 8c62de7e19c249039c102bd3bca2f4ce ChangeLog 502
 MD5 00a23217d512848371e81f66adfda033 files/digest-setuptools-0.6_alpha5 65
diff --git a/dev-python/setuptools/setuptools-0.6_alpha5.ebuild b/dev-python/setuptools/setuptools-0.6_alpha5.ebuild
index 69ed15799df7..0858f7603f75 100644
--- a/dev-python/setuptools/setuptools-0.6_alpha5.ebuild
+++ b/dev-python/setuptools/setuptools-0.6_alpha5.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/dev-python/setuptools/setuptools-0.6_alpha5.ebuild,v 1.1 2005/10/15 05:41:59 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-0.6_alpha5.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/simpleparse/ChangeLog b/dev-python/simpleparse/ChangeLog
index 979437c58ecf..2d8785794530 100644
--- a/dev-python/simpleparse/ChangeLog
+++ b/dev-python/simpleparse/ChangeLog
@@ -1,17 +1,49 @@
-# ChangeLog for dev-python/SimpleParse
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/ChangeLog,v 1.1 2004/06/21 23:58:02 kloeri Exp $
+# ChangeLog for dev-python/simpleparse
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> simpleparse-2.0.0.ebuild:
+  Mark 2.0.0 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> simpleparse-2.0.0.ebuild:
+  add ~ia64
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> simpleparse-2.0.0.ebuild:
+  stable on amd64
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  simpleparse-2.0.0.ebuild:
+  Stable on alpha.
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> simpleparse-2.0.0.ebuild:
+  Stable on sparc.
+
+  04 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> simpleparse-1.0.ebuild,
+  simpleparse-2.0.0.ebuild:
+  depend on app-arch/unzip bug# 69831, marked stable x86
+
+  23 Sep 2004; <blubb@gentoo.org> simpleparse-2.0.0.ebuild:
+  added ~amd64
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> simpleparse-2.0.0.ebuild:
+  Added to ~ppc.
 
 *simpleparse-2.0.0 (22 Jun 2004)
 
-  22 Jun 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  22 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +simpleparse-1.0.ebuild, +simpleparse-2.0.0.ebuild:
   Moved from dev-python/SimpleParse.
 
-  04 May 2004; Bryan �stergaard <kloeri@gentoo.org> SimpleParse-1.0.ebuild:
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> SimpleParse-1.0.ebuild:
   Remove default S.
 
-  28 Mar 2004; Bryan �stergaard <kloeri@gentoo.org> SimpleParse-1.0.ebuild:
+  28 Mar 2004; Bryan Østergaard <kloeri@gentoo.org> SimpleParse-1.0.ebuild:
   Update SRC_URI and HOMEPAGE.
 
 *SimpleParse-2.0.0 (10 Mar 2004)
diff --git a/dev-python/simpleparse/Manifest b/dev-python/simpleparse/Manifest
index 3be1b7165c91..7e05526aee9d 100644
--- a/dev-python/simpleparse/Manifest
+++ b/dev-python/simpleparse/Manifest
@@ -1,8 +1,6 @@
-MD5 962e2534e906d8ca32261d3e9d04cb72 simpleparse-1.0.ebuild 644
-MD5 cce4b8e09ad5a84c203e755b1e41811c simpleparse-2.0.0.ebuild 648
-MD5 e2415ad405d6c9698fbf2953bfff4025 ChangeLog 946
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 efc9ea4ea5675544632203216b25d361 files/digest-SimpleParse-2.0.0 66
+MD5 64ac26672756cd91515118c4a42169bc ChangeLog 2130
+MD5 4712e5992708c82526ae99b510bbe0f2 simpleparse-2.0.0.ebuild 672
+MD5 08ff3befbe37b835fe56821c49d4e13c simpleparse-1.0.ebuild 655
 MD5 efc9ea4ea5675544632203216b25d361 files/digest-simpleparse-2.0.0 66
-MD5 47d741d0204aab4b0b6cd42602522430 files/digest-SimpleParse-1.0 63
 MD5 47d741d0204aab4b0b6cd42602522430 files/digest-simpleparse-1.0 63
diff --git a/dev-python/simpleparse/simpleparse-1.0.ebuild b/dev-python/simpleparse/simpleparse-1.0.ebuild
index 4f60c3563694..82684d352899 100644
--- a/dev-python/simpleparse/simpleparse-1.0.ebuild
+++ b/dev-python/simpleparse/simpleparse-1.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/dev-python/simpleparse/simpleparse-1.0.ebuild,v 1.1 2004/06/21 23:58:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/simpleparse-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 IUSE=""
 
@@ -13,7 +13,8 @@ DESCRIPTION="A Parser Generator for mxTextTools."
 SRC_URI="mirror://sourceforge/simpleparse/${MY_P}.zip"
 HOMEPAGE="http://simpleparse.sourceforge.net"
 DEPEND="virtual/python
-	dev-python/egenix-mx-base"
+	dev-python/egenix-mx-base
+	app-arch/unzip"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 sparc alpha"
diff --git a/dev-python/simpleparse/simpleparse-2.0.0.ebuild b/dev-python/simpleparse/simpleparse-2.0.0.ebuild
index 8734245a265e..d9cf73a3c52e 100644
--- a/dev-python/simpleparse/simpleparse-2.0.0.ebuild
+++ b/dev-python/simpleparse/simpleparse-2.0.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/dev-python/simpleparse/simpleparse-2.0.0.ebuild,v 1.1 2004/06/21 23:58:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpleparse/simpleparse-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:04 chriswhite Exp $
 
 IUSE=""
 
@@ -13,10 +13,11 @@ DESCRIPTION="A Parser Generator for mxTextTools."
 SRC_URI="mirror://sourceforge/simpleparse/${MY_P}.zip"
 HOMEPAGE="http://simpleparse.sourceforge.net"
 DEPEND="virtual/python
-	dev-python/egenix-mx-base"
+	dev-python/egenix-mx-base
+	app-arch/unzip"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 
 src_install() {
 	distutils_src_install --install-data=/usr/share/doc/${PF}
diff --git a/dev-python/simpletal/ChangeLog b/dev-python/simpletal/ChangeLog
index ffd6e5324d65..3b4be91ff838 100644
--- a/dev-python/simpletal/ChangeLog
+++ b/dev-python/simpletal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/simpletal
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/ChangeLog,v 1.1 2005/01/02 17:56:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+*simpletal-3.13 (16 Oct 2005)
+
+  16 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> +simpletal-3.13.ebuild:
+  Version bump.
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> simpletal-3.11.ebuild:
+  add ~ia64
 
 *simpletal-3.11 (02 Jan 2005)
 
diff --git a/dev-python/simpletal/Manifest b/dev-python/simpletal/Manifest
index af0e4ac64ea9..12551a085355 100644
--- a/dev-python/simpletal/Manifest
+++ b/dev-python/simpletal/Manifest
@@ -1,6 +1,18 @@
-MD5 59d43ab23ceeb74fa80ffabbc6a57662 ChangeLog 541
-MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 a62a768f0c320b4259f737ff7c5941c3 simpletal-3.11.ebuild 1190
-MD5 b866e43f97a7143e60ad6633f4763471 simpletal-3.9.ebuild 1159
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cd57cb2316516352704c6b6ae3035cc5 ChangeLog 949
 MD5 8ab1c501fda1db4fbdaa3a452d1ad025 files/digest-simpletal-3.11 65
+MD5 c9162c32bb56331e09f1a327128d088c files/digest-simpletal-3.13 65
 MD5 6087cc9e8740414f14c5d41646acc8ae files/digest-simpletal-3.9 64
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 deaa3ac7205238ca4e22111006a8a143 simpletal-3.11.ebuild 1302
+MD5 4678515f2e9786192424fcf919eb96be simpletal-3.13.ebuild 1300
+MD5 905592d18249144fb292194dc265111e simpletal-3.9.ebuild 1262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUs/mKf2g/qXtneoRAq1qAKC44EQJpkvncrAXvgE16BSZveHcdQCdF7RA
+67hsVKRusTcdb06RwfQu4G4=
+=G0YD
+-----END PGP SIGNATURE-----
diff --git a/dev-python/simpletal/simpletal-3.11.ebuild b/dev-python/simpletal/simpletal-3.11.ebuild
index 5c917a501741..8a7472200070 100644
--- a/dev-python/simpletal/simpletal-3.11.ebuild
+++ b/dev-python/simpletal/simpletal-3.11.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/dev-python/simpletal/simpletal-3.11.ebuild,v 1.1 2005/01/02 17:56:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/simpletal-3.11.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 IUSE=""
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.owlfish.com/software/simpleTAL/"
 DEPEND="virtual/python"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~alpha ~ia64 ~ppc ~sparc ~x86"
 
 S=${WORKDIR}/${MY_P}-${PV}
 
diff --git a/dev-python/simpletal/simpletal-3.13.ebuild b/dev-python/simpletal/simpletal-3.13.ebuild
index e3d87b001edd..f157f5822ef9 100644
--- a/dev-python/simpletal/simpletal-3.13.ebuild
+++ b/dev-python/simpletal/simpletal-3.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/dev-python/simpletal/simpletal-3.13.ebuild,v 1.1 2005/10/16 22:10:35 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/simpletal-3.13.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 IUSE=""
 
diff --git a/dev-python/simpletal/simpletal-3.9.ebuild b/dev-python/simpletal/simpletal-3.9.ebuild
index 895045de08a1..d3a0d2f5c757 100644
--- a/dev-python/simpletal/simpletal-3.9.ebuild
+++ b/dev-python/simpletal/simpletal-3.9.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/dev-python/simpletal/simpletal-3.9.ebuild,v 1.1 2005/01/02 17:56:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpletal/simpletal-3.9.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 IUSE=""
 
diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index f474ee8ae862..260f9796a075 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,11 +1,259 @@
 # ChangeLog for dev-python/sip
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.1 2002/02/01 21:53:28 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
+
+*sip-4.3.1 (23 Sep 2005)
+
+  23 Sep 2005; Chris Bainbridge <chrb@gentoo.org> +sip-4.3.1.ebuild:
+  Version bump, fixed LICENSE, bug #93575.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> sip-4.2.1.ebuild:
+  add ~ia64
+
+  26 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> sip-4.1.1.ebuild:
+  Stable on alpha.
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> sip-4.1.1.ebuild:
+  Stable on ppc.
+
+*sip-4.2.1 (07 Mar 2005)
+
+  07 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +sip-4.2.1.ebuild:
+  version bump
+
+*sip-4.2 (20 Feb 2005)
+
+  20 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +sip-4.2.ebuild:
+  version bump
+
+  07 Feb 2005; Jeremy Huddleston <eradicator@gentoo.org> sip-4.1.1.ebuild:
+  Multilib fix for python.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Dec 2004; Carsten Lohrke <carlo@gentoo.org> sip-4.1.1.ebuild:
+  debug support, minor fixes
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> sip-4.1.1.ebuild:
+  Stable on amd64.
+
+  09 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org> sip-4.1.1.ebuild:
+  Stable on sparc
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> sip-4.1.1.ebuild:
+  stable on x86
+
+  08 Nov 2004; Daniel Ostrow <dostrow@gentoo.org> sip-4.1.1.ebuild:
+  Marked ~ppc64
+
+  25 Sep 2004; Jason Wever <weeve@gentoo.org> sip-4.0.1.ebuild:
+  Stable on sparc.
+
+*sip-3.11.1 (25 Sep 2004)
+
+  25 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.1.1.ebuild:
+  version bump
+
+*sip-3.11.1 (25 Sep 2004)
+
+  25 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-3.11.1.ebuild,
+  -sip-3.11.ebuild, -sip-4.1.ebuild:
+  version bump
+
+*sip-3.11 (20 Sep 2004)
+
+  20 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-3.11.ebuild,
+  +sip-4.1.ebuild, -sip-4.1_rc1.ebuild:
+  version bump
+
+  17 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org> sip-4.1_rc1.ebuild:
+  Fix src_uri.
+
+*sip-4.1_rc1 (16 Sep 2004)
+
+  16 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.1_rc1.ebuild:
+  version bump
+
+*sip-3.8-r1 (31 Aug 2004)
+
+  31 Aug 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
+  +files/license-3.8.diff, +sip-3.8-r1.ebuild:
+  Add back sip-3.8* as it's needed by PyQt-3.8.1.
+
+  30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> -files/license-3.8.diff,
+  -sip-3.8-r1.ebuild, sip-4.0.1.ebuild, -sip-4.0.ebuild, -sip-4.0_rc2.ebuild,
+  -sip-4.0_rc4.ebuild:
+  4.0.1 stable on x86, ebuild clean up
+
+  21 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> sip-4.0.1.ebuild:
+  Marked stable on amd64.
+
+*sip-3.10.2 (18 Jul 2004)
+
+  18 Jul 2004; Jason Wever <weeve@gentoo.org> sip-3.10.2.ebuild:
+  Stable on sparc wrt bug #56712.
+
+  18 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> sip-3.10.2.ebuild:
+  Stable on alpha.
+
+  11 Jul 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.2.ebuild:
+  stable on x86
+
+*sip-4.0.1 (06 Jul 2004)
+
+  06 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.0.1.ebuild:
+  version bump
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> sip-3.10.2.ebuild,
+  sip-3.8-r1.ebuild, sip-4.0.ebuild, sip-4.0_rc2.ebuild, sip-4.0_rc4.ebuild:
+  change virtual/glibc to virtual/libc
+
+*sip-4.0_rc2 (24 Jun 2004)
+
+  24 Jun 2004; Carsten Lohrke <carlo@gentoo.org> +sip-4.0_rc2.ebuild:
+  readd rc2 for amd64
+
+*sip-4.0 (23 Jun 2004)
+
+  23 Jun 2004; Carsten Lohrke <carlo@gentoo.org> -files/license-3.5.diff,
+  sip-3.10.2.ebuild, -sip-3.5.ebuild, sip-3.8-r1.ebuild, +sip-4.0.ebuild,
+  -sip-4.0_rc2.ebuild, sip-4.0_rc4.ebuild:
+  version bump, QA
+
+  25 May 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.1.ebuild,
+  sip-3.10.ebuild, sip-3.5.ebuild, sip-3.8-r1.ebuild, sip-3.8.ebuild,
+  sip-4.0_rc1.ebuild, sip-4.0_rc2.ebuild, sip-4.0_rc3.ebuild:
+  mirror://gentoo fixes, cleanup,
+  marked sip-3.8-r1 stable on alpha
+
+*sip-4.0_rc4 (22 May 2004)
+
+  22 May 2004; Carsten Lohrke <carlo@gentoo.org> sip-3.10.2.ebuild,
+  sip-4.0_rc4.ebuild:
+  version bump and ebuild clean up
+
+  29 Mar 2004; Martin Holzer <mholzer@gentoo.org> files/license-3.5.diff:
+  adding license. closes 46144
+
+  29 Mar 2004; Luca Barbato <lu_zero@gentoo.org> sip-3.8-r1.ebuild:
+  Marked ppc, the 3.5 is broken.
+
+*sip-4.0_rc3 (17 Mar 2004)
+
+  17 Mar 2004; Caleb Tennis <caleb@gentoo.org> sip-4.0_rc3.ebuild:
+  New rc version
+
+*sip-3.10.1 (17 Mar 2004)
+
+  17 Mar 2004; Caleb Tennis <caleb@gentoo.org> sip-3.10.1.ebuild,
+  sip-3.10.ebuild:
+  Latest version w/ bugfixes
+
+  27 Feb 2004; Sven Blumenstein <bazik@gentoo.org> sip-3.8-r1.ebuild:
+  Stable on sparc.
+
+  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> sip-3.8.ebuild:
+  Stable on sparc.
+
+  26 Feb 2004; <kloeri@gentoo.org> sip-3.8-r1.ebuild:
+  Oops, install both binaries and headerfiles.
+
+*sip-3.8-r1 (26 Feb 2004)
+
+  26 Feb 2004; <kloeri@gentoo.org> sip-3.8-r1.ebuild:
+  sip-3.8 didn't install all files, see bug #42047.
+
+  30 Jan 2004; Brian Harring <ferringb@gentoo.org> sip-3.5.ebuild,
+  sip-3.8.ebuild, sip-4.0_rc1.ebuild, sip-4.0_rc2.ebuild:
+  Updated sip-3.8 w/ a mirror://gentoo url, due to it being removed upstream.
+  Copyright date fixes, removed sip-3.9 due to lack of upstream src.
+
+*sip-3.10 (17 Jan 2004)
+
+  17 Jan 2004; Rob Cakebread <pythonhead@gentoo.org> sip-3.10.ebuild:
+  Version bump. Bug# 38533. Thanks Carlo <current@myrealbox.com>
+
+*sip-4.0_rc2 (17 Jan 2004)
+
+  17 Jan 2004; Rob Cakebread <pythonhead@gentoo.org> sip-4.0_rc2.ebuild:
+  Version bump
+
+*sip-3.5 (25 Dec 2003)
+
+  25 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> sip-3.5.ebuild:
+  Re-add sip-3.5.ebuild to satisfy PyQt dependency
+
+  17 Dec 2003; Caleb Tennis <caleb@gentoo.org> sip-3.5.ebuild, sip-3.6.ebuild,
+  sip-3.7.ebuild, sip-3.9.ebuild, sip-4.0_rc1.ebuild, files/license-3.5.diff,
+  files/license-3.6.diff, files/license-3.7.diff:
+  Some fixes for 3.9 and 4.0_rc1 as noted in bug #35368
+  Removed older sips (not available anymore via download anyway)
+
+*sip-4.0_rc1 (08 Dec 2003)
+
+  08 Dec 2003; Caleb Tennis <caleb@gentoo.org> sip-3.9.ebuild, sip-4.0_rc1.ebuild:
+  New versions - thanks Carlo (bug #35368)
+
+  10 Nov 2003; Caleb Tennis <caleb@gentoo.org> sip-3.8.ebuild:
+  x86 stable
+
+*sip-3.8 (27 Aug 2003)
+
+  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> sip-3.8.ebuild:
+  Version bump
+
+*sip-3.7 (30 Jul 2003)
+
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org> sip-3.7.ebuild:
+  Version bump
+
+*sip-3.6 (29 Apr 2003)
+
+  29 Apr 2003; Michele Balistreri <brain@gentoo.org> sip-3.6.ebuild :
+  Version bump
+
+*sip-3.5 (14 Dec 2002)
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> sip-3.5.ebuild,
+  files/license-3.5.diff:
+  patch cleanups
+
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> sip-3.5.ebuild :
+  changelog cleanup, ebuild cleanup.
+
+  14 Dec 2002; Bart Verwilst <verwilst@gentoo.org> :
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> :
+  changed sparc ~sparc keywords
+
+*sip-3.4 (18 Sep 2002)
+
+  18 Sep 2002; Sascha Schwabbauer <cybersystem@gentoo.org> :
+  Added ppc to keywords.
+
+  25 Jul 2003; Bart Verwilst <verwilst@gentoo.org> :
+
+*sip-3.3.2 (25 Jul 2002)
+
+  25 Jul 2002; Bart Verwilst <verwilst@gentoo.org> :
+
+*sip-3.2.4 (5 July 2002)
+
+  5 Jul 2002; Bart Verwilst <verwilst@gentoo.org> :
+
+*sip-3.2.1 (5 May 2002)
+
+  5 May 2002; B.Verwilst <verwilst@gentoo.org> ChangeLog :
+  New version, needed by PyQt 3.2
 
 *sip-3.0 (1 Feb 2002)
 
   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/dev-python/sip/Manifest b/dev-python/sip/Manifest
index 9c4b87233e5b..305b740ddf2c 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,7 +1,19 @@
-MD5 4684defc77151f0e2483eedb9f1d4076 ChangeLog 1597
-MD5 0566b1536262d34d232c555ce994dcbc sip-3.5.ebuild 1146
-MD5 3c4a5f3f9efa66889bcf60d480634959 sip-3.6.ebuild 1152
-MD5 3d3910def0f161c87391dd758512fc18 files/license-3.6.diff 1037
-MD5 02beeecfef8cd92555d0a20b8d331fa6 files/digest-sip-3.5 67
-MD5 ea94cf729c92330a5d8a6d508361fd1c files/license-3.5.diff 1052
-MD5 6e388fdcff422e9e350096079b248249 files/digest-sip-3.6 67
+MD5 59e047a2d18df493f99e0780feeb9623 ChangeLog 7871
+MD5 811c07ba7510a315382249fc3adb44fc metadata.xml 175
+MD5 6073de272dd6cbfe30d272888ed458f1 sip-3.10.2.ebuild 985
+MD5 003bd57a5468d299d42bf9b3faa31ad8 sip-3.11.1.ebuild 989
+MD5 f1f7b930d08a04928ff97a1e31504bf3 sip-3.8-r1.ebuild 1108
+MD5 091ddb57f823459fd1d698ce48cb2802 sip-4.0.1.ebuild 1058
+MD5 0468a95344df9a393c5f550a6de02ba3 sip-4.1.1.ebuild 1199
+MD5 482dbf379fc0b81f589fb2983fa72be0 sip-4.2.1.ebuild 1403
+MD5 051009e174698dfec8b9339803d05092 sip-4.2.ebuild 1392
+MD5 12bbcf91e753c326fa7725be85b3bdb2 sip-4.3.1.ebuild 1397
+MD5 821af86e779d5bc5b3457336a0426fa1 files/digest-sip-3.8-r1 67
+MD5 70ee7d5fd80e0bec5823095ca853d455 files/license-3.8.diff 1003
+MD5 18e143f22df1dd8636fc12aa07ac9f36 files/digest-sip-3.11.1 62
+MD5 6a011f04f4a2219a674a61dd82763301 files/digest-sip-4.0.1 61
+MD5 08ece4353d9fbbcda23f73d770999e49 files/digest-sip-4.1.1 61
+MD5 1bd43eafb0d81d9f5b74ddc0a420cd93 files/digest-sip-4.2.1 61
+MD5 86e845ce5203479dce2e4ea0bb6e8ad9 files/digest-sip-4.3.1 61
+MD5 e052f291e46bb8d1de4cfb1b45aeac88 files/digest-sip-3.10.2 62
+MD5 d83d1aa3500b9b65c79dbba9840a5d68 files/digest-sip-4.2 59
diff --git a/dev-python/sip/metadata.xml b/dev-python/sip/metadata.xml
index de483c53568f..a789e7bbe9ee 100644
--- a/dev-python/sip/metadata.xml
+++ b/dev-python/sip/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<herd>qt</herd>
 </pkgmetadata>
diff --git a/dev-python/sip/sip-3.10.2.ebuild b/dev-python/sip/sip-3.10.2.ebuild
index 0c3c9989ec2d..0c39b828d001 100644
--- a/dev-python/sip/sip-3.10.2.ebuild
+++ b/dev-python/sip/sip-3.10.2.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/dev-python/sip/sip-3.10.2.ebuild,v 1.1 2004/05/22 19:54:14 carlo Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.10.2.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -12,9 +10,10 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	x11-libs/qt
 	virtual/python"
 
@@ -32,3 +31,7 @@ src_install() {
 	einstall DESTDIR=${D} || die
 	dodoc ChangeLog LICENSE NEWS README THANKS TODO
 }
+
+pkg_postinst() {
+	einfo "Please note, that you have to emerge PyQt again, when upgrading from an earlier sip-3.x version."
+}
diff --git a/dev-python/sip/sip-3.11.1.ebuild b/dev-python/sip/sip-3.11.1.ebuild
index d12db285ff70..867cda9921da 100644
--- a/dev-python/sip/sip-3.11.1.ebuild
+++ b/dev-python/sip/sip-3.11.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/dev-python/sip/sip-3.11.1.ebuild,v 1.1 2004/09/24 22:50:51 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.11.1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/sip/sip-3.8-r1.ebuild b/dev-python/sip/sip-3.8-r1.ebuild
index ab49623dec25..161bb45b09c1 100644
--- a/dev-python/sip/sip-3.8-r1.ebuild
+++ b/dev-python/sip/sip-3.8-r1.ebuild
@@ -1,22 +1,20 @@
-# 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/dev-python/sip/sip-3.8-r1.ebuild,v 1.1 2004/02/25 23:28:38 kloeri Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-3.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit eutils distutils
 
 MY_P="${PN}-x11-gpl-${PV}"
 DESCRIPTION="SIP is a tool for generating bindings for C++ classes so that they can be used by Python."
-#SRC_URI="http://www.river-bank.demon.co.uk/download/sip/${MY_P}.tar.gz"
 SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 HOMEPAGE="http://www.riverbankcomputing.co.uk/sip/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha"
+KEYWORDS="x86 ppc sparc alpha"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	x11-libs/qt
 	>=dev-lang/python-2.2.1"
 
@@ -38,11 +36,13 @@ src_compile(){
 		-b ${D}/usr/bin \
 		-d ${D}/usr/lib/python${PYVER}/site-packages \
 		-e ${D}/usr/include/python${PYVER}
+
+	emake || die
 }
 
 src_install() {
 	distutils_python_version
-	dodir /usr/include/python${PYVER}a
+	dodir /usr/include/python${PYVER}
 	emake || die
 	einstall || die
 	dodoc NEWS README THANKS
diff --git a/dev-python/sip/sip-4.0.1.ebuild b/dev-python/sip/sip-4.0.1.ebuild
index e9ef16301f29..a075f5356450 100644
--- a/dev-python/sip/sip-4.0.1.ebuild
+++ b/dev-python/sip/sip-4.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/dev-python/sip/sip-4.0.1.ebuild,v 1.1 2004/07/06 14:51:25 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="x86 ~ppc sparc ~alpha amd64"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/dev-python/sip/sip-4.1.1.ebuild b/dev-python/sip/sip-4.1.1.ebuild
index c1d6e056002d..a0f14cf4166e 100644
--- a/dev-python/sip/sip-4.1.1.ebuild
+++ b/dev-python/sip/sip-4.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/dev-python/sip/sip-4.1.1.ebuild,v 1.1 2004/09/24 22:50:51 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-IUSE="doc"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
+IUSE="debug doc"
 
 DEPEND="virtual/libc
 	x11-libs/qt
@@ -22,20 +22,22 @@ DEPEND="virtual/libc
 
 src_compile(){
 	distutils_python_version
-	python configure.py -l qt-mt \
-		-b /usr/bin \
-		-d /usr/lib/python${PYVER}/site-packages \
-		-e /usr/include/python${PYVER} \
-		"CXXFLAGS+=${CXXFLAGS}"
-	emake || die
+
+	local myconf="-l qt-mt -b /usr/bin -d /usr/$(get_libdir)/python${PYVER}/site-packages -e /usr/include/python${PYVER}"
+	use debug && myconf="${myconf} -u"
+
+	python configure.py ${myconf} "CFLAGS+=${CFLAGS}" "CXXFLAGS+=${CXXFLAGS}"
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "install failed"
 	dodoc ChangeLog LICENSE NEWS README THANKS TODO
 	if use doc ; then dohtml doc/* ; fi
 }
 
 pkg_postinst() {
+	echo ""
 	einfo "Please note, that you have to emerge PyQt again, when upgrading from sip-3.x."
+	echo ""
 }
diff --git a/dev-python/sip/sip-4.2.1.ebuild b/dev-python/sip/sip-4.2.1.ebuild
index 027175a9f820..617c62609b7d 100644
--- a/dev-python/sip/sip-4.2.1.ebuild
+++ b/dev-python/sip/sip-4.2.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/dev-python/sip/sip-4.2.1.ebuild,v 1.1 2005/03/06 23:31:03 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug doc"
 
 DEPEND="virtual/libc
diff --git a/dev-python/sip/sip-4.2.ebuild b/dev-python/sip/sip-4.2.ebuild
index 3cfb23e1d947..7aa326e0f2a5 100644
--- a/dev-python/sip/sip-4.2.ebuild
+++ b/dev-python/sip/sip-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/dev-python/sip/sip-4.2.ebuild,v 1.1 2005/02/20 16:01:58 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.2.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/sip/sip-4.3.1.ebuild b/dev-python/sip/sip-4.3.1.ebuild
index 2b00bd1c9fb9..2d84ad55ccfc 100644
--- a/dev-python/sip/sip-4.3.1.ebuild
+++ b/dev-python/sip/sip-4.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/dev-python/sip/sip-4.3.1.ebuild,v 1.1 2005/09/22 23:25:37 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:09 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/snmpy/ChangeLog b/dev-python/snmpy/ChangeLog
index 48b7d1e660fe..ab207a7cf726 100644
--- a/dev-python/snmpy/ChangeLog
+++ b/dev-python/snmpy/ChangeLog
@@ -1,9 +1,17 @@
-# ChangeLog for dev-python/python-fchksum
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snmpy/ChangeLog,v 1.1 2002/04/28 16:18:41 jnelson Exp $
+# ChangeLog for dev-python/snmpy
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snmpy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> snmpy-1.0_alpha4.ebuild:
+  changed dep to virtual/snmp to allow using net-snmp or ucd-snmp (#27316)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *snmpy-1.0_alpha4 (28 Apr 2002)
 
+  04 Apr 2003; Alastair Tse <liquidx@gentoo.org> snmpy-1.0_alpha4.ebuild:
+  Added IUSE
+
   28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ChangeLog 
    snmpy-1.0_alpha4.ebuild:
   
diff --git a/dev-python/snmpy/Manifest b/dev-python/snmpy/Manifest
index e69de29bb2d1..fdba9d760a21 100644
--- a/dev-python/snmpy/Manifest
+++ b/dev-python/snmpy/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fff4daf4ae94348d5996a924f33a52c5 ChangeLog 680
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 f2d9aea727d2f1a2cd3d23e8cb731f5f snmpy-1.0_alpha4.ebuild 583
+MD5 3eded070e87c9a70c72342494b6be1b3 files/digest-snmpy-1.0_alpha4 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCGUoCmdTrptrqvGERAoXoAJ4yQc2be7PoLtxKw7b6unZ3o6OfFgCgjaaF
+8d4UeZGTMuox7SY93r6YCO0=
+=eC9r
+-----END PGP SIGNATURE-----
diff --git a/dev-python/snmpy/snmpy-1.0_alpha4.ebuild b/dev-python/snmpy/snmpy-1.0_alpha4.ebuild
index 3db5c8b9b81d..ecc63f9a79c3 100644
--- a/dev-python/snmpy/snmpy-1.0_alpha4.ebuild
+++ b/dev-python/snmpy/snmpy-1.0_alpha4.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: gert@hobbiton.be (Gert)
-# Maintainer: Jon Nelson <jnelson@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-python/snmpy/snmpy-1.0_alpha4.ebuild,v 1.1 2002/04/28 16:18:41 jnelson Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/snmpy/snmpy-1.0_alpha4.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+inherit distutils
 
 TARNAME=snmpy-alpha-4
 S=${WORKDIR}/${TARNAME}
-DESCRIPTION="python SNMP interface"
-SRC_URI="http://prdownloads.sourceforge.net/snmpy/${TARNAME}.tar.gz"
-HOMEPAGE="http://sourceforge.net/projects/snmpy/"
 
-DEPEND="virtual/python
-	>=net-analyzer/ucd-snmp-4.2.0"
-RDEPEND="${DEPEND}"
+DESCRIPTION="Python SNMP interface"
+SRC_URI="mirror://sourceforge/snmpy/${TARNAME}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/snmpy/"
 
-src_compile() {
-	python setup.py build || die
-}
+IUSE=""
+LICENSE="CNRI"
+SLOT="0"
+KEYWORDS="x86 sparc alpha"
 
-src_install() {
-	python setup.py install --root=${D} --prefix=/usr || die
-	dodoc README ChangeLog RELEASE-NOTES docs/docs.html
-}
+DEPEND="virtual/python
+	net-analyzer/net-snmp"
 
+mydocs="RELEASE-NOTES docs/docs.html"
diff --git a/dev-python/soappy/ChangeLog b/dev-python/soappy/ChangeLog
index 6f17c14ad937..a0fc7f5afca8 100644
--- a/dev-python/soappy/ChangeLog
+++ b/dev-python/soappy/ChangeLog
@@ -1,9 +1,42 @@
 # ChangeLog for dev-python/soappy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/ChangeLog,v 1.1 2004/01/03 03:08:03 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org> soappy-0.11.3.ebuild:
+  stable on amd64
+
+  12 Feb 2005; Fernando Serboncini <fserb@gentoo.org> soappy-0.11.6.ebuild:
+  Raised dependency to fpconst-0.7.1. Closes #81752.
+
+  09 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> soappy-0.11.6.ebuild:
+  Unstable ppc-macos
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  06 Dec 2004; Jason Wever <weeve@gentoo.org> soappy-0.11.6.ebuild:
+  Added ~sparc keyword.
+
+*soappy-0.11.6 (05 Dec 2004)
+
+  05 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> soappy-0.11.3.ebuild,
+  +soappy-0.11.6.ebuild:
+  Version bump.
+
+  10 Oct 2004; Simon Stelling <blubb@gentoo.org> soappy-0.11.3.ebuild:
+  added ~amd64
+
+  18 Apr 2004; David Holm <dholm@gentoo.org> soappy-0.11.3.ebuild:
+  Added to ~ppc.
+
+*soappy-0.11.3 (10 Apr 2004)
+
+  10 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> soappy-0.11.1.ebuild,
+  soappy-0.11.3.ebuild:
+  Mark 0.11.1 stable on x86, add 0.11.3 to portage.
 
 *soappy-0.11.1 (03 Jan 2004)
 
-  03 Jan 2004; Bryan �stergaard,,, <kloeri@gentoo.org> soappy-0.11.1.ebuild:
+  03 Jan 2004; Bryan Østergaard,,, <kloeri@gentoo.org> soappy-0.11.1.ebuild:
   Initial import
 
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index d8c46abc22e1..544e4e34f045 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,2 +1,8 @@
-MD5 7a1319eb8e58efd4f4919710a984e9cf soappy-0.11.1.ebuild 441
+MD5 36b602aa851f57c5eef38e7ac9b4bb78 ChangeLog 1345
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 aca0046865c4f5b12636bb3823cdac2e soappy-0.11.1.ebuild 526
+MD5 62da4a468888592e194f809bae586d9a soappy-0.11.3.ebuild 535
+MD5 da39a41e5bd213bfbf63b46eb89f95d1 soappy-0.11.6.ebuild 564
 MD5 b3c3125f10348493294bd561f0d28542 files/digest-soappy-0.11.1 65
+MD5 2e07cf786d5fa22da74c2127424c16d7 files/digest-soappy-0.11.3 65
+MD5 e4577572885eab20f84ad6e658781681 files/digest-soappy-0.11.6 65
diff --git a/dev-python/soappy/soappy-0.11.1.ebuild b/dev-python/soappy/soappy-0.11.1.ebuild
index 6a14e4157ac0..c22e8f74e214 100644
--- a/dev-python/soappy/soappy-0.11.1.ebuild
+++ b/dev-python/soappy/soappy-0.11.1.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/dev-python/soappy/soappy-0.11.1.ebuild,v 1.1 2004/01/03 03:08:03 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.11.1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="SOAP implementation for Python"
 HOMEPAGE="http://pywebsvcs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/dev-python/soappy/soappy-0.11.3.ebuild b/dev-python/soappy/soappy-0.11.3.ebuild
index 5ef740dbac7f..3dd87af6343e 100644
--- a/dev-python/soappy/soappy-0.11.3.ebuild
+++ b/dev-python/soappy/soappy-0.11.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/dev-python/soappy/soappy-0.11.3.ebuild,v 1.1 2004/04/10 16:43:33 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.11.3.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="SOAP implementation for Python"
 HOMEPAGE="http://pywebsvcs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc amd64"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/dev-python/soappy/soappy-0.11.6.ebuild b/dev-python/soappy/soappy-0.11.6.ebuild
index f19c8a172dfd..6787a7574e53 100644
--- a/dev-python/soappy/soappy-0.11.6.ebuild
+++ b/dev-python/soappy/soappy-0.11.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/dev-python/soappy/soappy-0.11.6.ebuild,v 1.1 2004/12/05 15:54:41 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.11.6.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -10,12 +10,12 @@ DESCRIPTION="SOAP implementation for Python"
 HOMEPAGE="http://pywebsvcs.sourceforge.net/"
 SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~ppc-macos"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="dev-python/fpconst
+DEPEND=">=dev-python/fpconst-0.7.1
 		dev-python/pyxml"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog
index 479b0ada31de..d0e6c2cfee5f 100644
--- a/dev-python/soya/ChangeLog
+++ b/dev-python/soya/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for dev-python/soya
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.1 2003/05/10 18:46:25 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
+
+*soya-0.10.1 (29 Sep 2005)
+*soya-0.10 (29 Sep 2005)
+
+  29 Sep 2005; Bryan Østergaard <kloeri@gentoo.org> +soya-0.10.ebuild,
+  +soya-0.10.1.ebuild:
+  New versions, ebuilds by Arc Riley <arc@xiph.org>.
+
+  12 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> -soya-0.5.ebuild,
+  -soya-0.6.1.ebuild, -soya-0.8.1.ebuild, -soya-0.8.2.ebuild,
+  soya-0.9.2.ebuild:
+  Remove old versions and bump stable.
+
+*soya-0.9.2 (10 Feb 2005)
+
+  10 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> soya-0.9.1.ebuild,
+  +soya-0.9.2.ebuild:
+  Version bump + stable bump.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*soya-0.9.1 (30 Dec 2004)
+
+  30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> +soya-0.9.1.ebuild:
+  Version bump, cleaned up a bit from ebuild by Ali Sabil
+  <hybrid@tuxfamily.org> in bug 75967.
+
+*soya-0.8.2 (02 Nov 2004)
+
+  02 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> +soya-0.8.2.ebuild:
+  Version bump.
+
+*soya-0.8.1 (16 Oct 2004)
+
+  16 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> +soya-0.8.1.ebuild:
+  Version bump, bug 66329.
+
+  01 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> soya-0.3.1.ebuild,
+  soya-0.5.ebuild, soya-0.6.1.ebuild:
+  Mark 0.6.1 stable on x86, change homepage + src_uri, remove old version.
+
+*soya-0.6.1 (21 Dec 2003)
+
+  21 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> soya-0.6.1.ebuild:
+  Version bump
+
+*soya-0.5 (05 Dec 2003)
 
 *soya-0.3.1 (10 May 2003)
 
diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
index bf86238a3965..ac0fce31b47b 100644
--- a/dev-python/soya/Manifest
+++ b/dev-python/soya/Manifest
@@ -1,2 +1,20 @@
-MD5 9171a0957a96291cc3d629b193ad7c82 soya-0.3.1.ebuild 855
-MD5 c0d82c3a81e8d8f2ff59d95649c9cd5f files/digest-soya-0.3.1 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0aedd8901d9398b9269fae505a250c8f ChangeLog 1832
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 c86de0114e14bb899e314af7a16f28a6 soya-0.9.1.ebuild 1238
+MD5 9395012f8845529f96ea13b3f9bf6a88 soya-0.9.2.ebuild 1260
+MD5 d697c3fd7266c25e0aeeb296c09ff5e2 soya-0.10.1.ebuild 2765
+MD5 1d82441037a359ae9f15cc9289efc234 soya-0.10.ebuild 2685
+MD5 ce7ebbfababcb0bf12631502c229319d files/digest-soya-0.9.1 63
+MD5 138fe892cff3c70621ac7189ede6a5bc files/digest-soya-0.9.2 64
+MD5 b4b649c31b7108c03468e3c6a06dd082 files/digest-soya-0.10.1 138
+MD5 1d7d0f2ab0a31243830102f1d11c59b6 files/digest-soya-0.10 134
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPHJsKf2g/qXtneoRAhpEAJ9CruGee0uKJZUST20IqKbHvfwJrQCfcZn4
+GZ/BOM/KKdySWYjcVM+z/a8=
+=GV3w
+-----END PGP SIGNATURE-----
diff --git a/dev-python/soya/soya-0.10.1.ebuild b/dev-python/soya/soya-0.10.1.ebuild
index d03f516a3634..f7497b7611d2 100644
--- a/dev-python/soya/soya-0.10.1.ebuild
+++ b/dev-python/soya/soya-0.10.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/dev-python/soya/soya-0.10.1.ebuild,v 1.1 2005/09/29 23:01:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.10.1.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/soya/soya-0.10.ebuild b/dev-python/soya/soya-0.10.ebuild
index ddc0b902992f..926c666675c8 100644
--- a/dev-python/soya/soya-0.10.ebuild
+++ b/dev-python/soya/soya-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/dev-python/soya/soya-0.10.ebuild,v 1.1 2005/09/29 23:01:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.10.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/soya/soya-0.9.1.ebuild b/dev-python/soya/soya-0.9.1.ebuild
index 11e22999df09..c3ed033a6a28 100644
--- a/dev-python/soya/soya-0.9.1.ebuild
+++ b/dev-python/soya/soya-0.9.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/dev-python/soya/soya-0.9.1.ebuild,v 1.1 2004/12/29 23:44:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
@@ -10,7 +10,7 @@ DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
 SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2"
 HOMEPAGE="http://home.gna.org/oomadness/en/soya/"
 
-KEYWORDS="~x86 ~ppc ~ppc-macos"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/dev-python/soya/soya-0.9.2.ebuild b/dev-python/soya/soya-0.9.2.ebuild
index 52ce0599eb05..b72a153aed48 100644
--- a/dev-python/soya/soya-0.9.2.ebuild
+++ b/dev-python/soya/soya-0.9.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.2.ebuild,v 1.1 2005/02/09 23:21:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.2.ebuild,v 1.1.1.1 2005/11/30 10:10:07 chriswhite Exp $
 
 inherit distutils
 
-IUSE="ode"
 MY_P=${P/soya/Soya}
 DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://oomadness.tuxfamily.org/en/soya/"
 SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2"
-HOMEPAGE="http://home.gna.org/oomadness/en/soya/"
 
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc x86"
+IUSE="ode"
 
 # Documented to need PIL (imaging) and pyrex
 # pyrex isn't actually needed for normal building of non-cvs.
@@ -20,7 +20,6 @@ LICENSE="GPL-2"
 DEPEND="virtual/x11
 	virtual/opengl
 	>=dev-lang/python-2.2.2
-	>=dev-python/editobj-0.3.1
 	>=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-gfx-2.0.3
 	>=media-libs/sdl-image-1.2.2
@@ -33,6 +32,9 @@ DEPEND="virtual/x11
 	ode? ( >=dev-games/ode-0.5 )
 	dev-python/imaging"
 
+RDEPEND="${DEPEND}
+	>=dev-python/editobj-0.3.1"
+
 S=${WORKDIR}/${MY_P}
 
 src_compile() {
diff --git a/dev-python/sqlobject/ChangeLog b/dev-python/sqlobject/ChangeLog
index 75355e7be9d6..bc8f56b8362f 100644
--- a/dev-python/sqlobject/ChangeLog
+++ b/dev-python/sqlobject/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for dev-python/sqlobject
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.1 2004/10/08 03:53:54 pythonhead Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
+
+  24 Oct 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  sqlobject-0.7.0.ebuild:
+  Added to ~ppc, bug #109627
+
+*sqlobject-0.7.0 (17 Oct 2005)
+
+  17 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +sqlobject-0.7.0.ebuild:
+  Version bump.
+
+  12 Sep 2005; Luis Medinas <metalgod@gentoo.org> sqlobject-0.6.1-r1.ebuild:
+  Added ~amd64 keyword. Closes bug #103201
+
+  01 Aug 2005; Rob Cakebread <pythonhead@gentoo.org> sqlobject-0.6.ebuild,
+  sqlobject-0.6.1.ebuild, sqlobject-0.6.1-r1.ebuild:
+  Marked x86. Fixed deps for pysqlite bug# 100858
+
+  16 Jul 2005; Joseph Jezak <josejx@gentoo.org> sqlobject-0.6.1-r1.ebuild:
+  Marked ~ppc for bug #98822.
+
+*sqlobject-0.6.1-r1 (18 Mar 2005)
+
+  18 Mar 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/converters-0.6.1-gentoo.diff, +sqlobject-0.6.1-r1.ebuild:
+  Added patch for array type needed for Subway
+
+*sqlobject-0.6.1 (02 Mar 2005)
+
+  02 Mar 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +sqlobject-0.6.1.ebuild, sqlobject-0.6.ebuild:
+  Version bump. Added doc USE flag.
 
 *sqlobject-0.6 (07 Oct 2004)
 
diff --git a/dev-python/sqlobject/Manifest b/dev-python/sqlobject/Manifest
index 16cc01ca86e4..30cf47ff8ccc 100644
--- a/dev-python/sqlobject/Manifest
+++ b/dev-python/sqlobject/Manifest
@@ -1,4 +1,11 @@
-MD5 d1baf6d63004130efdd200de08981320 sqlobject-0.6.ebuild 815
-MD5 4f1a2e57adc3709e1eb06286ce386e62 metadata.xml 373
-MD5 a9187e12adb31a27474b1f358195f549 ChangeLog 317
+MD5 aded3be3a60d77a8c495751bc780fdc1 ChangeLog 1434
+MD5 5b2d75adc12e9723956e5f5bc0d6dbcf files/converters-0.6.1-gentoo.diff 894
 MD5 d0031ecb2e25667b84c0f038fbfd9824 files/digest-sqlobject-0.6 65
+MD5 1f977e1d1bdca5117fa468d6d620ca80 files/digest-sqlobject-0.6.1 67
+MD5 1f977e1d1bdca5117fa468d6d620ca80 files/digest-sqlobject-0.6.1-r1 67
+MD5 23723737850551f1799a5656cd7f0cde files/digest-sqlobject-0.7.0 67
+MD5 4f1a2e57adc3709e1eb06286ce386e62 metadata.xml 373
+MD5 5a306315fc1222463464324ce05c2a53 sqlobject-0.6.1-r1.ebuild 1083
+MD5 4ee5c20c841709f9d6d7be6d6ab72a68 sqlobject-0.6.1.ebuild 884
+MD5 4c84be3857d1268c0ac3ac0874e1de1b sqlobject-0.6.ebuild 884
+MD5 337ca376e4868aaeadcc5fb76d8de99b sqlobject-0.7.0.ebuild 1074
diff --git a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild b/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
index 8cefcab7caaf..708a00fe578c 100644
--- a/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.6.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/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild,v 1.1 2005/03/18 18:23:49 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -10,12 +10,12 @@ HOMEPAGE="http://sqlobject.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="postgres mysql sqlite firebird doc"
 RDEPEND=">=dev-lang/python-2.2
 		postgres? ( >=dev-python/psycopg-1.1.11 )
 		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( >=dev-python/pysqlite-0.5.0 )
+		sqlite? ( <dev-python/pysqlite-2.0 )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/sqlobject/sqlobject-0.6.1.ebuild b/dev-python/sqlobject/sqlobject-0.6.1.ebuild
index 6214ca9fdf6f..6a657330c66e 100644
--- a/dev-python/sqlobject/sqlobject-0.6.1.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.6.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/dev-python/sqlobject/sqlobject-0.6.1.ebuild,v 1.1 2005/03/03 04:29:09 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -10,12 +10,12 @@ HOMEPAGE="http://sqlobject.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="postgres mysql sqlite firebird doc"
 RDEPEND=">=dev-lang/python-2.2
 		postgres? ( >=dev-python/psycopg-1.1.11 )
 		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( >=dev-python/pysqlite-0.5.0 )
+		sqlite? ( <dev-python/pysqlite-2.0 )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/sqlobject/sqlobject-0.6.ebuild b/dev-python/sqlobject/sqlobject-0.6.ebuild
index 47c29b3ff4f7..510ebebca74c 100644
--- a/dev-python/sqlobject/sqlobject-0.6.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.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/dev-python/sqlobject/sqlobject-0.6.ebuild,v 1.1 2004/10/08 03:53:54 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.6.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -11,19 +11,22 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="postgres mysql sqlite firebird"
+IUSE="postgres mysql sqlite firebird doc"
 RDEPEND=">=dev-lang/python-2.2
 		postgres? ( >=dev-python/psycopg-1.1.11 )
 		mysql? ( >=dev-python/mysql-python-0.9.2-r1 )
-		sqlite? ( >=dev-python/pysqlite-0.5.0 )
+		sqlite? ( <dev-python/pysqlite-2.0 )
 		firebird? ( >=dev-python/kinterbasdb-3.0.2 )"
 
 S=${WORKDIR}/${MY_P}
 
+
 src_install() {
 	distutils_src_install
-	dodoc docs/*.txt
-	dohtml docs/*.css docs/*.html
-	docinto examples
-	dodoc examples/*
+	if use doc; then
+		dodoc docs/*.txt
+		dohtml docs/*.css docs/*.html
+		docinto examples
+		dodoc examples/*
+	fi
 }
diff --git a/dev-python/sqlobject/sqlobject-0.7.0.ebuild b/dev-python/sqlobject/sqlobject-0.7.0.ebuild
index a2049a2f7f52..1b19509d4e0b 100644
--- a/dev-python/sqlobject/sqlobject-0.7.0.ebuild
+++ b/dev-python/sqlobject/sqlobject-0.7.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/dev-python/sqlobject/sqlobject-0.7.0.ebuild,v 1.1 2005/10/17 20:39:16 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sqlobject/sqlobject-0.7.0.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://sqlobject.org/"
 SRC_URI="http://cheeseshop.python.org/packages/source/S/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="postgres mysql sqlite firebird doc"
 RDEPEND=">=dev-lang/python-2.2
 		postgres? ( >=dev-python/psycopg-1.1.11 )
diff --git a/dev-python/stripogram/ChangeLog b/dev-python/stripogram/ChangeLog
index 048de0b59fda..e68f36fdac04 100644
--- a/dev-python/stripogram/ChangeLog
+++ b/dev-python/stripogram/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/stripogram
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stripogram/ChangeLog,v 1.1 2003/04/08 08:19:13 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stripogram/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> stripogram-1.4.ebuild:
+  Add missing IUSE.
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> stripogram-1.4.ebuild:
+  ~x86 ~ppc -> x86 ppc
 
 *stripogram-1.4 (08 Apr 2003)
 
diff --git a/dev-python/stripogram/Manifest b/dev-python/stripogram/Manifest
index e69de29bb2d1..5faae8f5d42d 100644
--- a/dev-python/stripogram/Manifest
+++ b/dev-python/stripogram/Manifest
@@ -0,0 +1,4 @@
+MD5 a50c7e4a5c530e9b3c14794725240249 ChangeLog 642
+MD5 47829090d3ebd88a5a4da8ad5f1e81c2 stripogram-1.4.ebuild 528
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 00ea8a0a130b4f4f765f97a848ba1da6 files/digest-stripogram-1.4 62
diff --git a/dev-python/stripogram/files/digest-stripogram-1.4 b/dev-python/stripogram/files/digest-stripogram-1.4
index a8c39f2fb7c3..8a564fc09bea 100644
--- a/dev-python/stripogram/files/digest-stripogram-1.4
+++ b/dev-python/stripogram/files/digest-stripogram-1.4
@@ -1,2 +1 @@
-MD5 de2782665b3ebb721b37b44f1040ac48 /stripogram-1.4.ebuild 402
 MD5 d09a0fa325ec2ae9a6a94b0b4aabd408 stripogram-1-4.tgz 10767
diff --git a/dev-python/stripogram/stripogram-1.4.ebuild b/dev-python/stripogram/stripogram-1.4.ebuild
index 19d545cbcdca..9f4e7075fa87 100644
--- a/dev-python/stripogram/stripogram-1.4.ebuild
+++ b/dev-python/stripogram/stripogram-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-python/stripogram/stripogram-1.4.ebuild,v 1.1 2003/04/08 08:19:13 kutsuya Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/stripogram/stripogram-1.4.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit distutils
 P_NEW="${PN}-${PV/\./-}"
@@ -8,9 +8,9 @@ S=${WORKDIR}/${PN}
 
 DESCRIPTION="A library for converting HTML to Plain Text."
 HOMEPAGE="http://www.zope.org/Members/chrisw/StripOGram/"
-SRC_URI="${HOMEPAGE}/${P_NEW}.tgz"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
+SRC_URI="http://www.zope.org/Members/chrisw/StripOGram/${P_NEW}.tgz"
+
 LICENSE="MIT"
+SLOT="0"
+KEYWORDS="x86 ppc"
 IUSE=""
-
diff --git a/dev-python/tpg/ChangeLog b/dev-python/tpg/ChangeLog
index e89d01a5daec..ca9c65e72ff4 100644
--- a/dev-python/tpg/ChangeLog
+++ b/dev-python/tpg/ChangeLog
@@ -1,10 +1,31 @@
 # ChangeLog for dev-python/tpg
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/ChangeLog,v 1.1 2004/05/01 22:52:29 kloeri Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+*tpg-3.0.5 (25 Apr 2005)
+
+  25 Apr 2005; Carsten Lohrke <carlo@gentoo.org> +tpg-3.0.5.ebuild:
+  version bump
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*tpg-3.0.4 (07 Dec 2004)
+
+  07 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +tpg-3.0.4.ebuild:
+  version bump
+
+*tpg-3.0.3 (14 Oct 2004)
+
+  14 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +tpg-3.0.3.ebuild:
+  version bump
+
+  02 May 2004; David Holm <dholm@gentoo.org> tpg-3.0.2.ebuild:
+  Added to ~ppc.
 
 *tpg-3.0.2 (02 May 2004)
 
-  02 May 2004; Bryan �stergaard <kloeri@gentoo.org> +metadata.xml,
+  02 May 2004; Bryan Østergaard <kloeri@gentoo.org> +metadata.xml,
   +tpg-3.0.2.ebuild:
   Initial import, bug #48538.
 
diff --git a/dev-python/tpg/Manifest b/dev-python/tpg/Manifest
index dcafe56b70d6..2fb9a82c8222 100644
--- a/dev-python/tpg/Manifest
+++ b/dev-python/tpg/Manifest
@@ -1,2 +1,10 @@
-MD5 886424681067ee16944f9a9b25bdf33c tpg-3.0.2.ebuild 592
+MD5 253f29e169501a9fa8a3cd9db3270df7 tpg-3.0.2.ebuild 684
+MD5 4590d7502aac20ad7154ea5705133181 tpg-3.0.4.ebuild 688
+MD5 fad11b8719e8d23986f07a8e3705b4f1 tpg-3.0.3.ebuild 692
+MD5 90f658770071739c1ca487cc05cf0a12 ChangeLog 862
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 5efadb7f5ab667b24d40cb217dedc910 tpg-3.0.5.ebuild 688
 MD5 3a316dcd2d3d9cbba66179814976b4a2 files/digest-tpg-3.0.2 61
+MD5 84ccce99eb77438ee437d85e2e5bb55b files/digest-tpg-3.0.3 61
+MD5 5114010c132538cd19d85d013c91cb2a files/digest-tpg-3.0.4 61
+MD5 98c6dd99a31b84e855506521c687d7a4 files/digest-tpg-3.0.5 61
diff --git a/dev-python/tpg/tpg-3.0.2.ebuild b/dev-python/tpg/tpg-3.0.2.ebuild
index 835c38c1cad3..944d61bb75e4 100644
--- a/dev-python/tpg/tpg-3.0.2.ebuild
+++ b/dev-python/tpg/tpg-3.0.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/dev-python/tpg/tpg-3.0.2.ebuild,v 1.1 2004/05/01 22:52:29 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/tpg-3.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://christophe.delord.free.fr/soft/tpg/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE="doc"
 
 DEPEND="virtual/python"
diff --git a/dev-python/tpg/tpg-3.0.3.ebuild b/dev-python/tpg/tpg-3.0.3.ebuild
index 91959b055ae6..8637069b7e11 100644
--- a/dev-python/tpg/tpg-3.0.3.ebuild
+++ b/dev-python/tpg/tpg-3.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/dev-python/tpg/tpg-3.0.3.ebuild,v 1.1 2004/10/14 00:27:58 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/tpg-3.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -22,7 +22,7 @@ DOCS="License.txt THANKS"
 
 src_install() {
 	distutils_src_install
-	if use doc ; then 
+	if use doc ; then
 		dohtml doc/*
 		insinto /usr/share/doc/${PF}/examples
 		doins examples/*
diff --git a/dev-python/tpg/tpg-3.0.4.ebuild b/dev-python/tpg/tpg-3.0.4.ebuild
index 22ff1bdbc19b..09e80d1b962e 100644
--- a/dev-python/tpg/tpg-3.0.4.ebuild
+++ b/dev-python/tpg/tpg-3.0.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/dev-python/tpg/tpg-3.0.4.ebuild,v 1.1 2004/12/06 23:28:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/tpg-3.0.4.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/tpg/tpg-3.0.5.ebuild b/dev-python/tpg/tpg-3.0.5.ebuild
index bd052da0b7c4..e089d094d12b 100644
--- a/dev-python/tpg/tpg-3.0.5.ebuild
+++ b/dev-python/tpg/tpg-3.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/dev-python/tpg/tpg-3.0.5.ebuild,v 1.1 2005/04/25 17:22:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tpg/tpg-3.0.5.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/ttfquery/ChangeLog b/dev-python/ttfquery/ChangeLog
index cbc01063f9c5..8dea10e62b4b 100644
--- a/dev-python/ttfquery/ChangeLog
+++ b/dev-python/ttfquery/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/ttfquery
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ttfquery/ChangeLog,v 1.1 2004/07/10 09:22:15 usata Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttfquery/ChangeLog,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
+
+  02 May 2005; Carsten Lohrke <carlo@gentoo.org> ttfquery-1.0.0.ebuild:
+  QA: fixed typo, removed unneeded variable usage
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> ttfquery-1.0.0.ebuild:
+  added ~amd64
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> ttfquery-1.0.0.ebuild:
+  Added to ~ppc.
 
 *ttfquery-1.0.0 (10 Jul 2004)
 
diff --git a/dev-python/ttfquery/Manifest b/dev-python/ttfquery/Manifest
index 91ec94266ae1..df7bbf35db4d 100644
--- a/dev-python/ttfquery/Manifest
+++ b/dev-python/ttfquery/Manifest
@@ -1,2 +1,4 @@
-MD5 59baacf4d9ec28a41ca35f9afe69e172 ttfquery-1.0.0.ebuild 525
+MD5 178f0deee15edb79bafcd3f957e21c1b ttfquery-1.0.0.ebuild 631
+MD5 f432d362963048c85badf28f6d872325 ChangeLog 728
+MD5 ce4646c9d4a69033796359bcaf7373a5 metadata.xml 178
 MD5 4f827d6e0d7cec0cfc98fc20f07b0a99 files/digest-ttfquery-1.0.0 65
diff --git a/dev-python/ttfquery/ttfquery-1.0.0.ebuild b/dev-python/ttfquery/ttfquery-1.0.0.ebuild
index b57fa543a715..b3cc8af75170 100644
--- a/dev-python/ttfquery/ttfquery-1.0.0.ebuild
+++ b/dev-python/ttfquery/ttfquery-1.0.0.ebuild
@@ -1,21 +1,21 @@
-# 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/dev-python/ttfquery/ttfquery-1.0.0.ebuild,v 1.1 2004/07/10 09:22:15 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ttfquery/ttfquery-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:33 chriswhite Exp $
 
 inherit distutils
 MY_PN="TTFQuery"
 
 DESCRIPTION="Font metadata and glyph outline extraction utility library"
-HOMEPAGE="http://ttyquery.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.gz"
+HOMEPAGE="http://ttfquery.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ttfquery/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86" # should work on all architectures 
+KEYWORDS="~x86 ~ppc ~amd64" # should work on all architectures
 
 IUSE=""
-DEPEND="virtual/python 
-	dev-python/fonttools 
+DEPEND="virtual/python
+	dev-python/fonttools
 	dev-python/numeric"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/twibber/ChangeLog b/dev-python/twibber/ChangeLog
index 69bd14a47a10..a9b3f9536cb6 100644
--- a/dev-python/twibber/ChangeLog
+++ b/dev-python/twibber/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/twibber
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twibber/ChangeLog,v 1.1 2005/03/14 14:40:59 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twibber/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> twibber-0.2.0_pre2.ebuild:
+  add ~ia64
 
   14 Mar 2005; Thomas Raschbacher <lordvan@gentoo.org> :
   initial import
diff --git a/dev-python/twibber/Manifest b/dev-python/twibber/Manifest
index 31bb49e88b51..be3a54e929db 100644
--- a/dev-python/twibber/Manifest
+++ b/dev-python/twibber/Manifest
@@ -1,4 +1,4 @@
-MD5 4f41ffdfe0c5e85ad14bf93a87779faf twibber-0.2.0_pre2.ebuild 1016
-MD5 21e41c550c6ba123c4152578dd2720fa ChangeLog 194
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 d32aba109439ca296677f44beac37f86 ChangeLog 376
+MD5 6bfe78b35e41c713e67e65e65ff752b5 twibber-0.2.0_pre2.ebuild 1030
 MD5 5d062d520eeb07b73d25f7f664419a3e files/digest-twibber-0.2.0_pre2 69
diff --git a/dev-python/twibber/twibber-0.2.0_pre2.ebuild b/dev-python/twibber/twibber-0.2.0_pre2.ebuild
index 145fa3bd3fbe..622459151398 100644
--- a/dev-python/twibber/twibber-0.2.0_pre2.ebuild
+++ b/dev-python/twibber/twibber-0.2.0_pre2.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/dev-python/twibber/twibber-0.2.0_pre2.ebuild,v 1.1 2005/03/14 14:40:59 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twibber/twibber-0.2.0_pre2.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.jabberstudio.org/projects/twibber/releases/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-python/pyxml-0.8.3
diff --git a/dev-python/twisted-conch/ChangeLog b/dev-python/twisted-conch/ChangeLog
index ca2ebf2e8f3f..c435c7f7eb20 100644
--- a/dev-python/twisted-conch/ChangeLog
+++ b/dev-python/twisted-conch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/twisted-conch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.1 2005/04/08 14:06:17 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
+
+  07 Sep 2005; Tom Martin <slarti@gentoo.org> twisted-conch-0.5.0.ebuild:
+  Marked ~amd64, satisfies bug 105106.
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-conch-0.5.0:
   initial import
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
index 0e32b66d5a2c..a47e6e1e569a 100644
--- a/dev-python/twisted-conch/Manifest
+++ b/dev-python/twisted-conch/Manifest
@@ -1,4 +1,14 @@
-MD5 4ba902c44ec244466140da5a56aaf38b twisted-conch-0.5.0.ebuild 824
-MD5 e275c0b987aa40432389e6bc1c87f4a3 ChangeLog 344
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3786fbf1c8f7b45c97a0807a5a68c97f ChangeLog 482
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 cc0489554e2153377ec4bfd2535c7949 twisted-conch-0.5.0.ebuild 815
 MD5 4e7bf4c8e53132875fc7bc7182c590e9 files/digest-twisted-conch-0.5.0 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHshjCHk4+ZoBpvsRAu/tAKCSOr5QrFz3aD5HWv/t1W8udlfMkACeJCmt
+WfanQLgN0kX//2TlHn243hA=
+=GquS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-conch/twisted-conch-0.5.0.ebuild b/dev-python/twisted-conch/twisted-conch-0.5.0.ebuild
index fe1e9f2ae2fe..ba31aec7c136 100644
--- a/dev-python/twisted-conch/twisted-conch-0.5.0.ebuild
+++ b/dev-python/twisted-conch/twisted-conch-0.5.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/dev-python/twisted-conch/twisted-conch-0.5.0.ebuild,v 1.1 2005/04/08 14:06:17 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-conch/twisted-conch-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/Conch/0.5/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-cvs/ChangeLog b/dev-python/twisted-cvs/ChangeLog
index 0bdf82a3c0e4..a4c84ff7da2a 100644
--- a/dev-python/twisted-cvs/ChangeLog
+++ b/dev-python/twisted-cvs/ChangeLog
@@ -1,12 +1,28 @@
-# ChangeLog for dev-python/twisted
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-cvs/ChangeLog,v 1.1 2002/12/13 15:42:21 lordvan Exp $
+# ChangeLog for dev-python/twisted-cvs
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-cvs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
-*twisted-cvs-20021104 (12 Dec 2002) Thomas Raschbacher <lordvan@gentoo.org>
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 May 2004; Bryan Østergaard <kloeri@gentoo.org>
+  twisted-cvs-20031103.ebuild:
+  Add missing IUSE.
+
+*twisted-cvs-20031103 (03 Nov 2003)
+  03 Nov 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-cvs-20031103.ebuild:
+  changed cvs server to cvs.twistedmatrix.com
+  removed 20031104 version
+	
+*twisted-cvs-20021104 (12 Dec 2002) 
+
+  12 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org>
   Added dep for dev-python/pycrypto
   Added IUSE
   Added to portage tree on user request(for the moment)
 
 	
-*twisted-cvs-20021023 (23. Oct 2002) Thomas Raschbacher <lordvan@lordvan.com>
-  Added twisted-cvs.(It's almost a copy of twisted-1.0.0)
\ No newline at end of file
+*twisted-cvs-20021023 (23 Oct 2002) 
+
+  23 Oct 2002; Thomas Raschbacher <lordvan@lordvan.com>
+  Added twisted-cvs.(It's almost a copy of twisted-1.0.0)
diff --git a/dev-python/twisted-cvs/Manifest b/dev-python/twisted-cvs/Manifest
index e69de29bb2d1..1dba3501db18 100644
--- a/dev-python/twisted-cvs/Manifest
+++ b/dev-python/twisted-cvs/Manifest
@@ -0,0 +1,4 @@
+MD5 794d4e5ea3437bf9c00df71c78718408 ChangeLog 976
+MD5 acdee05723677a003ac998ea2b6af2e5 twisted-cvs-20031103.ebuild 1438
+MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-twisted-cvs-20031103 0
diff --git a/dev-python/twisted-cvs/twisted-cvs-20031103.ebuild b/dev-python/twisted-cvs/twisted-cvs-20031103.ebuild
index f532f9cc08e4..dbc124b1f91a 100644
--- a/dev-python/twisted-cvs/twisted-cvs-20031103.ebuild
+++ b/dev-python/twisted-cvs/twisted-cvs-20031103.ebuild
@@ -1,14 +1,13 @@
-# 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/dev-python/twisted-cvs/twisted-cvs-20031103.ebuild,v 1.1 2003/11/03 07:26:28 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-cvs/twisted-cvs-20031103.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 ECVS_USER="anon"
 ECVS_SERVER="cvs.twistedmatrix.com:/cvs"
 ECVS_MODULE="Twisted"
 ECVS_CVS_OPTIONS="-dP"
 
-inherit cvs
-inherit distutils
+inherit cvs distutils
 
 S=${WORKDIR}/${ECVS_MODULE}
 DESCRIPTION="Twisted is a framework, written in Python, for writing networked applications."
@@ -18,6 +17,7 @@ SRC_URI=""
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~x86 ~alpha"
+IUSE=""
 
 RDEPEND="virtual/python"
 DEPEND="${DEPEND}
diff --git a/dev-python/twisted-docs/ChangeLog b/dev-python/twisted-docs/ChangeLog
index 13a651192793..37baf969fe65 100644
--- a/dev-python/twisted-docs/ChangeLog
+++ b/dev-python/twisted-docs/ChangeLog
@@ -1,8 +1,67 @@
 # ChangeLog for dev-python/twisted-docs
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/ChangeLog,v 1.1 2003/11/03 07:02:01 lordvan Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> twisted-docs-1.3.0.ebuild:
+  add ~ia64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  twisted-docs-1.2.0.ebuild:
+  Stable on ppc.
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> twisted-docs-1.3.0.ebuild:
+  Added ~sparc keyword.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  twisted-docs-1.2.0.ebuild:
+  stable on amd64.
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> twisted-docs-1.2.0.ebuild:
+  Stable on alpha.
+
+*twisted-docs-1.3.0 (19 May 2004)
+
+  19 May 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  +twisted-docs-1.3.0.ebuild:
+  Version bump
+
+*twisted-docs-1.2.1_alpha2 (06 May 2004)
+
+  06 May 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  twisted-docs-1.2.0.ebuild, +twisted-docs-1.2.1_alpha2.ebuild:
+  added 1.2.1_alpha2
+  marked 1.2.0 stable on x86
+
+  22 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> twisted-docs-1.2.0.ebuild:
+  Added ~alpha to keywords.
+
+  29 Mar 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  twisted-docs-1.1.0.ebuild, twisted-docs-1.1.1.ebuild,
+  twisted-docs-1.2.0.ebuild:
+  changed KEYWORDS to match with dev-python/twisted ebuilds
+	
+  06 Mar 2004; David Holm <dholm@gentoo.org> twisted-docs-1.2.0.ebuild:
+  Added to ~ppc.
+
+*twisted-docs-1.2.0 (05 Mar 2004)
+
+  05 Mar 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  twisted-docs-1.2.0.ebuild:
+  Version Bump (~arch for now)
+	
+*twisted-docs-1.1.1 (13 Dec 2003)
+
+  13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org>
+  twisted-docs-1.1.1.ebuild:
+  Version bump.
 
 *twisted-docs-1.1.0 (27 Oct 2003)
+  03 Nov 2003; Thomas Raschbacher <lordvan@gentoo.org>:
+  moved from dev-python/TwistedDocs -> dev-python/twisted-docs (naming policy!)
+
   27 Oct 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-docs-1.1.0.ebuild:
   initial Import
   (docs were in dev-python/twisted before)
diff --git a/dev-python/twisted-docs/Manifest b/dev-python/twisted-docs/Manifest
index cfee214cedde..de67473e2074 100644
--- a/dev-python/twisted-docs/Manifest
+++ b/dev-python/twisted-docs/Manifest
@@ -1,4 +1,12 @@
-MD5 63a54c989abd02dc48cb5071e5edda98 twisted-docs-1.1.0.ebuild 914
-MD5 02af2daa787b59adf499a2aa06c0d050 ChangeLog 397
+MD5 64923cb789635c9f59a5a5552fb9ca70 twisted-docs-1.1.0.ebuild 909
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 d2a6d575d08a3365522fd40bf66ae83c ChangeLog 2167
+MD5 d73b32bd06b5112cb9d3d9af6d1b8bc2 twisted-docs-1.3.0.ebuild 1019
+MD5 da6a1e0f68d0e93290f378cf5eaad22f twisted-docs-1.1.1.ebuild 903
+MD5 a6ae9d49ede5100a49834c12e1733141 twisted-docs-1.2.1_alpha2.ebuild 975
+MD5 d148d042ea86caa6d586fc0a5ef20382 twisted-docs-1.2.0.ebuild 910
+MD5 e1cc24d837b53bd573bd68ef734a6534 files/digest-twisted-docs-1.1.1 71
 MD5 7b7856512d8720cdff541fe47a782a29 files/digest-twisted-docs-1.1.0 71
+MD5 2324736dc4ec6d95f959ad493dd251e2 files/digest-twisted-docs-1.2.1_alpha2 77
+MD5 ae072f34c3e48f56070ffcda8ee8cdc8 files/digest-twisted-docs-1.2.0 71
+MD5 65ec9eb27c4de6df611517f5658996bd files/digest-twisted-docs-1.3.0 71
diff --git a/dev-python/twisted-docs/twisted-docs-1.1.0.ebuild b/dev-python/twisted-docs/twisted-docs-1.1.0.ebuild
index 6830a0dc5735..ce295a5547dc 100644
--- a/dev-python/twisted-docs/twisted-docs-1.1.0.ebuild
+++ b/dev-python/twisted-docs/twisted-docs-1.1.0.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/dev-python/twisted-docs/twisted-docs-1.1.0.ebuild,v 1.1 2003/11/03 07:02:01 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/twisted-docs-1.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 #inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://twisted.sourceforge.net/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 alpha sparc"
+KEYWORDS="x86 alpha ~sparc"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/twisted-docs/twisted-docs-1.1.1.ebuild b/dev-python/twisted-docs/twisted-docs-1.1.1.ebuild
index a9fd17d88e89..4fb442d40237 100644
--- a/dev-python/twisted-docs/twisted-docs-1.1.1.ebuild
+++ b/dev-python/twisted-docs/twisted-docs-1.1.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/dev-python/twisted-docs/twisted-docs-1.1.1.ebuild,v 1.1 2003/12/13 04:35:57 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/twisted-docs-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 #inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://twisted.sourceforge.net/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="x86 alpha sparc"
+KEYWORDS="~x86 amd64"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/twisted-docs/twisted-docs-1.2.0.ebuild b/dev-python/twisted-docs/twisted-docs-1.2.0.ebuild
index b9ffa7750827..d9a95d49f700 100644
--- a/dev-python/twisted-docs/twisted-docs-1.2.0.ebuild
+++ b/dev-python/twisted-docs/twisted-docs-1.2.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/dev-python/twisted-docs/twisted-docs-1.2.0.ebuild,v 1.1 2004/03/05 20:07:15 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/twisted-docs-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 
 #inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://twisted.sourceforge.net/${MY_PN}-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~amd64"
+KEYWORDS="x86 amd64 ppc alpha"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/twisted-docs/twisted-docs-1.2.1_alpha2.ebuild b/dev-python/twisted-docs/twisted-docs-1.2.1_alpha2.ebuild
index 72bf06bc7493..85aef1ed2ccf 100644
--- a/dev-python/twisted-docs/twisted-docs-1.2.1_alpha2.ebuild
+++ b/dev-python/twisted-docs/twisted-docs-1.2.1_alpha2.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/dev-python/twisted-docs/twisted-docs-1.2.1_alpha2.ebuild,v 1.1 2004/05/06 17:49:40 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/twisted-docs-1.2.1_alpha2.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 #inherit distutils
 
diff --git a/dev-python/twisted-docs/twisted-docs-1.3.0.ebuild b/dev-python/twisted-docs/twisted-docs-1.3.0.ebuild
index 6eee5dcf182e..5379e573a929 100644
--- a/dev-python/twisted-docs/twisted-docs-1.3.0.ebuild
+++ b/dev-python/twisted-docs/twisted-docs-1.3.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/dev-python/twisted-docs/twisted-docs-1.3.0.ebuild,v 1.1 2004/05/19 20:29:03 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-docs/twisted-docs-1.3.0.ebuild,v 1.1.1.1 2005/11/30 10:10:27 chriswhite Exp $
 
 #inherit distutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://twisted.sourceforge.net/${MY_PN}-${MY_PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/twisted-flow/ChangeLog b/dev-python/twisted-flow/ChangeLog
index f4d6551bd2ef..de75981669b1 100644
--- a/dev-python/twisted-flow/ChangeLog
+++ b/dev-python/twisted-flow/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-flow
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-flow/ChangeLog,v 1.1 2005/04/08 14:44:12 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-flow/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-flow-0.1.0:
   initial import
diff --git a/dev-python/twisted-flow/Manifest b/dev-python/twisted-flow/Manifest
index b65a569d7dc6..c4e3aee54196 100644
--- a/dev-python/twisted-flow/Manifest
+++ b/dev-python/twisted-flow/Manifest
@@ -1,4 +1,4 @@
-MD5 a9a3a91c1ae0bb1c98344cb5243c2b3f twisted-flow-0.1.0.ebuild 790
-MD5 5810b6cf49885b749c270165935dc1a1 ChangeLog 365
+MD5 7416540048344e7052d0f7e5c959c4a7 twisted-flow-0.1.0.ebuild 771
+MD5 c2c006ae5f1590616a5f7edb2b21b88b ChangeLog 365
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 7914bbfad028e23b3f59fe3f68f69b33 files/digest-twisted-flow-0.1.0 69
diff --git a/dev-python/twisted-flow/twisted-flow-0.1.0.ebuild b/dev-python/twisted-flow/twisted-flow-0.1.0.ebuild
index 763bfc29bdeb..1c1e820059af 100644
--- a/dev-python/twisted-flow/twisted-flow-0.1.0.ebuild
+++ b/dev-python/twisted-flow/twisted-flow-0.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/dev-python/twisted-flow/twisted-flow-0.1.0.ebuild,v 1.1 2005/04/08 14:44:12 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-flow/twisted-flow-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/Flow/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-lore/ChangeLog b/dev-python/twisted-lore/ChangeLog
index bfe660706a8e..8b5febbf350d 100644
--- a/dev-python/twisted-lore/ChangeLog
+++ b/dev-python/twisted-lore/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-lore
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.1 2005/04/08 14:35:49 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/ChangeLog,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-lore-0.1.0:
   initial import
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
index db3a6b3ddcbd..028fae0c40f2 100644
--- a/dev-python/twisted-lore/Manifest
+++ b/dev-python/twisted-lore/Manifest
@@ -1,4 +1,4 @@
-MD5 690097ffc0d62893849f21a5da27b534 twisted-lore-0.1.0.ebuild 806
-MD5 15f1f63d0f2e2c3a8f1f84c7607eaaf4 ChangeLog 365
+MD5 0e770d4760b3ce76c2a5c38d3c60252c twisted-lore-0.1.0.ebuild 782
+MD5 9c51b5b74729b376c2004ad9a388c041 ChangeLog 365
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 c36a230912611e4218de6f5eb5e3d710 files/digest-twisted-lore-0.1.0 69
diff --git a/dev-python/twisted-lore/twisted-lore-0.1.0.ebuild b/dev-python/twisted-lore/twisted-lore-0.1.0.ebuild
index ce005c6683bf..e23218b36a19 100644
--- a/dev-python/twisted-lore/twisted-lore-0.1.0.ebuild
+++ b/dev-python/twisted-lore/twisted-lore-0.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/dev-python/twisted-lore/twisted-lore-0.1.0.ebuild,v 1.1 2005/04/08 14:35:49 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-lore/twisted-lore-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:08 chriswhite Exp $
 
 inherit distutils
 
@@ -8,13 +8,13 @@ inherit distutils
 MY_PV="${PV/_alpha/a}"
 MY_PN="TwistedLore"
 MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="An NNTP protocol implementation with client and server(?)"
+DESCRIPTION="Documentation generator with HTML and LaTeX support."
 HOMEPAGE="http://twistedmatrix.com/projects/lore/"
 SRC_URI="http://tmrc.mit.edu/mirror/twisted/Lore/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-mail/ChangeLog b/dev-python/twisted-mail/ChangeLog
index 9f8682cb3f76..3e3df5466bed 100644
--- a/dev-python/twisted-mail/ChangeLog
+++ b/dev-python/twisted-mail/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-mail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.1 2005/04/08 14:12:26 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-mail-0.5.0:
   initial import
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
index 9abb7497ebb2..be838d3b819e 100644
--- a/dev-python/twisted-mail/Manifest
+++ b/dev-python/twisted-mail/Manifest
@@ -1,4 +1,4 @@
-MD5 7581fecdce8a39941903a09ca2a7712f twisted-mail-0.1.0.ebuild 831
-MD5 23989829596e54366a2f5251b0004cb6 ChangeLog 365
+MD5 6b2b817b4d01328b316f0f8e47c67a4e twisted-mail-0.1.0.ebuild 810
+MD5 07d14aae731c19f695296461d2cfb350 ChangeLog 365
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 c04aee3a8274e3e757ba9635e16ce0c3 files/digest-twisted-mail-0.1.0 69
diff --git a/dev-python/twisted-mail/twisted-mail-0.1.0.ebuild b/dev-python/twisted-mail/twisted-mail-0.1.0.ebuild
index a1fc08c64daf..161a17f36745 100644
--- a/dev-python/twisted-mail/twisted-mail-0.1.0.ebuild
+++ b/dev-python/twisted-mail/twisted-mail-0.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/dev-python/twisted-mail/twisted-mail-0.1.0.ebuild,v 1.1 2005/04/08 14:12:26 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-mail/twisted-mail-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/Mail/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-names/ChangeLog b/dev-python/twisted-names/ChangeLog
index a776f0091a43..fe89d8c1a15a 100644
--- a/dev-python/twisted-names/ChangeLog
+++ b/dev-python/twisted-names/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-names
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/ChangeLog,v 1.1 2005/04/08 15:14:15 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/ChangeLog,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-names-0.1.0:
   initial import
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
index 8202166fa043..bfdc040e68c3 100644
--- a/dev-python/twisted-names/Manifest
+++ b/dev-python/twisted-names/Manifest
@@ -1,4 +1,4 @@
-MD5 f1bc8f4bae53f5a996d7fb1f99d646ea twisted-names-0.1.0.ebuild 811
-MD5 b3fca05c5d10167c584c057e5578b278 ChangeLog 369
+MD5 868f86835dfab3ed28abbd4143a00b39 twisted-names-0.1.0.ebuild 789
+MD5 112a571c6bb1eb6ddc79c8190de0be5a ChangeLog 369
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 bce5421a13546c1574eb9fcd01093802 files/digest-twisted-names-0.1.0 70
diff --git a/dev-python/twisted-names/twisted-names-0.1.0.ebuild b/dev-python/twisted-names/twisted-names-0.1.0.ebuild
index 7b7b5e566660..7ba53022429d 100644
--- a/dev-python/twisted-names/twisted-names-0.1.0.ebuild
+++ b/dev-python/twisted-names/twisted-names-0.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/dev-python/twisted-names/twisted-names-0.1.0.ebuild,v 1.1 2005/04/08 15:14:15 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-names/twisted-names-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:29 chriswhite Exp $
 
 inherit distutils
 
@@ -8,13 +8,13 @@ inherit distutils
 MY_PV="${PV/_alpha/a}"
 MY_PN="TwistedNames"
 MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="An NNTP protocol implementation with client and server(?)"
+DESCRIPTION="An DNS protocol implementation with client and server."
 HOMEPAGE="http://twistedmatrix.com/projects/names/"
 SRC_URI="http://tmrc.mit.edu/mirror/twisted/Names/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-news/ChangeLog b/dev-python/twisted-news/ChangeLog
index 51b3dc29f929..eaed97cc3ffb 100644
--- a/dev-python/twisted-news/ChangeLog
+++ b/dev-python/twisted-news/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-news
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/ChangeLog,v 1.1 2005/04/08 14:26:07 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/ChangeLog,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-news-0.1.0:
   initial import
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
index 7542dfa9e1da..348a67553921 100644
--- a/dev-python/twisted-news/Manifest
+++ b/dev-python/twisted-news/Manifest
@@ -1,4 +1,4 @@
-MD5 b5a124c9fe2ac8e2e3e581dac824be5b twisted-news-0.1.0.ebuild 808
-MD5 43eee8b3b707f3d28c9f43e2ffbb58f3 ChangeLog 365
+MD5 93dbc56a7d8f37b0539e8809f9a17eeb twisted-news-0.1.0.ebuild 787
+MD5 22894521731b8bf85e34e2cd931ea27e ChangeLog 365
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 579c33f80328a50755d05ccd21c35c6d files/digest-twisted-news-0.1.0 69
diff --git a/dev-python/twisted-news/twisted-news-0.1.0.ebuild b/dev-python/twisted-news/twisted-news-0.1.0.ebuild
index 29ae84dd0423..b1426b257f3f 100644
--- a/dev-python/twisted-news/twisted-news-0.1.0.ebuild
+++ b/dev-python/twisted-news/twisted-news-0.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/dev-python/twisted-news/twisted-news-0.1.0.ebuild,v 1.1 2005/04/08 14:26:07 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-news/twisted-news-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/News/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-pair/ChangeLog b/dev-python/twisted-pair/ChangeLog
index 7c918551b8cc..d20a17ce0f5d 100644
--- a/dev-python/twisted-pair/ChangeLog
+++ b/dev-python/twisted-pair/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-pair
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/ChangeLog,v 1.1 2005/04/08 15:48:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-pair-0.1.0:
   initial import
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
index 46f4f2832552..74a8592c7a30 100644
--- a/dev-python/twisted-pair/Manifest
+++ b/dev-python/twisted-pair/Manifest
@@ -1,4 +1,4 @@
-MD5 998df16e12347736d6f7fb021e42953d twisted-pair-0.1.0.ebuild 823
-MD5 8d6feb687c9807df7f5e35caca1b0fc3 ChangeLog 365
+MD5 34a76a5c88cf94c45e6c6ed29f85b28a twisted-pair-0.1.0.ebuild 754
+MD5 6a1c0b6a00c004133db6ca50bdf87338 ChangeLog 365
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 5ef628d4febe47ac438006f5157c0c27 files/digest-twisted-pair-0.1.0 68
diff --git a/dev-python/twisted-pair/twisted-pair-0.1.0.ebuild b/dev-python/twisted-pair/twisted-pair-0.1.0.ebuild
index 213c5b31c047..2683e7d6f115 100644
--- a/dev-python/twisted-pair/twisted-pair-0.1.0.ebuild
+++ b/dev-python/twisted-pair/twisted-pair-0.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/dev-python/twisted-pair/twisted-pair-0.1.0.ebuild,v 1.1 2005/04/08 15:48:41 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-pair/twisted-pair-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -8,13 +8,13 @@ inherit distutils
 MY_PV="${PV/_alpha/a}"
 MY_PN="TwistedPair"
 MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="An SSH and SFTP protocol implementation together with clients and servers."
+DESCRIPTION="Twisted Low-level stuff."
 HOMEPAGE="http://twistedmatrix.com/projects/pair/"
 SRC_URI="http://tmrc.mit.edu/mirror/twisted/Pair/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-runner/ChangeLog b/dev-python/twisted-runner/ChangeLog
index aa0060ab5d7e..5447405d1707 100644
--- a/dev-python/twisted-runner/ChangeLog
+++ b/dev-python/twisted-runner/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for dev-python/twisted-runner
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/ChangeLog,v 1.1 2005/04/08 15:58:44 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/ChangeLog,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-runner-0.1.0:
   initial import
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
index df99f1832427..180cfa705c40 100644
--- a/dev-python/twisted-runner/Manifest
+++ b/dev-python/twisted-runner/Manifest
@@ -1,4 +1,4 @@
-MD5 5ade45a5a2d21cc06a602772f64197e1 twisted-runner-0.1.0.ebuild 833
-MD5 4405d0323bf103da0090fd2c1548db55 ChangeLog 373
+MD5 5bcdee3db02cff7ba453921e3642ec7c twisted-runner-0.1.0.ebuild 767
+MD5 8433c9447ee5351ff7f76f0310166d5f ChangeLog 373
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 d246ce1f4e71f9651546601c36dd846f files/digest-twisted-runner-0.1.0 70
diff --git a/dev-python/twisted-runner/twisted-runner-0.1.0.ebuild b/dev-python/twisted-runner/twisted-runner-0.1.0.ebuild
index 43c1b2e87a56..c01b486638f8 100644
--- a/dev-python/twisted-runner/twisted-runner-0.1.0.ebuild
+++ b/dev-python/twisted-runner/twisted-runner-0.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/dev-python/twisted-runner/twisted-runner-0.1.0.ebuild,v 1.1 2005/04/08 15:58:44 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-runner/twisted-runner-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:13 chriswhite Exp $
 
 inherit distutils
 
@@ -8,13 +8,13 @@ inherit distutils
 MY_PV="${PV/_alpha/a}"
 MY_PN="TwistedRunner"
 MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="An SSH and SFTP protocol implementation together with clients and servers."
+DESCRIPTION="Twisted Process management."
 HOMEPAGE="http://twistedmatrix.com/projects/runner/"
 SRC_URI="http://tmrc.mit.edu/mirror/twisted/Runner/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-web/ChangeLog b/dev-python/twisted-web/ChangeLog
index 446564bdc6ba..33e9f9c2e655 100644
--- a/dev-python/twisted-web/ChangeLog
+++ b/dev-python/twisted-web/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/twisted-web
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.1 2005/04/08 13:59:49 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/ChangeLog,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
+
+  23 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  twisted-web-0.5.0.ebuild:
+  ~amd64
+
+  27 Jun 2005; David Holm <dholm@gentoo.org> twisted-web-0.5.0.ebuild:
+  Added to ~ppc.
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> :
   initial import
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
index d5dce8f08240..e019a7f8f787 100644
--- a/dev-python/twisted-web/Manifest
+++ b/dev-python/twisted-web/Manifest
@@ -1,3 +1,14 @@
-MD5 f340e960f4bfc4c1e4a9e9f2556a0ff9 twisted-web-0.5.0.ebuild 774
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 361f58157abea88c59f2f2b1ac5bde61 twisted-web-0.5.0.ebuild 778
+MD5 bec8f542880284671aede3b1a311fb9e ChangeLog 529
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 7e7885ea2a517955e3510dc59addad40 files/digest-twisted-web-0.5.0 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDM8S48zY1VwezZiERAtI3AJ0aYyfBcTYHqbsSY7VHSuITbgKJ2gCeNz8q
+vGoREqildTapk1tawT5mn3o=
+=PAXg
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-web/twisted-web-0.5.0.ebuild b/dev-python/twisted-web/twisted-web-0.5.0.ebuild
index 4bdd56de07bf..9e106d5fa30b 100644
--- a/dev-python/twisted-web/twisted-web-0.5.0.ebuild
+++ b/dev-python/twisted-web/twisted-web-0.5.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/dev-python/twisted-web/twisted-web-0.5.0.ebuild,v 1.1 2005/04/08 13:59:49 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-web/twisted-web-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:10:17 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/Web/0.5/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-words/ChangeLog b/dev-python/twisted-words/ChangeLog
index 44809441c237..cfee56d07ed1 100644
--- a/dev-python/twisted-words/ChangeLog
+++ b/dev-python/twisted-words/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for dev-python/twisted-words
-# Copyright 1999-20.1 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.1 2005/04/08 19:22:12 lordvan Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/ChangeLog,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
-  08 Apr 20.1; Thomas Raschbacher <lordvan@gentoo.org> twisted-words-0.1.0:
+  27 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  twisted-words-0.1.0.ebuild:
+  Marked ~amd64
+
+  08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-words-0.1.0:
   initial import
   twisted-words was part of the main twisted release
 
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
index 9f960c09d01a..ab3ee6e12bac 100644
--- a/dev-python/twisted-words/Manifest
+++ b/dev-python/twisted-words/Manifest
@@ -1,4 +1,14 @@
-MD5 27fd60017d247c84da4d8f2a3d70b01c twisted-words-0.1.0.ebuild 771
-MD5 5a2bf0eed6bcbb834048aa75753982c9 ChangeLog 369
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f84a2deb021b68590bb332e0c48f9bf8 twisted-words-0.1.0.ebuild 760
+MD5 d955d1aa3098b5ff49d4cefdf5168bd4 ChangeLog 474
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 1799a75811b18557d3ad80550fffae15 files/digest-twisted-words-0.1.0 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEPOU8zY1VwezZiERAq7WAKCow7oqBJ/6P5OxlLwxUmH/Odo7dgCfRXZ3
+Jn8UiAP6FO/QkRSSiFA8bjM=
+=/xxV
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-words/twisted-words-0.1.0.ebuild b/dev-python/twisted-words/twisted-words-0.1.0.ebuild
index a3b17943989d..201c35fc3ac0 100644
--- a/dev-python/twisted-words/twisted-words-0.1.0.ebuild
+++ b/dev-python/twisted-words/twisted-words-0.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-20.1 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.1.0.ebuild,v 1.1 2005/04/08 19:22:12 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-words/twisted-words-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:19 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/Words/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc ~amd64"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted-xish/ChangeLog b/dev-python/twisted-xish/ChangeLog
index a95576496d6a..e73a2f31dfbc 100644
--- a/dev-python/twisted-xish/ChangeLog
+++ b/dev-python/twisted-xish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/twisted-xish
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-xish/ChangeLog,v 1.1 2005/04/08 19:34:13 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-xish/ChangeLog,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
+
+  27 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  twisted-xish-0.1.0.ebuild:
+  Marked ~amd64
 
   08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-xish-0.5.0:
   initial import
diff --git a/dev-python/twisted-xish/Manifest b/dev-python/twisted-xish/Manifest
index fa1b488ae0ba..faca41003798 100644
--- a/dev-python/twisted-xish/Manifest
+++ b/dev-python/twisted-xish/Manifest
@@ -1,4 +1,14 @@
-MD5 13e92572372718e32740e87d937cf023 twisted-xish-0.1.0.ebuild 762
-MD5 83bb17964a64e7186a22ed05c1da4565 ChangeLog 365
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 428a653c6a447a457fa96d9e6fd152f0 twisted-xish-0.1.0.ebuild 749
+MD5 a5f2c04ed2e78478f266526c1868ea34 ChangeLog 469
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
 MD5 5c448152d766e72c9051ceb19a5e2493 files/digest-twisted-xish-0.1.0 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDEPNW8zY1VwezZiERAu7FAJ9j21CC8GddOug6b12kRnK9I7+DSwCeMrk3
+P/gu1y6Texm/0Uor5aFr6S4=
+=VkYG
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted-xish/twisted-xish-0.1.0.ebuild b/dev-python/twisted-xish/twisted-xish-0.1.0.ebuild
index b6e14653f716..a75f46055985 100644
--- a/dev-python/twisted-xish/twisted-xish-0.1.0.ebuild
+++ b/dev-python/twisted-xish/twisted-xish-0.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/dev-python/twisted-xish/twisted-xish-0.1.0.ebuild,v 1.1 2005/04/08 19:34:13 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted-xish/twisted-xish-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/Xish/0.1/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="~x86 ~sparc ~amd64"
 IUSE="doc"
 
 DEPEND=">=dev-python/twisted-2.0.0"
diff --git a/dev-python/twisted/ChangeLog b/dev-python/twisted/ChangeLog
index a0099e9670d1..9f1061d7b06c 100644
--- a/dev-python/twisted/ChangeLog
+++ b/dev-python/twisted/ChangeLog
@@ -1,7 +1,197 @@
 # ChangeLog for dev-python/twisted
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.1 2002/06/03 22:25:11 karltk Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/ChangeLog,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
+  05 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> twisted-2.0.0.ebuild:
+  marked ~alpha wrt bug #110575
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> -twisted-1.1.0.ebuild,
+  -twisted-1.1.1.ebuild, twisted-1.2.0.ebuild, -twisted-1.2.1_alpha2.ebuild,
+  twisted-1.3.0.ebuild, twisted-2.0.0.ebuild:
+  removed gtk2 useflag
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> twisted-1.3.0.ebuild:
+  add ~ia64
+
+  22 May 2005; Simon Stelling <blubb@gentoo.org> twisted-2.0.0.ebuild:
+  added ~amd64 keyword
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> twisted-1.1.0.ebuild,
+  twisted-1.1.1.ebuild, twisted-1.2.0.ebuild, twisted-1.2.1_alpha2.ebuild,
+  twisted-1.3.0.ebuild, twisted-2.0.0.ebuild:
+  Removed trailing * from <, <=, >= and > dependencies.
+
+  30 Apr 2005; David Holm <dholm@gentoo.org> twisted-2.0.0.ebuild:
+  Added to ~ppc
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> twisted-1.2.0.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> :
+  added zope.interface dep.
+  Thanks to Stephan Wienczny <Stephan@Wienczny.de> for pointing this out.
+
+  08 Apr 2005; Thomas Raschbacher <lordvan@gentoo.org> twisted-2.0.0.ebuild:
+  Version bump (package split now look out for twisted-web, twisted-mail,
+  twisted-conch,... within the next few days)
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> twisted-1.3.0.ebuild:
+  Added ~sparc keyword.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> twisted-1.2.0.ebuild:
+  stable on amd64.
+
+  17 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> twisted-1.1.1.ebuild,
+  twisted-1.2.0.ebuild, twisted-1.2.1_alpha2.ebuild, twisted-1.3.0.ebuild:
+  Fix pyopenssl dependencies.
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> twisted-1.2.0.ebuild:
+  Stable on alpha.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> twisted-1.1.0.ebuild,
+  twisted-1.1.1.ebuild, twisted-1.2.0.ebuild, twisted-1.2.1_alpha2.ebuild,
+  twisted-1.3.0.ebuild:
+  Fix use invocation
+
+*twisted-1.3.0 (19 May 2004)
+
+  19 May 2004; Thomas Raschbacher <lordvan@gentoo.org> +twisted-1.3.0.ebuild:
+  Version bump
+
+*twisted-1.2.1_alpha2 (06 May 2004)
+
+  06 May 2004; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.2.0.ebuild,
+  +twisted-1.2.1_alpha2.ebuild:
+  added 1.2.1_alpha2
+  marked 1.2.0 stable on x86
+
+  22 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> twisted-1.2.0.ebuild:
+  Added ~alpha to keywords.
+
+  06 Mar 2004; David Holm <dholm@gentoo.org> twisted-1.2.0.ebuild:
+  Added to ~ppc.
+
+*twisted-1.2.0 (05 Mar 2004)
+
+  05 Mar 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  twisted-1.2.0.ebuild:
+  Version Bump (~arch for now)
+
+	
+  16 Dec 2003; Jason Wever <weeve@gentoo.org> twisted-1.1.0.ebuild:
+  Changed sparc keyword to ~sparc as dependency dev-python/pycrypto was missing
+  any sparc keywords.
+
+*twisted-1.1.1 (13 Dec 2003)
+
+  21 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.1.1.ebuild,
+  twisted-1.1.0.ebuild:
+  fixed gtk,gtk2 deps
+	
+  13 Dec 2003; Bryan Østergaard,,, <kloeri@gentoo.org> twisted-1.1.1.ebuild:
+  Version bump.
+
+  06 Dec 2003; Alastair Tse <liquidx@gentoo.org> twisted-1.0.6.ebuild,
+  twisted-1.0.7.ebuild, twisted-1.0.7_rc1.ebuild, twisted-1.1.0.ebuild:
+  cleanup and fix gtk2 useflags (#34558)
+
+*twisted-1.1.0 (27 Oct 2003)
+  03 Nov 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.1.0.ebuild:
+  fixed dep for TwistedDocs -> twisted-docs move
+
+  27 Oct 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.1.0.ebuild:
+  version bump
+  using _NoDocs tarball now (dev-python/twisted-docs created)
+	
+*twisted-1.0.7 (13 Sep 2003)
+  13 Sep 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.0.7.ebuild:
+  version bump
+	
+*twisted-1.0.7-rc1 (30 Aug 2003)
+  30 Aug 2003; Thomas Raschbacher<lordvan@gentoo.org>:
+  removed alpha5
+  added rc1
+	
+*twisted-1.0.7-alpha5 (21 Aug 2003)
+  21 Aug 2003; Thomas Raschbacher <lordvan@gentoo.org>:
+  removed 1.0.7alpha4 
+  added 1.0.7alpha5
+	
+  19 Jul 2003; Alastair Tse <liquidx@gentoo.org> metadata.xml,
+  twisted-1.0.1-r1.ebuild, twisted-1.0.2.ebuild, twisted-1.0.3-r1.ebuild,
+  twisted-1.0.3.ebuild, twisted-1.0.4.ebuild, twisted-1.0.5.ebuild:
+  cleaned out old versions because of security issues pre-1.0.6. added lordvan
+  one of the maintainers
+
+*twisted-1.0.6 (29 Jun 2003)
+  29 Jun 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.0.6.ebuild:
+  new version (with security bugfix for twisted.web)
+
+  12 Jun 2003; <msterret@gentoo.org> twisted-1.0.2.ebuild:
+  add Header
+
+*twisted-1.0.5 (09 May 2003)
+  09 May 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.0.5.ebuild:
+  new ebuild (does not support python-2.1 anymore!
+	
+*twisted-1.0.4 (18 Apr 2003)
+  18 Apr 2003; Thomas Raschbacher <lordvan@gentoo.org> twisted-1.0.4.ebuild
+  new version
+	
+*twisted-1.0.3-r1 (10 Apr 2003)
+
+  10 Apr 2003; Alastair Tse <liquidx@gentoo.org> twisted-1.0.3-r1.ebuild:
+  added pygtk deps, and fix manhole to use pygtk2 is requested
+
+*twisted-1.0.3 (16 Feb 2003)
+
+  05 Apr 2003; Alastair Tse <liquidx@gentoo.org> twisted-1.0.1.ebuild,
+  twisted-1.0.1.ebuild, twisted-1.0.2_alpha4.ebuild,
+  twisted-1.0.2_alpha4.ebuild, twisted-1.0.3.ebuild:
+  bump to stable
+
+  16 Feb 2003; Thomas Raschbacher <lordvan@gentoo.org>: twisted-1.0.3.ebuild
+  version bump (~arch)
+	
+*twisted-1.0.2 (29 Jan 2003)
+  29 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org>: twisted-1.0.2.ebuild
+  version bump (~arch cuz of freeze)
+
+*twisted-1.0.2_alpha4 (23 Jan 2003)
+  23 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org>: twisted-1.0.2_alpha4.ebuild
+  version bump ~arch masked
+  26 Jan 2003; Thomas Raschbacher <lordvan@gentoo.org>: twisted-1.0.2_alpha4.ebuild
+  fixed typo in WORKDIR (fixed bug #14471)
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*twisted-1.0.1-r1 (05 Dec 2002)
+  05 Dec 2002; Thomas Raschbacher <lordvan@gentoo.org>: twisted-1.0.1-r1
+  Added dep for dev-python/pycrypto
+  Added IUSE
+	
+*twisted-1.0.1 (29 Nov 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  New version, with lots of bugfixes to the ebuild itself as well, 
+  provided by Thomas Raschbacher. 
+
+*twisted-1.0.0 (26 Okt 2002) Bart Verwilst <verwilst@gentoo.org>
+
+*twisted-0.99.4 (14 Okt 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  Long overdue new version. Masked for testing (~x86) because of the freeze.
+
+
+*twisted-0.19.0 (1 Aug 2002)
+  1 Aug 2002; Jon Nelson <jnelson@gentoo.org> twisted-0.18.0.ebuild twisted-0.19.0.ebuild :
+  
+  Add KEYWORDS to 0.18.0 and update to 0.19.0 at the same time
+  0.19.0 uses distutils eclass
+
+  Update LICENSE to use LGPL-2.1
+  
 *twisted-0.18.0 (03 Jun 2002)
 
   03 Jun 2002; Karl Trygve Kalleberg <karltk@gentoo.org> twisted-0.18.0.ebuild files/digest-twisted-0.18.0 :
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 2331cd5a265b..21d6e89acd6c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,9 +1,18 @@
-MD5 1e9979d4b31c1b1f739d50dace7a4097 ChangeLog 5322
-MD5 a292cc4da12ab047112cb1d1c924974d twisted-1.0.1-r1.ebuild 1045
-MD5 d06471a8cd5ee9b2b656271b78666209 twisted-1.0.2.ebuild 1043
-MD5 964cfc6aed5e04485cd18e27d9632f0e twisted-1.0.3.ebuild 1027
-MD5 d5cee98a24ee3f1eb23c651a07fc4878 twisted-1.0.3-r1.ebuild 1237
-MD5 bb7d3ef16b63fe638cc8becd30eede88 files/digest-twisted-1.0.3-r1 67
-MD5 962cfda0434627ad4e3e6780175833a7 files/digest-twisted-1.0.1-r1 67
-MD5 a10d97e929ad363df80f670b7579f2a6 files/digest-twisted-1.0.2 67
-MD5 bb7d3ef16b63fe638cc8becd30eede88 files/digest-twisted-1.0.3 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b334a51322c3da107d175c71db5c5b68 twisted-1.2.0.ebuild 996
+MD5 742e8cfdb91ef5a2685eb8734f209c41 twisted-1.3.0.ebuild 1061
+MD5 7d5efe87283a25e3cf2f87d1a0e0c8b5 twisted-2.0.0.ebuild 899
+MD5 004f2084935a67c95bcf27419aad9b4f ChangeLog 10137
+MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
+MD5 9e8836d4aec3a1a4f688add9c6c64877 files/digest-twisted-1.2.0 74
+MD5 387f6df81a68c591e6f30fe8878d964b files/digest-twisted-1.3.0 74
+MD5 48ff6eb1136ce5dd8f785e589a7723d5 files/digest-twisted-2.0.0 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbSeGViELBEf1JB0RArjgAJ99VcOyH+zsN4xIeN3txCu3ZBynJgCdEvnW
+JMcLeJTy7RsywlKG/Eg8+LA=
+=Iz+r
+-----END PGP SIGNATURE-----
diff --git a/dev-python/twisted/metadata.xml b/dev-python/twisted/metadata.xml
index de483c53568f..37d1f8e02e49 100644
--- a/dev-python/twisted/metadata.xml
+++ b/dev-python/twisted/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<maintainer><email>lordvan@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/dev-python/twisted/twisted-1.2.0.ebuild b/dev-python/twisted/twisted-1.2.0.ebuild
index 15bd1ffdb3d1..7a6f363aaf0e 100644
--- a/dev-python/twisted/twisted-1.2.0.ebuild
+++ b/dev-python/twisted/twisted-1.2.0.ebuild
@@ -1,7 +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/dev-python/twisted/twisted-1.2.0.ebuild,v 1.1 2004/03/05 20:12:48 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -11,14 +10,14 @@ SRC_URI="http://twisted.sourceforge.net/Twisted_NoDocs-${PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="gtk gtk2 doc"
+KEYWORDS="x86 amd64 ppc alpha"
+IUSE="gtk doc"
 
 DEPEND=">=dev-lang/python-2.2
 	>=dev-python/pycrypto-1.9_alpha6
 	dev-python/pyserial
-	dev-python/pyOpenSSL
-	gtk? ( gtk2? ( >=dev-python/pygtk-1.99* ) !gtk2? ( =dev-python/pygtk-0.6* ) )
+	dev-python/pyopenssl
+	gtk? ( >=dev-python/pygtk-1.99 )
 	doc? ( =dev-python/twisted-docs-${PV} )"
 
 S=${WORKDIR}/Twisted-${PV}
@@ -27,7 +26,7 @@ src_install() {
 	distutils_src_install
 
 	# use gtk2 if they so wish
-	if [ -n "`use gtk2`" ]; then
+	if use gtk; then
 		sed -e 's/import manhole/import manhole2/' \
 			-e 's/manhole\.run()/manhole2.run()/' \
 			-i ${D}/usr/bin/manhole
diff --git a/dev-python/twisted/twisted-1.3.0.ebuild b/dev-python/twisted/twisted-1.3.0.ebuild
index 87b0a7db4e16..9463e94e7337 100644
--- a/dev-python/twisted/twisted-1.3.0.ebuild
+++ b/dev-python/twisted/twisted-1.3.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/dev-python/twisted/twisted-1.3.0.ebuild,v 1.1 2004/05/19 20:39:26 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-1.3.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -12,14 +12,14 @@ SRC_URI="http://twisted.sourceforge.net/Twisted_NoDocs-${MY_PV}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha"
-IUSE="gtk gtk2 doc"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="gtk doc"
 
 DEPEND=">=dev-lang/python-2.2
 	>=dev-python/pycrypto-1.9_alpha6
 	dev-python/pyserial
-	dev-python/pyOpenSSL
-	gtk? ( gtk2? ( >=dev-python/pygtk-1.99* ) !gtk2? ( =dev-python/pygtk-0.6* ) )
+	dev-python/pyopenssl
+	gtk? ( >=dev-python/pygtk-1.99 )
 	doc? ( =dev-python/twisted-docs-${PV} )"
 
 S=${WORKDIR}/Twisted-${MY_PV}
@@ -28,7 +28,7 @@ src_install() {
 	distutils_src_install
 
 	# use gtk2 if they so wish
-	if [ -n "`use gtk2`" ]; then
+	if use gtk; then
 		sed -e 's/import manhole/import manhole2/' \
 			-e 's/manhole\.run()/manhole2.run()/' \
 			-i ${D}/usr/bin/manhole
diff --git a/dev-python/twisted/twisted-2.0.0.ebuild b/dev-python/twisted/twisted-2.0.0.ebuild
index 176e65a9ce95..343795ad2c97 100644
--- a/dev-python/twisted/twisted-2.0.0.ebuild
+++ b/dev-python/twisted/twisted-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/dev-python/twisted/twisted-2.0.0.ebuild,v 1.1 2005/04/08 13:56:09 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twisted/twisted-2.0.0.ebuild,v 1.1.1.1 2005/11/30 10:10:18 chriswhite Exp $
 
 inherit distutils
 
@@ -14,14 +14,15 @@ SRC_URI="http://tmrc.mit.edu/mirror/twisted/${MY_PN}/2.0/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
-IUSE="gtk gtk2 doc"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE="gtk doc"
 
 DEPEND=">=dev-lang/python-2.2
 	>=dev-python/pycrypto-1.9_alpha6
 	dev-python/pyserial
 	dev-python/pyopenssl
-	gtk2? ( >=dev-python/pygtk-1.99* )"
+	gtk? ( >=dev-python/pygtk-1.99 )
+	net-zope/zopeinterface"
 #	doc? ( =dev-python/twisted-docs-${PV} )"
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/twistedsnmp/ChangeLog b/dev-python/twistedsnmp/ChangeLog
index fced2f79c1c4..466943a87d3b 100644
--- a/dev-python/twistedsnmp/ChangeLog
+++ b/dev-python/twistedsnmp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/twistedsnmp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/ChangeLog,v 1.1 2005/07/04 15:44:37 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  05 Jul 2005; David Holm <dholm@gentoo.org> twistedsnmp-0.2.9.ebuild:
+  Added to ~ppc.
 
 *twistedsnmp-0.2.9 (04 Jul 2005)
 
diff --git a/dev-python/twistedsnmp/Manifest b/dev-python/twistedsnmp/Manifest
index 8296decbc447..b2c65ef94885 100644
--- a/dev-python/twistedsnmp/Manifest
+++ b/dev-python/twistedsnmp/Manifest
@@ -1,4 +1,4 @@
-MD5 255a29c17b7d9d27149a3cad0040d304 ChangeLog 336
+MD5 48cd829bf6a028bcba43f7437e9b5b7d ChangeLog 518
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
-MD5 a86987aa5b7cad93b663cd040682eb00 twistedsnmp-0.2.9.ebuild 772
+MD5 e4f8518eb2e9b787fe6f3e93d989072c twistedsnmp-0.2.9.ebuild 867
 MD5 8748689838f64d3fa9bac15b652ef7df files/digest-twistedsnmp-0.2.9 68
diff --git a/dev-python/twistedsnmp/twistedsnmp-0.2.9.ebuild b/dev-python/twistedsnmp/twistedsnmp-0.2.9.ebuild
index 5bad09a62d20..66f8a26d11d1 100644
--- a/dev-python/twistedsnmp/twistedsnmp-0.2.9.ebuild
+++ b/dev-python/twistedsnmp/twistedsnmp-0.2.9.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/dev-python/twistedsnmp/twistedsnmp-0.2.9.ebuild,v 1.1 2005/07/04 15:44:37 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/twistedsnmp/twistedsnmp-0.2.9.ebuild,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
 
 inherit distutils
 MY_PN="TwistedSNMP"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0" # should only be the one version installed
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 IUSE=""
 DEPEND="virtual/python
diff --git a/dev-python/urlgrabber/ChangeLog b/dev-python/urlgrabber/ChangeLog
index 1ecc60e7fcf0..7f5c555ce43c 100644
--- a/dev-python/urlgrabber/ChangeLog
+++ b/dev-python/urlgrabber/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for dev-python/urlgrabber
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/ChangeLog,v 1.1 2004/12/09 23:15:07 kloeri Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/ChangeLog,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org> urlgrabber-2.9.6.ebuild:
+  Added ~amd64 keywords.
+
+*urlgrabber-2.9.6 (28 Jun 2005)
+
+  28 Jun 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  +urlgrabber-2.9.6.ebuild:
+  Version bump. Closing bug #96420.
+
+  06 Mar 2005; Joseph Jezak <josejx@gentoo.org> urlgrabber-2.9.0.ebuild:
+  Marked ~ppc.
+
+  27 Feb 2005; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  urlgrabber-2.9.0.ebuild:
+  Marked stable on x86. Added description to metadata.
 
 *urlgrabber-2.9.0 (10 Dec 2004)
 
diff --git a/dev-python/urlgrabber/Manifest b/dev-python/urlgrabber/Manifest
index 8f4197de585e..31d28f04caca 100644
--- a/dev-python/urlgrabber/Manifest
+++ b/dev-python/urlgrabber/Manifest
@@ -1,2 +1,6 @@
-MD5 91bf86a3abb5cb2bae5b6ca1df76197e urlgrabber-2.9.0.ebuild 370
+MD5 46e5dae8d847548fde16f306ad20e661 ChangeLog 869
+MD5 3e58423ad3290f53b2d963fa4081d127 metadata.xml 1318
+MD5 62a323970e1f5cc1587497507fe44703 urlgrabber-2.9.0.ebuild 481
+MD5 e32dc99836c19203ec67ae18fa085a93 urlgrabber-2.9.6.ebuild 491
 MD5 f93cceb8379e0d6edc42cb435bbcf24b files/digest-urlgrabber-2.9.0 67
+MD5 127f1ae8488170f8db82e7620a5b3504 files/digest-urlgrabber-2.9.6 67
diff --git a/dev-python/urlgrabber/metadata.xml b/dev-python/urlgrabber/metadata.xml
index de483c53568f..277fe04e4457 100644
--- a/dev-python/urlgrabber/metadata.xml
+++ b/dev-python/urlgrabber/metadata.xml
@@ -2,4 +2,32 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+A high-level cross-protocol url-grabber.
+        
+Using urlgrabber, data can be fetched in three basic ways:
+
+urlgrab(url) copy the file to the local filesystem
+urlopen(url) open the remote file and return a file object (like urllib2.urlopen)
+urlread(url) return the contents of the file as a string
+
+
+When using these functions (or methods), urlgrabber supports the following
+features:
+
+* identical behavior for http://, ftp://, and file:// urls
+* http keepalive - faster downloads of many files by using only a single
+  connection
+* byte ranges - fetch only a portion of the file
+* reget - for a urlgrab, resume a partial download
+* progress meters - the ability to report download progress automatically,
+  even when using urlopen!
+* throttling - restrict bandwidth usage
+* retries - automatically retry a download if it fails. The number of retries
+  and failure types are configurable.
+* authenticated server access for http and ftp
+* proxy support - support for authenticated http and ftp proxies
+* mirror groups - treat a list of mirrors as a single source, automatically
+  switching mirrors if there is a failure.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/urlgrabber/urlgrabber-2.9.0.ebuild b/dev-python/urlgrabber/urlgrabber-2.9.0.ebuild
index 5d637215bb7e..2a4f4e4a4a30 100644
--- a/dev-python/urlgrabber/urlgrabber-2.9.0.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-2.9.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/dev-python/urlgrabber/urlgrabber-2.9.0.ebuild,v 1.1 2004/12/09 23:15:07 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/urlgrabber-2.9.0.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -10,5 +10,5 @@ SRC_URI="http://linux.duke.edu/projects/urlgrabber/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
diff --git a/dev-python/urlgrabber/urlgrabber-2.9.6.ebuild b/dev-python/urlgrabber/urlgrabber-2.9.6.ebuild
index e5ae7d4a1033..0d4d926d0d41 100644
--- a/dev-python/urlgrabber/urlgrabber-2.9.6.ebuild
+++ b/dev-python/urlgrabber/urlgrabber-2.9.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/dev-python/urlgrabber/urlgrabber-2.9.6.ebuild,v 1.1 2005/06/28 10:18:07 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/urlgrabber-2.9.6.ebuild,v 1.1.1.1 2005/11/30 10:10:15 chriswhite Exp $
 
 inherit distutils
 
@@ -10,5 +10,5 @@ SRC_URI="http://linux.duke.edu/projects/urlgrabber/download/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
diff --git a/dev-python/urwid/ChangeLog b/dev-python/urwid/ChangeLog
index a6b254f280a9..c39f509b8188 100644
--- a/dev-python/urwid/ChangeLog
+++ b/dev-python/urwid/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for dev-python/urwid
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/ChangeLog,v 1.1 2005/01/17 02:22:47 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/ChangeLog,v 1.1.1.1 2005/11/30 10:10:22 chriswhite Exp $
+
+*urwid-0.8.7-r1 (15 May 2005)
+
+  15 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  files/urwid-0.8.7-input.diff, -urwid-0.8.7.ebuild, +urwid-0.8.7-r1.ebuild:
+  Revised patch. bug# 92081
+
+  10 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/urwid-0.8.7-input.diff, urwid-0.8.7.ebuild:
+  Added down key patch from upstream. bug# 91338
+
+*urwid-0.8.7 (10 May 2005)
+
+  10 May 2005; Rob Cakebread <pythonhead@gentoo.org> +urwid-0.8.7.ebuild:
+  Version bump - Thanks Daniel Feliciano Branco <danielblues@yahoo.com>
+
+  27 Feb 2005; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  urwid-0.8.6.ebuild:
+  Some cleanup. Added description to metadata.
+
+  21 Feb 2005; David Holm <dholm@gentoo.org> urwid-0.8.6.ebuild:
+  Added to ~ppc.
+
+  20 Jan 2005; Rob Cakebread <pythonhead@gentoo.org> urwid-0.8.6.ebuild:
+  License changed to LGPL-2.1
 
 *urwid-0.8.6 (16 Jan 2005)
 
diff --git a/dev-python/urwid/Manifest b/dev-python/urwid/Manifest
index e87c549e6b5d..d4812f5a520d 100644
--- a/dev-python/urwid/Manifest
+++ b/dev-python/urwid/Manifest
@@ -1,2 +1,17 @@
-MD5 fa393b3bd5debd0e5fae6e46193fb524 urwid-0.8.6.ebuild 500
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f367b6d77406960c7d3d3b8151f25712 urwid-0.8.6.ebuild 747
+MD5 26d7d704ca382b7d9271064f1011385b metadata.xml 855
+MD5 2a31404f7519a0408bd815a504331e11 ChangeLog 1193
+MD5 2babe8c870c5aac5042b24e30486e376 urwid-0.8.7-r1.ebuild 870
 MD5 84b7b6bba847f6a4f3c63695b607eb8a files/digest-urwid-0.8.6 62
+MD5 aa77940438f11f48e2d3dcd568275c94 files/urwid-0.8.7-input.diff 7220
+MD5 f8967397e1d9508b8cc6df9fc17a0e75 files/digest-urwid-0.8.7-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCh4aAHOCQyz1WCXYRAux6AKCjMFQusd61S6s4R5RekcBQfngVwQCePqT0
+vtMmje9J4Tvr0rPx2qlIPy4=
+=/ujH
+-----END PGP SIGNATURE-----
diff --git a/dev-python/urwid/files/urwid-0.8.7-input.diff b/dev-python/urwid/files/urwid-0.8.7-input.diff
index 1ce066b27070..68a09c8618b3 100644
--- a/dev-python/urwid/files/urwid-0.8.7-input.diff
+++ b/dev-python/urwid/files/urwid-0.8.7-input.diff
@@ -10,7 +10,7 @@
 +	
 +
 +_escape_sequences = [
-+	('[A','up'),('[B','[down'),('[C','right'),('[D','left'),
++	('[A','up'),('[B','down'),('[C','right'),('[D','left'),
 +	('[E','5'),('[F','end'),('[H','home'),
 +
 +	('[1~','home'),('[2~','insert'),('[3~','delete'),('[4~','end'),
diff --git a/dev-python/urwid/metadata.xml b/dev-python/urwid/metadata.xml
index 301d2207cc29..074ba7fffa24 100644
--- a/dev-python/urwid/metadata.xml
+++ b/dev-python/urwid/metadata.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>python</herd>
+<herd>python</herd>
+<longdescription>
+Urwid is a curses-based user interface library.  It includes many features
+useful for text console application developers including:
+
+- Fluid interface resizing (xterm window resizing / fbset on Linux console)
+- Support for 8-bit and CJK encodings
+- Multiple text alignment and wrapping modes built-in
+- Ability to register user-defined text alignment and wrapping modes
+- Simple markup for setting text attributes
+- Powerful list box that handles scrolling between different widget types
+- List box contents may be managed with a user-defined class
+- Flexible edit box for editing many different types of text
+- Easy interface for creating HTML screen shots
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/urwid/urwid-0.8.6.ebuild b/dev-python/urwid/urwid-0.8.6.ebuild
index c89c16405e3b..c1ee65ef9bcb 100644
--- a/dev-python/urwid/urwid-0.8.6.ebuild
+++ b/dev-python/urwid/urwid-0.8.6.ebuild
@@ -1,22 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.8.6.ebuild,v 1.1 2005/01/17 02:22:47 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.8.6.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
-DESCRIPTION="urwid is a curses-based user interface library for Python."
+DESCRIPTION="Urwid is a curses-based user interface library for Python."
 HOMEPAGE="http://excess.org/urwid/"
 SRC_URI="http://excess.org/urwid/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
-IUSE=""
-DEPEND=">=dev-lang/python-2.1.3-r1"
-DOCS="browse.py edit.py test_urwid.py calc.py fib.py tour.py"
+IUSE="examples"
+DEPEND="virtual/python"
+
+src_test() {
+	${python} test_urwid.py || die "unit tests failed"
+}
 
 src_install() {
 	distutils_src_install
-	dohtml *html
+
+	dohtml tutorial.html reference.html
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins browse.py edit.py calc.py fib.py tour.py
+	fi
 }
diff --git a/dev-python/urwid/urwid-0.8.7-r1.ebuild b/dev-python/urwid/urwid-0.8.7-r1.ebuild
index e126bbf8f755..d278c1a52bb4 100644
--- a/dev-python/urwid/urwid-0.8.7-r1.ebuild
+++ b/dev-python/urwid/urwid-0.8.7-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/dev-python/urwid/urwid-0.8.7-r1.ebuild,v 1.1 2005/05/15 17:26:54 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/urwid/urwid-0.8.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:21 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/validation/ChangeLog b/dev-python/validation/ChangeLog
index e58ef33620a0..b56ca368bd69 100644
--- a/dev-python/validation/ChangeLog
+++ b/dev-python/validation/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for dev-python/validation
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/validation/ChangeLog,v 1.1 2003/10/11 06:12:57 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/validation/ChangeLog,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+
+  22 Mar 2004; <kloeri@gentoo.org> validation-1.0.1.ebuild,
+  validation-1.2.3.ebuild:
+  QA, bug #45343.
+
+*validation-1.2.3 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> validation-1.0.1.ebuild,
+  validation-1.0.ebuild, validation-1.2.3.ebuild:
+  add homepage
+
+  11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> validation-1.0.1.ebuild,
+  validation-1.0.ebuild:
+  fix SLOTing
+
+*validation-1.0.1 (11 Oct 2003)
+
+  11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> validation-1.0.1.ebuild:
+  version bump, source is now inside archetypes
 
 *validation-1.0 (10 Oct 2003)
 
diff --git a/dev-python/validation/Manifest b/dev-python/validation/Manifest
index f850a339df94..28dac09add55 100644
--- a/dev-python/validation/Manifest
+++ b/dev-python/validation/Manifest
@@ -1,2 +1,6 @@
-MD5 ce494b446fc8e7224b745d4ed86b6c10 validation-1.0.ebuild 646
-MD5 12418119718245666bf678e376f890e7 files/digest-validation-1.0 64
+MD5 e1cf87f48809b2c23d0947884c28d5ea validation-1.2.3.ebuild 1303
+MD5 e13a3ecb194e4015df2c0f8d2a0ccc5e validation-1.0.1.ebuild 1297
+MD5 afab2cd26688b8dba8f11f64b5058066 ChangeLog 965
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 223af5173c7341daf23e517d356b0a0e files/digest-validation-1.0.1 65
+MD5 bac38b349854782125c283ee177883cf files/digest-validation-1.2.3 71
diff --git a/dev-python/validation/validation-1.0.1.ebuild b/dev-python/validation/validation-1.0.1.ebuild
index 5aa244a04258..af9c66d0af93 100644
--- a/dev-python/validation/validation-1.0.1.ebuild
+++ b/dev-python/validation/validation-1.0.1.ebuild
@@ -1,9 +1,10 @@
-# 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/dev-python/validation/validation-1.0.1.ebuild,v 1.1 2003/10/11 08:38:22 robbat2 Exp $
-SLOT=0
+# $Header: /var/cvsroot/gentoo-x86/dev-python/validation/validation-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
+SLOT="0"
 IUSE=""
 DESCRIPTION="Generic validators originally defined for Archetypes"
+HOMEPAGE="http://www.sourceforge.net/projects/archetypes"
 SRC_PN=archetypes
 SRC_PV=1.0.1
 SRC_P=${SRC_PN}-${SRC_PV}
@@ -12,11 +13,10 @@ S=${WORKDIR}/${SRC_P}/${PN}
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-	RDEPEND="virtual/python"
+	DEPEND="virtual/python"
 else
-	RDEPEND="dev-lang/python"
+	DEPEND="dev-lang/python"
 fi
-DEPEND="${RDEPEND}"
 
 src_install() {
 	local python=""
diff --git a/dev-python/validation/validation-1.2.3.ebuild b/dev-python/validation/validation-1.2.3.ebuild
index 2a9e14e0b118..13e4e31db7dc 100644
--- a/dev-python/validation/validation-1.2.3.ebuild
+++ b/dev-python/validation/validation-1.2.3.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/dev-python/validation/validation-1.2.3.ebuild,v 1.1 2004/01/19 13:16:51 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/validation/validation-1.2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:28 chriswhite Exp $
 SLOT="0"
 IUSE=""
 DESCRIPTION="Generic validators originally defined for Archetypes"
@@ -13,11 +13,10 @@ S=${WORKDIR}/${SRC_P}/${PN}
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 if [ "${PYTHON_SLOT_VERSION}" = 'VIRTUAL' ] ; then
-	RDEPEND="virtual/python"
+	DEPEND="virtual/python"
 else
-	RDEPEND="dev-lang/python"
+	DEPEND="dev-lang/python"
 fi
-DEPEND="${RDEPEND}"
 
 src_install() {
 	local python=""
diff --git a/dev-python/visual/ChangeLog b/dev-python/visual/ChangeLog
index 3cab2dc40266..1e45d4864304 100644
--- a/dev-python/visual/ChangeLog
+++ b/dev-python/visual/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/visual
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.1 2005/06/01 02:04:13 tercel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/ChangeLog,v 1.1.1.1 2005/11/30 10:10:10 chriswhite Exp $
+
+  11 Sep 2005; Jonathan Smith <smithj@gentoo.org> visual-3.2.1.ebuild:
+  fixed dependency... changed >=gtkglarea-1.2 to =1.2*
+
+  13 Jul 2005; <colin@gentoo.org> visual-3.2.1.ebuild:
+  3.2.1 moved to stable on x86
 
 *visual-3.2.1 (01 Jun 2005)
 
diff --git a/dev-python/visual/Manifest b/dev-python/visual/Manifest
index fbb60d7b6c28..6f5258b087cd 100644
--- a/dev-python/visual/Manifest
+++ b/dev-python/visual/Manifest
@@ -1,3 +1,14 @@
-MD5 0b9ca1955039be56e22e04d5095da4bc metadata.xml 255
-MD5 656c145725d09ca80c163616feb35226 visual-3.2.1.ebuild 1454
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4c134cf76fb56f1537a9e92019bde6c0 visual-3.2.1.ebuild 1753
+MD5 abdc4542d3cbb0948c0b82ea3fc5729f ChangeLog 540
+MD5 dc0b1d0f6421b62d34ca91dd8ac2d52d metadata.xml 255
 MD5 6d6e6100c2055b0082f7ddbee8f2d1e2 files/digest-visual-3.2.1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJL8Sl5AvwDPiUowRApYzAJ9TSqR5iX3taGaa+FnAKuo6sAuDeACgo+eA
+dO/tP1fmqPH+u4NSN6fJNaM=
+=bKie
+-----END PGP SIGNATURE-----
diff --git a/dev-python/visual/visual-3.2.1.ebuild b/dev-python/visual/visual-3.2.1.ebuild
index 18724643fd53..e30281d2b81b 100644
--- a/dev-python/visual/visual-3.2.1.ebuild
+++ b/dev-python/visual/visual-3.2.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/dev-python/visual/visual-3.2.1.ebuild,v 1.1 2005/06/01 02:04:13 tercel Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/visual/visual-3.2.1.ebuild,v 1.1.1.1 2005/11/30 10:10:11 chriswhite Exp $
 
 inherit distutils
 
@@ -10,30 +10,35 @@ HOMEPAGE="http://www.vpython.org/"
 
 IUSE="doc examples numeric numarray"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="visual"
 
 DEPEND=">=dev-lang/python-2.3
 		virtual/opengl
 		=x11-libs/gtk+-1.2*
-		>=x11-libs/gtkglarea-1.2
+		=x11-libs/gtkglarea-1.2*
 		dev-util/pkgconfig
 		>=dev-libs/boost-1.31
 		numeric? ( dev-python/numeric )
 		numarray? ( >=dev-python/numarray-1.0 )
-		!numeric? ( !numarray? (dev-python/numeric) )"
-
-RESTRICT="nomirror"
+		!numeric? ( !numarray? ( dev-python/numeric ) )"
 
 src_compile() {
+	local myconf="--without-numarray --without-numeric"
+
 	echo
 	if useq numeric; then
 		einfo "Building with Numeric support"
-	elif useq numarray; then
+		myconf=${myconf/--without-numeric}
+	fi
+	if useq numarray; then
 		einfo "Building with Numarray support"
-	else
+		myconf=${myconf/--without-numarray}
+	fi
+	if ! useq numeric && ! useq numarray; then
 		einfo "Support for Numeric or Numarray was not specified."
 		einfo "Building with Numeric support"
+		myconf=${myconf/--without-numeric}
 	fi
 	echo
 
@@ -42,6 +47,7 @@ src_compile() {
 	--with-example-dir=/usr/share/doc/${PF}/examples \
 	$(use_enable doc docs ) \
 	$(use_enable examples ) \
+	${myconf} \
 	|| die "configure failed"
 
 	emake || die "emake failed"
diff --git a/dev-python/winpdb/ChangeLog b/dev-python/winpdb/ChangeLog
index 2bfc1974f157..732b57d178dc 100644
--- a/dev-python/winpdb/ChangeLog
+++ b/dev-python/winpdb/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-python/winpdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/winpdb/ChangeLog,v 1.1 2005/08/12 18:10:33 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/winpdb/ChangeLog,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
+
+*winpdb-1.0.6-r1 (10 Nov 2005)
+
+  10 Nov 2005; Rob Cakebread <pythonhead@gentoo.org> -winpdb-1.0.6.ebuild,
+  +winpdb-1.0.6-r1.ebuild:
+  Fix line-endings and digest due to upstream file change. bug# 112043
+
+*winpdb-1.0.6 (01 Nov 2005)
+
+  01 Nov 2005; Rob Cakebread <pythonhead@gentoo.org> -winpdb-1.0.1.ebuild,
+  +winpdb-1.0.6.ebuild:
+  Version bump.
 
 *winpdb-1.0.1 (12 Aug 2005)
 
diff --git a/dev-python/winpdb/Manifest b/dev-python/winpdb/Manifest
index db881b1a76a6..c7c7fa388ebf 100644
--- a/dev-python/winpdb/Manifest
+++ b/dev-python/winpdb/Manifest
@@ -1,4 +1,14 @@
-MD5 f63c8ec90303fbe69b37111508e2e083 winpdb-1.0.1.ebuild 489
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
-MD5 5141a6efd02f9ad05ca0867f4952a803 ChangeLog 241
-MD5 1d2cd9e1f0542f09e6d8ceff43f8906a files/digest-winpdb-1.0.1 63
+MD5 2ee08dd77e6c01de7a24ed78cffea851 ChangeLog 685
+MD5 a168888d0727fb340b8a8c926f02d403 winpdb-1.0.6-r1.ebuild 824
+MD5 6f419399c8c146e18c5a9e3bd4d142ed files/digest-winpdb-1.0.6-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDcybOTry2jroju7wRApfcAJ9yUdwXqUYj6Prf+jZuRKeRkr1WAgCffdxK
+ZD/6lDAax5UtGfIi74frPsc=
+=1GrP
+-----END PGP SIGNATURE-----
diff --git a/dev-python/winpdb/winpdb-1.0.6-r1.ebuild b/dev-python/winpdb/winpdb-1.0.6-r1.ebuild
index 2ecb2f8c4158..5db2415c75bf 100644
--- a/dev-python/winpdb/winpdb-1.0.6-r1.ebuild
+++ b/dev-python/winpdb/winpdb-1.0.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/dev-python/winpdb/winpdb-1.0.6-r1.ebuild,v 1.1 2005/11/10 18:53:51 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/winpdb/winpdb-1.0.6-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:30 chriswhite Exp $
 
 inherit distutils
 
diff --git a/dev-python/wxpython-docs/ChangeLog b/dev-python/wxpython-docs/ChangeLog
index 4146049e4871..118904e11da6 100644
--- a/dev-python/wxpython-docs/ChangeLog
+++ b/dev-python/wxpython-docs/ChangeLog
@@ -1,6 +1,86 @@
 # ChangeLog for dev-python/wxpython-docs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.1 2003/07/08 00:52:01 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/ChangeLog,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+  13 Nov 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  wxpython-docs-2.4.2.4-r1.ebuild:
+  mark ~ppc
+
+  24 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wxpython-docs-2.6.0.0-r1.ebuild:
+  Unstable on ppc.
+
+  14 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-docs-2.6.0.0-r1.ebuild:
+  Adjusted install dir. bug# 92549
+
+*wxpython-docs-2.6.0.0-r1 (13 May 2005)
+
+  13 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/wxpython-docs-2.6.0.0-writable.patch,
+  -wxpython-docs-2.6.0.0.ebuild, +wxpython-docs-2.6.0.0-r1.ebuild:
+  Removed warning dialog. bug# 92481
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/viewdocs-2.4.2.4.patch, +files/demo-2.6.0.0-version.patch,
+  +files/viewdocs-2.6.0.0.patch, wxpython-docs-2.4.2.4-r1.ebuild,
+  wxpython-docs-2.6.0.0.ebuild:
+  Fixed viewdocs.py thanks Ivan Todoroski <grnch@gmx.net> bug# 86625
+
+*wxpython-docs-2.6.0.0 (02 May 2005)
+*wxpython-docs-2.4.2.4-r1 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -wxpython-docs-2.4.0.7.ebuild, -wxpython-docs-2.4.1.2.ebuild,
+  -wxpython-docs-2.4.2.4.ebuild, +wxpython-docs-2.4.2.4-r1.ebuild,
+  +wxpython-docs-2.6.0.0.ebuild:
+  Version bump. Include demo files, removed ancient versions.
+
+  24 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  wxpython-docs-2.4.2.4.ebuild:
+  stable on amd64
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  wxpython-docs-2.4.2.4.ebuild:
+  keywords ~amd64; closes #60994.
+
+  15 Aug 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-docs-2.4.0.7.ebuild, wxpython-docs-2.4.1.2.ebuild,
+  wxpython-docs-2.4.2.4.ebuild:
+  Marked stable x86
+
+  15 Aug 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-docs-2.4.0.7.ebuild, wxpython-docs-2.4.1.2.ebuild:
+  Fixed SRC_URI
+
+  02 Aug 2004; Ferris McCormick <fmccor@gentoo.org>
+  wxpython-docs-2.4.2.4.ebuild:
+  Add ~sparc keyword.  Pure python+html, but a good workout for wxpython
+  itself.
+
+  15 Jul 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-docs-2.4.2.4.ebuild:
+  Fixed DOCDIR. Closes bug# 57237
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  wxpython-docs-2.4.0.7.ebuild, wxpython-docs-2.4.1.2.ebuild,
+  wxpython-docs-2.4.2.4.ebuild:
+  wxPython is now wxpython.
+
+*wxpython-docs-2.4.2.4 (08 Oct 2003)
+
+  08 Oct 2003; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-docs-2.4.0.7.ebuild, wxpython-docs-2.4.2.4.ebuild:
+  Version bump, marked 2.4.0.7 stable
+
+*wxpython-docs-2.4.1.2 (08 Oct 2003)
+
+  08 Oct 2003; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-docs-2.4.1.2.ebuild:
+  Version bump (bug #30601)
 
 *wxpython-docs-2.4.0.7 (08 Jul 2003)
 
diff --git a/dev-python/wxpython-docs/Manifest b/dev-python/wxpython-docs/Manifest
index 91c171483c65..6f616f486e63 100644
--- a/dev-python/wxpython-docs/Manifest
+++ b/dev-python/wxpython-docs/Manifest
@@ -1,2 +1,19 @@
-MD5 488f89585ddf95a7145083229aa99dc5 wxpython-docs-2.4.0.7.ebuild 649
-MD5 52f0f1eee85a5d6f1988758ac11c7a71 files/digest-wxpython-docs-2.4.0.7 73
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee877bda9405c6be2fcdb9aff08b649a ChangeLog 3086
+MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
+MD5 dbc25a6ab9efc80ac10cbdac0b6d762c wxpython-docs-2.4.2.4-r1.ebuild 1168
+MD5 af19496ef17dce374f7a10dc84688c07 wxpython-docs-2.6.0.0-r1.ebuild 1508
+MD5 2911f08ca57d7ce8297146ffd74e5fca files/digest-wxpython-docs-2.4.2.4-r1 146
+MD5 2e16d6b640e3678d8d85abe15dfbc3b0 files/digest-wxpython-docs-2.6.0.0-r1 225
+MD5 f98b398d5de65497f6e213f8a2dec801 files/demo-2.6.0.0-version.patch 219
+MD5 875e8ee40a9db65f42134928d4fd8e09 files/viewdocs-2.4.2.4.patch 329
+MD5 f451c42589546a9015ae771ca742a53f files/wxpython-docs-2.6.0.0-writable.patch 1342
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFDd2/K/NoSW7FuNV8RAmkIAKCDZ9jLs8oF08OJBe4cXr4pxKmqgwCgwuei
+jhpJNKlY6fMu403p/nPgpXQ=
+=jrO2
+-----END PGP SIGNATURE-----
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
index 9bcae5dbb9d3..e81e4e96f430 100644
--- a/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild
+++ b/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.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/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild,v 1.1 2005/05/02 19:02:13 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.4.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
+
+inherit eutils
 
 MY_P="${P/wxpython-docs/wxPythonDocs}"
 
@@ -11,11 +13,17 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz
 
 LICENSE="wxWinFDL-3 LGPL-2.1"
 SLOT="2.4"
-KEYWORDS="x86 ~sparc amd64"
+KEYWORDS="x86 ~sparc amd64 ~ppc"
 IUSE=""
 
-S="${WORKDIR}/wxPython-${PVR}"
-DOCDIR="wxpython-${PVR}"
+S="${WORKDIR}/wxPython-${PV}"
+DOCDIR="wxPython-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S} || die "Couldn't cd to ${S}"
+	epatch ${FILESDIR}/viewdocs-2.4.2.4.patch
+}
 
 src_install() {
 	dodir /usr/share/doc/${DOCDIR}/docs
diff --git a/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.ebuild b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.ebuild
index 982371212e5f..ec1caa3bc01b 100644
--- a/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.ebuild
+++ b/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-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/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.ebuild,v 1.1 2005/05/13 19:31:46 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython-docs/wxpython-docs-2.6.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:16 chriswhite Exp $
 
 inherit eutils
 
@@ -12,11 +12,11 @@ SRC_URI="mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.gz
 
 LICENSE="wxWinFDL-3 LGPL-2.1"
 SLOT="2.6"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
-S="${WORKDIR}/wxPython-${PVR}"
-DOCDIR="wxPython-${PVR}"
+S="${WORKDIR}/wxPython-${PV}"
+DOCDIR="wxPython-${PV}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-python/wxpython/ChangeLog b/dev-python/wxpython/ChangeLog
index 9b9f3b3dc1c2..c5f295966f36 100644
--- a/dev-python/wxpython/ChangeLog
+++ b/dev-python/wxpython/ChangeLog
@@ -1,10 +1,141 @@
-# ChangeLog for dev-python/wxPython
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.1 2004/07/03 11:46:54 kloeri Exp $
+# ChangeLog for dev-python/wxpython
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/ChangeLog,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
+
+  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wxpython-2.6.1.0.ebuild:
+  Stable on ppc.
+
+  17 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  wxpython-2.6.1.0.ebuild:
+  Stable on sparc
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> wxpython-2.6.1.0.ebuild:
+  Mark 2.6.1.0 stable on alpha
+
+  15 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.6.1.0.ebuild:
+  Stable x86. Fixed wxGTK dep
+
+*wxpython-2.4.2.4-r3 (11 Oct 2005)
+
+  11 Oct 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +wxpython-2.4.2.4-r3.ebuild:
+  Fixes bug #108643
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  wxpython-2.4.2.4-r2.ebuild:
+  Mark 2.4.2.4-r2 stable on alpha
+
+  07 Sep 2005; Simon Stelling <blubb@gentoo.org> wxpython-2.4.2.4.ebuild,
+  wxpython-2.4.2.4-r2.ebuild, wxpython-2.6.0.0-r1.ebuild,
+  wxpython-2.6.1.0.ebuild:
+  make multilib-strict aware; bug 103535
+
+*wxpython-2.6.1.0 (12 Jul 2005)
+
+  12 Jul 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/scripts-multiver-2.6.1.0.diff, +wxpython-2.6.1.0.ebuild:
+  Version bump.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  wxpython-2.4.2.4-r2.ebuild:
+  Stable on ppc.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> wxpython-2.4.2.4-r2.ebuild:
+  Stable on ppc64
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> wxpython-2.4.2.4-r2.ebuild:
+  Stable on SPARC.
+
+  22 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  wxpython-2.4.2.4-r2.ebuild:
+  Stable on hppa
+
+  18 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.4.2.4-r2.ebuild:
+  Marked stable x86
+
+*wxpython-2.6.0.0-r1 (11 May 2005)
+
+  11 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  -wxpython-2.6.0.0.ebuild, +wxpython-2.6.0.0-r1.ebuild:
+  Changed to non-monolithic build. bug# 91574, removed monolithic ebuild
+
+*wxpython-2.6.0.0 (02 May 2005)
+*wxpython-2.4.2.4-r2 (02 May 2005)
+
+  02 May 2005; Rob Cakebread <pythonhead@gentoo.org>
+  +files/scripts-multiver-2.6.0.0.diff, files/wxpy-config.py,
+  +wxpython-2.4.2.4-r2.ebuild, -wxpython-2.5.3.1.ebuild,
+  +wxpython-2.6.0.0.ebuild:
+  Version bump. Now using SLOTs.
+
+  25 Jan 2005; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.4.2.4.ebuild:
+  Moved to SLOT 2.4
+
+  31 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  11 Dec 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.5.3.1.ebuild:
+  Put headers in a better place. Closes #74019
+
+  13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.5.3.1.ebuild:
+  Fixed site_pkgs location
+
+  13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.4.2.4.ebuild:
+  Pegged deps on wxGTK at 2.4*
+
+  13 Nov 2004; Rob Cakebread <pythonhead@gentoo.org>
+  wxpython-2.4.2.4-r1.ebuild, wxpython-2.5.3.1.ebuild:
+  wxpy-config.py wasn't being copied. bug# 71043
+
+*wxpython-2.4.2.4-r1 (12 Nov 2004)
+
+  12 Nov 2004; Rob Cakebread <pythonhead@gentoo.org> +files/wxpy-config.py,
+  +files/wxversion.py, +wxpython-2.4.2.4-r1.ebuild,
+  +wxpython-2.5.3.1.ebuild:
+  Version bump, retrofitted with SLOTs, bug# 47810
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  18 Aug 2004; Tom Gall <tgall@gentoo.org> wxpython-2.4.2.4.ebuild:
+  stable on ppc64, bug #58420
+
+  06 Aug 2004; Rob Cakebread <pythonhead@gentoo.org> -wxpython-2.4.0.7.ebuild,
+  -wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild:
+  Removed obsolete versions, changed 2.4.2.4 to use new wxwidgets eclass
+
+  02 Aug 2004; Rob Cakebread <pythonhead@gentoo.org>
+  +files/controsl2.py.patch:
+  Added missing controls2.py.patch
+
+  02 Aug 2004; Ferris McCormick <fmccor@gentoo.org> wxpython-2.4.2.4.ebuild:
+  Stable for sparc.  This version runs fine, and the previous stable
+  version (2.4.1.2) no longer builds because its patch file is missing.
+  This version runs both +gtk2, -gtk2.  Also, it (and wxGTK) build with
+  gcc-3.3.3, hardened gcc-3.3.4-r1 as of the date of this entry, and run.
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wxpython-2.4.0.7.ebuild,
+  wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild:
+  dev-python/PyOpenGL is now dev-python/pyopengl - adjust dependencies
+  accordingly.
+
+  05 Jul 2004; Rob Cakebread <pythonhead@gentoo.org> wxpython-2.4.2.4.ebuild:
+  Clarified USE='gtk2' messages. Bug# 56153
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> wxpython-2.4.0.7.ebuild,
+  wxpython-2.4.1.2.ebuild, wxpython-2.4.2.4.ebuild:
+  Fix error messages.
 
 *wxpython-2.4.2.4 (03 Jul 2004)
 
-  03 Jul 2004; Bryan �stergaard <kloeri@gentoo.org> +wxpython-2.4.0.7.ebuild,
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> +wxpython-2.4.0.7.ebuild,
   +wxpython-2.4.1.2.ebuild, +wxpython-2.4.2.4.ebuild:
   Follow naming policy, rename wxPython to wxpython.
 
@@ -114,7 +245,7 @@
   back to to 2.3.3 series of wxGTK.
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
+
 *wxPython-2.3.3.1-r2 (30 Oct 2002)
 
   30 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
@@ -154,12 +285,12 @@
 
   22 Aug 2002; Nick Hadaway <raker@gentoo.org> wxPython-2.3.2.1-r1.ebuild,
   files/noglcanvas.diff, files/nogizmos.diff :
-  Ebuild disables glcancas and gizmos extensions as they currently are 
+  Ebuild disables glcancas and gizmos extensions as they currently are
   not building correctly.
 
   2 Jul 2002; Jon Nelson <jnelson@gentoo.org> wxPython-2.3.2.1-r1:
   Make lintool happy
-  expressly don't build GLCANVAS  
+  expressly don't build GLCANVAS
 
 *wxPython-2.3.2.1 (11 Apr 2002)
 
@@ -170,7 +301,7 @@
 *wxPython-2.3.2.1 (1 Feb 2002)
 
   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/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index dbe8cd6f198b..8e6b8324b8e7 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,8 +1,14 @@
-MD5 f84cf362662de7cdb23e3a1dfbfc9d34 wxpython-2.4.0.7.ebuild 3007
-MD5 8300434df8411b2e4c1e80178f355884 wxpython-2.4.1.2.ebuild 2371
-MD5 e4b8b593a689345109fec0a616cf60da ChangeLog 6318
-MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
-MD5 e634fed41c2b3ad67209fa3eeb51b430 wxpython-2.4.2.4.ebuild 3350
-MD5 88f72c81ee2c594876b3bddc9e14bb72 files/digest-wxpython-2.4.0.7 73
-MD5 ce3003c042f7c8fe4700193e357ad2ad files/digest-wxpython-2.4.1.2 73
+MD5 13ae9404698350244b4bf05b2e6eed9c ChangeLog 10911
 MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4 73
+MD5 d1efabd4c6bcd5edd9e61ca070e20ff0 files/digest-wxpython-2.4.2.4-r3 73
+MD5 a286125e4aefdde3f9adebd4f5ab6ff3 files/digest-wxpython-2.6.0.0-r1 74
+MD5 28179f7df1afe227ca36d593ff6aab33 files/digest-wxpython-2.6.1.0 74
+MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.0.0.diff 3373
+MD5 d69bb360ce49f76f26ef1ae017f4bc31 files/scripts-multiver-2.6.1.0.diff 3373
+MD5 3966851c4cfba6f57e620747f1630523 files/wxpy-config.py 3265
+MD5 49c68d8febf658844a392bd0108fdf10 files/wxversion.py 14404
+MD5 3b06f1e87549af51d78bb7bfa33728b5 metadata.xml 182
+MD5 fe78c694316a3e21d959581ffbf641a4 wxpython-2.4.2.4-r3.ebuild 3813
+MD5 b0230600572787b85708285c7d907fa7 wxpython-2.4.2.4.ebuild 2470
+MD5 90204c228ce41914368e3e67bb4aba81 wxpython-2.6.0.0-r1.ebuild 3844
+MD5 ad49316d06ab616b0c9a82f93924b2f9 wxpython-2.6.1.0.ebuild 3792
diff --git a/dev-python/wxpython/files/wxpy-config.py b/dev-python/wxpython/files/wxpy-config.py
index 5dc424b8e8ac..1ea9fda72adb 100755
--- a/dev-python/wxpython/files/wxpy-config.py
+++ b/dev-python/wxpython/files/wxpy-config.py
@@ -13,17 +13,17 @@
 
  Examples:
 
-    wx-2.4.2-gtk2-ansi
-    wx-2.4.2-gtk2-unicode
-    wx-2.5.3-gtk
+    wx-2.4-gtk2-ansi
+    wx-2.4-gtk2-unicode
+    wx-2.6-gtk
 
  It is strongly suggested you use a 2.4* version as the system default
  because most stable wxPython applications are known to work with it.
- Applications that only work with 2.5* can use this code to
- select 2.5*
+ Applications that only work with 2.6* can use this code to
+ select 2.6*
 
      import wxversion
-     wxversion.select("2.5")
+     wxversion.select("2.6")
      import wx
 
  See this documentation for more info if you're a wxPython developer:
@@ -40,7 +40,7 @@ PYVER = sys.version[0:3]
 SITE_PKGS = "/usr/lib/python%s/site-packages" % PYVER
 
 ENCODINGS = ["gtk2-ansi", "gtk2-unicode", "gtk-ansi"]
-WX_VERSIONS = ["2.4.2", "2.5.3"]
+WX_VERSIONS = ["2.4", "2.6"]
 
 
 def versions_installed():
diff --git a/dev-python/wxpython/files/wxversion.py b/dev-python/wxpython/files/wxversion.py
index bd0202e4030f..fa13730c8727 100644
--- a/dev-python/wxpython/files/wxversion.py
+++ b/dev-python/wxpython/files/wxversion.py
@@ -7,7 +7,7 @@
 # Author:      Robin Dunn
 #
 # Created:     24-Sept-2004
-# RCS-ID:      $Id: wxversion.py,v 1.1 2004/11/13 04:08:20 pythonhead Exp $
+# RCS-ID:      $Id: wxversion.py,v 1.1.1.1 2005/11/30 10:10:24 chriswhite Exp $
 # Copyright:   (c) 2004 by Total Control Software
 # Licence:     wxWindows license
 #----------------------------------------------------------------------
diff --git a/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild b/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild
index 01b569f75273..67c6009fe7c7 100644
--- a/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild
+++ b/dev-python/wxpython/wxpython-2.4.2.4-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/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild,v 1.1 2005/10/11 16:12:22 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4-r3.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
 inherit eutils wxwidgets python multilib
 
diff --git a/dev-python/wxpython/wxpython-2.4.2.4.ebuild b/dev-python/wxpython/wxpython-2.4.2.4.ebuild
index 97d59055dca4..19b3c0aa5d16 100644
--- a/dev-python/wxpython/wxpython-2.4.2.4.ebuild
+++ b/dev-python/wxpython/wxpython-2.4.2.4.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/dev-python/wxpython/wxpython-2.4.2.4.ebuild,v 1.1 2004/07/03 11:46:54 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.4.2.4.ebuild,v 1.1.1.1 2005/11/30 10:10:23 chriswhite Exp $
 
-inherit eutils
+inherit eutils wxwidgets multilib
 
 MY_P="${P/wxpython-/wxPythonSrc-}"
 S="${WORKDIR}/${MY_P}/wxPython"
@@ -11,66 +11,50 @@ HOMEPAGE="http://www.wxpython.org/"
 SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
 
 LICENSE="wxWinLL-3"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc alpha arm ~amd64 ia64 hppa"
-IUSE="opengl tiff jpeg png gtk2 unicode"
+SLOT="2.4"
+KEYWORDS="x86 ppc sparc alpha arm amd64 ia64 hppa ppc64"
+IUSE="gtk2 unicode opengl tiff jpeg png"
 
 RDEPEND=">=dev-lang/python-2.1
-	>=x11-libs/wxGTK-2.4.2
+	=x11-libs/wxGTK-2.4.2*
 	gtk2? ( >=x11-libs/gtk+-2.0
 		>=x11-libs/pango-1.2
 		>=dev-libs/glib-2.0 )
+	unicode? ( >=x11-libs/gtk+-2.0
+		>=x11-libs/pango-1.2
+		>=dev-libs/glib-2.0 )
 	!gtk2? ( =x11-libs/gtk+-1.2*
 		=dev-libs/glib-1.2* )
 	png? ( media-libs/libpng )
 	jpeg? ( media-libs/jpeg )
 	tiff? ( media-libs/tiff )
 	>=sys-libs/zlib-1.1.4
-	opengl? ( >=dev-python/PyOpenGL-2.0.0.44 )"
+	opengl? ( >=dev-python/pyopengl-2.0.0.44 )"
 
 DEPEND="${RDEPEND}
 	gtk2? ( dev-util/pkgconfig )"
 
 pkg_setup() {
-	# make sure if you want gtk2, you have wxGTK with gtk2, and vice versa
-	if use gtk2; then
-		if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2ud-2.4-config" -a ! -f "/usr/bin/wxgtk2-2.4-config" -a ! -f "/usr/bin/wxgtk2d-2.4-config" ]; then
-			eerror "You need x11-libs/wxGTK compiled with GTK+2 support."
-			eerror "Either emerge wxGTK with 'gtk2' in your USE flags or"
-			eerror "emerge wxPython without 'gtk2' in your USE flags."
-			die "wxGTK needs to be compiled with gtk2"
-		fi
-	else
-		if [ ! -f "/usr/bin/wxgtk-2.4-config" ]; then
-			eerror "You need x11-libs/wxGTK compiled with GTK+1."
-			eerror "Either emerge wxGTK without 'gtk2' in your USE flags or"
-			eerror "emerge wxPython with 'gtk2' in your USE flags."
-			die "wxGTK needs to be compiled without gtk2"
-		fi
-	fi
-
-	# make sure that wxPython and wxGTK have same unicode setting:
-	if use unicode; then
-		if [ ! -f "/usr/bin/wxgtk2u-2.4-config" -a ! -f "/usr/bin/wxgtk2ud-2.4-config" ]; then
-			eerror "You need x11-libs/wxGTK compiled with Unicode support."
-			eerror "Either emerge wxGTK with 'unicode' in your USE flags or"
-			eerror "emerge wxPython without 'unicode' in your USE flags."
-			die "wxGTK needs to be compiled with unicode"
-		fi
-	else
-		if [ ! -f "/usr/bin/wxgtk-2.4-config" -a ! -f "/usr/bin/wxgtk2-2.4-config" -a ! -f "/usr/bin/wxgtkd-2.4-config" -a ! -f "/usr/bin/wxgtk2d-2.4-config" ]; then
-			eerror "You need x11-libs/wxGTK compiled without Unicode."
-			eerror "Either emerge wxGTK without 'unicode' in your USE flags or"
-			eerror "emerge wxPython with 'unicode' in your USE flags."
-			die "wxGTK needs to be compiled without unicode"
-		fi
+	einfo "You can now have gtk, gtk2 and unicode versions of wxGTK"
+	einfo "simultaneously installed as of >=wxGTK-2.4.2-r2."
+	einfo "This means you can have wxpython installed using any one of those"
+	einfo "versions by setting gtk2, unicode, or -gtk2 (for gtk1) in USE"
+	if  use unicode; then
+		! use gtk2 && die "You must put gtk2 in your USE if you need unicode support"
 	fi
-
 }
 
 src_compile() {
 	local mypyconf
 
+	if ! use gtk2; then
+		need-wxwidgets gtk || die "Emerge wxGTK with -no_wxgtk1 in USE"
+	elif use unicode; then
+		need-wxwidgets unicode || die "Emerge wxGTK with unicode in USE"
+	else
+		need-wxwidgets gtk2 || die "Emerge wxGTK with gtk2 in USE"
+	fi
+
 	use opengl \
 		&& 	mypyconf="${mypyconf} BUILD_GLCANVAS=1" \
 		|| mypyconf="${mypyconf} BUILD_GLCANVAS=0"
@@ -97,5 +81,6 @@ src_install() {
 
 	use unicode && mypyconf="${mypyconf} UNICODE=1"
 
-	python setup.py ${mypyconf} install --prefix=/usr --root=${D} || die
+	python setup.py ${mypyconf} install --prefix=/usr \
+	--install-lib=/usr/$(get_libdir)/ --root=${D} || die
 }
diff --git a/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild b/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild
index 2c358eac8e62..ba52cf8aedf4 100644
--- a/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.0.0-r1.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/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild,v 1.1 2005/05/11 20:08:38 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:24 chriswhite Exp $
 
-inherit python wxwidgets eutils
+inherit python wxwidgets eutils multilib
 
 MY_P="${P/wxpython-/wxPython-src-}"
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
@@ -79,7 +79,7 @@ src_compile() {
 src_install() {
 	python_version
 	local mypyconf
-	local site_pkgs=/usr/lib/python${PYVER}/site-packages
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
 	dodir ${site_pkgs}
 
 	if ! use gtk2; then
diff --git a/dev-python/wxpython/wxpython-2.6.1.0.ebuild b/dev-python/wxpython/wxpython-2.6.1.0.ebuild
index c41f00e590bd..fbf87eea9344 100644
--- a/dev-python/wxpython/wxpython-2.6.1.0.ebuild
+++ b/dev-python/wxpython/wxpython-2.6.1.0.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/dev-python/wxpython/wxpython-2.6.1.0.ebuild,v 1.1 2005/07/12 18:48:03 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wxpython/wxpython-2.6.1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:24 chriswhite Exp $
 
-inherit python wxwidgets eutils
+inherit python wxwidgets eutils multilib
 
 MY_P="${P/wxpython-/wxPython-src-}"
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
@@ -11,11 +11,11 @@ SRC_URI="mirror://sourceforge/wxpython/${MY_P}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="2.6"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~amd64 ~ia64 ~hppa"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ppc sparc x86"
 IUSE="gtk gtk2 unicode opengl"
 
 RDEPEND=">=dev-lang/python-2.1
-	=x11-libs/wxGTK-2.6.1*
+	=x11-libs/wxGTK-2.6*
 	!<dev-python/wxpython-2.4.2.4-r1
 	gtk2? ( >=x11-libs/gtk+-2.0
 		>=x11-libs/pango-1.2
@@ -79,7 +79,7 @@ src_compile() {
 src_install() {
 	python_version
 	local mypyconf
-	local site_pkgs=/usr/lib/python${PYVER}/site-packages
+	local site_pkgs=/usr/$(get_libdir)/python${PYVER}/site-packages
 	dodir ${site_pkgs}
 
 	if ! use gtk2; then
diff --git a/dev-python/xsv/ChangeLog b/dev-python/xsv/ChangeLog
index 7f246b32f80a..df53747aedba 100644
--- a/dev-python/xsv/ChangeLog
+++ b/dev-python/xsv/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for dev-python/xsv
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xsv/ChangeLog,v 1.1 2003/09/02 21:26:48 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xsv/ChangeLog,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
+
+  15 May 2005; Bryan Østergaard <kloeri@gentoo.org> xsv-2.7.ebuild:
+  Stable on x86.
+
+  07 Feb 2005; Fernando Serboncini <fserb@gentoo.org> xsv-2.5-r1.ebuild:
+  stable on x86
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> xsv-2.7.ebuild:
+  Added to ~ppc.
+
+*xsv-2.7 (15 Jul 2004)
+
+  15 Jul 2004; Lukasz Strzygowski <lucass@gentoo.org> metadata.xml,
+  +xsv-2.7.ebuild:
+  Version bump, some little fixes to install documentation in the
+  correct directory. Added long description to metadata.xml.
+
+*xsv-2.5-r1 (29 Oct 2003)
+
+  29 Oct 2003; Rob Cakebread <pythonhead@gentoo.org> xsv-2.5-r1.ebuild,
+  xsv-2.5.ebuild:
+  Added dependency on dev-python/pyltxml, removed 2.5
 
 *xsv-2.5 (02 Sep 2003)
 
diff --git a/dev-python/xsv/Manifest b/dev-python/xsv/Manifest
index 17fb3f1ed401..7f55a7687cb5 100644
--- a/dev-python/xsv/Manifest
+++ b/dev-python/xsv/Manifest
@@ -1,2 +1,16 @@
-MD5 6d605bf45f3cd5cd7bfe35f01a4f4d2e xsv-2.5.ebuild 422
-MD5 f134d7216c196df2014bcb24241dea89 files/digest-xsv-2.5 59
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 78d4249eefee8a320bbe7d50853d404d xsv-2.7.ebuild 811
+MD5 e4a830ba66ddde837b6882f94a49dcd4 ChangeLog 1018
+MD5 1785b4c5baf9e85c889c911be11fcb38 metadata.xml 621
+MD5 dc2f77bff63d02315d169727be4ff2eb xsv-2.5-r1.ebuild 538
+MD5 76ef7541ab475f65b514eeaf2b2b6633 files/digest-xsv-2.7 59
+MD5 f134d7216c196df2014bcb24241dea89 files/digest-xsv-2.5-r1 59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCh7eyKf2g/qXtneoRArJeAJ9nzbUM76wJ2gMZY37nH+7LAjQG5ACePGw6
+NFfO7nirorcZ3Ho48Wsm6z0=
+=GjKQ
+-----END PGP SIGNATURE-----
diff --git a/dev-python/xsv/metadata.xml b/dev-python/xsv/metadata.xml
index de483c53568f..a8cc5a4f3d06 100644
--- a/dev-python/xsv/metadata.xml
+++ b/dev-python/xsv/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>python</herd>
+<longdescription>
+XSV (XML Schema Validator) is an open source (GPLed) work-in-progress
+attempt at a conformant schema-aware processor, as defined by XML Schema
+Part 1: Structures, May 2, 2001 (REC) version. It has been developed at
+the Language Technology Group of the Human Communication Research Centre
+in the Division of Informatics at the University of Edinburgh, with support
+for one of us (Thompson) from the World Wide Web Consortium.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-python/xsv/xsv-2.5-r1.ebuild b/dev-python/xsv/xsv-2.5-r1.ebuild
index 3f35982ef671..6f8893d1759a 100644
--- a/dev-python/xsv/xsv-2.5-r1.ebuild
+++ b/dev-python/xsv/xsv-2.5-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/dev-python/xsv/xsv-2.5-r1.ebuild,v 1.1 2003/10/30 08:29:42 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xsv/xsv-2.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="Python XML Schema Validator"
 SRC_URI="ftp://ftp.cogsci.ed.ac.uk/pub/XSV/${MY_P}.tar.gz"
 HOMEPAGE="http://www.ltg.ed.ac.uk/~ht/xsv-status.html"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/dev-python/xsv/xsv-2.7.ebuild b/dev-python/xsv/xsv-2.7.ebuild
index 012525f9497a..95c2be9b6fc5 100644
--- a/dev-python/xsv/xsv-2.7.ebuild
+++ b/dev-python/xsv/xsv-2.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/dev-python/xsv/xsv-2.7.ebuild,v 1.1 2004/07/15 06:35:30 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xsv/xsv-2.7.ebuild,v 1.1.1.1 2005/11/30 10:10:03 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ DESCRIPTION="Python XML Schema Validator"
 SRC_URI="ftp://ftp.cogsci.ed.ac.uk/pub/XSV/${MY_P}.tar.gz"
 HOMEPAGE="http://www.ltg.ed.ac.uk/~ht/xsv-status.html"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/games-board/ace/ChangeLog b/games-board/ace/ChangeLog
index d3d92db59a0c..634355fed9d9 100644
--- a/games-board/ace/ChangeLog
+++ b/games-board/ace/ChangeLog
@@ -1,6 +1,30 @@
-# ChangeLog for app-games/ace
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/ace
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  06 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> ace-1.2-r1.ebuild:
+  fix deps; tidy
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> ace-1.2-r1.ebuild:
+  Removed INSTALL file.
+
+  02 Jan 2005; Mike Frysinger <vapier@gentoo.org> ace-1.2-r1.ebuild:
+  Punt all the autotool crap and just fix the timestamp of configure.in #76473.
+
+  28 Dec 2004; Joseph Jezak <josejx@gentoo.org> ace-1.2-r1.ebuild:
+  Marked ppc stable.
+
+  14 Nov 2004; Michael Hanselmann <hansmi@gentoo.org> ace-1.2-r1.ebuild:
+  Added to ~sparc.
+
+  02 Nov 2004; Joseph Jezak <josejx@gentoo.org> ace-1.2-r1.ebuild:
+  GCC 3.4 fix from Yuri Vasilevski, bug #67794.  Marked ~ppc.
+
+  22 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> ace-1.2-r1.ebuild:
+  WANT_AUTOMAKE=1.4 for bug #54701 - thanks to Ian Truelsen
+
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ace-1.2-r1.ebuild:
+  don't rdepend on libtool and sed
 
   30 Jul 2003; Michael Sterrett <msterret@gentoo.org> ace-1.2-r1.ebuild:
   use sed -i
diff --git a/games-board/ace/Manifest b/games-board/ace/Manifest
index cdb764689f5d..c6a9116cb2b2 100644
--- a/games-board/ace/Manifest
+++ b/games-board/ace/Manifest
@@ -1,3 +1,5 @@
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 5e8d33435873284eee2f840b61cb7bbf ace-1.2-r1.ebuild 851
+MD5 426e7e450472402815a2438bf68584a0 ChangeLog 1464
 MD5 0db35cac674353398197d9ae9feb9fc3 files/digest-ace-1.2-r1 59
-MD5 b6ae68de05b3a2d2f8280fae8cd6368b ace-1.2-r1.ebuild 971
-MD5 21fcdc141cf1631bbc9262958c4dcb89 ChangeLog 570
+MD5 1dbc44808235a583afa1158ba19cb5a6 files/ace-1.2-check_for_end_of_game.patch 262
diff --git a/games-board/ace/ace-1.2-r1.ebuild b/games-board/ace/ace-1.2-r1.ebuild
index 89422917e201..8b6a6bdeff13 100644
--- a/games-board/ace/ace-1.2-r1.ebuild
+++ b/games-board/ace/ace-1.2-r1.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/games-board/ace/ace-1.2-r1.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ace/ace-1.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="DJ Delorie's Ace of Penguins solitaire games"
 HOMEPAGE="http://www.delorie.com/store/ace/"
@@ -10,29 +10,25 @@ SRC_URI="http://www.delorie.com/store/ace/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
 
-DEPEND="x11-base/xfree
-	>=sys-apps/sed-4
+DEPEND="virtual/x11
 	media-libs/libpng
-	sys-libs/zlib
-	>=sys-devel/libtool-1.3.4"
+	sys-libs/zlib"
 
-src_compile() {
-	egamesconf || die
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/ace-1.2-check_for_end_of_game.patch
 
-	for f in `grep 1.3.4 * -l` ; do
-		sed -i -e 's:1.3.4::' ${f} || die "sed ${f} failed"
-	done
-	emake || die "emake died (first pass)"
-	./ltconfig ltmain.sh || die "./ltconfig failed"
-	emake || die "emake died (second pass)"
+	# Fix timestamps so we dont run autotools #76473
+	touch -r aclocal.m4 configure.in
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-	rm docs/COPYING
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README
 	dohtml docs/*
 	prepgamesdirs
 }
diff --git a/games-board/ace/metadata.xml b/games-board/ace/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/ace/metadata.xml
+++ b/games-board/ace/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/atakks/ChangeLog b/games-board/atakks/ChangeLog
index 17d94c37fecc..78da33496681 100644
--- a/games-board/atakks/ChangeLog
+++ b/games-board/atakks/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-board/atakks
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/atakks/ChangeLog,v 1.1 2004/06/02 08:29:58 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/atakks/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  11 Nov 2004; Joseph Jezak <josejx@gentoo.org> atakks-1.0.ebuild:
+  Marked ppc stable.
+
+  11 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> :
+  Added ~amd64 KEYWORD and closing bug #69765.
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> atakks-1.0.ebuild:
+  Added to ~ppc.
 
 *atakks-1.0 (02 Jun 2004)
 
diff --git a/games-board/atakks/Manifest b/games-board/atakks/Manifest
index b59aa945f109..5aad4dae7a81 100644
--- a/games-board/atakks/Manifest
+++ b/games-board/atakks/Manifest
@@ -1,4 +1,5 @@
-MD5 0a4883eae5d4eb8ff5af9e8fbb6c36de atakks-1.0.ebuild 1029
+MD5 0c78e0c26914103b1ddae814822fdb1f atakks-1.0.ebuild 1183
+MD5 5fb97dc7acd1af2e61dda24753b48565 ChangeLog 665
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 72c4f16cc5669d6e67ffded2c74fff9f ChangeLog 306
+MD5 691b70eadcc8b0fa2a7d7e44a89ecaa1 files/1.0-warnings.patch 975
 MD5 90961f342c8ec6af1466aa72b6931080 files/digest-atakks-1.0 61
diff --git a/games-board/atakks/atakks-1.0.ebuild b/games-board/atakks/atakks-1.0.ebuild
index 8d500803b0cf..695ae7635940 100644
--- a/games-board/atakks/atakks-1.0.ebuild
+++ b/games-board/atakks/atakks-1.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/games-board/atakks/atakks-1.0.ebuild,v 1.1 2004/06/02 08:29:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/atakks/atakks-1.0.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 RDEPEND=">=media-libs/libsdl-1.2.7"
diff --git a/games-board/camato/ChangeLog b/games-board/camato/ChangeLog
index 4d2b67dfa941..1908673b03c4 100644
--- a/games-board/camato/ChangeLog
+++ b/games-board/camato/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/camato
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/camato/ChangeLog,v 1.1 2004/09/10 19:52:37 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/camato/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  15 Oct 2004; David Holm <dholm@gentoo.org> camato-0.6.2.ebuild:
+  Added to ~ppc.
 
 *camato-0.6.2 (10 Sep 2004)
 
diff --git a/games-board/camato/Manifest b/games-board/camato/Manifest
index f6468844e744..4e30775d6e83 100644
--- a/games-board/camato/Manifest
+++ b/games-board/camato/Manifest
@@ -1,3 +1,4 @@
-MD5 fc31f729db84c3b6e1f03fb8611369a5 camato-0.6.2.ebuild 591
+MD5 eea79eacb44ae31cd9eb66c27b712864 ChangeLog 423
+MD5 6002c4bf87a9a26062e5fd267c6388e0 camato-0.6.2.ebuild 791
 MD5 182c31eeb5c074719e6375327e0bec06 metadata.xml 347
 MD5 06d68f8f7c55c5e6d8d246f8f7967d1b files/digest-camato-0.6.2 63
diff --git a/games-board/camato/camato-0.6.2.ebuild b/games-board/camato/camato-0.6.2.ebuild
index a09c82dbecf2..2e275571e3cf 100644
--- a/games-board/camato/camato-0.6.2.ebuild
+++ b/games-board/camato/camato-0.6.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/games-board/camato/camato-0.6.2.ebuild,v 1.1 2004/09/10 19:52:37 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/camato/camato-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 MY_PV=${PV//./_}
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://yusei.ragondux.com/loisirs_jdp_catane_camato-en.html"
 SRC_URI="http://yusei.ragondux.com/files/gnocatan/${PN}-${MY_PV}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="dev-ruby/ruby-gtk2"
diff --git a/games-board/ccgo/ChangeLog b/games-board/ccgo/ChangeLog
index 7715f0471068..7516f5dc303b 100644
--- a/games-board/ccgo/ChangeLog
+++ b/games-board/ccgo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/ccgo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ccgo/ChangeLog,v 1.1 2005/07/29 05:28:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ccgo/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  29 Jul 2005; David Holm <dholm@gentoo.org> ccgo-0.3.6.2.ebuild:
+  Added to ~ppc.
 
 *ccgo-0.3.6.2 (29 Jul 2005)
 
diff --git a/games-board/ccgo/Manifest b/games-board/ccgo/Manifest
index 18ebbebd6b8b..f10cb29142e9 100644
--- a/games-board/ccgo/Manifest
+++ b/games-board/ccgo/Manifest
@@ -1,2 +1,4 @@
-MD5 3f4a0da38c8e7e3a488d0a2cb1692b94 ccgo-0.3.6.2.ebuild 642
+MD5 9a8dfede1198422d30c8d0522465dcab ChangeLog 480
+MD5 bf974a99af9543573d1fb16e88ad6520 ccgo-0.3.6.2.ebuild 738
+MD5 7be057a9771e6eb03103063d47a366b8 metadata.xml 388
 MD5 6bf1b1c079d5b5564dd1b062ebb10160 files/digest-ccgo-0.3.6.2 64
diff --git a/games-board/ccgo/ccgo-0.3.6.2.ebuild b/games-board/ccgo/ccgo-0.3.6.2.ebuild
index 0d2a05e48783..8c97d7d216f6 100644
--- a/games-board/ccgo/ccgo-0.3.6.2.ebuild
+++ b/games-board/ccgo/ccgo-0.3.6.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/games-board/ccgo/ccgo-0.3.6.2.ebuild,v 1.1 2005/07/29 05:28:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ccgo/ccgo-0.3.6.2.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="http://ccdw.org/~cjj/prog/ccgo/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
 IUSE="nls"
 
 DEPEND=">=dev-cpp/gtkmm-2.4
diff --git a/games-board/cgoban/ChangeLog b/games-board/cgoban/ChangeLog
index 9abf9f471e3d..319554b17126 100644
--- a/games-board/cgoban/ChangeLog
+++ b/games-board/cgoban/ChangeLog
@@ -1,6 +1,25 @@
-# ChangeLog for app-games/cgoban
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/cgoban
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  02 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -cgoban-1.9.12.ebuild, cgoban-1.9.14.ebuild:
+  clean old version; tidy
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> cgoban-1.9.12.ebuild,
+  cgoban-1.9.14.ebuild:
+  virtual/glibc -> virtual/libc
+
+  21 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> cgoban-1.9.14.ebuild:
+  keyword for amd64 (bug #48574)
+
+*cgoban-1.9.14 (09 Feb 2004)
+
+  09 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> cgoban-1.9.14.ebuild:
+  version bump (bug #40975)
 
 *cgoban-1.9.12 (03 Mar 2003)
 
@@ -9,7 +28,7 @@
 
 *cgoban-1.9.11 (1 Feb 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> cgoban-1.9.11.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> cgoban-1.9.11.ebuild :
   Added LICENSE, KEYWORDS.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/games-board/cgoban/Manifest b/games-board/cgoban/Manifest
index 3382212e39cc..61bfefd84e1d 100644
--- a/games-board/cgoban/Manifest
+++ b/games-board/cgoban/Manifest
@@ -1,3 +1,4 @@
-MD5 d5957915301c2703744cdb6dd01b5d31 ChangeLog 914
-MD5 bd082b967ecbb6b1e096dd2cf02eb53b cgoban-1.9.12.ebuild 603
-MD5 af9d552579fbe9905bc5c46360d4f953 files/digest-cgoban-1.9.12 65
+MD5 df0209206ce6301f77992f21a9cb79b2 ChangeLog 1531
+MD5 a6753d5e4345e4ff3a1f41a6d4440e73 cgoban-1.9.14.ebuild 727
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 3dc18755aaa342e190dfba70d1736c6f files/digest-cgoban-1.9.14 65
diff --git a/games-board/cgoban/cgoban-1.9.14.ebuild b/games-board/cgoban/cgoban-1.9.14.ebuild
index fd3c720620f7..01e19ea99f19 100644
--- a/games-board/cgoban/cgoban-1.9.14.ebuild
+++ b/games-board/cgoban/cgoban-1.9.14.ebuild
@@ -1,23 +1,30 @@
-# 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/games-board/cgoban/cgoban-1.9.14.ebuild,v 1.1 2004/02/09 23:30:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban/cgoban-1.9.14.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="A Go-frontend"
 HOMEPAGE="http://cgoban1.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cgoban1/${P}.tar.gz"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/glibc
-	virtual/x11"
+DEPEND="virtual/x11"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp cgoban_icon.png ${PN}.png || die "cp failed"
+}
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README TODO
+	doicon ${PN}.png
+	make_desktop_entry cgoban Cgoban
 	prepgamesdirs
 }
diff --git a/games-board/cgoban/metadata.xml b/games-board/cgoban/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/cgoban/metadata.xml
+++ b/games-board/cgoban/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/cgoban2/ChangeLog b/games-board/cgoban2/ChangeLog
index 1ff1045352de..8ee2011f2380 100644
--- a/games-board/cgoban2/ChangeLog
+++ b/games-board/cgoban2/ChangeLog
@@ -1,9 +1,122 @@
-# ChangeLog for app-games/cgoban2
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/cgoban2
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+*cgoban2-2.6.12 (12 Apr 2005)
+
+  12 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -cgoban2-2.6.11.ebuild, +cgoban2-2.6.12.ebuild:
+  version bump; clean older version
+
+*cgoban2-2.6.11 (08 Apr 2005)
+
+  08 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +cgoban2-2.6.11.ebuild:
+  version bump
+
+  02 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -cgoban2-2.6.7.ebuild, -cgoban2-2.6.8.ebuild, -cgoban2-2.6.9.ebuild:
+  clean old versions
+
+*cgoban2-2.6.10 (23 Mar 2005)
+
+  23 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.10.ebuild:
+  version bump
+
+*cgoban2-2.6.9 (22 Jan 2005)
+
+  22 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.9.ebuild:
+  version bump
+
+*cgoban2-2.6.8 (10 Dec 2004)
+
+  10 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> -cgoban2-2.6.5.ebuild,
+  -cgoban2-2.6.6.ebuild, +cgoban2-2.6.8.ebuild:
+  clean older ebuilds; version bump
+
+*cgoban2-2.6.7 (19 Nov 2004)
+
+  19 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.7.ebuild:
+  version bump
+
+  03 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> -cgoban2-2.6.4.ebuild:
+  clean older ebuild
+
+*cgoban2-2.6.6 (03 Nov 2004)
+
+  03 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.6.ebuild:
+  version bump
+
+  27 Oct 2004; Tom Martin <slarti@gentoo.org> cgoban2-2.6.5.ebuild:
+  Marked ~amd64 for bug 61056.
+
+  23 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -cgoban2-2.5.8.ebuild,
+  -cgoban2-2.6.1.ebuild, -cgoban2-2.6.3.ebuild:
+  clean older versions
+
+*cgoban2-2.6.5 (23 Sep 2004)
+
+  23 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.5.ebuild:
+  version bump
+
+*cgoban2-2.6.4 (20 Jul 2004)
+
+  20 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.4.ebuild:
+  version bump (bug #57746)
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> cgoban2-2.6.3.ebuild:
+  Added to ~ppc.
+
+*cgoban2-2.6.3 (14 Jul 2004)
+
+  14 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +cgoban2-2.6.3.ebuild:
+  version bump (bug #56940)
+
+*cgoban2-2.6.1 (27 May 2004)
+
+  27 May 2004; Michael Sterrett <mr_bones_@gentoo.org> cgoban2-2.6.1.ebuild:
+  version bump
+
+*cgoban2-2.5.8 (24 May 2004)
+
+  24 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> +cgoban2-2.5.8.ebuild:
+  Version bumped to 2.5.8 and closing bug #51835.
+
+*cgoban2-2.5.7 (17 Mar 2004)
+
+  17 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> cgoban2-2.5.7.ebuild:
+  version bump (bug #44965)
+
+*cgoban2-2.5.6 (19 Feb 2004)
+
+  19 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> cgoban2-2.5.2.ebuild,
+  cgoban2-2.5.3.ebuild, cgoban2-2.5.5.ebuild, cgoban2-2.5.6.ebuild:
+  version bump
+
+*cgoban2-2.5.5 (29 Dec 2003)
+
+  29 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> cgoban2-2.5.5.ebuild:
+  version bump
+
+  21 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> cgoban2-2.5.1.ebuild:
+  roll off oldest version
+
+*cgoban2-2.5.3 (21 Oct 2003)
+
+  21 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> cgoban2-2.5.3.ebuild:
+  version bump (bug 31656)
+
+*cgoban2-2.5.2 (26 Sep 2003)
+
+  26 Sep 2003; Michael Sterrett <msterret@gentoo.org> cgoban2-2.5.2.ebuild,
+  files/cgoban2:
+  version bump
 
 *cgoban2-2.5.1 (17 Jul 2003)
 
+  26 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add wrapper script to show nicer errors #29617.
+
   17 Jul 2003; Michael Sterrett <msterret@gentoo.org> cgoban2-2.5.1.ebuild:
   version bump (bug 24663)
 
diff --git a/games-board/cgoban2/Manifest b/games-board/cgoban2/Manifest
index c72f4302a90d..07a17d0785cd 100644
--- a/games-board/cgoban2/Manifest
+++ b/games-board/cgoban2/Manifest
@@ -1,5 +1,7 @@
-MD5 4828356df2ba94b99b03a445130eefaf files/digest-cgoban2-2.4.61 71
-MD5 37a97ab008e09ff0c6ff2f31153974a2 files/digest-cgoban2-2.5.1 70
-MD5 c881c35a9f975b610bf52371501f39e6 ChangeLog 528
-MD5 83cabe0663ae099db2309718981995bb cgoban2-2.4.61.ebuild 783
-MD5 d3a2698c848e13df3acad9cb40a64c4d cgoban2-2.5.1.ebuild 782
+MD5 3f11aaf297b2fe67404a96cda13e9bfe metadata.xml 251
+MD5 6a05c74821c7458bf3f9c0b3a7047305 cgoban2-2.6.12.ebuild 796
+MD5 707920a2e890f26bdc18f06c8b7985f3 cgoban2-2.6.10.ebuild 796
+MD5 3c4ba42b81a394018aeea65b3bc4e4b8 ChangeLog 3710
+MD5 7249f08b23b281f560ebf763f0076bcd files/digest-cgoban2-2.6.10 72
+MD5 1b0a9234d1a372284d0501e12c5717bd files/digest-cgoban2-2.6.12 72
+MD5 00f7293cf49b7639625c74a3b6f0375a files/cgoban2 430
diff --git a/games-board/cgoban2/cgoban2-2.6.10.ebuild b/games-board/cgoban2/cgoban2-2.6.10.ebuild
index e70bdd31803d..985f4fe8a7f6 100644
--- a/games-board/cgoban2/cgoban2-2.6.10.ebuild
+++ b/games-board/cgoban2/cgoban2-2.6.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/games-board/cgoban2/cgoban2-2.6.10.ebuild,v 1.1 2005/03/23 19:36:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/cgoban2-2.6.10.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
diff --git a/games-board/cgoban2/cgoban2-2.6.12.ebuild b/games-board/cgoban2/cgoban2-2.6.12.ebuild
index 33e45c9d5ccc..8603b94ae197 100644
--- a/games-board/cgoban2/cgoban2-2.6.12.ebuild
+++ b/games-board/cgoban2/cgoban2-2.6.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/games-board/cgoban2/cgoban2-2.6.12.ebuild,v 1.1 2005/04/12 21:52:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/cgoban2-2.6.12.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
diff --git a/games-board/cgoban2/files/cgoban2 b/games-board/cgoban2/files/cgoban2
index f5f054f53433..5d28422b536f 100644
--- a/games-board/cgoban2/files/cgoban2
+++ b/games-board/cgoban2/files/cgoban2
@@ -1,10 +1,12 @@
 #!/bin/sh
-cd GENTOO_DIR
-javabin="`which java 2>/dev/null`"
-if [ -z "${javabin}" ] ; then
-	echo "No 'java' binary found."
-	echo "You should run 'java-config' to choose your default VM."
-	exit 1
-else
-	exec java -jar cgoban.jar "$@"
-fi
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/cgoban2/files/cgoban2,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+which java > /dev/null 2>&1 && \
+	java -jar INSTALL_DIR/cgoban.jar $* && \
+	exit 0
+
+echo "No \"java\" binary found in your PATH."
+echo "You should run \"java-config\" to choose your default VM."
+exit 1
diff --git a/games-board/crafty/ChangeLog b/games-board/crafty/ChangeLog
index 42a9f6f52482..91692569f5b3 100644
--- a/games-board/crafty/ChangeLog
+++ b/games-board/crafty/ChangeLog
@@ -1,8 +1,61 @@
-# ChangeLog for app-games/crafty
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/crafty
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
-*crafty-19.1.ebuild (25 Oct 2002)
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> crafty-19.8.ebuild:
+  Making games last on inherit line.
+
+  12 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> crafty-19.20.ebuild:
+  Stable on ppc.
+
+*crafty-19.20 (25 Aug 2005)
+
+  25 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> +crafty-19.20.ebuild:
+  version bump (bug #103567)
+
+  24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> -crafty-19.1.ebuild,
+  -crafty-19.12.ebuild, -crafty-19.15.ebuild, -crafty-19.18.ebuild:
+  clean old ebuilds
+
+  24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> crafty-19.19.ebuild:
+  stable on x86
+
+*crafty-19.19 (31 May 2005)
+
+  31 May 2005; Michael Sterrett <mr_bones_@gentoo.org> +crafty-19.19.ebuild:
+  version bump (bug #94641)
+
+*crafty-19.18 (12 Apr 2005)
+
+  12 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org> +crafty-19.18.ebuild:
+  version bump
+
+*crafty-19.15 (20 Jul 2004)
+
+  20 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +crafty-19.15.ebuild:
+  version bump
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> crafty-19.1.ebuild,
+  crafty-19.12.ebuild, crafty-19.8.ebuild:
+  virtual/glibc -> virtual/libc
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> crafty-19.8.ebuild:
+  Fix use invocation
+
+*crafty-19.12 (06 Apr 2004)
+
+  06 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> crafty-19.12.ebuild:
+  version bump
+
+*crafty-19.8 (31 Dec 2003)
+
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Update to 19.8 and clean up #34789.
+
+*crafty-19.1 (25 Oct 2002)
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> crafty-19.1.ebuild:
+  mark stable on amd64
 
   25 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
   Update to 19.1 per #9657.
diff --git a/games-board/crafty/Manifest b/games-board/crafty/Manifest
index 99d970ef4ff8..cd9f52566056 100644
--- a/games-board/crafty/Manifest
+++ b/games-board/crafty/Manifest
@@ -1,4 +1,6 @@
-MD5 f38e5eac5da4190272d211e5f841e542 ChangeLog 936
-MD5 c3d8d47d95c59e404a11a1ca49234637 crafty-19.1.ebuild 2289
-MD5 1cfc5524de1fd69ae391d434d6e483d9 files/crafty-18.15-ppc.patch 634
-MD5 cf2bf7fa0aa2a30369f35f79bbc0f44a files/digest-crafty-19.1 63
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 6646e459c86a10c6539f2c91341d3e22 crafty-19.20.ebuild 2275
+MD5 d0a5ce169e3de402085e8fc69be3e1cf crafty-20.1.ebuild 2287
+MD5 db309e06fa0025cad92342bb96311154 ChangeLog 2485
+MD5 65a97af46b1a4567e7df624c923cbc9a files/digest-crafty-20.1 60
+MD5 1d2478ad97099a71745f628650cfa99b files/digest-crafty-19.20 64
diff --git a/games-board/crafty/crafty-19.20.ebuild b/games-board/crafty/crafty-19.20.ebuild
index 931f4cb78078..5fb561c08eb3 100644
--- a/games-board/crafty/crafty-19.20.ebuild
+++ b/games-board/crafty/crafty-19.20.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/games-board/crafty/crafty-19.20.ebuild,v 1.1 2005/08/25 00:46:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-19.20.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit flag-o-matic games
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.cis.uab.edu/pub/hyatt/source/${P}.tar.gz"
 
 LICENSE="crafty"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="icc no-opts"
 
 RDEPEND=""
diff --git a/games-board/crafty/crafty-20.1.ebuild b/games-board/crafty/crafty-20.1.ebuild
index dadde88b7d92..14cf722e50c8 100644
--- a/games-board/crafty/crafty-20.1.ebuild
+++ b/games-board/crafty/crafty-20.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/games-board/crafty/crafty-20.1.ebuild,v 1.1 2005/11/12 11:21:52 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/crafty/crafty-20.1.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit flag-o-matic games
 
diff --git a/games-board/crafty/metadata.xml b/games-board/crafty/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/crafty/metadata.xml
+++ b/games-board/crafty/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/daemonshogi/ChangeLog b/games-board/daemonshogi/ChangeLog
index 4554bb53d15b..aa1817394526 100644
--- a/games-board/daemonshogi/ChangeLog
+++ b/games-board/daemonshogi/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for app-games/daemonshogi
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/daemonshogi/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/daemonshogi
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/daemonshogi/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  12 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  daemonshogi-0.1.3.ebuild:
+  Added ~amd64 KEYWORDS and closing bug #69767.
+
+  15 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  daemonshogi-0.1.3.ebuild:
+  fix for bug 33347 - patch from Mamoru KOMACHI to work with gettext-12
+
+  12 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  daemonshogi-0.1.3.ebuild:
+  fix the .po file for gettext-12 (bug 33347); more error checking/messages
 
 *daemonshogi-0.1.3 (05 Jul 2003)
 
diff --git a/games-board/daemonshogi/Manifest b/games-board/daemonshogi/Manifest
index d30a05b360c8..84ddf7a955c8 100644
--- a/games-board/daemonshogi/Manifest
+++ b/games-board/daemonshogi/Manifest
@@ -1,3 +1,4 @@
-MD5 ae8224a57c4aec6aee9d0978eee023ae daemonshogi-0.1.3.ebuild 752
-MD5 7886480d1886726111cb30cd1d6abbcd ChangeLog 498
+MD5 54bb8d0a25cf2281d1da6a9017c7c904 daemonshogi-0.1.3.ebuild 880
+MD5 eed81175af1b13f915bf734b13530fcd ChangeLog 940
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 c03a831291426128ab93478061233d42 files/digest-daemonshogi-0.1.3 69
diff --git a/games-board/daemonshogi/daemonshogi-0.1.3.ebuild b/games-board/daemonshogi/daemonshogi-0.1.3.ebuild
index a880ac5eff5b..2599b850cb75 100644
--- a/games-board/daemonshogi/daemonshogi-0.1.3.ebuild
+++ b/games-board/daemonshogi/daemonshogi-0.1.3.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/games-board/daemonshogi/daemonshogi-0.1.3.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/daemonshogi/daemonshogi-0.1.3.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
@@ -9,16 +9,19 @@ HOMEPAGE="http://www.users.yun.co.jp/~tokita/daemonshogi/"
 SRC_URI="http://www.users.yun.co.jp/~tokita/daemonshogi/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
+KEYWORDS="x86 ppc sparc ~amd64"
 SLOT="0"
-KEYWORDS="x86 ppc sparc"
 IUSE="nls"
 
-DEPEND="gnome-base/gnome-libs"
-RDEPEND="nls? ( >=sys-devel/gettext-0.10.38 )"
+DEPEND="gnome-base/gnome-libs
+	nls? ( >=sys-devel/gettext-0.10.38 )"
 
 src_compile() {
+	if use nls && has_version '>=sys-devel/gettext-0.12' ; then
+		export XGETTEXT="/usr/bin/xgettext --from-code=EUC-JP"
+	fi
 	egamesconf `use_enable nls` || die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-board/daemonshogi/metadata.xml b/games-board/daemonshogi/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/daemonshogi/metadata.xml
+++ b/games-board/daemonshogi/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/eboard/ChangeLog b/games-board/eboard/ChangeLog
index 65bb236e231b..f7ddffc8fec9 100644
--- a/games-board/eboard/ChangeLog
+++ b/games-board/eboard/ChangeLog
@@ -1,6 +1,39 @@
-# ChangeLog for app-games/eboard
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/eboard
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  16 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> eboard-0.9.5.ebuild:
+  Stable on sparc
+
+  05 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  -files/0.8.0-fake-nls.patch, -files/0.9.0-fake-nls.patch,
+  eboard-0.9.5.ebuild:
+  Keyworded ~sparc wrt #97950
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> eboard-0.9.5.ebuild:
+  Marking stable on amd64 (no bugs in 474 days).
+
+  13 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> eboard-0.9.5.ebuild:
+  marked ~amd64
+
+  02 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> eboard-0.8.0.ebuild,
+  eboard-0.9.0.ebuild, eboard-0.9.5.ebuild:
+  fix sed for CXXFLAGS (bug 36995)
+  fix config location
+  more error checking/messages
+
+*eboard-0.9.5 (01 Jan 2003)
+
+  01 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #35793.
+
+*eboard-0.9.0 (13 Oct 2003)
+
+  13 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #30978 + more extra packs.
 
 *eboard-0.8.0 (28 Jun 2003)
 
@@ -25,7 +58,7 @@
   30 Sep 2002; Mike Frysinger <vapier@gentoo.org> eboard-0.4.3-gcc3.patch :
   Added a small patch to make eboard compile under gcc3.2
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> eboard-0.4.3.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> eboard-0.4.3.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   7 May 2002; Spider <spider@gentoo.org> eboard-0.4.3.ebuild :
diff --git a/games-board/eboard/Manifest b/games-board/eboard/Manifest
index 4d0b02c472f5..6127814e6e7f 100644
--- a/games-board/eboard/Manifest
+++ b/games-board/eboard/Manifest
@@ -1,4 +1,14 @@
-MD5 3c36db72c37ae94198738d7f8abf6eb3 files/digest-eboard-0.8.0 134
-MD5 6953acbec0a7bbd9597ced29af533fd1 files/0.8.0-fake-nls.patch 191
-MD5 6474ae5b7ed1438aabaf4421b3e10fe6 eboard-0.8.0.ebuild 1220
-MD5 a7100e9b147a141fb35693df7cc48a62 ChangeLog 1662
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a8f1ffc950e6ce94583fb88ddd1b92cb eboard-0.9.5.ebuild 1835
+MD5 7c4dd5de233fdbfc6ea51d256114c286 ChangeLog 2682
+MD5 f37e8356d4b5cb9585c1bdae8dcd889c files/digest-eboard-0.9.5 201
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDAf4nKRy60XGEcJIRAgfJAJsG1PpKJgKbXmas9sB+U0NrgKqNygCgpgXK
++mSd3Bw2CXcBA5vXCLRL4Xw=
+=0xYw
+-----END PGP SIGNATURE-----
diff --git a/games-board/eboard/eboard-0.9.5.ebuild b/games-board/eboard/eboard-0.9.5.ebuild
index 9c9ea8cf5418..84563a117e65 100644
--- a/games-board/eboard/eboard-0.9.5.ebuild
+++ b/games-board/eboard/eboard-0.9.5.ebuild
@@ -1,11 +1,11 @@
-# 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/games-board/eboard/eboard-0.9.5.ebuild,v 1.1 2004/01/02 02:16:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/eboard/eboard-0.9.5.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
-EXTRAS1=eboard-extras-1pl2
-EXTRAS2=eboard-extras-2
+EXTRAS1="eboard-extras-1pl2"
+EXTRAS2="eboard-extras-2"
 DESCRIPTION="chess interface for POSIX systems"
 HOMEPAGE="http://eboard.sourceforge.net/"
 SRC_URI="mirror://sourceforge/eboard/${P}.tar.gz
@@ -14,46 +14,50 @@ SRC_URI="mirror://sourceforge/eboard/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc amd64 sparc"
 IUSE="nls"
 
-DEPEND="=x11-libs/gtk+-1*
+RDEPEND="=x11-libs/gtk+-1*
 	>=media-libs/imlib-1.9.7
 	dev-lang/perl
-	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i "s:-O6:${CXXFLAGS}:" configure
+	sed -i \
+		-e "/DATADIR/ s:\$prefix/share:${GAMES_DATADIR}:" \
+		-e "s:(\"-O6\"):split(' ', \"${CXXFLAGS}\"):" configure \
+			|| die "sed configure failed"
 }
 
 src_compile() {
-	egamesconf `use_enable nls` || die
-	emake || die
+	egamesconf $(use_enable nls) || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake install \
-		prefix=${D}/${GAMES_PREFIX} \
-		bindir=${D}/${GAMES_BINDIR} \
-		mandir=${D}/usr/share/man \
-		datadir=${D}/${GAMES_DATADIR}/${PN} \
-		|| die
-	dodoc README AUTHORS ChangeLog TODO
-	dodoc Documentation/*
-
-	insinto ${GAMES_DATADIR}/eboard
-	cd ${WORKDIR}/${EXTRAS1}
-	doins *.png *.wav
-	newins extras1.conf themeconf.extras1
-	newdoc ChangeLog Changelog.extras
-	newdoc README README.extras
-	dodoc CREDITS
-	cd ${WORKDIR}/${EXTRAS2}
-	doins *.png *.wav
-	newins extras2.conf themeconf.extras2
+	make \
+		prefix="${D}/${GAMES_PREFIX}" \
+		bindir="${D}/${GAMES_BINDIR}" \
+		mandir="${D}/usr/share/man" \
+		datadir="${D}/${GAMES_DATADIR}/${PN}" \
+			install || die "make install failed"
+	dodoc README AUTHORS ChangeLog TODO Documentation/* || die "dodoc failed"
+
+	cd "${WORKDIR}/${EXTRAS1}"
+	insinto "${GAMES_DATADIR}/eboard"
+	doins *.png *.wav || die "doins failed (extra1)"
+	newins extras1.conf themeconf.extras1 || die "newins failed (extra1)"
+	newdoc ChangeLog Changelog.extras || die "newdoc failed (extra1.1)"
+	newdoc README README.extras || die "newdoc failed (extra1.2)"
+	dodoc CREDITS || die "dodoc failed (extra1)"
+
+	cd "${WORKDIR}/${EXTRAS2}"
+	doins *.png *.wav || die "doins failed (extra2)"
+	newins extras2.conf themeconf.extras2 || die "newins failed (extra2)"
 
 	prepgamesdirs
 }
diff --git a/games-board/eboard/metadata.xml b/games-board/eboard/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/eboard/metadata.xml
+++ b/games-board/eboard/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gamazons/ChangeLog b/games-board/gamazons/ChangeLog
index 0016505e98d5..124e6d758c41 100644
--- a/games-board/gamazons/ChangeLog
+++ b/games-board/gamazons/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/gamazons
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gamazons/ChangeLog,v 1.1 2005/01/29 03:06:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gamazons/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  22 Feb 2005; David Holm <dholm@gentoo.org> gamazons-0.83.ebuild:
+  Added to ~ppc.
 
 *gamazons-0.83 (28 Jan 2005)
 
diff --git a/games-board/gamazons/Manifest b/games-board/gamazons/Manifest
index bfe3c76b48b8..275c632a4b64 100644
--- a/games-board/gamazons/Manifest
+++ b/games-board/gamazons/Manifest
@@ -1,2 +1,4 @@
-MD5 04bc830387d9f0b2637d10d2d0aa988a gamazons-0.83.ebuild 358
+MD5 bb98aade9b89acda79e8ae11a6c42e9c ChangeLog 493
+MD5 fb71315714f31087517ae06e49446460 gamazons-0.83.ebuild 465
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 e7e74c4a14f7255191849b2a58dcd02e files/digest-gamazons-0.83 65
diff --git a/games-board/gamazons/gamazons-0.83.ebuild b/games-board/gamazons/gamazons-0.83.ebuild
index c9fc89b13dfb..5fa9d569d392 100644
--- a/games-board/gamazons/gamazons-0.83.ebuild
+++ b/games-board/gamazons/gamazons-0.83.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/games-board/gamazons/gamazons-0.83.ebuild,v 1.1 2005/01/29 03:06:38 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gamazons/gamazons-0.83.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.yorgalily.org/gamazons/src/$P.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=">=gnome-base/libgnomeui-2"
diff --git a/games-board/ggz-gtk-client/ChangeLog b/games-board/ggz-gtk-client/ChangeLog
index 6ffebebb0c53..6c2d1a3856d6 100644
--- a/games-board/ggz-gtk-client/ChangeLog
+++ b/games-board/ggz-gtk-client/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for app-games/ggz-gtk-client
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/ggz-gtk-client
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+  20 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ggz-gtk-client-0.0.9.ebuild:
+  Removed gtk2 flag per bug #106560.
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ggz-gtk-client-0.0.9.ebuild:
+  Removed INSTALL file.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*ggz-gtk-client-0.0.9 (26 Dec 2004)
+
+  26 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  +files/0.0.9-duplicate-prototypes.patch, -ggz-gtk-client-0.0.7.ebuild,
+  +ggz-gtk-client-0.0.9.ebuild:
+  Version bump #69432 by Bryan Duff.
+
+  27 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  ggz-gtk-client-0.0.7.ebuild:
+  fix gtk2 USE flag usage (bug 34559)
 
 *ggz-gtk-client-0.0.7 (10 Jul 2003)
 
@@ -9,7 +31,7 @@
 
 *ggz-gtk-client-0.0.5 (13 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> ggz-gtk-client-0.0.5.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> ggz-gtk-client-0.0.5.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   07 May 2002; Spider <spider@gentoo.org> ggz-gtk-client-0.0.5.ebuild :
diff --git a/games-board/ggz-gtk-client/Manifest b/games-board/ggz-gtk-client/Manifest
index b47b2d6e2b40..c3542d6b071a 100644
--- a/games-board/ggz-gtk-client/Manifest
+++ b/games-board/ggz-gtk-client/Manifest
@@ -1,5 +1,7 @@
+MD5 c37a1740f3be80fe19b68249d53bc598 ggz-gtk-client-0.0.9.ebuild 944
+MD5 0b364a7db3be6ed6651c2a705b0b50a3 ggz-gtk-client-0.0.5.ebuild 568
+MD5 c19cd980041fdb7b3ee43b37f08ac50c ChangeLog 1495
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 23cbf7e56fed5e7283f6b88bf62050e4 files/0.0.9-duplicate-prototypes.patch 697
 MD5 a70e4f21ed3008a0abfac956e634a71b files/digest-ggz-gtk-client-0.0.5 72
-MD5 1e8c24bd09f29cd29f9179681a676c92 files/digest-ggz-gtk-client-0.0.7 72
-MD5 0c659b32988f9a297638b25f6e360a9a ggz-gtk-client-0.0.5.ebuild 589
-MD5 5129655fe092329819f50e6fc8ebbd53 ChangeLog 803
-MD5 a761e0bb18fe6b9ac920e6b778f1fd2b ggz-gtk-client-0.0.7.ebuild 986
+MD5 76c3c06b7b7c7513f8a47b76328a9f06 files/digest-ggz-gtk-client-0.0.9 72
diff --git a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.5.ebuild b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.5.ebuild
index e982c88cef20..2d3d59c898e1 100644
--- a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.5.ebuild
+++ b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.5.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/games-board/ggz-gtk-client/ggz-gtk-client-0.0.5.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ggz-gtk-client-0.0.5.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 DESCRIPTION="The gtk client for GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -9,15 +9,11 @@ SRC_URI="mirror://sourceforge/ggz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="~dev-games/ggz-client-libs-0.0.5
 	=x11-libs/gtk+-1.2*"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.9.ebuild b/games-board/ggz-gtk-client/ggz-gtk-client-0.0.9.ebuild
index 615aa377b5d5..2f40d2830e56 100644
--- a/games-board/ggz-gtk-client/ggz-gtk-client-0.0.9.ebuild
+++ b/games-board/ggz-gtk-client/ggz-gtk-client-0.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/games-board/ggz-gtk-client/ggz-gtk-client-0.0.9.ebuild,v 1.1 2004/12/26 23:03:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-client/ggz-gtk-client-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils
 
@@ -11,11 +11,10 @@ SRC_URI="http://ftp.ggzgamingzone.org/pub/ggz/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="gtk2 nls"
+IUSE="nls"
 
 DEPEND=">=dev-games/ggz-client-libs-${PV}
-	gtk2? ( =x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1* )"
+	=x11-libs/gtk+-2* "
 
 src_unpack() {
 	unpack ${A}
@@ -26,7 +25,6 @@ src_unpack() {
 
 src_compile() {
 	local myconf="--enable-gtk=gtk2"
-	use gtk2 || myconf="--enable-gtk"
 
 	econf \
 		--disable-debug \
@@ -38,5 +36,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS QuickStart.GGZ README* TODO
+	dodoc AUTHORS ChangeLog NEWS QuickStart.GGZ README* TODO
 }
diff --git a/games-board/ggz-gtk-client/metadata.xml b/games-board/ggz-gtk-client/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/ggz-gtk-client/metadata.xml
+++ b/games-board/ggz-gtk-client/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/ggz-gtk-games/ChangeLog b/games-board/ggz-gtk-games/ChangeLog
index 24553ad7c2ce..1d579c831d99 100644
--- a/games-board/ggz-gtk-games/ChangeLog
+++ b/games-board/ggz-gtk-games/ChangeLog
@@ -1,6 +1,30 @@
-# ChangeLog for app-games/ggz-gtk-games
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/ggz-gtk-games
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  20 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ggz-gtk-games-0.0.9.ebuild:
+  Removed gtk2 flag per bug #106560.
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ggz-gtk-games-0.0.9.ebuild:
+  Removed INSTALL file.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*ggz-gtk-games-0.0.9 (26 Dec 2004)
+
+  26 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  -ggz-gtk-games-0.0.7.ebuild, +ggz-gtk-games-0.0.9.ebuild:
+  Version bump #69434 by Bryan Duff.
+
+  25 Apr 2004; Aron Griffis <agriffis@gentoo.org> ggz-gtk-games-0.0.5.ebuild:
+  Add die following econf for bug 48950
+
+  27 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  ggz-gtk-games-0.0.7.ebuild:
+  fix gtk2 USE flag usage (bug 34559)
 
 *ggz-gtk-games-0.0.7 (10 Jul 2003)
 
@@ -9,7 +33,7 @@
 
 *ggz-gtk-games-0.0.5 (13 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> ggz-gtk-games-0.0.5.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> ggz-gtk-games-0.0.5.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   07 May 2002; Spider <spider@gentoo.org> ggz-gtk-games-0.0.5.ebuild :
diff --git a/games-board/ggz-gtk-games/Manifest b/games-board/ggz-gtk-games/Manifest
index 28f4c3d40918..8eef70bf9a41 100644
--- a/games-board/ggz-gtk-games/Manifest
+++ b/games-board/ggz-gtk-games/Manifest
@@ -1,5 +1,6 @@
+MD5 98f3979310b75824fd2122e09b73e0b0 ggz-gtk-games-0.0.5.ebuild 897
+MD5 3f30874c15e67aa59c55d6b0624b4f22 ChangeLog 1570
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 9094aac3a2c2b652476405d79588c2b5 ggz-gtk-games-0.0.9.ebuild 732
 MD5 21486a6671931be37bdb42fde5c3f4ae files/digest-ggz-gtk-games-0.0.5 72
-MD5 13d4a80e2820e952f10b5b02ac97e93c files/digest-ggz-gtk-games-0.0.7 72
-MD5 7860573662d49f91582e75cfb4395d1e ggz-gtk-games-0.0.5.ebuild 871
-MD5 dee1542981305de349cc8fffe89c4b02 ChangeLog 808
-MD5 31c0d50a99e91e64ffa6715297e427d7 ggz-gtk-games-0.0.7.ebuild 941
+MD5 609fcc7c219088c238fa32b7f48d13aa files/digest-ggz-gtk-games-0.0.9 72
diff --git a/games-board/ggz-gtk-games/ggz-gtk-games-0.0.5.ebuild b/games-board/ggz-gtk-games/ggz-gtk-games-0.0.5.ebuild
index 8bf5f5af9677..1b6e40df9d3f 100644
--- a/games-board/ggz-gtk-games/ggz-gtk-games-0.0.5.ebuild
+++ b/games-board/ggz-gtk-games/ggz-gtk-games-0.0.5.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/games-board/ggz-gtk-games/ggz-gtk-games-0.0.5.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ggz-gtk-games-0.0.5.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 DESCRIPTION="These are the gtk versions of the games made by GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -9,11 +9,12 @@ SRC_URI="mirror://sourceforge/ggz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
-DEPEND="=app-games/ggz-gtk-client-0.0.5"
+DEPEND="=games-board/ggz-gtk-client-0.0.5"
 
 src_compile() {
-	econf
+	econf || die "econf failed"
 	# we need to remove some /usr-paths that ggz-config puts into in 
 	# the makefile.  ugly.  :/
 
diff --git a/games-board/ggz-gtk-games/ggz-gtk-games-0.0.9.ebuild b/games-board/ggz-gtk-games/ggz-gtk-games-0.0.9.ebuild
index 7ffa0c3886fd..45b477f85613 100644
--- a/games-board/ggz-gtk-games/ggz-gtk-games-0.0.9.ebuild
+++ b/games-board/ggz-gtk-games/ggz-gtk-games-0.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/games-board/ggz-gtk-games/ggz-gtk-games-0.0.9.ebuild,v 1.1 2004/12/26 23:09:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-gtk-games/ggz-gtk-games-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 DESCRIPTION="These are the gtk versions of the games made by GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -9,15 +9,13 @@ SRC_URI="http://ftp.ggzgamingzone.org/pub/ggz/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="gtk2"
+IUSE=""
 
 DEPEND=">=games-board/ggz-gtk-client-${PV}
-	gtk2? ( =x11-libs/gtk+-2* )
-	!gtk2? ( =x11-libs/gtk+-1* )"
+	=x11-libs/gtk+-2*"
 
 src_compile() {
 	myconf="--enable-gtk2"
-	use gtk2 || myconf="--enable-gtk"
 
 	econf ${myconf} || die
 	make || die
@@ -25,5 +23,5 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS QuickStart.GGZ README* TODO
+	dodoc AUTHORS ChangeLog NEWS QuickStart.GGZ README* TODO
 }
diff --git a/games-board/ggz-gtk-games/metadata.xml b/games-board/ggz-gtk-games/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/ggz-gtk-games/metadata.xml
+++ b/games-board/ggz-gtk-games/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/ggz-kde-client/ChangeLog b/games-board/ggz-kde-client/ChangeLog
index acf6eee9f983..5bc34024ddfb 100644
--- a/games-board/ggz-kde-client/ChangeLog
+++ b/games-board/ggz-kde-client/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-board/ggz-kde-client
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ChangeLog,v 1.1 2004/12/27 00:36:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 *ggz-kde-client-0.0.9 (26 Dec 2004)
 
diff --git a/games-board/ggz-kde-client/Manifest b/games-board/ggz-kde-client/Manifest
index 7fe96df72795..dcac6510f759 100644
--- a/games-board/ggz-kde-client/Manifest
+++ b/games-board/ggz-kde-client/Manifest
@@ -1,4 +1,14 @@
-MD5 4bab736482a13a95db5b7fa2f150d95d ChangeLog 1153
-MD5 70dd4f3677f5673bcb3b4ee4250e4359 ggz-kde-client-0.0.9.ebuild 623
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c172aeca43167b0bcf45ef4d469f1c69 ChangeLog 351
+MD5 e6ce68b1b0cdb8d39f5cb8d2b91939ea ggz-kde-client-0.0.9.ebuild 514
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 da3138f2189b9c33542c9aa511ef4fec files/digest-ggz-kde-client-0.0.9 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBz1koroRuSHgZdywRAqBIAJ9+ZvX18bu7GLTMVTaGfPA/JUJMMQCfRXOR
+djztxfCM8KI/ykw0Oiw7i8c=
+=6Utc
+-----END PGP SIGNATURE-----
diff --git a/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild b/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild
index 73945ecb768d..6a5f81c5b7a0 100644
--- a/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild
+++ b/games-board/ggz-kde-client/ggz-kde-client-0.0.9.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/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild,v 1.1 2004/12/27 00:36:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-client/ggz-kde-client-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit kde
 
diff --git a/games-board/ggz-kde-games/ChangeLog b/games-board/ggz-kde-games/ChangeLog
index fc3faa1d461b..478ebf6fd9e5 100644
--- a/games-board/ggz-kde-games/ChangeLog
+++ b/games-board/ggz-kde-games/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-board/ggz-kde-games
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-games/ChangeLog,v 1.1 2004/12/27 00:38:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-games/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 *ggz-kde-games-0.0.9 (26 Dec 2004)
 
diff --git a/games-board/ggz-kde-games/Manifest b/games-board/ggz-kde-games/Manifest
index 5c2f8cd06963..48b8ad36dc99 100644
--- a/games-board/ggz-kde-games/Manifest
+++ b/games-board/ggz-kde-games/Manifest
@@ -1,4 +1,14 @@
-MD5 30bfd7b9a893d9385a4f89066affe483 ChangeLog 349
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a3a7a6188f26285efb36a71ea63c0a22 ChangeLog 349
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 e273c9f04c7f12deb7aafab7593d9f09 ggz-kde-games-0.0.9.ebuild 541
+MD5 30a3e2b0b8d1ba44f6aaff81ac78a430 ggz-kde-games-0.0.9.ebuild 577
 MD5 230107ab0c2b276b464dd2759cc877b9 files/digest-ggz-kde-games-0.0.9 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBz1mfroRuSHgZdywRAudJAJwIF6gB5j+wqpVKFyvVU2bKnjqVHgCdF6Vf
+IK9f1kb529OvSX61yueP36c=
+=tF4Y
+-----END PGP SIGNATURE-----
diff --git a/games-board/ggz-kde-games/ggz-kde-games-0.0.9.ebuild b/games-board/ggz-kde-games/ggz-kde-games-0.0.9.ebuild
index f936a0351bff..d86f92fa81dd 100644
--- a/games-board/ggz-kde-games/ggz-kde-games-0.0.9.ebuild
+++ b/games-board/ggz-kde-games/ggz-kde-games-0.0.9.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/games-board/ggz-kde-games/ggz-kde-games-0.0.9.ebuild,v 1.1 2004/12/27 00:38:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-kde-games/ggz-kde-games-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit kde
 
diff --git a/games-board/ggz-sdl-games/ChangeLog b/games-board/ggz-sdl-games/ChangeLog
index b4455036f147..c689f3e44080 100644
--- a/games-board/ggz-sdl-games/ChangeLog
+++ b/games-board/ggz-sdl-games/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/ggz-sdl-games
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-sdl-games/ChangeLog,v 1.1 2004/12/27 00:13:54 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-sdl-games/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ggz-sdl-games-0.0.9.ebuild:
+  Removed INSTALL file.
 
 *ggz-sdl-games-0.0.9 (26 Dec 2004)
 
diff --git a/games-board/ggz-sdl-games/Manifest b/games-board/ggz-sdl-games/Manifest
index 393381e96f70..a8149211b42d 100644
--- a/games-board/ggz-sdl-games/Manifest
+++ b/games-board/ggz-sdl-games/Manifest
@@ -1,4 +1,4 @@
-MD5 96fe8b7bb4c92476bc89024570519a11 ChangeLog 1230
-MD5 4a815813752105650103f66af081fe2c ggz-sdl-games-0.0.9.ebuild 762
+MD5 526aeed7994d80208b04f4f40c9ce212 ChangeLog 460
+MD5 a9d0b018a24f222ff7980e1a389c8272 ggz-sdl-games-0.0.9.ebuild 716
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 438e74c650e378de6fec33c558f5b3b2 files/digest-ggz-sdl-games-0.0.9 71
diff --git a/games-board/ggz-sdl-games/ggz-sdl-games-0.0.9.ebuild b/games-board/ggz-sdl-games/ggz-sdl-games-0.0.9.ebuild
index 054318a7da42..82f9d80f8c2a 100644
--- a/games-board/ggz-sdl-games/ggz-sdl-games-0.0.9.ebuild
+++ b/games-board/ggz-sdl-games/ggz-sdl-games-0.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/games-board/ggz-sdl-games/ggz-sdl-games-0.0.9.ebuild,v 1.1 2004/12/27 00:13:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-sdl-games/ggz-sdl-games-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 DESCRIPTION="These are the sdl versions of the games made by GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -9,15 +9,14 @@ SRC_URI="http://ftp.ggzgamingzone.org/pub/ggz/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~ppc ~x86"
-IUSE="gtk2"
+IUSE=""
 
-DEPEND=">=games-board/ggz-gtk-client-${PV}
-	>=dev-games/ggz-client-libs-${PV}
+DEPEND=">=dev-games/ggz-client-libs-${PV}
 	>=media-libs/libsdl-1.2.0
 	>=media-libs/sdl-image-1.2.0
 	>=media-libs/sdl-ttf-1.2.0"
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS QuickStart.GGZ README* TODO
+	dodoc AUTHORS ChangeLog NEWS QuickStart.GGZ README* TODO
 }
diff --git a/games-board/ggz-txt-client/ChangeLog b/games-board/ggz-txt-client/ChangeLog
index 29209026f675..537af41d281f 100644
--- a/games-board/ggz-txt-client/ChangeLog
+++ b/games-board/ggz-txt-client/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for app-games/ggz-txt-client
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-txt-client/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/ggz-txt-client
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-txt-client/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  ggz-txt-client-0.0.9.ebuild:
+  Removed INSTALL file.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*ggz-txt-client-0.0.9 (26 Dec 2004)
+
+  26 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  -ggz-txt-client-0.0.7.ebuild, +ggz-txt-client-0.0.9.ebuild:
+  Version bump #69443 by Bryan Duff.
 
 *ggz-txt-client-0.0.7 (10 Jul 2003)
 
@@ -12,7 +25,7 @@
   18 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> ggz-txt-client-0.0.5.ebuild :
   Updated to mirror://sourceforge in SRC_URI.
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> ggz-txt-client-0.0.5.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> ggz-txt-client-0.0.5.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   13 Apr 2002; T.Kvernes <terjekv@math.uio.no> ChangeLog :
diff --git a/games-board/ggz-txt-client/Manifest b/games-board/ggz-txt-client/Manifest
index cdad17290a9f..7e41666e4786 100644
--- a/games-board/ggz-txt-client/Manifest
+++ b/games-board/ggz-txt-client/Manifest
@@ -1,5 +1,6 @@
+MD5 bb4064c22037850d1220bf21ad4928b5 ChangeLog 1204
+MD5 58f65bbd06035ab03fabd423c60bcbd1 ggz-txt-client-0.0.5.ebuild 529
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 1fd7b4288354f0a23c9b87dd962c1e8b ggz-txt-client-0.0.9.ebuild 808
 MD5 5eb94fe62119e52dd8461293e0bf42c3 files/digest-ggz-txt-client-0.0.5 71
-MD5 e7a1e120688c78290bb02ca1703cb832 files/digest-ggz-txt-client-0.0.7 72
-MD5 e04d3eeac288b706f712d1878b644693 ggz-txt-client-0.0.5.ebuild 574
-MD5 204f342751dfc19818c8de05749584b3 ChangeLog 803
-MD5 fff5940b6365b5647c444377e887707a ggz-txt-client-0.0.7.ebuild 779
+MD5 94eb1f6691ba379818476e5d29366714 files/digest-ggz-txt-client-0.0.9 72
diff --git a/games-board/ggz-txt-client/ggz-txt-client-0.0.5.ebuild b/games-board/ggz-txt-client/ggz-txt-client-0.0.5.ebuild
index 0292cfdbf8df..afed7d40f13b 100644
--- a/games-board/ggz-txt-client/ggz-txt-client-0.0.5.ebuild
+++ b/games-board/ggz-txt-client/ggz-txt-client-0.0.5.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/games-board/ggz-txt-client/ggz-txt-client-0.0.5.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-txt-client/ggz-txt-client-0.0.5.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 DESCRIPTION="The textbased client for GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -9,14 +9,10 @@ SRC_URI="mirror://sourceforge/ggz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc"
+IUSE=""
 
 DEPEND="~dev-games/ggz-client-libs-0.0.5"
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install() {
 	make DESTDIR=${D} install || die
 }
diff --git a/games-board/ggz-txt-client/ggz-txt-client-0.0.9.ebuild b/games-board/ggz-txt-client/ggz-txt-client-0.0.9.ebuild
index fe00914710d5..a16d003d7af7 100644
--- a/games-board/ggz-txt-client/ggz-txt-client-0.0.9.ebuild
+++ b/games-board/ggz-txt-client/ggz-txt-client-0.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/games-board/ggz-txt-client/ggz-txt-client-0.0.9.ebuild,v 1.1 2004/12/26 23:10:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/ggz-txt-client/ggz-txt-client-0.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 DESCRIPTION="The textbased client for GGZ Gaming Zone"
 HOMEPAGE="http://ggz.sourceforge.net/"
@@ -24,5 +24,5 @@ src_unpack() {
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS QuickStart.GGZ README* TODO
+	dodoc AUTHORS ChangeLog NEWS QuickStart.GGZ README* TODO
 }
diff --git a/games-board/ggz-txt-client/metadata.xml b/games-board/ggz-txt-client/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/ggz-txt-client/metadata.xml
+++ b/games-board/ggz-txt-client/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnono/ChangeLog b/games-board/gnono/ChangeLog
index 6ee5273f6b6f..a4c6e32ccbb7 100644
--- a/games-board/gnono/ChangeLog
+++ b/games-board/gnono/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for app-games/gnono
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gnono
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gnono-0.0.3.ebuild:
+  Stable on ppc.
+
+  31 Dec 2004; Joseph Jezak <josejx@gentoo.org> gnono-0.0.3.ebuild:
+  Marked ~ppc.
+
+  11 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> gnono-0.0.3.ebuild:
+  Added ~amd64 KEYWORD and closing bug #69770.
 
 *gnono-0.0.3 (12 Dec 2002)
 
diff --git a/games-board/gnono/Manifest b/games-board/gnono/Manifest
index 395d351baffe..ca25f6ca7b9b 100644
--- a/games-board/gnono/Manifest
+++ b/games-board/gnono/Manifest
@@ -1,3 +1,4 @@
-MD5 3f844c3d76b54d5c86660777d67749cf ChangeLog 362
-MD5 31ab579f10cc4263b1f2f4b9626153d3 gnono-0.0.3.ebuild 663
+MD5 4418f2569e7f7530a46aafd0e31afc18 gnono-0.0.3.ebuild 697
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 27a28835c3a8606b25b2e175bc417e7f ChangeLog 655
 MD5 d52424b02808bbadc2523d1f164e07ac files/digest-gnono-0.0.3 63
diff --git a/games-board/gnono/gnono-0.0.3.ebuild b/games-board/gnono/gnono-0.0.3.ebuild
index c707493170ab..b8ba39f8ed86 100644
--- a/games-board/gnono/gnono-0.0.3.ebuild
+++ b/games-board/gnono/gnono-0.0.3.ebuild
@@ -1,16 +1,16 @@
-# 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/games-board/gnono/gnono-0.0.3.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnono/gnono-0.0.3.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="rewrite of Windows card game WUNO"
-SRC_URI="ftp://ftp.paw.co.za/pub/PAW/sources/${P}.tar.gz"
 HOMEPAGE="http://www.paw.co.za/projects/gnono/"
+SRC_URI="ftp://ftp.paw.co.za/pub/PAW/sources/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64 ppc"
 IUSE="nls"
 
 DEPEND="gnome-base/gnome-libs
@@ -20,11 +20,11 @@ DEPEND="gnome-base/gnome-libs
 	=x11-libs/gtk+-1.2*"
 
 src_compile() {
-	egamesconf `use_enable nls`
-	emake || die
+	egamesconf $(use_enable nls) || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	einstall
+	einstall || die
 	prepgamesdirs
 }
diff --git a/games-board/gnono/metadata.xml b/games-board/gnono/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gnono/metadata.xml
+++ b/games-board/gnono/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index bdb69b76da85..449064ba94a7 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,63 @@
-# ChangeLog for app-games/gnubg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gnubg
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -gnubg-0.13.0-r1.ebuild, -gnubg-0.14.2.ebuild:
+  clean old versions
+
+  25 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.14.3.ebuild:
+  fix up deps; turn off gtk1 support since it's broken (bug #83283)
+
+*gnubg-0.14.3 (24 Feb 2005)
+
+  24 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> +gnubg-0.14.3.ebuild:
+  version bump
+
+  27 Dec 2004; Mike Frysinger <vapier@gentoo.org> gnubg-0.14.2.ebuild:
+  Stick ftgl into the opengl?() portion of DEPEND #75768.
+
+  27 Dec 2004; Mike Frysinger <vapier@gentoo.org> gnubg-0.14.2.ebuild:
+  Add support for USE=opengl to track glgtkext support #47039 by Nicolai
+  Lissner / Thomas R. (TRauMa).
+
+  17 Dec 2004; David Holm <dholm@gentoo.org> gnubg-0.14.2.ebuild:
+  Added to ~ppc.
+
+  09 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.14.2.ebuild:
+  filter-flags -ffast-math #bug #67929
+
+  15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org> gnubg-0.14.2.ebuild:
+  Added to -amd64 (game segfaults on startup).
+
+  12 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gnubg-0.14.2.ebuild:
+  Added to ~sparc.  Closes bug #38396.
+
+  03 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.14.2.ebuild:
+  gnuconfig_update for mips; no backticks
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnubg-0.13.0-r1.ebuild:
+  Fix use invocation
+
+*gnubg-0.14.2 (05 Apr 2004)
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.14.2.ebuild:
+  version bump
+
+  20 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.13.0-r1.ebuild:
+  stop using deprecated ?: use syntax
+
+  30 Sep 2003; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.13.0-r1.ebuild:
+  Failed to link with USE=nas so fix configure.in in this case.  Also, default
+  to gtk2; added more DEPENDs based on USE flags.
+
+*gnubg-0.13.0-r1 (29 Sep 2003)
+
+  29 Sep 2003; Michael Sterrett <mr_bones_@gentoo.org> gnubg-0.13.0-r1.ebuild:
+  Add more USE flags to IUSE; modify the way the USE flags are handled to allow
+  more combinations of USE flags. There may still be issues with certain
+  combinations of USE flags but I think the current code will prove more
+  flexible. (driven by bug 28580)
 
 *gnubg-0.13.0 (02 Mar 2003)
 
diff --git a/games-board/gnubg/Manifest b/games-board/gnubg/Manifest
index 9a74fa0cb288..4029bc4fab3e 100644
--- a/games-board/gnubg/Manifest
+++ b/games-board/gnubg/Manifest
@@ -1,3 +1,4 @@
-MD5 d7c8a2e698a45f34caadfb26b0b6a068 ChangeLog 369
-MD5 adeac5354058ee95625cfdf279a9624d gnubg-0.13.0.ebuild 1783
-MD5 14a8f9e2546292fc22c04fbea97287f7 files/digest-gnubg-0.13.0 188
+MD5 3f11aaf297b2fe67404a96cda13e9bfe metadata.xml 251
+MD5 5032691e4559c014542c548714de4ed6 gnubg-0.14.3.ebuild 2552
+MD5 fca1fb1126751b71ec2230628296f557 ChangeLog 2547
+MD5 b66b2af80cad13b367a5e7e86e10ee17 files/digest-gnubg-0.14.3 252
diff --git a/games-board/gnubg/gnubg-0.14.3.ebuild b/games-board/gnubg/gnubg-0.14.3.ebuild
index 0c4a2309cfa2..e7ce47d33cf0 100644
--- a/games-board/gnubg/gnubg-0.14.3.ebuild
+++ b/games-board/gnubg/gnubg-0.14.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/games-board/gnubg/gnubg-0.14.3.ebuild,v 1.1 2005/02/25 03:14:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit gnuconfig flag-o-matic games
 
@@ -15,31 +15,30 @@ SRC_URI="ftp://alpha.gnu.org/gnu/gnubg/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-amd64 ~ppc ~sparc x86"
-IUSE="arts esd gdbm guile gtk gtk2 nas nls opengl png python readline truetype X"
+IUSE="arts esd gdbm gtk guile nas nls opengl png python readline X"
 
 # FIXME does this need to DEPEND on netpbm?
-DEPEND="guile? ( dev-util/guile )
-	python? ( dev-lang/python )
-	truetype? ( =media-libs/freetype-1* )
-	gtk? (
-		gtk2? (
-			=x11-libs/gtk+-2*
-			=dev-libs/glib-2*
-		)
-		!gtk2? (
-			=x11-libs/gtk+-1.2*
-			=dev-libs/glib-1*
-		)
-		opengl? ( x11-libs/gtkglext media-libs/ftgl )
-	)
-	readline? ( sys-libs/readline )
-	X? ( virtual/x11 )
+DEPEND="virtual/libc
 	dev-libs/glib
-	gdbm? ( sys-libs/gdbm )
-	esd? ( media-sound/esound )
+	>=media-libs/freetype-2
+	media-libs/libpng
+	dev-libs/libxml2
+	sys-libs/zlib
 	arts? ( kde-base/arts )
+	esd? ( media-sound/esound )
+	gdbm? ( sys-libs/gdbm )
+	gtk? (
+		=x11-libs/gtk+-2*
+		=dev-libs/glib-2*
+		opengl? ( x11-libs/gtkglext
+			media-libs/ftgl )
+		virtual/x11
+	)
+	guile? ( dev-util/guile )
 	nas? ( media-libs/nas )
-	png? ( media-libs/libpng )"
+	python? ( dev-lang/python )
+	readline? ( sys-libs/readline )
+	X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
@@ -58,15 +57,13 @@ src_compile() {
 		else
 			myconf="--without-gtkextra"
 		fi
-		# --with-gtk doesn't mean what you think it means for configuring gnubg.
-		if use gtk2 ; then
-			myconf="${myconf} --with-gtk --with-gtk2"
-		else
-			myconf="${myconf} --with-gtk --without-gtk2"
-		fi
+		myconf="${myconf} --with-gtk --with-gtk2"
 		if use opengl ; then
 			myconf="${myconf} --with-board3d"
 			append-flags $(pkg-config ftgl --cflags)
+			append-ldflags $(pkg-config ftgl --libs)
+		else
+			myconf="${myconf} --without-board3d"
 		fi
 	else
 		myconf="${myconf} --without-gtk --disable-gtktest --without-board3d"
@@ -76,14 +73,12 @@ src_compile() {
 	else
 		myconf="${myconf} --without-sound --disable-esdtest --disable-artsc-test"
 	fi
-	if ! use truetype ; then
-		myconf="${myconf} --with-ft=no --with-ft-exec-prefix=no --disable-freetypetest"
+	if ! use guile ; then
+		myconf="${myconf} --without-guile"
 	fi
 
 	filter-flags -ffast-math #bug #67929
 
-	# configure script doesn't handle this option correctly.
-	#       `use_with guile` \
 	egamesconf \
 		$(use_enable arts artsc) \
 		$(use_enable esd) \
diff --git a/games-board/gnuchess-book/ChangeLog b/games-board/gnuchess-book/ChangeLog
index 66b4b6407db4..983713c6579f 100644
--- a/games-board/gnuchess-book/ChangeLog
+++ b/games-board/gnuchess-book/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-board/gnuchess-book
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess-book/ChangeLog,v 1.1 2004/02/22 22:02:48 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess-book/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  18 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  gnuchess-book-1.00.ebuild:
+  Work around build issue with userpriv (bug #112898)
+
+  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> gnuchess-book-1.00.ebuild:
+  Marked ~amd64 wrt bug #93676.
 
 *gnuchess-book-1.00 (22 Feb 2004)
 
diff --git a/games-board/gnuchess-book/Manifest b/games-board/gnuchess-book/Manifest
index 3a53360c0ea5..166687cf92bd 100644
--- a/games-board/gnuchess-book/Manifest
+++ b/games-board/gnuchess-book/Manifest
@@ -1,3 +1,4 @@
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 06764e530870f6cfaeddffcf983eccde gnuchess-book-1.00.ebuild 780
+MD5 cb02af36fe96a8bafcc7177b05953b29 ChangeLog 625
 MD5 b4391e00a72772f5f441e12e9b5e08b5 files/digest-gnuchess-book-1.00 63
-MD5 bf2fb0a1e87cf3661f77bb03c7a8d6be gnuchess-book-1.00.ebuild 695
-MD5 499a5a987488f97e719935ab7ecc1133 ChangeLog 383
diff --git a/games-board/gnuchess-book/gnuchess-book-1.00.ebuild b/games-board/gnuchess-book/gnuchess-book-1.00.ebuild
index 58410636f60a..946478c879e2 100644
--- a/games-board/gnuchess-book/gnuchess-book-1.00.ebuild
+++ b/games-board/gnuchess-book/gnuchess-book-1.00.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/games-board/gnuchess-book/gnuchess-book-1.00.ebuild,v 1.1 2004/02/22 22:02:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess-book/gnuchess-book-1.00.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
@@ -10,18 +10,21 @@ SRC_URI="mirror://gnu/chess/book_${PV}.pgn.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="alpha ~amd64 ppc sparc x86"
+IUSE=""
+RESTRICT="userpriv" # bug #112898
 
 DEPEND="games-board/gnuchess"
 
 S=${WORKDIR}
 
 src_compile() {
-	echo  -e "book add book_${PV}.pgn"$'\n'"quit" | ${GAMES_BINDIR}/gnuchess || die
+	echo -e "book add book_${PV}.pgn"$'\n'"quit" | "${GAMES_BINDIR}"/gnuchess \
+		|| die "generation failed"
 }
 
 src_install() {
-	insinto ${GAMES_DATADIR}/gnuchess
-	doins book.dat || die
+	insinto "${GAMES_DATADIR}/gnuchess"
+	doins book.dat || die "doins failed"
 	prepgamesdirs
 }
diff --git a/games-board/gnuchess/ChangeLog b/games-board/gnuchess/ChangeLog
index 992053050cbe..d41468c53022 100644
--- a/games-board/gnuchess/ChangeLog
+++ b/games-board/gnuchess/ChangeLog
@@ -1,6 +1,34 @@
-# ChangeLog for app-games/gnuchess
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gnuchess
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> gnuchess-5.06.ebuild,
+  gnuchess-5.07.ebuild:
+  Removed INSTALL file.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gnuchess-5.07.ebuild:
+  virtual/glibc -> virtual/libc
+
+*gnuchess-5.07 (30 Jan 2004)
+
+  30 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> gnuchess-5.07.ebuild:
+  version bump (bug 39906)
+
+  24 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> gnuchess-5.05.ebuild,
+  gnuchess-5.06.ebuild:
+  tidy; header fix
+
+  12 Nov 2003; Sven Blumenstein <bazik@gentoo.org> gnuchess-5.06.ebuild:
+  Sparcified - closes bug #33294, thanks to 
+  Michael Hellwig <michael.hellwig@uibk.ac.at> for testing
+
+*gnuchess-5.06 (19 Oct 2003)
+
+  19 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> gnuchess-5.06.ebuild:
+  version bump
 
 *gnuchess-5.05 (04 Jan 2003)
 
@@ -9,7 +37,7 @@
 
 *gnuchess-5.04 (18 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> gnuchess-5.04.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> gnuchess-5.04.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   18 Apr 2002; Ryan Phillips <rphillips@gentoo.org> gnuchess-0.54.ebuild :
diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest
index 1de455766fe5..589badee6b57 100644
--- a/games-board/gnuchess/Manifest
+++ b/games-board/gnuchess/Manifest
@@ -1,5 +1,4 @@
-MD5 21152b8ba827ffe85162f543a323842c ChangeLog 1091
-MD5 bb805aaee5970da2954e4526bc565e0c gnuchess-5.04.ebuild 593
-MD5 f9d4ebd7c76832710869c904d20d0514 gnuchess-5.05.ebuild 606
-MD5 8e30f016eb56bddd528b39812b8ed3e1 files/digest-gnuchess-5.04 65
-MD5 4100599a283012ead2414d0838395c16 files/digest-gnuchess-5.05 65
+MD5 2f1485acc8aea29aeddf3cb3a9e7ecf4 gnuchess-5.07.ebuild 773
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 f74a9f45a8343b4c2de2fa03387f8f4e ChangeLog 1990
+MD5 994fcb9b70d94e5702ad5170c6fbaebe files/digest-gnuchess-5.07 65
diff --git a/games-board/gnuchess/gnuchess-5.07.ebuild b/games-board/gnuchess/gnuchess-5.07.ebuild
index f93cfcc64ad7..d11f322816a8 100644
--- a/games-board/gnuchess/gnuchess-5.07.ebuild
+++ b/games-board/gnuchess/gnuchess-5.07.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/games-board/gnuchess/gnuchess-5.07.ebuild,v 1.1 2004/01/30 22:19:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnuchess/gnuchess-5.07.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
@@ -8,23 +8,22 @@ DESCRIPTION="Console based chess interface"
 HOMEPAGE="http://www.gnu.org/software/chess/chess.html"
 SRC_URI="mirror://gnu/chess/${P}.tar.gz"
 
-KEYWORDS="x86 ppc sparc"
+KEYWORDS="alpha amd64 ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="readline"
 
-DEPEND="virtual/glibc
-	readline? ( sys-libs/readline )"
+DEPEND="readline? ( sys-libs/readline )"
 
 src_compile() {
 	egamesconf \
 		--disable-dependency-tracking \
-		`use_with readline` \
+		$(use_with readline) \
 			|| die
 	emake || die "emake failed"
 }
 src_install () {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS TODO doc/README || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS TODO doc/README
 	prepgamesdirs
 }
diff --git a/games-board/gnuchess/metadata.xml b/games-board/gnuchess/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gnuchess/metadata.xml
+++ b/games-board/gnuchess/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnugo/ChangeLog b/games-board/gnugo/ChangeLog
index f326828d501d..b39aec5e978d 100644
--- a/games-board/gnugo/ChangeLog
+++ b/games-board/gnugo/ChangeLog
@@ -1,6 +1,47 @@
-# ChangeLog for app-games/gnugo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnugo/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gnugo
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnugo/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+*gnugo-3.7.7 (22 Oct 2005)
+
+  22 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> +gnugo-3.7.7.ebuild:
+  version bump
+
+*gnugo-3.7.6 (09 Oct 2005)
+
+  09 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> +gnugo-3.7.6.ebuild:
+  version bump (bug #108420)
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> gnugo-3.6.ebuild:
+  Removed INSTALL file.
+
+  03 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org> -gnugo-3.2.ebuild,
+  -gnugo-3.3.22.ebuild, -gnugo-3.4.ebuild, gnugo-3.6.ebuild:
+  clean old versions; tidy
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*gnugo-3.6 (01 Dec 2004)
+
+  01 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +gnugo-3.6.ebuild:
+  version bump
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gnugo-3.2.ebuild,
+  gnugo-3.3.22.ebuild, gnugo-3.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  21 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gnugo-3.4.ebuild:
+  keyword for amd64 (bug #48573)
+
+  19 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> gnugo-3.3.22.ebuild,
+  gnugo-3.4.ebuild:
+  mark stable for x86
+
+*gnugo-3.4 (29 Oct 2003)
+
+  29 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> gnugo-3.4.ebuild:
+  version bump; bug 32230
 
 *gnugo-3.3.22 (10 Jul 2003)
 
@@ -20,7 +61,7 @@
   28 Aug 2002; Mark Guertin <gerk@gentoo.org> gnugo-3.0.0.ebuild :
   Added ppc to keywords
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> gnugo-3.0.0.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> gnugo-3.0.0.ebuild :
   Added LICENSE, KEYWORDS.
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/games-board/gnugo/Manifest b/games-board/gnugo/Manifest
index 3b6b64a70ea4..44b5291cf839 100644
--- a/games-board/gnugo/Manifest
+++ b/games-board/gnugo/Manifest
@@ -1,5 +1,8 @@
-MD5 6c04bbd458cdb686b2d6886d1b316881 ChangeLog 1429
-MD5 dd5dee36852d9ef96bf811c1ce6a2ac3 gnugo-3.2.ebuild 576
-MD5 9daf6b8170b96b595ebb228199dd6ce6 gnugo-3.3.22.ebuild 724
-MD5 8b2c35b94c8f2892a9f91bc8fa9779a7 files/digest-gnugo-3.2 62
-MD5 bf16c16d8ba6dd3b035c79924ea1947f files/digest-gnugo-3.3.22 65
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 63829463d8af06595b0b510f52b916e2 gnugo-3.6.ebuild 711
+MD5 d5dcdf6a63ccaab73301114d1ed33df5 gnugo-3.7.7.ebuild 814
+MD5 a831b142496c273c56df4c2d056af87b gnugo-3.7.6.ebuild 814
+MD5 1b786a4a97aa211eaf8c0007591ca723 ChangeLog 2664
+MD5 cef43075d7d7cb1a424c32f595b94ce2 files/digest-gnugo-3.6 62
+MD5 8de888f4cacff722342c9e6acd875179 files/digest-gnugo-3.7.7 64
+MD5 d93386fbc802ed336b404532ae1b3d13 files/digest-gnugo-3.7.6 64
diff --git a/games-board/gnugo/gnugo-3.6.ebuild b/games-board/gnugo/gnugo-3.6.ebuild
index 618d0abecffc..22f09b846996 100644
--- a/games-board/gnugo/gnugo-3.6.ebuild
+++ b/games-board/gnugo/gnugo-3.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/games-board/gnugo/gnugo-3.6.ebuild,v 1.1 2004/12/01 20:30:06 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnugo/gnugo-3.6.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit games
 
@@ -10,11 +10,10 @@ SRC_URI="ftp://sporadic.stanford.edu/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc alpha amd64"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	>=sys-libs/ncurses-5.2-r3"
+DEPEND=">=sys-libs/ncurses-5.2-r3"
 
 src_compile() {
 	egamesconf --enable-cache-size=32 || die
@@ -23,6 +22,6 @@ src_compile() {
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog INSTALL NEWS README THANKS TODO
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	prepgamesdirs
 }
diff --git a/games-board/gnugo/gnugo-3.7.6.ebuild b/games-board/gnugo/gnugo-3.7.6.ebuild
index 87647bbc33fd..e801dfb6aaf2 100644
--- a/games-board/gnugo/gnugo-3.7.6.ebuild
+++ b/games-board/gnugo/gnugo-3.7.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/games-board/gnugo/gnugo-3.7.6.ebuild,v 1.1 2005/10/09 05:03:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnugo/gnugo-3.7.6.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit games
 
diff --git a/games-board/gnugo/gnugo-3.7.7.ebuild b/games-board/gnugo/gnugo-3.7.7.ebuild
index 7f3a8b969afd..41f8bf894300 100644
--- a/games-board/gnugo/gnugo-3.7.7.ebuild
+++ b/games-board/gnugo/gnugo-3.7.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/games-board/gnugo/gnugo-3.7.7.ebuild,v 1.1 2005/10/22 01:37:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnugo/gnugo-3.7.7.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit games
 
diff --git a/games-board/gnugo/metadata.xml b/games-board/gnugo/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gnugo/metadata.xml
+++ b/games-board/gnugo/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gnushogi/ChangeLog b/games-board/gnushogi/ChangeLog
index f7b77483ae45..52ded5ecf566 100644
--- a/games-board/gnushogi/ChangeLog
+++ b/games-board/gnushogi/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for app-games/gnushogi
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gnushogi
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> gnushogi-1.3.ebuild:
+  Removed INSTALL file.
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> gnushogi-1.3.ebuild:
+  Stable on ppc.
+
+  21 Dec 2004; Dylan Carlson <absinthe@gentoo.org> gnushogi-1.3.ebuild:
+  keywords ~amd64.
+
+  05 Nov 2004; Joseph Jezak <josejx@gentoo.org> gnushogi-1.3.ebuild:
+  Added ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gnushogi-1.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> gnushogi-1.3.ebuild:
+  games.eclass already inherits eutils; less RDEPEND; use flags tidy
+
+  02 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> gnushogi-1.3.ebuild:
+  Add errno patch from edi via bug 37013; also, support X use better and sed in
+  unpack; more error checking/messages
 
   03 Sep 2003; Michael Sterrett <msterret@gentoo.org> gnushogi-1.3.ebuild:
   use sed >= 4; error messages
diff --git a/games-board/gnushogi/Manifest b/games-board/gnushogi/Manifest
index 63779fa247ff..99ee4ae23e96 100644
--- a/games-board/gnushogi/Manifest
+++ b/games-board/gnushogi/Manifest
@@ -1,3 +1,5 @@
-MD5 46c90cddffd308af1f6bc40a8eee5b68 ChangeLog 582
-MD5 80318514cf700cffba0435582a20e462 gnushogi-1.3.ebuild 990
+MD5 755c7263b2f7040e7d6291725752f382 ChangeLog 1400
+MD5 3e324199351fff5591bf8e685d6616cd gnushogi-1.3.ebuild 1288
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 97c87cb301c5365d234901fe7ea9456d files/1.3-errno.patch 304
 MD5 a46c4bdecc0df352e8f7735ee4e6e37b files/digest-gnushogi-1.3 64
diff --git a/games-board/gnushogi/gnushogi-1.3.ebuild b/games-board/gnushogi/gnushogi-1.3.ebuild
index dbb729b2e459..20ab51094eb3 100644
--- a/games-board/gnushogi/gnushogi-1.3.ebuild
+++ b/games-board/gnushogi/gnushogi-1.3.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/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="Japanese version of chess (commandline + X-Version)"
 HOMEPAGE="http://www.gnu.org/directory/games/gnushogi.html"
@@ -10,30 +10,45 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc ~amd64"
 IUSE="X"
 
-DEPEND=">=sys-devel/bison-1.34
-	>=sys-devel/flex-2.5
-	>=sys-apps/sed-4
+RDEPEND="virtual/libc
+	sys-libs/ncurses
 	X? ( virtual/x11 )"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.34
+	>=sys-devel/flex-2.5
+	>=sys-apps/sed-4"
 
-src_compile() {
+src_unpack() {
+	local f
+
+	unpack ${A}
+	cd ${S}
 	for f in `grep -Rl -- -ltermcap *` ; do
+		einfo "Fixing ${f}"
 		sed -i \
-			-e 's:-ltermcap:-lcurses:' ${f} || \
-				die "sed ${f} failed"
+			-e 's:-ltermcap:-lcurses:' ${f} \
+				|| die "sed ${f} failed"
 	done
+	epatch "${FILESDIR}/${PV}-errno.patch"
+}
 
-	egamesconf || die
+src_compile() {
+	egamesconf \
+		$(use_with X x) \
+		$(use_with X xshogi) || die
 	addpredict /usr/games/lib/gnushogi/gnushogi.hsh
 	emake || die "emake failed"
 }
 
 src_install() {
-	dogamesbin gnushogi/gnushogi
-	use X && dogamesbin xshogi/xshogi
-	dogameslib gnushogi/gnushogi.bbk
+	dogamesbin gnushogi/gnushogi      || die "dogamesbin failed"
+	if use X ; then
+		dogamesbin xshogi/xshogi      || die "dogamesbin failed (X)"
+	fi
+	dogameslib gnushogi/gnushogi.bbk  || die "dogameslib failed"
+	dodoc README NEWS CONTRIB
 	prepgamesdirs
-	dodoc COPYING INSTALL.generic INSTALL README NEWS CONTRIB
 }
diff --git a/games-board/gnushogi/metadata.xml b/games-board/gnushogi/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gnushogi/metadata.xml
+++ b/games-board/gnushogi/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gtkatlantic/ChangeLog b/games-board/gtkatlantic/ChangeLog
index 5efc823cc168..8ee8a1a771e3 100644
--- a/games-board/gtkatlantic/ChangeLog
+++ b/games-board/gtkatlantic/ChangeLog
@@ -1,6 +1,51 @@
-# ChangeLog for app-games/gtkatlantic
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gtkatlantic
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
+
+*gtkatlantic-0.3.3 (10 Apr 2005)
+
+  10 Apr 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -gtkatlantic-0.3.1.ebuild, gtkatlantic-0.3.2.ebuild,
+  +gtkatlantic-0.3.3.ebuild:
+  version bump; tidy older ebuild; added menu support from Josh Nichols (bug
+  #83303)
+
+  17 Mar 2005; Lars Weiler <pylon@gentoo.org> gtkatlantic-0.3.2.ebuild:
+  Stable on ppc.
+
+  21 Feb 2005; Danny van Dyk <kugelfang@gentoo.org>
+  gtkatlantic-0.3.2.ebuild:
+  Marked ~amd64.
+
+*gtkatlantic-0.3.2 (13 Feb 2005)
+
+  13 Feb 2005; Lars Weiler <pylon@gentoo.org> +gtkatlantic-0.3.2.ebuild:
+  Added current stable version. Version 0.4.1 is package-masked due to buggy
+  behaviour.  See webpage.
+
+  29 Jan 2005; Tom Martin <slarti@gentoo.org> gtkatlantic-0.4.1.ebuild:
+  Keyworded ~amd64 after some extensive testing with beejay :)
+
+  22 Jul 2004; David Holm <dholm@gentoo.org> gtkatlantic-0.4.1.ebuild:
+  Added to ~ppc.
+
+*gtkatlantic-0.4.1 (21 Jul 2004)
+
+  21 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +gtkatlantic-0.4.1.ebuild:
+  version bump (bug #57728)
+
+*gtkatlantic-0.3.1 (13 Nov 2003)
+
+  13 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  gtkatlantic-0.3.1.ebuild:
+  version bump (bug 33385)
+
+*gtkatlantic-0.3.0 (30 Oct 2003)
+
+  30 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  gtkatlantic-0.3.0.ebuild:
+  version bump
 
 *gtkatlantic-0.2.13 (21 Aug 2003)
 
diff --git a/games-board/gtkatlantic/Manifest b/games-board/gtkatlantic/Manifest
index 29448ea2d567..20722177851f 100644
--- a/games-board/gtkatlantic/Manifest
+++ b/games-board/gtkatlantic/Manifest
@@ -1,5 +1,6 @@
-MD5 8fc5044f29ae7f4a9a3b28c5ab0110d4 ChangeLog 540
-MD5 46255424f7479b07a1e3cd3e62e036cc gtkatlantic-0.2.10.ebuild 662
-MD5 69d7405b3c92a63d32d632ab2f27baee gtkatlantic-0.2.13.ebuild 686
-MD5 7051b05606d99d049ac96b857530b40f files/digest-gtkatlantic-0.2.10 71
-MD5 492c9b665f90f6aff3ba1982dca478d4 files/digest-gtkatlantic-0.2.13 71
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 83aac44abe056a334f9cddfd4a85bf4e gtkatlantic-0.4.1.ebuild 702
+MD5 c8996ce895fc408f3c89b890e05e12ab gtkatlantic-0.3.3.ebuild 891
+MD5 d6f5d833954556fc9e55e4d342b3c681 ChangeLog 1848
+MD5 33b4e2958ca9aba670b99349e4f3f3f3 files/digest-gtkatlantic-0.3.3 70
+MD5 84e4f4c92d7339bd6a02a43497e171d6 files/digest-gtkatlantic-0.4.1 70
diff --git a/games-board/gtkatlantic/gtkatlantic-0.3.3.ebuild b/games-board/gtkatlantic/gtkatlantic-0.3.3.ebuild
index bd346cbdbea3..5d0145babe4e 100644
--- a/games-board/gtkatlantic/gtkatlantic-0.3.3.ebuild
+++ b/games-board/gtkatlantic/gtkatlantic-0.3.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/games-board/gtkatlantic/gtkatlantic-0.3.3.ebuild,v 1.1 2005/04/10 04:56:53 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/gtkatlantic-0.3.3.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-board/gtkatlantic/gtkatlantic-0.4.1.ebuild b/games-board/gtkatlantic/gtkatlantic-0.4.1.ebuild
index f5b9354fa4b5..05748222c1f3 100644
--- a/games-board/gtkatlantic/gtkatlantic-0.4.1.ebuild
+++ b/games-board/gtkatlantic/gtkatlantic-0.4.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/games-board/gtkatlantic/gtkatlantic-0.4.1.ebuild,v 1.1 2004/07/21 09:01:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkatlantic/gtkatlantic-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="http://gtkatlantic.gradator.net/downloads/v0.4/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-2*
diff --git a/games-board/gtkatlantic/metadata.xml b/games-board/gtkatlantic/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gtkatlantic/metadata.xml
+++ b/games-board/gtkatlantic/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/gtkboard/ChangeLog b/games-board/gtkboard/ChangeLog
index ba594c698ccd..d433bad1e3af 100644
--- a/games-board/gtkboard/ChangeLog
+++ b/games-board/gtkboard/ChangeLog
@@ -1,6 +1,21 @@
-# ChangeLog for app-games/gtkboard
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/gtkboard
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
+
+  11 Nov 2004; Joseph Jezak <josejx@gentoo.org> gtkboard-0.11_pre0.ebuild:
+  Marked ppc stable.
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> gtkboard-0.11_pre0.ebuild:
+  Added to ~ppc.
+
+  01 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  gtkboard-0.11_pre0.ebuild:
+  add sdl-mixer depend (bug 39984)
+
+*gtkboard-0.11_pre0 (04 Jan 2004)
+
+  04 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #36695 + nicer games.eclass.
 
 *gtkboard-0.10.4 (30 Jul 2003)
 
diff --git a/games-board/gtkboard/Manifest b/games-board/gtkboard/Manifest
index 2fa6066c3e78..5a206eab50a1 100644
--- a/games-board/gtkboard/Manifest
+++ b/games-board/gtkboard/Manifest
@@ -1,3 +1,6 @@
-MD5 6ab4a2f8e8d3e8492330c2c398ce71bb gtkboard-0.10.4.ebuild 556
-MD5 bac59a021e024c255db648cfcabb5406 ChangeLog 416
+MD5 f212c713c59925d6e59c0d173b81ffd2 ChangeLog 848
+MD5 8ca1686e1cc5b79dea1ae0e57c9ee7d0 gtkboard-0.10.4.ebuild 550
+MD5 c7fd2ac26c057ed4aa872675a8c60ae1 gtkboard-0.11_pre0.ebuild 828
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 b0b4520ca5dd494b20ee91bd9ca78b32 files/digest-gtkboard-0.10.4 67
+MD5 325dd313ba175b2684829aefd7cab5a0 files/digest-gtkboard-0.11_pre0 69
diff --git a/games-board/gtkboard/gtkboard-0.10.4.ebuild b/games-board/gtkboard/gtkboard-0.10.4.ebuild
index 92360fc70141..1b55376c1e7f 100644
--- a/games-board/gtkboard/gtkboard-0.10.4.ebuild
+++ b/games-board/gtkboard/gtkboard-0.10.4.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/games-board/gtkboard/gtkboard-0.10.4.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/gtkboard-0.10.4.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="Board games system"
 HOMEPAGE="http://gtkboard.sf.net/"
 SRC_URI="mirror://sourceforge/gtkboard/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=x11-libs/gtk+-2"
diff --git a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
index 379fe0275976..84a53dbfb859 100644
--- a/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
+++ b/games-board/gtkboard/gtkboard-0.11_pre0.ebuild
@@ -1,29 +1,33 @@
-# 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/games-board/gtkboard/gtkboard-0.11_pre0.ebuild,v 1.1 2004/01/05 04:20:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gtkboard/gtkboard-0.11_pre0.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit games
 
 MY_P=${P/_}
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Board games system"
 HOMEPAGE="http://gtkboard.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gtkboard/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-
-DEPEND=">=x11-libs/gtk+-2"
+KEYWORDS="x86 amd64 ppc"
+IUSE=""
 
-S=${WORKDIR}/${MY_P}
+DEPEND=">=x11-libs/gtk+-2
+	>=media-libs/libsdl-1.2
+	media-libs/sdl-mixer"
 
 src_compile() {
-	egamesconf --datadir=${GAMES_DATADIR}/${PN} || die
-	emake || die
+	egamesconf \
+		--disable-dependency-tracking \
+		--datadir="${GAMES_DATADIR}/${PN}" || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog TODO
 	dohtml doc/index.html
 	prepgamesdirs
diff --git a/games-board/gtkboard/metadata.xml b/games-board/gtkboard/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/gtkboard/metadata.xml
+++ b/games-board/gtkboard/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/hearts/ChangeLog b/games-board/hearts/ChangeLog
index 38f59b549d51..b574a0611097 100644
--- a/games-board/hearts/ChangeLog
+++ b/games-board/hearts/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-board/hearts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/ChangeLog,v 1.1 2005/08/06 03:11:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 *hearts-1.98 (05 Aug 2005)
 
diff --git a/games-board/hearts/Manifest b/games-board/hearts/Manifest
index ebe6a1c0cc6d..dc11669f6766 100644
--- a/games-board/hearts/Manifest
+++ b/games-board/hearts/Manifest
@@ -1,2 +1,15 @@
-MD5 28da59f8499ffa18bd556b80a789a0b4 hearts-1.98.ebuild 372
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2a9282010a748974cacbb41b2c36e07d hearts-1.98.ebuild 617
+MD5 222fc0d1f3856713f0659f8c76b2f3e9 ChangeLog 353
 MD5 f400d638fd3e3879f01904a1cca864c5 files/digest-hearts-1.98 64
+MD5 7ae96bbe4ec91232491891b183247700 files/hearts-1.98-gcc.patch 752
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+UKigIKl8Uu19MoRAiaWAKCCS/6VJMQM5Yv0TpESQBK9d4co6QCffGE9
+tlRvUWpIrVj/RLy+xaK5RR8=
+=2RyO
+-----END PGP SIGNATURE-----
diff --git a/games-board/hearts/hearts-1.98.ebuild b/games-board/hearts/hearts-1.98.ebuild
index 91f3edfeffa8..bac468ddfca1 100644
--- a/games-board/hearts/hearts-1.98.ebuild
+++ b/games-board/hearts/hearts-1.98.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/games-board/hearts/hearts-1.98.ebuild,v 1.1 2005/08/06 03:11:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hearts/hearts-1.98.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
-inherit kde
+inherit eutils kde
 
 DESCRIPTION="clone of the hearts game for KDE that comes with Windows"
 HOMEPAGE="http://hearts.luispedro.org/index.php"
@@ -19,7 +19,6 @@ PATCHES="${FILESDIR}/${P}-gcc.patch"
 
 src_install() {
 	kde_src_install
-	insinto /usr/share/applications
-	doins "${D}"/usr/share/applnk/Games/Card/hearts.desktop || die
 	rm -r "${D}"/usr/share/applnk
+	make_desktop_entry hearts Hearts
 }
diff --git a/games-board/hexxagon/ChangeLog b/games-board/hexxagon/ChangeLog
index d36231794c83..b36d396b437c 100644
--- a/games-board/hexxagon/ChangeLog
+++ b/games-board/hexxagon/ChangeLog
@@ -1,6 +1,50 @@
-# ChangeLog for app-games/hexxagon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/hexxagon
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  13 May 2005; Joseph Jezak <josejx@gentoo.org> hexxagon-1.0.ebuild:
+  Marked ppc stable.
+
+  12 May 2005; Jan Brinkmann <luckyduck@gentoo.org> hexxagon-1.0.ebuild:
+  stable on amd64
+
+*hexxagon-0.3.3 (03 May 2005)
+
+  03 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -hexxagon-0.3.2.ebuild, +hexxagon-0.3.3.ebuild:
+  version bump 0.x version (bug #91234); clean old version
+
+  02 May 2005; Michael Sterrett <mr_bones_@gentoo.org> hexxagon-1.0.ebuild:
+  stable for x86
+
+  29 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> hexxagon-1.0.ebuild:
+  Added dev-cpp/glibmm to DEPEND and closing bug #79922.
+
+*hexxagon-1.0 (28 Jan 2005)
+
+  28 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org> +hexxagon-1.0.ebuild:
+  Version bumped to 1.0 and closing bug #78626.
+
+  28 Dec 2004; Joseph Jezak <josejx@gentoo.org> hexxagon-0.3.2.ebuild:
+  Marked ppc stable.
+
+  05 Nov 2004; Joseph Jezak <josejx@gentoo.org> hexxagon-0.3.2.ebuild:
+  Added ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  hexxagon-0.3.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+  19 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> hexxagon-0.3.2.ebuild:
+  Keyword for amd64 (bug #54388)
+
+  23 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> hexxagon-0.3.2.ebuild:
+  make gtk non-optional
+
+*hexxagon-0.3.2 (23 Feb 2004)
+
+  23 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> hexxagon-0.3.2.ebuild:
+  version bump (fixes bug #41736)
 
 *hexxagon-0.3.1 (22 Jun 2003)
 
diff --git a/games-board/hexxagon/Manifest b/games-board/hexxagon/Manifest
index edec39478475..7821c115a1f8 100644
--- a/games-board/hexxagon/Manifest
+++ b/games-board/hexxagon/Manifest
@@ -1,3 +1,6 @@
-MD5 5c539b3d40961899859aadb9cbb4fb2e files/digest-hexxagon-0.3.1 66
-MD5 d8587aefbad5c6cecd4d6ebffa31f2fd hexxagon-0.3.1.ebuild 697
-MD5 a39e9d8d18c5daadd54b49baecbe6e5e ChangeLog 384
+MD5 e0cca93b38a5c61f184e09fb2156f046 ChangeLog 1793
+MD5 5f0a3a0a15cd92fa693026a9ffca7e5a hexxagon-0.3.3.ebuild 619
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 9cd2242bcd1e92a51ca710f9123f2512 hexxagon-1.0.ebuild 645
+MD5 19d6b2bd6c1a339d097764ddfb5b05c3 files/digest-hexxagon-0.3.3 66
+MD5 f64da571147470c047a9e2ec3077d091 files/digest-hexxagon-1.0 66
diff --git a/games-board/hexxagon/hexxagon-0.3.3.ebuild b/games-board/hexxagon/hexxagon-0.3.3.ebuild
index f14251ebd875..314d18a13781 100644
--- a/games-board/hexxagon/hexxagon-0.3.3.ebuild
+++ b/games-board/hexxagon/hexxagon-0.3.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/games-board/hexxagon/hexxagon-0.3.3.ebuild,v 1.1 2005/05/03 00:13:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-0.3.3.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
diff --git a/games-board/hexxagon/hexxagon-1.0.ebuild b/games-board/hexxagon/hexxagon-1.0.ebuild
index e705a24fc070..29e6f91c0def 100644
--- a/games-board/hexxagon/hexxagon-1.0.ebuild
+++ b/games-board/hexxagon/hexxagon-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/games-board/hexxagon/hexxagon-1.0.ebuild,v 1.1 2005/01/28 21:09:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/hexxagon/hexxagon-1.0.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
@@ -10,10 +10,11 @@ SRC_URI="http://nesqi.homeip.net/hexxagon/download/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc
+	>=dev-cpp/glibmm-2.4
 	>=dev-cpp/gtkmm-2.4
 	>=x11-libs/gtk+-2.0"
 
diff --git a/games-board/hexxagon/metadata.xml b/games-board/hexxagon/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/hexxagon/metadata.xml
+++ b/games-board/hexxagon/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/jrisk/ChangeLog b/games-board/jrisk/ChangeLog
index b6de416e4337..9305d6d019a1 100644
--- a/games-board/jrisk/ChangeLog
+++ b/games-board/jrisk/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for games-board/jrisk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/jrisk/ChangeLog,v 1.1 2005/06/28 03:25:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/jrisk/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+*jrisk-1.0.8.3 (31 Oct 2005)
+
+  31 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +jrisk-1.0.8.3.ebuild:
+  version bump
+
+*jrisk-1.0.8.2 (18 Oct 2005)
+
+  18 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +jrisk-1.0.8.2.ebuild:
+  version bump
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> jrisk-1.0.7.6.ebuild:
+  Marked ~amd64.
 
 *jrisk-1.0.7.6 (28 Jun 2005)
 
diff --git a/games-board/jrisk/Manifest b/games-board/jrisk/Manifest
index 904d39d7096b..c2fac114c171 100644
--- a/games-board/jrisk/Manifest
+++ b/games-board/jrisk/Manifest
@@ -1,2 +1,6 @@
-MD5 7edeca81a5c7c3dfa8c2edf4f135d0da jrisk-1.0.7.6.ebuild 1203
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 74121b09b46836291612de8b3352c702 jrisk-1.0.8.3.ebuild 1290
+MD5 6c384143ddbbeba8341fb8952dc0df0b ChangeLog 752
+MD5 0915c1b474d2731ec5eeb504175966a7 jrisk-1.0.7.6.ebuild 1288
+MD5 20bc6dc8768de2c7a65d02f715ab0f43 files/digest-jrisk-1.0.8.3 72
 MD5 1c7181125aed14e8e720dca1b7a2fc46 files/digest-jrisk-1.0.7.6 66
diff --git a/games-board/jrisk/jrisk-1.0.7.6.ebuild b/games-board/jrisk/jrisk-1.0.7.6.ebuild
index 07c14bf2d52a..3c314fab67f0 100644
--- a/games-board/jrisk/jrisk-1.0.7.6.ebuild
+++ b/games-board/jrisk/jrisk-1.0.7.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/games-board/jrisk/jrisk-1.0.7.6.ebuild,v 1.1 2005/06/28 03:25:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/jrisk/jrisk-1.0.7.6.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit eutils games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/jrisk/Risk_src_${PV}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 x86"
 IUSE="jikes"
 
 RDEPEND=">=virtual/jre-1.4"
diff --git a/games-board/jrisk/jrisk-1.0.8.3.ebuild b/games-board/jrisk/jrisk-1.0.8.3.ebuild
index a7eebafcf7dc..b730fa5d539e 100644
--- a/games-board/jrisk/jrisk-1.0.8.3.ebuild
+++ b/games-board/jrisk/jrisk-1.0.8.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/games-board/jrisk/jrisk-1.0.8.3.ebuild,v 1.1 2005/10/31 01:39:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/jrisk/jrisk-1.0.8.3.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-board/kcheckers/ChangeLog b/games-board/kcheckers/ChangeLog
index 011af3a0f898..ab959b89f63b 100644
--- a/games-board/kcheckers/ChangeLog
+++ b/games-board/kcheckers/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for games-board/kcheckers
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/kcheckers/ChangeLog,v 1.1 2004/12/07 22:26:19 mr_bones_ Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/kcheckers/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> -kcheckers-0.5.ebuild:
+  remove old version
+
+  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> kcheckers-0.6.ebuild:
+  x86 stable
+
+*kcheckers-0.6 (09 Jul 2005)
+
+  09 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kcheckers-0.6.ebuild:
+  New version. Remove dependency on kde.
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> kcheckers-0.5.ebuild:
+  Fix qmake dir per bug #97535
+
+  10 Jun 2005; David Holm <dholm@gentoo.org> kcheckers-0.5.ebuild:
+  Added to ~ppc.
+
+  07 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> kcheckers-0.5.ebuild:
+  fix sandbox (bug #73744)
 
 *kcheckers-0.5 (07 Dec 2004)
 
diff --git a/games-board/kcheckers/Manifest b/games-board/kcheckers/Manifest
index 1b154bbe1b23..c35642e5d5fa 100644
--- a/games-board/kcheckers/Manifest
+++ b/games-board/kcheckers/Manifest
@@ -1,2 +1,4 @@
-MD5 b4ee83d2347250bbb56f876dbbf1eceb kcheckers-0.5.ebuild 540
-MD5 92305e617c480707b1beeae51bce5cd4 files/digest-kcheckers-0.5 64
+MD5 7d20a5fe695b4f7a799ed609913284dc kcheckers-0.6.ebuild 820
+MD5 b3fb1be1b5138c298d7502d4a5eb0b13 ChangeLog 1017
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 020c25d34e7ca94b6bfc0a318df59f80 files/digest-kcheckers-0.6 65
diff --git a/games-board/kcheckers/kcheckers-0.6.ebuild b/games-board/kcheckers/kcheckers-0.6.ebuild
index 2b8440260a7d..d3082bf2e119 100644
--- a/games-board/kcheckers/kcheckers-0.6.ebuild
+++ b/games-board/kcheckers/kcheckers-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/games-board/kcheckers/kcheckers-0.6.ebuild,v 1.1 2005/07/09 21:26:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/kcheckers/kcheckers-0.6.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit qt3 games
 
@@ -10,16 +10,11 @@ SRC_URI="http://kcheckers.org/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="=x11-libs/qt-3*"
 
-pkg_setup() {
-	qt3_pkg_setup
-	games_pkg_setup
-}
-
 src_compile() {
 	sed -i -e 's,/usr/local,/usr,' config.h kcheckers.pro
 
diff --git a/games-board/knights/ChangeLog b/games-board/knights/ChangeLog
index 03fc3ad154a9..abfad571709b 100644
--- a/games-board/knights/ChangeLog
+++ b/games-board/knights/ChangeLog
@@ -1,6 +1,28 @@
-# ChangeLog for app-games/knights
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/knights/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/knights
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/knights/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  04 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> knights-0.6.ebuild:
+  arts dep - bug #73352
+
+  17 Nov 2004; Chris Gianelloni <wolf31o2@gentoo.org> knights-0.6.ebuild:
+  Added eutils to inherit.
+
+  05 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/0.6-gcc34.patch,
+  knights-0.6.ebuild:
+  gcc34 patch from Andrew Kirilenko via bug #69382
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> knights-0.6.ebuild:
+  Marked ~amd64; resolving 59658.
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> knights-0.6.ebuild:
+  Marked stable on sparc.
+
+  13 Nov 2003; Jason Wever <weeve@gentoo.org> knights-0.6.ebuild:
+  Added ~sparc keyword, fixes bug #33295.
 
   31 Aug 2003; Michael Sterrett <msterret@gentoo.org> knights-0.6.ebuild:
   inherit kde-base -> inherit kde
@@ -18,15 +40,15 @@
 
 *knights-0.5.6 (22 Aug 2002)
   
-  07 Sep 2002: J. Alberto Su�rez L�pez <bass@gentoo.org> knights-0.5.6.ebuild:
+  07 Sep 2002: J. Alberto Suárez López <bass@gentoo.org> knights-0.5.6.ebuild:
   New dependency kde-base/kdesdk #7498
 
-  22 Aug 2002; J. Alberto Su�rez L�pez <bass@gentoo.org> knights-0.5.6.ebuild :
+  22 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> knights-0.5.6.ebuild :
   Bumped version (gentoo@wahuu.at (Wahuu))
 
 *knights-0.5.4.1 (17 julio 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> knights-0.5.4.1.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> knights-0.5.4.1.ebuild :
   Added KEYWORDS, SLOT.
 
 *knights-0.5.1 (7 May 2002)
diff --git a/games-board/knights/Manifest b/games-board/knights/Manifest
index e843f48e2767..787048048e23 100644
--- a/games-board/knights/Manifest
+++ b/games-board/knights/Manifest
@@ -1,3 +1,5 @@
-MD5 c5f39f9fb8758a4d6856c0c916aba095 ChangeLog 1544
-MD5 c4f5ab346620ecd474b5ecc2d2c85b89 knights-0.6.ebuild 814
+MD5 6eeaf5ad1b2de5ea3c5fda7c01090ab6 ChangeLog 2308
+MD5 07662ec2f6b1ae54cc4f16c83f9cc114 files/0.6-gcc34.patch 1138
 MD5 14dd7b0024f0b5d7447f3f62332e5633 files/digest-knights-0.6 140
+MD5 de3ebaad5207382198d5d5a0c7c765cc knights-0.6.ebuild 1004
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
diff --git a/games-board/knights/knights-0.6.ebuild b/games-board/knights/knights-0.6.ebuild
index d3adb77568d0..427c7a9cc631 100644
--- a/games-board/knights/knights-0.6.ebuild
+++ b/games-board/knights/knights-0.6.ebuild
@@ -1,32 +1,43 @@
-# 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/games-board/knights/knights-0.6.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/knights/knights-0.6.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
-inherit kde
-
-need-kde 3
+inherit eutils kde
 
 THEME=${PN}-themepack-0.5.9
 DESCRIPTION="KDE Chess Interface"
+HOMEPAGE="http://knights.sourceforge.net/"
 SRC_URI="mirror://sourceforge/knights/${P}.tar.gz
 	mirror://sourceforge/knights/${THEME}.tar.gz"
-HOMEPAGE="http://knights.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc sparc amd64"
+IUSE=""
+
+# need-kde isn't smart enough yet so we have to set both *DEPEND right now
+# arts dep - bug #73352
+DEPEND="kde-base/arts"
+RDEPEND="kde-base/arts"
+
+need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-gcc34.patch"
+}
 
 src_compile() {
-	./configure \
-		--datadir="${KDEDIR}" \
-		|| die "./configure failed"
-	emake || die "emake failed"
+	myconf="--disable-dependency-tracking"
+
+	kde_src_compile
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	kde_src_install
 
 	cd ../${PN}-themepack || die "Themes seem to be missing."
-	insinto ${KDEDIR}/share/apps/knights/themes/
-	doins *.tar.gz
+	insinto /usr/share/apps/knights/themes/
+	doins *.tar.gz || die "doins failed"
 }
diff --git a/games-board/knights/metadata.xml b/games-board/knights/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/knights/metadata.xml
+++ b/games-board/knights/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/kwappen/ChangeLog b/games-board/kwappen/ChangeLog
index 63a41a12eaf1..2c300c7dc24d 100644
--- a/games-board/kwappen/ChangeLog
+++ b/games-board/kwappen/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-games/kwappen
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/kwappen/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/kwappen
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/kwappen/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  10 Jun 2005; David Holm <dholm@gentoo.org> kwappen-1.1.5.ebuild:
+  Added to ~ppc.
+
+*kwappen-1.1.5 (24 May 2005)
+
+  24 May 2005; Mike Frysinger <vapier@gentoo.org> +kwappen-1.1.5.ebuild:
+  Version bump #82142 by Arndt Wills.
 
   31 Aug 2003; Michael Sterrett <msterret@gentoo.org> kwappen-1.1.2.ebuild:
   inherit kde-base -> inherit kde
diff --git a/games-board/kwappen/Manifest b/games-board/kwappen/Manifest
index cd6a7987fa45..55a0b7ade95f 100644
--- a/games-board/kwappen/Manifest
+++ b/games-board/kwappen/Manifest
@@ -1,3 +1,6 @@
-MD5 1dde1b8b191c054ddfa3b34492e337dd ChangeLog 721
-MD5 2e523b3e19b7442dc2b379b303fb79fa kwappen-1.1.2.ebuild 454
+MD5 7f1c47454c8c1e4286fddb8b52d3eaff ChangeLog 940
+MD5 301a0db7a1b8fe776017a70c4e0f619c kwappen-1.1.2.ebuild 456
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 43915af71b934a60b33ced30fef07b28 kwappen-1.1.5.ebuild 464
 MD5 ed6708ffaf0c6238813f17ba2293d61d files/digest-kwappen-1.1.2 65
+MD5 1159693a1d45160dd180960e8521c458 files/digest-kwappen-1.1.5 66
diff --git a/games-board/kwappen/kwappen-1.1.2.ebuild b/games-board/kwappen/kwappen-1.1.2.ebuild
index 920f33ac2af6..b927f8562d43 100644
--- a/games-board/kwappen/kwappen-1.1.2.ebuild
+++ b/games-board/kwappen/kwappen-1.1.2.ebuild
@@ -1,14 +1,15 @@
-# 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/games-board/kwappen/kwappen-1.1.2.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/kwappen/kwappen-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit kde
-
 need-kde 3
 
 DESCRIPTION="A jigsaw puzzle game for the KDE environment"
 HOMEPAGE="http://www.lcs-chemie.de/kwappen_eng.htm"
 SRC_URI="http://www.lcs-chemie.de/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE=""
diff --git a/games-board/kwappen/kwappen-1.1.5.ebuild b/games-board/kwappen/kwappen-1.1.5.ebuild
index 3e59395d4ca8..bef91419ed7d 100644
--- a/games-board/kwappen/kwappen-1.1.5.ebuild
+++ b/games-board/kwappen/kwappen-1.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/games-board/kwappen/kwappen-1.1.5.ebuild,v 1.1 2005/05/24 01:03:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/kwappen/kwappen-1.1.5.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit kde
 need-kde 3
@@ -11,5 +11,5 @@ SRC_URI="http://www.lcs-chemie.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
diff --git a/games-board/kwappen/metadata.xml b/games-board/kwappen/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/kwappen/metadata.xml
+++ b/games-board/kwappen/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/mah-jong/ChangeLog b/games-board/mah-jong/ChangeLog
index dc265ffaf329..5629600c06c4 100644
--- a/games-board/mah-jong/ChangeLog
+++ b/games-board/mah-jong/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for games-board/mah-jong
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/ChangeLog,v 1.1 2003/11/05 10:04:50 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  11 Nov 2004; Joseph Jezak <josejx@gentoo.org> mah-jong-1.6.3.ebuild:
+  Marked ppc stable.
+
+  10 May 2004; David Holm <dholm@gentoo.org> mah-jong-1.6.3.ebuild:
+  Added to ~ppc.
+
+*mah-jong-1.6.3 (09 May 2004)
+
+  09 May 2004; Michael Sterrett <mr_bones_@gentoo.org> mah-jong-1.6.3.ebuild:
+  version bump
+
+  18 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> mah-jong-1.6.ebuild:
+  mark amd64 for bug #44639
 
 *mah-jong-1.6 (05 Nov 2003)
 
diff --git a/games-board/mah-jong/Manifest b/games-board/mah-jong/Manifest
index 02a949a5c241..fea47b176a7e 100644
--- a/games-board/mah-jong/Manifest
+++ b/games-board/mah-jong/Manifest
@@ -1,2 +1,6 @@
-MD5 f30bea4fa5b6dc4d1b04aaf578c8728d mah-jong-1.6.ebuild 659
+MD5 840952554be8bd08ba81dd5d684c0351 mah-jong-1.6.3.ebuild 1317
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 3b427b702bdeb399e25e7692b76452b2 mah-jong-1.6.ebuild 1327
+MD5 f629023becd280995843d7f1a77ceb8e ChangeLog 782
 MD5 5f90c97fdd4915658eaa642c7f0dfa32 files/digest-mah-jong-1.6 62
+MD5 e9db719c11a3abdbd7b7c6079de117d2 files/digest-mah-jong-1.6.3 64
diff --git a/games-board/mah-jong/mah-jong-1.6.3.ebuild b/games-board/mah-jong/mah-jong-1.6.3.ebuild
index 52a9c6848ac8..d2fe7ed8db85 100644
--- a/games-board/mah-jong/mah-jong-1.6.3.ebuild
+++ b/games-board/mah-jong/mah-jong-1.6.3.ebuild
@@ -1,33 +1,33 @@
-# 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/games-board/mah-jong/mah-jong-1.6.3.ebuild,v 1.1 2004/05/10 02:17:02 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/mah-jong-1.6.3.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit games
 
 MY_P="mj-${PV}-src"
-S="${WORKDIR}/${MY_P}"
 DESCRIPTION="A networked Mah Jong program, together with a computer player"
 HOMEPAGE="http://www.stevens-bradfield.com/MahJong/"
 SRC_URI="http://www.stevens-bradfield.com/MahJong/Source/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="virtual/x11
 	=x11-libs/gtk+-1.2*"
 DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=sys-apps/sed-4"
+	dev-lang/perl"
+
+S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i \
 		-e '/^.TH/ s/1/6/' xmj.man \
-			|| die "sed xmj.man failed"
+		|| die "sed xmj.man failed"
 	sed -i \
 		-e "/^DESTDIR =/ s:=.*:= ${D}:" \
 		-e "/^BINDIR =/ s:=.*:= ${GAMES_BINDIR}:" \
@@ -35,7 +35,7 @@ src_unpack() {
 		-e "/^MANSUFFIX =/ s:1:6:" \
 		-e "/^CFLAGS =/ s:=:= ${CFLAGS}:" \
 		-e "/^TILESETPATH=/ s:NULL:\"${GAMES_DATADIR}/${PN}/\":" Makefile \
-			|| die "sed Makefile failed"
+		|| die "sed Makefile failed"
 }
 
 src_install() {
@@ -44,7 +44,7 @@ src_install() {
 	cp -R fallbacktiles/ \
 		tiles-numbered/ \
 		tiles-small/ "${D}${GAMES_DATADIR}/${PN}" \
-			|| die "cp failed"
+		|| die "cp failed"
 	dodoc CHANGES ChangeLog *.txt
 	prepgamesdirs
 }
diff --git a/games-board/mah-jong/mah-jong-1.6.ebuild b/games-board/mah-jong/mah-jong-1.6.ebuild
index c52252514247..96de050dd746 100644
--- a/games-board/mah-jong/mah-jong-1.6.ebuild
+++ b/games-board/mah-jong/mah-jong-1.6.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/games-board/mah-jong/mah-jong-1.6.ebuild,v 1.1 2003/11/05 10:04:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/mah-jong-1.6.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit games
 
@@ -10,9 +10,9 @@ DESCRIPTION="A networked Mah Jong program, together with a computer player"
 HOMEPAGE="http://www.stevens-bradfield.com/MahJong/"
 SRC_URI="http://www.stevens-bradfield.com/MahJong/Source/${MY_P}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 RDEPEND="virtual/x11
@@ -34,17 +34,17 @@ src_unpack() {
 		-e "/^MANDIR =/ s:man/man1:/usr/share/man/man6:" \
 		-e "/^MANSUFFIX =/ s:1:6:" \
 		-e "/^CFLAGS =/ s:=:= ${CFLAGS}:" \
-		-e "/^TILESETPATH=/ s:NULL:\"${GAMES_DATADIR}/${PN}\":" Makefile || \
+		-e "/^TILESETPATH=/ s:NULL:\"${GAMES_DATADIR}/${PN}/\":" Makefile || \
 			die "sed Makefile failed"
 }
 
 src_install() {
 	make install install.man || die "make install failed"
-	dodir "${GAMES_DATADIR}/${PN}"
+	dodir ${GAMES_DATADIR}/${PN}
 	cp -R fallbacktiles/ \
 		tiles-numbered/ \
-		tiles-small/ "${D}${GAMES_DATADIR}/${PN}" || \
-			die "cp failed"
-	dodoc CHANGES ChangeLog *.txt || die "dodoc failed"
+		tiles-small/ "${D}${GAMES_DATADIR}/${PN}" \
+		|| die "cp failed"
+	dodoc CHANGES ChangeLog *.txt
 	prepgamesdirs
 }
diff --git a/games-board/mah-jong/metadata.xml b/games-board/mah-jong/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/mah-jong/metadata.xml
+++ b/games-board/mah-jong/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/mahjongg3d/ChangeLog b/games-board/mahjongg3d/ChangeLog
index dd7025469818..c4e5b0f82854 100644
--- a/games-board/mahjongg3d/ChangeLog
+++ b/games-board/mahjongg3d/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for games-board/mahjongg3d
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/ChangeLog,v 1.1 2004/06/07 19:09:56 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> mahjongg3d-0.96.ebuild:
+  Fix qt dep per bug #100235
+
+  21 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -mahjongg3d-0.95.ebuild, mahjongg3d-0.96.ebuild:
+  clean old ebuild; tidy
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> mahjongg3d-0.95.ebuild,
+  mahjongg3d-0.96.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  21 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> mahjongg3d-0.96.ebuild:
+  fix typo in SRC_URI
+
+*mahjongg3d-0.96 (21 Jun 2004)
+
+  21 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> mahjongg3d-0.96.ebuild:
+  version bump
 
 *mahjongg3d-0.95 (07 Jun 2004)
 
diff --git a/games-board/mahjongg3d/Manifest b/games-board/mahjongg3d/Manifest
index 032bd3a8b1d9..ba4408b75a8d 100644
--- a/games-board/mahjongg3d/Manifest
+++ b/games-board/mahjongg3d/Manifest
@@ -1,2 +1,4 @@
-MD5 59ae9a5abb3ec20b5352e835ec2d551e mahjongg3d-0.95.ebuild 1236
-MD5 25238a925f8e2204bb9c3e05e3ad3c3f files/digest-mahjongg3d-0.95 69
+MD5 dd47e51c10e67a97bbac44dfb088dbe9 mahjongg3d-0.96.ebuild 1052
+MD5 45e8ffc8f6d7fe181160a52d72da6f18 ChangeLog 1005
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 51ea5b85f839726d9bace362ae786b12 files/digest-mahjongg3d-0.96 69
diff --git a/games-board/mahjongg3d/files/digest-mahjongg3d-0.96 b/games-board/mahjongg3d/files/digest-mahjongg3d-0.96
index f4f4d1e30925..2f340eea5262 100644
--- a/games-board/mahjongg3d/files/digest-mahjongg3d-0.96
+++ b/games-board/mahjongg3d/files/digest-mahjongg3d-0.96
@@ -1 +1 @@
-MD5 2c8b0793b6a2f74a0ce5915b8e71e9b4 mahjongg3d.tar.bz2 3674725
+MD5 f5a08f4d1f375f3e4e94a2d392fe21d7 mahjongg3d-0.96.tar.bz2 4906036
diff --git a/games-board/mahjongg3d/mahjongg3d-0.96.ebuild b/games-board/mahjongg3d/mahjongg3d-0.96.ebuild
index 3ec820285980..5c5f3c2b1671 100644
--- a/games-board/mahjongg3d/mahjongg3d-0.96.ebuild
+++ b/games-board/mahjongg3d/mahjongg3d-0.96.ebuild
@@ -1,31 +1,30 @@
-# 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/games-board/mahjongg3d/mahjongg3d-0.96.ebuild,v 1.1 2004/06/21 19:00:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mahjongg3d/mahjongg3d-0.96.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit kde games
 
 DESCRIPTION="An implementation of the classical chinese game Mah Jongg with 3D OpenGL graphics"
 HOMEPAGE="http://www.reto-schoelly.de/mahjongg3d/"
-SRC_URI="http://www.reto-schoelly.de/${PN}/${PN}.tar.bz2"
+SRC_URI="http://www.reto-schoelly.de/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-RDEPEND=">=qt-3.2.0
+DEPEND="$(qt_min_version 3.2)
 	virtual/opengl"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
-S="${WORKDIR}/${PN}.release"
+S=${WORKDIR}/${PN}.release
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i \
 		-e "/GAMEDATA_BASE_PATH/ s:\.:${GAMES_DATADIR}/${PN}:" \
-		src/gamedata_path.h || die "sed src/gamedata_path.h failed"
+		src/gamedata_path.h \
+		|| die "sed failed"
 }
 
 src_compile() {
@@ -35,7 +34,7 @@ src_compile() {
 }
 
 src_install () {
-	dogamesbin bin/{mahjongg3d,mahjongg3d-install-*} || die "dogamesbin failed"
+	dogamesbin bin/mahjongg3d || die "dogamesbin failed"
 	dodir "${GAMES_DATADIR}/${PN}"
 	cp -r bin/{[a-l]*,t*} "${D}${GAMES_DATADIR}/${PN}" || die "cp failed"
 	dodoc README Changelog
diff --git a/games-board/maitretarot/ChangeLog b/games-board/maitretarot/ChangeLog
index f3f02d80e893..250c272e05e7 100644
--- a/games-board/maitretarot/ChangeLog
+++ b/games-board/maitretarot/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-games/maitretarot
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/maitretarot/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/maitretarot
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/maitretarot/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 *maitretarot-0.1.98 (13 Jul 2003)
 
diff --git a/games-board/maitretarot/Manifest b/games-board/maitretarot/Manifest
index da846beb653d..19baa94c6ead 100644
--- a/games-board/maitretarot/Manifest
+++ b/games-board/maitretarot/Manifest
@@ -1,3 +1,4 @@
+MD5 ae95626a6960049e03dbea22b0a459b2 maitretarot-0.1.98.ebuild 841
+MD5 8269c4a6e1967861e3018e448ab5b4d5 ChangeLog 386
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 a767a36faedb5c6b483f4ce478069391 files/digest-maitretarot-0.1.98 70
-MD5 7272713a34ec373f1ca8cb94786b35d1 maitretarot-0.1.98.ebuild 799
-MD5 de051dab59ce05256b6621cb1ee8a962 ChangeLog 389
diff --git a/games-board/maitretarot/maitretarot-0.1.98.ebuild b/games-board/maitretarot/maitretarot-0.1.98.ebuild
index 4c5bb84288ea..3e0d3da7edf1 100644
--- a/games-board/maitretarot/maitretarot-0.1.98.ebuild
+++ b/games-board/maitretarot/maitretarot-0.1.98.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/games-board/maitretarot/maitretarot-0.1.98.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/maitretarot/maitretarot-0.1.98.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="http://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="=dev-libs/glib-2*
 	dev-libs/libxml2
@@ -20,11 +21,11 @@ src_compile() {
 	egamesconf \
 		--with-default-config-file=${GAMES_SYSCONFDIR}/maitretarotrc.xml \
 		|| die
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 	prepgamesdirs
 }
diff --git a/games-board/maitretarot/metadata.xml b/games-board/maitretarot/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/maitretarot/metadata.xml
+++ b/games-board/maitretarot/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/megamek/ChangeLog b/games-board/megamek/ChangeLog
index bf0f8815e729..c6fab550409c 100644
--- a/games-board/megamek/ChangeLog
+++ b/games-board/megamek/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/megamek
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/megamek/ChangeLog,v 1.1 2005/06/08 21:17:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/megamek/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  09 Jun 2005; David Holm <dholm@gentoo.org> megamek-0.29.10.ebuild:
+  Added to ~ppc.
 
 *megamek-0.29.10 (08 Jun 2005)
 
diff --git a/games-board/megamek/Manifest b/games-board/megamek/Manifest
index 35f8271c9e7f..14913ea1ab61 100644
--- a/games-board/megamek/Manifest
+++ b/games-board/megamek/Manifest
@@ -1,2 +1,4 @@
-MD5 f258ba7fe6825ab5e8fb9869706e52fc megamek-0.29.10.ebuild 1308
+MD5 4279cc62d734de17d0732ffdc8dd8cae megamek-0.29.10.ebuild 946
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a89483b6bc95c9da238c6f26b13e8a50 ChangeLog 480
 MD5 b53a3742945810621b88bc9be990d1c9 files/digest-megamek-0.29.10 73
diff --git a/games-board/megamek/megamek-0.29.10.ebuild b/games-board/megamek/megamek-0.29.10.ebuild
index 84e8da0238fc..001128dec446 100644
--- a/games-board/megamek/megamek-0.29.10.ebuild
+++ b/games-board/megamek/megamek-0.29.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/games-board/megamek/megamek-0.29.10.ebuild,v 1.1 2005/06/08 21:17:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/megamek/megamek-0.29.10.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 # Nonofficial ebuild by Ycarus. For new version look here : http://gentoo.zugaina.org/
 
 inherit eutils games
@@ -12,14 +12,15 @@ HOMEPAGE="http://megamek.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 RESTRICT="nomirror"
 
-DEPEND=">=virtual/jdk-1.4"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
 RDEPEND=">=virtual/jre-1.4"
 
-S="${WORKDIR}"
+S=${WORKDIR}
 
 src_install() {
 	insinto "${GAMES_DATADIR}/${PN}"
diff --git a/games-board/metadata.xml b/games-board/metadata.xml
index 0cfabcdfcdb7..bc5c949530e7 100644
--- a/games-board/metadata.xml
+++ b/games-board/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The games-board category contains board games.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-board enthält Brettspiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-board contiene juegos de tablero.
+	</longdescription>
+	<longdescription lang="ja">
+		games-boardカテゴリーにはボード・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-board categorie bevat bordspellen.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-board chứa các trò chơi dạng bảng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-board contiene giochi da tavolo.
+	</longdescription>
 </catmetadata>
 
diff --git a/games-board/mt_dolphin_ia/ChangeLog b/games-board/mt_dolphin_ia/ChangeLog
index 90db774856e2..12959eee96ef 100644
--- a/games-board/mt_dolphin_ia/ChangeLog
+++ b/games-board/mt_dolphin_ia/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-games/mt_dolphin_ia
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mt_dolphin_ia/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/mt_dolphin_ia
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/mt_dolphin_ia/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 *mt_dolphin_ia-0.1.98 (13 Jul 2003)
 
diff --git a/games-board/mt_dolphin_ia/Manifest b/games-board/mt_dolphin_ia/Manifest
index 0372f87a20c0..bd4a30e68446 100644
--- a/games-board/mt_dolphin_ia/Manifest
+++ b/games-board/mt_dolphin_ia/Manifest
@@ -1,3 +1,4 @@
+MD5 1804088cbfafe2bafa357e02e6901c08 mt_dolphin_ia-0.1.98.ebuild 729
+MD5 ebb2090ecd6327c2496da9857ecd9d7c ChangeLog 392
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 12cbc5aaa0db39fba41b4d56af3b5f05 files/digest-mt_dolphin_ia-0.1.98 72
-MD5 196162ed4d9d35a12df27c6f35bc4a3a mt_dolphin_ia-0.1.98.ebuild 754
-MD5 5ce22aeab213c5c5460150ed17897957 ChangeLog 395
diff --git a/games-board/mt_dolphin_ia/metadata.xml b/games-board/mt_dolphin_ia/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/mt_dolphin_ia/metadata.xml
+++ b/games-board/mt_dolphin_ia/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
index a1d6b7224fdd..561209685aee 100644
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild
+++ b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.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/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit games
 
@@ -11,19 +11,15 @@ SRC_URI="http://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="=dev-libs/glib-2*
 	dev-libs/libxml2
 	dev-games/libmaitretarot
 	dev-games/libmt_client"
 
-src_compile() {
-	egamesconf || die
-	emake || die
-}
-
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 	prepgamesdirs
 }
diff --git a/games-board/mt_gtk_client/ChangeLog b/games-board/mt_gtk_client/ChangeLog
index 42ec456108fa..82aba745280f 100644
--- a/games-board/mt_gtk_client/ChangeLog
+++ b/games-board/mt_gtk_client/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-games/mt_gtk_client
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mt_gtk_client/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/mt_gtk_client
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/mt_gtk_client/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 *mt_gtk_client-0.1.98 (13 Jul 2003)
 
diff --git a/games-board/mt_gtk_client/Manifest b/games-board/mt_gtk_client/Manifest
index 8cde1c7c0345..f3fbe9625e3e 100644
--- a/games-board/mt_gtk_client/Manifest
+++ b/games-board/mt_gtk_client/Manifest
@@ -1,3 +1,4 @@
+MD5 1810ad4e6deacb4f3a22a5897eee69aa mt_gtk_client-0.1.98.ebuild 959
+MD5 4a848a672e9c69d7a0ade50788f01946 ChangeLog 392
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 6449ce3bccfd74d5c975a49fb4c9cd94 files/digest-mt_gtk_client-0.1.98 73
-MD5 fe875b5b7fee908dc95644f57d5cd435 mt_gtk_client-0.1.98.ebuild 924
-MD5 d73ee8847c80b3a1f84dd85b9a845434 ChangeLog 395
diff --git a/games-board/mt_gtk_client/metadata.xml b/games-board/mt_gtk_client/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/mt_gtk_client/metadata.xml
+++ b/games-board/mt_gtk_client/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild b/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
index fb9c34eb21e9..718bbfdd59c4 100644
--- a/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild
+++ b/games-board/mt_gtk_client/mt_gtk_client-0.1.98.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/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mt_gtk_client/mt_gtk_client-0.1.98.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
@@ -23,12 +23,12 @@ RDEPEND="${DEPEND}
 	dev-games/cardpics"
 
 src_compile() {
-	egamesconf `use_enable gnome gnome2` || die
-	emake || die
+	egamesconf $(use_enable gnome gnome2) || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	mv ${D}/${GAMES_DATADIR}/locale ${D}/usr/share/
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 	prepgamesdirs
diff --git a/games-board/mt_ncurses_client/ChangeLog b/games-board/mt_ncurses_client/ChangeLog
index 0fa2b9ab304c..97bbf50ba8ff 100644
--- a/games-board/mt_ncurses_client/ChangeLog
+++ b/games-board/mt_ncurses_client/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for app-games/mt_ncurses_client
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mt_ncurses_client/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/mt_ncurses_client
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/mt_ncurses_client/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 *mt_ncurses_client-0.1.98 (13 Jul 2003)
 
diff --git a/games-board/mt_ncurses_client/Manifest b/games-board/mt_ncurses_client/Manifest
index 5115b2e3d635..a327c42aa55a 100644
--- a/games-board/mt_ncurses_client/Manifest
+++ b/games-board/mt_ncurses_client/Manifest
@@ -1,3 +1,4 @@
+MD5 98bc96cdcbe38988450b66b180953961 mt_ncurses_client-0.1.98.ebuild 755
+MD5 5d60cf41dc710c511b2093f52023c70f ChangeLog 404
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 bc5d383a9a788c9e7f5ad89f24bf278f files/digest-mt_ncurses_client-0.1.98 76
-MD5 c526fa05b03296fcf02b8666ec8c7999 mt_ncurses_client-0.1.98.ebuild 780
-MD5 9eb8ec6ce43e7701103b9a016f8f89e4 ChangeLog 407
diff --git a/games-board/mt_ncurses_client/metadata.xml b/games-board/mt_ncurses_client/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/mt_ncurses_client/metadata.xml
+++ b/games-board/mt_ncurses_client/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
index db86fca6de3f..d980a05716ce 100644
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild
+++ b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.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/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
@@ -11,6 +11,7 @@ SRC_URI="http://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.ta
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
+IUSE=""
 
 DEPEND="=dev-libs/glib-2*
 	dev-libs/libxml2
@@ -18,13 +19,8 @@ DEPEND="=dev-libs/glib-2*
 	dev-games/libmt_client
 	sys-libs/ncurses"
 
-src_compile() {
-	egamesconf || die
-	emake || die
-}
-
 src_install() {
-	make install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 	prepgamesdirs
 }
diff --git a/games-board/natch/ChangeLog b/games-board/natch/ChangeLog
index 69f3b6c7d6c4..e30baa80d502 100644
--- a/games-board/natch/ChangeLog
+++ b/games-board/natch/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/natch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/natch/ChangeLog,v 1.1 2005/03/27 00:40:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/natch/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  03 May 2005; David Holm <dholm@gentoo.org> natch-2.3.ebuild:
+  Added to ~ppc.
 
 *natch-2.3 (26 Mar 2005)
 
diff --git a/games-board/natch/Manifest b/games-board/natch/Manifest
index 50936dda9a47..19b616ea5cab 100644
--- a/games-board/natch/Manifest
+++ b/games-board/natch/Manifest
@@ -1,3 +1,4 @@
-MD5 5fe8b0bfdd15757beb04f5a07b18293b natch-2.3.ebuild 496
-MD5 d41d8cd98f00b204e9800998ecf8427e ChangeLog 0
+MD5 bac7d069f87d04c48c0a0bcf3a7e2a30 ChangeLog 435
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 3404d1e485db552135498523336f42b2 natch-2.3.ebuild 645
 MD5 233f35ddc5fceec3dc1b872c2470c5b2 files/digest-natch-2.3 61
diff --git a/games-board/natch/natch-2.3.ebuild b/games-board/natch/natch-2.3.ebuild
index 61041e2bec51..8117db9af2ff 100644
--- a/games-board/natch/natch-2.3.ebuild
+++ b/games-board/natch/natch-2.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/games-board/natch/natch-2.3.ebuild,v 1.1 2005/03/27 00:40:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/natch/natch-2.3.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit games
 
@@ -11,7 +11,7 @@ SRC_URI="http://natch.free.fr/Natch/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/games-board/pio/ChangeLog b/games-board/pio/ChangeLog
index 2aef49c219d2..89cedbbb19ae 100644
--- a/games-board/pio/ChangeLog
+++ b/games-board/pio/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for games-board/pio
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pio/ChangeLog,v 1.1 2005/07/21 03:00:04 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pio/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  18 Oct 2005; Don Seiler <rizzo@gentoo.org> pio-0.9.19.ebuild:
+  Removed broken debug building for bug #109084
+
+*pio-0.9.33 (18 Oct 2005)
+
+  18 Oct 2005; Don Seiler <rizzo@gentoo.org> +pio-0.9.33.ebuild:
+  Version bump
+
+*pio-0.9.23 (18 Aug 2005)
+
+  18 Aug 2005; Don Seiler <rizzo@gentoo.org> +pio-0.9.23.ebuild:
+  Version bump
 
 *pio-0.9.19 (21 Jul 2005)
 
diff --git a/games-board/pio/Manifest b/games-board/pio/Manifest
index ff2158454231..0ee020ece09d 100644
--- a/games-board/pio/Manifest
+++ b/games-board/pio/Manifest
@@ -1,3 +1,8 @@
-MD5 a465af903d255faba337334fbc2f1a15 pio-0.9.19.ebuild 1122
+MD5 71a6059bd11e6bb1dc95370eb1cc128a pio-0.9.19.ebuild 1048
 MD5 7035b4db1ed5ed0e55ee3dd6524e5b2b metadata.xml 321
+MD5 4a2092784b8521003ff632cf3b614cae pio-0.9.23.ebuild 1127
+MD5 8e7d0e08524bc699a47659a0e7d0f6a1 ChangeLog 710
+MD5 3e421777d59bc01c0906697f3e06da96 pio-0.9.33.ebuild 1123
 MD5 a270a5b020f0b2c049fe47b0396bafd9 files/digest-pio-0.9.19 68
+MD5 bd0fefda62535dc61a6c2791b5b194f8 files/digest-pio-0.9.23 68
+MD5 1aa79202dcebe05379ba182e2f361d44 files/digest-pio-0.9.33 68
diff --git a/games-board/pio/pio-0.9.19.ebuild b/games-board/pio/pio-0.9.19.ebuild
index 72c4a5cd21b9..0ff25fb317ae 100644
--- a/games-board/pio/pio-0.9.19.ebuild
+++ b/games-board/pio/pio-0.9.19.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/games-board/pio/pio-0.9.19.ebuild,v 1.1 2005/07/21 03:00:04 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pio/pio-0.9.19.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
-inherit eutils gnome2 debug
+inherit eutils gnome2
 
 MY_P="pioneers-${PV}"
 DESCRIPTION="A clone of the popular board game The Settlers of Catan"
@@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/pio/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="nls debug X"
+KEYWORDS="x86 ~ppc ~amd64"
+IUSE="nls X"
 
 RDEPEND=">=dev-libs/glib-2.0
 	X? ( >=gnome-base/libgnomeui-2.6.1.1
@@ -25,7 +25,6 @@ S=${WORKDIR}/${MY_P}
 
 src_compile() {
 	export G2CONF="${G2CONF} `use_enable nls`"
-	export G2CONF="${G2CONF} `use_enable debug`"
 
 	if use X ; then
 		gnome2_src_compile
diff --git a/games-board/pio/pio-0.9.23.ebuild b/games-board/pio/pio-0.9.23.ebuild
index 3bfe7c194e9e..09cdeb930f71 100644
--- a/games-board/pio/pio-0.9.23.ebuild
+++ b/games-board/pio/pio-0.9.23.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/games-board/pio/pio-0.9.23.ebuild,v 1.1 2005/08/18 17:16:43 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pio/pio-0.9.23.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit eutils gnome2 debug
 
diff --git a/games-board/pio/pio-0.9.33.ebuild b/games-board/pio/pio-0.9.33.ebuild
index c9317095d8f8..7a30b5036f9f 100644
--- a/games-board/pio/pio-0.9.33.ebuild
+++ b/games-board/pio/pio-0.9.33.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/games-board/pio/pio-0.9.33.ebuild,v 1.1 2005/10/18 03:02:54 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pio/pio-0.9.33.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit eutils gnome2 debug
 
diff --git a/games-board/pysol-sound-server/ChangeLog b/games-board/pysol-sound-server/ChangeLog
index 0d89cebb456d..9a9b43d32e08 100644
--- a/games-board/pysol-sound-server/ChangeLog
+++ b/games-board/pysol-sound-server/ChangeLog
@@ -1,6 +1,20 @@
-# ChangeLog for app-games/pysol-sound-server
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysol-sound-server/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/pysol-sound-server
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol-sound-server/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+*pysol-sound-server-3.01 (01 Jan 2005)
+
+  01 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +pysol-sound-server-3.01.ebuild:
+  Version bump #76241 by Brian Hall.
+
+  19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  pysol-sound-server-3.00.ebuild:
+  Marking stable on amd64 (no bugs in 651 days).
+
+  24 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  pysol-sound-server-3.00.ebuild:
+  header fix; tidy
 
 *pysol-sound-server-3.00 (08 Jul 2002)
 
diff --git a/games-board/pysol-sound-server/Manifest b/games-board/pysol-sound-server/Manifest
index 11b62fbcbb69..df1b9201a8bd 100644
--- a/games-board/pysol-sound-server/Manifest
+++ b/games-board/pysol-sound-server/Manifest
@@ -1,3 +1,4 @@
-MD5 b7ee2cfbc4a9c2056dd2479bf25adc0a ChangeLog 431
-MD5 e1addf10153856749dc0d997e161cb70 pysol-sound-server-3.00.ebuild 731
-MD5 026b7c98c7f90f70ea2d386201d7234a files/digest-pysol-sound-server-3.00 76
+MD5 94b387158a20845d417e324f08c4e30b ChangeLog 836
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 fdda9bcb2424c4f457552595e0ebce6a pysol-sound-server-3.01.ebuild 762
+MD5 cc8b74f33cfbba0d62ffcab35bd7c68b files/digest-pysol-sound-server-3.01 76
diff --git a/games-board/pysol-sound-server/metadata.xml b/games-board/pysol-sound-server/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/pysol-sound-server/metadata.xml
+++ b/games-board/pysol-sound-server/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/pysol-sound-server/pysol-sound-server-3.01.ebuild b/games-board/pysol-sound-server/pysol-sound-server-3.01.ebuild
index 3006bdefdc36..942e18fe3449 100644
--- a/games-board/pysol-sound-server/pysol-sound-server-3.01.ebuild
+++ b/games-board/pysol-sound-server/pysol-sound-server-3.01.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/games-board/pysol-sound-server/pysol-sound-server-3.01.ebuild,v 1.1 2005/01/01 22:20:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol-sound-server/pysol-sound-server-3.01.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 DESCRIPTION="Sound server for PySol"
 HOMEPAGE="http://www.oberhumer.com/opensource/pysol/"
diff --git a/games-board/pysol/ChangeLog b/games-board/pysol/ChangeLog
index 34aa01bb575d..91640116dda9 100644
--- a/games-board/pysol/ChangeLog
+++ b/games-board/pysol/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for app-games/pysol
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/pysol
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+*pysol-4.82-r1 (24 Jun 2005)
+
+  24 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/pysol-4.82-sound-ok.patch, +pysol-4.82-r1.ebuild:
+  Install the source to fix #81176 by David Ripton and fix an assert error
+  #94234 by Mark Knecht.
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> pysol-4.82.ebuild:
+  Removed INSTALL file.
+
+  19 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org> pysol-4.82.ebuild:
+  old tarball went away upstream.
+
+  19 Apr 2004; Chris Gianelloni <wolf31o2@gentoo.org> pysol-4.82.ebuild:
+  Marking stable on amd64 (no bugs in 229 days).
 
 *pysol-4.82 (03 Sep 2003)
 
diff --git a/games-board/pysol/Manifest b/games-board/pysol/Manifest
index 5b9dbc6b14dd..71ea727b603d 100644
--- a/games-board/pysol/Manifest
+++ b/games-board/pysol/Manifest
@@ -1,5 +1,17 @@
-MD5 c073db34dd7b8e49a0ab2e4d0cb03a24 ChangeLog 815
-MD5 aab6e91aa9113a8958a30488dd0d0c8e pysol-4.81-r1.ebuild 1639
-MD5 7d88d90a8927da4ba2817774a07817a6 pysol-4.82.ebuild 1627
-MD5 b678862ac0cf6cb48cc82b461ff685a7 files/digest-pysol-4.81-r1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2ed9f5b51fdbd06e6ebca139b3068076 pysol-4.82.ebuild 1009
+MD5 03d647a87b01e25cc791f288985cfe10 pysol-4.82-r1.ebuild 1323
+MD5 cc92bbc17e8d3cf9c712ec0f3d8de975 ChangeLog 1378
+MD5 1ea7842520bd2765105663127826d162 files/digest-pysol-4.82-r1 131
+MD5 3f8caa1bf12625ec007855239ce99176 files/pysol-4.82-sound-ok.patch 635
 MD5 64d3e8b76a0ed236cf4a0fdb4a3e4b50 files/digest-pysol-4.82 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHLXRgIKl8Uu19MoRAswoAJ4pwTLccZdePKKPSdwkPABwSSexDQCfYqU2
+S56iUaQmoMVSteVB7yJitf0=
+=C/+K
+-----END PGP SIGNATURE-----
diff --git a/games-board/pysol/metadata.xml b/games-board/pysol/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/pysol/metadata.xml
+++ b/games-board/pysol/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/pysol/pysol-4.82-r1.ebuild b/games-board/pysol/pysol-4.82-r1.ebuild
index 3ef2c2b2e205..7f00415d7e2a 100644
--- a/games-board/pysol/pysol-4.82-r1.ebuild
+++ b/games-board/pysol/pysol-4.82-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/games-board/pysol/pysol-4.82-r1.ebuild,v 1.1 2005/06/24 01:04:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/pysol-4.82-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games python eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="virtual/python"
@@ -21,6 +21,7 @@ RDEPEND="virtual/python
 
 pkg_setup() {
 	python_tkinter_exists
+	games_pkg_setup
 }
 
 src_unpack() {
@@ -43,9 +44,12 @@ src_install() {
 
 	doman pysol.6
 	dodoc NEWS README
+
+	prepgamesdirs
 }
 
 pkg_postinst() {
+	games_pkg_postinst
 	python_mod_optimize "${GAMES_LIBDIR}"/${PN}
 }
 
diff --git a/games-board/pysol/pysol-4.82.ebuild b/games-board/pysol/pysol-4.82.ebuild
index fbac510584f4..0ea45bdbaf1c 100644
--- a/games-board/pysol/pysol-4.82.ebuild
+++ b/games-board/pysol/pysol-4.82.ebuild
@@ -1,61 +1,41 @@
-# 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/games-board/pysol/pysol-4.82.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pysol/pysol-4.82.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
-DESCRIPTION="An exciting collection of more than 200 solitaire card games"
-SRC_URI="http://www.oberhumer.com/opensource/pysol/download/${P}.tar.bz2"
-HOMEPAGE="http://www.oberhumer.com/opensource/pysol/"
+inherit python
 
-DEPEND="virtual/python
-	>=sys-apps/sed-4"
-RDEPEND="virtual/python
-	>=app-games/pysol-sound-server-3.0
-	>=dev-lang/tk-8.0"
+DESCRIPTION="An exciting collection of more than 200 solitaire card games"
+HOMEPAGE="http://www.pysol.org/"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="virtual/python"
+RDEPEND="virtual/python
+	>=games-board/pysol-sound-server-3.0
+	>=dev-lang/tk-8.0"
 
 pkg_setup() {
-	if ! python -c "import Tkinter" >/dev/null 2>&1
-	then
-		eerror "You need to recompile python with Tkinter support."
-		eerror "That means: USE='tcltk' emerge python"
-		echo
-		die "missing tkinter support with installed python"
-	fi
+	python_tkinter_exists
 }
 
-src_install () {
-	local prefix
-	local datadir
-	local pkgdatadir
-
-	prefix="/usr"
-	datadir="${prefix}/share"
-	pkgdatadir=${datadir}/${PN}/${PV}
+src_install() {
+	local prefix="/usr"
+	local datadir="${prefix}/share"
+	local pkgdatadir=${datadir}/${PN}/${PV}
 
 	sed -i \
 		-e "s|@prefix@|${prefix}|" \
-		-e "s|@pkgdatadir@|${pkgdatadir}|" pysol || \
-			die "sed pysol failed"
-	dobin pysol
-
-	make prefix=${D}/usr install-data
+		-e "s|@pkgdatadir@|${pkgdatadir}|" \
+		pysol || die "sed pysol failed"
 
-	insinto /usr/X11R6/include/X11/pixmaps
+	dobin pysol || die "dobin failed"
+	make prefix="${D}/usr" install-data || die "install-data failed"
+	insinto /usr/include/X11/pixmaps
 	doins data/pysol.xpm
-
 	doman pysol.6
-
-#	cp -a ${WORKDIR}/pysol-cardsets-4.40/data/cardset-* ${D}/opt/${P}/data/
-#	cp -a ${WORKDIR}/pysol-music-4.40/data/music/* ${D}/opt/${P}/data/music/
-	dodoc COPYING INSTALL NEWS README
-}
-
-pkg_postinst() {
-	einfo "Please make sure that python was built with TK support:"
-	einfo "grep tcltk /var/db/pkg/dev-lang/python*/USE"
-	einfo "If the grep fails, then:"
-	einfo "USE='tcltk' emerge python"
+	dodoc NEWS README
 }
diff --git a/games-board/qgo/ChangeLog b/games-board/qgo/ChangeLog
index c8f8b32ba11a..e0adab215152 100644
--- a/games-board/qgo/ChangeLog
+++ b/games-board/qgo/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for games-board/qgo
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.1 2004/03/04 00:04:58 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+*qgo-1.0.3 (22 Oct 2005)
+
+  22 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org> +qgo-1.0.3.ebuild:
+  version bump
+
+*qgo-1.0.2 (05 Jul 2005)
+
+  05 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.0.2-gcc.patch, +qgo-1.0.2.ebuild:
+  version bump
+
+  24 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/1.0.1-gcc.patch, qgo-1.0.1.ebuild:
+  add back in a better named patch
+
+  24 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/0.2.2-gcc.patch, -qgo-0.2.2.ebuild, -qgo-1.0.0.ebuild:
+  clean older ebuilds
+
+*qgo-1.0.1 (31 Mar 2005)
+
+  31 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> +qgo-1.0.1.ebuild:
+  version bump
+
+*qgo-1.0.0 (14 Dec 2004)
+
+  14 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> +qgo-1.0.0.ebuild:
+  version bump
+
+  25 Oct 2004; Tom Martin <slarti@gentoo.org> qgo-0.2.2.ebuild:
+  Marked ~amd64, see bug 61642.
+
+*qgo-0.2.2 (19 Oct 2004)
+
+  19 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/0.2.2-gcc.patch,
+  +qgo-0.2.2.ebuild:
+  version bump
+
+*qgo-0.2.1 (05 Jul 2004)
+
+  05 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> +files/0.2.1-gcc.patch,
+  +qgo-0.2.1.ebuild:
+  version bump
+
+  04 Jun 2004; David Holm <dholm@gentoo.org> qgo-0.2.ebuild:
+  Added to ~ppc.
+
+  03 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> qgo-0.1.3.ebuild:
+  mark stable
+
+*qgo-0.2 (02 Jun 2004)
+
+  02 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> qgo-0.2.ebuild:
+  version bump - patch from Andrew Kirilenko via bug #50570
 
 *qgo-0.1.3 (03 Mar 2004)
 
diff --git a/games-board/qgo/Manifest b/games-board/qgo/Manifest
index 029d1af5c9e6..f901eb9f3a4a 100644
--- a/games-board/qgo/Manifest
+++ b/games-board/qgo/Manifest
@@ -1,4 +1,10 @@
-MD5 ea7f21cf900889be2ff0f258234dab0d files/digest-qgo-0.1.3 62
-MD5 7d51915bbfbb040413c30ecf9b05cc8f ChangeLog 353
 MD5 7be057a9771e6eb03103063d47a366b8 metadata.xml 388
-MD5 cfd6a778535399e2751e72a11b68c72f qgo-0.1.3.ebuild 699
+MD5 d3f09af9eba249d175def3f18198c931 qgo-1.0.3.ebuild 572
+MD5 b43bab1a312905a7abfd8efbf0a5800c qgo-1.0.1.ebuild 677
+MD5 9c1c3eb3abb3482d019a65dcbd6184dc qgo-1.0.2.ebuild 651
+MD5 f56db4e7ee922b27ae23528f3d3b2c21 ChangeLog 1819
+MD5 27e98c0c98b8d714580d36f4b28f3542 files/digest-qgo-1.0.1 62
+MD5 c8d87e22089221af58773e0115d51003 files/1.0.2-gcc.patch 520
+MD5 c8d87e22089221af58773e0115d51003 files/1.0.1-gcc.patch 520
+MD5 5c6238d73ea9a373978f8ce1bf9b8228 files/digest-qgo-1.0.3 62
+MD5 94b5e7f9489270517355918e2037042f files/digest-qgo-1.0.2 62
diff --git a/games-board/qgo/qgo-1.0.1.ebuild b/games-board/qgo/qgo-1.0.1.ebuild
index 9096f580b016..875056809e23 100644
--- a/games-board/qgo/qgo-1.0.1.ebuild
+++ b/games-board/qgo/qgo-1.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/games-board/qgo/qgo-1.0.1.ebuild,v 1.1 2005/03/31 17:36:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit kde-functions eutils
 need-qt 3
@@ -17,7 +17,7 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/0.2.2-gcc.patch
+	epatch "${FILESDIR}"/${PV}-gcc.patch
 }
 
 src_install() {
diff --git a/games-board/qgo/qgo-1.0.2.ebuild b/games-board/qgo/qgo-1.0.2.ebuild
index bb9d30a6b3aa..98fcb56e7014 100644
--- a/games-board/qgo/qgo-1.0.2.ebuild
+++ b/games-board/qgo/qgo-1.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/games-board/qgo/qgo-1.0.2.ebuild,v 1.1 2005/07/05 15:28:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit kde-functions eutils
 need-qt 3
diff --git a/games-board/qgo/qgo-1.0.3.ebuild b/games-board/qgo/qgo-1.0.3.ebuild
index 57e6728d2eb5..3b24644d2811 100644
--- a/games-board/qgo/qgo-1.0.3.ebuild
+++ b/games-board/qgo/qgo-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/games-board/qgo/qgo-1.0.3.ebuild,v 1.1 2005/10/22 04:27:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/qgo/qgo-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit kde-functions eutils
 
diff --git a/games-board/r-katro/ChangeLog b/games-board/r-katro/ChangeLog
index f745d7e6c16f..ba64ea103bfc 100644
--- a/games-board/r-katro/ChangeLog
+++ b/games-board/r-katro/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-games/r-katro
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/r-katro/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/r-katro
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/r-katro/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> r-katro-0.7.0.ebuild:
+  Fix qt dep
+
+  03 May 2005; David Holm <dholm@gentoo.org> r-katro-0.7.0.ebuild:
+  Added to ~ppc.
 
 *r-katro-0.7.0 (06 Aug 2003)
 
diff --git a/games-board/r-katro/Manifest b/games-board/r-katro/Manifest
index 68631ebd18c8..2df57f3bc390 100644
--- a/games-board/r-katro/Manifest
+++ b/games-board/r-katro/Manifest
@@ -1,3 +1,4 @@
-MD5 4024ee71e430453299e4ce28dac221ca r-katro-0.7.0.ebuild 760
-MD5 af5f2ead8cd67f967c4ce24392a3b691 ChangeLog 389
+MD5 b3874c82cc87a956c24f96c0328f64ab ChangeLog 549
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 bb1215c09bc397f0234b40875fcc731a r-katro-0.7.0.ebuild 788
 MD5 8ed3c41e3e73e7f74eb9844c32883d2f files/digest-r-katro-0.7.0 66
diff --git a/games-board/r-katro/metadata.xml b/games-board/r-katro/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/r-katro/metadata.xml
+++ b/games-board/r-katro/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/r-katro/r-katro-0.7.0.ebuild b/games-board/r-katro/r-katro-0.7.0.ebuild
index 2648528c717f..b234ab5bf934 100644
--- a/games-board/r-katro/r-katro-0.7.0.ebuild
+++ b/games-board/r-katro/r-katro-0.7.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/games-board/r-katro/r-katro-0.7.0.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/r-katro/r-katro-0.7.0.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit games
 
@@ -9,15 +9,16 @@ HOMEPAGE="http://f.rodrigo.free.fr/games/r-katro/r-katro.php"
 SRC_URI="http://f.rodrigo.free.fr/r-tech/cmp/addon-module/link/link.php?games/r-katro/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="nls"
 SLOT="0"
+KEYWORDS="x86 ~ppc"
+IUSE="nls"
 
-DEPEND=">=x11-libs/qt-3
+DEPEND="=x11-libs/qt-3*
 	virtual/glut"
 
 src_compile() {
 	egamesconf `use_enable nls` || die
+	mkdir src/moc src/helpviewer/moc
 	emake CXXFLAGS="${CXXFLAGS}" || die "emake failed"
 }
 
diff --git a/games-board/schafkopf/ChangeLog b/games-board/schafkopf/ChangeLog
index f0e8137bb88c..1cef5bde17a8 100644
--- a/games-board/schafkopf/ChangeLog
+++ b/games-board/schafkopf/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-board/schafkopf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/schafkopf/ChangeLog,v 1.1 2005/08/24 06:18:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/schafkopf/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 *schafkopf-0.6 (24 Aug 2005)
 
diff --git a/games-board/schafkopf/Manifest b/games-board/schafkopf/Manifest
index 61d24ac7d5b6..d5f52184827a 100644
--- a/games-board/schafkopf/Manifest
+++ b/games-board/schafkopf/Manifest
@@ -1,2 +1,4 @@
-MD5 cdb46f37ed3397481d55aed13767315d schafkopf-0.6.ebuild 386
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 629d667073b1297af65750240b8530b8 schafkopf-0.6.ebuild 496
+MD5 0cb286dc94922967a6efdce25334c097 ChangeLog 415
 MD5 39b6736bfa88e3bfa55bd1148c50d8d1 files/digest-schafkopf-0.6 65
diff --git a/games-board/schafkopf/schafkopf-0.6.ebuild b/games-board/schafkopf/schafkopf-0.6.ebuild
index 7dc0b15b454e..a059c4b5b8b5 100644
--- a/games-board/schafkopf/schafkopf-0.6.ebuild
+++ b/games-board/schafkopf/schafkopf-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/games-board/schafkopf/schafkopf-0.6.ebuild,v 1.1 2005/08/24 06:18:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/schafkopf/schafkopf-0.6.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit kde
 
diff --git a/games-board/scid/ChangeLog b/games-board/scid/ChangeLog
index f66678929861..eb7b95744968 100644
--- a/games-board/scid/ChangeLog
+++ b/games-board/scid/ChangeLog
@@ -1,6 +1,36 @@
-# ChangeLog for app-games/scid
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/scid
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> scid-3.5.ebuild,
+  scid-3.6.1.ebuild:
+  needs app-arch/unzip
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> scid-3.5.ebuild,
+  scid-3.6.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*scid-3.6.1 (21 Jun 2004)
+
+  21 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> scid-3.6.1.ebuild:
+  version bump (bug #49346) - ebuild provided by Gene Ruebsamen
+
+  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> scid-3.5.ebuild:
+  buggy makefiles bug #46110
+
+*scid-3.5 (04 Jan 2004)
+
+  04 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> scid-3.4-r1.ebuild,
+  scid-3.5.ebuild:
+  version bump; ebuild supplied by Gene Ruebsamen via bug 37164 (modified)
+
+  13 Dec 2003; Brad House <brad_mssw@gentoo.org> scid-3.4-r1.ebuild:
+  mark stable on amd64
+
+*scid-3.4-r1 (26 Sep 2003)
+
+  26 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add a few more binaries to the install process.
 
 *scid-3.4 (18 Jun 2003)
 
diff --git a/games-board/scid/Manifest b/games-board/scid/Manifest
index f2c64f05191a..13244ff4aa92 100644
--- a/games-board/scid/Manifest
+++ b/games-board/scid/Manifest
@@ -1,3 +1,6 @@
-MD5 f3969885d7efc3561108cac27da88318 ChangeLog 459
-MD5 8e562e75218861ab0a1cdcb3cd8f0bb2 scid-3.4.ebuild 1070
-MD5 1612d1a60912f96846bbf642e99ab2b2 files/digest-scid-3.4 135
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 0061f7342129ff12fc03f325e6162f03 scid-3.5.ebuild 1412
+MD5 86eab7011ddddcf5f86d0c84d3081b81 ChangeLog 1390
+MD5 5a89cec410834732a582a814682d8eb9 scid-3.6.1.ebuild 1362
+MD5 5077b69510a8f93737858b5f66a24167 files/digest-scid-3.5 307
+MD5 98ccde6f6d31a508fa3128d9b6e8d489 files/digest-scid-3.6.1 308
diff --git a/games-board/scid/metadata.xml b/games-board/scid/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/scid/metadata.xml
+++ b/games-board/scid/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/scid/scid-3.5.ebuild b/games-board/scid/scid-3.5.ebuild
index df1dbf8b3a96..ea67ec275c2b 100644
--- a/games-board/scid/scid-3.5.ebuild
+++ b/games-board/scid/scid-3.5.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/games-board/scid/scid-3.5.ebuild,v 1.1 2004/01/05 05:05:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-3.5.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
@@ -12,17 +12,18 @@ SRC_URI="mirror://sourceforge/scid/${P}.tar.gz
 	mirror://sourceforge/scid/spelling.zip
 	mirror://sourceforge/scid/scidlet40k.zip"
 
-KEYWORDS="x86 alpha ppc sparc amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/glibc
-	virtual/x11
+DEPEND="virtual/x11
 	>=dev-lang/tk-8.3
 	>=sys-libs/zlib-1.1.3"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.1"
+DEPEND="${DEPEND}
+	app-arch/unzip"
 
 src_compile() {
 	./configure \
@@ -32,7 +33,8 @@ src_compile() {
 		OPTIMIZE="${CXXFLAGS}" \
 		TCL_INCLUDE=""
 
-	emake || die "emake failed"
+	# buggy makefiles bug #46110
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
diff --git a/games-board/scid/scid-3.6.1.ebuild b/games-board/scid/scid-3.6.1.ebuild
index d4f2d7865457..a7183e6d4725 100644
--- a/games-board/scid/scid-3.6.1.ebuild
+++ b/games-board/scid/scid-3.6.1.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/games-board/scid/scid-3.6.1.ebuild,v 1.1 2004/06/21 20:24:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-3.6.1.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
@@ -14,15 +14,16 @@ SRC_URI="mirror://sourceforge/scid/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc amd64"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/glibc
-	virtual/x11
+DEPEND="virtual/x11
 	>=dev-lang/tk-8.3
 	>=sys-libs/zlib-1.1.3"
 RDEPEND="${DEPEND}
 	>=dev-lang/python-2.1"
+DEPEND="${DEPEND}
+	app-arch/unzip"
 
 src_compile() {
 	./configure \
diff --git a/games-board/sirius/ChangeLog b/games-board/sirius/ChangeLog
index a4e7a734b003..d7d87c60e48a 100644
--- a/games-board/sirius/ChangeLog
+++ b/games-board/sirius/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for app-games/sirius
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/sirius/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/sirius
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/sirius/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
+
+  19 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> sirius-0.8.0.ebuild:
+  Removed media-libs/gdk-pixbuf from DEPEND and closing bug #106553.
+
+  19 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> sirius-0.8.0.ebuild:
+  more deps needed (bug #60356)
 
 *sirius-0.8.0 (27 Aug 2003)
 
diff --git a/games-board/sirius/Manifest b/games-board/sirius/Manifest
index b0590cdd6763..cdd95fd333e8 100644
--- a/games-board/sirius/Manifest
+++ b/games-board/sirius/Manifest
@@ -1,5 +1,4 @@
-MD5 92cc8de843107755e0d283bf84db6e45 ChangeLog 739
-MD5 410371db942dcb760ebc4ef7cdf3a7cd sirius-0.7.0.ebuild 564
-MD5 48a1bfcd07a02aeccaa880d4a8969a16 sirius-0.8.0.ebuild 579
-MD5 25e0572f7fe85fc645ba5adf3dc7f1d4 files/digest-sirius-0.7.0 65
+MD5 5f0ba90a12908c7b09cd304ef71422b5 sirius-0.8.0.ebuild 624
+MD5 faf93e1f5bdf381535f91a49b15a23bc ChangeLog 988
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 0b5b01fd48178eb33491139af936c6aa files/digest-sirius-0.8.0 65
diff --git a/games-board/sirius/metadata.xml b/games-board/sirius/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/sirius/metadata.xml
+++ b/games-board/sirius/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/sirius/sirius-0.8.0.ebuild b/games-board/sirius/sirius-0.8.0.ebuild
index a3dbad1af14c..c6d66770e4fe 100644
--- a/games-board/sirius/sirius-0.8.0.ebuild
+++ b/games-board/sirius/sirius-0.8.0.ebuild
@@ -1,20 +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/games-board/sirius/sirius-0.8.0.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/sirius/sirius-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="A program for playing the game of othello"
 HOMEPAGE="http://sirius.bitvis.nu/"
 SRC_URI="http://sirius.bitvis.nu/files/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-DEPEND="=x11-libs/gtk+-2*"
+
+DEPEND="=x11-libs/gtk+-2*
+	=gnome-base/gconf-2*
+	gnome-base/libgnomeui
+	gnome-base/libgnomecanvas"
 
 src_install() {
 	egamesinstall || die
-	dodoc AUTHORS BUGS ChangeLog README || die "dodoc failed"
+	dodoc AUTHORS BUGS ChangeLog README
 	prepgamesdirs
 }
diff --git a/games-board/six/ChangeLog b/games-board/six/ChangeLog
index 27e8495b0b1e..89118f28000e 100644
--- a/games-board/six/ChangeLog
+++ b/games-board/six/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for games-board/six
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/six/ChangeLog,v 1.1 2003/11/28 23:02:08 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/six/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  12 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> six-0.5.2.ebuild:
+  need-kde goes after DEPEND
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> six-0.5.2.ebuild:
+  Added ~sparc keyword.
+
+  11 Nov 2004; Joseph Jezak <josejx@gentoo.org> six-0.5.2.ebuild:
+  Marked ppc stable.
+
+  19 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> -six-0.4.0.ebuild,
+  -six-0.5.0.ebuild, -six-0.5.1.ebuild:
+  clean old versions
+
+*six-0.5.2 (04 Aug 2004)
+
+  04 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> +six-0.5.2.ebuild:
+  version bump
+
+  30 Mar 2004; David Holm <dholm@gentoo.org> six-0.5.1.ebuild:
+  Added to ~ppc.
+
+*six-0.5.1 (29 Mar 2004)
+
+  29 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> six-0.5.1.ebuild:
+  version bump
+
+*six-0.5.0 (01 Mar 2004)
+
+  01 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> six-0.5.0.ebuild:
+  version bump
 
 *six-0.4.0 (28 Nov 2003)
 
diff --git a/games-board/six/Manifest b/games-board/six/Manifest
index c71012ba0dcd..018d8cca8516 100644
--- a/games-board/six/Manifest
+++ b/games-board/six/Manifest
@@ -1,2 +1,4 @@
-MD5 c23c8cf68bf4ffe928ab7fe7d8be86d4 six-0.4.0.ebuild 425
-MD5 93a1951ff5df8bac26b89b041cece715 files/digest-six-0.4.0 61
+MD5 3feeaa8d72dc81ed6083c30b6c1b018d six-0.5.2.ebuild 453
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 d0f25c63dcf3f11434571d092a71a16b ChangeLog 1183
+MD5 4f7b868d920c9419475cb8e3208b9cd4 files/digest-six-0.5.2 61
diff --git a/games-board/six/metadata.xml b/games-board/six/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/six/metadata.xml
+++ b/games-board/six/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/six/six-0.5.2.ebuild b/games-board/six/six-0.5.2.ebuild
index f0e90b20c986..ca83b57ebc6d 100644
--- a/games-board/six/six-0.5.2.ebuild
+++ b/games-board/six/six-0.5.2.ebuild
@@ -1,9 +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/games-board/six/six-0.5.2.ebuild,v 1.1 2004/08/04 18:40:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/six/six-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit kde
-need-kde 3
 
 DESCRIPTION="A Hex playing program for KDE"
 HOMEPAGE="http://six.retes.hu/"
@@ -11,5 +10,8 @@ SRC_URI="http://six.retes.hu/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="ppc ~sparc x86"
 IUSE=""
+
+DEPEND="kde-base/arts"
+need-kde 3
diff --git a/games-board/sjeng/ChangeLog b/games-board/sjeng/ChangeLog
index 47927e49c62f..9c7519ff21f3 100644
--- a/games-board/sjeng/ChangeLog
+++ b/games-board/sjeng/ChangeLog
@@ -1,13 +1,31 @@
-# ChangeLog for app-games/sjeng
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/sjeng/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/sjeng
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/sjeng/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  04 May 2005; Michael Sterrett <mr_bones_@gentoo.org> -sjeng-11.2.ebuild,
+  sjeng-11.2-r1.ebuild:
+  fix deps for bug #90894; tidy
+
+  09 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> sjeng-11.2-r1.ebuild:
+  added ~amd64 KEYWORD, fixes #72704
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> sjeng-11.2-r1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*sjeng-11.2-r1 (24 Jan 2004)
+
+  24 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> sjeng-11.2-r1.ebuild:
+  use games eclass; install docs; tidy
 
   02 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org> sjeng-11.2.ebuild:
   Fixed to use mirror://sourceforge
 
 *sjeng-11.2 (5 May 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> sjeng-11.2.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> sjeng-11.2.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   5 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
diff --git a/games-board/sjeng/Manifest b/games-board/sjeng/Manifest
index c9221b3f4ac6..af5cb96073bb 100644
--- a/games-board/sjeng/Manifest
+++ b/games-board/sjeng/Manifest
@@ -1,3 +1,4 @@
-MD5 4a53b312c28e9f5d064f3877001f903f ChangeLog 902
-MD5 a61546dd26451f93ad3655d931689cd4 sjeng-11.2.ebuild 643
-MD5 642c55324abefa7826ee7985ceb5d3ec files/digest-sjeng-11.2 67
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 e0b23d21b370da984469f5a9308abe40 sjeng-11.2-r1.ebuild 638
+MD5 d71d760c8c51db4e066c57a1195ebc35 ChangeLog 1508
+MD5 642c55324abefa7826ee7985ceb5d3ec files/digest-sjeng-11.2-r1 67
diff --git a/games-board/sjeng/metadata.xml b/games-board/sjeng/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/sjeng/metadata.xml
+++ b/games-board/sjeng/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/sjeng/sjeng-11.2-r1.ebuild b/games-board/sjeng/sjeng-11.2-r1.ebuild
index ef97b873af38..28c67e703793 100644
--- a/games-board/sjeng/sjeng-11.2-r1.ebuild
+++ b/games-board/sjeng/sjeng-11.2-r1.ebuild
@@ -1,23 +1,24 @@
-# 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/games-board/sjeng/sjeng-11.2-r1.ebuild,v 1.1 2004/01/24 13:34:01 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/sjeng/sjeng-11.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit games
 
-S="${WORKDIR}/Sjeng-Free-${PV}"
 DESCRIPTION="Console based chess interface"
 HOMEPAGE="http://sjeng.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sjeng/Sjeng-Free-${PV}.tar.gz"
 
-KEYWORDS="x86"
 LICENSE="GPL-2"
+KEYWORDS="~amd64 x86"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="sys-libs/gdbm"
+
+S=${WORKDIR}/Sjeng-Free-${PV}
 
 src_install () {
-	make DESTDIR="${D}" install                     || die "make install failed"
-	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS || die "dodoc failed"
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS
 	prepgamesdirs
 }
diff --git a/games-board/slibo/ChangeLog b/games-board/slibo/ChangeLog
index 18b8387ed5d8..83e9469fb990 100644
--- a/games-board/slibo/ChangeLog
+++ b/games-board/slibo/ChangeLog
@@ -1,9 +1,21 @@
-# ChangeLog for app-games/slibo
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.1 2003/09/12 00:52:57 vapier Exp $
+# ChangeLog for games-board/slibo
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+  29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.4.4-gcc34.patch, slibo-0.4.4.ebuild:
+  gcc-34 patch from upstream (bug #69492)
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> slibo-0.4.4.ebuild:
+  Depend on version 2 of sqlite.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> slibo-0.4.4.ebuild:
+  QA: need-kde after R/DEPEND
+
+  01 Dec 2003; Michael Sterrett <mr_bones_@gentoo.org> slibo-0.4.4.ebuild:
+  expand DEPEND instead of overriding it.
 
 *slibo-0.4.4 (06 Sep 2003)
 
   06 Sep 2003; Michael Sterrett <msterret@gentoo.org> slibo-0.4.4.ebuild:
   initial commit
-
diff --git a/games-board/slibo/Manifest b/games-board/slibo/Manifest
index 109a92821161..da9577e0852a 100644
--- a/games-board/slibo/Manifest
+++ b/games-board/slibo/Manifest
@@ -1,3 +1,5 @@
-MD5 2f8e35e933c37783a9cba75bdb1e2248 slibo-0.4.4.ebuild 480
-MD5 d58a069ed7ee7a294a2b14c19fec37cd ChangeLog 334
+MD5 75e91af84bd534d7cfb9fd86d2fe879b ChangeLog 798
+MD5 8a3f793fc831f69a2b8e179b20946af0 slibo-0.4.4.ebuild 810
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 edaca2f8718114ab18c48cda4794b2d1 files/digest-slibo-0.4.4 64
+MD5 2956467632bec1b5ec193090cccbdca9 files/0.4.4-gcc34.patch 2638
diff --git a/games-board/slibo/metadata.xml b/games-board/slibo/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/slibo/metadata.xml
+++ b/games-board/slibo/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/slibo/slibo-0.4.4.ebuild b/games-board/slibo/slibo-0.4.4.ebuild
index 9e78630ff9a6..4c78ab34010e 100644
--- a/games-board/slibo/slibo-0.4.4.ebuild
+++ b/games-board/slibo/slibo-0.4.4.ebuild
@@ -1,17 +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/games-board/slibo/slibo-0.4.4.ebuild,v 1.1 2003/09/12 00:52:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/slibo/slibo-0.4.4.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
-inherit kde
-
-need-kde 3
+inherit eutils kde
 
 DESCRIPTION="A comfortable replacement for the xboard chess interface"
-SRC_URI="mirror://sourceforge/slibo/${P}.tar.bz2"
 HOMEPAGE="http://slibo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/slibo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86"
+IUSE=""
+
+DEPEND="=dev-db/sqlite-2*"
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-gcc34.patch"
+}
 
-DEPEND="dev-db/sqlite"
+pkg_postinst() {
+	einfo "If you updated from an older version, please do a"
+	einfo "    rm ~/.kde/share/apps/slibo/sliboui.rc"
+	einfo "to get rid of old configuration files, otherwise"
+	einfo "new menu items etc. will not appear"
+}
diff --git a/games-board/teg/ChangeLog b/games-board/teg/ChangeLog
index 12d195671828..108e1cb4e67f 100644
--- a/games-board/teg/ChangeLog
+++ b/games-board/teg/ChangeLog
@@ -1,28 +1,55 @@
-# ChangeLog for app-games/teg
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/teg/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/teg
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/teg/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Sep 2004; Michael Sterrett <mr_bones_@gentoo.org> -teg-0.11.0-r1.ebuild:
+  clean older ebuild
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> teg-0.11.0-r1.ebuild,
+  teg-0.11.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> teg-0.11.1.ebuild:
+  stablize; teg-0.11.0 is pretty broken
+
+*teg-0.11.1 (27 May 2004)
+
+  27 May 2004; Michael Sterrett <mr_bones_@gentoo.org> teg-0.11.1.ebuild:
+  version bump
+
+  01 May 2004; Michael Sterrett <mr_bones_@gentoo.org> teg-0.11.0-r1.ebuild:
+  IUSE; die backticks; tidy
+
+*teg-0.11.0-r1 (02 Oct 2003)
+
+  02 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Make this more of a GNOME install than a games install.
+
+*teg-0.11.0 (08 Jan 2003)
 
   21 May 2003; Martin Holzer <mholzer@gentoo.org> teg-0.11.0.ebuild:
   Adding libgnomeui as depend. Closes #19050.
 
-*teg-0.11.0 (08 Jan 2003)
-  08 Jan 2003; J.Alberto Su�rez L�pez <bass@gentoo.org> teg-0.11.0.ebuild:
+  08 Jan 2003; J.Alberto Suárez López <bass@gentoo.org> teg-0.11.0.ebuild:
   New finel version.
 
 *teg-0.10.1 (08 Aug 2002)
-  27 Aug 2002; J.Alberto Su�rez L�pez <bass@gentoo.org> teg-0.10.1.ebuild:
+  27 Aug 2002; J.Alberto Suárez López <bass@gentoo.org> teg-0.10.1.ebuild:
   added dev/libxml in DEPEND. Close  #7003
 
-  8 Aug 2002; J.Alberto Su�rez L�pez <bass@gentoo.org> teg-0.10.1.ebuild:
+  8 Aug 2002; J.Alberto Suárez López <bass@gentoo.org> teg-0.10.1.ebuild:
   New version. Must fix bug #4729
 
 *teg-0.9.4 (7 May 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> teg-0.9.4.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> teg-0.9.4.ebuild :
   Added LICENSE, KEYWORDS.
   7 May 2002; Spider <spider@gentoo.org> teg-0.9.4.ebuild teg-0.9.2.ebuild:
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> teg-0.9.2.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> teg-0.9.2.ebuild :
   Added LICENSE, KEYWORDS.
    fix sourceforge mirroring.
           
diff --git a/games-board/teg/Manifest b/games-board/teg/Manifest
index 29b843b09f9d..be3c1b3325f0 100644
--- a/games-board/teg/Manifest
+++ b/games-board/teg/Manifest
@@ -1,3 +1,14 @@
-MD5 1d1439c4d5d96b3f745a605a4a3e1208 ChangeLog 1825
-MD5 8c75c0d8c9a2f2308252c35ca65f1eb0 teg-0.11.0.ebuild 894
-MD5 a9d760775efb109a8a9ec50287b97842 files/digest-teg-0.11.0 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee96b555722d1b6ef64f103642b7e1bb ChangeLog 2648
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 1d3ef381c17fc5ec24ab4bf3a6f38a96 teg-0.11.1.ebuild 560
+MD5 7e5ff9e1b0b7c09fc145cbcd70e65bcd files/digest-teg-0.11.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB3bT9roRuSHgZdywRAikfAJ9Msc4wVGPqFWZILMjhoIgAMPs0xACaAnBT
+mfbrLmSe3xClwACL0OA8+Ig=
+=9jnS
+-----END PGP SIGNATURE-----
diff --git a/games-board/teg/metadata.xml b/games-board/teg/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/teg/metadata.xml
+++ b/games-board/teg/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/teg/teg-0.11.1.ebuild b/games-board/teg/teg-0.11.1.ebuild
index 092a21e83763..654b6467f2b7 100644
--- a/games-board/teg/teg-0.11.1.ebuild
+++ b/games-board/teg/teg-0.11.1.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/games-board/teg/teg-0.11.1.ebuild,v 1.1 2004/05/27 22:54:54 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/teg/teg-0.11.1.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/teg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
 	dev-libs/glib
 	gnome-base/libgnomeui
diff --git a/games-board/xboard/ChangeLog b/games-board/xboard/ChangeLog
index f25bf997d42b..2dc183367f3d 100644
--- a/games-board/xboard/ChangeLog
+++ b/games-board/xboard/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-games/xboard
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/xboard
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/ChangeLog,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xboard-4.2.7 (05 Jan 2004)
+
+  05 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
 
 *xboard-4.2.6-r1 (14 Aug 2003)
 
@@ -9,7 +17,7 @@
 
 *xboard-4.2.6 (18 Apr 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> xboard-4.2.6.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> xboard-4.2.6.ebuild :
   Added LICENSE, KEYWORDS, SLOT.
 
   18 Apr 2002; Ryan Phillips <rphillips@gentoo.org> xboard-4.2.6.ebuild :
diff --git a/games-board/xboard/Manifest b/games-board/xboard/Manifest
index 16eee652e36b..252e806981a3 100644
--- a/games-board/xboard/Manifest
+++ b/games-board/xboard/Manifest
@@ -1,4 +1,6 @@
+MD5 c52b1da31672b0f0f5286680f7adf1d6 xboard-4.2.7.ebuild 690
+MD5 de858aa6a2d765ca3031dc86b03990f3 ChangeLog 777
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 4e6718e88e8b86630db7846e5d65fd04 files/digest-xboard-4.2.7 65
+MD5 f99bdbe68caa44c40ef71762f27da40c files/4.2.7-default-program.patch 362
 MD5 f99bdbe68caa44c40ef71762f27da40c files/xboard-4.2.6-patch.diff 362
-MD5 4c2b6f7e0d86f5583e227d94bde222cc files/digest-xboard-4.2.6-r1 65
-MD5 96670b64ef4211568bd980c3d01e3093 ChangeLog 576
-MD5 7bb3ba5f851d87986f0301812c065a91 xboard-4.2.6-r1.ebuild 667
diff --git a/games-board/xboard/metadata.xml b/games-board/xboard/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xboard/metadata.xml
+++ b/games-board/xboard/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xboard/xboard-4.2.7.ebuild b/games-board/xboard/xboard-4.2.7.ebuild
index 080846b780e0..9615ae04384b 100644
--- a/games-board/xboard/xboard-4.2.7.ebuild
+++ b/games-board/xboard/xboard-4.2.7.ebuild
@@ -1,23 +1,24 @@
-# 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/games-board/xboard/xboard-4.2.7.ebuild,v 1.1 2004/01/05 05:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xboard/xboard-4.2.7.ebuild,v 1.1.1.1 2005/11/30 10:09:57 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="GUI for gnuchess and for internet chess servers"
 HOMEPAGE="http://www.tim-mann.org/xboard.html"
-SRC_URI="ftp://gatekeeper.dec.com/pub/GNU/xboard/${P}.tar.gz"
+SRC_URI="mirror://gnu/xboard/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="x86 ppc alpha amd64"
+IUSE=""
 
 DEPEND="games-board/gnuchess"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-default-program.patch
+	epatch "${FILESDIR}/${PV}-default-program.patch"
 }
 
 src_install() {
diff --git a/games-board/xfreecell/ChangeLog b/games-board/xfreecell/ChangeLog
index e3ba1061aaa6..9fa8f12d2f6f 100644
--- a/games-board/xfreecell/ChangeLog
+++ b/games-board/xfreecell/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for games-board/xfreecell
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/ChangeLog,v 1.1 2004/02/25 10:24:30 mr_bones_ Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/ChangeLog,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
+
+  06 Feb 2005; Markus Rothe <corsair@gentoo.org> xfreecell-1.0.5b.ebuild:
+  Stable on ppc64
+
+  21 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xfreecell-1.0.5b.ebuild:
+  keywords ~amd64.
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org> xfreecell-1.0.5b.ebuild:
+  Marked ~ppc for bug #74706.
+
+  15 Dec 2004; Markus Rothe <corsair@gentoo.org> xfreecell-1.0.5b.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #74231
 
 *xfreecell-1.0.5b (25 Feb 2004)
 
diff --git a/games-board/xfreecell/Manifest b/games-board/xfreecell/Manifest
index fc754ac81c93..a1e4c39401fa 100644
--- a/games-board/xfreecell/Manifest
+++ b/games-board/xfreecell/Manifest
@@ -1,3 +1,5 @@
-MD5 7711a77007c4357dd12ff9b9f9b55fb6 xfreecell-1.0.5b.ebuild 882
+MD5 32d25a5ba5dc51cde2d9da6e67873406 ChangeLog 860
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2c112b42104c169129a76413cfd6ad9a xfreecell-1.0.5b.ebuild 847
 MD5 51a8fae46811047f83a26319fbb01ec8 files/digest-xfreecell-1.0.5b 122
-MD5 7017bfae6e22894f57b92088888acb43 files/xfreecell-1.0.5b-gentoo.diff 10843
+MD5 3748d34df2621b2391ef0e177dc140e6 files/xfreecell-1.0.5b-gentoo.patch 11172
diff --git a/games-board/xfreecell/metadata.xml b/games-board/xfreecell/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xfreecell/metadata.xml
+++ b/games-board/xfreecell/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xfreecell/xfreecell-1.0.5b.ebuild b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
index 7f88fcbb8ff1..8902cf81ef6a 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b.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/games-board/xfreecell/xfreecell-1.0.5b.ebuild,v 1.1 2004/02/25 10:24:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/xfreecell-1.0.5b.ebuild,v 1.1.1.1 2005/11/30 10:09:59 chriswhite Exp $
 
 inherit eutils games
 
@@ -11,8 +11,8 @@ SRC_URI="http://www2.giganet.net/~nakayama/${P}.tgz
 	http://www2.giganet.net/~nakayama/MSNumbers.gz"
 
 LICENSE="as-is"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86 ppc64 ~ppc ~amd64"
 IUSE=""
 
 DEPEND="virtual/x11"
@@ -27,7 +27,7 @@ src_install() {
 	dogamesbin xfreecell || die "dogamesbin failed"
 	insinto "${GAMES_DATADIR}/${PN}"
 	doins "${WORKDIR}/MSNumbers" || die "doins failed"
-	dodoc CHANGES README mshuffle.txt || die "dodoc failed"
-	doman xfreecell.6 || die "doman failed"
+	dodoc CHANGES README mshuffle.txt
+	doman xfreecell.6
 	prepgamesdirs
 }
diff --git a/games-board/xfrisk/ChangeLog b/games-board/xfrisk/ChangeLog
index dfb01b88abad..8b478db5cc02 100644
--- a/games-board/xfrisk/ChangeLog
+++ b/games-board/xfrisk/ChangeLog
@@ -1,8 +1,11 @@
-# ChangeLog for app-games/xfrisk
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xfrisk/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/xfrisk
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfrisk/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
-  29 Jun 2003; <msterret@gentoo.org> xfrisk-1.2.ebuild:
+  23 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> xfrisk-1.2.ebuild:
+  don't rdepend on sed
+
+  29 Jun 2003; Michael Sterrett <mr_bones_@gentoo.org> xfrisk-1.2.ebuild:
   don't bother to sed the spec file since it's unused
   use sed -i
   added some more docs
diff --git a/games-board/xfrisk/Manifest b/games-board/xfrisk/Manifest
index a8b5dfdaf77b..650d10e526c9 100644
--- a/games-board/xfrisk/Manifest
+++ b/games-board/xfrisk/Manifest
@@ -1,3 +1,4 @@
-MD5 5b2812a59b1e972a02d0bd3fc5b6169f ChangeLog 640
-MD5 bbf031aff22e1d0272f0a10029ec881e xfrisk-1.2.ebuild 790
+MD5 7a5c4c9dcf6ac05d033d48836ae1e2ff ChangeLog 751
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 1b6278535608a554875f07aeecd1d39d xfrisk-1.2.ebuild 820
 MD5 32bd08c3a2efd038205d1cf92af69929 files/digest-xfrisk-1.2 62
diff --git a/games-board/xfrisk/metadata.xml b/games-board/xfrisk/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xfrisk/metadata.xml
+++ b/games-board/xfrisk/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xfrisk/xfrisk-1.2.ebuild b/games-board/xfrisk/xfrisk-1.2.ebuild
index a81c945a1601..fa7b0aa7f114 100644
--- a/games-board/xfrisk/xfrisk-1.2.ebuild
+++ b/games-board/xfrisk/xfrisk-1.2.ebuild
@@ -1,36 +1,34 @@
-# 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/games-board/xfrisk/xfrisk-1.2.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfrisk/xfrisk-1.2.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
-S=${WORKDIR}/XFrisk
+S="${WORKDIR}/XFrisk"
 DESCRIPTION="The RISK board game"
 SRC_URI="http://morphy.iki.fi/xfrisk/files/${P}.tar.gz"
 HOMEPAGE="http://morphy.iki.fi/xfrisk/"
 
-SLOT="0"
+KEYWORDS="x86 ppc sparc amd64"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc"
+SLOT="0"
+IUSE=""
 
-DEPEND="x11-libs/Xaw3d
+RDEPEND="virtual/x11
+	x11-libs/Xaw3d"
+DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i \
-		-e "s:/usr/local:${GAMES_PREFIX}:" \
-		Makefile || \
-			die "sed Makefile failed"
-}
-
-src_compile() {
-	emake || die
+		-e "s:/usr/local:${GAMES_PREFIX}:" Makefile \
+			|| die "sed Makefile failed"
 }
 
 src_install() {
-	make PREFIX=${D}/${GAMES_PREFIX} install || die "make install failed"
-	dodoc BUGS ChangeLog FAQ TODO
+	make PREFIX="${D}/${GAMES_PREFIX}" install || die "make install failed"
+	dodoc BUGS ChangeLog FAQ TODO || die "dodoc failed"
 	prepgamesdirs
 }
diff --git a/games-board/xgammon/ChangeLog b/games-board/xgammon/ChangeLog
index a7fa8c6310b3..83973eefee3a 100644
--- a/games-board/xgammon/ChangeLog
+++ b/games-board/xgammon/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for app-games/xgammon
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $ Header: $
+# ChangeLog for games-board/xgammon
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/ChangeLog,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
+
+  21 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xgammon-0.98.ebuild:
+  keywords ~amd64.
+
+  07 May 2004; Michael Sterrett <mr_bones_@gentoo.org> xgammon-0.98.ebuild,
+  files/gcc33.patch:
+  fix compile for >=gcc3.3 (bug #50364)
+
+  04 Nov 2003; Jason Wever <weeve@gentoo.org> xgammon-0.98.ebuild:
+  Added ~sparc keyword.
 
   12 Jun 2003; <msterret@gentoo.org> xgammon-0.98.ebuild:
   fix Header
@@ -10,7 +20,7 @@
   05 Mar 2003; Bartosch Pixa <darkspecter@gentoo.org> xgammon-0.98.ebuild:
   set ~ppc in keywords
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> xgammon-0.98.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> xgammon-0.98.ebuild :
   Added KEYWORDS.
 
   03 Jul 2002; T.Kvernes <terjekv@math.uio.no> xgammon-0.98:
diff --git a/games-board/xgammon/Manifest b/games-board/xgammon/Manifest
index 3707a1881702..c579370d6698 100644
--- a/games-board/xgammon/Manifest
+++ b/games-board/xgammon/Manifest
@@ -1,5 +1,7 @@
-MD5 18e0707048c018135c6c4454f93641c6 ChangeLog 639
-MD5 d51cd28abdfb5a4d323d17b7f877e7ed xgammon-0.98.ebuild 792
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 5a55276257a0feaf891458769c3ad6e8 xgammon-0.98.ebuild 868
+MD5 e595e9cd35b33f6c8b7a2c3b80312a89 ChangeLog 1049
 MD5 713a4a778934c4793f43df1ba783d07c files/digest-xgammon-0.98 64
+MD5 30d019c96ba991fbc030e1acab5d1f4d files/gcc33.patch 3672
 MD5 5e492c857cd63f9bc13aced6d469814f files/xgammon-0.98-broken.patch 263
 MD5 9a1350fd77ab6f36cd2539f73c4b0a6a files/xgammon-0.98-config.patch 823
diff --git a/games-board/xgammon/metadata.xml b/games-board/xgammon/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xgammon/metadata.xml
+++ b/games-board/xgammon/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xgammon/xgammon-0.98.ebuild b/games-board/xgammon/xgammon-0.98.ebuild
index 0e812f45e5a5..913ba2dc8092 100644
--- a/games-board/xgammon/xgammon-0.98.ebuild
+++ b/games-board/xgammon/xgammon-0.98.ebuild
@@ -1,17 +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/games-board/xgammon/xgammon-0.98.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/xgammon-0.98.ebuild,v 1.1.1.1 2005/11/30 10:10:00 chriswhite Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}a
+S="${WORKDIR}/${P}a"
 DESCRIPTION="very nice backgammon game for X"
-SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
 HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
+SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 ppc sparc ~amd64"
+IUSE=""
 
 DEPEND="virtual/x11"
 
@@ -19,15 +20,16 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/xgammon-0.98-broken.patch
-	epatch ${FILESDIR}/xgammon-0.98-config.patch
+	epatch "${FILESDIR}/${P}-broken.patch"
+	epatch "${FILESDIR}/${P}-config.patch"
+	epatch "${FILESDIR}/gcc33.patch"
 }
 
 src_compile() {
 	xmkmf || die "xmkmf died"
-	env PATH="${PATH}:." emake || die
+	env PATH="${PATH}:." emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/games-board/xmahjongg/ChangeLog b/games-board/xmahjongg/ChangeLog
index 00d1b4e558f4..78639239b44a 100644
--- a/games-board/xmahjongg/ChangeLog
+++ b/games-board/xmahjongg/ChangeLog
@@ -1,6 +1,17 @@
-# ChangeLog for app-games/xmahjongg
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/xmahjongg
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/ChangeLog,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
+
+  29 Oct 2005; Fabian Groffen <grobian@gentoo.org> xmahjongg-3.6.1.ebuild:
+  Marked ~ppc-macos (bug #106115)
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xmahjongg-3.6.1.ebuild:
+  Stable on ppc.
+
+  18 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xmahjongg-3.6.1.ebuild:
+  Added to ~ppc.
 
 *xmahjongg-3.6.1 (30 Nov 2002)
 
diff --git a/games-board/xmahjongg/Manifest b/games-board/xmahjongg/Manifest
index a26e01bf8298..ee57c80c5bd5 100644
--- a/games-board/xmahjongg/Manifest
+++ b/games-board/xmahjongg/Manifest
@@ -1,3 +1,4 @@
-MD5 9c51a5e2a83b8c7dcafd26fbea66e1f0 ChangeLog 373
-MD5 b7be129d5d59e864f51c0f8804df1914 xmahjongg-3.6.1.ebuild 591
+MD5 a9c5fc59735ab355b4a76dc1308a8123 xmahjongg-3.6.1.ebuild 629
+MD5 f59a43056b7cae88273deedd5655d076 ChangeLog 675
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 61e9702fb576aac975f4d57f4e22b0ec files/digest-xmahjongg-3.6.1 67
diff --git a/games-board/xmahjongg/metadata.xml b/games-board/xmahjongg/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xmahjongg/metadata.xml
+++ b/games-board/xmahjongg/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xmahjongg/xmahjongg-3.6.1.ebuild b/games-board/xmahjongg/xmahjongg-3.6.1.ebuild
index 2e414a78c2ba..b1f5f9b6f3f3 100644
--- a/games-board/xmahjongg/xmahjongg-3.6.1.ebuild
+++ b/games-board/xmahjongg/xmahjongg-3.6.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/games-board/xmahjongg/xmahjongg-3.6.1.ebuild,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/xmahjongg-3.6.1.ebuild,v 1.1.1.1 2005/11/30 10:09:58 chriswhite Exp $
 
 inherit games
 
@@ -8,9 +8,10 @@ DESCRIPTION="friendly GUI version of xmahjongg"
 HOMEPAGE="http://www.lcdf.org/xmahjongg/"
 SRC_URI="http://www.lcdf.org/xmahjongg/${P}.tar.gz"
 
+KEYWORDS="amd64 ppc ~ppc-macos x86"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+IUSE=""
 
 DEPEND="virtual/x11
 	media-libs/libpng
@@ -18,7 +19,7 @@ DEPEND="virtual/x11
 
 src_compile() {
 	egamesconf --with-x
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-board/xmille/ChangeLog b/games-board/xmille/ChangeLog
index 4a5f5750c12d..17d3ec79b12e 100644
--- a/games-board/xmille/ChangeLog
+++ b/games-board/xmille/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for games-board/xmille
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/ChangeLog,v 1.1 2004/01/09 01:43:59 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  21 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xmille-2.0-r1.ebuild:
+  keywords ~amd64.
+
+  11 Nov 2004; Joseph Jezak <josejx@gentoo.org> xmille-2.0-r1.ebuild:
+  Marked ppc stable.
+
+  23 Apr 2004; David Holm <dholm@gentoo.org> xmille-2.0-r1.ebuild:
+  Added to ~ppc.
+
+*xmille-2.0-r1 (22 Apr 2004)
+
+  22 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> xmille-2.0-r1.ebuild:
+  get the patch off the Debian mirrors; update to the latest Debian patch.
 
 *xmille-2.0 (08 Jan 2004)
 
diff --git a/games-board/xmille/Manifest b/games-board/xmille/Manifest
index ede1cb1cfe9d..2a4c71b9d632 100644
--- a/games-board/xmille/Manifest
+++ b/games-board/xmille/Manifest
@@ -1,3 +1,15 @@
-MD5 865b51d8d1fbab588fcbeca74b0a4884 xmille-2.0.ebuild 686
-MD5 4110656ac287ba70ad0808dff153218d files/digest-xmille-2.0 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0e9a0fbb2264075212bca02eaefb734c ChangeLog 867
 MD5 b958c2750b407b46c33dce2fc4219350 files/2.0.patch 2125
+MD5 9b125711cad5960508f032402504a875 files/digest-xmille-2.0-r1 130
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c1e2dea5059e1c86b5c14d0b024140f6 xmille-2.0-r1.ebuild 884
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCz/b0I1lqEGTUzyQRAr7LAKCxkPQm3lnNB6gz+Fksdkm+bQwKywCfTbn3
+NKw7LlrJ/ud3Ipqn3dnlD74=
+=HNBp
+-----END PGP SIGNATURE-----
diff --git a/games-board/xmille/metadata.xml b/games-board/xmille/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xmille/metadata.xml
+++ b/games-board/xmille/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xmille/xmille-2.0-r1.ebuild b/games-board/xmille/xmille-2.0-r1.ebuild
index 9c576254c498..285d3e4eeb52 100644
--- a/games-board/xmille/xmille-2.0-r1.ebuild
+++ b/games-board/xmille/xmille-2.0-r1.ebuild
@@ -1,23 +1,23 @@
-# 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/games-board/xmille/xmille-2.0-r1.ebuild,v 1.1 2004/04/22 07:13:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/xmille-2.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit eutils games
 
 DEB_PATCH_VER="10"
 DESCRIPTION="Mille Bournes card game"
-HOMEPAGE=""
+HOMEPAGE="http://www.milleborne.info/"
 SRC_URI="mirror://debian/pool/main/x/xmille/${PN}_${PV}.orig.tar.gz
 	mirror://debian/pool/main/x/xmille/${PN}_${PV}-${DEB_PATCH_VER}.diff.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 DEPEND="virtual/x11"
 
-S="${WORKDIR}/${PN}-${PV}.orig"
+S="${WORKDIR}/${P}.orig"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-board/xscrabble/ChangeLog b/games-board/xscrabble/ChangeLog
index 589c1ea14ae5..7734b738ec4b 100644
--- a/games-board/xscrabble/ChangeLog
+++ b/games-board/xscrabble/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for app-games/xscrabble
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $
+# ChangeLog for games-board/xscrabble
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
+
+  27 Aug 2005; Fabian Groffen <grobian@gentoo.org> xscrabble-2.10-r1.ebuild:
+  Marking ~ppc-macos (bug #82575)
+
+*xscrabble-2.10-r1 (06 May 2005)
+
+  06 May 2005; Mike Frysinger <vapier@gentoo.org> +xscrabble-2.10-r1.ebuild:
+  Fix label that showed english as eng instead of en #91740 by Prof. Jonathan
+  King.
+
+  04 May 2004; Michael Sterrett <mr_bones_@gentoo.org> xscrabble-2.10.ebuild:
+  Only sed actual files (bug #49892)
+
+  13 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> xscrabble-2.10.ebuild:
+  games eclass already inherits eutils; depend on sed >= 4; error check sed; use
+  flag tidy
 
 *xscrabble-2.10 (15 Jul 2003)
 
diff --git a/games-board/xscrabble/Manifest b/games-board/xscrabble/Manifest
index 3eaa5f359ef6..c77f086956ec 100644
--- a/games-board/xscrabble/Manifest
+++ b/games-board/xscrabble/Manifest
@@ -1,4 +1,5 @@
-MD5 c19e0ecddaa500074a5fa91392f2659b files/digest-xscrabble-2.10 184
-MD5 f6e1f3f73d71157779c68284da50e166 files/2.10-path-fixes.patch 1184
-MD5 acbda8865d400fa8ba380d3185ace4a6 ChangeLog 388
-MD5 e0275acd4d84d22937ad7b93ca553120 xscrabble-2.10.ebuild 1160
+MD5 1968ac6364fb5dae81702e013f9a9d61 xscrabble-2.10-r1.ebuild 1377
+MD5 e7a8d8a7728f7d749f9b766f467dd6e6 ChangeLog 982
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 35e0131103aa25d8ea0d1d3363397d88 files/xscrabble-2.10-path-fixes.patch 1106
+MD5 c19e0ecddaa500074a5fa91392f2659b files/digest-xscrabble-2.10-r1 184
diff --git a/games-board/xscrabble/metadata.xml b/games-board/xscrabble/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xscrabble/metadata.xml
+++ b/games-board/xscrabble/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
index 741aeeaf03a2..05775730c7a6 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-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/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.1 2005/05/06 22:59:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:56 chriswhite Exp $
 
 inherit eutils games multilib
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/educational_games/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc-macos x86"
 IUSE=""
 
 DEPEND="virtual/x11"
diff --git a/games-board/xskat/ChangeLog b/games-board/xskat/ChangeLog
index f8678352628a..0426e0e2126d 100644
--- a/games-board/xskat/ChangeLog
+++ b/games-board/xskat/ChangeLog
@@ -1,9 +1,22 @@
-# ChangeLog for app-games/xskat
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/ChangeLog,v 1.1 2003/09/10 17:46:27 vapier Exp $ 
+# ChangeLog for games-board/xskat
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/ChangeLog,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*xskat-4.0 (27 May 2004)
+
+  27 May 2004; Michael Sterrett <mr_bones_@gentoo.org> xskat-4.0.ebuild:
+  version bump
+
+*xskat-3.4-r1 (13 Sep 2003)
+
+  13 Sep 2003; Michael Sterrett <msterret@gentoo.org> xskat-3.4-r1.ebuild:
+  use games eclass; install more docs; fix DESCRIPTION
 
 *xskat-3.4 (22 Aug 2002)
 
-  22 Aug 2002; J. Alberto Su�rez L�pez <bass@gentoo.org> xsaket-3.4.ebuild
+  22 Aug 2002; J. Alberto Suárez López <bass@gentoo.org> xsaket-3.4.ebuild
   First relase (Stephan_Weber@gmx.de (Stephan Weber))
 
diff --git a/games-board/xskat/Manifest b/games-board/xskat/Manifest
index fb0af3b205e5..0d0958768771 100644
--- a/games-board/xskat/Manifest
+++ b/games-board/xskat/Manifest
@@ -1,3 +1,6 @@
-MD5 9409fa2b5b02bf7ac5f8508292d760c3 files/digest-xskat-3.4 61
-MD5 34c15a4ea36ff397061c795919203002 xskat-3.4.ebuild 663
-MD5 40201f9a4de945d1d8415d4d3173b740 ChangeLog 367
+MD5 8bd65090aadae84c438678c40930cab3 xskat-4.0.ebuild 678
+MD5 6783be406dfef9c29e0e0c07dfed700c ChangeLog 746
+MD5 f457410001c76e8be2909aa6a5732ebb xskat-3.4-r1.ebuild 682
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 9409fa2b5b02bf7ac5f8508292d760c3 files/digest-xskat-3.4-r1 61
+MD5 67fe815940a056602bdce0fe4fa6483b files/digest-xskat-4.0 61
diff --git a/games-board/xskat/metadata.xml b/games-board/xskat/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-board/xskat/metadata.xml
+++ b/games-board/xskat/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-board/xskat/xskat-3.4-r1.ebuild b/games-board/xskat/xskat-3.4-r1.ebuild
index 953118f791de..89f1e78ce31c 100644
--- a/games-board/xskat/xskat-3.4-r1.ebuild
+++ b/games-board/xskat/xskat-3.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/games-board/xskat/xskat-3.4-r1.ebuild,v 1.1 2003/09/13 10:44:27 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/xskat-3.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
@@ -8,9 +8,10 @@ DESCRIPTION="Famous german card game"
 HOMEPAGE="http://www.gulu.net/xskat"
 SRC_URI="http://www.gulu.net/xskat/${P}.tar.gz"
 
-KEYWORDS="x86 ppc"
 LICENSE="freedist"
 SLOT="0"
+KEYWORDS="x86 ppc amd64"
+IUSE=""
 
 DEPEND="virtual/x11"
 
@@ -20,7 +21,7 @@ src_compile() {
 }
 
 src_install() {
-	dogamesbin xskat
+	dogamesbin xskat || die "dogamesbin failed"
 	newman xskat.man xskat.6
 	dodoc CHANGES README{,.IRC}
 	prepgamesdirs
diff --git a/games-board/xskat/xskat-4.0.ebuild b/games-board/xskat/xskat-4.0.ebuild
index 941ad43ed8a7..d625baacb90d 100644
--- a/games-board/xskat/xskat-4.0.ebuild
+++ b/games-board/xskat/xskat-4.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/games-board/xskat/xskat-4.0.ebuild,v 1.1 2004/05/28 00:32:29 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xskat/xskat-4.0.ebuild,v 1.1.1.1 2005/11/30 10:10:01 chriswhite Exp $
 
 inherit games
 
diff --git a/games-rpg/adonthell/ChangeLog b/games-rpg/adonthell/ChangeLog
index 51c5894fa85a..b8c858a6f650 100644
--- a/games-rpg/adonthell/ChangeLog
+++ b/games-rpg/adonthell/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for app-games/adonthell
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/adonthell
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  adonthell-0.3.3-r1.ebuild, adonthell-0.3.4a.ebuild:
+  Removed INSTALL file.
+
+*adonthell-0.3.4a (09 Jun 2005)
+
+  09 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.3.4a-configure.in.patch, +adonthell-0.3.4a.ebuild:
+  version bump
+
+  13 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  files/0.3.3-configure.in.patch, adonthell-0.3.3-r1.ebuild:
+  cleaned up python library code in configure.in; added work-around for bug
+  #83434 that caused a compile failure related to nls support; more deps for use
+  doc; keepdir the directory that games that use adonthell will use.
+
+  06 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  adonthell-0.3.3-r1.ebuild:
+  requires oggvorbis; tidy
+
+  11 Feb 2004; David Holm <dholm@gentoo.org> adonthell-0.3.3-r1.ebuild:
+  Added to ~ppc.
 
 *adonthell-0.3.3-r1 (20 Mar 2003)
 
diff --git a/games-rpg/adonthell/Manifest b/games-rpg/adonthell/Manifest
index a59c58aff7f5..c2546d30da95 100644
--- a/games-rpg/adonthell/Manifest
+++ b/games-rpg/adonthell/Manifest
@@ -1,4 +1,18 @@
-MD5 6211b46f79a2bbaea936f30e64a83713 files/0.3.3-configure.in.patch 528
-MD5 55d668981b78a8cde872051ff3a056c9 files/digest-adonthell-0.3.3-r1 68
-MD5 7aea7973778e5d622206c31e1e381f17 ChangeLog 860
-MD5 1ad2f047368991c9256be901c6c90860 adonthell-0.3.3-r1.ebuild 1040
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47b1922be8c7e82000af8d01e57b0814 adonthell-0.3.4a.ebuild 1412
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 73d4b7e27d435af64ffcc6b24b1d43f7 adonthell-0.3.3-r1.ebuild 1217
+MD5 4ac8b7dfa3b21c4089f6ae23918fd572 ChangeLog 1697
+MD5 e944f3812b6938f625c3a2bba14b3b35 files/digest-adonthell-0.3.3-r1 72
+MD5 f8819f0b8b8a019c2ab89d7c707665eb files/0.3.4a-configure.in.patch 2957
+MD5 f8819f0b8b8a019c2ab89d7c707665eb files/0.3.3-configure.in.patch 2957
+MD5 9b2f86f7d5729fd1944524672760f256 files/digest-adonthell-0.3.4a 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC1bevgIKl8Uu19MoRArOaAJ48eGawKJNYUYd9mK6PeZWJRrS9YACfcGuF
+gd3UZh3hXLdJXFCQLpKj30E=
+=DgE/
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/adonthell/adonthell-0.3.3-r1.ebuild b/games-rpg/adonthell/adonthell-0.3.3-r1.ebuild
index c24fa2ff244e..3afae375be50 100644
--- a/games-rpg/adonthell/adonthell-0.3.3-r1.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.3-r1.ebuild
@@ -1,45 +1,50 @@
-# 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/games-rpg/adonthell/adonthell-0.3.3-r1.ebuild,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 DESCRIPTION="roleplaying game engine"
 HOMEPAGE="http://adonthell.linuxgames.com/"
-SRC_URI="http://savannah.nongnu.org/download/adonthell/src/${P}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="oggvorbis gtk nls doc"
+KEYWORDS="~amd64 ppc x86"
+IUSE="doc"
 
-DEPEND="dev-lang/python
+RDEPEND="dev-lang/python
 	media-libs/libsdl
-	oggvorbis? ( media-libs/libvorbis
-		media-libs/libogg )
-	sys-libs/zlib
-	gtk? ( =x11-libs/gtk+-1* )
-	doc? ( app-doc/doxygen )"
+	media-libs/libvorbis
+	media-libs/libogg
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen )
+	sys-devel/autoconf"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-configure.in.patch
-	autoconf || die
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}-configure.in.patch"
+	aclocal && automake -a && autoconf || die "autotools failed"
 }
 
 src_compile() {
 	egamesconf \
-		`use_enable nls` \
-		`use_enable doc` \
-		--with-gnu-ld \
+		--disable-dependency-tracking \
+		--disable-py-debug \
+		--enable-nls \
+		$(use_enable doc) \
 		|| die
 	touch doc/items/{footer,header}.html
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
-	dodoc README AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS
+	make DESTDIR="${D}" install || die "make install failed"
+	keepdir "${GAMES_DATADIR}/${PN}/games"
+	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
 	prepgamesdirs
 }
diff --git a/games-rpg/adonthell/adonthell-0.3.4a.ebuild b/games-rpg/adonthell/adonthell-0.3.4a.ebuild
index 9eec62fd4b9e..67f17ea6388a 100644
--- a/games-rpg/adonthell/adonthell-0.3.4a.ebuild
+++ b/games-rpg/adonthell/adonthell-0.3.4a.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/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.1 2005/06/09 04:35:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/adonthell/adonthell-0.3.4a.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 inherit eutils games
 
@@ -30,14 +30,20 @@ S=${WORKDIR}/${PN}-${PV/a/}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}/${PV}-configure.in.patch"
-	aclocal && automake -a && autoconf || die "autotools failed"
+	epatch "${FILESDIR}"/${PV}-configure.in.patch
+	rm -f ac{local,include}.m4
+	aclocal && \
+	libtoolize -c -f && \
+	autoconf && \
+	automake -a -c || die "autotools failed"
 }
 
 src_compile() {
+	# the fugly --with-vorbis is to work around #98689
 	egamesconf \
 		--disable-dependency-tracking \
 		--disable-py-debug \
+		--with-vorbis="${T}" \
 		$(use_enable nls) \
 		$(use_enable doc) \
 		|| die
@@ -48,6 +54,6 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 	keepdir "${GAMES_DATADIR}/${PN}/games"
-	dodoc AUTHORS ChangeLog FULLSCREEN.howto INSTALL NEWBIE NEWS README
+	dodoc AUTHORS ChangeLog FULLSCREEN.howto NEWBIE NEWS README
 	prepgamesdirs
 }
diff --git a/games-rpg/adonthell/files/0.3.3-configure.in.patch b/games-rpg/adonthell/files/0.3.3-configure.in.patch
index ca6d5d1edcc5..fd7ad893772c 100644
--- a/games-rpg/adonthell/files/0.3.3-configure.in.patch
+++ b/games-rpg/adonthell/files/0.3.3-configure.in.patch
@@ -1,11 +1,74 @@
---- configure.in.orig	2003-03-10 19:34:50.000000000 -0800
-+++ configure.in	2003-03-10 19:35:31.000000000 -0800
-@@ -216,7 +216,7 @@
- 
-    if test x$haveldd != x ; then
-        changequote(<<, >>)
--       py_deps=`ldd $PYPACKAGE | sed 's/\( *lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d'`
-+       py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v sandbox`
-        for py_lib in $py_deps ; do
-          if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then
-             PY_DEPS="$PY_DEPS $py_lib"
+--- configure.in.orig	2005-03-12 18:01:25.000000000 -0500
++++ configure.in	2005-03-13 00:12:26.000000000 -0500
+@@ -159,10 +159,8 @@
+ 
+    dnl Extract the version using Python, check against 1.5+
+ 
+-   changequote(<<, >>)
+-   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version[0]) * 10 + int(sys.version[2]))'`
+-   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version[0:3]'`
+-   changequote([, ])
++   PYTHON_VERSION=`$PYPACKAGE -c 'import sys ; print (int(sys.version@<:@0@:>@) * 10 + int(sys.version@<:@2@:>@))'`
++   PY_VERSION=`$PYPACKAGE -c 'import sys ; print sys.version@<:@0:3@:>@'`
+ 
+    if test $PYTHON_VERSION -lt 15; then
+ 	echo "Sorry, you need to have Python 1.5+ installed - update your version!"
+@@ -172,9 +170,7 @@
+    dnl Find the Python.h header file
+ 
+    AC_MSG_CHECKING(for Python header files)
+-   changequote(<<, >>)
+-   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version[:3])'`
+-   changequote([, ])
++   PYINCLUDE=`$PYPACKAGE -c 'import sys ; print "%s/include/python%s" % (sys.prefix, sys.version@<:@:3@:>@)'`
+ 
+    if test -r "$PYINCLUDE/Python.h"; then
+       PY_CFLAGS="-I$PYINCLUDE"
+@@ -188,10 +184,8 @@
+ 
+    AC_MSG_CHECKING(for Python library)
+    PYLIB=""
+-   changequote(<<, >>)
+    PYPREFIX=`$PYPACKAGE -c 'import sys; print sys.prefix'`
+-   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version[:3]'`
+-   changequote([, ])
++   PYLIBVER=`$PYPACKAGE -c 'import sys; print sys.version@<:@:3@:>@'`
+ 
+    py_paths="$PYPREFIX/lib/python$PYLIBVER/config $PYPREFIX/lib"
+    py_suffix="$PYLIBVER.so $PYLIBVER.a .so .a"
+@@ -220,19 +214,9 @@
+ 
+    dnl Get the libraries that python depends on
+ 
+-   AC_PATH_PROG(haveldd, ldd)
+    AC_MSG_CHECKING(for Python's dependencies)
+ 
+-   if test x$haveldd != x ; then
+-       changequote(<<, >>)
+-       py_deps=`ldd $PYPACKAGE | sed 's/\( *.*lib\([^\/]*\)\.so.*=.*$\)/-l\2/p; d' | grep -v 'stdc++'`
+-       for py_lib in $py_deps ; do
+-         if test "$py_lib" != "-lm" && test "$py_lib" != "-lc" ; then
+-            PY_DEPS="$PY_DEPS $py_lib"
+-         fi
+-      done
+-      changequote([, ])
+-   fi
++   PY_DEPS="$PY_DEPS `python-config --libs`"
+ 
+    case $target in
+        *-sun-solaris*)
+@@ -280,11 +264,9 @@
+ if test "$P_SWIG" != "no" ; then
+     $P_SWIG -version &> swig.ver
+ 
+-    changequote(<<, >>)
+-    swig_major_ver=`more swig.ver | sed 's/.* \([0-9]*\)\.[0-9]*\.[0-9]*.*/\1/p; d'`
+-    swig_minor_ver=`more swig.ver | sed 's/.* [0-9]*\.\([0-9]*\)\.[0-9]*.*/\1/p; d'`
+-    swig_micro_ver=`more swig.ver | sed 's/.* [0-9]*\.[0-9]*\.\([0-9]*\).*/\1/p; d'`
+-    changequote([, ])
++    swig_major_ver=`more swig.ver | sed 's/.* \(@<:@0-9@:>@*\)\.@<:@0-9@:>@*\.@<:@0-9@:>@*.*/\1/p; d'`
++    swig_minor_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/p; d'`
++    swig_micro_ver=`more swig.ver | sed 's/.* @<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/p; d'`
+ 
+     rm -f swig.ver
+ 
diff --git a/games-rpg/adonthell/files/digest-adonthell-0.3.3-r1 b/games-rpg/adonthell/files/digest-adonthell-0.3.3-r1
index d66cb68c860c..fbb7a051e786 100644
--- a/games-rpg/adonthell/files/digest-adonthell-0.3.3-r1
+++ b/games-rpg/adonthell/files/digest-adonthell-0.3.3-r1
@@ -1 +1 @@
-MD5 8ed4a8b02ea24fd393b67bca355cc70b adonthell-0.3.3.tar.gz 1042278
+MD5 93d6c13a07e0b319a04a971e8304fc8e adonthell-src-0.3.3.tar.gz 1023601
diff --git a/games-rpg/adonthell/metadata.xml b/games-rpg/adonthell/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/adonthell/metadata.xml
+++ b/games-rpg/adonthell/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/aklabeth/ChangeLog b/games-rpg/aklabeth/ChangeLog
index 8672dc87c1f6..b8255a277d96 100644
--- a/games-rpg/aklabeth/ChangeLog
+++ b/games-rpg/aklabeth/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/aklabeth
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/aklabeth/ChangeLog,v 1.1 2004/08/13 11:35:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/aklabeth/ChangeLog,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
+
+  17 Dec 2004; Joseph Jezak <josejx@gentoo.org> aklabeth-1.0.ebuild:
+  Marked ppc stable.
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> aklabeth-1.0.ebuild:
+  Added to ~ppc.
 
 *aklabeth-1.0 (13 Aug 2004)
 
diff --git a/games-rpg/aklabeth/Manifest b/games-rpg/aklabeth/Manifest
index a404c9195d2e..819ffad2bd89 100644
--- a/games-rpg/aklabeth/Manifest
+++ b/games-rpg/aklabeth/Manifest
@@ -1,2 +1,4 @@
-MD5 b4b169ede71227d1fb1d35bb7aaac701 aklabeth-1.0.ebuild 503
+MD5 d169af94c7d3b70f2168ec466f349d91 ChangeLog 576
+MD5 113b9d50231232a476a9ef2a35b4b4cc aklabeth-1.0.ebuild 606
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 4c8628b96099e3aab5668c2df1cc32ef files/digest-aklabeth-1.0 64
diff --git a/games-rpg/aklabeth/aklabeth-1.0.ebuild b/games-rpg/aklabeth/aklabeth-1.0.ebuild
index 0c2063068e0d..5fc0e82bdeda 100644
--- a/games-rpg/aklabeth/aklabeth-1.0.ebuild
+++ b/games-rpg/aklabeth/aklabeth-1.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/games-rpg/aklabeth/aklabeth-1.0.ebuild,v 1.1 2004/08/13 11:35:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/aklabeth/aklabeth-1.0.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.autismuk.freeserve.co.uk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 DEPEND="media-libs/libsdl"
diff --git a/games-rpg/bass/ChangeLog b/games-rpg/bass/ChangeLog
index c6509eda0138..06bb067f6c19 100644
--- a/games-rpg/bass/ChangeLog
+++ b/games-rpg/bass/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for games-rpg/bass
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/bass/ChangeLog,v 1.1 2003/10/13 21:38:34 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/bass/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
+
+*bass-1.2 (01 Nov 2005)
+
+  01 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> +bass-1.2.ebuild:
+  version bump
+
+*bass-0-r1 (01 Nov 2005)
+
+  01 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org> +bass-0-r1.ebuild:
+  add file needed by new scummvm version (bug #111063)
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> bass-0.ebuild:
+  Added ~sparc keyword.
+
+  28 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> bass-0.ebuild:
+  use games_make_wrapper; error check
+
+  13 Jan 2003; Spider <spider@gentoo.org> :
+  Fixed dependency so it doesn't break with new portage. 
 
 *bass-0 (13 Oct 2003)
 
diff --git a/games-rpg/bass/Manifest b/games-rpg/bass/Manifest
index f25cdb507a75..642a8bb05235 100644
--- a/games-rpg/bass/Manifest
+++ b/games-rpg/bass/Manifest
@@ -1,4 +1,14 @@
-MD5 2a32d6e6a684f1b7b753008f654c1f3f files/bass 49
-MD5 ff351fdd9fae00bfd828fc41c3fd99b3 files/digest-bass-0 58
-MD5 68f35e8a4930fdcc6440a362508fa1dd bass-0.ebuild 719
-MD5 1be89c269342b23a014d335f8b7a8100 ChangeLog 372
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9526818a799e18c50c46b5815605faf9 ChangeLog 934
+MD5 32ab2a5448abfafc6296b07e98f2064b bass-1.2.ebuild 802
+MD5 3a55fe0961583fa19706d4c9d116f141 files/digest-bass-1.2 62
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaEVOgIKl8Uu19MoRAu+/AJ93Hv/JnxZ5VPDAK8o5u/J2wgSJngCfXiAL
+6LfSPvRC7KRmlt2Kv5gykho=
+=kgmc
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/bass/bass-1.2.ebuild b/games-rpg/bass/bass-1.2.ebuild
index 769ecdd9a90d..225154c41328 100644
--- a/games-rpg/bass/bass-1.2.ebuild
+++ b/games-rpg/bass/bass-1.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/bass/bass-1.2.ebuild,v 1.1 2005/11/01 21:51:14 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/bass/bass-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 inherit games
 
 DESCRIPTION="Beneath a Steel Sky: a science fiction thriller set in a bleak vision of the future"
-HOMEPAGE="http://www.revgames.com/"
+HOMEPAGE="http://www.revgames.com/_display.php?id=16"
 SRC_URI="mirror://sourceforge/scummvm/bass-cd-${PV}.zip"
 
 LICENSE="bass"
diff --git a/games-rpg/bass/metadata.xml b/games-rpg/bass/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/bass/metadata.xml
+++ b/games-rpg/bass/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/daimonin-client/ChangeLog b/games-rpg/daimonin-client/ChangeLog
index 22daba57d004..2af13a8a5d7c 100644
--- a/games-rpg/daimonin-client/ChangeLog
+++ b/games-rpg/daimonin-client/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for games-rpg/daimonin-client
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.1 2003/10/19 03:36:07 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/ChangeLog,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  daimonin-client-0.95b-r2.ebuild:
+  Making games last on inherit line.
+
+  22 Jan 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  daimonin-client-0.95b-r2.ebuild, daimonin-client-0.96.6_beta3.ebuild:
+  Setting virtual/x11 DEPEND based on X USE flag and closing bug #77826.
+
+*daimonin-client-0.96.6_beta3 (29 Dec 2004)
+
+  29 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -daimonin-client-0.96.5_beta3-r1.ebuild,
+  -daimonin-client-0.96.5_beta3.ebuild, +daimonin-client-0.96.6_beta3.ebuild,
+  -daimonin-client-0.96_beta2.ebuild:
+  version bump (bug #74979); clean old ebuilds
+
+*daimonin-client-0.96.5_beta3-r1 (29 Nov 2004)
+
+  29 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +daimonin-client-0.96.5_beta3-r1.ebuild:
+  minor version bump
+
+*daimonin-client-0.96.5_beta3 (31 Aug 2004)
+
+  31 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.96.5_beta3-gentoo-paths.patch,
+  +daimonin-client-0.96.5_beta3.ebuild:
+  version bump
+
+*daimonin-client-0.96_beta2 (29 Jun 2004)
+
+  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +daimonin-client-0.96_beta2.ebuild, -daimonin-client-0.96a_beta2.ebuild:
+  Renamed ebuild to work around a portage bug (#17172)
+
+*daimonin-client-0.96a_beta2 (29 Jun 2004)
+
+  29 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/0.96a_beta2-gentoo-paths.patch, +daimonin-client-0.96a_beta2.ebuild:
+  version bump (bug #52180) - ebuild and patch thanks to Alexander Sandbu
+
+  16 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  daimonin-client-0.95b.ebuild:
+  clean older ebuild
+
+  27 May 2004; Danny van Dyk <kugelfang@gentoo.org>
+  daimonin-client-0.95b-r2.ebuild:
+  Marked ~amd64.
+
+*daimonin-client-0.95b-r2 (15 Feb 2004)
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> daimonin-client-0.95b-r2.ebuild:
+  Versionbump and placed in ~ppc.
 
 *daimonin-client-0.95b (18 Oct 2003)
 
diff --git a/games-rpg/daimonin-client/Manifest b/games-rpg/daimonin-client/Manifest
index 503830a93bb5..afe50e519a1f 100644
--- a/games-rpg/daimonin-client/Manifest
+++ b/games-rpg/daimonin-client/Manifest
@@ -1,5 +1,11 @@
+MD5 426b30cf4b1867bf14e86ece8b64a3dc daimonin-client-0.95b-r2.ebuild 1179
+MD5 4e3a9f7c8f3225ea493f25a303a9d0f1 daimonin-client-0.96.6_beta3.ebuild 1508
+MD5 a63120e59f6a97c39b05603089c0fe4e ChangeLog 2208
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96.6_beta3-gentoo-paths.patch 3172
+MD5 5ac5c8e1d72348115409654af5ab3584 files/digest-daimonin-client-0.96.6_beta3 77
 MD5 f0fea0494c9b50a88620443df60a150e files/0.95b-gcc3.patch 1664
-MD5 e2acc696de7c335eefa9867e6ed22e60 files/digest-daimonin-client-0.95b 68
+MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96.5_beta3-gentoo-paths.patch 3172
 MD5 49fc669e5a92e2d43091dbcb3f5afec2 files/0.95b-gentoo-paths.patch 2948
-MD5 5b01812021b090945f55980be68ac1bc daimonin-client-0.95b.ebuild 1096
-MD5 85cf3d4326775d668200287b172ea4dc ChangeLog 365
+MD5 8a41290909b2aa9cf1835f6aac36c738 files/0.96a_beta2-gentoo-paths.patch 3172
+MD5 b7f58f6b5220a09dedb532eb977bd227 files/digest-daimonin-client-0.95b-r2 69
diff --git a/games-rpg/daimonin-client/daimonin-client-0.95b-r2.ebuild b/games-rpg/daimonin-client/daimonin-client-0.95b-r2.ebuild
index 4dcf153d1837..a60c1b9346ed 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.95b-r2.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.95b-r2.ebuild
@@ -1,8 +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/games-rpg/daimonin-client/daimonin-client-0.95b-r2.ebuild,v 1.1 2004/02/15 19:27:09 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/daimonin-client-0.95b-r2.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
-inherit games eutils flag-o-matic
+inherit eutils flag-o-matic games
 
 MY_PV=95b2
 DESCRIPTION="MMORPG with 2D isometric tiles grafik, true color and alpha blending effects"
@@ -11,32 +11,36 @@ SRC_URI="mirror://sourceforge/daimonin/dm_client_${MY_PV}_src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
+IUSE="X"
 
-DEPEND="media-libs/libsdl
+RDEPEND="media-libs/libsdl
 	media-libs/sdl-mixer
 	media-libs/sdl-image
-	virtual/x11"
+	X? ( virtual/x11 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
-S=${WORKDIR}/daimonin/client
+S="${WORKDIR}/daimonin/client"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-gentoo-paths.patch
+	epatch "${FILESDIR}/${PV}-gentoo-paths.patch"
 }
 
 src_compile() {
 	cd make/linux
 	append-flags -DGENTOO_DATADIR="'\"${GAMES_DATADIR}/${PN}\"'"
-	emake EXTRA_CFLAGS="${CFLAGS}" || die
+	emake EXTRA_CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
 	dogamesbin src/daimonin
-	dodir ${GAMES_DATADIR}/${PN}
-	cp -r bitmaps icons media sfx cache ${D}/${GAMES_DATADIR}/${PN}/
-	insinto ${GAMES_DATADIR}/${PN}
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r bitmaps icons media sfx cache "${D}/${GAMES_DATADIR}/${PN}/" \
+		|| die "cp failed"
+	insinto "${GAMES_DATADIR}/${PN}"
 	doins *.dat
 	prepgamesdirs
 }
diff --git a/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild b/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild
index 401536de4d6d..07e4ad050e5a 100644
--- a/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild
+++ b/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.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/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild,v 1.1 2004/12/30 00:30:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/daimonin-client/daimonin-client-0.96.6_beta3.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
 inherit eutils flag-o-matic games
 
@@ -12,15 +12,15 @@ SRC_URI="mirror://sourceforge/daimonin/daimonin_client-BETA3-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X"
 
 DEPEND="media-libs/libsdl
 	media-libs/sdl-mixer
 	media-libs/sdl-image
-	virtual/x11"
+	X? ( virtual/x11 )"
 
-S="${WORKDIR}/daimonin/client"
+S=${WORKDIR}/daimonin/client
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-rpg/daimonin-client/metadata.xml b/games-rpg/daimonin-client/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/daimonin-client/metadata.xml
+++ b/games-rpg/daimonin-client/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/egoboo/ChangeLog b/games-rpg/egoboo/ChangeLog
index 48a2913149a6..d26da65ee4f5 100644
--- a/games-rpg/egoboo/ChangeLog
+++ b/games-rpg/egoboo/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for app-games/egoboo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/egoboo
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/ChangeLog,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
+
+  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> egoboo-2.22.ebuild:
+  Cleanup for bug #92745.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> egoboo-2.22.ebuild:
+  virtual/glibc -> virtual/libc
+
+  15 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild:
+  inherit eutils for epatch
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> egoboo-2.22.ebuild,
+  files/2.22-endian.patch:
+  Added a patch to make egoboo compile on ppc. Keyworded ~ppc.
+
+  08 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild,
+  files/egoboo-2.22.sh:
+  try to make things actually work (bug 37474); use games eclass
+
+  01 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> egoboo-2.22.ebuild:
+  chown user.group -> chown user:group
 
 *egoboo-2.22 (18 Sep 2002)
 
@@ -15,10 +38,10 @@
 
   Filter -march=pentium4 or -march=athlon*. Replace with i686.
     
-  20 Jul 2002: Jose Alberto Su�rez L�pez <bass@gentoo.org> egoboo-2.22.ebuild :
+  20 Jul 2002: Jose Alberto Suárez López <bass@gentoo.org> egoboo-2.22.ebuild :
   Fixed bug #5272. Only moving env variables to other section.
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> egoboo-2.22.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> egoboo-2.22.ebuild :
   Added KEYWORDS.
 
   20 June 2002; George Shapovalov <george@gentoo.org> all :
diff --git a/games-rpg/egoboo/Manifest b/games-rpg/egoboo/Manifest
index 3e6b6ef580c4..f37adc6cee81 100644
--- a/games-rpg/egoboo/Manifest
+++ b/games-rpg/egoboo/Manifest
@@ -1,5 +1,7 @@
-MD5 da512f7037f2f55446ffcc33cffebfa6 ChangeLog 1105
-MD5 d2f05ca19711038a435c31085849fea7 egoboo-2.22.ebuild 1813
-MD5 51c7e53fd5f581bc0e057240613daccd files/digest-egoboo-2.22 60
+MD5 17984222a4ff3b548acc4e57bec074e5 egoboo-2.22.ebuild 1580
+MD5 bf47071ded057428a449cfde8fada248 ChangeLog 1959
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 53d4b92337a6d90ccfc2e0256d47d46f files/egoboo-2.22.sh 269
 MD5 2afa7b7e1883fef3200371e1d3f3300f files/egoboo-2.22-makefile-gentoo.patch 672
-MD5 e7b50c0d2ed611fcc240bed0d000a9b3 files/egoboo-2.22.sh 56
+MD5 0fc47d542e1b356cc9f9a99c4e8884f6 files/2.22-endian.patch 6416
+MD5 51c7e53fd5f581bc0e057240613daccd files/digest-egoboo-2.22 60
diff --git a/games-rpg/egoboo/egoboo-2.22.ebuild b/games-rpg/egoboo/egoboo-2.22.ebuild
index afc93943a880..0159a7d9ecad 100644
--- a/games-rpg/egoboo/egoboo-2.22.ebuild
+++ b/games-rpg/egoboo/egoboo-2.22.ebuild
@@ -1,63 +1,62 @@
-# 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/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/egoboo-2.22.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
-inherit flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs games
 
-N=egoboo
-S=${WORKDIR}/${N}
-DESCRIPTION="egoboo: a 3d dungeon crawling adventure in the spirit of NetHack"
-SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz"
+DESCRIPTION="A 3d dungeon crawling adventure in the spirit of NetHack"
 HOMEPAGE="http://egoboo.sourceforge.net/"
-KEYWORDS="x86 -ppc"
+SRC_URI="mirror://sourceforge/${PN}/ego${PV/./}.tar.gz"
+
+LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="-* x86 ppc"
+IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="virtual/libc
+	virtual/x11
 	virtual/opengl
 	virtual/glu
 	media-libs/libsdl"
-LICENSE="GPL-2"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
-	SDLLIBS=`sdl-config --libs`
-	SDLFLAGS=`sdl-config --cflags`
+	replace-cpu-flags 'athlon*' pentium4 i686
 
 	unpack ${A}
-	cd ${S}/code
-	patch < ${FILESDIR}/${P}-makefile-gentoo.patch || die "Patch Failed"
-	mv Makefile Makefile.bak
-	echo SDLLIBS=${SDLLIBS} > /tmp/sdllibs.tmp || die "file already exists"
-	echo SDLFLAGS=${SDLFLAGS} > /tmp/sdlflags.tmp || die "file already exists"a
-	cat /tmp/sdllibs.tmp /tmp/sdlflags.tmp Makefile.bak > Makefile
-	rm -f /tmp/sdllibs.tmp
-	rm -f /tmp/sdlflags.tmp
+	cd ${S}
+
+	sed -i \
+		-e "/^CC=/ s:=.*:=$(tc-getCC):" \
+		-e "s:-ffast-math -funroll-loops -O3 -g:${CFLAGS}:" code/Makefile \
+		|| die "sed code/Makefile failed"
+	sed \
+		-e "s:GENTOODIR:${GAMES_DATADIR}:" "${FILESDIR}/${P}.sh" \
+			> "${T}/egoboo" || die "sed wrapper failed"
+
+	# Fix endianess using SDL
+	epatch ${FILESDIR}/${PV}-endian.patch
 }
 
 src_compile() {
-	replace-flags "-march=athlon*" "-march=i686"
-	replace-flags "-march=pentium4" "-march=i686"
-
 	cd code
-	make clean || die "failed build"
-	make egoboo || die "failed build"
-	}
+	make clean || die "make clean failed"
+	emake egoboo || die "emake failed"
+}
 
 src_install () {
-	dodir /usr/share/egoboo
-	dodir /usr/bin
-	dodoc egoboo.txt gpl.txt
-	cp -r basicdat ${D}/usr/share/egoboo
-	cp code/egoboo ${D}/usr/share/egoboo
-	cp -r import ${D}/usr/share/egoboo
-	cp -r modules ${D}/usr/share/egoboo
-	cp -r players ${D}/usr/share/egoboo
-	cp -r text ${D}/usr/share/egoboo
-	cp controls.txt ${D}/usr/share/egoboo
-	cp setup.txt ${D}/usr/share/egoboo
-	cp ${FILESDIR}/${P}.sh ${D}/usr/bin/egoboo
-
-	#chown to root.users and chmod g+w to let regular users run the app
-	cd ${D}/usr/share/egoboo
-	chown -R root.users *
-	chmod -R g+w setup.txt basicdat players
+	dogamesbin "${T}/egoboo" || die "dogamesbin failed"
+	dodoc egoboo.txt
+	dodir "${GAMES_DATADIR}/${PN}" "${GAMES_BINDIR}"
+	cp -R basicdat/ import/ modules/ players/ text/ \
+		code/egoboo controls.txt setup.txt \
+		"${D}${GAMES_DATADIR}/${PN}" || die "cp failed"
+
+	prepgamesdirs
+	# ugly, but the game needs write here.
+	cd "${D}${GAMES_DATADIR}/${PN}"
+	chmod -R g+w setup.txt basicdat players import
 }
diff --git a/games-rpg/egoboo/files/egoboo-2.22.sh b/games-rpg/egoboo/files/egoboo-2.22.sh
index feea548d0885..64c6a2a81dcb 100644
--- a/games-rpg/egoboo/files/egoboo-2.22.sh
+++ b/games-rpg/egoboo/files/egoboo-2.22.sh
@@ -1,3 +1,7 @@
 #!/bin/sh
-cd /usr/share/egoboo
-/usr/share/egoboo/egoboo
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/egoboo/files/egoboo-2.22.sh,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
+
+cd GENTOODIR/egoboo
+exec ./egoboo $@
diff --git a/games-rpg/egoboo/metadata.xml b/games-rpg/egoboo/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/egoboo/metadata.xml
+++ b/games-rpg/egoboo/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/eternal-lands/ChangeLog b/games-rpg/eternal-lands/ChangeLog
index 634de5d8eb01..aa82e64b129d 100644
--- a/games-rpg/eternal-lands/ChangeLog
+++ b/games-rpg/eternal-lands/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for games-rpg/eternal-lands
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.1 2004/08/27 16:40:01 kanaka Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/ChangeLog,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
+
+  28 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  eternal-lands-1.0.1.ebuild, eternal-lands-1.1.2.ebuild:
+  Since this won't work with the newer openal, I need to make it a blocker.
+  Closing bug #110709.
+
+  25 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  eternal-lands-1.0.1.ebuild, eternal-lands-1.1.2.ebuild:
+  Made openal dependency work for both older openal and newer with split alut.
+  Closing bug #110392.
+
+*eternal-lands-1.1.2 (24 Oct 2005)
+
+  24 Oct 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +eternal-lands-1.1.2.ebuild:
+  version bump
+
+*eternal-lands-1.0.1 (28 Jan 2005)
+
+  28 Jan 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +eternal-lands-1.0.1.ebuild:
+  version bump - ebuild submitted by Bjørn Mogense via bug #79501
+
+  29 Nov 2004; Mike Doty <kingtaco@gentoo.org> eternal-lands-1.0.0.ebuild:
+  ~amd64 keyword added
+
+  27 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  eternal-lands-1.0.0.ebuild:
+  unpack in src_unpack; use games.eclass functions; tidy
 
 *eternal-lands-1.0.0 (17 Aug 2004)
 
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 25abf082594c..71467dc2c631 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -1,4 +1,4 @@
-MD5 bf9932ae0628b44d39e5285f277e05cd eternal-lands-1.0.0.ebuild 1919
-MD5 052b2dde2a40655a914fcf2e4943aef7 ChangeLog 266
 MD5 f14047c98a46008d55322cc6df542db0 metadata.xml 218
-MD5 13332eb34e0c35e33cfd4e40064f1672 files/digest-eternal-lands-1.0.0 113
+MD5 4b9e51e59b8c2f7edd72926d0304bf05 eternal-lands-1.1.2.ebuild 4055
+MD5 99735af03908e8a0ce11b2f97acaf730 ChangeLog 1360
+MD5 e6486bdc48faa0017a36591fb674f105 files/digest-eternal-lands-1.1.2 242
diff --git a/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild b/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild
index 0f09da157e61..2279e023b419 100644
--- a/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild
+++ b/games-rpg/eternal-lands/eternal-lands-1.1.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/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild,v 1.1 2005/10/24 05:47:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/eternal-lands/eternal-lands-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
 
 inherit games
 
@@ -21,7 +21,9 @@ RDEPEND="virtual/x11
 	virtual/opengl
 	>=media-libs/libsdl-1.2.5
 	>=media-libs/sdl-net-1.2.5
-	>media-libs/openal-20020127
+	<media-libs/openal-20051024
+	!>=media-libs/openal-20051024
+	!media-libs/alut
 	media-libs/libvorbis
 	>=dev-libs/libxml2-2.6.7
 	=media-libs/cal3d-0.10.0
diff --git a/games-rpg/freedroid/ChangeLog b/games-rpg/freedroid/ChangeLog
index 74babfb26136..67039f975d9f 100644
--- a/games-rpg/freedroid/ChangeLog
+++ b/games-rpg/freedroid/ChangeLog
@@ -1,6 +1,25 @@
-# ChangeLog for app-games/freedroid
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroid/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/freedroid
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroid/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
+
+  06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  freedroid-1.0.2.ebuild:
+  oggvorbis -> vorbis for bug #94254.
+
+  17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  freedroid-1.0.2.ebuild:
+  Cleanup for bug #92745.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> freedroid-1.0.2.ebuild:
+  fix header; more error checking/messages; add prepgamesdirs
+
+*freedroid-1.0.2 (14 Sep 2003)
+
+  14 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *freedroid-1.0.1 (05 Jun 2003)
 
@@ -9,5 +28,5 @@
 
 *freedroid-0.8.4 (1 Aug 2002)
 
-  1 Aug 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> freedroid-0.8.4.ebuild:
+  1 Aug 2002; Jose Alberto Suárez López <bass@gentoo.org> freedroid-0.8.4.ebuild:
   First relase.
diff --git a/games-rpg/freedroid/Manifest b/games-rpg/freedroid/Manifest
index d763d6f0bc97..bcf97558df28 100644
--- a/games-rpg/freedroid/Manifest
+++ b/games-rpg/freedroid/Manifest
@@ -1,5 +1,4 @@
-MD5 5e7502594b1fa5fca5e1df001949f7aa files/digest-freedroid-0.8.4 68
-MD5 e3df0a9eb1ee383a8c7f1d756e8cc00b files/digest-freedroid-1.0.1 68
-MD5 50da904ad90934feef1b25ff6ff8bc9d freedroid-0.8.4.ebuild 722
-MD5 6a0f75729a11c49d81ab1daf452977e0 ChangeLog 490
-MD5 8e3f7a0112779ce81fa87a49a3861ff7 freedroid-1.0.1.ebuild 715
+MD5 a80aa47d57180e7ebd2450a21e68b143 freedroid-1.0.2.ebuild 870
+MD5 98caeee14e45dd9b0b9c03a06a5f1dbd ChangeLog 1061
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 aa4a280b33128b87158cc207dd24de3e files/digest-freedroid-1.0.2 68
diff --git a/games-rpg/freedroid/freedroid-1.0.2.ebuild b/games-rpg/freedroid/freedroid-1.0.2.ebuild
index 906f6832e02f..69ab3f92adbc 100644
--- a/games-rpg/freedroid/freedroid-1.0.2.ebuild
+++ b/games-rpg/freedroid/freedroid-1.0.2.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/games-rpg/freedroid/freedroid-1.0.2.ebuild,v 1.1 2003/09/15 01:16:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroid/freedroid-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
-inherit games
+inherit flag-o-matic toolchain-funcs games
 
 DESCRIPTION="Freedroid - a Paradroid clone"
 HOMEPAGE="http://freedroid.sourceforge.net/"
@@ -10,8 +10,8 @@ SRC_URI="mirror://sourceforge/freedroid/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="oggvorbis"
+KEYWORDS="x86 ppc ~amd64"
+IUSE="vorbis"
 
 DEPEND=">=media-libs/libsdl-1.2.3
 	media-libs/jpeg
@@ -19,9 +19,15 @@ DEPEND=">=media-libs/libsdl-1.2.3
 	media-libs/libpng
 	media-libs/sdl-image
 	media-libs/sdl-mixer
-	oggvorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )"
+
+src_compile() {
+	[ "$(gcc-fullversion)" == "3.2.3" ] && filter-mfpmath sse
+	games_src_compile
+}
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README
+	prepgamesdirs
 }
diff --git a/games-rpg/freedroid/metadata.xml b/games-rpg/freedroid/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/freedroid/metadata.xml
+++ b/games-rpg/freedroid/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/freedroidrpg/ChangeLog b/games-rpg/freedroidrpg/ChangeLog
index 2063dd8303e4..5a54efcad0f9 100644
--- a/games-rpg/freedroidrpg/ChangeLog
+++ b/games-rpg/freedroidrpg/ChangeLog
@@ -1,6 +1,30 @@
-# ChangeLog for app-games/freedroidrpg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/freedroidrpg
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/ChangeLog,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  freedroidrpg-0.9.13.ebuild:
+  Stable on ppc.
+
+*freedroidrpg-0.9.13 (15 Sep 2005)
+
+  15 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +freedroidrpg-0.9.13.ebuild:
+  Version bump #105994 by egolf.
+
+  10 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  freedroidrpg-0.9.6.ebuild, freedroidrpg-0.9.9.ebuild:
+  Old
+
+*freedroidrpg-0.9.12 (09 Apr 2004)
+
+  09 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #46979 by gentoo@leezpc.freeserve.co.uk.
+
+*freedroidrpg-0.9.9 (27 Oct 2003)
+
+  27 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #32058.
 
 *freedroidrpg-0.9.6 (03 Aug 2003)
 
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 356344f50ddf..0571a2ab705a 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,5 +1,6 @@
-MD5 8d3b0e3f120bb422d4b401796fa7c7b1 files/digest-freedroidrpg-0.9.5_p1 81
-MD5 8e41b51991c32e8c223794fbd3c7047d files/digest-freedroidrpg-0.9.6 72
-MD5 04d46cc57e4967dfee529c8ef997c105 ChangeLog 511
-MD5 540d9de1565135b1ac62de2e2c99f21f freedroidrpg-0.9.5_p1.ebuild 888
-MD5 57620c75188787d0bc90d533a04394c3 freedroidrpg-0.9.6.ebuild 749
+MD5 c144a3fd8a99ee9e198773cb1f905de5 metadata.xml 2102
+MD5 7713a838aa74fd573829817729ba7688 ChangeLog 1129
+MD5 570a6326fdaec3647ef7565e2100f768 freedroidrpg-0.9.12.ebuild 782
+MD5 3b9e0d5146e122e14ab7e4584da9468a freedroidrpg-0.9.13.ebuild 779
+MD5 62e1d8dcbe6857c59d1c3bb814343fe6 files/digest-freedroidrpg-0.9.12 74
+MD5 cfe669e06e748b230304f08670ad16b1 files/digest-freedroidrpg-0.9.13 74
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild
index 0556379d403a..24d53c886382 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild
@@ -1,16 +1,17 @@
-# 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/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild,v 1.1 2004/04/09 06:12:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.9.12.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
 inherit games
 
-DESCRIPTION="Freedroid - a Paradroid clone"
+DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
 HOMEPAGE="http://freedroid.sourceforge.net/"
 SRC_URI="mirror://sourceforge/freedroid/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~amd64 ppc x86"
+IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.1.5
 	media-libs/jpeg
@@ -22,7 +23,7 @@ DEPEND=">=media-libs/libsdl-1.1.5
 	virtual/x11"
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	prepgamesdirs
 }
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild
index 6106c2738360..a646b09aabf1 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-0.9.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/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild,v 1.1 2005/09/15 05:01:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/freedroidrpg/freedroidrpg-0.9.13.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/freedroid/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=media-libs/libsdl-1.1.5
diff --git a/games-rpg/gwiz/ChangeLog b/games-rpg/gwiz/ChangeLog
index bce9ba9e8134..6e6e238ff688 100644
--- a/games-rpg/gwiz/ChangeLog
+++ b/games-rpg/gwiz/ChangeLog
@@ -1,10 +1,25 @@
-# ChangeLog for app-games/gwiz
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/gwiz/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/gwiz
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/gwiz/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
+
+  10 Sep 2005; Aron Griffis <agriffis@gentoo.org> gwiz-0.8.ebuild:
+  Mark 0.8 stable on alpha
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> gwiz-0.8.ebuild:
+  Stable on ppc.
+
+  09 May 2005; David Holm <dholm@gentoo.org> gwiz-0.8.ebuild:
+  Added to ~ppc.
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Apr 2004; Aron Griffis <agriffis@gentoo.org> gwiz-0.8.ebuild:
+  Add ~alpha
 
 *gwiz-0.8 (22 May 2002)
 
-  17 jul 2002; Jose Alberto Su�rez L�pez <bass@gentoo.org> gwiz-0.8.ebuild :
+  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> gwiz-0.8.ebuild :
   Added KEYWORDS, SLOT.
 
   22 May 2002; Ryan Phillips <rphillips@gentoo.org> ChangeLog :
diff --git a/games-rpg/gwiz/Manifest b/games-rpg/gwiz/Manifest
index fa979be97cf3..e37413cf3be7 100644
--- a/games-rpg/gwiz/Manifest
+++ b/games-rpg/gwiz/Manifest
@@ -1,3 +1,4 @@
-MD5 cdc58e129b3dbc99a81a78a39229ea5e ChangeLog 779
-MD5 7076d1ca8dbee9f29d8cd37e9bab71d2 gwiz-0.8.ebuild 646
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a802eda0da628a9c4731480cc52e3ab0 gwiz-0.8.ebuild 655
+MD5 ce61af0087b05041ad88f4bdf79ca363 ChangeLog 1224
 MD5 9f61b384503a2dcf5615122aedba2ab9 files/digest-gwiz-0.8 62
diff --git a/games-rpg/gwiz/gwiz-0.8.ebuild b/games-rpg/gwiz/gwiz-0.8.ebuild
index 9c85bf1291c4..a194d98e0bee 100644
--- a/games-rpg/gwiz/gwiz-0.8.ebuild
+++ b/games-rpg/gwiz/gwiz-0.8.ebuild
@@ -1,16 +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/games-rpg/gwiz/gwiz-0.8.ebuild,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/gwiz/gwiz-0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 DESCRIPTION="clone of old-school Wizardry(tm) games by SirTech"
-SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
 HOMEPAGE="http://icculus.org/gwiz/"
+SRC_URI="http://icculus.org/gwiz/${P}.tar.bz2"
 
-KEYWORDS="x86"
+KEYWORDS="alpha ~amd64 ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
+IUSE=""
 
-RDEPEND=">=media-libs/libsdl-1.2.3
+DEPEND=">=media-libs/libsdl-1.2.3
 	>=media-libs/sdl-image-1.2.1-r1
 	>=media-libs/sdl-ttf-2.0.4"
 
@@ -21,5 +22,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING ChangeLog README doc/HOWTO-PLAY
+	dodoc AUTHORS ChangeLog README doc/HOWTO-PLAY
 }
diff --git a/games-rpg/gwiz/metadata.xml b/games-rpg/gwiz/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/gwiz/metadata.xml
+++ b/games-rpg/gwiz/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/metadata.xml b/games-rpg/metadata.xml
index 47f4af751f48..a10a111febfb 100644
--- a/games-rpg/metadata.xml
+++ b/games-rpg/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The games-rpg category contains role-playing games.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie games-rpg enthält Rollenspiele.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría games-rpg contiene juegos de rol.
+	</longdescription>
+	<longdescription lang="ja">
+		games-rpgカテゴリーにはロール・プレイング・ゲームが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De games-rpg categorie bevat rollenspellen (Role-Playing Games).
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm games-rpg chứa các trò chơi dạng chơi theo lượt (role-playing - RPG).
+	</longdescription>
+	<longdescription lang="it">
+		La categoria games-rpg contiene giochi di ruolo.
+	</longdescription>
 </catmetadata>
 
diff --git a/games-rpg/nwn-cep/ChangeLog b/games-rpg/nwn-cep/ChangeLog
index bcc3995a2195..958c26b17cd1 100644
--- a/games-rpg/nwn-cep/ChangeLog
+++ b/games-rpg/nwn-cep/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for games-rpg/nwn-cep
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-cep/ChangeLog,v 1.1 2005/01/20 06:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-cep/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 *nwn-cep-1.50 (20 Jan 2004)
 
diff --git a/games-rpg/nwn-cep/Manifest b/games-rpg/nwn-cep/Manifest
index e69de29bb2d1..e5907fca4670 100644
--- a/games-rpg/nwn-cep/Manifest
+++ b/games-rpg/nwn-cep/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b55ea59568d8259d463d012b38e592ec nwn-cep-1.50.ebuild 1495
+MD5 caf552afc18dad55f432440b0796fd84 ChangeLog 375
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c017eb9709b6ed5cec61ee4d9f7faca0 files/digest-nwn-cep-1.50 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB78UhI1lqEGTUzyQRAkA9AKCCeool6GpXaTqQrRAghxwHmQTO6QCgiI9Q
+b/e4I/aWKSR/i5+ViqPgeTM=
+=9GjU
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/nwn-cep/nwn-cep-1.50.ebuild b/games-rpg/nwn-cep/nwn-cep-1.50.ebuild
index a6b68bd122d2..a2334e70c42b 100644
--- a/games-rpg/nwn-cep/nwn-cep-1.50.ebuild
+++ b/games-rpg/nwn-cep/nwn-cep-1.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/games-rpg/nwn-cep/nwn-cep-1.50.ebuild,v 1.1 2005/01/20 06:48:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-cep/nwn-cep-1.50.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 inherit games
 
diff --git a/games-rpg/nwn-data/ChangeLog b/games-rpg/nwn-data/ChangeLog
index 54d5cff5aa77..3fc5a9dc0292 100644
--- a/games-rpg/nwn-data/ChangeLog
+++ b/games-rpg/nwn-data/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for games-rpg/nwn-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.1 2005/09/21 00:11:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/ChangeLog,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
+
+  02 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Added license checking.
+
+  01 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Fixed installation when not using USE=nowin.
+
+  17 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Added nwmouse check from bug #106789 for bug #109619.
+
+  30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Fixed cosmetic errors on USE=-nowin.
+
+  22 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-data-1.29.ebuild:
+  Added echo lines to inform users which CD they'll need.
 
 *nwn-data-1.29 (21 Sep 2005)
 
@@ -8,6 +23,6 @@
   +metadata.xml, +nwn-data-1.29.ebuild:
   Initial import. Ebuild by me. This is the first ebuild for breaking up
   Neverwinter Nights into 2 ebuilds. This ebuild also adds support for
-  installing the Shadows of Undrentide and Hourdes of the Underdark expansion
+  installing the Shadows of Undrentide and Hordes of the Underdark expansion
   packs from CD using USE=sou and USE=hou respectively.
 
diff --git a/games-rpg/nwn-data/Manifest b/games-rpg/nwn-data/Manifest
index 0b861d0cec1a..76a41e9aaac9 100644
--- a/games-rpg/nwn-data/Manifest
+++ b/games-rpg/nwn-data/Manifest
@@ -1,3 +1,5 @@
-MD5 865e0ba3b5586be311a4be3205d6154c nwn-data-1.29.ebuild 3888
+MD5 97bc5159ea774a20fc86e3f2b0448929 ChangeLog 1240
 MD5 a1f70c52e9c1098e5bd13153dce5b63d files/digest-nwn-data-1.29 396
 MD5 d05b3b73edd2b4beadbce95837e2ab20 files/nwn.png 4296
+MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
+MD5 57a7d9396ee1821fa676bc7d5aaf0410 nwn-data-1.29.ebuild 5377
diff --git a/games-rpg/nwn-data/nwn-data-1.29.ebuild b/games-rpg/nwn-data/nwn-data-1.29.ebuild
index 5756ae848555..e3a2df122eb9 100644
--- a/games-rpg/nwn-data/nwn-data-1.29.ebuild
+++ b/games-rpg/nwn-data/nwn-data-1.29.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/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.1 2005/09/21 00:11:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn-data/nwn-data-1.29.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
 inherit eutils games
 
@@ -33,35 +33,42 @@ RDEPEND="virtual/x11
 	>=media-libs/libsdl-1.2.5
 	amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
-S="${WORKDIR}/nwn"
-dir="${GAMES_PREFIX_OPT}/${PN/-data}"
-Ddir="${D}/${dir}"
+S=${WORKDIR}/nwn
+
+GAMES_LICENSE_CHECK="yes"
+dir=${GAMES_PREFIX_OPT}/nwn
+Ddir=${D}/${dir}
 
 pkg_setup() {
+	games_pkg_setup
 	if use sou && use hou
 	then
+		echo "You will need the SoU and HoU CDs for this installation."
 		cdrom_get_cds NWNSoUInstallGuide.rtf \
 			ArcadeInstallNWNXP213f.EXE
 	elif use sou
 	then
+		 echo "You will need the SoU CD for this installation."
 		cdrom_get_cds NWNSoUInstallGuide.rtf
 	elif use hou
 	then
+		 echo "You will need the HoU CD for this installation."
 		cdrom_get_cds ArcadeInstallNWNXP213f.EXE
 	fi
 }
 
 src_unpack() {
-	mkdir ${S}
-	cd ${S}
+	mkdir "${S}"
+	cd "${S}"
 	unpack nwclient129.tar.gz
-	cd ${WORKDIR}
+	cd "${WORKDIR}"
 	use nowin && unpack nwresources129.tar.gz
-	cd ${S}
+	cd "${S}"
 	rm -rf override/*
 	# the following is so ugly, please pretend it doesnt exist
 	declare -a Aarray=(${A})
-	use nowin && if [ "${#Aarray[*]}" == "3" ]; then
+	use nowin && if [ "${#Aarray[*]}" == "3" ]
+	then
 		unpack ${Aarray[1]}
 	fi
 	if use sou
@@ -84,16 +91,23 @@ src_unpack() {
 		unzip -o ${CDROM_ROOT}/Language_data.zip
 		unzip -o ${CDROM_ROOT}/Language_update.zip
 	fi
+	sed -i -e '\:^./nwmain .*:i \
+if [[ -f ./nwmouse.so ]]; then \
+	export XCURSOR_PATH="$(pwd)" \
+	export XCURSOR_THEME=nwmouse \
+	export LD_PRELOAD=./nwmouse.so:$LD_PRELOAD \
+fi \
+	' "${S}/nwn"
 }
 
 src_install() {
-	dodir ${dir}
+	dodir "${dir}"
 	# Since the movies don't play anyway, we'll remove them
-	rm -rf ${S}/movies
-	mkdir -p ${S}/dmvault ${S}/hak ${S}/portraits
-	rm -rf ${S}/dialog.tlk ${S}/dialog.TLK ${S}/dmclient ${S}/nwmain \
-		${S}/nwserver  ${S}/nwm/* ${S}/SDL-1.2.5 ${S}/fixinstall
-	mv ${S}/* ${Ddir}
+	rm -rf "${S}"/movies
+	mkdir -p "${S}"/dmvault "${S}"/hak "${S}"/portraits "${S}"/localvault
+	rm -rf "${S}"/dialog.tlk "${S}"/dialog.TLK "${S}"/dmclient "${S}"/nwmain \
+		"${S}"/nwserver  "${S}"/nwm/* "${S}"/SDL-1.2.5 "${S}"/fixinstall
+	mv "${S}"/* "${Ddir}"
 	keepdir ${dir}/servervault
 	keepdir ${dir}/scripttemplates
 	keepdir ${dir}/saves
@@ -102,24 +116,27 @@ src_install() {
 	cd ${Ddir}
 	for d in ambient data dmvault hak localvault music override portraits
 	do
-		cd ${d}
-		for f in $(find . -name '*.*') ; do
-			lcf=$(echo ${f} | tr [:upper:] [:lower:])
-			if [ ${f} != ${lcf} ] && [ -f ${f} ]
-			then
-				mv ${f} $(echo ${f} | tr [:upper:] [:lower:])
-			fi
-		done
-		cd ${Ddir}
+		if [ -d ${d} ]
+		then
+			cd ${d}
+			for f in $(find . -name '*.*') ; do
+				lcf=$(echo ${f} | tr [:upper:] [:lower:])
+				if [ ${f} != ${lcf} ] && [ -f ${f} ]
+				then
+					mv ${f} $(echo ${f} | tr [:upper:] [:lower:])
+				fi
+			done
+			cd ${Ddir}
+		fi
 	done
-	if ! use sou && ! use hou
+	if ! use sou && ! use hou && use nowin
 	then
-		chmod a-x ${Ddir}/data/patch.bif chmod a-x${Ddir}/patch.key
+		chmod a-x ${Ddir}/data/patch.bif ${Ddir}/patch.key
 	fi
-	doicon ${FILESDIR}/nwn.png
+	doicon "${FILESDIR}"/nwn.png
 	prepgamesdirs
 	chmod -R g+rwX ${Ddir}/saves ${Ddir}/localvault ${Ddir}/dmvault \
-		|| die "could not chmod"
+		2>&1 > /dev/null || die "could not chmod"
 	chmod g+rwX ${Ddir} || die "could not chmod"
 }
 
@@ -129,25 +146,34 @@ pkg_postinst() {
 		einfo "The NWN linux client data is now installed."
 		einfo "Proceed with the following steps in order to get it working:"
 		einfo "1) Copy the following directories/files from your installed and"
-		einfo "   patched (${PV}) Neverwinter Nights to ${GAMES_PREFIX_OPT}/nwn:"
+		einfo "   patched (1.66) Neverwinter Nights to ${dir}:"
 		einfo "    ambient/"
-		einfo "    data/ (all files except for patch.bif)"
+		einfo "    data/"
 		einfo "    dmvault/"
 		einfo "    hak/"
 		einfo "    localvault/"
 		einfo "    modules/"
 		einfo "    music/"
-		einfo "    override/"
 		einfo "    portraits/"
 		einfo "    saves/"
 		einfo "    servervault/"
 		einfo "    texturepacks/"
 		einfo "    chitin.key"
-		einfo "2) Chown and chmod the files with the following commands"
+		einfo "2) Remove some files to make way for the patch"
+		einfo "    rm ${dir}/music/mus_dd_{kingmaker,shadowgua,witchwake}.bmu"
+		einfo "    rm ${dir}/override/iit_medkit_001.tga"
+		einfo "    rm ${dir}/data/patch.bif"
+		if use sou
+		then
+			einfo "    rm ${dir}/xp1patch.key ${dir}/data/xp1patch.bif"
+		fi
+		if use hou
+		then
+			einfo "    rm ${dir}/xp2patch.key ${dir}/data/xp2patch.bif"
+		fi
+		einfo "3) Chown and chmod the files with the following commands"
 		einfo "    chown -R ${GAMES_USER}:${GAMES_GROUP} ${dir}"
 		einfo "    chmod -R g+rwX ${dir}"
-		einfo "3) Run ${dir}/fixinstall as root"
-		einfo "4) Make sure that you are in group ${GAMES_GROUP}"
 		echo
 		einfo "Or try emerging with USE=nowin"
 	else
diff --git a/games-rpg/nwn/ChangeLog b/games-rpg/nwn/ChangeLog
index c0d550e585ec..460c2d9b4a62 100644
--- a/games-rpg/nwn/ChangeLog
+++ b/games-rpg/nwn/ChangeLog
@@ -1,6 +1,119 @@
-# ChangeLog for app-games/nwn
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/nwn
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+  02 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.66-r1.ebuild:
+  Added license checking and initial language support information.
+
+  01 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.66-r1.ebuild:
+  fperm is supposed to be fperms.
+
+  21 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.65-r1.ebuild,
+  nwn-1.66.ebuild, nwn-1.66-r1.ebuild:
+  Added addition dir variable to games_make_wrapper for bug #109793.
+
+  16 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.66-r1.ebuild:
+  Fix fixinstall not being executable.
+
+  30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> files/fixinstall:
+  Made cosmetic fix to fixinstall script.
+
+  22 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -files/nwn-1.65-fixinstall, +files/fixinstall, nwn-1.65-r1.ebuild,
+  nwn-1.66.ebuild, nwn-1.66-r1.ebuild:
+  Fixed fixinstall script.
+
+*nwn-1.66-r1 (21 Sep 2005)
+
+  21 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml,
+  nwn-1.66.ebuild, +nwn-1.66-r1.ebuild:
+  Initial commit of new split ebuild for nwn (1.66-r1). It is currently
+  masked, but I'm hoping that this becomes the default for nwn quite shortly.
+  Closing bug #106484.
+
+  16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.65-r1.ebuild,
+  nwn-1.66.ebuild:
+  needs app-arch/unzip
+
+  15 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.66.ebuild:
+  Fixing digest and disabling German support for the time being.
+
+*nwn-1.66 (13 Sep 2005)
+
+  13 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> +nwn-1.66.ebuild:
+  Version bump to 1.66 and added a couple more mirrors for
+  nwresources129.tar.gz. Closing bug #96640.
+
+*nwn-1.65-r1 (02 Jan 2005)
+
+  02 Jan 2005; Mike Frysinger <vapier@gentoo.org> +nwn-1.65-r1.ebuild,
+  -nwn-1.65.ebuild:
+  Fix array usage with $A so it actually works #76428 by Francois Guimond.
+
+  30 Dec 2004; Mike Frysinger <vapier@gentoo.org> nwn-1.65.ebuild:
+  Add localization support #61260 by dju.
+
+*nwn-1.65 (30 Dec 2004)
+
+  30 Dec 2004; Mike Frysinger <vapier@gentoo.org>
+  -files/nwn-1.30-fixinstall, -files/nwn-1.32-fixinstall,
+  -files/nwn-1.61-fixinstall, -files/nwn-1.62-fixinstall,
+  +files/nwn-1.65-fixinstall, -nwn-1.62.ebuild, +nwn-1.65.ebuild:
+  Version bump #74871 by Francois Guimond et al.
+
+  28 Aug 2004; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.62.ebuild:
+  fix DESCRIPTION (bug #62066)
+
+  05 Jun 2004; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.62.ebuild:
+  Changed license to NWN-EULA and closing bug #52507.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> nwn-1.62.ebuild:
+  Fix use invocation
+
+  24 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.62.ebuild:
+  Fixed typo and closing bug #50809.
+
+  18 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.62.ebuild:
+  Added RDEPEND for app-emulation/emul-linux-x86-baselibs on amd64.
+
+  17 May 2004; Chris Gianelloni <wolf31o2@gentoo.org> +files/nwn.png,
+  nwn-1.62.ebuild:
+  Added .desktop entry and closing bug #50809.
+
+  17 May 2004; Danny van Dyk <kugelfang@gentoo.org> nwn-1.62.ebuild:
+  Marked ~amd64.
+
+  11 May 2004; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.30.ebuild,
+  nwn-1.32.ebuild, nwn-1.61-r1.ebuild:
+  clean older ebuilds
+
+  19 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.62.ebuild:
+  opengl isn't optional.
+
+*nwn-1.62 (28 Feb 2004)
+
+  28 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #43033 by Luca Santarelli.
+
+*nwn-1.61-r1 (14 Jan 2004)
+
+  14 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  I neglected to include the fix install script in the version bump #38351.
+
+*nwn-1.61 (03 Jan 2004)
+
+  03 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #36007.
+
+*nwn-1.32 (13 Oct 2003)
+
+  13 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #29316 and add helpful output #29505 and fix SRC_URI #31073.
+
+*nwn-1.30 (26 Jun 2003)
+
+  01 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org> nwn-1.30.ebuild:
+  chown user.group -> chown user:group
 
   06 Sep 2003; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.30.ebuild:
   Added RESTRICT=fetch.  Closes bug #27548.
@@ -8,8 +121,6 @@
   29 Aug 2003; Chris Gianelloni <wolf31o2@gentoo.org> nwn-1.30.ebuild:
   Added RESTRICT=fetch.  Closing bug #27548.
 
-*nwn-1.30 (26 Jun 2003)
-
   14 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
   Add updated ebuild from Daniel Mannarino <thesnark@operamail.com> #25162.
   Fixes USE=nowin install.
diff --git a/games-rpg/nwn/Manifest b/games-rpg/nwn/Manifest
index 295571ca34e4..2d4fe0a81d1d 100644
--- a/games-rpg/nwn/Manifest
+++ b/games-rpg/nwn/Manifest
@@ -1,5 +1,11 @@
-MD5 2142a97c19f5965d387e078c938f2ab0 nwn-1.30.ebuild 2470
-MD5 aaf52bd569006b7ef2ebb0a40178fe37 ChangeLog 1941
-MD5 1330dd0f889d308e814b0b0f8b1faa85 files/nwn 38
-MD5 3991783d84979fb3cc6430785ae08aa6 files/digest-nwn-1.30 213
-MD5 0875406c242fb0889db6de2d3f4ace88 files/nwn-1.30-fixinstall 1684
+MD5 666a92ee1e461e1147a5b7d7eb024839 ChangeLog 5832
+MD5 3952e8e76ebdde92fe0bf84facaaea38 files/digest-nwn-1.65-r1 892
+MD5 a15f98043e8a4c08555ef8384a1e848c files/digest-nwn-1.66 1147
+MD5 25cad5bc0f76382b0577ef11b5d5aeef files/digest-nwn-1.66-r1 1551
+MD5 004cf98b585a8186262ea2117907129e files/fixinstall 2453
+MD5 3eddaf5e88a92951762058756003c855 files/nwn 44
+MD5 d05b3b73edd2b4beadbce95837e2ab20 files/nwn.png 4296
+MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
+MD5 b09157145a832f02eb5ccbdff5244310 nwn-1.65-r1.ebuild 3688
+MD5 d3cc4071c19c1a08d527239dd69176ea nwn-1.66-r1.ebuild 4144
+MD5 69d62e623dfb29a0ca928233044220c7 nwn-1.66.ebuild 4228
diff --git a/games-rpg/nwn/files/digest-nwn-1.66 b/games-rpg/nwn/files/digest-nwn-1.66
index 0cdb645fd946..6c8b3f36c66d 100644
--- a/games-rpg/nwn/files/digest-nwn-1.66
+++ b/games-rpg/nwn/files/digest-nwn-1.66
@@ -1,12 +1,16 @@
 MD5 73c6515fd6aa5f860802098a55000ae8 nwclient129.tar.gz 5504342
 MD5 682de9174ed425d842fcfa0e1d33c175 French_linuxclient166_orig.tar.gz 95815139
 MD5 98d3d4afa02be4a76cc664372aa3576d NWNFrench1.66dialog.zip 6758854
-MD5 fd196316842c0ba0e622174a16f16d3b German_linuxclient166_orig.tar.gz 96518347
-MD5 2f12c9aac4588a72e2528a0ab536dc77 NWNGerman1.66dialog.zip 7217241
+MD5 d1e72a42a20c247332de6c6adcbcade5 nwfrench129.tar.gz 357777520
 MD5 a8ea537b8ff909d1e473dfd26440507f Italian_linuxclient166_orig.tar.gz 97447989
 MD5 73c9ddb239ddf21684088b536a670aae NWNItalian1.66dialog.zip 6719283
+MD5 efa3fb10bdaced373d21d9809a176968 nwitalian129.tar.gz 3926804
 MD5 506c6b358266ada6dfeb741c1f0f3e2e Spanish_linuxclient166_orig.tar.gz 97416220
 MD5 0cfe48c49ecbb52263853ebe4f8c2854 NWNSpanish1.66dialog.zip 6693679
+MD5 920d4fdcf5d8d0ff583f236ae7f3f6d4 nwspanish129.tar.gz 3912516
+MD5 fd196316842c0ba0e622174a16f16d3b German_linuxclient166_orig.tar.gz 96518347
+MD5 2f12c9aac4588a72e2528a0ab536dc77 NWNGerman1.66dialog.zip 7217241
+MD5 7ff8aeea91a59f8c54a5263ca8ea2261 nwgerman129.tar.gz 381832822
 MD5 bf313bdffef3440011888a1b8386ef88 English_linuxclient166_orig.tar.gz 95293070
 MD5 f4dafd3788aae35c8295c691b4e40db4 NWNEnglish1.66dialog.zip 3180592
 MD5 8222401efe25235b56d01b38ae880b5b nwresources129.tar.gz 1212356127
diff --git a/games-rpg/nwn/files/fixinstall b/games-rpg/nwn/files/fixinstall
index d0d7a4c80315..f92a9d9707c6 100755
--- a/games-rpg/nwn/files/fixinstall
+++ b/games-rpg/nwn/files/fixinstall
@@ -92,14 +92,14 @@ chown GENTOO_USER:GENTOO_GROUP GENTOO_DIR/nwn/ -R
 chmod g+rwX GENTOO_DIR/nwn/ -R
 
 # 1.65-specific fixes to permissions
-chmod a-x GENTOO_DIR/nwn/data/patch.bif
-chmod a-x GENTOO_DIR/nwn/nwm/Chapter1.nwm
-chmod a-x GENTOO_DIR/nwn/nwm/Chapter1E.nwm
-chmod a-x GENTOO_DIR/nwn/nwm/Chapter2.nwm
-chmod a-x GENTOO_DIR/nwn/nwm/Chapter2E.nwm
-chmod a-x GENTOO_DIR/nwn/nwm/Chapter3.nwm
-chmod a-x GENTOO_DIR/nwn/nwm/Chapter4.nwm
-chmod a-x GENTOO_DIR/nwn/nwm/Prelude.nwm
-chmod a-x GENTOO_DIR/nwn/patch.key
+chmod a-x GENTOO_DIR/nwn/data/patch.bif 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter1.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter1E.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter2.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter2E.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter3.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Chapter4.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/nwm/Prelude.nwm 2>&1 > /dev/null
+chmod a-x GENTOO_DIR/nwn/patch.key 2>&1 > /dev/null
 
 printf "\nYou are ready to run Neverwinter Nights.\n\n"
diff --git a/games-rpg/nwn/files/nwn b/games-rpg/nwn/files/nwn
index a254dd9230b4..c57e1a4c73c8 100644
--- a/games-rpg/nwn/files/nwn
+++ b/games-rpg/nwn/files/nwn
@@ -1,3 +1,3 @@
 #!/bin/sh
-cd /opt/nwn
+cd GENTOO_DIR/nwn
 exec ./nwn ${@}
diff --git a/games-rpg/nwn/metadata.xml b/games-rpg/nwn/metadata.xml
index 1cef6e243af3..fe08918e6837 100644
--- a/games-rpg/nwn/metadata.xml
+++ b/games-rpg/nwn/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>games</herd>
 <maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
+  <email>wolf31o2@gentoo.org</email>
+  <name>Chris Gianelloni</name>
 </maintainer>
 </pkgmetadata>
diff --git a/games-rpg/nwn/nwn-1.65-r1.ebuild b/games-rpg/nwn/nwn-1.65-r1.ebuild
index ccf4f944bfe5..cd555095b649 100644
--- a/games-rpg/nwn/nwn-1.65-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.65-r1.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/games-rpg/nwn/nwn-1.65-r1.ebuild,v 1.1 2005/01/03 02:48:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.65-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
-inherit games eutils
+inherit eutils games
 
 UPDATEVER=${PV//.}
 PATCH_URL_BASE=http://content.bioware.com/neverwinternights/linux/${UPDATEVER}/linuxclientupdate1xxto${UPDATEVER}
@@ -23,23 +23,25 @@ SRC_URI="http://nwdownloads.bioware.com/neverwinternights/linux/129/nwclient129.
 LICENSE="NWN-EULA"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="nowin nocd"
+IUSE="nowin"
 RESTRICT="nostrip nomirror"
 
 RDEPEND="virtual/x11
 	virtual/opengl
 	>=media-libs/libsdl-1.2.5
 	amd64? ( app-emulation/emul-linux-x86-baselibs )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
 
 S="${WORKDIR}/nwn"
 
 pkg_setup() {
-	use nocd && \
-	cdrom_get_cds \
-		Data_Shared.zip \
-		disk2.zip \
-		disk3.zip \
-		disk4.zip
+#	use nocd && \
+#	cdrom_get_cds \
+#		Data_Shared.zip \
+#		disk2.zip \
+#		disk3.zip \
+#		disk4.zip
 	games_pkg_setup
 }
 
@@ -63,7 +65,7 @@ src_install() {
 		-e "s:GENTOO_USER:${GAMES_USER}:" \
 		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
 		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
-		${FILESDIR}/${P}-fixinstall > ${WORKDIR}/nwn/fixinstall
+		${FILESDIR}/fixinstall > ${WORKDIR}/nwn/fixinstall
 	mv ${S} ${D}/${GAMES_PREFIX_OPT}
 	insinto /usr/share/pixmaps
 	doins ${FILESDIR}/nwn.png
diff --git a/games-rpg/nwn/nwn-1.66-r1.ebuild b/games-rpg/nwn/nwn-1.66-r1.ebuild
index 587b29d4ff27..764a005201b3 100644
--- a/games-rpg/nwn/nwn-1.66-r1.ebuild
+++ b/games-rpg/nwn/nwn-1.66-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/games-rpg/nwn/nwn-1.66-r1.ebuild,v 1.1 2005/09/21 00:39:05 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.66-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit eutils games
 
@@ -52,6 +52,8 @@ RDEPEND="games-rpg/nwn-data
 	amd64? ( app-emulation/emul-linux-x86-baselibs )"
 
 S="${WORKDIR}/nwn"
+
+GAMES_LICENSE_CHECK="yes"
 dir="${GAMES_PREFIX_OPT}/${PN}"
 Ddir="${D}/${dir}"
 
@@ -68,6 +70,12 @@ die_from_busted_nwn-data() {
 }
 
 pkg_setup() {
+	games_pkg_setup
+	declare -a LANGarray=($LINGUAS)
+	if [ "${#LANGarray[*]}" == "0" ]
+	then
+		einfo "Setting default language to English."
+	fi
 	if use sou
 	then
 		built_with_use games-rpg/nwn-data sou || die_from_busted_nwn-data sou
@@ -96,7 +104,6 @@ pkg_setup() {
 		built_with_use games-rpg/nwn-data linguas_de || \
 			die_from_busted_nwn-data linguas_de
 	fi
-	games_pkg_setup
 }
 
 src_unpack() {
@@ -117,9 +124,10 @@ src_install() {
 		-e "s:GENTOO_USER:${GAMES_USER}:" \
 		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
 		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
-		${FILESDIR}/${P}-fixinstall > ${S}/fixinstall
+		${FILESDIR}/fixinstall > ${S}/fixinstall
+	fperms ug+x ${dir}/fixinstall
 	mv ${S}/* ${Ddir}
-	games_make_wrapper nwn ./nwn ${dir}
+	games_make_wrapper nwn ./nwn "${dir}" "${dir}"
 	make_desktop_entry nwn "Neverwinter Nights"
 	prepgamesdirs
 }
diff --git a/games-rpg/nwn/nwn-1.66.ebuild b/games-rpg/nwn/nwn-1.66.ebuild
index 71b59d09b752..d240ac333f57 100644
--- a/games-rpg/nwn/nwn-1.66.ebuild
+++ b/games-rpg/nwn/nwn-1.66.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/games-rpg/nwn/nwn-1.66.ebuild,v 1.1 2005/09/13 15:33:45 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/nwn/nwn-1.66.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit eutils games
 
@@ -13,20 +13,20 @@ DESCRIPTION="Neverwinter Nights"
 HOMEPAGE="http://nwn.bioware.com/downloads/linuxclient.html"
 SRC_URI="http://nwdownloads.bioware.com/neverwinternights/linux/129/nwclient129.tar.gz
 	linguas_fr? ( ${PATCH_URL_BASE}French${PACKAGE_NAME} ${DIALOG_URL_BASE}/french/NWNFrench${PV}dialog.zip ftp://jeuxlinux.com/bioware/Neverwinter_Nights/nwfrench129.tar.gz )
-	linguas_de? ( ${PATCH_URL_BASE}German${PACKAGE_NAME} ${DIALOG_URL_BASE}/german/NWNGerman${PV}dialog.zip http://xfer06.fileplanet.com/%5E389272944/082003/nwgerman129.tar.gz )
 	linguas_it? ( ${PATCH_URL_BASE}Italian${PACKAGE_NAME} ${DIALOG_URL_BASE}/italian/NWNItalian${PV}dialog.zip http://nwdownloads.bioware.com/neverwinternights/linux/129/nwitalian129.tar.gz )
 	linguas_es? ( ${PATCH_URL_BASE}Spanish${PACKAGE_NAME} ${DIALOG_URL_BASE}/spanish/NWNSpanish${PV}dialog.zip http://nwdownloads.bioware.com/neverwinternights/linux/129/nwspanish129.tar.gz )
+	linguas_de? ( ${PATCH_URL_BASE}German${PACKAGE_NAME} ${DIALOG_URL_BASE}/german/NWNGerman${PV}dialog.zip http://xfer06.fileplanet.com/%5E389272944/082003/nwgerman129.tar.gz )
 	!linguas_de? ( !linguas_fr? ( !linguas_es? ( !linguas_it? (
 		${PATCH_URL_BASE}English${PACKAGE_NAME} ${DIALOG_URL_BASE}/english/NWNEnglish${PV}dialog.zip
 	) ) ) )
 	nowin? ( http://bsd.mikulas.com/nwresources129.tar.gz
-		http://163.22.12.40/FreeBSD/distfiles/nwresources129.tar.gz
-		ftp://jeuxlinux.com/bioware/Neverwinter_Nights/nwresources129.tar.gz )"
+	http://163.22.12.40/FreeBSD/distfiles/nwresources129.tar.gz
+	ftp://jeuxlinux.com/bioware/Neverwinter_Nights/nwresources129.tar.gz )"
 
 LICENSE="NWN-EULA"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nowin" # nocd"
+KEYWORDS="amd64 x86"
+IUSE="nowin"
 RESTRICT="nostrip nomirror"
 
 RDEPEND="virtual/x11
@@ -71,12 +71,10 @@ src_install() {
 		-e "s:GENTOO_USER:${GAMES_USER}:" \
 		-e "s:GENTOO_GROUP:${GAMES_GROUP}:" \
 		-e "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" \
-		${FILESDIR}/${P}-fixinstall > ${WORKDIR}/nwn/fixinstall
+		${FILESDIR}/fixinstall > ${WORKDIR}/nwn/fixinstall
 	mv ${S} ${D}/${GAMES_PREFIX_OPT}
 	doicon ${FILESDIR}/nwn.png
-	#dogamesbin ${FILESDIR}/nwn
-	#dosed "s:GENTOO_DIR:${GAMES_PREFIX_OPT}:" ${GAMES_BINDIR}/nwn
-	games_make_wrapper nwn ./nwn ${dir}
+	games_make_wrapper nwn ./nwn "${dir}" "${dir}"
 	make_desktop_entry nwn "Neverwinter Nights" nwn.png
 	prepgamesdirs
 }
diff --git a/games-rpg/openglad/ChangeLog b/games-rpg/openglad/ChangeLog
index 80bd254b6ba3..91501ff06d91 100644
--- a/games-rpg/openglad/ChangeLog
+++ b/games-rpg/openglad/ChangeLog
@@ -1,9 +1,18 @@
-# ChangeLog for app-games/openglad
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/openglad
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  09 May 2005; David Holm <dholm@gentoo.org> openglad-0.98.ebuild:
+  Added to ~ppc.
+
+  15 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org> openglad-0.98.ebuild:
+  Updated ebuild to use icon file and closing bug #85279.
 
 *openglad-0.98 (01 Aug 2003)
 
+  31 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch from Paul Taylor <birder@ozemail.com.au> to fix compile #35167.
+
   01 Aug 2003; Michael Sterrett <msterret@gentoo.org> openglad-0.98.ebuild:
   initial commit.  ebuild submitted by Rob Cakebread (modified) via bug 24844
 
diff --git a/games-rpg/openglad/Manifest b/games-rpg/openglad/Manifest
index 5dac0e1ea95f..9659112d06aa 100644
--- a/games-rpg/openglad/Manifest
+++ b/games-rpg/openglad/Manifest
@@ -1,3 +1,5 @@
-MD5 605ee4e402049c4264bc644ef2db64dd openglad-0.98.ebuild 872
-MD5 99d2e6aa2c77c34d4a04c097d3d729ad ChangeLog 405
-MD5 98d439dee2392a1f4518ef1b2581baf5 files/digest-openglad-0.98 65
+MD5 3208bfdfde69f640ef15c79a5601aba7 ChangeLog 742
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 96987d17d7080a6f07949a5cf1542350 openglad-0.98.ebuild 1060
+MD5 af773a3d54c961efd0baea7d788c249b files/0.98-gladpack.c.patch 516
+MD5 7b1d4e4756879ee76a905e09f5d454ab files/digest-openglad-0.98 120
diff --git a/games-rpg/openglad/files/digest-openglad-0.98 b/games-rpg/openglad/files/digest-openglad-0.98
index 24ef5b1635db..64abc248c9b8 100644
--- a/games-rpg/openglad/files/digest-openglad-0.98
+++ b/games-rpg/openglad/files/digest-openglad-0.98
@@ -1 +1,2 @@
 MD5 e211c0ba876a75215dd99f7925783ea4 openglad-0.98.tar.gz 724106
+MD5 762bf0c76d50a7e6844bbdbba7864ed7 openglad.png 5593
diff --git a/games-rpg/openglad/metadata.xml b/games-rpg/openglad/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/openglad/metadata.xml
+++ b/games-rpg/openglad/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/openglad/openglad-0.98.ebuild b/games-rpg/openglad/openglad-0.98.ebuild
index 7b799729c811..0b59c43e1e6b 100644
--- a/games-rpg/openglad/openglad-0.98.ebuild
+++ b/games-rpg/openglad/openglad-0.98.ebuild
@@ -1,31 +1,46 @@
-# 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/games-rpg/openglad/openglad-0.98.ebuild,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openglad/openglad-0.98.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="An SDL clone of Gladiator, a classic RPG game"
-HOMEPAGE="http://snowstorm.sf.net/"
-SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz"
+HOMEPAGE="http://snowstorm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/snowstorm/${P}.tar.gz
+	mirror://gentoo/${PN}.png"
+
 LICENSE="GPL-2"
-KEYWORDS="x86"
 SLOT="0"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND=">=media-libs/sdl-mixer-1.2.5
 	>=media-libs/sdl-image-1.2.2
 	>=media-libs/libsdl-1.2.0"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gladpack.c.patch
+}
+
 src_compile() {
-	egamesconf --datadir=/usr/share/games/openglad \
-		--prefix=/usr --bindir=/usr/games/bin || die
+	egamesconf \
+		--prefix=/usr \
+		--bindir="${GAMES_BINDIR}" \
+		--datadir="${GAMES_DATADIR}/${PN}" \
+		 || die
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-
-	rm ${D}${GAMES_DATADIR_BASE}/doc/${PN}/COPYING
-	gzip -9 ${D}${GAMES_DATADIR_BASE}/doc/${PN}/*
+	make install \
+		DESTDIR=${D} \
+		docdir=${D}/usr/share/doc/${PF} \
+		|| die "make install failed"
+	prepalldocs
 	prepgamesdirs
+
+	doicon ${DISTDIR}/${PN}.png
+	make_desktop_entry openglad "OpenGladiator" ${PN}.png
 }
diff --git a/games-rpg/openrpg/ChangeLog b/games-rpg/openrpg/ChangeLog
index 401ca4c6c5b0..919b86b150ae 100644
--- a/games-rpg/openrpg/ChangeLog
+++ b/games-rpg/openrpg/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for app-games/openrpg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/openrpg
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/ChangeLog,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
+
+  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*openrpg-1.6.1-r1 (08 Dec 2004)
+
+  08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  +openrpg-1.6.1-r1.ebuild, -openrpg-1.6.1.ebuild:
+  make src_install static; tidy; clean older broken version (re: bug #73718)
+
+  08 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org> -openrpg-1.4.1.ebuild,
+  -openrpg-1.5.1.ebuild:
+  clean older ebuilds
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> openrpg-1.4.1.ebuild,
+  openrpg-1.5.1.ebuild, openrpg-1.6.1.ebuild:
+  Change wxPython to wxpython.
+
+*openrpg-1.6.1 (17 Jan 2004)
+
+  17 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #38523.
+
+*openrpg-1.5.1 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + fix permission problems in #28010.
 
 *openrpg-1.4.1 (12 Jul 2003)
 
diff --git a/games-rpg/openrpg/Manifest b/games-rpg/openrpg/Manifest
index 83c74f359a36..80dea90becaf 100644
--- a/games-rpg/openrpg/Manifest
+++ b/games-rpg/openrpg/Manifest
@@ -1,5 +1,8 @@
-MD5 4954c611ef9d814c6a8cfd64eb3fc244 ChangeLog 380
-MD5 dd268ce51bac8b1039b934238353e7a1 openrpg-1.4.1.ebuild 856
-MD5 e917ee8484cc0e6eae28278fe45d01bf files/digest-openrpg-1.4.1 65
-MD5 b5baa628a375bb9288906b135e8cb12a files/openrpg 50
-MD5 a20f7099c35fa5a83a28a1e4fc2f0397 files/openrpg-server 57
+MD5 3dc1aa81c0353401dbb78c558e7c1f86 ChangeLog 1214
+MD5 cb7877f6fbec4883a1bc7d783841396e openrpg-1.6.1-r1.ebuild 1920
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 4ff4ff64e01f9f31bc34d647d07df279 files/openrpg 52
+MD5 4857bbf8a73aa2d8996a58b1622fefc4 files/openrpg-server 59
+MD5 6fea28893d2bd6c8d845d04db2183d2c files/digest-openrpg-1.6.1-r1 65
+MD5 a3a877a3127c4ac11108c1a5b92a12d0 files/1.6.1-gentoo-paths.patch 1156
+MD5 a3a877a3127c4ac11108c1a5b92a12d0 files/1.5.1-gentoo-paths.patch 1156
diff --git a/games-rpg/openrpg/files/openrpg b/games-rpg/openrpg/files/openrpg
index 97e711feff2d..1d4da9154943 100644
--- a/games-rpg/openrpg/files/openrpg
+++ b/games-rpg/openrpg/files/openrpg
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd GENTOO_DIR
-exec python start.py ${@}
+exec python start.py "${@}"
diff --git a/games-rpg/openrpg/files/openrpg-server b/games-rpg/openrpg/files/openrpg-server
index 65e76d8d3375..18cf34dc7872 100644
--- a/games-rpg/openrpg/files/openrpg-server
+++ b/games-rpg/openrpg/files/openrpg-server
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd GENTOO_DIR
-exec python start_server.py ${@}
+exec python start_server.py "${@}"
diff --git a/games-rpg/openrpg/metadata.xml b/games-rpg/openrpg/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/openrpg/metadata.xml
+++ b/games-rpg/openrpg/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild b/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild
index 76207a0ffbf6..384aa5676ae3 100644
--- a/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild
+++ b/games-rpg/openrpg/openrpg-1.6.1-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/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild,v 1.1 2004/12/08 09:03:19 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/openrpg/openrpg-1.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
-DEPEND=">=dev-python/wxpython-2.4.0.2
+DEPEND="<dev-python/wxpython-2.5
 	>=dev-lang/python-2.2.2"
 
 S="${WORKDIR}/${PN}1"
diff --git a/games-rpg/pcgen/ChangeLog b/games-rpg/pcgen/ChangeLog
index 346a750c2d5d..f74a4053bda7 100644
--- a/games-rpg/pcgen/ChangeLog
+++ b/games-rpg/pcgen/ChangeLog
@@ -1,6 +1,30 @@
-# ChangeLog for app-games/pcgen
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/pcgen/ChangeLog,v 1.1 2003/09/12 00:52:27 vapier Exp $
+# ChangeLog for games-rpg/pcgen
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/pcgen/ChangeLog,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
+
+*pcgen-5.8.0 (05 Jun 2005)
+
+  05 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> +pcgen-5.8.0.ebuild:
+  version bump - ebuild submitted by Simon Poirier via bug #94748
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> pcgen-5.4.ebuild,
+  pcgen-5.6.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+*pcgen-5.6.0 (05 Apr 2004)
+
+  05 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #40911 by Geoffrey & Keith Constable.
+
+*pcgen-5.4 (28 Oct 2003)
+
+  28 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*pcgen-5.3.9 (18 Sep 2003)
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + perm fix #28829.
 
 *pcgen-5.3.3 (08 Aug 2003)
 
diff --git a/games-rpg/pcgen/Manifest b/games-rpg/pcgen/Manifest
index b3aa48c00a8c..a92324101494 100644
--- a/games-rpg/pcgen/Manifest
+++ b/games-rpg/pcgen/Manifest
@@ -1,5 +1,4 @@
-MD5 681bde17d965aba501b737f796af30e3 pcgen-5.2.ebuild 1273
-MD5 1a0d4e318a978bf2217e33ae2ab65f3c ChangeLog 623
-MD5 c0c753d1e9399ba83cf7fd41914ee08f pcgen-5.3.3.ebuild 1283
-MD5 0b48b8e421147af50877a1b736fc346e files/digest-pcgen-5.2 303
-MD5 79e8d5ecc4bf5c873def7c54a29f24f4 files/digest-pcgen-5.3.3 311
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 a2dbbefc2a598bc281444ae3474da758 pcgen-5.8.0.ebuild 1308
+MD5 ed8ab08e6bca939428c85b08420ad5f2 ChangeLog 1260
+MD5 9bad29bd5fbb14a745235c5a7fce57ac files/digest-pcgen-5.8.0 117
diff --git a/games-rpg/pcgen/files/digest-pcgen-5.8.0 b/games-rpg/pcgen/files/digest-pcgen-5.8.0
index 1b8a628ce9c6..363dad1d3985 100644
--- a/games-rpg/pcgen/files/digest-pcgen-5.8.0
+++ b/games-rpg/pcgen/files/digest-pcgen-5.8.0
@@ -1,3 +1,2 @@
 MD5 1b4736cc746982aa479a49af008ed6dd pcgen580_full.zip 17819739
 MD5 851bf10cceca8c5265d01a59704f8854 skin.zip 724492
-MD5 083d90528ec3692b6ae296b261663dda pdf_new.zip 5027521
diff --git a/games-rpg/pcgen/metadata.xml b/games-rpg/pcgen/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/pcgen/metadata.xml
+++ b/games-rpg/pcgen/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/pcgen/pcgen-5.8.0.ebuild b/games-rpg/pcgen/pcgen-5.8.0.ebuild
index 4e0030aabdfe..83b4d616edb8 100644
--- a/games-rpg/pcgen/pcgen-5.8.0.ebuild
+++ b/games-rpg/pcgen/pcgen-5.8.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/games-rpg/pcgen/pcgen-5.8.0.ebuild,v 1.1 2005/06/05 00:05:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/pcgen/pcgen-5.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
 inherit games
 
diff --git a/games-rpg/planeshift/ChangeLog b/games-rpg/planeshift/ChangeLog
index 67e658d59710..d277bafb8cf7 100644
--- a/games-rpg/planeshift/ChangeLog
+++ b/games-rpg/planeshift/ChangeLog
@@ -1,6 +1,36 @@
-# ChangeLog for app-games/planeshift
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/planeshift/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/planeshift
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/planeshift/ChangeLog,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
+
+*planeshift-0.3.011 (31 Aug 2005)
+
+  31 Aug 2005; Philip Walls <malverian@gentoo.org>
+  -files/planeshift-0.2.010-fix-cast.diff, files/planeshift,
+  files/planeshift-setup, files/planeshift-updater,
+  -planeshift-0.2.010-r1.ebuild, -planeshift-0.3.010.ebuild,
+  +planeshift-0.3.011.ebuild:
+  Version bump
+
+  22 May 2005; Philip Walls <malverian@gentoo.org> files/planeshift
+  files/planeshift-updater +files/planeshift-setup:
+  Added environment variables to wrappers for CEL and CRYSTAL
+  Added script for running planeshift setup utility
+
+*planeshift-0.3.010 (21 May 2005)
+
+  21 May 2005; Philip Walls <malverian@gentoo.org>  planeshift-0.3.010.ebuild:
+  Version bump. Revamped build process some.
+
+  20 Dec 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  planeshift-0.2.010-r1.ebuild:
+  fix curl include - bug #75104
+
+  21 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  planeshift-0.2.010-r1.ebuild:
+  Doesn't like the new cs-config (bug #54659); use sed not dosed
+
+  27 Oct 2003; David Holm <dholm@gentoo.org> planeshift-0.2.010-r1.ebuild:
+  Added to ~ppc.
 
 *planeshift-0.2.010-r1 (10 Jul 2003)
 
diff --git a/games-rpg/planeshift/Manifest b/games-rpg/planeshift/Manifest
index f1204d840d63..c680b91695b9 100644
--- a/games-rpg/planeshift/Manifest
+++ b/games-rpg/planeshift/Manifest
@@ -1,4 +1,17 @@
-MD5 b8b8a31f70400cd54c5b8cfea9af368a files/planeshift 116
-MD5 a6b3c03bb00760172f490ae59e50cd32 files/digest-planeshift-0.2.010-r1 73
-MD5 da6ad4506f7244d14a8de8afa9160eb3 ChangeLog 945
-MD5 c60ef7306ba08421ab93864c3227a0cc planeshift-0.2.010-r1.ebuild 1412
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e95a4cff22b82f67d41788b36eb6f80c ChangeLog 2006
+MD5 ef4af237db8a9c93c7fb476c87e0e9d8 files/digest-planeshift-0.3.011 73
+MD5 c88f36fa5955068c95a8717023d99a87 files/planeshift 305
+MD5 d36ebb08ae2a044431da73cf9af175f2 files/planeshift-setup 290
+MD5 b0529daec0a1a5176bc138c2cb99654d files/planeshift-updater 335
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 22305942b48821e0fe6f83cfdad076d3 planeshift-0.3.011.ebuild 2518
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDaAMCgIKl8Uu19MoRAr5AAJ4vYFHaSGHDINd08qh0urr+hzoVZgCeM4+h
+Y6Hc1OvsEXXP0XAzZ3zCraE=
+=MEaq
+-----END PGP SIGNATURE-----
diff --git a/games-rpg/planeshift/files/planeshift b/games-rpg/planeshift/files/planeshift
index 3f8df5f0e326..79e5b5e8985b 100644
--- a/games-rpg/planeshift/files/planeshift
+++ b/games-rpg/planeshift/files/planeshift
@@ -1,5 +1,15 @@
 #!/bin/sh
-export CRYSTAL=GENTOO_CRYSTAL_DIR
-export CEL=GENTOO_CEL_DIR
-cd GENTOO_PLANESHIFT_DIR
-exec ./psclient ${@}
+
+PLANESHIFT_DIR="/opt/planeshift"
+
+if [ ! -d "$PLANESHIFT_DIR" ]; then
+        echo "Your Planeshift directory is missing. You need to reinstall Planeshift!"
+        exit 1
+fi
+
+cd "$PLANESHIFT_DIR"
+
+export CRYSTAL="/opt/crystal/lib/crystalspace"
+export CEL="/opt/crystal/lib/cel"
+
+./psclient $@
diff --git a/games-rpg/planeshift/files/planeshift-setup b/games-rpg/planeshift/files/planeshift-setup
index 77986604da72..90bc2884eebf 100644
--- a/games-rpg/planeshift/files/planeshift-setup
+++ b/games-rpg/planeshift/files/planeshift-setup
@@ -1,6 +1,13 @@
 #!/bin/sh
 
-cd /opt/planeshift
+PLANESHIFT_DIR="/opt/planeshift"
+
+if [ ! -d "$PLANESHIFT_DIR" ]; then
+	echo "Your Planeshift directory is missing. You need to reinstall Planeshift!"
+	exit 1
+fi
+
+cd "$PLANESHIFT_DIR"
 
 export CRYSTAL="/opt/crystal/lib/crystalspace"
 export CEL="/opt/crystal/lib/cel"
diff --git a/games-rpg/planeshift/files/planeshift-updater b/games-rpg/planeshift/files/planeshift-updater
index fdd2fce7a1dd..401cdd99ba78 100644
--- a/games-rpg/planeshift/files/planeshift-updater
+++ b/games-rpg/planeshift/files/planeshift-updater
@@ -1,5 +1,17 @@
 #!/bin/sh
 
-cd /opt/planeshift
+PLANESHIFT_DIR="/opt/planeshift"
+
+if [ ! -d "$PLANESHIFT_DIR" ]; then
+	echo "Your Planeshift directory is missing. You need to reinstall Planeshift!"
+	exit 1
+fi
+
+cd "$PLANESHIFT_DIR"
+
+export CRYSTAL="/opt/crystal/lib/crystalspace"
+export CEL="/opt/crystal/lib/cel"
 
 ./updater $@
+
+chmod g+rw "$PLANESHIFT_DIR" -R 2>/dev/null
diff --git a/games-rpg/planeshift/metadata.xml b/games-rpg/planeshift/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/planeshift/metadata.xml
+++ b/games-rpg/planeshift/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/planeshift/planeshift-0.3.011.ebuild b/games-rpg/planeshift/planeshift-0.3.011.ebuild
index d535e61413b3..1fb7469a2818 100644
--- a/games-rpg/planeshift/planeshift-0.3.011.ebuild
+++ b/games-rpg/planeshift/planeshift-0.3.011.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/games-rpg/planeshift/planeshift-0.3.011.ebuild,v 1.1 2005/08/31 19:34:16 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/planeshift/planeshift-0.3.011.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
 inherit eutils games debug
 
@@ -11,12 +11,11 @@ SRC_URI="mirror://gentoo/distfiles/${P}.tar.bz2"
 LICENSE="|| ( GPL-2 Planeshift )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="${IUSE}"
+IUSE="debug"
 
 RDEPEND="net-misc/curl
 	>=dev-games/crystalspace-0.99_pre*
 	>=dev-games/cel-0.99_pre*"
-
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
diff --git a/games-rpg/queen/ChangeLog b/games-rpg/queen/ChangeLog
index f2d3accef000..a004e1036860 100644
--- a/games-rpg/queen/ChangeLog
+++ b/games-rpg/queen/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-rpg/queen
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/queen/ChangeLog,v 1.1 2004/03/30 09:38:36 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/queen/ChangeLog,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
+
+  05 Nov 2004; Joseph Jezak <josejx@gentoo.org> queen-0.ebuild:
+  Marked ppc stable.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> queen-0.ebuild:
+  Added ~sparc keyword.
+
+  30 Mar 2004; David Holm <dholm@gentoo.org> queen-0.ebuild:
+  Added to ~ppc.
 
 *queen-0 (30 Mar 2004)
 
diff --git a/games-rpg/queen/Manifest b/games-rpg/queen/Manifest
index e520a528d4a6..49934d72c1ec 100644
--- a/games-rpg/queen/Manifest
+++ b/games-rpg/queen/Manifest
@@ -1,2 +1,4 @@
-MD5 76ee8ece76884d7ed6cfbafa8a68a924 queen-0.ebuild 659
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c070a7b9d9250f8b622087639fcadde0 ChangeLog 637
+MD5 7932156929a8ecdd50db7f437519c0ab queen-0.ebuild 798
 MD5 b9e234c03cc80c7d4d666f4c5942f9ba files/digest-queen-0 63
diff --git a/games-rpg/queen/queen-0.ebuild b/games-rpg/queen/queen-0.ebuild
index 4a96480147cf..f9b5e6548a87 100644
--- a/games-rpg/queen/queen-0.ebuild
+++ b/games-rpg/queen/queen-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/games-rpg/queen/queen-0.ebuild,v 1.1 2004/03/30 09:38:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/queen/queen-0.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
 inherit games
 
@@ -8,14 +8,16 @@ DESCRIPTION="Flight of the Amazon Queen is a 2D point-and-click adventure game s
 HOMEPAGE="http://scummvm.sourceforge.net/"
 SRC_URI="mirror://sourceforge/scummvm/FOTAQ_Talkie.zip"
 
-S="${WORKDIR}/FOTAQ_Talkie"
-
 LICENSE="queen"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
-DEPEND=">=games-engines/scummvm-0.6.0"
+RDEPEND=">=games-engines/scummvm-0.6.0"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/FOTAQ_Talkie"
 
 src_install() {
 	games_make_wrapper queen "scummvm -f -p \"${GAMES_DATADIR}/${PN}\" queen" .
diff --git a/games-rpg/tmw/ChangeLog b/games-rpg/tmw/ChangeLog
index 097e126bcc1f..cf3a550537cc 100644
--- a/games-rpg/tmw/ChangeLog
+++ b/games-rpg/tmw/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for games-rpg/tmw
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.1 2005/05/05 01:09:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
+
+*tmw-0.0.17 (12 Oct 2005)
+
+  12 Oct 2005; Mike Frysinger <vapier@gentoo.org> +tmw-0.0.17.ebuild:
+  Version bump #108865 by Andrej Kacian.
+
+*tmw-0.0.16-r1 (02 Oct 2005)
+
+  02 Oct 2005; Mike Frysinger <vapier@gentoo.org> +tmw-0.0.16-r1.ebuild:
+  Add missing curl DEPEND #106499 by Mauro Iazzi and missing music file
+  #106681 by Matija Suklje (hook).
+
+*tmw-0.0.16 (06 Sep 2005)
+
+  06 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> +tmw-0.0.16.ebuild:
+  version bump (bug #104839)
+
+  24 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org> -tmw-0.0.12.ebuild,
+  -tmw-0.0.13.ebuild, -tmw-0.0.14.ebuild:
+  clean old ebuilds
+
+*tmw-0.0.15 (24 Aug 2005)
+
+  24 Aug 2005; Mike Frysinger <vapier@gentoo.org> +tmw-0.0.15.ebuild:
+  Version bump #101278 by Andy Holmes.
+
+*tmw-0.0.14.1 (09 Jul 2005)
+
+  09 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> +tmw-0.0.14.1.ebuild:
+  version bump (bug #98413)
+
+*tmw-0.0.14 (06 Jul 2005)
+
+  06 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org> +tmw-0.0.14.ebuild:
+  version bump
+
+  15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> tmw-0.0.12.ebuild,
+  tmw-0.0.13.ebuild:
+  Removed INSTALL file.
+
+  08 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org> tmw-0.0.12.ebuild,
+  tmw-0.0.13.ebuild:
+  games_pkg_setup in pkg_setup; fix bug #95483
+
+*tmw-0.0.13 (06 Jun 2005)
+
+  06 Jun 2005; Mike Frysinger <vapier@gentoo.org> +tmw-0.0.13.ebuild:
+  Version bump.
 
 *tmw-0.0.12 (04 May 2005)
 
diff --git a/games-rpg/tmw/Manifest b/games-rpg/tmw/Manifest
index 12556cebf47a..bf036b714e7b 100644
--- a/games-rpg/tmw/Manifest
+++ b/games-rpg/tmw/Manifest
@@ -1,2 +1,7 @@
-MD5 0f6f079df84bbed778c37f4c00156be4 tmw-0.0.12.ebuild 700
-MD5 28ec001a7bdc25f73730cb5e99d2298f files/digest-tmw-0.0.12 63
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 f64825736e53be2ee93876dd3cec6056 tmw-0.0.16-r1.ebuild 1415
+MD5 5fbd471b6adf37768789e9b34f435121 ChangeLog 1730
+MD5 629f3b5d9b44aafc605d5d0489a82985 tmw-0.0.17.ebuild 1435
+MD5 e49ce75b0ee692a5348fa56fbda9648b files/digest-tmw-0.0.17 127
+MD5 a933813e8f649c13b231f99f5639b421 files/digest-tmw-0.0.16-r1 127
+MD5 6e873b44081c25fa618a3bd28d74f86c files/tmw-0.0.12-desktop.patch 757
diff --git a/games-rpg/tmw/tmw-0.0.16-r1.ebuild b/games-rpg/tmw/tmw-0.0.16-r1.ebuild
index b1b79d8934f6..4085b9b36dc0 100644
--- a/games-rpg/tmw/tmw-0.0.16-r1.ebuild
+++ b/games-rpg/tmw/tmw-0.0.16-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/games-rpg/tmw/tmw-0.0.16-r1.ebuild,v 1.1 2005/10/02 08:29:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.16-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit eutils games
 
diff --git a/games-rpg/tmw/tmw-0.0.17.ebuild b/games-rpg/tmw/tmw-0.0.17.ebuild
index e4eeee403ce3..3a43a46cbb58 100644
--- a/games-rpg/tmw/tmw-0.0.17.ebuild
+++ b/games-rpg/tmw/tmw-0.0.17.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/games-rpg/tmw/tmw-0.0.17.ebuild,v 1.1 2005/10/12 23:44:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.17.ebuild,v 1.1.1.1 2005/11/30 10:10:57 chriswhite Exp $
 
 inherit eutils games
 
@@ -20,6 +20,7 @@ DEPEND=">=dev-games/physfs-1.0.0
 	dev-libs/libxml2
 	media-libs/sdl-mixer
 	media-libs/sdl-image
+	media-libs/sdl-net
 	net-misc/curl
 	>=dev-games/guichan-0.4.0"
 
diff --git a/games-rpg/tux_aqfh/ChangeLog b/games-rpg/tux_aqfh/ChangeLog
index 18c1b81bc44e..95a0df031884 100644
--- a/games-rpg/tux_aqfh/ChangeLog
+++ b/games-rpg/tux_aqfh/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for games-rpg/tux_aqfh
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tux_aqfh/ChangeLog,v 1.1 2004/07/16 03:45:35 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tux_aqfh/ChangeLog,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
+
+  16 Nov 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  tux_aqfh-1.0.14.ebuild:
+  don't use autoreconf (bug #12658)
+
+  29 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  tux_aqfh-1.0.14.ebuild:
+  stable for x86; tidy
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> tux_aqfh-1.0.14.ebuild:
+  Added to ~ppc.
 
 *tux_aqfh-1.0.14 (15 Jul 2004)
 
diff --git a/games-rpg/tux_aqfh/Manifest b/games-rpg/tux_aqfh/Manifest
index 673a02f79e6f..2e4c2359f6a4 100644
--- a/games-rpg/tux_aqfh/Manifest
+++ b/games-rpg/tux_aqfh/Manifest
@@ -1,2 +1,5 @@
-MD5 713f37e2bce41c5fbe9d0b97c0cdecfc tux_aqfh-1.0.14.ebuild 1192
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 2eec0eab81ab5cb05b9a3a08de8bf9c0 tux_aqfh-1.0.14.ebuild 844
+MD5 ba5cd403de571d5bc6590cd56dea9b0f ChangeLog 762
 MD5 d7312654531d476da25eb8494cf4c397 files/digest-tux_aqfh-1.0.14 68
+MD5 55e00842bfacd631d3d525bfe36af3ae files/1.0.14-fix-paths.patch 5925
diff --git a/games-rpg/tux_aqfh/tux_aqfh-1.0.14.ebuild b/games-rpg/tux_aqfh/tux_aqfh-1.0.14.ebuild
index ca397b5425b4..45c1d1a268fd 100644
--- a/games-rpg/tux_aqfh/tux_aqfh-1.0.14.ebuild
+++ b/games-rpg/tux_aqfh/tux_aqfh-1.0.14.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/games-rpg/tux_aqfh/tux_aqfh-1.0.14.ebuild,v 1.1 2004/07/16 03:45:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tux_aqfh/tux_aqfh-1.0.14.ebuild,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="A puzzle game starring Tux, the linux penguin"
 HOMEPAGE="http://tuxaqfh.sourceforge.net/"
@@ -10,20 +10,18 @@ SRC_URI="http://tuxaqfh.sourceforge.net/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND=">=media-libs/plib-1.8.0
+DEPEND=">=media-libs/plib-1.8.0
 	virtual/x11
 	virtual/opengl"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-fix-paths.patch
-	autoreconf || die "couldnt autoreconf"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-fix-paths.patch
+	aclocal && autoconf && automake -a -c || die "autotools failed"
 }
 
 src_install() {
diff --git a/games-rpg/twclone/ChangeLog b/games-rpg/twclone/ChangeLog
index 162b19d81575..70220d55b9be 100644
--- a/games-rpg/twclone/ChangeLog
+++ b/games-rpg/twclone/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-rpg/twclone
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/twclone/ChangeLog,v 1.1 2003/10/25 10:21:09 vapier Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/twclone/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
+
+  27 Mar 2004; David Holm <dholm@gentoo.org> twclone-0.14.ebuild:
+  Added to ~ppc.
+
+*twclone-0.14 (26 Mar 2004)
+
+  26 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> twclone-0.14.ebuild:
+  version bump (bug #45310)
 
 *twclone-0.12 (25 Oct 2003)
 
diff --git a/games-rpg/twclone/Manifest b/games-rpg/twclone/Manifest
index 46a59517e0d3..ece05916af10 100644
--- a/games-rpg/twclone/Manifest
+++ b/games-rpg/twclone/Manifest
@@ -1,5 +1,7 @@
+MD5 6b8a98729ab67a7b5a9c929d53871d6b twclone-0.14.ebuild 702
+MD5 334a6f1de08a1b8dc653b679ca27d126 ChangeLog 551
+MD5 6980b005434b3a1b20ff7c94d2a2782b metadata.xml 514
+MD5 b4b01878bfcd44ea9cc06f291ad6b253 twclone-0.12.ebuild 788
 MD5 c3b6734d48a947141b36bf928c84568e files/0.12-glibc-sendmsg.patch 1582
 MD5 cbb92ca565e221232fb5a086a55b7214 files/digest-twclone-0.12 71
-MD5 1f5333eb3ad0d81f05bb5562ca7d4125 ChangeLog 340
-MD5 6980b005434b3a1b20ff7c94d2a2782b metadata.xml 514
-MD5 2919b2796fed3468e6eb861a98be78ff twclone-0.12.ebuild 754
+MD5 e85bc3cfade6d13cc43b56c03e3c7416 files/digest-twclone-0.14 71
diff --git a/games-rpg/twclone/twclone-0.12.ebuild b/games-rpg/twclone/twclone-0.12.ebuild
index e7b55c8af787..919d75721340 100644
--- a/games-rpg/twclone/twclone-0.12.ebuild
+++ b/games-rpg/twclone/twclone-0.12.ebuild
@@ -1,19 +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/games-rpg/twclone/twclone-0.12.ebuild,v 1.1 2003/10/25 10:21:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/twclone/twclone-0.12.ebuild,v 1.1.1.1 2005/11/30 10:11:01 chriswhite Exp $
 
-inherit games
+inherit eutils games
 
-MY_P=${PN}-source-${PV}
+MY_P="${PN}-source-${PV}"
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Clone of BBS Door game Trade Wars 2002"
 HOMEPAGE="http://twclone.sourceforge.net/"
 SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz"
 
+KEYWORDS="x86"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-
-S=${WORKDIR}/${MY_P}
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
@@ -22,7 +22,7 @@ src_unpack() {
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS ChangeLog NEWS PROTOCOL README TODO
 	cd ${D}/${GAMES_BINDIR}
 	for f in * ; do
diff --git a/games-rpg/twclone/twclone-0.14.ebuild b/games-rpg/twclone/twclone-0.14.ebuild
index 571e7c3f0ef9..520b09fb9365 100644
--- a/games-rpg/twclone/twclone-0.14.ebuild
+++ b/games-rpg/twclone/twclone-0.14.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/games-rpg/twclone/twclone-0.14.ebuild,v 1.1 2004/03/26 11:58:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/twclone/twclone-0.14.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 inherit games
 
@@ -10,7 +10,7 @@ DESCRIPTION="Clone of BBS Door game Trade Wars 2002"
 HOMEPAGE="http://twclone.sourceforge.net/"
 SRC_URI="mirror://sourceforge/twclone/${MY_P}.tar.gz"
 
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/games-rpg/vegastrike/ChangeLog b/games-rpg/vegastrike/ChangeLog
index 79592086cb4c..7cbeb34dd521 100644
--- a/games-rpg/vegastrike/ChangeLog
+++ b/games-rpg/vegastrike/ChangeLog
@@ -1,9 +1,33 @@
-# ChangeLog for app-games/vegastrike
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/vegastrike
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/ChangeLog,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
+
+  26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  vegastrike-0.3.1.ebuild:
+  Making games last on inherit line.
+
+  27 May 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  vegastrike-0.4.1.ebuild:
+  error check file io; clean up vsinstall; tidy
+
+  08 May 2004; David Holm <dholm@gentoo.org> +files/0.4.1-endianess.patch,
+  vegastrike-0.4.1.ebuild:
+  Added patch to fix compilation bug. Added to ~ppc.
+
+  23 Nov 2003; Martin Holzer <mholzer@gentoo.org> vegastrike-0.3.1.ebuild,
+  vegastrike-0.4.1.ebuild:
+  adding RESTRICT="nomirror"
+
+*vegastrike-0.4.1 (20 Nov 2003)
+
+  20 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #29419.
 
 *vegastrike-0.3.1 (21 Jun 2003)
 
+  24 Sep 2003; Martin Holzer <mholzer@gentoo.org> vegastrike-0.3.1.ebuild:
+  Added gcc3 patch. Closes #29317
+
   21 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
   Version bump + openal + deprecated GL headers.
   Fixes #18021, #18025, and #16336.
diff --git a/games-rpg/vegastrike/Manifest b/games-rpg/vegastrike/Manifest
index c8be8a242249..73013d329c9b 100644
--- a/games-rpg/vegastrike/Manifest
+++ b/games-rpg/vegastrike/Manifest
@@ -1,4 +1,10 @@
-MD5 a8b6466ea45f94f56345e7ac4a00192e ChangeLog 1023
-MD5 9f1b27010253c7e2ff2b8a5b960fd807 vegastrike-0.3.1.ebuild 2188
+MD5 63af9873a49336d50841c7ed570d3220 vegastrike-0.3.1.ebuild 2276
+MD5 9674b76962e9fc47647af24cc4ceff43 vegastrike-0.4.1.ebuild 3513
+MD5 f623238c2ac9651d199ca609a9f444f5 ChangeLog 1773
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 c7b628bd6c2c0473c3ffc715165b860c files/0.4.1-endianess.patch 922
 MD5 b7121086183c9741c97fe59559fd9177 files/digest-vegastrike-0.3.1 156
+MD5 36b85699310d5fc0373c61ef3cbfa6fa files/digest-vegastrike-0.4.1 82
 MD5 2e620174666c33d1a873ea9f3f68286e files/0.3.1-vsinstall.patch 975
+MD5 54e9b74f6699f40a4b755466838a2250 files/0.4.1-vsinstall.patch 753
+MD5 6106850a49aab787ec7af37878f3518a files/vegastrike-0.3.1-gcc3.patch 3437
diff --git a/games-rpg/vegastrike/metadata.xml b/games-rpg/vegastrike/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/vegastrike/metadata.xml
+++ b/games-rpg/vegastrike/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/vegastrike/vegastrike-0.3.1.ebuild b/games-rpg/vegastrike/vegastrike-0.3.1.ebuild
index 16983a952de9..ed74d7b629e0 100644
--- a/games-rpg/vegastrike/vegastrike-0.3.1.ebuild
+++ b/games-rpg/vegastrike/vegastrike-0.3.1.ebuild
@@ -1,14 +1,15 @@
-# 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/games-rpg/vegastrike/vegastrike-0.3.1.ebuild,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/vegastrike-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
 
-inherit games eutils flag-o-matic
+inherit eutils flag-o-matic games
 
 DATA_VER=0.3-1
 DESCRIPTION="3d OpenGL Action RPG space sim"
 HOMEPAGE="http://vegastrike.sourceforge.net/"
 SRC_URI="mirror://sourceforge/vegastrike/${P}-gcc3.2.src.rpm
 	mirror://sourceforge/vegastrike/${PN}-data-${DATA_VER}.noarch.rpm"
+RESTRICT="nomirror"
 
 SLOT="0"
 LICENSE="GPL-2"
@@ -34,6 +35,9 @@ src_unpack() {
 
 	rpm2targz ${DISTDIR}/${PN}-data-${DATA_VER}.noarch.rpm || die "data rpm2targz failed"
 	tar -zxf ${PN}-data-${DATA_VER}.noarch.tar.gz || die "src tar failed"
+	cd ${WORKDIR}
+	#Fixes gcc3 issue
+	epatch ${FILESDIR}/${P}-gcc3.patch || die
 
 	cd ${S}
 	autoconf || die
diff --git a/games-rpg/vegastrike/vegastrike-0.4.1.ebuild b/games-rpg/vegastrike/vegastrike-0.4.1.ebuild
index b455a85f1007..18f3386b3d9e 100644
--- a/games-rpg/vegastrike/vegastrike-0.4.1.ebuild
+++ b/games-rpg/vegastrike/vegastrike-0.4.1.ebuild
@@ -1,19 +1,21 @@
-# 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/games-rpg/vegastrike/vegastrike-0.4.1.ebuild,v 1.1 2003/11/21 02:44:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/vegastrike/vegastrike-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:10:59 chriswhite Exp $
 
-inherit games eutils flag-o-matic
+inherit flag-o-matic eutils games
 
 DESCRIPTION="A 3D space simulator that allows you to trade and bounty hunt"
 HOMEPAGE="http://vegastrike.sourceforge.net/"
 SRC_URI="mirror://sourceforge/vegastrike/${P}-installer.tar.bz2"
+RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
-IUSE="sdl"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
-RDEPEND="virtual/glu
+RDEPEND="virtual/x11
+	virtual/glu
 	virtual/glut
 	virtual/opengl
 	media-libs/libsdl
@@ -22,25 +24,36 @@ RDEPEND="virtual/glu
 	dev-libs/expat
 	media-libs/openal
 	media-libs/sdl-mixer
-	virtual/x11"
+	=x11-libs/gtk+-1*"
 DEPEND="${RDEPEND}
-	dev-lang/perl"
+	dev-lang/perl
+	>=sys-devel/autoconf-2.58"
 
-S=${WORKDIR}/${P}-installer
+S="${WORKDIR}/${P}-installer"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	for tar in ${P}-{data,source,setup}.tgz ; do
-		tar -zxf ${tar}
+		tar -zxf ${tar} || die "tar ${tar} failed"
 		# save space :)
 		rm ${tar}
 	done
+	epatch "${FILESDIR}/${PV}-endianess.patch"
 
 	# Clean up data dir
 	find data -name CVS -type d -exec rm -rf '{}' \; >&/dev/null
 	find data -name '*~' -type f -exec rm -f '{}' \; >&/dev/null
 
+	# we install this as vsinstall so fix it up here.
+	mv vsfinalize vsinstall
+	epatch "${FILESDIR}/${PV}-vsinstall.patch"
+	sed -i \
+		-e "s!/usr/local/share/vegastrike!${GAMES_DATADIR}/vegastrike!" \
+		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
+		vsinstall \
+		|| die "sed vsinstall failed"
+
 	# Sort out directory references
 	sed -i \
 		-e "s!/usr/local/share/doc!/usr/share/doc!" \
@@ -48,33 +61,41 @@ src_unpack() {
 		-e "s!/usr/games/vegastrike!${GAMES_DATADIR}/vegastrike!" \
 		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
 		-e "s!/usr/local/lib/man!/usr/share/man!" \
-		data/documentation/vegastrike.1
+		data/documentation/vegastrike.1 \
+		|| die "sed data/documentation/vegastrike.1 failed"
+
+	cd ${S}/vegastrike
 	sed -i \
 		-e "s!/usr/games/vegastrike!${GAMES_DATADIR}/vegastrike!" \
 		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
-		vegastrike/launcher/saveinterface.cpp
+		launcher/saveinterface.cpp \
+		|| die "sed launcher/saveinterface.cpp failed"
 	sed -i \
 		"s!/usr/local/share/vegastrike!${GAMES_DATADIR}/vegastrike!" \
-		vegastrike/src/common/common.cpp
+		src/common/common.cpp \
+		|| die "sed src/common/common.cpp failed"
 	sed -i \
 		"s!/usr/share/local/vegastrike!${GAMES_DATADIR}/vegastrike!" \
-		vegastrike/src/filesys.cpp
+		src/filesys.cpp \
+		|| die "sed src/filesys.cpp failed"
 	sed -i \
-		-e "s!/usr/local/games/vegastrike!${GAMES_DATADIR}/vegastrike!" \
-		-e "s!/usr/local/bin!${GAMES_BINDIR}!" \
-		vsfinalize
-
-	cd ${S}/vegastrike
-	sed -i '/^SUBDIRS =/s:tools::' Makefile.am
-	sed -i 's:$(liblowlevel)::' src/networking/Makefile.am
+		-e '/^SUBDIRS =/s:tools::' \
+		Makefile.am \
+		|| die "sed Makefile.am failed"
+	sed -i \
+		-e 's:$(liblowlevel)::' \
+		src/networking/Makefile.am \
+		|| die "sed src/networking/Makefile.am failed"
 	aclocal || die "aclocal failed"
-	WANT_AUTOCONF_2_5=1 autoconf || die "autoconf failed"
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 	automake -a || die "automake failed"
 }
 
 src_compile() {
+	append-flags -DGLX_GLXEXT_LEGACY
+
 	cd ${S}/vegastrike
-	egamesconf || die "econf failed"
+	egamesconf --enable-boost-128 || die "egamesconf failed"
 	emake || die "emake failed"
 
 	cd ${S}/vssetup/src/
@@ -82,18 +103,19 @@ src_compile() {
 }
 
 src_install() {
-	newgamesbin vsfinalize vsinstall
-	newgamesbin vssetup/src/bin/setup vssetup
-	dogamesbin vegastrike/src/vegastrike
-	dogamesbin vegastrike/launcher/vslauncher
-	cp -rf vegastrike/src/networking/soundserver data/
+	dogamesbin \
+		vegastrike/src/vegastrike \
+		vegastrike/launcher/vslauncher \
+		vsinstall \
+		|| die "dogamesbin failed"
+	newgamesbin vssetup/src/bin/setup vssetup || die "newgamesbin failed"
+	cp -rf vegastrike/src/networking/soundserver data/ || die "cp failed"
 
 	doman data/documentation/*.1
 	dodoc data/documentation/*.txt
 
-	dodir ${GAMES_DATADIR}/${PN}
-	cp -r data ${D}/${GAMES_DATADIR}/${PN}/
-
+	dodir "${GAMES_DATADIR}/${PN}"
+	cp -r data/ "${D}/${GAMES_DATADIR}/${PN}/" || die "cp failed (data)"
 	prepgamesdirs
 }
 
diff --git a/games-rpg/wastesedge/ChangeLog b/games-rpg/wastesedge/ChangeLog
index 7e42e49a0d05..ed6c44913135 100644
--- a/games-rpg/wastesedge/ChangeLog
+++ b/games-rpg/wastesedge/ChangeLog
@@ -1,6 +1,37 @@
-# ChangeLog for app-games/wastesedge
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/wastesedge/ChangeLog,v 1.1 2003/09/10 06:26:50 vapier Exp $
+# ChangeLog for games-rpg/wastesedge
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/wastesedge/ChangeLog,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
+
+  06 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  wastesedge-0.3.3-r1.ebuild, wastesedge-0.3.4.ebuild:
+  oggvorbis -> vorbis for bug #94254.
+
+  09 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wastesedge-0.3.4.ebuild:
+  version bump
+
+*wastesedge-0.3.4 (09 Jun 2005)
+
+  09 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wastesedge-0.3.4.ebuild:
+  version bump
+
+*wastesedge-0.3.3-r1 (08 Jun 2005)
+
+  08 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +wastesedge-0.3.3-r1.ebuild:
+  It really wants *exactly adonthell v0.3.3
+
+  14 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  wastesedge-0.3.3.ebuild:
+  add desktop entry for bug #85021; tidy
+
+  10 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  wastesedge-0.3.3.ebuild:
+  error messages
+
+  11 Feb 2004; David Holm <dholm@gentoo.org> wastesedge-0.3.3.ebuild:
+  Added to ~ppc.
 
   12 Jun 2003; <msterret@gentoo.org> wastesedge-0.3.3.ebuild:
   add Header
diff --git a/games-rpg/wastesedge/Manifest b/games-rpg/wastesedge/Manifest
index 6638b56c5874..5e2698994ef5 100644
--- a/games-rpg/wastesedge/Manifest
+++ b/games-rpg/wastesedge/Manifest
@@ -1,3 +1,6 @@
-MD5 2ae86f1a15baad273564b25c3d167d8c ChangeLog 466
-MD5 e15237c09a499d855636d378bfc24fcc wastesedge-0.3.3.ebuild 966
-MD5 68e07fed88cbac21fd1820576f035922 files/digest-wastesedge-0.3.3 70
+MD5 f2b4dfa3ea22578dcda6c3a176dbf875 wastesedge-0.3.3-r1.ebuild 1179
+MD5 17b563fa90085383ff0ca54233673554 wastesedge-0.3.4.ebuild 1184
+MD5 04cbbeeae0418baffec43087207e2345 ChangeLog 1315
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 34382e2ddf7dc20449909b344e0763d0 files/digest-wastesedge-0.3.4 74
+MD5 68e07fed88cbac21fd1820576f035922 files/digest-wastesedge-0.3.3-r1 70
diff --git a/games-rpg/wastesedge/metadata.xml b/games-rpg/wastesedge/metadata.xml
index 1cef6e243af3..d3c2cc926f0b 100644
--- a/games-rpg/wastesedge/metadata.xml
+++ b/games-rpg/wastesedge/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<maintainer>
-<email>games@gentoo.org</email>
-<name>Games Team</name>
-</maintainer>
 </pkgmetadata>
diff --git a/games-rpg/wastesedge/wastesedge-0.3.3-r1.ebuild b/games-rpg/wastesedge/wastesedge-0.3.3-r1.ebuild
index b775265e1151..9d171a1c3b4b 100644
--- a/games-rpg/wastesedge/wastesedge-0.3.3-r1.ebuild
+++ b/games-rpg/wastesedge/wastesedge-0.3.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/games-rpg/wastesedge/wastesedge-0.3.3-r1.ebuild,v 1.1 2005/06/08 06:21:03 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/wastesedge/wastesedge-0.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
 inherit eutils games
 
@@ -11,13 +11,13 @@ SRC_URI="http://savannah.nongnu.org/download/adonthell/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="oggvorbis doc nls"
+IUSE="vorbis doc nls"
 RESTRICT="nouserpriv"
 
 DEPEND="virtual/x11
 	>=media-libs/libsdl-1.1.6
 	>=dev-lang/python-2.0
-	oggvorbis? ( >=media-libs/libvorbis-1.0
+	vorbis? ( >=media-libs/libvorbis-1.0
 		>=media-libs/libogg-1.0 )
 	doc? ( >=app-doc/doxygen-1.2 )
 	~games-rpg/adonthell-${PV}"
diff --git a/games-rpg/wastesedge/wastesedge-0.3.4.ebuild b/games-rpg/wastesedge/wastesedge-0.3.4.ebuild
index 7ebff18fee92..0d49cd9f064e 100644
--- a/games-rpg/wastesedge/wastesedge-0.3.4.ebuild
+++ b/games-rpg/wastesedge/wastesedge-0.3.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/games-rpg/wastesedge/wastesedge-0.3.4.ebuild,v 1.1 2005/06/09 04:35:31 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/wastesedge/wastesedge-0.3.4.ebuild,v 1.1.1.1 2005/11/30 10:10:58 chriswhite Exp $
 
 inherit eutils games
 
@@ -11,13 +11,13 @@ SRC_URI="http://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ppc x86"
-IUSE="oggvorbis doc nls"
+IUSE="vorbis doc nls"
 RESTRICT="nouserpriv"
 
 DEPEND="virtual/x11
 	>=media-libs/libsdl-1.1.6
 	>=dev-lang/python-2.0
-	oggvorbis? ( >=media-libs/libvorbis-1.0
+	vorbis? ( >=media-libs/libvorbis-1.0
 		>=media-libs/libogg-1.0 )
 	doc? ( >=app-doc/doxygen-1.2 )
 	>=games-rpg/adonthell-${PV}"
diff --git a/games-rpg/xu4/ChangeLog b/games-rpg/xu4/ChangeLog
index 76fdc29ac39e..e51d2fcde438 100644
--- a/games-rpg/xu4/ChangeLog
+++ b/games-rpg/xu4/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-rpg/xu4
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.1 2004/06/22 09:05:56 mr_bones_ Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/ChangeLog,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
+
+  22 Oct 2004; Simon Stelling <blubb@gentoo.org> xu4-0.9.ebuild:
+  added ~amd64
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> xu4-0.9.ebuild:
+  Added to ~ppc.
 
 *xu4-0.9 (22 Jun 2004)
 
diff --git a/games-rpg/xu4/Manifest b/games-rpg/xu4/Manifest
index 2935296c4d47..a4cbf5643427 100644
--- a/games-rpg/xu4/Manifest
+++ b/games-rpg/xu4/Manifest
@@ -1,2 +1,5 @@
-MD5 36b6ed44b8a2de436da5e568c8802249 xu4-0.9.ebuild 1170
+MD5 891a7a116b3e1c3395e757502ca21451 ChangeLog 548
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 334a18319a0cee66357d2f76fa8a3eb2 xu4-0.9.ebuild 1773
+MD5 c8204dbb0ebe1821538ef2ff0fc4fb00 files/0.9-savegame.patch 1861
 MD5 6c0078d6a0b637f6fb6a862894f9734b files/digest-xu4-0.9 177
diff --git a/games-rpg/xu4/xu4-0.9.ebuild b/games-rpg/xu4/xu4-0.9.ebuild
index f774abec53bf..39712680ac04 100644
--- a/games-rpg/xu4/xu4-0.9.ebuild
+++ b/games-rpg/xu4/xu4-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/games-rpg/xu4/xu4-0.9.ebuild,v 1.1 2004/06/22 09:05:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/xu4/xu4-0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:00 chriswhite Exp $
 
 inherit eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xu4/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 RDEPEND="dev-libs/libxml2
diff --git a/kde-base/akode/ChangeLog b/kde-base/akode/ChangeLog
index 44c3a0c3bd8a..f218ceb8509f 100644
--- a/kde-base/akode/ChangeLog
+++ b/kde-base/akode/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/akode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/ChangeLog,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> akode-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> akode-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> akode-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+  06 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> akode-3.4.3.ebuild:
+  Fix compilation without arts (#109579).
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> akode-3.4.3.ebuild:
+  Added missing dep on kdemultimedia-arts and KMCOPYLIB instructions for
+  USE=arts.
+
+*akode-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +akode-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -akode-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*akode-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +akode-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*akode-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +akode-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> akode-3.4.2.ebuild:
+  ~alpha keyword.
+
+*akode-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +akode-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> akode-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> akode-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> akode-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*akode-3.4.1-r1 (10 Jun 2005)
+
+  10 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.4.1-akode-hang.patch, +akode-3.4.1-r1.ebuild:
+  Fix regression: juk hangs with akode engine (#95022).
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org> akode-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592), 'mad' into 'mp3' (#94045).
+
+*akode-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +akode-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> akode-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> akode-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> akode-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> akode-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> akode-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*akode-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +akode-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  06 Feb 2005; Carsten Lohrke <carlo@gentoo.org> akode-3.4.0_beta2.ebuild:
+  media-sound/jack != media-sound/jack-audio-connection-kit
+
+*akode-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +akode-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *akode-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/akode/Manifest b/kde-base/akode/Manifest
index d98478d0c71c..1d5db30ff895 100644
--- a/kde-base/akode/Manifest
+++ b/kde-base/akode/Manifest
@@ -1,4 +1,21 @@
-MD5 6b5e567dd56873891ab04d518d53c760 akode-3.4.0_beta1.ebuild 659
-MD5 6b5e567dd56873891ab04d518d53c760 akode-3.4.0_alpha1.ebuild 659
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-akode-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-akode-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f9f3990dab7b1c2c5a4947818b7f41c7 ChangeLog 3668
+MD5 a443791437dd7163afdf38c26b27cf46 akode-3.4.1-r1.ebuild 1239
+MD5 ea2902384b1afd69066f6a3f6d30c5a9 akode-3.4.1.ebuild 1118
+MD5 4119db129be52ce806e5f589476ec15c akode-3.4.2.ebuild 1123
+MD5 660b5ff9dbbf941ff5a189eca8849e5d akode-3.4.3.ebuild 1307
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-akode-3.4.1 227
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-akode-3.4.1-r1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-akode-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-akode-3.4.3 73
+MD5 0ed594ab9238b688fca70c1959d3932e files/kdemultimedia-3.4.1-akode-hang.patch 653
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmpXntT9W3vfTuoRAkn/AJ9AixOpYNNApDU3cAjbpVLNXEpyEQCfRXz2
+hiepwEOw/3S+PqZIQeUGqxg=
+=x4If
+-----END PGP SIGNATURE-----
diff --git a/kde-base/akode/akode-3.4.1-r1.ebuild b/kde-base/akode/akode-3.4.1-r1.ebuild
index 1f0e74ecbcee..2fa0dfdca65b 100644
--- a/kde-base/akode/akode-3.4.1-r1.ebuild
+++ b/kde-base/akode/akode-3.4.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/kde-base/akode/akode-3.4.1-r1.ebuild,v 1.1 2005/06/10 14:55:25 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/akode-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="aRts plugins for various formats"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="alsa arts flac jack mp3 speex vorbis"
 DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	flac? ( media-libs/flac )
diff --git a/kde-base/akode/akode-3.4.1.ebuild b/kde-base/akode/akode-3.4.1.ebuild
index 497118c113ff..8fa577ed0265 100644
--- a/kde-base/akode/akode-3.4.1.ebuild
+++ b/kde-base/akode/akode-3.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/kde-base/akode/akode-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/akode-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,15 +8,15 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="aRts plugins for various formats"
-KEYWORDS="~x86 ~amd64"
-IUSE="flac oggvorbis speex mad arts alsa jack"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+IUSE="alsa arts flac jack mp3 speex vorbis"
 DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	flac? ( media-libs/flac )
-	oggvorbis? ( media-sound/vorbis-tools )
+	vorbis? ( media-sound/vorbis-tools )
 	speex? ( media-libs/speex )
 	!=media-libs/speex-1.1.4
 	media-libs/libsamplerate
-	mad? ( media-libs/libmad )
+	mp3? ( media-libs/libmad )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( media-sound/jack-audio-connection-kit )"
 
@@ -25,8 +25,8 @@ DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 
 src_compile() {
 	use speex && myconf="$myconf --with-extra-includes=/usr/include/speex"
-	myconf="$myconf $(use_with mad libmad) $(use_with flac) $(use_with speex)
-			$(use_with alsa) $(use_with jack) $(use_with oggvorbis vorbis)"
+	myconf="$myconf $(use_with mp3 libmad) $(use_with flac) $(use_with speex)
+			$(use_with alsa) $(use_with jack) $(use_with vorbis)"
 
 	kde-meta_src_compile
 }
diff --git a/kde-base/akode/akode-3.4.2.ebuild b/kde-base/akode/akode-3.4.2.ebuild
index 790ea9798771..eebe49c0256e 100644
--- a/kde-base/akode/akode-3.4.2.ebuild
+++ b/kde-base/akode/akode-3.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/kde-base/akode/akode-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/akode-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="aRts plugins for various formats"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa arts flac jack mp3 speex vorbis"
 DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	flac? ( media-libs/flac )
diff --git a/kde-base/akode/akode-3.4.3.ebuild b/kde-base/akode/akode-3.4.3.ebuild
index 842d2034768e..f38fdb777a7f 100644
--- a/kde-base/akode/akode-3.4.3.ebuild
+++ b/kde-base/akode/akode-3.4.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/kde-base/akode/akode-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akode/akode-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,9 +8,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="aRts plugins for various formats"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="alsa arts flac jack mp3 speex vorbis"
-DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
+DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) $(deprange 3.4.1 $MAXKDEVER kde-base/kdemultimedia-arts) )
 	flac? ( media-libs/flac )
 	vorbis? ( media-sound/vorbis-tools )
 	speex? ( media-libs/speex )
@@ -23,6 +23,15 @@ DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 # MISSING: polypaudio - no gentoo ebuild as yet
 # TODO: configure needs a pkg-config file for media-sound/jack to detect it
 
+src_unpack() {
+	if use arts; then
+		KMCOPYLIB="${KMCOPYLIB}
+		           libartsbuilder arts/runtime"
+	fi
+
+	kde-meta_src_unpack
+}
+
 src_compile() {
 	use speex && myconf="$myconf --with-extra-includes=/usr/include/speex"
 	myconf="$myconf $(use_with mp3 libmad) $(use_with flac) $(use_with speex)
diff --git a/kde-base/akode/files/digest-akode-3.4.1 b/kde-base/akode/files/digest-akode-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/akode/files/digest-akode-3.4.1
+++ b/kde-base/akode/files/digest-akode-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/akode/files/digest-akode-3.4.2 b/kde-base/akode/files/digest-akode-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/akode/files/digest-akode-3.4.2
+++ b/kde-base/akode/files/digest-akode-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/akode/metadata.xml b/kde-base/akode/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/akode/metadata.xml
+++ b/kde-base/akode/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 72dab882a6ca..df6494724f54 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,127 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> akregator-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  akregator-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*akregator-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*akregator-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> akregator-3.5_beta1.ebuild,
+  akregator-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*akregator-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.5.0_beta2.ebuild:
+  New version.
+
+*akregator-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.4.3.ebuild:
+  New version.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> akregator-3.4.2.ebuild,
+  akregator-3.5_beta1.ebuild:
+  Mark 3.5_beta1 3.4.2 ~alpha #104849
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -akregator-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*akregator-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +akregator-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*akregator-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +akregator-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*akregator-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> akregator-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Dan Armak <danarmak@gentoo.org> akregator-3.4.0-r1.ebuild:
+  Removed blocking dep on the old net-www/akregator package, which has been
+  removed from the tree and has a move instruction to this package.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> akregator-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*akregator-3.4.1-r1 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.1-akregator-unread.patch, +akregator-3.4.1-r1.ebuild:
+  Fix regression (#95455).
+
+*akregator-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> akregator-3.4.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> akregator-3.4.0-r1.ebuild:
+  Added ~sparc keyword.
+
+*akregator-3.4.0-r1 (24 Mar 2005)
+
+  24 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.0-akregator-fix.patch, +akregator-3.4.0-r1.ebuild,
+  -akregator-3.4.0.ebuild:
+  Add patch to avoid akregator messing with the archive (#86477).
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> akregator-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> akregator-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  akregator-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*akregator-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +akregator-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*akregator-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +akregator-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  18 Jan 2005; Dan Armak <danarmak@gentoo.org> :
+  Build the kontact plugin as well. Fixes 78516.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> akregator-3.4.0_beta1.ebuild:
+  Added missing dep on libkdeipm. Closes bug #78123.
 
 *akregator-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/akregator/Manifest b/kde-base/akregator/Manifest
index 276511faea66..2b53ddc05d26 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,2 +1,19 @@
-MD5 75411f7a630553bf16f628ab055665e9 akregator-3.4.0_beta1.ebuild 258
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-akregator-3.4.0_beta1 213
+MD5 920283938dbc7ad7ee55f3341aa22d17 ChangeLog 4384
+MD5 a95ef484dfcc546853d046a83850553a akregator-3.4.1-r1.ebuild 787
+MD5 cbea42aea3668a2227f03e0599b96f8b akregator-3.4.1.ebuild 665
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 a67a5c3d2ab0343738089e25c1ec196c akregator-3.4.2.ebuild 672
+MD5 74781ae4d5f44a35b457f387a728748e akregator-3.5_beta1.ebuild 656
+MD5 c6a374ae0ad613a43dbfab89e73e11f4 akregator-3.4.3.ebuild 669
+MD5 7702916be02493f39834e1d3f2dfffbb akregator-3.5.0_beta2.ebuild 658
+MD5 db42322d7be2c0e30fb992dc650a4bc2 akregator-3.5.0_rc1.ebuild 657
+MD5 d994b5d5070a45a3400ea28c7391568b akregator-3.5.0.ebuild 653
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-akregator-3.4.1 208
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-akregator-3.4.1-r1 208
+MD5 b6a29865e7aefe8e3858bd65de651d3d files/kdepim-3.4.1-akregator-unread.patch 673
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-akregator-3.4.2 282
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-akregator-3.5_beta1 68
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-akregator-3.4.3 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-akregator-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-akregator-3.5.0_rc1 294
+MD5 d39afb82a428db364187e1039af79947 files/digest-akregator-3.5.0 67
diff --git a/kde-base/akregator/akregator-3.4.1-r1.ebuild b/kde-base/akregator/akregator-3.4.1-r1.ebuild
index 5a9dc3b9b0ea..e3cb93e3c4c7 100644
--- a/kde-base/akregator/akregator-3.4.1-r1.ebuild
+++ b/kde-base/akregator/akregator-3.4.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/kde-base/akregator/akregator-3.4.1-r1.ebuild,v 1.1 2005/06/08 22:01:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 ~sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
diff --git a/kde-base/akregator/akregator-3.4.1.ebuild b/kde-base/akregator/akregator-3.4.1.ebuild
index aa7a7830cff6..e4ad75ba3631 100644
--- a/kde-base/akregator/akregator-3.4.1.ebuild
+++ b/kde-base/akregator/akregator-3.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/kde-base/akregator/akregator-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
diff --git a/kde-base/akregator/akregator-3.4.2.ebuild b/kde-base/akregator/akregator-3.4.2.ebuild
index e0ea654d9a9d..3470d07dd1e7 100644
--- a/kde-base/akregator/akregator-3.4.2.ebuild
+++ b/kde-base/akregator/akregator-3.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/kde-base/akregator/akregator-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
diff --git a/kde-base/akregator/akregator-3.4.3.ebuild b/kde-base/akregator/akregator-3.4.3.ebuild
index 8e13af6ecdd4..2e3f1fbf31bf 100644
--- a/kde-base/akregator/akregator-3.4.3.ebuild
+++ b/kde-base/akregator/akregator-3.4.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/kde-base/akregator/akregator-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
diff --git a/kde-base/akregator/akregator-3.5.0.ebuild b/kde-base/akregator/akregator-3.5.0.ebuild
index d92750ba7e84..f15600cbf3af 100644
--- a/kde-base/akregator/akregator-3.5.0.ebuild
+++ b/kde-base/akregator/akregator-3.5.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/kde-base/akregator/akregator-3.5.0.ebuild,v 1.1 2005/11/22 22:13:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/akregator/akregator-3.5.0_beta2.ebuild b/kde-base/akregator/akregator-3.5.0_beta2.ebuild
index 8c6e3214ac4b..0d61fb9772ab 100644
--- a/kde-base/akregator/akregator-3.5.0_beta2.ebuild
+++ b/kde-base/akregator/akregator-3.5.0_beta2.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/kde-base/akregator/akregator-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:47 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
-KEYWORDS="~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
diff --git a/kde-base/akregator/akregator-3.5.0_rc1.ebuild b/kde-base/akregator/akregator-3.5.0_rc1.ebuild
index 265080f336c2..33e8bfe881a4 100644
--- a/kde-base/akregator/akregator-3.5.0_rc1.ebuild
+++ b/kde-base/akregator/akregator-3.5.0_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/kde-base/akregator/akregator-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/akregator/akregator-3.5_beta1.ebuild b/kde-base/akregator/akregator-3.5_beta1.ebuild
index 838d98f1d232..962cfd3e95fe 100644
--- a/kde-base/akregator/akregator-3.5_beta1.ebuild
+++ b/kde-base/akregator/akregator-3.5_beta1.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/kde-base/akregator/akregator-3.5_beta1.ebuild,v 1.1 2005/09/22 17:14:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE news feed aggregator"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kontact)
diff --git a/kde-base/akregator/files/digest-akregator-3.4.1 b/kde-base/akregator/files/digest-akregator-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/akregator/files/digest-akregator-3.4.1
+++ b/kde-base/akregator/files/digest-akregator-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/akregator/files/digest-akregator-3.4.2 b/kde-base/akregator/files/digest-akregator-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/akregator/files/digest-akregator-3.4.2
+++ b/kde-base/akregator/files/digest-akregator-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/akregator/metadata.xml b/kde-base/akregator/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/akregator/metadata.xml
+++ b/kde-base/akregator/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/amor/ChangeLog b/kde-base/amor/ChangeLog
index 5e8fb4c2a537..7002ccb03559 100644
--- a/kde-base/amor/ChangeLog
+++ b/kde-base/amor/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/amor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/ChangeLog,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> amor-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> amor-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> amor-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*amor-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +amor-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*amor-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +amor-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> amor-3.5_beta1.ebuild,
+  amor-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*amor-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +amor-3.5.0_beta2.ebuild:
+  New version.
+
+*amor-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +amor-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -amor-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*amor-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +amor-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*amor-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +amor-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> amor-3.4.2.ebuild:
+  ~alpha keyword.
+
+*amor-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +amor-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> amor-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> amor-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> amor-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*amor-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +amor-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> amor-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> amor-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> amor-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> amor-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> amor-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*amor-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +amor-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*amor-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +amor-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *amor-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/amor/Manifest b/kde-base/amor/Manifest
index ed939aed0359..7a47de9ae275 100644
--- a/kde-base/amor/Manifest
+++ b/kde-base/amor/Manifest
@@ -1,4 +1,26 @@
-MD5 81559d6a7fff0bc807b2789437026a36 amor-3.4.0_alpha1.ebuild 305
-MD5 81559d6a7fff0bc807b2789437026a36 amor-3.4.0_beta1.ebuild 305
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-amor-3.4.0_alpha1 68
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-amor-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 777c9fed5cf1ffded7e186e465396acb ChangeLog 3430
+MD5 c57f7f0ff2462b21a8a24bb032d5a1dc amor-3.4.1.ebuild 418
+MD5 0cebbee54eae2aa68b5e47ece192019f amor-3.4.2.ebuild 431
+MD5 73a741f1103feed08722b81d25e29199 amor-3.4.3.ebuild 428
+MD5 fcb32001de1a5a9d67aa8d2608a51dba amor-3.5.0.ebuild 407
+MD5 7479fd3f66e9ccc74c05261de3cfb419 amor-3.5.0_beta2.ebuild 412
+MD5 0538954fda8ea73934dabdf68c2207ba amor-3.5.0_rc1.ebuild 411
+MD5 83efccddd6545a5adb9866d4c4730a4a amor-3.5_beta1.ebuild 410
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-amor-3.4.1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-amor-3.4.2 282
+MD5 4792409083f3033f880840748c1ec31a files/digest-amor-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-amor-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-amor-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-amor-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-amor-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvf1ntT9W3vfTuoRAqeAAKCpO5ooqhJm/ZYO8LijrIZMh1F3AACgruUI
+aEV8IXWEShOh+4KasyVRctA=
+=7hPF
+-----END PGP SIGNATURE-----
diff --git a/kde-base/amor/amor-3.4.1.ebuild b/kde-base/amor/amor-3.4.1.ebuild
index 38e0d9ef2dce..6c9731770489 100644
--- a/kde-base/amor/amor-3.4.1.ebuild
+++ b/kde-base/amor/amor-3.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/kde-base/amor/amor-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/amor/amor-3.4.2.ebuild b/kde-base/amor/amor-3.4.2.ebuild
index 00eb70bcf474..fd6c652f8ed7 100644
--- a/kde-base/amor/amor-3.4.2.ebuild
+++ b/kde-base/amor/amor-3.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/kde-base/amor/amor-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/amor/amor-3.4.3.ebuild b/kde-base/amor/amor-3.4.3.ebuild
index f773d6568284..21a01375ab05 100644
--- a/kde-base/amor/amor-3.4.3.ebuild
+++ b/kde-base/amor/amor-3.4.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/kde-base/amor/amor-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND=""
\ No newline at end of file
+DEPEND=""
diff --git a/kde-base/amor/amor-3.5.0.ebuild b/kde-base/amor/amor-3.5.0.ebuild
index 7a08e46c7dd7..64af59594312 100644
--- a/kde-base/amor/amor-3.5.0.ebuild
+++ b/kde-base/amor/amor-3.5.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/kde-base/amor/amor-3.5.0.ebuild,v 1.1 2005/11/22 22:13:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/amor/amor-3.5.0_beta2.ebuild b/kde-base/amor/amor-3.5.0_beta2.ebuild
index ca3231ad199f..9741fdaca0a1 100644
--- a/kde-base/amor/amor-3.5.0_beta2.ebuild
+++ b/kde-base/amor/amor-3.5.0_beta2.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/kde-base/amor/amor-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/amor/amor-3.5.0_rc1.ebuild b/kde-base/amor/amor-3.5.0_rc1.ebuild
index 08983295329e..b836a27f3078 100644
--- a/kde-base/amor/amor-3.5.0_rc1.ebuild
+++ b/kde-base/amor/amor-3.5.0_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/kde-base/amor/amor-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/amor/amor-3.5_beta1.ebuild b/kde-base/amor/amor-3.5_beta1.ebuild
index 0cd70f309743..875d675986cb 100644
--- a/kde-base/amor/amor-3.5_beta1.ebuild
+++ b/kde-base/amor/amor-3.5_beta1.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/kde-base/amor/amor-3.5_beta1.ebuild,v 1.1 2005/09/22 17:22:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/amor/amor-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Amusing Misuse Of Resources - desktop-dwelling creature"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/amor/files/digest-amor-3.4.1 b/kde-base/amor/files/digest-amor-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/amor/files/digest-amor-3.4.1
+++ b/kde-base/amor/files/digest-amor-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/amor/files/digest-amor-3.4.2 b/kde-base/amor/files/digest-amor-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/amor/files/digest-amor-3.4.2
+++ b/kde-base/amor/files/digest-amor-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/amor/metadata.xml b/kde-base/amor/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/amor/metadata.xml
+++ b/kde-base/amor/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ark/ChangeLog b/kde-base/ark/ChangeLog
index 39f21fabfe23..7d9e6bd0689f 100644
--- a/kde-base/ark/ChangeLog
+++ b/kde-base/ark/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for kde-base/ark
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ChangeLog,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ark-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ark-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ark-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*ark-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ark-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ark-3.5_beta1.ebuild,
+  ark-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ark-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ark-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -ark-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ark-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ark-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ark-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ark-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ark-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ark-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ark-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ark-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ark-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ark-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ark-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ark-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ark-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ark-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ark-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ark-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ark-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ark-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ark-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ark-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ark-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ark-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ark/Manifest b/kde-base/ark/Manifest
index b7f00349aef2..4c207197f26d 100644
--- a/kde-base/ark/Manifest
+++ b/kde-base/ark/Manifest
@@ -1,4 +1,22 @@
-MD5 757b7d832a20d97f63901138670ea5cb ark-3.4.0_alpha1.ebuild 255
-MD5 757b7d832a20d97f63901138670ea5cb ark-3.4.0_beta1.ebuild 255
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-ark-3.4.0_beta1 216
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-ark-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6f8bf2eb1dc47347ad136e0806dae0a0 ChangeLog 3142
+MD5 885a22e569066d08670d8cf7b4233698 ark-3.4.1.ebuild 366
+MD5 88213da9e3018afbad59deca37cc734d ark-3.4.2.ebuild 377
+MD5 03af3102f1e0d6416b2233e5854efc61 ark-3.5.0.ebuild 355
+MD5 6432842f22cea7f1a69f662f8eca9c85 ark-3.5.0_beta2.ebuild 367
+MD5 6d930f4b67ce2410b1e1b10aa0225352 ark-3.5_beta1.ebuild 358
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-ark-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-ark-3.4.2 288
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-ark-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-ark-3.5.0_beta2 216
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-ark-3.5_beta1 69
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvrYntT9W3vfTuoRAihnAJ49bivAILZS/NjAkMrd2NimaqnLKwCgpjTE
+JJwDMZYtPrghSoKKQvr0C8o=
+=wME6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ark/ark-3.4.1.ebuild b/kde-base/ark/ark-3.4.1.ebuild
index e5d416fa38c7..65eff79af9b6 100644
--- a/kde-base/ark/ark-3.4.1.ebuild
+++ b/kde-base/ark/ark-3.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/kde-base/ark/ark-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/ark/ark-3.4.2.ebuild b/kde-base/ark/ark-3.4.2.ebuild
index 5e7b9af2e06d..61ad150beac8 100644
--- a/kde-base/ark/ark-3.4.2.ebuild
+++ b/kde-base/ark/ark-3.4.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/kde-base/ark/ark-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/ark/ark-3.5.0.ebuild b/kde-base/ark/ark-3.5.0.ebuild
index b6d594d82c9c..0590b6abe2fd 100644
--- a/kde-base/ark/ark-3.5.0.ebuild
+++ b/kde-base/ark/ark-3.5.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/kde-base/ark/ark-3.5.0.ebuild,v 1.1 2005/11/22 22:13:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/ark/ark-3.5.0_beta2.ebuild b/kde-base/ark/ark-3.5.0_beta2.ebuild
index 1cad83c502b3..577ea61edebc 100644
--- a/kde-base/ark/ark-3.5.0_beta2.ebuild
+++ b/kde-base/ark/ark-3.5.0_beta2.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/kde-base/ark/ark-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/ark/ark-3.5_beta1.ebuild b/kde-base/ark/ark-3.5_beta1.ebuild
index 4a46751cbd9a..e1d5982d366c 100644
--- a/kde-base/ark/ark-3.5_beta1.ebuild
+++ b/kde-base/ark/ark-3.5_beta1.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/kde-base/ark/ark-3.5_beta1.ebuild,v 1.1 2005/09/22 17:25:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ark/ark-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Archiving tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/ark/files/digest-ark-3.4.1 b/kde-base/ark/files/digest-ark-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/ark/files/digest-ark-3.4.1
+++ b/kde-base/ark/files/digest-ark-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/ark/files/digest-ark-3.4.2 b/kde-base/ark/files/digest-ark-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/ark/files/digest-ark-3.4.2
+++ b/kde-base/ark/files/digest-ark-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/ark/metadata.xml b/kde-base/ark/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ark/metadata.xml
+++ b/kde-base/ark/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/arts/ChangeLog b/kde-base/arts/ChangeLog
index 25347583b848..8614f6ef1b5e 100644
--- a/kde-base/arts/ChangeLog
+++ b/kde-base/arts/ChangeLog
@@ -1,8 +1,747 @@
 # ChangeLog for kde-base/arts
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.1 2002/04/04 20:09:22 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/ChangeLog,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
-*arts-3.0 (4 Apr 2002)
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> arts-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> arts-3.4.3.ebuild:
+  Stable on ppc64
+
+*arts-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +arts-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> arts-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+  13 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> arts-3.5.0_rc1.ebuild:
+  Use an alternative to alsa-1.4-mcopidl, testing the flags supported for
+  disabling stack protector. This allows to build arts with vanilla GCC and
+  GCC 4.1 (and non-GCC too, probably).
+
+*arts-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +arts-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+*arts-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +arts-3.5.0_beta2.ebuild:
+  New version.
+
+*arts-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +arts-3.4.3.ebuild:
+  New version.
+
+*arts-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-3.4.3.ebuild:
+  New version.
+
+*arts-3.5_beta1-r1 (25 Sep 2005)
+
+  25 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -arts-3.5_beta1.ebuild,
+  +arts-3.5_beta1-r1.ebuild:
+  Make patches non-conditional, drop hardened useflag. Revbump to force
+  rebuilding this without visibility enabled, or it crashes badly when using
+  qt 3.3.5.
+
+*arts-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-3.5_beta1.ebuild:
+  New version.
+
+  18 Sep 2005; Caleb Tennis <caleb@gentoo.org> arts-3.4.1-r2.ebuild,
+  arts-3.4.2.ebuild, arts-3.5_alpha1.ebuild:
+  Change jack dep to >= 0.90
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> arts-3.4.1-r2.ebuild:
+  Mark 3.4.1-r2 stable on alpha
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> arts-3.4.1-r2.ebuild:
+  stable on ia64
+
+*arts-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  29 Jul 2005; Dan Armak <danarmak@gentoo.org> arts-3.4.2.ebuild:
+  Apply the cpu overload patch in 3.4.2 too.
+
+*arts-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-3.4.2.ebuild:
+  New version. Add support for nas (#97030).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> arts-3.4.1-r2.ebuild:
+  Stable on hppa.
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> arts-1.2.3.ebuild,
+  arts-1.3.2.ebuild, arts-1.3.2-r1.ebuild, arts-3.4.0.ebuild,
+  arts-3.4.1.ebuild, arts-3.4.1-r1.ebuild, arts-3.4.1-r2.ebuild:
+  Change qt dep per bug #100235
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> arts-3.4.1-r2.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> arts-3.4.1-r2.ebuild:
+  Add ~alpha keyword.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> arts-3.4.1.ebuild,
+  arts-3.4.1-r1.ebuild, arts-3.4.1-r2.ebuild:
+  3.4.1-r2 stable on ppc64; removed dublicate keywords.. however they got in
+  there..
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> arts-3.4.1-r2.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> arts-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> arts-3.4.1.ebuild,
+  arts-3.4.1-r1.ebuild:
+  Marked ppc stable for bug #97544.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> arts-1.3.2-r1.ebuild:
+  Stable on alpha.
+
+*arts-3.4.1-r2 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/arts-3.4.1-cpu-overload.patch, +arts-3.4.1-r2.ebuild:
+  Add patch to fix amd64 cpu overload (#95356).
+
+*arts-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/arts-3.4.1-configure.patch, +arts-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966, #74121). Better support for
+  amd64 multilib (#94872).
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org> arts-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592), 'mad' into 'mp3' (#94045).
+
+*arts-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +arts-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  19 May 2005; Guy Martin <gmsoft@gentoo.org> arts-1.3.2-r1.ebuild:
+  Stable on hppa.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> arts-3.4.0.ebuild:
+  add ~ia64
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> arts-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  21 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> arts-1.3.2-r1.ebuild:
+  Stable on ppc.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> arts-1.3.2-r1.ebuild:
+  Stable on ppc64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> arts-1.3.2-r1.ebuild:
+  stable on amd64
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> arts-1.3.2-r1.ebuild:
+  Stable on SPARC.
+
+  25 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> arts-1.3.2-r1.ebuild:
+  Stable on x86.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> arts-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Jason Wever <weeve@gentoo.org> arts-3.4.0.ebuild:
+  Added ~sparc keyword as it was mistakenly dropped in the version bump.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> arts-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> arts-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> arts-3.4.0_rc1.ebuild:
+  Marked ~amd64.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  27 Feb 2005; Jason Wever <weeve@gentoo.org> arts-3.4.0_rc1.ebuild:
+  Added ~sparc keyword as it was dropped in the version bump.
+
+*arts-3.4.0_rc1 (26 Feb 2005)
+
+  26 Feb 2005; Dan Armak <danarmak@gentoo.org> +arts-3.4.0_rc1.ebuild:
+  Arts 3.4.0_rc1 (not yet released, and masked).
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> arts-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  08 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -files/arts-1.2.2-buffer.patch, -arts-1.2.0.ebuild, -arts-1.2.2.ebuild,
+  arts-1.2.3.ebuild, -arts-1.3.0.ebuild:
+  Remove old ebuilds.
+
+*arts-1.3.2-r1 (07 Feb 2005)
+
+  07 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-1.3.2-r1.ebuild:
+  Remove KDEDIR form the environment (#33079).
+
+*arts-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +arts-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> arts-1.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> arts-3.4.0_beta1.ebuild:
+  Updated mcopidl patch for hardened configurations to apply cleanly with 3.4.
+  Actually, Gregorio updated the patch earlier, but apprently he forgot to
+  update the ebuild itself.
+
+*arts-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +arts-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Remove the file setting KDEDIR in /etc/env.d,
+  since it is obsoleted.
+
+  03 Jan 2005; Guy Martin <gmsoft@gentoo.org> arts-1.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> arts-1.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> arts-1.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> arts-1.3.1.ebuild:
+  Stable on ppc64
+
+  09 Dec 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.2.ebuild:
+  Only use the hardened patch if it's necessary
+
+  09 Dec 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.2.ebuild:
+  Add a patch to apply -fno-stack-protector so arts doesn't die for some people
+
+*arts-1.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/arts-1.3.2-alsa-bigendian.patch, +arts-1.3.2.ebuild:
+  Version bump
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> arts-1.3.1.ebuild:
+  Stable on alpha.
+
+  14 Nov 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/arts-1.3.1-alsa-bigendian.patch, arts-1.3.1.ebuild:
+  Make arts use the proper alsa default on bigendian
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> arts-1.3.1.ebuild:
+  Marked ppc stable.
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> arts-1.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> arts-1.3.1.ebuild:
+  ~alpha keyword.
+
+  03 Nov 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.1.ebuild:
+  x86 stable
+
+*arts-1.3.1 (12 Oct 2004)
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org> +arts-1.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> arts-1.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> arts-1.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> arts-1.3.0.ebuild:
+  Stable on sparc.
+
+  12 Sep 2004; Bryan Østergaard <kloeri@gentoo.org> arts-1.2.3.ebuild:
+  Stable on alpha.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> :
+  x86 stable
+
+  31 Aug 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.0.ebuild:
+  dep change : jack -> jack-audio-connection-kit
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> arts-1.1.5.ebuild,
+  arts-1.2.1.ebuild, arts-1.3.0.ebuild:
+  Masked arts-1.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> arts-1.1.5.ebuild,
+  arts-1.2.1.ebuild:
+  Masked arts-1.2.2.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> arts-1.1.5.ebuild,
+  arts-1.2.1.ebuild:
+  Masked arts-1.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> arts-1.1.5.ebuild:
+  Masked arts-1.1.5.ebuild stable for ppc
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.0.ebuild,
+  files/1.3.0-jack-configure.in.in.patch:
+  Add a patch which allows use to setup a dependency on jack
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> arts-1.3.0.ebiuld:
+  stable on ppc64
+
+*arts-1.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.0.ebuild,
+  arts-1.3.0_beta2.ebuild:
+  1.3.0 final
+
+*arts-1.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.0_rc1.ebuild,
+  arts-1.3.0_rc2.ebuild:
+  remove _rc1, add _rc2
+
+*arts-1.3.0_rc1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> arts-1.3.0_beta1.ebuild,
+  arts-1.3.0_rc1.ebuild:
+  Add new rc, remove beta1
+
+  28 Jul 2004; Tom Gall <tgall@gentoo.org> arts-1.2.3.ebuild:
+  stable on ppc64, bug #55076
+
+*arts-1.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +arts-1.3.0_beta2.ebuild:
+  Add beta2
+
+*arts-1.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -arts-1.3.0_alpha1.ebuild,
+  +arts-1.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> arts-1.2.2.ebuild:
+  Stable on alpha.
+
+  20 Jun 2004; Tom Gall <tgall@gentoo.org> arts-1.2.3.ebuild:
+  ~ppc64, bug #54147
+
+  10 Jun 2004; Travis Tilley <lv@gentoo.org> arts-1.2.3.ebuild:
+  fixed epatch line so that it tries to use a patch that actually exists
+
+*arts-1.2.3 (09 Jun 2004)
+
+  09 Jun 2004; Caleb Tennis <caleb@gentoo.org> arts-1.2.3.ebuild: 
+  Version bump
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> arts-1.1.5.ebuild,
+  arts-1.2.0.ebuild, arts-1.2.1.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> arts-1.2.2.ebuild:
+  stable on amd64
+
+*arts-1.3.0_alpha1 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org> +arts-1.3.0_alpha1.ebuild:
+  3.3alpha1 - hardmasked
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> arts-1.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> arts-1.2.2.ebuild:
+  Stable on sparc.
+
+  04 May 2004; Travis Tilley <lv@gentoo.org> +files/arts-vorbis-fix.dif,
+  arts-1.2.1.ebuild, arts-1.2.2.ebuild:
+  added a patch to fix arts suddenly jumping to 100% cpu usage and staying there
+  for mp3 or vorbis streams at least, a bug that is particularly annoying on
+  amd64
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> arts-1.2.1.ebuild,
+  arts-1.2.2.ebuild:
+  Add inherit eutils
+
+  24 Apr 2004; Bret Curtis,,, <psi29a@gentoo.org> arts-1.2.2.ebuild:
+  added to ~mips
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -files/tmp-mcop-user-fix.patch,
+  -arts-1.0.5b.ebuild:
+  Remove old version
+
+  19 Apr 2004; Jon Hood <squinky86@gentoo.org> arts-1.2.2.ebuild:
+  fix SRC_URI
+
+*arts-1.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +files/arts-1.2.2-buffer.patch:
+  Version Bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> arts-1.2.1.ebuild:
+  stable on amd64
+
+  07 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org> arts-1.2.1.ebuild:
+  filter -fomit-frame-pointer on sparc to close bug #41980
+
+  24 Mar 2004; Jason Huebel <jhuebel@gentoo.org> files/arts-1.2.1-buffer.patch,
+  arts-1.2.1.ebuild
+  Patch to fix sound problems with arts on amd64. Contributed by coolo at SUSE.
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> arts-1.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+  arts-1.2.1.ebuild, files/arts-1.1.4-alsafix.diff,
+  files/arts-1.1.4-amd64.patch:
+  x86 stable and old cleanups
+
+*arts-1.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> arts-1.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> arts-1.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> arts-1.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> arts-1.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> arts-1.2.0.ebuild:
+  Stable on ppc.
+
+  08 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Move a lot of code out of global scope since it shouldnt be there ;).
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> arts-1.2.0.ebuild:
+  Marked ~ppc
+
+*arts-1.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> arts-1.2.0.ebuild,
+  arts-1.2.0_rc1.ebuild:
+  New version, remove _rc.
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> arts-1.1.5.ebuild:
+  stable on alpha and ia64
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> arts-1.1.5.ebuild:
+  Marked stable on hppa.
+
+*arts-1.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.5.ebuild:
+  New version.  Removing patches as they shouldn't be needed for this version.
+  Marking x86 stable, and unstable on all other arches present in 1.1.4
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> arts-1.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> arts-1.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+  arts-1.2.0_beta2.ebuild, files/arts-1.1.4-alsafix.diff,
+  files/arts-1.2.0_beta2-alsafix.diff:
+  Add a patch to let arts work with alsa 1.0
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+  arts-1.2.0_beta2.ebuild:
+  Alsa dep <= 0.9.8
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+  arts-1.2.0_beta2.ebuild:
+  more minor dep changes
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> arts-1.2.0_beta2.ebuild:
+  ebuild cleanup - add esound as a optional dependency
+
+*arts-1.2.0_beta2 (01 Dec 2003)
+
+  01 Dec 2003; Caleb Tennis <caleb@gentoo.org> arts-1.2.0_alpha2.ebuild,
+  arts-1.2.0_beta1.ebuild, arts-1.2.0_beta2.ebuild:
+  New beta version, remove older alphas and betas
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> arts-1.1.4.ebuild:
+  Marked ppc
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> arts-1.1.4.ebuild:
+  Marked ppc
+
+*arts-1.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> arts-1.2.0_beta1.ebuild:
+  New beta version
+
+  28 Sep 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild,
+  files/arts-1.1.4-amd64.patch:
+  patch for compilation of amd64, add ~amd64
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> arts-1.1.4.ebuild:
+  Added sparc keyword.
+
+*arts-1.2.0_alpha2 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> arts-1.2.0_alpha1.ebuild,
+  arts-1.2.0_alpha1.ebuild, arts-1.2.0_alpha2.ebuild:
+  new alpha version
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild:
+  marking x86 stable
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> arts-1.1.3.ebuild:
+  Marked stable for sparc.
+
+*arts-1.1.4 (19 Sep 2003)
+
+  19 Sep 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.4.ebuild:
+  readd in head -1 fix
+
+  12 Sep 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.3.ebuild:
+  Compile fix for coreutils users
+
+*arts-1.2.0_alpha1 (12 Sep 2003)
+
+  12 Sep 2003; Jason Wever <weeve@gentoo.org> arts-1.2.0_alpha1.ebuild:
+  Marking as unusable as not all dependecies are met and hasn't been tested yet.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.3.ebuild:
+  x86 stable
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> arts-1.1.3.ebuild:
+  Fix some braindamage in the automake detection script, so that we can apply
+  our patch again
+
+*arts-1.1.3 (20 Jul 2003)
+
+  20 Jul 2003; Caleb Tennis <caleb@gentoo.org> arts-1.1.3.ebuild:
+  Version bump of ebuild for kde 3.1.3.  Commented out the arts and 
+  oggvorbis patch support as it causes it not to compile (at least on my 
+  machine).  Will require more testing.
+
+  19 Jul 2003; Nick Hadaway <raker@gentoo.org> arts-1.1.2-r1.ebuild:
+  Changed mads dep back to media-sound/mad
+
+*arts-1.1.2-r1 (18 Jul 2003)
+
+  18 Jul 2003; Nick Hadaway <raker@gentoo.org> arts-1.1.2-r1.ebuild:
+  Changed media-sound/mad to media-libs/{libmad,libid3tag).  Also
+  implemented the mad USE variable.
+
+  30 Jun 2003; Brad Laue <brad@gentoo.org> arts-1.1.1.ebuild,
+  arts-1.1.2.ebuild:
+  Really disable alsa if not specified in USE flags. (we mean it this time!)
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 1.0.5a, 1.1.0, 1.1.0-r1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> arts-1.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> arts-1.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> arts-1.1.2.ebuild:
+  Use correct version number in the name of the env.d file.
+
+*arts-1.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> arts-1.1.2.ebuild:
+  New version that comes with kde 3.1.2.
+
+*arts-1.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+  14 Mar 2003; Dan Armak <danarmak@gentoo.org> arts-1.0.5a.ebuild:
+  
+  Add fix for #16329 to this versionn as well, without creating a new revision.
+  Added matching change to latest revision of kdelibs-3.0.5a.
+
+*arts-1.1.1 (14 Mar 2003)
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> arts-1.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+  20 Mar 2003; Jason Wever <weeve@gentoo.org> arts-1.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.1.1.ebuild:
+  version bump
+
+*arts-1.1.0-r1 (11 Mar 2003)
+
+  16 Mar 2003; Mark Guertin <gerk@gentoo.org> arts-1.1.0-r1.ebuild:
+  set ppc in keywords
+
+  11 Mar 2003; Dan Armak <danarmak@gentoo.org> arts-1.1.0-r1.ebuild:
+  Fix bug #16329 (arts not added to paths without kdelibs); goes together
+  with the new kdelibs-3.1-r3.
+  Also, add an informational message about making artswrapper suid root
+  (cf bug #7883).
+
+  28 Feb 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.1.0.ebuild:
+  Fix bug #13453: filter out the -foptimize-sibling-calls optimization flag,
+  which causes a segfault in the compilation process.
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> arts-1.1.0.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*arts-1.1.0 (14 Jan 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> arts-1.1.0.ebuild :
+  Added ~alpha keyword
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.0.2.ebuild,
+  arts-1.0.2-r1.ebuild, arts-1.0.3.ebuild, arts-1.0.4.ebuild,
+  arts-1.1.0_rc6.ebuild: removed old versions
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> arts-1.1.0.ebuild:
+  added ~sparc to keywords
+
+  01 Feb 2003; Dan Armak <danarmak@gentoo.org> arts-1.0.5a.ebuild  :
+
+  Fix bug #13453: filter out the -foptimize-sibling-calls optimization flag,
+  which causes a segfault in the compilation process.
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+  28 Jan 2003; Jon Nall <nall@gentoo.org> arts-1.1.0.ebuild :
+  changed ~ppc to ppc
+
+  14 Jan 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.1.0.ebuild:
+  fixed for kde-3.1.final
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> arts-1.1.0_rc6.ebuild:
+  added ~ppc to keywords
+
+*arts-1.1.0_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> arts-1.1.0_rc6.ebuild:
+  version bump
+
+*arts-1.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> arts-1.0.5a.ebuild:
+  Added ~sparc to keywords.
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> arts-1.0.5a.ebuild:
+  version bump
+
+*arts-1.1.0_rc5 (16 Dec 2002)
+
+  16 Dec 2002; Hannes Mehnert <hannes@gentoo.org> arts-1.1.0_rc5-r1.ebuild:
+  added patch which fixes bug #11860
+
+*arts-1.0.4-r1 (15 Dec 2002)
+
+  15 Dec 2002; Hannes Mehnert <hannes@gentoo.org> arts-1.0.4-r1.ebuild:
+  added patch which should fix bug #10338
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> arts-1.1.0_rc5 :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  08 Dec 2002; Hannes Mehnert <hannes@gentoo.org> arts-1.1.0.x.ebuild:
+  renamed arts-1.1.0.3 to arts-1.1.0_rc3, 1.1.0.5 to 1.1.0_rc5 and 1.1.0.4
+  to 1.1.0
+
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> arts-1.1.0.4.ebuild:
+  Added ppc keyword
+
+*arts-1.1.0.3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*arts-1.1.0.2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*arts-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  aRts 1.0.4 from KDE 3.0.4, the latest bugfix release.
+
+  04 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #8175: force make -j1 in arts-1.0.3.
+
+*arts-1.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+  13 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Add HOMEPAGE=multimedia.kde.org.
+
+*arts-1.0.2-r1 (08 Jul 2002) Bart Verwilst <verwilst@gentoo.org>:
+
+  Fixes newly discovered root exploit in artswrapper.
+
+*arts-1.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New stability release (comes with kde 3.0.2).
+
+*arts-1.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+	
+  Update <verwilst>: Filter out "-fomit-frame-pointer" and 
+  -fstrength-reduce" on gentoo 1.3+ systems. Arts seems very unstable 
+  otherwise (Even compiling something shuts it down )
+
+*arts-1.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (part of KDE 3.0.1).
+
+*arts-1.0 (4 Apr 2002)
 
   4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
 
diff --git a/kde-base/arts/Manifest b/kde-base/arts/Manifest
index 67c78a6714c6..0182eca4f553 100644
--- a/kde-base/arts/Manifest
+++ b/kde-base/arts/Manifest
@@ -1,14 +1,36 @@
-MD5 3e14fb40f4adb1f75c566e5636f241f5 arts-1.0.5a.ebuild 1428
-MD5 28a643d6bb6a22518803e2bc7229794f arts-1.0.4-r1.ebuild 1040
-MD5 e74f8fca62373910b83566fd3cf5bbe4 arts-1.1.1.ebuild 1875
-MD5 c842795f8f876b607244297f69eb8f0f arts-1.1.0-r1.ebuild 2003
-MD5 44c03c421acfe509548cc3950cd41a02 arts-1.1.0.ebuild 1203
-MD5 e3ca52900ec6a6d7c3646dfac9e028a8 arts-1.0.5b.ebuild 1438
-MD5 c391e1f87eff71f92dcb7bdbcf80d3ee ChangeLog 5912
-MD5 c88ab1b439285e5474a280faa6a12c83 files/digest-arts-1.1.0 69
-MD5 0618185a5569820b71b70e635ac9cd2a files/digest-arts-1.1.1 63
-MD5 6ecdbbae1fbfc89218e79fac2b2822ff files/digest-arts-1.0.5a 65
-MD5 783f52e41abb732466bec517c6ff1ae1 files/digest-arts-1.0.5b 200
-MD5 1b00ca71ff1ea0b5ed8387a0d5f9020d files/digest-arts-1.0.4-r1 64
-MD5 c88ab1b439285e5474a280faa6a12c83 files/digest-arts-1.1.0-r1 69
-MD5 226c503848cbc85a5daacb28eef4a0a6 files/tmp-mcop-user-fix.patch 1045
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 30b7101c365d75c991d3285c56ee1b2f ChangeLog 24567
+MD5 9503779c4a371ce5172784d2e8a48274 arts-1.3.2-r1.ebuild 2655
+MD5 51046f9ff099e5b3045caa3884c8d8eb arts-1.3.2.ebuild 2780
+MD5 9780af748959ac2da43677dd72a313f0 arts-3.4.1-r2.ebuild 2854
+MD5 db0f7cdd6d695cdf6af189655f4758d5 arts-3.4.2.ebuild 2941
+MD5 505ba00897fb02535eff36aa4f443168 arts-3.4.3.ebuild 2938
+MD5 32841bcb36cb9438ff9ea2bbcdaabc75 arts-3.5.0.ebuild 3069
+MD5 d9248d6dc9fd9c9372024083c991f59d arts-3.5.0_beta2.ebuild 2619
+MD5 c7bd158a61cf7881b3ac5b67b4b2f244 arts-3.5.0_rc1.ebuild 3044
+MD5 5ab88e65406f5d0dcb2c22a7174f7806 arts-3.5_beta1-r1.ebuild 2621
+MD5 68ec6c8e74dfea13c3bb54575b1c51d4 files/1.3.0-jack-configure.in.in.patch 694
+MD5 22eaa23f91c114995e7b8ae286c3ac2c files/arts-1.3.2-alsa-bigendian.patch 571
+MD5 64df5930253711053181dcdbba96f42b files/arts-1.3.2-mcopidl.patch 418
+MD5 196311c78bda3759d3d92a450fcf12ea files/arts-1.4-mcopidl.patch 448
+MD5 c0838be4fcac1f2a9f9efd922b4b6d8d files/arts-3.4.1-configure.patch 4429
+MD5 5fa50e6520e137f4731eea03a5a644ea files/arts-3.4.1-cpu-overload.patch 1371
+MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2 63
+MD5 0a66e4f219b0dee9346c9c99ae4b15d0 files/digest-arts-1.3.2-r1 63
+MD5 0756f4b60219058bac587ef4688d4b11 files/digest-arts-3.4.1-r2 63
+MD5 aee14037bb0dcd09b7dfcb784e7ad12c files/digest-arts-3.4.2 63
+MD5 61d9c5cbe910f57e3dbf0c9ee58d8a38 files/digest-arts-3.4.3 63
+MD5 0a8674e9c6e95640520c60bbae2156b7 files/digest-arts-3.5.0 63
+MD5 594b1aee0aa6fec867f62b1774586434 files/digest-arts-3.5.0_beta2 64
+MD5 9efe20df34c4f9e516b9d12dea825e25 files/digest-arts-3.5.0_rc1 67
+MD5 3ab1771e7a2c34e08a3c1e5dbd5af975 files/digest-arts-3.5_beta1-r1 64
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjWsntT9W3vfTuoRAnQtAKCezVHD+Xc+5hzwMkFbfpAMhJgvswCaA1uv
+JbhhB7/AnUbNA7A2y/c5tyo=
+=MSgC
+-----END PGP SIGNATURE-----
diff --git a/kde-base/arts/arts-1.3.2-r1.ebuild b/kde-base/arts/arts-1.3.2-r1.ebuild
index 95e20abf4095..09791c7a16cd 100644
--- a/kde-base/arts/arts-1.3.2-r1.ebuild
+++ b/kde-base/arts/arts-1.3.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/kde-base/arts/arts-1.3.2-r1.ebuild,v 1.1 2005/02/07 19:59:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.3
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PV/1.3.2/3.3.2}/src/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.3"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~alpha"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="alsa oggvorbis esd artswrappersuid jack mad hardened"
 
 DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
@@ -21,12 +21,7 @@ DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	media-libs/audiofile
 	>=dev-libs/glib-2
-	>=x11-libs/qt-3.3"
-
-# patch to configure.in.in that makes the vorbis, libmad deps optional
-# has no version number in its filename because it's the same for all
-# arts versions - the patched file hasn't changed in a year's time
-# PATCHES="$FILESDIR/optional-deps.diff"
+	$(qt_min_version 3.3)"
 
 src_unpack() {
 	kde_src_unpack
@@ -42,9 +37,6 @@ src_unpack() {
 	# rm -f $S/configure
 
 	cd ${S} && make -f admin/Makefile.common
-	# use amd64 && epatch ${FILESDIR}/arts-${PV}-buffer.patch
-	# this patch fixes the high cpu usage of mp3 and vorbis
-	# epatch ${FILESDIR}/arts-vorbis-fix.dif
 }
 
 src_compile() {
diff --git a/kde-base/arts/arts-1.3.2.ebuild b/kde-base/arts/arts-1.3.2.ebuild
index 9bb63ca26f12..da25dc1fd05e 100644
--- a/kde-base/arts/arts-1.3.2.ebuild
+++ b/kde-base/arts/arts-1.3.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/kde-base/arts/arts-1.3.2.ebuild,v 1.1 2004/12/09 01:27:33 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.3
@@ -11,8 +11,8 @@ SRC_URI="mirror://kde/stable/${PV/1.3.2/3.3.2}/src/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.3"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~alpha"
-IUSE="alsa oggvorbis esd artswrappersuid jack mad"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="alsa oggvorbis esd artswrappersuid jack mad hardened"
 
 DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
 	oggvorbis? ( media-libs/libvorbis media-libs/libogg )
@@ -21,26 +21,23 @@ DEPEND="alsa? ( media-libs/alsa-lib virtual/alsa )
 	mad? ( media-libs/libmad media-libs/libid3tag )
 	media-libs/audiofile
 	>=dev-libs/glib-2
-	>=x11-libs/qt-3.3
+	$(qt_min_version 3.3)
 	>=sys-apps/portage-2.0.49-r8"
 
-# patch to configure.in.in that makes the vorbis, libmad deps optional
-# has no version number in its filename because it's the same for all
-# arts versions - the patched file hasn't changed in a year's time
-# PATCHES="$FILESDIR/optional-deps.diff"
-
 src_unpack() {
 	kde_src_unpack
 	epatch ${FILESDIR}/1.3.0-jack-configure.in.in.patch
 	epatch ${FILESDIR}/${P}-alsa-bigendian.patch
+
+	if (is-flag -fstack-protector || is-flag -fstack-protector-all || use hardened); then
+		epatch ${FILESDIR}/arts-1.3.2-mcopidl.patch
+	fi
+
 	kde_sandbox_patch ${S}/soundserver
 	# for the configure.in.in patch, for some reason it's not automatically picked up
 	# rm -f $S/configure
 
 	cd ${S} && make -f admin/Makefile.common
-	# use amd64 && epatch ${FILESDIR}/arts-${PV}-buffer.patch
-	# this patch fixes the high cpu usage of mp3 and vorbis
-	# epatch ${FILESDIR}/arts-vorbis-fix.dif
 }
 
 src_compile() {
diff --git a/kde-base/arts/arts-3.4.1-r2.ebuild b/kde-base/arts/arts-3.4.1-r2.ebuild
index fe80d76fd4ce..ca45f2b80d1c 100644
--- a/kde-base/arts/arts-3.4.1-r2.ebuild
+++ b/kde-base/arts/arts-3.4.1-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.4.1-r2.ebuild,v 1.1 2005/06/08 09:55:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
-set-qtdir 3
 set-kdedir 3.4
 
 MY_PV=${PV/#3/1}
@@ -15,17 +14,17 @@ SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64 ~ia64 ~ppc64 ~ppc ~sparc ~sparc ~ppc ~ppc64 ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="alsa esd artswrappersuid jack mp3 hardened vorbis"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	vorbis? ( media-libs/libvorbis media-libs/libogg )
 	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
 	mp3? ( media-libs/libmad )
 	media-libs/audiofile
 	>=dev-libs/glib-2
-	>=x11-libs/qt-3.3"
+	$(qt_min_version 3.3)"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
diff --git a/kde-base/arts/arts-3.4.2.ebuild b/kde-base/arts/arts-3.4.2.ebuild
index ce224c2a7451..801e36431e6e 100644
--- a/kde-base/arts/arts-3.4.2.ebuild
+++ b/kde-base/arts/arts-3.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/kde-base/arts/arts-3.4.2.ebuild,v 1.1 2005/07/28 12:51:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.4
@@ -22,7 +22,7 @@ RDEPEND="$(qt_min_version 3.3)
 	alsa? ( media-libs/alsa-lib )
 	vorbis? ( media-libs/libvorbis media-libs/libogg )
 	esd? ( media-sound/esound )
-	jack? ( media-sound/jack-audio-connection-kit )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.90 )
 	mp3? ( media-libs/libmad )
 	nas? ( media-libs/nas )
 	media-libs/audiofile"
@@ -38,6 +38,9 @@ src_unpack() {
 		epatch ${FILESDIR}/arts-1.4-mcopidl.patch
 	fi
 
+	# Fix amd64 cpu overload & crash bug, kde bug 88474. Applied for 3.5.
+	epatch "$FILESDIR/arts-3.4.1-cpu-overload.patch"
+
 	# Configure patch. Applied for 3.5.
 	epatch "${FILESDIR}/arts-3.4.1-configure.patch"
 
diff --git a/kde-base/arts/arts-3.4.3.ebuild b/kde-base/arts/arts-3.4.3.ebuild
index 5d4e05f3af87..1e4a2e2d542b 100644
--- a/kde-base/arts/arts-3.4.3.ebuild
+++ b/kde-base/arts/arts-3.4.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/kde-base/arts/arts-3.4.3.ebuild,v 1.1 2005/10/12 13:19:17 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.4
@@ -14,7 +14,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
 IUSE="alsa esd artswrappersuid jack mp3 nas hardened vorbis"
 
 RDEPEND="$(qt_min_version 3.3)
diff --git a/kde-base/arts/arts-3.5.0.ebuild b/kde-base/arts/arts-3.5.0.ebuild
index 7daeaacb2982..b20ee7955406 100644
--- a/kde-base/arts/arts-3.5.0.ebuild
+++ b/kde-base/arts/arts-3.5.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/kde-base/arts/arts-3.5.0.ebuild,v 1.1 2005/11/22 22:13:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
@@ -10,7 +10,8 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
 HOMEPAGE="http://multimedia.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+#SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="mirror://kde/stable/3.5/src/${PN}-${MY_PV}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="3.5"
diff --git a/kde-base/arts/arts-3.5.0_beta2.ebuild b/kde-base/arts/arts-3.5.0_beta2.ebuild
index d8fd37781cb5..e788d0bb6ae9 100644
--- a/kde-base/arts/arts-3.5.0_beta2.ebuild
+++ b/kde-base/arts/arts-3.5.0_beta2.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/kde-base/arts/arts-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 DESCRIPTION="aRts, the KDE sound (and all-around multimedia) server/output manager"
 HOMEPAGE="http://multimedia.kde.org/"
 #SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
-SRC_URI="mirror://kde/unstable/${PV/_/-}/src/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="mirror://kde/unstable/${PV/.0_/-}/src/${PN}-${MY_PV}.tar.bz2"
 LICENSE="GPL-2 LGPL-2"
 
 SLOT="3.5"
diff --git a/kde-base/arts/arts-3.5.0_rc1.ebuild b/kde-base/arts/arts-3.5.0_rc1.ebuild
index 35ab2c0ea3b7..ba109cc4db99 100644
--- a/kde-base/arts/arts-3.5.0_rc1.ebuild
+++ b/kde-base/arts/arts-3.5.0_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/kde-base/arts/arts-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
@@ -32,8 +32,23 @@ RDEPEND="$(qt_min_version 3.3)
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch
-	${FILESDIR}/arts-1.4-mcopidl.patch"
+PATCHES="${FILESDIR}/arts-1.3.2-alsa-bigendian.patch"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Alternative to arts-1.4-mcopidl.patch, make sure that flags are supported
+	# before trying to use them, for non-GCC, vanilla GCC or GCC 4.1 compilers
+	local nosspflags
+
+	[[ -n $(test_flag -fno-stack-protector) ]] && \
+		nosspflags="${nosspflags} -fno-stack-protector"
+	[[ -n $(test_flag -fno-stack-protector-all) ]] && \
+		nosspflags="${nosspflags} -fno-stack-protector-all"
+
+	sed -i -e "s:KDE_CXXFLAGS =\(.*\):KDE_CXXFLAGS = \1 ${nosspflags}:" \
+		${S}/mcopidl/Makefile.am
+}
 
 src_compile() {
 	myconf="$(use_enable alsa) $(use_enable vorbis)
diff --git a/kde-base/arts/arts-3.5_beta1-r1.ebuild b/kde-base/arts/arts-3.5_beta1-r1.ebuild
index 84fcb69a8ff4..d44021cde852 100644
--- a/kde-base/arts/arts-3.5_beta1-r1.ebuild
+++ b/kde-base/arts/arts-3.5_beta1-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/kde-base/arts/arts-3.5_beta1-r1.ebuild,v 1.1 2005/09/25 21:12:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/arts/arts-3.5_beta1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 
 inherit kde flag-o-matic eutils
 set-kdedir 3.5
diff --git a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch b/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
index aedfea48a479..a707f01f711b 100644
--- a/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
+++ b/kde-base/arts/files/1.3.0-jack-configure.in.in.patch
@@ -1,4 +1,4 @@
---- /var/tmp/portage/arts-1.3.0/work/arts-1.3.0/configure.in.in	2004-08-05 13:53:14.000000000 -0500
+--- configure.in.in	2004-08-05 13:53:14.000000000 -0500
 +++ configure.in.in	2004-08-26 14:15:51.901070600 -0500
 @@ -697,6 +697,12 @@
  AC_SUBST(GLIB_LIBADD)
diff --git a/kde-base/arts/metadata.xml b/kde-base/arts/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/arts/metadata.xml
+++ b/kde-base/arts/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/artsplugin-akode/ChangeLog b/kde-base/artsplugin-akode/ChangeLog
index 3ef62798f898..af3acecf55fd 100644
--- a/kde-base/artsplugin-akode/ChangeLog
+++ b/kde-base/artsplugin-akode/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for kde-base/artsplugin-akode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/ChangeLog,v 1.1 2005/09/24 10:23:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/ChangeLog,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
+
+*artsplugin-akode-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-akode-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*artsplugin-akode-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-akode-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  artsplugin-akode-3.5_beta1.ebuild, artsplugin-akode-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  artsplugin-akode-3.5.0_beta2.ebuild:
+  Fix compilation (missing KMCOPYLIB statement) and add corresponding dep on
+  kdemultimedia-arts.
+
+*artsplugin-akode-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-akode-3.5.0_beta2.ebuild:
+  New version.
 
 *artsplugin-akode-3.5_beta1 (24 Sep 2005)
 
diff --git a/kde-base/artsplugin-akode/Manifest b/kde-base/artsplugin-akode/Manifest
index a303f0d13f4c..c3b8437d04d1 100644
--- a/kde-base/artsplugin-akode/Manifest
+++ b/kde-base/artsplugin-akode/Manifest
@@ -1,3 +1,10 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 b6259510757f5e446e8a1e7bc03ab98c artsplugin-akode-3.5_beta1.ebuild 599
+MD5 fdfaa01e530eec57519d0ad4375dadd1 ChangeLog 1255
+MD5 6a396edb67b0a3a5a46775aedbe45d5b artsplugin-akode-3.5.0.ebuild 769
+MD5 6459ffe513c6e763b83b2bbac6b4fc08 artsplugin-akode-3.5.0_beta2.ebuild 774
+MD5 22ee1fb0fceea847acd9189a4adb9a0e artsplugin-akode-3.5.0_rc1.ebuild 773
+MD5 fdd53b43894650057b361c127296c3c5 artsplugin-akode-3.5_beta1.ebuild 675
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-artsplugin-akode-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-artsplugin-akode-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-artsplugin-akode-3.5.0_rc1 320
 MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-artsplugin-akode-3.5_beta1 74
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/artsplugin-akode/artsplugin-akode-3.5.0.ebuild b/kde-base/artsplugin-akode/artsplugin-akode-3.5.0.ebuild
index ef278c130483..ddfa44fa6e94 100644
--- a/kde-base/artsplugin-akode/artsplugin-akode-3.5.0.ebuild
+++ b/kde-base/artsplugin-akode/artsplugin-akode-3.5.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/kde-base/artsplugin-akode/artsplugin-akode-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/artsplugin-akode-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=akode_artsplugin
diff --git a/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_beta2.ebuild b/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_beta2.ebuild
index b52c6b5c9af6..4e31071870ed 100644
--- a/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_beta2.ebuild
+++ b/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_beta2.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/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=akode_artsplugin
@@ -9,9 +9,12 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="akode arts plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="media-libs/akode"
+DEPEND="media-libs/akode
+	$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)"
+
+KMCOPYLIB="libartsbuilder arts/runtime"
 
 pkg_setup() {
 	if ! useq arts; then
diff --git a/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_rc1.ebuild b/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_rc1.ebuild
index 7afb7af8118c..8907e1d3589e 100644
--- a/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_rc1.ebuild
+++ b/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_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/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/artsplugin-akode-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=akode_artsplugin
diff --git a/kde-base/artsplugin-akode/artsplugin-akode-3.5_beta1.ebuild b/kde-base/artsplugin-akode/artsplugin-akode-3.5_beta1.ebuild
index 1fa154be4a71..16fc4e5514b9 100644
--- a/kde-base/artsplugin-akode/artsplugin-akode-3.5_beta1.ebuild
+++ b/kde-base/artsplugin-akode/artsplugin-akode-3.5_beta1.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/kde-base/artsplugin-akode/artsplugin-akode-3.5_beta1.ebuild,v 1.1 2005/09/24 10:23:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-akode/artsplugin-akode-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=akode_artsplugin
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="akode arts plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-libs/akode"
 
@@ -19,3 +19,9 @@ pkg_setup() {
 		die
 	fi
 }
+
+src_compile() {
+	local myconf="--with-akode"
+
+	kde-meta_src_compile
+}
diff --git a/kde-base/artsplugin-audiofile/ChangeLog b/kde-base/artsplugin-audiofile/ChangeLog
index 70e04108c241..ed89f32a01ef 100644
--- a/kde-base/artsplugin-audiofile/ChangeLog
+++ b/kde-base/artsplugin-audiofile/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/artsplugin-audiofile
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+*artsplugin-audiofile-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-audiofile-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  artsplugin-audiofile-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -artsplugin-audiofile-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*artsplugin-audiofile-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-audiofile-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  artsplugin-audiofile-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*artsplugin-audiofile-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-audiofile-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  artsplugin-audiofile-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  artsplugin-audiofile-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  artsplugin-audiofile-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-audiofile-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*artsplugin-audiofile-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-audiofile-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-audiofile-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  artsplugin-audiofile-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  artsplugin-audiofile-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  artsplugin-audiofile-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  artsplugin-audiofile-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*artsplugin-audiofile-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-audiofile-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *artsplugin-audiofile-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/artsplugin-audiofile/Manifest b/kde-base/artsplugin-audiofile/Manifest
index 19ef0052fc0a..004da3d708e2 100644
--- a/kde-base/artsplugin-audiofile/Manifest
+++ b/kde-base/artsplugin-audiofile/Manifest
@@ -1,4 +1,8 @@
-MD5 1f23fc68f1ae6c45db74e2f344703d1d artsplugin-audiofile-3.4.0_alpha1.ebuild 487
-MD5 1f23fc68f1ae6c45db74e2f344703d1d artsplugin-audiofile-3.4.0_beta1.ebuild 487
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-artsplugin-audiofile-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-artsplugin-audiofile-3.4.0_beta1 231
+MD5 a53ed3cd57ad0f8e5d0b971d90262143 ChangeLog 3035
+MD5 51bdca15e5c834039fa22d97cb5d3bfe artsplugin-audiofile-3.4.1.ebuild 643
+MD5 ccb13a1bbb7c48b1f281e30ebc667951 artsplugin-audiofile-3.5.0.ebuild 620
+MD5 97f6c3b8f9c759a7d54b7914709b82ec artsplugin-audiofile-3.5_beta1.ebuild 630
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-artsplugin-audiofile-3.4.1 227
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-artsplugin-audiofile-3.5.0 73
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-artsplugin-audiofile-3.5_beta1 74
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.4.1.ebuild b/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.4.1.ebuild
index 4345cbfd32f5..300543b12690 100644
--- a/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.4.1.ebuild
+++ b/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=audiofile_artsplugin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="arts audiofile plugin"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="media-libs/audiofile"
 
diff --git a/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5.0.ebuild b/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5.0.ebuild
index bfb5554c8442..d9024ddb8eda 100644
--- a/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5.0.ebuild
+++ b/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5.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/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=audiofile_artsplugin
diff --git a/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5_beta1.ebuild b/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5_beta1.ebuild
index 051c635a188d..a26715781955 100644
--- a/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5_beta1.ebuild
+++ b/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5_beta1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5_beta1.ebuild,v 1.1 2005/09/22 17:26:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-audiofile/artsplugin-audiofile-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=audiofile_artsplugin
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="arts audiofile plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-libs/audiofile"
 
diff --git a/kde-base/artsplugin-audiofile/files/digest-artsplugin-audiofile-3.4.1 b/kde-base/artsplugin-audiofile/files/digest-artsplugin-audiofile-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/artsplugin-audiofile/files/digest-artsplugin-audiofile-3.4.1
+++ b/kde-base/artsplugin-audiofile/files/digest-artsplugin-audiofile-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/artsplugin-audiofile/metadata.xml b/kde-base/artsplugin-audiofile/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/artsplugin-audiofile/metadata.xml
+++ b/kde-base/artsplugin-audiofile/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/artsplugin-mpeglib/ChangeLog b/kde-base/artsplugin-mpeglib/ChangeLog
index 4a057b7904a4..7929c4f07638 100644
--- a/kde-base/artsplugin-mpeglib/ChangeLog
+++ b/kde-base/artsplugin-mpeglib/ChangeLog
@@ -1,6 +1,125 @@
 # ChangeLog for kde-base/artsplugin-mpeglib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/ChangeLog,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  artsplugin-mpeglib-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-mpeglib-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  artsplugin-mpeglib-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*artsplugin-mpeglib-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpeglib-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*artsplugin-mpeglib-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpeglib-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  artsplugin-mpeglib-3.5_beta1.ebuild,
+  artsplugin-mpeglib-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*artsplugin-mpeglib-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpeglib-3.5.0_beta2.ebuild:
+  New version.
+
+*artsplugin-mpeglib-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpeglib-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -artsplugin-mpeglib-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*artsplugin-mpeglib-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-mpeglib-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  artsplugin-mpeglib-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*artsplugin-mpeglib-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-mpeglib-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  artsplugin-mpeglib-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  artsplugin-mpeglib-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  artsplugin-mpeglib-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-mpeglib-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*artsplugin-mpeglib-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-mpeglib-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-mpeglib-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  artsplugin-mpeglib-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  artsplugin-mpeglib-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  artsplugin-mpeglib-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  artsplugin-mpeglib-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  06 Mar 2005; Simone Gotti <motaboy@gentoo.org>
+  artsplugin-mpeglib-3.4.0_rc1.ebuild:
+  Change kde-base/mpeglib deps as it was updated.
+
+*artsplugin-mpeglib-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-mpeglib-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*artsplugin-mpeglib-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-mpeglib-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *artsplugin-mpeglib-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/artsplugin-mpeglib/Manifest b/kde-base/artsplugin-mpeglib/Manifest
index 2d11a4f7c736..b390b07d4cec 100644
--- a/kde-base/artsplugin-mpeglib/Manifest
+++ b/kde-base/artsplugin-mpeglib/Manifest
@@ -1,4 +1,24 @@
-MD5 70b9fabf108d699d8a31d9c097b21926 artsplugin-mpeglib-3.4.0_alpha1.ebuild 600
-MD5 70b9fabf108d699d8a31d9c097b21926 artsplugin-mpeglib-3.4.0_beta1.ebuild 600
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-artsplugin-mpeglib-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-artsplugin-mpeglib-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8eb4fa2d410df54260bcb8d9a3ec2686 ChangeLog 4114
+MD5 c9d4d9c2c2f4446a1e62871a2d56e7be artsplugin-mpeglib-3.4.1.ebuild 747
+MD5 0ed10f3264dae2ff2e6fb65574ef495b artsplugin-mpeglib-3.4.3.ebuild 752
+MD5 48aa593505bc019647b521cdfd48d01e artsplugin-mpeglib-3.5.0.ebuild 697
+MD5 5e6800fad58232748d58b61dc3f0a8dd artsplugin-mpeglib-3.5.0_beta2.ebuild 702
+MD5 819b411a9384b009af6866336a83fbf0 artsplugin-mpeglib-3.5.0_rc1.ebuild 701
+MD5 388219a52c68037cab99b5369587995a artsplugin-mpeglib-3.5_beta1.ebuild 733
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-artsplugin-mpeglib-3.4.1 227
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-artsplugin-mpeglib-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-artsplugin-mpeglib-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-artsplugin-mpeglib-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-artsplugin-mpeglib-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-artsplugin-mpeglib-3.5_beta1 74
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmtFntT9W3vfTuoRAuO+AJ9eetADk51Doh+FwrTVZKcETAHepgCgghK4
+hMex6JAgWVeqcTvS32a98bY=
+=nR0W
+-----END PGP SIGNATURE-----
diff --git a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.1.ebuild b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.1.ebuild
index d2a6fd32d2cf..54bcc4545787 100644
--- a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.1.ebuild
+++ b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpeglib_artsplug
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="mpeglib plugin for arts"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/mpeglib)"
+DEPEND="$(deprange $PV 3.4.2 kde-base/mpeglib)"
 OLDDEPEND="~kde-base/mpeglib-$PV"
 KMCOPYLIB="libmpeg mpeglib/lib/"
 KMEXTRACTONLY="mpeglib/"
diff --git a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.3.ebuild b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.3.ebuild
index 256a432e8629..4054ef896052 100644
--- a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.3.ebuild
+++ b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.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/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpeglib_artsplug
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="mpeglib plugin for arts"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/mpeglib)"
 OLDDEPEND="~kde-base/mpeglib-$PV"
diff --git a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0.ebuild b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0.ebuild
index 94570dd5013c..c2878e830cd8 100644
--- a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0.ebuild
+++ b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.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/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpeglib_artsplug
diff --git a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_beta2.ebuild b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_beta2.ebuild
index 6916db1df15c..2a426b83a1fe 100644
--- a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_beta2.ebuild
+++ b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_beta2.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/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpeglib_artsplug
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="mpeglib plugin for arts"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/mpeglib)"
 
diff --git a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_rc1.ebuild b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_rc1.ebuild
index dd2a0b7c9021..6942dbc2f014 100644
--- a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_rc1.ebuild
+++ b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_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/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpeglib_artsplug
diff --git a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5_beta1.ebuild b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5_beta1.ebuild
index e209b37192f0..f479abeb0752 100644
--- a/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5_beta1.ebuild
+++ b/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5_beta1.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/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5_beta1.ebuild,v 1.1 2005/09/22 17:27:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpeglib/artsplugin-mpeglib-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpeglib_artsplug
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="mpeglib plugin for arts"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/mpeglib)"
 OLDDEPEND="~kde-base/mpeglib-$PV"
diff --git a/kde-base/artsplugin-mpeglib/files/digest-artsplugin-mpeglib-3.4.1 b/kde-base/artsplugin-mpeglib/files/digest-artsplugin-mpeglib-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/artsplugin-mpeglib/files/digest-artsplugin-mpeglib-3.4.1
+++ b/kde-base/artsplugin-mpeglib/files/digest-artsplugin-mpeglib-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/artsplugin-mpeglib/metadata.xml b/kde-base/artsplugin-mpeglib/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/artsplugin-mpeglib/metadata.xml
+++ b/kde-base/artsplugin-mpeglib/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/artsplugin-mpg123/ChangeLog b/kde-base/artsplugin-mpg123/ChangeLog
index f186acf55d76..5a18899f3c25 100644
--- a/kde-base/artsplugin-mpg123/ChangeLog
+++ b/kde-base/artsplugin-mpg123/ChangeLog
@@ -1,6 +1,102 @@
 # ChangeLog for kde-base/artsplugin-mpg123
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/ChangeLog,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
+
+*artsplugin-mpg123-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpg123-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*artsplugin-mpg123-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpg123-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  artsplugin-mpg123-3.5_beta1.ebuild, artsplugin-mpg123-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*artsplugin-mpg123-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-mpg123-3.5.0_beta2.ebuild:
+  New version.
+
+  25 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/artsplugin-mpg123-mcpu.patch, artsplugin-mpg123-3.4.1.ebuild,
+  artsplugin-mpg123-3.5_beta1.ebuild:
+  Don't force -mcpu on PPC users. Closes bug #107118.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -artsplugin-mpg123-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*artsplugin-mpg123-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-mpg123-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  artsplugin-mpg123-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*artsplugin-mpg123-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-mpg123-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  artsplugin-mpg123-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  artsplugin-mpg123-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  artsplugin-mpg123-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-mpg123-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*artsplugin-mpg123-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-mpg123-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-mpg123-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  artsplugin-mpg123-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  artsplugin-mpg123-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  artsplugin-mpg123-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  artsplugin-mpg123-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*artsplugin-mpg123-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-mpg123-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *artsplugin-mpg123-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/artsplugin-mpg123/Manifest b/kde-base/artsplugin-mpg123/Manifest
index 4731fd5b2d46..0f34d9855e04 100644
--- a/kde-base/artsplugin-mpg123/Manifest
+++ b/kde-base/artsplugin-mpg123/Manifest
@@ -1,4 +1,13 @@
-MD5 57e0e4ea1820fcded71a70908d3e5b5b artsplugin-mpg123-3.4.0_beta1.ebuild 521
-MD5 57e0e4ea1820fcded71a70908d3e5b5b artsplugin-mpg123-3.4.0_alpha1.ebuild 521
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-artsplugin-mpg123-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-artsplugin-mpg123-3.4.0_alpha1 74
+MD5 5a89f7ea44c2074770a1fb8f28149e6e ChangeLog 3525
+MD5 a76ef67c68527da5d4393efdde06f4ae artsplugin-mpg123-3.4.1.ebuild 659
+MD5 87669c5aa494407346f577c03ebb52ea artsplugin-mpg123-3.5.0.ebuild 583
+MD5 dee6c6f7f07353cdaae99238b834d17e artsplugin-mpg123-3.5.0_beta2.ebuild 588
+MD5 1f8840c188609e16205ec136136affe5 artsplugin-mpg123-3.5.0_rc1.ebuild 587
+MD5 21c423762a35b4f01b15395c19ee285f artsplugin-mpg123-3.5_beta1.ebuild 639
+MD5 ed6772ec21e7a7b2ada7417ff6b5be82 files/artsplugin-mpg123-mcpu.patch 451
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-artsplugin-mpg123-3.4.1 227
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-artsplugin-mpg123-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-artsplugin-mpg123-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-artsplugin-mpg123-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-artsplugin-mpg123-3.5_beta1 74
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.4.1.ebuild b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.4.1.ebuild
index 93d89581bd35..e93ecf78c18a 100644
--- a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.4.1.ebuild
+++ b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpg123_artsplugin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts plugin for mpg123"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 pkg_setup() {
@@ -19,3 +19,5 @@ pkg_setup() {
 	fi
 }
 
+PATCHES="${FILESDIR}/artsplugin-mpg123-mcpu.patch"
+
diff --git a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0.ebuild b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0.ebuild
index 16440d2b48b3..396cb0cb8c27 100644
--- a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0.ebuild
+++ b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.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/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpg123_artsplugin
diff --git a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_beta2.ebuild b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_beta2.ebuild
index ea627ee1f569..f0ab2593cd13 100644
--- a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_beta2.ebuild
+++ b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_beta2.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/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpg123_artsplugin
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts plugin for mpg123"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 pkg_setup() {
@@ -18,6 +18,3 @@ pkg_setup() {
 		die
 	fi
 }
-
-PATCHES="${FILESDIR}/artsplugin-mpg123-mcpu.patch"
-
diff --git a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_rc1.ebuild b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_rc1.ebuild
index 6c228dbeb100..58ee250ba02a 100644
--- a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_rc1.ebuild
+++ b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_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/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpg123_artsplugin
diff --git a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5_beta1.ebuild b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5_beta1.ebuild
index f797480f2f90..843c6edf56a0 100644
--- a/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5_beta1.ebuild
+++ b/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5_beta1.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/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5_beta1.ebuild,v 1.1 2005/09/22 17:28:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-mpg123/artsplugin-mpg123-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=mpg123_artsplugin
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts plugin for mpg123"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 pkg_setup() {
@@ -19,3 +19,5 @@ pkg_setup() {
 	fi
 }
 
+PATCHES="${FILESDIR}/artsplugin-mpg123-mcpu.patch"
+
diff --git a/kde-base/artsplugin-mpg123/files/digest-artsplugin-mpg123-3.4.1 b/kde-base/artsplugin-mpg123/files/digest-artsplugin-mpg123-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/artsplugin-mpg123/files/digest-artsplugin-mpg123-3.4.1
+++ b/kde-base/artsplugin-mpg123/files/digest-artsplugin-mpg123-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/artsplugin-mpg123/metadata.xml b/kde-base/artsplugin-mpg123/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/artsplugin-mpg123/metadata.xml
+++ b/kde-base/artsplugin-mpg123/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/artsplugin-xine/ChangeLog b/kde-base/artsplugin-xine/ChangeLog
index bd052ceea737..1e24a86b43e0 100644
--- a/kde-base/artsplugin-xine/ChangeLog
+++ b/kde-base/artsplugin-xine/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/artsplugin-xine
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/ChangeLog,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
+
+*artsplugin-xine-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-xine-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  artsplugin-xine-3.5_beta1.ebuild, artsplugin-xine-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*artsplugin-xine-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +artsplugin-xine-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -artsplugin-xine-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*artsplugin-xine-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-xine-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  artsplugin-xine-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*artsplugin-xine-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +artsplugin-xine-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  25 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  artsplugin-xine-3.4.1.ebuild:
+  Stable on sparc
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  artsplugin-xine-3.4.1.ebuild:
+  ~alpha keyword.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> artsplugin-xine-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-xine-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*artsplugin-xine-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-xine-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  artsplugin-xine-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> artsplugin-xine-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  21 Mar 2005; Carsten Lohrke <carlo@gentoo.org> artsplugin-xine-3.4.0.ebuild:
+  depend on xine-lib-1.0, #86136
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  artsplugin-xine-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  artsplugin-xine-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> artsplugin-xine-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*artsplugin-xine-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-xine-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*artsplugin-xine-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +artsplugin-xine-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *artsplugin-xine-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/artsplugin-xine/Manifest b/kde-base/artsplugin-xine/Manifest
index 8cd08f13d701..96d07c779d63 100644
--- a/kde-base/artsplugin-xine/Manifest
+++ b/kde-base/artsplugin-xine/Manifest
@@ -1,4 +1,10 @@
-MD5 bdaf133d9c2920bafa68b99a3014e6a6 artsplugin-xine-3.4.0_alpha1.ebuild 487
-MD5 bdaf133d9c2920bafa68b99a3014e6a6 artsplugin-xine-3.4.0_beta1.ebuild 487
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-artsplugin-xine-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-artsplugin-xine-3.4.0_alpha1 74
+MD5 f7510ec15761b66575a281a1cb03bbae ChangeLog 3350
+MD5 a85b3523bbb4fadf491c68a01b722a90 artsplugin-xine-3.4.1.ebuild 629
+MD5 1e0e97a8679874c1f0eed82125fc4c3a artsplugin-xine-3.5.0.ebuild 606
+MD5 daf6b3fd4ff9fe606e0c07583ddc594f artsplugin-xine-3.5.0_beta2.ebuild 618
+MD5 cc06646fb589c32f9275c8568a0d858e artsplugin-xine-3.5_beta1.ebuild 609
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-artsplugin-xine-3.4.1 227
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-artsplugin-xine-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-artsplugin-xine-3.5.0_beta2 231
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-artsplugin-xine-3.5_beta1 74
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/artsplugin-xine/artsplugin-xine-3.4.1.ebuild b/kde-base/artsplugin-xine/artsplugin-xine-3.4.1.ebuild
index 2cb529142745..e417ba5228e6 100644
--- a/kde-base/artsplugin-xine/artsplugin-xine-3.4.1.ebuild
+++ b/kde-base/artsplugin-xine/artsplugin-xine-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/artsplugin-xine-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/artsplugin-xine-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=xine_artsplugin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="arts xine plugin"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=">=media-libs/xine-lib-1.0"
 
diff --git a/kde-base/artsplugin-xine/artsplugin-xine-3.5.0.ebuild b/kde-base/artsplugin-xine/artsplugin-xine-3.5.0.ebuild
index ebd4a1334885..da3abc053a53 100644
--- a/kde-base/artsplugin-xine/artsplugin-xine-3.5.0.ebuild
+++ b/kde-base/artsplugin-xine/artsplugin-xine-3.5.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/kde-base/artsplugin-xine/artsplugin-xine-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/artsplugin-xine-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=xine_artsplugin
diff --git a/kde-base/artsplugin-xine/artsplugin-xine-3.5.0_beta2.ebuild b/kde-base/artsplugin-xine/artsplugin-xine-3.5.0_beta2.ebuild
index dd192574f080..e90018e1fd65 100644
--- a/kde-base/artsplugin-xine/artsplugin-xine-3.5.0_beta2.ebuild
+++ b/kde-base/artsplugin-xine/artsplugin-xine-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/artsplugin-xine-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/artsplugin-xine-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=xine_artsplugin
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="arts xine plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=">=media-libs/xine-lib-1.0"
 
diff --git a/kde-base/artsplugin-xine/artsplugin-xine-3.5_beta1.ebuild b/kde-base/artsplugin-xine/artsplugin-xine-3.5_beta1.ebuild
index 69700c62fbad..6560207c77d0 100644
--- a/kde-base/artsplugin-xine/artsplugin-xine-3.5_beta1.ebuild
+++ b/kde-base/artsplugin-xine/artsplugin-xine-3.5_beta1.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/kde-base/artsplugin-xine/artsplugin-xine-3.5_beta1.ebuild,v 1.1 2005/09/22 17:29:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/artsplugin-xine/artsplugin-xine-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=xine_artsplugin
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="arts xine plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=">=media-libs/xine-lib-1.0"
 
diff --git a/kde-base/artsplugin-xine/files/digest-artsplugin-xine-3.4.1 b/kde-base/artsplugin-xine/files/digest-artsplugin-xine-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/artsplugin-xine/files/digest-artsplugin-xine-3.4.1
+++ b/kde-base/artsplugin-xine/files/digest-artsplugin-xine-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/artsplugin-xine/metadata.xml b/kde-base/artsplugin-xine/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/artsplugin-xine/metadata.xml
+++ b/kde-base/artsplugin-xine/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/atlantik/ChangeLog b/kde-base/atlantik/ChangeLog
index 2d2443f8c1dc..33e3cbe64bb2 100644
--- a/kde-base/atlantik/ChangeLog
+++ b/kde-base/atlantik/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/atlantik
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/ChangeLog,v 1.1 2005/01/15 02:24:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/ChangeLog,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> atlantik-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> atlantik-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> atlantik-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*atlantik-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*atlantik-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> atlantik-3.5_beta1.ebuild,
+  atlantik-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*atlantik-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.5.0_beta2.ebuild:
+  New version.
+
+*atlantik-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -atlantik-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*atlantik-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +atlantik-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*atlantik-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +atlantik-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> atlantik-3.4.2.ebuild:
+  ~alpha keyword.
+
+*atlantik-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> atlantik-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> atlantik-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> atlantik-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*atlantik-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> atlantik-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> atlantik-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> atlantik-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> atlantik-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> atlantik-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*atlantik-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*atlantik-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +atlantik-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *atlantik-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/atlantik/Manifest b/kde-base/atlantik/Manifest
index 01aa22cd8df8..3671d658c74b 100644
--- a/kde-base/atlantik/Manifest
+++ b/kde-base/atlantik/Manifest
@@ -1,4 +1,26 @@
-MD5 145ee64b6989a01469d4af3e85220bfc atlantik-3.4.0_beta1.ebuild 420
-MD5 145ee64b6989a01469d4af3e85220bfc atlantik-3.4.0_alpha1.ebuild 420
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-atlantik-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-atlantik-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b991a6983daf9791ee6b9215025acf6e ChangeLog 3588
+MD5 df82b50ea4c41d84ded31c451780e808 atlantik-3.4.1.ebuild 541
+MD5 96da51483e0560e695ee447811cca8d9 atlantik-3.4.2.ebuild 554
+MD5 3d82783280b6354e5abb42bc6b4d58da atlantik-3.4.3.ebuild 550
+MD5 b0ea5abef07a658392a53d1318efe7d2 atlantik-3.5.0.ebuild 491
+MD5 7030d9d49ac00b39cd6edec148086d7a atlantik-3.5.0_beta2.ebuild 496
+MD5 6ace5082f8d7714b59491d5a4cb26af6 atlantik-3.5.0_rc1.ebuild 495
+MD5 180ecd0773f70c9f60585a5f0eb05f5e atlantik-3.5_beta1.ebuild 533
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-atlantik-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-atlantik-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-atlantik-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-atlantik-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-atlantik-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-atlantik-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-atlantik-3.5_beta1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkg8ntT9W3vfTuoRAsQKAJ4vdktesHAb+ZmHDZAMRrpmfBzstgCfezEX
+J+PMV/LLUHLCGIVbzcaxmec=
+=GRAR
+-----END PGP SIGNATURE-----
diff --git a/kde-base/atlantik/atlantik-3.4.1.ebuild b/kde-base/atlantik/atlantik-3.4.1.ebuild
index fd094de08114..97591faef926 100644
--- a/kde-base/atlantik/atlantik-3.4.1.ebuild
+++ b/kde-base/atlantik/atlantik-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The Atlantic board game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/atlantik/atlantik-3.4.2.ebuild b/kde-base/atlantik/atlantik-3.4.2.ebuild
index 60dbf9c4faf6..2e2baebd4818 100644
--- a/kde-base/atlantik/atlantik-3.4.2.ebuild
+++ b/kde-base/atlantik/atlantik-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The Atlantic board game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/atlantik/atlantik-3.4.3.ebuild b/kde-base/atlantik/atlantik-3.4.3.ebuild
index b2468d8ad67c..f4675ba2ef23 100644
--- a/kde-base/atlantik/atlantik-3.4.3.ebuild
+++ b/kde-base/atlantik/atlantik-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The Atlantic board game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/atlantik/atlantik-3.5.0.ebuild b/kde-base/atlantik/atlantik-3.5.0.ebuild
index 339f901cb42a..0a64e21302e2 100644
--- a/kde-base/atlantik/atlantik-3.5.0.ebuild
+++ b/kde-base/atlantik/atlantik-3.5.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/kde-base/atlantik/atlantik-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/atlantik/atlantik-3.5.0_beta2.ebuild b/kde-base/atlantik/atlantik-3.5.0_beta2.ebuild
index 8d812caf469d..99a4f301fde2 100644
--- a/kde-base/atlantik/atlantik-3.5.0_beta2.ebuild
+++ b/kde-base/atlantik/atlantik-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The Atlantic board game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/atlantik/atlantik-3.5.0_rc1.ebuild b/kde-base/atlantik/atlantik-3.5.0_rc1.ebuild
index cf9ec96dc752..0dc45fe2297c 100644
--- a/kde-base/atlantik/atlantik-3.5.0_rc1.ebuild
+++ b/kde-base/atlantik/atlantik-3.5.0_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/kde-base/atlantik/atlantik-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/atlantik/atlantik-3.5_beta1.ebuild b/kde-base/atlantik/atlantik-3.5_beta1.ebuild
index 91f598facfbc..77ecd74bc8fc 100644
--- a/kde-base/atlantik/atlantik-3.5_beta1.ebuild
+++ b/kde-base/atlantik/atlantik-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.5_beta1.ebuild,v 1.1 2005/09/22 17:30:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantik/atlantik-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The Atlantic board game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/atlantik/files/digest-atlantik-3.4.1 b/kde-base/atlantik/files/digest-atlantik-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/atlantik/files/digest-atlantik-3.4.1
+++ b/kde-base/atlantik/files/digest-atlantik-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/atlantik/files/digest-atlantik-3.4.2 b/kde-base/atlantik/files/digest-atlantik-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/atlantik/files/digest-atlantik-3.4.2
+++ b/kde-base/atlantik/files/digest-atlantik-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/atlantik/metadata.xml b/kde-base/atlantik/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/atlantik/metadata.xml
+++ b/kde-base/atlantik/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/atlantikdesigner/ChangeLog b/kde-base/atlantikdesigner/ChangeLog
index a805b6450911..1dcb23219406 100644
--- a/kde-base/atlantikdesigner/ChangeLog
+++ b/kde-base/atlantikdesigner/ChangeLog
@@ -1,6 +1,119 @@
 # ChangeLog for kde-base/atlantikdesigner
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/ChangeLog,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  atlantikdesigner-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  atlantikdesigner-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  atlantikdesigner-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*atlantikdesigner-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +atlantikdesigner-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*atlantikdesigner-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +atlantikdesigner-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  atlantikdesigner-3.5_beta1.ebuild, atlantikdesigner-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*atlantikdesigner-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +atlantikdesigner-3.5.0_beta2.ebuild:
+  New version.
+
+*atlantikdesigner-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +atlantikdesigner-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -atlantikdesigner-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*atlantikdesigner-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +atlantikdesigner-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*atlantikdesigner-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +atlantikdesigner-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  atlantikdesigner-3.4.2.ebuild:
+  ~alpha keyword.
+
+*atlantikdesigner-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +atlantikdesigner-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> atlantikdesigner-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> atlantikdesigner-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  atlantikdesigner-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*atlantikdesigner-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +atlantikdesigner-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  atlantikdesigner-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> atlantikdesigner-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  atlantikdesigner-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  atlantikdesigner-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  atlantikdesigner-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*atlantikdesigner-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +atlantikdesigner-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*atlantikdesigner-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +atlantikdesigner-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *atlantikdesigner-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/atlantikdesigner/Manifest b/kde-base/atlantikdesigner/Manifest
index 0f90ae4d8f70..fe5ff5716503 100644
--- a/kde-base/atlantikdesigner/Manifest
+++ b/kde-base/atlantikdesigner/Manifest
@@ -1,4 +1,26 @@
-MD5 91dda99154344c8df3efa4f0ccd85ceb atlantikdesigner-3.4.0_beta1.ebuild 355
-MD5 91dda99154344c8df3efa4f0ccd85ceb atlantikdesigner-3.4.0_alpha1.ebuild 355
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-atlantikdesigner-3.4.0_beta1 219
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-atlantikdesigner-3.4.0_alpha1 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 90f39de332a30da78ec471dc5c74d0bf ChangeLog 3928
+MD5 c85f14ce2dda1942f774b5c12700f4b2 atlantikdesigner-3.4.1.ebuild 492
+MD5 5aea3cb64a24ec01389c2667aff99a89 atlantikdesigner-3.4.2.ebuild 505
+MD5 744f01eb64650f4bff8774abad44e52e atlantikdesigner-3.4.3.ebuild 501
+MD5 ffbdbfb631c04dc011359b5be1876299 atlantikdesigner-3.5.0.ebuild 447
+MD5 b4a147240d944f7ccbdc0c477257c215 atlantikdesigner-3.5.0_beta2.ebuild 452
+MD5 d852806859c374417a533af9065a249f atlantikdesigner-3.5.0_rc1.ebuild 451
+MD5 e8b06d5ea65a2de7a006f2034ce71338 atlantikdesigner-3.5_beta1.ebuild 484
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-atlantikdesigner-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-atlantikdesigner-3.4.2 291
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-atlantikdesigner-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-atlantikdesigner-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-atlantikdesigner-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-atlantikdesigner-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-atlantikdesigner-3.5_beta1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkhkntT9W3vfTuoRAjnnAJ9xKlphqV1+8ZjWyWt9NyKkFkUzvQCfSbQa
+7FMzVJXY1gXvVq0Ju3lYrAI=
+=XoE6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.4.1.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.4.1.ebuild
index e291f04ccb53..2f403f05cd21 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.4.1.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.4.1.ebuild,v 1.1 2005/05/25 21:22:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Atlantik gameboard designer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/atlantik)"
 OLDDEPEND="~kde-base/atlantik-$PV"
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.4.2.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.4.2.ebuild
index b8ef5906c4d2..9eb9f5ef10e4 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.4.2.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Atlantik gameboard designer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/atlantik)"
 OLDDEPEND="~kde-base/atlantik-$PV"
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.4.3.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.4.3.ebuild
index eaec13909d70..a8c9cb57aea9 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.4.3.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Atlantik gameboard designer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/atlantik)"
 OLDDEPEND="~kde-base/atlantik-$PV"
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.5.0.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.5.0.ebuild
index a8320bc1ce57..80ce608fd006 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.5.0.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.5.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/kde-base/atlantikdesigner/atlantikdesigner-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_beta2.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_beta2.ebuild
index 0111382229da..e5453bc84d4c 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_beta2.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Atlantik gameboard designer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/atlantik)"
 
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_rc1.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_rc1.ebuild
index e45a324d9cb2..48af44ea8b5d 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_rc1.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_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/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/atlantikdesigner/atlantikdesigner-3.5_beta1.ebuild b/kde-base/atlantikdesigner/atlantikdesigner-3.5_beta1.ebuild
index 2486f6e93508..86b2b8fa30b4 100644
--- a/kde-base/atlantikdesigner/atlantikdesigner-3.5_beta1.ebuild
+++ b/kde-base/atlantikdesigner/atlantikdesigner-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.5_beta1.ebuild,v 1.1 2005/09/22 17:31:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/atlantikdesigner/atlantikdesigner-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Atlantik gameboard designer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/atlantik)"
 OLDDEPEND="~kde-base/atlantik-$PV"
diff --git a/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.1 b/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.1
+++ b/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.2 b/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.2
+++ b/kde-base/atlantikdesigner/files/digest-atlantikdesigner-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/atlantikdesigner/metadata.xml b/kde-base/atlantikdesigner/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/atlantikdesigner/metadata.xml
+++ b/kde-base/atlantikdesigner/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/blinken/ChangeLog b/kde-base/blinken/ChangeLog
index 150257e6b957..9a698383f9bb 100644
--- a/kde-base/blinken/ChangeLog
+++ b/kde-base/blinken/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for kde-base/blinken
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.1 2005/09/24 10:24:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/ChangeLog,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
+
+*blinken-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +blinken-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*blinken-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +blinken-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> blinken-3.5_beta1.ebuild,
+  blinken-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*blinken-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +blinken-3.5.0_beta2.ebuild:
+  New version.
 
 *blinken-3.5_beta1 (24 Sep 2005)
 
diff --git a/kde-base/blinken/Manifest b/kde-base/blinken/Manifest
index 69e46431cff7..6d6df53b004b 100644
--- a/kde-base/blinken/Manifest
+++ b/kde-base/blinken/Manifest
@@ -1,3 +1,10 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 f49bfb8cea96425db4da48fec76e4cfb blinken-3.5_beta1.ebuild 397
+MD5 84616e99169fe0d7498b5e5a57a183bf ChangeLog 961
+MD5 0717a42e0ebb1eb0c54b9c154d15b46d blinken-3.5.0.ebuild 387
+MD5 368208139c834626ad9bb49d0ede031a blinken-3.5.0_beta2.ebuild 392
+MD5 006c03d2f00b142594f412e491fee2ef blinken-3.5.0_rc1.ebuild 391
+MD5 5b7e77110647ac7c10f1414d6697e237 blinken-3.5_beta1.ebuild 390
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-blinken-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-blinken-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-blinken-3.5.0_rc1 294
 MD5 bb87804db4b06c40fdff58984b70c393 files/digest-blinken-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/blinken/blinken-3.5.0.ebuild b/kde-base/blinken/blinken-3.5.0.ebuild
index a9ebc0472fbb..a37ad9cfc1fb 100644
--- a/kde-base/blinken/blinken-3.5.0.ebuild
+++ b/kde-base/blinken/blinken-3.5.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/kde-base/blinken/blinken-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/blinken/blinken-3.5.0_beta2.ebuild b/kde-base/blinken/blinken-3.5.0_beta2.ebuild
index 907aedddec86..f36adb4a1385 100644
--- a/kde-base/blinken/blinken-3.5.0_beta2.ebuild
+++ b/kde-base/blinken/blinken-3.5.0_beta2.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/kde-base/blinken/blinken-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/blinken/blinken-3.5.0_rc1.ebuild b/kde-base/blinken/blinken-3.5.0_rc1.ebuild
index c7502eca3fbc..9b1a864d2125 100644
--- a/kde-base/blinken/blinken-3.5.0_rc1.ebuild
+++ b/kde-base/blinken/blinken-3.5.0_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/kde-base/blinken/blinken-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/blinken/blinken-3.5_beta1.ebuild b/kde-base/blinken/blinken-3.5_beta1.ebuild
index 702a197b9337..91551b34234d 100644
--- a/kde-base/blinken/blinken-3.5_beta1.ebuild
+++ b/kde-base/blinken/blinken-3.5_beta1.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/kde-base/blinken/blinken-3.5_beta1.ebuild,v 1.1 2005/09/24 10:24:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/blinken/blinken-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE version of the Simon Says game."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/certmanager/ChangeLog b/kde-base/certmanager/ChangeLog
index f9d3fc9a8317..c45d09000c8d 100644
--- a/kde-base/certmanager/ChangeLog
+++ b/kde-base/certmanager/ChangeLog
@@ -1,6 +1,119 @@
 # ChangeLog for kde-base/certmanager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/ChangeLog,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  certmanager-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> certmanager-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  certmanager-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*certmanager-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +certmanager-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*certmanager-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +certmanager-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  certmanager-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  certmanager-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*certmanager-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +certmanager-3.5.0_beta2.ebuild:
+  New version.
+
+*certmanager-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +certmanager-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> certmanager-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -certmanager-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*certmanager-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +certmanager-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*certmanager-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +certmanager-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  certmanager-3.4.2.ebuild:
+  ~alpha keyword.
+
+*certmanager-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +certmanager-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> certmanager-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> certmanager-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> certmanager-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*certmanager-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +certmanager-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> certmanager-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> certmanager-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> certmanager-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> certmanager-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  certmanager-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*certmanager-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +certmanager-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*certmanager-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +certmanager-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *certmanager-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/certmanager/Manifest b/kde-base/certmanager/Manifest
index 1dbc28af211c..0d5c45c90a3b 100644
--- a/kde-base/certmanager/Manifest
+++ b/kde-base/certmanager/Manifest
@@ -1,4 +1,26 @@
-MD5 a90ee130a994db93a537cd2b103d4c0b certmanager-3.4.0_beta1.ebuild 554
-MD5 a90ee130a994db93a537cd2b103d4c0b certmanager-3.4.0_alpha1.ebuild 554
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-certmanager-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-certmanager-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 270888da99289128fd83d10a67dd3b86 ChangeLog 3902
+MD5 26f0b0b902627bf38a968714a0c55da1 certmanager-3.4.1.ebuild 690
+MD5 bb52fe4cb8d2fc69dcf871c381d5aa42 certmanager-3.4.2.ebuild 698
+MD5 fe880e85af9d8848cd441e017f9ceb8e certmanager-3.4.3.ebuild 695
+MD5 e2cc897b5971f7ba7fa055125a32a01e certmanager-3.5.0.ebuild 637
+MD5 91028fba30d74febf9b86dc91d3f32e8 certmanager-3.5.0_beta2.ebuild 652
+MD5 524814495353fb6f0a56bdc633a4979f certmanager-3.5.0_rc1.ebuild 653
+MD5 c9203eda521968989d7da6c64e8c7f59 certmanager-3.5_beta1.ebuild 673
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-certmanager-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-certmanager-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-certmanager-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-certmanager-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-certmanager-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-certmanager-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-certmanager-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvBSntT9W3vfTuoRAlkhAKCU4SIKj/G+6dsAlC1/2zlE3NhjGgCfQi3n
+PzqeEubLY8sVCd3C36G1uRM=
+=HcKp
+-----END PGP SIGNATURE-----
diff --git a/kde-base/certmanager/certmanager-3.4.1.ebuild b/kde-base/certmanager/certmanager-3.4.1.ebuild
index f6aac71d2dde..3e6305298b5a 100644
--- a/kde-base/certmanager/certmanager-3.4.1.ebuild
+++ b/kde-base/certmanager/certmanager-3.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/kde-base/certmanager/certmanager-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE certificate manager gui"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdenetwork-$PV"
 DEPEND="
diff --git a/kde-base/certmanager/certmanager-3.4.2.ebuild b/kde-base/certmanager/certmanager-3.4.2.ebuild
index e024bbdfa262..fef6509bfbdd 100644
--- a/kde-base/certmanager/certmanager-3.4.2.ebuild
+++ b/kde-base/certmanager/certmanager-3.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/kde-base/certmanager/certmanager-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE certificate manager gui"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdenetwork-$PV"
 DEPEND="
diff --git a/kde-base/certmanager/certmanager-3.4.3.ebuild b/kde-base/certmanager/certmanager-3.4.3.ebuild
index 99cfc442ac28..4c8e0b3b62e4 100644
--- a/kde-base/certmanager/certmanager-3.4.3.ebuild
+++ b/kde-base/certmanager/certmanager-3.4.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/kde-base/certmanager/certmanager-3.4.3.ebuild,v 1.1 2005/10/13 00:09:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE certificate manager gui"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdenetwork-$PV"
 DEPEND="
@@ -22,4 +22,4 @@ KMEXTRACTONLY="libkdenetwork/
 
 KMEXTRA="
 	doc/kleopatra
-	doc/kwatchgnupg"
\ No newline at end of file
+	doc/kwatchgnupg"
diff --git a/kde-base/certmanager/certmanager-3.5.0.ebuild b/kde-base/certmanager/certmanager-3.5.0.ebuild
index 4076dbc57407..85171c25b8fa 100644
--- a/kde-base/certmanager/certmanager-3.5.0.ebuild
+++ b/kde-base/certmanager/certmanager-3.5.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/kde-base/certmanager/certmanager-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/certmanager/certmanager-3.5.0_beta2.ebuild b/kde-base/certmanager/certmanager-3.5.0_beta2.ebuild
index 35233bcd9dd7..261c919c0db4 100644
--- a/kde-base/certmanager/certmanager-3.5.0_beta2.ebuild
+++ b/kde-base/certmanager/certmanager-3.5.0_beta2.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/kde-base/certmanager/certmanager-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE certificate manager gui"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
@@ -22,4 +22,4 @@ KMEXTRACTONLY="libkdenetwork/
 
 KMEXTRA="
 	doc/kleopatra
-	doc/kwatchgnupg"
\ No newline at end of file
+	doc/kwatchgnupg"
diff --git a/kde-base/certmanager/certmanager-3.5.0_rc1.ebuild b/kde-base/certmanager/certmanager-3.5.0_rc1.ebuild
index 6d40bd6460b1..37d6e039a954 100644
--- a/kde-base/certmanager/certmanager-3.5.0_rc1.ebuild
+++ b/kde-base/certmanager/certmanager-3.5.0_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/kde-base/certmanager/certmanager-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/certmanager/certmanager-3.5_beta1.ebuild b/kde-base/certmanager/certmanager-3.5_beta1.ebuild
index 9f3d42a03b4d..ca971c140946 100644
--- a/kde-base/certmanager/certmanager-3.5_beta1.ebuild
+++ b/kde-base/certmanager/certmanager-3.5_beta1.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/kde-base/certmanager/certmanager-3.5_beta1.ebuild,v 1.1 2005/09/22 17:31:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/certmanager/certmanager-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE certificate manager gui"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdenetwork-$PV"
 DEPEND="
diff --git a/kde-base/certmanager/files/digest-certmanager-3.4.1 b/kde-base/certmanager/files/digest-certmanager-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/certmanager/files/digest-certmanager-3.4.1
+++ b/kde-base/certmanager/files/digest-certmanager-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/certmanager/files/digest-certmanager-3.4.2 b/kde-base/certmanager/files/digest-certmanager-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/certmanager/files/digest-certmanager-3.4.2
+++ b/kde-base/certmanager/files/digest-certmanager-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/certmanager/metadata.xml b/kde-base/certmanager/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/certmanager/metadata.xml
+++ b/kde-base/certmanager/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/cervisia/ChangeLog b/kde-base/cervisia/ChangeLog
index 554bfa3cb72c..81d38e199020 100644
--- a/kde-base/cervisia/ChangeLog
+++ b/kde-base/cervisia/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for kde-base/cervisia
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/ChangeLog,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> cervisia-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> cervisia-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> cervisia-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*cervisia-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*cervisia-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> cervisia-3.5_beta1.ebuild,
+  cervisia-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*cervisia-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.5.0_beta2.ebuild:
+  New version.
+
+*cervisia-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -cervisia-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*cervisia-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +cervisia-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*cervisia-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +cervisia-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*cervisia-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> cervisia-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> cervisia-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*cervisia-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> cervisia-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> cervisia-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> cervisia-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> cervisia-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> cervisia-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*cervisia-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*cervisia-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +cervisia-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *cervisia-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/cervisia/Manifest b/kde-base/cervisia/Manifest
index 4ff92aa65a6b..42fe7a315850 100644
--- a/kde-base/cervisia/Manifest
+++ b/kde-base/cervisia/Manifest
@@ -1,4 +1,16 @@
-MD5 391bb57cce8baf93a635f4da6e1674b4 cervisia-3.4.0_beta1.ebuild 303
-MD5 391bb57cce8baf93a635f4da6e1674b4 cervisia-3.4.0_alpha1.ebuild 303
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-cervisia-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-cervisia-3.4.0_alpha1 67
+MD5 86b71c1c4e412a095b8f11c159e76c97 ChangeLog 3396
+MD5 99aa15246b1fb1211e3ced5c2249cdfd cervisia-3.4.1.ebuild 425
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 caf88b1c5cce5ccbe24abd0852bc97ce cervisia-3.4.2.ebuild 433
+MD5 c4ba973e2e21934053df0d12bc1211f1 cervisia-3.5_beta1.ebuild 416
+MD5 adbf8506c5666bfb81c7c6cfc100abed cervisia-3.4.3.ebuild 429
+MD5 2b25130a5dcdd34f25bd3c88e7977025 cervisia-3.5.0_beta2.ebuild 418
+MD5 bbc0a86a441104d81b84ff6049659fed cervisia-3.5.0_rc1.ebuild 417
+MD5 c59b0040348179337d4a199e2359d337 cervisia-3.5.0.ebuild 413
+MD5 9b4e9e38740207531ab771519519d01e files/digest-cervisia-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-cervisia-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-cervisia-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-cervisia-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-cervisia-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-cervisia-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-cervisia-3.5.0 66
diff --git a/kde-base/cervisia/cervisia-3.4.1.ebuild b/kde-base/cervisia/cervisia-3.4.1.ebuild
index ee1726458fe3..32d16bc6e4ae 100644
--- a/kde-base/cervisia/cervisia-3.4.1.ebuild
+++ b/kde-base/cervisia/cervisia-3.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/kde-base/cervisia/cervisia-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/cervisia/cervisia-3.4.2.ebuild b/kde-base/cervisia/cervisia-3.4.2.ebuild
index eabae75aabf2..84a4b38878bf 100644
--- a/kde-base/cervisia/cervisia-3.4.2.ebuild
+++ b/kde-base/cervisia/cervisia-3.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/kde-base/cervisia/cervisia-3.4.2.ebuild,v 1.1 2005/07/28 21:16:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/cervisia/cervisia-3.4.3.ebuild b/kde-base/cervisia/cervisia-3.4.3.ebuild
index af2723c91a57..020d930e4bae 100644
--- a/kde-base/cervisia/cervisia-3.4.3.ebuild
+++ b/kde-base/cervisia/cervisia-3.4.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/kde-base/cervisia/cervisia-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,8 +8,8 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
-	dev-util/cvs"
\ No newline at end of file
+	dev-util/cvs"
diff --git a/kde-base/cervisia/cervisia-3.5.0.ebuild b/kde-base/cervisia/cervisia-3.5.0.ebuild
index 97fe244ea8f8..1d9710a5fdac 100644
--- a/kde-base/cervisia/cervisia-3.5.0.ebuild
+++ b/kde-base/cervisia/cervisia-3.5.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/kde-base/cervisia/cervisia-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/cervisia/cervisia-3.5.0_beta2.ebuild b/kde-base/cervisia/cervisia-3.5.0_beta2.ebuild
index f86647d64391..c760d886fd0a 100644
--- a/kde-base/cervisia/cervisia-3.5.0_beta2.ebuild
+++ b/kde-base/cervisia/cervisia-3.5.0_beta2.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/kde-base/cervisia/cervisia-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/cervisia/cervisia-3.5.0_rc1.ebuild b/kde-base/cervisia/cervisia-3.5.0_rc1.ebuild
index 2bea9734b1ec..d211db7c5bfd 100644
--- a/kde-base/cervisia/cervisia-3.5.0_rc1.ebuild
+++ b/kde-base/cervisia/cervisia-3.5.0_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/kde-base/cervisia/cervisia-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/cervisia/cervisia-3.5_beta1.ebuild b/kde-base/cervisia/cervisia-3.5_beta1.ebuild
index 3d4e367ef83d..6c96140829ad 100644
--- a/kde-base/cervisia/cervisia-3.5_beta1.ebuild
+++ b/kde-base/cervisia/cervisia-3.5_beta1.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/kde-base/cervisia/cervisia-3.5_beta1.ebuild,v 1.1 2005/09/22 17:32:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/cervisia/cervisia-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Cervisia - A KDE CVS frontend"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/cervisia/files/digest-cervisia-3.4.1 b/kde-base/cervisia/files/digest-cervisia-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/cervisia/files/digest-cervisia-3.4.1
+++ b/kde-base/cervisia/files/digest-cervisia-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/cervisia/files/digest-cervisia-3.4.2 b/kde-base/cervisia/files/digest-cervisia-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/cervisia/files/digest-cervisia-3.4.2
+++ b/kde-base/cervisia/files/digest-cervisia-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/cervisia/metadata.xml b/kde-base/cervisia/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/cervisia/metadata.xml
+++ b/kde-base/cervisia/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/dcopc/ChangeLog b/kde-base/dcopc/ChangeLog
index 08231d4079e1..2aa64d24531b 100644
--- a/kde-base/dcopc/ChangeLog
+++ b/kde-base/dcopc/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for kde-base/dcopc
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/ChangeLog,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
+
+*dcopc-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +dcopc-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> dcopc-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*dcopc-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +dcopc-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*dcopc-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +dcopc-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> dcopc-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> dcopc-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> dcopc-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*dcopc-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcopc-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *dcopc-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/dcopc/Manifest b/kde-base/dcopc/Manifest
index e11e9e14723b..cdd116d01f2c 100644
--- a/kde-base/dcopc/Manifest
+++ b/kde-base/dcopc/Manifest
@@ -1,3 +1,11 @@
-MD5 1ca19f295733c9b517c4dae226a94c00 dcopc-3.3.1.ebuild 331
-MD5 a8a268518872bfb866a04079086d71d9 files/digest-dcopc-3.3.1 146
+MD5 3e18acc92c42a0b13961cae7996037cd ChangeLog 1978
+MD5 2b0ef9043cc4c732a674e528cfedb90b dcopc-3.3.1.ebuild 471
+MD5 dd57af480c47c3bae3d3a781d4e3ceaa dcopc-3.4.1.ebuild 529
+MD5 1ac60941bb0ea012864c56131dc58884 dcopc-3.5.0.ebuild 524
+MD5 2fc94202d70454243ffa33e63e9f600e dcopc-3.5.0_beta2.ebuild 536
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-dcopc-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-dcopc-3.4.1 221
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-dcopc-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-dcopc-3.5.0_beta2 225
 MD5 44ed3a0bfa44a55b883dafba9e944e3f files/remove-configure.diff 265
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/dcopc/dcopc-3.3.1.ebuild b/kde-base/dcopc/dcopc-3.3.1.ebuild
index 8641153cb1c5..6bb414b9fbd3 100644
--- a/kde-base/dcopc/dcopc-3.3.1.ebuild
+++ b/kde-base/dcopc/dcopc-3.3.1.ebuild
@@ -1,15 +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/kde-base/dcopc/dcopc-3.3.1.ebuild,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/dcopc-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="C bindings for DCOP"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*"
 
 # Make sure to compile this
-PATCHES="$FILESDIR/remove-configure.diff"	
+PATCHES="$FILESDIR/remove-configure.diff"
 
diff --git a/kde-base/dcopc/dcopc-3.4.1.ebuild b/kde-base/dcopc/dcopc-3.4.1.ebuild
index f4c42ccf9a0f..1062f9ee9c1c 100644
--- a/kde-base/dcopc/dcopc-3.4.1.ebuild
+++ b/kde-base/dcopc/dcopc-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/dcopc-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/dcopc-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="C bindings for DCOP"
-KEYWORDS="~x86 ~amd64" # broken according to upstream - 3.4a1 README=
+KEYWORDS="x86 amd64 ~ppc" # broken according to upstream - 3.4a1 README=
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*"
 
diff --git a/kde-base/dcopc/dcopc-3.5.0.ebuild b/kde-base/dcopc/dcopc-3.5.0.ebuild
index 42258479a673..23cbe95f7f43 100644
--- a/kde-base/dcopc/dcopc-3.5.0.ebuild
+++ b/kde-base/dcopc/dcopc-3.5.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/kde-base/dcopc/dcopc-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/dcopc-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 MAXKDEVER=$PV
diff --git a/kde-base/dcopc/dcopc-3.5.0_beta2.ebuild b/kde-base/dcopc/dcopc-3.5.0_beta2.ebuild
index 692d2f9be7ac..0ef7aefcb8c6 100644
--- a/kde-base/dcopc/dcopc-3.5.0_beta2.ebuild
+++ b/kde-base/dcopc/dcopc-3.5.0_beta2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/dcopc-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopc/dcopc-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="C bindings for DCOP"
-KEYWORDS="~amd64" # broken according to upstream - 3.4a1 README=
+KEYWORDS="~amd64 ~x86" # broken according to upstream - 3.4a1 README=
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*"
 
diff --git a/kde-base/dcopc/files/digest-dcopc-3.3.1 b/kde-base/dcopc/files/digest-dcopc-3.3.1
index 92184cf95840..a16df2f0cf51 100644
--- a/kde-base/dcopc/files/digest-dcopc-3.3.1
+++ b/kde-base/dcopc/files/digest-dcopc-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 7110b1f88df0b1cc1358a92e9c075c6e dcopc-3.3.1-0-makefiles.tar.bz2 15158
diff --git a/kde-base/dcopc/files/digest-dcopc-3.4.1 b/kde-base/dcopc/files/digest-dcopc-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/dcopc/files/digest-dcopc-3.4.1
+++ b/kde-base/dcopc/files/digest-dcopc-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/dcopc/metadata.xml b/kde-base/dcopc/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/dcopc/metadata.xml
+++ b/kde-base/dcopc/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/dcopjava/ChangeLog b/kde-base/dcopjava/ChangeLog
index aee40ffb5c1f..e99a410a0e7f 100644
--- a/kde-base/dcopjava/ChangeLog
+++ b/kde-base/dcopjava/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for kde-base/dcopjava
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/ChangeLog,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
+
+*dcopjava-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +dcopjava-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> dcopjava-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*dcopjava-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +dcopjava-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*dcopjava-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +dcopjava-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> dcopjava-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> dcopjava-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> dcopjava-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*dcopjava-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcopjava-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  dcopjava-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+  17 Nov 2004; Dan Armak <danarmak@gentoo.org> dcopjava-3.3.1.ebuild:
+  Unmasked in package.mask; removing all keywords - this package is broken for
+  now
+
+  12 Nov 2004; Dan Armak <danarmak@gentoo.org> dcopjava-3.3.1.ebuild:
+  Don't run java-config in the global part of the ebuild.
 
 *dcopjava-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/dcopjava/Manifest b/kde-base/dcopjava/Manifest
index 4fbe60a148e1..994fcbe7e8e4 100644
--- a/kde-base/dcopjava/Manifest
+++ b/kde-base/dcopjava/Manifest
@@ -1,3 +1,11 @@
-MD5 8e35432189fcc9d6d567d3082126c52d dcopjava-3.3.1.ebuild 611
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 a118b1c0fe7474ba9e56786d1eef17d4 files/digest-dcopjava-3.3.1 149
+MD5 8b5e588c82a793ebff1bd140bcea3c94 ChangeLog 2466
+MD5 6c22f35f21bc31285c0ee1e9ac79bea0 dcopjava-3.3.1.ebuild 816
+MD5 ade80caaf34ba564c927a35223f037d8 dcopjava-3.4.1.ebuild 873
+MD5 430835d270490c2a91e42d80171d249b dcopjava-3.5.0.ebuild 868
+MD5 945efec5be5de8a6cbc89629b72ab807 dcopjava-3.5.0_beta2.ebuild 880
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-dcopjava-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-dcopjava-3.4.1 221
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-dcopjava-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-dcopjava-3.5.0_beta2 225
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/dcopjava/dcopjava-3.3.1.ebuild b/kde-base/dcopjava/dcopjava-3.3.1.ebuild
index e0d617ebd7a3..cd1e6eb56f5a 100644
--- a/kde-base/dcopjava/dcopjava-3.3.1.ebuild
+++ b/kde-base/dcopjava/dcopjava-3.3.1.ebuild
@@ -1,23 +1,30 @@
-# 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/kde-base/dcopjava/dcopjava-3.3.1.ebuild,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/dcopjava-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 # NOTE TODO install a jar file rather than a tree of class files, and use java-pkg.eclass,
 # in keeping with policy
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kdejava/configure.in.in"
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Java bindings for DCOP"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/jdk"
 RDEPEND="virtual/jre"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
-myconf="$myconf --with-java=`java-config --jdk-home`"
 
 pkg_setup() {
-    ewarn "This package is consdered broken by upstream. You're on your own."
+	ewarn "This package is consdered broken by upstream. You're on your own."
+}
+
+src_compile () {
+	myconf="$myconf --with-java=`java-config --jdk-home`"
+	kde-meta_src_compile
 }
\ No newline at end of file
diff --git a/kde-base/dcopjava/dcopjava-3.4.1.ebuild b/kde-base/dcopjava/dcopjava-3.4.1.ebuild
index 507c51ee3134..76a0411c3cfe 100644
--- a/kde-base/dcopjava/dcopjava-3.4.1.ebuild
+++ b/kde-base/dcopjava/dcopjava-3.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/kde-base/dcopjava/dcopjava-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/dcopjava-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 # NOTE TODO install a jar file rather than a tree of class files, and use java-pkg.eclass,
 # in keeping with policy
@@ -8,12 +8,12 @@
 KMNAME=kdebindings
 KMEXTRACTONLY="kdejava/configure.in.in"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Java bindings for DCOP"
-KEYWORDS="~x86 ~amd64" # broken according to upstream - 3.4a1 README
+KEYWORDS="x86 amd64 ~ppc" # broken according to upstream - 3.4a1 README
 IUSE=""
 DEPEND="virtual/jdk"
 RDEPEND="virtual/jre"
diff --git a/kde-base/dcopjava/dcopjava-3.5.0.ebuild b/kde-base/dcopjava/dcopjava-3.5.0.ebuild
index 9feb280993e3..a89b553bc2af 100644
--- a/kde-base/dcopjava/dcopjava-3.5.0.ebuild
+++ b/kde-base/dcopjava/dcopjava-3.5.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/kde-base/dcopjava/dcopjava-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/dcopjava-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 # NOTE TODO install a jar file rather than a tree of class files, and use java-pkg.eclass,
 # in keeping with policy
diff --git a/kde-base/dcopjava/dcopjava-3.5.0_beta2.ebuild b/kde-base/dcopjava/dcopjava-3.5.0_beta2.ebuild
index 2c83ccb86c45..a2ac83897487 100644
--- a/kde-base/dcopjava/dcopjava-3.5.0_beta2.ebuild
+++ b/kde-base/dcopjava/dcopjava-3.5.0_beta2.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/kde-base/dcopjava/dcopjava-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopjava/dcopjava-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 # NOTE TODO install a jar file rather than a tree of class files, and use java-pkg.eclass,
 # in keeping with policy
@@ -8,12 +8,12 @@
 KMNAME=kdebindings
 KMEXTRACTONLY="kdejava/configure.in.in"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Java bindings for DCOP"
-KEYWORDS="~amd64" # broken according to upstream - 3.4a1 README
+KEYWORDS="~amd64 ~x86" # broken according to upstream - 3.4a1 README
 IUSE=""
 DEPEND="virtual/jdk"
 RDEPEND="virtual/jre"
diff --git a/kde-base/dcopjava/files/digest-dcopjava-3.3.1 b/kde-base/dcopjava/files/digest-dcopjava-3.3.1
index de94bcaa405a..a16df2f0cf51 100644
--- a/kde-base/dcopjava/files/digest-dcopjava-3.3.1
+++ b/kde-base/dcopjava/files/digest-dcopjava-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 060948a94466ad7f3f149c5f97286945 dcopjava-3.3.1-0-makefiles.tar.bz2 20593
diff --git a/kde-base/dcopjava/files/digest-dcopjava-3.4.1 b/kde-base/dcopjava/files/digest-dcopjava-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/dcopjava/files/digest-dcopjava-3.4.1
+++ b/kde-base/dcopjava/files/digest-dcopjava-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/dcopjava/files/no-gtk-glib-check.diff b/kde-base/dcopjava/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/dcopjava/files/no-gtk-glib-check.diff
+++ b/kde-base/dcopjava/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/dcopjava/metadata.xml b/kde-base/dcopjava/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/dcopjava/metadata.xml
+++ b/kde-base/dcopjava/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/dcopperl/ChangeLog b/kde-base/dcopperl/ChangeLog
index ff17da21c91a..651a48b9d810 100644
--- a/kde-base/dcopperl/ChangeLog
+++ b/kde-base/dcopperl/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for kde-base/dcopperl
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/ChangeLog,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> dcopperl-3.4.1.ebuild:
+  Stable on sparc wrt #112842
+
+*dcopperl-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> dcopperl-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*dcopperl-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> dcopperl-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*dcopperl-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+*dcopperl-3.4.0-r1 (19 Mar 2005)
+
+  19 Mar 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.4.0-r1.ebuild:
+  Don't clobber perllocal.pod; use the functions from perl-module.eclass to
+  handle it properly. Fixes bug 83520. Credit goes to Yaakov S, who also
+  submitted the change to perl-module.eclass.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> dcopperl-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> dcopperl-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*dcopperl-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*dcopperl-3.4.0_beta2-r1 (19 Feb 2005)
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.3.1-r2.ebuild,
+  +dcopperl-3.4.0_beta2-r1.ebuild:
+  Moved all versions to SLOT 0, because they install in /usr, and the
+  different SLOTs were overwriting one another. Bug 80858.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> dcopperl-3.3.1-r1.ebuild:
+  Added x86 (stable) keyword.
+
+*dcopperl-3.3.1-r1 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/installdirs-vendor.diff, +dcopperl-3.3.1-r1.ebuild,
+  dcopperl-3.4.0_beta2.ebuild:
+  Install the perl modules under vendor_perl, not site_perl. Fixes bug 42819.
+
+*dcopperl-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcopperl-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  dcopperl-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *dcopperl-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/dcopperl/Manifest b/kde-base/dcopperl/Manifest
index 3ba826ea55f3..1fb69e067474 100644
--- a/kde-base/dcopperl/Manifest
+++ b/kde-base/dcopperl/Manifest
@@ -1,3 +1,22 @@
-MD5 b679589f0dd4aa333a3263fbca11fd6c dcopperl-3.3.1.ebuild 285
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 81d1f81eb80fbfcb30b31c6d0fd20175 files/digest-dcopperl-3.3.1 149
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 822c8da634f9778beca9fdcbc7528b25 ChangeLog 3356
+MD5 1b1e06629e9705a8d173c2b853bbf5ce dcopperl-3.3.1-r2.ebuild 779
+MD5 fe11119b9f95fea535570f4c27c55ef7 dcopperl-3.4.1.ebuild 954
+MD5 1df4a45daf664e0fe577a2e014c5b453 dcopperl-3.5.0.ebuild 943
+MD5 e8b8f88dbd332f083d1ac473793d7722 dcopperl-3.5.0_beta2.ebuild 955
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-dcopperl-3.3.1-r2 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-dcopperl-3.4.1 221
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-dcopperl-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-dcopperl-3.5.0_beta2 225
+MD5 d793eee91b4c53d85e826da7e98ed495 files/installdirs-vendor.diff 574
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDhgMwKRy60XGEcJIRAg8zAJ9bO2guj2DsFS8AS+CBs1Qd66OxfACgg7O1
+h9JaSNg5zFUC42PsT7zvLhc=
+=+i7g
+-----END PGP SIGNATURE-----
diff --git a/kde-base/dcopperl/dcopperl-3.3.1-r2.ebuild b/kde-base/dcopperl/dcopperl-3.3.1-r2.ebuild
index 6540b4421218..32b1f9ae37b1 100644
--- a/kde-base/dcopperl/dcopperl-3.3.1-r2.ebuild
+++ b/kde-base/dcopperl/dcopperl-3.3.1-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/kde-base/dcopperl/dcopperl-3.3.1-r2.ebuild,v 1.1 2005/02/19 15:34:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.3.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdebindings
 MAXKDEVER=3.3.2
diff --git a/kde-base/dcopperl/dcopperl-3.4.1.ebuild b/kde-base/dcopperl/dcopperl-3.4.1.ebuild
index 65fcf491e632..76f11ba9bbdf 100644
--- a/kde-base/dcopperl/dcopperl-3.4.1.ebuild
+++ b/kde-base/dcopperl/dcopperl-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit perl-module kde-meta
 
 DESCRIPTION="Perl bindings for DCOP"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff
diff --git a/kde-base/dcopperl/dcopperl-3.5.0.ebuild b/kde-base/dcopperl/dcopperl-3.5.0.ebuild
index d6bc2e1a6c9e..d202e1675e7d 100644
--- a/kde-base/dcopperl/dcopperl-3.5.0.ebuild
+++ b/kde-base/dcopperl/dcopperl-3.5.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/kde-base/dcopperl/dcopperl-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/dcopperl/dcopperl-3.5.0_beta2.ebuild b/kde-base/dcopperl/dcopperl-3.5.0_beta2.ebuild
index 65a1ec6ec84d..bbd9614816a6 100644
--- a/kde-base/dcopperl/dcopperl-3.5.0_beta2.ebuild
+++ b/kde-base/dcopperl/dcopperl-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcopperl/dcopperl-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit perl-module kde-meta
 
 DESCRIPTION="Perl bindings for DCOP"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff
diff --git a/kde-base/dcopperl/files/digest-dcopperl-3.3.1-r2 b/kde-base/dcopperl/files/digest-dcopperl-3.3.1-r2
index 7f5343b3c27f..a16df2f0cf51 100644
--- a/kde-base/dcopperl/files/digest-dcopperl-3.3.1-r2
+++ b/kde-base/dcopperl/files/digest-dcopperl-3.3.1-r2
@@ -1,3 +1 @@
-MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
-MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
diff --git a/kde-base/dcopperl/files/digest-dcopperl-3.4.1 b/kde-base/dcopperl/files/digest-dcopperl-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/dcopperl/files/digest-dcopperl-3.4.1
+++ b/kde-base/dcopperl/files/digest-dcopperl-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/dcopperl/files/no-gtk-glib-check.diff b/kde-base/dcopperl/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/dcopperl/files/no-gtk-glib-check.diff
+++ b/kde-base/dcopperl/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/dcopperl/metadata.xml b/kde-base/dcopperl/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/dcopperl/metadata.xml
+++ b/kde-base/dcopperl/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/dcoppython/ChangeLog b/kde-base/dcoppython/ChangeLog
index 3db7de45284f..826e12db6c7c 100644
--- a/kde-base/dcoppython/ChangeLog
+++ b/kde-base/dcoppython/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for kde-base/dcoppython
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/ChangeLog,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> dcoppython-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  dcoppython-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*dcoppython-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +dcoppython-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  dcoppython-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*dcoppython-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  +dcoppython-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*dcoppython-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +dcoppython-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> dcoppython-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*dcoppython-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +dcoppython-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> dcoppython-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> dcoppython-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  dcoppython-3.4.0_beta2-r1.ebuild:
+  Fix: this revision should also get the fix that marks is as safe to use with
+  RC1.
+
+*dcoppython-3.4.0_beta2-r1 (19 Feb 2005)
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcoppython-3.3.1-r1.ebuild,
+  +dcoppython-3.4.0_beta2-r1.ebuild:
+  Moved all versions to SLOT 0, because they install in /usr, and the
+  different SLOTs were overwriting one another. Bug 80858.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> dcoppython-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*dcoppython-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +dcoppython-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  dcoppython-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *dcoppython-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/dcoppython/Manifest b/kde-base/dcoppython/Manifest
index b19032a2ed28..31d37225e230 100644
--- a/kde-base/dcoppython/Manifest
+++ b/kde-base/dcoppython/Manifest
@@ -1,3 +1,23 @@
-MD5 7f7dafb57bb4ef464641d790904791b9 dcoppython-3.3.1.ebuild 295
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 eb60c31b9c50087c80632fae53046043 files/digest-dcoppython-3.3.1 151
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1f1d3e0f0541ad065acfab02e19503d3 ChangeLog 3122
+MD5 aa7cfb47c40b615833da94ef9e90d964 dcoppython-3.3.1-r1.ebuild 701
+MD5 659b6ddda0b8033accba7ff3f32bf751 dcoppython-3.4.1.ebuild 729
+MD5 9bf425879a719b0cd29a039f07e82ff8 dcoppython-3.4.2.ebuild 731
+MD5 e65f37b366c3220f9c983940c951e3f4 dcoppython-3.5.0.ebuild 722
+MD5 3ce007d5a083ea0ac74e0fab2edaa71e dcoppython-3.5.0_beta2.ebuild 734
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-dcoppython-3.3.1-r1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-dcoppython-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-dcoppython-3.4.2 300
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-dcoppython-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-dcoppython-3.5.0_beta2 225
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyJKntT9W3vfTuoRAhl3AJ9x207ppyEbNycySU/YO7qN1R75xgCfSOv6
+jgCVR9EzOdJftbh97flx0Xw=
+=jWD7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/dcoppython/dcoppython-3.3.1-r1.ebuild b/kde-base/dcoppython/dcoppython-3.3.1-r1.ebuild
index dbd080eeca7c..92391a5205d2 100644
--- a/kde-base/dcoppython/dcoppython-3.3.1-r1.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.3.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/kde-base/dcoppython/dcoppython-3.3.1-r1.ebuild,v 1.1 2005/02/19 15:35:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdebindings
 MAXKDEVER=3.3.2
diff --git a/kde-base/dcoppython/dcoppython-3.4.1.ebuild b/kde-base/dcoppython/dcoppython-3.4.1.ebuild
index 1018fc5ac81d..ec4a14f648d8 100644
--- a/kde-base/dcoppython/dcoppython-3.4.1.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.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/kde-base/dcoppython/dcoppython-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Python bindings for DCOP"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND="virtual/python"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/dcoppython/dcoppython-3.4.2.ebuild b/kde-base/dcoppython/dcoppython-3.4.2.ebuild
index 9dd86d3adf98..f7ed8db2a9df 100644
--- a/kde-base/dcoppython/dcoppython-3.4.2.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.4.2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Python bindings for DCOP"
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND="virtual/python"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/dcoppython/dcoppython-3.5.0.ebuild b/kde-base/dcoppython/dcoppython-3.5.0.ebuild
index d3a446a5b7fa..27cfd36977f5 100644
--- a/kde-base/dcoppython/dcoppython-3.5.0.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.5.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/kde-base/dcoppython/dcoppython-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/dcoppython/dcoppython-3.5.0_beta2.ebuild b/kde-base/dcoppython/dcoppython-3.5.0_beta2.ebuild
index f55457ba5ad5..939440d7b140 100644
--- a/kde-base/dcoppython/dcoppython-3.5.0_beta2.ebuild
+++ b/kde-base/dcoppython/dcoppython-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoppython/dcoppython-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Python bindings for DCOP"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="virtual/python"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/dcoppython/files/digest-dcoppython-3.3.1-r1 b/kde-base/dcoppython/files/digest-dcoppython-3.3.1-r1
index 7f5343b3c27f..a16df2f0cf51 100644
--- a/kde-base/dcoppython/files/digest-dcoppython-3.3.1-r1
+++ b/kde-base/dcoppython/files/digest-dcoppython-3.3.1-r1
@@ -1,3 +1 @@
-MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
-MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
diff --git a/kde-base/dcoppython/files/digest-dcoppython-3.4.1 b/kde-base/dcoppython/files/digest-dcoppython-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/dcoppython/files/digest-dcoppython-3.4.1
+++ b/kde-base/dcoppython/files/digest-dcoppython-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/dcoppython/files/digest-dcoppython-3.4.2 b/kde-base/dcoppython/files/digest-dcoppython-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/dcoppython/files/digest-dcoppython-3.4.2
+++ b/kde-base/dcoppython/files/digest-dcoppython-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/dcoppython/files/no-gtk-glib-check.diff b/kde-base/dcoppython/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/dcoppython/files/no-gtk-glib-check.diff
+++ b/kde-base/dcoppython/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/dcoppython/metadata.xml b/kde-base/dcoppython/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/dcoppython/metadata.xml
+++ b/kde-base/dcoppython/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/dcoprss/ChangeLog b/kde-base/dcoprss/ChangeLog
index e16db9ab55af..dbf6648942e4 100644
--- a/kde-base/dcoprss/ChangeLog
+++ b/kde-base/dcoprss/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/dcoprss
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/ChangeLog,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> dcoprss-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> dcoprss-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> dcoprss-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*dcoprss-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*dcoprss-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> dcoprss-3.5_beta1.ebuild,
+  dcoprss-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*dcoprss-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.5.0_beta2.ebuild:
+  New version.
+
+*dcoprss-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -dcoprss-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*dcoprss-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +dcoprss-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*dcoprss-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +dcoprss-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> dcoprss-3.4.2.ebuild:
+  ~alpha keyword.
+
+*dcoprss-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> dcoprss-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> dcoprss-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> dcoprss-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*dcoprss-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> dcoprss-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> dcoprss-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> dcoprss-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> dcoprss-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> dcoprss-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*dcoprss-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*dcoprss-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +dcoprss-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *dcoprss-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/dcoprss/Manifest b/kde-base/dcoprss/Manifest
index b3309bfdb928..e5ac95218f5d 100644
--- a/kde-base/dcoprss/Manifest
+++ b/kde-base/dcoprss/Manifest
@@ -1,4 +1,26 @@
-MD5 c0dc0ae1227cbded14a427af8f6c27a6 dcoprss-3.4.0_beta1.ebuild 407
-MD5 c0dc0ae1227cbded14a427af8f6c27a6 dcoprss-3.4.0_alpha1.ebuild 407
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-dcoprss-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-dcoprss-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2ae1a836b131532220f8cb10dbcbab46 ChangeLog 3549
+MD5 f74830c2332cb73eaf3d752315fcecbd dcoprss-3.4.1.ebuild 535
+MD5 aab32ce961f67617b84a367ea2595564 dcoprss-3.4.2.ebuild 550
+MD5 19a225ce15a46eb27f1c07a8eb5bda8b dcoprss-3.4.3.ebuild 546
+MD5 3bb9f673dd6cec357aef6b7b5eea2ffc dcoprss-3.5.0.ebuild 492
+MD5 1db1be6ea042155ee43c35d75d136b5d dcoprss-3.5.0_beta2.ebuild 503
+MD5 ccf11760b06f8db27192d417e51313a8 dcoprss-3.5.0_rc1.ebuild 502
+MD5 d9ef172a91a93b3e84e3bc8721b6e82a dcoprss-3.5_beta1.ebuild 527
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-dcoprss-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-dcoprss-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-dcoprss-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-dcoprss-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-dcoprss-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-dcoprss-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-dcoprss-3.5_beta1 71
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuJantT9W3vfTuoRAicVAJ0fKA1rbLTbY5rmGLVXKi6NsowBqwCfTV/V
+cUKibxSdbeR/Uei4zmtu7o0=
+=olC/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/dcoprss/dcoprss-3.4.1.ebuild b/kde-base/dcoprss/dcoprss-3.4.1.ebuild
index 39aac24327db..5f8d307f0c44 100644
--- a/kde-base/dcoprss/dcoprss-3.4.1.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.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/kde-base/dcoprss/dcoprss-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: RSS server and client for DCOP"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/librss)"
 OLDDEPEND="~kde-base/librss-$PV"
diff --git a/kde-base/dcoprss/dcoprss-3.4.2.ebuild b/kde-base/dcoprss/dcoprss-3.4.2.ebuild
index 63e8bf5321ae..c12fd316f722 100644
--- a/kde-base/dcoprss/dcoprss-3.4.2.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.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/kde-base/dcoprss/dcoprss-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: RSS server and client for DCOP"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/librss)"
 OLDDEPEND="~kde-base/librss-$PV"
diff --git a/kde-base/dcoprss/dcoprss-3.4.3.ebuild b/kde-base/dcoprss/dcoprss-3.4.3.ebuild
index 9b878fb4e1f9..765170fb31ad 100644
--- a/kde-base/dcoprss/dcoprss-3.4.3.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.4.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/kde-base/dcoprss/dcoprss-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: RSS server and client for DCOP"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/librss)"
 OLDDEPEND="~kde-base/librss-$PV"
diff --git a/kde-base/dcoprss/dcoprss-3.5.0.ebuild b/kde-base/dcoprss/dcoprss-3.5.0.ebuild
index af1c1aa60a5d..fac9ce8f83de 100644
--- a/kde-base/dcoprss/dcoprss-3.5.0.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.5.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/kde-base/dcoprss/dcoprss-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/dcoprss/dcoprss-3.5.0_beta2.ebuild b/kde-base/dcoprss/dcoprss-3.5.0_beta2.ebuild
index e737e25b867c..00980da6d2dc 100644
--- a/kde-base/dcoprss/dcoprss-3.5.0_beta2.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.5.0_beta2.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/kde-base/dcoprss/dcoprss-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: RSS server and client for DCOP"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange 3.5_beta1 $MAXKDEVER kde-base/librss)"
 
diff --git a/kde-base/dcoprss/dcoprss-3.5.0_rc1.ebuild b/kde-base/dcoprss/dcoprss-3.5.0_rc1.ebuild
index 04cd28cd4486..6aca5172b04b 100644
--- a/kde-base/dcoprss/dcoprss-3.5.0_rc1.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.5.0_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/kde-base/dcoprss/dcoprss-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/dcoprss/dcoprss-3.5_beta1.ebuild b/kde-base/dcoprss/dcoprss-3.5_beta1.ebuild
index 77ed8f1c8ef3..1e67598ae6d0 100644
--- a/kde-base/dcoprss/dcoprss-3.5_beta1.ebuild
+++ b/kde-base/dcoprss/dcoprss-3.5_beta1.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/kde-base/dcoprss/dcoprss-3.5_beta1.ebuild,v 1.1 2005/09/22 17:33:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/dcoprss/dcoprss-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: RSS server and client for DCOP"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/librss)"
 OLDDEPEND="~kde-base/librss-$PV"
diff --git a/kde-base/dcoprss/files/digest-dcoprss-3.4.1 b/kde-base/dcoprss/files/digest-dcoprss-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/dcoprss/files/digest-dcoprss-3.4.1
+++ b/kde-base/dcoprss/files/digest-dcoprss-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/dcoprss/files/digest-dcoprss-3.4.2 b/kde-base/dcoprss/files/digest-dcoprss-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/dcoprss/files/digest-dcoprss-3.4.2
+++ b/kde-base/dcoprss/files/digest-dcoprss-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/dcoprss/metadata.xml b/kde-base/dcoprss/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/dcoprss/metadata.xml
+++ b/kde-base/dcoprss/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index 7f254f4b0603..1fcfad8bb698 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> drkonqi-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> drkonqi-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> drkonqi-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*drkonqi-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*drkonqi-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> drkonqi-3.5_beta1.ebuild,
+  drkonqi-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*drkonqi-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.5.0_beta2.ebuild:
+  New version.
+
+*drkonqi-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -drkonqi-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*drkonqi-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +drkonqi-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*drkonqi-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +drkonqi-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> drkonqi-3.4.2.ebuild:
+  ~alpha keyword.
+
+*drkonqi-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> drkonqi-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> drkonqi-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> drkonqi-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*drkonqi-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> drkonqi-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> drkonqi-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> drkonqi-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> drkonqi-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> drkonqi-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*drkonqi-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*drkonqi-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +drkonqi-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *drkonqi-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/drkonqi/Manifest b/kde-base/drkonqi/Manifest
index 809d07756198..c2cd786fe9cf 100644
--- a/kde-base/drkonqi/Manifest
+++ b/kde-base/drkonqi/Manifest
@@ -1,4 +1,26 @@
-MD5 4e79d20c1655ce3a3e5afb29561d3b08 drkonqi-3.4.0_alpha1.ebuild 405
-MD5 4e79d20c1655ce3a3e5afb29561d3b08 drkonqi-3.4.0_beta1.ebuild 405
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-drkonqi-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-drkonqi-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 98fb6d97d5b1c7ecc558c04d07c345ca ChangeLog 3549
+MD5 a9cb3e7a732e6a24bf550867143e6e81 drkonqi-3.4.1.ebuild 426
+MD5 57aea957248a3568b5398dae0afec235 drkonqi-3.4.2.ebuild 439
+MD5 56749b88bcc97ebd42cc01428ecdf5ff drkonqi-3.4.3.ebuild 435
+MD5 980ec2d73c1d694cb6528d1feba53cf4 drkonqi-3.5.0.ebuild 415
+MD5 552b9ddc89a130a60af1801002694cb1 drkonqi-3.5.0_beta2.ebuild 420
+MD5 7e9a0a06d1ae6a20ef3e19b3a9608df0 drkonqi-3.5.0_rc1.ebuild 419
+MD5 899056895d87c134360a6d5ddc1c7931 drkonqi-3.5_beta1.ebuild 418
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-drkonqi-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-drkonqi-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-drkonqi-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-drkonqi-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-drkonqi-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-drkonqi-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-drkonqi-3.5_beta1 69
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjlcntT9W3vfTuoRAiJwAJ9umi2AqjfHm6cOTiWKtI/AOV0lugCfU99m
++m77W5ONn5VFvG8565IyG7k=
+=v//+
+-----END PGP SIGNATURE-----
diff --git a/kde-base/drkonqi/drkonqi-3.4.1.ebuild b/kde-base/drkonqi/drkonqi-3.4.1.ebuild
index 1d9a267d44b2..c773b6c7e32a 100644
--- a/kde-base/drkonqi/drkonqi-3.4.1.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.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/kde-base/drkonqi/drkonqi-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/drkonqi/drkonqi-3.4.2.ebuild b/kde-base/drkonqi/drkonqi-3.4.2.ebuild
index 76d6722f1f8b..241cab1b19c9 100644
--- a/kde-base/drkonqi/drkonqi-3.4.2.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.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/kde-base/drkonqi/drkonqi-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/drkonqi/drkonqi-3.4.3.ebuild b/kde-base/drkonqi/drkonqi-3.4.3.ebuild
index 2b692b00d882..371fb9ffc3ea 100644
--- a/kde-base/drkonqi/drkonqi-3.4.3.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.4.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/kde-base/drkonqi/drkonqi-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/drkonqi/drkonqi-3.5.0.ebuild b/kde-base/drkonqi/drkonqi-3.5.0.ebuild
index b03e3d478324..5fca76976ff1 100644
--- a/kde-base/drkonqi/drkonqi-3.5.0.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.5.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/kde-base/drkonqi/drkonqi-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/drkonqi/drkonqi-3.5.0_beta2.ebuild b/kde-base/drkonqi/drkonqi-3.5.0_beta2.ebuild
index a3822130b1a9..b9af99bc9f19 100644
--- a/kde-base/drkonqi/drkonqi-3.5.0_beta2.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.5.0_beta2.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/kde-base/drkonqi/drkonqi-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/drkonqi/drkonqi-3.5.0_rc1.ebuild b/kde-base/drkonqi/drkonqi-3.5.0_rc1.ebuild
index a9aa68901697..41ef869c7a6a 100644
--- a/kde-base/drkonqi/drkonqi-3.5.0_rc1.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.5.0_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/kde-base/drkonqi/drkonqi-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/drkonqi/drkonqi-3.5_beta1.ebuild b/kde-base/drkonqi/drkonqi-3.5_beta1.ebuild
index 17628f172d3b..6ccf21c31efa 100644
--- a/kde-base/drkonqi/drkonqi-3.5_beta1.ebuild
+++ b/kde-base/drkonqi/drkonqi-3.5_beta1.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/kde-base/drkonqi/drkonqi-3.5_beta1.ebuild,v 1.1 2005/09/22 17:34:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE crash handler gives the user feedback if a program crashed"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/drkonqi/files/digest-drkonqi-3.4.1 b/kde-base/drkonqi/files/digest-drkonqi-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/drkonqi/files/digest-drkonqi-3.4.1
+++ b/kde-base/drkonqi/files/digest-drkonqi-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/drkonqi/files/digest-drkonqi-3.4.2 b/kde-base/drkonqi/files/digest-drkonqi-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/drkonqi/files/digest-drkonqi-3.4.2
+++ b/kde-base/drkonqi/files/digest-drkonqi-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/drkonqi/metadata.xml b/kde-base/drkonqi/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/drkonqi/metadata.xml
+++ b/kde-base/drkonqi/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/eyesapplet/ChangeLog b/kde-base/eyesapplet/ChangeLog
index a384756f270b..cf13f29476ee 100644
--- a/kde-base/eyesapplet/ChangeLog
+++ b/kde-base/eyesapplet/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for kde-base/eyesapplet
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/ChangeLog,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
+
+*eyesapplet-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +eyesapplet-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*eyesapplet-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +eyesapplet-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> eyesapplet-3.5_beta1.ebuild,
+  eyesapplet-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*eyesapplet-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +eyesapplet-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -eyesapplet-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*eyesapplet-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +eyesapplet-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> eyesapplet-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*eyesapplet-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +eyesapplet-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  eyesapplet-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> eyesapplet-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> eyesapplet-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> eyesapplet-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*eyesapplet-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +eyesapplet-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> eyesapplet-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> eyesapplet-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> eyesapplet-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> eyesapplet-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  eyesapplet-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*eyesapplet-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +eyesapplet-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*eyesapplet-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +eyesapplet-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *eyesapplet-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/eyesapplet/Manifest b/kde-base/eyesapplet/Manifest
index abecb36c2ba0..fe9c476adf45 100644
--- a/kde-base/eyesapplet/Manifest
+++ b/kde-base/eyesapplet/Manifest
@@ -1,4 +1,12 @@
-MD5 21518314116cc3bacff62ac94427970a eyesapplet-3.4.0_alpha1.ebuild 308
-MD5 21518314116cc3bacff62ac94427970a eyesapplet-3.4.0_beta1.ebuild 308
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-eyesapplet-3.4.0_beta1 212
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-eyesapplet-3.4.0_alpha1 68
+MD5 17ccea4fde67f037a76338122a4b3b29 ChangeLog 3216
+MD5 a1b482f6dba9c1d3b649b67544e15000 eyesapplet-3.4.1.ebuild 445
+MD5 d6f85fb2ab218d84b8af2fad15e9cbbf eyesapplet-3.5.0.ebuild 422
+MD5 949dbde5b9ebf515ef1f57cf615930fe eyesapplet-3.5.0_beta2.ebuild 427
+MD5 8eaacb353ce5ff970562c5a8e523ad4f eyesapplet-3.5.0_rc1.ebuild 426
+MD5 ca70792c58c5d871cc141f639d125789 eyesapplet-3.5_beta1.ebuild 425
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-eyesapplet-3.4.1 208
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-eyesapplet-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-eyesapplet-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-eyesapplet-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-eyesapplet-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/eyesapplet/eyesapplet-3.4.1.ebuild b/kde-base/eyesapplet/eyesapplet-3.4.1.ebuild
index 6a38d1285e9b..3a1322ae07f8 100644
--- a/kde-base/eyesapplet/eyesapplet-3.4.1.ebuild
+++ b/kde-base/eyesapplet/eyesapplet-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/eyesapplet-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/eyesapplet-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdetoys
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/eyesapplet/eyesapplet-3.5.0.ebuild b/kde-base/eyesapplet/eyesapplet-3.5.0.ebuild
index bfbb4f485d42..c04bc5951bf0 100644
--- a/kde-base/eyesapplet/eyesapplet-3.5.0.ebuild
+++ b/kde-base/eyesapplet/eyesapplet-3.5.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/kde-base/eyesapplet/eyesapplet-3.5.0.ebuild,v 1.1 2005/11/22 22:13:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/eyesapplet-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/eyesapplet/eyesapplet-3.5.0_beta2.ebuild b/kde-base/eyesapplet/eyesapplet-3.5.0_beta2.ebuild
index e5044131361a..4d4d99d2e8af 100644
--- a/kde-base/eyesapplet/eyesapplet-3.5.0_beta2.ebuild
+++ b/kde-base/eyesapplet/eyesapplet-3.5.0_beta2.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/kde-base/eyesapplet/eyesapplet-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/eyesapplet-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/eyesapplet/eyesapplet-3.5.0_rc1.ebuild b/kde-base/eyesapplet/eyesapplet-3.5.0_rc1.ebuild
index 158a2f789a5b..8681916af06a 100644
--- a/kde-base/eyesapplet/eyesapplet-3.5.0_rc1.ebuild
+++ b/kde-base/eyesapplet/eyesapplet-3.5.0_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/kde-base/eyesapplet/eyesapplet-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/eyesapplet-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/eyesapplet/eyesapplet-3.5_beta1.ebuild b/kde-base/eyesapplet/eyesapplet-3.5_beta1.ebuild
index 9161fa909cf8..7b069847dcb4 100644
--- a/kde-base/eyesapplet/eyesapplet-3.5_beta1.ebuild
+++ b/kde-base/eyesapplet/eyesapplet-3.5_beta1.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/kde-base/eyesapplet/eyesapplet-3.5_beta1.ebuild,v 1.1 2005/09/22 17:35:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/eyesapplet/eyesapplet-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applet: eyes following the movement of the mouse pointer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/eyesapplet/files/digest-eyesapplet-3.4.1 b/kde-base/eyesapplet/files/digest-eyesapplet-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/eyesapplet/files/digest-eyesapplet-3.4.1
+++ b/kde-base/eyesapplet/files/digest-eyesapplet-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/eyesapplet/metadata.xml b/kde-base/eyesapplet/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/eyesapplet/metadata.xml
+++ b/kde-base/eyesapplet/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/fifteenapplet/ChangeLog b/kde-base/fifteenapplet/ChangeLog
index a59f2441cf6d..3cc6b23812fb 100644
--- a/kde-base/fifteenapplet/ChangeLog
+++ b/kde-base/fifteenapplet/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/fifteenapplet
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/ChangeLog,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  fifteenapplet-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> fifteenapplet-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  fifteenapplet-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*fifteenapplet-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +fifteenapplet-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*fifteenapplet-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +fifteenapplet-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  fifteenapplet-3.5_beta1.ebuild, fifteenapplet-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*fifteenapplet-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +fifteenapplet-3.5.0_beta2.ebuild:
+  New version.
+
+*fifteenapplet-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +fifteenapplet-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -fifteenapplet-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*fifteenapplet-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +fifteenapplet-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  fifteenapplet-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*fifteenapplet-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +fifteenapplet-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  fifteenapplet-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> fifteenapplet-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> fifteenapplet-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> fifteenapplet-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*fifteenapplet-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +fifteenapplet-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> fifteenapplet-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> fifteenapplet-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> fifteenapplet-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> fifteenapplet-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  fifteenapplet-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*fifteenapplet-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +fifteenapplet-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *fifteenapplet-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/fifteenapplet/Manifest b/kde-base/fifteenapplet/Manifest
index 7cc34376c6d3..e82d5e66e4a1 100644
--- a/kde-base/fifteenapplet/Manifest
+++ b/kde-base/fifteenapplet/Manifest
@@ -1,4 +1,24 @@
-MD5 b22ddaa73aa400eb166688ce3cb613a4 fifteenapplet-3.4.0_alpha1.ebuild 274
-MD5 b22ddaa73aa400eb166688ce3cb613a4 fifteenapplet-3.4.0_beta1.ebuild 274
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-fifteenapplet-3.4.0_alpha1 68
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-fifteenapplet-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 747f702a2f9486ee44080a45bd8a38ba ChangeLog 3624
+MD5 f66bf7eb93688ec5026bfd7a44899d45 fifteenapplet-3.4.1.ebuild 416
+MD5 c1f468f1e7c37f0c80a17fde6e45620a fifteenapplet-3.4.3.ebuild 415
+MD5 9616ce4ef29641f5177894347a95b69b fifteenapplet-3.5.0.ebuild 394
+MD5 780ee4e7176f75a5e315b66f32048d1e fifteenapplet-3.5.0_beta2.ebuild 399
+MD5 9f5de5af38ceb189cc8bbed99fd4534d fifteenapplet-3.5.0_rc1.ebuild 398
+MD5 561b630417ce4650050723dc825057a0 fifteenapplet-3.5_beta1.ebuild 397
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-fifteenapplet-3.4.1 208
+MD5 4792409083f3033f880840748c1ec31a files/digest-fifteenapplet-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-fifteenapplet-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-fifteenapplet-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-fifteenapplet-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-fifteenapplet-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvhDntT9W3vfTuoRArzhAJ9B4Hy/ZSpSPI/J4Zg8Y7mnVyReFwCffLj+
+M4gBPMzn5aEazfwhpXr2V7s=
+=mNfv
+-----END PGP SIGNATURE-----
diff --git a/kde-base/fifteenapplet/fifteenapplet-3.4.1.ebuild b/kde-base/fifteenapplet/fifteenapplet-3.4.1.ebuild
index 3388b53d1423..2e46a20125a6 100644
--- a/kde-base/fifteenapplet/fifteenapplet-3.4.1.ebuild
+++ b/kde-base/fifteenapplet/fifteenapplet-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdetoys
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker plugin for the 15-game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/fifteenapplet/fifteenapplet-3.4.3.ebuild b/kde-base/fifteenapplet/fifteenapplet-3.4.3.ebuild
index 0b855374738e..e6f90d0fe57e 100644
--- a/kde-base/fifteenapplet/fifteenapplet-3.4.3.ebuild
+++ b/kde-base/fifteenapplet/fifteenapplet-3.4.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/kde-base/fifteenapplet/fifteenapplet-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker plugin for the 15-game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND=""
\ No newline at end of file
+DEPEND=""
diff --git a/kde-base/fifteenapplet/fifteenapplet-3.5.0.ebuild b/kde-base/fifteenapplet/fifteenapplet-3.5.0.ebuild
index 365c4df5be81..3b1d28bc37e7 100644
--- a/kde-base/fifteenapplet/fifteenapplet-3.5.0.ebuild
+++ b/kde-base/fifteenapplet/fifteenapplet-3.5.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/kde-base/fifteenapplet/fifteenapplet-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/fifteenapplet/fifteenapplet-3.5.0_beta2.ebuild b/kde-base/fifteenapplet/fifteenapplet-3.5.0_beta2.ebuild
index 7028376b0d71..b1e5752df6a9 100644
--- a/kde-base/fifteenapplet/fifteenapplet-3.5.0_beta2.ebuild
+++ b/kde-base/fifteenapplet/fifteenapplet-3.5.0_beta2.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/kde-base/fifteenapplet/fifteenapplet-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker plugin for the 15-game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/fifteenapplet/fifteenapplet-3.5.0_rc1.ebuild b/kde-base/fifteenapplet/fifteenapplet-3.5.0_rc1.ebuild
index 377ab24ef59f..f0a05e754c77 100644
--- a/kde-base/fifteenapplet/fifteenapplet-3.5.0_rc1.ebuild
+++ b/kde-base/fifteenapplet/fifteenapplet-3.5.0_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/kde-base/fifteenapplet/fifteenapplet-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/fifteenapplet/fifteenapplet-3.5_beta1.ebuild b/kde-base/fifteenapplet/fifteenapplet-3.5_beta1.ebuild
index cbfc64e001d1..56c0791b5c7a 100644
--- a/kde-base/fifteenapplet/fifteenapplet-3.5_beta1.ebuild
+++ b/kde-base/fifteenapplet/fifteenapplet-3.5_beta1.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/kde-base/fifteenapplet/fifteenapplet-3.5_beta1.ebuild,v 1.1 2005/09/22 17:36:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/fifteenapplet/fifteenapplet-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker plugin for the 15-game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/fifteenapplet/files/digest-fifteenapplet-3.4.1 b/kde-base/fifteenapplet/files/digest-fifteenapplet-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/fifteenapplet/files/digest-fifteenapplet-3.4.1
+++ b/kde-base/fifteenapplet/files/digest-fifteenapplet-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/fifteenapplet/metadata.xml b/kde-base/fifteenapplet/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/fifteenapplet/metadata.xml
+++ b/kde-base/fifteenapplet/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/juk/ChangeLog b/kde-base/juk/ChangeLog
index 8531b9a1481d..5960364b4664 100644
--- a/kde-base/juk/ChangeLog
+++ b/kde-base/juk/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for kde-base/juk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/ChangeLog,v 1.1.1.1 2005/11/30 10:14:18 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> juk-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> juk-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> juk-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*juk-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +juk-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*juk-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +juk-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> juk-3.5_beta1.ebuild,
+  juk-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*juk-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +juk-3.5.0_beta2.ebuild:
+  New version.
+
+*juk-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +juk-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> juk-3.5_beta1.ebuild:
+  Make the ebuild work properly with KDE 3.5 (#107018). Enable akode support.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -juk-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*juk-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +juk-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*juk-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +juk-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> juk-3.4.2.ebuild:
+  ~alpha keyword.
+
+  29 Jul 2005; Dan Armak <danarmak@gentoo.org> juk-3.4.2.ebuild:
+  Use local use flag musicbrainz to determine whether to build musicbrainz
+  support (defaulting to off). This matches the new kdemultimedia ebuild
+  usage. musicbrainz has been a problematic dep, historically.
+
+*juk-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdemultimedia-juk.patch, +juk-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> juk-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> juk-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> juk-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org> juk-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592), 'mad' into 'mp3' (#94045).
+
+*juk-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +juk-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> juk-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> juk-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> juk-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> juk-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> juk-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*juk-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +juk-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  07 Feb 2005; Simone Gotti <motaboy@gentoo.org> juk-3.4.0_beta2.ebuild:
+  Now juk has a fixed dep on akode, so it needs its libs and its headers.
+
+*juk-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +juk-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> juk-3.4.0_beta1.ebuild:
+  Add missing (optional) dep on gstreamer and gst-plugins.
 
 *juk-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/juk/Manifest b/kde-base/juk/Manifest
index 946c7bce9c31..b168ad34a726 100644
--- a/kde-base/juk/Manifest
+++ b/kde-base/juk/Manifest
@@ -1,4 +1,27 @@
-MD5 5da4d40bf77ea67b4d9a2091165923bb juk-3.4.0_alpha1.ebuild 544
-MD5 5da4d40bf77ea67b4d9a2091165923bb juk-3.4.0_beta1.ebuild 544
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-juk-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-juk-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 92eb61412ef0462b3aa1f7a5c5cf4354 ChangeLog 4284
+MD5 4fdb0ffd65dc5bbcb439ea875a4f1ba6 files/configure-fix-kdemultimedia-juk.patch 4482
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-juk-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-juk-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-juk-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-juk-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-juk-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-juk-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-juk-3.5_beta1 74
+MD5 ec445dac6f93f19d62a5ea6cce9087dc juk-3.4.1.ebuild 1084
+MD5 6839233323dd9b1caded4608bb0d7446 juk-3.4.2.ebuild 1274
+MD5 69a178652e0cfe988fbdaea15c0eb4fe juk-3.4.3.ebuild 1270
+MD5 25783219c0448acdfe303723b86d1132 juk-3.5.0.ebuild 1189
+MD5 fd0a55d8ac9064e0a95808a7ca2781a4 juk-3.5.0_beta2.ebuild 1194
+MD5 eae187cdfa979cdfe48b771d29ef9c9e juk-3.5.0_rc1.ebuild 1193
+MD5 3f686bda90a65bfac56516b3fbd50006 juk-3.5_beta1.ebuild 1192
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmrXntT9W3vfTuoRAsl1AJ9Hno39bmOgmeBTWBOxbn4sarhqfwCfXL3N
+4F+X8tM9pORnxJcHZBvBaA4=
+=bQOR
+-----END PGP SIGNATURE-----
diff --git a/kde-base/juk/files/digest-juk-3.4.1 b/kde-base/juk/files/digest-juk-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/juk/files/digest-juk-3.4.1
+++ b/kde-base/juk/files/digest-juk-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/juk/files/digest-juk-3.4.2 b/kde-base/juk/files/digest-juk-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/juk/files/digest-juk-3.4.2
+++ b/kde-base/juk/files/digest-juk-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/juk/juk-3.4.1.ebuild b/kde-base/juk/juk-3.4.1.ebuild
index 3e16e0b42e18..ae73c3b18316 100644
--- a/kde-base/juk/juk-3.4.1.ebuild
+++ b/kde-base/juk/juk-3.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/kde-base/juk/juk-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,18 +8,18 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Jukebox and music manager for KDE"
-KEYWORDS="~x86 ~amd64"
-IUSE="flac gstreamer mad oggvorbis"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="flac gstreamer mp3 vorbis"
 
 DEPEND="media-libs/taglib
 	media-libs/tunepimp
-	gstreamer? ( >=media-libs/gstreamer-0.8 )
+	gstreamer? ( >=media-libs/gstreamer-0.8
+	             >=media-libs/gst-plugins-0.8 )
 	$(deprange $PV $MAXKDEVER kde-base/akode)"
 
 RDEPEND="${DEPEND}
-	gstreamer? ( >=media-libs/gst-plugins-0.8
-		     mad? ( >=media-plugins/gst-plugins-mad-0.8 )
-		     oggvorbis? ( >=media-plugins/gst-plugins-ogg-0.8
+	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
+		     vorbis? ( >=media-plugins/gst-plugins-ogg-0.8
 				  >=media-plugins/gst-plugins-vorbis-0.8 )
 		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
 
diff --git a/kde-base/juk/juk-3.4.2.ebuild b/kde-base/juk/juk-3.4.2.ebuild
index 91e128197512..55bd2fe77f86 100644
--- a/kde-base/juk/juk-3.4.2.ebuild
+++ b/kde-base/juk/juk-3.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/kde-base/juk/juk-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,14 +8,12 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Jukebox and music manager for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="flac gstreamer mp3 vorbis"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="flac gstreamer mp3 vorbis musicbrainz"
 
-# There's a configure switch for optional musicbrainz support, but there's no use flag for it, and I don't want to introduce
-# a local nomusicbrainz flag
 DEPEND="media-libs/taglib
-	media-libs/tunepimp
-	media-libs/musicbrainz
+	musicbrainz? ( 	media-libs/tunepimp
+			media-libs/musicbrainz )
 	gstreamer? ( >=media-libs/gstreamer-0.8
 	             >=media-libs/gst-plugins-0.8 )
 	$(deprange $PV $MAXKDEVER kde-base/akode)"
@@ -27,7 +25,7 @@ RDEPEND="${DEPEND}
 		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
 
 PATCHES="$FILESDIR/configure-fix-kdemultimedia-juk.patch"
-myconf="$myconf $(use_with gstreamer)"
+myconf="$myconf $(use_with gstreamer) $(use_with musicbrainz)"
 
 KMCOPYLIB="
 	libakode akode/lib/"
diff --git a/kde-base/juk/juk-3.4.3.ebuild b/kde-base/juk/juk-3.4.3.ebuild
index 65757fa7089c..6171c8b3fbae 100644
--- a/kde-base/juk/juk-3.4.3.ebuild
+++ b/kde-base/juk/juk-3.4.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/kde-base/juk/juk-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Jukebox and music manager for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="flac gstreamer mp3 vorbis musicbrainz"
 
 DEPEND="media-libs/taglib
diff --git a/kde-base/juk/juk-3.5.0.ebuild b/kde-base/juk/juk-3.5.0.ebuild
index 51d0b44e54d4..690b8e07cfb7 100644
--- a/kde-base/juk/juk-3.5.0.ebuild
+++ b/kde-base/juk/juk-3.5.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/kde-base/juk/juk-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/juk/juk-3.5.0_beta2.ebuild b/kde-base/juk/juk-3.5.0_beta2.ebuild
index 3a4ffb4db074..c02cb98bfc78 100644
--- a/kde-base/juk/juk-3.5.0_beta2.ebuild
+++ b/kde-base/juk/juk-3.5.0_beta2.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/kde-base/juk/juk-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Jukebox and music manager for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="flac gstreamer mp3 vorbis musicbrainz"
 
 DEPEND="media-libs/taglib
diff --git a/kde-base/juk/juk-3.5.0_rc1.ebuild b/kde-base/juk/juk-3.5.0_rc1.ebuild
index ed886ff79c24..cdcccf3dc75a 100644
--- a/kde-base/juk/juk-3.5.0_rc1.ebuild
+++ b/kde-base/juk/juk-3.5.0_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/kde-base/juk/juk-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/juk/juk-3.5_beta1.ebuild b/kde-base/juk/juk-3.5_beta1.ebuild
index b55bdf3c1c1b..954971f4baac 100644
--- a/kde-base/juk/juk-3.5_beta1.ebuild
+++ b/kde-base/juk/juk-3.5_beta1.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/kde-base/juk/juk-3.5_beta1.ebuild,v 1.1 2005/09/22 17:37:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/juk/juk-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:18 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,15 +8,15 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Jukebox and music manager for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="flac gstreamer mp3 vorbis musicbrainz"
 
 DEPEND="media-libs/taglib
+	media-libs/akode
 	musicbrainz? ( 	media-libs/tunepimp
 			media-libs/musicbrainz )
 	gstreamer? ( >=media-libs/gstreamer-0.8
-	             >=media-libs/gst-plugins-0.8 )
-	$(deprange $PV $MAXKDEVER kde-base/akode)"
+	             >=media-libs/gst-plugins-0.8 )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
@@ -24,13 +24,7 @@ RDEPEND="${DEPEND}
 				  >=media-plugins/gst-plugins-vorbis-0.8 )
 		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
 
-PATCHES="$FILESDIR/configure-fix-kdemultimedia-juk.patch"
-myconf="$myconf $(use_with gstreamer) $(use_with musicbrainz)"
-
-KMCOPYLIB="
-	libakode akode/lib/"
-KMEXTRACTONLY="arts/configure.in.in
-	akode/lib/"
+KMEXTRACTONLY="arts/configure.in.in"
 
 pkg_setup() {
 	if ! useq arts && ! useq gstreamer; then
@@ -38,3 +32,10 @@ pkg_setup() {
 		die
 	fi
 }
+
+src_compile() {
+	local myconf="--with-akode $(use_with gstreamer)
+	              $(use_with musicbrainz)"
+
+	kde-meta_src_compile
+}
diff --git a/kde-base/juk/metadata.xml b/kde-base/juk/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/juk/metadata.xml
+++ b/kde-base/juk/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kaboodle/ChangeLog b/kde-base/kaboodle/ChangeLog
index 7ca5bd21f410..4bb064404e65 100644
--- a/kde-base/kaboodle/ChangeLog
+++ b/kde-base/kaboodle/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/kaboodle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/ChangeLog,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kaboodle-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kaboodle-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kaboodle-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kaboodle-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kaboodle-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kaboodle-3.5_beta1.ebuild,
+  kaboodle-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kaboodle-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.5.0_beta2.ebuild:
+  New version.
+
+*kaboodle-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.4.3.ebuild:
+  New version.
+
+  27 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> kaboodle-3.5_beta1.ebuild:
+  Remove dependencies on specific plugins.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kaboodle-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kaboodle-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaboodle-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kaboodle-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kaboodle-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaboodle-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kaboodle-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kaboodle-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kaboodle-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kaboodle-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kaboodle-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kaboodle-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kaboodle-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kaboodle-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kaboodle-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kaboodle-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kaboodle-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kaboodle-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kaboodle-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kaboodle-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kaboodle/Manifest b/kde-base/kaboodle/Manifest
index 8e0cbb4601c2..23dac8bdf7a1 100644
--- a/kde-base/kaboodle/Manifest
+++ b/kde-base/kaboodle/Manifest
@@ -1,4 +1,24 @@
-MD5 e28600355fc54c9860c4556c838bf6ea kaboodle-3.4.0_alpha1.ebuild 987
-MD5 e28600355fc54c9860c4556c838bf6ea kaboodle-3.4.0_beta1.ebuild 987
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kaboodle-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kaboodle-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3c2b8aab7902c963031ced4a444f678 ChangeLog 3680
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kaboodle-3.4.1 227
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kaboodle-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kaboodle-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kaboodle-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kaboodle-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kaboodle-3.5_beta1 74
+MD5 7f47254e7da51f10ee99acdf0f9f6a62 kaboodle-3.4.1.ebuild 1094
+MD5 8fa170ebd2a0ede3add3643231767c98 kaboodle-3.4.3.ebuild 1126
+MD5 83109a22f3ae8f90b461da9a7ab51539 kaboodle-3.5.0.ebuild 676
+MD5 8927d53a5e8ff41902e7c4cfbef7e2c0 kaboodle-3.5.0_beta2.ebuild 681
+MD5 bd6fc2d8343a8cbb31ec7015a783eb8c kaboodle-3.5.0_rc1.ebuild 680
+MD5 03ab65612c424a59394184768e4426c7 kaboodle-3.5_beta1.ebuild 679
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmtuntT9W3vfTuoRAinvAJ4uTr4vnB1czpxvy2oW+/h6HxJ4wACeIXTi
+nPISJcJyKqkaZD3GDowlJRc=
+=PKMn
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kaboodle/files/digest-kaboodle-3.4.1 b/kde-base/kaboodle/files/digest-kaboodle-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kaboodle/files/digest-kaboodle-3.4.1
+++ b/kde-base/kaboodle/files/digest-kaboodle-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kaboodle/kaboodle-3.4.1.ebuild b/kde-base/kaboodle/kaboodle-3.4.1.ebuild
index e76bf73c8c00..f379a406fcad 100644
--- a/kde-base/kaboodle/kaboodle-3.4.1.ebuild
+++ b/kde-base/kaboodle/kaboodle-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdemultimedia
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The Lean KDE Media Player"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="xine audiofile"
 
 OLDRDEPEND="
@@ -17,11 +17,11 @@ OLDRDEPEND="
 	~kde-base/artsplugin-mpg123-$PV
 	xine? ( ~kde-base/artsplugin-xine-$PV )
 	audiofile? ( ~kde-base/artsplugin-audiofile-$PV )"
-RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
-	$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpeglib)
-	$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpg123)
-	xine? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-xine) )
-	audiofile? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile) )"
+RDEPEND="$(deprange $PV 3.4.2 kde-base/kdemultimedia-arts)
+	$(deprange $PV 3.4.2 kde-base/artsplugin-mpeglib)
+	$(deprange $PV 3.4.2 kde-base/artsplugin-mpg123)
+	xine? ( $(deprange $PV 3.4.2 kde-base/artsplugin-xine) )
+	audiofile? ( $(deprange $PV 3.4.2 kde-base/artsplugin-audiofile) )"
 
 KMEXTRACTONLY="arts/"
 
diff --git a/kde-base/kaboodle/kaboodle-3.4.3.ebuild b/kde-base/kaboodle/kaboodle-3.4.3.ebuild
index d0c713a611e1..685daedcd188 100644
--- a/kde-base/kaboodle/kaboodle-3.4.3.ebuild
+++ b/kde-base/kaboodle/kaboodle-3.4.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/kde-base/kaboodle/kaboodle-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The Lean KDE Media Player"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="xine audiofile"
 
 OLDRDEPEND="
@@ -30,4 +30,4 @@ pkg_setup() {
 		eerror "${PN} needs the USE=\"arts\" enabled and also the kdelibs compiled with the USE=\"arts\" enabled"
 		die
 	fi
-}
\ No newline at end of file
+}
diff --git a/kde-base/kaboodle/kaboodle-3.5.0.ebuild b/kde-base/kaboodle/kaboodle-3.5.0.ebuild
index 0d1642189054..490dee3554f6 100644
--- a/kde-base/kaboodle/kaboodle-3.5.0.ebuild
+++ b/kde-base/kaboodle/kaboodle-3.5.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/kde-base/kaboodle/kaboodle-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kaboodle/kaboodle-3.5.0_beta2.ebuild b/kde-base/kaboodle/kaboodle-3.5.0_beta2.ebuild
index 7c40eb94190e..296d1a35ffa8 100644
--- a/kde-base/kaboodle/kaboodle-3.5.0_beta2.ebuild
+++ b/kde-base/kaboodle/kaboodle-3.5.0_beta2.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/kde-base/kaboodle/kaboodle-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The Lean KDE Media Player"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 OLDRDEPEND="~kde-base/kdemultimedia-arts-$PV"
diff --git a/kde-base/kaboodle/kaboodle-3.5.0_rc1.ebuild b/kde-base/kaboodle/kaboodle-3.5.0_rc1.ebuild
index 143edb1455b1..2851011f746a 100644
--- a/kde-base/kaboodle/kaboodle-3.5.0_rc1.ebuild
+++ b/kde-base/kaboodle/kaboodle-3.5.0_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/kde-base/kaboodle/kaboodle-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kaboodle/kaboodle-3.5_beta1.ebuild b/kde-base/kaboodle/kaboodle-3.5_beta1.ebuild
index 54aeada2ade5..7374c5411d2f 100644
--- a/kde-base/kaboodle/kaboodle-3.5_beta1.ebuild
+++ b/kde-base/kaboodle/kaboodle-3.5_beta1.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/kde-base/kaboodle/kaboodle-3.5_beta1.ebuild,v 1.1 2005/09/22 17:38:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaboodle/kaboodle-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,20 +8,11 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The Lean KDE Media Player"
-KEYWORDS="~amd64"
-IUSE="xine audiofile"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
 
-OLDRDEPEND="
-	~kde-base/kdemultimedia-arts-$PV
-	~kde-base/artsplugin-mpeglib-$PV
-	~kde-base/artsplugin-mpg123-$PV
-	xine? ( ~kde-base/artsplugin-xine-$PV )
-	audiofile? ( ~kde-base/artsplugin-audiofile-$PV )"
-RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
-	$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpeglib)
-	$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpg123)
-	xine? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-xine) )
-	audiofile? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile) )"
+OLDRDEPEND="~kde-base/kdemultimedia-arts-$PV"
+RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)"
 
 KMEXTRACTONLY="arts/"
 
@@ -30,4 +21,4 @@ pkg_setup() {
 		eerror "${PN} needs the USE=\"arts\" enabled and also the kdelibs compiled with the USE=\"arts\" enabled"
 		die
 	fi
-}
\ No newline at end of file
+}
diff --git a/kde-base/kaboodle/metadata.xml b/kde-base/kaboodle/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kaboodle/metadata.xml
+++ b/kde-base/kaboodle/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kaddressbook-plugins/ChangeLog b/kde-base/kaddressbook-plugins/ChangeLog
index 34388ba6bffb..8fb69511a95f 100644
--- a/kde-base/kaddressbook-plugins/ChangeLog
+++ b/kde-base/kaddressbook-plugins/ChangeLog
@@ -1,10 +1,114 @@
 # ChangeLog for kde-base/kaddressbook-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/ChangeLog,v 1.1 2005/02/11 01:10:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kaddressbook-plugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kaddressbook-plugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kaddressbook-plugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kaddressbook-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kaddressbook-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kaddressbook-plugins-3.5_beta1.ebuild,
+  kaddressbook-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kaddressbook-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+*kaddressbook-plugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-plugins-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  kaddressbook-plugins-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kaddressbook-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kaddressbook-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaddressbook-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kaddressbook-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaddressbook-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kaddressbook-plugins-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kaddressbook-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kaddressbook-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kaddressbook-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kaddressbook-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kaddressbook-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kaddressbook-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kaddressbook-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kaddressbook-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kaddressbook-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kaddressbook-plugins-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org> :
+  Importing beta1 module as well so we can remove obsoleted
+  kaddressbook-xxports-kworldclock
 
 *kaddressbook-plugins-3.4.0_beta2 (10 Feb 2005)
 
   10 Feb 2005; Caleb Tennis <caleb@gentoo.org> +metadata.xml,
   +kaddressbook-plugins-3.4.0_beta2.ebuild:
   Initial import - replaces kde-base/kaddressbook-xxports-kworldclock
-
diff --git a/kde-base/kaddressbook-plugins/Manifest b/kde-base/kaddressbook-plugins/Manifest
index efc4273be6e8..b83dc8c751eb 100644
--- a/kde-base/kaddressbook-plugins/Manifest
+++ b/kde-base/kaddressbook-plugins/Manifest
@@ -1,2 +1,24 @@
-MD5 693cdd0e4a18f89869d03829535ec21d kaddressbook-plugins-3.4.0_beta2.ebuild 568
-MD5 9009a89a3313cb85f25a0d66683e48ed files/digest-kaddressbook-plugins-3.4.0_beta2 298
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76dc2d298a21b4de0a2f155a0ffbfb65 ChangeLog 3708
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-kaddressbook-plugins-3.4.1 215
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kaddressbook-plugins-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kaddressbook-plugins-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-kaddressbook-plugins-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-kaddressbook-plugins-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kaddressbook-plugins-3.5_beta1 70
+MD5 e81e3d20b60c3a2038e91bb16e8bc8a4 kaddressbook-plugins-3.4.1.ebuild 546
+MD5 3eab2c3b02102e3d0f70f5a6d0c22ec1 kaddressbook-plugins-3.4.3.ebuild 549
+MD5 2450b4740cc8a584976396958b8bbff7 kaddressbook-plugins-3.5.0.ebuild 491
+MD5 854c65f641320ba42e4ca9213dac8c4f kaddressbook-plugins-3.5.0_beta2.ebuild 496
+MD5 00f8349aaaa90e59e13bcfa74359d645 kaddressbook-plugins-3.5.0_rc1.ebuild 495
+MD5 47425947177f16ac221c22b81d26026c kaddressbook-plugins-3.5_beta1.ebuild 532
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxcantT9W3vfTuoRApbBAJ0X/jJneGYMHwa+9TSeSGynnb2q5ACfT2KW
++YwAmhO5hRl2++1dkJUUDMg=
+=JY+x
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kaddressbook-plugins/files/digest-kaddressbook-plugins-3.4.1 b/kde-base/kaddressbook-plugins/files/digest-kaddressbook-plugins-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/kaddressbook-plugins/files/digest-kaddressbook-plugins-3.4.1
+++ b/kde-base/kaddressbook-plugins/files/digest-kaddressbook-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.1.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.1.ebuild
index a6cce7876f2f..2a5bf517c016 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.1.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Plugins for KAB"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/kaddressbook)"
+DEPEND="$(deprange $PV 3.4.2 kde-base/kaddressbook)"
 OLDDEPEND="~kde-base/kaddressbook-$PV"
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.3.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.3.ebuild
index dfcfc10254e9..c3dd82d82341 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.3.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.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/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Plugins for KAB"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kaddressbook)"
 OLDDEPEND="~kde-base/kaddressbook-$PV"
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0.ebuild
index f8c5b1b387f3..e19b57136ce7 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.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/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_beta2.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_beta2.ebuild
index bc53d24afd89..788e58f9bf24 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_beta2.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/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Plugins for KAB"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kaddressbook)"
 
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_rc1.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_rc1.ebuild
index 2b6227289920..6934e83918c5 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_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/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
diff --git a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5_beta1.ebuild b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5_beta1.ebuild
index 6cb21817cc3d..4f5143184485 100644
--- a/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5_beta1.ebuild
+++ b/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5_beta1.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/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 17:40:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook-plugins/kaddressbook-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA=kaddressbook-plugins/
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Plugins for KAB"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kaddressbook)"
 OLDDEPEND="~kde-base/kaddressbook-$PV"
diff --git a/kde-base/kaddressbook-plugins/metadata.xml b/kde-base/kaddressbook-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kaddressbook-plugins/metadata.xml
+++ b/kde-base/kaddressbook-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 27b7bbcaf386..7504325b6c2e 100644
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,124 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kaddressbook-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kaddressbook-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kaddressbook-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kaddressbook-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kaddressbook-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kaddressbook-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kaddressbook-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*kaddressbook-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-3.5.0_beta2.ebuild:
+  New version.
+
+*kaddressbook-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> kaddressbook-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kaddressbook-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kaddressbook-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaddressbook-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kaddressbook-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaddressbook-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kaddressbook-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kaddressbook-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdepim-gnokii-3.4.patch, +kaddressbook-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kaddressbook-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kaddressbook-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kaddressbook-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  30 May 2005; Carsten Lohrke <carlo@gentoo.org> kaddressbook-3.4.0.ebuild,
+  kaddressbook-3.4.1.ebuild:
+  corrected libical path
+
+*kaddressbook-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kaddressbook-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kaddressbook-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kaddressbook-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kaddressbook-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kaddressbook-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kaddressbook-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kaddressbook-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kaddressbook-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kaddressbook-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kaddressbook-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kaddressbook-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kaddressbook/Manifest b/kde-base/kaddressbook/Manifest
index 815bf2ba1b62..a27534232501 100644
--- a/kde-base/kaddressbook/Manifest
+++ b/kde-base/kaddressbook/Manifest
@@ -1,4 +1,27 @@
-MD5 b90d210a1a2c8be9faa742d3273058f1 kaddressbook-3.4.0_alpha1.ebuild 1483
-MD5 b90d210a1a2c8be9faa742d3273058f1 kaddressbook-3.4.0_beta1.ebuild 1483
-MD5 892303ffe022b31a222f9efab549727b files/digest-kaddressbook-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kaddressbook-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 06ab46edba0533219817058ac1d674d2 ChangeLog 4136
+MD5 98742ffe69ec2a609069bb2804d85af8 files/configure-fix-kdepim-gnokii-3.4.patch 1965
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kaddressbook-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kaddressbook-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kaddressbook-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kaddressbook-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kaddressbook-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kaddressbook-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kaddressbook-3.5_beta1 68
+MD5 a8854f652d8134ae4f7015c69affd8ae kaddressbook-3.4.1.ebuild 1673
+MD5 da836a591019f65ef3ef30a5676e7c10 kaddressbook-3.4.2.ebuild 1677
+MD5 709352145e8e80d5f2899953afffe70e kaddressbook-3.4.3.ebuild 1673
+MD5 b43d2617fda2b2dc745de76e76a667e2 kaddressbook-3.5.0.ebuild 1598
+MD5 f54d8964095aa91672e3829416b69563 kaddressbook-3.5.0_beta2.ebuild 1607
+MD5 8c53b6fcb91e2cdcde9868974709951d kaddressbook-3.5.0_rc1.ebuild 1608
+MD5 d888709cfef349749024c72f624cee4b kaddressbook-3.5_beta1.ebuild 1596
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvDhntT9W3vfTuoRAjkMAJ0f0Z53WpOyqo1R3QL4yPbY2aY+RgCdFCXF
+3DtaEUqlrGM7BHZo6QGayTY=
+=XEah
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch b/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
index ecb73ecee065..0a275a187677 100644
--- a/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
+++ b/kde-base/kaddressbook/files/configure-fix-kdepim-gnokii-3.4.patch
@@ -3,7 +3,7 @@ Index: kaddressbook/xxport/configure.in.in
 --- kaddressbook/xxport/configure.in.in	(revision 433932)
 +++ kaddressbook/xxport/configure.in.in	(working copy)
 @@ -1,6 +1,2 @@
- # $Id: configure-fix-kdepim-gnokii-3.4.patch,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+ # $Id: configure-fix-kdepim-gnokii-3.4.patch,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 -
 -KDE_CHECK_BLUETOOTH
 -KDE_CHECK_GNOKII
diff --git a/kde-base/kaddressbook/files/digest-kaddressbook-3.4.1 b/kde-base/kaddressbook/files/digest-kaddressbook-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kaddressbook/files/digest-kaddressbook-3.4.1
+++ b/kde-base/kaddressbook/files/digest-kaddressbook-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kaddressbook/files/digest-kaddressbook-3.4.2 b/kde-base/kaddressbook/files/digest-kaddressbook-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kaddressbook/files/digest-kaddressbook-3.4.2
+++ b/kde-base/kaddressbook/files/digest-kaddressbook-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kaddressbook/kaddressbook-3.4.1.ebuild b/kde-base/kaddressbook/kaddressbook-3.4.1.ebuild
index a13a465a8671..931c777e2957 100644
--- a/kde-base/kaddressbook/kaddressbook-3.4.1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.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/kde-base/kaddressbook/kaddressbook-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV
@@ -31,14 +31,13 @@ KMEXTRACTONLY="
 	libkdepim/
 	libkdenetwork/
 	libkcal/
-	libical/
 	certmanager/
 	kontact/interfaces/
 	akregator
 	kmail/kmailIface.h"
 KMCOMPILEONLY="
-	libical/src/libical/
-	libical/src/libicalss/
+	libkcal/libical/src/libical/
+	libkcal/libical/src/libicalss/
 	akregator/src/librss"
 	# We add them here because they are standard plugins and programs related to kaddressbook but not a dep of any other kdepim program, so they will be lost if noone install them
 KMEXTRA="
@@ -49,9 +48,9 @@ KMEXTRA="
 src_compile() {
 	export DO_NOT_COMPILE="libical" && kde-meta_src_compile myconf configure
 	# generate "ical.h"
-	cd ${S}/libical/src/libical && make ical.h
+	cd ${S}/libkcal/libical/src/libical && make ical.h
 	# generate "icalss.h"
-	cd ${S}/libical/src/libicalss && make icalss.h
+	cd ${S}/libkcal/libical/src/libicalss && make icalss.h
 
 	kde-meta_src_compile "make"
 }
diff --git a/kde-base/kaddressbook/kaddressbook-3.4.2.ebuild b/kde-base/kaddressbook/kaddressbook-3.4.2.ebuild
index 74207f507c9e..c9b03888f0bf 100644
--- a/kde-base/kaddressbook/kaddressbook-3.4.2.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.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/kde-base/kaddressbook/kaddressbook-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gnokii"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)
diff --git a/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild b/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild
index 2c67ba01abc7..f071417ad1d4 100644
--- a/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.4.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/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="gnokii"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.0.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.0.ebuild
index 11764a89ee4a..b548f6ce7a82 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.0.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.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/kde-base/kaddressbook/kaddressbook-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.0_beta2.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.0_beta2.ebuild
index eb4e9453700f..f0ce3f905898 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.0_beta2.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.0_beta2.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/kde-base/kaddressbook/kaddressbook-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gnokii"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)
diff --git a/kde-base/kaddressbook/kaddressbook-3.5.0_rc1.ebuild b/kde-base/kaddressbook/kaddressbook-3.5.0_rc1.ebuild
index 110c8ac081ef..a50672bb61bc 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5.0_rc1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5.0_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/kde-base/kaddressbook/kaddressbook-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kaddressbook/kaddressbook-3.5_beta1.ebuild b/kde-base/kaddressbook/kaddressbook-3.5_beta1.ebuild
index d03342cbdaf2..3a875e8e1f4b 100644
--- a/kde-base/kaddressbook/kaddressbook-3.5_beta1.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-3.5_beta1.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/kde-base/kaddressbook/kaddressbook-3.5_beta1.ebuild,v 1.1 2005/09/22 17:39:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Address Book"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="gnokii"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)
diff --git a/kde-base/kaddressbook/metadata.xml b/kde-base/kaddressbook/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kaddressbook/metadata.xml
+++ b/kde-base/kaddressbook/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index 5503a6dd3c3c..70e1a8d4ded9 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kalarm-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kalarm-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kalarm-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kalarm-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kalarm-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kalarm-3.5_beta1.ebuild,
+  kalarm-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kalarm-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.5.0_beta2.ebuild:
+  New version.
+
+*kalarm-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kalarm-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kalarm-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kalarm-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kalarm-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kalarm-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kalarm-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kalarm-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kalarm-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kalarm-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kalarm-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kalarm-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kalarm-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kalarm-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kalarm-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kalarm-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kalarm-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kalarm-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kalarm-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kalarm-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kalarm-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index d05834fce21e..d93ec01f877e 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -1,4 +1,26 @@
-MD5 c9d20ddcc9c1fbedb398112440dc3765 kalarm-3.4.0_alpha1.ebuild 1190
-MD5 c9d20ddcc9c1fbedb398112440dc3765 kalarm-3.4.0_beta1.ebuild 1190
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kalarm-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-kalarm-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0dac91eb77cad23ed727290e03ff1b7e ChangeLog 3527
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kalarm-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kalarm-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kalarm-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kalarm-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kalarm-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kalarm-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kalarm-3.5_beta1 68
+MD5 8d0e906ef8c9e840c798bb699007499f kalarm-3.4.1.ebuild 1306
+MD5 44511ebf1535acf717af37e59314e5bb kalarm-3.4.2.ebuild 1325
+MD5 3779fae3e9ed21cfd959ef8a09a9a197 kalarm-3.4.3.ebuild 1320
+MD5 e44b03c51091ed570741cdee354020b1 kalarm-3.5.0.ebuild 1207
+MD5 9c0d0c8ed19e4f6941c65dde02264dc9 kalarm-3.5.0_beta2.ebuild 1224
+MD5 4593185f66d5306283d71908649a1fe9 kalarm-3.5.0_rc1.ebuild 1223
+MD5 9a64690c3f59316efea8eb296c686e83 kalarm-3.5_beta1.ebuild 1298
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvF4ntT9W3vfTuoRAoP5AKCiYaFF3AzDz7PVb8SZsT8KkP6CLACgk+/U
+hALg4JfjRYoVnHvcShqOUio=
+=qVpw
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kalarm/files/digest-kalarm-3.4.1 b/kde-base/kalarm/files/digest-kalarm-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kalarm/files/digest-kalarm-3.4.1
+++ b/kde-base/kalarm/files/digest-kalarm-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kalarm/files/digest-kalarm-3.4.2 b/kde-base/kalarm/files/digest-kalarm-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kalarm/files/digest-kalarm-3.4.2
+++ b/kde-base/kalarm/files/digest-kalarm-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kalarm/kalarm-3.4.1.ebuild b/kde-base/kalarm/kalarm-3.4.1.ebuild
index e85e4d9da38a..164078291e67 100644
--- a/kde-base/kalarm/kalarm-3.4.1.ebuild
+++ b/kde-base/kalarm/kalarm-3.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/kde-base/kalarm/kalarm-3.4.1.ebuild,v 1.1 2005/05/25 21:23:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkdenetwork-$PV
diff --git a/kde-base/kalarm/kalarm-3.4.2.ebuild b/kde-base/kalarm/kalarm-3.4.2.ebuild
index 9d92be209c92..6f40919dfc7f 100644
--- a/kde-base/kalarm/kalarm-3.4.2.ebuild
+++ b/kde-base/kalarm/kalarm-3.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/kde-base/kalarm/kalarm-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkdenetwork-$PV
diff --git a/kde-base/kalarm/kalarm-3.4.3.ebuild b/kde-base/kalarm/kalarm-3.4.3.ebuild
index 9a12a02380d4..fea430781fd1 100644
--- a/kde-base/kalarm/kalarm-3.4.3.ebuild
+++ b/kde-base/kalarm/kalarm-3.4.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/kde-base/kalarm/kalarm-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkdenetwork-$PV
@@ -42,4 +42,4 @@ src_compile() {
 	cd ${S}/libkcal/libical/src/libicalss && make icalss.h
 
 	kde-meta_src_compile make
-}
\ No newline at end of file
+}
diff --git a/kde-base/kalarm/kalarm-3.5.0.ebuild b/kde-base/kalarm/kalarm-3.5.0.ebuild
index 566283556f80..10482612917c 100644
--- a/kde-base/kalarm/kalarm-3.5.0.ebuild
+++ b/kde-base/kalarm/kalarm-3.5.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/kde-base/kalarm/kalarm-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kalarm/kalarm-3.5.0_beta2.ebuild b/kde-base/kalarm/kalarm-3.5.0_beta2.ebuild
index 1087b371e455..abaa64a59284 100644
--- a/kde-base/kalarm/kalarm-3.5.0_beta2.ebuild
+++ b/kde-base/kalarm/kalarm-3.5.0_beta2.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/kde-base/kalarm/kalarm-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange 3.5_beta1 $MAXKDEVER kde-base/libkdenetwork)
diff --git a/kde-base/kalarm/kalarm-3.5.0_rc1.ebuild b/kde-base/kalarm/kalarm-3.5.0_rc1.ebuild
index 31f8ad093d3a..3e8ffbb3e3e6 100644
--- a/kde-base/kalarm/kalarm-3.5.0_rc1.ebuild
+++ b/kde-base/kalarm/kalarm-3.5.0_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/kde-base/kalarm/kalarm-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kalarm/kalarm-3.5_beta1.ebuild b/kde-base/kalarm/kalarm-3.5_beta1.ebuild
index 3e61d2e6c45d..ed82a3f78917 100644
--- a/kde-base/kalarm/kalarm-3.5_beta1.ebuild
+++ b/kde-base/kalarm/kalarm-3.5_beta1.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/kde-base/kalarm/kalarm-3.5_beta1.ebuild,v 1.1 2005/09/22 17:41:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Personal alarm message, command and email scheduler for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkdenetwork-$PV
diff --git a/kde-base/kalarm/metadata.xml b/kde-base/kalarm/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kalarm/metadata.xml
+++ b/kde-base/kalarm/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kalyptus/ChangeLog b/kde-base/kalyptus/ChangeLog
index 56f319f6fece..db8a38d37835 100644
--- a/kde-base/kalyptus/ChangeLog
+++ b/kde-base/kalyptus/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for kde-base/kalyptus
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/ChangeLog,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kalyptus-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kalyptus-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kalyptus-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kalyptus-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kalyptus-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kalyptus-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*kalyptus-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> kalyptus-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kalyptus-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kalyptus-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kalyptus-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kalyptus-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> kalyptus-3.3.2.ebuild:
+  Added x86 (stable) keyword.
+
+*kalyptus-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kalyptus-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kalyptus-3.3.2 (25 Dec 2004)
+
+  25 Dec 2004; Dan Armak <danarmak@gentoo.org> kalyptus-3.3.1.ebuild,
+  +kalyptus-3.3.2.ebuild:
+  New ebuild for 3.3.2.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  kalyptus-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *kalyptus-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/kalyptus/Manifest b/kde-base/kalyptus/Manifest
index 1f0909394efb..f063427e4648 100644
--- a/kde-base/kalyptus/Manifest
+++ b/kde-base/kalyptus/Manifest
@@ -1,3 +1,25 @@
-MD5 eae5cfc6b4b47cac3839ebc743f5d8d2 kalyptus-3.3.1.ebuild 535
-MD5 7591be3709667b0ab4db53f0fee67fb5 files/digest-kalyptus-3.3.1 149
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6ea69716cdcbd2c3ed55abaa3dd387c7 ChangeLog 3049
+MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-kalyptus-3.3.2 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-kalyptus-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-kalyptus-3.4.2 300
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-kalyptus-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-kalyptus-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-kalyptus-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 67f69a490c47381d82c77c9cde372ce5 kalyptus-3.3.2.ebuild 688
+MD5 0ee39aeccf35dcd265240cd4f12be93e kalyptus-3.4.1.ebuild 701
+MD5 693432151bc7f94db83027914222a657 kalyptus-3.4.2.ebuild 704
+MD5 99d8b8531444c160fda223a8dce9af67 kalyptus-3.5.0.ebuild 694
+MD5 68cf30ec3e59b706686737b992032be7 kalyptus-3.5.0_beta2.ebuild 699
+MD5 15641720b2b31448a302e2ab9d4653e9 kalyptus-3.5.0_rc1.ebuild 698
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyKHntT9W3vfTuoRAuKtAJ9tJVTVRIGseaCu94he1qyD/VkudACgnSZe
+xHSsN+QrWQXSVXC4O3HCXtY=
+=SceH
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kalyptus/files/digest-kalyptus-3.3.2 b/kde-base/kalyptus/files/digest-kalyptus-3.3.2
index 2c8ca5dff9d8..1b3b65c42a2e 100644
--- a/kde-base/kalyptus/files/digest-kalyptus-3.3.2
+++ b/kde-base/kalyptus/files/digest-kalyptus-3.3.2
@@ -1,3 +1 @@
-MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
-MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
-MD5 224bbb908b607ec9b2c3f1ff1cde1907 kdebindings-3.3.1-3.3.2.tar.xdelta 603690
+MD5 a8ae8e2ef4dd3680d0756adf76086d85 kdebindings-3.3.2.tar.bz2 7131727
diff --git a/kde-base/kalyptus/files/digest-kalyptus-3.4.1 b/kde-base/kalyptus/files/digest-kalyptus-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/kalyptus/files/digest-kalyptus-3.4.1
+++ b/kde-base/kalyptus/files/digest-kalyptus-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/kalyptus/files/digest-kalyptus-3.4.2 b/kde-base/kalyptus/files/digest-kalyptus-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/kalyptus/files/digest-kalyptus-3.4.2
+++ b/kde-base/kalyptus/files/digest-kalyptus-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/kalyptus/files/no-gtk-glib-check.diff b/kde-base/kalyptus/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/kalyptus/files/no-gtk-glib-check.diff
+++ b/kde-base/kalyptus/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/kalyptus/kalyptus-3.3.2.ebuild b/kde-base/kalyptus/kalyptus-3.3.2.ebuild
index 5b3e94ce6f89..5edb46cf63fd 100644
--- a/kde-base/kalyptus/kalyptus-3.3.2.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.3.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/kde-base/kalyptus/kalyptus-3.3.2.ebuild,v 1.1 2004/12/25 15:48:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE bindings generator for C, ObjC and Java"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/kalyptus/kalyptus-3.4.1.ebuild b/kde-base/kalyptus/kalyptus-3.4.1.ebuild
index fdb6f4488b69..a2f989f3e28c 100644
--- a/kde-base/kalyptus/kalyptus-3.4.1.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.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/kde-base/kalyptus/kalyptus-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE bindings generator for C, ObjC and Java"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/kalyptus/kalyptus-3.4.2.ebuild b/kde-base/kalyptus/kalyptus-3.4.2.ebuild
index f7106a84d358..ee2d3b6e2ac4 100644
--- a/kde-base/kalyptus/kalyptus-3.4.2.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.4.2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE bindings generator for C, ObjC and Java"
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
@@ -24,4 +24,4 @@ src_compile () {
 src_install() {
 	cd $S/kalyptus
 	make install DESTDIR=$D
-}
\ No newline at end of file
+}
diff --git a/kde-base/kalyptus/kalyptus-3.5.0.ebuild b/kde-base/kalyptus/kalyptus-3.5.0.ebuild
index d53723985220..d9d21219092a 100644
--- a/kde-base/kalyptus/kalyptus-3.5.0.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.5.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/kde-base/kalyptus/kalyptus-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/kalyptus/kalyptus-3.5.0_beta2.ebuild b/kde-base/kalyptus/kalyptus-3.5.0_beta2.ebuild
index 87d9e81d0569..40c3c8c45966 100644
--- a/kde-base/kalyptus/kalyptus-3.5.0_beta2.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.5.0_beta2.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/kde-base/kalyptus/kalyptus-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE bindings generator for C, ObjC and Java"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/kalyptus/kalyptus-3.5.0_rc1.ebuild b/kde-base/kalyptus/kalyptus-3.5.0_rc1.ebuild
index cfd4c28dfbca..01b8a955274f 100644
--- a/kde-base/kalyptus/kalyptus-3.5.0_rc1.ebuild
+++ b/kde-base/kalyptus/kalyptus-3.5.0_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/kde-base/kalyptus/kalyptus-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalyptus/kalyptus-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/kalyptus/metadata.xml b/kde-base/kalyptus/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kalyptus/metadata.xml
+++ b/kde-base/kalyptus/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kalzium/ChangeLog b/kde-base/kalzium/ChangeLog
index 7c4fd83fb4f9..5fc98625eda8 100644
--- a/kde-base/kalzium/ChangeLog
+++ b/kde-base/kalzium/ChangeLog
@@ -1,6 +1,114 @@
 # ChangeLog for kde-base/kalzium
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/ChangeLog,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kalzium-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kalzium-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kalzium-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kalzium-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kalzium-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kalzium-3.5_beta1.ebuild,
+  kalzium-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  16 Oct 2005; Dan Armak <danarmak@gentoo.org> kalzium-3.4.3.ebuild,
+  kalzium-3.5.0_beta2.ebuild:
+  Correct HOMEPAGE value.
+
+*kalzium-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.5.0_beta2.ebuild:
+  New version.
+
+*kalzium-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kalzium-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  23 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kalzium-3.5_beta1.ebuild:
+  Fixes to enable compilation.
+
+*kalzium-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kalzium-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kalzium-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kalzium-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kalzium-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kalzium-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kalzium-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kalzium-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kalzium-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kalzium-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kalzium-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kalzium-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kalzium-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kalzium-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kalzium-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kalzium-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kalzium-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kalzium-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kalzium-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kalzium/Manifest b/kde-base/kalzium/Manifest
index a4308c43d338..25b3328f377f 100644
--- a/kde-base/kalzium/Manifest
+++ b/kde-base/kalzium/Manifest
@@ -1,4 +1,26 @@
-MD5 31232f94119fa3e20d03e3381dc9d20d kalzium-3.4.0_beta1.ebuild 450
-MD5 31232f94119fa3e20d03e3381dc9d20d kalzium-3.4.0_alpha1.ebuild 450
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kalzium-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kalzium-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d3ca16d31ca7be169695afae315e1c84 ChangeLog 3804
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kalzium-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kalzium-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kalzium-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kalzium-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kalzium-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kalzium-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kalzium-3.5_beta1 68
+MD5 af3397486a2e6c6c376f64311a06fc6e kalzium-3.4.1.ebuild 569
+MD5 b271de29aa1af888a552164019995d4c kalzium-3.4.2.ebuild 582
+MD5 9c39bc1eae19d87724d9e8d45097ec51 kalzium-3.4.3.ebuild 617
+MD5 b4b8d671dce360ed3d89386ff50bec29 kalzium-3.5.0.ebuild 608
+MD5 ad012e77bfa583fe447e9b72ad2643bf kalzium-3.5.0_beta2.ebuild 613
+MD5 fecc92080d0293b9edbb1040c2b86a8a kalzium-3.5.0_rc1.ebuild 612
+MD5 855f71ec8cab3b96e6f2ef3c77b1d13f kalzium-3.5_beta1.ebuild 611
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlB7ntT9W3vfTuoRAuxIAKCmBOXtWita6PSa+zbt8BaiMyaJSwCggqKs
+DMZod8bwq9TsSyZPUczFuAE=
+=NoPx
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kalzium/files/digest-kalzium-3.4.1 b/kde-base/kalzium/files/digest-kalzium-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kalzium/files/digest-kalzium-3.4.1
+++ b/kde-base/kalzium/files/digest-kalzium-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kalzium/files/digest-kalzium-3.4.2 b/kde-base/kalzium/files/digest-kalzium-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kalzium/files/digest-kalzium-3.4.2
+++ b/kde-base/kalzium/files/digest-kalzium-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kalzium/kalzium-3.4.1.ebuild b/kde-base/kalzium/kalzium-3.4.1.ebuild
index bcceb67575d4..1a107b97dd40 100644
--- a/kde-base/kalzium/kalzium-3.4.1.ebuild
+++ b/kde-base/kalzium/kalzium-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: periodic table of the elements"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
diff --git a/kde-base/kalzium/kalzium-3.4.2.ebuild b/kde-base/kalzium/kalzium-3.4.2.ebuild
index 9df58b7be1ae..28a5aa5adf15 100644
--- a/kde-base/kalzium/kalzium-3.4.2.ebuild
+++ b/kde-base/kalzium/kalzium-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: periodic table of the elements"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
diff --git a/kde-base/kalzium/kalzium-3.4.3.ebuild b/kde-base/kalzium/kalzium-3.4.3.ebuild
index 40adf59d00fd..a2513f805ad4 100644
--- a/kde-base/kalzium/kalzium-3.4.3.ebuild
+++ b/kde-base/kalzium/kalzium-3.4.3.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: periodic table of the elements"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
 $(deprange 3.4.2 $MAXKDEVER kde-base/libkdeedu)"
-
+HOMEPAGE="http://edu.kde.org/kalzium"
 
 KMEXTRACTONLY="libkdeedu/kdeeduplot"
 KMCOPYLIB="libkdeeduplot libkdeedu/kdeeduplot"
diff --git a/kde-base/kalzium/kalzium-3.5.0.ebuild b/kde-base/kalzium/kalzium-3.5.0.ebuild
index cc2afa8bd902..e4b168618c10 100644
--- a/kde-base/kalzium/kalzium-3.5.0.ebuild
+++ b/kde-base/kalzium/kalzium-3.5.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/kde-base/kalzium/kalzium-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kalzium/kalzium-3.5.0_beta2.ebuild b/kde-base/kalzium/kalzium-3.5.0_beta2.ebuild
index 0c3b073e3b36..ad26b005983d 100644
--- a/kde-base/kalzium/kalzium-3.5.0_beta2.ebuild
+++ b/kde-base/kalzium/kalzium-3.5.0_beta2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: periodic table of the elements"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+HOMEPAGE="http://edu.kde.org/kalzium"
 
-DEPEND="
-$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 
 KMEXTRACTONLY="libkdeedu/kdeeduplot
 	libkdeedu/kdeeduui"
diff --git a/kde-base/kalzium/kalzium-3.5.0_rc1.ebuild b/kde-base/kalzium/kalzium-3.5.0_rc1.ebuild
index 6f65ea0c9329..e037b72afce5 100644
--- a/kde-base/kalzium/kalzium-3.5.0_rc1.ebuild
+++ b/kde-base/kalzium/kalzium-3.5.0_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/kde-base/kalzium/kalzium-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kalzium/kalzium-3.5_beta1.ebuild b/kde-base/kalzium/kalzium-3.5_beta1.ebuild
index 10b75c07dce6..df5dc8c4e669 100644
--- a/kde-base/kalzium/kalzium-3.5_beta1.ebuild
+++ b/kde-base/kalzium/kalzium-3.5_beta1.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5_beta1.ebuild,v 1.1 2005/09/22 17:42:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalzium/kalzium-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: periodic table of the elements"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 
-
-KMEXTRACTONLY="libkdeedu/kdeeduplot"
-KMCOPYLIB="libkdeeduplot libkdeedu/kdeeduplot"
-
+KMEXTRACTONLY="libkdeedu/kdeeduplot
+	libkdeedu/kdeeduui"
+KMCOPYLIB="libkdeeduplot libkdeedu/kdeeduplot
+	libkdeeduui libkdeedu/kdeeduui"
diff --git a/kde-base/kalzium/metadata.xml b/kde-base/kalzium/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kalzium/metadata.xml
+++ b/kde-base/kalzium/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kamera/ChangeLog b/kde-base/kamera/ChangeLog
index 4835103893f6..9b330aa79ccd 100644
--- a/kde-base/kamera/ChangeLog
+++ b/kde-base/kamera/ChangeLog
@@ -1,6 +1,97 @@
 # ChangeLog for kde-base/kamera
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/ChangeLog,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kamera-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kamera-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kamera-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kamera-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kamera-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kamera-3.5_beta1.ebuild,
+  kamera-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kamera-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kamera-3.5.0_beta2.ebuild:
+  New version.
+
+*kamera-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kamera-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kamera-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kamera-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kamera-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kamera-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kamera-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kamera-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kamera-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kamera-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  29 May 2005; Carsten Lohrke <carlo@gentoo.org> kamera-3.4.0.ebuild,
+  kamera-3.4.1.ebuild:
+  corrected gphoto2 dependency
+
+*kamera-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kamera-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kamera-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kamera-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kamera-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kamera-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kamera-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kamera-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kamera-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kamera-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kamera-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kamera-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kamera/Manifest b/kde-base/kamera/Manifest
index d64c383077fb..bd89ff581f22 100644
--- a/kde-base/kamera/Manifest
+++ b/kde-base/kamera/Manifest
@@ -1,4 +1,22 @@
-MD5 98fef02b4bf5c1aa4cf284ebb5e9c9d3 kamera-3.4.0_beta1.ebuild 299
-MD5 98fef02b4bf5c1aa4cf284ebb5e9c9d3 kamera-3.4.0_alpha1.ebuild 299
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kamera-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kamera-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 859532e1fad34419f3f4145efe7fe4fa ChangeLog 3292
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kamera-3.4.1 221
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kamera-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kamera-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kamera-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kamera-3.5_beta1 72
+MD5 27dd56fbac105520d3687e4360c20449 kamera-3.4.1.ebuild 425
+MD5 27dac460a47611bd5c0ef752aa6a82d8 kamera-3.4.3.ebuild 423
+MD5 d6d4a7bdafb54fac2e9f2c57a01b05b2 kamera-3.5.0.ebuild 409
+MD5 7e1f121e0eac4820c4818e5702d4828a kamera-3.5.0_beta2.ebuild 421
+MD5 9059aaa9970206bb87f7098ef8542bb3 kamera-3.5_beta1.ebuild 412
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmQHntT9W3vfTuoRAq3yAKCasBQxUwJgcXCPZ2HHc8ZbKh10WgCeO1/z
+qr1fROKzDXuHJ+QgBIHH8gE=
+=U4Ko
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kamera/files/digest-kamera-3.4.1 b/kde-base/kamera/files/digest-kamera-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kamera/files/digest-kamera-3.4.1
+++ b/kde-base/kamera/files/digest-kamera-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kamera/kamera-3.4.1.ebuild b/kde-base/kamera/kamera-3.4.1.ebuild
index c7f699294170..e79cc791b74d 100644
--- a/kde-base/kamera/kamera-3.4.1.ebuild
+++ b/kde-base/kamera/kamera-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="media-gfx/gphoto2"
\ No newline at end of file
+DEPEND="media-libs/libgphoto2"
\ No newline at end of file
diff --git a/kde-base/kamera/kamera-3.4.3.ebuild b/kde-base/kamera/kamera-3.4.3.ebuild
index eac224d90ef2..d98e8febba9e 100644
--- a/kde-base/kamera/kamera-3.4.3.ebuild
+++ b/kde-base/kamera/kamera-3.4.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/kde-base/kamera/kamera-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND="media-libs/libgphoto2"
\ No newline at end of file
+DEPEND="media-libs/libgphoto2"
diff --git a/kde-base/kamera/kamera-3.5.0.ebuild b/kde-base/kamera/kamera-3.5.0.ebuild
index 371bf5e2e42f..455861eadeb6 100644
--- a/kde-base/kamera/kamera-3.5.0.ebuild
+++ b/kde-base/kamera/kamera-3.5.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/kde-base/kamera/kamera-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kamera/kamera-3.5.0_beta2.ebuild b/kde-base/kamera/kamera-3.5.0_beta2.ebuild
index f9e45a8c6d33..900e0afdb7b4 100644
--- a/kde-base/kamera/kamera-3.5.0_beta2.ebuild
+++ b/kde-base/kamera/kamera-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-libs/libgphoto2"
\ No newline at end of file
diff --git a/kde-base/kamera/kamera-3.5_beta1.ebuild b/kde-base/kamera/kamera-3.5_beta1.ebuild
index 8a150cb2cae2..df6b0df67874 100644
--- a/kde-base/kamera/kamera-3.5_beta1.ebuild
+++ b/kde-base/kamera/kamera-3.5_beta1.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/kde-base/kamera/kamera-3.5_beta1.ebuild,v 1.1 2005/09/22 17:43:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kamera/kamera-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE digital camera manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-libs/libgphoto2"
\ No newline at end of file
diff --git a/kde-base/kamera/metadata.xml b/kde-base/kamera/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kamera/metadata.xml
+++ b/kde-base/kamera/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kanagram/ChangeLog b/kde-base/kanagram/ChangeLog
index 1a3e1f825cff..6fe59d2ed628 100644
--- a/kde-base/kanagram/ChangeLog
+++ b/kde-base/kanagram/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for kde-base/kanagram
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.1 2005/09/24 10:24:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/ChangeLog,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
+
+*kanagram-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kanagram-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kanagram-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kanagram-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kanagram-3.5_beta1.ebuild,
+  kanagram-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kanagram-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kanagram-3.5.0_beta2.ebuild:
+  New version.
 
 *kanagram-3.5_beta1 (24 Sep 2005)
 
diff --git a/kde-base/kanagram/Manifest b/kde-base/kanagram/Manifest
index bd1cd03c1a94..00763e62acd3 100644
--- a/kde-base/kanagram/Manifest
+++ b/kde-base/kanagram/Manifest
@@ -1,3 +1,10 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 451c2ad564f717cb51c38ab8c1e2ae4a kanagram-3.5_beta1.ebuild 384
+MD5 06f0cd5f0e09a1abe9f2eafc49b2dec9 ChangeLog 973
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kanagram-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kanagram-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kanagram-3.5.0_rc1 294
 MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kanagram-3.5_beta1 68
+MD5 cc7e3567dbc1fa98c996628711e96f4c kanagram-3.5.0.ebuild 376
+MD5 4169ac6c7fa07403767e98370e67a8ec kanagram-3.5.0_beta2.ebuild 381
+MD5 9d72cd7c9d3edcb29acf6b8b19fedb9f kanagram-3.5.0_rc1.ebuild 380
+MD5 3d1a1f65ed2903f1e9795796c52cebf2 kanagram-3.5_beta1.ebuild 379
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kanagram/kanagram-3.5.0.ebuild b/kde-base/kanagram/kanagram-3.5.0.ebuild
index 357c34db0160..63690eb78eb0 100644
--- a/kde-base/kanagram/kanagram-3.5.0.ebuild
+++ b/kde-base/kanagram/kanagram-3.5.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/kde-base/kanagram/kanagram-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kanagram/kanagram-3.5.0_beta2.ebuild b/kde-base/kanagram/kanagram-3.5.0_beta2.ebuild
index e215296e4f96..528ad1215aa8 100644
--- a/kde-base/kanagram/kanagram-3.5.0_beta2.ebuild
+++ b/kde-base/kanagram/kanagram-3.5.0_beta2.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/kde-base/kanagram/kanagram-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: letter order game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kanagram/kanagram-3.5.0_rc1.ebuild b/kde-base/kanagram/kanagram-3.5.0_rc1.ebuild
index 085f27138194..11c7691f9a69 100644
--- a/kde-base/kanagram/kanagram-3.5.0_rc1.ebuild
+++ b/kde-base/kanagram/kanagram-3.5.0_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/kde-base/kanagram/kanagram-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kanagram/kanagram-3.5_beta1.ebuild b/kde-base/kanagram/kanagram-3.5_beta1.ebuild
index b4e511f68301..830f902b5951 100644
--- a/kde-base/kanagram/kanagram-3.5_beta1.ebuild
+++ b/kde-base/kanagram/kanagram-3.5_beta1.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/kde-base/kanagram/kanagram-3.5_beta1.ebuild,v 1.1 2005/09/24 10:24:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kanagram/kanagram-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: letter order game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kandy/ChangeLog b/kde-base/kandy/ChangeLog
index d843f579d215..cc001a8c2a96 100644
--- a/kde-base/kandy/ChangeLog
+++ b/kde-base/kandy/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kandy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/ChangeLog,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kandy-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kandy-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kandy-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kandy-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kandy-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kandy-3.5_beta1.ebuild,
+  kandy-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kandy-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.5.0_beta2.ebuild:
+  New version.
+
+*kandy-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kandy-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kandy-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kandy-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kandy-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kandy-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kandy-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kandy-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kandy-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kandy-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kandy-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kandy-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kandy-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kandy-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kandy-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kandy-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kandy-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kandy-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kandy-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kandy-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kandy-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kandy/Manifest b/kde-base/kandy/Manifest
index b718d5dc77c6..83ecc1d525b4 100644
--- a/kde-base/kandy/Manifest
+++ b/kde-base/kandy/Manifest
@@ -1,4 +1,26 @@
-MD5 1e1f806ac8765b82a546eb6b6b1a4c8a kandy-3.4.0_alpha1.ebuild 438
-MD5 1e1f806ac8765b82a546eb6b6b1a4c8a kandy-3.4.0_beta1.ebuild 438
-MD5 892303ffe022b31a222f9efab549727b files/digest-kandy-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kandy-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e28bbbe175ad70ff5861b176e0049fca ChangeLog 3488
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kandy-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kandy-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kandy-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kandy-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kandy-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kandy-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kandy-3.5_beta1 68
+MD5 9c4b48cca38846bc94756c4eec33bde7 kandy-3.4.1.ebuild 553
+MD5 4e287081cb4941d8b2a8c16c4cbc38da kandy-3.4.2.ebuild 566
+MD5 cb42da07120eed1d8c2e13333efb4b78 kandy-3.4.3.ebuild 563
+MD5 2c4741e507fdf4b867d1d22e41b91d11 kandy-3.5.0.ebuild 507
+MD5 c71aa931e7f2d4a2006ca9095a142635 kandy-3.5.0_beta2.ebuild 512
+MD5 7be926d8de4e6d4ea986dc195f56b2fc kandy-3.5.0_rc1.ebuild 511
+MD5 2bdb9f0f5c07106aed1f8f87930dcfbb kandy-3.5_beta1.ebuild 545
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvHLntT9W3vfTuoRApxaAKCiscg4KQqRUFJFqO5sVW/neJm1uACcCq71
+QAOnOTaGxV3gJaITjD0zuyA=
+=T6zT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kandy/files/digest-kandy-3.4.1 b/kde-base/kandy/files/digest-kandy-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kandy/files/digest-kandy-3.4.1
+++ b/kde-base/kandy/files/digest-kandy-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kandy/files/digest-kandy-3.4.2 b/kde-base/kandy/files/digest-kandy-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kandy/files/digest-kandy-3.4.2
+++ b/kde-base/kandy/files/digest-kandy-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kandy/kandy-3.4.1.ebuild b/kde-base/kandy/kandy-3.4.1.ebuild
index f1c4eda99f6f..5ed6c8db566e 100644
--- a/kde-base/kandy/kandy-3.4.1.ebuild
+++ b/kde-base/kandy/kandy-3.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/kde-base/kandy/kandy-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Communicating with your mobile phone"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)"
 OLDDEPEND="~kde-base/libkdepim-$PV"
diff --git a/kde-base/kandy/kandy-3.4.2.ebuild b/kde-base/kandy/kandy-3.4.2.ebuild
index d3224db11387..ff59f3237458 100644
--- a/kde-base/kandy/kandy-3.4.2.ebuild
+++ b/kde-base/kandy/kandy-3.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/kde-base/kandy/kandy-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Communicating with your mobile phone"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)"
 OLDDEPEND="~kde-base/libkdepim-$PV"
diff --git a/kde-base/kandy/kandy-3.4.3.ebuild b/kde-base/kandy/kandy-3.4.3.ebuild
index 9eef14ee7ce8..ce62c83fb664 100644
--- a/kde-base/kandy/kandy-3.4.3.ebuild
+++ b/kde-base/kandy/kandy-3.4.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/kde-base/kandy/kandy-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Communicating with your mobile phone"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)"
 OLDDEPEND="~kde-base/libkdepim-$PV"
@@ -16,4 +16,4 @@ OLDDEPEND="~kde-base/libkdepim-$PV"
 KMCOPYLIB="
 	libkdepim libkdepim"
 KMEXTRACTONLY="
-	libkdepim/ "
\ No newline at end of file
+	libkdepim/ "
diff --git a/kde-base/kandy/kandy-3.5.0.ebuild b/kde-base/kandy/kandy-3.5.0.ebuild
index 15b616dab691..c12544e677bb 100644
--- a/kde-base/kandy/kandy-3.5.0.ebuild
+++ b/kde-base/kandy/kandy-3.5.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/kde-base/kandy/kandy-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kandy/kandy-3.5.0_beta2.ebuild b/kde-base/kandy/kandy-3.5.0_beta2.ebuild
index c60105f40b94..5b68c7efe4ed 100644
--- a/kde-base/kandy/kandy-3.5.0_beta2.ebuild
+++ b/kde-base/kandy/kandy-3.5.0_beta2.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/kde-base/kandy/kandy-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Communicating with your mobile phone"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)"
 
diff --git a/kde-base/kandy/kandy-3.5.0_rc1.ebuild b/kde-base/kandy/kandy-3.5.0_rc1.ebuild
index e3e7045d69c9..cca0a834efa7 100644
--- a/kde-base/kandy/kandy-3.5.0_rc1.ebuild
+++ b/kde-base/kandy/kandy-3.5.0_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/kde-base/kandy/kandy-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kandy/kandy-3.5_beta1.ebuild b/kde-base/kandy/kandy-3.5_beta1.ebuild
index 876fe93dbebf..1fbeb8e93f9e 100644
--- a/kde-base/kandy/kandy-3.5_beta1.ebuild
+++ b/kde-base/kandy/kandy-3.5_beta1.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/kde-base/kandy/kandy-3.5_beta1.ebuild,v 1.1 2005/09/22 17:44:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kandy/kandy-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Communicating with your mobile phone"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)"
 OLDDEPEND="~kde-base/libkdepim-$PV"
diff --git a/kde-base/kandy/metadata.xml b/kde-base/kandy/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kandy/metadata.xml
+++ b/kde-base/kandy/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kappfinder/ChangeLog b/kde-base/kappfinder/ChangeLog
index 0d277c3fca74..3e300a30fb19 100644
--- a/kde-base/kappfinder/ChangeLog
+++ b/kde-base/kappfinder/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/kappfinder
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.1 2005/01/15 02:24:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/ChangeLog,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kappfinder-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kappfinder-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kappfinder-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kappfinder-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kappfinder-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kappfinder-3.5_beta1.ebuild,
+  kappfinder-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kappfinder-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.5.0_beta2.ebuild:
+  New version.
+
+*kappfinder-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kappfinder-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kappfinder-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kappfinder-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kappfinder-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kappfinder-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kappfinder-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kappfinder-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kappfinder-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kappfinder-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kappfinder-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kappfinder-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kappfinder-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kappfinder-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kappfinder-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kappfinder-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kappfinder-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kappfinder-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kappfinder-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kappfinder-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kappfinder-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kappfinder-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kappfinder/Manifest b/kde-base/kappfinder/Manifest
index 4ec8225c0efc..c2f43dbf8f68 100644
--- a/kde-base/kappfinder/Manifest
+++ b/kde-base/kappfinder/Manifest
@@ -1,4 +1,26 @@
-MD5 a307a5baa2957e620d46b77cdf9640f5 kappfinder-3.4.0_beta1.ebuild 447
-MD5 a307a5baa2957e620d46b77cdf9640f5 kappfinder-3.4.0_alpha1.ebuild 447
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kappfinder-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kappfinder-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8f4ad48e0b48faa8a7a1fa8d90a1bff4 ChangeLog 3691
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kappfinder-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kappfinder-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kappfinder-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kappfinder-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kappfinder-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kappfinder-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kappfinder-3.5_beta1 69
+MD5 8b8391d7802c75421cebc42ff814a926 kappfinder-3.4.1.ebuild 526
+MD5 72094b29dee8f087631dbf12a458f391 kappfinder-3.4.2.ebuild 539
+MD5 d8deee1a9eb066afdff0cccefd0beaf8 kappfinder-3.4.3.ebuild 535
+MD5 eaa6ea60ccb39a08b39d585e22a373b3 kappfinder-3.5.0.ebuild 515
+MD5 8c0b6306f567375b82f1be4808cf5e24 kappfinder-3.5.0_beta2.ebuild 520
+MD5 862175157a7fec2c538143a3a61b199a kappfinder-3.5.0_rc1.ebuild 519
+MD5 5cd7587ad906b25e8ef4afe20f950952 kappfinder-3.5_beta1.ebuild 518
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjqZntT9W3vfTuoRAvTGAJ9qfxLTQ7AaS0nsb00JrcpbGiSc2ACgqjx9
+YYe66Ky/ihjZ9GebEwSZUs0=
+=0Ovj
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kappfinder/files/digest-kappfinder-3.4.1 b/kde-base/kappfinder/files/digest-kappfinder-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kappfinder/files/digest-kappfinder-3.4.1
+++ b/kde-base/kappfinder/files/digest-kappfinder-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kappfinder/files/digest-kappfinder-3.4.2 b/kde-base/kappfinder/files/digest-kappfinder-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kappfinder/files/digest-kappfinder-3.4.2
+++ b/kde-base/kappfinder/files/digest-kappfinder-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kappfinder/kappfinder-3.4.1.ebuild b/kde-base/kappfinder/kappfinder-3.4.1.ebuild
index f2eeedc9bb5a..6ba9f051f584 100644
--- a/kde-base/kappfinder/kappfinder-3.4.1.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.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/kde-base/kappfinder/kappfinder-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates .desktop files for them in the KDE menu"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kicker)"
diff --git a/kde-base/kappfinder/kappfinder-3.4.2.ebuild b/kde-base/kappfinder/kappfinder-3.4.2.ebuild
index d7b39a250fe2..514b0212339f 100644
--- a/kde-base/kappfinder/kappfinder-3.4.2.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.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/kde-base/kappfinder/kappfinder-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates .desktop files for them in the KDE menu"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kicker)"
diff --git a/kde-base/kappfinder/kappfinder-3.4.3.ebuild b/kde-base/kappfinder/kappfinder-3.4.3.ebuild
index 94cd29026453..3fe3c67d3ccd 100644
--- a/kde-base/kappfinder/kappfinder-3.4.3.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.4.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/kde-base/kappfinder/kappfinder-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates .desktop files for them in the KDE menu"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kicker)"
diff --git a/kde-base/kappfinder/kappfinder-3.5.0.ebuild b/kde-base/kappfinder/kappfinder-3.5.0.ebuild
index adadf48c298f..820f6b8043fd 100644
--- a/kde-base/kappfinder/kappfinder-3.5.0.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.5.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/kde-base/kappfinder/kappfinder-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kappfinder/kappfinder-3.5.0_beta2.ebuild b/kde-base/kappfinder/kappfinder-3.5.0_beta2.ebuild
index 1daac54da9d8..11d45a646e9d 100644
--- a/kde-base/kappfinder/kappfinder-3.5.0_beta2.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.5.0_beta2.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/kde-base/kappfinder/kappfinder-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates .desktop files for them in the KDE menu"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kicker)"
diff --git a/kde-base/kappfinder/kappfinder-3.5.0_rc1.ebuild b/kde-base/kappfinder/kappfinder-3.5.0_rc1.ebuild
index eb8e85a80eab..fd764b7f203a 100644
--- a/kde-base/kappfinder/kappfinder-3.5.0_rc1.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.5.0_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/kde-base/kappfinder/kappfinder-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kappfinder/kappfinder-3.5_beta1.ebuild b/kde-base/kappfinder/kappfinder-3.5_beta1.ebuild
index c6fe070c1312..8398657016b4 100644
--- a/kde-base/kappfinder/kappfinder-3.5_beta1.ebuild
+++ b/kde-base/kappfinder/kappfinder-3.5_beta1.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/kde-base/kappfinder/kappfinder-3.5_beta1.ebuild,v 1.1 2005/09/22 17:45:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kappfinder/kappfinder-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tool that looks for well-known apps in your path and creates .desktop files for them in the KDE menu"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kicker)"
diff --git a/kde-base/kappfinder/metadata.xml b/kde-base/kappfinder/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kappfinder/metadata.xml
+++ b/kde-base/kappfinder/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kapptemplate/ChangeLog b/kde-base/kapptemplate/ChangeLog
index e7522c9e18e7..4e2160c0f50e 100644
--- a/kde-base/kapptemplate/ChangeLog
+++ b/kde-base/kapptemplate/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for kde-base/kapptemplate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.1 2005/01/15 02:24:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/ChangeLog,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
+
+*kapptemplate-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kapptemplate-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kapptemplate-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kapptemplate-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kapptemplate-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kapptemplate-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kapptemplate-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kapptemplate-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kapptemplate-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kapptemplate-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kapptemplate-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kapptemplate-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kapptemplate-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kapptemplate-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kapptemplate-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kapptemplate-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kapptemplate-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kapptemplate-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kapptemplate-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kapptemplate-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kapptemplate/Manifest b/kde-base/kapptemplate/Manifest
index 82c2598139ac..f4d3fe0bdbd1 100644
--- a/kde-base/kapptemplate/Manifest
+++ b/kde-base/kapptemplate/Manifest
@@ -1,4 +1,8 @@
-MD5 5fdcb0709fed0149dac4b9607e16879d kapptemplate-3.4.0_beta1.ebuild 349
-MD5 5fdcb0709fed0149dac4b9607e16879d kapptemplate-3.4.0_alpha1.ebuild 349
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kapptemplate-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kapptemplate-3.4.0_alpha1 67
+MD5 64cefb98ac017e10117a760dc47ad698 ChangeLog 2519
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kapptemplate-3.4.1 206
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kapptemplate-3.5.0 66
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kapptemplate-3.5_beta1 67
+MD5 d73bfc2f1baac9d975d64a93316c0bb1 kapptemplate-3.4.1.ebuild 484
+MD5 5298950b7c2b761d202294e6a965b17d kapptemplate-3.5.0.ebuild 467
+MD5 32e00b8f2f1ddf22f433146d0e46f732 kapptemplate-3.5_beta1.ebuild 477
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kapptemplate/files/digest-kapptemplate-3.4.1 b/kde-base/kapptemplate/files/digest-kapptemplate-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kapptemplate/files/digest-kapptemplate-3.4.1
+++ b/kde-base/kapptemplate/files/digest-kapptemplate-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kapptemplate/kapptemplate-3.4.1.ebuild b/kde-base/kapptemplate/kapptemplate-3.4.1.ebuild
index 4b181572c436..51f12e41fb01 100644
--- a/kde-base/kapptemplate/kapptemplate-3.4.1.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KAppTemplate - A shell script that will create the necessary framework to develop various KDE applications"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/kapptemplate/kapptemplate-3.5.0.ebuild b/kde-base/kapptemplate/kapptemplate-3.5.0.ebuild
index b63d45f33143..c96bc52ccc58 100644
--- a/kde-base/kapptemplate/kapptemplate-3.5.0.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-3.5.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/kde-base/kapptemplate/kapptemplate-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kapptemplate/kapptemplate-3.5_beta1.ebuild b/kde-base/kapptemplate/kapptemplate-3.5_beta1.ebuild
index bf408b319a3c..d965e6957cfb 100644
--- a/kde-base/kapptemplate/kapptemplate-3.5_beta1.ebuild
+++ b/kde-base/kapptemplate/kapptemplate-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-3.5_beta1.ebuild,v 1.1 2005/09/22 17:46:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kapptemplate/kapptemplate-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KAppTemplate - A shell script that will create the necessary framework to develop various KDE applications"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/kapptemplate/metadata.xml b/kde-base/kapptemplate/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kapptemplate/metadata.xml
+++ b/kde-base/kapptemplate/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/karm/ChangeLog b/kde-base/karm/ChangeLog
index e1282eb3e5e3..d1e09594a504 100644
--- a/kde-base/karm/ChangeLog
+++ b/kde-base/karm/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/karm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/ChangeLog,v 1.1 2005/01/15 02:24:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/ChangeLog,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> karm-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> karm-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> karm-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*karm-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +karm-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*karm-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +karm-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> karm-3.5_beta1.ebuild,
+  karm-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*karm-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +karm-3.5.0_beta2.ebuild:
+  New version.
+
+*karm-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +karm-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -karm-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*karm-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +karm-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*karm-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +karm-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> karm-3.4.2.ebuild:
+  ~alpha keyword.
+
+*karm-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +karm-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> karm-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> karm-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> karm-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*karm-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +karm-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> karm-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> karm-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> karm-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> karm-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> karm-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*karm-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +karm-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*karm-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +karm-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *karm-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/karm/Manifest b/kde-base/karm/Manifest
index fe70831ae852..b3062808450a 100644
--- a/kde-base/karm/Manifest
+++ b/kde-base/karm/Manifest
@@ -1,4 +1,26 @@
-MD5 bd9388228495ea7e1bfdbf0c495d1fb7 karm-3.4.0_alpha1.ebuild 512
-MD5 bd9388228495ea7e1bfdbf0c495d1fb7 karm-3.4.0_beta1.ebuild 512
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-karm-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-karm-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5c311f9b40cc769907fc10c882bdb4ee ChangeLog 3447
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-karm-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-karm-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-karm-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-karm-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-karm-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-karm-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-karm-3.5_beta1 68
+MD5 2c57dcfef40f6801e365cd219bbe3889 karm-3.4.1.ebuild 740
+MD5 2dcd6979729830efb5ef1c19c9d0783d karm-3.4.2.ebuild 753
+MD5 8faf404d6175cbf76caee8b85ad55fc9 karm-3.4.3.ebuild 749
+MD5 6bab4e192300180a7b8f60f263444218 karm-3.5.0.ebuild 670
+MD5 999be9df167e679888e5798ad18b7d51 karm-3.5.0_beta2.ebuild 675
+MD5 679ca8b2284f269b089b78e09b179698 karm-3.5.0_rc1.ebuild 674
+MD5 acb0865f5162f41ab17f9d66e8a8a7f6 karm-3.5_beta1.ebuild 732
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvL2ntT9W3vfTuoRArfqAJ0XGpu9pX+vqA6BsPS0TVxyUcJrBwCgioZ5
+mdLz6B+rZQsjVEQlu2l91Tg=
+=KD6w
+-----END PGP SIGNATURE-----
diff --git a/kde-base/karm/files/digest-karm-3.4.1 b/kde-base/karm/files/digest-karm-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/karm/files/digest-karm-3.4.1
+++ b/kde-base/karm/files/digest-karm-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/karm/files/digest-karm-3.4.2 b/kde-base/karm/files/digest-karm-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/karm/files/digest-karm-3.4.2
+++ b/kde-base/karm/files/digest-karm-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/karm/karm-3.4.1.ebuild b/kde-base/karm/karm-3.4.1.ebuild
index ea04e47203e7..ee58a93c3ece 100644
--- a/kde-base/karm/karm-3.4.1.ebuild
+++ b/kde-base/karm/karm-3.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/kde-base/karm/karm-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Time tracker tool"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV
 	~kde-base/libkdepim-$PV"
diff --git a/kde-base/karm/karm-3.4.2.ebuild b/kde-base/karm/karm-3.4.2.ebuild
index 9655773ffe7b..00d4af9f4f9b 100644
--- a/kde-base/karm/karm-3.4.2.ebuild
+++ b/kde-base/karm/karm-3.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/kde-base/karm/karm-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Time tracker tool"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV
 	~kde-base/libkdepim-$PV"
diff --git a/kde-base/karm/karm-3.4.3.ebuild b/kde-base/karm/karm-3.4.3.ebuild
index 95d3bb58e1bb..6506956bd52e 100644
--- a/kde-base/karm/karm-3.4.3.ebuild
+++ b/kde-base/karm/karm-3.4.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/kde-base/karm/karm-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Time tracker tool"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV
 	~kde-base/libkdepim-$PV"
diff --git a/kde-base/karm/karm-3.5.0.ebuild b/kde-base/karm/karm-3.5.0.ebuild
index 862f6e933f23..24e4e3a981fe 100644
--- a/kde-base/karm/karm-3.5.0.ebuild
+++ b/kde-base/karm/karm-3.5.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/kde-base/karm/karm-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/karm/karm-3.5.0_beta2.ebuild b/kde-base/karm/karm-3.5.0_beta2.ebuild
index 66050f858245..1e6f15097d19 100644
--- a/kde-base/karm/karm-3.5.0_beta2.ebuild
+++ b/kde-base/karm/karm-3.5.0_beta2.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/kde-base/karm/karm-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Time tracker tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/kdepim-kresources)
diff --git a/kde-base/karm/karm-3.5.0_rc1.ebuild b/kde-base/karm/karm-3.5.0_rc1.ebuild
index a1934c1d9d37..72ee375b8555 100644
--- a/kde-base/karm/karm-3.5.0_rc1.ebuild
+++ b/kde-base/karm/karm-3.5.0_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/kde-base/karm/karm-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/karm/karm-3.5_beta1.ebuild b/kde-base/karm/karm-3.5_beta1.ebuild
index 3da9e0672913..473d9fc847f5 100644
--- a/kde-base/karm/karm-3.5_beta1.ebuild
+++ b/kde-base/karm/karm-3.5_beta1.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/kde-base/karm/karm-3.5_beta1.ebuild,v 1.1 2005/09/22 17:47:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/karm/karm-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Time tracker tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV
 	~kde-base/libkdepim-$PV"
diff --git a/kde-base/karm/metadata.xml b/kde-base/karm/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/karm/metadata.xml
+++ b/kde-base/karm/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kasteroids/ChangeLog b/kde-base/kasteroids/ChangeLog
index 8f887d9ce40f..094c56e8c38c 100644
--- a/kde-base/kasteroids/ChangeLog
+++ b/kde-base/kasteroids/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for kde-base/kasteroids
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/ChangeLog,v 1.1 2005/01/15 02:24:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/ChangeLog,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kasteroids-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kasteroids-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kasteroids-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kasteroids-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kasteroids-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kasteroids-3.5_beta1.ebuild,
+  kasteroids-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kasteroids-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.5.0_beta2.ebuild:
+  New version.
+
+*kasteroids-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kasteroids-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kasteroids-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kasteroids-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kasteroids-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kasteroids-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kasteroids-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kasteroids-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kasteroids-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kasteroids-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kasteroids-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kasteroids-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  25 May 2005; Marcus D. Hanwell <cryos@gentoo.org> kasteroids-3.4.0.ebuild:
+  Marked ~amd64 now that visibility has been disabled - bug 80944.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kasteroids-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kasteroids-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kasteroids-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kasteroids-3.4.0.ebuild:
+  Should not have been keyworded, when tested I found that pressing L to launch
+  causes a crash every time. Marking -amd64 until a fix can be found.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kasteroids-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kasteroids-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kasteroids-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kasteroids-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kasteroids-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kasteroids-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kasteroids/Manifest b/kde-base/kasteroids/Manifest
index 9c5772e549ee..fae208a97164 100644
--- a/kde-base/kasteroids/Manifest
+++ b/kde-base/kasteroids/Manifest
@@ -1,4 +1,26 @@
-MD5 e20cc08cb6f7e9986d297f291d931852 kasteroids-3.4.0_alpha1.ebuild 408
-MD5 e20cc08cb6f7e9986d297f291d931852 kasteroids-3.4.0_beta1.ebuild 408
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kasteroids-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kasteroids-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3675fd376c29207d367e50264f75ee4d ChangeLog 3922
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kasteroids-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kasteroids-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kasteroids-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kasteroids-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kasteroids-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kasteroids-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kasteroids-3.5_beta1 70
+MD5 885e5e5818b3cb22eb5989c5a1ff50b8 kasteroids-3.4.1.ebuild 690
+MD5 c4beacc55130d4dcb9ad3413cc7722c5 kasteroids-3.4.2.ebuild 703
+MD5 b98392b0ad69fc2ceeaf3bb712748e3b kasteroids-3.4.3.ebuild 699
+MD5 16494abc1df9c488f291d2756a285b33 kasteroids-3.5.0.ebuild 642
+MD5 16af8904f3175f2b9b42c7240861e505 kasteroids-3.5.0_beta2.ebuild 647
+MD5 03283aa13a05e9ce8d81c167ad603d43 kasteroids-3.5.0_rc1.ebuild 646
+MD5 8d64a392e3f24e2c1a85cc4d2ec346f0 kasteroids-3.5_beta1.ebuild 682
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlgnntT9W3vfTuoRAgfmAJ9EtSdq2NuANETFicbl4hVZdO9ejwCcCntd
+3ly9NaARF53wENJTXkcPBSs=
+=ig5D
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kasteroids/files/digest-kasteroids-3.4.1 b/kde-base/kasteroids/files/digest-kasteroids-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kasteroids/files/digest-kasteroids-3.4.1
+++ b/kde-base/kasteroids/files/digest-kasteroids-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kasteroids/files/digest-kasteroids-3.4.2 b/kde-base/kasteroids/files/digest-kasteroids-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kasteroids/files/digest-kasteroids-3.4.2
+++ b/kde-base/kasteroids/files/digest-kasteroids-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kasteroids/kasteroids-3.4.1.ebuild b/kde-base/kasteroids/kasteroids-3.4.1.ebuild
index fcb6e05a2841..cb6254a8ff93 100644
--- a/kde-base/kasteroids/kasteroids-3.4.1.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kasteroids/kasteroids-3.4.2.ebuild b/kde-base/kasteroids/kasteroids-3.4.2.ebuild
index c53a2fd93219..b1a0fc8946b7 100644
--- a/kde-base/kasteroids/kasteroids-3.4.2.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kasteroids/kasteroids-3.4.3.ebuild b/kde-base/kasteroids/kasteroids-3.4.3.ebuild
index 9fe9b1416aba..aec373f9a6d0 100644
--- a/kde-base/kasteroids/kasteroids-3.4.3.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kasteroids/kasteroids-3.5.0.ebuild b/kde-base/kasteroids/kasteroids-3.5.0.ebuild
index 28eb3e212a09..0d9508742105 100644
--- a/kde-base/kasteroids/kasteroids-3.5.0.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.5.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/kde-base/kasteroids/kasteroids-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kasteroids/kasteroids-3.5.0_beta2.ebuild b/kde-base/kasteroids/kasteroids-3.5.0_beta2.ebuild
index a65c39d59107..1582fb6a502c 100644
--- a/kde-base/kasteroids/kasteroids-3.5.0_beta2.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kasteroids/kasteroids-3.5.0_rc1.ebuild b/kde-base/kasteroids/kasteroids-3.5.0_rc1.ebuild
index b8e2f394cfa2..74c398813780 100644
--- a/kde-base/kasteroids/kasteroids-3.5.0_rc1.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.5.0_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/kde-base/kasteroids/kasteroids-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kasteroids/kasteroids-3.5_beta1.ebuild b/kde-base/kasteroids/kasteroids-3.5_beta1.ebuild
index 52f9e3291acf..db1d9ea59d8c 100644
--- a/kde-base/kasteroids/kasteroids-3.5_beta1.ebuild
+++ b/kde-base/kasteroids/kasteroids-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.5_beta1.ebuild,v 1.1 2005/09/22 17:47:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kasteroids/kasteroids-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kasteroids/metadata.xml b/kde-base/kasteroids/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kasteroids/metadata.xml
+++ b/kde-base/kasteroids/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kate-plugins/ChangeLog b/kde-base/kate-plugins/ChangeLog
index 6a37cfeac46a..e040206b9ec2 100644
--- a/kde-base/kate-plugins/ChangeLog
+++ b/kde-base/kate-plugins/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for kde-base/kate-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/ChangeLog,v 1.1 2005/02/11 02:08:17 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kate-plugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kate-plugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kate-plugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kate-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kate-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kate-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kate-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kate-plugins-3.5_beta1.ebuild, kate-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kate-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kate-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+*kate-plugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kate-plugins-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kate-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kate-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kate-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kate-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kate-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kate-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kate-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kate-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kate-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kate-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kate-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kate-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kate-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kate-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kate-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kate-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kate-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kate-plugins-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kate-plugins-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kate-plugins-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kate-plugins-3.4.0_beta2-r1 (11 Feb 2005)
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +kate-plugins-3.4.0_beta1-r1.ebuild, -kate-plugins-3.4.0_beta1.ebuild,
+  +kate-plugins-3.4.0_beta2-r1.ebuild, -kate-plugins-3.4.0_beta2.ebuild:
+  bump to pull in docs changes
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kate-plugins-3.4.0_beta1.ebuild, kate-plugins-3.4.0_beta2.ebuild:
+  merge in docs ebuild
+
+*kate-plugins-3.4.0_beta1 (11 Feb 2005)
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +kate-plugins-3.4.0_beta1.ebuild:
+  support the kate-* move
 
 *kate-plugins-3.4.0_beta2 (10 Feb 2005)
 
diff --git a/kde-base/kate-plugins/Manifest b/kde-base/kate-plugins/Manifest
index a9f8ad8f5010..c99553cde134 100644
--- a/kde-base/kate-plugins/Manifest
+++ b/kde-base/kate-plugins/Manifest
@@ -1,2 +1,26 @@
-MD5 2c536140a4db32ec1443340b3336891a kate-plugins-3.4.0_beta2.ebuild 595
-MD5 9009a89a3313cb85f25a0d66683e48ed files/digest-kate-plugins-3.4.0_beta2 298
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c351a1eff745ad05f8db8bb2c10c80dd ChangeLog 3966
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-kate-plugins-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-kate-plugins-3.4.2 291
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kate-plugins-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kate-plugins-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-kate-plugins-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-kate-plugins-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kate-plugins-3.5_beta1 70
+MD5 ee742e534fe545c6250e9bfcca863ff1 kate-plugins-3.4.1.ebuild 499
+MD5 d717083a99ee39a5a324d9d9a5b91f5d kate-plugins-3.4.2.ebuild 512
+MD5 03ffc27260a1430d03cf079453ee3c63 kate-plugins-3.4.3.ebuild 508
+MD5 49a579e859925f966c9c2560467f3049 kate-plugins-3.5.0.ebuild 458
+MD5 075c8e99409dfd3c45a71d39fd949497 kate-plugins-3.5.0_beta2.ebuild 463
+MD5 72601b3de6d7df790b2274a5126d29de kate-plugins-3.5.0_rc1.ebuild 462
+MD5 6d6a9b62607cb7564b66f6464d5c5a76 kate-plugins-3.5_beta1.ebuild 491
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxdRntT9W3vfTuoRAn42AJ9F02qvJASP1X22F7TBqoJI/xIMhwCfQKBx
+Fl7bEgj9otIe9ebY7+wOrv8=
+=WwYi
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kate-plugins/files/digest-kate-plugins-3.4.1 b/kde-base/kate-plugins/files/digest-kate-plugins-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/kate-plugins/files/digest-kate-plugins-3.4.1
+++ b/kde-base/kate-plugins/files/digest-kate-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/kate-plugins/files/digest-kate-plugins-3.4.2 b/kde-base/kate-plugins/files/digest-kate-plugins-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/kate-plugins/files/digest-kate-plugins-3.4.2
+++ b/kde-base/kate-plugins/files/digest-kate-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/kate-plugins/kate-plugins-3.4.1.ebuild b/kde-base/kate-plugins/kate-plugins-3.4.1.ebuild
index 29b663c8548a..bcaba832fa01 100644
--- a/kde-base/kate-plugins/kate-plugins-3.4.1.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.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/kde-base/kate-plugins/kate-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kate plugins and docs"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kate)"
 OLDDEPEND="~kde-base/kate-$PV"
diff --git a/kde-base/kate-plugins/kate-plugins-3.4.2.ebuild b/kde-base/kate-plugins/kate-plugins-3.4.2.ebuild
index 4cdf325d0617..50444680c26f 100644
--- a/kde-base/kate-plugins/kate-plugins-3.4.2.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.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/kde-base/kate-plugins/kate-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kate plugins and docs"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kate)"
 OLDDEPEND="~kde-base/kate-$PV"
diff --git a/kde-base/kate-plugins/kate-plugins-3.4.3.ebuild b/kde-base/kate-plugins/kate-plugins-3.4.3.ebuild
index 3e92eeaf7b93..337526321f6e 100644
--- a/kde-base/kate-plugins/kate-plugins-3.4.3.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.4.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/kde-base/kate-plugins/kate-plugins-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kate plugins and docs"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kate)"
 OLDDEPEND="~kde-base/kate-$PV"
diff --git a/kde-base/kate-plugins/kate-plugins-3.5.0.ebuild b/kde-base/kate-plugins/kate-plugins-3.5.0.ebuild
index 8138c90ae4bc..e721134d0458 100644
--- a/kde-base/kate-plugins/kate-plugins-3.5.0.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5.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/kde-base/kate-plugins/kate-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
diff --git a/kde-base/kate-plugins/kate-plugins-3.5.0_beta2.ebuild b/kde-base/kate-plugins/kate-plugins-3.5.0_beta2.ebuild
index 1f29ce425f1b..4659bf59eab1 100644
--- a/kde-base/kate-plugins/kate-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5.0_beta2.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/kde-base/kate-plugins/kate-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kate plugins and docs"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kate)"
 
diff --git a/kde-base/kate-plugins/kate-plugins-3.5.0_rc1.ebuild b/kde-base/kate-plugins/kate-plugins-3.5.0_rc1.ebuild
index 36ab5b5aeb67..c06119e525ef 100644
--- a/kde-base/kate-plugins/kate-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5.0_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/kde-base/kate-plugins/kate-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
diff --git a/kde-base/kate-plugins/kate-plugins-3.5_beta1.ebuild b/kde-base/kate-plugins/kate-plugins-3.5_beta1.ebuild
index 0882708cedb2..8ce8141bc488 100644
--- a/kde-base/kate-plugins/kate-plugins-3.5_beta1.ebuild
+++ b/kde-base/kate-plugins/kate-plugins-3.5_beta1.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/kde-base/kate-plugins/kate-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 17:49:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate-plugins/kate-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kate"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kate plugins and docs"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kate)"
 OLDDEPEND="~kde-base/kate-$PV"
diff --git a/kde-base/kate-plugins/metadata.xml b/kde-base/kate-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kate-plugins/metadata.xml
+++ b/kde-base/kate-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kate/ChangeLog b/kde-base/kate/ChangeLog
index 077bfff88a3f..0bd4d91f7e4b 100644
--- a/kde-base/kate/ChangeLog
+++ b/kde-base/kate/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for kde-base/kate
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.1 2005/01/15 02:24:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/ChangeLog,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kate-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kate-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kate-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kate-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kate-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kate-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kate-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kate-3.5_beta1.ebuild,
+  kate-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kate-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kate-3.5.0_beta2.ebuild:
+  New version.
+
+*kate-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kate-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kate-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kate-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kate-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kate-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kate-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kate-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kate-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kate-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  18 Jul 2005; Caleb Tennis <caleb@gentoo.org> ChangeLog:
+  Fix kate for gcc 4.x
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kate-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kate-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kate-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kate-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kate-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kate-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kate-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kate-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kate-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kate-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kate-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kate-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kate-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kate-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kate-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kate/Manifest b/kde-base/kate/Manifest
index 87bcb353b424..c2770ee05df8 100644
--- a/kde-base/kate/Manifest
+++ b/kde-base/kate/Manifest
@@ -1,4 +1,27 @@
-MD5 770c11af3268a3dcfb2d5d66489d030a kate-3.4.0_beta1.ebuild 361
-MD5 770c11af3268a3dcfb2d5d66489d030a kate-3.4.0_alpha1.ebuild 361
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kate-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kate-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee4debdeecee443fcba5d7d7ffa1a876 ChangeLog 3529
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kate-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kate-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kate-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kate-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kate-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kate-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kate-3.5_beta1 69
+MD5 3b51987b260bd459b22f032394a48dc0 files/kate-gcc-4.patch 287
+MD5 e3aec595f1bb9e306214befbaecc006a kate-3.4.1.ebuild 436
+MD5 c1847e2ae10a648a883ec88fd6b73ac6 kate-3.4.2.ebuild 410
+MD5 7e410ae2e60aca3a55fc63e71d6a6a18 kate-3.4.3.ebuild 406
+MD5 17d0eafc6551df79759c38aa9a7374ed kate-3.5.0.ebuild 386
+MD5 09339b3488273c6517f825e229c8dd4a kate-3.5.0_beta2.ebuild 391
+MD5 1f9422931b9cffc49d27c10895a04502 kate-3.5.0_rc1.ebuild 390
+MD5 f2f4020b660993a9edce1e62b08458b0 kate-3.5_beta1.ebuild 389
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjrYntT9W3vfTuoRAneyAKCm+oBVYoJimBuy1hmWZ3T3L5VGoACgofca
+/MkL3SJVx29uQHAFQFDpOLE=
+=qQhk
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kate/files/digest-kate-3.4.1 b/kde-base/kate/files/digest-kate-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kate/files/digest-kate-3.4.1
+++ b/kde-base/kate/files/digest-kate-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kate/files/digest-kate-3.4.2 b/kde-base/kate/files/digest-kate-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kate/files/digest-kate-3.4.2
+++ b/kde-base/kate/files/digest-kate-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kate/kate-3.4.1.ebuild b/kde-base/kate/kate-3.4.1.ebuild
index 6802af2edde9..a189984d9e61 100644
--- a/kde-base/kate/kate-3.4.1.ebuild
+++ b/kde-base/kate/kate-3.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/kde-base/kate/kate-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE MDI editor/ide"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
+KMEXTRA="doc/kwrite"
+PATCHES="${FILESDIR}/kate-gcc-4.patch"
 
diff --git a/kde-base/kate/kate-3.4.2.ebuild b/kde-base/kate/kate-3.4.2.ebuild
index f2681120a8fa..1a53837d52f0 100644
--- a/kde-base/kate/kate-3.4.2.ebuild
+++ b/kde-base/kate/kate-3.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/kde-base/kate/kate-3.4.2.ebuild,v 1.1 2005/07/28 21:16:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE MDI editor/ide"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 KMEXTRA="doc/kwrite"
diff --git a/kde-base/kate/kate-3.4.3.ebuild b/kde-base/kate/kate-3.4.3.ebuild
index e59cd4ed0ca7..a64f6afdee92 100644
--- a/kde-base/kate/kate-3.4.3.ebuild
+++ b/kde-base/kate/kate-3.4.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/kde-base/kate/kate-3.4.3.ebuild,v 1.1 2005/10/13 00:09:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE MDI editor/ide"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 KMEXTRA="doc/kwrite"
diff --git a/kde-base/kate/kate-3.5.0.ebuild b/kde-base/kate/kate-3.5.0.ebuild
index 81172b2daf2f..fda6fd426c1e 100644
--- a/kde-base/kate/kate-3.5.0.ebuild
+++ b/kde-base/kate/kate-3.5.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/kde-base/kate/kate-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kate/kate-3.5.0_beta2.ebuild b/kde-base/kate/kate-3.5.0_beta2.ebuild
index ef211d22ee4c..6337510e6fc1 100644
--- a/kde-base/kate/kate-3.5.0_beta2.ebuild
+++ b/kde-base/kate/kate-3.5.0_beta2.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/kde-base/kate/kate-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE MDI editor/ide"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="doc/kwrite"
diff --git a/kde-base/kate/kate-3.5.0_rc1.ebuild b/kde-base/kate/kate-3.5.0_rc1.ebuild
index d16061937721..34175a01dd91 100644
--- a/kde-base/kate/kate-3.5.0_rc1.ebuild
+++ b/kde-base/kate/kate-3.5.0_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/kde-base/kate/kate-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kate/kate-3.5_beta1.ebuild b/kde-base/kate/kate-3.5_beta1.ebuild
index 497d204a613a..15d78898c3c3 100644
--- a/kde-base/kate/kate-3.5_beta1.ebuild
+++ b/kde-base/kate/kate-3.5_beta1.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/kde-base/kate/kate-3.5_beta1.ebuild,v 1.1 2005/09/22 17:48:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kate/kate-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE MDI editor/ide"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="doc/kwrite"
diff --git a/kde-base/kate/metadata.xml b/kde-base/kate/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kate/metadata.xml
+++ b/kde-base/kate/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/katomic/ChangeLog b/kde-base/katomic/ChangeLog
index 6a9d217d7c61..8fd52d9bd373 100644
--- a/kde-base/katomic/ChangeLog
+++ b/kde-base/katomic/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/katomic
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/ChangeLog,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> katomic-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> katomic-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> katomic-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*katomic-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*katomic-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> katomic-3.5_beta1.ebuild,
+  katomic-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*katomic-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.5.0_beta2.ebuild:
+  New version.
+
+*katomic-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -katomic-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*katomic-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +katomic-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*katomic-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +katomic-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> katomic-3.4.2.ebuild:
+  ~alpha keyword.
+
+*katomic-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> katomic-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> katomic-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> katomic-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*katomic-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> katomic-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> katomic-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> katomic-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> katomic-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> katomic-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*katomic-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*katomic-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +katomic-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *katomic-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/katomic/Manifest b/kde-base/katomic/Manifest
index 96bdf0024964..595e212b871b 100644
--- a/kde-base/katomic/Manifest
+++ b/kde-base/katomic/Manifest
@@ -1,4 +1,26 @@
-MD5 a75420e753da4f13b51f4ee5907b1c93 katomic-3.4.0_alpha1.ebuild 423
-MD5 a75420e753da4f13b51f4ee5907b1c93 katomic-3.4.0_beta1.ebuild 423
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-katomic-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-katomic-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ebbd727e1c67cbb59a159cc63ca2d6c5 ChangeLog 3566
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-katomic-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-katomic-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-katomic-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-katomic-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-katomic-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-katomic-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-katomic-3.5_beta1 70
+MD5 c33625786e9af17a8fb4a75fa4f0053e katomic-3.4.1.ebuild 542
+MD5 b53bd421e8f19c681dc48b9f56bf99d9 katomic-3.4.2.ebuild 555
+MD5 069c9986d4d9d7e7fd9a1e56b5c0bcf3 katomic-3.4.3.ebuild 551
+MD5 c6b43ae7380342d7130db08db0aca457 katomic-3.5.0.ebuild 494
+MD5 5485ce6049d7fd10410ced5b7a2da612 katomic-3.5.0_beta2.ebuild 499
+MD5 a68308059f110b71e595b918c2428429 katomic-3.5.0_rc1.ebuild 498
+MD5 e25cf14d9a7c3bd63836ce3a4d68daee katomic-3.5_beta1.ebuild 534
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlhnntT9W3vfTuoRAuS3AJ9MuW/QidNPK1ssHxPc87Oe4rK/jgCdH00X
+LyZle2FLVHQAKea7NUJIfQ4=
+=xGy/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/katomic/files/digest-katomic-3.4.1 b/kde-base/katomic/files/digest-katomic-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/katomic/files/digest-katomic-3.4.1
+++ b/kde-base/katomic/files/digest-katomic-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/katomic/files/digest-katomic-3.4.2 b/kde-base/katomic/files/digest-katomic-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/katomic/files/digest-katomic-3.4.2
+++ b/kde-base/katomic/files/digest-katomic-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/katomic/katomic-3.4.1.ebuild b/kde-base/katomic/katomic-3.4.1.ebuild
index dfabab1feabe..70b6aacef27e 100644
--- a/kde-base/katomic/katomic-3.4.1.ebuild
+++ b/kde-base/katomic/katomic-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/katomic/katomic-3.4.2.ebuild b/kde-base/katomic/katomic-3.4.2.ebuild
index 5369b8036fb8..ddcb89f31c5c 100644
--- a/kde-base/katomic/katomic-3.4.2.ebuild
+++ b/kde-base/katomic/katomic-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/katomic/katomic-3.4.3.ebuild b/kde-base/katomic/katomic-3.4.3.ebuild
index 1872a2ceeb0e..75adfa0e62e1 100644
--- a/kde-base/katomic/katomic-3.4.3.ebuild
+++ b/kde-base/katomic/katomic-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/katomic/katomic-3.5.0.ebuild b/kde-base/katomic/katomic-3.5.0.ebuild
index 423da0cd6b33..b15b08aacbc7 100644
--- a/kde-base/katomic/katomic-3.5.0.ebuild
+++ b/kde-base/katomic/katomic-3.5.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/kde-base/katomic/katomic-3.5.0.ebuild,v 1.1 2005/11/22 22:13:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/katomic/katomic-3.5.0_beta2.ebuild b/kde-base/katomic/katomic-3.5.0_beta2.ebuild
index 376a9497fcce..549aaedb93c5 100644
--- a/kde-base/katomic/katomic-3.5.0_beta2.ebuild
+++ b/kde-base/katomic/katomic-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/katomic/katomic-3.5.0_rc1.ebuild b/kde-base/katomic/katomic-3.5.0_rc1.ebuild
index 96929d319e6f..0d33223e3679 100644
--- a/kde-base/katomic/katomic-3.5.0_rc1.ebuild
+++ b/kde-base/katomic/katomic-3.5.0_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/kde-base/katomic/katomic-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/katomic/katomic-3.5_beta1.ebuild b/kde-base/katomic/katomic-3.5_beta1.ebuild
index 8a5679546e3b..5251b0f28f23 100644
--- a/kde-base/katomic/katomic-3.5_beta1.ebuild
+++ b/kde-base/katomic/katomic-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.5_beta1.ebuild,v 1.1 2005/09/22 17:50:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/katomic/katomic-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Atomic Entertainment Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/katomic/metadata.xml b/kde-base/katomic/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/katomic/metadata.xml
+++ b/kde-base/katomic/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kaudiocreator/ChangeLog b/kde-base/kaudiocreator/ChangeLog
index ed306fa79c9d..1a4c3a05c063 100644
--- a/kde-base/kaudiocreator/ChangeLog
+++ b/kde-base/kaudiocreator/ChangeLog
@@ -1,6 +1,125 @@
 # ChangeLog for kde-base/kaudiocreator
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/ChangeLog,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kaudiocreator-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kaudiocreator-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kaudiocreator-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kaudiocreator-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaudiocreator-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kaudiocreator-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kaudiocreator-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kaudiocreator-3.5_beta1.ebuild, kaudiocreator-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kaudiocreator-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaudiocreator-3.5.0_beta2.ebuild:
+  New version.
+
+*kaudiocreator-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kaudiocreator-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kaudiocreator-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kaudiocreator-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaudiocreator-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kaudiocreator-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kaudiocreator-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kaudiocreator-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kaudiocreator-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kaudiocreator-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kaudiocreator-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kaudiocreator-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kaudiocreator-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kaudiocreator-3.4.1.ebuild:
+  Correct dependencies, fixing bug #95304.
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kaudiocreator-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592).
+
+*kaudiocreator-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kaudiocreator-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kaudiocreator-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kaudiocreator-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kaudiocreator-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kaudiocreator-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kaudiocreator-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kaudiocreator-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kaudiocreator-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kaudiocreator-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kaudiocreator-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  29 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  kaudiocreator-3.4.0_beta1.ebuild:
+  Add optional runtime deps on lame, vorbis-tools (for oggenc) and flac. These
+  are used as encoders by kaudiocreator. Closes bug #79515.
 
 *kaudiocreator-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kaudiocreator/Manifest b/kde-base/kaudiocreator/Manifest
index 56efab528cbf..ab953a91f545 100644
--- a/kde-base/kaudiocreator/Manifest
+++ b/kde-base/kaudiocreator/Manifest
@@ -1,4 +1,26 @@
-MD5 1d1db0c9e6710b00360fd95f00b951e9 kaudiocreator-3.4.0_beta1.ebuild 450
-MD5 1d1db0c9e6710b00360fd95f00b951e9 kaudiocreator-3.4.0_alpha1.ebuild 450
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kaudiocreator-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kaudiocreator-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 093775f04f39f26defb72afa5b91f58f ChangeLog 4286
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kaudiocreator-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-kaudiocreator-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kaudiocreator-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kaudiocreator-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kaudiocreator-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kaudiocreator-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kaudiocreator-3.5_beta1 74
+MD5 c2549fb388f6f9cb0e8c4e7f1934697f kaudiocreator-3.4.1.ebuild 1092
+MD5 aaac11e8f69c89ec27ff0826251fed89 kaudiocreator-3.4.2.ebuild 1105
+MD5 75d3ec6d20d6deb255318c1e11d5fd95 kaudiocreator-3.4.3.ebuild 1101
+MD5 400160dcc51daa65b72ddcc9edbc926f kaudiocreator-3.5.0.ebuild 1301
+MD5 57e131e399c610855a8e24c4b49c61a3 kaudiocreator-3.5.0_beta2.ebuild 1306
+MD5 44cc3436110e6a1602f42ea3c40f69dd kaudiocreator-3.5.0_rc1.ebuild 1305
+MD5 94369157daad09346ca12f60fdfd28ba kaudiocreator-3.5_beta1.ebuild 1304
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmxAntT9W3vfTuoRAtR7AJ43vMdvMteYUszDYyRdXY8xAmiWdACgsiBY
+PxCk2xktjFeTPUM5KZMrxRw=
+=OcpV
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.1 b/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.1
+++ b/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.2 b/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.2
+++ b/kde-base/kaudiocreator/files/digest-kaudiocreator-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.4.1.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.4.1.ebuild
index ecd54a196f90..377c4106c328 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.4.1.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.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/kde-base/kaudiocreator/kaudiocreator-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,16 +8,17 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD ripper and audio encoder frontend"
-KEYWORDS="~x86 ~amd64"
-IUSE="encode flac oggvorbis"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia"
 
 # External encoders used - no optional compile-time support
 RDEPEND="$DEPEND
-oggvorbis? ( media-sound/vorbis-tools )
-flac? ( media-libs/flac )
-encode? ( media-sound/lame )"
+	$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-kioslaves)
+	encode? ( vorbis? ( media-sound/vorbis-tools )
+	          flac? ( media-libs/flac )
+	          mp3? ( media-sound/lame ) )"
 
 KMCOPYLIB="libkcddb libkcddb"
 KMEXTRACTONLY="libkcddb"
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.4.2.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.4.2.ebuild
index e2d7fddb4553..46db38eeeba8 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.4.2.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.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/kde-base/kaudiocreator/kaudiocreator-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD ripper and audio encoder frontend"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia"
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.4.3.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.4.3.ebuild
index abb9a91709e5..c6037f693987 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.4.3.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.4.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/kde-base/kaudiocreator/kaudiocreator-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD ripper and audio encoder frontend"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia"
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.5.0.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.5.0.ebuild
index 43f2659deda7..f9acf852ed62 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.5.0.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.5.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/kde-base/kaudiocreator/kaudiocreator-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.5.0_beta2.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.5.0_beta2.ebuild
index 29cd9db39ea7..05adc8a4cd94 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.5.0_beta2.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.5.0_beta2.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/kde-base/kaudiocreator/kaudiocreator-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD ripper and audio encoder frontend"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia"
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.5.0_rc1.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.5.0_rc1.ebuild
index 0567a4652681..2c433f45f4a2 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.5.0_rc1.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.5.0_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/kde-base/kaudiocreator/kaudiocreator-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kaudiocreator/kaudiocreator-3.5_beta1.ebuild b/kde-base/kaudiocreator/kaudiocreator-3.5_beta1.ebuild
index ae18e9536fee..29496fbd70a6 100644
--- a/kde-base/kaudiocreator/kaudiocreator-3.5_beta1.ebuild
+++ b/kde-base/kaudiocreator/kaudiocreator-3.5_beta1.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/kde-base/kaudiocreator/kaudiocreator-3.5_beta1.ebuild,v 1.1 2005/09/22 17:51:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaudiocreator/kaudiocreator-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD ripper and audio encoder frontend"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia"
diff --git a/kde-base/kaudiocreator/metadata.xml b/kde-base/kaudiocreator/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kaudiocreator/metadata.xml
+++ b/kde-base/kaudiocreator/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbabel/ChangeLog b/kde-base/kbabel/ChangeLog
index 251e4f51c8a9..cf78989b61d2 100644
--- a/kde-base/kbabel/ChangeLog
+++ b/kde-base/kbabel/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/kbabel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/ChangeLog,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kbabel-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kbabel-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kbabel-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kbabel-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kbabel-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kbabel-3.5_beta1.ebuild,
+  kbabel-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kbabel-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.5.0_beta2.ebuild:
+  New version.
+
+*kbabel-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbabel-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbabel-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbabel-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbabel-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbabel-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  29 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/configure-fix-kdesdk-db-3.4.patch, kbabel-3.4.2.ebuild:
+  Add support for Berkeley DB.
+
+*kbabel-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbabel-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbabel-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbabel-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbabel-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kbabel-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbabel-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbabel-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kbabel-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kbabel-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbabel-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbabel-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbabel-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kbabel/Manifest b/kde-base/kbabel/Manifest
index f5c60765d240..833c8f2a4abe 100644
--- a/kde-base/kbabel/Manifest
+++ b/kde-base/kbabel/Manifest
@@ -1,4 +1,17 @@
-MD5 36a64bdcae92e5feb1dd411b1bf0a51e kbabel-3.4.0_beta1.ebuild 301
-MD5 36a64bdcae92e5feb1dd411b1bf0a51e kbabel-3.4.0_alpha1.ebuild 301
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kbabel-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kbabel-3.4.0_alpha1 67
+MD5 2862dbe7e2dbfbac6f419c56477d25bb ChangeLog 3486
+MD5 dfde24583562b306a9d74f0d3902dd32 kbabel-3.4.1.ebuild 419
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 8674548f2ded07167d5b431a9314d138 kbabel-3.4.2.ebuild 1014
+MD5 39332cf4e8cbd8a4d9129fa9be2db9b2 kbabel-3.5_beta1.ebuild 999
+MD5 62fde18e9883792d74d3ffe6ab66634d kbabel-3.4.3.ebuild 1011
+MD5 3971deff74059669f9b0fef49c87753b kbabel-3.5.0_beta2.ebuild 943
+MD5 bef60360e4e29adc737bb5d331ec449d kbabel-3.5.0_rc1.ebuild 942
+MD5 bca2fbc3689340c695f5380cb52b21c3 kbabel-3.5.0.ebuild 938
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kbabel-3.4.1 206
+MD5 6b1138834ead945e1b1116dd3a92a7f9 files/configure-fix-kdesdk-db-3.4.patch 999
+MD5 0a38813829924b012d8b632f47abb45d files/digest-kbabel-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kbabel-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kbabel-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kbabel-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-kbabel-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kbabel-3.5.0 66
diff --git a/kde-base/kbabel/files/digest-kbabel-3.4.1 b/kde-base/kbabel/files/digest-kbabel-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kbabel/files/digest-kbabel-3.4.1
+++ b/kde-base/kbabel/files/digest-kbabel-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kbabel/files/digest-kbabel-3.4.2 b/kde-base/kbabel/files/digest-kbabel-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/kbabel/files/digest-kbabel-3.4.2
+++ b/kde-base/kbabel/files/digest-kbabel-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kbabel/kbabel-3.4.1.ebuild b/kde-base/kbabel/kbabel-3.4.1.ebuild
index 091b4a469150..8cf82aefb7f2 100644
--- a/kde-base/kbabel/kbabel-3.4.1.ebuild
+++ b/kde-base/kbabel/kbabel-3.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/kde-base/kbabel/kbabel-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBabel - An advanced PO file editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/flex"
\ No newline at end of file
diff --git a/kde-base/kbabel/kbabel-3.4.2.ebuild b/kde-base/kbabel/kbabel-3.4.2.ebuild
index acf782910a99..befbbabfa335 100644
--- a/kde-base/kbabel/kbabel-3.4.2.ebuild
+++ b/kde-base/kbabel/kbabel-3.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/kde-base/kbabel/kbabel-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -9,6 +9,28 @@ inherit kde-meta eutils
 
 DESCRIPTION="KBabel - An advanced PO file editor"
 KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="berkdb"
 
-DEPEND="sys-devel/flex"
\ No newline at end of file
+DEPEND="sys-devel/flex
+	berkdb? ( || ( =sys-libs/db-4.3*
+	               =sys-libs/db-4.2* ) )"
+
+PATCHES1="${FILESDIR}/configure-fix-kdesdk-db-3.4.patch"
+
+src_compile() {
+	local myconf=""
+
+	if use berkdb; then
+		if has_version "=sys-libs/db-4.3*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3
+			        --with-db-include-dir=/usr/include/db4.3"
+		elif has_version "=sys-libs/db-4.2*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2
+			        --with-db-include-dir=/usr/include/db4.2"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	kde_src_compile
+}
diff --git a/kde-base/kbabel/kbabel-3.4.3.ebuild b/kde-base/kbabel/kbabel-3.4.3.ebuild
index 16cde676e003..23b846f66eb4 100644
--- a/kde-base/kbabel/kbabel-3.4.3.ebuild
+++ b/kde-base/kbabel/kbabel-3.4.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/kde-base/kbabel/kbabel-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBabel - An advanced PO file editor"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE="berkdb"
 
 DEPEND="sys-devel/flex
diff --git a/kde-base/kbabel/kbabel-3.5.0.ebuild b/kde-base/kbabel/kbabel-3.5.0.ebuild
index 24ab26bb6ce0..2238e20d5c7d 100644
--- a/kde-base/kbabel/kbabel-3.5.0.ebuild
+++ b/kde-base/kbabel/kbabel-3.5.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/kde-base/kbabel/kbabel-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kbabel/kbabel-3.5.0_beta2.ebuild b/kde-base/kbabel/kbabel-3.5.0_beta2.ebuild
index 8065046b04b4..76fab8729637 100644
--- a/kde-base/kbabel/kbabel-3.5.0_beta2.ebuild
+++ b/kde-base/kbabel/kbabel-3.5.0_beta2.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/kde-base/kbabel/kbabel-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,15 +8,13 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBabel - An advanced PO file editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="berkdb"
 
 DEPEND="sys-devel/flex
 	berkdb? ( || ( =sys-libs/db-4.3*
 	               =sys-libs/db-4.2* ) )"
 
-PATCHES1="${FILESDIR}/configure-fix-kdesdk-db-3.4.patch"
-
 src_compile() {
 	local myconf=""
 
diff --git a/kde-base/kbabel/kbabel-3.5.0_rc1.ebuild b/kde-base/kbabel/kbabel-3.5.0_rc1.ebuild
index dcc1e88db1ac..7e952c533616 100644
--- a/kde-base/kbabel/kbabel-3.5.0_rc1.ebuild
+++ b/kde-base/kbabel/kbabel-3.5.0_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/kde-base/kbabel/kbabel-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kbabel/kbabel-3.5_beta1.ebuild b/kde-base/kbabel/kbabel-3.5_beta1.ebuild
index 41ced58f0204..b182626f51fc 100644
--- a/kde-base/kbabel/kbabel-3.5_beta1.ebuild
+++ b/kde-base/kbabel/kbabel-3.5_beta1.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/kde-base/kbabel/kbabel-3.5_beta1.ebuild,v 1.1 2005/09/22 17:52:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbabel/kbabel-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBabel - An advanced PO file editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="berkdb"
 
 DEPEND="sys-devel/flex
diff --git a/kde-base/kbabel/metadata.xml b/kde-base/kbabel/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbabel/metadata.xml
+++ b/kde-base/kbabel/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbackgammon/ChangeLog b/kde-base/kbackgammon/ChangeLog
index 3ff3cd3ff8f4..59a0878cdd34 100644
--- a/kde-base/kbackgammon/ChangeLog
+++ b/kde-base/kbackgammon/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kbackgammon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kbackgammon-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kbackgammon-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kbackgammon-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kbackgammon-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbackgammon-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kbackgammon-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbackgammon-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kbackgammon-3.5_beta1.ebuild, kbackgammon-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kbackgammon-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbackgammon-3.5.0_beta2.ebuild:
+  New version.
+
+*kbackgammon-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbackgammon-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbackgammon-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbackgammon-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbackgammon-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbackgammon-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbackgammon-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kbackgammon-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kbackgammon-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbackgammon-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbackgammon-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kbackgammon-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbackgammon-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbackgammon-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbackgammon-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbackgammon-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kbackgammon-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbackgammon-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbackgammon-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kbackgammon-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kbackgammon-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbackgammon-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbackgammon-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbackgammon-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbackgammon-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kbackgammon/Manifest b/kde-base/kbackgammon/Manifest
index 49fb9ef965b5..ced7b4d55785 100644
--- a/kde-base/kbackgammon/Manifest
+++ b/kde-base/kbackgammon/Manifest
@@ -1,4 +1,26 @@
-MD5 1416eddbbd86615062dfce658620fd9c kbackgammon-3.4.0_alpha1.ebuild 422
-MD5 1416eddbbd86615062dfce658620fd9c kbackgammon-3.4.0_beta1.ebuild 422
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kbackgammon-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kbackgammon-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53e8407b2129ca0acd02fa6b4b17ae01 ChangeLog 3734
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kbackgammon-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kbackgammon-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kbackgammon-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kbackgammon-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kbackgammon-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kbackgammon-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kbackgammon-3.5_beta1 70
+MD5 0353cc128a6f7f89acf7922fee8a9296 kbackgammon-3.4.1.ebuild 549
+MD5 283943169f14216890da50dc44565372 kbackgammon-3.4.2.ebuild 562
+MD5 61c420502a662c3f2e367fc65cc1be44 kbackgammon-3.4.3.ebuild 558
+MD5 48bc59e473e388a0980ad38715dc21a2 kbackgammon-3.5.0.ebuild 501
+MD5 0dac87b63a5c772a99ba6d7f64a37829 kbackgammon-3.5.0_beta2.ebuild 506
+MD5 2c1b414a04f06430e55bed988bb99cbd kbackgammon-3.5.0_rc1.ebuild 505
+MD5 4beab437401ed58a48ca97335c39f178 kbackgammon-3.5_beta1.ebuild 541
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlkintT9W3vfTuoRAm5xAJ9ULpKRJ7O5qA2u9nIvef+J7aihhgCeIICJ
+9LNQcxnOkgSGdYqoLER5yHg=
+=ZtXW
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kbackgammon/files/digest-kbackgammon-3.4.1 b/kde-base/kbackgammon/files/digest-kbackgammon-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kbackgammon/files/digest-kbackgammon-3.4.1
+++ b/kde-base/kbackgammon/files/digest-kbackgammon-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kbackgammon/files/digest-kbackgammon-3.4.2 b/kde-base/kbackgammon/files/digest-kbackgammon-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kbackgammon/files/digest-kbackgammon-3.4.2
+++ b/kde-base/kbackgammon/files/digest-kbackgammon-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kbackgammon/kbackgammon-3.4.1.ebuild b/kde-base/kbackgammon/kbackgammon-3.4.1.ebuild
index d7063089e5ca..2c800987b6f7 100644
--- a/kde-base/kbackgammon/kbackgammon-3.4.1.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A Backgammon program for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbackgammon/kbackgammon-3.4.2.ebuild b/kde-base/kbackgammon/kbackgammon-3.4.2.ebuild
index 014b420ed730..9c5a3aec16ed 100644
--- a/kde-base/kbackgammon/kbackgammon-3.4.2.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A Backgammon program for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbackgammon/kbackgammon-3.4.3.ebuild b/kde-base/kbackgammon/kbackgammon-3.4.3.ebuild
index 3a8cbfadf987..e5138d0d7bd6 100644
--- a/kde-base/kbackgammon/kbackgammon-3.4.3.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A Backgammon program for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbackgammon/kbackgammon-3.5.0.ebuild b/kde-base/kbackgammon/kbackgammon-3.5.0.ebuild
index 457d2b118947..1e0f1c42a627 100644
--- a/kde-base/kbackgammon/kbackgammon-3.5.0.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.5.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/kde-base/kbackgammon/kbackgammon-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbackgammon/kbackgammon-3.5.0_beta2.ebuild b/kde-base/kbackgammon/kbackgammon-3.5.0_beta2.ebuild
index b1f6e8f4c511..8089490ada96 100644
--- a/kde-base/kbackgammon/kbackgammon-3.5.0_beta2.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:49 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A Backgammon program for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kbackgammon/kbackgammon-3.5.0_rc1.ebuild b/kde-base/kbackgammon/kbackgammon-3.5.0_rc1.ebuild
index 2d47a2eeb539..8d21e8129464 100644
--- a/kde-base/kbackgammon/kbackgammon-3.5.0_rc1.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.5.0_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/kde-base/kbackgammon/kbackgammon-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbackgammon/kbackgammon-3.5_beta1.ebuild b/kde-base/kbackgammon/kbackgammon-3.5_beta1.ebuild
index 4241d2e9ee69..a27552203d0e 100644
--- a/kde-base/kbackgammon/kbackgammon-3.5_beta1.ebuild
+++ b/kde-base/kbackgammon/kbackgammon-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.5_beta1.ebuild,v 1.1 2005/09/22 17:53:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbackgammon/kbackgammon-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A Backgammon program for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbackgammon/metadata.xml b/kde-base/kbackgammon/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbackgammon/metadata.xml
+++ b/kde-base/kbackgammon/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbattleship/ChangeLog b/kde-base/kbattleship/ChangeLog
index 7cb99f51f72c..a47670cbcfa5 100644
--- a/kde-base/kbattleship/ChangeLog
+++ b/kde-base/kbattleship/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/kbattleship
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/ChangeLog,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kbattleship-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kbattleship-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kbattleship-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kbattleship-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbattleship-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kbattleship-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbattleship-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kbattleship-3.5_beta1.ebuild, kbattleship-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kbattleship-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbattleship-3.5.0_beta2.ebuild:
+  New version.
+
+*kbattleship-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbattleship-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbattleship-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbattleship-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbattleship-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbattleship-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbattleship-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kbattleship-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kbattleship-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbattleship-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbattleship-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kbattleship-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbattleship-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbattleship-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbattleship-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbattleship-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kbattleship-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbattleship-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbattleship-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> :
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kbattleship-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbattleship-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbattleship-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbattleship-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbattleship-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kbattleship/Manifest b/kde-base/kbattleship/Manifest
index cfddb85d0e1d..a16bbff166e1 100644
--- a/kde-base/kbattleship/Manifest
+++ b/kde-base/kbattleship/Manifest
@@ -1,4 +1,26 @@
-MD5 552f3ed46aacecdb6fdad526f08c6895 kbattleship-3.4.0_alpha1.ebuild 418
-MD5 552f3ed46aacecdb6fdad526f08c6895 kbattleship-3.4.0_beta1.ebuild 418
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kbattleship-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kbattleship-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3d57910450521b024214aeb198861b8c ChangeLog 3704
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kbattleship-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kbattleship-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kbattleship-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kbattleship-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kbattleship-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kbattleship-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kbattleship-3.5_beta1 70
+MD5 6464e69434d69b538c8394f61ecceb02 kbattleship-3.4.1.ebuild 545
+MD5 6ed5e868bdcd1bb970fcdae14c827693 kbattleship-3.4.2.ebuild 558
+MD5 791b48bca57012e97245ef0ebbdafe67 kbattleship-3.4.3.ebuild 554
+MD5 4c067b4589c9db4032eef5c76e259d56 kbattleship-3.5.0.ebuild 497
+MD5 d31b5e5c4a524b08be413aafb2267220 kbattleship-3.5.0_beta2.ebuild 502
+MD5 9626fc61294af3def33227fc7cc0cf2c kbattleship-3.5.0_rc1.ebuild 501
+MD5 515cbce8f7e897ba5e3e26b9e025ec94 kbattleship-3.5_beta1.ebuild 537
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlqFntT9W3vfTuoRAmmOAJ0exVY0d20tz+FU8ry33eB7YSb3QwCgq3hc
+suy5zSQCtS4dn54pPBdmX7c=
+=A6s2
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kbattleship/files/digest-kbattleship-3.4.1 b/kde-base/kbattleship/files/digest-kbattleship-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kbattleship/files/digest-kbattleship-3.4.1
+++ b/kde-base/kbattleship/files/digest-kbattleship-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kbattleship/files/digest-kbattleship-3.4.2 b/kde-base/kbattleship/files/digest-kbattleship-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kbattleship/files/digest-kbattleship-3.4.2
+++ b/kde-base/kbattleship/files/digest-kbattleship-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kbattleship/kbattleship-3.4.1.ebuild b/kde-base/kbattleship/kbattleship-3.4.1.ebuild
index 95a3c9010cd7..07234ebd6cd9 100644
--- a/kde-base/kbattleship/kbattleship-3.4.1.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbattleship/kbattleship-3.4.2.ebuild b/kde-base/kbattleship/kbattleship-3.4.2.ebuild
index 92fa8dd32616..0a384fd16595 100644
--- a/kde-base/kbattleship/kbattleship-3.4.2.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbattleship/kbattleship-3.4.3.ebuild b/kde-base/kbattleship/kbattleship-3.4.3.ebuild
index b42ecb86c2f4..5d47c35c4b7a 100644
--- a/kde-base/kbattleship/kbattleship-3.4.3.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbattleship/kbattleship-3.5.0.ebuild b/kde-base/kbattleship/kbattleship-3.5.0.ebuild
index ded2831580a9..5a3febac998e 100644
--- a/kde-base/kbattleship/kbattleship-3.5.0.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.5.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/kde-base/kbattleship/kbattleship-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbattleship/kbattleship-3.5.0_beta2.ebuild b/kde-base/kbattleship/kbattleship-3.5.0_beta2.ebuild
index 6faacb0906e6..0d535271e92b 100644
--- a/kde-base/kbattleship/kbattleship-3.5.0_beta2.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kbattleship/kbattleship-3.5.0_rc1.ebuild b/kde-base/kbattleship/kbattleship-3.5.0_rc1.ebuild
index 17eb9b48055f..d4a32ece3dca 100644
--- a/kde-base/kbattleship/kbattleship-3.5.0_rc1.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.5.0_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/kde-base/kbattleship/kbattleship-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbattleship/kbattleship-3.5_beta1.ebuild b/kde-base/kbattleship/kbattleship-3.5_beta1.ebuild
index c942a7c60f92..13c493e28056 100644
--- a/kde-base/kbattleship/kbattleship-3.5_beta1.ebuild
+++ b/kde-base/kbattleship/kbattleship-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.5_beta1.ebuild,v 1.1 2005/09/22 17:54:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbattleship/kbattleship-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The KDE Battleship clone"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbattleship/metadata.xml b/kde-base/kbattleship/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbattleship/metadata.xml
+++ b/kde-base/kbattleship/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kblackbox/ChangeLog b/kde-base/kblackbox/ChangeLog
index 4d88e0acda0d..9ebdd67ef634 100644
--- a/kde-base/kblackbox/ChangeLog
+++ b/kde-base/kblackbox/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kblackbox
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/ChangeLog,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kblackbox-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kblackbox-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kblackbox-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kblackbox-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kblackbox-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kblackbox-3.5_beta1.ebuild,
+  kblackbox-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kblackbox-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.5.0_beta2.ebuild:
+  New version.
+
+*kblackbox-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kblackbox-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kblackbox-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kblackbox-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kblackbox-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kblackbox-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kblackbox-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kblackbox-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kblackbox-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kblackbox-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kblackbox-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kblackbox-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kblackbox-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kblackbox-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kblackbox-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kblackbox-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kblackbox-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kblackbox-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kblackbox-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kblackbox-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kblackbox-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kblackbox-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kblackbox/Manifest b/kde-base/kblackbox/Manifest
index 7aa3edb2f834..6d30e3b14bf0 100644
--- a/kde-base/kblackbox/Manifest
+++ b/kde-base/kblackbox/Manifest
@@ -1,4 +1,26 @@
-MD5 908a8431f657d87fd74377901763e4c0 kblackbox-3.4.0_beta1.ebuild 411
-MD5 908a8431f657d87fd74377901763e4c0 kblackbox-3.4.0_alpha1.ebuild 411
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kblackbox-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kblackbox-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b39897248731bb12a12f154bd8357364 ChangeLog 3650
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kblackbox-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kblackbox-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kblackbox-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kblackbox-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kblackbox-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kblackbox-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kblackbox-3.5_beta1 70
+MD5 552519c74646e7521c5d90ce1d8bb6f0 kblackbox-3.4.1.ebuild 534
+MD5 ff38175938447bca27f57c383aff14b9 kblackbox-3.4.2.ebuild 547
+MD5 edb3099433602fc90b0fd8aa9951525d kblackbox-3.4.3.ebuild 543
+MD5 ee11f7e18add844e7be294e8237f7274 kblackbox-3.5.0.ebuild 486
+MD5 b0b76572a4ea9b64708d4b51cb0b59e8 kblackbox-3.5.0_beta2.ebuild 491
+MD5 09bc896249bac0c0251b2bdb0bf90592 kblackbox-3.5.0_rc1.ebuild 490
+MD5 8d1f65ea4f3a2b6f199418bc38957677 kblackbox-3.5_beta1.ebuild 526
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlq5ntT9W3vfTuoRAkPNAKCPzj64nr/CKS1cxnj/q7d5ms3RjACcCWsG
+LAfj2JDMlbLIFd+ZNz5oFGQ=
+=2S9L
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kblackbox/files/digest-kblackbox-3.4.1 b/kde-base/kblackbox/files/digest-kblackbox-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kblackbox/files/digest-kblackbox-3.4.1
+++ b/kde-base/kblackbox/files/digest-kblackbox-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kblackbox/files/digest-kblackbox-3.4.2 b/kde-base/kblackbox/files/digest-kblackbox-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kblackbox/files/digest-kblackbox-3.4.2
+++ b/kde-base/kblackbox/files/digest-kblackbox-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kblackbox/kblackbox-3.4.1.ebuild b/kde-base/kblackbox/kblackbox-3.4.1.ebuild
index 6dc5a23c5152..a1f9b196f9fa 100644
--- a/kde-base/kblackbox/kblackbox-3.4.1.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kblackbox/kblackbox-3.4.2.ebuild b/kde-base/kblackbox/kblackbox-3.4.2.ebuild
index bfa40a26ef8d..b9b187a24ec5 100644
--- a/kde-base/kblackbox/kblackbox-3.4.2.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kblackbox/kblackbox-3.4.3.ebuild b/kde-base/kblackbox/kblackbox-3.4.3.ebuild
index 6863491140e1..9477eb6e95fc 100644
--- a/kde-base/kblackbox/kblackbox-3.4.3.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kblackbox/kblackbox-3.5.0.ebuild b/kde-base/kblackbox/kblackbox-3.5.0.ebuild
index 6e1bd3439cae..a46b82dc91b6 100644
--- a/kde-base/kblackbox/kblackbox-3.5.0.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.5.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/kde-base/kblackbox/kblackbox-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kblackbox/kblackbox-3.5.0_beta2.ebuild b/kde-base/kblackbox/kblackbox-3.5.0_beta2.ebuild
index 78f7b5a53d63..49a6f36230e7 100644
--- a/kde-base/kblackbox/kblackbox-3.5.0_beta2.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kblackbox/kblackbox-3.5.0_rc1.ebuild b/kde-base/kblackbox/kblackbox-3.5.0_rc1.ebuild
index f31d575d1021..67d4f94f2a23 100644
--- a/kde-base/kblackbox/kblackbox-3.5.0_rc1.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.5.0_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/kde-base/kblackbox/kblackbox-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kblackbox/kblackbox-3.5_beta1.ebuild b/kde-base/kblackbox/kblackbox-3.5_beta1.ebuild
index 6a99abeae846..ce2a526daa7f 100644
--- a/kde-base/kblackbox/kblackbox-3.5_beta1.ebuild
+++ b/kde-base/kblackbox/kblackbox-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.5_beta1.ebuild,v 1.1 2005/09/22 17:55:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kblackbox/kblackbox-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Blackbox Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kblackbox/metadata.xml b/kde-base/kblackbox/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kblackbox/metadata.xml
+++ b/kde-base/kblackbox/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbounce/ChangeLog b/kde-base/kbounce/ChangeLog
index 0d1b3c3ba0d2..35139a1985ef 100644
--- a/kde-base/kbounce/ChangeLog
+++ b/kde-base/kbounce/ChangeLog
@@ -1,6 +1,103 @@
 # ChangeLog for kde-base/kbounce
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/ChangeLog,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kbounce-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kbounce-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kbounce-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kbounce-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kbounce-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kbounce-3.5_beta1.ebuild,
+  kbounce-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kbounce-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.5.0_beta2.ebuild:
+  New version.
+
+*kbounce-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbounce-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbounce-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbounce-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbounce-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbounce-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kbounce-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kbounce-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbounce-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kbounce-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbounce-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbounce-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbounce-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kbounce-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbounce-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbounce-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kbounce-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbounce-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbounce-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbounce-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kbounce/Manifest b/kde-base/kbounce/Manifest
index d0755e4b2288..b15f614976e8 100644
--- a/kde-base/kbounce/Manifest
+++ b/kde-base/kbounce/Manifest
@@ -1,4 +1,26 @@
-MD5 945c352cb4b78fa94df5999ba2a2902a kbounce-3.4.0_alpha1.ebuild 414
-MD5 945c352cb4b78fa94df5999ba2a2902a kbounce-3.4.0_beta1.ebuild 414
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kbounce-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kbounce-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d878a0fa111cb7b2286d9255eb32d9ae ChangeLog 3429
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kbounce-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kbounce-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kbounce-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kbounce-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kbounce-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kbounce-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kbounce-3.5_beta1 70
+MD5 ebaf6c2739231b4a7c78ff78e133c439 kbounce-3.4.1.ebuild 690
+MD5 040f8483350ecd97826ba1dfbf2d9c1c kbounce-3.4.2.ebuild 547
+MD5 e3454b334a7a67824afee0d3241d6448 kbounce-3.4.3.ebuild 543
+MD5 06687830fb8e1b1a7e2e8c8f4fa7ec23 kbounce-3.5.0.ebuild 486
+MD5 51688561b2e8f3ad122071fa5c72bf14 kbounce-3.5.0_beta2.ebuild 491
+MD5 fdddcce40fb310589a6402ba1fc50685 kbounce-3.5.0_rc1.ebuild 490
+MD5 815736cda87c9adf50b7c363a638e517 kbounce-3.5_beta1.ebuild 526
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlxfntT9W3vfTuoRAv31AJ9wyXTbaZMoqEPZz9Bi5hDtcRukPgCfV4hQ
+ZU+RPVsdhq6gODRKN0NSPxM=
+=Ngly
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kbounce/files/digest-kbounce-3.4.1 b/kde-base/kbounce/files/digest-kbounce-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kbounce/files/digest-kbounce-3.4.1
+++ b/kde-base/kbounce/files/digest-kbounce-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kbounce/files/digest-kbounce-3.4.2 b/kde-base/kbounce/files/digest-kbounce-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kbounce/files/digest-kbounce-3.4.2
+++ b/kde-base/kbounce/files/digest-kbounce-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kbounce/kbounce-3.4.1.ebuild b/kde-base/kbounce/kbounce-3.4.1.ebuild
index f76d8ec25eb8..524af039005f 100644
--- a/kde-base/kbounce/kbounce-3.4.1.ebuild
+++ b/kde-base/kbounce/kbounce-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbounce/kbounce-3.4.2.ebuild b/kde-base/kbounce/kbounce-3.4.2.ebuild
index df8e99c0e3f5..dfb2f7d92616 100644
--- a/kde-base/kbounce/kbounce-3.4.2.ebuild
+++ b/kde-base/kbounce/kbounce-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbounce/kbounce-3.4.3.ebuild b/kde-base/kbounce/kbounce-3.4.3.ebuild
index 559e7113e1cb..57492d28b063 100644
--- a/kde-base/kbounce/kbounce-3.4.3.ebuild
+++ b/kde-base/kbounce/kbounce-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbounce/kbounce-3.5.0.ebuild b/kde-base/kbounce/kbounce-3.5.0.ebuild
index 234aa2b80473..79dc7af0e42d 100644
--- a/kde-base/kbounce/kbounce-3.5.0.ebuild
+++ b/kde-base/kbounce/kbounce-3.5.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/kde-base/kbounce/kbounce-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbounce/kbounce-3.5.0_beta2.ebuild b/kde-base/kbounce/kbounce-3.5.0_beta2.ebuild
index b27fc1c17b42..61cc1211008b 100644
--- a/kde-base/kbounce/kbounce-3.5.0_beta2.ebuild
+++ b/kde-base/kbounce/kbounce-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kbounce/kbounce-3.5.0_rc1.ebuild b/kde-base/kbounce/kbounce-3.5.0_rc1.ebuild
index 4eb686a24340..3f7398f13d92 100644
--- a/kde-base/kbounce/kbounce-3.5.0_rc1.ebuild
+++ b/kde-base/kbounce/kbounce-3.5.0_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/kde-base/kbounce/kbounce-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbounce/kbounce-3.5_beta1.ebuild b/kde-base/kbounce/kbounce-3.5_beta1.ebuild
index 9f004cac97d8..7df9dc544250 100644
--- a/kde-base/kbounce/kbounce-3.5_beta1.ebuild
+++ b/kde-base/kbounce/kbounce-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.5_beta1.ebuild,v 1.1 2005/09/22 17:56:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbounce/kbounce-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Bounce Ball Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kbounce/metadata.xml b/kde-base/kbounce/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbounce/metadata.xml
+++ b/kde-base/kbounce/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbruch/ChangeLog b/kde-base/kbruch/ChangeLog
index 33800ad025e1..d82d924205b4 100644
--- a/kde-base/kbruch/ChangeLog
+++ b/kde-base/kbruch/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for kde-base/kbruch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kbruch-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kbruch-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kbruch-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kbruch-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbruch-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kbruch-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbruch-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbruch-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbruch-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbruch-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbruch-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kbruch-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kbruch-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbruch-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbruch-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kbruch-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbruch-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbruch-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbruch-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbruch-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kbruch-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbruch-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbruch-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kbruch-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kbruch-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbruch-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbruch-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbruch-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbruch-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kbruch/Manifest b/kde-base/kbruch/Manifest
index c56b152d0999..4ae83000fe00 100644
--- a/kde-base/kbruch/Manifest
+++ b/kde-base/kbruch/Manifest
@@ -1,4 +1,20 @@
-MD5 6a199c33969f7d1458a3604832b9604b kbruch-3.4.0_beta1.ebuild 294
-MD5 6a199c33969f7d1458a3604832b9604b kbruch-3.4.0_alpha1.ebuild 294
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kbruch-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kbruch-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d864ec9d78978afc51f918fbfdac0050 ChangeLog 3115
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kbruch-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kbruch-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kbruch-3.5.0 67
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kbruch-3.5_beta1 68
+MD5 4d7c8098d79608b38f85a521aef44aa1 kbruch-3.4.1.ebuild 411
+MD5 75396903db3914244155f26d864e9ae9 kbruch-3.4.2.ebuild 422
+MD5 365b883800c94465acb753e9f239bc75 kbruch-3.5.0.ebuild 400
+MD5 ee6e861254f452d76ab2cbac604b46d7 kbruch-3.5_beta1.ebuild 410
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlDGntT9W3vfTuoRAkN0AKCNE1TQY1FITWfskGaNJTbUSkzQhACgj1HN
+ACCSNwi7I/bkeVqHdFmoerQ=
+=Jc+B
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kbruch/files/digest-kbruch-3.4.1 b/kde-base/kbruch/files/digest-kbruch-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kbruch/files/digest-kbruch-3.4.1
+++ b/kde-base/kbruch/files/digest-kbruch-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kbruch/files/digest-kbruch-3.4.2 b/kde-base/kbruch/files/digest-kbruch-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kbruch/files/digest-kbruch-3.4.2
+++ b/kde-base/kbruch/files/digest-kbruch-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kbruch/kbruch-3.4.1.ebuild b/kde-base/kbruch/kbruch-3.4.1.ebuild
index 85a36219d4ac..2938f85e895c 100644
--- a/kde-base/kbruch/kbruch-3.4.1.ebuild
+++ b/kde-base/kbruch/kbruch-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kbruch/kbruch-3.4.2.ebuild b/kde-base/kbruch/kbruch-3.4.2.ebuild
index bc5798ce8c4a..927d6c5b4829 100644
--- a/kde-base/kbruch/kbruch-3.4.2.ebuild
+++ b/kde-base/kbruch/kbruch-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kbruch/kbruch-3.5.0.ebuild b/kde-base/kbruch/kbruch-3.5.0.ebuild
index 8b6144e241fe..a6483d3fff19 100644
--- a/kde-base/kbruch/kbruch-3.5.0.ebuild
+++ b/kde-base/kbruch/kbruch-3.5.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/kde-base/kbruch/kbruch-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbruch/kbruch-3.5_beta1.ebuild b/kde-base/kbruch/kbruch-3.5_beta1.ebuild
index baa3c30fe3c9..2e9fa287d887 100644
--- a/kde-base/kbruch/kbruch-3.5_beta1.ebuild
+++ b/kde-base/kbruch/kbruch-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.5_beta1.ebuild,v 1.1 2005/09/22 17:57:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbruch/kbruch-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Learn calculating with fractions"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kbruch/metadata.xml b/kde-base/kbruch/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbruch/metadata.xml
+++ b/kde-base/kbruch/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbstateapplet/ChangeLog b/kde-base/kbstateapplet/ChangeLog
index 8a9166e41906..958c8c4500af 100644
--- a/kde-base/kbstateapplet/ChangeLog
+++ b/kde-base/kbstateapplet/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kbstateapplet
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/ChangeLog,v 1.1 2005/01/17 08:56:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/ChangeLog,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kbstateapplet-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kbstateapplet-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kbstateapplet-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kbstateapplet-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbstateapplet-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kbstateapplet-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbstateapplet-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kbstateapplet-3.5_beta1.ebuild, kbstateapplet-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kbstateapplet-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbstateapplet-3.5.0_beta2.ebuild:
+  New version.
+
+*kbstateapplet-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbstateapplet-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbstateapplet-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbstateapplet-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbstateapplet-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbstateapplet-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbstateapplet-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kbstateapplet-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kbstateapplet-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbstateapplet-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbstateapplet-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kbstateapplet-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbstateapplet-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbstateapplet-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbstateapplet-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbstateapplet-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kbstateapplet-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbstateapplet-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbstateapplet-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kbstateapplet-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kbstateapplet-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbstateapplet-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbstateapplet-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbstateapplet-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbstateapplet-3.4.0_beta1 (17 Jan 2005)
 
diff --git a/kde-base/kbstateapplet/Manifest b/kde-base/kbstateapplet/Manifest
index 3ce1e7049024..bf67e31b0c24 100644
--- a/kde-base/kbstateapplet/Manifest
+++ b/kde-base/kbstateapplet/Manifest
@@ -1,3 +1,16 @@
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 1dcf01fa8738a6f13939d853299e6d23 kbstateapplet-3.4.0_beta1.ebuild 405
-MD5 c5420b3dc1848daf59305d1f2ff74a83 files/digest-kbstateapplet-3.4.0_beta1 240
+MD5 78670e931e2d5e8cb14a5cda9b5db645 ChangeLog 3861
+MD5 41903595f1fe844227e9177091e4375e kbstateapplet-3.4.1.ebuild 481
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 42cb59ec0517877178253f754357d94b kbstateapplet-3.4.2.ebuild 493
+MD5 f9eb809fff44220b0f61a1926775b2b0 kbstateapplet-3.5_beta1.ebuild 472
+MD5 81c781c8443b01ba21b187c2aa23d8e7 kbstateapplet-3.4.3.ebuild 491
+MD5 91570fa6cc7b33f85505d67cf130e08b kbstateapplet-3.5.0_beta2.ebuild 474
+MD5 59ff6cdbd246b09ed87ab813d686331f kbstateapplet-3.5.0_rc1.ebuild 473
+MD5 380c93842de8dd6f34efef85ba370659 kbstateapplet-3.5.0.ebuild 469
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-kbstateapplet-3.4.1 236
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-kbstateapplet-3.4.2 320
+MD5 174790e90449897638084f6c4bea761f files/digest-kbstateapplet-3.5_beta1 77
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kbstateapplet-3.4.3 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-kbstateapplet-3.5.0_beta2 240
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-kbstateapplet-3.5.0_rc1 332
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kbstateapplet-3.5.0 76
diff --git a/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.1 b/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.1
+++ b/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.2 b/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.2
+++ b/kde-base/kbstateapplet/files/digest-kbstateapplet-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.4.1.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.4.1.ebuild
index 8ffb4fec4027..ea17b36c1140 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.4.1.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.4.1.ebuild,v 1.1 2005/05/25 21:23:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
-DESCRIPTION="KD panel applet that displays the keyboard status"
-KEYWORDS="~x86 ~amd64"
+DESCRIPTION="KDE panel applet that displays the keyboard status"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.4.2.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.4.2.ebuild
index ebf64b77ca16..104621917829 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.4.2.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE panel applet that displays the keyboard status"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.4.3.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.4.3.ebuild
index ed7d63d9bc26..fe8bfd2b222e 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.4.3.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE panel applet that displays the keyboard status"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5.0.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5.0.ebuild
index 0f39a4e9549b..8a49d2eb14e9 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.5.0.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5.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/kde-base/kbstateapplet/kbstateapplet-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5.0_beta2.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5.0_beta2.ebuild
index 8e6e8feff734..e3ca2769ac3f 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.5.0_beta2.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE panel applet that displays the keyboard status"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5.0_rc1.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5.0_rc1.ebuild
index 619afb48ef07..ce9348f3d5b9 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.5.0_rc1.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5.0_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/kde-base/kbstateapplet/kbstateapplet-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kbstateapplet/kbstateapplet-3.5_beta1.ebuild b/kde-base/kbstateapplet/kbstateapplet-3.5_beta1.ebuild
index b9bcbfbca483..487024716b14 100644
--- a/kde-base/kbstateapplet/kbstateapplet-3.5_beta1.ebuild
+++ b/kde-base/kbstateapplet/kbstateapplet-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5_beta1.ebuild,v 1.1 2005/09/22 17:58:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbstateapplet/kbstateapplet-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:02 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE panel applet that displays the keyboard status"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 
diff --git a/kde-base/kbstateapplet/metadata.xml b/kde-base/kbstateapplet/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbstateapplet/metadata.xml
+++ b/kde-base/kbstateapplet/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kbugbuster/ChangeLog b/kde-base/kbugbuster/ChangeLog
index 174d069a702e..5f1115ce581f 100644
--- a/kde-base/kbugbuster/ChangeLog
+++ b/kde-base/kbugbuster/ChangeLog
@@ -1,6 +1,103 @@
 # ChangeLog for kde-base/kbugbuster
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/ChangeLog,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kbugbuster-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kbugbuster-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kbugbuster-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kbugbuster-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kbugbuster-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kbugbuster-3.5_beta1.ebuild,
+  kbugbuster-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kbugbuster-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.5.0_beta2.ebuild:
+  New version.
+
+*kbugbuster-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kbugbuster-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kbugbuster-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbugbuster-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kbugbuster-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kbugbuster-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kbugbuster-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kbugbuster-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kbugbuster-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kbugbuster-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kbugbuster-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kbugbuster-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kbugbuster-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kbugbuster-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kbugbuster-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kbugbuster-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kbugbuster-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kbugbuster-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kbugbuster-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kbugbuster-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kbugbuster/Manifest b/kde-base/kbugbuster/Manifest
index 1cb7a89a5664..47da07921682 100644
--- a/kde-base/kbugbuster/Manifest
+++ b/kde-base/kbugbuster/Manifest
@@ -1,4 +1,16 @@
-MD5 3c913a3b73030cc35b46108c61e97fa9 kbugbuster-3.4.0_alpha1.ebuild 483
-MD5 3c913a3b73030cc35b46108c61e97fa9 kbugbuster-3.4.0_beta1.ebuild 483
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kbugbuster-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kbugbuster-3.4.0_beta1 210
+MD5 10624605976f3ae4e555119480f3f777 ChangeLog 3493
+MD5 f0185e15faeb197ecb66dc00f9562191 kbugbuster-3.4.1.ebuild 609
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 d4446996a1eea24d28c40f0bef4c4e98 kbugbuster-3.4.2.ebuild 617
+MD5 e848f9d2a5575304610f06c2c929423a kbugbuster-3.5_beta1.ebuild 600
+MD5 07037476ec34f54afca69b4d89c6ce99 kbugbuster-3.4.3.ebuild 612
+MD5 799ef4c9ebfcc3c3e49fe2a389b8078f kbugbuster-3.5.0_beta2.ebuild 559
+MD5 f591b9f5ac7861b6ab9567bcfddb3597 kbugbuster-3.5.0_rc1.ebuild 558
+MD5 ec5b190636595bf86d8c3df755602f70 kbugbuster-3.5.0.ebuild 554
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kbugbuster-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-kbugbuster-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kbugbuster-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kbugbuster-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kbugbuster-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-kbugbuster-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kbugbuster-3.5.0 66
diff --git a/kde-base/kbugbuster/files/digest-kbugbuster-3.4.1 b/kde-base/kbugbuster/files/digest-kbugbuster-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kbugbuster/files/digest-kbugbuster-3.4.1
+++ b/kde-base/kbugbuster/files/digest-kbugbuster-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kbugbuster/files/digest-kbugbuster-3.4.2 b/kde-base/kbugbuster/files/digest-kbugbuster-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/kbugbuster/files/digest-kbugbuster-3.4.2
+++ b/kde-base/kbugbuster/files/digest-kbugbuster-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kbugbuster/kbugbuster-3.4.1.ebuild b/kde-base/kbugbuster/kbugbuster-3.4.1.ebuild
index 642daa3dbf50..60d08817dce0 100644
--- a/kde-base/kbugbuster/kbugbuster-3.4.1.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.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/kde-base/kbugbuster/kbugbuster-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="kcal"
 
 OLDDEPEND="kcal? ( ~kde-base/libkcal-$PV )"
diff --git a/kde-base/kbugbuster/kbugbuster-3.4.2.ebuild b/kde-base/kbugbuster/kbugbuster-3.4.2.ebuild
index d04e30553325..81f45b144bae 100644
--- a/kde-base/kbugbuster/kbugbuster-3.4.2.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.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/kde-base/kbugbuster/kbugbuster-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kbugbuster/kbugbuster-3.4.3.ebuild b/kde-base/kbugbuster/kbugbuster-3.4.3.ebuild
index 3074b506dc8b..35e50d1b58c5 100644
--- a/kde-base/kbugbuster/kbugbuster-3.4.3.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.4.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/kde-base/kbugbuster/kbugbuster-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE="kcal"
 
 OLDDEPEND="kcal? ( ~kde-base/libkcal-$PV )"
diff --git a/kde-base/kbugbuster/kbugbuster-3.5.0.ebuild b/kde-base/kbugbuster/kbugbuster-3.5.0.ebuild
index 5ee1ebdd5775..e1ec923f09c4 100644
--- a/kde-base/kbugbuster/kbugbuster-3.5.0.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.5.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/kde-base/kbugbuster/kbugbuster-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kbugbuster/kbugbuster-3.5.0_beta2.ebuild b/kde-base/kbugbuster/kbugbuster-3.5.0_beta2.ebuild
index e4791d21d3fa..5d91aac451f6 100644
--- a/kde-base/kbugbuster/kbugbuster-3.5.0_beta2.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.5.0_beta2.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/kde-base/kbugbuster/kbugbuster-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="kcal"
 
 
diff --git a/kde-base/kbugbuster/kbugbuster-3.5.0_rc1.ebuild b/kde-base/kbugbuster/kbugbuster-3.5.0_rc1.ebuild
index 8f6f2dcb2b1f..038f9d09ad57 100644
--- a/kde-base/kbugbuster/kbugbuster-3.5.0_rc1.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.5.0_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/kde-base/kbugbuster/kbugbuster-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kbugbuster/kbugbuster-3.5_beta1.ebuild b/kde-base/kbugbuster/kbugbuster-3.5_beta1.ebuild
index 0fb7f0d45af5..5a2fa7f43b8f 100644
--- a/kde-base/kbugbuster/kbugbuster-3.5_beta1.ebuild
+++ b/kde-base/kbugbuster/kbugbuster-3.5_beta1.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/kde-base/kbugbuster/kbugbuster-3.5_beta1.ebuild,v 1.1 2005/09/22 17:59:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kbugbuster/kbugbuster-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KBugBuster - A tool for checking and reporting KDE apps' bugs"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="kcal"
 
 OLDDEPEND="kcal? ( ~kde-base/libkcal-$PV )"
diff --git a/kde-base/kbugbuster/metadata.xml b/kde-base/kbugbuster/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kbugbuster/metadata.xml
+++ b/kde-base/kbugbuster/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcachegrind/ChangeLog b/kde-base/kcachegrind/ChangeLog
index c7899d2af88a..935b5d64be1a 100644
--- a/kde-base/kcachegrind/ChangeLog
+++ b/kde-base/kcachegrind/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for kde-base/kcachegrind
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/ChangeLog,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kcachegrind-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kcachegrind-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kcachegrind-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kcachegrind-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcachegrind-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kcachegrind-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcachegrind-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kcachegrind-3.5_beta1.ebuild, kcachegrind-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kcachegrind-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcachegrind-3.5.0_beta2.ebuild:
+  New version.
+
+*kcachegrind-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcachegrind-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcachegrind-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcachegrind-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcachegrind-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kcachegrind-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcachegrind-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  03 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kcachegrind-3.4.2.ebuild:
+  Add dependency on graphviz (#100916).
+
+*kcachegrind-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kcachegrind-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcachegrind-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcachegrind-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcachegrind-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcachegrind-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcachegrind-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kcachegrind-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcachegrind-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcachegrind-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kcachegrind-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcachegrind-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kcachegrind-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kcachegrind-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kcachegrind-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcachegrind-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcachegrind/Manifest b/kde-base/kcachegrind/Manifest
index 3649685b92dd..39c8401786b8 100644
--- a/kde-base/kcachegrind/Manifest
+++ b/kde-base/kcachegrind/Manifest
@@ -1,4 +1,16 @@
-MD5 bb9ff40f99043b0646dcb443e91c8c2f kcachegrind-3.4.0_beta1.ebuild 307
-MD5 bb9ff40f99043b0646dcb443e91c8c2f kcachegrind-3.4.0_alpha1.ebuild 307
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kcachegrind-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kcachegrind-3.4.0_alpha1 67
+MD5 e11ecfbd7de2d2ad3a558ea8f8d14fbc ChangeLog 3651
+MD5 1d90892061c0eeb42ea7e88e01fd355a kcachegrind-3.4.1.ebuild 435
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 b1f8b1b85874b9e323387dc5520ce5ce kcachegrind-3.4.2.ebuild 482
+MD5 30ec11117dabf1052a7d1c03246f7c60 kcachegrind-3.5_beta1.ebuild 467
+MD5 7680b8ae9769ecb719d26978930bb756 kcachegrind-3.4.3.ebuild 479
+MD5 66003eb142d8497f5d150d43c7e55a07 kcachegrind-3.5.0_beta2.ebuild 469
+MD5 a72c18d5dbea82b7eb46b2584b55e071 kcachegrind-3.5.0_rc1.ebuild 468
+MD5 4dd668d979d084e94b6142fc2333a382 kcachegrind-3.5.0.ebuild 464
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kcachegrind-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-kcachegrind-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kcachegrind-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kcachegrind-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kcachegrind-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-kcachegrind-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kcachegrind-3.5.0 66
diff --git a/kde-base/kcachegrind/files/digest-kcachegrind-3.4.1 b/kde-base/kcachegrind/files/digest-kcachegrind-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kcachegrind/files/digest-kcachegrind-3.4.1
+++ b/kde-base/kcachegrind/files/digest-kcachegrind-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kcachegrind/files/digest-kcachegrind-3.4.2 b/kde-base/kcachegrind/files/digest-kcachegrind-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/kcachegrind/files/digest-kcachegrind-3.4.2
+++ b/kde-base/kcachegrind/files/digest-kcachegrind-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kcachegrind/kcachegrind-3.4.1.ebuild b/kde-base/kcachegrind/kcachegrind-3.4.1.ebuild
index 6df70c49ec60..916b325af682 100644
--- a/kde-base/kcachegrind/kcachegrind-3.4.1.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.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/kde-base/kcachegrind/kcachegrind-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="x86? ( dev-util/callgrind )"
diff --git a/kde-base/kcachegrind/kcachegrind-3.4.2.ebuild b/kde-base/kcachegrind/kcachegrind-3.4.2.ebuild
index 365292a3f89e..079dfcd73a6d 100644
--- a/kde-base/kcachegrind/kcachegrind-3.4.2.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.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/kde-base/kcachegrind/kcachegrind-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -12,3 +12,6 @@ KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="x86? ( dev-util/callgrind )"
+
+RDEPEND="${DEPEND}
+	media-gfx/graphviz"
diff --git a/kde-base/kcachegrind/kcachegrind-3.4.3.ebuild b/kde-base/kcachegrind/kcachegrind-3.4.3.ebuild
index ac27324dd87a..e0f0e222f209 100644
--- a/kde-base/kcachegrind/kcachegrind-3.4.3.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.4.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/kde-base/kcachegrind/kcachegrind-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="x86? ( dev-util/callgrind )"
diff --git a/kde-base/kcachegrind/kcachegrind-3.5.0.ebuild b/kde-base/kcachegrind/kcachegrind-3.5.0.ebuild
index 81f31e85ce76..612f2908d096 100644
--- a/kde-base/kcachegrind/kcachegrind-3.5.0.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.5.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/kde-base/kcachegrind/kcachegrind-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kcachegrind/kcachegrind-3.5.0_beta2.ebuild b/kde-base/kcachegrind/kcachegrind-3.5.0_beta2.ebuild
index 8a39d250e0c9..9af27f5f1570 100644
--- a/kde-base/kcachegrind/kcachegrind-3.5.0_beta2.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.5.0_beta2.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/kde-base/kcachegrind/kcachegrind-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x86? ( dev-util/callgrind )"
diff --git a/kde-base/kcachegrind/kcachegrind-3.5.0_rc1.ebuild b/kde-base/kcachegrind/kcachegrind-3.5.0_rc1.ebuild
index b2df47414d90..415b9a050268 100644
--- a/kde-base/kcachegrind/kcachegrind-3.5.0_rc1.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.5.0_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/kde-base/kcachegrind/kcachegrind-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kcachegrind/kcachegrind-3.5_beta1.ebuild b/kde-base/kcachegrind/kcachegrind-3.5_beta1.ebuild
index 6523fe9415fa..81b3f036b928 100644
--- a/kde-base/kcachegrind/kcachegrind-3.5_beta1.ebuild
+++ b/kde-base/kcachegrind/kcachegrind-3.5_beta1.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/kde-base/kcachegrind/kcachegrind-3.5_beta1.ebuild,v 1.1 2005/09/22 18:00:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcachegrind/kcachegrind-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Frontend for Cachegrind"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="x86? ( dev-util/callgrind )"
diff --git a/kde-base/kcachegrind/metadata.xml b/kde-base/kcachegrind/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcachegrind/metadata.xml
+++ b/kde-base/kcachegrind/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index dc032557bd5d..34dcb724ce77 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kcalc-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kcalc-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kcalc-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kcalc-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kcalc-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kcalc-3.5_beta1.ebuild,
+  kcalc-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kcalc-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.5.0_beta2.ebuild:
+  New version.
+
+*kcalc-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcalc-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcalc-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcalc-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kcalc-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcalc-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kcalc-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kcalc-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcalc-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kcalc-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcalc-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcalc-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcalc-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kcalc-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcalc-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcalc-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kcalc-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcalc-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kcalc-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcalc-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcalc-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcalc/Manifest b/kde-base/kcalc/Manifest
index 2edf06f000e1..7f2f5b2e5d90 100644
--- a/kde-base/kcalc/Manifest
+++ b/kde-base/kcalc/Manifest
@@ -1,4 +1,26 @@
-MD5 f18a2bee73b55415ccfb1fccb3b03269 kcalc-3.4.0_alpha1.ebuild 257
-MD5 f18a2bee73b55415ccfb1fccb3b03269 kcalc-3.4.0_beta1.ebuild 257
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kcalc-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kcalc-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 213c9456845caa6b817a7b94537db91b ChangeLog 3488
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kcalc-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-kcalc-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kcalc-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kcalc-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kcalc-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kcalc-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kcalc-3.5_beta1 69
+MD5 4f951674a5ce6584753cb2b966ec4c62 kcalc-3.4.1.ebuild 372
+MD5 be903c0bf1f70dd069c4057bc9c67666 kcalc-3.4.2.ebuild 385
+MD5 d01b1813992576ea1acbba42b66f81c4 kcalc-3.4.3.ebuild 382
+MD5 c32c30a3cbcb8126f0fff42502a49cdb kcalc-3.5.0.ebuild 386
+MD5 027d41eb40697110036121130d971cd3 kcalc-3.5.0_beta2.ebuild 391
+MD5 f7f5934cac566a11ec99761e593f4767 kcalc-3.5.0_rc1.ebuild 390
+MD5 4f65a9a83db53171f738ec61c8177b04 kcalc-3.5_beta1.ebuild 389
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvsIntT9W3vfTuoRAocmAJ4iUjh+rDEeOOkDtFeByErHxZY/wACfdJgL
+R9NvgLYnSYJrpDJ9Qibtkis=
+=aaqK
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kcalc/files/digest-kcalc-3.4.1 b/kde-base/kcalc/files/digest-kcalc-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kcalc/files/digest-kcalc-3.4.1
+++ b/kde-base/kcalc/files/digest-kcalc-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kcalc/files/digest-kcalc-3.4.2 b/kde-base/kcalc/files/digest-kcalc-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/kcalc/files/digest-kcalc-3.4.2
+++ b/kde-base/kcalc/files/digest-kcalc-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/kcalc/kcalc-3.4.1.ebuild b/kde-base/kcalc/kcalc-3.4.1.ebuild
index ac6ca8eaa128..9f4bd54e032e 100644
--- a/kde-base/kcalc/kcalc-3.4.1.ebuild
+++ b/kde-base/kcalc/kcalc-3.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/kde-base/kcalc/kcalc-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Calculator"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kcalc/kcalc-3.4.2.ebuild b/kde-base/kcalc/kcalc-3.4.2.ebuild
index 5d78ab046e7f..06a03468d829 100644
--- a/kde-base/kcalc/kcalc-3.4.2.ebuild
+++ b/kde-base/kcalc/kcalc-3.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/kde-base/kcalc/kcalc-3.4.2.ebuild,v 1.1 2005/07/28 21:16:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Calculator"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kcalc/kcalc-3.4.3.ebuild b/kde-base/kcalc/kcalc-3.4.3.ebuild
index 0f6786d04cd7..0991abc19772 100644
--- a/kde-base/kcalc/kcalc-3.4.3.ebuild
+++ b/kde-base/kcalc/kcalc-3.4.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/kde-base/kcalc/kcalc-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Calculator"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kcalc/kcalc-3.5.0.ebuild b/kde-base/kcalc/kcalc-3.5.0.ebuild
index 7adf84d60137..c990b84e89ec 100644
--- a/kde-base/kcalc/kcalc-3.5.0.ebuild
+++ b/kde-base/kcalc/kcalc-3.5.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/kde-base/kcalc/kcalc-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kcalc/kcalc-3.5.0_beta2.ebuild b/kde-base/kcalc/kcalc-3.5.0_beta2.ebuild
index 10f0ef18d068..9f9cbe03a5bd 100644
--- a/kde-base/kcalc/kcalc-3.5.0_beta2.ebuild
+++ b/kde-base/kcalc/kcalc-3.5.0_beta2.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/kde-base/kcalc/kcalc-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Calculator"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/gmp"
diff --git a/kde-base/kcalc/kcalc-3.5.0_rc1.ebuild b/kde-base/kcalc/kcalc-3.5.0_rc1.ebuild
index ecce166f5eba..58eadcb9fc17 100644
--- a/kde-base/kcalc/kcalc-3.5.0_rc1.ebuild
+++ b/kde-base/kcalc/kcalc-3.5.0_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/kde-base/kcalc/kcalc-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kcalc/kcalc-3.5_beta1.ebuild b/kde-base/kcalc/kcalc-3.5_beta1.ebuild
index 43a546a7f68d..521dcfe019ed 100644
--- a/kde-base/kcalc/kcalc-3.5_beta1.ebuild
+++ b/kde-base/kcalc/kcalc-3.5_beta1.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/kde-base/kcalc/kcalc-3.5_beta1.ebuild,v 1.1 2005/09/22 18:01:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Calculator"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/gmp"
diff --git a/kde-base/kcalc/metadata.xml b/kde-base/kcalc/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcalc/metadata.xml
+++ b/kde-base/kcalc/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcharselect/ChangeLog b/kde-base/kcharselect/ChangeLog
index 3274164098c3..920388e9f114 100644
--- a/kde-base/kcharselect/ChangeLog
+++ b/kde-base/kcharselect/ChangeLog
@@ -1,6 +1,78 @@
 # ChangeLog for kde-base/kcharselect
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/ChangeLog,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
+
+*kcharselect-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcharselect-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kcharselect-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcharselect-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcharselect-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcharselect-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kcharselect-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kcharselect-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcharselect-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kcharselect-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcharselect-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kcharselect-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcharselect-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcharselect-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcharselect-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcharselect-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kcharselect-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcharselect-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcharselect-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kcharselect-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcharselect-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kcharselect-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcharselect-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcharselect/Manifest b/kde-base/kcharselect/Manifest
index d2e584640f12..8ccae17a79b6 100644
--- a/kde-base/kcharselect/Manifest
+++ b/kde-base/kcharselect/Manifest
@@ -1,4 +1,8 @@
-MD5 7b8e21dc963d0e0faf437beab137f2d2 kcharselect-3.4.0_beta1.ebuild 303
-MD5 7b8e21dc963d0e0faf437beab137f2d2 kcharselect-3.4.0_alpha1.ebuild 303
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kcharselect-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kcharselect-3.4.0_beta1 216
+MD5 e0478d6082403703af07954d6da1d042 ChangeLog 2804
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kcharselect-3.4.1 212
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kcharselect-3.5.0 68
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kcharselect-3.5_beta1 69
+MD5 3f72b3ff828b1bb1f98c6e9187ee369c kcharselect-3.4.1.ebuild 442
+MD5 3f5d9965a66001fb9964bacc9add4ebb kcharselect-3.5.0.ebuild 419
+MD5 7973cec2e721f94d8472e230f4a2da86 kcharselect-3.5_beta1.ebuild 429
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kcharselect/files/digest-kcharselect-3.4.1 b/kde-base/kcharselect/files/digest-kcharselect-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kcharselect/files/digest-kcharselect-3.4.1
+++ b/kde-base/kcharselect/files/digest-kcharselect-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kcharselect/kcharselect-3.4.1.ebuild b/kde-base/kcharselect/kcharselect-3.4.1.ebuild
index 75b24fe22c84..1a0cd48b2c24 100644
--- a/kde-base/kcharselect/kcharselect-3.4.1.ebuild
+++ b/kde-base/kcharselect/kcharselect-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE character selection utility"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 KMEXTRA="charselectapplet/"
\ No newline at end of file
diff --git a/kde-base/kcharselect/kcharselect-3.5.0.ebuild b/kde-base/kcharselect/kcharselect-3.5.0.ebuild
index 3aaa70bb431a..dacb4d491685 100644
--- a/kde-base/kcharselect/kcharselect-3.5.0.ebuild
+++ b/kde-base/kcharselect/kcharselect-3.5.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/kde-base/kcharselect/kcharselect-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kcharselect/kcharselect-3.5_beta1.ebuild b/kde-base/kcharselect/kcharselect-3.5_beta1.ebuild
index 7d9a458241a2..8bcaee9e56f2 100644
--- a/kde-base/kcharselect/kcharselect-3.5_beta1.ebuild
+++ b/kde-base/kcharselect/kcharselect-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-3.5_beta1.ebuild,v 1.1 2005/09/22 18:02:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcharselect/kcharselect-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE character selection utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="charselectapplet/"
\ No newline at end of file
diff --git a/kde-base/kcharselect/metadata.xml b/kde-base/kcharselect/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcharselect/metadata.xml
+++ b/kde-base/kcharselect/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcheckpass/ChangeLog b/kde-base/kcheckpass/ChangeLog
index 0e5fc8ea4335..a76b368ef67a 100644
--- a/kde-base/kcheckpass/ChangeLog
+++ b/kde-base/kcheckpass/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for kde-base/kcheckpass
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/ChangeLog,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kcheckpass-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kcheckpass-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kcheckpass-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kcheckpass-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcheckpass-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  12 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kcheckpass-3.5.0_rc1.ebuild:
+  Remove the pie patch as it's already applied upstream. Bug #112342.
+
+*kcheckpass-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcheckpass-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kcheckpass-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+  20 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kcheckpass-pie-final.patch, kcheckpass-3.5.0_beta2.ebuild:
+  Added patch to compile kcheckpass fine on PIC architectures when using
+  --enable-final. See bug #107218.
+
+*kcheckpass-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcheckpass-3.5.0_beta2.ebuild:
+  New version.
+
+*kcheckpass-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcheckpass-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kcheckpass-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcheckpass-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcheckpass-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcheckpass-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kcheckpass-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcheckpass-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kcheckpass-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kcheckpass-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kcheckpass-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcheckpass-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kcheckpass-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcheckpass-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcheckpass-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcheckpass-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcheckpass-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kcheckpass-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcheckpass-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcheckpass-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kcheckpass-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcheckpass-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kcheckpass-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcheckpass-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcheckpass/Manifest b/kde-base/kcheckpass/Manifest
index b5788717fdab..e2a56002aeb4 100644
--- a/kde-base/kcheckpass/Manifest
+++ b/kde-base/kcheckpass/Manifest
@@ -1,4 +1,27 @@
-MD5 d043c51d2e0f5490cdebdbc847b995fb kcheckpass-3.4.0_alpha1.ebuild 446
-MD5 d043c51d2e0f5490cdebdbc847b995fb kcheckpass-3.4.0_beta1.ebuild 446
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kcheckpass-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kcheckpass-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ae0ee3fb0c19fbd03aee140d933bba1b ChangeLog 4008
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcheckpass-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcheckpass-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcheckpass-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kcheckpass-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kcheckpass-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kcheckpass-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kcheckpass-3.5_beta1 69
+MD5 6fbfb59b6c34c3ed5a8b8bbfb5ccb1c7 files/kcheckpass-pie-final.patch 624
+MD5 b401a538cf13f910f1d1feaf4c6af086 kcheckpass-3.4.1.ebuild 517
+MD5 c6405bea7c47189c312b88797fac75c6 kcheckpass-3.4.2.ebuild 529
+MD5 b3abc7fc8c9fc2596aaa23157cb58739 kcheckpass-3.4.3.ebuild 525
+MD5 3cb594190b6058092de389d4365f48cb kcheckpass-3.5.0.ebuild 510
+MD5 3bb52311ac100edf44ac503b15eb240d kcheckpass-3.5.0_beta2.ebuild 664
+MD5 9a7ad2f6c01fe484affa77116db3470b kcheckpass-3.5.0_rc1.ebuild 515
+MD5 d8e6f992e888f8a83ce7e3d10553f6bc kcheckpass-3.5_beta1.ebuild 511
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjsUntT9W3vfTuoRAl0CAJ0Qf9M3FbbUIFpUujl73P5dR7E93wCeP+Ys
+SfGLj8vQKZP8/mI/BbCeO+0=
+=0LDC
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kcheckpass/files/digest-kcheckpass-3.4.1 b/kde-base/kcheckpass/files/digest-kcheckpass-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kcheckpass/files/digest-kcheckpass-3.4.1
+++ b/kde-base/kcheckpass/files/digest-kcheckpass-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kcheckpass/files/digest-kcheckpass-3.4.2 b/kde-base/kcheckpass/files/digest-kcheckpass-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kcheckpass/files/digest-kcheckpass-3.4.2
+++ b/kde-base/kcheckpass/files/digest-kcheckpass-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kcheckpass/kcheckpass-3.4.1.ebuild b/kde-base/kcheckpass/kcheckpass-3.4.1.ebuild
index c4ecf54c7a96..727dabd51d65 100644
--- a/kde-base/kcheckpass/kcheckpass-3.4.1.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
-DESCRIPTION="KDE pam client that allows you to auth as a specified user without actually doing anything as that user"
-KEYWORDS="~x86 ~amd64"
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="pam"
-DEPEND="pam? ( sys-libs/pam ~kde-base/kdebase-pam-4 ) !pam? ( sys-apps/shadow )"
+DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
diff --git a/kde-base/kcheckpass/kcheckpass-3.4.2.ebuild b/kde-base/kcheckpass/kcheckpass-3.4.2.ebuild
index cad00bfbb69a..8dd626f31d7c 100644
--- a/kde-base/kcheckpass/kcheckpass-3.4.2.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.4.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
-DESCRIPTION="KDE pam client that allows you to auth as a specified user without actually doing anything as that user"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
diff --git a/kde-base/kcheckpass/kcheckpass-3.4.3.ebuild b/kde-base/kcheckpass/kcheckpass-3.4.3.ebuild
index 59c96137c89d..f02ffbac7f37 100644
--- a/kde-base/kcheckpass/kcheckpass-3.4.3.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.4.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/kde-base/kcheckpass/kcheckpass-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
diff --git a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
index 8a5e02357d5d..54e5c0d7f9a2 100644
--- a/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5.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/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kcheckpass/kcheckpass-3.5.0_beta2.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.0_beta2.ebuild
index a963da350985..d4e60ccbaa54 100644
--- a/kde-base/kcheckpass/kcheckpass-3.5.0_beta2.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5.0_beta2.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/kde-base/kcheckpass/kcheckpass-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,11 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A simple password checker, used by any software in need of user authentication."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
+# Fixes problem with PIE and kcheckpass with --enable-final on PIC plaforms
+# Already applied for 3.5 RC.
+PATCHES="${FILESDIR}/${PN}-pie-final.patch"
+
diff --git a/kde-base/kcheckpass/kcheckpass-3.5.0_rc1.ebuild b/kde-base/kcheckpass/kcheckpass-3.5.0_rc1.ebuild
index fd31e72bc23e..9539d29f4682 100644
--- a/kde-base/kcheckpass/kcheckpass-3.5.0_rc1.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5.0_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/kde-base/kcheckpass/kcheckpass-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -12,7 +12,3 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
-# Fixes problem with PIE and kcheckpass with --enable-final on PIC plaforms
-# Already applied for 3.5 RC.
-PATCHES="${FILESDIR}/${PN}-pie-final.patch"
-
diff --git a/kde-base/kcheckpass/kcheckpass-3.5_beta1.ebuild b/kde-base/kcheckpass/kcheckpass-3.5_beta1.ebuild
index be202d4623e1..700adb8b7063 100644
--- a/kde-base/kcheckpass/kcheckpass-3.5_beta1.ebuild
+++ b/kde-base/kcheckpass/kcheckpass-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5_beta1.ebuild,v 1.1 2005/09/22 18:03:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcheckpass/kcheckpass-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
-DESCRIPTION="KDE pam client that allows you to auth as a specified user without actually doing anything as that user"
-KEYWORDS="~amd64"
+DESCRIPTION="A simple password checker, used by any software in need of user authentication."
+KEYWORDS="~amd64 ~x86"
 IUSE="pam"
 DEPEND="pam? ( kde-base/kdebase-pam ) !pam? ( sys-apps/shadow )"
 
diff --git a/kde-base/kcheckpass/metadata.xml b/kde-base/kcheckpass/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcheckpass/metadata.xml
+++ b/kde-base/kcheckpass/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcminit/ChangeLog b/kde-base/kcminit/ChangeLog
index 98bbe4279855..e473cc485f8f 100644
--- a/kde-base/kcminit/ChangeLog
+++ b/kde-base/kcminit/ChangeLog
@@ -1,6 +1,85 @@
 # ChangeLog for kde-base/kcminit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
+
+*kcminit-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcminit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kcminit-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kcminit-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcminit-3.5.0_beta2.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kcminit-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcminit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcminit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcminit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kcminit-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kcminit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcminit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kcminit-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcminit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kcminit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcminit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcminit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcminit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcminit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kcminit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcminit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcminit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kcminit-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcminit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcminit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcminit-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcminit/Manifest b/kde-base/kcminit/Manifest
index 36af84b7f5d2..fd13ea603ff5 100644
--- a/kde-base/kcminit/Manifest
+++ b/kde-base/kcminit/Manifest
@@ -1,4 +1,10 @@
-MD5 95a5137a6799dc46fe25a3a091799bf2 kcminit-3.4.0_beta1.ebuild 402
-MD5 95a5137a6799dc46fe25a3a091799bf2 kcminit-3.4.0_alpha1.ebuild 402
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kcminit-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kcminit-3.4.0_alpha1 69
+MD5 62f677d399efa0fd24cc1b9713683ffc ChangeLog 2921
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcminit-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kcminit-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kcminit-3.5.0_beta2 216
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kcminit-3.5_beta1 69
+MD5 b47ead437403c3a76f69654b02afe1e7 kcminit-3.4.1.ebuild 435
+MD5 ff92b994e71b71c317694e1d35c9889d kcminit-3.5.0.ebuild 417
+MD5 67a46b056fa2cc36f21ed1f3f8128522 kcminit-3.5.0_beta2.ebuild 429
+MD5 c3d17962c955e71836abf1e489d6bb42 kcminit-3.5_beta1.ebuild 418
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kcminit/files/digest-kcminit-3.4.1 b/kde-base/kcminit/files/digest-kcminit-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kcminit/files/digest-kcminit-3.4.1
+++ b/kde-base/kcminit/files/digest-kcminit-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kcminit/kcminit-3.4.1.ebuild b/kde-base/kcminit/kcminit-3.4.1.ebuild
index df725a192e87..aaf45f9eb3de 100644
--- a/kde-base/kcminit/kcminit-3.4.1.ebuild
+++ b/kde-base/kcminit/kcminit-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kcminit/kcminit-3.5.0.ebuild b/kde-base/kcminit/kcminit-3.5.0.ebuild
index c9ac629b50de..5813487e45ae 100644
--- a/kde-base/kcminit/kcminit-3.5.0.ebuild
+++ b/kde-base/kcminit/kcminit-3.5.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/kde-base/kcminit/kcminit-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kcminit/kcminit-3.5.0_beta2.ebuild b/kde-base/kcminit/kcminit-3.5.0_beta2.ebuild
index 4e374ac88a3d..469155817bc8 100644
--- a/kde-base/kcminit/kcminit-3.5.0_beta2.ebuild
+++ b/kde-base/kcminit/kcminit-3.5.0_beta2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kcminit/kcminit-3.5_beta1.ebuild b/kde-base/kcminit/kcminit-3.5_beta1.ebuild
index 6a306383b068..5ef5d7acaef9 100644
--- a/kde-base/kcminit/kcminit-3.5_beta1.ebuild
+++ b/kde-base/kcminit/kcminit-3.5_beta1.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/kde-base/kcminit/kcminit-3.5_beta1.ebuild,v 1.1 2005/09/22 18:03:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcminit/kcminit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KCMInit - runs startups initialization for Control Modules."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kcminit/metadata.xml b/kde-base/kcminit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcminit/metadata.xml
+++ b/kde-base/kcminit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcoloredit/ChangeLog b/kde-base/kcoloredit/ChangeLog
index 36945d056408..e2be1bf7fbf5 100644
--- a/kde-base/kcoloredit/ChangeLog
+++ b/kde-base/kcoloredit/ChangeLog
@@ -1,6 +1,97 @@
 # ChangeLog for kde-base/kcoloredit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcoloredit/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcoloredit/ChangeLog,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kcoloredit-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kcoloredit-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kcoloredit-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kcoloredit-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcoloredit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kcoloredit-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+*kcoloredit-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcoloredit-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcoloredit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcoloredit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcoloredit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kcoloredit-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kcoloredit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcoloredit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kcoloredit-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcoloredit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kcoloredit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcoloredit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcoloredit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcoloredit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcoloredit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kcoloredit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcoloredit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcoloredit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kcoloredit-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcoloredit-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcoloredit-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kcoloredit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kcoloredit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcoloredit-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcoloredit/Manifest b/kde-base/kcoloredit/Manifest
index 8953e19872dc..6353622a7578 100644
--- a/kde-base/kcoloredit/Manifest
+++ b/kde-base/kcoloredit/Manifest
@@ -1,4 +1,20 @@
-MD5 653f5f995f32491367b1e49021616dfa kcoloredit-3.4.0_beta1.ebuild 271
-MD5 653f5f995f32491367b1e49021616dfa kcoloredit-3.4.0_alpha1.ebuild 271
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kcoloredit-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kcoloredit-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9d8ea8d07c97ad6a396ee77e077dbd24 ChangeLog 3346
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kcoloredit-3.4.1 221
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kcoloredit-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kcoloredit-3.5.0 71
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kcoloredit-3.5_beta1 72
+MD5 1a3978987e5c672248c431b902190cd3 kcoloredit-3.4.1.ebuild 407
+MD5 60052c0ac40abc50798deecd67dd6bd6 kcoloredit-3.4.3.ebuild 406
+MD5 54e8b69575cff121201157a80db1fef4 kcoloredit-3.5.0.ebuild 385
+MD5 335a96756e8a61f6b4be26a23bc4e1f6 kcoloredit-3.5_beta1.ebuild 395
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmQ/ntT9W3vfTuoRAooZAJ92xXPPS0ix2SQ+IdT5j2dZK1WTbACgq/Am
+/zXuCUGUBWa1YN/PDhmFlgc=
+=IibY
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kcoloredit/files/digest-kcoloredit-3.4.1 b/kde-base/kcoloredit/files/digest-kcoloredit-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kcoloredit/files/digest-kcoloredit-3.4.1
+++ b/kde-base/kcoloredit/files/digest-kcoloredit-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kcoloredit/kcoloredit-3.4.1.ebuild b/kde-base/kcoloredit/kcoloredit-3.4.1.ebuild
index c3e545f5c2e5..a5423d07f902 100644
--- a/kde-base/kcoloredit/kcoloredit-3.4.1.ebuild
+++ b/kde-base/kcoloredit/kcoloredit-3.4.1.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/kde-base/kcoloredit/kcoloredit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcoloredit/kcoloredit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE color selector/editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kcoloredit/kcoloredit-3.4.3.ebuild b/kde-base/kcoloredit/kcoloredit-3.4.3.ebuild
index 844aad17d636..fd52c5697aff 100644
--- a/kde-base/kcoloredit/kcoloredit-3.4.3.ebuild
+++ b/kde-base/kcoloredit/kcoloredit-3.4.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/kde-base/kcoloredit/kcoloredit-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcoloredit/kcoloredit-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE color selector/editor"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kcoloredit/kcoloredit-3.5.0.ebuild b/kde-base/kcoloredit/kcoloredit-3.5.0.ebuild
index ab8f71665a1e..6a2602c6c7ce 100644
--- a/kde-base/kcoloredit/kcoloredit-3.5.0.ebuild
+++ b/kde-base/kcoloredit/kcoloredit-3.5.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/kde-base/kcoloredit/kcoloredit-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcoloredit/kcoloredit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kcoloredit/kcoloredit-3.5_beta1.ebuild b/kde-base/kcoloredit/kcoloredit-3.5_beta1.ebuild
index 363b3f568c9d..e1cfa884dd68 100644
--- a/kde-base/kcoloredit/kcoloredit-3.5_beta1.ebuild
+++ b/kde-base/kcoloredit/kcoloredit-3.5_beta1.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/kde-base/kcoloredit/kcoloredit-3.5_beta1.ebuild,v 1.1 2005/09/22 18:05:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcoloredit/kcoloredit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE color selector/editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kcoloredit/metadata.xml b/kde-base/kcoloredit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcoloredit/metadata.xml
+++ b/kde-base/kcoloredit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index 2516a5638bce..2ba2c0afb1ab 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,153 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.1 2005/01/15 02:24:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kcontrol-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kcontrol-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kcontrol-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kcontrol-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kcontrol-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kcontrol-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kcontrol-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.5.0_beta2.ebuild:
+  New version.
+
+*kcontrol-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kcontrol-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+*kcontrol-3.4.2-r1 (04 Oct 2005)
+
+  04 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.2-kinfocenter-opengl-fix.patch,
+  +kcontrol-3.4.2-r1.ebuild:
+  Add patch to fix opengl related crash (#103937).
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcontrol-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  23 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kcontrol-3.5_beta1.ebuild:
+  Remove the two file that does not need to be extracted anymore.
+
+*kcontrol-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcontrol-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kcontrol-3.5_alpha1.ebuild:
+  Add explicit dependency on libkonq and kicker.
+
+*kcontrol-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcontrol-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kcontrol-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kcontrol-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcontrol-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  03 Jul 2005; Dan Armak <danarmak@gentoo.org> kcontrol-3.4.1-r1.ebuild:
+  Add missing dep on khotkeys, fixes bug 97773. Thanks to Lukas Turek for
+  reporting.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kcontrol-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcontrol-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  10 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kcontrol-3.4.1-r1.ebuild:
+  Add missing documentation (#89912).
+
+*kcontrol-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-configure.patch, +kcontrol-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966, #92433).
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> kcontrol-3.4.1.ebuild:
+  Add dependency on khelpcenter (#90594).
+
+*kcontrol-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcontrol-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kcontrol-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcontrol-3.4.0.ebuild,
+  kcontrol-3.4.0_beta2.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcontrol-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcontrol-3.4.0_beta1.ebuild,
+  kcontrol-3.4.0_beta2.ebuild, kcontrol-3.4.0_rc1.ebuild:
+  Depend on the new kdebase-data package instead of kdebase-applnk.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kcontrol-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcontrol-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kcontrol-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcontrol-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  02 Feb 2005; Dan Armak <danarmak@gentoo.org> kcontrol-3.4.0_beta1.ebuild:
+  Add support for SVG files in the kdesktop background settings module; closes
+  bug #80272.
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> kcontrol-3.4.0_beta1.ebuild:
+  Adding missing dep on freetype, bug #78206.
 
 *kcontrol-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index 9ada3e906b37..603830b9dfee 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -1,5 +1,33 @@
-MD5 1224859d0de3f5cd740be038e8c71114 kcontrol-3.4.0_beta1.ebuild 1307
-MD5 1224859d0de3f5cd740be038e8c71114 kcontrol-3.4.0_alpha1.ebuild 1307
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kcontrol-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kcontrol-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e4b96078b7f0c371bbf671b9202b07c6 ChangeLog 5356
 MD5 64e656c39553f20b12d38eca1f8120d6 files/configure.in.in-kdm-settings.diff 686
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcontrol-3.4.1 212
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kcontrol-3.4.1-r1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcontrol-3.4.2 287
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kcontrol-3.4.2-r1 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kcontrol-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kcontrol-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kcontrol-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kcontrol-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kcontrol-3.5_beta1 69
+MD5 5da6ade21525a3e320c94c4b3351a7a3 files/kdebase-3.4.1-configure.patch 2936
+MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
+MD5 4a0b15f07ae8a1bc4c778165f7083a13 kcontrol-3.4.1-r1.ebuild 1551
+MD5 8c071d64261cb5641d4f140ab61debd2 kcontrol-3.4.1.ebuild 1326
+MD5 ac9c4ad066ae48aaee618b7f297f1768 kcontrol-3.4.2-r1.ebuild 1916
+MD5 f6ddcb89e8d636e9dad86a9ff397928e kcontrol-3.4.2.ebuild 1779
+MD5 4fdda4f47d80f2781ec8639977ee3623 kcontrol-3.4.3.ebuild 1775
+MD5 d45e7eeeb7123110120abf7b2d8a1951 kcontrol-3.5.0.ebuild 1614
+MD5 05b977a4624b963bb509e377371ddb93 kcontrol-3.5.0_beta2.ebuild 1623
+MD5 6b1687fc49b1b99afdca67402121c891 kcontrol-3.5.0_rc1.ebuild 1626
+MD5 d8698caadf1ce99d0e5bfa17c67ebae6 kcontrol-3.5_beta1.ebuild 1615
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjwgntT9W3vfTuoRAsenAJ9poTueUHiC1JG77Udl0eJEhKYH9ACgjTi9
+XG3iOA1R1mi6/L2BhzQZpS4=
+=TNKY
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.4.1 b/kde-base/kcontrol/files/digest-kcontrol-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kcontrol/files/digest-kcontrol-3.4.1
+++ b/kde-base/kcontrol/files/digest-kcontrol-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kcontrol/files/digest-kcontrol-3.4.2 b/kde-base/kcontrol/files/digest-kcontrol-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kcontrol/files/digest-kcontrol-3.4.2
+++ b/kde-base/kcontrol/files/digest-kcontrol-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kcontrol/kcontrol-3.4.1-r1.ebuild b/kde-base/kcontrol/kcontrol-3.4.1-r1.ebuild
index 2748eece6cfe..76d7d840efaa 100644
--- a/kde-base/kcontrol/kcontrol-3.4.1-r1.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.4.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/kde-base/kcontrol/kcontrol-3.4.1-r1.ebuild,v 1.1 2005/06/07 13:01:02 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
 
 PATCHES="$FILESDIR/configure.in.in-kdm-settings.diff
@@ -23,7 +23,9 @@ DEPEND="ssl? ( dev-libs/openssl )
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kcminit)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
-$(deprange $PV $MAXKDEVER kde-base/khelpcenter)"
+$(deprange $PV $MAXKDEVER kde-base/kdesu)
+$(deprange $PV $MAXKDEVER kde-base/khelpcenter)
+$(deprange $PV $MAXKDEVER kde-base/khotkeys)"
 
 KMEXTRACTONLY="kicker/core/kicker.h
 	    kwin/kwinbindings.cpp
@@ -36,6 +38,7 @@ KMEXTRACTONLY="kicker/core/kicker.h
 	    kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
 
 KMCOMPILEONLY="kicker/share" # for kickerSettings.h
+KMEXTRA="doc/kinfocenter"
 
 src_compile() {
 	myconf="$myconf `use_with ssl` `use_with arts` `use_with opengl gl`
diff --git a/kde-base/kcontrol/kcontrol-3.4.1.ebuild b/kde-base/kcontrol/kcontrol-3.4.1.ebuild
index 8089b6db232d..b07ee51fc418 100644
--- a/kde-base/kcontrol/kcontrol-3.4.1.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.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/kde-base/kcontrol/kcontrol-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
 PATCHES="$FILESDIR/configure.in.in-kdm-settings.diff"
 
@@ -20,7 +20,8 @@ DEPEND="ssl? ( dev-libs/openssl )
 
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kcminit)
-$(deprange $PV $MAXKDEVER kde-base/kdebase-data)"
+$(deprange $PV $MAXKDEVER kde-base/kdebase-data)
+$(deprange $PV $MAXKDEVER kde-base/khelpcenter)"
 
 KMEXTRACTONLY="kicker/core/kicker.h
 	    kwin/kwinbindings.cpp
diff --git a/kde-base/kcontrol/kcontrol-3.4.2-r1.ebuild b/kde-base/kcontrol/kcontrol-3.4.2-r1.ebuild
index f441d73e7b27..1eca96a43ad0 100644
--- a/kde-base/kcontrol/kcontrol-3.4.2-r1.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.4.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/kde-base/kcontrol/kcontrol-3.4.2-r1.ebuild,v 1.1 2005/10/04 09:44:47 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kcontrol/kcontrol-3.4.2.ebuild b/kde-base/kcontrol/kcontrol-3.4.2.ebuild
index be658c34a8f1..9010da97e2a5 100644
--- a/kde-base/kcontrol/kcontrol-3.4.2.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.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/kde-base/kcontrol/kcontrol-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
 
 # configure.in.in-kdm-settings.diff: add configure tests from kdm necessary to configure kcontrol
@@ -16,16 +16,18 @@ IUSE="ssl arts ieee1394 logitech-mouse opengl"
 PATCHES="$FILESDIR/configure.in.in-kdm-settings.diff
 	$FILESDIR/kdebase-3.4.1-configure.patch"
 
-DEPEND="ssl? ( dev-libs/openssl )
+DEPEND=">=media-libs/freetype-2
+	media-libs/fontconfig
+	ssl? ( dev-libs/openssl )
 	arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	opengl? ( virtual/opengl )
 	ieee1394? ( sys-libs/libraw1394 )
 	logitech-mouse? ( >=dev-libs/libusb-0.1.10a )"
 
 RDEPEND="${DEPEND}
-$(deprange 3.4.1-r1 $MAXKDEVER kde-base/kcminit)
+$(deprange 3.4.1 $MAXKDEVER kde-base/kcminit)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-data)
-$(deprange 3.4.1-r1 $MAXKDEVER kde-base/kdesu)
+$(deprange 3.4.1 $MAXKDEVER kde-base/kdesu)
 $(deprange $PV $MAXKDEVER kde-base/khelpcenter)
 $(deprange $PV $MAXKDEVER kde-base/khotkeys)"
 
diff --git a/kde-base/kcontrol/kcontrol-3.4.3.ebuild b/kde-base/kcontrol/kcontrol-3.4.3.ebuild
index e7fcdef1a9e1..bff9a4df5316 100644
--- a/kde-base/kcontrol/kcontrol-3.4.3.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.4.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/kde-base/kcontrol/kcontrol-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
 
 DEPEND=">=media-libs/freetype-2
diff --git a/kde-base/kcontrol/kcontrol-3.5.0.ebuild b/kde-base/kcontrol/kcontrol-3.5.0.ebuild
index 6e2e9d10f9a5..ab01871ff336 100644
--- a/kde-base/kcontrol/kcontrol-3.5.0.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5.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/kde-base/kcontrol/kcontrol-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kcontrol/kcontrol-3.5.0_beta2.ebuild b/kde-base/kcontrol/kcontrol-3.5.0_beta2.ebuild
index 16f0cb5bdb7b..34f545f01727 100644
--- a/kde-base/kcontrol/kcontrol-3.5.0_beta2.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5.0_beta2.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/kde-base/kcontrol/kcontrol-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
 
 DEPEND=">=media-libs/freetype-2
diff --git a/kde-base/kcontrol/kcontrol-3.5.0_rc1.ebuild b/kde-base/kcontrol/kcontrol-3.5.0_rc1.ebuild
index 6696f925e79c..41a513e7a996 100644
--- a/kde-base/kcontrol/kcontrol-3.5.0_rc1.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5.0_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/kde-base/kcontrol/kcontrol-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kcontrol/kcontrol-3.5_beta1.ebuild b/kde-base/kcontrol/kcontrol-3.5_beta1.ebuild
index a98fdfb8a7e1..83230436e5f5 100644
--- a/kde-base/kcontrol/kcontrol-3.5_beta1.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5_beta1.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/kde-base/kcontrol/kcontrol-3.5_beta1.ebuild,v 1.1 2005/09/22 18:05:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Control Center"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl arts ieee1394 logitech-mouse opengl"
 
 DEPEND=">=media-libs/freetype-2
@@ -28,18 +28,13 @@ $(deprange $PV $MAXKDEVER kde-base/khotkeys)
 $(deprange $PV $MAXKDEVER kde-base/libkonq)
 $(deprange $PV $MAXKDEVER kde-base/kicker)"
 
-# kdm/configure.in.in is needed for KDE_CONFDIR, can be removed for beta1
-# kioslave/thumbnail/configure.in.in is needed for HAVE_LIBART, can be removed
-# for beta1
 KMEXTRACTONLY="kwin/kwinbindings.cpp
 	    kicker/kicker/core/kickerbindings.cpp
 		kicker/taskbar/taskbarbindings.cpp
 	    kdesktop/kdesktopbindings.cpp
 	    klipper/klipperbindings.cpp
 	    kxkb/kxkbbindings.cpp
-		kdm/configure.in.in
-		kicker/taskmanager
-	    kioslave/thumbnail/configure.in.in"
+		kicker/taskmanager"
 
 KMEXTRA="doc/kinfocenter"
 KMCOMPILEONLY="kicker/libkicker
diff --git a/kde-base/kcontrol/metadata.xml b/kde-base/kcontrol/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcontrol/metadata.xml
+++ b/kde-base/kcontrol/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kcron/ChangeLog b/kde-base/kcron/ChangeLog
index 735aaf9be602..02221b765eb7 100644
--- a/kde-base/kcron/ChangeLog
+++ b/kde-base/kcron/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for kde-base/kcron
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/ChangeLog,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kcron-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kcron-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kcron-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kcron-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kcron-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kcron-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+*kcron-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kcron-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kcron-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kcron-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcron-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kcron-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kcron-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kcron-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kcron-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kcron-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kcron-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kcron-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kcron-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kcron-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kcron-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kcron-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kcron-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kcron-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kcron-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kcron-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcron-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kcron-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kcron-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kcron-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kcron/Manifest b/kde-base/kcron/Manifest
index 297372e73c38..6b95b3676f57 100644
--- a/kde-base/kcron/Manifest
+++ b/kde-base/kcron/Manifest
@@ -1,4 +1,20 @@
-MD5 5dd931d5b4b72eb8be355d48700ceabc kcron-3.4.0_beta1.ebuild 265
-MD5 5dd931d5b4b72eb8be355d48700ceabc kcron-3.4.0_alpha1.ebuild 265
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-kcron-3.4.0_beta1 215
-MD5 5c80d63263041da2a3656e9484510f15 files/digest-kcron-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 65b1b8e862e430bfcae0614220e805bb ChangeLog 3173
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-kcron-3.4.1 211
+MD5 80b3c1753e84c4d6d9caf0502325b7b4 files/digest-kcron-3.4.3 68
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-kcron-3.5.0 68
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-kcron-3.5_beta1 69
+MD5 7d070e7472fea8fbc31dc4bc4a7db226 kcron-3.4.1.ebuild 391
+MD5 dc5038e18f689eed653a28e68f80a3b6 kcron-3.4.3.ebuild 389
+MD5 e6c727841a3a98891ce936a5434bebac kcron-3.5.0.ebuild 369
+MD5 ab3ce13c424c743a808d7b8e46502ad0 kcron-3.5_beta1.ebuild 379
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkkCntT9W3vfTuoRAvXnAJ4rqoBgPlYMAWW9TFMqDC20XWBd3ACfYELc
+tiZGPvEKcMqvU3ooljFuXaI=
+=Y4K7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kcron/files/digest-kcron-3.4.1 b/kde-base/kcron/files/digest-kcron-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/kcron/files/digest-kcron-3.4.1
+++ b/kde-base/kcron/files/digest-kcron-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/kcron/kcron-3.4.1.ebuild b/kde-base/kcron/kcron-3.4.1.ebuild
index c77845b029f7..f191646b8b22 100644
--- a/kde-base/kcron/kcron-3.4.1.ebuild
+++ b/kde-base/kcron/kcron-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kcron/kcron-3.4.3.ebuild b/kde-base/kcron/kcron-3.4.3.ebuild
index e432e2496c4c..fd7164fc2f1c 100644
--- a/kde-base/kcron/kcron-3.4.3.ebuild
+++ b/kde-base/kcron/kcron-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kcron/kcron-3.5.0.ebuild b/kde-base/kcron/kcron-3.5.0.ebuild
index da5a90104be1..5fdebfa21bbe 100644
--- a/kde-base/kcron/kcron-3.5.0.ebuild
+++ b/kde-base/kcron/kcron-3.5.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/kde-base/kcron/kcron-3.5.0.ebuild,v 1.1 2005/11/22 22:13:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kcron/kcron-3.5_beta1.ebuild b/kde-base/kcron/kcron-3.5_beta1.ebuild
index 9532eec9e400..a5dc1132aba1 100644
--- a/kde-base/kcron/kcron-3.5_beta1.ebuild
+++ b/kde-base/kcron/kcron-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.5_beta1.ebuild,v 1.1 2005/09/22 18:06:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcron/kcron-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Task Scheduler"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kcron/metadata.xml b/kde-base/kcron/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kcron/metadata.xml
+++ b/kde-base/kcron/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdat/ChangeLog b/kde-base/kdat/ChangeLog
index 8e0d5a7488af..dfbb6c48f15d 100644
--- a/kde-base/kdat/ChangeLog
+++ b/kde-base/kdat/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/kdat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdat-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdat-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdat-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdat-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdat-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdat-3.5_beta1.ebuild,
+  kdat-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdat-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdat-3.5.0_beta2.ebuild:
+  New version.
+
+*kdat-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdat-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdat-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdat-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kdat-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdat-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdat-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdat-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdat-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdat-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdat-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdat-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdat-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdat-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdat-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdat-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdat-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdat-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdat-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdat-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdat-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdat-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdat-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdat-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdat/Manifest b/kde-base/kdat/Manifest
index d52415579e73..1affd2b37263 100644
--- a/kde-base/kdat/Manifest
+++ b/kde-base/kdat/Manifest
@@ -1,4 +1,22 @@
-MD5 a900b5d6645d8f15dee2766758c6dea5 kdat-3.4.0_beta1.ebuild 277
-MD5 a900b5d6645d8f15dee2766758c6dea5 kdat-3.4.0_alpha1.ebuild 277
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-kdat-3.4.0_beta1 215
-MD5 5c80d63263041da2a3656e9484510f15 files/digest-kdat-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 38afac78e58fd168037cec826e4072c8 ChangeLog 3287
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-kdat-3.4.1 211
+MD5 80b3c1753e84c4d6d9caf0502325b7b4 files/digest-kdat-3.4.3 68
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-kdat-3.5.0 68
+MD5 64ad1da64ecad951c67e7899dbfa8bd7 files/digest-kdat-3.5.0_beta2 215
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-kdat-3.5_beta1 69
+MD5 66119c2d78aa1217999e550a684c9865 kdat-3.4.1.ebuild 401
+MD5 853f271a69e9094ac6441e6e74eada85 kdat-3.4.3.ebuild 399
+MD5 e2aed4e645ee86b30fac039b2ce4a248 kdat-3.5.0.ebuild 379
+MD5 27710be5bad1e757c2a5676a87a135aa kdat-3.5.0_beta2.ebuild 391
+MD5 8813cc157acd5727e9390b31c6c99fed kdat-3.5_beta1.ebuild 382
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhklSntT9W3vfTuoRAguHAKCBZLleSZZO20QQiE1FPHvWFie3TQCfZrye
+/BDJw//7KSBgiUv70uRARwo=
+=DHxl
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdat/files/digest-kdat-3.4.1 b/kde-base/kdat/files/digest-kdat-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/kdat/files/digest-kdat-3.4.1
+++ b/kde-base/kdat/files/digest-kdat-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/kdat/kdat-3.4.1.ebuild b/kde-base/kdat/kdat-3.4.1.ebuild
index fab2681aa9f3..d1b31778e22f 100644
--- a/kde-base/kdat/kdat-3.4.1.ebuild
+++ b/kde-base/kdat/kdat-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="tar-based DAT archiver for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdat/kdat-3.4.3.ebuild b/kde-base/kdat/kdat-3.4.3.ebuild
index 7a9dbdeb5584..46fce2110365 100644
--- a/kde-base/kdat/kdat-3.4.3.ebuild
+++ b/kde-base/kdat/kdat-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.4.3.ebuild,v 1.1 2005/10/13 00:09:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="tar-based DAT archiver for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdat/kdat-3.5.0.ebuild b/kde-base/kdat/kdat-3.5.0.ebuild
index ccf6b0bfa733..f69e5d9260b6 100644
--- a/kde-base/kdat/kdat-3.5.0.ebuild
+++ b/kde-base/kdat/kdat-3.5.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/kde-base/kdat/kdat-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kdat/kdat-3.5.0_beta2.ebuild b/kde-base/kdat/kdat-3.5.0_beta2.ebuild
index cef8d3726fd8..0aa2201e42d4 100644
--- a/kde-base/kdat/kdat-3.5.0_beta2.ebuild
+++ b/kde-base/kdat/kdat-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="tar-based DAT archiver for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdat/kdat-3.5_beta1.ebuild b/kde-base/kdat/kdat-3.5_beta1.ebuild
index 7ecafcffe3a0..afb9f193833e 100644
--- a/kde-base/kdat/kdat-3.5_beta1.ebuild
+++ b/kde-base/kdat/kdat-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.5_beta1.ebuild,v 1.1 2005/09/22 18:08:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdat/kdat-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="tar-based DAT archiver for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdat/metadata.xml b/kde-base/kdat/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdat/metadata.xml
+++ b/kde-base/kdat/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdcop/ChangeLog b/kde-base/kdcop/ChangeLog
index 17e6b88f7833..dd770f1e0f1b 100644
--- a/kde-base/kdcop/ChangeLog
+++ b/kde-base/kdcop/ChangeLog
@@ -1,6 +1,74 @@
 # ChangeLog for kde-base/kdcop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/ChangeLog,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
+
+*kdcop-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdcop-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdcop-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdcop-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdcop-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdcop-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdcop-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdcop-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdcop-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdcop-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdcop-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdcop-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdcop-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdcop-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdcop-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdcop-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdcop-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdcop-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdcop-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdcop-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdcop-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdcop-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdcop-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdcop/Manifest b/kde-base/kdcop/Manifest
index 66cd98f97925..cf730f359ff0 100644
--- a/kde-base/kdcop/Manifest
+++ b/kde-base/kdcop/Manifest
@@ -1,4 +1,8 @@
-MD5 488e087bb17ae8617c34ce1d611f8c29 kdcop-3.4.0_beta1.ebuild 392
-MD5 488e087bb17ae8617c34ce1d611f8c29 kdcop-3.4.0_alpha1.ebuild 392
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdcop-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdcop-3.4.0_beta1 216
+MD5 cad73e5f524f310b8c0ac81ebf3973e4 ChangeLog 2640
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdcop-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdcop-3.5.0 68
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdcop-3.5_beta1 69
+MD5 04b4b7bae66ce589cad00a6bd002416b kdcop-3.4.1.ebuild 421
+MD5 462e89845dc76027890f0846de4935b5 kdcop-3.5.0.ebuild 398
+MD5 4176d4129f517058190fdfb52bc9957a kdcop-3.5_beta1.ebuild 408
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdcop/files/digest-kdcop-3.4.1 b/kde-base/kdcop/files/digest-kdcop-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdcop/files/digest-kdcop-3.4.1
+++ b/kde-base/kdcop/files/digest-kdcop-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdcop/kdcop-3.4.1.ebuild b/kde-base/kdcop/kdcop-3.4.1.ebuild
index 622c67f499cd..667b94352d7a 100644
--- a/kde-base/kdcop/kdcop-3.4.1.ebuild
+++ b/kde-base/kdcop/kdcop-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/kdcop-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/kdcop-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: graphical DCOP browser/client"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 KMNODOCS="true"
 
diff --git a/kde-base/kdcop/kdcop-3.5.0.ebuild b/kde-base/kdcop/kdcop-3.5.0.ebuild
index 9d588cdfc708..88840a9785c1 100644
--- a/kde-base/kdcop/kdcop-3.5.0.ebuild
+++ b/kde-base/kdcop/kdcop-3.5.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/kde-base/kdcop/kdcop-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/kdcop-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdcop/kdcop-3.5_beta1.ebuild b/kde-base/kdcop/kdcop-3.5_beta1.ebuild
index bb94ef66501f..8e644ad5aa60 100644
--- a/kde-base/kdcop/kdcop-3.5_beta1.ebuild
+++ b/kde-base/kdcop/kdcop-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/kdcop-3.5_beta1.ebuild,v 1.1 2005/09/22 18:08:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdcop/kdcop-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: graphical DCOP browser/client"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMNODOCS="true"
 
diff --git a/kde-base/kdcop/metadata.xml b/kde-base/kdcop/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdcop/metadata.xml
+++ b/kde-base/kdcop/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kde-env/ChangeLog b/kde-base/kde-env/ChangeLog
index 431df51e97b7..b3ad7a93d063 100644
--- a/kde-base/kde-env/ChangeLog
+++ b/kde-base/kde-env/ChangeLog
@@ -1,13 +1,88 @@
 # ChangeLog for kde-base/kde-env
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
-
-*kde-env-2.2.2 (1 Feb 2002)
-
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+*kde-env-3-r4 (17 Sep 2005)
+
+  17 Sep 2005; Caleb Tennis <caleb@gentoo.org> +kde-env-3-r4.ebuild:
+  Remove KDE_MALLOC line
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> kde-env-3-r3.ebuild:
+  Stable on ppc64
+
+  21 Feb 2005; Hardave Riar <hardave@gentoo.org> kde-env-3-r3.ebuild:
+  Stable on mips.
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kde-env-3-r3.ebuild:
+  Stable on alpha.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> kde-env-3-r3.ebuild:
+  stable on amd64.
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> :
+  Stable on sparc.
+
+  09 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> kde-env-3-r3.ebuild:
+  Stable on sparc
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> kde-env-3-r3.ebuild:
+  Stable on hppa.
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kde-env-3-r3.ebuild:
+  Masked kde-env-3-r3.ebuild stable for ppc
+
+*kde-env-3-r3 (25 Aug 2004)
+
+  25 Aug 2004; Caleb Tennis <caleb@gentoo.org> kde-env-3-r3.ebuild:
+  New version, supports KDE_MALLOC and KDE_IS_PRELINKED (see bug #60771)
+
+  20 Jun 2004; Tom Gall <tgall@gentoo.org> kde-env-3-r2.ebuild:
+  stable on ppc64, bug #54146
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> kde-env-3-r2.ebuild:
+  Added to ~mips
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> :
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Marked ~ppc
+
+  28 Jan 2004; Aron Griffis <agriffis@gentoo.org> kde-env-3-r2.ebuild:
+  stable on ia64, of course
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*kde-env-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kde-env-3-r2 (04 Sep 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kde-env-3-r2.ebuild:
+  Added ~sparc keyword
+
+  04 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix this part of bug #7359: add /usr/share/config to CONFIG_PROTECT.
+
+*kde-env-3-r1 (13 Aug 2002)
+
+  30 Aug 2002; mark Guertin <gerk@gentoo.org> :
+  Changed keywords from * to "x86 ppc sparc sparc64", * was depreciated 
+  and I'm not sure its proper, this should be safer
+
+  13 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Make the env.d file item 99, because it needs to be last in the KDEDIRS list.
+
+*kde-env-1 (12 Aug 2002)
+
+  12 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  This package installs some env.d files required by kde. Reintroduced for
+  KDE 3.0.3 and 3.1_beta1; is very different from the kde-env that existed
+  in the kde2 era.
diff --git a/kde-base/kde-env/Manifest b/kde-base/kde-env/Manifest
index eac191a54537..51ac716d2e19 100644
--- a/kde-base/kde-env/Manifest
+++ b/kde-base/kde-env/Manifest
@@ -1,5 +1,6 @@
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r2 0
-MD5 799746e484472374836f78460f5fbee6 kde-env-3-r1.ebuild 596
-MD5 1b1834e16075cbd6d89704b131c914f4 kde-env-3-r2.ebuild 751
-MD5 3c0898a30768c5581eb3f5864912922e ChangeLog 1282
+MD5 b080cc1fd0523a05a60f0288f068dd72 kde-env-3-r4.ebuild 562
+MD5 1e6865a11fbc57d7971075425224d67d kde-env-3-r3.ebuild 577
+MD5 77ab3ff7658a6f936d522c52a17b0cfe ChangeLog 2719
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-env-3-r4 0
diff --git a/kde-base/kde-env/kde-env-3-r3.ebuild b/kde-base/kde-env/kde-env-3-r3.ebuild
index b75a31513723..188b7a68bf57 100644
--- a/kde-base/kde-env/kde-env-3-r3.ebuild
+++ b/kde-base/kde-env/kde-env-3-r3.ebuild
@@ -1,27 +1,24 @@
-# 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/kde-base/kde-env/kde-env-3-r3.ebuild,v 1.1 2004/08/25 19:03:54 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-3-r3.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
-DESCRIPTION="Sets up some env.d files for kde"
+DESCRIPTION="Sets up some env.d files for KDE"
 HOMEPAGE="http://www.gentoo.org/"
 SRC_URI=""
 
-LICENSE="GPL-2" # like the ebuild itself
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~mips ~ppc64" # works everywhere - nothing to compile, no deps
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
-# needs the new portage to process the CONFIG_PROTECT values correctly
-DEPEND=""
-RDEPEND=">=sys-apps/portage-2.0.36"
-
-src_unpack() { true; }
-src_compile() { true; }
+S=${WORKDIR}
 
 src_install() {
 	dodir /etc/env.d
-	echo "KDEDIRS=/usr
+	cat << EOF > ${D}/etc/env.d/99kde-env
+KDEDIRS=/usr
 CONFIG_PROTECT=/usr/share/config
 KDE_MALLOC=1
-#KDE_IS_PRELINKED=1" > ${D}/etc/env.d/99kde-env
+#KDE_IS_PRELINKED=1
+EOF
 }
diff --git a/kde-base/kde-env/kde-env-3-r4.ebuild b/kde-base/kde-env/kde-env-3-r4.ebuild
index 46de75aab263..25f6b09b7553 100644
--- a/kde-base/kde-env/kde-env-3-r4.ebuild
+++ b/kde-base/kde-env/kde-env-3-r4.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/kde-base/kde-env/kde-env-3-r4.ebuild,v 1.1 2005/09/17 17:02:25 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-env/kde-env-3-r4.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 DESCRIPTION="Sets up some env.d files for KDE"
 HOMEPAGE="http://www.gentoo.org/"
diff --git a/kde-base/kde-env/metadata.xml b/kde-base/kde-env/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kde-env/metadata.xml
+++ b/kde-base/kde-env/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kde-i18n/ChangeLog b/kde-base/kde-i18n/ChangeLog
index efede90700c7..a7cd2dccdf7b 100644
--- a/kde-base/kde-i18n/ChangeLog
+++ b/kde-base/kde-i18n/ChangeLog
@@ -1,6 +1,310 @@
 # ChangeLog for kde-base/kde-i18n
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.1 2003/09/19 21:57:14 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/ChangeLog,v 1.1.1.1 2005/11/30 10:14:17 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kde-i18n-3.4.3.ebuild:
+  Added ~ppc64 keyword; bug #112842
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kde-i18n-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kde-i18n-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kde-i18n-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kde-i18n-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kde-i18n-3.5.0_rc1 (13 Nov 2005)
+
+  13 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kde-i18n-3.5.0_rc1.ebuild:
+  Added kde-i18n 3.5.0_rc1. Closes bug #112409.
+
+*kde-i18n-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kde-i18n-3.5.0_beta2.ebuild:
+  New version.
+
+*kde-i18n-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kde-i18n-3.4.3.ebuild:
+  New version.
+
+*kde-i18n-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-i18n-3.4.3.ebuild:
+  New version.
+
+  28 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kde-i18n-de-3.4.91-compile.patch, kde-i18n-3.5_beta1.ebuild:
+  Fix compilation error (#106919).
+
+*kde-i18n-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kde-i18n-3.5_beta1.ebuild:
+  New version.
+
+  28 Jul 2005; Guy Martin <gmsoft@gentoo.org> kde-i18n-3.4.1.ebuild:
+  Stable on hppa.
+
+*kde-i18n-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-i18n-3.4.2.ebuild:
+  New version.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> kde-i18n-3.4.1.ebuild:
+  To sparc stable
+
+  04 Jul 2005; Lars Weiler <pylon@gentoo.org> kde-i18n-3.4.1.ebuild:
+  Stable on ppc.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kde-i18n-3.4.1.ebuild:
+  Stable on ppc64
+
+  15 Jun 2005; Carsten Lohrke <carlo@gentoo.org> kde-i18n-3.4.1.ebuild:
+  pt_BR: don't build kommander docs, #96143
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kde-i18n-3.4.0.ebuild,
+  kde-i18n-3.4.1.ebuild:
+  Added ~ppc64
+
+*kde-i18n-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-i18n-3.4.1.ebuild:
+  New version.
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kde-i18n-de-3.4.0-next.patch, kde-i18n-3.4.0.ebuild:
+  Add patch to fix bug #86050.
+
+  21 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kde-i18n-3.3.2.ebuild,
+  kde-i18n-3.4.0.ebuild:
+  Better error message if LINGUAS contains unavailable languages (#85997).
+
+  20 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kde-i18n-3.4.0.ebuild:
+  Marked ~amd64, closes bug 85981.
+
+  20 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kde-i18n-ru-3.4.0-filedialog.patch, kde-i18n-3.4.0.ebuild:
+  Add patch to fix bug #85858.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kde-i18n-3.4.0.ebuild:
+  Added to ~ppc
+
+*kde-i18n-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-i18n-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kde-i18n-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kde-i18n-3.4.0_beta2.ebuild:
+  Version bump.
+
+  08 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kde-i18n-3.3.1.ebuild, kde-i18n-3.3.2.ebuild:
+  Pushing to stable on ppc64 with pvdabeel's approval to stay in line with
+  rest of kde.
+
+*kde-i18n-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-i18n-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> kde-i18n-3.3.2.ebuild:
+  Stable on sparc
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kde-i18n-3.3.2.ebuild:
+  Stable on hppa.
+
+  02 Jan 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kde-i18n-ru-3.3.2-kmplot.diff, kde-i18n-3.3.2.ebuild:
+  i18n-ru fix
+
+  30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kde-i18n-3.3.2.ebuild:
+  Stable on alpha.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.3.2.ebuild:
+  x86 stable
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kde-i18n-3.3.2.ebuild:
+  Stable on amd64.
+
+  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kde-i18n-3.3.1.ebuild:
+  Stable on alpha.
+
+  12 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kde-i18n-3.3.1.ebuild:
+  ~alpha keyword.
+
+  10 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kde-i18n-3.3.2.ebuild:
+  forgot to remove 3.3.1 it patch
+
+*kde-i18n-3.3.2 (10 Dec 2004)
+
+  10 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +kde-i18n-3.3.2.ebuild:
+  version bump
+
+  08 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kde-i18n-3.3.1.ebuild:
+  stable on amd64
+
+  30 Nov 2004; Carsten Lohrke <carlo@gentoo.org> kde-i18n-3.2.0.ebuild:
+  removed kde-i18n-st, since it isn't available upstream anymore and the digest
+  is missing
+
+  09 Nov 2004; Lars Weiler <pylon@gentoo.org> kde-i18n-3.3.1.ebuild:
+  Stable on ppc.
+
+  08 Nov 2004; Simone Gotti <motaboy@gentoo.org> kde-i18n-3.3.1.ebuild:
+  Added a patch to fix compilation problems for the italian localization.
+  Fixes bug #67674
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kde-i18n-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+*kde-i18n-3.3.1 (17 Oct 2004)
+
+  17 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +kde-i18n-3.3.1.ebuild:
+  version bump
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> kde-i18n-3.3.0.ebuild:
+  stable on amd64.
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kde-i18n-3.3.0.ebuild:
+  Stable on hppa.
+
+  21 Sep 2004; Carsten Lohrke <carlo@gentoo.org> kde-i18n-3.2.3.ebuild:
+  linguas_se doesn't exist: #56194
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kde-i18n-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.3.0.ebuild:
+  x86 stable 3.3.0
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> kde-i18n-3.3.0.ebuild:
+  stable on ppc64, bug #61800
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kde-i18n-3.1.5.ebuild, kde-i18n-3.3.0.ebuild:
+  Masked kde-i18n-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kde-i18n-3.1.5.ebuild:
+  Masked kde-i18n-3.1.5.ebuild stable for ppc
+
+*kde-i18n-3.3.0 (23 Aug 2004)
+
+  23 Aug 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.3.0.ebuild:
+  3.3.0 final
+
+  09 Aug 2004; Guy Martin <gmsoft@gentoo.org> kde-i18n-3.2.3.ebuild:
+  Stable on hppa.
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kde-i18n-3.2.2.ebuild:
+  Stable on alpha.
+
+  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> kde-i18n-3.2.2.ebuild:
+  Marked stable on amd64.
+
+*kde-i18n-3.2.3 (11 Jun 2004)
+
+  11 Jun 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.3.ebuild:
+  Version bump
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kde-i18n-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kde-i18n-3.2.2.ebuild:
+  Stable on sparc.
+
+  02 May 2004; Danny van Dyk <kugelfang@gentoo.org> kde-i18n-3.2.1.ebuild:
+  Marked stable on amd64.
+
+*kde-i18n-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kde-i18n-3.2.2.ebuild:
+  Version bump
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kde-i18n-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.1.4.ebuild,
+  kde-i18n-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kde-i18n-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.1.ebuild:
+  Version bump
+
+  29 Feb 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.0.ebuild:
+  Change wording in ewarn to be correct.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kde-i18n-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kde-i18n-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kde-i18n-3.2.0.ebuild:
+  Marked ~ppc
+
+  05 Feb 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.0.ebuild:
+  Fix src_uri errors
+
+*kde-i18n-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.0.ebuild,
+  kde-i18n-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+*kde-i18n-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.0_beta1.ebuild,
+  kde-i18n-3.2.0_beta2.ebuild, kde-i18n-3.2.0_rc1.ebuild:
+  New version, removing older versions
+
+*kde-i18n-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.1.5.ebuild:
+  New version
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kde-i18n-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kde-i18n-3.2.0_beta2 (04 Dec 2003)
+
+  04 Dec 2003; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.1.4.ebuild,
+  kde-i18n-3.2.0_beta2.ebuild:
+  New beta version
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kde-i18n-3.1.4.ebuild:
+  Marked ppc
+
+*kde-i18n-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.2.0_beta1.ebuild:
+  New beta version
+
+  13 Oct 2003; Caleb Tennis <caleb@gentoo.org> kde-1i8n-3.1.4.ebuild:
+  Now that portage has fixed USE_EXPAND, let's go with a new scheme in this ebuild.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-i18n-3.1.4.ebuild:
+  marking x86 stable
 
 *kde-i18n-3.1.4 (19 Sep 2003)
 
diff --git a/kde-base/kde-i18n/Manifest b/kde-base/kde-i18n/Manifest
index f76d8dec2120..75a677ea481e 100644
--- a/kde-base/kde-i18n/Manifest
+++ b/kde-base/kde-i18n/Manifest
@@ -1,4 +1,20 @@
-MD5 bca55c5a92baa00cd10a559c747441b4 kde-i18n-3.1.4.ebuild 1522
-MD5 324fe2a5807dae1d0b2c61baffc5dae3 ChangeLog 334
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 47b8fcf8ee830e187b7229adfd3e7b1d files/digest-kde-i18n-3.1.4 3708
+MD5 65bbbe6224ac4dc3b89dc0e649ad6d58 ChangeLog 9583
+MD5 2906e8c990e0ff3679848c7477a4a5fc kde-i18n-3.3.2.ebuild 1797
+MD5 700e3025b1cd5c09135833d248c3a98e kde-i18n-3.4.1.ebuild 1678
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 0e7f0dd7b167205b5ba69e9a72f52744 kde-i18n-3.4.2.ebuild 1686
+MD5 64b1796b6d855ebd068e53a5b7fa7ae8 kde-i18n-3.5_beta1.ebuild 2010
+MD5 6d6123538d4895b1501c8196e24fffdb kde-i18n-3.4.3.ebuild 1496
+MD5 f8d5d812ccee1622511be82927db0f39 kde-i18n-3.5.0_beta2.ebuild 1656
+MD5 6099cc9b1b43ef5cef511924a8cc346c kde-i18n-3.5.0_rc1.ebuild 1658
+MD5 dbb4d3c37fe377a7375625e74a3ca7d5 kde-i18n-3.5.0.ebuild 1644
+MD5 be2b24a376f130383c134228731eea5b files/digest-kde-i18n-3.3.2 3714
+MD5 19f50dd0a35e4946b903767ee0781d05 files/digest-kde-i18n-3.4.1 3567
+MD5 d1650da7994b1a5297c442cd12e73cc3 files/digest-kde-i18n-3.5_beta1 4480
+MD5 fe416091cd30cb387c87c28e2d0a793d files/kde-i18n-ru-3.3.2-kmplot.diff 9744
+MD5 868980d85a65572dbd8fccdbc95a9e52 files/digest-kde-i18n-3.4.2 3638
+MD5 7c3f67b582aa0a2ed4213c7670400f11 files/kde-i18n-de-3.4.91-compile.patch 7271
+MD5 2310151e5185ce18d4f49ffa6506b813 files/digest-kde-i18n-3.4.3 3638
+MD5 1d27a9f3020eedda26f2c8a7c07e1af1 files/digest-kde-i18n-3.5.0_beta2 4480
+MD5 eebd194d58c7b7cbec1f2b9813809017 files/digest-kde-i18n-3.5.0_rc1 4662
+MD5 98f830cbb7204b2814676d58641bf689 files/digest-kde-i18n-3.5.0 4489
diff --git a/kde-base/kde-i18n/files/digest-kde-i18n-3.4.1 b/kde-base/kde-i18n/files/digest-kde-i18n-3.4.1
index b7db02de3eea..81490dc42225 100644
--- a/kde-base/kde-i18n/files/digest-kde-i18n-3.4.1
+++ b/kde-base/kde-i18n/files/digest-kde-i18n-3.4.1
@@ -34,7 +34,7 @@ MD5 f94b30928746f56decf014aba4dd0a62 kde-i18n-nn-3.4.1.tar.bz2 1686266
 MD5 b8447164534f6eb640914df73b67d435 kde-i18n-pa-3.4.1.tar.bz2 864470
 MD5 a8a4274f098cca840aff4815ed0f2dc7 kde-i18n-pl-3.4.1.tar.bz2 2162365
 MD5 ca86da0bf48c0b1ac0299a72ef6a8673 kde-i18n-pt-3.4.1.tar.bz2 7047815
-MD5 2fc5154c299e992745bfbdb7423bb4f9 kde-i18n-pt_BR-3.4.1.tar.bz2 10214558
+MD5 252bc28b226b66573b619399586aa32a kde-i18n-pt_BR-3.4.1.tar.bz2 10215473
 MD5 59b9771ea148a16987ffa219c5bf8012 kde-i18n-ro-3.4.1.tar.bz2 3042966
 MD5 5a8716e4247369411dbd60f1f193ea3c kde-i18n-ru-3.4.1.tar.bz2 7534106
 MD5 59fae9861c2ecd7c2e110f885a41d114 kde-i18n-se-3.4.1.tar.bz2 925713
diff --git a/kde-base/kde-i18n/files/digest-kde-i18n-3.5.0 b/kde-base/kde-i18n/files/digest-kde-i18n-3.5.0
index 030747b433f9..2a04ae8c3940 100644
--- a/kde-base/kde-i18n/files/digest-kde-i18n-3.5.0
+++ b/kde-base/kde-i18n/files/digest-kde-i18n-3.5.0
@@ -29,6 +29,7 @@ MD5 9e4108754b8b9d84157f8a139749f96e kde-i18n-hu-3.5.0.tar.bz2 2927219
 MD5 9ecfc0c82796bca3f7cbb621b2535b51 kde-i18n-is-3.5.0.tar.bz2 2043988
 MD5 1d2c594bf5c6f853822ae869ae101373 kde-i18n-it-3.5.0.tar.bz2 14256750
 MD5 404c4ad98acc237eb4ea36b1b637f708 kde-i18n-ja-3.5.0.tar.bz2 2439668
+MD5 b3aebc0c475b6a297d15bef69d630483 kde-i18n-km-3.5.0.tar.bz2 701064
 MD5 6e04c93815138fb78b182e82335a2b74 kde-i18n-ko-3.5.0.tar.bz2 1053650
 MD5 f03e5c7dac20f93f215c01e4f76de2bc kde-i18n-lt-3.5.0.tar.bz2 1849479
 MD5 4c3f19b6208784da447535d39cbe617b kde-i18n-lv-3.5.0.tar.bz2 1341234
diff --git a/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild b/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild
index 9709d180a797..7e976f6cc503 100644
--- a/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.3.2.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/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild,v 1.1 2004/12/09 23:42:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:14:17 chriswhite Exp $
 
-inherit kde
+inherit kde eutils
 
 MY_PV=${PV}
 #MY_PV=3.3
@@ -11,7 +11,7 @@ IUSE=""
 DESCRIPTION="KDE ${PV} - i18n: ${PN}"
 HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64 ~hppa"
+KEYWORDS="x86 amd64 sparc ppc ppc64 hppa alpha"
 SLOT="$KDEMAJORVER.$KDEMINORVER"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -22,26 +22,27 @@ SRC_URI="linguas_sr? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-sr@Lat
 
 LANGS="af ar bg bn bs ca cs cy da de el en_GB eo es et eu fa fi fr gl he hi hr hsb hu is it ja mn ms nb nds nl nn pa pl pt pt_BR ro ru sk sl sr sr@Latn sv ta tg tr uk uz zh_CN zh_TW"
 
-for X in ${LANGS} ; do 
+for X in ${LANGS} ; do
 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://kde/stable/${MY_PV}/src/kde-i18n/kde-i18n-${X}-${PV}.tar.bz2 )"
 done
 
-src_unpack() {
-
-	if [ -z "${LINGUAS}" ]; then
-		ewarn
-		ewarn "You must define a LINGUAS environment variable that contains a list"
-		ewarn "of the language codes for which languages you would like to install."
-		ewarn "e.g.: LINGUAS=\"se de pt\""
-		ewarn
+pkg_setup() {
+	if [ -z "${A}" ]; then
+		echo
+		eerror "You must define a LINGUAS environment variable that contains a list"
+		eerror "of the language codes for which languages you would like to install."
+		eerror "Look at the LANGS variable inside the ebuild to see the list of"
+		eerror "available languages."
+		eerror "e.g.: LINGUAS=\"sv de pt\""
+		echo
 		die
 	fi
+}
 
+src_unpack() {
 	base_src_unpack unpack
-
-	hasq "it" ${LINGUAS} && epatch ${WORKDIR}/patches/kde-i18n-it-3.3.1.patch
-
-	rm -r ${WORKDIR}/patches/
+	cd ${WORKDIR}
+	use linguas_ru && epatch ${FILESDIR}/kde-i18n-ru-3.3.2-kmplot.diff
 }
 
 src_compile() {
diff --git a/kde-base/kde-i18n/kde-i18n-3.4.1.ebuild b/kde-base/kde-i18n/kde-i18n-3.4.1.ebuild
index e8ea9d877007..f7f56335e07e 100644
--- a/kde-base/kde-i18n/kde-i18n-3.4.1.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.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/kde-base/kde-i18n/kde-i18n-3.4.1.ebuild,v 1.1 2005/05/27 08:59:31 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:17 chriswhite Exp $
 
 inherit kde
 
@@ -8,7 +8,7 @@ DESCRIPTION="KDE internationalization package"
 HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86 hppa"
 IUSE=""
 SLOT="${KDEMAJORVER}.${KDEMINORVER}"
 
@@ -30,17 +30,24 @@ pkg_setup() {
 		eerror "of the language codes for which languages you would like to install."
 		eerror "Look at the LANGS variable inside the ebuild to see the list of"
 		eerror "available languages."
-		eerror "e.g.: LINGUAS=\"se de pt\""
+		eerror "e.g.: LINGUAS=\"sv de pt\""
 		echo
 		die
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	# work around bug 96143
+	if [ -e ${WORKDIR}/kde-i18n-pt_BR-3.4.1 ] ; then
+		sed -i -e "s:kommander::" ${WORKDIR}/kde-i18n-pt_BR-3.4.1/docs/kdewebdev/Makefile.in
+	fi
+}
+
 src_compile() {
 	local _S=${S}
 	for dir in `ls ${WORKDIR}`; do
 		S=${WORKDIR}/${dir}
-
 		kde_src_compile myconf
 		myconf="${myconf} --prefix=${KDEDIR}"
 		kde_src_compile configure
@@ -53,7 +60,7 @@ src_install() {
 	local _S=${S}
 	for dir in `ls ${WORKDIR}`; do
 		cd ${WORKDIR}/${dir}
-		make DESTDIR=${D} install
+		make DESTDIR=${D} install || die
 	done
 	S=${_S}
 }
diff --git a/kde-base/kde-i18n/kde-i18n-3.4.2.ebuild b/kde-base/kde-i18n/kde-i18n-3.4.2.ebuild
index 3f1eb2bd8406..f3c0b561b4e2 100644
--- a/kde-base/kde-i18n/kde-i18n-3.4.2.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.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/kde-base/kde-i18n/kde-i18n-3.4.2.ebuild,v 1.1 2005/07/28 13:09:19 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:17 chriswhite Exp $
 
 inherit kde
 
@@ -39,8 +39,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	# work around bug 96143
-	if [ -e ${WORKDIR}/kde-i18n-pt_BR-3.4.1 ] ; then
-		sed -i -e "s:kommander::" ${WORKDIR}/kde-i18n-pt_BR-3.4.1/docs/kdewebdev/Makefile.in
+	if [ -e ${WORKDIR}/kde-i18n-pt_BR-3.4.2 ] ; then
+		sed -i -e "s:kommander::" ${WORKDIR}/kde-i18n-pt_BR-3.4.2/docs/kdewebdev/Makefile.in
 	fi
 }
 
diff --git a/kde-base/kde-i18n/kde-i18n-3.4.3.ebuild b/kde-base/kde-i18n/kde-i18n-3.4.3.ebuild
index e1cf4d28cb9c..817d939ae303 100644
--- a/kde-base/kde-i18n/kde-i18n-3.4.3.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.4.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/kde-base/kde-i18n/kde-i18n-3.4.3.ebuild,v 1.1 2005/10/12 13:32:54 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 inherit kde
 
@@ -8,7 +8,7 @@ DESCRIPTION="KDE internationalization package"
 HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ppc64 sparc ~x86"
 IUSE=""
 SLOT="${KDEMAJORVER}.${KDEMINORVER}"
 
diff --git a/kde-base/kde-i18n/kde-i18n-3.5.0.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.0.ebuild
index c9ebd3d3cd68..93653c5202a8 100644
--- a/kde-base/kde-i18n/kde-i18n-3.5.0.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.5.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/kde-base/kde-i18n/kde-i18n-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 inherit kde
 
@@ -8,19 +8,20 @@ DESCRIPTION="KDE internationalization package"
 HOMEPAGE="http://www.kde.org/"
 LICENSE="GPL-2"
 
+SLOT="${KDEMAJORVER}.${KDEMINORVER}"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-SLOT="${KDEMAJORVER}.${KDEMINORVER}"
 
 need-kde ${PV}
 
 LANGS="af ar az bg bn br bs ca cs cy da de el en_GB eo es et
-eu fa fi fr fy ga gl he hi hr hu is it ja ko lt lv mk
-mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl sr
-sr@Latn ss sv ta tg tr uk uz zh_CN zh_TW"
+eu fa fi fr fy ga gl he hi hr hu is it ja km ko lt lv
+mk mn ms nb nds nl nn pa pl pt pt_BR ro ru rw se sk sl
+sr sr@Latn ss sv ta tg tr uk uz zh_CN zh_TW"
 
 for X in ${LANGS} ; do
-	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://kde/stable/${PV}/src/kde-i18n/kde-i18n-${X}-${PV}.tar.bz2 )"
+	#SRC_URI="${SRC_URI} linguas_${X}? ( mirror://kde/stable/${PV}/src/kde-i18n/kde-i18n-${X}-${PV}.tar.bz2 )"
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://kde/stable/3.5/src/kde-i18n/kde-i18n-${X}-${PV}.tar.bz2 )"
 done
 
 pkg_setup() {
diff --git a/kde-base/kde-i18n/kde-i18n-3.5.0_beta2.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.0_beta2.ebuild
index 2262b9e41465..12d73919e78a 100644
--- a/kde-base/kde-i18n/kde-i18n-3.5.0_beta2.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.5.0_beta2.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/kde-base/kde-i18n/kde-i18n-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-base/kde-i18n/kde-i18n-3.5.0_rc1.ebuild b/kde-base/kde-i18n/kde-i18n-3.5.0_rc1.ebuild
index 460ccd734640..da185f1fa065 100644
--- a/kde-base/kde-i18n/kde-i18n-3.5.0_rc1.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.5.0_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/kde-base/kde-i18n/kde-i18n-3.5.0_rc1.ebuild,v 1.1 2005/11/13 16:41:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:17 chriswhite Exp $
 
 inherit kde
 
diff --git a/kde-base/kde-i18n/kde-i18n-3.5_beta1.ebuild b/kde-base/kde-i18n/kde-i18n-3.5_beta1.ebuild
index 5c721acfb11a..765f4e2d108c 100644
--- a/kde-base/kde-i18n/kde-i18n-3.5_beta1.ebuild
+++ b/kde-base/kde-i18n/kde-i18n-3.5_beta1.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/kde-base/kde-i18n/kde-i18n-3.5_beta1.ebuild,v 1.1 2005/09/21 17:30:07 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-i18n/kde-i18n-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:17 chriswhite Exp $
 
 inherit kde
 
@@ -43,6 +43,11 @@ src_unpack() {
 	if [ -e ${WORKDIR}/kde-i18n-pt_BR-3.4.91 ] ; then
 		sed -i -e "s:kommander::" ${WORKDIR}/kde-i18n-pt_BR-3.4.91/docs/kdewebdev/Makefile.in
 	fi
+
+	# Fix compilation error (kde bug 113283). Applied in rc1.
+	if [ -e ${WORKDIR}/kde-i18n-de-3.4.91 ] ; then
+		epatch "${FILESDIR}/kde-i18n-de-3.4.91-compile.patch"
+	fi
 }
 
 src_compile() {
diff --git a/kde-base/kde-i18n/metadata.xml b/kde-base/kde-i18n/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kde-i18n/metadata.xml
+++ b/kde-base/kde-i18n/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kde-meta/ChangeLog b/kde-base/kde-meta/ChangeLog
index 815631a2910b..25af5110e9b5 100644
--- a/kde-base/kde-meta/ChangeLog
+++ b/kde-base/kde-meta/ChangeLog
@@ -1,6 +1,133 @@
 # ChangeLog for kde-base/kde-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kde-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kde-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kde-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kde-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kde-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kde-meta-3.5_beta1.ebuild,
+  kde-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kde-meta-3.5_beta1.ebuild,
+  kde-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kde-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kde-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kde-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kde-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kde-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org> kde-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kde-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kde-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kde-meta-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kde-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kde-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kde-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kde-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  18 Jun 2005; Carsten Lohrke <carlo@gentoo.org> kde-meta-3.4.0.ebuild,
+  kde-meta-3.4.1.ebuild:
+  added kdelibs dependency for consistency with kde-base/kde
+
+  14 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kde-meta-3.4.1.ebuild:
+  Remove dependency on kdesdk (#95768).
+
+*kde-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  25 May 2005; Marcus D. Hanwell <cryos@gentoo.org> kde-meta-3.4.0.ebuild:
+  Marked ~amd64 now that visibility has been disabled - bug 80944.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kde-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kde-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  22 Mar 2005; Carsten Lohrke <carlo@gentoo.org> kde-meta-3.4.0.ebuild:
+  removed kdewebdev temporarily, #86284
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kde-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kde-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kde-meta-3.4.0_rc1.ebuild:
+  Make the dependency on kdeaccessibility conditional on the 'accessibility'
+  flag.
+
+*kde-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kde-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kde-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kde-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> kde-meta-3.4.0_beta1.ebuild,
+  +kde-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kde-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kde-meta/Manifest b/kde-base/kde-meta/Manifest
index d2017ee21bef..fa6ed23b6c8c 100644
--- a/kde-base/kde-meta/Manifest
+++ b/kde-base/kde-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 4d5c0e95d4bd6c91240e0a24574d2920 kde-meta-3.4.0_alpha1.ebuild 1173
-MD5 4d5c0e95d4bd6c91240e0a24574d2920 kde-meta-3.4.0_beta1.ebuild 1173
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b70f1a50290ae24079fd2888d52cc64 ChangeLog 4554
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-meta-3.5_beta1 0
+MD5 ccdb1a4f9d0f8d715b4ceedffd1bad5d kde-meta-3.4.1.ebuild 1203
+MD5 0eaedc14a77dae85a3c9062f6d03bb91 kde-meta-3.4.2.ebuild 1216
+MD5 b36973439bf68a9984e232ed2328ca6a kde-meta-3.4.3.ebuild 1212
+MD5 818f2d8c74f3b636e61da4fa1da2b104 kde-meta-3.5.0.ebuild 1192
+MD5 98c7e90c87fb7fa33c6a219c2fbd7fe3 kde-meta-3.5.0_beta2.ebuild 1197
+MD5 a7a2311a741b40ff1e6056b0607918b3 kde-meta-3.5.0_rc1.ebuild 1196
+MD5 5b4a012ff876cfaf3a0d22cca820c7ea kde-meta-3.5_beta1.ebuild 1195
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxsWntT9W3vfTuoRAh6CAJ988oR5i2Mj5ujAdV2/ZkmPzTP0ywCfdBIp
+CyljtkCf/HrhRE3tF5G2Br0=
+=xC1J
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kde-meta/kde-meta-3.4.1.ebuild b/kde-base/kde-meta/kde-meta-3.4.1.ebuild
index 738e32551fdb..42602b923cc0 100644
--- a/kde-base/kde-meta/kde-meta-3.4.1.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.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/kde-base/kde-meta/kde-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,10 +9,10 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="accessibility"
 
-RDEPEND="
+RDEPEND="~kde-base/kdelibs-${PV}
 $(deprange $PV $MAXKDEVER kde-base/kdeaddons-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdeadmin-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-meta)
@@ -22,11 +22,8 @@ $(deprange $PV $MAXKDEVER kde-base/kdegraphics-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdemultimedia-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdenetwork-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdepim-meta)
-$(deprange $PV $MAXKDEVER kde-base/kdesdk-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdetoys-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdeutils-meta)
 $(deprange $PV $MAXKDEVER kde-base/kdeartwork-meta)
+$(deprange $PV $MAXKDEVER kde-base/kdewebdev-meta)
 accessibility? ( $(deprange $PV $MAXKDEVER kde-base/kdeaccessibility-meta) )"
-
-# see bug 86284
-#$(deprange $PV $MAXKDEVER kde-base/kdewebdev-meta)
\ No newline at end of file
diff --git a/kde-base/kde-meta/kde-meta-3.4.2.ebuild b/kde-base/kde-meta/kde-meta-3.4.2.ebuild
index 3379d9818ce2..14e497816683 100644
--- a/kde-base/kde-meta/kde-meta-3.4.2.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.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/kde-base/kde-meta/kde-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="accessibility"
 
 RDEPEND="~kde-base/kdelibs-${PV}
diff --git a/kde-base/kde-meta/kde-meta-3.4.3.ebuild b/kde-base/kde-meta/kde-meta-3.4.3.ebuild
index e85ec2e1046a..0936c2caced7 100644
--- a/kde-base/kde-meta/kde-meta-3.4.3.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.4.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/kde-base/kde-meta/kde-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="accessibility"
 
 RDEPEND="~kde-base/kdelibs-${PV}
diff --git a/kde-base/kde-meta/kde-meta-3.5.0.ebuild b/kde-base/kde-meta/kde-meta-3.5.0.ebuild
index 78ec0ed8975e..72c9d59c9cc1 100644
--- a/kde-base/kde-meta/kde-meta-3.5.0.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.5.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/kde-base/kde-meta/kde-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kde-meta/kde-meta-3.5.0_beta2.ebuild b/kde-base/kde-meta/kde-meta-3.5.0_beta2.ebuild
index ab5a9c68985d..dad62fe9c9ba 100644
--- a/kde-base/kde-meta/kde-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.5.0_beta2.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/kde-base/kde-meta/kde-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="accessibility"
 
 RDEPEND="~kde-base/kdelibs-${PV}
diff --git a/kde-base/kde-meta/kde-meta-3.5.0_rc1.ebuild b/kde-base/kde-meta/kde-meta-3.5.0_rc1.ebuild
index 4fb891bdffa5..c8a48fbaddd3 100644
--- a/kde-base/kde-meta/kde-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.5.0_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/kde-base/kde-meta/kde-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kde-meta/kde-meta-3.5_beta1.ebuild b/kde-base/kde-meta/kde-meta-3.5_beta1.ebuild
index 7a1406e43cbe..196cb02ced0e 100644
--- a/kde-base/kde-meta/kde-meta-3.5_beta1.ebuild
+++ b/kde-base/kde-meta/kde-meta-3.5_beta1.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/kde-base/kde-meta/kde-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:39:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde-meta/kde-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="accessibility"
 
 RDEPEND="~kde-base/kdelibs-${PV}
diff --git a/kde-base/kde-meta/metadata.xml b/kde-base/kde-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kde-meta/metadata.xml
+++ b/kde-base/kde-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kde/ChangeLog b/kde-base/kde/ChangeLog
index 68a0e9067618..a96f874a30df 100644
--- a/kde-base/kde/ChangeLog
+++ b/kde-base/kde/ChangeLog
@@ -1,6 +1,472 @@
 # ChangeLog for kde-base/kde
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/ChangeLog,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kde-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kde-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kde-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.5.0_rc1.ebuild:
+  New version.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> kde-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kde-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.5.0_beta2.ebuild:
+  New version.
+
+*kde-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kde-3.4.3.ebuild:
+  New version.
+
+*kde-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kde-3.4.2.ebuild:
+  Keyworded ~mips.
+
+  04 Oct 2005; Hardave Riar <hardave@gentoo.org> kde-3.4.1.ebuild:
+  Keyworded ~mips.
+
+*kde-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kde-3.4.1.ebuild:
+  stable on ia64
+
+*kde-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+*kde-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.2.ebuild:
+  New version.
+
+  28 Jul 2005; Guy Martin <gmsoft@gentoo.org> kde-3.4.1.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Hardave Riar <hardave@gentoo.org> kde-3.3.2.ebuild:
+  Stable on mips.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kde-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kde-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  01 Jul 2005; Hardave Riar <hardave@gentoo.org> kde-3.3.2.ebuild:
+  Marked ~mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kde-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kde-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.1.ebuild:
+  New version.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> kde-3.4.0.ebuild:
+  add ~ia64
+
+  22 Mar 2005; Carsten Lohrke <carlo@gentoo.org> kde-3.4.0.ebuild:
+  removed kdewebdev temporarily, #86284
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kde-3.4.0.ebuild:
+  Added to ~ppc
+
+*kde-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kde-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.0_rc1.ebuild:
+  New version. Readd kdewebdev as dependency.
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kde-3.4.0_beta2.ebuild:
+  Marked kde-3.4.0_beta2 ~sparc.
+
+*kde-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.0_beta2.ebuild:
+  Version bump. Make kdeaccessibility optional.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kde-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kde-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kde-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kde-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Removed kdewebdev from dependencies.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kde-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kde-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kde-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kde-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kde-3.3.1.ebuild:
+  stable on ppc64
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kde-3.3.2.ebuild:
+  added ~ppc64 to KEYWORDS
+
+*kde-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kde-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kde-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kde-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kde-3.3.1.ebuild:
+  Stable on ppc.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kde-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kde-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kde-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kde-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kde-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kde-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kde-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kde-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kde-3.2.1.ebuild:
+  mark 3.3.0 x86 stable
+
+  03 Sep 2004; Tom Gall <tgall@gentoo.org> kde-3.3.0.ebuild:
+  added ~ppc64 bug #62776
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> kde-3.1.5.ebuild,
+  kde-3.2.1.ebuild, kde-3.3.0.ebuild:
+  Masked kde-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> kde-3.1.5.ebuild,
+  kde-3.2.1.ebuild:
+  Masked kde-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> kde-3.1.5.ebuild:
+  Masked kde-3.1.5.ebuild stable for ppc
+
+*kde-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kde-3.3.0.ebuild:
+  3.3.0 final
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kde-3.2.3.ebuild:
+  Stable on hppa.
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kde-3.2.2.ebuild:
+  Stable on alpha.
+
+*kde-3.2.3 (16 Jun 2004)
+
+  16 Jun 2004; Jason Wever <weeve@gentoo.org> kde-3.2.3.ebuild:
+  Re-added ~sparc keyword in relation to bug #54092.
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kde-3.2.2.ebuild:
+  stable on amd64
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kde-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kde-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kde-3.2.2.ebuild:
+  Stable on sparc.
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kde-3.0.5b.ebuild:
+  Removing old version
+
+*kde-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kde-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kde-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kde-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kde-3.1.4.ebuild,
+  kde-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kde-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kde-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kde-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  25 Feb 2004; Guy Martin <gmsoft@gentoo.org> kde-3.2.0.ebuild:
+  Marked stable on hppa.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kde-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kde-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kde-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kde-3.2.0.ebuild:
+  Marked ~ppc
+
+*kde-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kde-3.2.0.ebuild,
+  kde-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kde-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kde-3.0.5b (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kde-3.0.4.ebuild,
+  kde-3.0.5b.ebuild, kde-3.1.2.ebuild, kde-3.2.0_beta1.ebuild,
+  kde-3.2.0_beta2.ebuild, kde-3.2.0_rc1.ebuild:
+  New version, remove older versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kde-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kde-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kde-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kde-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kde-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kde-3.2.0_beta2 (04 Dec 2003)
+
+  04 Dec 2003; Caleb Tennis <caleb@gentoo.org> kde-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kde-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kde-3.1.4.ebuild:
+  Marked ppc
+
+*kde-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kde-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kde-3.1.4.ebuild:
+  add ~amd64 flag to 3.1.4
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-2.2.2-r1.ebuild,
+  kde-2.2.2-r1.ebuild, kde-3.1.1a.ebuild, kde-3.1.1a.ebuild, kde-3.1.3.ebuild,
+  kde-3.1.3.ebuild:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kde-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-3.1.4.ebuild:
+  marked x86 stable
+
+*kde-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kde-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  08 Sep 2003; Caleb Tennis <caleb@gentoo.org> kde-3.1.3.ebuild:
+  x86 stable
+
+*kde-3.1.3 (13 Aug 2003)
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kde-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1, 3.1.1 
+
+  19 Jun 2003; Will Woods <wwoods@gentoo.org> kde-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kde-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kde-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kde-3.1.2.ebuild:
+  New version of KDE.
+
+*kde-3.1.1a (16 Mai 2003)
+
+  16 Mai 2003; Lars Weiler <pylon@gentoo.org> kde-3.1.1a.ebuild:
+  Set ppc in KEYWORDS
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kde-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kde-3.1.1 (14 Mar 2003)
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kde-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kde-3.1.1.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kde-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kde-3.1.ebuild:
+  Added ~alpha to keywords
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kde-3.0.2.ebuild,
+  kde-3.0.3.ebuild, kde-3.0.3a.ebuild, kde-3.1_rc6.ebuild: removed
+  old versions
+
+*kde-3.1_rc6 (05 Jan 2003)
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kde-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kde-3.1.ebuild:
+  added ~sparc to keywords
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kde-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kde-3.1_rc6.ebuild:
+  version bump
+
+*kde-3.0.5a (21 Dec 2003)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kde-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kde-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kde-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kde-3.1.ebuild:
+  Added ppc keyword
+
+*kde-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kde-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kde-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kde-3.0.3a (05 Oct 2002)
+
+  05 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New kde ebuild that depends on kdelibs-3.0.3a. The 3.0.3 ebuild insisted
+  on installing kdelibs 3.0.3. Sorry about not noticing that sooner.
+
+*kde-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+  13 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change SLOT from "3" to "3.0" to be the same as all the other ebuilds.
+
+*kde-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+
+  New stability release.
+
+*kde-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kde-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kde-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kde-2.2.2-r1 (1 Feb 2002)
 
diff --git a/kde-base/kde/Manifest b/kde-base/kde/Manifest
index cfb1ebc102b5..3949cd37fcaf 100644
--- a/kde-base/kde/Manifest
+++ b/kde-base/kde/Manifest
@@ -1,16 +1,28 @@
-MD5 e327af16071627faa668f90239c1e37b kde-2.2.2-r1.ebuild 602
-MD5 c49bf955a48e2915a1681fcd4e24f361 kde-3.0.5a.ebuild 603
-MD5 6a9626ff6103a839a1bd7d4a92e9858c manifest 901
-MD5 42531d7f8d48bc713272e1f19a18b536 kde-3.1.ebuild 602
-MD5 03f7930eac798a1bc7065f643d2bf3ef kde-3.1.1.ebuild 606
-MD5 c776d64e62a42cda1584b68c138a736b kde-3.1.1a.ebuild 636
-MD5 e2dc6503cd0134e63b254efce60cc22a ChangeLog 3453
-MD5 8abd4f7ad9bf37da46c4630d630cfe3c kde-3.0.5b.ebuild 605
-MD5 cdbbac4ad107f5f9bd885918b1a585ad kde-3.0.4.ebuild 594
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-2.2.2-r1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.0.5a 0
-MD5 b9017c5399befa28b08a2c99cf2c8f6c files/digest-kde-3.0.5b 60
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.1a 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.0.4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.1.1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4a6477dbf01661fa0a1bbc07cfc164dc ChangeLog 13671
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.3.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kde-3.5_beta1 0
+MD5 e6eb5fca5a03e9cceecd8f3883b4ec42 kde-3.3.2.ebuild 904
+MD5 b142c69fabd5156f8799b686bfcd0439 kde-3.4.1.ebuild 935
+MD5 4d6630a38fd27dc12e187ff5970225a6 kde-3.4.2.ebuild 940
+MD5 277e39e2a280d45a1b3ab7a6cc4fd7f1 kde-3.4.3.ebuild 936
+MD5 ffb60a6277f5271a3ed3893bc7f1b086 kde-3.5.0.ebuild 916
+MD5 9d6b5090f2d386caeebe584c69c31f7d kde-3.5.0_beta2.ebuild 920
+MD5 665e299f6f427e4198035638f1b9a191 kde-3.5.0_rc1.ebuild 918
+MD5 3f2ad8ab7021776833264a6aa1cac19c kde-3.5_beta1.ebuild 918
+MD5 7a4227b8020c4b9e67023781105928ab metadata.xml 318
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxthntT9W3vfTuoRApMKAKCbJhiJNhGcJnuuPOA3TwZFVJ5RowCgqneE
+Uy0JZ9NPWZk4fO1z3vPGwzk=
+=rWOl
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kde/kde-3.3.2.ebuild b/kde-base/kde/kde-3.3.2.ebuild
index 8157649a9499..60d8cdb6032a 100644
--- a/kde-base/kde/kde-3.3.2.ebuild
+++ b/kde-base/kde/kde-3.3.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/kde-base/kde/kde-3.3.2.ebuild,v 1.1 2004/12/09 02:49:07 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
-DESCRIPTION="KDE 3.3 - merge this to pull in all non-developer kde-base/* packages"
+DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.3"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~ppc"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 # removed: kdebindings, kdesdk since these are developer-only packages
diff --git a/kde-base/kde/kde-3.4.1.ebuild b/kde-base/kde/kde-3.4.1.ebuild
index 23f4440fd740..4081391890ce 100644
--- a/kde-base/kde/kde-3.4.1.ebuild
+++ b/kde-base/kde/kde-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.4.1.ebuild,v 1.1 2005/05/27 08:58:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="accessibility"
 
 # excluded: kdebindings, kdesdk, since these are developer-only packages
diff --git a/kde-base/kde/kde-3.4.2.ebuild b/kde-base/kde/kde-3.4.2.ebuild
index 74d3dde91690..6e03db18114a 100644
--- a/kde-base/kde/kde-3.4.2.ebuild
+++ b/kde-base/kde/kde-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.4.2.ebuild,v 1.1 2005/07/28 13:05:09 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="accessibility"
 
 # excluded: kdebindings, kdesdk, since these are developer-only packages
diff --git a/kde-base/kde/kde-3.4.3.ebuild b/kde-base/kde/kde-3.4.3.ebuild
index 49d309fc34b6..32fab388e0c6 100644
--- a/kde-base/kde/kde-3.4.3.ebuild
+++ b/kde-base/kde/kde-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.4.3.ebuild,v 1.1 2005/10/12 13:31:09 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="accessibility"
 
 # excluded: kdebindings, kdesdk, since these are developer-only packages
diff --git a/kde-base/kde/kde-3.5.0.ebuild b/kde-base/kde/kde-3.5.0.ebuild
index b0c40b904bc2..c990a9971712 100644
--- a/kde-base/kde/kde-3.5.0.ebuild
+++ b/kde-base/kde/kde-3.5.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/kde-base/kde/kde-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
diff --git a/kde-base/kde/kde-3.5.0_beta2.ebuild b/kde-base/kde/kde-3.5.0_beta2.ebuild
index a86c82340593..4a66ed823f44 100644
--- a/kde-base/kde/kde-3.5.0_beta2.ebuild
+++ b/kde-base/kde/kde-3.5.0_beta2.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/kde-base/kde/kde-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
diff --git a/kde-base/kde/kde-3.5.0_rc1.ebuild b/kde-base/kde/kde-3.5.0_rc1.ebuild
index 351f0cbf8731..95be157ede52 100644
--- a/kde-base/kde/kde-3.5.0_rc1.ebuild
+++ b/kde-base/kde/kde-3.5.0_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/kde-base/kde/kde-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:47:10 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
diff --git a/kde-base/kde/kde-3.5_beta1.ebuild b/kde-base/kde/kde-3.5_beta1.ebuild
index f08a93f76b30..8ecf219d366c 100644
--- a/kde-base/kde/kde-3.5_beta1.ebuild
+++ b/kde-base/kde/kde-3.5_beta1.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/kde-base/kde/kde-3.5_beta1.ebuild,v 1.1 2005/09/21 17:27:43 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kde/kde-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 DESCRIPTION="KDE - merge this to pull in all non-developer kde-base/* packages"
 HOMEPAGE="http://www.kde.org/"
diff --git a/kde-base/kde/metadata.xml b/kde-base/kde/metadata.xml
index fb69410f7ba9..887056c739ee 100644
--- a/kde-base/kde/metadata.xml
+++ b/kde-base/kde/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-core</herd>
+<herd>kde</herd>
 <longdescription>
 Kde is a broadly used desktop environment. This package installs all 
 non-development parts of the kde desktop environment. 
diff --git a/kde-base/kdeaccessibility-iconthemes/ChangeLog b/kde-base/kdeaccessibility-iconthemes/ChangeLog
index dd83478ddb96..bada7caea685 100644
--- a/kde-base/kdeaccessibility-iconthemes/ChangeLog
+++ b/kde-base/kdeaccessibility-iconthemes/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/kdeaccessibility-iconthemes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/ChangeLog,v 1.1 2005/02/05 17:47:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/ChangeLog,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeaccessibility-iconthemes-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-iconthemes-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeaccessibility-iconthemes-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-iconthemes-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeaccessibility-iconthemes-3.5_beta1.ebuild,
+  kdeaccessibility-iconthemes-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeaccessibility-iconthemes-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-iconthemes-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeaccessibility-iconthemes-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-iconthemes-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaccessibility-iconthemes-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeaccessibility-iconthemes-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaccessibility-iconthemes-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeaccessibility-iconthemes-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaccessibility-iconthemes-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeaccessibility-iconthemes-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-iconthemes-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeaccessibility-iconthemes-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-iconthemes-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaccessibility-iconthemes-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeaccessibility-iconthemes-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-iconthemes-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
 
 *kdeaccessibility-iconthemes-3.4.0_beta2 (05 Feb 2005)
 
diff --git a/kde-base/kdeaccessibility-iconthemes/Manifest b/kde-base/kdeaccessibility-iconthemes/Manifest
index 85d7be6db990..25ed07c32145 100644
--- a/kde-base/kdeaccessibility-iconthemes/Manifest
+++ b/kde-base/kdeaccessibility-iconthemes/Manifest
@@ -1,3 +1,16 @@
-MD5 1e38e75fe22387f388354c4cd2b5e682 kdeaccessibility-iconthemes-3.4.0_beta2.ebuild 462
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 5e8955cdbfb66ebe90a2ed45352728d2 files/digest-kdeaccessibility-iconthemes-3.4.0_beta2 327
+MD5 a60250a31d7c3526cd009f18f646a841 ChangeLog 4055
+MD5 711fa18fa936b375e5d1f7be92a09f72 kdeaccessibility-iconthemes-3.4.1.ebuild 486
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 e1672d47e6f0b710288757784135c351 kdeaccessibility-iconthemes-3.4.2.ebuild 499
+MD5 057c4bfe1e4454ef7aac92a192db4707 kdeaccessibility-iconthemes-3.5_beta1.ebuild 478
+MD5 4b36b42c61f8838c7b32e90e00eda77a kdeaccessibility-iconthemes-3.4.3.ebuild 497
+MD5 e1bce11974e63251102b4145ce0a787d kdeaccessibility-iconthemes-3.5.0_beta2.ebuild 480
+MD5 17a8496e895e849055c071bd6256a1ca kdeaccessibility-iconthemes-3.5.0_rc1.ebuild 479
+MD5 64d56f42561ceb48b12aca97d75d88fa kdeaccessibility-iconthemes-3.5.0.ebuild 475
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-kdeaccessibility-iconthemes-3.4.1 236
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-kdeaccessibility-iconthemes-3.4.2 320
+MD5 174790e90449897638084f6c4bea761f files/digest-kdeaccessibility-iconthemes-3.5_beta1 77
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kdeaccessibility-iconthemes-3.4.3 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-kdeaccessibility-iconthemes-3.5.0_beta2 240
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-kdeaccessibility-iconthemes-3.5.0_rc1 332
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kdeaccessibility-iconthemes-3.5.0 76
diff --git a/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.1 b/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.1
+++ b/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.2 b/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.2
+++ b/kde-base/kdeaccessibility-iconthemes/files/digest-kdeaccessibility-iconthemes-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.1.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.1.ebuild
index f2f077526d15..76666715661d 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.1.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde from the kdeaccessibility module"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.2.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.2.ebuild
index f690f3df95d0..329d1eaf32a4 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.2.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde from the kdeaccessibility module"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.3.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.3.ebuild
index 263ee5a78ef8..b5acf699188c 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.3.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde from the kdeaccessibility module"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0.ebuild
index b4d97a69a8a2..bcba34ccba28 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_beta2.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_beta2.ebuild
index 429aabf175f6..562c22c2486f 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_beta2.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_beta2.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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde from the kdeaccessibility module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_rc1.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_rc1.ebuild
index d2916d3e285e..9179e3a4a858 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_rc1.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
diff --git a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5_beta1.ebuild b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5_beta1.ebuild
index cf52842780d1..c5f67461bf06 100644
--- a/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5_beta1.ebuild
+++ b/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5_beta1.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/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5_beta1.ebuild,v 1.1 2005/09/22 18:09:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-iconthemes/kdeaccessibility-iconthemes-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeaccessibility
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde from the kdeaccessibility module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeaccessibility-iconthemes/metadata.xml b/kde-base/kdeaccessibility-iconthemes/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaccessibility-iconthemes/metadata.xml
+++ b/kde-base/kdeaccessibility-iconthemes/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeaccessibility-meta/ChangeLog b/kde-base/kdeaccessibility-meta/ChangeLog
index e472b02881d5..384c09db682d 100644
--- a/kde-base/kdeaccessibility-meta/ChangeLog
+++ b/kde-base/kdeaccessibility-meta/ChangeLog
@@ -1,6 +1,141 @@
 # ChangeLog for kde-base/kdeaccessibility-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaccessibility-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeaccessibility-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeaccessibility-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeaccessibility-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeaccessibility-meta-3.5_beta1.ebuild,
+  kdeaccessibility-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeaccessibility-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeaccessibility-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaccessibility-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeaccessibility-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaccessibility-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdeaccessibility-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdeaccessibility-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaccessibility-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdeaccessibility-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeaccessibility-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeaccessibility-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdeaccessibility-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeaccessibility-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeaccessibility-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeaccessibility-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaccessibility-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaccessibility-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaccessibility-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeaccessibility-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  13 Feb 2005; Simone Gotti <motaboy@gentoo.org>
+  kdeaccessibility-meta-3.4.0_beta2.ebuild:
+  Add arts use flag, pull in ksayit only if the arts use flag is enabled.
+  Fixes bug #81912.
+
+*kdeaccessibility-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kdeaccessibility-meta-3.4.0_beta1-r1 (21 Jan 2005)
+
+  21 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaccessibility-meta-3.4.0_beta1-r1.ebuild:
+  Added deps on the lately added ebuilds kttsd, ksayit and kbstateapplet.
 
 *kdeaccessibility-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeaccessibility-meta/Manifest b/kde-base/kdeaccessibility-meta/Manifest
index b61b41b97aa0..40a268e445e7 100644
--- a/kde-base/kdeaccessibility-meta/Manifest
+++ b/kde-base/kdeaccessibility-meta/Manifest
@@ -1,4 +1,16 @@
-MD5 e7846d60d147ad8da0d256543c10e409 kdeaccessibility-meta-3.4.0_beta1.ebuild 574
-MD5 e7846d60d147ad8da0d256543c10e409 kdeaccessibility-meta-3.4.0_alpha1.ebuild 574
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.4.0_alpha1 0
+MD5 41d23cd30345820e9a938bfee5a3f690 ChangeLog 4818
+MD5 d3bdd888a8e1b0ffed94c20d97505763 kdeaccessibility-meta-3.4.1.ebuild 836
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 7af52742df7cab35a7660867e9984a89 kdeaccessibility-meta-3.4.2.ebuild 849
+MD5 748c0b8e0f1ee7376382afedbcfa656b kdeaccessibility-meta-3.5_beta1.ebuild 828
+MD5 222e3d2414afc754923c5aedc90883c6 kdeaccessibility-meta-3.4.3.ebuild 847
+MD5 36d0beb9fc77771e739c1e77c0c7ed43 kdeaccessibility-meta-3.5.0_beta2.ebuild 830
+MD5 d0caf2ccc8c51eb17344b9fa214218fd kdeaccessibility-meta-3.5.0_rc1.ebuild 829
+MD5 72c5acec5413c6c80bc6b23b50e6b524 kdeaccessibility-meta-3.5.0.ebuild 825
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.5_beta1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaccessibility-meta-3.5.0 0
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.1.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.1.ebuild
index 3d4409813a12..ec4c42deaacd 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.1.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.2.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.2.ebuild
index 42fd6aeee5dd..588911ccaf62 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.2.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.3.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.3.ebuild
index 4e81e342dc22..4fa24317f643 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.3.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0.ebuild
index 5b7a78aeeee4..525c09c5f90c 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_beta2.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_beta2.ebuild
index 103370f35d0e..b1f5d2516e2a 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_beta2.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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_rc1.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_rc1.ebuild
index 326f9a5fe88b..04462c998856 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5_beta1.ebuild b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5_beta1.ebuild
index 66fc08256416..568963b0afd2 100644
--- a/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5_beta1.ebuild
+++ b/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5_beta1.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/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:40:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility-meta/kdeaccessibility-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaccessibility-meta/metadata.xml b/kde-base/kdeaccessibility-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaccessibility-meta/metadata.xml
+++ b/kde-base/kdeaccessibility-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeaccessibility/ChangeLog b/kde-base/kdeaccessibility/ChangeLog
index 650c47f8c6a1..791ef6e33951 100644
--- a/kde-base/kdeaccessibility/ChangeLog
+++ b/kde-base/kdeaccessibility/ChangeLog
@@ -1,6 +1,345 @@
 # ChangeLog for kde-base/kdeaccessibility
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.1 2003/09/28 05:13:27 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/ChangeLog,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaccessibility-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdeaccessibiilty-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibiilty-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeaccessibility-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeaccessibility-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.5.0_rc1.ebuild:
+  New version.
+
+*kdeaccessibility-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeaccessibility-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaccessibility-3.4.3.ebuild:
+  New version.
+
+*kdeaccessibility-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.3.ebuild:
+  New version.
+
+*kdeaccessibility-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.5_beta1.ebuild:
+  New version. Add support for akode.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeaccessibility-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeaccessibility-3.4.1.ebuild:
+  stable on ia64
+
+*kdeaccessibility-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+*kdeaccessibility-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.2.ebuild:
+  New version.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeaccessibility-3.4.1.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeaccessibility-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org>
+  kdeaccessibility-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org>
+  kdeaccessibility-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdeaccessibility-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.1.ebuild:
+  New version.
+
+  16 May 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/kdeaccessibility-3.4.0-noarts.patch, kdeaccessibility-3.4.0.ebuild:
+  add gstreamer support, bug #85673
+
+  11 May 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeaccessibility-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeaccessibility-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdeaccessibility-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+  07 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdeaccessibility-3.4.0_rc1.ebuild:
+  Add support for gstreamer.
+
+*kdeaccessibility-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org>
+  kdeaccessibility-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org>
+  kdeaccessibility-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdeaccessibility-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.0_beta2.ebuild:
+  Version bump. Added dependencies to text-to-speech engines.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdeaccessibility-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaccessibility-3.4.0_beta1.ebuild:
+  Added blocking dep on x11-misc/kmousetool, an older version of an app now
+  included here.
+
+*kdeaccessibility-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaccessibility-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdeaccessibility-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  kdeaccessibility-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  kdeaccessibility-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdeaccessibility-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdeaccessibility-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org>
+  kdeaccessibility-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org>
+  kdeaccessibility-3.3.1.ebuild:
+  Marked ppc stable.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdeaccessibility-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdeaccessibility-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdeaccessibility-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdeaccessibility-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org>
+  kdeaccessibility-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdeaccessibility-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeaccessibility-3.2.1.ebuild:
+  3.3.0 is x86 stable
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeaccessibility-3.2.1.ebuild, kdeaccessibility-3.3.0.ebuild:
+  Masked kdeaccessibility-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeaccessibility-3.2.1.ebuild:
+  Masked kdeaccessibility-3.2.1.ebuild stable for ppc
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> kdeaccessibility-3.3.0.ebuild:
+  stable on ppc64, bug #58696
+
+*kdeaccessibility-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.3.0.ebuild,
+  kdeaccessibility-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdeaccessibility-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org>
+  kdeaccessibility-3.3.0_beta1.ebuild, kdeaccessibility-3.3.0_rc2.ebuild:
+  Add _rc2, remove _beta1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdeaccessibility-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdeaccessibility-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdeaccessibility-3.3.0_beta2.ebuild:
+  new beta
+
+*kdeaccessibility-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdeaccessibility-3.3.0_alpha1.ebuild, +kdeaccessibility-3.3.0_beta1.ebuild:
+  Add beta,remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaccessibility-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdeaccessibility-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdeaccessibility-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdeaccessibility-3.2.2.ebuild:
+  stable on amd64
+
+*kdeaccessibility-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdeaccessibility-3.3.0_alpha1.ebuild:
+  3.3 alpha 1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdeaccessibility-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdeaccessibility-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdeaccessibility-3.2.2.ebuild:
+  Stable on sparc.
+
+*kdeaccessibility-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> :
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdeaccessibility-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdeaccessibility-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.2.1.ebuild:
+  x86 stable
+
+*kdeaccessibility-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.2.1.ebuild:
+  Version bump
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdeaccessibility-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdeaccessibility-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org>
+  kdeaccessibility-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdeaccessibility-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.2.0.ebuild,
+  kdeaccessibility-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+*kdeaccessibility-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org>
+  kdeaccessibility-3.2.0_beta1.ebuild, kdeaccessibility-3.2.0_beta2.ebuild,
+  kdeaccessibility-3.2.0_rc1.ebuild:
+  New version, removing old versions
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org>
+  kdeaccessibility-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdeaccessibility-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.2.0_beta2.ebuild:
+  New beta version
+
+*kdeaccessibility-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdeaccessibility-3.2.0_beta1.ebuild:
+  New beta version
 
 *kdeaccessibility-3.2.0_alpha2 (28 Sep 2003)
 
diff --git a/kde-base/kdeaccessibility/Manifest b/kde-base/kdeaccessibility/Manifest
index 4eb9e249a8df..c97bbc30790f 100644
--- a/kde-base/kdeaccessibility/Manifest
+++ b/kde-base/kdeaccessibility/Manifest
@@ -1,4 +1,29 @@
-MD5 d8e228027e11b98b1a8f205df3b04686 kdeaccessibility-3.2.0_alpha2.ebuild 313
-MD5 5282c0d92811fe1edcf8694203211c9c ChangeLog 302
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 21667bd908823a7cfb00f78a78886e29 files/digest-kdeaccessibility-3.2.0_alpha2 77
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 26f3d554a4e69336c558eeeeea65a617 ChangeLog 10160
+MD5 39b0d45ba034c139eed4599fe33074d0 files/digest-kdeaccessibility-3.3.2 76
+MD5 a96a1d7a63ac3bfb215cda52b2a9c3e6 files/digest-kdeaccessibility-3.4.1 76
+MD5 8340ca34cb0bed2c4acfd82f444a2624 files/digest-kdeaccessibility-3.4.2 76
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kdeaccessibility-3.4.3 76
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kdeaccessibility-3.5.0 76
+MD5 254a84107cc908f500e1bd2ea08dcdc9 files/digest-kdeaccessibility-3.5.0_beta2 77
+MD5 cdef77222aadde0c27667909b3a7c7aa files/digest-kdeaccessibility-3.5.0_rc1 80
+MD5 174790e90449897638084f6c4bea761f files/digest-kdeaccessibility-3.5_beta1 77
+MD5 a4a2fe961dac0445daa5ceffc2e2c841 files/kdeaccessibility-3.4.0-noarts.patch 3826
+MD5 d8d24de351d4616955249a64e3071e88 kdeaccessibility-3.3.2.ebuild 364
+MD5 ac6ca6d889d6da3a003f6c7492215086 kdeaccessibility-3.4.1.ebuild 999
+MD5 e63c5344542f80d67d7ce09949855bdf kdeaccessibility-3.4.2.ebuild 1139
+MD5 b6f94a78324b04062ee2f693117702c5 kdeaccessibility-3.4.3.ebuild 1199
+MD5 083bdef9a2775e34af27666e45980d2e kdeaccessibility-3.5.0.ebuild 827
+MD5 aafcb12e75032697bfd3972835bc223f kdeaccessibility-3.5.0_beta2.ebuild 831
+MD5 6c0800aea1de8a939e4b854569d4b2f7 kdeaccessibility-3.5.0_rc1.ebuild 829
+MD5 4f1a810cdf8f6e3939a3d0f5e93f782e kdeaccessibility-3.5_beta1.ebuild 829
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkcrntT9W3vfTuoRAhJrAJ9YLFhX0Rj2N5wYbpRWzMSZfDQwFgCgsV3o
+039QuF0GVEWGQSDzl+kMy+Y=
+=Jhv1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.3.2.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.3.2.ebuild
index f76e4a0ceaff..a9b6f6eee446 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.3.2.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.3.2.ebuild
@@ -1,10 +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/kde-base/kdeaccessibility/kdeaccessibility-3.3.2.ebuild,v 1.1 2004/12/09 02:46:56 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE accessibility module"
 
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.4.1.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.4.1.ebuild
index 49c229ee328a..2d585179ff67 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.4.1.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.4.1.ebuild,v 1.1 2005/05/27 08:58:17 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE accessibility module"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE="arts gstreamer"
 
 DEPEND="gstreamer? ( >=media-libs/gstreamer-0.8.7 )"
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.4.2.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.4.2.ebuild
index ff9d5c8ac641..d43633a0b39c 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.4.2.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.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/kde-base/kdeaccessibility/kdeaccessibility-3.4.2.ebuild,v 1.1 2005/07/28 12:59:54 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.4.3.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.4.3.ebuild
index 07f5f317e2ac..ad63f31d9806 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.4.3.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.4.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.4.3.ebuild,v 1.1 2005/10/12 13:29:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE accessibility module"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc sparc ~x86"
 IUSE="arts gstreamer"
 
 DEPEND="gstreamer? ( >=media-libs/gstreamer-0.8.7
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild
index b5313e6b666e..cfc075939527 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.5.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/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_beta2.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_beta2.ebuild
index 6a8850e315eb..fc16f5400399 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_beta2.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_beta2.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/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild
index d46192d3ec6f..6c3d358a47ba 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_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/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:42:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaccessibility/kdeaccessibility-3.5_beta1.ebuild b/kde-base/kdeaccessibility/kdeaccessibility-3.5_beta1.ebuild
index 30bcf56ff35d..fad5bf9994a3 100644
--- a/kde-base/kdeaccessibility/kdeaccessibility-3.5_beta1.ebuild
+++ b/kde-base/kdeaccessibility/kdeaccessibility-3.5_beta1.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/kde-base/kdeaccessibility/kdeaccessibility-3.5_beta1.ebuild,v 1.1 2005/09/21 17:27:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaccessibility/kdeaccessibility-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaccessibility/metadata.xml b/kde-base/kdeaccessibility/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaccessibility/metadata.xml
+++ b/kde-base/kdeaccessibility/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeaddons-docs-konq-plugins/ChangeLog b/kde-base/kdeaddons-docs-konq-plugins/ChangeLog
index 60b069aee452..82bb88c25779 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/ChangeLog
+++ b/kde-base/kdeaddons-docs-konq-plugins/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/kdeaddons-docs-konq-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
+
+*kdeaddons-docs-konq-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-docs-konq-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaddons-docs-konq-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeaddons-docs-konq-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaddons-docs-konq-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeaddons-docs-konq-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaddons-docs-konq-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeaddons-docs-konq-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaddons-docs-konq-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaddons-docs-konq-plugins-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeaddons-docs-konq-plugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaddons-docs-konq-plugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeaddons-docs-konq-plugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeaddons-docs-konq-plugins/Manifest b/kde-base/kdeaddons-docs-konq-plugins/Manifest
index 02d52b266e4c..2918bb6c6a9b 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/Manifest
+++ b/kde-base/kdeaddons-docs-konq-plugins/Manifest
@@ -1,4 +1,8 @@
-MD5 c07b52ea65a7900d93b24541a5a42fcc kdeaddons-docs-konq-plugins-3.4.0_alpha1.ebuild 345
-MD5 c07b52ea65a7900d93b24541a5a42fcc kdeaddons-docs-konq-plugins-3.4.0_beta1.ebuild 345
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-kdeaddons-docs-konq-plugins-3.4.0_beta1 219
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-kdeaddons-docs-konq-plugins-3.4.0_alpha1 70
+MD5 936de18a9488fbac9c1aecc03a43fa78 ChangeLog 3238
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-kdeaddons-docs-konq-plugins-3.4.1 215
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kdeaddons-docs-konq-plugins-3.5.0 69
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kdeaddons-docs-konq-plugins-3.5_beta1 70
+MD5 0b4f3389e0c9001bb4f151b597fc7213 kdeaddons-docs-konq-plugins-3.4.1.ebuild 516
+MD5 b453d26e8cdff374f6d5792076e3919f kdeaddons-docs-konq-plugins-3.5.0.ebuild 493
+MD5 6a47fad09eecc92b249a4d193c92a66e kdeaddons-docs-konq-plugins-3.5_beta1.ebuild 503
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdeaddons-docs-konq-plugins/files/digest-kdeaddons-docs-konq-plugins-3.4.1 b/kde-base/kdeaddons-docs-konq-plugins/files/digest-kdeaddons-docs-konq-plugins-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/files/digest-kdeaddons-docs-konq-plugins-3.4.1
+++ b/kde-base/kdeaddons-docs-konq-plugins/files/digest-kdeaddons-docs-konq-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.4.1.ebuild b/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.4.1.ebuild
index 6cc64cf28274..9bcf3c9b36ef 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.4.1.ebuild
+++ b/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="doc/konq-plugins"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Documentation for the konqueror plugins from kdeaddons"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5.0.ebuild b/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5.0.ebuild
index 902f1dcc4c92..9cd9c7e3c7ed 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5.0.ebuild
+++ b/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5.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/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="doc/konq-plugins"
diff --git a/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5_beta1.ebuild b/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5_beta1.ebuild
index df5d0fb7a680..ecf47ed24e59 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5_beta1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:10:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-docs-konq-plugins/kdeaddons-docs-konq-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="doc/konq-plugins"
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Documentation for the konqueror plugins from kdeaddons"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeaddons-docs-konq-plugins/metadata.xml b/kde-base/kdeaddons-docs-konq-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaddons-docs-konq-plugins/metadata.xml
+++ b/kde-base/kdeaddons-docs-konq-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeaddons-kfile-plugins/ChangeLog b/kde-base/kdeaddons-kfile-plugins/ChangeLog
index e311da2887dc..2d8f8d3b4e9e 100644
--- a/kde-base/kdeaddons-kfile-plugins/ChangeLog
+++ b/kde-base/kdeaddons-kfile-plugins/ChangeLog
@@ -1,6 +1,85 @@
 # ChangeLog for kde-base/kdeaddons-kfile-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/ChangeLog,v 1.1 2005/02/11 01:31:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
+
+*kdeaddons-kfile-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-kfile-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeaddons-kfile-plugins-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaddons-kfile-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeaddons-kfile-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaddons-kfile-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeaddons-kfile-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaddons-kfile-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeaddons-kfile-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaddons-kfile-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaddons-kfile-plugins-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeaddons-kfile-plugins-3.4.0_beta1 (11 Feb 2005)
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +kdeaddons-kfile-plugins-3.4.0_beta1.ebuild:
+  Adding beta1 package to obsolete the others
 
 *kdeaddons-kfile-plugins-3.4.0_beta2 (10 Feb 2005)
 
diff --git a/kde-base/kdeaddons-kfile-plugins/Manifest b/kde-base/kdeaddons-kfile-plugins/Manifest
index f0b79b5cfcbb..e77029acb53c 100644
--- a/kde-base/kdeaddons-kfile-plugins/Manifest
+++ b/kde-base/kdeaddons-kfile-plugins/Manifest
@@ -1,2 +1,8 @@
-MD5 b2220583a7a49a7cf60810c48194b10c kdeaddons-kfile-plugins-3.4.0_beta2.ebuild 427
-MD5 9009a89a3313cb85f25a0d66683e48ed files/digest-kdeaddons-kfile-plugins-3.4.0_beta2 298
+MD5 c70f9f3d3a5265c6e552ceb3cb346d4d ChangeLog 2951
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-kdeaddons-kfile-plugins-3.4.1 215
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kdeaddons-kfile-plugins-3.5.0 69
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kdeaddons-kfile-plugins-3.5_beta1 70
+MD5 ebba42112e29a2df31ce9c9d8d05c750 kdeaddons-kfile-plugins-3.4.1.ebuild 527
+MD5 80b70732f0c347e6f7f0bed805fc0c70 kdeaddons-kfile-plugins-3.5.0.ebuild 504
+MD5 d2b9c588ce59c530171765bf300e5a4b kdeaddons-kfile-plugins-3.5_beta1.ebuild 514
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdeaddons-kfile-plugins/files/digest-kdeaddons-kfile-plugins-3.4.1 b/kde-base/kdeaddons-kfile-plugins/files/digest-kdeaddons-kfile-plugins-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/kdeaddons-kfile-plugins/files/digest-kdeaddons-kfile-plugins-3.4.1
+++ b/kde-base/kdeaddons-kfile-plugins/files/digest-kdeaddons-kfile-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.4.1.ebuild b/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.4.1.ebuild
index caa984085655..3c1d99ba2400 100644
--- a/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.4.1.ebuild
+++ b/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.4.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kfile-plugins/"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kdeaddons kfile plugins"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="ssl? (dev-libs/openssl)"
+DEPEND="ssl? ( dev-libs/openssl )"
 
 # kfile-cert requires ssl
 
diff --git a/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5.0.ebuild b/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5.0.ebuild
index 1ed8918a9ecd..4a4c8e196e29 100644
--- a/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5.0.ebuild
+++ b/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5.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/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kfile-plugins/"
diff --git a/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5_beta1.ebuild b/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5_beta1.ebuild
index db6fb9e5255b..e583c87d7a9c 100644
--- a/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5_beta1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:11:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-kfile-plugins/kdeaddons-kfile-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kfile-plugins/"
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kdeaddons kfile plugins"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="ssl? ( dev-libs/openssl )"
 
diff --git a/kde-base/kdeaddons-kfile-plugins/metadata.xml b/kde-base/kdeaddons-kfile-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaddons-kfile-plugins/metadata.xml
+++ b/kde-base/kdeaddons-kfile-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeaddons-meta/ChangeLog b/kde-base/kdeaddons-meta/ChangeLog
index de78978ba8a2..60b43985666e 100644
--- a/kde-base/kdeaddons-meta/ChangeLog
+++ b/kde-base/kdeaddons-meta/ChangeLog
@@ -1,6 +1,186 @@
 # ChangeLog for kde-base/kdeaddons-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaddons-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeaddons-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeaddons-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeaddons-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeaddons-meta-3.5_beta1.ebuild, kdeaddons-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeaddons-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeaddons-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeaddons-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeaddons-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaddons-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdeaddons-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdeaddons-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeaddons-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeaddons-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdeaddons-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeaddons-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeaddons-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeaddons-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeaddons-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdeaddons-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  19 Mar 2005; Simone Gotti <motaboy@gentoo.org>
+  kdeaddons-meta-3.4.0.ebuild:
+  Added dep on konq-plugins. Fixes bug #85640.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeaddons-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaddons-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeaddons-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeaddons-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaddons-meta-3.4.0_rc1.ebuild:
+  Fix incorrect dep: kdeaddons-docs-konq-plugins doesn't have an rc1 ebuild
+
+*kdeaddons-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaddons-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeaddons-meta-3.4.0_beta2-r3 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  -kdeaddons-meta-3.4.0_beta1-r1.ebuild,
+  kdeaddons-meta-3.4.0_beta2-r3.ebuild:
+  Changed to depend on the new konq-plugins ebuild instead of the old
+  konqueror-* ones.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdeaddons-meta-3.4.0_beta1-r1.ebuild:
+  Changed the beta1 ebuild to depend on the new noatun-plugins ebuild, too.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Bumping again for the noatun ebuilds move.
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kdeaddons-meta-3.4.0_beta1-r1.ebuild:
+  Support the kate-* move
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org> :
+  Remove some old ebuilds, update for kicker-* changes
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kdeaddons-meta-3.4.0_beta1-r1.ebuild:
+  Obsoleting kfile-*
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kdeaddons-meta-3.4.0_beta1-r1.ebuild:
+  Changing beta1 to new package to remove obsoleted one
+
+*kdeaddons-meta-3.4.0_beta2-r2 (10 Feb 2005)
+
+  10 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +kdeaddons-meta-3.4.0_beta2-r2.ebuild:
+  bump again for kate-* dep changes
+
+  10 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kdeaddons-meta-3.4.0_beta2.ebuild:
+  Change kfile-* deps to kdeaddons-kfile-plugins
+
+  10 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kdeaddons-meta-3.4.0_beta2.ebuild:
+  Change dep to kaddressbook-plugins
+
+*kdeaddons-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeaddons-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kdeaddons-meta-3.4.0_beta1-r1 (29 Jan 2005)
+
+  29 Jan 2005; Simone Gotti <motaboy@gentoo.org>
+  +kdeaddons-meta-3.4.0_beta1-r1.ebuild, -kdeaddons-meta-3.4.0_beta1.ebuild:
+  Revision bump as a new dep on konqueror-akregator ebuild was added.
+
+  25 Jan 2005; Simone Gotti <motaboy@gentoo.org>
+  kdeaddons-meta-3.4.0_beta1.ebuild:
+  Add dependency on kde-base/konqueror-akregator.
 
 *kdeaddons-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeaddons-meta/Manifest b/kde-base/kdeaddons-meta/Manifest
index 29bced0aa2b9..23f6aadcc59c 100644
--- a/kde-base/kdeaddons-meta/Manifest
+++ b/kde-base/kdeaddons-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 acef584615d74ae90c35f73f8fa7585c kdeaddons-meta-3.4.0_beta1.ebuild 4182
-MD5 acef584615d74ae90c35f73f8fa7585c kdeaddons-meta-3.4.0_alpha1.ebuild 4182
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.4.0_alpha1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 66dc31ed48c0b5865f92d83fa4ec2c35 ChangeLog 6196
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeaddons-meta-3.5_beta1 0
+MD5 c8bcb90d2f904bacbf363f6bc221b737 kdeaddons-meta-3.4.1.ebuild 1216
+MD5 6950192ed4daaee921df3b638c51ca50 kdeaddons-meta-3.4.2.ebuild 1243
+MD5 6b954b13565087817cd823c87bb96c66 kdeaddons-meta-3.4.3.ebuild 1237
+MD5 d378ce547338089344c40ba850628bab kdeaddons-meta-3.5.0.ebuild 1161
+MD5 5cf70023c6e6f7a575627043c4093ee4 kdeaddons-meta-3.5.0_beta2.ebuild 1184
+MD5 c4f66c4542b460ed24a6cfb512a0e19f kdeaddons-meta-3.5.0_rc1.ebuild 1191
+MD5 388ee8f1ac7c97372a40bb73128dbb46 kdeaddons-meta-3.5_beta1.ebuild 1164
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxqIntT9W3vfTuoRAu24AJwIaVQuBH8076qvWhqhrJmwgsJJtgCdEDmV
+2tAO4XJcJ9ko5lozIc5AvBQ=
+=WOJx
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.1.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.1.ebuild
index 4c428e5e8f7d..46e710e722d8 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.1.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.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/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.2.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.2.ebuild
index d89bca9c8eaf..5050af92749f 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.2.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.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/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.3.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.3.ebuild
index d528ec96966c..080fbe285721 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.3.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.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/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0.ebuild
index baba22765b61..17379f108cf2 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.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/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_beta2.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_beta2.ebuild
index 3f73295686f6..1774d72ab422 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_beta2.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/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_rc1.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_rc1.ebuild
index 8d28172293a4..38769c5d71ab 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_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/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5_beta1.ebuild b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5_beta1.ebuild
index 56283e6c19b4..f075c3bec07d 100644
--- a/kde-base/kdeaddons-meta/kdeaddons-meta-3.5_beta1.ebuild
+++ b/kde-base/kdeaddons-meta/kdeaddons-meta-3.5_beta1.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/kde-base/kdeaddons-meta/kdeaddons-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:41:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons-meta/kdeaddons-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdeaddons-meta/metadata.xml b/kde-base/kdeaddons-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaddons-meta/metadata.xml
+++ b/kde-base/kdeaddons-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeaddons/ChangeLog b/kde-base/kdeaddons/ChangeLog
index c6fdd0cb59b4..aa1ddd9b9d40 100644
--- a/kde-base/kdeaddons/ChangeLog
+++ b/kde-base/kdeaddons/ChangeLog
@@ -1,6 +1,588 @@
 # ChangeLog for kde-base/kdeaddons
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/ChangeLog,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeaddons-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdeaddons-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeaddons-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeaddons-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaddons-3.5.0_rc1.ebuild:
+  New version.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeaddons-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaddons-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeaddons-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeaddons-3.4.3.ebuild:
+  New version.
+
+*kdeaddons-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeaddons-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdeaddons-3.4.2.ebuild:
+  Keyworded ~mips.
+
+  04 Oct 2005; Hardave Riar <hardave@gentoo.org> kdeaddons-3.4.1.ebuild:
+  Keyworded ~mips.
+
+*kdeaddons-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaddons-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.4.1.ebuild:
+  stable on ia64
+
+*kdeaddons-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaddons-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+*kdeaddons-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeaddons-3.4-configure.patch, +kdeaddons-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Better detection of Berkeley DB.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.4.1.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeaddons-3.4.1.ebuild:
+  Stable on SPARC.
+
+  05 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdeaddons-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeaddons-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdeaddons-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdeaddons-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeaddons-3.4.1.ebuild:
+  New version.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeaddons-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdeaddons-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeaddons-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdeaddons-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeaddons-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdeaddons-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdeaddons-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  12 Feb 2005; Carsten Lohrke <carlo@gentoo.org> kdeaddons-3.4.0_beta2.ebuild:
+  fixed typo in dependency
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/noatun-oblique-db-location-3.4.0_beta2.diff,
+  kdeaddons-3.4.0_beta2.ebuild:
+  Added the same patch noatun-oblique and noatun-plugins use. This fixes the
+  berkeley db test, which enables the oblique plugin. Note that the berkdb USE
+  flag actually works here wrt what is built.
+
+*kdeaddons-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeaddons-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdeaddons-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdeaddons-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdeaddons-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeaddons-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Add dependency on kdegeames (for the atlantik
+  plugin). Removed the 'esd' and 'svga' flags (not supported anymore).
+
+  03 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdeaddons-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdeaddons-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdeaddons-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdeaddons-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.3.1.ebuild,
+  +kdeaddons-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdeaddons-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeaddons-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdeaddons-3.3.1.ebuild:
+  Marked ppc stable.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeaddons-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdeaddons-3.3.1 (14 Oct 2004)
+
+  14 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdeaddons-3.3.1.ebuild:
+  Version bump
+
+*kdeaddons-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdeaddons-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdeaddons-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeaddons-3.2.1.ebuild:
+  3.3.0 is x86 stable
+
+  03 Sep 2004; Tom Gall <tgall@gentoo.org> kdeaddons-3.3.0.ebuild:
+  added ~ppc64, bug #62775
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeaddons-3.1.5.ebuild, kdeaddons-3.2.1.ebuild, kdeaddons-3.3.0.ebuild:
+  Masked kdeaddons-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeaddons-3.1.5.ebuild, kdeaddons-3.2.1.ebuild:
+  Masked kdeaddons-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeaddons-3.1.5.ebuild:
+  Masked kdeaddons-3.1.5.ebuild stable for ppc
+
+*kdeaddons-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.3.0.ebuild,
+  kdeaddons-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdeaddons-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.3.0_beta1.ebuild,
+  kdeaddons-3.3.0_rc2.ebuild:
+  add _rc2, remove _beta1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdeaddons-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdeaddons-3.3.0_beta2.ebuild:
+  new beta
+
+*kdeaddons-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdeaddons-3.3.0_alpha1.ebuild,
+  +kdeaddons-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdeaddons-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdeaddons-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdeaddons-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdeaddons-3.2.2.ebuild:
+  stable on amd64
+
+*kdeaddons-3.3.0_alpha1 (27 May 2004)
+
+  27 May 2004; Caleb Tennis <caleb@gentoo.org> +kdeaddons-3.3.0_alpha1.ebuild:
+  3.3alph1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2003; Daniel Ostrow <dostrow@gentoo.org> kdeaddons-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.2.2.ebuild:
+  Stable on sparc.
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org>
+  +files/kdeaddons-3.2.2-gcc34.patch, kdeaddons-3.2.2.ebuild:
+  added fix for compiling with gcc 3.4
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdeaddons-3.0.5b.ebuild:
+  Remove old version
+
+*kdeaddons-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdeaddons-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdeaddons-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.4.ebuild,
+  kdeaddons-3.2.1.ebuild, files/kdeaddons-3.1.4-enable-crashes.diff:
+  x86 stable and version cleanups
+
+*kdeaddons-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  25 Feb 2004; Guy Martin <gmsoft@gentoo.org> kdeaddons-3.2.0.ebuild:
+  Marked stable on hppa.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdeaddons-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdeaddons-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdeaddons-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.0.ebuild,
+  kdeaddons-3.2.0_rc1.ebuild, files/kdeaddons-3.2.0-kvim.diff,
+  files/kdeaddons-3.2.0_rc1-kvim.diff:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdeaddons-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.0.4.ebuild,
+  kdeaddons-3.1.2.ebuild, kdeaddons-3.2.0_beta1.ebuild,
+  kdeaddons-3.2.0_beta2.ebuild, kdeaddons-3.2.0_rc1.ebuild,
+  files/kdeaddons-3.1.1-enable-crashes.diff,
+  files/kdeaddons-3.1.2-enable-crashes.diff,
+  files/kdeaddons-3.1.3-enable-crashes.diff,
+  files/kdeaddons-3.2.0_beta2-kvim.diff, files/kdeaddons-3.2.0_rc1-kvim.diff:
+  New version, removing old versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeaddons-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdeaddons-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.5.ebuild,
+  files/kdeaddons-3.1.5-enable-crashes.diff:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeaddons-3.1.4.ebuild:
+  stable on alpha
+
+  08 Jan 2004; <agriffis@gentoo.org> kdeaddons-3.2.0_beta2.ebuild,
+  files/kdeaddons-3.2.0_beta2-kvim.diff:
+  Fix bug 33077 by patching kdeaddons to use kvim instead of vim
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> kdeaddons-3.0.4.ebuild,
+  kdeaddons-3.0.5b.ebuild, kdeaddons-3.1.2.ebuild, kdeaddons-3.1.4.ebuild,
+  kdeaddons-3.2.0_beta1.ebuild, kdeaddons-3.2.0_beta2.ebuild:
+  fix tail -1 issue and copyright headers
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdeaddons-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.4.ebuild,
+  kdeaddons-3.2.0_beta2.ebuild:
+  Add esound dependency
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.0_beta2.ebuild:
+  minor dependency fixes
+
+*kdeaddons-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdeaddons-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdeaddons-3.1.4.ebuild:
+  Marked ppc
+
+*kdeaddons-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdeaddons-3.1.4.ebuild:
+  add ~amd64 flag to 3.1.4
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-2.2.2-r1.ebuild,
+  kdeaddons-2.2.2-r1.ebuild, kdeaddons-3.1.1.ebuild, kdeaddons-3.1.1.ebuild,
+  kdeaddons-3.1.3.ebuild, kdeaddons-3.1.3.ebuild:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.4.ebuild:
+  marking x86 stable
+
+*kdeaddons-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.4.ebuild,
+  files/kdeaddons-3.1.4-enable-crashes.diff:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+  07 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdeaddons-3.1.3.ebuild:
+  Remove dependency on kdegames, closes bug #25834
+
+*kdeaddons-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdeaddons-3.1.3.ebuild:
+  Version bump
+
+  07 Jul 2003; Michele Balistreri <brain@gentoo.org> kdeaddons-3.1.2.ebuild:
+  Fixed bug #23947
+
+  30 Jun 2003; Bartosch Pixa <darkspecter@gentoo.org> kdeaddons-3.1.1.ebuild:
+  set ppc in keywords
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removed old ebuilds: 3.0.5a, 3.1, 3.1.1-r1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdeaddons-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeaddons-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdeaddons-3.1.2.ebuild:
+  New version of KDE.
+
+*kdeaddons-3.1.1-r1 (23 Apr 2003)
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdeaddons-3.1.1-r1.ebuild:
+  Set ppc in KEYWORDS
+
+  23 Apr 2003; Dan Armak <danarmak@gentoo.org> Manifest,
+  kdeaddons-3.1.1-r1.ebuild, files/kdeaddons-3.1.1-enable-crashes.diff:
+  Enable building of the konqueror crashes plugin. This plugin was disabled by
+  mistake (by the kde developers) in the original kde 3.1 release and was
+  reenabled shortly afterwards in kde cvs. In the even of konqueror crashing,
+  the plugin will give you a list of the URLs you had open before the crash, so
+  you can resume browsing quickly. Not that konqueror ever crashes in Gentoo,
+  this is just for the sake of completeness :-)
+
+*kdeaddons-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdeaddons-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeaddons-3.1 (01 Feb 2003)
+
+  06 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.0.4.ebuild,
+  kdeaddons-3.0.5a.ebuild, kdeaddons-3.1.ebuild:
+  added depend on arts, fixes bug #15542
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdeaddons-3.1.ebuild :
+  Added ~alpha keyword
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.0.2.ebuild,
+  kdeaddons-3.0.3.ebuild, kdeaddons-3.1_rc6.ebuild: removed old versions
+
+  02 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.0.2.ebuild:
+  fixed typo, bug #14948
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdeaddons-3.1.ebuild:
+  added ~sparc to keywords
+
+*kdeaddons-3.1_rc6 (05 Jan 2003)
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdeaddons-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.1_rc6.ebuild:
+  version bump
+
+*kdeaddons-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdeaddons-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdeaddons-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdeaddons-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdeaddons-3.1.ebuild:
+  Added ppc keyword
+
+*kdeaddons-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdeaddons-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdeaddons-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+  08 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  As below; add the same fix to the 3.1.x ebuilds (bug #8843).
+
+  08 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  If -march=pentium4 is used, add -mno-sse2 to avoid the bug #7625 compile
+  error.
+
+*kdeaddons-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdeaddons-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : :
+
+  New stability release.
+  
+  25 June 2002; Mark Guertin <gerk@gentoo.org> changelog:
+
+  Fixed svgalib dep.  Was really to close bug #3161 (not 3104).  In that
+  case the user had previously installed svgalib and noautounmadness.so linked
+  against it.  have seen this in PPC land before as well,  If kdelibs is 
+  built with svgalib (or any other lib) linked and you remove it you will run 
+  into same problem if you don't rebuild the kdelibs after removing.
+  Closes bug #4111
+
+  10 Jun 2002; Dan Armak <danarmak@gentoo.org> changelog:
+
+  Add missing svgalib dep, close bug #3104.
+
+*kdeaddons-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdeaddons-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1). Ebuild cleanup.
+
+  20 Apr 2002; Dan Armak <danarmak@gentoo.org. Changelog:
+  
+  Fix sdl dep, now it only goes in if use sdl is on.
+
+*kdeaddons-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdeaddons-2.2.2-r1 (1 Feb 2002)
 
diff --git a/kde-base/kdeaddons/Manifest b/kde-base/kdeaddons/Manifest
index dea3a1c40fc8..5f72afb6e2f4 100644
--- a/kde-base/kdeaddons/Manifest
+++ b/kde-base/kdeaddons/Manifest
@@ -1,13 +1,31 @@
-MD5 7c94e3fc4a443b1f13fbb8bd407f37e3 kdeaddons-3.0.4.ebuild 820
-MD5 5dbe13fb38e8bff00a133d5a55d7274a kdeaddons-3.0.5a.ebuild 830
-MD5 fc8a6c6ce238d2d3393e92bcd3165692 kdeaddons-3.1.ebuild 938
-MD5 e54e1d1def512af5d46a17231383b20e kdeaddons-2.2.2-r1.ebuild 457
-MD5 050ce123fdd1569e7bcee260fa1ca9f6 kdeaddons-3.1.1.ebuild 941
-MD5 fb9eaf4c9f8c25c68cee8bcaa3f63f1c kdeaddons-3.0.5b.ebuild 832
-MD5 a2e61309b6efb9ae2c08b7e5aaef775a ChangeLog 4671
-MD5 098c455a204e173354058b9d6f6c57d1 files/digest-kdeaddons-2.2.2-r1 68
-MD5 e8625416573645384d9deddc0e4c9400 files/digest-kdeaddons-3.1 67
-MD5 6b980ba7c8dc231ab66727f24c1d93c3 files/digest-kdeaddons-3.0.5a 69
-MD5 ed91f0d062ff55480453793d6635ade3 files/digest-kdeaddons-3.0.5b 135
-MD5 daf284d1e03ab78bef056c0b4c2a9285 files/digest-kdeaddons-3.0.4 68
-MD5 d449a692f809c2c21d804766ffc4d942 files/digest-kdeaddons-3.1.1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a54aa5973df64d7c7e635e001e746a4e ChangeLog 18936
+MD5 f510fb4a423935c458f3e01d994b5bd2 files/digest-kdeaddons-3.3.2 69
+MD5 b222a3f919d71f11915038fe18b0a7d7 files/digest-kdeaddons-3.4.1 69
+MD5 bed9e2e46d8e7de37c5996e1ad3025bd files/digest-kdeaddons-3.4.2 69
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kdeaddons-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kdeaddons-3.5.0 69
+MD5 0759d28e218dffee9d6e880b105aefc0 files/digest-kdeaddons-3.5.0_beta2 70
+MD5 d64933c682f2a9012a546e80a02fa50d files/digest-kdeaddons-3.5.0_rc1 73
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kdeaddons-3.5_beta1 70
+MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
+MD5 76a1c9bb2b631b0233e79ed5ab7eb20e files/kdeaddons-3.4-configure.patch 3422
+MD5 6ec5a8a3f0f5ae85d431525c926c27fe files/noatun-oblique-db-location-3.4.0.diff 625
+MD5 3a692b7c76a442ddec552bbb5786d366 kdeaddons-3.3.2.ebuild 994
+MD5 5cb3102b5887be89c0079df0a6028d51 kdeaddons-3.4.1.ebuild 1350
+MD5 4b184080c3a26edabff3c4d61409516d kdeaddons-3.4.2.ebuild 1549
+MD5 47e78047e738a641ecc605ee12186cb6 kdeaddons-3.4.3.ebuild 1545
+MD5 94baf4f3a23bf12857317cd1c3b838c0 kdeaddons-3.5.0.ebuild 1140
+MD5 b57253163536c2af268e0468ab4ad51c kdeaddons-3.5.0_beta2.ebuild 1144
+MD5 566fb20310743772fd1f286dfd76e2e0 kdeaddons-3.5.0_rc1.ebuild 1142
+MD5 986da28bb575012cb5ecd4b5beaf8cd8 kdeaddons-3.5_beta1.ebuild 1142
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxrYntT9W3vfTuoRAtKbAJ9MSLqZhDtFrFCEWttl4gO9agW0WACeOuHH
+Z1vYA3S0iWOqFoC1SjkGkM4=
+=l2aW
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeaddons/kdeaddons-3.3.2.ebuild b/kde-base/kdeaddons/kdeaddons-3.3.2.ebuild
index 8e6dd0a24eee..a37c848d5015 100644
--- a/kde-base/kdeaddons/kdeaddons-3.3.2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.3.2.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdeaddons/kdeaddons-3.3.2.ebuild,v 1.1 2004/12/09 02:45:14 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 
 inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64 ~hppa"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="arts sdl svga xmms esd"
 
 DEPEND="~kde-base/kdepim-${PV}
diff --git a/kde-base/kdeaddons/kdeaddons-3.4.1.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.1.ebuild
index 3515adf4d9ac..1ee4178e5a65 100644
--- a/kde-base/kdeaddons/kdeaddons-3.4.1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.4.1.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/kde-base/kdeaddons/kdeaddons-3.4.1.ebuild,v 1.1 2005/05/27 08:50:47 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="arts sdl xmms berkdb"
 
 DEPEND="~kde-base/kdepim-${PV}
diff --git a/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild
index 4b48a5c3cd3f..637ad372676a 100644
--- a/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.4.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/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild,v 1.1 2005/07/28 12:54:24 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="arts berkdb sdl xmms"
 
 DEPEND="~kde-base/kdepim-${PV}
diff --git a/kde-base/kdeaddons/kdeaddons-3.4.3.ebuild b/kde-base/kdeaddons/kdeaddons-3.4.3.ebuild
index 34e001a6e9cb..9a4ba396c352 100644
--- a/kde-base/kdeaddons/kdeaddons-3.4.3.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.4.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/kde-base/kdeaddons/kdeaddons-3.4.3.ebuild,v 1.1 2005/10/12 13:22:12 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE addon modules: plugins for konqueror, noatun etc"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="arts berkdb sdl xmms"
 
 DEPEND="~kde-base/kdepim-${PV}
diff --git a/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild
index ae09ed31bd0b..396664cd51c2 100644
--- a/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.5.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/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild,v 1.1 2005/11/22 22:13:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaddons/kdeaddons-3.5.0_beta2.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.0_beta2.ebuild
index 1d061934fc99..729a343b7eca 100644
--- a/kde-base/kdeaddons/kdeaddons-3.5.0_beta2.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.5.0_beta2.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/kde-base/kdeaddons/kdeaddons-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaddons/kdeaddons-3.5.0_rc1.ebuild b/kde-base/kdeaddons/kdeaddons-3.5.0_rc1.ebuild
index d33f4d420f18..f14221b86839 100644
--- a/kde-base/kdeaddons/kdeaddons-3.5.0_rc1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.5.0_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/kde-base/kdeaddons/kdeaddons-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:02:09 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaddons/kdeaddons-3.5_beta1.ebuild b/kde-base/kdeaddons/kdeaddons-3.5_beta1.ebuild
index a7c1a6892cbe..fb742395b1a0 100644
--- a/kde-base/kdeaddons/kdeaddons-3.5_beta1.ebuild
+++ b/kde-base/kdeaddons/kdeaddons-3.5_beta1.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/kde-base/kdeaddons/kdeaddons-3.5_beta1.ebuild,v 1.1 2005/09/21 17:20:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeaddons/kdeaddons-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeaddons/metadata.xml b/kde-base/kdeaddons/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeaddons/metadata.xml
+++ b/kde-base/kdeaddons/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeadmin-kfile-plugins/ChangeLog b/kde-base/kdeadmin-kfile-plugins/ChangeLog
index 5456d2df6439..86034f1fc05b 100644
--- a/kde-base/kdeadmin-kfile-plugins/ChangeLog
+++ b/kde-base/kdeadmin-kfile-plugins/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/kdeadmin-kfile-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeadmin-kfile-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-kfile-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeadmin-kfile-plugins-3.5_beta1.ebuild,
+  kdeadmin-kfile-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeadmin-kfile-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-kfile-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeadmin-kfile-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeadmin-kfile-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeadmin-kfile-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeadmin-kfile-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeadmin-kfile-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeadmin-kfile-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeadmin-kfile-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeadmin-kfile-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeadmin-kfile-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeadmin-kfile-plugins-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeadmin-kfile-plugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeadmin-kfile-plugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeadmin-kfile-plugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeadmin-kfile-plugins/Manifest b/kde-base/kdeadmin-kfile-plugins/Manifest
index cb18d3f1450f..d597cfee2d61 100644
--- a/kde-base/kdeadmin-kfile-plugins/Manifest
+++ b/kde-base/kdeadmin-kfile-plugins/Manifest
@@ -1,4 +1,22 @@
-MD5 409a1d47b640739927542a0fde6ba1af kdeadmin-kfile-plugins-3.4.0_beta1.ebuild 297
-MD5 409a1d47b640739927542a0fde6ba1af kdeadmin-kfile-plugins-3.4.0_alpha1.ebuild 297
-MD5 5c80d63263041da2a3656e9484510f15 files/digest-kdeadmin-kfile-plugins-3.4.0_alpha1 69
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-kdeadmin-kfile-plugins-3.4.0_beta1 215
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67a1de1d60b6c5bda5265ad00d5809c1 ChangeLog 3701
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-kdeadmin-kfile-plugins-3.4.1 211
+MD5 9d1b64c1a3fcf3755ead7efab419928f files/digest-kdeadmin-kfile-plugins-3.4.2 286
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-kdeadmin-kfile-plugins-3.5.0 68
+MD5 64ad1da64ecad951c67e7899dbfa8bd7 files/digest-kdeadmin-kfile-plugins-3.5.0_beta2 215
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-kdeadmin-kfile-plugins-3.5_beta1 69
+MD5 bd839173c1c9088442431d2111193dd0 kdeadmin-kfile-plugins-3.4.1.ebuild 446
+MD5 444e749814623d546f11160dd0ce33b0 kdeadmin-kfile-plugins-3.4.2.ebuild 457
+MD5 cb78f55702a36386bedda8c1bf77e422 kdeadmin-kfile-plugins-3.5.0.ebuild 435
+MD5 b67fb3fb3f8f078c0463c66169130e8d kdeadmin-kfile-plugins-3.5.0_beta2.ebuild 447
+MD5 19e9eed2a20a3c6e612634b2021ffb33 kdeadmin-kfile-plugins-3.5_beta1.ebuild 438
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkmSntT9W3vfTuoRAoI+AJ9QIGynKFWfp9dnYMrJ7ZAWRl1pqgCdGXQb
+FzCuAyA/1gyRTVtEePgjVoo=
+=1eH2
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.1 b/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.1
+++ b/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.2 b/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.2
index 704ba375213a..7a7584d3ac0d 100644
--- a/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.2
+++ b/kde-base/kdeadmin-kfile-plugins/files/digest-kdeadmin-kfile-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
+MD5 b4066d3c4962fdb0d5ae5820bb09ce8d kdeadmin-3.4.1-3.4.2.tar.xdelta 63771
 MD5 ef1d4be02bbe384d46e807421dd52fed kdeadmin-3.4.2.tar.bz2 1520873
diff --git a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.1.ebuild b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.1.ebuild
index f0edbe8b73fe..19af63e7b6ed 100644
--- a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.1.ebuild
+++ b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.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/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -8,7 +8,7 @@ inherit kde-meta
 KMMODULE=kfile-plugins
 
 DESCRIPTION="kfile plugins from kdeadmin"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.2.ebuild b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.2.ebuild
index 07507354aa82..9bff9c2728ca 100644
--- a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.2.ebuild
+++ b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 KMMODULE=kfile-plugins
 
 DESCRIPTION="kfile plugins from kdeadmin"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0.ebuild b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0.ebuild
index 8012b6b822da..38c102c9a47b 100644
--- a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0.ebuild
+++ b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.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/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0_beta2.ebuild b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0_beta2.ebuild
index 331695952c48..802d2234abb1 100644
--- a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0_beta2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 KMMODULE=kfile-plugins
 
 DESCRIPTION="kfile plugins from kdeadmin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5_beta1.ebuild b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5_beta1.ebuild
index 4f3fbd684515..21cb446003bb 100644
--- a/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5_beta1.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/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:12:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-kfile-plugins/kdeadmin-kfile-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -8,7 +8,7 @@ inherit kde-meta
 KMMODULE=kfile-plugins
 
 DESCRIPTION="kfile plugins from kdeadmin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeadmin-kfile-plugins/metadata.xml b/kde-base/kdeadmin-kfile-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeadmin-kfile-plugins/metadata.xml
+++ b/kde-base/kdeadmin-kfile-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeadmin-meta/ChangeLog b/kde-base/kdeadmin-meta/ChangeLog
index 87f5f80d5516..02c96b5bb1d7 100644
--- a/kde-base/kdeadmin-meta/ChangeLog
+++ b/kde-base/kdeadmin-meta/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for kde-base/kdeadmin-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeadmin-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdeadmin-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeadmin-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeadmin-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeadmin-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeadmin-meta-3.5_beta1.ebuild, kdeadmin-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeadmin-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-meta-3.5.0_beta2.ebuild:
+  New version.
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> kdeadmin-meta-3.4.3.ebuild:
+  Correct dep: there's no lilo-config-3.4.2, the dep should accept verion 3.4.1.
+
+*kdeadmin-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeadmin-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeadmin-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeadmin-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdeadmin-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdeadmin-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeadmin-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeadmin-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdeadmin-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeadmin-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeadmin-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdeadmin-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeadmin-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdeadmin-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdeadmin-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeadmin-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeadmin-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeadmin-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeadmin-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeadmin-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeadmin-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeadmin-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeadmin-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeadmin-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeadmin-meta/Manifest b/kde-base/kdeadmin-meta/Manifest
index 21b0221b9027..535738a7311f 100644
--- a/kde-base/kdeadmin-meta/Manifest
+++ b/kde-base/kdeadmin-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 b634fb0557215c696f73e0250a412341 kdeadmin-meta-3.4.0_alpha1.ebuild 913
-MD5 b634fb0557215c696f73e0250a412341 kdeadmin-meta-3.4.0_beta1.ebuild 913
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 efce492790204b9918eee6badf5358fe ChangeLog 4214
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeadmin-meta-3.5_beta1 0
+MD5 4532e72b8eda62bcbe43262c9721a833 kdeadmin-meta-3.4.1.ebuild 901
+MD5 9d364fed497b9fa2907c0618205fe8eb kdeadmin-meta-3.4.2.ebuild 922
+MD5 18c66aa0087ecfffb3da80b2c364baed kdeadmin-meta-3.4.3.ebuild 918
+MD5 43d74475b500e382714d6c9b34c40b3b kdeadmin-meta-3.5.0.ebuild 890
+MD5 9e7ee37e7a256a6c053bc696034c4d6a kdeadmin-meta-3.5.0_beta2.ebuild 907
+MD5 af64873d1cc86a393aa047a546a87f4f kdeadmin-meta-3.5.0_rc1.ebuild 922
+MD5 0366d48bfdde4171ac3aa2b0c3babd0e kdeadmin-meta-3.5_beta1.ebuild 893
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkqcntT9W3vfTuoRAllYAJ9qAsMw/6ku5J5Xhs6ANIPR7jInkACeLMRz
+QQtu8m8b/RdL3acw8a4OXTA=
+=AA98
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.1.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.1.ebuild
index 67bceb8b19c7..96f32ffef304 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.1.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.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/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.2.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.2.ebuild
index 0a0a4229ec0a..dd3e1f8a3db6 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.2.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.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/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.3.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.3.ebuild
index f3fd9232a815..190448971359 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.3.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.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/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
@@ -17,7 +17,7 @@ $(deprange $PV $MAXKDEVER kde-base/kcron)
 $(deprange $PV $MAXKDEVER kde-base/kdat)
 $(deprange 3.4.2 $MAXKDEVER kde-base/kdeadmin-kfile-plugins)
 $(deprange 3.4.2 $MAXKDEVER kde-base/kuser)
-x86? ( $(deprange 3.4.2 $MAXKDEVER kde-base/lilo-config) )
+x86? ( $(deprange 3.4.1 $MAXKDEVER kde-base/lilo-config) )
 $(deprange 3.4.1 $MAXKDEVER kde-base/secpolicy)"
 
 # NOTE: kpackage, ksysv are useless on a normal gentoo system and so aren't included
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0.ebuild
index e92ca4f72188..620bc368532e 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.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/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_beta2.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_beta2.ebuild
index 14baba4807cd..743696977745 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_beta2.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/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:50 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_rc1.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_rc1.ebuild
index 8a2119ffe640..41be3aea11ba 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_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/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5_beta1.ebuild b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5_beta1.ebuild
index 7993769a7be6..5a2e36eb02b3 100644
--- a/kde-base/kdeadmin-meta/kdeadmin-meta-3.5_beta1.ebuild
+++ b/kde-base/kdeadmin-meta/kdeadmin-meta-3.5_beta1.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/kde-base/kdeadmin-meta/kdeadmin-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:42:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin-meta/kdeadmin-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeadmin-meta/metadata.xml b/kde-base/kdeadmin-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeadmin-meta/metadata.xml
+++ b/kde-base/kdeadmin-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeadmin/ChangeLog b/kde-base/kdeadmin/ChangeLog
index 2245bdcdf25a..a5f47f826eae 100644
--- a/kde-base/kdeadmin/ChangeLog
+++ b/kde-base/kdeadmin/ChangeLog
@@ -1,6 +1,554 @@
 # ChangeLog for kde-base/kdeadmin
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/ChangeLog,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeadmin-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdeadmin-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdeadmin-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeadmin-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeadmin-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeadmin-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeadmin-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeadmin-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeadmin-3.4.3.ebuild:
+  New version.
+
+*kdeadmin-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeadmin-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdeadmin-3.4.2.ebuild:
+  Keyworded ~mips.
+
+*kdeadmin-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeadmin-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.4.1.ebuild:
+  stable on ia64
+
+*kdeadmin-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeadmin-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdeadmin-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdeadmin-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeadmin-3.4.2.ebuild:
+  New version.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeadmin-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeadmin-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeadmin-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdeadmin-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeadmin-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdeadmin-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdeadmin-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeadmin-3.4.1.ebuild:
+  New version.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.4.0-r1.ebuild:
+  add ~ia64
+
+*kdeadmin-3.4.0-r1 (08 Apr 2005)
+
+  08 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeadmin-3.4.0-kuser.patch, +kdeadmin-3.4.0-r1.ebuild:
+  Add patch to fix /etc/passwd corruption in kuser (#87405).
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeadmin-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdeadmin-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeadmin-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdeadmin-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeadmin-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdeadmin-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdeadmin-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> :
+  Added ~sparc keyword.
+
+*kdeadmin-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeadmin-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdeadmin-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdeadmin-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdeadmin-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeadmin-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdeadmin-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdeadmin-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdeadmin-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdeadmin-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdeadmin-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdeadmin-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdeadmin-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeadmin-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdeadmin-3.3.1.ebuild:
+  Stable on ppc.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeadmin-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdeadmin-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdeadmin-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdeadmin-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdeadmin-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeadmin-3.2.1.ebuild:
+  3.3.0 is x86 stable
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeadmin-3.1.5.ebuild, kdeadmin-3.2.1.ebuild, kdeadmin-3.3.0.ebuild:
+  Masked kdeadmin-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeadmin-3.1.5.ebuild, kdeadmin-3.2.1.ebuild:
+  Masked kdeadmin-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeadmin-3.1.5.ebuild:
+  Masked kdeadmin-3.1.5.ebuild stable for ppc
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdeadmin-3.3.0.ebuild:
+  stable on ppc64, bug #58190
+
+*kdeadmin-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.3.0.ebuild,
+  kdeadmin-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdeadmin-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.3.0_beta1.ebuild,
+  kdeadmin-3.3.0_rc2.ebuild:
+  Add _rc2, remove _beta1
+
+*kdeadmin-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdeadmin-3.3.0_beta2.ebuild:
+  new beta
+
+*kdeadmin-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdeadmin-3.3.0_alpha1.ebuild,
+  +kdeadmin-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdeadmin-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdeadmin-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdeadmin-3.2.3.ebuild:
+  Version bump
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.1.5.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdeadmin-3.2.2.ebuild:
+  stable on amd64
+
+*kdeadmin-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> +kdeadmin-3.3.0_alpha1.ebuild:
+  3.3 alpha 1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdeadmin-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdeadmin-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.2.2.ebuild:
+  Stable on sparc.
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/kdeadmin-qt311-gentoo.diff, -kdeadmin-3.0.5b.ebuild:
+  Remove old version
+
+*kdeadmin-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdeadmin-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdeadmin-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.4.ebuild,
+  kdeadmin-3.2.1.ebuild:
+  x86 stable and version cleanup
+
+*kdeadmin-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdeadmin-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdeadmin-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdeadmin-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.0.ebuild,
+  kdeadmin-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdeadmin-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.0.4.ebuild,
+  kdeadmin-3.1.2.ebuild, kdeadmin-3.2.0_beta1.ebuild,
+  kdeadmin-3.2.0_beta2.ebuild, kdeadmin-3.2.0_rc1.ebuild:
+  New version, removing old versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeadmin-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdeadmin-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeadmin-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdeadmin-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  25 Dec 2003; Seemant Kulleen <seemant@gentoo.org>
+  kdeadmin-3.2.0_beta2.ebuild:
+  lm-sensors, not lm_sensors -- thanks to FieldySnuts in #gentoo-dev
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.0_beta2.ebuild:
+  minor dependency fixes
+
+*kdeadmin-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdeadmin-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdeadmin-3.1.4.ebuild:
+  Marked ppc
+
+*kdeadmin-3.2.0_beta1 (02 Nov 2003)
+
+  02 Nov 2003; root <root@gentoo.org> kdeadmin-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdeadmin-3.1.4.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-2.2.2.ebuild,
+  kdeadmin-2.2.2.ebuild, kdeadmin-3.1.1-r2.ebuild, kdeadmin-3.1.1-r2.ebuild,
+  kdeadmin-3.1.3.ebuild, kdeadmin-3.1.3.ebuild:
+  removing stale versions
+
+*kdeadmin-3.2.0_alpha2 (27 Sep 2003)
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.4.ebuild:
+  marking x86 stable
+
+*kdeadmin-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb <caleb@gentoo.org> kdeadmin-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.3.ebuild:
+  x86 stable
+
+  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.3.ebuild:
+  Commented out the foreign-package use flag compilation stuff as it's
+  broken with newer rpm versions.
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.1-r2.ebuild:
+  Marked for sparc to fix repoman dep issues.
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+  31 Jul 2003; Caleb Tennis <caleb@gentoo.org> kdeadmin-3.1.2.ebuild:
+  Add patch code ala kdeaddons to make it work with autotools 1.7.2
+  Fixes bug #21479 (hopefully).
+
+*kdeadmin-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdeadmin-3.1.3.ebuild:
+  Version bump
+
+  20 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1, 3.1.1, 3.1.1-r1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdeadmin-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeadmin-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdeadmin-3.1.1-r2.ebuild:
+  Set ppc in KEYWORDS
+
+  25 Apr 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.1.1-r1.ebuild,
+  kdeadmin-3.1.1-r2.ebuild:
+  Remove deps on rpm and popt, only depend on them if the new local use flag
+  foreign-package is enabled. I somehow overlooked this before, sorry...
+
+  25 Apr 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.1.1-r2.ebuild:
+  Never build lilo-config on non-x86 platforms, since lilo itself doesn't exist
+  there. This problem was introduced in the previous revision.
+
+*kdeadmin-3.1.1-r1 (08 Apr 2003)
+
+  23 Apr 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.1.1-r1:
+  Do not build kpackage and ksysv by default, since they are normally useless on
+  a Gentoo system. Each of them can be built by turning on the appropriate local
+  use flag: foreign-package for kpackage and foreign-sysvinit for ksysv.
+  
+  Also, always build lilo-config, even if lilo isn't installed -- makes for
+  deterministic behaviour.
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+  15 Mar 2003; Dan Armak <danarmak@gentoo.org> kdeadmin-3.0.5a.ebuild:
+  
+  Disable rpm support in kpackage. It doesn't compile with the newest rpm
+  package, and won't be fixed in the kde-3.0.x tree, especially not
+  on Gentoo first :-)
+
+*kdeadmin-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeadmin-3.1 (12 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdeadmin-3.1.ebuild:
+  Added ~alpha keyword
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.0.2.ebuild,
+  kdeadmin-3.0.3.ebuild, kdeadmin-3.1_rc6.ebuild: removed old versions
+
+*kdeadmin-3.1_rc6 (05 Jan 2003)
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdeadmin-3.1.ebuild:
+  added ~sparc to keywords
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdeadmin-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.1_rc6.ebuild:
+  version bump
+  
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.1_rc5.ebuild:
+  added patch to compile with qt-3.1.1, fixes bug #12506. thanks to
+  lichte@ctcis.net (Cletus Lichte)
+
+*kdeadmin-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdeadmin-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdeadmin-3.0.5a.ebuild:
+  version bump
+  
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdeadmin-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdeadmin-3.1.ebuild:
+  Added ppc keyword
+
+*kdeadmin-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdeadmin-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdeadmin-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdeadmin-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdeadmin-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : :
+
+  New stability release.
+
+*kdeadmin-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdeadmin-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1). Bump rpm dep to 4.0.4-r1, which fixes some ilbpopt problems.
+
+*kdeadmin-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdeadmin-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdeadmin/Manifest b/kde-base/kdeadmin/Manifest
index 3fb3c7878d69..68d5e160d710 100644
--- a/kde-base/kdeadmin/Manifest
+++ b/kde-base/kdeadmin/Manifest
@@ -1,14 +1,28 @@
-MD5 0436d812e08501ed14a6e1f5158c70ae kdeadmin-2.2.2.ebuild 557
-MD5 67e6b58d8e4db581011f4a612481f4ed kdeadmin-3.0.5b.ebuild 792
-MD5 54c8e245d2f315394301b3e40407c2b2 kdeadmin-3.1.1.ebuild 579
-MD5 582c968d7cbe1dac2694607364a9b295 kdeadmin-3.1.ebuild 577
-MD5 f23fbccd6b84393de9f07879e2facf58 kdeadmin-3.0.5a.ebuild 792
-MD5 4dff1f309f68e7b7b2cd5017c8842f7b ChangeLog 4005
-MD5 97025c29f78ad5392ab528a179326531 kdeadmin-3.0.4.ebuild 528
-MD5 1316a500de36f700a22fa89a3bd18f67 files/digest-kdeadmin-3.1 66
-MD5 4e2463a3c245a4beec7d1b920d457216 files/digest-kdeadmin-2.2.2 67
-MD5 f8da196912e8b6de614b016bae287008 files/digest-kdeadmin-3.0.4 68
-MD5 127ebafdf182b5e161b6946b38587833 files/digest-kdeadmin-3.1.1 68
-MD5 e741759e72657c73057f606db0adc641 files/kdeadmin-qt311-gentoo.diff 608
-MD5 d1d0b030e89c1ddbcc7e1a54998a4237 files/digest-kdeadmin-3.0.5a 69
-MD5 b48f8a01e6d8bc732551640dbae3fcba files/digest-kdeadmin-3.0.5b 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 64b4107aad35945f8c6a76da1463cfd4 ChangeLog 17373
+MD5 2f8513094264710dea75ca730c25b858 files/digest-kdeadmin-3.3.2 68
+MD5 8f9c012c60be21c26eb7ffdfdb2028db files/digest-kdeadmin-3.4.1 68
+MD5 989e7ce04bdedd84132a4de27b408f93 files/digest-kdeadmin-3.4.2 68
+MD5 80b3c1753e84c4d6d9caf0502325b7b4 files/digest-kdeadmin-3.4.3 68
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-kdeadmin-3.5.0 68
+MD5 a151bb158ed251862e050c28de846890 files/digest-kdeadmin-3.5.0_beta2 69
+MD5 45d60d517d64d4d40412cc124e833719 files/digest-kdeadmin-3.5.0_rc1 72
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-kdeadmin-3.5_beta1 69
+MD5 8e05194146eee671618623350403842d kdeadmin-3.3.2.ebuild 1049
+MD5 48be512760042fae56362300f41edeb4 kdeadmin-3.4.1.ebuild 1034
+MD5 ea014a2bc46363915808f003ccd4085d kdeadmin-3.4.2.ebuild 1040
+MD5 f4ca1377f3864cbf1183b95e1df2e871 kdeadmin-3.4.3.ebuild 1018
+MD5 67711223476148b4bd586665afadb55e kdeadmin-3.5.0.ebuild 1041
+MD5 d1fc3c7ccdddfa93e303391d6b33ebe0 kdeadmin-3.5.0_beta2.ebuild 1045
+MD5 38cdb67f9cd5aeb3dd9883358c73146f kdeadmin-3.5.0_rc1.ebuild 1043
+MD5 020f5c9f13f9b3ab162bb0b1f94266b3 kdeadmin-3.5_beta1.ebuild 1043
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkrantT9W3vfTuoRAuCaAKCWJHvISpSmzP/FE46/ytG9ZT0GTgCfdNmR
+io0dp0bkC4OsFuYGLfXds1Y=
+=UbY2
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeadmin/kdeadmin-3.3.2.ebuild b/kde-base/kdeadmin/kdeadmin-3.3.2.ebuild
index 591951b508ac..8b0e1ba83f41 100644
--- a/kde-base/kdeadmin/kdeadmin-3.3.2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.3.2.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdeadmin/kdeadmin-3.3.2.ebuild,v 1.1 2004/12/09 02:41:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="pam"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeadmin/kdeadmin-3.4.1.ebuild b/kde-base/kdeadmin/kdeadmin-3.4.1.ebuild
index 36a0a7832550..5db81c453351 100644
--- a/kde-base/kdeadmin/kdeadmin-3.4.1.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.4.1.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/kde-base/kdeadmin/kdeadmin-3.4.1.ebuild,v 1.1 2005/05/27 08:51:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
 
 DEPEND="~kde-base/kdebase-${PV}"
diff --git a/kde-base/kdeadmin/kdeadmin-3.4.2.ebuild b/kde-base/kdeadmin/kdeadmin-3.4.2.ebuild
index ec19096b3523..27632e5e1fe1 100644
--- a/kde-base/kdeadmin/kdeadmin-3.4.2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.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/kde-base/kdeadmin/kdeadmin-3.4.2.ebuild,v 1.1 2005/07/28 13:00:30 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeadmin/kdeadmin-3.4.3.ebuild b/kde-base/kdeadmin/kdeadmin-3.4.3.ebuild
index 693a88130f4a..32d05108587c 100644
--- a/kde-base/kdeadmin/kdeadmin-3.4.3.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.4.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/kde-base/kdeadmin/kdeadmin-3.4.3.ebuild,v 1.1 2005/10/12 13:22:45 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE administration tools (user manager, etc.)"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE=""
 
 DEPEND="~kde-base/kdebase-${PV}"
diff --git a/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild b/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild
index c184f485f962..a9097b29e12a 100644
--- a/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.5.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/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeadmin/kdeadmin-3.5.0_beta2.ebuild b/kde-base/kdeadmin/kdeadmin-3.5.0_beta2.ebuild
index 303e9d02602e..f4a5ceea7423 100644
--- a/kde-base/kdeadmin/kdeadmin-3.5.0_beta2.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.5.0_beta2.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/kde-base/kdeadmin/kdeadmin-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeadmin/kdeadmin-3.5.0_rc1.ebuild b/kde-base/kdeadmin/kdeadmin-3.5.0_rc1.ebuild
index 1e65863dea03..f25650419ff7 100644
--- a/kde-base/kdeadmin/kdeadmin-3.5.0_rc1.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.5.0_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/kde-base/kdeadmin/kdeadmin-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:13:16 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeadmin/kdeadmin-3.5_beta1.ebuild b/kde-base/kdeadmin/kdeadmin-3.5_beta1.ebuild
index 713a21c13fd3..c915d76a053e 100644
--- a/kde-base/kdeadmin/kdeadmin-3.5_beta1.ebuild
+++ b/kde-base/kdeadmin/kdeadmin-3.5_beta1.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/kde-base/kdeadmin/kdeadmin-3.5_beta1.ebuild,v 1.1 2005/09/21 17:20:56 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeadmin/kdeadmin-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeadmin/metadata.xml b/kde-base/kdeadmin/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeadmin/metadata.xml
+++ b/kde-base/kdeadmin/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-emoticons/ChangeLog b/kde-base/kdeartwork-emoticons/ChangeLog
index fe44d4fa7a99..e2dc559948ac 100644
--- a/kde-base/kdeartwork-emoticons/ChangeLog
+++ b/kde-base/kdeartwork-emoticons/ChangeLog
@@ -1,6 +1,85 @@
 # ChangeLog for kde-base/kdeartwork-emoticons
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.1 2005/02/05 18:43:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/ChangeLog,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
+
+*kdeartwork-emoticons-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-emoticons-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-emoticons-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-emoticons-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-emoticons-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-emoticons-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeartwork-emoticons-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeartwork-emoticons-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-emoticons-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-emoticons-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-emoticons-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-emoticons-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-emoticons-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-emoticons-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-emoticons-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-emoticons-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-emoticons-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-emoticons-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-emoticons-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-emoticons-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-emoticons-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-emoticons-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
 
 *kdeartwork-emoticons-3.4.0_beta2 (05 Feb 2005)
 
diff --git a/kde-base/kdeartwork-emoticons/Manifest b/kde-base/kdeartwork-emoticons/Manifest
index 681b9f932ae0..0ea67fbd0e6f 100644
--- a/kde-base/kdeartwork-emoticons/Manifest
+++ b/kde-base/kdeartwork-emoticons/Manifest
@@ -1,3 +1,8 @@
-MD5 dde948827ce56fdc4eb61fc1c0234466 kdeartwork-emoticons-3.4.0_beta2.ebuild 455
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 92c0fb40653b25f4d53c3ee2063819b9 files/digest-kdeartwork-emoticons-3.4.0_beta2 304
+MD5 27412fde1d3c91a39268887ba42bc3db ChangeLog 2865
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-emoticons-3.4.1 220
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-emoticons-3.5.0 71
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-emoticons-3.5_beta1 72
+MD5 10ad847af3e31a98282f887aefc48289 kdeartwork-emoticons-3.4.1.ebuild 477
+MD5 b55bf6f8747ba24210fbc9755e4ac673 kdeartwork-emoticons-3.5.0.ebuild 454
+MD5 bbf2443af43a5dce3788542d9f1f9688 kdeartwork-emoticons-3.5_beta1.ebuild 464
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdeartwork-emoticons/files/digest-kdeartwork-emoticons-3.4.1 b/kde-base/kdeartwork-emoticons/files/digest-kdeartwork-emoticons-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-emoticons/files/digest-kdeartwork-emoticons-3.4.1
+++ b/kde-base/kdeartwork-emoticons/files/digest-kdeartwork-emoticons-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.4.1.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.4.1.ebuild
index ad9e20e42954..0c090a30ea8f 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.4.1.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMMODULE=emoticons
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.0.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.0.ebuild
index fbcd3e80b294..d41b29d451b0 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.0.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.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/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMMODULE=emoticons
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5_beta1.ebuild b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5_beta1.ebuild
index a32bae657d9e..0cd681ef7eee 100644
--- a/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5_beta1.ebuild,v 1.1 2005/09/22 18:13:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-emoticons/kdeartwork-emoticons-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMMODULE=emoticons
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="EmotIcons (icons for things like smilies :-) for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-emoticons/metadata.xml b/kde-base/kdeartwork-emoticons/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-emoticons/metadata.xml
+++ b/kde-base/kdeartwork-emoticons/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-icewm-themes/ChangeLog b/kde-base/kdeartwork-icewm-themes/ChangeLog
index c0f0818c69f3..4bf00b3ea75a 100644
--- a/kde-base/kdeartwork-icewm-themes/ChangeLog
+++ b/kde-base/kdeartwork-icewm-themes/ChangeLog
@@ -1,6 +1,86 @@
 # ChangeLog for kde-base/kdeartwork-icewm-themes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/ChangeLog,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
+
+*kdeartwork-icewm-themes-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-icewm-themes-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-icewm-themes-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-icewm-themes-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-icewm-themes-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-icewm-themes-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeartwork-icewm-themes-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeartwork-icewm-themes-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-icewm-themes-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-icewm-themes-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-icewm-themes-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ChangeLog:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-icewm-themes-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-icewm-themes-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-icewm-themes-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-icewm-themes-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-icewm-themes-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-icewm-themes-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-icewm-themes-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-icewm-themes-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-icewm-themes-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-icewm-themes-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-icewm-themes-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-icewm-themes/Manifest b/kde-base/kdeartwork-icewm-themes/Manifest
index 236e28bfd33e..20108daa1af3 100644
--- a/kde-base/kdeartwork-icewm-themes/Manifest
+++ b/kde-base/kdeartwork-icewm-themes/Manifest
@@ -1,4 +1,8 @@
-MD5 14876fdbb14c2996b08c81dde6bc7cc2 kdeartwork-icewm-themes-3.4.0_alpha1.ebuild 271
-MD5 14876fdbb14c2996b08c81dde6bc7cc2 kdeartwork-icewm-themes-3.4.0_beta1.ebuild 271
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-icewm-themes-3.4.0_alpha1 72
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-icewm-themes-3.4.0_beta1 224
+MD5 1df9ef61905a73bc4a9c4e039c4f09f2 ChangeLog 3105
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-icewm-themes-3.4.1 220
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-icewm-themes-3.5.0 71
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-icewm-themes-3.5_beta1 72
+MD5 62898423d8e9847b89c1a80d2dd56269 kdeartwork-icewm-themes-3.4.1.ebuild 466
+MD5 bd0985e5ea72f668f8d84f030e9f0419 kdeartwork-icewm-themes-3.5.0.ebuild 443
+MD5 84b361458ba95f33abc38c7a14285488 kdeartwork-icewm-themes-3.5_beta1.ebuild 453
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdeartwork-icewm-themes/files/digest-kdeartwork-icewm-themes-3.4.1 b/kde-base/kdeartwork-icewm-themes/files/digest-kdeartwork-icewm-themes-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-icewm-themes/files/digest-kdeartwork-icewm-themes-3.4.1
+++ b/kde-base/kdeartwork-icewm-themes/files/digest-kdeartwork-icewm-themes-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.4.1.ebuild b/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.4.1.ebuild
index 3a820a12384f..a2d7058d9011 100644
--- a/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.4.1.ebuild
+++ b/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 KMMODULE=icewm-themes
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Themes for IceWM from kdeartwork"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.0.ebuild b/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.0.ebuild
index 68d8eebcee0b..21cb642db00a 100644
--- a/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.0.ebuild
+++ b/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.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/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 KMMODULE=icewm-themes
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5_beta1.ebuild b/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5_beta1.ebuild
index 4bd4c289098d..71bb9cc3355f 100644
--- a/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5_beta1.ebuild,v 1.1 2005/09/22 18:14:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-icewm-themes/kdeartwork-icewm-themes-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 KMMODULE=icewm-themes
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Themes for IceWM from kdeartwork"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-icewm-themes/metadata.xml b/kde-base/kdeartwork-icewm-themes/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-icewm-themes/metadata.xml
+++ b/kde-base/kdeartwork-icewm-themes/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-iconthemes/ChangeLog b/kde-base/kdeartwork-iconthemes/ChangeLog
index 202b232cebeb..3ef987a1c04b 100644
--- a/kde-base/kdeartwork-iconthemes/ChangeLog
+++ b/kde-base/kdeartwork-iconthemes/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for kde-base/kdeartwork-iconthemes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/ChangeLog,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-iconthemes-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-iconthemes-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-iconthemes-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-iconthemes-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-iconthemes-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-iconthemes-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-iconthemes-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-iconthemes-3.5_beta1.ebuild,
+  kdeartwork-iconthemes-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-iconthemes-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-iconthemes-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeartwork-iconthemes-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-iconthemes-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-iconthemes-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-iconthemes-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-iconthemes-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeartwork-iconthemes-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-iconthemes-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-iconthemes-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeartwork-iconthemes-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-iconthemes-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-iconthemes-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-iconthemes-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-iconthemes-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-iconthemes-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-iconthemes-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-iconthemes-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-iconthemes-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-iconthemes-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-iconthemes-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-iconthemes-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-iconthemes-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-iconthemes-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeartwork-iconthemes-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-iconthemes-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-iconthemes-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-iconthemes/Manifest b/kde-base/kdeartwork-iconthemes/Manifest
index 12dd38ed30b7..f2eb2afaf8e3 100644
--- a/kde-base/kdeartwork-iconthemes/Manifest
+++ b/kde-base/kdeartwork-iconthemes/Manifest
@@ -1,4 +1,26 @@
-MD5 a3122d830c3cf6f686d4e2f92f0026db kdeartwork-iconthemes-3.4.0_beta1.ebuild 269
-MD5 a3122d830c3cf6f686d4e2f92f0026db kdeartwork-iconthemes-3.4.0_alpha1.ebuild 269
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-iconthemes-3.4.0_beta1 224
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-iconthemes-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5fb6a24a82ef8bdd18011b7198b869dc ChangeLog 4146
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-iconthemes-3.4.1 220
+MD5 52630059e55189d550ffb49b50e90d85 files/digest-kdeartwork-iconthemes-3.4.2 298
+MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-iconthemes-3.4.3 71
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-iconthemes-3.5.0 71
+MD5 025789635e7fc20be5b0cd4ef7f7401e files/digest-kdeartwork-iconthemes-3.5.0_beta2 224
+MD5 9416a0c97953bce3beb6c13558ce414f files/digest-kdeartwork-iconthemes-3.5.0_rc1 310
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-iconthemes-3.5_beta1 72
+MD5 49c82deba802d55d2811f10d0438d9b1 kdeartwork-iconthemes-3.4.1.ebuild 435
+MD5 ceca23e226349a196bb13bb517b44830 kdeartwork-iconthemes-3.4.2.ebuild 448
+MD5 62e9173be5b2ec1019b5fa844d7ff395 kdeartwork-iconthemes-3.4.3.ebuild 444
+MD5 73e633c236b16e1b0c7f6762d8526326 kdeartwork-iconthemes-3.5.0.ebuild 424
+MD5 1e9da6e78d11476167534dbc855474d5 kdeartwork-iconthemes-3.5.0_beta2.ebuild 429
+MD5 8557520d8e984bfb0d72a94c4dd67cd4 kdeartwork-iconthemes-3.5.0_rc1.ebuild 428
+MD5 4e588b6a9424c3523013051054a6062b kdeartwork-iconthemes-3.5_beta1.ebuild 427
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhktDntT9W3vfTuoRAnBlAJ9N6Fc/opiPYUADG1aKC3YE2z40pgCeJEem
+loHI2cmvnvofAWZdRVKPmOE=
+=K4GH
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.1 b/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.1
+++ b/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.2 b/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.2
index 845e5d00f1ea..ef3bdad4bb97 100644
--- a/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.2
+++ b/kde-base/kdeartwork-iconthemes/files/digest-kdeartwork-iconthemes-3.4.2
@@ -1 +1,4 @@
+MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
+MD5 79c547de84f482edf5f8f26ba96dbf6f kdeartwork-3.4.1-3.4.2.tar.xdelta 291128
 MD5 3fcf6c047ee7350350a9a4c918299603 kdeartwork-3.4.2.tar.bz2 18023334
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.1.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.1.ebuild
index a065380a2bea..48a5ef113894 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.1.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.2.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.2.ebuild
index 6e59cfe100c4..3826bf6a0b60 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.2.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.3.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.3.ebuild
index cd100d864288..eddf20420377 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.3.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0.ebuild
index 01d5c1abcab5..3f0d695deafa 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_beta2.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_beta2.ebuild
index 1a021b3e2f73..4ff25acc75a8 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_beta2.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_rc1.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_rc1.ebuild
index e06f2fb697b8..ff8ef9066a8c 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5_beta1.ebuild b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5_beta1.ebuild
index 6e1a9fdf34e1..c9deafe531c9 100644
--- a/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5_beta1.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/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5_beta1.ebuild,v 1.1 2005/09/22 18:15:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-iconthemes/kdeartwork-iconthemes-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMMODULE=IconThemes
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icon themes for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-iconthemes/metadata.xml b/kde-base/kdeartwork-iconthemes/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-iconthemes/metadata.xml
+++ b/kde-base/kdeartwork-iconthemes/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-kscreensaver/ChangeLog b/kde-base/kdeartwork-kscreensaver/ChangeLog
index f2ceb746fa5d..cd3936267afd 100644
--- a/kde-base/kdeartwork-kscreensaver/ChangeLog
+++ b/kde-base/kdeartwork-kscreensaver/ChangeLog
@@ -1,6 +1,153 @@
 # ChangeLog for kde-base/kdeartwork-kscreensaver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/ChangeLog,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-kscreensaver-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kscreensaver-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-kscreensaver-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-kscreensaver-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kscreensaver-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-kscreensaver-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kscreensaver-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-kscreensaver-3.5_beta1.ebuild,
+  kdeartwork-kscreensaver-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-kscreensaver-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kscreensaver-3.5.0_beta2.ebuild:
+  New version.
+
+  13 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4.3-configure.patch,
+  +files/kdeartwork-3.4.3-kfiresaver.patch,
+  kdeartwork-kscreensaver-3.4.3.ebuild:
+  Update configure patch. Add small patch for missing entry in Makefile.
+
+*kdeartwork-kscreensaver-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kscreensaver-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-kscreensaver-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-kscreensaver-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-kscreensaver-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeartwork-kscreensaver-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-kscreensaver-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  11 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  files/kdeartwork-3.4-configure.patch:
+  Update configure patch to fix compilation problem (#102031).
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-kscreensaver-3.4.2.ebuild:
+  ~alpha keyword.
+
+  30 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4-configure.patch,
+  kdeartwork-kscreensaver-3.4.2.ebuild:
+  Add configure patch, including better xscreensaver detection (#98819).
+
+*kdeartwork-kscreensaver-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kscreensaver-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-kscreensaver-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-kscreensaver-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kscreensaver-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4.1-configure.patch,
+  kdeartwork-kscreensaver-3.4.1.ebuild:
+  Add patch to fix detection of arts (#91696).
+
+*kdeartwork-kscreensaver-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kscreensaver-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kscreensaver-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-kscreensaver-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-kscreensaver-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-kscreensaver-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-kscreensaver-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-kscreensaver-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kdeartwork-3.4.0_rc1-gl-kdesavers.patch,
+  +kdeartwork-kscreensaver-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  19 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4.0_beta2-gl-kdesavers.patch,
+  kdeartwork-kscreensaver-3.4.0_beta2.ebuild:
+  Fix compilation when using --without-gl (#46775).
+
+*kdeartwork-kscreensaver-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kscreensaver-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  15 Jan 2005; Sven Wegener <swegener@gentoo.org>
+  kdeartwork-kscreensaver-3.4.0_beta1.ebuild:
+  Added missing ? in *DEPEND.
 
 *kdeartwork-kscreensaver-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-kscreensaver/Manifest b/kde-base/kdeartwork-kscreensaver/Manifest
index b3deb13e0d28..24272aa204fb 100644
--- a/kde-base/kdeartwork-kscreensaver/Manifest
+++ b/kde-base/kdeartwork-kscreensaver/Manifest
@@ -1,4 +1,30 @@
-MD5 f313eb730ab42a70a598e2d5a5c9bf11 kdeartwork-kscreensaver-3.4.0_alpha1.ebuild 669
-MD5 f313eb730ab42a70a598e2d5a5c9bf11 kdeartwork-kscreensaver-3.4.0_beta1.ebuild 669
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-kscreensaver-3.4.0_beta1 224
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-kscreensaver-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ef6dff4dfada2c11c8945f59c611f73d ChangeLog 5393
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-kscreensaver-3.4.1 220
+MD5 52630059e55189d550ffb49b50e90d85 files/digest-kdeartwork-kscreensaver-3.4.2 298
+MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-kscreensaver-3.4.3 71
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-kscreensaver-3.5.0 71
+MD5 025789635e7fc20be5b0cd4ef7f7401e files/digest-kdeartwork-kscreensaver-3.5.0_beta2 224
+MD5 9416a0c97953bce3beb6c13558ce414f files/digest-kdeartwork-kscreensaver-3.5.0_rc1 310
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-kscreensaver-3.5_beta1 72
+MD5 a51b6bfc735f8cec40cd4481a289309d files/kdeartwork-3.4-configure.patch 7591
+MD5 fe55c64ff5050b92d175b2114c2d1667 files/kdeartwork-3.4.1-configure.patch 815
+MD5 45fe881cc7f39f2d70b8b4ccc61cf707 files/kdeartwork-3.4.3-configure.patch 5729
+MD5 789091c90eea0d565e886b92589f1119 files/kdeartwork-3.4.3-kfiresaver.patch 765
+MD5 2fe0472a2ca64ac229f658b1414755ac kdeartwork-kscreensaver-3.4.1.ebuild 850
+MD5 c63624b52624e2ed23a1a06aa27452e4 kdeartwork-kscreensaver-3.4.2.ebuild 1062
+MD5 85c38434db9e51ad0cc38e11178791db kdeartwork-kscreensaver-3.4.3.ebuild 935
+MD5 2806dd277391e7c94df078e78b9bab13 kdeartwork-kscreensaver-3.5.0.ebuild 756
+MD5 f952e96425aff1e09b2f0bac19af2912 kdeartwork-kscreensaver-3.5.0_beta2.ebuild 761
+MD5 fe61f3319648ab5b0c3c66e91ddd40c9 kdeartwork-kscreensaver-3.5.0_rc1.ebuild 760
+MD5 5665eb430cbd8b96e7c301fae94ae97f kdeartwork-kscreensaver-3.5_beta1.ebuild 759
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkuPntT9W3vfTuoRAmEeAJ9BcJZv7KQ981viJm4J9WEoG+jZqgCgha1k
+W8iDC/UHI2EBYX98GhDLPiE=
+=gR+h
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.1 b/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.1
+++ b/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.2 b/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.2
index 845e5d00f1ea..ef3bdad4bb97 100644
--- a/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.2
+++ b/kde-base/kdeartwork-kscreensaver/files/digest-kdeartwork-kscreensaver-3.4.2
@@ -1 +1,4 @@
+MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
+MD5 79c547de84f482edf5f8f26ba96dbf6f kdeartwork-3.4.1-3.4.2.tar.xdelta 291128
 MD5 3fcf6c047ee7350350a9a4c918299603 kdeartwork-3.4.2.tar.bz2 18023334
diff --git a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch
index f0649e935e01..2412cdcd77f5 100644
--- a/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch
+++ b/kde-base/kdeartwork-kscreensaver/files/kdeartwork-3.4-configure.patch
@@ -1,6 +1,6 @@
 diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/kscreensaver/configure.in.in
 --- kdeartwork-3.4.2.orig/kscreensaver/configure.in.in	2005-07-20 18:40:58.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-07-26 13:54:39.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-08-11 18:27:34.000000000 +0200
 @@ -36,32 +36,41 @@
  AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
  AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
@@ -65,7 +65,7 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/ks
  
 diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot
 --- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-07-26 13:54:39.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-08-11 18:22:05.000000000 +0200
 @@ -1,4 +1,4 @@
 -if test "$XSCREENSAVER" = "NO"; then
 +if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
@@ -74,14 +74,23 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwo
    echo "Check www.jwz.org/xscreensaver if you're loving to"
 diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in
 --- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-07-26 13:54:39.000000000 +0200
-@@ -1,4 +1,4 @@
++++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-08-11 18:39:20.000000000 +0200
+@@ -1,4 +1,13 @@
 -AC_DEFUN([KDE_CHECK_XSREENSAVER],
-+AC_DEFUN([KDE_CHECK_XSCREENSAVER],
++AC_DEFUN([KDE_CHECK_XSCREENSAVER_HACKS],
++[
++     XSCREENSAVER_HACKS_DIR=NO
++     AC_FIND_FILE($1/flame, [ $xscreensaver_prefixes ], XSCREENSAVER_HACKS_DIR)
++     if test "$XSCREENSAVER_HACKS_DIR" != NO; then
++	XSCREENSAVER_HACKS_DIR="$XSCREENSAVER_HACKS_DIR/$1"
++     fi
++])
++
++AC_DEFUN([KDE_CHECK_XSCREENSAVER_CONFIG],
  [
       XSCREENSAVER_CONFIG=NO
       AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-@@ -22,46 +22,82 @@
+@@ -22,46 +31,80 @@
  done
  IFS=$old_IFS
  
@@ -114,44 +123,41 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwor
 +    [where the xscreensaver config files are])], [])
 +
 +XSCREENSAVER=NO
-+XSCREENSAVER_CONFIG=NO
 +if test "x$with_xscreensaver" != xno; then
-+  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
-+    XSCREENSAVER="$with_xscreensaver_dir/flame"
-+  fi
++  XSCREENSAVER_HACKS_DIR=NO
++  XSCREENSAVER_CONFIG=NO
 +
-+  if test "x$XSCREENSAVER" = xNO && test -n "$kdelibsuff"; then
-+    KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  fi
-+
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  fi
++  AC_MSG_CHECKING([for xscreensaver])
 +
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(libexec/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  fi
-+
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
++    XSCREENSAVER_HACKS_DIR="$with_xscreensaver_dir"
 +  fi
 +
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  if test "x$XSCREENSAVER_HACKS_DIR" = xNO; then
++     for subdir in lib$kdelibsuff/xscreensaver \
++		   lib/xscreensaver \
++		   libexec/xscreensaver \
++		   bin/xscreensaver-hacks \
++		   hacks; do
++         KDE_CHECK_XSCREENSAVER_HACKS($subdir)
++         if test "$XSCREENSAVER_HACKS_DIR" != NO; then
++		break
++         fi
++     done
 +  fi
 +
-+  AC_MSG_CHECKING([for flame.xml])
-+
-+  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
-+    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
-+  fi
++  AC_MSG_RESULT([$XSCREENSAVER_HACKS_DIR])
  
 -XSCREENSAVER_HACKS_DIR=
--
++  AC_MSG_CHECKING([for xscreensaver config files])
+ 
 -if test "$XSCREENSAVER" != "NO"; then
 -     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
 -     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
--
++  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
++    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
++  fi
+ 
 -     AC_MSG_CHECKING([for flame.xml])
 +  if test "x$XSCREENSAVER_CONFIG" = xNO; then
       for subdir in lib/xscreensaver/config \
@@ -162,7 +168,7 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwor
                     xscreensaver \
  		   config/control-center-2.0; do
 -         KDE_CHECK_XSREENSAVER($subdir)
-+         KDE_CHECK_XSCREENSAVER($subdir)
++         KDE_CHECK_XSCREENSAVER_CONFIG($subdir)
           if test "$XSCREENSAVER_CONFIG" != NO; then
  		break
           fi
@@ -174,17 +180,16 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwor
 +
 +  AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
 +
-+  if test "x$XSCREENSAVER_CONFIG" = xNO; then
-+    XSCREENSAVER=NO
++  if test "x$XSCREENSAVER_HACKS_DIR" != xNO && test "x$XSCREENSAVER_CONFIG" != xNO; then
++    XSCREENSAVER=YES
 +  fi
 +
-+  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then
++  if test "x$with_xscreensaver" != xcheck && test "$XSCREENSAVER" != YES; then
 +    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
 +  fi
 +fi
 +
 +if test "$XSCREENSAVER" != "NO"; then
-+     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
 +     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
 +     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files])
  fi
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild
index 844c119c60c6..dcecd8619b32 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -9,13 +9,15 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="opengl xscreensaver"
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/kscreensaver)
+DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver)
 	opengl? ( virtual/opengl )
-	!ppc64? ( xscreensaver? ( x11-misc/xscreensaver ) )"
+	xscreensaver? ( x11-misc/xscreensaver )"
 
-PATCHES="${FILESDIR}/kdeartwork-3.4.0-gl-kdesavers.patch"
+# Fix compilation with --without-gl and detection of arts.
+# See kde bug 89387 and 102398. Applied for 3.4.2.
+PATCHES1="${FILESDIR}/kdeartwork-3.4.1-configure.patch"
 
 src_compile() {
 	myconf="$myconf --with-dpms $(use_with opengl gl)"
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.2.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.2.ebuild
index 78a778043e76..efde4fdeb26d 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.2.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -9,13 +9,26 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="opengl xscreensaver"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver)
+	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 
+PATCHES1="${FILESDIR}/kdeartwork-3.4-configure.patch"
+
 src_compile() {
-	myconf="$myconf --with-dpms $(use_with opengl gl)"
+	local myconf="$myconf --with-dpms --with-libart
+	              $(use_with opengl gl)"
+
+	if use xscreensaver; then
+		myconf="${myconf} --with-xscreensaver
+		        --with-xscreensaver-dir=/usr/lib/misc/xscreensaver
+		        --with-xscreensaver-config=/usr/share/xscreensaver/config"
+	else
+		myconf="${myconf} --without-xscreensaver"
+	fi
+
 	kde-meta_src_compile
 }
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild
index bcf91fe0dd89..07d4adf0daa8 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -9,26 +9,21 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="opengl xscreensaver"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver)
 	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 
-PATCHES1="${FILESDIR}/kdeartwork-3.4-configure.patch"
+PATCHES="${FILESDIR}/kdeartwork-3.4.3-configure.patch"
+
+# Fix Makefile. Applied for 3.4.4.
+PATCHES="${PATCHES} ${FILESDIR}/kdeartwork-3.4.3-kfiresaver.patch"
 
 src_compile() {
 	local myconf="$myconf --with-dpms --with-libart
-	              $(use_with opengl gl)"
-
-	if use xscreensaver; then
-		myconf="${myconf} --with-xscreensaver
-		        --with-xscreensaver-dir=/usr/lib/misc/xscreensaver
-		        --with-xscreensaver-config=/usr/share/xscreensaver/config"
-	else
-		myconf="${myconf} --without-xscreensaver"
-	fi
+	              $(use_with opengl gl) $(use_with xscreensaver)"
 
 	kde-meta_src_compile
 }
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0.ebuild
index 0dde60812143..c08b26427e47 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_beta2.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_beta2.ebuild
index 2733762128b4..78fe89d688ad 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_beta2.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl xscreensaver"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver)
 	media-libs/libart_lgpl
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_rc1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_rc1.ebuild
index e1d720cfab26..6cd4410bfbfe 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5_beta1.ebuild b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5_beta1.ebuild
index 1705ad8fbe22..5eb24d9c98e6 100644
--- a/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5_beta1.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/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5_beta1.ebuild,v 1.1 2005/09/22 18:16:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kscreensaver/kdeartwork-kscreensaver-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:28 chriswhite Exp $
 
 KMMODULE=kscreensaver
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra screensavers for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl xscreensaver"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver)
 	media-libs/libart_lgpl
@@ -18,15 +18,7 @@ DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kscreensaver)
 
 src_compile() {
 	local myconf="$myconf --with-dpms --with-libart
-	              $(use_with opengl gl)"
-
-	if use xscreensaver; then
-		myconf="${myconf} --with-xscreensaver
-		        --with-xscreensaver-dir=/usr/lib/misc/xscreensaver
-		        --with-xscreensaver-config=/usr/share/xscreensaver/config"
-	else
-		myconf="${myconf} --without-xscreensaver"
-	fi
+	              $(use_with opengl gl) $(use_with xscreensaver)"
 
 	kde-meta_src_compile
 }
diff --git a/kde-base/kdeartwork-kscreensaver/metadata.xml b/kde-base/kdeartwork-kscreensaver/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-kscreensaver/metadata.xml
+++ b/kde-base/kdeartwork-kscreensaver/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-kwin-styles/ChangeLog b/kde-base/kdeartwork-kwin-styles/ChangeLog
index ae016137733c..1dee2a90184b 100644
--- a/kde-base/kdeartwork-kwin-styles/ChangeLog
+++ b/kde-base/kdeartwork-kwin-styles/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for kde-base/kdeartwork-kwin-styles
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/ChangeLog,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-kwin-styles-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kwin-styles-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-kwin-styles-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-kwin-styles-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kwin-styles-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-kwin-styles-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kwin-styles-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-kwin-styles-3.5_beta1.ebuild,
+  kdeartwork-kwin-styles-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-kwin-styles-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kwin-styles-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeartwork-kwin-styles-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kwin-styles-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-kwin-styles-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-kwin-styles-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-kwin-styles-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeartwork-kwin-styles-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-kwin-styles-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-kwin-styles-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeartwork-kwin-styles-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kwin-styles-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-kwin-styles-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-kwin-styles-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kwin-styles-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-kwin-styles-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kwin-styles-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kwin-styles-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-kwin-styles-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-kwin-styles-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-kwin-styles-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-kwin-styles-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-kwin-styles-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kwin-styles-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeartwork-kwin-styles-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kwin-styles-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-kwin-styles-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-kwin-styles/Manifest b/kde-base/kdeartwork-kwin-styles/Manifest
index 332c45f9aede..2b1544b87829 100644
--- a/kde-base/kdeartwork-kwin-styles/Manifest
+++ b/kde-base/kdeartwork-kwin-styles/Manifest
@@ -1,4 +1,26 @@
-MD5 dbb8513197189f7fe9820b2c4f477099 kdeartwork-kwin-styles-3.4.0_beta1.ebuild 343
-MD5 dbb8513197189f7fe9820b2c4f477099 kdeartwork-kwin-styles-3.4.0_alpha1.ebuild 343
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-kwin-styles-3.4.0_alpha1 72
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-kwin-styles-3.4.0_beta1 224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ce48aad7d0ac3c774bcb06c8a5f46dc9 ChangeLog 4185
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-kwin-styles-3.4.1 220
+MD5 52630059e55189d550ffb49b50e90d85 files/digest-kdeartwork-kwin-styles-3.4.2 298
+MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-kwin-styles-3.4.3 71
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-kwin-styles-3.5.0 71
+MD5 025789635e7fc20be5b0cd4ef7f7401e files/digest-kdeartwork-kwin-styles-3.5.0_beta2 224
+MD5 9416a0c97953bce3beb6c13558ce414f files/digest-kdeartwork-kwin-styles-3.5.0_rc1 310
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-kwin-styles-3.5_beta1 72
+MD5 e42a767a0366a3edd96790b9c72d6f52 kdeartwork-kwin-styles-3.4.1.ebuild 518
+MD5 bbb08f7d1ad937a126d320b1aa65767a kdeartwork-kwin-styles-3.4.2.ebuild 531
+MD5 9ad97de45bc777d41fbfd1729f82cc2c kdeartwork-kwin-styles-3.4.3.ebuild 527
+MD5 060ddbe52b9d523042d40770bc238fea kdeartwork-kwin-styles-3.5.0.ebuild 477
+MD5 c03faa497b3dbe08cc438b590e735ecc kdeartwork-kwin-styles-3.5.0_beta2.ebuild 482
+MD5 7622e833c02e12a9609b4df0773dd580 kdeartwork-kwin-styles-3.5.0_rc1.ebuild 481
+MD5 b44df529c89d2bfc54dff3cdc7d66cb4 kdeartwork-kwin-styles-3.5_beta1.ebuild 510
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkvantT9W3vfTuoRAlpMAKCRtMFIP1mPfLlA+nYw0B5EB/yyrQCgg/2v
+XPR40XIx2bvjFRLmYClLO9I=
+=B9i7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.1 b/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.1
+++ b/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.2 b/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.2
index 845e5d00f1ea..ef3bdad4bb97 100644
--- a/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.2
+++ b/kde-base/kdeartwork-kwin-styles/files/digest-kdeartwork-kwin-styles-3.4.2
@@ -1 +1,4 @@
+MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
+MD5 79c547de84f482edf5f8f26ba96dbf6f kdeartwork-3.4.1-3.4.2.tar.xdelta 291128
 MD5 3fcf6c047ee7350350a9a4c918299603 kdeartwork-3.4.2.tar.bz2 18023334
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.1.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.1.ebuild
index a8e590644dcc..b9457ca5df46 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.1.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
@@ -9,9 +9,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Window styles for kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/kwin-$PV"
 DEPEND="
-$(deprange $PV $MAXKDEVER kde-base/kwin)"
+$(deprange-dual $PV $MAXKDEVER kde-base/kwin)"
 
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.2.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.2.ebuild
index d5d02f7254ff..94ca4f8f1063 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.2.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Window styles for kde"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/kwin-$PV"
 DEPEND="
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.3.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.3.ebuild
index 4ddb314693d0..b4148c6130e1 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.3.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Window styles for kde"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/kwin-$PV"
 DEPEND="
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0.ebuild
index 0a7210f39d50..5af679a6710b 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_beta2.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_beta2.ebuild
index e5a20c6ebc01..b108e045601f 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_beta2.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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Window styles for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_rc1.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_rc1.ebuild
index d4fbd0cb4af1..c18c446d11b8 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5_beta1.ebuild b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5_beta1.ebuild
index 9092f40ede9b..511b63c45284 100644
--- a/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5_beta1.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/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5_beta1.ebuild,v 1.1 2005/09/22 18:17:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kwin-styles/kdeartwork-kwin-styles-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMMODULE=kwin-styles
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Window styles for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/kwin-$PV"
 DEPEND="
diff --git a/kde-base/kdeartwork-kwin-styles/metadata.xml b/kde-base/kdeartwork-kwin-styles/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-kwin-styles/metadata.xml
+++ b/kde-base/kdeartwork-kwin-styles/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-kworldclock/ChangeLog b/kde-base/kdeartwork-kworldclock/ChangeLog
index 9c4a06eac195..ac466e618ad0 100644
--- a/kde-base/kdeartwork-kworldclock/ChangeLog
+++ b/kde-base/kdeartwork-kworldclock/ChangeLog
@@ -1,6 +1,117 @@
 # ChangeLog for kde-base/kdeartwork-kworldclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/ChangeLog,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-kworldclock-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kworldclock-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-kworldclock-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-kworldclock-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kworldclock-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-kworldclock-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kworldclock-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-kworldclock-3.5_beta1.ebuild,
+  kdeartwork-kworldclock-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-kworldclock-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kworldclock-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeartwork-kworldclock-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-kworldclock-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-kworldclock-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-kworldclock-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-kworldclock-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeartwork-kworldclock-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-kworldclock-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-kworldclock-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeartwork-kworldclock-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kworldclock-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-kworldclock-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-kworldclock-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kworldclock-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-kworldclock-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kworldclock-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-kworldclock-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-kworldclock-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-kworldclock-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-kworldclock-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-kworldclock-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-kworldclock-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-kworldclock-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-kworldclock-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-kworldclock/Manifest b/kde-base/kdeartwork-kworldclock/Manifest
index 7540ed1444cd..eb1ae11f0079 100644
--- a/kde-base/kdeartwork-kworldclock/Manifest
+++ b/kde-base/kdeartwork-kworldclock/Manifest
@@ -1,4 +1,26 @@
-MD5 173b62da2ed15af75bc62dee704bc335 kdeartwork-kworldclock-3.4.0_alpha1.ebuild 270
-MD5 173b62da2ed15af75bc62dee704bc335 kdeartwork-kworldclock-3.4.0_beta1.ebuild 270
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-kworldclock-3.4.0_alpha1 72
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-kworldclock-3.4.0_beta1 224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dcd89caa032117a8726fdb174e6d93a3 ChangeLog 4022
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-kworldclock-3.4.1 220
+MD5 52630059e55189d550ffb49b50e90d85 files/digest-kdeartwork-kworldclock-3.4.2 298
+MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-kworldclock-3.4.3 71
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-kworldclock-3.5.0 71
+MD5 025789635e7fc20be5b0cd4ef7f7401e files/digest-kdeartwork-kworldclock-3.5.0_beta2 224
+MD5 9416a0c97953bce3beb6c13558ce414f files/digest-kdeartwork-kworldclock-3.5.0_rc1 310
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-kworldclock-3.5_beta1 72
+MD5 cf3349896ee1e58a53a73cf4cb4821b1 kdeartwork-kworldclock-3.4.1.ebuild 500
+MD5 cb5b9a8d02e0062330eeb83fc1dcaa57 kdeartwork-kworldclock-3.4.2.ebuild 513
+MD5 d718b531d5768183e70f73ac95921c0b kdeartwork-kworldclock-3.4.3.ebuild 509
+MD5 0a04f81da0e38505a7923261d7937a41 kdeartwork-kworldclock-3.5.0.ebuild 489
+MD5 9b51f001abe120d3a72646431bbb5b75 kdeartwork-kworldclock-3.5.0_beta2.ebuild 494
+MD5 1ae3cfa82639df4c3f34afa24f262a12 kdeartwork-kworldclock-3.5.0_rc1.ebuild 493
+MD5 ee48095265ad3a6017449bf52aafac62 kdeartwork-kworldclock-3.5_beta1.ebuild 492
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkybntT9W3vfTuoRAgM8AJ9ruv1dryNF6PGZLTyvnKC71nNQdQCgmuGq
+nYIgQp4FQHFWV0fn4wVycwU=
+=CU75
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.1 b/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.1
+++ b/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.2 b/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.2
index 845e5d00f1ea..ef3bdad4bb97 100644
--- a/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.2
+++ b/kde-base/kdeartwork-kworldclock/files/digest-kdeartwork-kworldclock-3.4.2
@@ -1 +1,4 @@
+MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
+MD5 79c547de84f482edf5f8f26ba96dbf6f kdeartwork-3.4.1-3.4.2.tar.xdelta 291128
 MD5 3fcf6c047ee7350350a9a4c918299603 kdeartwork-3.4.2.tar.bz2 18023334
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.1.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.1.ebuild
index 515755ceb7e0..7cf138f15129 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.1.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
@@ -9,6 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kworldclock from kdeartwork"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND=""
+
+RDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kworldwatch)"
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.2.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.2.ebuild
index 9d8ec5f3b631..170ae7e8d2b1 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.2.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kworldclock from kdeartwork"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kworldwatch)"
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.3.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.3.ebuild
index 8fdc304e7cca..282e81e187e2 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.3.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kworldclock from kdeartwork"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kworldwatch)"
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0.ebuild
index fe110d52bf9e..758d1002b439 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_beta2.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_beta2.ebuild
index 02462ae015e4..063cce93093b 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_beta2.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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kworldclock from kdeartwork"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kworldwatch)"
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_rc1.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_rc1.ebuild
index 153afab9a583..e7a982849763 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5_beta1.ebuild b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5_beta1.ebuild
index 72bcfb978122..cedaa4bbc429 100644
--- a/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5_beta1.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/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5_beta1.ebuild,v 1.1 2005/09/22 18:18:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-kworldclock/kdeartwork-kworldclock-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMMODULE=kworldclock
 KMNAME=kdeartwork
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kworldclock from kdeartwork"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kworldwatch)"
diff --git a/kde-base/kdeartwork-kworldclock/metadata.xml b/kde-base/kdeartwork-kworldclock/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-kworldclock/metadata.xml
+++ b/kde-base/kdeartwork-kworldclock/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-meta/ChangeLog b/kde-base/kdeartwork-meta/ChangeLog
index d6c3f474f4eb..ff0a9865609e 100644
--- a/kde-base/kdeartwork-meta/ChangeLog
+++ b/kde-base/kdeartwork-meta/ChangeLog
@@ -1,6 +1,126 @@
 # ChangeLog for kde-base/kdeartwork-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-meta-3.5_beta1.ebuild, kdeartwork-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeartwork-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdeartwork-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdeartwork-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdeartwork-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeartwork-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeartwork-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdeartwork-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeartwork-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeartwork-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-meta/Manifest b/kde-base/kdeartwork-meta/Manifest
index 8eeba32d171d..b51f38273d48 100644
--- a/kde-base/kdeartwork-meta/Manifest
+++ b/kde-base/kdeartwork-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 6293e7209d9f99cd3b338f7e7ea8df49 kdeartwork-meta-3.4.0_beta1.ebuild 797
-MD5 6293e7209d9f99cd3b338f7e7ea8df49 kdeartwork-meta-3.4.0_alpha1.ebuild 797
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b83c28309ab59fa04b17cefac3bde62d ChangeLog 4151
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeartwork-meta-3.5_beta1 0
+MD5 0568a67f40cae03b57bcbcd07a213f49 kdeartwork-meta-3.4.1.ebuild 989
+MD5 e203adf71436a8122d389e6860647b92 kdeartwork-meta-3.4.2.ebuild 1010
+MD5 dd7b13cd64652bd046c3da6a27d0f672 kdeartwork-meta-3.4.3.ebuild 1005
+MD5 db7015f07754b003fc0d6c1b8a4e1fb4 kdeartwork-meta-3.5.0.ebuild 978
+MD5 978736743bfbeb704fc6b17095a2daa6 kdeartwork-meta-3.5.0_beta2.ebuild 1001
+MD5 5da1ecbfd5f9fdd55aacfc3d7176bcb0 kdeartwork-meta-3.5.0_rc1.ebuild 1000
+MD5 74c6a5adff547c2958428fbef896ada7 kdeartwork-meta-3.5_beta1.ebuild 981
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhk09ntT9W3vfTuoRAl98AJ45KBBtsqVWBq5s/HoW49XxSKB0qgCgs28F
+AYGk4gIADOF/kw2cLkduxP4=
+=XkrL
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.1.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.1.ebuild
index a4fcf9e6a221..aa32ea2008e7 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.1.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.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/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.2.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.2.ebuild
index 5c7820693a12..154fd023153f 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.2.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.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/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.3.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.3.ebuild
index 5bf678a27836..0db63972c547 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.3.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.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/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0.ebuild
index fd7dec9d486b..427e4267d86d 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.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/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_beta2.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_beta2.ebuild
index 6e8f72ef024b..698160b2090e 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_beta2.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/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_rc1.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_rc1.ebuild
index 51f05492a39d..d03958b7d001 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_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/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5_beta1.ebuild b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5_beta1.ebuild
index 6af94f3d5162..dd3a5cadad17 100644
--- a/kde-base/kdeartwork-meta/kdeartwork-meta-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-meta/kdeartwork-meta-3.5_beta1.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/kde-base/kdeartwork-meta/kdeartwork-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:43:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-meta/kdeartwork-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeartwork-meta/metadata.xml b/kde-base/kdeartwork-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-meta/metadata.xml
+++ b/kde-base/kdeartwork-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-sounds/ChangeLog b/kde-base/kdeartwork-sounds/ChangeLog
index c86ca2995d71..8a2a928c0a71 100644
--- a/kde-base/kdeartwork-sounds/ChangeLog
+++ b/kde-base/kdeartwork-sounds/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/kdeartwork-sounds
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/ChangeLog,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
+
+*kdeartwork-sounds-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-sounds-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-sounds-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-sounds-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-sounds-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-sounds-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeartwork-sounds-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeartwork-sounds-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-sounds-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-sounds-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-sounds-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-sounds-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-sounds-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-sounds-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-sounds-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-sounds-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-sounds-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-sounds-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-sounds-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-sounds-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-sounds-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-sounds-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-sounds-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-sounds/Manifest b/kde-base/kdeartwork-sounds/Manifest
index 374c4c3d183a..13c28c9a0b21 100644
--- a/kde-base/kdeartwork-sounds/Manifest
+++ b/kde-base/kdeartwork-sounds/Manifest
@@ -1,4 +1,8 @@
-MD5 1afdcd30960ad433d48a87214b76754a kdeartwork-sounds-3.4.0_beta1.ebuild 265
-MD5 1afdcd30960ad433d48a87214b76754a kdeartwork-sounds-3.4.0_alpha1.ebuild 265
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-sounds-3.4.0_beta1 224
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-sounds-3.4.0_alpha1 72
+MD5 6694c8da8ef6d0048e644ede48eba151 ChangeLog 2978
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-sounds-3.4.1 220
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-sounds-3.5.0 71
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-sounds-3.5_beta1 72
+MD5 e0e76a7654bcb99e907499e9326913e5 kdeartwork-sounds-3.4.1.ebuild 442
+MD5 6f981b6aff9654ed66fbc92fa6b2a0be kdeartwork-sounds-3.5.0.ebuild 419
+MD5 f864c7ee0bfc1421430ac74356c83912 kdeartwork-sounds-3.5_beta1.ebuild 429
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdeartwork-sounds/files/digest-kdeartwork-sounds-3.4.1 b/kde-base/kdeartwork-sounds/files/digest-kdeartwork-sounds-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-sounds/files/digest-kdeartwork-sounds-3.4.1
+++ b/kde-base/kdeartwork-sounds/files/digest-kdeartwork-sounds-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.4.1.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.4.1.ebuild
index e5485de8cc52..2aefc39c489b 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.4.1.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMMODULE=sounds
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra sound themes for kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5.0.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5.0.ebuild
index dfe32603f7ee..c0f27e78e87f 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5.0.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5.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/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMMODULE=sounds
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5_beta1.ebuild b/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5_beta1.ebuild
index df2db2f2ee01..34c2beccca3b 100644
--- a/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5_beta1.ebuild,v 1.1 2005/09/22 18:19:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-sounds/kdeartwork-sounds-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMMODULE=sounds
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra sound themes for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-sounds/metadata.xml b/kde-base/kdeartwork-sounds/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-sounds/metadata.xml
+++ b/kde-base/kdeartwork-sounds/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-styles/ChangeLog b/kde-base/kdeartwork-styles/ChangeLog
index 4d346bc9e51f..281596e18603 100644
--- a/kde-base/kdeartwork-styles/ChangeLog
+++ b/kde-base/kdeartwork-styles/ChangeLog
@@ -1,6 +1,122 @@
 # ChangeLog for kde-base/kdeartwork-styles
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/ChangeLog,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-styles-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-styles-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-styles-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-styles-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-styles-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-styles-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-styles-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-styles-3.5_beta1.ebuild, kdeartwork-styles-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-styles-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-styles-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeartwork-styles-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-styles-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-styles-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-styles-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-styles-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeartwork-styles-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-styles-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-styles-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeartwork-styles-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-styles-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-styles-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-styles-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-styles-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-styles-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-styles-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-styles-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-styles-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-styles-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-styles-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-styles-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-styles-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-styles-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeartwork-styles-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-styles-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-styles-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-styles/Manifest b/kde-base/kdeartwork-styles/Manifest
index 50c3aa049161..6d1ab95a39f0 100644
--- a/kde-base/kdeartwork-styles/Manifest
+++ b/kde-base/kdeartwork-styles/Manifest
@@ -1,4 +1,26 @@
-MD5 4349722b43e6202be2c0ff3f77023d84 kdeartwork-styles-3.4.0_alpha1.ebuild 265
-MD5 4349722b43e6202be2c0ff3f77023d84 kdeartwork-styles-3.4.0_beta1.ebuild 265
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-styles-3.4.0_beta1 224
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-styles-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aaa42ad39271545161e58361d3ad3b99 ChangeLog 3988
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-styles-3.4.1 220
+MD5 52630059e55189d550ffb49b50e90d85 files/digest-kdeartwork-styles-3.4.2 298
+MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-styles-3.4.3 71
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-styles-3.5.0 71
+MD5 025789635e7fc20be5b0cd4ef7f7401e files/digest-kdeartwork-styles-3.5.0_beta2 224
+MD5 9416a0c97953bce3beb6c13558ce414f files/digest-kdeartwork-styles-3.5.0_rc1 310
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-styles-3.5_beta1 72
+MD5 55c3d246e65bff2332b99f52d5216d2e kdeartwork-styles-3.4.1.ebuild 424
+MD5 715f62a7b8d771069df28c38ba7b844b kdeartwork-styles-3.4.2.ebuild 437
+MD5 e1a03ffe912d6fc32ea8d29bbed21cce kdeartwork-styles-3.4.3.ebuild 433
+MD5 c386d78ae9a6bc8205f1b853a47021be kdeartwork-styles-3.5.0.ebuild 413
+MD5 5680ad4a43bbbdbf871b3f34e5d3dba7 kdeartwork-styles-3.5.0_beta2.ebuild 418
+MD5 9e58a378ad4927ec2ef9ff9bd8b6b9f4 kdeartwork-styles-3.5.0_rc1.ebuild 417
+MD5 b030ec6905a3055a4b8b0972022bfd7e kdeartwork-styles-3.5_beta1.ebuild 416
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkzpntT9W3vfTuoRAkukAKCwaVggUx3H5vpAap+0ys0+7Fq1+wCeLDqM
+7Aypvnug2Wk+zvun4MqmvM8=
+=88Oa
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.1 b/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.1
+++ b/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.2 b/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.2
index 845e5d00f1ea..ef3bdad4bb97 100644
--- a/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.2
+++ b/kde-base/kdeartwork-styles/files/digest-kdeartwork-styles-3.4.2
@@ -1 +1,4 @@
+MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
+MD5 79c547de84f482edf5f8f26ba96dbf6f kdeartwork-3.4.1-3.4.2.tar.xdelta 291128
 MD5 3fcf6c047ee7350350a9a4c918299603 kdeartwork-3.4.2.tar.bz2 18023334
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.1.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.1.ebuild
index 559a12424310..a549074bbdbd 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.1.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.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/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra styles for kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.2.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.2.ebuild
index 8d1fc473cfd7..de0f2ad8200d 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.2.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.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/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra styles for kde"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.3.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.3.ebuild
index 804cf96a5e52..c20009fb0cd4 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.3.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.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/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra styles for kde"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0.ebuild
index 7b5e646cce43..db039d65a931 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.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/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_beta2.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_beta2.ebuild
index 96a66d019091..7f9f624782f9 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_beta2.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/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra styles for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_rc1.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_rc1.ebuild
index 3312b5306aa7..cefb920bf8a2 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_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/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5_beta1.ebuild b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5_beta1.ebuild
index a9df7a886c9c..e8a70cc798c8 100644
--- a/kde-base/kdeartwork-styles/kdeartwork-styles-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-styles/kdeartwork-styles-3.5_beta1.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/kde-base/kdeartwork-styles/kdeartwork-styles-3.5_beta1.ebuild,v 1.1 2005/09/22 18:20:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-styles/kdeartwork-styles-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMMODULE=styles
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Extra styles for kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-styles/metadata.xml b/kde-base/kdeartwork-styles/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-styles/metadata.xml
+++ b/kde-base/kdeartwork-styles/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork-wallpapers/ChangeLog b/kde-base/kdeartwork-wallpapers/ChangeLog
index 8ff2bf597870..27471aed358b 100644
--- a/kde-base/kdeartwork-wallpapers/ChangeLog
+++ b/kde-base/kdeartwork-wallpapers/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/kdeartwork-wallpapers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.1 2005/01/15 02:24:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/ChangeLog,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
+
+*kdeartwork-wallpapers-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-wallpapers-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeartwork-wallpapers-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-wallpapers-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeartwork-wallpapers-3.5_beta1.ebuild,
+  kdeartwork-wallpapers-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeartwork-wallpapers-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-wallpapers-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeartwork-wallpapers-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeartwork-wallpapers-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-wallpapers-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdeartwork-wallpapers-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeartwork-wallpapers-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeartwork-wallpapers-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-wallpapers-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-wallpapers-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdeartwork-wallpapers-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-wallpapers-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeartwork-wallpapers-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-wallpapers-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdeartwork-wallpapers-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdeartwork-wallpapers-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdeartwork-wallpapers-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdeartwork-wallpapers-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeartwork-wallpapers-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeartwork-wallpapers-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeartwork-wallpapers-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeartwork-wallpapers-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeartwork-wallpapers/Manifest b/kde-base/kdeartwork-wallpapers/Manifest
index 27cfac7af488..0efb45aca765 100644
--- a/kde-base/kdeartwork-wallpapers/Manifest
+++ b/kde-base/kdeartwork-wallpapers/Manifest
@@ -1,4 +1,12 @@
-MD5 b5bcacf791eb898ecf2c663e987514fa kdeartwork-wallpapers-3.4.0_alpha1.ebuild 269
-MD5 b5bcacf791eb898ecf2c663e987514fa kdeartwork-wallpapers-3.4.0_beta1.ebuild 269
-MD5 09af1c83a94e3efb529eb66b885e7559 files/digest-kdeartwork-wallpapers-3.4.0_beta1 224
-MD5 38c5ad109eb2d23480bb8643f6f3d7f8 files/digest-kdeartwork-wallpapers-3.4.0_alpha1 72
+MD5 09fb3959a5a18e0fa19afcb697c11ce8 ChangeLog 3455
+MD5 3ce4c765a64632e913584e2bc500f6d3 files/digest-kdeartwork-wallpapers-3.4.1 220
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-wallpapers-3.5.0 71
+MD5 025789635e7fc20be5b0cd4ef7f7401e files/digest-kdeartwork-wallpapers-3.5.0_beta2 224
+MD5 9416a0c97953bce3beb6c13558ce414f files/digest-kdeartwork-wallpapers-3.5.0_rc1 310
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-wallpapers-3.5_beta1 72
+MD5 2d95c5f3732fb3bc30abb2ee27ef4901 kdeartwork-wallpapers-3.4.1.ebuild 447
+MD5 6cd155f54a00a529cc1c5dfdf8b3c07a kdeartwork-wallpapers-3.5.0.ebuild 424
+MD5 00d72869f7754b20cc3b2e85ef57bcb1 kdeartwork-wallpapers-3.5.0_beta2.ebuild 429
+MD5 e1e6f2f284a54a8eb2d75cb6df1a8e88 kdeartwork-wallpapers-3.5.0_rc1.ebuild 428
+MD5 24e5f5dc4a3e31479423e11d2de621b6 kdeartwork-wallpapers-3.5_beta1.ebuild 427
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdeartwork-wallpapers/files/digest-kdeartwork-wallpapers-3.4.1 b/kde-base/kdeartwork-wallpapers/files/digest-kdeartwork-wallpapers-3.4.1
index 4a6ba39eb025..b5135ccada48 100644
--- a/kde-base/kdeartwork-wallpapers/files/digest-kdeartwork-wallpapers-3.4.1
+++ b/kde-base/kdeartwork-wallpapers/files/digest-kdeartwork-wallpapers-3.4.1
@@ -1,2 +1,3 @@
 MD5 89df94d9e6c63887e5a66312b6514d0d kdeartwork-3.4.0.tar.bz2 18077818
+MD5 225e4274446ffe3b2a23997c1dc1a2c1 kdeartwork-3.4.0-3.4.1.tar.xdelta 301755
 MD5 0f58245c2fa3c58dbe139da43037a203 kdeartwork-3.4.1.tar.bz2 18066167
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.4.1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.4.1.ebuild
index aa7540d87944..c52fda9b4d61 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.4.1.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMMODULE=wallpapers
 KMNAME=kdeartwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0.ebuild
index 3919afaea1ef..02b6fb413cb5 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.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/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMMODULE=wallpapers
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_beta2.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_beta2.ebuild
index df3bd16167d0..28033c27b152 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_beta2.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/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMMODULE=wallpapers
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_rc1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_rc1.ebuild
index 2fb30f3308c6..c0c298ed19b1 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_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/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMMODULE=wallpapers
 KMNAME=kdeartwork
diff --git a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5_beta1.ebuild b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5_beta1.ebuild
index 7415a6dff00e..a870c7c444d1 100644
--- a/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5_beta1.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/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5_beta1.ebuild,v 1.1 2005/09/22 18:21:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork-wallpapers/kdeartwork-wallpapers-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMMODULE=wallpapers
 KMNAME=kdeartwork
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Wallpapers from kde"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kdeartwork-wallpapers/metadata.xml b/kde-base/kdeartwork-wallpapers/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork-wallpapers/metadata.xml
+++ b/kde-base/kdeartwork-wallpapers/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeartwork/ChangeLog b/kde-base/kdeartwork/ChangeLog
index 3bf52c1657b8..110ab88e1244 100644
--- a/kde-base/kdeartwork/ChangeLog
+++ b/kde-base/kdeartwork/ChangeLog
@@ -1,6 +1,563 @@
 # ChangeLog for kde-base/kdeartwork
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/ChangeLog,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeartwork-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdeartwork-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeartwork-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeartwork-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeartwork-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdeartwork-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeartwork-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeartwork-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeartwork-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeartwork-3.4.3.ebuild:
+  New version.
+
+*kdeartwork-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4.3-configure.patch,
+  +files/kdeartwork-3.4.3-kfiresaver.patch, +kdeartwork-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdeartwork-3.4.2.ebuild:
+  Keyworded ~mips.
+
+*kdeartwork-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeartwork-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdeartwork-3.4.1.ebuild:
+  stable on ia64
+
+*kdeartwork-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.5_alpha1-xscreensaver.patch,
+  +kdeartwork-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  11 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  files/kdeartwork-3.4-configure.patch:
+  Update configure patch to fix compilation problem (#102031).
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdeartwork-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdeartwork-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4-configure.patch, +kdeartwork-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Fix detection of xscreensaver
+  (#98819).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeartwork-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeartwork-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeartwork-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeartwork-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdeartwork-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdeartwork-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.4.1-configure.patch, +kdeartwork-3.4.1.ebuild:
+  New version. Add patch to fix arts detection (#91696).
+
+  10 May 2005; Aron Griffis <agriffis@gentoo.org> kdeartwork-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeartwork-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdeartwork-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeartwork-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+  12 Mar 2005; Hardave Riar <hardave@gentoo.org> kdeartwork-3.3.2.ebuild:
+  Marked ~mips.
+
+*kdeartwork-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeartwork-3.4.0_rc1.ebuild:
+  New version.
+
+  19 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeartwork-3.3.2-gl-kdesavers.patch,
+  +files/kdeartwork-3.4.0_beta2-gl-kdesavers.patch, kdeartwork-3.3.2.ebuild,
+  kdeartwork-3.4.0_beta2.ebuild:
+  Fix compilation when using --without-gl (#46775).
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdeartwork-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdeartwork-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeartwork-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdeartwork-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdeartwork-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdeartwork-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeartwork-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdeartwork-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdeartwork-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdeartwork-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdeartwork-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdeartwork-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdeartwork-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdeartwork-3.3.1.ebuild:
+  Stable on ppc.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdeartwork-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdeartwork-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdeartwork-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdeartwork-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.0.ebuild:
+  Add in dep on xscreensaver (Bug #39011)
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdeartwork-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeartwork-3.2.1.ebuild:
+  3.3.0 is x86 stable
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> kdeartwork-3.3.0.ebuild:
+  stable on ppc64, bug #62166
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeartwork-3.1.5.ebuild, kdeartwork-3.2.1.ebuild, kdeartwork-3.3.0.ebuild:
+  Masked kdeartwork-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeartwork-3.1.5.ebuild, kdeartwork-3.2.1.ebuild:
+  Masked kdeartwork-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeartwork-3.1.5.ebuild:
+  Masked kdeartwork-3.1.5.ebuild stable for ppc
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.0.ebuild,
+  files/3.3.0-kfiresaver-Makefile.am.patch,
+  files/3.3.0-kfiresaver-configure.in.in.patch:
+  Add a patch to make it compile without arts support
+
+*kdeartwork-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.0.ebuild,
+  kdeartwork-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+  17 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdeartwork-3.2.3.ebuild,
+  kdeartwork-3.3.0_rc2.ebuild:
+  xscreensaver path fix, #36508
+
+*kdeartwork-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.3.0_beta1.ebuild,
+  kdeartwork-3.3.0_rc2.ebuild:
+  add _rc2, remove _beta1
+
+*kdeartwork-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdeartwork-3.3.0_beta2.ebuild:
+  new beta
+
+*kdeartwork-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdeartwork-3.3.0_alpha1.ebuild, +kdeartwork-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdeartwork-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdeartwork-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdeartwork-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdeartwork-3.2.2.ebuild:
+  stable on amd64
+
+*kdeartwork-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdeartwork-3.3.0_alpha1.ebuild:
+  3.3 alpha 1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdeartwork-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2003; Daniel Ostrow <dostrow@gentoo.org> kdeartwork-3.2.2.ebuild:
+  Stableon ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.2.2.ebuild:
+  Stable on sparc.
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> kdeartwork-3.2.2.ebuild:
+  Added to ~mips
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/kdeartwork-screensaver.patch, -kdeartwork-3.0.5b.ebuild:
+  Remove old version
+
+*kdeartwork-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdeartwork-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdeartwork-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.1.4.ebuild,
+  kdeartwork-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kdeartwork-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdeartwork-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdeartwork-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdeartwork-3.2.0 (02 Feb 2004)
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeartwork-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdeartwork-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.0.4.ebuild,
+  kdeartwork-3.1.2.ebuild, kdeartwork-3.2.0_beta1.ebuild,
+  kdeartwork-3.2.0_beta2.ebuild, kdeartwork-3.2.0_rc1.ebuild:
+  New version, removing old versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeartwork-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdeartwork-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeartwork-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdeartwork-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdeartwork-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdeartwork-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdeartwork-3.1.4.ebuild:
+  Marked ppc
+
+*kdeartwork-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.2.0_beta1.ebuild:
+  New beta version
+
+  23 Oct 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.2.0_alpha2.ebuild:
+  Remove the patch, as the files isn't in the package anymore
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdeartwork-3.1.4.ebuild:
+  add ~amd64 flag
+
+*kdeartwork-3.2.0_alpha2 (07 Oct 2003)
+
+  07 Oct 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-2.2.2.ebuild,
+  kdeartwork-2.2.2.ebuild, kdeartwork-3.1.1.ebuild, kdeartwork-3.1.1.ebuild,
+  kdeartwork-3.1.3.ebuild, kdeartwork-3.1.3.ebuild:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.1.4.ebuild:
+  marking x86 stable
+
+*kdeartwork-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeartwork-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+*kdeartwork-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdeartwork-3.1.3.ebuild:
+  Version bump
+
+  20 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1 
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdeartwork-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeartwork-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdeartwork-3.1.2.ebuild:
+  New version of KDE.
+
+*kdeartwork-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeartwork-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdeartwork-3.1.1 (14 Mar 2003)
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdeartwork-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdeartwork-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeartwork-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdeartwork-3.1.ebuild:
+  Added ~alpha keyword
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdeartwork-3.0.2.ebuild,
+  kdeartwork-3.0.3.ebuild, kdeartwork-3.1_rc6.ebuild: removed old ebuilds
+  
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdeartwork-3.1.ebuild:
+  added ~sparc to keywords
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdeartwork-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdeartwork-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdeartwork-3.1_rc6.ebuild:
+  version bump
+
+*kdeartwork-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdeartwork-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdeartwork-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdeartwork-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdeartwork-3.1.ebuild:
+  Added ppc keyword
+
+*kdeartwork-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdeartwork-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdeartwork-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+  26 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix the dep on kdebase: make it a dep on the $PV version of kdebase,
+  i.e. kdeartwork's version.
+
+*kdeartwork-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdeartwork-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : :
+
+  New stability release.
+
+*kdeartwork-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+  26 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Add missing dep on ~kdebase-$PV.
+
+*kdeartwork-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1). Ebuild cleanup.
+
+*kdeartwork-3.0-r1 (22 Apr 2002)
+
+  22 Apr 2002; Ryan Phillips <rphillips@gentoo.org> kdeartwork-3.0-r1 :
+
+  No version rev.  Fixed pipes.cpp to compile with nvidia headers.
+  I hope this doesn't break anything.
+
+*kdeartwork-3.0-r1 (18 Apr 2002)
+
+  18 Apr 2002; Ryan Phillips <rphillips@gentoo.org> kdeartwork-3.0-r1 :
+
+  Variable was overwriting the GL dependency. Fixed (#1950)
+
+*kdeartwork-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdeartwork-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdeartwork/Manifest b/kde-base/kdeartwork/Manifest
index 4b9905679f32..725bf64ab51e 100644
--- a/kde-base/kdeartwork/Manifest
+++ b/kde-base/kdeartwork/Manifest
@@ -1,15 +1,33 @@
-MD5 230a7e59d9d1846828ca84532f281b8c kdeartwork-3.0.5b.ebuild 786
-MD5 935a830c59a85491fdeba4b43fbccf34 kdeartwork-3.1.ebuild 553
-MD5 d6687083e11588e24d45481465d6569b kdeartwork-3.0.4.ebuild 775
-MD5 dbdc851f9febc193e1bc496df88fdcd2 kdeartwork-3.0.5a.ebuild 784
-MD5 0df288991b8ca4cb4d0575ba732ca4af kdeartwork-2.2.2.ebuild 396
-MD5 5b15f06c8cba012b87b1c1de86105f56 kdeartwork-3.1.1.ebuild 556
-MD5 8d003836b6c38cc1c770a848bcf21aa6 ChangeLog 4425
-MD5 c1d6b596c0614da94a656a6eab560f66 files/digest-kdeartwork-3.0.5a 72
-MD5 48e8d7fd608bfc6ac151f6ac3cc05a27 files/digest-kdeartwork-3.0.5b 297
-MD5 5c1ca939fc1dbb4714ca55f8c707ebf1 files/kdeartwork-screensaver.patch 634
-MD5 e09643b7d8304e13d5a69d62946ec733 files/digest-kdeartwork-2.2.2 70
-MD5 f6e92fde8ace49b0d447aaf6ddf8f978 files/digest-kdeartwork-3.0.4 71
-MD5 e748fe1957c4ee16a31c8d47847e2f12 files/digest-kdeartwork-3.1.1 71
-MD5 c8aa641bca5096a0158636729b7acc9b files/digest-kdeartwork-3.1 69
-MD5 1579545755bc63505fd6c670f9e70bdc files/xsaver-conflicting-typedefs.diff 510
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4316ed07c9269fd535d95af504f69581 ChangeLog 17540
+MD5 976327b55d73654f03a7c4545f59d516 files/digest-kdeartwork-3.3.2 71
+MD5 48916b43a9686c5c004bb311c8acc1c6 files/digest-kdeartwork-3.4.1 71
+MD5 b63dbb6cdbc61bdd0f73baace77284a1 files/digest-kdeartwork-3.4.2 71
+MD5 48256bc40d421d92b903308f172a596e files/digest-kdeartwork-3.4.3 71
+MD5 5d798bbc72f84bd47d8347da83a552a2 files/digest-kdeartwork-3.5.0 71
+MD5 0b4aa84d68a5789a9d4d8411dbc156e2 files/digest-kdeartwork-3.5.0_beta2 72
+MD5 548c9852f0538dfa7f7cc65b2c19ee24 files/digest-kdeartwork-3.5.0_rc1 75
+MD5 7f1e0c6f226befe1c3b684e3bdf5b4a8 files/digest-kdeartwork-3.5_beta1 72
+MD5 a78e3dcfd0504ff7a053ec4c918c845f files/kdeartwork-3.3.2-gl-kdesavers.patch 711
+MD5 a51b6bfc735f8cec40cd4481a289309d files/kdeartwork-3.4-configure.patch 7591
+MD5 fe55c64ff5050b92d175b2114c2d1667 files/kdeartwork-3.4.1-configure.patch 815
+MD5 45fe881cc7f39f2d70b8b4ccc61cf707 files/kdeartwork-3.4.3-configure.patch 5729
+MD5 789091c90eea0d565e886b92589f1119 files/kdeartwork-3.4.3-kfiresaver.patch 765
+MD5 00e5d82dd484b4ad1bd36338cc5b9ad3 kdeartwork-3.3.2.ebuild 833
+MD5 e35b31c29a9467d7afd6564eeae51dd0 kdeartwork-3.4.1.ebuild 773
+MD5 5c8f4293876c1b162c00e153f2131dca kdeartwork-3.4.2.ebuild 1110
+MD5 66675568aa7a1aa78c9713da2e66d1b2 kdeartwork-3.4.3.ebuild 934
+MD5 d1f5e9480adb0a8c9bfaf56c466aca28 kdeartwork-3.5.0.ebuild 630
+MD5 3755e95cce9c784bf40deeb032810117 kdeartwork-3.5.0_beta2.ebuild 634
+MD5 fd93140e2d1d33392d18933b523199d2 kdeartwork-3.5.0_rc1.ebuild 632
+MD5 9c5ffe183fd6f2c6e87419f0956c782c kdeartwork-3.5_beta1.ebuild 632
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhk2PntT9W3vfTuoRAvbWAKCenuDXQDTs7YDa7LHp/f2BZowbFwCaAnFR
+JZecpfrZmDIO/tXZHCsg+r0=
+=9bh8
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch b/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
index f0649e935e01..2412cdcd77f5 100644
--- a/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
+++ b/kde-base/kdeartwork/files/kdeartwork-3.4-configure.patch
@@ -1,6 +1,6 @@
 diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/kscreensaver/configure.in.in
 --- kdeartwork-3.4.2.orig/kscreensaver/configure.in.in	2005-07-20 18:40:58.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-07-26 13:54:39.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/configure.in.in	2005-08-11 18:27:34.000000000 +0200
 @@ -36,32 +36,41 @@
  AM_CONDITIONAL(COMPILE_X11_KSAVERS, test "x$ac_x_includes" != x && test "x$ac_x_libraries" != x)
  AM_CONDITIONAL(COMPILE_ARTS_KSAVERS, test x$build_arts = xyes)
@@ -65,7 +65,7 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/configure.in.in kdeartwork-3.4.2/ks
  
 diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot
 --- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-07-26 13:54:39.000000000 +0200
++++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.bot	2005-08-11 18:22:05.000000000 +0200
 @@ -1,4 +1,4 @@
 -if test "$XSCREENSAVER" = "NO"; then
 +if test "x$with_xscreensaver" = xcheck && test "$XSCREENSAVER" = "NO"; then
@@ -74,14 +74,23 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.bot kdeartwo
    echo "Check www.jwz.org/xscreensaver if you're loving to"
 diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in
 --- kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in	2005-07-20 18:40:57.000000000 +0200
-+++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-07-26 13:54:39.000000000 +0200
-@@ -1,4 +1,4 @@
++++ kdeartwork-3.4.2/kscreensaver/kxsconfig/configure.in.in	2005-08-11 18:39:20.000000000 +0200
+@@ -1,4 +1,13 @@
 -AC_DEFUN([KDE_CHECK_XSREENSAVER],
-+AC_DEFUN([KDE_CHECK_XSCREENSAVER],
++AC_DEFUN([KDE_CHECK_XSCREENSAVER_HACKS],
++[
++     XSCREENSAVER_HACKS_DIR=NO
++     AC_FIND_FILE($1/flame, [ $xscreensaver_prefixes ], XSCREENSAVER_HACKS_DIR)
++     if test "$XSCREENSAVER_HACKS_DIR" != NO; then
++	XSCREENSAVER_HACKS_DIR="$XSCREENSAVER_HACKS_DIR/$1"
++     fi
++])
++
++AC_DEFUN([KDE_CHECK_XSCREENSAVER_CONFIG],
  [
       XSCREENSAVER_CONFIG=NO
       AC_FIND_FILE($1/flame.xml, [ $xscreensaver_prefixes ], XSCREENSAVER_CONFIG)
-@@ -22,46 +22,82 @@
+@@ -22,46 +31,80 @@
  done
  IFS=$old_IFS
  
@@ -114,44 +123,41 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwor
 +    [where the xscreensaver config files are])], [])
 +
 +XSCREENSAVER=NO
-+XSCREENSAVER_CONFIG=NO
 +if test "x$with_xscreensaver" != xno; then
-+  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
-+    XSCREENSAVER="$with_xscreensaver_dir/flame"
-+  fi
++  XSCREENSAVER_HACKS_DIR=NO
++  XSCREENSAVER_CONFIG=NO
 +
-+  if test "x$XSCREENSAVER" = xNO && test -n "$kdelibsuff"; then
-+    KDE_FIND_PATH(lib$kdelibsuff/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  fi
-+
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(lib/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  fi
++  AC_MSG_CHECKING([for xscreensaver])
 +
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(libexec/xscreensaver/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
-+  fi
-+
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(bin/xscreensaver-hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  if test -n "$with_xscreensaver_dir" && test -f "$with_xscreensaver_dir/flame"; then
++    XSCREENSAVER_HACKS_DIR="$with_xscreensaver_dir"
 +  fi
 +
-+  if test "x$XSCREENSAVER" = xNO; then
-+    KDE_FIND_PATH(hacks/flame, XSCREENSAVER, [ $xscreensaver_prefixes ])
++  if test "x$XSCREENSAVER_HACKS_DIR" = xNO; then
++     for subdir in lib$kdelibsuff/xscreensaver \
++		   lib/xscreensaver \
++		   libexec/xscreensaver \
++		   bin/xscreensaver-hacks \
++		   hacks; do
++         KDE_CHECK_XSCREENSAVER_HACKS($subdir)
++         if test "$XSCREENSAVER_HACKS_DIR" != NO; then
++		break
++         fi
++     done
 +  fi
 +
-+  AC_MSG_CHECKING([for flame.xml])
-+
-+  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
-+    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
-+  fi
++  AC_MSG_RESULT([$XSCREENSAVER_HACKS_DIR])
  
 -XSCREENSAVER_HACKS_DIR=
--
++  AC_MSG_CHECKING([for xscreensaver config files])
+ 
 -if test "$XSCREENSAVER" != "NO"; then
 -     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
 -     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
--
++  if test -n "$with_xscreensaver_config" && test -f "$with_xscreensaver_config/flame.xml"; then
++    XSCREENSAVER_CONFIG="$with_xscreensaver_config"
++  fi
+ 
 -     AC_MSG_CHECKING([for flame.xml])
 +  if test "x$XSCREENSAVER_CONFIG" = xNO; then
       for subdir in lib/xscreensaver/config \
@@ -162,7 +168,7 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwor
                     xscreensaver \
  		   config/control-center-2.0; do
 -         KDE_CHECK_XSREENSAVER($subdir)
-+         KDE_CHECK_XSCREENSAVER($subdir)
++         KDE_CHECK_XSCREENSAVER_CONFIG($subdir)
           if test "$XSCREENSAVER_CONFIG" != NO; then
  		break
           fi
@@ -174,17 +180,16 @@ diff -Nur kdeartwork-3.4.2.orig/kscreensaver/kxsconfig/configure.in.in kdeartwor
 +
 +  AC_MSG_RESULT([$XSCREENSAVER_CONFIG])
 +
-+  if test "x$XSCREENSAVER_CONFIG" = xNO; then
-+    XSCREENSAVER=NO
++  if test "x$XSCREENSAVER_HACKS_DIR" != xNO && test "x$XSCREENSAVER_CONFIG" != xNO; then
++    XSCREENSAVER=YES
 +  fi
 +
-+  if test "x$with_xscreensaver" != xcheck && test "x$XSCREENSAVER" = xNO; then
++  if test "x$with_xscreensaver" != xcheck && test "$XSCREENSAVER" != YES; then
 +    AC_MSG_ERROR([--with-xscreensaver was given, but test for xscreensaver failed])
 +  fi
 +fi
 +
 +if test "$XSCREENSAVER" != "NO"; then
-+     XSCREENSAVER_HACKS_DIR=`echo $XSCREENSAVER | sed -e 's,/flame$,,'`
 +     AC_DEFINE_UNQUOTED(XSCREENSAVER_HACKS_DIR, "$XSCREENSAVER_HACKS_DIR", [Defines where xscreensaver stores its graphic hacks])
 +     AC_DEFINE_UNQUOTED(XSCREENSAVER_CONFIG_DIR, "$XSCREENSAVER_CONFIG", [Defines where xscreensaver stores it's config files])
  fi
diff --git a/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild b/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild
index 74b0f29faaed..16df7109c993 100644
--- a/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild,v 1.1 2004/12/09 02:39:45 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE artwork package"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64 ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="opengl xscreensaver"
 
 DEPEND="opengl? ( virtual/opengl )
@@ -15,7 +15,12 @@ DEPEND="opengl? ( virtual/opengl )
 
 src_unpack() {
 	kde_src_unpack
-	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.in
+	sed -ie "s:X11R6/lib\(/X11\)\?:lib:g" kscreensaver/kxsconfig/Makefile.am
+
+	# Fix compilation with --without-gl. See bug #46775 and kde bug 89387.
+	epatch ${FILESDIR}/${P}-gl-kdesavers.patch
+
+	make -f admin/Makefile.common
 }
 
 src_compile() {
diff --git a/kde-base/kdeartwork/kdeartwork-3.4.1.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.1.ebuild
index ef11d5477a56..41177bad2882 100644
--- a/kde-base/kdeartwork/kdeartwork-3.4.1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.4.1.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/kde-base/kdeartwork/kdeartwork-3.4.1.ebuild,v 1.1 2005/05/27 08:51:57 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE artwork package"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="opengl xscreensaver"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -17,7 +17,7 @@ src_unpack() {
 	kde_src_unpack
 
 	# Fix compilation with --without-gl and detection of arts.
-	# See kde bug 89387 and 102398.
+	# See kde bug 89387 and 102398. Applied for 3.4.2.
 	epatch ${FILESDIR}/${P}-configure.patch
 
 	make -f admin/Makefile.common
diff --git a/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild
index 1861abfe2460..8913d8c24415 100644
--- a/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.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/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild,v 1.1 2005/07/28 12:55:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist eutils
 
@@ -10,6 +10,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="opengl xscreensaver"
 
 DEPEND="~kde-base/kdebase-${PV}
+	media-libs/libart_lgpl
 	opengl? ( virtual/opengl )
 	xscreensaver? ( x11-misc/xscreensaver )"
 
@@ -17,6 +18,7 @@ src_unpack() {
 	kde_src_unpack
 
 	# Configure patch. Applied for 3.5.
+	# Includes the patch in kde bug 105748, not applied yet.
 	epatch ${FILESDIR}/kdeartwork-3.4-configure.patch
 
 	# For the configure patch.
diff --git a/kde-base/kdeartwork/kdeartwork-3.4.3.ebuild b/kde-base/kdeartwork/kdeartwork-3.4.3.ebuild
index 78de00dd4b01..be6bea242335 100644
--- a/kde-base/kdeartwork/kdeartwork-3.4.3.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.4.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/kde-base/kdeartwork/kdeartwork-3.4.3.ebuild,v 1.1 2005/10/12 13:23:24 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE artwork package"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="opengl xscreensaver"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild b/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild
index 769654937f76..533ed3b59f09 100644
--- a/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.5.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/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild,v 1.1 2005/11/22 22:14:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeartwork/kdeartwork-3.5.0_beta2.ebuild b/kde-base/kdeartwork/kdeartwork-3.5.0_beta2.ebuild
index e94a61673627..4ff854aa342d 100644
--- a/kde-base/kdeartwork/kdeartwork-3.5.0_beta2.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.5.0_beta2.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/kde-base/kdeartwork/kdeartwork-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:40 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeartwork/kdeartwork-3.5.0_rc1.ebuild b/kde-base/kdeartwork/kdeartwork-3.5.0_rc1.ebuild
index 72c72cdb7d8c..8a6af83106f1 100644
--- a/kde-base/kdeartwork/kdeartwork-3.5.0_rc1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.5.0_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/kde-base/kdeartwork/kdeartwork-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:14:35 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeartwork/kdeartwork-3.5_beta1.ebuild b/kde-base/kdeartwork/kdeartwork-3.5_beta1.ebuild
index 631459980b63..c0523c6974bd 100644
--- a/kde-base/kdeartwork/kdeartwork-3.5_beta1.ebuild
+++ b/kde-base/kdeartwork/kdeartwork-3.5_beta1.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/kde-base/kdeartwork/kdeartwork-3.5_beta1.ebuild,v 1.1 2005/09/21 17:21:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeartwork/kdeartwork-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeartwork/metadata.xml b/kde-base/kdeartwork/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeartwork/metadata.xml
+++ b/kde-base/kdeartwork/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebase-data/ChangeLog b/kde-base/kdebase-data/ChangeLog
index 2a4f253ca9d2..2765ca5692d9 100644
--- a/kde-base/kdebase-data/ChangeLog
+++ b/kde-base/kdebase-data/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kdebase-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.1 2005/03/13 18:48:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/ChangeLog,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-data-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdebase-data-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebase-data-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdebase-data-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdebase-data-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdebase-data-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kdebase-data-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.5.0_beta2.ebuild:
+  New version.
+
+*kdebase-data-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kdebase-data-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdebase-data-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdebase-data-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebase-data-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdebase-data-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebase-data-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-data-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdebase-data-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdebase-data-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdebase-data-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdebase-data-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdebase-data-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdebase-data-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  24 Mar 2005; Simone Gotti <motaboy@gentoo.org> kdebase-data-3.4.0.ebuild,
+  kdebase-data-3.4.0_rc1-r1.ebuild:
+  Remove unneeded dependencies. Fixes bug #86504.
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdebase-data-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdebase-data-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> :
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdebase-data-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdebase-data-3.4.0 (13 Mar 2005)
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> +kdebase-data-3.4.0.ebuild,
+  kdebase-data-3.4.0_rc1-r1.ebuild:
+  Ooops... This shouldn't have replaced kdebase-startkde, but rather
+  kdebase-applnk. Fixing.
 
 *kdebase-data-3.4.0_rc1-r1 (13 Mar 2005)
 
diff --git a/kde-base/kdebase-data/Manifest b/kde-base/kdebase-data/Manifest
index 8fe2d2c08240..10a9e9136d5b 100644
--- a/kde-base/kdebase-data/Manifest
+++ b/kde-base/kdebase-data/Manifest
@@ -1,6 +1,26 @@
-MD5 971c90018f31b1db2b791cba10063663 kdebase-data-3.4.0_rc1-r1.ebuild 2020
-MD5 51e2d27bfc8c66f05157ae118c8ff9f4 kdebase-data-3.4.0.ebuild 2004
-MD5 73d99fe43f941a329bf4eeba2f34c201 ChangeLog 350
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 bf55cbe0244386a3b46be4ca7fe7bc8a files/digest-kdebase-data-3.4.0_rc1-r1 378
-MD5 54e17e8f38d377972c220f10357c9b2f files/digest-kdebase-data-3.4.0 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d9f7a62ad292e2f37e2e521f58327ee5 ChangeLog 3758
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-data-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdebase-data-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdebase-data-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdebase-data-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdebase-data-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdebase-data-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-data-3.5_beta1 69
+MD5 d7f1f28b9fcacc33d401afc1ff351a55 kdebase-data-3.4.1.ebuild 633
+MD5 c99761443de0b322e1104f98697b2369 kdebase-data-3.4.2.ebuild 646
+MD5 8b6619d8709a681e1fad24db07d404a4 kdebase-data-3.4.3.ebuild 642
+MD5 f126109815b08dd7ffe7a82fa7bff2c3 kdebase-data-3.5.0.ebuild 627
+MD5 e1bb40c0eb2876e946ee0280c1bb959c kdebase-data-3.5.0_beta2.ebuild 630
+MD5 fa4236ac64e0b91675287d4e824e856e kdebase-data-3.5.0_rc1.ebuild 631
+MD5 da15bb4ae7cbb22d031b64dc0e0ffe8f kdebase-data-3.5_beta1.ebuild 628
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjntntT9W3vfTuoRAtK6AJ9grSI98v2y/kbPYeK53vjnCZemtACfQi1O
+ClaEfyO8TyM1XFUt63eI0VY=
+=51kN
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-data/files/digest-kdebase-data-3.4.1 b/kde-base/kdebase-data/files/digest-kdebase-data-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdebase-data/files/digest-kdebase-data-3.4.1
+++ b/kde-base/kdebase-data/files/digest-kdebase-data-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdebase-data/files/digest-kdebase-data-3.4.2 b/kde-base/kdebase-data/files/digest-kdebase-data-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdebase-data/files/digest-kdebase-data-3.4.2
+++ b/kde-base/kdebase-data/files/digest-kdebase-data-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdebase-data/kdebase-data-3.4.1.ebuild b/kde-base/kdebase-data/kdebase-data-3.4.1.ebuild
index 542a332f10d7..e7da49da8ad9 100644
--- a/kde-base/kdebase-data/kdebase-data-3.4.1.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.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/kde-base/kdebase-data/kdebase-data-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase. Includes the l10n, pics and applnk subdirs."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-data/kdebase-data-3.4.2.ebuild b/kde-base/kdebase-data/kdebase-data-3.4.2.ebuild
index bdc5723145f0..219cda41d368 100644
--- a/kde-base/kdebase-data/kdebase-data-3.4.2.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.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/kde-base/kdebase-data/kdebase-data-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase. Includes the l10n, pics and applnk subdirs."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-data/kdebase-data-3.4.3.ebuild b/kde-base/kdebase-data/kdebase-data-3.4.3.ebuild
index 490d5f5ab618..4622fa20e0c0 100644
--- a/kde-base/kdebase-data/kdebase-data-3.4.3.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.4.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/kde-base/kdebase-data/kdebase-data-3.4.3.ebuild,v 1.1 2005/10/13 00:09:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase. Includes the l10n, pics and applnk subdirs."
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-data/kdebase-data-3.5.0.ebuild b/kde-base/kdebase-data/kdebase-data-3.5.0.ebuild
index 03cd17b13215..daabaa1120de 100644
--- a/kde-base/kdebase-data/kdebase-data-3.5.0.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.5.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/kde-base/kdebase-data/kdebase-data-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
diff --git a/kde-base/kdebase-data/kdebase-data-3.5.0_beta2.ebuild b/kde-base/kdebase-data/kdebase-data-3.5.0_beta2.ebuild
index 42ea6dcf11c8..8ea2ae4af0ec 100644
--- a/kde-base/kdebase-data/kdebase-data-3.5.0_beta2.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.5.0_beta2.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/kde-base/kdebase-data/kdebase-data-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase. Includes the l10n, pics and applnk subdirs."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-data/kdebase-data-3.5.0_rc1.ebuild b/kde-base/kdebase-data/kdebase-data-3.5.0_rc1.ebuild
index c0e7ea5b36c3..57a15e28ab7a 100644
--- a/kde-base/kdebase-data/kdebase-data-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.5.0_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/kde-base/kdebase-data/kdebase-data-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
diff --git a/kde-base/kdebase-data/kdebase-data-3.5_beta1.ebuild b/kde-base/kdebase-data/kdebase-data-3.5_beta1.ebuild
index e2113c73ccd1..e0eab17b2c2f 100644
--- a/kde-base/kdebase-data/kdebase-data-3.5_beta1.ebuild
+++ b/kde-base/kdebase-data/kdebase-data-3.5_beta1.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/kde-base/kdebase-data/kdebase-data-3.5_beta1.ebuild,v 1.1 2005/09/22 18:22:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-data/kdebase-data-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Icons, localization data and various .desktop files from kdebase. Includes the l10n, pics and applnk subdirs."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-data/metadata.xml b/kde-base/kdebase-data/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebase-data/metadata.xml
+++ b/kde-base/kdebase-data/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 6ce06e9e80da..8f8da207e898 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,170 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-kioslaves-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdebase-kioslaves-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebase-kioslaves-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdebase-kioslaves-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-kioslaves-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdebase-kioslaves-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-kioslaves-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdebase-kioslaves-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  kdebase-kioslaves-3.5.0_beta2.ebuild:
+  Removed no longer necessary patch.
+
+*kdebase-kioslaves-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-kioslaves-3.5.0_beta2.ebuild:
+  New version.
+
+*kdebase-kioslaves-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-kioslaves-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kdebase-kioslaves-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+*kdebase-kioslaves-3.4.2-r1 (02 Oct 2005)
+
+  02 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kubuntu_23_hal_api.diff, +kdebase-kioslaves-3.4.2-r1.ebuild:
+  Applied kubuntu patch to kioslaves to allow it to work with the new
+  hal/dbus, bug 105553.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdebase-kioslaves-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdebase-kioslaves-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebase-kioslaves-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdebase-kioslaves-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-3.5-configure-openexr.patch,
+  +kdebase-kioslaves-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-kioslaves-3.4.2.ebuild:
+  ~alpha keyword.
+
+  29 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdebase-openexr.patch,
+  kdebase-kioslaves-3.4.2.ebuild:
+  Add configure patch that fixes our control of whether openexr support is
+  compiled or not. Add optional dep on openexr.
+
+*kdebase-kioslaves-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-kioslaves-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdebase-kioslaves-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdebase-kioslaves-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdebase-kioslaves-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdebase-kioslaves-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-configure.patch, +kdebase-kioslaves-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966).
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild, kdebase-kioslaves-3.4.1.ebuild:
+  remove kdesktop from dependencies, #89867
+
+*kdebase-kioslaves-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-kioslaves-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  10 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild:
+  corrected dbus and hal dependencies, #91903
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  22 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild:
+  corrected dependencies
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdebase-kioslaves-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-kioslaves-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  28 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdebase-kioslaves-3.4.0_rc1.ebuild:
+  Add support for hal/dbus.
+
+*kdebase-kioslaves-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-kioslaves-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdebase-kioslaves-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-kioslaves-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  18 Jan 2005; Simone Gotti <motaboy@gentoo.org>
+  kdebase-kioslaves-3.4.0_beta1.ebuild:
+  Remove sasl USE flag and make it a fixed dep. Fixes bug #78290.
 
 *kdebase-kioslaves-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index e0d3d02236f4..40845de14f76 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,4 +1,33 @@
-MD5 d3055f2ec77f6a244f4a791d2af5697d kdebase-kioslaves-3.4.0_beta1.ebuild 707
-MD5 d3055f2ec77f6a244f4a791d2af5697d kdebase-kioslaves-3.4.0_alpha1.ebuild 707
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdebase-kioslaves-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdebase-kioslaves-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee0d55d323cc8cd5f9e86d2d1b19edc6 ChangeLog 5642
+MD5 00c42877b616c0d2c5df33a6eaecbfdd files/configure-fix-kdebase-openexr.patch 703
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-kioslaves-3.4.1 212
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-kioslaves-3.4.1-r1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdebase-kioslaves-3.4.2 287
+MD5 b6281505be2ad7a32d59e136fad31976 files/digest-kdebase-kioslaves-3.4.2-r1 362
+MD5 b00bc3487e612ed4aa511ace892d5937 files/digest-kdebase-kioslaves-3.4.3 145
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdebase-kioslaves-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdebase-kioslaves-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdebase-kioslaves-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-kioslaves-3.5_beta1 69
+MD5 51057f5a3aacb159e8d4cc4af02b00e6 files/kdebase-3.4.1-configure.patch 1916
+MD5 dfb258d599bf770949dff416197af77f files/kdebase-3.5-configure-openexr.patch 780
+MD5 905699f5d72415ca005d2a915cb4731c kdebase-kioslaves-3.4.1-r1.ebuild 962
+MD5 3196f5d7edade715c6861def61990244 kdebase-kioslaves-3.4.1.ebuild 895
+MD5 aa60665f6528f6da8f064764de4bfe70 kdebase-kioslaves-3.4.2-r1.ebuild 1299
+MD5 baa5d6bb5f0bda49ce3e96283732ca46 kdebase-kioslaves-3.4.2.ebuild 1096
+MD5 48fc2af5a7db78b5f70b131417ceff43 kdebase-kioslaves-3.4.3.ebuild 1296
+MD5 3392e7d0c0735ba8ddace32c7309d4e3 kdebase-kioslaves-3.5.0.ebuild 918
+MD5 314b5c31e180d391a5c5eebf7bde3fdb kdebase-kioslaves-3.5.0_beta2.ebuild 921
+MD5 7af8fa019f9d2973ad154473643fc9ee kdebase-kioslaves-3.5.0_rc1.ebuild 922
+MD5 06a88c81d95a7d3eeda92d506171826d kdebase-kioslaves-3.5_beta1.ebuild 1024
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjyantT9W3vfTuoRAojoAJsEX7dCS9FP0atU+KW5fU5r2wIEBQCfRbsk
+O3LgpbZr8yxWmcmy8fgEGBo=
+=DZUJ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1 b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1
+++ b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2 b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2
+++ b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2-r1 b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2-r1
index a5f92d1d76f9..1499ccaca563 100644
--- a/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2-r1
+++ b/kde-base/kdebase-kioslaves/files/digest-kdebase-kioslaves-3.4.2-r1
@@ -2,3 +2,4 @@ MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
 MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
+MD5 81bc814fdd3d572f305a8fb93daa6949 kdebase-3.4-kubuntu-hal.patch.gz 8340
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild
index 0f7ec244cdeb..be2d844f5e74 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild,v 1.1 2005/06/07 13:01:52 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="hal ldap samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1.ebuild
index a7a82a816a6e..fb14a2bcb1c8 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE="hal ldap samba"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
@@ -17,8 +17,7 @@ DEPEND="ldap? ( net-nds/openldap )
 	hal? ( =sys-apps/dbus-0.23*
 	       =sys-apps/hal-0.4* )"
 RDEPEND="${DEPEND}
-	$(deprange $PV $MAXKDEVER kde-base/kdesktop)
-	$(deprange $PV $MAXKDEVER kde-base/kdialog)"  # both for the kdeeject script used by the devices/mounthelper ioslave
+	$(deprange $PV $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
 
 
 src_compile () {
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2-r1.ebuild
index d608adfa16f2..2075e427b24d 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2-r1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2-r1.ebuild,v 1.1 2005/10/02 14:20:19 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -8,23 +8,26 @@ MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
+SRC_URI="${SRC_URI} mirror://gentoo/kdebase-3.4-kubuntu-hal.patch.gz"
+
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
-	hal? ( >=sys-apps/dbus
-	       >=sys-apps/hal )
+	hal? ( sys-apps/dbus
+	       sys-apps/hal )
 	openexr? ( media-libs/openexr )"
 RDEPEND="${DEPEND}
 	$(deprange 3.4.1 $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
+
 # for --with-samba
 PATCHES="${FILESDIR}/kdebase-3.4.1-configure.patch"
 # for --with-openexr
 PATCHES="$PATCHES $FILESDIR/configure-fix-kdebase-openexr.patch"
 # Use the kubuntu patch to allow the kioslave to work with the new hal/dbus
-PATCHES="${PATCHES} ${FILESDIR}/kubuntu_23_hal_api.diff"
+PATCHES="${PATCHES} ${DISTDIR}/kdebase-3.4-kubuntu-hal.patch.gz"
 
 myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild
index 6ad551b089a6..4fdba8b0de66 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -9,20 +9,20 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="hal ldap samba"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
 	>=dev-libs/cyrus-sasl-2
 	hal? ( =sys-apps/dbus-0.23*
-	       =sys-apps/hal-0.4* )"
+	       =sys-apps/hal-0.4* )
+	openexr? ( media-libs/openexr )"
 RDEPEND="${DEPEND}
-	$(deprange 3.4.1-r1 $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
+	$(deprange 3.4.1 $MAXKDEVER kde-base/kdialog)"  # for the kdeeject script used by the devices/mounthelper ioslave
 # for --with-samba
 PATCHES="${FILESDIR}/kdebase-3.4.1-configure.patch"
+# for --with-openexr
+PATCHES="$PATCHES $FILESDIR/configure-fix-kdebase-openexr.patch"
 
-src_compile () {
-	myconf="$myconf `use_with ldap` `use_with samba` `use_with hal`"
-	kde-meta_src_compile
-}
+myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
 
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild
index 0f2dfbf38494..40757048d628 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -11,7 +11,7 @@ inherit kde-meta eutils
 SRC_URI="${SRC_URI} mirror://gentoo/kdebase-3.4.3-kubuntu-hal.patch.gz"
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0.ebuild
index cbb7091e37c3..fabac0e7bed6 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_beta2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_beta2.ebuild
index c8b7521ecdd2..107486c0fe15 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_beta2.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_beta2.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
@@ -22,10 +22,3 @@ RDEPEND="${DEPEND}
 
 myconf="$myconf `use_with ldap` `use_with samba` `use_with hal` `use_with openexr`"
 
-src_unpack() {
-	kde-meta_src_unpack
-
-	cd ${S}
-	epatch ${FILESDIR}/kdebase-3.5-configure-openexr.patch
-}
-
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_rc1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_rc1.ebuild
index 92ea46c56b4f..9c0e57ae6bdb 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5_beta1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5_beta1.ebuild
index a1d94c8e3e89..2d557d134500 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5_beta1.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5_beta1.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/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5_beta1.ebuild,v 1.1 2005/09/22 18:23:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="hal ldap samba openexr"
 DEPEND="ldap? ( net-nds/openldap )
 	samba? ( >=net-fs/samba-3.0.1 )
diff --git a/kde-base/kdebase-kioslaves/metadata.xml b/kde-base/kdebase-kioslaves/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebase-kioslaves/metadata.xml
+++ b/kde-base/kdebase-kioslaves/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebase-meta/ChangeLog b/kde-base/kdebase-meta/ChangeLog
index f978b0ee0cad..05e91324a4d0 100644
--- a/kde-base/kdebase-meta/ChangeLog
+++ b/kde-base/kdebase-meta/ChangeLog
@@ -1,6 +1,130 @@
 # ChangeLog for kde-base/kdebase-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdebase-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebase-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdebase-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdebase-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdebase-meta-3.5_beta1.ebuild, kdebase-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdebase-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdebase-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdebase-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdebase-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebase-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdebase-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdebase-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebase-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdebase-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdebase-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdebase-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdebase-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdebase-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdebase-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdebase-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdebase-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdebase-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdebase-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdebase-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdebase-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdebase-meta-3.4.0_beta1.ebuild, kdebase-meta-3.4.0_beta2.ebuild,
+  kdebase-meta-3.4.0_rc1.ebuild:
+  Depend on the new kdebase-data package instead of kdebase-applnk.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdebase-meta-3.4.0_beta1.ebuild, kdebase-meta-3.4.0_beta2.ebuild,
+  kdebase-meta-3.4.0_rc1.ebuild:
+  Change deps from kdebase-l10n, -startkde and -pics to the new apcakge
+  kdebase-data which replaces them.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdebase-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdebase-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdebase-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdebase-meta/Manifest b/kde-base/kdebase-meta/Manifest
index c7e8f3f43f90..f77e24562cf7 100644
--- a/kde-base/kdebase-meta/Manifest
+++ b/kde-base/kdebase-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 dfe7cb1207bc467bc3cae9330c3139c3 kdebase-meta-3.4.0_alpha1.ebuild 2286
-MD5 dfe7cb1207bc467bc3cae9330c3139c3 kdebase-meta-3.4.0_beta1.ebuild 2286
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.4.0_alpha1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 014969ca9014412b611acea4a6469af8 ChangeLog 4488
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-meta-3.5_beta1 0
+MD5 d9cf09112472e8a05372d6e7d01b9567 kdebase-meta-3.4.1.ebuild 2270
+MD5 4717b82557ace97d037f3a94e31602cc kdebase-meta-3.4.2.ebuild 2303
+MD5 5b3e3ea136c02592af1c5178b9612c42 kdebase-meta-3.4.3.ebuild 2301
+MD5 c0dfdd1c3c29e437213bbf56a2423613 kdebase-meta-3.5.0.ebuild 2259
+MD5 fb9e673a292da9c67baa42e9904e50ce kdebase-meta-3.5.0_beta2.ebuild 2300
+MD5 3b2080eb6b25d1a0bb596c4c7f662e83 kdebase-meta-3.5.0_rc1.ebuild 2309
+MD5 72f5b4ce6ad2e9fdd33d1f8b7828ef62 kdebase-meta-3.5_beta1.ebuild 2262
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkP4ntT9W3vfTuoRAgXBAJ0cfJCRdyhW4fratDJYv02uU8iVogCcC+f0
+r+pp+8ULKsSwsZk3ImTLHrg=
+=DLTe
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.4.1.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.4.1.ebuild
index 459172985e56..f7c3f4a46d5c 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.4.1.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.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/kde-base/kdebase-meta/kdebase-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.4.2.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.4.2.ebuild
index 9b9cf377d8c5..9a19966e6826 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.4.2.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.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/kde-base/kdebase-meta/kdebase-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.4.3.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.4.3.ebuild
index 80952d2ee9a7..7aa0d7811c4f 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.4.3.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.4.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/kde-base/kdebase-meta/kdebase-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.0.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.0.ebuild
index d81bd009e9f3..9bc8636e9724 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.0.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.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/kde-base/kdebase-meta/kdebase-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.0_beta2.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.0_beta2.ebuild
index 54376d3409c0..e3f8399b66d7 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.0_beta2.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/kde-base/kdebase-meta/kdebase-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5.0_rc1.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5.0_rc1.ebuild
index 9663367b804a..6efa00df2b55 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5.0_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/kde-base/kdebase-meta/kdebase-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdebase-meta/kdebase-meta-3.5_beta1.ebuild b/kde-base/kdebase-meta/kdebase-meta-3.5_beta1.ebuild
index 994c0ccb8bff..af47a15c66be 100644
--- a/kde-base/kdebase-meta/kdebase-meta-3.5_beta1.ebuild
+++ b/kde-base/kdebase-meta/kdebase-meta-3.5_beta1.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/kde-base/kdebase-meta/kdebase-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:44:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-meta/kdebase-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebase-meta/metadata.xml b/kde-base/kdebase-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebase-meta/metadata.xml
+++ b/kde-base/kdebase-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebase-pam/ChangeLog b/kde-base/kdebase-pam/ChangeLog
index 44c448b17a3a..0604e222f8d0 100644
--- a/kde-base/kdebase-pam/ChangeLog
+++ b/kde-base/kdebase-pam/ChangeLog
@@ -1,6 +1,91 @@
 # ChangeLog for kde-base/kdebase-pam
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/ChangeLog,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
+
+  16 Nov 2005; Markus Rothe <corsair@gentoo.org> kdebase-pam-6.ebuild:
+  Stable on ppc64
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdebase-pam-6.ebuild:
+  Mark 6 stable on alpha
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdebase-pam-6.ebuild:
+  stable on ia64
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kdebase-pam-6.ebuild:
+  Stable on hppa and ppc.
+
+  03 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> kdebase-pam-6.ebuild:
+  Stable on amd64.
+
+  01 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdebase-pam-6.ebuild:
+  Stable on sparc
+
+  30 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-pam-5.ebuild,
+  kdebase-pam-6.ebuild:
+  Stable on x86.
+
+*kdebase-pam-6 (09 Jul 2005)
+
+  09 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +files/kde-np.pam-6,
+  +files/kde.pam-6, +kdebase-pam-6.ebuild:
+  Remove references to the pam_console module (#31877).
+
+  01 Jul 2005; Hardave Riar <hardave@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdebase-pam-4.ebuild:
+  Marked ppc stable for bug #97544.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on alpha.
+
+  26 May 2005; Marcus D. Hanwell <marcus@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on amd64.
+
+*kdebase-pam-5 (26 May 2005)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org> +files/kde-np.pam-5,
+  +files/kde.pam-5, +kdebase-pam-5.ebuild:
+  New version, needed for Gentoo/FBSD (#93179).
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> kdebase-pam-4.ebuild:
+  Added missing HOMEPAGE ebuild variable.
+
+  19 May 2005; Guy Martin <gmsoft@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on hppa.
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on ppc64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> kdebase-pam-4.ebuild:
+  stable on ia64
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on SPARC.
+
+  25 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-pam-4.ebuild:
+  Stable on x86.
+
+  07 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -kdebase-pam-3.4.0_beta2.ebuild, kdebase-pam-4.ebuild:
+  Add the same keywords as kdebase, since these two files were previously
+  distributed with kdebase.
+
+*kdebase-pam-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-pam-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kdebase-pam-4 (03 Feb 2005)
+
+  03 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  -kdebase-pam-3.4.0_beta1.ebuild, +kdebase-pam-4.ebuild:
+  Changed the ebuild's slot to 0 and its version to 4 (which doesn't stand for
+  anything; it just enforces an upgrade from the previous version). Versions
+  of KDE will not have separate pam.d files. Bug 16022.
 
 *kdebase-pam-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdebase-pam/Manifest b/kde-base/kdebase-pam/Manifest
index 0942fe0d6dd1..6d6c44ffd131 100644
--- a/kde-base/kdebase-pam/Manifest
+++ b/kde-base/kdebase-pam/Manifest
@@ -1,4 +1,14 @@
-MD5 e89ea971768b8029daafcb881a8ac054 kdebase-pam-3.4.0_beta1.ebuild 459
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-pam-3.4.0_beta1 0
+MD5 d0ea4a0a245ddadc7061cacd97ffa14b ChangeLog 3367
+MD5 a0f671ff0e0e4a888e87fc8d4263120a kdebase-pam-4.ebuild 551
+MD5 31dea466278cbbdb28425dbced99ff19 kdebase-pam-5.ebuild 554
+MD5 b9085332c050c443968fa12b56798f4b kdebase-pam-6.ebuild 548
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-pam-4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-pam-5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebase-pam-6 0
 MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+MD5 722767981ebf7e09dda75264e5d6f155 files/kde-np.pam-5 236
+MD5 23b83482c0496d7414ba241e13b3bdba files/kde-np.pam-6 196
+MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
+MD5 43ce12fb996a669b5b6a0fbba878bab7 files/kde.pam-5 237
+MD5 2ce6abeca73a825ffcba5c0852dcb81d files/kde.pam-6 197
diff --git a/kde-base/kdebase-pam/kdebase-pam-4.ebuild b/kde-base/kdebase-pam/kdebase-pam-4.ebuild
index b60e21dcfe24..8226ce1cd728 100644
--- a/kde-base/kdebase-pam/kdebase-pam-4.ebuild
+++ b/kde-base/kdebase-pam/kdebase-pam-4.ebuild
@@ -1,15 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/kdebase-pam-4.ebuild,v 1.1 2005/02/03 15:56:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/kdebase-pam-4.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
+
 DESCRIPTION="pam.d files used by several kdebase-derived packages"
-KEYWORDS="~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
+HOMEPAGE="http://www.kde.org"
+
 DEPEND="sys-libs/pam"
-LICENSE="GPL-2"
-SLOT=0
 
 src_install() {
 	insinto /etc/pam.d
-	newins $FILESDIR/kde.pam kde
-	newins $FILESDIR/kde-np.pam kde-np
+	newins "${FILESDIR}"/kde.pam kde
+	newins "${FILESDIR}"/kde-np.pam kde-np
 }
diff --git a/kde-base/kdebase-pam/kdebase-pam-5.ebuild b/kde-base/kdebase-pam/kdebase-pam-5.ebuild
index b03c21901c74..db3ddf08742d 100644
--- a/kde-base/kdebase-pam/kdebase-pam-5.ebuild
+++ b/kde-base/kdebase-pam/kdebase-pam-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/kde-base/kdebase-pam/kdebase-pam-5.ebuild,v 1.1 2005/05/26 14:31:52 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/kdebase-pam-5.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 inherit pam
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/pam"
diff --git a/kde-base/kdebase-pam/kdebase-pam-6.ebuild b/kde-base/kdebase-pam/kdebase-pam-6.ebuild
index e0f31b4329da..4560fe858ecc 100644
--- a/kde-base/kdebase-pam/kdebase-pam-6.ebuild
+++ b/kde-base/kdebase-pam/kdebase-pam-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/kde-base/kdebase-pam/kdebase-pam-6.ebuild,v 1.1 2005/07/09 12:34:13 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-pam/kdebase-pam-6.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 inherit pam
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org"
 LICENSE="as-is"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/pam"
diff --git a/kde-base/kdebase-pam/metadata.xml b/kde-base/kdebase-pam/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebase-pam/metadata.xml
+++ b/kde-base/kdebase-pam/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebase-startkde/ChangeLog b/kde-base/kdebase-startkde/ChangeLog
index 6d4d3c12131d..bc61eec0337f 100644
--- a/kde-base/kdebase-startkde/ChangeLog
+++ b/kde-base/kdebase-startkde/ChangeLog
@@ -1,6 +1,149 @@
 # ChangeLog for kde-base/kdebase-startkde
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/ChangeLog,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-startkde-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdebase-startkde-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebase-startkde-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdebase-startkde-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-startkde-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdebase-startkde-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-startkde-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdebase-startkde-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kdebase-startkde-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-startkde-3.5.0_beta2.ebuild:
+  New version.
+
+*kdebase-startkde-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-startkde-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kdebase-startkde-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdebase-startkde-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdebase-startkde-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebase-startkde-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdebase-startkde-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-3.5-startkde-gentoo.patch,
+  +kdebase-startkde-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-startkde-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdebase-startkde-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kdebase-startkde-3.4.2-gentoo.patch,
+  +kdebase-startkde-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdebase-startkde-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdebase-startkde-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdebase-startkde-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdebase-startkde-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kdebase-startkde-3.4.1-gentoo.patch,
+  +kdebase-startkde-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+*kdebase-startkde-3.4.0-r1 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-startkde-3.4.0-r1-gentoo.patch,
+  +kdebase-startkde-3.4.0-r1.ebuild:
+  Better handling of config files migration (#40698). Fix conflict with the
+  menu from gnome 2.10 (#89870).
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdebase-startkde-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdebase-startkde-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdebase-startkde-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdebase-startkde-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdebase-startkde-3.4.0_rc1-r1 (13 Mar 2005)
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> +files/agent-shutdown.sh,
+  +files/agent-startup.sh, +files/startkde-3.4.0_rc1-gentoo.diff,
+  +kdebase-startkde-3.4.0_rc1-r1.ebuild:
+  Ooops. removed by mistake. This ebuild is _not_ replaced by kdebase-data.
+  Readding.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebase-startkde-3.4.0_rc1-r1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdebase-startkde-3.4.0_rc1-r1 (28 Feb 2005)
+
+  28 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  files/startkde-3.4.0_rc1-gentoo.diff, +kdebase-startkde-3.4.0_rc1-r1.ebuild,
+  -kdebase-startkde-3.4.0_rc1.ebuild:
+  Fix typo in startkde script, and bump revision to propagate the change.
+
+*kdebase-startkde-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/startkde-3.4.0_rc1-gentoo.diff, +kdebase-startkde-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdebase-startkde-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebase-startkde-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdebase-startkde-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdebase-startkde/Manifest b/kde-base/kdebase-startkde/Manifest
index e9dc471838b5..e76d4eeee98c 100644
--- a/kde-base/kdebase-startkde/Manifest
+++ b/kde-base/kdebase-startkde/Manifest
@@ -1,8 +1,31 @@
-MD5 200e6769e259a90558eff7003fa8d656 kdebase-startkde-3.4.0_beta1.ebuild 2013
-MD5 200e6769e259a90558eff7003fa8d656 kdebase-startkde-3.4.0_alpha1.ebuild 2013
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdebase-startkde-3.4.0_alpha1 69
-MD5 54e0de06f4b04b096f733f0bdb63324a files/startkde-3.4.0_beta1-gentoo.diff 1552
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdebase-startkde-3.4.0_beta1 216
-MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204
-MD5 54e0de06f4b04b096f733f0bdb63324a files/startkde-3.4.0_alpha1-gentoo.diff 1552
-MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 befbd31239e01e0f6fed8c44fb74b7e3 ChangeLog 5177
+MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
+MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebase-startkde-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdebase-startkde-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdebase-startkde-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdebase-startkde-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdebase-startkde-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdebase-startkde-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-startkde-3.5_beta1 69
+MD5 acf270f97062baaaa0576f0b2d28b3ce files/kdebase-3.5-startkde-gentoo.patch 1283
+MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-startkde-3.4.1-gentoo.patch 1284
+MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-startkde-3.4.2-gentoo.patch 1284
+MD5 770f131098299857b2d09195509f1137 kdebase-startkde-3.4.1.ebuild 2171
+MD5 baad6b9a465fb667a269413a29b22162 kdebase-startkde-3.4.2.ebuild 2190
+MD5 af08747f97f02f8d64040a7844d3ad51 kdebase-startkde-3.4.3.ebuild 2192
+MD5 e9c302b4d61fbf3ae9eea8a473db4ac9 kdebase-startkde-3.5.0.ebuild 2180
+MD5 7a38d417f25fe1765de3b65c106ed2b9 kdebase-startkde-3.5.0_beta2.ebuild 2195
+MD5 f3407857320e2382112c204b30f7d4c4 kdebase-startkde-3.5.0_rc1.ebuild 2204
+MD5 08e1648f05e028801785181139b3a255 kdebase-startkde-3.5_beta1.ebuild 2181
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj50ntT9W3vfTuoRAnSjAKCtd1p6SPQo1rZW9ubO2meBc5uzlACeKAKK
+tEH6YbkSDSgp5XO5QOicwuE=
+=JnDZ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase-startkde/files/agent-shutdown.sh b/kde-base/kdebase-startkde/files/agent-shutdown.sh
index 09c026605b12..479f3f7bfc18 100644
--- a/kde-base/kdebase-startkde/files/agent-shutdown.sh
+++ b/kde-base/kdebase-startkde/files/agent-shutdown.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# Customized agents shutdown file
-#
-#if [ -x /usr/bin/gpg-agent -a -n "$GPG_AGENT_INFO" ]; then
-#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) 2>&1 >/dev/null
-#fi 
-#
-#if [ -x /usr/bin/ssh-agent ]; then
-#  eval "$(/usr/bin/ssh-agent -k)"
+# This file is executed at kde shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+#if [ -n "${GPG_AGENT_INFO}" ]; then
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
 #fi
-#
 
+#if [ -n "${SSH_AGENT_PID}" ]; then
+#  eval "$(ssh-agent -k)"
+#fi
diff --git a/kde-base/kdebase-startkde/files/agent-startup.sh b/kde-base/kdebase-startkde/files/agent-startup.sh
index bf788b003549..768de9b24f39 100644
--- a/kde-base/kdebase-startkde/files/agent-startup.sh
+++ b/kde-base/kdebase-startkde/files/agent-startup.sh
@@ -1,13 +1,19 @@
-#!/bin/sh
-#
-# Customized agents startup file
+# Agents startup file
 #
+# This file is sourced at kde startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at kde startup.
+# If you do so, do not forget to uncomment the respective
+# lines in KDEDIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
 #if [ -x /usr/bin/gpg-agent ]; then
 #  eval "$(/usr/bin/gpg-agent --daemon)"
 #fi 
-#
+
 #if [ -x /usr/bin/ssh-agent ]; then
 #  eval "$(/usr/bin/ssh-agent -s)"
 #fi
-#
-
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.1 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.1
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.2 b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.2
+++ b/kde-base/kdebase-startkde/files/digest-kdebase-startkde-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch
index 1448491071a1..08f781212465 100644
--- a/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch
+++ b/kde-base/kdebase-startkde/files/kdebase-startkde-3.4.1-gentoo.patch
@@ -1,7 +1,7 @@
 diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
 --- kdebase-3.4.0.orig/startkde	2005-03-04 12:20:04.000000000 +0100
-+++ kdebase-3.4.0/startkde	2005-05-11 14:56:43.000000000 +0200
-@@ -14,6 +14,39 @@
++++ kdebase-3.4.0/startkde	2005-05-26 02:04:35.000000000 +0200
+@@ -14,6 +14,40 @@
  	exit 1
  fi
  
@@ -33,6 +33,7 @@ diff -Nur kdebase-3.4.0.orig/startkde kdebase-3.4.0/startkde
 +					"${file}"
 +			fi
 +		done
++		cd ${HOME}
 +	fi
 +	ln -sf .kde3.4 .kde
 +fi
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.4.1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.4.1.ebuild
index 36dcda17c05d..43de8d018418 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.4.1.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.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/kde-base/kdebase-startkde/kdebase-startkde-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 # The kde apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.4.2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.4.2.ebuild
index 3588e6859fa5..928e6524bdbc 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.4.2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.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/kde-base/kdebase-startkde/kdebase-startkde-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 # The kde apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.4.3.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.4.3.ebuild
index dc09ed131fba..9e1836439aa3 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.4.3.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.4.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/kde-base/kdebase-startkde/kdebase-startkde-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 # The kde apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild
index 92fc27704b58..b61790b8f466 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.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/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_beta2.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_beta2.ebuild
index 89eabb6897bc..b70af1a04d75 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_beta2.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_beta2.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/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 # The kde apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_rc1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_rc1.ebuild
index e7aadfde165a..99975b3775d7 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_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/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
diff --git a/kde-base/kdebase-startkde/kdebase-startkde-3.5_beta1.ebuild b/kde-base/kdebase-startkde/kdebase-startkde-3.5_beta1.ebuild
index 806b67601dcd..6f0a94253deb 100644
--- a/kde-base/kdebase-startkde/kdebase-startkde-3.5_beta1.ebuild
+++ b/kde-base/kdebase-startkde/kdebase-startkde-3.5_beta1.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/kde-base/kdebase-startkde/kdebase-startkde-3.5_beta1.ebuild,v 1.1 2005/09/22 18:24:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-startkde/kdebase-startkde-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdebase
 KMNOMODULE=true
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="startkde script, which starts a complete KDE session, and associated scripts"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # The kde apps called from the startkde script.
diff --git a/kde-base/kdebase-startkde/metadata.xml b/kde-base/kdebase-startkde/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebase-startkde/metadata.xml
+++ b/kde-base/kdebase-startkde/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index bf026777b5ac..ad3730fc6c76 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,9 +1,1108 @@
 # ChangeLog for kde-base/kdebase
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.1.1.1 2005/11/30 10:13:01 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdebase-3.4.3-r1.ebuild:
+  Stable on amd64, bug 112842.
+
+  23 Nov 2005; Dan Armak <danarmak@gentoo.org> kdebase-3.5.0.ebuild:
+  Removed kxkb patch applied upstream.
+
+*kdebase-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebase-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebase-3.4.3-r1.ebuild:
+  Stable on sparc wrt #112842
+
+  20 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kxkb-3.5.0_rc1-modularx.patch, kdebase-3.5.0_rc1.ebuild:
+  Added backport of revision 481658 to let kxkb find the data while using
+  modular X.
+
+*kdebase-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdebase-3.5.0_rc1.ebuild:
+  New version.
+
+  20 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kcheckpass-pie-final.patch, kdebase-3.5.0_beta2.ebuild:
+  Added patch to compile kcheckpass fine on PIC architectures when using
+  --enable-final. See bug #107218.
+
+*kdebase-3.4.3-r1 (19 Oct 2005)
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.3-noimake.patch, +files/kdebase-3.4.3-xdmcp.patch,
+  +files/kdebase-3.5.0_beta2-noimake.patch, +kdebase-3.4.3-r1.ebuild,
+  kdebase-3.5.0_beta2.ebuild:
+  Add patch to fix segfault in XDMCP (#109528). Add patch to compile without
+  imake (#102780).
+
+*kdebase-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdebase-3.5.0_beta2.ebuild:
+  New version.
+
+*kdebase-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebase-3.4.3.ebuild:
+  New version.
+
+*kdebase-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdebase-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdebase-3.4.2-r1.ebuild:
+  Keyworded ~mips.
+
+*kdebase-3.4.2-r2 (04 Oct 2005)
+
+  04 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.2-kinfocenter-opengl-fix.patch,
+  +kdebase-3.4.2-r2.ebuild:
+  Add patch for hal-0.5 compatibility (#105553). Add patch to fix opengl
+  related crash (#103937).
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdebase-3.4.1-r1.ebuild:
+  Mark 3.4.1-r1 stable on alpha
+
+*kdebase-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +kdebase-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdebase-3.4.1-r1.ebuild:
+  stable on ia64
+
+*kdebase-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.5-configure-openexr.patch,
+  +files/kdebase-3.5-startkde-gentoo.patch, +kdebase-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. Add zeroconf support for ksysguardd.
+
+*kdebase-3.4.2-r1 (06 Aug 2005)
+
+  06 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-3.4.2-konqueror-filter.patch, +kdebase-3.4.2-r1.ebuild:
+  Added patch for bug #101501 (Konqueror considers name filters even when a
+  file with the exact name exists).
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdebase-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdebase-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  files/kdebase-3.4.1-configure.patch, +kdebase-3.4.2.ebuild:
+  New version. Add configure patch (#81966).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdebase-3.4.1-r1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdebase-3.4.1-r1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdebase-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-3.4.1-r1.ebuild:
+  Add ~alpha keyword.
+
+  01 Jul 2005; Hardave Riar <hardave@gentoo.org> kdebase-3.3.2-r3.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdebase-3.4.1-r1.ebuild:
+  Marked ppc stable for bug #97544.
+
+  27 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebase-3.3.2-r3.ebuild:
+  Stable on sparc
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org> kdebase-3.3.2-r3.ebuild:
+  Stable on ppc64
+
+  19 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-3.3.2-r3.ebuild:
+  Stable on x86.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-3.3.2-r2.ebuild:
+  Stable on alpha.
+
+*kdebase-3.3.2-r3 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/3.3.2-r3/backgroundrc, +files/3.3.2-r3/kdmrc,
+  +files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff, +kdebase-3.3.2-r3.ebuild:
+  Add fix to avoid losing the KDE menu if a recent Gnome version is installed
+  (#89870).
+
+*kdebase-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-configure.patch, +kdebase-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966, #92433).
+
+  28 May 2005; Diego Pettenò <flameeyes@gentoo.org> kdebase-3.4.1.ebuild:
+  Moved dependency to virtual/eject.
+
+*kdebase-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-startkde-gentoo.patch, +kdebase-3.4.1.ebuild:
+  New version.
+
+  19 May 2005; Guy Martin <gmsoft@gentoo.org> kdebase-3.3.2-r2.ebuild:
+  Stable on hppa.
+
+*kdebase-3.4.0-r1 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.0-r1-startkde-gentoo.patch, +kdebase-3.4.0-r1.ebuild:
+  Better handling of config files migration (#40698). Fix conflict with the
+  menu from gnome 2.10 (#89870).
+
+  10 May 2005; Carsten Lohrke <carlo@gentoo.org> kdebase-3.4.0.ebuild:
+  corrected dbus and hal dependencies, #91903
+
+  10 May 2005; Aron Griffis <agriffis@gentoo.org> kdebase-3.4.0.ebuild:
+  add ~ia64
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> kdebase-3.3.2-r2.ebuild:
+  stable on ia64
+
+  08 Apr 2005; Markus Rothe <corsair@gentoo.org> kdebase-3.3.2-r2.ebuild:
+  Stable on ppc64
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdebase-3.3.2-r2.ebuild:
+  Stable on SPARC.
+
+  25 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-3.3.2-r2.ebuild:
+  Stable on x86.
+
+  19 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  kdebase-3.4.0.ebuild:
+  Versioned libusb dependency as 0.1.8 doesn't work.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdebase-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdebase-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.0-startkde-gentoo.patch, +kdebase-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+  07 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-3.4.0_rc1.ebuild:
+  Proper handling of java (#82032).
+
+*kdebase-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.0_rc1-startkde-gentoo.patch, +kdebase-3.4.0_rc1.ebuild:
+  New version. Add support for hal (#78339). Switch back to the old
+  system to manage the .kde* directories.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  kdebase-3.4.0_beta2.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  kdebase-3.4.0_beta1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  21 Feb 2005; Hardave Riar <hardave@gentoo.org> kdebase-3.3.2-r1.ebuild:
+  Stable on mips.
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdebase-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  10 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kicker-visibility.diff, kdebase-3.4.0_beta2.ebuild:
+  Add patch to fix compilation with gcc 3.4.
+
+*kdebase-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdebase-3.4.0_beta2.ebuild:
+  Version bump. Use kde-base/kdebase-pam to provide files in /etc/pam.d.
+
+  08 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -files/3.3.0-kwinrules-Makefile.am.diff, -files/3.3.0-sasl-fix.diff,
+  -files/kdebase-3.2.0-kcontrol.patch, -files/kdebase-3.2.2-genkdmconf.c.diff,
+  -files/kscreensaver.pam, -kdebase-3.2.0.ebuild, -kdebase-3.2.2.ebuild,
+  -kdebase-3.3.0.ebuild:
+  Remove old ebuilds.
+
+*kdebase-3.3.2-r2 (07 Feb 2005)
+
+  07 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdebase-3.3.2-r2.ebuild:
+  Remove KDEDIR from the environment (#33079). Depend on kdebase-pam as a
+  provider for files in /etc/pam.d (#16022). Set proper permissions on
+  agent-startup.sh and agent-shutdown.sh (#76719, #76720). Make kdm use
+  /usr/share/xsessions to list available sessions.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdebase-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdebase-3.3.2-r1.ebuild:
+  Stable on ppc64; bug #78619
+
+  17 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> kdebase-3.4.0_beta1.ebuild:
+  Added missing (optional) dep on lm_sensors.
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> kdebase-3.4.0_beta1.ebuild:
+  Adding missing dep on freetype, bug #78206.
+
+*kdebase-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> files/agent-shutdown.sh,
+  files/agent-startup.sh, +files/3.4.0_beta1/kdmrc,
+  +files/3.4.0_beta1/startkde-gentoo.diff, +kdebase-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Added support for cyrus-sasl. Added support for
+  logitech-mouse plugin. Fix the kde script to handle the .kde3.3 .kde3.4
+  migration (#40698). Fix agents-startup and agents-shutdown scripts (#76719,
+  #76720). Use /usr/share/xsession to list available sessions in kdm. Set the
+  default kdm face icon.
+
+  03 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdebase-3.3.2-r1.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdebase-3.3.2-r1.ebuild:
+  Stable on alpha, bug 72750.
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdebase-3.3.2-r1.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.2-r1.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdebase-3.3.1-r2.ebuild:
+  Stable on ppc64
+
+  13 Dec 2004; Caleb Tennis <caleb@gentoo.org> -files/detectwidget.cpp.diff,
+  -files/utils.h.diff, -files/3.3.1-r1/Xsetup, -files/3.3.1-r1/backgroundrc,
+  -files/3.3.1-r1/kdmrc, -files/3.3.1-r1/startkde-3.3.1-gentoo.diff,
+  -files/3.3.1-r1/startkde-3.3.1-r1-gentoo.diff, -kdebase-3.2.3-r1.ebuild,
+  -kdebase-3.2.3-r2.ebuild, -kdebase-3.3.1-r1.ebuild, -kdebase-3.3.1.ebuild,
+  -kdebase-3.3.2.ebuild:
+  remove older revisions
+
+*kdebase-3.3.1-r2 (13 Dec 2004)
+
+  13 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdebase-htmlframes2.patch,
+  +files/post-3.3.1-kdebase-htmlframes2.patch,
+  +files/post-3.3.2-kdebase-htmlframes2.patch, +files/3.2.3-r3/Xsetup,
+  +files/3.2.3-r3/backgroundrc, +files/3.2.3-r3/kdmrc,
+  +files/3.2.3-r3/startkde-3.2.3-r3-gentoo.diff, +files/3.3.1-r2/Xsetup,
+  +files/3.3.1-r2/backgroundrc, +files/3.3.1-r2/kdmrc,
+  +files/3.3.1-r2/startkde-3.3.1-r2-gentoo.diff, +files/3.3.2-r1/Xsetup,
+  +files/3.3.2-r1/backgroundrc, +files/3.3.2-r1/kdmrc,
+  +files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff, +kdebase-3.2.3-r3.ebuild,
+  +kdebase-3.3.1-r2.ebuild, +kdebase-3.3.2-r1.ebuild:
+  Rev bump for security fix bug #73869
+
+*kdebase-3.2.3-r2 (09 Dec 2004)
+
+  09 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdebase-smb.diff, +files/post-3.3.1-kdebase-smb.diff,
+  +files/3.2.3-r2/Xsetup, +files/3.2.3-r2/backgroundrc, +files/3.2.3-r2/kdmrc,
+  +files/3.2.3-r2/startkde-3.2.3-r1-gentoo.diff,
+  +files/3.2.3-r2/startkde-3.2.3-r2-gentoo.diff, +files/3.3.1-r1/Xsetup,
+  +files/3.3.1-r1/backgroundrc, +files/3.3.1-r1/kdmrc,
+  +files/3.3.1-r1/startkde-3.3.1-gentoo.diff,
+  +files/3.3.1-r1/startkde-3.3.1-r1-gentoo.diff, +kdebase-3.2.3-r2.ebuild,
+  +kdebase-3.3.1-r1.ebuild:
+  Rev bump for security fix bug #72804
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +files/pgo.desktop:
+  forgot this file
+
+*kdebase-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +files/kde.desktop,
+  +files/konsole-3.3.2.patch, +files/3.3.2/Xsetup,
+  +files/3.3.2/backgroundrc, +files/3.3.2/kdmrc,
+  +files/3.3.2/startkde-3.3.2-gentoo.diff, +kdebase-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdebase-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdebase-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdebase-3.3.1.ebuild:
+  Stable on ppc.
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdebase-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdebase-3.3.1.ebuild:
+  ~alpha keyword.
+
+  03 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.1.ebuild:
+  x86 stable
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> files/3.3.1/kdmrc,
+  files/3.3.1/startkde-3.3.1-gentoo.diff:
+  Providing a new kdmrc from bug #61499
+
+*kdebase-3.3.1 (12 Oct 2004)
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org> +files/3.3.1/Xsetup,
+  +files/3.3.1/backgroundrc, +files/3.3.1/kdmrc,
+  +files/3.3.1/startkde-3.3.1-gentoo.diff, +kdebase-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdebase-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdebase-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdebase-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdebase-3.2.1.ebuild,
+  -kdebase-3.2.3.ebuild:
+  Remove old files, mark 3.3.0 x86 stable
+
+  07 Sep 2004; Carsten Lohrke <carlo@gentoo.org> +files/3.3.0-sasl-fix.diff,
+  kdebase-3.3.0.ebuild:
+  proper sasl fix
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdebase-3.1.5.ebuild, kdebase-3.2.1.ebuild, kdebase-3.2.3.ebuild,
+  kdebase-3.3.0.ebuild:
+  Masked kdebase-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdebase-3.1.5.ebuild, kdebase-3.2.1.ebuild, kdebase-3.2.3.ebuild:
+  Masked kdebase-3.2.3.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdebase-3.1.5.ebuild, kdebase-3.2.1.ebuild:
+  Masked kdebase-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdebase-3.1.5.ebuild:
+  Masked kdebase-3.1.5.ebuild stable for ppc
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0.ebuild,
+  files/3.3.0-kwinrules-Makefile.am.diff:
+  Fix parallel make compilation error
+
+  23 Aug 2004; psi29a <psi29a@gentoo.org> kdebase-3.3.0.ebuild:
+  Added to ~mips
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdebase-3.3.0.ebuild:
+  stable on ppc64, bug #58181
+
+  21 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdebase-3.3.0.ebuild:
+  sasl.h fix, #60735
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0_beta2.ebuild,
+  files/3.3.0/Xsetup, files/3.3.0/backgroundrc, files/3.3.0/kdmrc,
+  files/3.3.0/startkde-3.3.0-gentoo.diff, files/3.3.0_beta2/Xsetup,
+  files/3.3.0_beta2/backgroundrc, files/3.3.0_beta2/kdmrc,
+  files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff:
+  3.3.0 final
+
+*kdebase-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0_rc1.ebuild,
+  kdebase-3.3.0_rc2.ebuild:
+  add _rc2, remove _rc1
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0_rc1.ebuild,
+  files/agent-shutdown.sh, files/agent-startup.sh:
+  Add agents.sh files to startup and shutdown
+
+*kdebase-3.2.3-r1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.3-r1.ebuild,
+  files/post-3.2.3-kdebase-htmlframes.patch, files/3.2.3-r1/Xsetup,
+  files/3.2.3-r1/backgroundrc, files/3.2.3-r1/kdmrc,
+  files/3.2.3-r1/startkde-3.2.3-r1-gentoo.diff:
+  Incorporate a security fix
+
+*kdebase-3.3.0_rc1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.3.0_beta1.ebuild,
+  kdebase-3.3.0_rc1.ebuild, files/3.3.0_rc1/Xsetup,
+  files/3.3.0_rc1/backgroundrc, files/3.3.0_rc1/kdmrc,
+  files/3.3.0_rc1/startkde-3.3.0_rc1-gentoo.diff:
+  New _rc1, remove _beta1
+
+*kdebase-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +files/3.3.0_beta2/Xsetup,
+  +files/3.3.0_beta2/backgroundrc, +files/3.3.0_beta2/kdmrc,
+  +files/3.3.0_beta2/startkde-3.3.0_beta2-gentoo.diff,
+  +kdebase-3.3.0_beta2.ebuild:
+  new beta
+
+*kdebase-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> +files/detectwidget.cpp.diff,
+  +files/utils.h.diff, -files/3.3.0_alpha1/Xsetup,
+  -files/3.3.0_alpha1/backgroundrc, -files/3.3.0_alpha1/kdmrc,
+  -files/3.3.0_alpha1/startkde-3.3.0_alpha1-gentoo.diff,
+  +files/3.3.0_beta1/Xsetup, +files/3.3.0_beta1/backgroundrc,
+  +files/3.3.0_beta1/kdmrc,
+  +files/3.3.0_beta1/startkde-3.3.0_beta1-gentoo.diff,
+  -kdebase-3.3.0_alpha1.ebuild, +kdebase-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdebase-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdebase-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +files/3.2.3/Xsetup,
+  +files/3.2.3/backgroundrc, +files/3.2.3/kdmrc,
+  +files/3.2.3/startkde-3.2.3-gentoo.diff, +kdebase-3.2.3.ebuild:
+  Version bump
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> kdebase-3.2.0.ebuild,
+  kdebase-3.2.1.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdebase-3.2.2.ebuild:
+  stable on amd64
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdebase-3.2.2.ebuild:
+  stable on amd64
+
+*kdebase-3.3.0_alpha1 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org> +kdebase-3.3.0_alpha1.ebuild:
+  3.3alpha1 - hardmasked
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdebase-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdebase-3.2.2.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdebase-3.2.0.ebuild,
+  kdebase-3.2.1.ebuild, kdebase-3.2.2.ebuild:
+  Add inherit eutils
+
+*kdebase-3.2.2 (24 Apr 2004)
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> kdebase-3.2.2.ebuild:
+  Added to ~mips
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz,
+  -files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff,
+  -files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff,
+  -files/3.0.5b/startkde-3.0.5b-gentoo.diff, -kdebase-3.0.5b.ebuild:
+  Remove old version
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> :
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdebase-3.2.1.ebuild:
+  marked stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdebase-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  15 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.1.ebuild:
+  I'm adding a warning so that people who have their sandbox on and have the
+  PORTAGE_TMPDIR changed will know that this is a known bug.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  kdebase-3.2.0.ebuild, kdebase-3.2.1.ebuild, files/focus-patch.diff,
+  files/kdebase-3.1.4-amd64-accessviol.patch, files/konq-crash-patch.diff,
+  files/3.1.4/backgroundrc, files/3.1.4/kdmrc,
+  files/3.1.4/startkde-3.1.4-gentoo.diff:
+  x86 stable and version cleanup
+
+*kdebase-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.1.ebuild,
+  files/3.2.1/Xsetup, files/3.2.1/backgroundrc, files/3.2.1/kdmrc,
+  files/3.2.1/startkde-3.2.1-gentoo.diff:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdebase-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdebase-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdebase-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdebase-3.2.0.ebuild:
+  Marked ~ppc
+
+  03 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0.ebuild,
+  files/kdebase-3.2.0-kcontrol.patch:
+  Small patch for compilation/installation
+
+*kdebase-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0.ebuild,
+  kdebase-3.2.0_rc1.ebuild, files/3.2.0/Xsetup, files/3.2.0/backgroundrc,
+  files/3.2.0/kdmrc, files/3.2.0/startkde-3.2.0-gentoo.diff,
+  files/3.2.0_rc1/Xsetup, files/3.2.0_rc1/backgroundrc, files/3.2.0_rc1/kdmrc,
+  files/3.2.0_rc1/startkde-3.2.0_rc1-gentoo.diff:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdebase-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdebase-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.0.4-r3.ebuild,
+  kdebase-3.1.2.ebuild, kdebase-3.2.0_beta1-r1.ebuild,
+  kdebase-3.2.0_beta2.ebuild, kdebase-3.2.0_rc1.ebuild,
+  files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff,
+  files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz,
+  files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff,
+  files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff,
+  files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff, files/3.1.2/backgroundrc,
+  files/3.1.2/fontconfig-2.2-support.patch, files/3.1.2/kdmrc,
+  files/3.1.2/sftp.patch, files/3.1.2/startkde-3.1.2-gentoo.diff,
+  files/3.2.0_beta1-r1/Xsetup, files/3.2.0_beta1-r1/backgroundrc,
+  files/3.2.0_beta1-r1/kdmrc,
+  files/3.2.0_beta1-r1/startkde-3.2.0_beta1-r1-gentoo.diff,
+  files/3.2.0_rc1/Xsetup, files/3.2.0_rc1/backgroundrc, files/3.2.0_rc1/kdmrc,
+  files/3.2.0_rc1/startkde-3.2.0_rc1-gentoo.diff:
+  New version, removing old versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdebase-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdebase-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.5.ebuild,
+  files/kdebase-3.1.5-amd64-accessviol.patch, files/3.1.5/backgroundrc,
+  files/3.1.5/kdmrc, files/3.1.5/startkde-3.1.5-gentoo.diff:
+  New version.
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdebase-3.1.4.ebuild:
+  stable on alpha
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> kdebase-3.1.2.ebuild,
+  kdebase-3.1.4.ebuild, kdebase-3.2.0_beta1-r1.ebuild,
+  kdebase-3.2.0_beta2.ebuild:
+  fixed motif dep
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdebase-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  kdebase-3.2.0_beta2.ebuild:
+  minor dep cleanups
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  kdebase-3.2.0_beta2.ebuild:
+  Change java dep to use either jdk or jre - as noted in bug 28445
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta2.ebuild:
+  Dependency cleanups.
+
+*kdebase-3.2.0_beta2 (01 Dec 2003)
+
+  01 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_alpha2.ebuild,
+  kdebase-3.2.0_beta1.ebuild, kdebase-3.2.0_beta2.ebuild,
+  files/3.2.0_alpha2/backgroundrc, files/3.2.0_alpha2/kdmrc,
+  files/3.2.0_alpha2/startkde-3.2.0_alpha2-gentoo.diff,
+  files/3.2.0_beta1/backgroundrc, files/3.2.0_beta1/kdmrc,
+  files/3.2.0_beta1/startkde-3.2.0_beta1-gentoo.diff:
+  new beta version, remove older versions
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdebase-3.1.4.ebuild:
+  Marked ppc
+
+  20 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta1-r1.ebuild,
+  files/kde-np.pam:
+  Add new kde-np pam module for autologin.  See bug 33690
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdebase-3.1.4.ebuild:
+  mark stable on amd64
+
+  12 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta1-r1.ebuild:
+  Fix a couple of lines
+
+*kdebase-3.2.0_beta1-r1 (10 Nov 2003)
+
+  10 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta1-r1.ebuild,
+  files/3.2.0_beta1-r1/Xsetup, files/3.2.0_beta1-r1/backgroundrc,
+  files/3.2.0_beta1-r1/kdmrc,
+  files/3.2.0_beta1-r1/startkde-3.2.0_beta1-r1-gentoo.diff:
+  Fixes to make kdm better? see bug #32994
+
+*kdebase-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_beta1.ebuild,
+  files/3.2.0_beta1/backgroundrc, files/3.2.0_beta1/kdmrc,
+  files/3.2.0_beta1/startkde-3.2.0_beta1-gentoo.diff:
+  New beta version
+
+  07 Oct 2003; Brad House <brad_mssw@gentoo.org> kdebase-3.1.4.ebuild,
+  files/kdebase-3.1.4-amd64-accessviol.patch:
+  patch to get rid of access violation during install
+  on amd64. Based on patch from Andrew Johnson <ajohnson@lastaccess.com>
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdebase-3.1.4.ebuild:
+  add ~amd64 flag
+
+  28 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  files/konq-crash-patch.diff:
+  patch from kde bug database to fix a konq crash
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-2.2.2-r5.ebuild,
+  kdebase-2.2.2-r5.ebuild, kdebase-3.1.1a.ebuild, kdebase-3.1.1a.ebuild,
+  kdebase-3.1.3.ebuild, kdebase-3.1.3.ebuild:
+  removing stale versions
+
+  26 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild,
+  files/focus-patch.diff:
+  add a focus patch that fixes bug #29648 - no revision bump
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.4.ebuild:
+  Added sparc keyword.
+
+*kdebase-3.2.0_alpha2 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_alpha1.ebuild,
+  kdebase-3.2.0_alpha1.ebuild, kdebase-3.2.0_alpha2.ebuild,
+  files/3.2.0_alpha1/backgroundrc, files/3.2.0_alpha1/kdmrc,
+  files/3.2.0_alpha1/startkde-3.2.0_alpha1-gentoo.diff:
+  new alpha version
+
+*kdebase-3.1.4 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.4.ebuild:
+  marking x86 stable
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  15 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.2.0_alpha1.ebuild:
+  Fix startkde patch from bug #28642
+
+*kdebase-3.2.0_alpha1 (12 Sep 2003)
+
+  12 Sep 2003; Jason Wever <weeve@gentoo.org> kdebase-3.2.0_alpha1.ebuild:
+  Marking as unusable as not all dependecies are met and hasn't been tested yet.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.3.ebuild:
+  x86 stable
+
+  08 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.3.ebuild:
+  Add a function that scans and replaces instances of "head -1" with "head -n 1" 
+  (in kde-functions.eclass), but this ebuild uses it.
+
+*kdebase-3.1.3 (20 Jul 2003)
+
+  20 Jul 2003; Caleb Tennis <caleb@gentoo.org> kdebase-3.1.3.ebuild:
+  New version.
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 2.2.2-r4, 3.0.5, 3.0.5-r2, 3.1, 3.1-r1, 3.1.1, 3.1.1-r1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdebase-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdebase-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdebase-3.1.2.ebuild:
+  New version of KDE.
+
+  16 Mai 2003; Lars Weiler <pylon@gentoo.org> kdebase-3.1.1a.ebuild:
+  Set ppc in KEYWORDS
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdebase-3.1.1-r1.ebuild:
+  Set ppc in KEYWORDS
+
+  11 Apr 2003; Dan Armak <danarmak@gentoo.org> kdebase-3.1.1a.ebuild:
+  Add notice about mtools (bug #4934). See the notice at the end of the ebuild
+  for more info.
+
+*kdebase-2.2.2-r5 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-2.2.2-r5.ebuild,
+  files/2.2.2-r5/startkde-2.2.2-r5-gentoo:
+  The same security fixes for 2.2.2.
+
+*kdebase-3.1.1a (08 Apr 2003)
+
+  11 Apr 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.1a.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1.1a.ebuild,
+  files/3.1.1a/*:
+  The same security fixes for kde 3.1.1.
+
+*kdebase-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.0.5b.ebuild,
+  files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff,
+  files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff,
+  files/3.0.5b/startkde-3.0.5b-gentoo.diff:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+  01 Apr 2003; danrmaak <danarmak@gentoo.org> kdebase-3.1.1-r1.ebuild:
+  Added stable x86 keyword.
+
+*kdebase-3.1.1-r1 (22 Mar 2003)
+
+  22 Mar 2003; Dan Armak <danarmak@gentoo.org> kdebase-3.1.1-r1.ebuild, files/3.1.1-r1/*:
+  
+  Added two patches from kde cvs which fix two issues with QT 3.1.2.
+  See http://www.kde.org/info/3.1.1.php for info on the patches.
+
+  21 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.0.4-r3.ebuild,
+  kdebase-3.0.5a.ebuild, kdebase-3.0.5a-r2.ebuild, kdebase-3.1.ebuild,
+  kdebase-3.1-r1.ebuild, kdebase-3.1.1.ebuild:
+  added sys-apps/eject to RDEPEND, thanks to bsolar <bsolar@bluewin.ch>
+  (bug #17577)
+
+  18 Mar 2003; Dan Armak <danarmak@gentoo.org> kdebase-3.1-r1.ebuild:
+  
+  Fix bug #17429 by accepting kdelibs 3.1-r3.
+
+*kdebase-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1.1.ebuild,
+  files/3.1.1/backgroundrc, files/3.1.1/kdmrc,
+  files/3.1.1/startkde-3.1.1-gentoo.diff:
+  version bump
+
+  08 Mar 2003; Jason Wever <weeve@gentoo.org> kdebase-3.0.5a-r2.ebuild,kdebase-3.1-r1.ebuild:
+  Changed ~sparc keywords to sparc.
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1-r1.ebuild:
+  Added ~sparc to keywords.
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdebase-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdebase-3.1-r1.ebuild:
+  Added ~alpha keyword
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-2.2.2-r3.ebuild,
+  kdebase-3.0.2.ebuild, kdebase-3.0.3.ebuild, kdebase-3.0.3-r1.ebuild,
+  kdebase-3.0.4.ebuild, kdebase-3.0.4-r2.ebuild, kdebase-3.0.5a-r1.ebuild,
+  kdebase-3.1-r1.ebuild: removed old ebuilds
+
+  06 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1-r1.ebuild:
+  added upstream patch for bug #15198 (kpager doesn't compile)
+
+  05 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1-r1.ebuild:
+  changed dep on motif to virtual/motif (lesstif also works), changed dep
+  to kdelibs-3.1-r2 (closes bug #15182, thanks to throstur@bylur.net)
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdebase-3.1.ebuild:
+  added ~sparc to keywords
+
+  31 Jan 2003; Dan Armak <danarmak@gentoo.org> kdebase-3.0.5a-r2.ebuild  :
+
+  Fix bug #12705: add missing Xreset, Xstartup, Xsetup files to the kdm
+  config dir.
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+*kdebase-3.1-r1, 3.0.5a-r2 (28 Jan 2003)
+
+  28 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New revisions to fix bug #7179. This part of the fix removes the hardcoded
+  KDEDIRS setting from startkde, allowing the env.d files from kde-env to
+  set it. This is a bug/fix almost noone cares about, so no need to upgrade
+  unless you know what this is. Masked at first for initial testing.
+
+  27 Jan 2003; Dan Armak <danarmak@gentoo.org> files/3.1/startkde-3.1-gentoo.diff  :
+
+  Change mv, ls, cp, mkdir invocations to /bin/mv, /bin/cp etc. avoiding
+  problems in cases where the user has redefined 'mv' (via alias) in his
+  shell. Fixes bug #12475.
+
+*kdebase-2.2.2-r4 (17 Jan 2003)
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-2.2.2-r4.ebuild:
+  new version, fixes #12520
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kde-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdebase-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1_rc6.ebuild:
+  version bump
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> kdebase-3.0.5a-r1.ebuild :
+
+  Fix sandbox issue ...  Get rid of kdmrc.orig.
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> kdebase-3.0.5a-xft2.0-fix.diff :
+
+  Fix segfault if compiled agaist Xft2, and the user clicked on:
+
+    System->Font Installer->Anti-Alias->Advanced
+
+  25 Dec 2002; Martin Schlemmer <azarah@gentoo.org> kscreensaver.pam :
+
+  Fix kscreensaver's pam.d file to use pam_stack.so again (bug #12596).
+
+*kdebase-3.0.5a-r1 (24 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdebase-3.0.5a-r1.ebuild:
+  Added ~sparc keyword
+
+  24 Dec 2002; Martin Schlemmer <azarah@gentoo.org> kdebase-3.0.5a-r1.ebuild,
+                                                    kdebase-3.0.5a-xft2.0-fix.diff :
+
+  Patch kdebase-3.0.5a to compile with Xft2.0 installed.  Also add a function to
+  detect if we have Xft1 or Xft2 installed, and against what QT was compiled.
+  The System->Font Installer->Anti-Alias->Advanced do crash though, will see if
+  I can get this fixed.  This should close bug #9423 again.
+
+*kdebase-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdebase-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdebase-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdebase-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdebase-3.1.ebuild:
+  Added ppc keyword
+
+  26 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdebase-3.1.ebuild:
+  added java use flag to IUSE, depend and myconf
+
+*kdebase-3.0.4-r3 (22 Nov 2002)
+
+  22 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdebase-3.0.4-r3.ebuild:
+  added fix for konsole crashing when using qt-3.1 (bug #10978 and #10796)
+
+*kdebase-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+  11 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  the path to startkde-patch was wrong in kdebase-3.0.4-r2, changed this.
+  Thanks to suka_at@yahoo.de (suka) for submission (bug #10541)
+
+*kdebase-3.1_rc2-r1 (10 Nov 2002)
+
+  10 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  This new revision has a static kdmrc file that enables several faetures
+  not pesent in the default one we had before. Among them are antialiasing
+  being turned on by default and making kdm use the scripts in /etc/X11/xdm.
+
+*kdebase-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+  04 Nov 2002; Mark Guertin <gerk@gentoo.org> kdebase-2.0.4-r2.ebuild :
+  My bad, set back as ppc (xfree-4.2.1 is upgraded already)
+
+  04 Nov 2002; Mark Guertin <gerk@gentoo.org> kdebase-2.0.4-r2.ebuild :
+  set ~ppc in keywords, this is not required (yet) on ppc until xfree-4.2.1
+  is set to stable, no sense making users upgrade
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdebase-3.0.4-r2.ebuild:
+  uses kdebase-3.0.4-nspluginviewer-qt31.diff.gz by default. This fixes
+  #10062
+
+*kdebase-3.0.4-r1 (29 Oct 2002)
+
+  29 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  A new version that adds a patch described in comment #20 of bug #9423
+  (kfontinst not compiling with xfree 4.2.1) in an attempt to fix that bug.
+
+*kdebase-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release. This incorporates all the fixes from
+  kdebase-3.0.3-r1, which wasn't unmasked.
+
+  05 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Make the default kdmrc use /etc/X11/xdm/Xsetup_0. It was using the
+  genkdmconf-generated Xsetup, which didn't know about our /etc/X11/Sessions
+  files.
+
+*kdebase-3.0.3-r1 (01 Oct 2002)
+
+  01 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #6519 (ksplash-ml installation problems). See the bugzilla page for
+  full info. Briefly, you can set $KSPLASH in your profile to the full path
+  of a ksplash-replacement binary of your choice. By default, ksplash-ml
+  is used if installed (actually it sets $KSPLASH in env.d), otherwise the
+  default kde ksplash. You will need the latest revision of ksplash-ml and
+  ksplash-ml-themes as well. All this is masked for now.
+  Also fix the remaining part of bug #5953 - use a new and better kde.pam
+  file. See the bugzilla page for details.
+
+  29 Aug 2002; Martin Schlemmer <azarah@gentoo.org> kscreensaver.pam :
+  Update to use system-auth. Bug #5953.
+
+  29 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix the sed on kdmrc so that it expands kde- into e.g. kde-3.0.3, and
+  desn't add a literal '' to the session list.
+
+  23 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Remove patch that was included in the mainline sources for 3.0.3.
+
+*kdebase-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+  13 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Add explicit >=media-libs/freetype-2 dep until I can figure out the issue
+  more fully. HTH, it certainly can't do harm.
+
+  27 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #3594: remove optimization flag -fomit-frame-pointer from the
+  kdm/kfrontend subdirectory's makefiles.
+
+*kdebase-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : :
+
+  New stability release.
+
+  10 Jun 2002; Dan Armak <danarmak@gentoo.org> changelog:
+
+  Fix the startkde patch to be correct for the global case of any $KDEDIR.
+
+*kdebase-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdebase-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1). Ebuild cleanup. Add dep on samba, conditional
+  on samba use flag.
+  
+  14 May 2002; Bart Verwilst <verwilst@gentoo.org> Changelog:
+  
+  Create a backup copy of the default splashscreen images so that they can be
+  put back after merging and unmerging e.g. mosfet (which overwrite them).
+  (Logged by Dan Armak)
+
+  5 May 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Don't abort when creating the emptydir if it already exists; use mkdir -p.
+
+*kdebase-3.0-r3 (4 May 2002)
+
+  4 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  
+  Fix bug #1978 ($KDEDIR/share/templates/.soure/emptydir disappearing on remerge).
+
+*kdebase-3.0-r2 (30 Apr 2002)
+
+  30 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  
+  Fix bug #2093 (files being installed into /var/tmp).
+
+  13 Apr 2002; Bart Verwilst <verwilst@gentoo.org>: Ok, just copied the 
+  icons inside the pics dir to the /usr/share/pixmaps first :o) you never 
+  know somebody _might_ add some more icons over time..
+
+  13 Apr 2002; Bart Verwilst <verwilst@gentoo.org>: Make sure the gnome 
+  icons are visible when choosing a new icon (under 'other icons'), 
+  instead of 3 ugly kde-icons. I won't change the revision for something 
+  as trivial as this though :o)
+
+  13 Apr 2002; Dan Armak <danarmak@gentoo.org>: add KDEDIRS to the 2.x
+  startkde as well (new revision 2.2.2-r3).
+
+  12 Apr 2002;  Seemant Kulleen <seemant@gentoo.org> kdebase-3.0-r1.ebuild
+  kdebase-3.0.ebuild kdebase-2.2.2-r2.ebuild :
+
+  Changed the vorbis USE flag to oggvorbis.
+
+*kdebase-3.0-r1 (9 Apr 2002)
+
+  9 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  
+  Added KDEDIRS and KDEMAINDIR variables to startkde. Hope it helps some people.
+
+*kdebase-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
+
+  16 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Made sure that $KDEDIR/share/templates/.source/emptydir gets installed,
+  and isn't ever unmerged, and is really empty. Closes bug #846.
+
+  10 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Added missing media-libs/lcms dep as notified on gentoo-dev.
 
 *kdebase-2.2.2-r2 (1 Feb 2002)
 
+  2 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Fixed bug #846, which prevented the /usr/kde/2/share/templates/.source/emptydir
+  directory from bein merged. This directory is needed for konqueror's New Directory
+  command.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index a5ffabf76bc4..9b8570803fb3 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -1,63 +1,67 @@
-MD5 d86cf66c5b1ca9de93d2cdc98875c980 kdebase-3.1.1a.ebuild 3316
-MD5 6c4679fc125b4c86c3c513f8fd65e76d .#ChangeLog.1.29 6213
-MD5 97c3ee75d6a4fde7ac863fd664d4eb5f kdebase-3.1-r1.ebuild 3805
-MD5 8abae83002b281ed8245261bfafe8763 kdebase-3.0.5b.ebuild 8115
-MD5 a934d20eb160a4cb8a8edd4ebd387a64 kdebase-3.1.1-r1.ebuild 3418
-MD5 e5df5ef4b2369f3349fb61c6f567b230 kdebase-3.0.4-r3.ebuild 4489
-MD5 378cf74d42ba6d30ccd0b61c420b1b96 kdebase-3.1.1.ebuild 3315
-MD5 875689ec3da4657a1d152c30788871c8 kdebase-2.2.2-r5.ebuild 2943
-MD5 4616c3a5dac71294a65bd62b42550cc6 kdebase-3.1.ebuild 3320
-MD5 abbe2ac5e9c940d44fa2a15503f10e66 kdebase-3.0.5a.ebuild 4189
-MD5 8f91aa0f1542945024f378b4432a8e33 ChangeLog 13050
-MD5 34e832659ad20dad4378fe1dbd192f17 kdebase-3.0.5a-r2.ebuild 8502
-MD5 875689ec3da4657a1d152c30788871c8 kdebase-2.2.2-r4.ebuild 2943
-MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a 69
-MD5 c07ead342cf5e19907a9ba978d713d80 files/digest-kdebase-3.0.5b 69
-MD5 1c511caae066d700eabea2058d8caae3 files/digest-kdebase-3.1.1a 136
-MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1-r1 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 91a63aa346954732ad7d3301ad0d8d6b ChangeLog 40315
+MD5 3403677f5c4e44815c5a97c507d4f117 files/3.3.2-r1/Xsetup 758
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r1/backgroundrc 342
+MD5 928f7208882e2a90d9cb633dcfa9abf9 files/3.3.2-r1/kdmrc 19878
+MD5 e4c7caf47cbddd4251ee76f0fe4070ba files/3.3.2-r1/startkde-3.3.2-r1-gentoo.diff 1544
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r2/backgroundrc 342
+MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r2/kdmrc 19864
+MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r2/startkde-3.3.2-r2-gentoo.diff 1420
+MD5 2f1f31f38b93136baeb537500c8cfabc files/3.3.2-r3/backgroundrc 342
+MD5 0e829761448ff4a074404d08399fcab3 files/3.3.2-r3/kdmrc 19864
+MD5 93b6c3484bb947b8ec75289fcbe47a85 files/3.3.2-r3/startkde-3.3.2-r3-gentoo.diff 1420
+MD5 38116c7e3963674ec4a3c0948904ec3b files/agent-shutdown.sh 320
+MD5 016f5ae82399f6d6c1b9f82aa80ac831 files/agent-startup.sh 550
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r1 68
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r2 68
+MD5 473c39b9f37a35e244d5718bf0006716 files/digest-kdebase-3.3.2-r3 68
+MD5 f7875ce8a2e0dde4822449ec3deac74e files/digest-kdebase-3.4.1-r1 68
+MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2 68
+MD5 ee7ed731fc8a9b896d5888b94febb4fe files/digest-kdebase-3.4.2-r1 68
+MD5 387a99610a8332cea995ed48d7e3339b files/digest-kdebase-3.4.2-r2 143
+MD5 b00bc3487e612ed4aa511ace892d5937 files/digest-kdebase-3.4.3 145
+MD5 567135da80c6ae6bc19c925a4ff42765 files/digest-kdebase-3.4.3-r1 145
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdebase-3.5.0 68
+MD5 12824ea25b96ca06a0a91f4e4bf81cab files/digest-kdebase-3.5.0_beta2 69
+MD5 7a4f5a930b2071393172484a0557bc17 files/digest-kdebase-3.5.0_rc1 72
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebase-3.5_beta1 69
+MD5 6fbfb59b6c34c3ed5a8b8bbfb5ccb1c7 files/kcheckpass-pie-final.patch 624
+MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
+MD5 78fb451ad534b71fc3e541e9e5759dac files/kde.desktop 3910
 MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 d06aabcc5fd1c39bc732b7571318d5d2 files/digest-kdebase-3.0.5a-r2 69
-MD5 6eb40b28a36f889d0f1919cdbf160ef7 files/kscreensaver.pam 79
-MD5 4b4d530bf8e05f89991d2161242da3f2 files/digest-kdebase-3.0.4-r3 68
-MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1-r1 68
-MD5 79fc6f0cd8a9dfcaf9acec89c1e53685 files/digest-kdebase-2.2.2-r4 135
-MD5 63e277899292d5e8e765367ab6f4234c files/digest-kdebase-2.2.2-r5 210
-MD5 7a40dbe0a3460fa95aa08d1a6df1af8a files/digest-kdebase-3.1.1 68
-MD5 94f7c5a331319b84b9a54094c2e6641e files/digest-kdebase-3.1 66
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1/kdmrc 17661
-MD5 a500709e4a41d613bd4a59bcc7d9a11c files/3.1/startkde-3.1-gentoo.diff 1848
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1/backgroundrc 342
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b files/3.1.1/startkde-3.1.1-gentoo.diff 1879
-MD5 41d954f907dd2ba220ebca498e7f1735 files/3.0.4-r3/kdebase-3.0.4-konsole-qt31.diff 611
-MD5 5a8c948b28b4558217ee06a9ea0c0305 files/3.0.4-r3/startkde-3.0.4-r3-gentoo.diff 1605
-MD5 b0dd1d862909571ddd17ea58bf3925d4 files/3.0.4-r3/kdebase-3.0.4-nspluginviewer-qt31.diff.gz 13733
-MD5 54c424a5920645360378aa5f494d35b2 files/3.0.4-r3/kdebase-3.0.4-xft1.1-fix.diff 3129
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.4-r3/kdebase-3.0.4-xft_h-fix.diff 214
-MD5 a4c64296993987d930fb938a3902b51b files/3.1.1-r1/kdebase-3.1.1-kdm.diff 5975
-MD5 f12f03b607574596c17507007591b61b files/3.1.1-r1/startkde-3.1.1-r1-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1-r1/backgroundrc 342
-MD5 7814212b71b6d5ef8a1fb4042d9d9edc files/3.1.1-r1/kdebase-3.1.1-minicli.diff 772
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r4/startkde-2.2.2-r4-gentoo 4010
-MD5 4653ca8833aa10adb3a4d2fe0afa1863 files/2.2.2-r5/startkde-2.2.2-r5-gentoo 4010
-MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a-r2/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5a-r2/kdebase-3.0.5a-xft2.0-fix.diff 4745
-MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5a-r2/startkde-3.0.5a-r2-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a-r2/kdebase-3.0.5a-xft_h-fix.diff 214
-MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5a/kdebase-3.0.5a-nspluginviewer-qt31.diff.gz 36346
-MD5 54c424a5920645360378aa5f494d35b2 files/3.0.5a/kdebase-3.0.5a-xft1.1-fix.diff 3129
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5a/kdebase-3.0.5a-xft_h-fix.diff 214
-MD5 32feb8257a8724e235935b111fa98a94 files/3.0.5a/startkde-3.0.5a-gentoo.diff 1608
-MD5 91f01b28ae245f6af19ea53cb5586101 files/3.0.5b/kdebase-3.0.5b-nspluginviewer-qt31.diff.gz 36346
-MD5 836a4045534a443437eea7506a7fa3f7 files/3.0.5b/startkde-3.0.5b-gentoo.diff 1641
-MD5 867ead4d7b68109c1437e1b96eb26342 files/3.0.5b/kdebase-3.0.5b-xft_h-fix.diff 214
-MD5 290aae1d211e55fcc2e6aa54859eb342 files/3.0.5b/kdebase-3.0.5b-xft2.0-fix.diff 4745
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1.1a/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1.1a/backgroundrc 342
-MD5 f12f03b607574596c17507007591b61b files/3.1.1a/startkde-3.1.1a-gentoo.diff 1879
-MD5 7db6d7353b1bfbb47d44e9df63be1410 files/3.1-r1/kdmrc 17661
-MD5 2f1f31f38b93136baeb537500c8cfabc files/3.1-r1/backgroundrc 342
-MD5 4c83f4f577a2cbcf7021fef0f2482fcc files/3.1-r1/startkde-3.1-r1-gentoo.diff 1901
-MD5 e5929c2c92c147f160b824c6fed8b573 files/3.1-r1/kdebase-3.1-kpager.diff 521
+MD5 c13bb6243f0c10dd3892ca00a9fce333 files/kdebase-3.4-configure.patch 7273
+MD5 49ebf63cda60ba3265f1231f295bc51b files/kdebase-3.4.1-configure.patch 6497
+MD5 acdc4850637dc2fafa8803790f771164 files/kdebase-3.4.1-startkde-gentoo.patch 1284
+MD5 65ca7243fb9d880e763019fdcf5b7264 files/kdebase-3.4.2-kinfocenter-opengl-fix.patch 346
+MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
+MD5 cbfa9f15423035b33eb50456dfb04691 files/kdebase-3.4.3-noimake.patch 2214
+MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
+MD5 dfb258d599bf770949dff416197af77f files/kdebase-3.5-configure-openexr.patch 780
+MD5 acf270f97062baaaa0576f0b2d28b3ce files/kdebase-3.5-startkde-gentoo.patch 1283
+MD5 472a5c5b9ade622637e00a6d28e69614 files/kdebase-3.5.0_beta2-noimake.patch 2248
+MD5 f06224b0a38152e5d3435b00a70bcf6c files/konsole-3.3.2.patch 1201
+MD5 6dfdd0c3f860e595b1ba5ba09d4f32f7 files/kxkb-3.5.0_rc1-modularx.patch 672
+MD5 c6866e71fa56d6d12a18e96499716d2c files/post-3.3.2-kdebase-htmlframes2.patch 1342
+MD5 3e5f9d9151b0e949e220754c4466d29c kdebase-3.3.2-r1.ebuild 3843
+MD5 9ea970c24377c122bfd0d1024d1aed0e kdebase-3.3.2-r2.ebuild 3627
+MD5 acf208f77b0607c97763d9f91cb8da35 kdebase-3.3.2-r3.ebuild 3751
+MD5 6c3e64729fba168a32ee89887da2ed82 kdebase-3.4.1-r1.ebuild 3882
+MD5 78cbbef7e2dc635f99b0d468cce8e028 kdebase-3.4.2-r1.ebuild 4224
+MD5 bca1b08e31bfa89d6d04e9996a77c0bd kdebase-3.4.2-r2.ebuild 4527
+MD5 d97f07ad36c0135703d7d85d89fe8785 kdebase-3.4.2.ebuild 4086
+MD5 340f2602770c7b5f30e1c26603cbdb14 kdebase-3.4.3-r1.ebuild 4488
+MD5 591117532cfbeb0a773148c9edf13f60 kdebase-3.4.3.ebuild 4256
+MD5 f0a2b1d6c1d17ce57f8bf2421895d99c kdebase-3.5.0.ebuild 4100
+MD5 b358eab7eab8c227d0985ba4f2280470 kdebase-3.5.0_beta2.ebuild 4265
+MD5 f4815f27488d7c174d789ce94ef90afc kdebase-3.5.0_rc1.ebuild 4238
+MD5 c9a8dd6584d378e6e0130a37ab107632 kdebase-3.5_beta1.ebuild 4087
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjhintT9W3vfTuoRAtPNAJ9VB0s9b93bxBOJ0JGlXXImFVg6pgCeJVcy
+V4pmiwtpJD8/L2h/nsjI+rg=
+=fkgx
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/agent-shutdown.sh b/kde-base/kdebase/files/agent-shutdown.sh
index c2095806c68a..479f3f7bfc18 100644
--- a/kde-base/kdebase/files/agent-shutdown.sh
+++ b/kde-base/kdebase/files/agent-shutdown.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# Customized agents shutdown file
-#
-#if [ -x /usr/bin/gpg-agent ]; then
-#  eval "$(/usr/bin/gpg-agent -k)"
-#fi 
-#
-#if [ -x /usr/bin/ssh-agent ]; then
-#  eval "$(/usr/bin/ssh-agent -k)"
+# This file is executed at kde shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+#if [ -n "${GPG_AGENT_INFO}" ]; then
+#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
 #fi
-#
 
+#if [ -n "${SSH_AGENT_PID}" ]; then
+#  eval "$(ssh-agent -k)"
+#fi
diff --git a/kde-base/kdebase/files/agent-startup.sh b/kde-base/kdebase/files/agent-startup.sh
index bf788b003549..768de9b24f39 100644
--- a/kde-base/kdebase/files/agent-startup.sh
+++ b/kde-base/kdebase/files/agent-startup.sh
@@ -1,13 +1,19 @@
-#!/bin/sh
-#
-# Customized agents startup file
+# Agents startup file
 #
+# This file is sourced at kde startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at kde startup.
+# If you do so, do not forget to uncomment the respective
+# lines in KDEDIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
 #if [ -x /usr/bin/gpg-agent ]; then
 #  eval "$(/usr/bin/gpg-agent --daemon)"
 #fi 
-#
+
 #if [ -x /usr/bin/ssh-agent ]; then
 #  eval "$(/usr/bin/ssh-agent -s)"
 #fi
-#
-
diff --git a/kde-base/kdebase/files/digest-kdebase-3.4.3 b/kde-base/kdebase/files/digest-kdebase-3.4.3
index bb8792f66435..b13a8a780aff 100644
--- a/kde-base/kdebase/files/digest-kdebase-3.4.3
+++ b/kde-base/kdebase/files/digest-kdebase-3.4.3
@@ -1,2 +1,2 @@
-MD5 7b25feba2774c077601d472dae5352c8 kdebase-3.4.3.tar.bz2 22425835
 MD5 0437cf2231a850d7a1b47d07daca603f kdebase-3.4.3-kubuntu-hal.patch.gz 8441
+MD5 7b25feba2774c077601d472dae5352c8 kdebase-3.4.3.tar.bz2 22425835
diff --git a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
index 413343ac8638..93ebe1b52a3c 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r1.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdebase/kdebase-3.3.2-r1.ebuild,v 1.1 2004/12/13 15:32:51 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:03 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="ldap pam cups ssl opengl samba java arts"
 
 DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
@@ -17,7 +17,6 @@ DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
 	opengl? ( virtual/opengl )
 	samba? ( >=net-fs/samba-3.0.1 )
 	java? ( || ( virtual/jdk virtual/jre ) )"
-
 RDEPEND="${DEPEND}
 	sys-apps/eject"
 
@@ -120,11 +119,6 @@ ${KDEDIR}/bin/startkde" > kde-${PV}
 	newins ${FILESDIR}/kde.desktop kde-${PV}.desktop
 	sed -i -e "s:_PREFIX_:${KDEDIR}:;s:_VERSION_:${PV}:" \
 		${D}/usr/share/xsessions/kde-${PV}.desktop
-
-	dodir ${D}/${KDEDIR}/share/services/searchprovider
-	insinto ${D}/${KDEDIR}/share/services/searchprovider
-	newins ${FILESDIR}/pgo.desktop
-
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild b/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
index a30848e1079e..8990a886f9e1 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r2.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/kde-base/kdebase/kdebase-3.3.2-r2.ebuild,v 1.1 2005/02/07 20:00:13 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:13:01 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~alpha"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="ldap pam cups ssl opengl samba java arts"
 
 DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
@@ -116,11 +116,6 @@ ${KDEDIR}/bin/startkde" > kde-${PV}
 	newins ${FILESDIR}/kde.desktop kde-${PV}.desktop
 	sed -i -e "s:_PREFIX_:${KDEDIR}:;s:_VERSION_:${PV}:" \
 		${D}/usr/share/xsessions/kde-${PV}.desktop
-
-	dodir ${D}/${KDEDIR}/share/services/searchprovider
-	insinto ${D}/${KDEDIR}/share/services/searchprovider
-	newins ${FILESDIR}/pgo.desktop
-
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild b/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
index c154ac71286c..3e288fe4c876 100644
--- a/kde-base/kdebase/kdebase-3.3.2-r3.ebuild
+++ b/kde-base/kdebase/kdebase-3.3.2-r3.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/kde-base/kdebase/kdebase-3.3.2-r3.ebuild,v 1.1 2005/06/08 16:18:53 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.3.2-r3.ebuild,v 1.1.1.1 2005/11/30 10:13:02 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 mips ~ppc ppc64 sparc x86"
 IUSE="ldap pam cups ssl opengl samba java arts"
 
 DEPEND="arts? ( ~kde-base/arts-${PV//3.3/1.3} )
diff --git a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild b/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
index 46505f91ad57..79c40ef12c0c 100644
--- a/kde-base/kdebase/kdebase-3.4.1-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.1-r1.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/kde-base/kdebase/kdebase-3.4.1-r1.ebuild,v 1.1 2005/06/07 13:00:19 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:02 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse opengl pam samba ssl"
 # hal: enables hal backend for 'media:' ioslave
 
diff --git a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild b/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
index f7013f74315a..58fa76592ccd 100644
--- a/kde-base/kdebase/kdebase-3.4.2-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2-r1.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/kde-base/kdebase/kdebase-3.4.2-r1.ebuild,v 1.1 2005/08/06 10:27:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl pam samba ssl"
 # hal: enables hal backend for 'media:' ioslave
 
diff --git a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild b/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
index 9dc4e896132e..0fb4dbbdfd40 100644
--- a/kde-base/kdebase/kdebase-3.4.2-r2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.2-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/kde-base/kdebase/kdebase-3.4.2-r2.ebuild,v 1.1 2005/10/04 09:40:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:13:02 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdebase/kdebase-3.4.2.ebuild b/kde-base/kdebase/kdebase-3.4.2.ebuild
index 0e5f460e5194..3c67dd95d047 100644
--- a/kde-base/kdebase/kdebase-3.4.2.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.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/kde-base/kdebase/kdebase-3.4.2.ebuild,v 1.1 2005/07/28 13:01:46 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:01 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl pam samba ssl"
 # hal: enables hal backend for 'media:' ioslave
 
diff --git a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild b/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
index 622075c91cef..2595f2466052 100644
--- a/kde-base/kdebase/kdebase-3.4.3-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.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/kde-base/kdebase/kdebase-3.4.3-r1.ebuild,v 1.1 2005/10/19 13:48:05 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:01 chriswhite Exp $
 
 inherit kde-dist eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror...
 
 SRC_URI="${SRC_URI} mirror://gentoo/kdebase-3.4.3-kubuntu-hal.patch.gz"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl pam samba ssl"
 # hal: enables hal backend for 'media:' ioslave
 
diff --git a/kde-base/kdebase/kdebase-3.4.3.ebuild b/kde-base/kdebase/kdebase-3.4.3.ebuild
index 78b1e3a9d54e..4a4571b062d5 100644
--- a/kde-base/kdebase/kdebase-3.4.3.ebuild
+++ b/kde-base/kdebase/kdebase-3.4.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/kde-base/kdebase/kdebase-3.4.3.ebuild,v 1.1 2005/10/12 13:21:33 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:02 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdebase/kdebase-3.5.0.ebuild b/kde-base/kdebase/kdebase-3.5.0.ebuild
index 82b2b8104546..86d9ed30e001 100644
--- a/kde-base/kdebase/kdebase-3.5.0.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.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/kde-base/kdebase/kdebase-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:02 chriswhite Exp $
 
 inherit kde-dist eutils
 
@@ -43,10 +43,6 @@ src_unpack() {
 	# Avoid using imake (kde bug 114466).
 	epatch "${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
 
-	# Let kxkb search in Xorg 7.0 default path (kde rev 481658, applied for
-	# final).
-	epatch "${FILESDIR}/kxkb-${PV}-modularx.patch"
-
 	# For the noimake patch.
 	make -f admin/Makefile.common || die
 }
diff --git a/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild
index bc202bdc3ea4..0a08c00ddd39 100644
--- a/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0_beta2.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/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:02 chriswhite Exp $
 
 inherit kde-dist eutils
 
@@ -39,6 +39,16 @@ src_unpack() {
 	kde_src_unpack
 
 	epatch "${FILESDIR}/kdebase-3.5-startkde-gentoo.patch"
+
+	# Avoid using imake (kde bug 114466).
+	epatch "${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
+
+	# Fixes problem with PIE and kcheckpass with --enable-final on PIC plaforms
+	# Already applied for 3.5 RC.
+	epatch "${FILESDIR}/kcheckpass-pie-final.patch"
+
+	# For the noimake patch.
+	make -f admin/Makefile.common || die
 }
 
 src_compile() {
diff --git a/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild b/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild
index 375504a0d220..048cdb0dbdfe 100644
--- a/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0_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/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild,v 1.1 2005/11/16 09:50:32 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:01 chriswhite Exp $
 
 inherit kde-dist eutils
 
@@ -43,6 +43,10 @@ src_unpack() {
 	# Avoid using imake (kde bug 114466).
 	epatch "${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
 
+	# Let kxkb search in Xorg 7.0 default path (kde rev 481658, applied for
+	# final).
+	epatch "${FILESDIR}/kxkb-${PV}-modularx.patch"
+
 	# For the noimake patch.
 	make -f admin/Makefile.common || die
 }
diff --git a/kde-base/kdebase/kdebase-3.5_beta1.ebuild b/kde-base/kdebase/kdebase-3.5_beta1.ebuild
index 8d5d8611c027..3213f2d9c9b3 100644
--- a/kde-base/kdebase/kdebase-3.5_beta1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5_beta1.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/kde-base/kdebase/kdebase-3.5_beta1.ebuild,v 1.1 2005/09/21 17:19:54 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:01 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdebase/metadata.xml b/kde-base/kdebase/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebase/metadata.xml
+++ b/kde-base/kdebase/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebindings-meta/ChangeLog b/kde-base/kdebindings-meta/ChangeLog
index e4c8f4bdf30e..0ee4576b3545 100644
--- a/kde-base/kdebindings-meta/ChangeLog
+++ b/kde-base/kdebindings-meta/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/kdebindings-meta
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebindings-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdebindings-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdebindings-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebindings-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdebindings-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebindings-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdebindings-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdebindings-meta-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebindings-meta-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*kdebindings-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebindings-meta-3.4.3.ebuild:
+  New version.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org> ChangeLog:
+  slot 3.4 -> 3.5
+
+*kdebindings-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebindings-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> kdebindings-meta-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kdebindings-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebindings-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdebindings-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdebindings-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdebindings-meta-3.4.0_rc1.ebuild:
+  Fix incorrect dep: dcoppython doesn't have an rc1 ebuild
+
+*kdebindings-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebindings-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdebindings-meta-3.3.2.ebuild, kdebindings-meta-3.4.0_beta2.ebuild:
+  Since dcopperl, dcoppython, qtruby and korundum have been moved to SLOT 0
+  (bug 80858) and only one version of each can be installed now, the deps here
+  are changed to match. This means kdebindings-meta-3.3.2 will work with
+  dcopperl-3.4.0. That's better than the alternative of not being able to
+  emerge two versions of kdebindings-meta at all.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdebindings-meta-3.3.2.ebuild:
+  Added x86 (stable) keyword.
+
+*kdebindings-meta-3.4.0_beta1 (06 Feb 2005)
+
+  06 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdebindings-meta-3.3.1.ebuild, kdebindings-meta-3.3.2.ebuild,
+  kdebindings-meta-3.4.0_beta1.ebuild, kdebindings-meta-3.4.0_beta2.ebuild:
+  Fix typo in the ebuild: RRDEPEND->RDEPEND. Previously the ebuild didn't do
+  anything. Curious that noone seems to have reported this.
+
+*kdebindings-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebindings-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kdebindings-meta-3.3.2 (25 Dec 2004)
+
+  25 Dec 2004; Dan Armak <danarmak@gentoo.org>
+  kdebindings-meta-3.3.1.ebuild, +kdebindings-meta-3.3.2.ebuild:
+  New ebuild for 3.3.2.
 
 *kdebindings-meta-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/kdebindings-meta/Manifest b/kde-base/kdebindings-meta/Manifest
index d2d15895cc90..a07f0ee10b36 100644
--- a/kde-base/kdebindings-meta/Manifest
+++ b/kde-base/kdebindings-meta/Manifest
@@ -1,2 +1,26 @@
-MD5 b2009c3a0b837e254a0d07c75a39805f kdebindings-meta-3.3.1.ebuild 711
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.3.1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d4c22765ad73fa0eec36ac5b02c60739 ChangeLog 4222
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.3.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdebindings-meta-3.5.0_rc1 0
+MD5 12b79deb58d7cc5f2296eef7b59fda85 kdebindings-meta-3.3.2.ebuild 868
+MD5 2730af65ee19bbce168461c9ebcf6710 kdebindings-meta-3.4.1.ebuild 870
+MD5 75a15cf3ac183925f2cbf9e9370962eb kdebindings-meta-3.4.2.ebuild 935
+MD5 d95d99d241889008a55ea5e882a8f7ee kdebindings-meta-3.4.3.ebuild 929
+MD5 9c7ee4d835a7def9e46b54bc88945f8d kdebindings-meta-3.5.0.ebuild 924
+MD5 d98b79baf9c9ab70504e059d134983b9 kdebindings-meta-3.5.0_beta2.ebuild 913
+MD5 67e5fddcc71de2a08fa58920b980bfe9 kdebindings-meta-3.5.0_rc1.ebuild 928
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyU7ntT9W3vfTuoRAuMYAJkB4wpYuKZQNAAGDBlJ7q5Ipmu2YACcDBT0
+b4WpBrAfUt+1OJe+HTakUbk=
+=Elgc
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.3.2.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.3.2.ebuild
index 3ca86b45ffc0..c2565e69279e 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.3.2.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.3.2.ebuild
@@ -1,28 +1,28 @@
-# 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/kde-base/kdebindings-meta/kdebindings-meta-3.3.2.ebuild,v 1.1 2004/12/25 15:48:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=3.3.2
 
 inherit kde-functions
-DESCRIPTION="kdebindings - merge this to pull in all kdebase-derived packages"
+DESCRIPTION="kdebindings - merge this to pull in all kdebindings-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.3"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-RRDEPEND="
+RDEPEND="
 $(deprange 3.3.1 $PV kde-base/dcopc)
-$(deprange 3.3.1 $PV kde-base/dcopperl)
-$(deprange 3.3.1 $PV kde-base/dcoppython)
+>=kde-base/dcopperl-3.3.1
+>=kde-base/dcoppython-3.3.1
 $(deprange $PV $MAXKDEVER kde-base/kalyptus)
 $(deprange 3.3.1 $PV kde-base/kdejava)
 $(deprange 3.3.1 $PV kde-base/kjsembed)
-$(deprange $PV $MAXKDEVER kde-base/korundum)
+>=kde-base/korundum-$PV
 $(deprange $PV $MAXKDEVER kde-base/qtjava)
-$(deprange $PV $MAXKDEVER kde-base/qtruby)
+>=kde-base/qtruby-$PV
 $(deprange 3.3.1 $PV kde-base/smoke)"
 
 
-# Omitted: qtsharp, dcopjava, xparts (considered broken by upstream) 
\ No newline at end of file
+# Omitted: qtsharp, dcopjava, xparts (considered broken by upstream) 
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.4.1.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.4.1.ebuild
index 8b4f94e34ce6..14b90b0642ab 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.4.1.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.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/kde-base/kdebindings-meta/kdebindings-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.4.2.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.4.2.ebuild
index a99a24e212d1..0148f67f4acd 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.4.2.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.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/kde-base/kdebindings-meta/kdebindings-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.4.3.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.4.3.ebuild
index 470d4a98eba9..6f6d91062471 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.4.3.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.4.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/kde-base/kdebindings-meta/kdebindings-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 
 # Unslotted packages aren't depended on via deprange
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.5.0.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.5.0.ebuild
index 437ead81ed24..1c25a7d67c0c 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.5.0.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.5.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/kde-base/kdebindings-meta/kdebindings-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_beta2.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_beta2.ebuild
index fb69d4f54961..37314805dd5a 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_beta2.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/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # Unslotted packages aren't depended on via deprange
diff --git a/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_rc1.ebuild b/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_rc1.ebuild
index 31c0b0b40637..703e8d4570bf 100644
--- a/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_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/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings-meta/kdebindings-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdebindings-meta/metadata.xml b/kde-base/kdebindings-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebindings-meta/metadata.xml
+++ b/kde-base/kdebindings-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdebugdialog/ChangeLog b/kde-base/kdebugdialog/ChangeLog
index 3dca08a67d6b..d775308227ff 100644
--- a/kde-base/kdebugdialog/ChangeLog
+++ b/kde-base/kdebugdialog/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for kde-base/kdebugdialog
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/ChangeLog,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
+
+*kdebugdialog-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdebugdialog-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdebugdialog-3.5_beta1.ebuild, kdebugdialog-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdebugdialog-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdebugdialog-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdebugdialog-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdebugdialog-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebugdialog-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdebugdialog-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdebugdialog-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdebugdialog-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdebugdialog-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdebugdialog-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdebugdialog-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdebugdialog-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdebugdialog-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdebugdialog-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdebugdialog-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdebugdialog-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdebugdialog-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdebugdialog-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdebugdialog-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdebugdialog-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdebugdialog-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdebugdialog-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdebugdialog/Manifest b/kde-base/kdebugdialog/Manifest
index f4f95b1c22d4..a80ea4a564ab 100644
--- a/kde-base/kdebugdialog/Manifest
+++ b/kde-base/kdebugdialog/Manifest
@@ -1,4 +1,10 @@
-MD5 8d9189afca730d063872a7082365d7dc kdebugdialog-3.4.0_beta1.ebuild 401
-MD5 8d9189afca730d063872a7082365d7dc kdebugdialog-3.4.0_alpha1.ebuild 401
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdebugdialog-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdebugdialog-3.4.0_beta1 216
+MD5 159398abdf41384f0369796c850f2b56 ChangeLog 3001
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdebugdialog-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdebugdialog-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdebugdialog-3.5.0_beta2 216
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdebugdialog-3.5_beta1 69
+MD5 47c49165caf13987a165904f7107a459 kdebugdialog-3.4.1.ebuild 444
+MD5 2a95a32c63dc46ea64a4e910c94a46db kdebugdialog-3.5.0.ebuild 421
+MD5 8d84f13e185e92224a117e1b43341d5c kdebugdialog-3.5.0_beta2.ebuild 433
+MD5 622fec7bf1117a8a47d9e582010a4fa1 kdebugdialog-3.5_beta1.ebuild 424
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdebugdialog/files/digest-kdebugdialog-3.4.1 b/kde-base/kdebugdialog/files/digest-kdebugdialog-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdebugdialog/files/digest-kdebugdialog-3.4.1
+++ b/kde-base/kdebugdialog/files/digest-kdebugdialog-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdebugdialog/kdebugdialog-3.4.1.ebuild b/kde-base/kdebugdialog/kdebugdialog-3.4.1.ebuild
index f53d3dd7c8d6..475de745b7f8 100644
--- a/kde-base/kdebugdialog/kdebugdialog-3.4.1.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kdebugdialog/kdebugdialog-3.5.0.ebuild b/kde-base/kdebugdialog/kdebugdialog-3.5.0.ebuild
index a560ff760c02..7c5ed50dd77a 100644
--- a/kde-base/kdebugdialog/kdebugdialog-3.5.0.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-3.5.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/kde-base/kdebugdialog/kdebugdialog-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdebugdialog/kdebugdialog-3.5.0_beta2.ebuild b/kde-base/kdebugdialog/kdebugdialog-3.5.0_beta2.ebuild
index 5660df925023..cc23a0eb1db5 100644
--- a/kde-base/kdebugdialog/kdebugdialog-3.5.0_beta2.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-3.5.0_beta2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kdebugdialog/kdebugdialog-3.5_beta1.ebuild b/kde-base/kdebugdialog/kdebugdialog-3.5_beta1.ebuild
index 718a22fc4aa6..ac389296b17b 100644
--- a/kde-base/kdebugdialog/kdebugdialog-3.5_beta1.ebuild
+++ b/kde-base/kdebugdialog/kdebugdialog-3.5_beta1.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/kde-base/kdebugdialog/kdebugdialog-3.5_beta1.ebuild,v 1.1 2005/09/22 18:25:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebugdialog/kdebugdialog-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialog box for setting preferences for debug output"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kdebugdialog/metadata.xml b/kde-base/kdebugdialog/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdebugdialog/metadata.xml
+++ b/kde-base/kdebugdialog/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeedu-applnk/ChangeLog b/kde-base/kdeedu-applnk/ChangeLog
index e5705800eb07..4789c43d3947 100644
--- a/kde-base/kdeedu-applnk/ChangeLog
+++ b/kde-base/kdeedu-applnk/ChangeLog
@@ -1,6 +1,102 @@
 # ChangeLog for kde-base/kdeedu-applnk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/ChangeLog,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeedu-applnk-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdeedu-applnk-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeedu-applnk-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeedu-applnk-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-applnk-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeedu-applnk-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-applnk-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeedu-applnk-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeedu-applnk-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeedu-applnk-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeedu-applnk-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeedu-applnk-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeedu-applnk-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeedu-applnk-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeedu-applnk-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-applnk-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeedu-applnk-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeedu-applnk-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdeedu-applnk-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeedu-applnk-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-applnk-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdeedu-applnk-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdeedu-applnk-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeedu-applnk-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeedu-applnk-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeedu-applnk-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeedu-applnk-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeedu-applnk-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeedu-applnk-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeedu-applnk-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeedu-applnk-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeedu-applnk/Manifest b/kde-base/kdeedu-applnk/Manifest
index 2fb09476868b..fb043d87d248 100644
--- a/kde-base/kdeedu-applnk/Manifest
+++ b/kde-base/kdeedu-applnk/Manifest
@@ -1,4 +1,22 @@
-MD5 89a7ab7a87c2534a6d6aad3bcf1d5279 kdeedu-applnk-3.4.0_beta1.ebuild 297
-MD5 89a7ab7a87c2534a6d6aad3bcf1d5279 kdeedu-applnk-3.4.0_alpha1.ebuild 297
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kdeedu-applnk-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kdeedu-applnk-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c588f47ba189ed7a4b79a32e10a39901 ChangeLog 3510
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kdeedu-applnk-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kdeedu-applnk-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kdeedu-applnk-3.5.0 67
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kdeedu-applnk-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kdeedu-applnk-3.5_beta1 68
+MD5 a893b67057bb2913fd7c68473079e8dc kdeedu-applnk-3.4.1.ebuild 428
+MD5 7be227425abe97b92db1a4397af04caa kdeedu-applnk-3.4.2.ebuild 439
+MD5 7a92753ed2c2a8f8fd19173e6b3ef3c6 kdeedu-applnk-3.5.0.ebuild 417
+MD5 874b92d0d94c49675609d129db187693 kdeedu-applnk-3.5.0_rc1.ebuild 421
+MD5 d92cb07a9a189500dc0caa22e8de4e9b kdeedu-applnk-3.5_beta1.ebuild 428
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlEKntT9W3vfTuoRAlDoAJ9ucLrgx4EwAVkr1V3tGUkSfrMG0ACfWJ4T
+8i+l3+192uJ7qqsWlls1PlA=
+=be/y
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.1 b/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.1
+++ b/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.2 b/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.2
+++ b/kde-base/kdeedu-applnk/files/digest-kdeedu-applnk-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.1.ebuild b/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.1.ebuild
index 9fef283affdf..fa0d1f4e17f9 100644
--- a/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.1.ebuild
+++ b/kde-base/kdeedu-applnk/kdeedu-applnk-3.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/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.1.ebuild,v 1.1 2005/05/25 21:23:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 KMMODULE=applnk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="applnk files for kdeedu-derived apps"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.2.ebuild b/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.2.ebuild
index eca3b1ecc7d1..86b800bfced0 100644
--- a/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.2.ebuild
+++ b/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 KMMODULE=applnk
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="applnk files for kdeedu-derived apps"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0.ebuild b/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0.ebuild
index e29250d1ce8d..66ccfe696549 100644
--- a/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0.ebuild
+++ b/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.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/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 KMMODULE=applnk
 MAXKDEVER=$PV
diff --git a/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0_rc1.ebuild b/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0_rc1.ebuild
index 2237f621955f..d39a599fae96 100644
--- a/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0_rc1.ebuild
+++ b/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0_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/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 KMMODULE=applnk
 MAXKDEVER=$PV
diff --git a/kde-base/kdeedu-applnk/kdeedu-applnk-3.5_beta1.ebuild b/kde-base/kdeedu-applnk/kdeedu-applnk-3.5_beta1.ebuild
index 2b7515cb880d..2ab3dff971de 100644
--- a/kde-base/kdeedu-applnk/kdeedu-applnk-3.5_beta1.ebuild
+++ b/kde-base/kdeedu-applnk/kdeedu-applnk-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.5_beta1.ebuild,v 1.1 2005/09/22 18:26:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-applnk/kdeedu-applnk-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 KMMODULE=applnk
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_beta2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="applnk files for kdeedu-derived apps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kdeedu-applnk/metadata.xml b/kde-base/kdeedu-applnk/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeedu-applnk/metadata.xml
+++ b/kde-base/kdeedu-applnk/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeedu-meta/ChangeLog b/kde-base/kdeedu-meta/ChangeLog
index 3f223b25a1ed..2cbe17ad0a0d 100644
--- a/kde-base/kdeedu-meta/ChangeLog
+++ b/kde-base/kdeedu-meta/ChangeLog
@@ -1,6 +1,134 @@
 # ChangeLog for kde-base/kdeedu-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeedu-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdeedu-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeedu-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeedu-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeedu-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeedu-meta-3.5_beta1.ebuild, kdeedu-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> kdeedu-meta-3.4.3.ebuild,
+  kdeedu-meta-3.5.0_beta2.ebuild:
+  Do not compile kmathtool by default (#109318).
+
+*kdeedu-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-meta-3.5.0_beta2.ebuild:
+  New version.
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> kdeedu-meta-3.4.3.ebuild:
+  Readding ~alpha keyword, since kvoctrain has been keyworded ~alpha.
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> kdeedu-meta-3.4.3.ebuild:
+  Removing ~alpha keyword, because the dep kvoctrain has had its keyword
+  removed in 3.4.2-r1.
+
+*kdeedu-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeedu-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  24 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdeedu-meta-3.5_beta1.ebuild:
+  Update list of kdeedu packages.
+
+*kdeedu-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeedu-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdeedu-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdeedu-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeedu-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeedu-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdeedu-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeedu-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeedu-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdeedu-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeedu-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdeedu-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdeedu-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeedu-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeedu-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeedu-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeedu-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeedu-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeedu-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeedu-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeedu-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeedu-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeedu-meta/Manifest b/kde-base/kdeedu-meta/Manifest
index bc3f51788c79..529bc708b22b 100644
--- a/kde-base/kdeedu-meta/Manifest
+++ b/kde-base/kdeedu-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 39563f8252150a61de19bbdbb356d6c9 kdeedu-meta-3.4.0_alpha1.ebuild 1179
-MD5 39563f8252150a61de19bbdbb356d6c9 kdeedu-meta-3.4.0_beta1.ebuild 1179
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4fc7c68d8c9831e975f9b2fdab8c232b ChangeLog 4564
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeedu-meta-3.5_beta1 0
+MD5 831319842fc689cc23905179fa383de8 kdeedu-meta-3.4.1.ebuild 1301
+MD5 346fa4b05c432e9c340240fa656a4629 kdeedu-meta-3.4.2.ebuild 1313
+MD5 bfba8474eb7bd0a7e3942cb451b03ab9 kdeedu-meta-3.4.3.ebuild 1356
+MD5 bd1542186673a03cfc78946855e6a024 kdeedu-meta-3.5.0.ebuild 1330
+MD5 146092fcb655d4180d944a543225ab3b kdeedu-meta-3.5.0_beta2.ebuild 1359
+MD5 a896667a171947dfcba4887d15b6ce0c kdeedu-meta-3.5.0_rc1.ebuild 1368
+MD5 8534b43d928020376de16a7fb773a2a7 kdeedu-meta-3.5_beta1.ebuild 1379
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhld/ntT9W3vfTuoRAmL9AJ961NYM+5AzATaWv0YiGiaOSciwzQCdHIuh
+proNyp8jBg85Z5GA1/E+lsw=
+=+Ki+
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.4.1.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.4.1.ebuild
index 81940d753b26..972d8fcfb1c8 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.4.1.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
-DESCRIPTION="kdeedu 3.3.0 - merge this to pull in all kdeedu-derived packages"
+DESCRIPTION="kdeedu - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.4.2.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.4.2.ebuild
index 8c383af44686..83c8cf9867cf 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.4.2.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.4.2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
-DESCRIPTION="kdeedu 3.3.0 - merge this to pull in all kdeedu-derived packages"
+DESCRIPTION="kdeedu - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.4.3.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.4.3.ebuild
index ca645898822e..87c151972ba9 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.4.3.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.4.3.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
-DESCRIPTION="kdeedu 3.3.0 - merge this to pull in all kdeedu-derived packages"
+DESCRIPTION="kdeedu - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
@@ -30,6 +30,8 @@ $(deprange $PV $MAXKDEVER kde-base/kmplot)
 $(deprange $PV $MAXKDEVER kde-base/kstars)
 $(deprange $PV $MAXKDEVER kde-base/ktouch)
 $(deprange 3.4.2 $MAXKDEVER kde-base/klettres)
-$(deprange 3.4.2 $MAXKDEVER kde-base/kmathtool)
 $(deprange $PV $MAXKDEVER kde-base/kwordquiz)
 "
+
+# Not compiled by default.
+#$(deprange 3.4.2 $MAXKDEVER kde-base/kmathtool)
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.5.0.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.5.0.ebuild
index e3f4243f269f..8d741f80f926 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.5.0.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.5.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/kde-base/kdeedu-meta/kdeedu-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_beta2.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_beta2.ebuild
index dac348723efb..38cb14ae9564 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_beta2.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/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
@@ -32,6 +32,5 @@ $(deprange $PV $MAXKDEVER kde-base/kmplot)
 $(deprange $PV $MAXKDEVER kde-base/kstars)
 $(deprange $PV $MAXKDEVER kde-base/ktouch)
 $(deprange $PV $MAXKDEVER kde-base/klettres)
-$(deprange 3.5_beta1 $MAXKDEVER kde-base/kmathtool)
 $(deprange $PV $MAXKDEVER kde-base/kwordquiz)
 "
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_rc1.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_rc1.ebuild
index c98ac01b880c..fe62e839bf6e 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_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/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeedu-meta/kdeedu-meta-3.5_beta1.ebuild b/kde-base/kdeedu-meta/kdeedu-meta-3.5_beta1.ebuild
index e54fe8fba1b0..028622716542 100644
--- a/kde-base/kdeedu-meta/kdeedu-meta-3.5_beta1.ebuild
+++ b/kde-base/kdeedu-meta/kdeedu-meta-3.5_beta1.ebuild
@@ -1,21 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:45:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu-meta/kdeedu-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
-DESCRIPTION="kdeedu 3.3.0 - merge this to pull in all kdeedu-derived packages"
+DESCRIPTION="kdeedu - merge this to pull in all kdeedu-derived packages"
 HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
-$(deprange $PV $MAXKDEVER kde-base/kig)
+$(deprange $PV $MAXKDEVER kde-base/blinken)
+$(deprange $PV $MAXKDEVER kde-base/kanagram)
 $(deprange $PV $MAXKDEVER kde-base/kalzium)
+$(deprange $PV $MAXKDEVER kde-base/kgeography)
 $(deprange $PV $MAXKDEVER kde-base/khangman)
+$(deprange $PV $MAXKDEVER kde-base/kig)
 $(deprange $PV $MAXKDEVER kde-base/kpercentage)
 $(deprange $PV $MAXKDEVER kde-base/kiten)
 $(deprange $PV $MAXKDEVER kde-base/kvoctrain)
@@ -24,7 +27,6 @@ $(deprange $PV $MAXKDEVER kde-base/kverbos)
 $(deprange $PV $MAXKDEVER kde-base/kdeedu-applnk)
 $(deprange $PV $MAXKDEVER kde-base/kbruch)
 $(deprange $PV $MAXKDEVER kde-base/keduca)
-$(deprange $PV $MAXKDEVER kde-base/kmessedwords)
 $(deprange $PV $MAXKDEVER kde-base/klatin)
 $(deprange $PV $MAXKDEVER kde-base/kmplot)
 $(deprange $PV $MAXKDEVER kde-base/kstars)
diff --git a/kde-base/kdeedu-meta/metadata.xml b/kde-base/kdeedu-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeedu-meta/metadata.xml
+++ b/kde-base/kdeedu-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeedu/ChangeLog b/kde-base/kdeedu/ChangeLog
index a3f44fc17c55..e54fba85a0ea 100644
--- a/kde-base/kdeedu/ChangeLog
+++ b/kde-base/kdeedu/ChangeLog
@@ -1,6 +1,612 @@
 # ChangeLog for kde-base/kdeedu
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.1 2002/04/04 20:09:23 danarmak Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/ChangeLog,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeedu-3.4.3-r10.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdeedu-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeedu-3.4.3-r10.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeedu-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.5.0_rc1.ebuild:
+  New version.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdeedu-3.4.1-r1.ebuild:
+  Mark 3.4.1-r1 stable on alpha
+
+*kdeedu-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeedu-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeedu-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeedu-3.4.3.ebuild:
+  New version.
+
+*kdeedu-3.4.3-r10 (12 Oct 2005)
+*kdeedu-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.3.ebuild,
+  +kdeedu-3.4.3-r10.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdeedu-3.4.2-r2.ebuild:
+  Keyworded ~mips.
+
+*kdeedu-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdeedu-3.4.1-r1.ebuild:
+  stable on ia64
+
+*kdeedu-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdeedu-3.4.1-r1.ebuild:
+  Stable on hppa and ppc.
+
+  16 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdeedu-3.3.2-r2.ebuild:
+  Stable on ia64, bug 102577.
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> kdeedu-3.3.2-r2.ebuild,
+  kdeedu-3.4.1-r1.ebuild:
+  Stable on SPARC wrt security bug #102577.
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org> kdeedu-3.4.1-r1.ebuild:
+  Stable on AMD64. Closes bug #102577
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org> kdeedu-3.3.2-r2.ebuild:
+  Stable on AMD64. Closes bug #102577
+
+  15 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdeedu-3.3.2-r2.ebuild:
+  Stable on ppc and hppa.
+
+  15 Aug 2005; Jose Luis Rivero <yoswink@gentoo.org> kdeedu-3.3.2-r2.ebuild:
+  Stable on alpha wrt #102577
+
+  15 Aug 2005; Markus Rothe <corsair@gentoo.org> kdeedu-3.3.2-r2.ebuild:
+  Stable on ppc64 (bug #102577)
+
+*kdeedu-3.4.2-r2 (14 Aug 2005)
+*kdeedu-3.4.1-r11 (14 Aug 2005)
+*kdeedu-3.4.1-r1 (14 Aug 2005)
+*kdeedu-3.3.2-r2 (14 Aug 2005)
+
+  14 Aug 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.4.2-kdeedu.diff, +kdeedu-3.3.2-r2.ebuild,
+  +kdeedu-3.4.1-r1.ebuild, +kdeedu-3.4.1-r11.ebuild,
+  +kdeedu-3.4.2-r2.ebuild:
+  KVoctrain temp file vulnerability, #102151
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdeedu-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdeedu-3.4.2-r1 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.2-r1.ebuild:
+  Readd a version of kdeedu with scripting support in kig.
+
+*kdeedu-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.2.ebuild:
+  New version.
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeedu-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeedu-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeedu-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeedu-3.4.1-r10.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeedu-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> ChangeLog:
+  Marked ppc stable for bug #97544.
+
+*kdeedu-3.4.1-r10 (30 Jun 2005)
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org> kdeedu-3.4.1.ebuild,
+  +kdeedu-3.4.1-r10.ebuild:
+  Added new revision identical to the old one, and removed kig-scripting
+  support in 3.4.1 (the old revision). The intention is to keyword only the
+  3.4.1 ebuild stable, and leave -r10 at ~arch, because the version of boost
+  necessary for kig-scripting support doesn't yet haev stable keywwords.
+
+*kdeedu-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.1.ebuild:
+  New version.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> kdeedu-3.4.0.ebuild:
+  add ~ia64
+
+  24 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kdeedu-3.4.0.ebuild:
+  Use local flag 'kig-scripting' instead of 'python' to enable scripting
+  support, disabling it by default (#85925).
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeedu-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Guy Martin <gmsoft@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  Stable on hppa.
+
+*kdeedu-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdeedu-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.0_rc1.ebuild:
+  New version. Add support for python scripting in kig.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdeedu-3.3.2.ebuild:
+  Marked ~mips
+
+  20 Feb 2005; Aron Griffis <agriffis@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  stable on ia64 #79585
+
+  16 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  stable on amd64. see #79585
+
+  16 Feb 2005; Luca Barbato <lu_zero@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  Marked ppc
+
+  16 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  Stable on alpha, bug 79585.
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdeedu-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  15 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  Stable on sparc wrt #79585
+
+  15 Feb 2005; Markus Rothe <corsair@gentoo.org> kdeedu-3.3.2-r1.ebuild:
+  Stable on ppc64; bug #79585
+
+*kdeedu-3.3.2-r1 (14 Feb 2005)
+
+  14 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +kdeedu-3.3.2-r1.ebuild:
+  buffer overflows in fliccd of kstars, #79585
+
+*kdeedu-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdeedu-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdeedu-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdeedu-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeedu-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdeedu-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdeedu-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdeedu-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdeedu-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdeedu-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdeedu-3.3.2.ebuild:
+  Version bump
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeedu-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdeedu-3.3.1.ebuild:
+  Marked ppc stable.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeedu-3.3.1.ebuild:
+  ~alpha keyword.
+
+  03 Nov 2004; Markus Rothe <corsair@gentoo.org> kdeedu-3.3.1.ebuild:
+  Removed patch lines for ppc and ppc64 (patch no longer needed). Bug #69949
+
+  16 Oct 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.3.1.ebuild:
+  Removed line for sparc patch from ebuild as it is no longer needed in kde-3.3.1
+
+*kdeedu-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdeedu-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdeedu-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdeedu-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeedu-3.2.1.ebuild:
+  3.3.0 is x86 stable
+
+  03 Sep 2004; Carsten Lohrke <carlo@gentoo.org> kdeedu-3.3.0.ebuild:
+  care for patches
+
+  02 Sep 2004; Carsten Lohrke <carlo@gentoo.org> kdeedu-3.3.0.ebuild:
+  jfs compatibility fix, #62510
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> kdeedu-3.3.0.ebuild:
+  stable on ppc64, bug #62165
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeedu-3.1.5.ebuild, kdeedu-3.2.1.ebuild, kdeedu-3.3.0.ebuild:
+  Masked kdeedu-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeedu-3.1.5.ebuild, kdeedu-3.2.1.ebuild:
+  Masked kdeedu-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeedu-3.1.5.ebuild:
+  Masked kdeedu-3.1.5.ebuild stable for ppc
+
+*kdeedu-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.3.0.ebuild,
+  kdeedu-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdeedu-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.3.0_beta1.ebuild,
+  kdeedu-3.3.0_rc2.ebuild:
+  Add _rc2, remove _beta1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdeedu-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdeedu-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdeedu-3.3.0_beta2.ebuild:
+  new beta
+
+*kdeedu-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdeedu-3.3.0_alpha1.ebuild,
+  +kdeedu-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdeedu-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdeedu-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdeedu-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdeedu-3.2.2.ebuild:
+  stable on amd64
+
+*kdeedu-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> +kdeedu-3.3.0_alpha1.ebuild:
+  3.3 alpha 1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdeedu-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdeedu-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.2.2.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdeedu-3.2.2.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdeedu-3.2.2-gcc34-compile.patch:
+  GCC 3.4 compile fix
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdeedu-3.0.5b.ebuild:
+  Remove old version
+
+*kdeedu-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdeedu-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdeedu-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.4.ebuild,
+  kdeedu-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kdeedu-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdeedu-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdeedu-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdeedu-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.2.0.ebuild,
+  kdeedu-3.2.0_beta2.ebuild, kdeedu-3.2.0_rc1.ebuild:
+  New version, remove old version
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeedu-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdeedu-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.0.4.ebuild,
+  kdeedu-3.1.2.ebuild, kdeedu-3.2.0_beta1.ebuild, kdeedu-3.2.0_beta2.ebuild,
+  kdeedu-3.2.0_rc1.ebuild, files/kdeedu-3.2.0_beta2-sparc-lx200.patch:
+  New version, removing older versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeedu-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdeedu-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeedu-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdeedu-3.2.0_beta2.ebuild,
+  files/kdeedu-3.2.0_beta2-sparc-lx200.patch:
+  Added ~sparc keyword.
+
+*kdeedu-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdeedu-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdeedu-3.1.4.ebuild:
+  Marked ppc
+
+*kdeedu-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdeedu-3.1.4.ebuild:
+  add ~amd64 flag
+
+*kdeedu-3.2.0_alpha2 (28 Sep 2003)
+
+  28 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.1.ebuild,
+  kdeedu-3.1.1.ebuild, kdeedu-3.1.3.ebuild, kdeedu-3.1.3.ebuild:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.4.ebuild:
+  marking x86 stable
+
+*kdeedu-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeedu-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+*kdeedu-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdeedu-3.1.3.ebuild:
+  Version bump
+
+  20 Jun 2003l Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.1, 3.1-r1 3.0.5a
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdeedu-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeedu-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdeedu-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdeedu-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdeedu-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdeedu-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.0.2.ebuild,
+  kdeedu-3.0.3.ebuild, kdeedu-3.1_rc6.ebuild: removed old ebuilds
+
+  05 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.1-r1.ebuild:
+  filter "-fomit-frame-pointer" if gcc-2.95.3 is used. fixes bug #14768
+
+*kdeedu-3.1-r1 (02 Feb 2003)
+
+  08 Mar 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.1-r1.ebuild:
+  Changed ~sparc keyword to sparc
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdeedu-3.1-r1.ebuild:
+  Added ~alpha keyword
+
+  02 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #51708 on bugs.kde.org (kstars exiting when view is swithed to a
+  point below the horizon). This is a patch from upstream cvs.
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdeedu-3.1.ebuild:
+  added ~sparc to keywords
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdeedu-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdeedu-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.1_rc6.ebuild:
+  version bump
+
+*kdeedu-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdeedu-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdeedu-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdeedu-3.1_rc5.ebuild
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdeedu-3.1.ebuild:
+  Added ppc keyword
+
+*kdeedu-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdeedu-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdeedu-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+  27 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix the code that removes the -fomit-frame-pointer flag from the kgeo and
+  kgeo/kgeo dirs' makefiles. Fixes #6788.
+
+*kdeedu-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdeedu-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : :
+
+  New stability release.
+
+*kdeedu-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdeedu-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1). Add missing call to kde_src_compile:myconf.
 
 *kdeedu-3.0 (4 Apr 2002)
 
diff --git a/kde-base/kdeedu/Manifest b/kde-base/kdeedu/Manifest
index f37bdb2e8e5f..08e3a7d17842 100644
--- a/kde-base/kdeedu/Manifest
+++ b/kde-base/kdeedu/Manifest
@@ -1,14 +1,45 @@
-MD5 72d30efe1d4d84a11c284e540f5f5ba1 kdeedu-3.0.5a.ebuild 633
-MD5 a6fdae2f761e924b99bbf50cb47f0db0 kdeedu-3.1.ebuild 310
-MD5 28a156d34db2bc5b1aad866a8ac0ba7a kdeedu-3.0.4.ebuild 625
-MD5 c6546ea57bb9a4033056f23b0716fb6f kdeedu-3.1-r1.ebuild 607
-MD5 825c4870be117b9b58bf0f9f5d40ad93 kdeedu-3.0.5b.ebuild 635
-MD5 3f16459f9ef00e1e0c781a59cc110981 ChangeLog 4424
-MD5 e025bee316055afa7e13a2f014d4e65e kdeedu-3.1.1.ebuild 419
-MD5 a31261be6204300d1af5f34ab6675a6f files/digest-kdeedu-3.0.5a 67
-MD5 e5cc833cf9395a8fdb5aa2ee18943e17 files/digest-kdeedu-3.0.5b 211
-MD5 193fd2058ab2e37f96859872fd99bcfd files/digest-kdeedu-3.1-r1 65
-MD5 193fd2058ab2e37f96859872fd99bcfd files/digest-kdeedu-3.1 65
-MD5 c4afd51ff390ce0228c7b580558ea033 files/kdeedu-3.1-branch-20030202.diff 4596
-MD5 0c79179c373ac6bcb1623c57d87ce229 files/digest-kdeedu-3.0.4 66
-MD5 68a34630292321130142b9ce15fab8bb files/digest-kdeedu-3.1.1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7918a6851221a6308d4421cd77997e2a ChangeLog 19266
+MD5 217724099165841cf8d84c4449344b2b files/digest-kdeedu-3.3.2 67
+MD5 8c7a533efeec6ea8c10027674472c7dd files/digest-kdeedu-3.3.2-r1 133
+MD5 8c7a533efeec6ea8c10027674472c7dd files/digest-kdeedu-3.3.2-r2 133
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1 67
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1-r1 67
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1-r10 67
+MD5 130e2ed23a0a0e8e00482b72450a525b files/digest-kdeedu-3.4.1-r11 67
+MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2 67
+MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2-r1 67
+MD5 0a69a5cb72c99f0ecc6f31877d6a228d files/digest-kdeedu-3.4.2-r2 67
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kdeedu-3.4.3 67
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kdeedu-3.4.3-r10 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kdeedu-3.5.0 67
+MD5 a53cf5dfdc44b4db21baed2e313acb44 files/digest-kdeedu-3.5.0_beta2 68
+MD5 3fb974789d0a2a20317b91df5b61fa3d files/digest-kdeedu-3.5.0_rc1 71
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kdeedu-3.5_beta1 68
+MD5 0e82c5810df3b04370188ba13cc50203 files/post-3.4.2-kdeedu.diff 1876
+MD5 8070d6e5cc1db3ec0736ca4a1f98764f kdeedu-3.3.2-r1.ebuild 720
+MD5 3a06c6f14b22aba9f6c791af2cea99eb kdeedu-3.3.2-r2.ebuild 763
+MD5 6ff7a4db095bb782a651b7856754ec08 kdeedu-3.3.2.ebuild 485
+MD5 2a620df424a42508423658da7d5cdfad kdeedu-3.4.1-r1.ebuild 436
+MD5 1d60b1487202f1902008238e59f9518d kdeedu-3.4.1-r10.ebuild 492
+MD5 9a464fd52083f983d91d69ed7b21ed6a kdeedu-3.4.1-r11.ebuild 538
+MD5 0a4c5b2e6bf26b17b618e2bdcb51a5b9 kdeedu-3.4.1.ebuild 380
+MD5 e7cd9b62dca74069886026f2b18a1aa1 kdeedu-3.4.2-r1.ebuild 497
+MD5 e9ab02b63c7cc15a2e5b90d211f62ea2 kdeedu-3.4.2-r2.ebuild 550
+MD5 cb126b5f74362daf4ecc8786f8b9f0e1 kdeedu-3.4.2.ebuild 381
+MD5 f75ce2054b9e2ba67aaa1a2a3a674665 kdeedu-3.4.3-r10.ebuild 501
+MD5 004429e86b6583b1d8f0e00e2af83586 kdeedu-3.4.3.ebuild 592
+MD5 2c14f2731a6a91fd2889c181be14875a kdeedu-3.5.0.ebuild 496
+MD5 8dea7e41d3857868385964cce9bef333 kdeedu-3.5.0_beta2.ebuild 500
+MD5 560d1aba67933bb16f80b8f134b43274 kdeedu-3.5.0_rc1.ebuild 498
+MD5 6e24412117007ce3f82f9111088df423 kdeedu-3.5_beta1.ebuild 498
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlfUntT9W3vfTuoRAgrdAJ9pUpmKsd2bHxAzROvfdHJdpU6e4QCgp7l3
+Xaq2PG4dSa1lggLEvfBVZ4w=
+=LQbW
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeedu/kdeedu-3.3.2-r1.ebuild b/kde-base/kdeedu/kdeedu-3.3.2-r1.ebuild
index 84343a00f210..6d4d00791fa5 100644
--- a/kde-base/kdeedu/kdeedu-3.3.2-r1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.3.2-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.2-r1.ebuild,v 1.1 2005/02/14 20:07:43 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE educational apps"
 SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2
 	http://dev.gentoo.org/~carlo/patches/kstars-3_3.diff.tar.gz"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild b/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild
index a290c8ead1c2..4a3d0cc72863 100644
--- a/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE educational apps"
 SRC_URI="mirror://kde/stable/${PV}/src/${PN}-${PV}.tar.bz2
 	http://dev.gentoo.org/~carlo/patches/kstars-3_3.diff.tar.gz"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/kde-base/kdeedu/kdeedu-3.3.2.ebuild b/kde-base/kdeedu/kdeedu-3.3.2.ebuild
index 5cb3d4ae0aaa..72abe1c06813 100644
--- a/kde-base/kdeedu/kdeedu-3.3.2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.3.2.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdeedu/kdeedu-3.3.2.ebuild,v 1.1 2004/12/09 02:29:55 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64 ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 src_unpack() {
diff --git a/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild b/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild
index 82953dfd9513..b32b37750b37 100644
--- a/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.1-r1.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/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~amd64 ~ia64 ~mips ~ppc ~sparc x86 ~hppa"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/kde-base/kdeedu/kdeedu-3.4.1-r10.ebuild b/kde-base/kdeedu/kdeedu-3.4.1-r10.ebuild
index 5839c1116abc..8d704206fbb0 100644
--- a/kde-base/kdeedu/kdeedu-3.4.1-r10.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.1-r10.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/kde-base/kdeedu/kdeedu-3.4.1-r10.ebuild,v 1.1 2005/06/30 15:03:43 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1-r10.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="kig-scripting"
 
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
diff --git a/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild b/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild
index 3562d6396bde..883104e0ecbc 100644
--- a/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.1-r11.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/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1-r11.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/kdeedu-3.4.1.ebuild b/kde-base/kdeedu/kdeedu-3.4.1.ebuild
index dd952eef9feb..755254129f38 100644
--- a/kde-base/kdeedu/kdeedu-3.4.1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.1.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1.ebuild,v 1.1 2005/05/27 08:52:43 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
-IUSE="kig-scripting"
+KEYWORDS="amd64 ~ia64 ~mips ppc sparc x86 hppa"
+IUSE=""
 
-DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+DEPEND=""
 
-src_compile() {
-	myconf="$(use_enable kig-scripting kig-python-scripting)"
-
-	kde_src_compile
-}
+myconf="--disable-kig-python-scripting"
diff --git a/kde-base/kdeedu/kdeedu-3.4.2-r1.ebuild b/kde-base/kdeedu/kdeedu-3.4.2-r1.ebuild
index 897fdee2bbd2..26ae7158191b 100644
--- a/kde-base/kdeedu/kdeedu-3.4.2-r1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.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/kde-base/kdeedu/kdeedu-3.4.2-r1.ebuild,v 1.1 2005/07/28 13:37:22 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild b/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild
index aeb08bf3e17a..9d64393c1a08 100644
--- a/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.2-r2.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/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild,v 1.1 2005/08/14 23:33:39 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="kig-scripting"
 
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
diff --git a/kde-base/kdeedu/kdeedu-3.4.2.ebuild b/kde-base/kdeedu/kdeedu-3.4.2.ebuild
index 19e0fafd754c..11765abc18d7 100644
--- a/kde-base/kdeedu/kdeedu-3.4.2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.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/kde-base/kdeedu/kdeedu-3.4.2.ebuild,v 1.1 2005/07/28 12:55:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/kde-base/kdeedu/kdeedu-3.4.3-r10.ebuild b/kde-base/kdeedu/kdeedu-3.4.3-r10.ebuild
index cbf0a30e3537..0b648ab27b11 100644
--- a/kde-base/kdeedu/kdeedu-3.4.3-r10.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.3-r10.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/kde-base/kdeedu/kdeedu-3.4.3-r10.ebuild,v 1.1 2005/10/12 13:24:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.3-r10.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE educational apps"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="kig-scripting"
 
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
diff --git a/kde-base/kdeedu/kdeedu-3.4.3.ebuild b/kde-base/kdeedu/kdeedu-3.4.3.ebuild
index b5603b632cb0..8570ccddd53d 100644
--- a/kde-base/kdeedu/kdeedu-3.4.3.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.4.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/kde-base/kdeedu/kdeedu-3.4.3.ebuild,v 1.1 2005/10/12 13:24:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/kdeedu-3.5.0.ebuild b/kde-base/kdeedu/kdeedu-3.5.0.ebuild
index 0113d8c96b45..53e6ae888f7c 100644
--- a/kde-base/kdeedu/kdeedu-3.5.0.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.5.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/kde-base/kdeedu/kdeedu-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/kdeedu-3.5.0_beta2.ebuild b/kde-base/kdeedu/kdeedu-3.5.0_beta2.ebuild
index e22f05c751af..484a6d12584b 100644
--- a/kde-base/kdeedu/kdeedu-3.5.0_beta2.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.5.0_beta2.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/kde-base/kdeedu/kdeedu-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/kdeedu-3.5.0_rc1.ebuild b/kde-base/kdeedu/kdeedu-3.5.0_rc1.ebuild
index 13beb10b814f..a744d2237194 100644
--- a/kde-base/kdeedu/kdeedu-3.5.0_rc1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.5.0_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/kde-base/kdeedu/kdeedu-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:16:53 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/kdeedu-3.5_beta1.ebuild b/kde-base/kdeedu/kdeedu-3.5_beta1.ebuild
index c16a288d8f38..7d8cf6ec8f4b 100644
--- a/kde-base/kdeedu/kdeedu-3.5_beta1.ebuild
+++ b/kde-base/kdeedu/kdeedu-3.5_beta1.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/kde-base/kdeedu/kdeedu-3.5_beta1.ebuild,v 1.1 2005/09/21 17:22:19 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeedu/kdeedu-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdeedu/metadata.xml b/kde-base/kdeedu/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeedu/metadata.xml
+++ b/kde-base/kdeedu/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdegames-meta/ChangeLog b/kde-base/kdegames-meta/ChangeLog
index 4efc3a483dd8..0554876730e9 100644
--- a/kde-base/kdegames-meta/ChangeLog
+++ b/kde-base/kdegames-meta/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for kde-base/kdegames-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegames-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdegames-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdegames-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdegames-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegames-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdegames-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegames-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdegames-meta-3.5_beta1.ebuild, kdegames-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdegames-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegames-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdegames-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegames-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdegames-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdegames-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegames-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdegames-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdegames-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegames-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegames-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdegames-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdegames-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdegames-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdegames-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdegames-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdegames-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdegames-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  25 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegames-meta-3.4.0.ebuild:
+  Marked ~amd64 now that visibility has been disabled - bug 80944.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdegames-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdegames-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdegames-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdegames-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegames-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdegames-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegames-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdegames-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegames-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdegames-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdegames-meta/Manifest b/kde-base/kdegames-meta/Manifest
index b8125fb4b994..733e039b0af2 100644
--- a/kde-base/kdegames-meta/Manifest
+++ b/kde-base/kdegames-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 dcb06205cd6d889988c2978ee8d8b785 kdegames-meta-3.4.0_beta1.ebuild 1724
-MD5 dcb06205cd6d889988c2978ee8d8b785 kdegames-meta-3.4.0_alpha1.ebuild 1724
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.4.0_alpha1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d7656f0efc2f99b1edb6f299f009e495 ChangeLog 4066
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegames-meta-3.5_beta1 0
+MD5 7b6d9a711de2dc6c791876da178773cc kdegames-meta-3.4.1.ebuild 1867
+MD5 91d7168af2caffd9f91e900cc4d8111f kdegames-meta-3.4.2.ebuild 1877
+MD5 213b9f1df8ca8cffbd8a069abdd2527b kdegames-meta-3.4.3.ebuild 1873
+MD5 c178c79177a9e7770610f6a889c54bb8 kdegames-meta-3.5.0.ebuild 1853
+MD5 f929e12ecbb9ffe0c20bf91d5eada4e8 kdegames-meta-3.5.0_beta2.ebuild 1858
+MD5 b7fbfd805153499ca2dd8084cbc66bd6 kdegames-meta-3.5.0_rc1.ebuild 1857
+MD5 9e6da26f72f6e76c8aabaea1c083b32b kdegames-meta-3.5_beta1.ebuild 1856
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmNjntT9W3vfTuoRAjXNAJ9zWHeMMI7NUNZCpaXfXkohBqxl8wCeLb26
+EniAcIBnLVJRq2IxtnvtePI=
+=xKPr
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.4.1.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.4.1.ebuild
index 7dfc81279347..a41a4e37db4d 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.4.1.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.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/kde-base/kdegames-meta/kdegames-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,8 +9,8 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="arts"
 
 RDEPEND="
 arts? ( $(deprange $PV $MAXKDEVER kde-base/kasteroids)
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.4.2.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.4.2.ebuild
index 309c6ef90add..32db748a917b 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.4.2.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.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/kde-base/kdegames-meta/kdegames-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.4.3.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.4.3.ebuild
index 751def9e01a4..a08e5ae2c10e 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.4.3.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.4.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/kde-base/kdegames-meta/kdegames-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.5.0.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.5.0.ebuild
index 8c934e38dfb3..7dabf8239691 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.5.0.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.5.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/kde-base/kdegames-meta/kdegames-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.5.0_beta2.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.5.0_beta2.ebuild
index 60b5049c4282..72f56ccac62d 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.5.0_beta2.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/kde-base/kdegames-meta/kdegames-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.5.0_rc1.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.5.0_rc1.ebuild
index 6c04296b01d3..796ab57c7ba0 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.5.0_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/kde-base/kdegames-meta/kdegames-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdegames-meta/kdegames-meta-3.5_beta1.ebuild b/kde-base/kdegames-meta/kdegames-meta-3.5_beta1.ebuild
index 5e18a542f2ed..4a6f4066cc4b 100644
--- a/kde-base/kdegames-meta/kdegames-meta-3.5_beta1.ebuild
+++ b/kde-base/kdegames-meta/kdegames-meta-3.5_beta1.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/kde-base/kdegames-meta/kdegames-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:46:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames-meta/kdegames-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts"
 
 RDEPEND="
diff --git a/kde-base/kdegames-meta/metadata.xml b/kde-base/kdegames-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdegames-meta/metadata.xml
+++ b/kde-base/kdegames-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdegames/ChangeLog b/kde-base/kdegames/ChangeLog
index 21d92b185a35..b65fe933919e 100644
--- a/kde-base/kdegames/ChangeLog
+++ b/kde-base/kdegames/ChangeLog
@@ -1,6 +1,531 @@
 # ChangeLog for kde-base/kdegames
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/ChangeLog,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdegames-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdegames-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegames-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdegames-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdegames-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegames-3.5.0_rc1.ebuild:
+  New version.
+
+*kdegames-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegames-3.5.0_beta2.ebuild:
+  New version.
+
+*kdegames-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegames-3.4.3.ebuild:
+  New version.
+
+*kdegames-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegames-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdegames-3.4.2.ebuild:
+  Keyworded ~mips.
+
+*kdegames-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegames-3.5_beta1.ebuild:
+  New version.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdegames-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdegames-3.4.1.ebuild:
+  stable on ia64
+
+*kdegames-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegames-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdegames-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdegames-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegames-3.4.2.ebuild:
+  New version.
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdegames-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdegames-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdegames-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdegames-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdegames-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdegames-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdegames-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegames-3.4.1.ebuild:
+  New version.
+
+  10 May 2005; Aron Griffis <agriffis@gentoo.org> kdegames-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdegames-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdegames-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegames-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdegames-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegames-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdegames-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdegames-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdegames-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegames-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdegames-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdegames-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdegames-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegames-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdegames-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdegames-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdegames-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdegames-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdegames-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdegames-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdegames-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdegames-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdegames-3.3.1.ebuild:
+  Marked ppc stable.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdegames-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdegames-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdegames-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdegames-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdegames-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdegames-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdegames-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdegames-3.2.1.ebuild,
+  -kdegames-3.3.0_rc2.ebuild:
+  3.3.0 is x86 stable
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdegames-3.1.5.ebuild, kdegames-3.2.1.ebuild, kdegames-3.3.0.ebuild:
+  Masked kdegames-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdegames-3.1.5.ebuild, kdegames-3.2.1.ebuild:
+  Masked kdegames-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdegames-3.1.5.ebuild:
+  Masked kdegames-3.1.5.ebuild stable for ppc
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdegames-3.3.0.ebuild:
+  stable on ppc64, bug #58187
+
+*kdegames-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.3.0.ebuild,
+  kdegames-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdegames-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.3.0_beta1.ebuild,
+  kdegames-3.3.0_rc2.ebuild:
+  Add _rc2, remove _beta1
+
+*kdegames-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdegames-3.3.0_beta2.ebuild:
+  new beta
+
+*kdegames-3.3.0_beta1 (09 Jul 2004)
+
+  09 Jul 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.3.0_alpha1.ebuild,
+  kdegames-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdegames-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdegames-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdegames-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdegames-3.2.2.ebuild:
+  stable on amd64
+
+*kdegames-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> +kdegames-3.3.0_alpha1.ebuild:
+  3.3 alpha1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdegames-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdegames-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdegames-3.2.2.ebuild:
+  Stable on sparc.
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/kdegames-3.0.5b-gentoo.diff, -kdegames-3.0.5b.ebuild:
+  Remove old version
+
+*kdegames-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdegames-3.2.2.ebuild:
+  Verision bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdegames-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdegames-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.1.4.ebuild,
+  kdegames-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kdegames-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdegames-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdegames-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdegames-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdegames-3.2.0.ebuild:
+  Marked ~ppc
+
+  05 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0.ebuild,
+  files/ktron.patch, files/libksirtet.patch:
+  Incorporate two patches that fix compilation.
+
+  04 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0.ebuild:
+  Don't compile ktron as it breaks for most people.
+  When a fix is available, we'll use it.
+
+*kdegames-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0.ebuild,
+  kdegames-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdegames-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdegames-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdegames-3.0.4.ebuild,
+  kdegames-3.1.2.ebuild, kdegames-3.2.0_beta1.ebuild,
+  kdegames-3.2.0_beta2.ebuild, kdegames-3.2.0_rc1.ebuild:
+  New version, removing older versions
+
+*kdegames-3.1.5 (16 Jan 2004)
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdegames-3.1.5.ebuild:
+  Marked stable on hppa.
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> :
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdegames-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdegames-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdegames-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdegames-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdegames-3.1.4.ebuild:
+  Marked ppc
+
+*kdegames-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdegames-3.1.4.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegames-2.2.2-r1.ebuild,
+  kdegames-2.2.2-r1.ebuild, kdegames-3.1.1.ebuild, kdegames-3.1.1.ebuild,
+  kdegames-3.1.3.ebuild, kdegames-3.1.3.ebuild,
+  files/kdegames-3.1.3-gcc33.diff:
+  removing stale versions
+
+*kdegames-3.2.0_alpha2 (27 Sep 2003)
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.1.4.ebuild:
+  marking x86 stable
+
+*kdegames-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+  06 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdegames-3.1.3.ebuild:
+  Added a patch to make it compile with gcc33
+
+*kdegames-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdegames-3.1.3.ebuild:
+  Version bump
+
+  13 Jul 2003; Daniel Robbins <drobbins@gentoo.org>: kdegames-3.1.2.ebuild:
+  like doctomoe with other kde-base ebuilds, I'm having parallel compile
+  problems. -j1 mode forced for this ebuild. No rev bump.
+  
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>: Removing 3.0.5a, 3.1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdegames-3.1.2.ebuild:
+  Marked stable for alpha
+
+  10 Jun 2003; Will Woods <wwoods@gentoo.org> kdegames-3.1.2.ebuild:
+  Changed the way we avoid building kmines on alpha.
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdegames-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdegames-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdegames-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdegames-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegames-3.0.5b.ebuild,
+  files/kdegames-3.0.5b-gentoo.diff:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdegames-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdegames-3.1.1.ebuild:
+  version bump
+
+*kdegames-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdegames-3.1.ebuild:
+  Hack to build without kmines on alpha, due to linker problems.
+  Removed previous patch which tried to fix this.
+  Added ~alpha keyword.
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdegames-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdegames-2.2.2.ebuild,
+  kdegames-3.0.2.ebuild, kdegames-3.0.3.ebuild, kdegames-3.1_rc6.ebuild:
+  removed old ebuilds
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdegames-3.1.ebuild:
+  added ~sparc to keyword
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+*kdegames-2.2.2-r1 (17 Jan 2003)
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdegames-2.2.2-r1.ebuild:
+  new version, fixes #12520
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdegames-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdegames-3.1._rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdegames-3.1_rc6.ebuild:
+  version bump
+
+*kdegames-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdegames-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdegames-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdegames-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdegames-3.1.ebuild:
+  Added ppc keyword
+
+*kdegames-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdegames-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdegames-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdegames-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdegames-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : :
+
+  New stability release.
+
+*kdegames-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdegames-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdegames-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdegames-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdegames/Manifest b/kde-base/kdegames/Manifest
index c410445cb4b3..4bf3ac9a6fdd 100644
--- a/kde-base/kdegames/Manifest
+++ b/kde-base/kdegames/Manifest
@@ -1,15 +1,28 @@
-MD5 17378a3176e17113464f403fd626c998 kdegames-2.2.2-r1.ebuild 482
-MD5 2df21a42b3519b94e7502ddefbee32c5 kdegames-3.0.4.ebuild 311
-MD5 5041d53d51f432255e29cf4d6a8aa385 kdegames-3.0.5b.ebuild 361
-MD5 0fdbe7995ecbecc0c21b63c24993b9f0 kdegames-3.1.ebuild 1050
-MD5 1405f8f60a28b33362aa6e46eb7c9a27 kdegames-3.1.1.ebuild 1051
-MD5 4da952f0eb299febdcbd1f06b007c5ef ChangeLog 4124
-MD5 9ef4bdeba44ef8eb32397a2e238fcb62 kdegames-3.0.5a.ebuild 359
-MD5 9454a7045d01e70b0b5b69c46be36801 files/kdegames-3.0.5b-gentoo.diff 592
-MD5 245411bbbf6ddc4fe9698b192374f69f files/digest-kdegames-2.2.2-r1 135
-MD5 73a3b61ff37f70ff995d3eaf9ae3e7d5 files/digest-kdegames-3.0.4 68
-MD5 c607a5f007e635dc05b4cf219e0f3ee9 files/digest-kdegames-3.1.1 68
-MD5 9454a7045d01e70b0b5b69c46be36801 files/kdegames-3.0.5a-gentoo.diff 592
-MD5 3e1e11419cebd48e317298cd8e20cf32 files/digest-kdegames-3.1 66
-MD5 2f6e69cece4660efe6de56a735409a4d files/digest-kdegames-3.0.5a 69
-MD5 726d8204b4760054fba2739aad24a7e4 files/digest-kdegames-3.0.5b 286
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 990c67b339f2d2a2adfb655976366211 ChangeLog 16322
+MD5 800905445ecab590b4dd377979174cce files/digest-kdegames-3.3.2 68
+MD5 7bb80d1fe9135a6bf99467903d48bb70 files/digest-kdegames-3.4.1 68
+MD5 b6a10ce36a18708dd9210e57751a7478 files/digest-kdegames-3.4.2 68
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kdegames-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kdegames-3.5.0 69
+MD5 75568beaee1e3b48eba3e2f97333d291 files/digest-kdegames-3.5.0_beta2 70
+MD5 e1652ea364cbe1574f526a1454708a5b files/digest-kdegames-3.5.0_rc1 73
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kdegames-3.5_beta1 70
+MD5 f3a5a8b6c765d4c06d1b41f1705750d0 kdegames-3.3.2.ebuild 355
+MD5 66b44c66f3f1f7127fa6683dca8bdccd kdegames-3.4.1.ebuild 352
+MD5 590eb77795668d03e555d96b40614ff1 kdegames-3.4.2.ebuild 490
+MD5 2763de46cedc9c525e3edb0bef34c1b9 kdegames-3.4.3.ebuild 486
+MD5 774df5121766d5c3105989855bbaca23 kdegames-3.5.0.ebuild 415
+MD5 f8a613ad223ff44804f32f9045d64df5 kdegames-3.5.0_beta2.ebuild 419
+MD5 cb49a9223fd8e936bcb8fdb362adff43 kdegames-3.5.0_rc1.ebuild 417
+MD5 4fb9f3a56fa16f0a39085249e1fa7c13 kdegames-3.5_beta1.ebuild 417
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmOpntT9W3vfTuoRAqckAJ9ung7KQYZ4GU0xixNSiH/o9RPthwCfXS5H
+9BNIAwWgO1WODl+spDMF414=
+=aP1q
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegames/kdegames-3.3.2.ebuild b/kde-base/kdegames/kdegames-3.3.2.ebuild
index fae12cc6741f..e5be7d52d370 100644
--- a/kde-base/kdegames/kdegames-3.3.2.ebuild
+++ b/kde-base/kdegames/kdegames-3.3.2.ebuild
@@ -1,10 +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/kde-base/kdegames/kdegames-3.3.2.ebuild,v 1.1 2004/12/09 02:26:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE games (solitaire :-)"
 
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdegames/kdegames-3.4.1.ebuild b/kde-base/kdegames/kdegames-3.4.1.ebuild
index 3b97766f1044..faa8a4eada5f 100644
--- a/kde-base/kdegames/kdegames-3.4.1.ebuild
+++ b/kde-base/kdegames/kdegames-3.4.1.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/kde-base/kdegames/kdegames-3.4.1.ebuild,v 1.1 2005/05/27 08:53:30 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE games (not just solitaire ;-)"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/kde-base/kdegames/kdegames-3.4.2.ebuild b/kde-base/kdegames/kdegames-3.4.2.ebuild
index a3671f2750b1..00d6607a49ba 100644
--- a/kde-base/kdegames/kdegames-3.4.2.ebuild
+++ b/kde-base/kdegames/kdegames-3.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/kde-base/kdegames/kdegames-3.4.2.ebuild,v 1.1 2005/07/28 13:02:29 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegames/kdegames-3.4.3.ebuild b/kde-base/kdegames/kdegames-3.4.3.ebuild
index e641d2511f2d..7222761b4af4 100644
--- a/kde-base/kdegames/kdegames-3.4.3.ebuild
+++ b/kde-base/kdegames/kdegames-3.4.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/kde-base/kdegames/kdegames-3.4.3.ebuild,v 1.1 2005/10/12 13:24:47 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE games (not just solitaire ;-)"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE=""
 
 # For backgrounds in kpat.
diff --git a/kde-base/kdegames/kdegames-3.5.0.ebuild b/kde-base/kdegames/kdegames-3.5.0.ebuild
index e708a62fe438..1992b932f0b3 100644
--- a/kde-base/kdegames/kdegames-3.5.0.ebuild
+++ b/kde-base/kdegames/kdegames-3.5.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/kde-base/kdegames/kdegames-3.5.0.ebuild,v 1.1 2005/11/22 22:14:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegames/kdegames-3.5.0_beta2.ebuild b/kde-base/kdegames/kdegames-3.5.0_beta2.ebuild
index 113e1c77768f..780662b5bf23 100644
--- a/kde-base/kdegames/kdegames-3.5.0_beta2.ebuild
+++ b/kde-base/kdegames/kdegames-3.5.0_beta2.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/kde-base/kdegames/kdegames-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegames/kdegames-3.5.0_rc1.ebuild b/kde-base/kdegames/kdegames-3.5.0_rc1.ebuild
index 6de9e70370a9..c7e6f5c624a4 100644
--- a/kde-base/kdegames/kdegames-3.5.0_rc1.ebuild
+++ b/kde-base/kdegames/kdegames-3.5.0_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/kde-base/kdegames/kdegames-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:19:24 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegames/kdegames-3.5_beta1.ebuild b/kde-base/kdegames/kdegames-3.5_beta1.ebuild
index 0b8409bb3a9d..d5abd5102fde 100644
--- a/kde-base/kdegames/kdegames-3.5_beta1.ebuild
+++ b/kde-base/kdegames/kdegames-3.5_beta1.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/kde-base/kdegames/kdegames-3.5_beta1.ebuild,v 1.1 2005/09/21 17:22:57 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegames/kdegames-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegames/metadata.xml b/kde-base/kdegames/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdegames/metadata.xml
+++ b/kde-base/kdegames/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdegraphics-kfile-plugins/ChangeLog b/kde-base/kdegraphics-kfile-plugins/ChangeLog
index 99958bc2da2c..03a681affc72 100644
--- a/kde-base/kdegraphics-kfile-plugins/ChangeLog
+++ b/kde-base/kdegraphics-kfile-plugins/ChangeLog
@@ -1,6 +1,124 @@
 # ChangeLog for kde-base/kdegraphics-kfile-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdegraphics-kfile-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-kfile-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdegraphics-kfile-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-kfile-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdegraphics-kfile-plugins-3.5_beta1.ebuild,
+  kdegraphics-kfile-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdegraphics-kfile-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-kfile-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+*kdegraphics-kfile-plugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-kfile-plugins-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdegraphics-kfile-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdegraphics-kfile-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegraphics-kfile-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdegraphics-kfile-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegraphics-kfile-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdegraphics-kfile-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdegraphics-openexr.patch,
+  +kdegraphics-kfile-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdegraphics-kfile-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-kfile-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-kfile-plugins-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdegraphics-kfile-plugins-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-kfile-plugins-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdegraphics-kfile-plugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-kfile-plugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdegraphics-kfile-plugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdegraphics-kfile-plugins/Manifest b/kde-base/kdegraphics-kfile-plugins/Manifest
index 6215d14ce3a6..c2a7bbc28bb0 100644
--- a/kde-base/kdegraphics-kfile-plugins/Manifest
+++ b/kde-base/kdegraphics-kfile-plugins/Manifest
@@ -1,4 +1,27 @@
-MD5 85f4712e6c7992483622561030a4d0f6 kdegraphics-kfile-plugins-3.4.0_alpha1.ebuild 498
-MD5 85f4712e6c7992483622561030a4d0f6 kdegraphics-kfile-plugins-3.4.0_beta1.ebuild 498
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kdegraphics-kfile-plugins-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kdegraphics-kfile-plugins-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 df89c5b2b01bded51d3fc0ecd13d1832 ChangeLog 4352
+MD5 d34b4b86b659b21184ada6cc00ec5569 files/configure-fix-kdegraphics-openexr.patch 704
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kdegraphics-kfile-plugins-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kdegraphics-kfile-plugins-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kdegraphics-kfile-plugins-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kdegraphics-kfile-plugins-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kdegraphics-kfile-plugins-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kdegraphics-kfile-plugins-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kdegraphics-kfile-plugins-3.5_beta1 72
+MD5 a01138948c8970285dccba96ddf7b5e8 kdegraphics-kfile-plugins-3.4.1.ebuild 701
+MD5 cd8f32acce0e2541d0481b1b69e7d6fa kdegraphics-kfile-plugins-3.4.2.ebuild 812
+MD5 cfbadd9dc0d67dc08f4ea56c37d5fbf4 kdegraphics-kfile-plugins-3.4.3.ebuild 808
+MD5 a8eb11b56bb8b7b0da8ebd0493d5d866 kdegraphics-kfile-plugins-3.5.0.ebuild 728
+MD5 66c539f6d46785059bf5e0752d340e5d kdegraphics-kfile-plugins-3.5.0_beta2.ebuild 733
+MD5 14a35e9c77263aa0b5e553d71fbe5744 kdegraphics-kfile-plugins-3.5.0_rc1.ebuild 732
+MD5 5096e2cd06073f0c06948241c3fa8f36 kdegraphics-kfile-plugins-3.5_beta1.ebuild 731
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmSuntT9W3vfTuoRAjLHAKCPPDh1CYQPo/JC+8CB5+LcBr8u1QCgi3DR
+1TNs6c8s4Ym8/gf2N1lU+bw=
+=+6eH
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.1 b/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.1
+++ b/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.2 b/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.2
+++ b/kde-base/kdegraphics-kfile-plugins/files/digest-kdegraphics-kfile-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.1.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.1.ebuild
index e3e8eeb13db7..7f7a2db49065 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.1.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdegraphics"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="tiff openexr"
 DEPEND="tiff? ( media-libs/tiff )
 	openexr? ( media-libs/openexr )"
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.2.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.2.ebuild
index 18f7fc2d3bea..c7f4b28c201f 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.2.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdegraphics"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="tiff openexr"
 DEPEND="tiff? ( media-libs/tiff )
 	openexr? ( media-libs/openexr )"
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.3.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.3.ebuild
index 1dc00d16b677..728db734c71e 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.3.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdegraphics"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="tiff openexr"
 DEPEND="tiff? ( media-libs/tiff )
 	openexr? ( media-libs/openexr )"
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0.ebuild
index 2de1799c5295..95161d6cbcbc 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_beta2.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_beta2.ebuild
index 1d0a7bed8f5b..ec058267e586 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_beta2.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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdegraphics"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="tiff openexr"
 DEPEND="tiff? ( media-libs/tiff )
 	openexr? ( media-libs/openexr )"
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_rc1.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_rc1.ebuild
index e42706218873..3f712309b163 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
diff --git a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5_beta1.ebuild b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5_beta1.ebuild
index cfee6821cd04..dfaede7eb35d 100644
--- a/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5_beta1.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/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:26:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-kfile-plugins/kdegraphics-kfile-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdegraphics"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="tiff openexr"
 DEPEND="tiff? ( media-libs/tiff )
 	openexr? ( media-libs/openexr )"
diff --git a/kde-base/kdegraphics-kfile-plugins/metadata.xml b/kde-base/kdegraphics-kfile-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdegraphics-kfile-plugins/metadata.xml
+++ b/kde-base/kdegraphics-kfile-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdegraphics-meta/ChangeLog b/kde-base/kdegraphics-meta/ChangeLog
index 1ec63c4ea1b0..8077bb8e97c1 100644
--- a/kde-base/kdegraphics-meta/ChangeLog
+++ b/kde-base/kdegraphics-meta/ChangeLog
@@ -1,6 +1,144 @@
 # ChangeLog for kde-base/kdegraphics-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdegraphics-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdegraphics-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdegraphics-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdegraphics-meta-3.5_beta1.ebuild, kdegraphics-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdegraphics-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdegraphics-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdegraphics-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdegraphics-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegraphics-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdegraphics-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdegraphics-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdegraphics-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdegraphics-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdegraphics-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdegraphics-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdegraphics-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdegraphics-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdegraphics-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdegraphics-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdegraphics-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  kdegraphics-meta-3.4.0_beta1.ebuild:
+  Some more changes related to the previous commit: removed 3.4.0_beta2 (since
+  3.4.0_beta2-r1 now exists). Removed the libksvg and ksvgplugin deps from the
+  3.4.0_beta1 ebuild: we want to get rid of beta1 soon anyway, and the
+  libksvg+ksvgplugin combination simply doesn't work.
+
+*kdegraphics-meta-3.4.0_beta2-r1 (11 Feb 2005)
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-meta-3.4.0_beta2-r1.ebuild:
+  This new revision depends on ksvg, instead of ksvgplugin and libksvg. Bug
+  80270.
+
+*kdegraphics-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdegraphics-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  18 Jan 2005; Simone Gotti <motaboy@gentoo.org> :
+  Add kgamma depency.
 
 *kdegraphics-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdegraphics-meta/Manifest b/kde-base/kdegraphics-meta/Manifest
index 866bb46d2d75..8e1c21c2d3a3 100644
--- a/kde-base/kdegraphics-meta/Manifest
+++ b/kde-base/kdegraphics-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 08e830a1e47c608b51128381f807bd95 kdegraphics-meta-3.4.0_beta1.ebuild 1334
-MD5 08e830a1e47c608b51128381f807bd95 kdegraphics-meta-3.4.0_alpha1.ebuild 1334
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b57e996a3cb001a42976ba47a6c8eff6 ChangeLog 4862
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdegraphics-meta-3.5_beta1 0
+MD5 c81c0db835a8df4c2ae3e2895b02f1e3 kdegraphics-meta-3.4.1.ebuild 1455
+MD5 efda0d2b44d73c186d04915802b61d8b kdegraphics-meta-3.4.2.ebuild 1480
+MD5 b2effe5f7268d0257a08cd483f55fa0c kdegraphics-meta-3.4.3.ebuild 1466
+MD5 190401a72550a90df6c8b013fd2c3d89 kdegraphics-meta-3.5.0.ebuild 1444
+MD5 4ac559aad2dce2e2d5ef0b23b31280d3 kdegraphics-meta-3.5.0_beta2.ebuild 1455
+MD5 e5f1cc004b342539c88309a01ed7b510 kdegraphics-meta-3.5.0_rc1.ebuild 1510
+MD5 dc80ef5cd170d60c1c58ba4a873280cf kdegraphics-meta-3.5_beta1.ebuild 1447
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmnPntT9W3vfTuoRAqXVAJ9Rq3vz2FF6TS0/U0Up0bQ/bf4wJQCggIgx
+uzZO2wvw/O6RP+K73DFyxNk=
+=wJdc
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.1.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.1.ebuild
index 899a1f9e359c..965d4ba25fe5 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.1.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.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/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="gphoto2 scanner povray"
 
 RDEPEND="gphoto2? ( $(deprange $PV $MAXKDEVER kde-base/kamera) )
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.2.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.2.ebuild
index cf3ec207db49..ea8f421c4638 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.2.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.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/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gphoto2 scanner povray"
 
 RDEPEND="gphoto2? ( $(deprange 3.4.1 $MAXKDEVER kde-base/kamera) )
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.3.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.3.ebuild
index 79aae823cf67..80c42aeacac3 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.3.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.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/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="gphoto2 scanner povray"
 
 RDEPEND="gphoto2? ( $(deprange $PV $MAXKDEVER kde-base/kamera) )
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0.ebuild
index 7af7eede3f0f..d15b3aa8adc6 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.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/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_beta2.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_beta2.ebuild
index 96e783d23277..61ebcd219eba 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_beta2.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/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="gphoto2 scanner povray"
 
 RDEPEND="gphoto2? ( $(deprange $PV $MAXKDEVER kde-base/kamera) )
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_rc1.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_rc1.ebuild
index eabf06b5c920..1f674ec5fca1 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_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/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5_beta1.ebuild b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5_beta1.ebuild
index 66726e5c7fee..05bda2b3f011 100644
--- a/kde-base/kdegraphics-meta/kdegraphics-meta-3.5_beta1.ebuild
+++ b/kde-base/kdegraphics-meta/kdegraphics-meta-3.5_beta1.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/kde-base/kdegraphics-meta/kdegraphics-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:47:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics-meta/kdegraphics-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="gphoto2 scanner povray"
 
 RDEPEND="gphoto2? ( $(deprange $PV $MAXKDEVER kde-base/kamera) )
diff --git a/kde-base/kdegraphics-meta/metadata.xml b/kde-base/kdegraphics-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdegraphics-meta/metadata.xml
+++ b/kde-base/kdegraphics-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdegraphics/ChangeLog b/kde-base/kdegraphics/ChangeLog
index 3d8bbf46c999..8b6e67e7d27e 100644
--- a/kde-base/kdegraphics/ChangeLog
+++ b/kde-base/kdegraphics/ChangeLog
@@ -1,6 +1,828 @@
 # ChangeLog for kde-base/kdegraphics
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/ChangeLog,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdegraphics-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdegraphics-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdegraphics-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  kdegraphics-3.4.1-r1.ebuild:
+  Mark 3.4.1-r1 stable on alpha
+
+*kdegraphics-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.5.0_beta2.ebuild:
+  New version.
+
+*kdegraphics-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdegraphics-3.4.3.ebuild:
+  New version.
+
+*kdegraphics-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegraphics-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org>
+  kdegraphics-3.4.2-r2.ebuild:
+  Keyworded ~mips.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org>
+  kdegraphics-3.3.2-r3.ebuild:
+  Stable on mips, bug #100263.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org>
+  kdegraphics-3.4.1-r1.ebuild:
+  Keyworded ~mips
+
+*kdegraphics-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  kdegraphics-3.4.1-r1.ebuild:
+  stable on ia64
+
+*kdegraphics-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. app-text/poppler replaces app-text/xpdf for pdf support.
+
+  08 Aug 2005; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.3.2-r3.ebuild,
+  kdegraphics-3.4.1-r1.ebuild:
+  Stable on hppa.
+
+  08 Aug 2005; Jory A. Pratt <anarchy@gentoo.org>
+  kdegraphics-3.3.2-r3.ebuild, kdegraphics-3.4.1-r1.ebuild:
+  Stable on ppc wrt bug #100263
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kdegraphics-3.3.2-r3.ebuild, kdegraphics-3.4.1-r1.ebuild:
+  Stable on amd64.
+
+  07 Aug 2005; Markus Rothe <corsair@gentoo.org>
+  kdegraphics-3.3.2-r3.ebuild:
+  Stable on ppc64 (bug #100263)
+
+  07 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.3.2-r3.ebuild:
+  Stable on alpha + ia64, bug 100263.
+
+  07 Aug 2005; Jason Wever <weeve@gentoo.org> kdegraphics-3.3.2-r3.ebuild:
+  Stable on SPARC wrt security bug #100263.
+
+  06 Aug 2005; Jason Wever <weeve@gentoo.org> kdegraphics-3.4.1-r1.ebuild:
+  Stable on SPARC wrt security bug #100263.
+
+*kdegraphics-3.4.2-r2 (06 Aug 2005)
+
+  06 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdegraphics-3.4.2-kpdf-contentcrash.patch,
+  +kdegraphics-3.4.2-r2.ebuild:
+  Added patch to fix crashes while expanding content tree. Closes bug #101558.
+
+*kdegraphics-3.4.1-r1 (03 Aug 2005)
+*kdegraphics-3.3.2-r3 (03 Aug 2005)
+
+  03 Aug 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.3.1-kdegraphics-4.diff,
+  +files/post-3.4.1-kdegraphics-4.diff, +kdegraphics-3.3.2-r3.ebuild,
+  +kdegraphics-3.4.1-r1.ebuild:
+  Yet another xpdf fix.
+
+*kdegraphics-3.4.2-r1 (05 Aug 2005)
+
+  05 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4.2-kpdf-fix.patch,
+  +files/kdegraphics-3.4-gcc4.patch, +kdegraphics-3.4.2-r1.ebuild:
+  Add patch to fix compilation with gcc4 (#101384). Add patch to fix
+  regression in kpdf (#101119).
+
+*kdegraphics-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4-configure.patch, +kdegraphics-3.4.2.ebuild:
+  New version. Add configure patch (#81966).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.4.1.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Hardave Riar <hardave@gentoo.org>
+  kdegraphics-3.3.2-r2.ebuild:
+  Stable on mips.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdegraphics-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  01 Jul 2005; Hardave Riar <hardave@gentoo.org>
+  kdegraphics-3.3.2-r2.ebuild:
+  Marked ~mips
+
+  01 Jul 2005; Dan Armak <danarmak@gentoo.org> kdegraphics-3.4.1.ebuild:
+  Don't build kpovmodeler if USE=-povray. Fixes bug 68690.
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdegraphics-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+  31 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4.1-gocr.patch, kdegraphics-3.4.1.ebuild:
+  Fix detection of gocr (#92779).
+
+  29 May 2005; Carsten Lohrke <carlo@gentoo.org> kdegraphics-3.4.0.ebuild,
+  kdegraphics-3.4.1.ebuild:
+  corrected gphoto2 dependency
+
+*kdegraphics-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegraphics-3.4.1.ebuild:
+  New version.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> kdegraphics-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdegraphics-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdegraphics-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdegraphics-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdegraphics-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.4.0_rc1.ebuild:
+  New version. Support disabling DRM in kpdf, exactly as xpdf does.
+
+  21 Feb 2005; Aron Griffis <agriffis@gentoo.org>
+  kdegraphics-3.2.3-r4.ebuild:
+  stable on ia64 #78619
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org>
+  kdegraphics-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdegraphics-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.4.0_beta2.ebuild:
+  Version bump.
+
+  08 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -files/kdegraphics-3.2.2-gcc34-compile.patch,
+  -files/post-3.2.3-kdegraphics.diff, -files/post-3.3.0-kdegraphics_2.diff,
+  -files/post-3.3.1-kdegraphics.diff, -files/xpdf-3.3.0-kdegraphics.diff,
+  -kdegraphics-3.2.0.ebuild, -kdegraphics-3.2.2.ebuild,
+  -kdegraphics-3.2.3-r1.ebuild, -kdegraphics-3.2.3-r2.ebuild,
+  -kdegraphics-3.2.3.ebuild, -kdegraphics-3.3.0-r1.ebuild,
+  -kdegraphics-3.3.0-r2.ebuild, -kdegraphics-3.3.0.ebuild,
+  -kdegraphics-3.3.1-r1.ebuild, -kdegraphics-3.3.1.ebuild,
+  -kdegraphics-3.3.2-r1.ebuild, -kdegraphics-3.3.2.ebuild:
+  Remove old ebuilds.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdegraphics-3.4.0_beta1-r1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdegraphics-3.3.2-r2.ebuild:
+  Stable on ppc64; bug #78619
+
+  23 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.3.2-r2.ebuild:
+  Stable on hppa.
+
+  22 Jan 2005; Danny van Dyk <kugelfang@gentoo.org>
+  kdegraphics-3.2.3-r4.ebuild:
+  Marked amd64 wrt Security BUG #78619.
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.2.3-r4.ebuild:
+  Stable on alpha, bug 78619.
+
+  21 Jan 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdegraphics-3.3.2-r2.ebuild:
+  Marked stable on amd64 as requested in bug 78619.
+
+  21 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdegraphics-3.2.3-r4.ebuild, kdegraphics-3.3.2-r2.ebuild:
+  Stable on sparc wrt #78619
+
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.3.2-r2.ebuild:
+  Stable on alpha, bug 78619.
+
+  21 Jan 2005; Lars Weiler <pylon@gentoo.org> kdegraphics-3.2.3-r4.ebuild,
+  kdegraphics-3.3.2-r2.ebuild:
+  Stable on ppc; bug #78619.
+
+*kdegraphics-3.4.0_beta1-r1 (19 Jan 2005)
+
+  19 Jan 2005; Carsten Lohrke <carlo@gentoo.org> +files/CAN-2005-0064.patch,
+  +files/CAN-2005-0064_kde-3.4.patch, +kdegraphics-3.2.3-r4.ebuild,
+  +kdegraphics-3.3.2-r2.ebuild, +kdegraphics-3.4.0_beta1-r1.ebuild:
+  fix for xpdf makeFileKey2 stack overflow, #78619
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  kdegraphics-3.4.0_beta1.ebuild:
+  Added blocking dep on kde-misc/kgamma, an older version of an app now
+  included here.
+
+*kdegraphics-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdegraphics-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Dependencies cleanup.
+
+  09 Jan 2005; Sven Wegener <swegener@gentoo.org> kdegraphics-3.1.5.ebuild,
+  kdegraphics-3.2.0.ebuild, kdegraphics-3.2.2.ebuild,
+  kdegraphics-3.2.3-r1.ebuild, kdegraphics-3.2.3-r2.ebuild,
+  kdegraphics-3.2.3-r3.ebuild, kdegraphics-3.2.3.ebuild,
+  kdegraphics-3.3.0-r1.ebuild, kdegraphics-3.3.0-r2.ebuild,
+  kdegraphics-3.3.0.ebuild, kdegraphics-3.3.1-r1.ebuild,
+  kdegraphics-3.3.1-r2.ebuild, kdegraphics-3.3.1.ebuild,
+  kdegraphics-3.3.2-r1.ebuild, kdegraphics-3.3.2.ebuild:
+  Added missing parentheses in SRC_URI/*DEPEND/LICENSE.
+
+  06 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  kdegraphics-3.2.3-r3.ebuild:
+  Stable on amd64, bug #75204
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.3.2-r1.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.3.2-r1.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  kdegraphics-3.3.2-r1.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.2-r1.ebuild:
+  x86 stable
+
+*kdegraphics-3.3.2-r1 (27 Dec 2004)
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdegraphics-2.diff, +files/post-3.3.2-kdegraphics.diff,
+  +kdegraphics-3.2.3-r3.ebuild, +kdegraphics-3.3.2-r1.ebuild:
+  Adding patches for security bug #75204
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdegraphics-3.3.1-r2.ebuild:
+  Stable on ppc64
+
+*kdegraphics-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdegraphics-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdegraphics-3.3.1-r2.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.3.1-r2.ebuild:
+  Stable on alpha.
+
+  05 Nov 2004; Markus Rothe <corsair@gentoo.org> kdegraphics-3.3.0-r2.ebuild:
+  Stable on ppc64, bug #69936
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.1-r2.ebuild:
+  x86 stable
+
+  05 Nov 2004; <SeJo@gentoo.org> kdegraphics-3.2.3-r2.ebuild,
+  kdegraphics-3.3.0-r2.ebuild, kdegraphics-3.3.1-r2.ebuild:
+  stable on ppc gsla: 69936
+
+  04 Nov 2004; Travis Tilley <lv@gentoo.org> kdegraphics-3.3.0-r2.ebuild:
+  stable on amd64
+
+  04 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  files/post-3.3.0-kdegraphics_2.diff:
+  fixed patch
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.3.1-r2.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.3.1-r2.ebuild:
+  ~alpha keyword.
+
+*kdegraphics-3.3.1-r2 (03 Nov 2004)
+
+  03 Nov 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.2.3-kdegraphics_2.diff, +files/post-3.3.0-kdegraphics_2.diff,
+  +files/post-3.3.1-kdegraphics_2.diff, +kdegraphics-3.2.3-r2.ebuild,
+  kdegraphics-3.3.0-r1.ebuild, +kdegraphics-3.3.0-r2.ebuild,
+  +kdegraphics-3.3.1-r2.ebuild:
+  integer overflow vulnerability, #69936
+
+  28 Oct 2004; Danny van Dyk <kugelfang@gentoo.org>
+  kdegraphics-3.2.3-r1.ebuild, kdegraphics-3.3.0-r1.ebuild:
+  Marked stable on amd64.
+
+  25 Oct 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.3.0-r1.ebuild:
+  Stable on sparc wrt security bug #68558 (missed it in earlier commit).
+
+  25 Oct 2004; <SeJo@gentoo.org> :
+  unstable on ppc gsla: 68558
+
+  25 Oct 2004; <SeJo@gentoo.org> kdegraphics-3.3.1-r1.ebuild:
+  stable on ppc gsla: 68558
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.2.3-r1.ebuild:
+  Stable on sparc wrt security bug #68558.
+
+  24 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdegraphics-3.2.3-r1.ebuild:
+  Stable on alpha, bug 68558.
+
+*kdegraphics-3.3.1-r1 (24 Oct 2004)
+
+  24 Oct 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.2.3-kdegraphics.diff, +files/post-3.3.1-kdegraphics.diff,
+  +files/xpdf-3.3.0-kdegraphics.diff, +kdegraphics-3.2.3-r1.ebuild,
+  +kdegraphics-3.3.0-r1.ebuild, +kdegraphics-3.3.1-r1.ebuild:
+  fxing kpdf integer overflows, #68558
+
+*kdegraphics-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdegraphics-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Add jpeg2k use flag to ebuild (Bug #52994)
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Add povray dep (Bug #38678)
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdegraphics-3.2.1.ebuild:
+  3.3.0 is x86 stable
+
+  03 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Tetex dep changed per bug #30684
+
+  02 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0.ebuild:
+  Make imlib dep optional
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdegraphics-3.1.5.ebuild, kdegraphics-3.2.1.ebuild,
+  kdegraphics-3.3.0.ebuild:
+  Masked kdegraphics-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdegraphics-3.1.5.ebuild, kdegraphics-3.2.1.ebuild:
+  Masked kdegraphics-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdegraphics-3.1.5.ebuild:
+  Masked kdegraphics-3.1.5.ebuild stable for ppc
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> kdegraphics-3.3.0.ebuild:
+  stable on ppc64, bug #58497
+
+  23 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdegraphics-3.3.0.ebuild:
+  let's block media-gfx/kolourpaint
+
+*kdegraphics-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0.ebuild,
+  kdegraphics-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdegraphics-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0_beta1.ebuild,
+  kdegraphics-3.3.0_rc2.ebuild:
+  add _rc2, remove _beta1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdegraphics-3.3.0_beta2 (26 Jul 2004)
+
+  26 Jul 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.3.0_beta2.ebuild:
+  New beta
+
+*kdegraphics-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdegraphics-3.3.0_alpha1.ebuild, +kdegraphics-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdegraphics-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdegraphics-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdegraphics-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdegraphics-3.2.2.ebuild:
+  stable on amd64
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> :
+  3.3 alpha 1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdegraphics-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdegraphics-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.2.2.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdegraphics-3.2.2.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdegraphics-3.2.2-gcc34-compile.patch:
+  GCC 3.4 compile fix
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/kdegraphics-3.0.5b-kghostviewrc, -kdegraphics-3.0.5b.ebuild:
+  Remove old version
+
+*kdegraphics-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdegraphics-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdegraphics-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.2.1.ebuild:
+  Marked stable on sparc.
+
+*kdegraphics-3.2.1 (12 Mar 2004)
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild,
+  kdegraphics-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> :
+  Version bump
+
+  02 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0.ebuild:
+  Turn off compilation of kpdf, as it breaks parallel make and is rather
+  deprecated
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdegraphics-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdegraphics-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdegraphics-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0.ebuild,
+  kdegraphics-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdegraphics-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdegraphics-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.0.4.ebuild,
+  kdegraphics-3.0.5b.ebuild, kdegraphics-3.1.2.ebuild,
+  kdegraphics-3.2.0_beta1.ebuild, kdegraphics-3.2.0_beta2.ebuild,
+  kdegraphics-3.2.0_rc1.ebuild, files/kdegraphics-3.0.4-kghostviewrc:
+  New version, removing older versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdegraphics-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdegraphics-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdegraphics-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdegraphics-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild,
+  kdegraphics-3.2.0_beta2.ebuild:
+  minor dep changes
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0_beta2.ebuild:
+  Don't use the bidi use flag - require fribidi as that gives us ksvg support
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0_beta2.ebuild:
+  minor dependency changes
+
+  23 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild,
+  kdegraphics-3.2.0_beta2.ebuild:
+  Remove gpio/libgpio dependencies as it's not needed anymore.
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> kdegraphics-3.0.4.ebuild,
+  kdegraphics-3.0.5b.ebuild, kdegraphics-3.1.2.ebuild,
+  kdegraphics-3.1.4.ebuild, kdegraphics-3.2.0_beta1.ebuild,
+  kdegraphics-3.2.0_beta2.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+*kdegraphics-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdegraphics-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdegraphics-3.1.4.ebuild:
+  Marked ppc
+
+  12 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0_beta1.ebuild:
+  Add fribidi as a dep based on the bidi use flag
+
+*kdegraphics-3.2.0_beta1 (02 Nov 2003)
+
+  02 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.2.0_beta1.ebuild:
+  New beta version
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-2.2.2-r1.ebuild,
+  kdegraphics-2.2.2-r1.ebuild, kdegraphics-2.2.2-r2.ebuild,
+  kdegraphics-2.2.2-r2.ebuild, kdegraphics-3.1.1a-r1.ebuild,
+  kdegraphics-3.1.1a-r1.ebuild, kdegraphics-3.1.3.ebuild,
+  kdegraphics-3.1.3.ebuild, files/kdegraphics-2.2.2-gentoo.diff:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild:
+  marking x86 stable
+
+*kdegraphics-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  09 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> kdegraphics-2.2.2-r1.ebuild,
+  kdegraphics-2.2.2-r2.ebuild, kdegraphics-3.0.4.ebuild,
+  kdegraphics-3.0.5b.ebuild, kdegraphics-3.1.1a-r1.ebuild,
+  kdegraphics-3.1.2.ebuild, kdegraphics-3.1.3.ebuild:
+  Changed app-text/tetex DEPEND to virtual/tetex
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdegraphics-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+*kdegraphics-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdegraphics-3.1.3.ebuild:
+  Version bump
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removed old ebuilds: 3.0.5a, 3.1, 3.1.1, 3.1.1a
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdegraphics-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdegraphics-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdegraphics-3.1.2.ebuild:
+  New version of KDE.
+
+  16 Mai 2003; Lars Weiler <pylon@gentoo.org> kdegraphics-3.1.1a-r1.ebuild:
+  Set ppc in KEYWORDS
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdegraphics-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+  15 Apr 2003; Dan Armak <danarmak@gentoo.org> kdegraphics-3.1.1a-r1.ebuild:
+  Add a dep on libieee1284 on x86 if scanner is in use. Requires portage 2.0.47
+  or greater. Closes bug #9271.
+
+*kdegraphics-3.1.1a-r1 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.1.1a-r1.ebuild:
+  The 3.1.1a ebuild was mistakenly missing part of the fix; added it all now.
+
+*kdegraphics-2.2.2-r2 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-2.2.2-r2.ebuild:
+  The same fix for 2.2.2.
+
+*kdegraphics-3.1.1a (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.1.1a.ebuild,
+  The same fix for 3.1.1.
+
+*kdegraphics-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.0.5b.ebuild,
+  files/kdegraphics-3.0.5b-kghostviewrc:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdegraphics-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdegraphics-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdegraphics-3.1.ebuild:
+  Added ~alpha keyword
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-2.2.2.ebuild,
+  kdegraphics-3.0.2.ebuild, kdegraphics-3.0.3.ebuild,
+  kdegraphics-3.1_rc6.ebuild: rmoved old ebuilds
+
+  02 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #14713: add missing deps on xpdf and tiff.
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdegraphics-3.1.ebuild:
+  added ~sparc to keywords
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+*kdegraphics-2.2.2-r1 (17 Jan 2003)
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-2.2.2-r1.ebuild:
+  new version, fixes #12520
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdegraphics-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdegraphics-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.1_rc6.ebuild:
+  version bump
+
+*kdegraphics-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdegraphics-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdegraphics-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdegraphics-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdegraphics-3.1.ebuild:
+  Added ppc keyword
+
+  22 Nov 2002; Dan Armak <danarmak@gentoo.org> kdegraphics-3.0.4.ebuild  :
+
+  Add a default system-wide kghostviewrc with working interpreter settings
+  (gs). Fixes bug #6562.
+
+  22 Nov 2002; Dan Armak <danarmak@gentoo.org> kdegraphics-3.0.4.ebuild  :
+
+  Quick fix to use autoconf 2.1 again. I'll implement a proper fix in
+  need-kde() later.
+
+*kdegraphics-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdegraphics-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+  20 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Disable the x86+scanner dep again because it triggers a bug in portage. Will
+  come back as soon as that bug is resolved.
+
+  20 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix #9271: Add a dep on libieee1284 on x86 if scanner is in use.
+
+*kdegraphics-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+  08 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Make building libkscan and kooka (the kde sane frontend) depend on the
+  new scanner use variale. This variable is on by default, so the default
+  behaviour is unchanged; therefore there is no new revision. Fix #4868.
+
+*kdegraphics-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdegraphics-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : : :
+
+  New stability release.
+
+*kdegraphics-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+  26 May 2002; Dan Armak <danarmak@gentoo.org> Changelog:
+
+  Fix typo that reset $DEPEND to "".
+
+*kdegraphics-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1). Ebuild cleanup. Update some deps.
+
+  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> kdegraphics-3.0.ebuild
+  kdegraphics-2.2.2.ebuild :
+
+  Changed the tex USE flag to tetex instead.
+
+  6 Apr 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  kdegraphics-2.2.2, kdegraphics-3.0: change gphoto dep from media-gfx/gphoto
+  to media-gfx/gphoto2. Resolves bug #1570. Thanks to Michael Hall for reporting.
+
+*kdegraphics-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdegraphics-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdegraphics/Manifest b/kde-base/kdegraphics/Manifest
index 90eda2dbe561..2f0deaca2495 100644
--- a/kde-base/kdegraphics/Manifest
+++ b/kde-base/kdegraphics/Manifest
@@ -1,22 +1,37 @@
-MD5 1fa50fd07cf69c0d792661275198272e kdegraphics-2.2.2-r2.ebuild 1277
-MD5 00374f28dd7cc19ffa46d0fed9a70a8d kdegraphics-3.1.1.ebuild 1198
-MD5 71a0d50a8e90630112f13687f0f4d1cb kdegraphics-3.1.ebuild 1196
-MD5 429c7f1d7a9e4cf91db6a633087eb160 kdegraphics-3.1.1a.ebuild 1200
-MD5 2f40b2ab1abb0358f49bdee8b1a0f4e1 kdegraphics-3.0.5b.ebuild 1505
-MD5 cfe322b5d0f420db651305ea3cc9cfc9 kdegraphics-2.2.2-r1.ebuild 1019
-MD5 001f7efb816a49f2e9651f8e3e1f2fb1 kdegraphics-3.0.4.ebuild 1490
-MD5 2dc3fc8a6af18d0524193c2fced55a95 ChangeLog 5581
-MD5 2d1fa12b97c9ec4a7d3000f598f95a75 .#kdegraphics-3.1.ebuild.1.3 1136
-MD5 b3f1fb8b67a5fdac84127f754bb42b12 kdegraphics-3.0.5a.ebuild 1504
-MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.4-kghostviewrc 335
-MD5 34693477929f801abd54b37a58efa7f0 files/digest-kdegraphics-3.0.4 71
-MD5 63149da878e9e69a3ddfbe1eb56ed03b files/digest-kdegraphics-3.1.1 71
-MD5 7529309378c3a5c51c9fa77374ecb9dc files/digest-kdegraphics-3.0.5a 72
-MD5 d87c27a43c42b5642c411eb8b55b9f31 files/digest-kdegraphics-3.0.5b 458
-MD5 ce0e61cda913cd6d68f8d806819279b8 files/digest-kdegraphics-3.1.1a 448
-MD5 d5bbeb3731063072794323e195a7a99d files/digest-kdegraphics-2.2.2-r1 141
-MD5 e7cc7d6e6591c7dfdc7c247d5a436549 files/digest-kdegraphics-2.2.2-r2 299
-MD5 4a423927953d09de2c598aac97f088e2 files/digest-kdegraphics-3.1 69
-MD5 8e79f1d4682e90f425f1280578625492 files/kdegraphics-2.2.2-gentoo.diff 472
-MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5b-kghostviewrc 335
-MD5 994f2eb077cf2e821a8477b918ee40b2 files/kdegraphics-3.0.5a-kghostviewrc 335
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b2c9f6b9c7f288e2b2296d9aab8c29fb ChangeLog 27449
+MD5 284f518172a2843428d308d2d48bbbee files/CAN-2005-0064.patch 793
+MD5 9eb12845ce85cc31e216d463877cb519 files/digest-kdegraphics-3.3.2-r3 71
+MD5 1a6dde4414b4ad894e4ed7ed3fa919ff files/digest-kdegraphics-3.4.1-r1 71
+MD5 a603b1f40c870db682665f57f908df0e files/digest-kdegraphics-3.4.2-r2 71
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kdegraphics-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kdegraphics-3.5.0 71
+MD5 6d733c3831b2a2aaf12b331003a6dc36 files/digest-kdegraphics-3.5.0_beta2 72
+MD5 c5b15d30a03478e362c3b1bb1651346c files/digest-kdegraphics-3.5.0_rc1 75
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kdegraphics-3.5_beta1 72
+MD5 72b0e0cd29559b5ac4a20829a3da892c files/kdegraphics-3.4-configure.patch 847
+MD5 c52515e268cbff75a6f7b7d1ee1fad47 files/kdegraphics-3.4-gcc4.patch 1226
+MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454
+MD5 653bd55a1e87c51731d0b0512051774e files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
+MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
+MD5 4a4bcdcb2456ab92b7846b6646da1bcb files/post-3.3.1-kdegraphics-4.diff 1797
+MD5 bf6b28780e0f5ea8f99e0777187e73cb files/post-3.3.2-kdegraphics.diff 1385
+MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
+MD5 8752f936f226c4117006b64736b21b05 kdegraphics-3.3.2-r3.ebuild 1612
+MD5 511facb4e5557ab04a88092e393860db kdegraphics-3.4.1-r1.ebuild 1456
+MD5 f8b2b24be0e28925e87267accd66968a kdegraphics-3.4.2-r2.ebuild 2089
+MD5 556e8baa5231539042d9e9a0947e2d6c kdegraphics-3.4.3.ebuild 1731
+MD5 ba0e957998df159aa4704f5b00882de7 kdegraphics-3.5.0.ebuild 1332
+MD5 edaa7001cf5700ec298acdf673a9b98c kdegraphics-3.5.0_beta2.ebuild 1336
+MD5 2cd0937569a14d6f5abde67051638630 kdegraphics-3.5.0_rc1.ebuild 1334
+MD5 ec58e983fdd86d75cc4790a53cbefd58 kdegraphics-3.5_beta1.ebuild 1335
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmoKntT9W3vfTuoRAtgOAKCN+wtImrdUSsXF8VeboLghRX91NQCfQjwX
+gSUaeqEj2hj2unT8iy/2yEY=
+=wU6b
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild b/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild
index ee4602a64719..5571e09b0587 100644
--- a/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.3.2-r3.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/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild,v 1.1 2005/08/03 17:09:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.3.2-r3.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE graphics-related apps"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="gphoto2 imlib jpeg2k opengl povray scanner tetex"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild
index 9c3422a249e5..80f41a3f364f 100644
--- a/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.4.1-r1.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/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild,v 1.1 2005/08/03 17:09:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE graphics-related apps"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="gphoto2 imlib nodrm opengl povray scanner tetex"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild
index b01f0594b2e4..99ce0b6622d4 100644
--- a/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.4.2-r2.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/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild,v 1.1 2005/08/06 19:43:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE graphics-related apps"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="gphoto2 imlib nodrm openexr opengl povray scanner tetex"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -44,7 +44,7 @@ src_unpack() {
 	# Fix regression in kpdf (kde bug 110000). Applied for 3.4.3.
 	epatch "${FILESDIR}/kdegraphics-3.4.2-kpdf-fix.patch"
 
-	# Fix compilation with gcc4. Applied for 3.5.
+	# Fix compilation with gcc4 (kde bug 110249). Applied for 3.4.3.
 	epatch "${FILESDIR}/kdegraphics-3.4-gcc4.patch"
 
 	# Configure patch. Applied for 3.5.
diff --git a/kde-base/kdegraphics/kdegraphics-3.4.3.ebuild b/kde-base/kdegraphics/kdegraphics-3.4.3.ebuild
index 25dc7761ee2a..f2f407796903 100644
--- a/kde-base/kdegraphics/kdegraphics-3.4.3.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.4.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/kde-base/kdegraphics/kdegraphics-3.4.3.ebuild,v 1.1 2005/10/12 13:25:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE graphics-related apps"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="gphoto2 imlib nodrm openexr opengl povray scanner tetex"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild
index 98e537cdf42f..65d2b449e4d3 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.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/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0_beta2.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0_beta2.ebuild
index df41e12ab0ca..1789cba04d5f 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.0_beta2.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.0_beta2.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/kde-base/kdegraphics/kdegraphics-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegraphics/kdegraphics-3.5.0_rc1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5.0_rc1.ebuild
index d959e9b6591a..dcaddd0774a1 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5.0_rc1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5.0_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/kde-base/kdegraphics/kdegraphics-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:28:24 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegraphics/kdegraphics-3.5_beta1.ebuild b/kde-base/kdegraphics/kdegraphics-3.5_beta1.ebuild
index 029841eec096..e6b68534972a 100644
--- a/kde-base/kdegraphics/kdegraphics-3.5_beta1.ebuild
+++ b/kde-base/kdegraphics/kdegraphics-3.5_beta1.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/kde-base/kdegraphics/kdegraphics-3.5_beta1.ebuild,v 1.1 2005/09/21 17:23:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdegraphics/kdegraphics-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdegraphics/metadata.xml b/kde-base/kdegraphics/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdegraphics/metadata.xml
+++ b/kde-base/kdegraphics/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdejava/ChangeLog b/kde-base/kdejava/ChangeLog
index 4c1f81262ed6..4511641fefd7 100644
--- a/kde-base/kdejava/ChangeLog
+++ b/kde-base/kdejava/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for kde-base/kdejava
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/ChangeLog,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdejava-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdejava-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdejava-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdejava-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdejava-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdejava-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdejava-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdejava-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdejava-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*kdejava-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdejava-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Removed 3.5_alpha1.
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Bump to 3.5 beta1.
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
+  Added 3.5_alpha1 split ebuild.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> kdejava-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kdejava-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdejava-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdejava-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdejava-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdejava-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kdejava-3.4.0_rc1-classpath.diff, +kdejava-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kdejava-3.3.1-classpath.diff, kdejava-3.3.1.ebuild:
+  Restored missing patchfile, without which the 3.3.1 ebuild didn't work.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> kdejava-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*kdejava-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdejava-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  12 Dec 2004; Dan Armak <danarmak@gentoo.org> kdejava-3.3.1.ebuild:
+  Fixed DEPEND to specify packages currently in portage.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  kdejava-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+  12 Nov 2004; Dan Armak <danarmak@gentoo.org> kdejava-3.3.1.ebuild:
+  Don't run java-config in the global par of the ebuild.
 
 *kdejava-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/kdejava/Manifest b/kde-base/kdejava/Manifest
index 9c7298c6a47b..5a8e41bb0e65 100644
--- a/kde-base/kdejava/Manifest
+++ b/kde-base/kdejava/Manifest
@@ -1,4 +1,27 @@
-MD5 d65397f63ca5b6d62f5af38875b7680f kdejava-3.3.1.ebuild 1081
-MD5 fc46ca78f5d80f074b350dc510f1858c files/digest-kdejava-3.3.1 148
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 9598e813037e1a6ea89142a23ac4018a files/classpath.diff 460
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 18c1bcc37eb3fa147df89693ec060471 ChangeLog 3635
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-kdejava-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-kdejava-3.4.1 221
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-kdejava-3.4.3 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-kdejava-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-kdejava-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-kdejava-3.5.0_rc1 312
+MD5 9598e813037e1a6ea89142a23ac4018a files/kdejava-3.3.1-classpath.diff 460
+MD5 98aaced38286ff2403d813b121aa1380 files/kdejava-3.4.0_rc1-classpath.diff 471
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 e3ad32e72065b892d2fe02daebcf73d0 kdejava-3.3.1.ebuild 1537
+MD5 a0cbdd2cea95d5ccf2f9116e467fe3fa kdejava-3.4.1.ebuild 1458
+MD5 8e50d631a9bbe43822e5af7e579a7383 kdejava-3.4.3.ebuild 1468
+MD5 1d7c728984899646d9f57104ebe4e1a4 kdejava-3.5.0.ebuild 1461
+MD5 bfc465c32daf23de0b330f772368ba4f kdejava-3.5.0_beta2.ebuild 1466
+MD5 f434036814d08a56d544452dbb58efd7 kdejava-3.5.0_rc1.ebuild 1465
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyN2ntT9W3vfTuoRAutLAJ9+2f6A0o6C4fAD8AjbpiR7ceyv7wCfXmK5
+FpZLD0DPk4qQKUWBXQP9qrk=
+=WZ6E
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdejava/files/digest-kdejava-3.3.1 b/kde-base/kdejava/files/digest-kdejava-3.3.1
index 406e40f6c9c1..a16df2f0cf51 100644
--- a/kde-base/kdejava/files/digest-kdejava-3.3.1
+++ b/kde-base/kdejava/files/digest-kdejava-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 d353862365f9a716e9fe0c4714b30538 kdejava-3.3.1-0-makefiles.tar.bz2 63505
diff --git a/kde-base/kdejava/files/digest-kdejava-3.4.1 b/kde-base/kdejava/files/digest-kdejava-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/kdejava/files/digest-kdejava-3.4.1
+++ b/kde-base/kdejava/files/digest-kdejava-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/kdejava/files/no-gtk-glib-check.diff b/kde-base/kdejava/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/kdejava/files/no-gtk-glib-check.diff
+++ b/kde-base/kdejava/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/kdejava/kdejava-3.3.1.ebuild b/kde-base/kdejava/kdejava-3.3.1.ebuild
index e677017abfad..d56b3d8548e5 100644
--- a/kde-base/kdejava/kdejava-3.3.1.ebuild
+++ b/kde-base/kdejava/kdejava-3.3.1.ebuild
@@ -1,22 +1,29 @@
-# 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/kde-base/kdejava/kdejava-3.3.1.ebuild,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
 KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE java bindings"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
-#COMMONDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV"
-COMMONDEPEND="~kde-base/kdebase-$PV ~kde-base/qtjava-$PV"
-DEPEND="$COMMONDEPEND virtual/jdk"
-RDEPEND="$COMMONDPEND virtual/jre"
-PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/classpath.diff"
+#COMMONDEPEND="$(deprange $PV $MAXKDEVER kde-base/kwin)
+#	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+#	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
+COMMONDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdebase)
+	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
+DEPEND="virtual/jdk $COMMONDEPEND"
+RDEPEND="virtual/jre $COMMONDEPEND"
+OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
+
+PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/$P-classpath.diff"
 
-myconf="$myconf --with-java=`java-config --jdk-home`"
 
 # Probably missing other kdebase, kdepim etc deps
 # Needs to be compiled with just kdelibs installed to make sure
@@ -24,13 +31,18 @@ myconf="$myconf --with-java=`java-config --jdk-home`"
 # Someone who knows about java-in-gentoo should look at this and the
 # other java kdebindings, and fix the stupid thing
 src_unpack() {
-    kde-meta_src_unpack
-    
-    # $PREFIX-dependant, so don't go into the makefile tarballs
-    cd $S/kdejava/koala/org/kde/koala
-    for x in Makefile.am Makefile.in; do
-	mv $x $x.orig
-	sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
-	rm $x.orig
-    done
+	kde-meta_src_unpack
+
+	# $PREFIX-dependant, so don't go into the makefile tarballs
+	cd $S/kdejava/koala/org/kde/koala
+	for x in Makefile.am Makefile.in; do
+		mv $x $x.orig
+		sed -e "s:_CLASSPATH_:$(java-config -p qtjava):" $x.orig > $x
+		rm $x.orig
+	done
+}
+
+src_compile() {
+	myconf="$myconf --with-java=`java-config --jdk-home`"
+	kde-meta_src_compile
 }
diff --git a/kde-base/kdejava/kdejava-3.4.1.ebuild b/kde-base/kdejava/kdejava-3.4.1.ebuild
index eed2ac2ee0cb..a2955c65281b 100644
--- a/kde-base/kdejava/kdejava-3.4.1.ebuild
+++ b/kde-base/kdejava/kdejava-3.4.1.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
 KMCOPYLIB="libqtjavasupport qtjava/javalib/qtjava"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE java bindings"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
-COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
-	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
-	$(deprange $PV $MAXKDEVER kde-base/qtjava)"
+COMMONDEPEND="$(deprange-dual $PV 3.4.2 kde-base/kwin)
+	$(deprange-dual $PV 3.4.2 kde-base/kcontrol)
+	$(deprange $PV 3.4.2 kde-base/qtjava)"
 DEPEND="virtual/jdk $COMMONDEPEND"
 RDEPEND="virtual/jre $COMMONDEPEND"
 OLDDEPEND="~kde-base/kwin-$PV ~kde-base/kcontrol-$PV ~kde-base/qtjava-$PV virtual/jdk"
diff --git a/kde-base/kdejava/kdejava-3.4.3.ebuild b/kde-base/kdejava/kdejava-3.4.3.ebuild
index fcf80d9333b3..f6ca0616e4a6 100644
--- a/kde-base/kdejava/kdejava-3.4.3.ebuild
+++ b/kde-base/kdejava/kdejava-3.4.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/kde-base/kdejava/kdejava-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -11,7 +11,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE java bindings"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
diff --git a/kde-base/kdejava/kdejava-3.5.0.ebuild b/kde-base/kdejava/kdejava-3.5.0.ebuild
index afaa78dc041d..2184fd5250f5 100644
--- a/kde-base/kdejava/kdejava-3.5.0.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.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/kde-base/kdejava/kdejava-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
diff --git a/kde-base/kdejava/kdejava-3.5.0_beta2.ebuild b/kde-base/kdejava/kdejava-3.5.0_beta2.ebuild
index e57d05ff083b..47770c13e7c6 100644
--- a/kde-base/kdejava/kdejava-3.5.0_beta2.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.0_beta2.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/kde-base/kdejava/kdejava-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
@@ -11,7 +11,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE java bindings"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 COMMONDEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
diff --git a/kde-base/kdejava/kdejava-3.5.0_rc1.ebuild b/kde-base/kdejava/kdejava-3.5.0_rc1.ebuild
index 3a43b73b49e8..fe003ac5e620 100644
--- a/kde-base/kdejava/kdejava-3.5.0_rc1.ebuild
+++ b/kde-base/kdejava/kdejava-3.5.0_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/kde-base/kdejava/kdejava-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdejava/kdejava-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY=qtjava
diff --git a/kde-base/kdejava/metadata.xml b/kde-base/kdejava/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdejava/metadata.xml
+++ b/kde-base/kdejava/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 81cc3b21c2e5..8ec58c514a93 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,1313 @@
 # ChangeLog for kde-base/kdelibs
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
+
+  27 Nov 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.4.3.ebuild:
+  Stable on hppa.
+
+  26 Nov 2005; Dan Armak <danarmak@gentoo.org> kdelibs-3.5.0.ebuild:
+  Upstream (unreleased) tarball updated, updating digests.
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.4.3.ebuild:
+  Stable on ppc64
+
+*kdelibs-3.5.0 (22 Nov 2005)
+
+  22 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdelibs-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdelibs-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+*kdelibs-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1. This is package.masked since it's a
+  prerelease.
+
+  18 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/kdelibs-3.4.3-inttypes.patch, kdelibs-3.4.3.ebuild:
+  Fixed compilation problem with missing inttypes.h.
+
+  17 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  +files/kdelibs-3.5.0_beta2-kwallet-stdint.patch,
+  kdelibs-3.5.0_beta2.ebuild:
+  Fix for big endian of 3.5 beta2
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> kdelibs-3.5.0_beta2.ebuild:
+  Removed patches applied upstream for this version.
+
+*kdelibs-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.5.0_beta2.ebuild:
+  New version.
+
+*kdelibs-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.4.3.ebuild:
+  New version.
+
+*kdelibs-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdelibs-3.4.3.ebuild:
+  New version. Add workaround for collision with kdeadmin (#100968).
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.4.2-r1.ebuild:
+  Keyworded ~mips.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.4.1-r2.ebuild:
+  Adding back dropped ~mips keyword.
+
+*kdelibs-3.5_beta1-r1 (26 Sep 2005)
+
+  26 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kioslave-pumount-devname.patch, -kdelibs-3.5_beta1.ebuild,
+  +kdelibs-3.5_beta1-r1.ebuild:
+  Added patch to be able to run pumount successfully, so to unbreak handling
+  of unmount action for users.
+
+*kdelibs-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.5_beta1-configure-acl.patch, +kdelibs-3.5_beta1.ebuild:
+  New version. Add support for ACLs.
+
+*kdelibs-3.4.2-r1 (17 Sep 2005)
+
+  17 Sep 2005; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.4.2-r1.ebuild,
+  kdelibs-3.5_alpha1.ebuild:
+  I'm promoting the change over to --disable-fast-malloc. Since we provide a
+  good glibc, this fast-malloc really isn't needed. Also, I have experienced
+  lots of spurious crashes with KDE applications with glibc-2.3.4.20041108 and
+  higher (with multithreaded applications), and using glibc's malloc instead
+  of KDE's implementation fixed it.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdelibs-3.4.1-r1.ebuild:
+  Mark 3.4.1-r1 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdelibs-3.4.1-r1.ebuild:
+  stable on ia64
+
+*kdelibs-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.5_alpha1-crash.patch, +kdelibs-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+*kdelibs-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.4.2-gmail-fix.patch, +kdelibs-3.4.2.ebuild:
+  New version. Add fix for Gmail (#100267).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.4.1-r1.ebuild,
+  kdelibs-3.4.1-r2.ebuild:
+  Stable on hppa.
+
+  25 Jul 2005; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.3-r7.ebuild,
+  kdelibs-3.2.3-r9.ebuild, kdelibs-3.3.2-r9.ebuild,
+  kdelibs-3.3.2-r10.ebuild, kdelibs-3.4.0-r2.ebuild,
+  kdelibs-3.4.1-r1.ebuild, kdelibs-3.4.1-r2.ebuild:
+  Remove set-qtdir statements and change qt deps to use qt_min_version per bug
+  #100235
+
+  22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.3.2-r10.ebuild:
+  Stable on ia64, bug 98735.
+
+  22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.3.2-r10.ebuild:
+  Stable on alpha, bug 98735.
+
+  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> kdelibs-3.3.2-r10.ebuild:
+  Stable on amd64 wrt bug #98735.
+
+  20 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  kdelibs-3.3.2-r10.ebuild:
+  Stable on hppa. bug #98735
+
+  20 Jul 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.3.2-r10.ebuild:
+  Stable on mips, bug #98735
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdelibs-3.3.2-r10.ebuild:
+  Stable on sparc wrt #98735
+
+  19 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  kdelibs-3.3.2-r10.ebuild:
+  ppc stable, #98735
+
+  19 Jul 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.2-r10.ebuild:
+  Stable on ppc64 (bug #98735)
+
+*kdelibs-3.3.2-r10 (18 Jul 2005)
+
+  18 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.3.2-kdelibs-kate.diff, +kdelibs-3.3.2-r10.ebuild:
+  backup file permission leak in kate, #98735
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.4.1-r1.ebuild:
+  Keyworded ~mips
+
+*kdelibs-3.4.1-r2 (10 Jul 2005)
+
+  10 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdelibs-3.4.1-kntlm.patch,
+  +files/kdelibs-3.4.1-ktoolbar-crash.patch, +kdelibs-3.4.1-r2.ebuild:
+  fix ntlm authentication, #98285 and konqueror crashes
+
+  08 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  -files/post-3.2.3-kdelibs-dcop.patch,
+  -files/post-3.2.3-kdelibs-dcopserver.patch,
+  -files/post-3.2.3-kdelibs-htmlframes2.patch,
+  -files/post-3.2.3-kdelibs-kcookiejar.patch,
+  -files/post-3.2.3-kdelibs-kio.diff,
+  -files/post-3.2.3-kdelibs-kioslave.patch,
+  -files/post-3.2.3-kdelibs-kstandarddirs.patch,
+  -files/post-3.3.2-kdelibs-dcop.patch,
+  -files/post-3.3.2-kdelibs-idn-2.patch,
+  -files/post-3.3.2-kdelibs-kimgio-2.diff,
+  -files/post-3.3.2-kdelibs-kio.diff,
+  -files/post-3.3.2-kdelibs-kioslave.patch,
+  -files/post-3.4.0-kdelibs-kimgio-2.diff, kdelibs-3.2.3-r7.ebuild,
+  kdelibs-3.2.3-r9.ebuild, kdelibs-3.3.2-r9.ebuild, kdelibs-3.4.0-r2.ebuild,
+  kdelibs-3.4.1-r1.ebuild:
+  Removed from files/ all patches that exist on ftp.kde.org, and pointed the
+  ebuilds there.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdelibs-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.4.1-r1.ebuild:
+  Add ~alpha keyword.
+
+  01 Jul 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.3.2-r9.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  08 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kdelibs-3.4.1-r1.ebuild:
+  Use virtual/utempter instead of sys-apps/utempter else Gentoo/FreeBSD fails
+  to get dependencies.
+
+*kdelibs-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.4.1-configure.patch, +kdelibs-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966). Fix #82220. Better support
+  for amd64 multilib (#94872).
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.4.1.ebuild:
+  switched from -fno-gcse to -mminimal-toc, to let this compile on ppc64
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+*kdelibs-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  09 May 2005; Aron Griffis <agriffis@gentoo.org> kdelibs-3.4.0-r2.ebuild:
+  add ~ia64
+
+  06 May 2005; Jason Wever <weeve@gentoo.org> kdelibs-3.3.2-r9.ebuild:
+  Stable on SPARC wrt bug #88862.
+
+  05 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdelibs-3.3.2-r9.ebuild:
+  Stable on hppa.
+
+  05 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.3.2-r9.ebuild:
+  Stable on alpha + ia64, bug 88862.
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> kdelibs-3.3.2-r9.ebuild:
+  stable on amd64 wrt #88862
+
+  04 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdelibs-3.3.2-r9.ebuild:
+  Stable on ppc.
+
+  04 May 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.4.0-r2.ebuild:
+  Readded ppc64 patch and readded append-flags -fno-gcse for ppc64 only -
+  those were lost within the last revision bump
+
+  04 May 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.2-r9.ebuild:
+  Stable on ppc64; bug #88862
+
+*kdelibs-3.4.0-r2 (03 May 2005)
+*kdelibs-3.3.2-r9 (03 May 2005)
+
+  03 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.3.2-kdelibs-kimgio-2.diff,
+  +files/post-3.4.0-kdelibs-kimgio-2.diff, +kdelibs-3.3.2-r9.ebuild,
+  +kdelibs-3.4.0-r2.ebuild:
+  new patch, fixing a bug in the previous one, kdelibs-3.2 not affected
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.4.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS and fix bug #85593.
+
+  22 Apr 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.2-r8.ebuild:
+  Stable on ppc64
+
+  22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.2.3-r9.ebuild, kdelibs-3.3.2-r8.ebuild:
+  Stable on alpha + ia64, bug 88862.
+
+  21 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdelibs-3.2.3-r9.ebuild, kdelibs-3.3.2-r8.ebuild:
+  Stable on sparc wrt #88862
+
+  21 Apr 2005; Lars Weiler <pylon@gentoo.org> kdelibs-3.2.3-r9.ebuild,
+  kdelibs-3.3.2-r8.ebuild:
+  Stable on ppc; bug #88862.
+
+  21 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.2.3-r9.ebuild,
+  kdelibs-3.3.2-r8.ebuild:
+  Stable on amd64, bug 88862.
+
+*kdelibs-3.4.0-r1 (20 Apr 2005)
+*kdelibs-3.3.2-r8 (20 Apr 2005)
+*kdelibs-3.2.3-r9 (20 Apr 2005)
+
+  20 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.2.3-kdelibs-idn.patch,
+  +files/post-3.2.3-kdelibs-kimgio.diff,
+  +files/post-3.3.2-kdelibs-idn-2.patch,
+  +files/post-3.3.2-kdelibs-kimgio.diff,
+  +files/post-3.4.0-kdelibs-kimgio.diff, +kdelibs-3.2.3-r9.ebuild,
+  +kdelibs-3.3.2-r8.ebuild, +kdelibs-3.4.0-r1.ebuild:
+  PCX Image Buffer Overflow Vulnerability, #88862
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.2.3-r7.ebuild:
+  Stable on hppa.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.2.3-r8.ebuild, kdelibs-3.3.2-r7.ebuild:
+  Stable on alpha, bug 83814.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdelibs-3.4.0.ebuild:
+  Added to ~ppc
+
+  17 Mar 2005; Jason Wever <weeve@gentoo.org> kdelibs-3.2.3-r8.ebuild,
+  kdelibs-3.3.2-r7.ebuild:
+  Stable on SPARC wrt security bug #83814.
+
+  17 Mar 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.3.2-r7.ebuild:
+  Stable on mips, bug #83814.
+
+  16 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.2.3-r8.ebuild:
+  Marked stable on amd64, bug 83814, and fixed for 2005.0 profile symlink.
+
+  16 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdelibs-3.2.3-r8.ebuild, kdelibs-3.3.2-r7.ebuild:
+  Stable on ppc.
+
+  16 Mar 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.2-r7.ebuild:
+  Stable on ppc64; bug #83814
+
+  16 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.3.2-r7.ebuild:
+  Marked stable on amd64, bug 83814.
+
+*kdelibs-3.3.2-r7 (16 Mar 2005)
+
+  16 Mar 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.2.3-kdelibs-dcop.patch, +files/post-3.3.2-kdelibs-dcop.patch,
+  +kdelibs-3.2.3-r8.ebuild, +kdelibs-3.3.2-r7.ebuild:
+  local DCOP DoS, #83814
+
+  15 Mar 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.3.2-r5.ebuild:
+  Stable on hppa
+
+  15 Mar 2005; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.3.2-r6.ebuild:
+  -arch to avoid useless recompilation
+
+  15 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.4.0-imagemap.patch, kdelibs-3.4.0.ebuild:
+  Add patch for bug #82017.
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.4.0-form-freeze.patch, kdelibs-3.4.0.ebuild:
+  Add patch for bug #84500 (freezing in web forms).
+
+  14 Mar 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.3.2-r5.ebuild:
+  Stable on mips, bug #81652.
+
+*kdelibs-3.3.2-r6 (14 Mar 2005)
+
+  14 Mar 2005; Markus Rothe <corsair@gentoo.org>
+  +files/kdelibs-3.3.2-ppc64.patch, +kdelibs-3.3.2-r6.ebuild:
+  Added patch which fixes a weird key problem on ppc64. Revision bump which is
+  stable on ppc64 only. Bug #63529
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdelibs-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  05 Mar 2005; Jason Wever <weeve@gentoo.org> kdelibs-3.2.3-r7.ebuild,
+  kdelibs-3.3.2-r5.ebuild:
+  Stable on sparc wrt security bug #81652.
+
+  05 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.2.3-r7.ebuild,
+  kdelibs-3.3.2-r5.ebuild:
+  Marked stable on amd64, bug 81652.
+
+  05 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.2.3-r7.ebuild, kdelibs-3.3.2-r5.ebuild:
+  Stable on alpha, bug 81652.
+
+  04 Mar 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.2-r5.ebuild:
+  Stable on ppc64; bug #81652
+
+  04 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdelibs-3.2.3-r7.ebuild, kdelibs-3.3.2-r5.ebuild:
+  Stable on ppc.
+
+*kdelibs-3.2.3-r7 (04 Mar 2005)
+
+  04 Mar 2005; Carsten Lohrke <carlo@gentoo.org> files/kde3-dcopidlng.patch,
+  +kdelibs-3.2.3-r7.ebuild, +kdelibs-3.3.2-r5.ebuild:
+  patch wasn't correct
+
+  03 Mar 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  kdelibs-3.3.2-r4.ebuild:
+  Marking stable on ppc64, per bug #81652.
+
+  03 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdelibs-3.2.3-r6.ebuild,
+  kdelibs-3.3.2-r4.ebuild:
+  Stable on sparc wrt #81652
+
+  02 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdelibs-3.2.3-r6.ebuild, kdelibs-3.3.2-r4.ebuild:
+  Stable on ppc.
+
+  02 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.2.3-r6.ebuild, kdelibs-3.3.2-r4.ebuild:
+  Stable on alpha, bug 81652.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelibs-3.2.3-r6.ebuild,
+  kdelibs-3.3.2-r4.ebuild:
+  Marked stable on amd64, bug 81652.
+
+*kdelibs-3.3.2-r4 (02 Mar 2005)
+
+  02 Mar 2005; Carsten Lohrke <carlo@gentoo.org> +files/kde3-dcopidlng.patch,
+  +kdelibs-3.2.3-r6.ebuild, +kdelibs-3.3.2-r4.ebuild:
+  insecure temporary file creation, #81652
+
+*kdelibs-3.4.0_rc1-r1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdelibs-3.4.0_rc1-r1.ebuild, -kdelibs-3.4.0_rc1.ebuild:
+  Add support for zeroconf. Cleanup.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  26 Feb 2005; Simone Gotti <motaboy@gentoo.org> kdelibs-3.4.0_rc1.ebuild:
+  Add configure's options to really enable/disable tiff, jpeg2k(jasper) and
+  openexr support compilation.
+
+*kdelibs-3.4.0_rc1 (26 Feb 2005)
+
+  26 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kdelibs-3.4.0_beta2-export-kio-symbols.diff,
+  +kdelibs-3.4.0_rc1.ebuild:
+  kdelibs 3.4.0_rc1. Note that this is still not released (i.e. no tarballs
+  are available to the general public).
+
+  21 Feb 2005; Hardave Riar <hardave@gentoo.org> kdelibs-3.3.2-r2.ebuild:
+  Stable on mips.
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdelibs-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  08 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -files/kdelibs-3.2.2-su.cpp.diff,
+  -files/post-3.2.2-kdelibs-kapplication.patch,
+  -files/post-3.2.2-kdelibs-ktelnetservice.patch,
+  -files/qt-3.3-printfix.patch, -kdelibs-3.2.0.ebuild,
+  -kdelibs-3.2.2-r1.ebuild, -kdelibs-3.3.0.ebuild:
+  Remove old ebuilds.
+
+*kdelibs-3.3.2-r3 (07 Feb 2005)
+
+  07 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdelibs-3.3.2-anchor-fix.patch,
+  +files/kdelibs-3.3.2-aspell-dir.patch, +kdelibs-3.3.2-r3.ebuild:
+  Remove KDEDIR from the environment (#33079). Add optional dependency on
+  aspell/ispell. Add patch for aspell dictionary support (#67748). Add patch to
+  fix konqueror anchor bug (#77127).
+
+*kdelibs-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdelibs-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdelibs-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.2-r2.ebuild:
+  Stable on ppc64; bug #78619
+
+  23 Jan 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdelibs-3.4.0_beta1.ebuild:
+  Added some extra logic to create correct symlink for multilib.
+
+  19 Jan 2005; Marcus Hanwell <cryos@gentoo.org> kdelibs-3.3.2-r2.ebuild:
+  Added some extra logic to create correct symlink for multilib.
+
+  18 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> kdelibs-3.4.0_beta1.ebuild:
+  Added optional support for spellcheckers.
+
+*kdelibs-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/reference-list-rev-1.3.diff, +kdelibs-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Removed dependency on openldap: code moved to
+  kdebase. Added optional support for jpeg2000 and for openexr file format.
+  Dependencies cleanup. Remove the file that sets KDEDIR in /etc/env.d, since it
+  is obsoleted.
+
+  03 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.3.2-r2.ebuild:
+  Stable on hppa.
+
+  03 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdelibs-3.3.2-r2.ebuild:
+  Stable on hppa.
+
+*kdelibs-3.3.2-r2 (03 Jan 2005)
+
+  03 Jan 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdelibs-kioslave.patch,
+  +files/post-3.3.2-kdelibs-kioslave.patch, -kdelibs-3.2.3-r4.ebuild,
+  +kdelibs-3.2.3-r5.ebuild, -kdelibs-3.3.2-r1.ebuild,
+  +kdelibs-3.3.2-r2.ebuild:
+  Add a patch for security bug #73759
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdelibs-3.3.2-r1.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdelibs-3.3.2-r1.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.2-r1.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdelibs-3.3.1-r2.ebuild:
+  Stable on ppc64
+
+  13 Dec 2004; Caleb Tennis <caleb@gentoo.org> -kdelibs-3.2.3-r2.ebuild,
+  -kdelibs-3.2.3-r3.ebuild, -kdelibs-3.3.1-r1.ebuild, -kdelibs-3.3.1.ebuild,
+  -kdelibs-3.3.2.ebuild:
+  Remove older revisions
+
+*kdelibs-3.2.3-r4 (13 Dec 2004)
+
+  13 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdelibs-htmlframes2.patch,
+  +files/post-3.3.1-kdelibs-htmlframes2.patch,
+  +files/post-3.3.2-kdelibs-htmlframes2.patch, +kdelibs-3.2.3-r4.ebuild,
+  +kdelibs-3.3.1-r2.ebuild, +kdelibs-3.3.2-r1.ebuild:
+  Rev bump for security bug fix #73869
+
+*kdelibs-3.3.1-r1 (09 Dec 2004)
+
+  09 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/post-3.2.3-kdelibs-khtml.diff, +files/post-3.2.3-kdelibs-kio.diff,
+  +files/post-3.3.1-kdelibs-khtml.diff, +files/post-3.3.1-kdelibs-kio.diff,
+  +kdelibs-3.2.3-r3.ebuild, +kdelibs-3.3.1-r1.ebuild:
+  Add patches (with new ebuild rev) for security bug #72804
+
+*kdelibs-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdelibs-3.3.1.ebuild:
+  stable on amd64
+
+  02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kdelibs-3.3.0.ebuild,
+  kdelibs-3.3.1.ebuild:
+  block kde-misc/kgamma
+
+  27 Nov 2004; Philip Walls <malverian@gentoo.org> kdelibs-3.3.1.ebuild:
+  Migrate to virtual/fam
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdelibs-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdelibs-3.3.1.ebuild:
+  Marked ppc stable.
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdelibs-3.3.1.ebuild:
+  ~alpha keyword.
+
+  03 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.1.ebuild:
+  x86 stable
+
+*kdelibs-3.3.1 (12 Oct 2004)
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdelibs-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.0.ebuild:
+  Add kerberos support (Bug #52994)
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdelibs-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdelibs-3.2.1.ebuild,
+  -kdelibs-3.2.2.ebuild, -kdelibs-3.2.3-r1.ebuild, -kdelibs-3.2.3.ebuild:
+  Remove stale versions, mark 3.3.0 x86 stable
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdelibs-3.1.5-r1.ebuild, kdelibs-3.2.1.ebuild, kdelibs-3.2.2.ebuild,
+  kdelibs-3.2.3.ebuild, kdelibs-3.3.0.ebuild:
+  Masked kdelibs-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdelibs-3.1.5-r1.ebuild, kdelibs-3.2.1.ebuild, kdelibs-3.2.2.ebuild,
+  kdelibs-3.2.3.ebuild:
+  Masked kdelibs-3.2.3.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdelibs-3.1.5-r1.ebuild, kdelibs-3.2.1.ebuild, kdelibs-3.2.2.ebuild:
+  Masked kdelibs-3.2.2.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdelibs-3.1.5-r1.ebuild, kdelibs-3.2.1.ebuild:
+  Masked kdelibs-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdelibs-3.1.5-r1.ebuild:
+  Masked kdelibs-3.1.5-r1.ebuild stable for ppc
+
+  23 Aug 2004; psi29a <psi29a@gentoo.org> kdelibs-3.3.0.ebuild:
+  Added to ~mips
+
+*kdelibs-3.2.3-r2 (23 Aug 2004)
+
+  23 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.3-r2.ebuild,
+  files/post-3.2.3-kdelibs-kcookiejar.patch:
+  Version bump to pull in revised kcookiejar patch (Bug #61389)
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdelibs-3.3.0.ebuild:
+  stable on ppc64, bug #58179
+
+*kdelibs-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.0.ebuild,
+  kdelibs-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdelibs-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.0_rc1.ebuild,
+  kdelibs-3.3.0_rc2.ebuild:
+  add _rc2, remove _rc1
+
+*kdelibs-3.3.0_rc1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.0_rc1.ebuild:
+  New _rc1, minor dep differences from _beta2.
+
+*kdelibs-3.2.3-r1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.3-r1.ebuild,
+  kdelibs-3.3.0_beta1.ebuild, files/post-3.2.3-kdelibs-dcopserver.patch,
+  files/post-3.2.3-kdelibs-htmlframes.patch,
+  files/post-3.2.3-kdelibs-kcookiejar.patch,
+  files/post-3.2.3-kdelibs-kstandarddirs.patch:
+  Add a new _rc1.
+  Remove the _beta1.
+  Add a 3.2.3-r1 which incorporates some security fixes.
+
+  26 Jul 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.3.0_beta2.ebuild:
+  add dep to libidn. Maybe this can be use flagged later, but it's such a small
+  library that for now I'm just going to put it in and see what happens.
+
+*kdelibs-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.3.0_beta2.ebuild:
+  new beta
+
+*kdelibs-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdelibs-3.3.0_alpha1.ebuild,
+  +kdelibs-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdelibs-3.2.2-r1.ebuild:
+  Stable on alpha.
+
+*kdelibs-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.2.3.ebuild:
+  Version bump
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.2.0.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdelibs-3.2.2-r1.ebuild:
+  stable on amd64
+
+*kdelibs-3.3.0_alpha1 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.3.0_alpha1.ebuild:
+  3.3alpha1 - hardmasked
+
+  23 May 2004; Daniel Ostrow <dostrow@forbes.com> kdelibs-3.2.2-r1.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.2.2.ebuild:
+  Stable on sparc.
+
+*kdelibs-3.1.5-r1 (17 May 2004)
+*kdelibs-3.2.2-r1 (17 May 2004)
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.5-r1.ebuild,
+  kdelibs-3.1.5.ebuild, kdelibs-3.2.2-r1.ebuild,
+  files/post-3.1.5-kdelibs-kapplication.patch,
+  files/post-3.1.5-kdelibs-ktelnetservice.patch,
+  files/post-3.2.2-kdelibs-kapplication.patch,
+  files/post-3.2.2-kdelibs-ktelnetservice.patch:
+  Add two patches for KDE security update, 3.2.2 and 3.1.5
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.1.5.ebuild,
+  kdelibs-3.2.0.ebuild, kdelibs-3.2.2.ebuild:
+  Add inherit eutils
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> kdelibs-3.2.2.ebuild:
+  Added to ~mips
+
+  21 Apr 2004; Caleb Tennis <caleb@gentoo.org> files/kdelibs-3.2.2-su.cpp.diff:
+  Fix the patch
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/kdelibs-3.0.5b-http.patch, -files/kdelibs-3.0.5b-khtml.patch,
+  -files/kdelibs-3.0.5b-libxml2-2.5.2.diff, -kdelibs-3.0.5b-r1.ebuild:
+  Remove old version
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdelibs-3.2.2-su.cpp.diff:
+  Add a patch which fixes kcmshell root password asking
+
+*kdelibs-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdelibs-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdelibs-3.2.1.ebuild:
+  marked stable on amd64
+
+  01 Apr 2004; Travis Tilley <lv@gentoo.org> kdelibs-3.2.1.ebuild:
+  added lib64 symlink on amd64
+
+  16 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.0.5b-r1.ebuild:
+  Change to virtual/alsa
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.1.ebuild, files/kdelibs-3.1.4-alsafix.diff,
+  files/kdelibs-3.1.4-kjs-alphaev6-gcc3-workaround.patch:
+  x86 stable and version cleanup
+
+*kdelibs-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.1.ebuild:
+  Version bump
+
+  03 Mar 2004; <agriffis@gentoo.org> kdelibs-3.2.0.ebuild:
+  stable on alpha and ia64
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdelibs-3.2.0.ebuild:
+  Stable on ppc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0.ebuild,
+  files/qt-3.3-printfix.patch:
+  Add a patch to fix printing problems with Qt 3.3
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdelibs-3.2.0.ebuild:
+  Marked ~ppc
+
+  05 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0.ebuild,
+  files/animated-gif-fix.patch:
+  Fix animated gif problems.
+
+*kdelibs-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0.ebuild,
+  kdelibs-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.1.5.ebuild:
+  stable on alpha and ia64
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.0.4-r1.ebuild,
+  kdelibs-3.1.2-r1.ebuild, kdelibs-3.2.0_beta1.ebuild,
+  kdelibs-3.2.0_beta2.ebuild, files/kdelibs-3.1.2-http.patch,
+  files/kdelibs-3.1.2-khtml.patch,
+  files/kdelibs-3.1.2-kjs-alphaev6-gcc3-workaround.patch:
+  New version, removing older versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdelibs-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdelibs-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.5.ebuild,
+  files/kdelibs-3.1.5-kjs-alphaev6-gcc3-workaround.patch:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.1.4.ebuild:
+  stable on alpha
+
+  10 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdelibs-3.1.4.ebuild:
+  require autoconf-2.58 now that it's marked stable on all arches where
+  kdelibs-3.1.4 is marked stable
+
+  08 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild:
+  Hopefully this will stop so many bugs from being reported
+  until autoconf becomes stable.
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdelibs-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  files/kdelibs-3.1.4-alsafix.diff:
+  Make it compile with alsa 1.0
+
+  03 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.0_beta2.ebuild:
+  make alsa dep <= 0.9.8
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.0_beta2.ebuild:
+  minor dep cleanups
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.0_beta2.ebuild:
+  Make alsa dependency < version 1.0.0 as kdelibs doesn't support it yet
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_beta2.ebuild:
+  minor cleanups
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> kdelibs-3.0.4-r1.ebuild,
+  kdelibs-3.0.5b-r1.ebuild, kdelibs-3.1.2-r1.ebuild, kdelibs-3.1.4.ebuild,
+  kdelibs-3.2.0_beta1.ebuild, kdelibs-3.2.0_beta2.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+*kdelibs-3.2.0_beta2 (01 Dec 2003)
+
+  07 Dec 2003; foser <foser@gentoo.org> kdelibs-*.ebuild :
+  Fix fam-oss dep to fam, due to move
+
+  01 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_alpha2.ebuild,
+  kdelibs-3.2.0_beta2.ebuild:
+  New beta version, remove old alpha version
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdelibs-3.1.4.ebuild:
+  Marked ppc
+
+  08 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_beta1.ebuild:
+  Add back in kdelibs apidocs compilation is the user has the doc flag set.
+
+*kdelibs-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_beta1.ebuild:
+  New beta version
+
+  13 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> kdelibs-3.2.0_alpha2.ebuild:
+  Change alsa_driver dependency to depend on virtual/alsa
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdelibs-3.1.4.ebuild:
+  add ~amd64 flag
+
+  30 Sep 2003; Luca Barbato <lu_zero@gentoo.org> files/kdelibs-3.1.2-*:
+  recovered the patches needed by kdelibs-3.1.2-r1
+  
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-2.2.2a-r2.ebuild,
+  kdelibs-2.2.2a-r2.ebuild, kdelibs-3.0.5b.ebuild, kdelibs-3.0.5b.ebuild,
+  kdelibs-3.1.1a.ebuild, kdelibs-3.1.1a.ebuild, kdelibs-3.1.2.ebuild,
+  kdelibs-3.1.2.ebuild, kdelibs-3.1.3-r1.ebuild, kdelibs-3.1.3-r1.ebuild,
+  kdelibs-3.1.3.ebuild, kdelibs-3.1.3.ebuild,
+  files/kdelibs-2.2.2a-crosside.diff, files/kdelibs-2.2.2a-gentoo.diff,
+  files/kdelibs-3.1.2-http.patch, files/kdelibs-3.1.2-khtml.patch:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.4.ebuild:
+  Added sparc keyword.
+
+*kdelibs-3.2.0_alpha2 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.2.0_alpha1.ebuild,
+  kdelibs-3.2.0_alpha1.ebuild, kdelibs-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  25 Sep 2003; root <root@gentoo.org> kdelibs-3.1.4.ebuild:
+  marking x86 stable
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.3.ebuild:
+  Marked stable for sparc.
+
+*kdelibs-3.1.4 (19 Sep 2003)
+
+  19 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.4.ebuild:
+  make dependency on virtual/alsa
+
+*kdelibs-3.2.0_alpha1 (12 Sep 2003)
+
+  12 Sep 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.2.0_alpha1.ebuild:
+  Marking as unusable as not all dependecies are met and hasn't been tested yet.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdelibs-3.1.3-r1.ebuild:
+  x86 stable
+
+*kdelibs-3.1.3-r1 (05 Aug 2003)
+
+  05 Aug 2003; Paul de Vrieze <pauldv@gentoo.org> kdelibs-3.1.3-r1.ebuild,
+  files/kdelibs-3.1.3-render_root.patch:
+  Fix the horizontal scrollbar issue with khtml-3.1.3
+
+*kdelibs-3.0.5b-r1 (20 Jul 2003)
+*kdelibs-3.1.2-r1 (20 Jul 2003)
+
+  20 Jul 2003; Caleb Tennis <caleb@gentoo.org: kdelibs-3.1.2-r1.ebuild, kdelibs-3.0.5b-r1.ebuild:
+  Adding two security patches.
+
+*kdelibs-3.1.3 (20 Jul 2003)
+
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org>: kdelibs-3.1.3.ebuild:
+  Add a dep that Qt version != 3.2.0, or kde bombs out.
+  Also remove an old portage version dep.
+
+  20 Jul 2003; Caleb Tennis <caleb@gentoo.org>: kdelibs-3.1.3.ebuild:
+  New version
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removed old ebuilds: 2.2.2a-r1, 3.0.5a-r1, 3.1, 3.1-r2, 3.1-r3, 3.1.1, 3.1.1-r1
+    and assorted patch/diff files that go along with them.
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdelibs-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdelibs-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1.2.ebuild:
+  New version of KDE.
+
+  16 Mai 2003; Lars Weiler <pylon@gentoo.org> kdelibs-3.1.1a.ebuild:
+  Set ppc in KEYWORDS
+
+  27 Apr 2003; Dan Armak <danarmak@gentoo.org> kdelibs-2.2.2a-r1.ebuild,
+  kdelibs-2.2.2a-r2.ebuild, kdelibs-3.0.4-r1.ebuild, kdelibs-3.0.5a-r1.ebuild,
+  kdelibs-3.0.5b.ebuild, kdelibs-3.1-r2.ebuild, kdelibs-3.1-r3.ebuild,
+  kdelibs-3.1.1-r1.ebuild, kdelibs-3.1.1.ebuild, kdelibs-3.1.1a.ebuild,
+  kdelibs-3.1.ebuild:
+  Adapt for changes in kde eclasses: don't inherit kde.org, and don't call
+  newdepend /c.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdelibs-3.1.1-r1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdelibs-2.2.2a-r2 (11 Apr 2003)
+
+  11 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-2.2.2a-r2.ebuild:
+  security fix
+
+*kdelibs-3.1.1a (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.1a.ebuild:
+  The same security fixes for kde 3.1.1.
+
+*kdelibs-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.0.5b.ebuild,
+  files/kdelibs-3.0.5b-libxml2-2.5.2.diff:
+
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+  27 Mar 2003; Dan Armak <danarmak@gentoo.org> all 3.x ebuilds:
+  
+  Added explicit dep on sys-devel/gettext, since it will soon be removed
+  from the sysem profiles and apps will have to depend on it directly.
+
+  21 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.ebuild,
+  kdelibs-3.1-r2.ebuild, kdelibs-3.1-r3.ebuild, kdelibs-3.1.1.ebuild,
+  kdelibs-3.1.1-r1.ebuild:
+  added media-libs/libart_lgpl to DEPEND, thanks to Matt Rogers
+  <mattrogers@sbcglobal.net> (bug #17052)
+
+*kdelibs-3.1.1-r1 (20 Mar 2003)
+
+  31 Mar 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.1-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  20 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1.1-r1.ebuild:
+  
+  Add patch that fixes kde bug #55571 (https authentication through proxy).
+
+  14 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.0.5a-r1.ebuild:
+  
+  Add fix for #16329 to this version as well. Added the other part of the fix
+  to arts-1.0.5a. No new revisions.
+
+  14 Mar 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1-r3.ebuild:
+  
+  Actually add the fix for #16329, as described two entries below. I guess I
+  somehow forgot it before. Sorry...
+
+*kdelibs-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.1.ebuild,
+  files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch,
+  files/kdelibs-3.1.1-zip.diff:
+  version bump
+
+*kdelibs-3.1-r3 (11 Mar 2003)
+
+  16 Mar 2003; Mark Guertin <gerk@gentoo.org> kdelibs-3.1-r2.ebuild,
+  kdelibs-3.1-r3.ebuild:
+  set ppc in keywords
+
+  10 Mar 2003; Dan Armak <danarmak@gentoo.org>
+  Fix bug #16329: make arts work without kdelibs installed. Goes together
+  with new revision arts-1.1.0-r1.
+
+  08 Mar 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.0.5a-r1.ebuild,kdelibs-3.1-r2.ebuild:
+  Changed ~sparc keywords to sparc.
+
+  28 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1-r2.ebuild:
+  added fix for >=libxml2-2.5.2. closes bug #15245
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1-r2.ebuild:
+  Added ~sparc keyword.
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.1.ebuild
+  Changed ~sparc keyword to sparc.
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdelibs-3.1-r2.ebuild:
+  Added workaround for gcc3 optimization bug on alpha, removed 
+  -mieee flag (old attempt to fix this bug), and added ~alpha keyword.
+
+  13 Feb 2003; Dan Armak <danarmak@gentoo.org> kdelibs-3.1-r1.ebuild:
+
+  Remove the change Hannes made below, it was just an emergency fix.
+  The proper fix, if you have a kde 3.1+3.0.x system, is to emerge
+  kdelibs-3.0.5a-r2 and kdebase-3.0.5aq-r1 if you are emerging kdelibs-3.1-r1
+  and kdebase-3.1-r1 (but don't get the new 3.0.5a's if for some reason you
+  aren't getting the new 3.1's !)
+  Or for a quick fix to avoid all that compiling, edit /etc/env.d65kdelibs-3.0.*
+  and remove the KDEDIRS= line, run env-update and restart kdm.
+
+  13 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1-r2.ebuild:
+  added KDEDIRS=${PREFIX} again to fix bug #15593
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-2.2.2-r4.ebuild,
+  kdelibs-2.2.2a.ebuild, kdelibs-3.0.2-r1.ebuild, kdelibs-3.0.3.ebuild,
+  kdelibs-3.0.3-r1.ebuild, kdelibs-3.0.4.ebuild, kdelibs-3.1_rc6.ebuild,
+  kdelibs-3.1-r1.ebuild: removed unneeded ebuilds
+
+  05 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1-r2.ebuild:
+  removing $KDEDIR/share/doc/HTML/en/kdelibs-apidocs (is provided by
+  app-doc/kdelibs-apidocs), fixes bug #15102
+
+*kdelibs-3.1-r2 (04 Feb 2003)
+
+  04 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1-r2.ebuild:
+  should fix bug #14759 and bug #14780.
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdelibs-3.1.ebuild:
+  added ~sparc to keywords
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+*kdelibs-3.1-r1, kdelibs-3.0.5a-r1 (28 Jan 2003)
+
+  28 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog :
+
+  New revisions to fix bug #7179. This part of the fix removes KDEDIRS
+  settings from kdelibs' env.d files. This is a bug/fix almost noone cares
+  about, so no need to upgrade unless you know what this is. Masked at first
+  for initial testing.
+
+*kdelibs-2.2.2a-r1 (17 Jan 2003)
+
+  24 Feb 2003;  <root@gentoo.org> kdelibs-2.2.2a-r1.ebuild :
+  Fix bug #11732, #14432, #15635: enforce singlethreaded make (-j1).
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-2.2.2a-r1.ebuild:
+  new version, fixes #12520
+
+  14 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.ebuild:
+  fixes for kde-3.1 (removed unneeded patches)
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdelibs-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+  06 Jan 2003; Hannes Mehnert <hannes@gentoo.org> *.ebuild:
+  fixed alsa dependency, added media-sound/alsa-driver if alsa is in use.
+  this fixes bug #11996, thanks to fghellar@yahoo.de (Felipe Ghellar)
+
+*kdelibs-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1_rc6.ebuild:
+  version bump
+
+  04 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.0.5a.ebuild:
+  included patch to have no crash if compiled with debug and clicking on
+  "Home" button in konqueror. no need to version bump cause most users
+  don't compile with debug and most users don't use the "Home" button.
+
+*kdelibs-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdelibs-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdelibs-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  05 Dec 2002; Dan Armak <danarmak@gentoo.org> kdelibs-2.2.2-r4.ebuild  :
+
+  Ditto for this older ebuild.
+
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org kdelibs-3.1.ebuild:
+  Added ppc keyword
+
+  04 Dec 2002; Dan Armak <danarmak@gentoo.org> kdelibs-2.2.2a.ebuild  :
+
+  Remove obsoltee ld.so dep. Fix #11541.
+
+  03 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.ebuild:
+  added patch to compile with USE=-ssl
+
+  02 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1.ebuild:
+  added two patches for big endian (from kde-packagers list)
+
+  30 Nov 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Return libxml2, libxslt deps to >= since the latest ebuilds now work
+  again. The ebuilds of the broken versions have been deleted.
+
+  21 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.0.4-r1.ebuild:
+  fixed dependencies to =libxml2-2.4.24 and =libxslt-1.0.20 (newer libs are
+  broken for kde).
+
+*kdelibs-3.0.4-r1 (14 Nov 2002)
+
+  14 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.0.4-r1.ebuild:
+  this fixes security bug #10707, thanks to n2uro@aol.com (Samuel Greenfeld)
+  for submission
+
+  13 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdelibs-3.1_rc2.ebuild,
+  kde-3.1_rc3.ebuild: fixed dependencies, they depend on libxml2-2.4.24,
+  because 2.4.26 is broken (bug #10281). Thanks to suka_at@yahoo.de (suka)
+  for submission.
+
+*kdelibs-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdelibs-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdelibs-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdelibs-2.2.2a (11 Sep 2002)
+
+  11 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  The same secutiry fix that became 3.0.3a, for 2.2.2
+
+*kdelibs-3.0.3a (10 Sep 2002)
+
+  10 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  A bugfix and security patch release. Fixes the cross side scripting
+  vulnerability in khtml. Note: there are no 3.0.3a versions of other packages,
+  only of kdelibs!
+
+*kdelibs-3.0.3-r1 (04 Sep 2002)
+
+  04 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #7359: add /share/config to CONFIG_PROTECT in our env.d file. After
+  everyone upgrades, the setting in make.globals can go away. Because of this,
+  an RDEPEND on >=sys-apps/portage-2.0.36 has been added.
+
+*kdelibs-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+  02 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Narrow down arts dependencies: don't allow usage of a more recent version
+  of arts than the one released with this kdelibs.
+
+*kdelibs-3.0.2-r1 (16 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  16 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New version that works well with the latest eclass updates and is fully
+  forward compatible with the kde 3.1_alpha1 ebuilds now in testing. Also
+  removes the trick where kde style plugins were installed into the qt
+  plugin dir (it raises issues with mutliple kde versions being installed;
+  you can enable the faeture manually via qtconfig).
+
+*kdelibs-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New stability release.
+
+*kdelibs-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+  26 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Cleanup deps.
+
+*kdelibs-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdelibs-3.0-r2 (11 May 2002)
+
+  11 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  
+  Make ${KDEDIR}/lib/kde3/plugins (where all style plugins live) a symlink to
+  /usr/qt/3/plugins. That way qt-only apps can use kde styles with the default qtconfig
+  setup. Closes bug #2118, too.
+
+  2 May 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Add ghostscript dep (needed for printing to pdf).
+
+  6 Apr 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Change cups dep to >=1.1.14.
+
+*kdelibs-3.0-r1 (5 Apr 2002)
+
+  5 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  
+  Add --with-fast-malloc=full configure option for a considerable speed improvement.
+
+*kdelibs-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
+  kdelibs-2.2.2-r4: added SLOT=2.
+
+*kdelibs-2.2.2-r4 (24 Mar 2002)
+
+  24 Mar 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Split the env.d file into two, so that when both ked2 and kde3 are installed,
+  the KDEDIR of kde3 gets exported (was the other way around till now).
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> kdelibs-2.2.2-r3.ebuild :
+
+  HTML documentation is now done with dohtml instead of dodoc, so it will not
+  get gzipped any longer.  This change is small as compared to the size of this
+  package so the revision level for the ebuild was not bumped up.
+
+*kdelibs-2.2.2-r3 (22 Feb 2002)
+
+  1 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+  
+  Added KDEDIRS export to env.d file - will come in handy when several KDEs are
+  installed side-by-side. If you're not into that kind of thing, you don't care
+  about it and needn't upgrade.
+  
+  Added support for customizing kde install locations. You probably don't need it,
+  in which case you don't want to hear about it. Note: untested support for now,
+  but doesn't break anything else.
 
 *kdelibs-2.2.2-r2 (1 Feb 2002)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 9260a87208ca..f5ac8836362d 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,41 +1,36 @@
-MD5 130147a46552f9f285746dce30a7ad1e kdelibs-3.1.ebuild 2227
-MD5 7db2b1da82acddc5d035b65b603a75d7 kdelibs-3.1-r2.ebuild 2893
-MD5 1ca83214282308c646fc459be393edb0 kdelibs-2.2.2a-r1.ebuild 2359
-MD5 3b0f0a331b55c353e8f081c08ada9557 kdelibs-3.0.4-r1.ebuild 2294
-MD5 ce7978a012d0358df342c9286b4ce08e .#kdelibs-3.1.ebuild.1.11 2049
-MD5 6d7ef21b5c69861561d1d3a418a4f931 kdelibs-3.1.1-r1.ebuild 2583
-MD5 08d7d42db0459201047dc9d05fd05642 kdelibs-3.1.1.ebuild 2452
-MD5 cbd5a6c42abdf4e1594288d8fc61f706 .kdelibs-2.2.2a-r2.ebuild.swp 12288
-MD5 0b73767b0a43bffe91801ea7fb959308 kdelibs-3.1.1a.ebuild 2572
-MD5 bc5823268f69692a5b041b3cc486e048 kdelibs-3.0.5b.ebuild 1895
-MD5 ef38008345821fcc6be40403b715713f .#kdelibs-3.1_rc6.ebuild.1.3 2100
-MD5 1982b8a373789563820363da234db618 .#kdelibs-3.1_rc6.ebuild.1.5 2269
-MD5 4ff73de0a5444a14c8e231da87bd8459 kdelibs-3.1-r3.ebuild 2653
-MD5 af03887e58b48a7d820e5fc60805fdd8 kdelibs-2.2.2a-r2.ebuild 2526
-MD5 76d59819eec552a98feadb81e991739b kdelibs-3.0.5a-r1.ebuild 2035
-MD5 33a2f1f3bddca088c3bec3f5ab98b1f6 ChangeLog 12609
-MD5 3c178889822836378fcf526195b86814 files/kdelibs-3.1.1-kio_http.diff 5257
-MD5 24190dc0508cd29ea5adecc4cefc0db2 files/kdelibs-2.2.2a-crosside.diff 1267
-MD5 980d79084b85a6f32099fc9c20667aba files/.#digest-kdelibs-3.1.1.4 66
-MD5 b9e995da45022f78aed48a79f02201e7 files/kdelibs-3.1-bookmark.diff 1320
-MD5 472719ee52ab4e62fd329431767c985d files/digest-kdelibs-3.0.5b 1194
-MD5 d76da7fd0b31b5491b33015d1c382df8 files/digest-kdelibs-3.1.1a 1180
-MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1-r2 66
-MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1-r3 66
-MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5b-libxml2-2.5.2.diff 703
-MD5 a24c4fa284fa06452ffd4ea438270fd2 files/digest-kdelibs-3.0.5a-r1 68
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 7353213c0eaadb42e684fb98fe8f4ff0 files/kdelibs-3.1.1-zip.diff 2906
-MD5 7353213c0eaadb42e684fb98fe8f4ff0 files/kdelibs-3.1-zip.diff 2906
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1.1a-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 185c0cca81183c5659b62f91fd240771 files/digest-kdelibs-3.1.1 68
-MD5 41d30ba8cf8d36ad3caebeedb1ddfd0e files/kdelibs-3.1-kjs-alphaev6-gcc3-workaround.patch 477
-MD5 bcd0e223c0be9cc4d1af5f2b5578a096 files/kdelibs-3.0.5a-dontcrash.diff 500
-MD5 cc4a5df0791ae13159f71f47996a8b95 files/digest-kdelibs-3.1 66
-MD5 067d29e66608e7461f28e94895a0f4a2 files/digest-kdelibs-3.0.4-r1 142
-MD5 ed6c2a4ca2dca736f3cbfe717b762fe6 files/kdelibs-2.2.2a-gentoo.diff 75788
-MD5 321a6376eccdfa7077aea0e578b560b5 files/digest-kdelibs-3.1.1-r1 1114
-MD5 6e7c2097ad93ecd9a011d1685cb8971f files/kdelibs-3.1-libxml2-2.5.2.diff 1404
-MD5 f458fafcd88e2ea5c4eb8a88424640c4 files/digest-kdelibs-2.2.2a-r1 67
-MD5 6541fd079b109e7a1d7050ed3d63cf86 files/digest-kdelibs-2.2.2a-r2 139
-MD5 acd90863c0847e230aa37f3943d58176 files/kdelibs-3.0.5a-libxml2-2.5.2.diff 703
+MD5 f7f91dc7b058ac9c61342cdf5faf4df0 ChangeLog 46443
+MD5 b75b773aa95374e55799e86e678173d6 kdelibs-3.4.1-r2.ebuild 3364
+MD5 12b3f3cc444cc940ed50e352054ccb7f kdelibs-3.4.2-r1.ebuild 3341
+MD5 a0a423eb46bcca9f140b0a97645a0177 kdelibs-3.3.2-r10.ebuild 4318
+MD5 e3740c0388768ccd2967eae6fb31a150 kdelibs-3.4.3.ebuild 3385
+MD5 2fd53a7c014e4527505ec32ec5425575 kdelibs-3.4.2.ebuild 3346
+MD5 05a09bc0f0f7710f7b2fd1a5602a19eb kdelibs-3.5_beta1-r1.ebuild 3751
+MD5 a0eb7bb0201886c13fd7dcfee1e436a2 kdelibs-3.5.0_beta2.ebuild 3582
+MD5 cdfb8526080bb849f051efed107d81eb kdelibs-3.5.0_rc1.ebuild 3373
+MD5 9379aa5720bde64046d3f8de972d18fd kdelibs-3.5.0.ebuild 3391
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 176460cf9160b02b1a157612af59e346 kdelibs-3.4.1-r1.ebuild 3363
+MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2-r1 68
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
+MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r10 517
+MD5 e7fe23c3618de82d63dfdc90fb483a86 files/digest-kdelibs-3.4.3 68
+MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
+MD5 ac733469cad0b673ee2a6fc35edc0e91 files/digest-kdelibs-3.4.2 68
+MD5 b0a18256a9bb33e81f45573f07a341e1 files/kdelibs-3.4.3-inttypes.patch 365
+MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+MD5 138c3252883171d55ec24ed0318950fd files/post-3.3.2-kdelibs-kate.diff 2212
+MD5 6b409debc4458da8e18975d681e5f622 files/kdelibs-3.5.0_beta2-kwallet-stdint.patch 332
+MD5 1b0e245ef6ceedc3bbc4e2f9dfd3bfb7 files/digest-kdelibs-3.5.0_rc1 72
+MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
+MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
+MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 4f827df22c4b05fdb50535c985ff5cb1 files/kdelibs-3.4.2-gmail-fix.patch 724
+MD5 481aadcb2e3cd311fce3a29b12c86b83 files/digest-kdelibs-3.5_beta1-r1 69
+MD5 1faf357303566f52581151bc68a6d245 files/kioslave-pumount-devname.patch 461
+MD5 1021a06a0034a59f2eb8fe6ccd2ee2b5 files/digest-kdelibs-3.5.0_beta2 69
+MD5 3e56d0cc58ec7854ae2f9c23bb729028 files/digest-kdelibs-3.5.0 68
+MD5 3c54378872cb0af555c68a12dddf156d files/kdelibs-3.5_beta1-configure-acl.patch 1457
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
+MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.5.0 b/kde-base/kdelibs/files/digest-kdelibs-3.5.0
index 7fb5f045b213..5d4155f9ff10 100644
--- a/kde-base/kdelibs/files/digest-kdelibs-3.5.0
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.5.0
@@ -1 +1 @@
-MD5 60481687b3649b2a4ae5b45cc33add00 kdelibs-3.5.0.tar.bz2 15381399
+MD5 2b11d654e2ea1a3cd16dcfdcbb7d1915 kdelibs-3.5.0.tar.bz2 15379557
diff --git a/kde-base/kdelibs/files/kde3-dcopidlng.patch b/kde-base/kdelibs/files/kde3-dcopidlng.patch
index 0535454d3b73..91da2ec97902 100644
--- a/kde-base/kdelibs/files/kde3-dcopidlng.patch
+++ b/kde-base/kdelibs/files/kde3-dcopidlng.patch
@@ -3,7 +3,7 @@
 @@ -1,13 +1,15 @@
  #!/bin/sh
 +
-+trap "rm -f dcopidlng.stderr.$$"
++trap "rm -f dcopidlng.stderr.$$" 0 1 2 15
 +
  if test -z "$KDECONFIG"; then
      KDECONFIG=kde-config
diff --git a/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild b/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
index e95e8147b2bd..998100e5768b 100644
--- a/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.3.2-r10.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/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild,v 1.1 2005/07/18 16:25:54 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.3.2-r10.ebuild,v 1.1.1.1 2005/11/30 10:12:52 chriswhite Exp $
 
 inherit kde eutils flag-o-matic
 set-kdedir 3.3
@@ -17,13 +17,13 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="alsa arts cups doc ipv6 kerberos ldap spell ssl tiff"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-1.3.2 )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
@@ -83,9 +83,6 @@ src_unpack() {
 
 	# see bug #98735.
 	epatch ${FILESDIR}/post-3.3.2-kdelibs-kate.diff
-
-
-	
 }
 
 src_compile() {
diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
index 6593035dde11..c2a8953fec00 100644
--- a/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild,v 1.1 2005/06/07 12:59:02 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
-set-qtdir 3
 set-kdedir 3.4
 
 DESCRIPTION="KDE libraries needed by all kde programs"
@@ -12,20 +11,20 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.4"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
 	>=dev-libs/libpcre-4.2
 	media-libs/libart_lgpl
 	net-dns/libidn
-	sys-apps/utempter
+	virtual/utempter
 	ssl? ( >=dev-libs/openssl-0.9.7d )
 	alsa? ( media-libs/alsa-lib )
 	cups? ( >=net-print/cups-1.1.19 )
@@ -47,7 +46,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack() {
-	kde_src_unpack
+	unpack ${P}.tar.bz2
+	# This is an ugly hack: it makes base_src_unpack do nothing, but still lets us enjoy
+	# the other things kde_src_unpack does.
+	kde_src_unpack nounpack
 
 	epatch "${FILESDIR}/${P}-configure.patch"
 
diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
index af1bdfc47fee..3c27a9218321 100644
--- a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild,v 1.1 2005/07/10 20:16:35 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:52 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
-set-qtdir 3
 set-kdedir 3.4
 
 DESCRIPTION="KDE libraries needed by all kde programs"
@@ -12,13 +11,13 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
 # so we recreate the entire DEPEND from scratch.
 RDEPEND="arts? ( ~kde-base/arts-${PV} )
-	>=x11-libs/qt-3.3.3
+	$(qt_min_version 3.3.3)
 	app-arch/bzip2
 	>=dev-libs/libxslt-1.1.4
 	>=dev-libs/libxml2-2.6.6
diff --git a/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild b/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild
index 211539fe6b71..a1c7bbd48a4e 100644
--- a/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.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/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild,v 1.1 2005/09/17 16:49:42 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:52 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.4
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
diff --git a/kde-base/kdelibs/kdelibs-3.4.2.ebuild b/kde-base/kdelibs/kdelibs-3.4.2.ebuild
index 61859cfc5706..6423582a0f02 100644
--- a/kde-base/kdelibs/kdelibs-3.4.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.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/kde-base/kdelibs/kdelibs-3.4.2.ebuild,v 1.1 2005/07/28 12:52:34 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.4
diff --git a/kde-base/kdelibs/kdelibs-3.4.3.ebuild b/kde-base/kdelibs/kdelibs-3.4.3.ebuild
index 6780a0f67e3c..d5f58eafffcb 100644
--- a/kde-base/kdelibs/kdelibs-3.4.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.4.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/kde-base/kdelibs/kdelibs-3.4.3.ebuild,v 1.1 2005/10/12 13:20:16 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.4
@@ -11,7 +11,7 @@ SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ~ppc ppc64 sparc ~x86"
 IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
 
 # kde.eclass has kdelibs in DEPEND, and we can't have that in here.
@@ -56,6 +56,9 @@ src_unpack() {
 	# Configure patch. Applied for 3.5.
 	epatch "${FILESDIR}/kdelibs-3.4.1-configure.patch"
 
+	# Missing <inttypes.h> include causes compilation to bork
+	epatch "${FILESDIR}/kdelibs-3.4.3-inttypes.patch"
+
 	# for the configure patch
 	make -f admin/Makefile.common || die
 }
diff --git a/kde-base/kdelibs/kdelibs-3.5.0.ebuild b/kde-base/kdelibs/kdelibs-3.5.0.ebuild
index 38d2bcc6189a..0b8573ca6f8f 100644
--- a/kde-base/kdelibs/kdelibs-3.5.0.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.0.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
 
 DESCRIPTION="KDE libraries needed by all kde programs"
 HOMEPAGE="http://www.kde.org/"
-SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
+#SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
+SRC_URI="mirror://kde/stable/3.5/src/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
diff --git a/kde-base/kdelibs/kdelibs-3.5.0_beta2.ebuild b/kde-base/kdelibs/kdelibs-3.5.0_beta2.ebuild
index aa51dbc09c52..c826bd8f36bc 100644
--- a/kde-base/kdelibs/kdelibs-3.5.0_beta2.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.0_beta2.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/kde-base/kdelibs/kdelibs-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
@@ -11,7 +11,7 @@ S=${WORKDIR}/${PN}-${MY_PV}
 DESCRIPTION="KDE libraries needed by all kde programs"
 HOMEPAGE="http://www.kde.org/"
 #SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
-SRC_URI="mirror://kde/unstable/${PV/_/-}/src/${PN}-${MY_PV}.tar.bz2"
+SRC_URI="mirror://kde/unstable/${PV/.0_/-}/src/${PN}-${MY_PV}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="3.5"
@@ -53,14 +53,8 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	kde_src_unpack
 
-	# Configure check for ACLs.
-	epatch "${FILESDIR}/${P}-configure-acl.patch"
-
-	# Fix for pumount that was passed the wrong device name
-	epatch "${FILESDIR}/kioslave-pumount-devname.patch"
-
-	# For the configure check.
-	make -f admin/Makefile.common || die
+	# Fix big endian problem with kwallet
+	epatch "${FILESDIR}/${P}-kwallet-stdint.patch"
 }
 
 src_compile() {
diff --git a/kde-base/kdelibs/kdelibs-3.5.0_rc1.ebuild b/kde-base/kdelibs/kdelibs-3.5.0_rc1.ebuild
index d293c66923ee..c08b611c01be 100644
--- a/kde-base/kdelibs/kdelibs-3.5.0_rc1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.0_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/kde-base/kdelibs/kdelibs-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
diff --git a/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild b/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild
index bcda871e3d47..a834eac7fc9e 100644
--- a/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5_beta1-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/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild,v 1.1 2005/09/26 08:30:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5_beta1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:53 chriswhite Exp $
 
 inherit kde flag-o-matic eutils multilib
 set-kdedir 3.5
diff --git a/kde-base/kdelibs/metadata.xml b/kde-base/kdelibs/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdelibs/metadata.xml
+++ b/kde-base/kdelibs/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdelirc/ChangeLog b/kde-base/kdelirc/ChangeLog
index 2ee890901718..fc569bf95530 100644
--- a/kde-base/kdelirc/ChangeLog
+++ b/kde-base/kdelirc/ChangeLog
@@ -1,6 +1,94 @@
 # ChangeLog for kde-base/kdelirc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/ChangeLog,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdelirc-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdelirc-3.4.3.ebuild:
+  Stable on ppc64
+
+*kdelirc-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdelirc-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdelirc-3.5_beta1.ebuild,
+  kdelirc-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdelirc-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.5.0_beta2.ebuild:
+  New version.
+
+*kdelirc-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdelirc-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdelirc-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdelirc-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdelirc-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdelirc-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdelirc-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdelirc-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdelirc-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdelirc-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdelirc-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdelirc-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdelirc-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdelirc-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdelirc-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdelirc-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdelirc-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdelirc-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdelirc/Manifest b/kde-base/kdelirc/Manifest
index d164d3f3d00c..ea758403f299 100644
--- a/kde-base/kdelirc/Manifest
+++ b/kde-base/kdelirc/Manifest
@@ -1,4 +1,26 @@
-MD5 8df8d2f6da73994ef16319fa563fdad0 kdelirc-3.4.0_beta1.ebuild 308
-MD5 dafe2565d616ffdf7e59593df3421036 ChangeLog 354
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kdelirc-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7b8c28770490fec8781f7c5c2e174761 ChangeLog 3141
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kdelirc-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-kdelirc-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kdelirc-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kdelirc-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kdelirc-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kdelirc-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kdelirc-3.5_beta1 69
+MD5 2f2c5c0c1a314b617e60231562a52f56 kdelirc-3.4.1.ebuild 421
+MD5 c880fc5ac6a88e2f1fe2666873815952 kdelirc-3.4.2.ebuild 433
+MD5 4edc59713660b98420d8c92018de40cf kdelirc-3.4.3.ebuild 430
+MD5 300389c38bfd963a13641bbd1b615906 kdelirc-3.5.0.ebuild 416
+MD5 fc94e5d7a114b4c3cc1a164d0d7af498 kdelirc-3.5.0_beta2.ebuild 421
+MD5 a0deb15d37e78448f22d0f94fb20b397 kdelirc-3.5.0_rc1.ebuild 420
+MD5 15c64f77e1bff3fa2ba590257025e119 kdelirc-3.5_beta1.ebuild 419
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvtMntT9W3vfTuoRAmlFAKCDqpZjLkRlvI729qEzVatscimcbACgsuf1
+Wsiqq/ge0Nfu1jw2M4Tt2Fc=
+=Q9ol
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelirc/files/digest-kdelirc-3.4.1 b/kde-base/kdelirc/files/digest-kdelirc-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kdelirc/files/digest-kdelirc-3.4.1
+++ b/kde-base/kdelirc/files/digest-kdelirc-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kdelirc/files/digest-kdelirc-3.4.2 b/kde-base/kdelirc/files/digest-kdelirc-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/kdelirc/files/digest-kdelirc-3.4.2
+++ b/kde-base/kdelirc/files/digest-kdelirc-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/kdelirc/kdelirc-3.4.1.ebuild b/kde-base/kdelirc/kdelirc-3.4.1.ebuild
index 5bff1205a0e4..1fb76340626a 100644
--- a/kde-base/kdelirc/kdelirc-3.4.1.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.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/kde-base/kdelirc/kdelirc-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDElirc - KDE Frontend to lirc"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kdelirc/kdelirc-3.4.2.ebuild b/kde-base/kdelirc/kdelirc-3.4.2.ebuild
index b894d1e11a54..be4e3026222c 100644
--- a/kde-base/kdelirc/kdelirc-3.4.2.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.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/kde-base/kdelirc/kdelirc-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDElirc - KDE Frontend to lirc"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kdelirc/kdelirc-3.4.3.ebuild b/kde-base/kdelirc/kdelirc-3.4.3.ebuild
index 9c2f8a23a561..84c97751c540 100644
--- a/kde-base/kdelirc/kdelirc-3.4.3.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.4.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/kde-base/kdelirc/kdelirc-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDElirc - KDE Frontend to lirc"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kdelirc/kdelirc-3.5.0.ebuild b/kde-base/kdelirc/kdelirc-3.5.0.ebuild
index 4047985ac294..05ebe2cc83b2 100644
--- a/kde-base/kdelirc/kdelirc-3.5.0.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.5.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/kde-base/kdelirc/kdelirc-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kdelirc/kdelirc-3.5.0_beta2.ebuild b/kde-base/kdelirc/kdelirc-3.5.0_beta2.ebuild
index addc158baca5..83b10048e35b 100644
--- a/kde-base/kdelirc/kdelirc-3.5.0_beta2.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.5.0_beta2.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/kde-base/kdelirc/kdelirc-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDElirc - KDE Frontend to lirc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kdelirc/kdelirc-3.5.0_rc1.ebuild b/kde-base/kdelirc/kdelirc-3.5.0_rc1.ebuild
index ce631d87c199..b5b140a3328b 100644
--- a/kde-base/kdelirc/kdelirc-3.5.0_rc1.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.5.0_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/kde-base/kdelirc/kdelirc-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kdelirc/kdelirc-3.5_beta1.ebuild b/kde-base/kdelirc/kdelirc-3.5_beta1.ebuild
index 1dfec69800a0..ba8c3557eb2b 100644
--- a/kde-base/kdelirc/kdelirc-3.5_beta1.ebuild
+++ b/kde-base/kdelirc/kdelirc-3.5_beta1.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/kde-base/kdelirc/kdelirc-3.5_beta1.ebuild,v 1.1 2005/09/22 18:28:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelirc/kdelirc-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDElirc - KDE Frontend to lirc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kdelirc/metadata.xml b/kde-base/kdelirc/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdelirc/metadata.xml
+++ b/kde-base/kdelirc/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdemultimedia-arts/ChangeLog b/kde-base/kdemultimedia-arts/ChangeLog
index 9de5303f5d23..9607202794a0 100644
--- a/kde-base/kdemultimedia-arts/ChangeLog
+++ b/kde-base/kdemultimedia-arts/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/kdemultimedia-arts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/ChangeLog,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
+
+*kdemultimedia-arts-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-arts-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdemultimedia-arts-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-arts-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdemultimedia-arts-3.5_beta1.ebuild,
+  kdemultimedia-arts-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdemultimedia-arts-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-arts-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdemultimedia-arts-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdemultimedia-arts-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-arts-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kdemultimedia-arts-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdemultimedia-arts-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-arts-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-arts-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-arts-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdemultimedia-arts-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-arts-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdemultimedia-arts-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-arts-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-arts-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-arts-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdemultimedia-arts-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-arts-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdemultimedia-arts-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdemultimedia-arts-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-arts-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdemultimedia-arts-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-arts-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdemultimedia-arts-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdemultimedia-arts/Manifest b/kde-base/kdemultimedia-arts/Manifest
index 40250d66c3d4..6f7553d187c3 100644
--- a/kde-base/kdemultimedia-arts/Manifest
+++ b/kde-base/kdemultimedia-arts/Manifest
@@ -1,4 +1,12 @@
-MD5 c291bd40f252ae7ef6c78260b8817b95 kdemultimedia-arts-3.4.0_alpha1.ebuild 596
-MD5 c291bd40f252ae7ef6c78260b8817b95 kdemultimedia-arts-3.4.0_beta1.ebuild 596
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kdemultimedia-arts-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kdemultimedia-arts-3.4.0_alpha1 74
+MD5 7c4bbe725e22d55db75b74dbcd87728a ChangeLog 3513
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kdemultimedia-arts-3.4.1 227
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kdemultimedia-arts-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kdemultimedia-arts-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kdemultimedia-arts-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kdemultimedia-arts-3.5_beta1 74
+MD5 a3462a6855a9d390e4a78fe50399a239 kdemultimedia-arts-3.4.1.ebuild 732
+MD5 245a053a9b0e3d462706456148f3a1e2 kdemultimedia-arts-3.5.0.ebuild 709
+MD5 7989920930627a2d9b84c99a20218b7f kdemultimedia-arts-3.5.0_beta2.ebuild 714
+MD5 3f0ce964832b65c37ee2bb2d79f6ae9a kdemultimedia-arts-3.5.0_rc1.ebuild 713
+MD5 59fb480cfc1d46280e2a7f053940aa9e kdemultimedia-arts-3.5_beta1.ebuild 712
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdemultimedia-arts/files/digest-kdemultimedia-arts-3.4.1 b/kde-base/kdemultimedia-arts/files/digest-kdemultimedia-arts-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kdemultimedia-arts/files/digest-kdemultimedia-arts-3.4.1
+++ b/kde-base/kdemultimedia-arts/files/digest-kdemultimedia-arts-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.4.1.ebuild b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.4.1.ebuild
index 2548320d03b1..b70fb04d4048 100644
--- a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.4.1.ebuild
+++ b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.4.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=arts
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts pipeline builder and other tools"
-KEYWORDS="~x86 ~amd64"
-IUSE="oggvorbis encode"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
 KMEXTRACTONLY="mpeglib_artsplug/configure.in.in" # needed because the artsc-config call is here
 KMEXTRA="doc/artsbuilder"
 
diff --git a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0.ebuild b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0.ebuild
index 0a09d7bee6ca..2ebfe7b9e737 100644
--- a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0.ebuild
+++ b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.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/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=arts
diff --git a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_beta2.ebuild b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_beta2.ebuild
index 7d5a9b7ea325..7e1ea0a83734 100644
--- a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_beta2.ebuild
+++ b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_beta2.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/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=arts
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts pipeline builder and other tools"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRACTONLY="mpeglib_artsplug/configure.in.in" # needed because the artsc-config call is here
 KMEXTRA="doc/artsbuilder"
diff --git a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_rc1.ebuild b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_rc1.ebuild
index 9ab0178b595b..c47c95d76d5b 100644
--- a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_rc1.ebuild
+++ b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_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/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=arts
diff --git a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5_beta1.ebuild b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5_beta1.ebuild
index 556a3cc30910..667459dd8341 100644
--- a/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5_beta1.ebuild
+++ b/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5_beta1.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/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5_beta1.ebuild,v 1.1 2005/09/22 18:29:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-arts/kdemultimedia-arts-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=arts
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts pipeline builder and other tools"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRACTONLY="mpeglib_artsplug/configure.in.in" # needed because the artsc-config call is here
 KMEXTRA="doc/artsbuilder"
diff --git a/kde-base/kdemultimedia-arts/metadata.xml b/kde-base/kdemultimedia-arts/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdemultimedia-arts/metadata.xml
+++ b/kde-base/kdemultimedia-arts/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdemultimedia-kappfinder-data/ChangeLog b/kde-base/kdemultimedia-kappfinder-data/ChangeLog
index 332c845a372f..4421e60f9dd0 100644
--- a/kde-base/kdemultimedia-kappfinder-data/ChangeLog
+++ b/kde-base/kdemultimedia-kappfinder-data/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for kde-base/kdemultimedia-kappfinder-data
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/ChangeLog,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdemultimedia-kappfinder-data-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kappfinder-data-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdemultimedia-kappfinder-data-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdemultimedia-kappfinder-data-3.5_beta1.ebuild,
+  kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdemultimedia-kappfinder-data-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild:
+  New version.
+
+*kdemultimedia-kappfinder-data-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kappfinder-data-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdemultimedia-kappfinder-data-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdemultimedia-kappfinder-data-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-kappfinder-data-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdemultimedia-kappfinder-data-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-kappfinder-data-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdemultimedia-kappfinder-data-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kappfinder-data-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdemultimedia-kappfinder-data-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kappfinder-data-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdemultimedia-kappfinder-data-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdemultimedia-kappfinder-data-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kappfinder-data-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdemultimedia-kappfinder-data-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kappfinder-data-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdemultimedia-kappfinder-data-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdemultimedia-kappfinder-data/Manifest b/kde-base/kdemultimedia-kappfinder-data/Manifest
index c3b4924c7126..89133cd527df 100644
--- a/kde-base/kdemultimedia-kappfinder-data/Manifest
+++ b/kde-base/kdemultimedia-kappfinder-data/Manifest
@@ -1,4 +1,26 @@
-MD5 c71619e6fda2ec2e54deaf33446db9f2 kdemultimedia-kappfinder-data-3.4.0_beta1.ebuild 308
-MD5 c71619e6fda2ec2e54deaf33446db9f2 kdemultimedia-kappfinder-data-3.4.0_alpha1.ebuild 308
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kdemultimedia-kappfinder-data-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kdemultimedia-kappfinder-data-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1bf980e14e7c72a4e9f7dbda7e9205af ChangeLog 4454
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kdemultimedia-kappfinder-data-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-kdemultimedia-kappfinder-data-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kdemultimedia-kappfinder-data-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kdemultimedia-kappfinder-data-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kdemultimedia-kappfinder-data-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kdemultimedia-kappfinder-data-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kdemultimedia-kappfinder-data-3.5_beta1 74
+MD5 6e402e000c62ad3fef16218c1e414681 kdemultimedia-kappfinder-data-3.4.1.ebuild 471
+MD5 ebc4bb57cd9cf8cb538eb3ea0917af03 kdemultimedia-kappfinder-data-3.4.2.ebuild 484
+MD5 842c97c7ff943f2d3358ea0134904ecf kdemultimedia-kappfinder-data-3.4.3.ebuild 480
+MD5 525e3eb8c92b354d2032bf8ca40bf7a4 kdemultimedia-kappfinder-data-3.5.0.ebuild 460
+MD5 58462e39604b164f491bc653f6ddd274 kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild 465
+MD5 881170f3fb8eb671c4e52a033b21b1e1 kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild 464
+MD5 187c4bbeab6cd93ce458149f677cf43c kdemultimedia-kappfinder-data-3.5_beta1.ebuild 463
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmyqntT9W3vfTuoRAqTUAJ4x1bHpGFWo/muY/uveOX9gPP9rywCgmfXk
+tzcWt9xX0R1Puq4Nv3+2Czw=
+=ctB8
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.1 b/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.1
+++ b/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.2 b/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.2
+++ b/kde-base/kdemultimedia-kappfinder-data/files/digest-kdemultimedia-kappfinder-data-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.1.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.1.ebuild
index 43b7c4930fab..1d16516d9f4f 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.1.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kappfinder data from kdemultimedia"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.2.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.2.ebuild
index 38604150f298..b45cfb47684c 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.2.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kappfinder data from kdemultimedia"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.3.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.3.ebuild
index 810f3500b3c1..25d73ebf138c 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.3.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kappfinder data from kdemultimedia"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0.ebuild
index 6a7c76699b6b..18708f27cec7 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild
index 7ba6986671d3..9eaeaf6bbe0c 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_beta2.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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kappfinder data from kdemultimedia"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild
index d33ce07b6674..4aaec606e65b 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
diff --git a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5_beta1.ebuild b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5_beta1.ebuild
index 88b60ecf6bd7..6edf9ca10b38 100644
--- a/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5_beta1.ebuild
+++ b/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5_beta1.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/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5_beta1.ebuild,v 1.1 2005/09/22 18:30:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kappfinder-data/kdemultimedia-kappfinder-data-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kappfinder-data
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kappfinder data from kdemultimedia"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdemultimedia-kappfinder-data/metadata.xml b/kde-base/kdemultimedia-kappfinder-data/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdemultimedia-kappfinder-data/metadata.xml
+++ b/kde-base/kdemultimedia-kappfinder-data/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdemultimedia-kfile-plugins/ChangeLog b/kde-base/kdemultimedia-kfile-plugins/ChangeLog
index 6761408d0dd8..a8c7757f5afa 100644
--- a/kde-base/kdemultimedia-kfile-plugins/ChangeLog
+++ b/kde-base/kdemultimedia-kfile-plugins/ChangeLog
@@ -1,6 +1,131 @@
 # ChangeLog for kde-base/kdemultimedia-kfile-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdemultimedia-kfile-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kfile-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdemultimedia-kfile-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdemultimedia-kfile-plugins-3.5_beta1.ebuild,
+  kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdemultimedia-kfile-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+*kdemultimedia-kfile-plugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kfile-plugins-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdemultimedia-kfile-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdemultimedia-kfile-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-kfile-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdemultimedia-kfile-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-kfile-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdemultimedia-kfile-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kfile-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592).
+
+*kdemultimedia-kfile-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kfile-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  28 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdemultimedia-kfile-plugins-3.4.0_rc1.ebuild:
+  Add optional support for libtheora.
+
+*kdemultimedia-kfile-plugins-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kfile-plugins-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdemultimedia-kfile-plugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kfile-plugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdemultimedia-kfile-plugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdemultimedia-kfile-plugins/Manifest b/kde-base/kdemultimedia-kfile-plugins/Manifest
index b8d9bc9f8ad9..2496088cf4a3 100644
--- a/kde-base/kdemultimedia-kfile-plugins/Manifest
+++ b/kde-base/kdemultimedia-kfile-plugins/Manifest
@@ -1,4 +1,26 @@
-MD5 5149ae182df68370f806d511c9e65fcb kdemultimedia-kfile-plugins-3.4.0_alpha1.ebuild 516
-MD5 5149ae182df68370f806d511c9e65fcb kdemultimedia-kfile-plugins-3.4.0_beta1.ebuild 516
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kdemultimedia-kfile-plugins-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kdemultimedia-kfile-plugins-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d1ab1628b93fb4f00eed21e137212941 ChangeLog 4658
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kdemultimedia-kfile-plugins-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-kdemultimedia-kfile-plugins-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kdemultimedia-kfile-plugins-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kdemultimedia-kfile-plugins-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kdemultimedia-kfile-plugins-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kdemultimedia-kfile-plugins-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kdemultimedia-kfile-plugins-3.5_beta1 74
+MD5 9b78ad53e5cfc93f0141e5ef62c60bb7 kdemultimedia-kfile-plugins-3.4.1.ebuild 657
+MD5 6c90d05fff7361d7217d340006873ee7 kdemultimedia-kfile-plugins-3.4.2.ebuild 670
+MD5 c40b81cad05f39672c7ede61e1cf1593 kdemultimedia-kfile-plugins-3.4.3.ebuild 666
+MD5 dee9a458f9ddb7b8db1669b16d2d9d5d kdemultimedia-kfile-plugins-3.5.0.ebuild 646
+MD5 84eb3b67b009759ba9f0b59ca28ea446 kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild 651
+MD5 065c18328d5c403f10a681a22da9de26 kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild 650
+MD5 b5bbbd2ef7b7d3335f4b58457edd7077 kdemultimedia-kfile-plugins-3.5_beta1.ebuild 649
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmzsntT9W3vfTuoRAlNBAKCxtZ0Jh4bVsII74Tcw0HqscLFghACeLelN
++jlavGeD6i7TfqmJFurPKUg=
+=+rzM
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.1 b/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.1
+++ b/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.2 b/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.2
+++ b/kde-base/kdemultimedia-kfile-plugins/files/digest-kdemultimedia-kfile-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.1.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.1.ebuild
index a4acedb12756..54b6ffcb75a3 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.1.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
@@ -9,13 +9,13 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdemultimedia package"
-KEYWORDS="~x86 ~amd64"
-IUSE="oggvorbis theora"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="vorbis theora"
 DEPEND="media-libs/taglib
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	theora? ( media-libs/libtheora )"
 
 src_compile() {
-	myconf="$myconf $(use_with oggvorbis vorbis)"
+	myconf="$myconf $(use_with vorbis)"
 	kde-meta_src_compile
 }
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.2.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.2.ebuild
index 10a34c1b0110..738bce6f72ec 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.2.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdemultimedia package"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="vorbis theora"
 DEPEND="media-libs/taglib
 	vorbis? ( media-libs/libvorbis )
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.3.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.3.ebuild
index abb527daad0e..a7469fcd26dc 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.3.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdemultimedia package"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="vorbis theora"
 DEPEND="media-libs/taglib
 	vorbis? ( media-libs/libvorbis )
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0.ebuild
index 787215f4ac9a..cd2452ef722f 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild
index 887fbb53f828..96a6c21b2ef4 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_beta2.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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdemultimedia package"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="vorbis theora"
 DEPEND="media-libs/taglib
 	vorbis? ( media-libs/libvorbis )
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild
index 2899a2306c8b..04b334e9437a 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
diff --git a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5_beta1.ebuild b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5_beta1.ebuild
index d89979a7373d..46780adb9773 100644
--- a/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5_beta1.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/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:31:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kfile-plugins/kdemultimedia-kfile-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kfile-plugins
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from kdemultimedia package"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="vorbis theora"
 DEPEND="media-libs/taglib
 	vorbis? ( media-libs/libvorbis )
diff --git a/kde-base/kdemultimedia-kfile-plugins/metadata.xml b/kde-base/kdemultimedia-kfile-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdemultimedia-kfile-plugins/metadata.xml
+++ b/kde-base/kdemultimedia-kfile-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdemultimedia-kioslaves/ChangeLog b/kde-base/kdemultimedia-kioslaves/ChangeLog
index 6575d236dc50..93caed6cac85 100644
--- a/kde-base/kdemultimedia-kioslaves/ChangeLog
+++ b/kde-base/kdemultimedia-kioslaves/ChangeLog
@@ -1,6 +1,131 @@
 # ChangeLog for kde-base/kdemultimedia-kioslaves
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/ChangeLog,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-kioslaves-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kioslaves-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdemultimedia-kioslaves-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdemultimedia-kioslaves-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kioslaves-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdemultimedia-kioslaves-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kioslaves-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdemultimedia-kioslaves-3.5_beta1.ebuild,
+  kdemultimedia-kioslaves-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdemultimedia-kioslaves-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kioslaves-3.5.0_beta2.ebuild:
+  New version.
+
+*kdemultimedia-kioslaves-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-kioslaves-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdemultimedia-kioslaves-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdemultimedia-kioslaves-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-kioslaves-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdemultimedia-kioslaves-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-kioslaves-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-kioslaves-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdemultimedia-kioslaves-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kioslaves-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-kioslaves-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdemultimedia-kioslaves-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kioslaves-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdemultimedia-kioslaves-3.4.1.ebuild:
+  Correct dependencies.
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdemultimedia-kioslaves-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592).
+
+*kdemultimedia-kioslaves-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kioslaves-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-kioslaves-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-kioslaves-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdemultimedia-kioslaves-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-kioslaves-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdemultimedia-kioslaves-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kdemultimedia-kioslaves-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kioslaves-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdemultimedia-kioslaves-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-kioslaves-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdemultimedia-kioslaves-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdemultimedia-kioslaves/Manifest b/kde-base/kdemultimedia-kioslaves/Manifest
index d3a5727947b3..0270068c54b1 100644
--- a/kde-base/kdemultimedia-kioslaves/Manifest
+++ b/kde-base/kdemultimedia-kioslaves/Manifest
@@ -1,4 +1,26 @@
-MD5 87e676c7b9d911ee2a602c3be1908190 kdemultimedia-kioslaves-3.4.0_beta1.ebuild 746
-MD5 87e676c7b9d911ee2a602c3be1908190 kdemultimedia-kioslaves-3.4.0_alpha1.ebuild 746
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kdemultimedia-kioslaves-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kdemultimedia-kioslaves-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d9ce6136d8d04ae0f76ccf86188c53c4 ChangeLog 4476
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kdemultimedia-kioslaves-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-kdemultimedia-kioslaves-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kdemultimedia-kioslaves-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kdemultimedia-kioslaves-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kdemultimedia-kioslaves-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kdemultimedia-kioslaves-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kdemultimedia-kioslaves-3.5_beta1 74
+MD5 c2eb64eaecac9cbdf2d47030cc980c46 kdemultimedia-kioslaves-3.4.1.ebuild 1166
+MD5 f26d5606d50caaad97cc6add72f234de kdemultimedia-kioslaves-3.4.2.ebuild 1179
+MD5 284c885336874b174dba0324caa39653 kdemultimedia-kioslaves-3.4.3.ebuild 1175
+MD5 2f966575ead88c0aa4931398c99c7f12 kdemultimedia-kioslaves-3.5.0.ebuild 1457
+MD5 e22850e5a5b145fae4520559166d2538 kdemultimedia-kioslaves-3.5.0_beta2.ebuild 1462
+MD5 792640f114f00ee6e97c989649a6f793 kdemultimedia-kioslaves-3.5.0_rc1.ebuild 1461
+MD5 375fc5ac3db29106232d291d17d66861 kdemultimedia-kioslaves-3.5_beta1.ebuild 1460
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmwdntT9W3vfTuoRAh8vAJ0cmuW5nisiyFUjJk5DmUSdI5T+3ACfXqeu
+7gOuG6hisZSEfnVyE3kNpAA=
+=xEL5
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.1 b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.1
+++ b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.2 b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.2
+++ b/kde-base/kdemultimedia-kioslaves/files/digest-kdemultimedia-kioslaves-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild
index 3b921f09784a..32b7989fc488 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -9,21 +9,28 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdemultimedia package"
-KEYWORDS="~x86 ~amd64"
-IUSE="oggvorbis flac encode"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia
 	media-libs/taglib
-	oggvorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )
-	encode? ( media-sound/lame )"
+	encode? ( vorbis? ( media-libs/libvorbis )
+	          flac? ( media-libs/flac ) )"
+RDEPEND="${DEPEND}
+	encode? ( mp3? ( media-sound/lame ) )"
+
 KMCOPYLIB="libkcddb libkcddb"
-KMEXTRACTONLY="kdemultimedia-3.3.0/akode/configure.in.in"
+KMEXTRACTONLY="akode/configure.in.in"
 KMCOMPILEONLY="libkcddb/"
 
 src_compile() {
 	myconf="--with-cdparanoia --enable-cdparanoia"
-	use oggvorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis"
+	if use encode; then
+		myconf="$myconf $(use_with vorbis) $(use_with flac)"
+	else
+		myconf="$myconf --without-vorbis --without-flac"
+	fi
+
 	DO_NOT_COMPILE=libkcddb kde-meta_src_compile myconf configure
 	cd $S/libkcddb && make configbase.h
 	DO_NOT_COMPILE=libkcddb kde-meta_src_compile make
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.2.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.2.ebuild
index a3dd81be4867..85c52c036bf0 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.2.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdemultimedia package"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.3.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.3.ebuild
index 52f4c328dd3e..4601c6d3c841 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.3.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.3.ebuild,v 1.1 2005/10/13 00:09:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdemultimedia package"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0.ebuild
index 3801360d0f1f..408cb5cf8f3f 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_beta2.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_beta2.ebuild
index 7fcb45df09d4..4b0345c214e3 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_beta2.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_beta2.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdemultimedia package"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_rc1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_rc1.ebuild
index d632706456e2..675570126d13 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_rc1.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5_beta1.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5_beta1.ebuild
index 54cf97a97b76..412cf9bdfeda 100644
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5_beta1.ebuild
+++ b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5_beta1.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/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5_beta1.ebuild,v 1.1 2005/09/22 18:31:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdemultimedia
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdemultimedia package"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="encode flac mp3 vorbis"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcddb)
 	media-sound/cdparanoia
diff --git a/kde-base/kdemultimedia-kioslaves/metadata.xml b/kde-base/kdemultimedia-kioslaves/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdemultimedia-kioslaves/metadata.xml
+++ b/kde-base/kdemultimedia-kioslaves/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdemultimedia-meta/ChangeLog b/kde-base/kdemultimedia-meta/ChangeLog
index 8414c518c8f6..1c37b927ffcf 100644
--- a/kde-base/kdemultimedia-meta/ChangeLog
+++ b/kde-base/kdemultimedia-meta/ChangeLog
@@ -1,6 +1,139 @@
 # ChangeLog for kde-base/kdemultimedia-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdemultimedia-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdemultimedia-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdemultimedia-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdemultimedia-meta-3.5_beta1.ebuild,
+  kdemultimedia-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdemultimedia-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdemultimedia-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdemultimedia-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  24 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdemultimedia-meta-3.5_beta1.ebuild:
+  Update list of kdemultimedia packages with artsplugin-akode.
+
+*kdemultimedia-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdemultimedia-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdemultimedia-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdemultimedia-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdemultimedia-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdemultimedia-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdemultimedia-meta-3.4.1.ebuild:
+  Make dependency on artsplugin-xine conditional (#91989).
+
+*kdemultimedia-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdemultimedia-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdemultimedia-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdemultimedia-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  06 Mar 2005; Simone Gotti <motaboy@gentoo.org>
+  kdemultimedia-meta-3.4.0_rc1.ebuild:
+  Change kde-base/mpeglib deps as it was updated.
+
+*kdemultimedia-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdemultimedia-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdemultimedia-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdemultimedia-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdemultimedia-meta/Manifest b/kde-base/kdemultimedia-meta/Manifest
index 181bf8602819..a931d53c78cc 100644
--- a/kde-base/kdemultimedia-meta/Manifest
+++ b/kde-base/kdemultimedia-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 3132f3583d482ab54bfff602dcf98c06 kdemultimedia-meta-3.4.0_beta1.ebuild 1316
-MD5 3132f3583d482ab54bfff602dcf98c06 kdemultimedia-meta-3.4.0_alpha1.ebuild 1316
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.4.0_alpha1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9a63c417a2bad8f599f85bd6e804017 ChangeLog 4571
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdemultimedia-meta-3.5_beta1 0
+MD5 fd4f557d97cb49e1fcff50c9c3e2dc8a kdemultimedia-meta-3.4.1.ebuild 1472
+MD5 84165c13764e375cc3efa8f0c8b8b2cf kdemultimedia-meta-3.4.2.ebuild 1501
+MD5 0a36097e49391f84786ec8320fefe978 kdemultimedia-meta-3.4.3.ebuild 1491
+MD5 ac9d5876153df7118bc2e2d4025c3256 kdemultimedia-meta-3.5.0.ebuild 1545
+MD5 7113f710baa8567a8d987999b4795829 kdemultimedia-meta-3.5.0_beta2.ebuild 1556
+MD5 5e41077d7aa961225a36ac162d540792 kdemultimedia-meta-3.5.0_rc1.ebuild 1571
+MD5 e2cfb590ba75475f1d10bd708b49adba kdemultimedia-meta-3.5_beta1.ebuild 1548
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm5bntT9W3vfTuoRAiIcAJ9eqd2HBk4kVL0LcsFZGdXT0QTCJQCfQkxg
+WOPmojt2mffqjg7187+GUNM=
+=eD8j
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.1.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.1.ebuild
index 97f0711571ac..1e416905dc63 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.1.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,13 +9,13 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
-IUSE="arts"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="arts xine"
 
 RDEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile)
 		$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpeglib)
 		$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpg123)
-		$(deprange $PV $MAXKDEVER kde-base/artsplugin-xine)
+		xine? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-xine) )
 		$(deprange $PV $MAXKDEVER kde-base/juk)
 		$(deprange $PV $MAXKDEVER kde-base/kaboodle)
 		$(deprange $PV $MAXKDEVER kde-base/kaudiocreator)
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.2.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.2.ebuild
index a48ffccf9a01..dd7a88b5b514 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.2.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts xine"
 
 RDEPEND="arts? ( $(deprange 3.4.1 $MAXKDEVER kde-base/artsplugin-audiofile)
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.3.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.3.ebuild
index 32be5cef9d2f..837d60e15680 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.3.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="arts xine"
 
 RDEPEND="arts? ( $(deprange 3.4.1 $MAXKDEVER kde-base/artsplugin-audiofile)
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0.ebuild
index d94897cafcd8..c62dcfc0c1ee 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_beta2.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_beta2.ebuild
index f316e6a156a9..0556ef36628f 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_beta2.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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts xine"
 
 RDEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-akode)
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_rc1.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_rc1.ebuild
index d294162278b0..500821abbe14 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5_beta1.ebuild b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5_beta1.ebuild
index 223762ddde89..51de6b68684b 100644
--- a/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5_beta1.ebuild
+++ b/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5_beta1.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/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:48:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-meta/kdemultimedia-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,17 +9,15 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts xine"
 
-RDEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile)
-		$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpeglib)
-		$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpg123)
+RDEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-akode)
+		$(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile)
 		xine? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-xine) )
 		$(deprange $PV $MAXKDEVER kde-base/juk)
 		$(deprange $PV $MAXKDEVER kde-base/kaboodle)
 		$(deprange $PV $MAXKDEVER kde-base/kaudiocreator)
-		$(deprange $PV $MAXKDEVER kde-base/akode)
 		$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
 		$(deprange $PV $MAXKDEVER kde-base/krec)
 		$(deprange $PV $MAXKDEVER kde-base/noatun) )
@@ -29,5 +27,9 @@ RDEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile)
 	$(deprange $PV $MAXKDEVER kde-base/kmid)
 	$(deprange $PV $MAXKDEVER kde-base/kmix)
 	$(deprange $PV $MAXKDEVER kde-base/kscd)
-	$(deprange $PV $MAXKDEVER kde-base/libkcddb)
-	$(deprange $PV $MAXKDEVER kde-base/mpeglib)"
+	$(deprange $PV $MAXKDEVER kde-base/libkcddb)"
+
+# Not really useful, these are scheduled for being removed from KDE soon.
+#$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpeglib)
+#$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpg123)
+#$(deprange $PV $MAXKDEVER kde-base/mpeglib)
diff --git a/kde-base/kdemultimedia-meta/metadata.xml b/kde-base/kdemultimedia-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdemultimedia-meta/metadata.xml
+++ b/kde-base/kdemultimedia-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog
index 31e96be6eb13..f01da5a82849 100644
--- a/kde-base/kdemultimedia/ChangeLog
+++ b/kde-base/kdemultimedia/ChangeLog
@@ -1,6 +1,784 @@
 # ChangeLog for kde-base/kdemultimedia
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdemultimedia-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdemultimedia-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdemultimedia-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdemultimedia-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  kdemultimedia-3.4.1-r1.ebuild:
+  Mark 3.4.1-r1 stable on alpha
+
+*kdemultimedia-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.5.0_beta2.ebuild:
+  New version.
+
+*kdemultimedia-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdemultimedia-3.4.3.ebuild:
+  New version.
+
+*kdemultimedia-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdemultimedia-3.4.2.ebuild:
+  Keyworded ~mips.
+
+  04 Oct 2005; Hardave Riar <hardave@gentoo.org>
+  kdemultimedia-3.4.1-r1.ebuild:
+  Keyworded ~mips.
+
+*kdemultimedia-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.5_beta1.ebuild:
+  New version. Add support for akode.
+
+  26 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.5_alpha1-compile-kscd.patch,
+  kdemultimedia-3.5_alpha1.ebuild:
+  Add patch to fix bug #103773.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  kdemultimedia-3.4.1-r1.ebuild:
+  stable on ia64
+
+*kdemultimedia-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.5_alpha1-compile.patch,
+  +kdemultimedia-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. aKode is not included anymore, it will be released
+  outside KDE as media-libs/akode.
+
+  29 Jul 2005; Dan Armak <danarmak@gentoo.org> kdemultimedia-3.4.2.ebuild:
+  Add explicit dep on musicbrainz in addition to tunepimp, since the juk
+  binary links against libmusicbrainz directly.
+
+*kdemultimedia-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.4-configure.patch, +kdemultimedia-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Make support for MusicBrainz
+  optional.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.4.1-r1.ebuild:
+  Stable on hppa.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdemultimedia-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-3.4.1-r1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdemultimedia-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org>
+  kdemultimedia-3.4.1-r1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdemultimedia-3.4.1-r1 (10 Jun 2005)
+
+  10 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdemultimedia-3.4.1-akode-hang.patch,
+  +kdemultimedia-3.4.1-r1.ebuild:
+  Fix regression: juk hangs with akode engine (#95022).
+
+*kdemultimedia-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.4.1.ebuild:
+  New version. Change flag 'oggvorbis' into 'vorbis' (#89592), 'mad' into
+  'mp3' (#94045).
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org>
+  kdemultimedia-3.4.0.ebuild:
+  add ~ia64
+
+  21 Mar 2005; Carsten Lohrke <carlo@gentoo.org> kdemultimedia-3.4.0.ebuild:
+  depend on xine-lib-1.0, #86136
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdemultimedia-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdemultimedia-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdemultimedia-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdemultimedia-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdemultimedia-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> +files/artsc-typo.diff,
+  kdemultimedia-3.4.0_beta2.ebuild:
+  Added a patch that already exists in the artsplugin-mpeglib ebuild. It
+  doesn't fix anything in particular, that I know of, but it might.
+
+*kdemultimedia-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/kdemultimedia-3.4.0_beta1-amd64.patch,
+  kdemultimedia-3.4.0_beta1.ebuild:
+  fix compilation on amd64
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdemultimedia-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdemultimedia-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdemultimedia-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdemultimedia-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Removed old flag filtering.
+
+  03 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> :
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  kdemultimedia-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.2.ebuild:
+  x86 stable
+
+  23 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  kdemultimedia-3.3.2.ebuild:
+  Omit 64-bit patch for amd64 to close bug 74961.
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  -files/kdemultimedia-3.3.2-64bit.patch, +files/kdemultimedia-64bit.patch,
+  kdemultimedia-3.3.1.ebuild, kdemultimedia-3.3.2.ebuild:
+  3.3.1 stable on ppc64 and changed according patch
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  +files/kdemultimedia-3.3.2-64bit.patch, kdemultimedia-3.3.2.ebuild:
+  Added patch to let this package compile on ppc64
+
+*kdemultimedia-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdemultimedia-3.3.2.ebuild:
+  Version bump
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdemultimedia-3.3.1.ebuild:
+  Marked ppc stable.
+
+  06 Nov 2004; Luca Barbato <lu_zero@gentoo.org> kdemultimedia-3.3.0.ebuild,
+  kdemultimedia-3.3.1.ebuild:
+  Fixed taglib dep, thanks to Paolo Sacconier for reporting
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdemultimedia-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdemultimedia-3.3.1 (12 Oct 2004)
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdemultimedia-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdemultimedia-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdemultimedia-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0.ebuild:
+  Change speex dep so we don't get 1.1.4
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdemultimedia-3.2.1.ebuild,
+  -kdemultimedia-3.2.2.ebuild:
+  removing old versions, marking 3.3.0 x86 stable
+
+  02 Sep 2004; Tom Gall <tgall@gentoo.org> kdemultimedia-3.3.0.ebuild:
+  added ~ppc64, bug 62685
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdemultimedia-3.1.5.ebuild, kdemultimedia-3.2.1.ebuild,
+  kdemultimedia-3.2.2.ebuild, kdemultimedia-3.3.0.ebuild:
+  Masked kdemultimedia-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdemultimedia-3.1.5.ebuild, kdemultimedia-3.2.1.ebuild,
+  kdemultimedia-3.2.2.ebuild:
+  Masked kdemultimedia-3.2.2.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdemultimedia-3.1.5.ebuild, kdemultimedia-3.2.1.ebuild:
+  Masked kdemultimedia-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdemultimedia-3.1.5.ebuild:
+  Masked kdemultimedia-3.1.5.ebuild stable for ppc
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.3.ebuild,
+  kdemultimedia-3.3.0.ebuild, files/3.2.3-Makefile-synth.am.diff,
+  files/3.3.0-Makefile-synth.am.diff:
+  Add two other parallel make compilation fixes (Bug #53847)
+
+  26 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0.ebuild,
+  files/3.3.0-Makefile.am.diff:
+  Add a parallel make compilation patch
+
+*kdemultimedia-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0.ebuild,
+  kdemultimedia-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdemultimedia-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0_rc1.ebuild,
+  kdemultimedia-3.3.0_rc2.ebuild:
+  add _rc2, remove _rc1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdemultimedia-3.3.0_rc1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.3.0_rc1.ebuild:
+  New _rc1, remove _beta1
+
+  28 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  kdemultimedia-3.3.0_beta2.ebuild:
+  changes based on bug #58640
+
+*kdemultimedia-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdemultimedia-3.3.0_beta2.ebuild:
+  new beta
+
+*kdemultimedia-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdemultimedia-3.3.0_alpha1.ebuild, +kdemultimedia-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+*kdemultimedia-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdemultimedia-3.3.0_alpha1.ebuild, +kdemultimedia-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdemultimedia-3.2.2-r1.ebuild:
+  Stable on alpha.
+
+*kdemultimedia-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdemultimedia-3.2.3.ebuild:
+  Version bump
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> kdemultimedia-3.1.5.ebuild,
+  kdemultimedia-3.2.0.ebuild, kdemultimedia-3.2.1.ebuild,
+  kdemultimedia-3.2.2-r1.ebuild, kdemultimedia-3.2.2.ebuild,
+  kdemultimedia-3.3.0_alpha1.ebuild:
+  Fix use invocation
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdemultimedia-3.2.2-r1.ebuild:
+  stable on amd64
+
+*kdemultimedia-3.3.0_alpha1 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdemultimedia-3.3.0_alpha1.ebuild:
+  3.3alpha1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.2.2-r1.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdemultimedia-3.2.2-r1.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdemultimedia-3.2.2-r1.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  Add inherit eutils
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  -files/kdemultimedia-3.0.5b-gentoo-timidity.diff,
+  -kdemultimedia-3.0.5b.ebuild:
+  Remove old version
+
+*kdemultimedia-3.2.2-r1 (20 Apr 2004)
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> : kdemultimedia-3.2.2-r1.ebuild
+  Radical changes to the ebuild - see bug #48484
+
+*kdemultimedia-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdemultimedia-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdemultimedia-3.2.1.ebuild:
+  stable on amd64
+
+  16 Mar 2004; root <root@gentoo.org> kdemultimedia-3.2.0.ebuild,
+  kdemultimedia-3.2.1.ebuild:
+  Remove xanim as a dep as it's no longer needed (see bug #39003)
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdemultimedia-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  15 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.1.ebuild:
+  readd filter-flags
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.4-r1.ebuild,
+  kdemultimedia-3.2.1.ebuild, files/kdemultimedia-3.1.4-alpha.diff,
+  files/kdemultimedia-3.1.4-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.4-ln-sf.diff:
+  x86 stable and version bump
+
+*kdemultimedia-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  25 Feb 2004; Guy Martin <gmsoft@gentoo.org> :
+  Marked stable on hppa.
+
+  15 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.0.5b.ebuild,
+  kdemultimedia-3.1.4-r1.ebuild, kdemultimedia-3.1.5.ebuild:
+  Change media-sound/mpg123 -> virtual/mpg123 as per mail on -dev
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> :
+  Stable on ppc.
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  Stable on ppc.
+
+  09 Feb 2004; <agriffis@gentoo.org> kdemultimedia-3.1.5.ebuild:
+  disallow xanim on ia64
+
+  09 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0.ebuild,
+  files/flac-patch.diff:
+  Fix compilation for earlier flac versions with a patch
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdemultimedia-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdemultimedia-3.1.5.ebuild:
+  stable on alpha and ia64
+
+  23 Jan 2004; Robin H. Johnson <robbat2@gentoo.org>
+  kdemultimedia-3.1.5.ebuild:
+  commit fix for #38326.
+
+*kdemultimedia-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.0.4.ebuild,
+  kdemultimedia-3.1.2-r1.ebuild, kdemultimedia-3.1.2.ebuild,
+  kdemultimedia-3.2.0_beta1.ebuild, kdemultimedia-3.2.0_beta2.ebuild,
+  kdemultimedia-3.2.0_rc1.ebuild,
+  files/kdemultimedia-3.0.4-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.2-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.2-ln-sf.diff:
+  New version, removing old versions
+
+*kdemultimedia-3.1.5 (14 Jan 2004)
+
+  16 Jan 2003; Guy Martin <gmsoft@gentoo.org> kdemultimedia-3.1.5.ebuild :
+  Marked stable on hppa.
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.5.ebuild,
+  files/kdemultimedia-3.1.5-alpha.diff,
+  files/kdemultimedia-3.1.5-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.5-ln-sf.diff:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  kdemultimedia-3.1.4-r1.ebuild:
+  stable on alpha
+
+  12 Jan 2004; Aron Griffis <agriffis@gentoo.org>
+  kdemultimedia-3.1.4-r1.ebuild, files/kdemultimedia-3.1.4-alpha.diff:
+  add patch for alpha (apply on all arches). This is a compile-time patch so
+  there's no need to bump the rev
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  kdemultimedia-3.1.2-r1.ebuild, kdemultimedia-3.1.2.ebuild,
+  kdemultimedia-3.1.4-r1.ebuild, kdemultimedia-3.2.0_beta1.ebuild,
+  kdemultimedia-3.2.0_beta2.ebuild:
+  fixed motif dep
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org>
+  kdemultimedia-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.4-r1.ebuild,
+  kdemultimedia-3.2.0_beta2.ebuild:
+  minor dependency fixes
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org>
+  kdemultimedia-3.2.0_beta2.ebuild:
+  minor dependency changes
+
+*kdemultimedia-3.2.0_beta2 (02 Dec 2003)
+
+  02 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org>
+  kdemultimedia-3.1.4-r1.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org>
+  kdemultimedia-3.1.4-r1.ebuild:
+  Marked ppc
+
+  06 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0_beta1.ebuild:
+  Add disabling of strict and warnings so it compiles for those with
+  strange linux-headers.  Not a final fix, but will work
+  in the interim.
+
+  06 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0_beta1.ebuild:
+  Remove cdr use flag (see bug 24169)
+
+  05 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0_beta1.ebuild:
+  Block juk as it's in this package now.
+  Drop cdrtools/cdrdao support (see bugs #32792 and #24169)
+  Drop xanim as aKtion frontend is gone.
+  Thank to Gregorio Guidi for pointing these out
+
+  04 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0_beta1.ebuild:
+  Add gstreamer use flag and dependency
+
+*kdemultimedia-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org>
+  kdemultimedia-3.1.4-r1.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-2.2.2-r1.ebuild,
+  kdemultimedia-2.2.2-r1.ebuild, kdemultimedia-3.1.1.ebuild,
+  kdemultimedia-3.1.1.ebuild, kdemultimedia-3.1.3-r1.ebuild,
+  kdemultimedia-3.1.3-r1.ebuild, kdemultimedia-3.1.3.ebuild,
+  kdemultimedia-3.1.3.ebuild, kdemultimedia-3.1.4.ebuild,
+  kdemultimedia-3.1.4.ebuild, files/kdemultimedia-2.2.2-r1-gentoo.diff,
+  files/kdemultimedia-3.1.1-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.1-ln-sf.diff, files/kdemultimedia-3.1.3-gcc33.diff,
+  files/kdemultimedia-3.1.3-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.3-ln-sf.diff:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.4-r1.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.4.ebuild:
+  marking x86 stable
+
+*kdemultimedia-3.1.3-r1 (19 Sep 2003)
+
+  19 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.3-r1.ebuild,
+  kdemultimedia-3.1.4-r1.ebuild:
+  perform same xine-lib fix as is in 3.1.2-r1
+
+*kdemultimedia-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb <caleb@gentoo.org> kdemultimedia-3.1.4.ebuild,
+  files/kdemultimedia-3.1.4-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.4-ln-sf.diff:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.3.ebuild:
+  x86 stable
+
+  11 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.3.ebuild:
+  kde_fix_head_instances fix.
+
+  06 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdemultimedia-3.1.3.ebuild:
+  Make it compile with gcc33 - patch.
+
+  03 Aug 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.2-r1.ebuild,
+  kdemultimedia-3.1.3.ebuild:
+  Fixed xine-lib dependency issues and added ~sparc to keywords to fix bug
+  #24714.
+
+*kdemultimedia-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdemultimedia-3.1.3.ebuild:
+  Version bump
+
+  15 Jul 2003; root <root@gentoo.org> kdemultimedia-3.1.2-r1.ebuild:
+  ~ppc keyworded
+
+  09 Jul 2003; Caleb Tennis <caleb@gentoo.org); kdemultimedia-3.1.2-r1.ebuild:
+  Remove non x86 flags from ebuild as xine-lib may cause problems.
+
+*kdemultimedia-3.1.2-r1 (07 Jul 2003)
+
+  07 Jul 2003; Caleb Tennis <caleb@gentoo.org>: kdemultimedia-3.1.2-r1.ebuild:
+  Reintegrate support for xine - closes bug #23486
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1, 3.1-r1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdemultimedia-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdemultimedia-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdemultimedia-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdemultimedia-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdemultimedia-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-3.0.5b.ebuild,
+  files/kdemultimedia-3.0.5b-gentoo-timidity.diff:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdemultimedia-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-3.1.1.ebuild,
+  files/kdemultimedia-3.1.1-gentoo-timidity.diff,
+  files/kdemultimedia-3.1.1-ln-sf.diff:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.1.ebuild, kdemultimedia-3.1-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-2.2.2.ebuild,
+  kdemultimedia-3.0.2.ebuild, kdemultimedia-3.0.3.ebuild,
+  kdemultimedia-3.1_rc6.ebuild: removed old ebuilds
+
+*kdemultimedia-3.1-r1 (11 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdemultimedia-3.1-r1.ebuild:
+  Added ~alpha to keywords
+
+  11 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change dep on openmotif to virtual/motif, since lesstif also works here. Put
+  this in ~ for now.
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdemultimedia-3.1.ebuild:
+  added ~sparc to keywords
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+*kdemultimedia-2.2.2-r1 (17 Jan 2003)
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-2.2.2-r1.ebuild:
+  new version, fixes #12520
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdemultimedia-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdemultimedia-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-3.1_rc6.ebuild:
+  version bump
+
+*kdemultimedia-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdemultimedia-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdemultimedia-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdemultimedia-3.1.ebuild:
+  Added ppc keyword
+
+  23 Nov 2002; Dan Armak <danarmak@gentoo.org> kdemultimedia-3.1_rc3.ebuild,
+  kdemultimedia-3.1.ebuild :
+
+  Enforce MAKEOPTS+=-j1 because parallel compiling breaks, at least on ppc
+  it seems.
+
+  21 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdemultimedia-3.0*.ebuild:
+  filtered -fomit-frame-pointer from kdemultimedia-3.0.x ebuilds,
+  this fixes bug #9894, thanks to jjcspamme@yahoo.com (Jerry) for submission
+
+*kdemultimedia-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdemultimedia-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdemultimedia-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+  13 Okt 2002; Bart Verwilst <verwilst@gentoo.org> Changelog:
+
+  Filter out -fforce-addr, because it b0rks kdemm compilation.
+  Compiles fine when filtered.
+
+  04 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Remove the kdemultimedia-3.0.3 dep on cdrtools and cdrdao altogether. koncd
+  isn't compiled by default, so these deps aren't needed.
+
+  08 Sep 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Make building koncd in 3.0.x, and kaudiocreator in 3.1.x, depend on the new
+  cdr use variable. This variable is on by default, so the default behaviour
+  is unchanged; therefore there is no new revision. Fix #4868.
+
+*kdemultimedia-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdemultimedia-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : : : : :
+
+  New stability release.
+
+  10 Jun 2002; Dan Armak <danarmak@gentoo.org> changelog:
+
+  Pass the correct parameters to configure to enable it to find NAS.
+
+*kdemultimedia-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdemultimedia-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+  12 May 2002; Dan Armak <danarmak@gentoo.org> changelog:
+  
+  Disabled building with alsa. The kdemm/alsa.9 bug isn't going to disappear soon it seems.
+
+*kdemultimedia-3.0-r1 (30 Apr 2002)
+
+  30 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Fixed files from kmidi/config installing into /var/tmp/portage/.../$KDEDIR.
+  Fixes bug #2095.
+
+  5 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog:
+  
+  Add patch submitted by Michael Thompson to fix building of TIMIDITY with tcltk bindings.
+  Fixes bug #1542.
+
+*kdemultimedia-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdemultimedia-2.2.2 (1 Feb 2002)
 
@@ -11,3 +789,4 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
+
diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest
index a6358d020265..e70609e3c3e6 100644
--- a/kde-base/kdemultimedia/Manifest
+++ b/kde-base/kdemultimedia/Manifest
@@ -1,24 +1,34 @@
-MD5 9dd75bdbc32e1c440d23edd235bac84b kdemultimedia-3.0.5a.ebuild 2523
-MD5 6f1ef1d0aeddc81da816f138ee90e778 kdemultimedia-3.0.4.ebuild 2517
-MD5 6ef1a62b5177796e9dc01e5037031786 kdemultimedia-2.2.2-r1.ebuild 1475
-MD5 0a233b27dc30d898aaa0c683898cdf2d ChangeLog 6191
-MD5 9a2144e67e17eebd7f6301c8bca49906 kdemultimedia-3.1.ebuild 2702
-MD5 2f6d40204ee7e978ce7b1bfbe5ae15ac kdemultimedia-3.1.1.ebuild 2698
-MD5 617f827cce13d597e59f810b00a9e446 kdemultimedia-3.1-r1.ebuild 2701
-MD5 8fb79646776cf184ad0689232821cf49 kdemultimedia-3.0.5b.ebuild 2525
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5a-gentoo-timidity.diff 694
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.4-gentoo-timidity.diff 694
-MD5 1d8fbf6a3381fec3bcf4b41f830cc360 files/digest-kdemultimedia-3.0.5a 74
-MD5 d37340290c8c5fd5d8dc6345ec9dee75 files/digest-kdemultimedia-3.0.5b 74
-MD5 617c96da71ee9854ff09217902c45ac0 files/digest-kdemultimedia-3.1-r1 71
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1-ln-sf.diff 1278
-MD5 f6cf44aaa0e416ee6dcc0a66f734d83a files/digest-kdemultimedia-2.2.2-r1 146
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.0.5b-gentoo-timidity.diff 694
-MD5 86d8f1ace438437515940f470b8d4ddd files/kdemultimedia-2.2.2-r1-gentoo.diff 2416
-MD5 86d8f1ace438437515940f470b8d4ddd files/kdemultimedia-2.2.2-gentoo.diff 2416
-MD5 bd16249f1d390fb635238b000fc0e1ef files/digest-kdemultimedia-3.0.4 73
-MD5 448728e6c262cd057b361af52d1f0c16 files/digest-kdemultimedia-3.1.1 73
-MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.1-ln-sf.diff 1278
-MD5 617c96da71ee9854ff09217902c45ac0 files/digest-kdemultimedia-3.1 71
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1.1-gentoo-timidity.diff 694
-MD5 353aca022c26e07139bf35ad2433fabd files/kdemultimedia-3.1-gentoo-timidity.diff 694
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ac6024b73bc009740a52c5159c094294 ChangeLog 26208
+MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73
+MD5 7768e89277edde1b1e163ae65e5a4e9c files/digest-kdemultimedia-3.4.1 73
+MD5 7768e89277edde1b1e163ae65e5a4e9c files/digest-kdemultimedia-3.4.1-r1 73
+MD5 dfce952f93ee14ecafcfea645134aec2 files/digest-kdemultimedia-3.4.2 73
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kdemultimedia-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kdemultimedia-3.5.0 73
+MD5 c59a8866e503610aa8719048121bd7a2 files/digest-kdemultimedia-3.5.0_beta2 74
+MD5 df7c23dbf7665ee793214ac55c82219d files/digest-kdemultimedia-3.5.0_rc1 77
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kdemultimedia-3.5_beta1 74
+MD5 ab4383e2b9810696530127a0a5464bfc files/kdemultimedia-3.4-configure.patch 5211
+MD5 b7a984a57c27e1e62a606d90d0c39437 files/kdemultimedia-3.4.0-amd64.patch 523
+MD5 0ed594ab9238b688fca70c1959d3932e files/kdemultimedia-3.4.1-akode-hang.patch 653
+MD5 0af60268ec8424c72256db89062b6f31 files/kdemultimedia-64bit.patch 634
+MD5 31324613721465d34f5a62e712fee02c kdemultimedia-3.3.2.ebuild 1767
+MD5 69025b5755c07548974ac22390000e20 kdemultimedia-3.4.1-r1.ebuild 1926
+MD5 bfab37322a08d99e36a6293f215deac9 kdemultimedia-3.4.1.ebuild 1772
+MD5 07c3c5c2b16ffe5a9f2d3b04423253a9 kdemultimedia-3.4.2.ebuild 2008
+MD5 ff369b071f7201fbe372094994f88cfe kdemultimedia-3.4.3.ebuild 2011
+MD5 54286ea5b15a84e8fea32c442d75d67c kdemultimedia-3.5.0.ebuild 2189
+MD5 e38be9472572c26bd1c79a9aaf384e83 kdemultimedia-3.5.0_beta2.ebuild 2193
+MD5 67c0b5a9caff3fdb6318ec93ce7f8da5 kdemultimedia-3.5.0_rc1.ebuild 2191
+MD5 737f64ac537885eae4bf7c46fd07290d kdemultimedia-3.5_beta1.ebuild 2191
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm6UntT9W3vfTuoRAgcOAJ4kpBkEzqW/sWKIA9Dr0pSq+hQzNACfWYER
+c0+VR3pweCWDGiEcYmGIJss=
+=moFA
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
index fab9d3be931a..fa79671b6a2a 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.1 2004/12/09 02:17:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist flag-o-matic eutils
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, artsbuilder..."
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64 ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="alsa audiofile cdparanoia encode flac oggvorbis speex xine"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -19,11 +19,15 @@ DEPEND="~kde-base/kdebase-${PV}
 	alsa? ( media-libs/alsa-lib )
 	speex? ( media-libs/speex !=media-libs/speex-1.1.4 )
 	>=media-libs/taglib-1.2
-	media-libs/tunepimp
-	!media-sound/juk"
+	media-libs/tunepimp"
 
 src_unpack() {
 	kde_src_unpack
+	cd ${S}
+	# bug 74961
+	if [ "${ARCH}" != "amd64" ] ; then
+		epatch ${FILESDIR}/${PN}-64bit.patch
+	fi
 }
 
 src_compile() {
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild
index c562c0f98909..0a178deb3040 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.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/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild,v 1.1 2005/06/10 14:54:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="alsa audiofile encode flac gstreamer jack mp3 speex theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -22,13 +22,13 @@ DEPEND="~kde-base/kdebase-${PV}
 	alsa? ( media-libs/alsa-lib )
 	speex? ( media-libs/speex )
 	theora? ( media-libs/libtheora )
-	gstreamer? ( >=media-libs/gstreamer-0.8 )
+	gstreamer? ( >=media-libs/gstreamer-0.8
+	             >=media-libs/gst-plugins-0.8 )
 	>=media-libs/taglib-1.2
 	media-libs/tunepimp"
 
 RDEPEND="${DEPEND}
-	gstreamer? ( >=media-libs/gst-plugins-0.8
-		     mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
+	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
 		     vorbis? ( >=media-plugins/gst-plugins-ogg-0.8
 		                  >=media-plugins/gst-plugins-vorbis-0.8 )
 		     flac? ( >=media-plugins/gst-plugins-flac-0.8 ) )"
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.1.ebuild
index a99d0ee17320..3e4b154aa771 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.4.1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.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/kde-base/kdemultimedia/kdemultimedia-3.4.1.ebuild,v 1.1 2005/05/27 08:45:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild
index 8e9dd6b95f2e..38e4c7066dc4 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.4.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/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild,v 1.1 2005/07/28 12:57:23 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="alsa audiofile encode flac gstreamer jack mp3 musicbrainz speex theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -25,7 +25,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	gstreamer? ( >=media-libs/gstreamer-0.8
 	             >=media-libs/gst-plugins-0.8 )
 	>=media-libs/taglib-1.2
-	musicbrainz? ( media-libs/tunepimp )"
+	musicbrainz? ( media-libs/tunepimp media-libs/musicbrainz )"
 
 RDEPEND="${DEPEND}
 	gstreamer? ( mp3? ( >=media-plugins/gst-plugins-mad-0.8 )
@@ -39,6 +39,7 @@ DEPEND="${DEPEND}
 src_unpack() {
 	kde_src_unpack
 
+	# Fix for 64 bit systems. Applied for 3.5.
 	epatch "${FILESDIR}/kdemultimedia-3.4.0-amd64.patch"
 
 	# Configure patch. Applied for 3.5.
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild
index 30437e93b5b6..0cf23b44ae84 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.4.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/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild,v 1.1 2005/10/12 13:26:06 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE multimedia apps: noatun, kscd, juk..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="alsa audiofile encode flac gstreamer jack mp3 musicbrainz speex theora vorbis xine"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild
index 71161719630b..a9ecb8ec65bb 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.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/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild,v 1.1 2005/11/22 22:14:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.0_beta2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.0_beta2.ebuild
index 137f03320025..79520e8d5eec 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.0_beta2.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.0_beta2.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/kde-base/kdemultimedia/kdemultimedia-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5.0_rc1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5.0_rc1.ebuild
index 8d0930e065d7..121d2e8a9f31 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5.0_rc1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5.0_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/kde-base/kdemultimedia/kdemultimedia-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:30:33 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdemultimedia/kdemultimedia-3.5_beta1.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.5_beta1.ebuild
index 6ecf47bd1359..d6196d09cb38 100644
--- a/kde-base/kdemultimedia/kdemultimedia-3.5_beta1.ebuild
+++ b/kde-base/kdemultimedia/kdemultimedia-3.5_beta1.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/kde-base/kdemultimedia/kdemultimedia-3.5_beta1.ebuild,v 1.1 2005/09/21 17:24:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:04 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdemultimedia/metadata.xml b/kde-base/kdemultimedia/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdemultimedia/metadata.xml
+++ b/kde-base/kdemultimedia/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdenetwork-filesharing/ChangeLog b/kde-base/kdenetwork-filesharing/ChangeLog
index 8fb08d7428e0..114652c2f4f3 100644
--- a/kde-base/kdenetwork-filesharing/ChangeLog
+++ b/kde-base/kdenetwork-filesharing/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for kde-base/kdenetwork-filesharing
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.1 2005/01/15 02:24:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/ChangeLog,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-filesharing-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-filesharing-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdenetwork-filesharing-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kdenetwork-filesharing-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-filesharing-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdenetwork-filesharing-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-filesharing-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdenetwork-filesharing-3.5_beta1.ebuild,
+  kdenetwork-filesharing-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdenetwork-filesharing-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-filesharing-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdenetwork-filesharing-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdenetwork-filesharing-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdenetwork-filesharing-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdenetwork-filesharing-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdenetwork-filesharing-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-filesharing-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdenetwork-filesharing-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-filesharing-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdenetwork-filesharing-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdenetwork-filesharing-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-filesharing-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdenetwork-filesharing-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-filesharing-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-filesharing-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdenetwork-filesharing-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdenetwork-filesharing-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdenetwork-filesharing-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-filesharing-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdenetwork-filesharing-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-filesharing-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdenetwork-filesharing-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-filesharing-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdenetwork-filesharing-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdenetwork-filesharing/Manifest b/kde-base/kdenetwork-filesharing/Manifest
index 295e8ef124d3..e3bdae50bcba 100644
--- a/kde-base/kdenetwork-filesharing/Manifest
+++ b/kde-base/kdenetwork-filesharing/Manifest
@@ -1,4 +1,24 @@
-MD5 3f1daa73998de67ee78ca6f6fe774b1f kdenetwork-filesharing-3.4.0_beta1.ebuild 349
-MD5 3f1daa73998de67ee78ca6f6fe774b1f kdenetwork-filesharing-3.4.0_alpha1.ebuild 349
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kdenetwork-filesharing-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kdenetwork-filesharing-3.4.0_beta1 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bdae62645e95e6d6703dedcfe4292854 ChangeLog 4039
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kdenetwork-filesharing-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kdenetwork-filesharing-3.4.2 296
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdenetwork-filesharing-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kdenetwork-filesharing-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kdenetwork-filesharing-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kdenetwork-filesharing-3.5_beta1 71
+MD5 49580aea427534893bb110fe6a9765c1 kdenetwork-filesharing-3.4.1.ebuild 467
+MD5 8ed973682288bb4a5d173d419e98b19f kdenetwork-filesharing-3.4.2.ebuild 478
+MD5 f6687e70250088209780c93d2460d48b kdenetwork-filesharing-3.5.0.ebuild 456
+MD5 8e52503e75a7fe559695e30830449a64 kdenetwork-filesharing-3.5.0_beta2.ebuild 461
+MD5 a727d1c4473f8687253ddcb6dc841c7d kdenetwork-filesharing-3.5.0_rc1.ebuild 460
+MD5 5202a748f5e8e735b62f3a9cc3b7365e kdenetwork-filesharing-3.5_beta1.ebuild 459
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuKXntT9W3vfTuoRAm4DAJ0TAn6HE9okD3KqgdikCj1QpqQwwwCcD6NA
+R8CO7/8soD2Fj2mbtMUuE9M=
+=0U7/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.1 b/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.1
+++ b/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.2 b/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.2
+++ b/kde-base/kdenetwork-filesharing/files/digest-kdenetwork-filesharing-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.1.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.1.ebuild
index 685b22939b6a..826eb2c969fe 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.1.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.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/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=filesharing
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.2.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.2.ebuild
index f8bfba97a46b..7cc35dc37300 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.2.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=filesharing
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0.ebuild
index 43343e3617ae..7e0e714b365b 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.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/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=filesharing
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_beta2.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_beta2.ebuild
index 4712cbd7de85..aaf8ce44f96d 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_beta2.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_beta2.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/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=filesharing
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_rc1.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_rc1.ebuild
index faabd8ec6a95..fbf5484fd960 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_rc1.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_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/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=filesharing
diff --git a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5_beta1.ebuild b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5_beta1.ebuild
index f9901a9363ae..a9532144e74c 100644
--- a/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5_beta1.ebuild
+++ b/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5_beta1.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/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5_beta1.ebuild,v 1.1 2005/09/22 18:32:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-filesharing/kdenetwork-filesharing-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=filesharing
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kcontrol filesharing config module for NFS, SMB etc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-filesharing/metadata.xml b/kde-base/kdenetwork-filesharing/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdenetwork-filesharing/metadata.xml
+++ b/kde-base/kdenetwork-filesharing/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdenetwork-kfile-plugins/ChangeLog b/kde-base/kdenetwork-kfile-plugins/ChangeLog
index 5edba0a2c458..37e628e36f2b 100644
--- a/kde-base/kdenetwork-kfile-plugins/ChangeLog
+++ b/kde-base/kdenetwork-kfile-plugins/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for kde-base/kdenetwork-kfile-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kdenetwork-kfile-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-kfile-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdenetwork-kfile-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-kfile-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdenetwork-kfile-plugins-3.5_beta1.ebuild,
+  kdenetwork-kfile-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdenetwork-kfile-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-kfile-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdenetwork-kfile-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdenetwork-kfile-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdenetwork-kfile-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdenetwork-kfile-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdenetwork-kfile-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdenetwork-kfile-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-kfile-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdenetwork-kfile-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-kfile-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-kfile-plugins-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdenetwork-kfile-plugins-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-kfile-plugins-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdenetwork-kfile-plugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-kfile-plugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdenetwork-kfile-plugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdenetwork-kfile-plugins/Manifest b/kde-base/kdenetwork-kfile-plugins/Manifest
index 42f7026af254..5c105f721134 100644
--- a/kde-base/kdenetwork-kfile-plugins/Manifest
+++ b/kde-base/kdenetwork-kfile-plugins/Manifest
@@ -1,4 +1,24 @@
-MD5 6d5a6e7dce23c01a2dc198351a02f043 kdenetwork-kfile-plugins-3.4.0_beta1.ebuild 354
-MD5 6d5a6e7dce23c01a2dc198351a02f043 kdenetwork-kfile-plugins-3.4.0_alpha1.ebuild 354
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kdenetwork-kfile-plugins-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kdenetwork-kfile-plugins-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a7e5cd4795f0d775dbf8906bca993d25 ChangeLog 4113
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kdenetwork-kfile-plugins-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kdenetwork-kfile-plugins-3.4.2 296
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdenetwork-kfile-plugins-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kdenetwork-kfile-plugins-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kdenetwork-kfile-plugins-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kdenetwork-kfile-plugins-3.5_beta1 71
+MD5 d1bdfe76415a148601252e134b99ab37 kdenetwork-kfile-plugins-3.4.1.ebuild 507
+MD5 157975e58e9fb999946e7da11b8f5c09 kdenetwork-kfile-plugins-3.4.2.ebuild 518
+MD5 7415bf19879932a73f862c8410630c04 kdenetwork-kfile-plugins-3.5.0.ebuild 496
+MD5 2968731c972b24ba7485b4b954530d98 kdenetwork-kfile-plugins-3.5.0_beta2.ebuild 501
+MD5 08688cee1639b213094618f2735fac78 kdenetwork-kfile-plugins-3.5.0_rc1.ebuild 500
+MD5 d4b53c506a3d75727311c62464be815e kdenetwork-kfile-plugins-3.5_beta1.ebuild 499
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuLintT9W3vfTuoRAi1NAJ9wEFbxFRFK7/ksQFeTveSwuPwpHgCgtcYY
+iDNW/Cwpq+EYR8UiEq7+R+M=
+=6dUL
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.1 b/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.1
+++ b/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.2 b/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.2
+++ b/kde-base/kdenetwork-kfile-plugins/files/digest-kdenetwork-kfile-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.1.ebuild b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.1.ebuild
index 458ad4b839d4..7e3a2e2860a0 100644
--- a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.1.ebuild
+++ b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.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/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=kfile-plugins
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from the kdenetwork package. Currently provides a torrent kfile plugin."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.2.ebuild b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.2.ebuild
index a1f8878a1e5a..94ad2353cbae 100644
--- a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.2.ebuild
+++ b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=kfile-plugins
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from the kdenetwork package. Currently provides a torrent kfile plugin."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0.ebuild b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0.ebuild
index d7d01ddbed20..077a1e5232bb 100644
--- a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0.ebuild
+++ b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.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/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=kfile-plugins
diff --git a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_beta2.ebuild b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_beta2.ebuild
index f3464088445c..c259fbad4415 100644
--- a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_beta2.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/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=kfile-plugins
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from the kdenetwork package. Currently provides a torrent kfile plugin."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_rc1.ebuild b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_rc1.ebuild
index 9a6a6d5fe156..54f98c17ce04 100644
--- a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_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/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=kfile-plugins
diff --git a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5_beta1.ebuild b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5_beta1.ebuild
index 53f5863341ed..65bf628e1895 100644
--- a/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5_beta1.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/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:33:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-kfile-plugins/kdenetwork-kfile-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=kfile-plugins
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins from the kdenetwork package. Currently provides a torrent kfile plugin."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdenetwork-kfile-plugins/metadata.xml b/kde-base/kdenetwork-kfile-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdenetwork-kfile-plugins/metadata.xml
+++ b/kde-base/kdenetwork-kfile-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdenetwork-meta/ChangeLog b/kde-base/kdenetwork-meta/ChangeLog
index e57fa41786e4..28b5c591c10f 100644
--- a/kde-base/kdenetwork-meta/ChangeLog
+++ b/kde-base/kdenetwork-meta/ChangeLog
@@ -1,6 +1,126 @@
 # ChangeLog for kde-base/kdenetwork-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdenetwork-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdenetwork-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdenetwork-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdenetwork-meta-3.5_beta1.ebuild, kdenetwork-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdenetwork-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdenetwork-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdenetwork-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdenetwork-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdenetwork-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdenetwork-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdenetwork-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdenetwork-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdenetwork-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdenetwork-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdenetwork-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdenetwork-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdenetwork-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdenetwork-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdenetwork-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdenetwork-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdenetwork-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdenetwork-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdenetwork-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdenetwork-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdenetwork-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdenetwork-meta/Manifest b/kde-base/kdenetwork-meta/Manifest
index 8273d9e35219..f8471ba013e3 100644
--- a/kde-base/kdenetwork-meta/Manifest
+++ b/kde-base/kdenetwork-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 9c39b6b73aba18e7834de51e58ee7a85 kdenetwork-meta-3.4.0_beta1.ebuild 1110
-MD5 9c39b6b73aba18e7834de51e58ee7a85 kdenetwork-meta-3.4.0_alpha1.ebuild 1110
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5cff51007d9ba5e683a2947dd05e81e9 ChangeLog 4151
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdenetwork-meta-3.5_beta1 0
+MD5 de32ca424d36992cd8b652d30f359048 kdenetwork-meta-3.4.1.ebuild 1259
+MD5 3cb4e2e0f3dbb9747a2b6cb6585e02de kdenetwork-meta-3.4.2.ebuild 1274
+MD5 382f239afa387641855222f6d0a148e1 kdenetwork-meta-3.4.3.ebuild 1282
+MD5 57ffa9c2ddf1f3614782323ed290171e kdenetwork-meta-3.5.0.ebuild 1248
+MD5 e48d037878a0f795db6dadfb1d89b671 kdenetwork-meta-3.5.0_beta2.ebuild 1259
+MD5 8dc74f7117fd6bbd4418421301bf4346 kdenetwork-meta-3.5.0_rc1.ebuild 1282
+MD5 1e80bf231dacfeb22cdbb373ccfbb309 kdenetwork-meta-3.5_beta1.ebuild 1251
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuaAntT9W3vfTuoRAlKgAJ9k3gDdpwoHRi9t+fomXwDA+IcBHgCgk6/8
+UXRACBwXg6yl4BdJ7bdrmqA=
+=3600
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.1.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.1.ebuild
index b273a1b3c830..e3f7217b67e1 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.1.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.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/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="wifi"
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/dcoprss)
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.2.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.2.ebuild
index 53f3e5ee3dfc..7ee942ae0e1c 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.2.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.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/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="wifi"
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/dcoprss)
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.3.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.3.ebuild
index b815497880a0..57fdf1e8408e 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.3.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.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/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="wifi"
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/dcoprss)
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0.ebuild
index 4dbb14a12e23..a8608029fa54 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.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/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_beta2.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_beta2.ebuild
index 4a047e50d04d..195405b6f2b1 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_beta2.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/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="wifi"
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/dcoprss)
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_rc1.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_rc1.ebuild
index db53977d711a..2bce25b4d29f 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_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/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5_beta1.ebuild b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5_beta1.ebuild
index 80d9903cd45c..08f9bfa4c70b 100644
--- a/kde-base/kdenetwork-meta/kdenetwork-meta-3.5_beta1.ebuild
+++ b/kde-base/kdenetwork-meta/kdenetwork-meta-3.5_beta1.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/kde-base/kdenetwork-meta/kdenetwork-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:49:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork-meta/kdenetwork-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="wifi"
 
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/dcoprss)
diff --git a/kde-base/kdenetwork-meta/metadata.xml b/kde-base/kdenetwork-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdenetwork-meta/metadata.xml
+++ b/kde-base/kdenetwork-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index f88cf550f99d..cfdca47194a6 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,727 @@
 # ChangeLog for kde-base/kdenetwork
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdenetwork-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdenetwork-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdenetwork-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+  17 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdenetwork-3.5.0_rc1.ebuild:
+  Correct dependency on meanwhile (#112808).
+
+*kdenetwork-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kopete-3.5.0_rc1-fix.patch, +kdenetwork-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  kdenetwork-3.4.1-r1.ebuild:
+  Mark 3.4.1-r1 stable on alpha
+
+*kdenetwork-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdenetwork-3.5.0_beta2.ebuild:
+  New version.
+
+*kdenetwork-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdenetwork-3.4.3.ebuild:
+  New version.
+
+*kdenetwork-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdenetwork-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.4.2.ebuild:
+  Keyworded ~mips.
+
+*kdenetwork-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.5_beta1-gadu.patch, +kdenetwork-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  kdenetwork-3.4.1-r1.ebuild:
+  stable on ia64
+
+*kdenetwork-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdenetwork-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. Add support for the Sametime protocol.
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdenetwork-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdenetwork-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.4-configure.patch, +kdenetwork-3.4.2.ebuild:
+  New version. Add configure patch (#81966).
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.4.1-r1.ebuild:
+  Stable on hppa.
+
+  22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-3.3.2-r2.ebuild:
+  Stable on ia64, bug 99754.
+
+  22 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-3.3.2-r2.ebuild:
+  Stable on alpha, bug 99754.
+
+  22 Jul 2005; Danny van Dyk <kugelfang@gentoo.org>
+  kdenetwork-3.3.2-r2.ebuild, kdenetwork-3.4.1-r1.ebuild:
+  Marked stable on amd64.
+
+  22 Jul 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.3.2-r2.ebuild:
+  Stable on mips, bug #99754.
+
+  22 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdenetwork-3.3.2-r2.ebuild, kdenetwork-3.4.1-r1.ebuild:
+  Stable on sparc wrt #99754
+
+  22 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdenetwork-3.3.2-r2.ebuild,
+  kdenetwork-3.4.1-r1.ebuild:
+  Marked ppc stable for bug #99754.
+
+  21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  kdenetwork-3.3.2-r2.ebuild:
+  Stable on hppa. bug #99754
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.2-r2.ebuild:
+  Stable on ppc64 (bug #99754)
+
+*kdenetwork-3.4.1-r1 (21 Jul 2005)
+*kdenetwork-3.3.2-r2 (21 Jul 2005)
+
+  21 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdenetwork-3.3.2-r2.ebuild, +kdenetwork-3.4.1-r1.ebuild:
+  Fix vulnerabilities in libgadu (#99754).
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.3.2-r1.ebuild:
+  Stable on mips.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdenetwork-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Jason Wever <weeve@gentoo.org> kdenetwork-3.3.2-r1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdenetwork-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org>
+  +files/disable-meanwhile.diff, kdenetwork-3.4.1.ebuild:
+  Force meanwhile support to off. It was unpredictable, was missing a dep, and
+  broke compilation with meanwhile >=0.4. Bug 96778.
+
+  29 Jun 2005; Dan Armak <danarmak@gentoo.org>
+  +files/wireless-extensions-api.diff, kdenetwork-3.4.1.ebuild:
+  Fix bug 94719: add patch from upstream branch cvs allowing kwifimanager to
+  compile with wireless extensions 28_pre8.
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.2-r1.ebuild:
+  Stable on ppc64
+
+  19 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdenetwork-3.3.2-r1.ebuild:
+  Stable on x86.
+
+  02 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kdenetwork-3.4.1.ebuild:
+  Correct dependency on wireless-tools for bug #94719.
+
+  28 May 2005; Gregorio Guidi <greg_g@gentoo.org> kdenetwork-3.4.1.ebuild:
+  Depend on rdesktop >= 1.4.1 (#94036).
+
+*kdenetwork-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdenetwork-3.4.1.ebuild:
+  New version.
+
+*kdenetwork-3.3.2-r1 (26 May 2005)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.3.2-kopete-msn.patch,
+  +files/kdenetwork-3.3.2-kwifimanager-configlocation.patch,
+  +kdenetwork-3.3.2-r1.ebuild:
+  Add patch to make kopete connect to msn (#93213). Add patch to fix bug #75907.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org>
+  kdenetwork-3.4.0-r2.ebuild:
+  add ~ia64
+
+*kdenetwork-3.4.0-r2 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.4.0-kopete-tabbed-windows.patch,
+  +kdenetwork-3.4.0-r2.ebuild:
+  Add patch to fix crash in kopete chatwindow (#91423).
+
+*kdenetwork-3.4.0-r1 (03 Apr 2005)
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.4.0-kopete-logout.patch,
+  +files/kdenetwork-3.4.0-kopete-spaces.patch, +kdenetwork-3.4.0-r1.ebuild:
+  Add patches for bug #86446 (crash on logout) and for bug #87485 (handling of
+  names with spaces).
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdenetwork-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdenetwork-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdenetwork-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+  12 Mar 2005; Hardave Riar <hardave@gentoo.org> kdenetwork-3.3.2.ebuild:
+  Marked ~mips.
+
+*kdenetwork-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdenetwork-3.4.0_rc1.ebuild:
+  New version.
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdenetwork-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdenetwork-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdenetwork-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdenetwork-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdenetwork-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdenetwork-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdenetwork-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdenetwork-3.3.1-r1.ebuild:
+  Stable on ppc64
+
+*kdenetwork-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.3.2.ebuild:
+  Version bump
+
+  05 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  kdenetwork-3.3.1-r1.ebuild:
+  The wifi module doesn't compile if arts support is disabled.
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdenetwork-3.3.1-r1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-3.3.1-r1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Joseph Jezak <josejx@gentoo.org> kdenetwork-3.3.1-r1.ebuild:
+  Marked ppc stable.
+
+*kdenetwork-3.3.1-r1 (05 Nov 2004)
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> +files/3.3.1-kget.diff,
+  +kdenetwork-3.3.1-r1.ebuild:
+  do a rev bump here, fixes a nasty kget crash
+  I'm going to keep sparc as stable, because the patch is pretty unobtrusive.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+*kdenetwork-3.3.1 (03 Nov 2004)
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  kdenetwork-3.3.1.ebuild:
+  ~alpha keyword.
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org> :
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdenetwork-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdenetwork-3.2.1.ebuild:
+  x86 stable, remove old version
+
+  02 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0.ebuild,
+  files/3.3.0-kget.diff:
+  Patch to fix a crash (#62296)
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild, kdenetwork-3.2.3.ebuild,
+  kdenetwork-3.3.0.ebuild:
+  Masked kdenetwork-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild, kdenetwork-3.2.3.ebuild:
+  Masked kdenetwork-3.2.3.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild:
+  Masked kdenetwork-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdenetwork-3.1.5.ebuild:
+  Masked kdenetwork-3.1.5.ebuild stable for ppc
+
+  30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdenetwork-3.3.0.ebuild:
+  block net-misc/ksambaplugin
+
+  25 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3-r1.ebuild:
+  x86 stable
+
+  23 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdenetwork-3.3.0.ebuild:
+  jabber use flag is useless, since kdelibs depends on net-dns/libidn now
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdenetwork-3.3.0.ebuild:
+  stable on ppc64, bug #58227
+
+*kdenetwork-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0.ebuild,
+  kdenetwork-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdenetwork-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0_beta1.ebuild,
+  kdenetwork-3.3.0_rc2.ebuild:
+  remove _beta1, add _rc2
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.2.3-r1.ebuild:
+  Stable on hppa.
+
+*kdenetwork-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.3.0_beta2.ebuild:
+  new beta
+
+*kdenetwork-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org>
+  -kdenetwork-3.3.0_alpha1.ebuild, +kdenetwork-3.3.0_beta1.ebuild:
+  New beta, remove alphas
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdenetwork-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdenetwork-3.2.3-r1 (28 Jun 2004)
+
+  28 Jun 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3-r1.ebuild:
+  Add a patch for Yahoo brokenness (BUG #55193)
+
+  16 Jun 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.3.ebuild:
+  Re-added ~sparc keyword in relation to bug #54092.
+
+  16 Jun 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3.ebuild,
+  kdenetwork-3.3.0_alpha1.ebuild:
+  Add jabber and ssl use flags with deps
+
+*kdenetwork-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdenetwork-3.2.2.ebuild:
+  stable on amd64
+
+*kdenetwork-3.3.0_alpha1 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org>
+  +kdenetwork-3.3.0_alpha1.ebuild:
+  3.3alpha1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdenetwork-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdenetwork-3.2.2.ebuild:
+  Stable on ppc.
+
+  17 May 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.2.ebuild:
+  Add wlan use flag support
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.2.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.2.0.ebuild,
+  kdenetwork-3.2.1.ebuild:
+  Add inherit eutils
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdenetwork-3.0.5b.ebuild:
+  remove old version
+
+*kdenetwork-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdenetwork-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdenetwork-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild,
+  kdenetwork-3.2.1.ebuild:
+  x86 stable and version cleanup
+
+*kdenetwork-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.1.ebuild:
+  Version bump
+
+*kdenetwork-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdenetwork-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdenetwork-3.2.0.ebuild:
+  Marked ~ppc
+
+  04 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0.ebuild,
+  files/linuxwirelesswidget.cpp.diff:
+  Add a wifi detection patch
+
+*kdenetwork-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_rc1.ebuild,
+  files/kdenetwork-3.2.0_rc1.patch:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.1.5.ebuild:
+  stable on alpha and ia64
+
+  23 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_rc1.ebuild,
+  files/kdenetwork-3.2.0_rc1.patch:
+  A patch for compilation on amd64
+
+*kdenetwork-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.0.4-r1.ebuild,
+  kdenetwork-3.1.2.ebuild, kdenetwork-3.2.0_beta1.ebuild,
+  kdenetwork-3.2.0_beta2.ebuild, kdenetwork-3.2.0_rc1.ebuild:
+  New version, removing old versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdenetwork-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdenetwork-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdenetwork-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  27 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild,
+  kdenetwork-3.2.0_beta2.ebuild:
+  minor dep fixes
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta2.ebuild:
+  dependency fixes
+
+*kdenetwork-3.2.0_beta2 (02 Dec 2003)
+
+  02 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdenetwork-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdenetwork-3.1.4.ebuild:
+  Marked ppc
+
+*kdenetwork-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdenetwork-3.1.4.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-2.2.2-r2.ebuild,
+  kdenetwork-2.2.2-r2.ebuild, kdenetwork-3.1.1-r1.ebuild,
+  kdenetwork-3.1.1-r1.ebuild, kdenetwork-3.1.3.ebuild,
+  kdenetwork-3.1.3.ebuild, files/kdenetwork-3.1.1-kmail-sig.diff:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.4.ebuild:
+  Added sparc keyword.
+
+*kdenetwork-3.2.0_alpha2 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_alpha1.ebuild,
+  kdenetwork-3.2.0_alpha1.ebuild, kdenetwork-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild:
+  marking x86 stable
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.3.ebuild:
+  Marked stable for sparc.
+
+*kdenetwork-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.4.ebuild:
+  New version
+
+*kdenetwork-3.2.0_alpha1 (15 Sep 2003)
+
+  15 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.0_alpha1:
+  Version bump - add slp use flag support.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.1-r1.ebuild:
+  Marked for sparc to fix repoman dep issues.
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+*kdenetwork-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdenetwork-3.1.3.ebuild:
+  Version bump
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1, 3.1.1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdenetwork-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdenetwork-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdenetwork-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdenetwork-3.1.1-r1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdenetwork-3.1.1-r1 (19 Apr 2003)
+
+  19 Apr 2003; Dan Armak <danarmak@gentoo.org> Manifest,
+  kdenetwork-3.1.1-r1.ebuild, files/kdenetwork-3.1.1-kmail-sig.diff:
+  Added patch from kde cvs that fixes the kmail issue that caused gpg signatures
+  of messages with attachements to be broken.
+
+*kdenetwork-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdenetwork-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1.1.ebuild:
+  version bump
+
+  28 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1.ebuild,
+  files/kdenetwork-3.1-libxml2-2.5.2.diff: fix for >=libxml2-2.5.2, bug
+  #15245
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdenetwork-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdenetwork-3.1.ebuild:
+  Added ~alpha to keywords
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-2.2.2.ebuild,
+  kdenetwork-3.0.2.ebuild, kdenetwork-3.0.3.ebuild, kdenetwork-3.0.4.ebuild,
+  kdenetwork-3.1_rc6.ebuild: removed old ebuilds
+
+*kdenetwork-2.2.2-r2 (17 Jan 2003)
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdenetwork-3.1.ebuild:
+  added ~sparc to keywords
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-2.2.2-r2.ebuild:
+  new version, fixes #12520
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdenetwork-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdenetwork-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1_rc6.ebuild:
+  version bump
+
+*kdenetwork-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdenetwork-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdenetwork-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdenetwork-3.1.ebuild:
+  Added ppc keyword
+
+  02 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.1.ebuild:
+  added patch to compile on alpha
+
+*kdenetwork-3.0.4-r1 (14 Nov 2002)
+
+  14 Nov 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.4-r1.ebuild:
+  this fixes security bug #10707, thanks to n2uro@aol.com (Samuel Greenfeld)
+  for submission
+
+*kdenetwork-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdenetwork-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+  24 Oct 2002; Hannes Mehnert <hannes@gentoo.org> kdenetwork-3.0.2.ebuild,
+  kdenetwork-3.0.3.ebuild, kdenetwork-3.0.4.ebuild, kdenetwork-3.1_beta1.ebuild,
+  kdenetwork-3.1_beta2.ebuild: added dependency on kdebase (closes #9402)
+
+*kdenetwork-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdenetwork-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdenetwork-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : : : : : :
+
+  New stability release.
+
+*kdenetwork-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdenetwork-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdenetwork-3.0.1 (14 May 2002)
+
+  14 May 2002; Bart Verwilst <verwilst@gentoo.org> Changelog :
+
+  New bugfix-release.. Enjoy!
+
+*kdenetwork-3.0-r1 (11 May 2002)
+
+  11 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  
+  Added initscripts for lisa and reslisa, close bug #1230.
+
+*kdenetwork-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
+
+*kdenetwork-2.2.2-r1 (28 Mar 2002)
+
+  28 Mar 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
+  
+  Install reslisa suid root. Close bug #1231. Thanks to pardsbane for reporting.
 
 *kdenetwork-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 28ef96d726dd..be076f5c623a 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,19 +1,39 @@
-MD5 e6811a9b5e680cf30978893e6c7a2caf kdenetwork-3.0.5b.ebuild 968
-MD5 2855066433f32ebe500a93ea3b1d366c kdenetwork-2.2.2-r2.ebuild 603
-MD5 3eae1afd41911bfee40a760b1bf8568a kdenetwork-3.0.5a.ebuild 967
-MD5 ce60f0025c07b1748b3b6254be3858c2 kdenetwork-3.1.ebuild 920
-MD5 95f4cb6f88741690f2faf0d451ac7b01 kdenetwork-3.1.1.ebuild 876
-MD5 7ee307959ba5ec560a0ad4044842f832 kdenetwork-3.0.4-r1.ebuild 1058
-MD5 7b0a87fb752fed738c52c3ce41a4a4eb ChangeLog 4874
-MD5 8cfc35635879b3b4fc158d2efa9ec0bb files/lisa 559
-MD5 86ce22554d0bf8df52bc6fe7425184a3 files/reslisa 570
-MD5 5eff7873bc0ddc7248a5c0a3d44ba2db files/digest-kdenetwork-2.2.2-r2 139
-MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 94476c75e583bcf4e21c7f3f4e9b75be ChangeLog 23212
+MD5 c6db44a9df98a9927235b28065adb065 files/digest-kdenetwork-3.3.2-r2 149
+MD5 7e1dab8dea5082d73c25c6ae6b4251b1 files/digest-kdenetwork-3.4.1-r1 149
+MD5 a4f0ff59ade2b98019bd0968a4615141 files/digest-kdenetwork-3.4.2 70
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kdenetwork-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdenetwork-3.5.0 70
+MD5 a3e74a75bc237f21ad90ded82284deba files/digest-kdenetwork-3.5.0_beta2 71
+MD5 759135b358d9f2f0d66de768f709cdc4 files/digest-kdenetwork-3.5.0_rc1 74
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kdenetwork-3.5_beta1 71
+MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
+MD5 cb87d2a81f7430f823e9173c3f478523 files/kdenetwork-3.3.2-kopete-msn.patch 34696
+MD5 e07566eb35cec7afdfa2e38edf7cdcd1 files/kdenetwork-3.3.2-kwifimanager-configlocation.patch 720
+MD5 e9d8998d39d625a80749a027a9a8e303 files/kdenetwork-3.4-configure.patch 5768
+MD5 18a84d8db7a6c95643f1de61e3c4c783 files/kdenetwork-3.5_beta1-gadu.patch 1876
+MD5 db3c7f3cc040e55e195767191491acaa files/kopete-3.5.0_rc1-fix.patch 709
+MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
-MD5 450c5fbda500f395c2514d2fb8f6a5b4 files/kdenetwork-3.1-libxml2-2.5.2.diff 559
-MD5 c97042204651bd92a0d0ccff4d6d0467 files/digest-kdenetwork-3.0.5a 71
-MD5 f0c248642c03c33f830bdab6c2114aee files/digest-kdenetwork-3.0.5b 522
-MD5 fd9d0a9e3a15f685d5368343cae44daa files/digest-kdenetwork-3.0.4-r1 151
-MD5 fa71bfa7d91dfad1c95002f15bbefa6a files/kdenetwork-3.1-alpha.diff 533
-MD5 efb32a414366975251ba09b9bb40c1b1 files/digest-kdenetwork-3.1 68
-MD5 9ffa1c32d0e67edf1ea46483e02ceb91 files/digest-kdenetwork-3.1.1 70
+MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
+MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
+MD5 426360bf289efe11a499f1fa89bb2f4b files/wireless-extensions-api.diff 528
+MD5 c7193df16ddf0b66963e907f864b3f56 kdenetwork-3.3.2-r2.ebuild 1642
+MD5 703982710ee8234b723875536043674f kdenetwork-3.4.1-r1.ebuild 1714
+MD5 f01a7eb66338a4264475bdd11347ac4b kdenetwork-3.4.2.ebuild 1794
+MD5 383d9694b2530580af3e9b966642a1a7 kdenetwork-3.4.3.ebuild 1760
+MD5 e51a0406a9fffcec777d684f05ef738f kdenetwork-3.5.0.ebuild 1655
+MD5 f5d41dc956a7a06750e6f3e81d18561b kdenetwork-3.5.0_beta2.ebuild 1654
+MD5 00b1aa1c21079fa6996ea866372457df kdenetwork-3.5.0_rc1.ebuild 1761
+MD5 ca35495beca57dcdee437d03007c0a86 kdenetwork-3.5_beta1.ebuild 1781
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhubSntT9W3vfTuoRAh3MAJ9MKFlDOrtjZFEWZLS7qRv+nw+xVQCfRQsZ
+Zjznu5c02ubvt5cMaGBMV+4=
+=0w5e
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch b/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch
index bc8e7456e805..277b307ab2c7 100644
--- a/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch
+++ b/kde-base/kdenetwork/files/kdenetwork-3.3.2-kopete-msn.patch
@@ -1,771 +1,83 @@
-diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.am kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am
---- kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.am	2004-06-25 11:10:14.000000000 +0200
-+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am	2005-05-22 19:35:27.000000000 +0200
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.am
+--- kdenetwork-3.3.2/kopete/protocols/msn/Makefile.am	2004-06-25 12:10:14.000000000 +0300
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.am	2005-05-21 14:06:36.000000000 +0300
 @@ -1,3 +1,4 @@
-+KDE_OPTIONS = nofinal 
++KDE_OPTIONS = nofinal
  METASOURCES = AUTO
  SUBDIRS = ui . icons config
  AM_CPPFLAGS = -I$(srcdir)/ui \
-@@ -11,8 +12,8 @@
- CLEANFILES = dummy.cpp
+@@ -12,7 +13,8 @@
  
  libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \
--	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
+ 	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
 -	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp
-+	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp \
-+	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp 
++	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp \
++	sslloginhandler.cpp
  
  libkopete_msn_shared_la_LIBADD  = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO)
  libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries)
-diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in
---- kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in	2004-11-29 16:24:54.000000000 +0100
-+++ kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in	2005-05-22 19:57:41.000000000 +0200
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.9.1 from Makefile.am.
-+# Makefile.in generated by automake 1.7.9 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 1.1 $ 
- # @configure_input@
- 
--# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004  Free Software Foundation, Inc.
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-+# Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,9 +15,6 @@
- 
- @SET_MAKE@
- 
--
--SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES)
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -25,6 +22,7 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
-+
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -41,97 +39,6 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
--subdir = kopete/protocols/msn
--DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in TODO
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
--	$(top_srcdir)/configure.in
--am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
--	$(ACLOCAL_M4)
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
--am__vpath_adj = case $$p in \
--    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
--    *) f=$$p;; \
--  esac;
--am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
--am__installdirs = "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" \
--	"$(DESTDIR)$(mydatadir)" "$(DESTDIR)$(servicedir)"
--kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
--libLTLIBRARIES_INSTALL = $(INSTALL)
--LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
--kopete_msn_la_DEPENDENCIES = libkopete_msn_shared.la
--am_kopete_msn_la_OBJECTS = dummy.lo
--#>- kopete_msn_la_OBJECTS = $(am_kopete_msn_la_OBJECTS)
--#>+ 1
--kopete_msn_la_OBJECTS = dummy.lo
--am__DEPENDENCIES_1 =
--libkopete_msn_shared_la_DEPENDENCIES = ./ui/libkopetemsnui.la \
--	../../libkopete/libkopete.la $(am__DEPENDENCIES_1)
--am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
--	msnaddcontactpage.lo msncontact.lo msnsocket.lo \
--	msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
--	msnswitchboardsocket.lo msnfiletransfersocket.lo \
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.in
+--- kdenetwork-3.3.2/kopete/protocols/msn/Makefile.in	2004-11-29 17:24:54.000000000 +0200
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/Makefile.in	2005-05-21 14:21:28.000000000 +0300
+@@ -74,18 +74,15 @@
+ 	msnaddcontactpage.lo msncontact.lo msnsocket.lo \
+ 	msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
+ 	msnswitchboardsocket.lo msnfiletransfersocket.lo \
 -	msninvitation.lo msnp2p.lo sha1.lo
--#>- libkopete_msn_shared_la_OBJECTS =  \
--#>- 	$(am_libkopete_msn_shared_la_OBJECTS)
++	msninvitation.lo msnp2p.lo sha1.lo sslloginhandler.lo
+ #>- libkopete_msn_shared_la_OBJECTS =  \
+ #>- 	$(am_libkopete_msn_shared_la_OBJECTS)
 -#>+ 8
 -libkopete_msn_shared_la_final_OBJECTS = libkopete_msn_shared_la.all_cpp.lo 
 -libkopete_msn_shared_la_nofinal_OBJECTS = msnprotocol.lo msnaccount.lo \
--	msnaddcontactpage.lo msncontact.lo msnsocket.lo \
--	msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
--	msnswitchboardsocket.lo msnfiletransfersocket.lo \
++#>+ 5
++libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
+ 	msnaddcontactpage.lo msncontact.lo msnsocket.lo \
+ 	msnmessagemanager.lo msndebugrawcmddlg.lo msnnotifysocket.lo \
+ 	msnswitchboardsocket.lo msnfiletransfersocket.lo \
 -	msninvitation.lo msnp2p.lo sha1.lo
 -@KDE_USE_FINAL_FALSE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_nofinal_OBJECTS)
 -@KDE_USE_FINAL_TRUE@libkopete_msn_shared_la_OBJECTS = $(libkopete_msn_shared_la_final_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
--depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
--am__depfiles_maybe = depfiles
--#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 2
--CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
--	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
--#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
--#>+ 3
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
--CXXLD = $(CXX)
--#>- CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
--#>- 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--#>+ 2
--CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) \
--	$(CXXFLAGS) $(KDE_CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
--SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES)
--DIST_SOURCES = $(kopete_msn_la_SOURCES) \
--	$(libkopete_msn_shared_la_SOURCES)
--#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
--#>- 	html-recursive info-recursive install-data-recursive \
--#>- 	install-exec-recursive install-info-recursive \
--#>- 	install-recursive installcheck-recursive installdirs-recursive \
--#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
--#>- 	uninstall-recursive
--#>+ 6
--RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
--	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive nmcheck-recursive bcheck-recursive
--mydataDATA_INSTALL = $(INSTALL_DATA)
--serviceDATA_INSTALL = $(INSTALL_DATA)
--DATA = $(mydata_DATA) $(service_DATA)
--ETAGS = etags
--CTAGS = ctags
--DIST_SUBDIRS = $(SUBDIRS)
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -320,8 +227,6 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
--am__tar = @am__tar@
--am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -407,7 +312,6 @@
- librss_SUBDIR_included_TRUE = @librss_SUBDIR_included_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
--mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -428,6 +332,7 @@
++	msninvitation.lo msnp2p.lo sha1.lo sslloginhandler.lo
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
+ am__depfiles_maybe = depfiles
+@@ -428,6 +425,7 @@
  xdg_appsdir = @xdg_appsdir@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
-+KDE_OPTIONS = nofinal 
++KDE_OPTIONS = nofinal
  #>- METASOURCES = AUTO
  SUBDIRS = ui . icons config
  AM_CPPFLAGS = -I$(srcdir)/ui \
-@@ -435,125 +340,197 @@
- 	$(KOPETE_INCLUDES) \
- 	$(all_includes)
- 
-+
- kde_module_LTLIBRARIES = kopete_msn.la
- lib_LTLIBRARIES = libkopete_msn_shared.la
-+
+@@ -440,7 +438,8 @@
  CLEANFILES = dummy.cpp
-+
  libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp msnaddcontactpage.cpp msncontact.cpp \
--	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
+ 	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp \
 -	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp
-+	msnsocket.cpp msnmessagemanager.cpp msndebugrawcmddlg.cpp sslloginhandler.cpp \
-+	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp 
-+
++	msnnotifysocket.cpp msnswitchboardsocket.cpp msnfiletransfersocket.cpp msninvitation.cpp msnp2p.cpp sha1.cpp \
++	sslloginhandler.cpp
  
  libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(LIB_KIO)
  #>- libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries)
- #>+ 1
- libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(KDE_NO_UNDEFINED) $(all_libraries)
-+
- kopete_msn_la_SOURCES = dummy.cpp
- kopete_msn_la_LIBADD = libkopete_msn_shared.la
-+
- #>- kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
- #>+ 1
- kopete_msn_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFINED) -module $(KDE_PLUGIN) $(all_libraries)
-+
- service_DATA = kopete_msn.desktop
- servicedir = $(kde_servicesdir)
-+
- mydatadir = $(kde_datadir)/kopete_msn
- mydata_DATA = msnchatui.rc
-+subdir = kopete/protocols/msn
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(kde_module_LTLIBRARIES) $(lib_LTLIBRARIES)
-+
-+kopete_msn_la_DEPENDENCIES = libkopete_msn_shared.la
-+am_kopete_msn_la_OBJECTS = dummy.lo
-+#>- kopete_msn_la_OBJECTS = $(am_kopete_msn_la_OBJECTS)
-+#>+ 1
-+kopete_msn_la_OBJECTS = dummy.lo
-+libkopete_msn_shared_la_DEPENDENCIES = ./ui/libkopetemsnui.la \
-+	../../libkopete/libkopete.la
-+am_libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
-+	msnaddcontactpage.lo msncontact.lo msnsocket.lo \
-+	msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \
-+	msnnotifysocket.lo msnswitchboardsocket.lo \
-+	msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo
-+#>- libkopete_msn_shared_la_OBJECTS = $(am_libkopete_msn_shared_la_OBJECTS)
-+#>+ 5
-+libkopete_msn_shared_la_OBJECTS = msnprotocol.lo msnaccount.lo \
-+	msnaddcontactpage.lo msncontact.lo msnsocket.lo \
-+	msnmessagemanager.lo msndebugrawcmddlg.lo sslloginhandler.lo \
-+	msnnotifysocket.lo msnswitchboardsocket.lo \
-+	msnfiletransfersocket.lo msninvitation.lo msnp2p.lo sha1.lo
-+
-+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
-+depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
-+am__depfiles_maybe = depfiles
-+#>- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/msnaccount.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnaddcontactpage.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msncontact.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msndebugrawcmddlg.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnfiletransfersocket.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msninvitation.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnmessagemanager.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnnotifysocket.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnp2p.Plo ./$(DEPDIR)/msnprotocol.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnsocket.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/msnswitchboardsocket.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/sha1.Plo \
-+#>- @AMDEP_TRUE@	./$(DEPDIR)/sslloginhandler.Plo
-+#>+ 13
-+@AMDEP_TRUE@DEP_FILES =  ./$(DEPDIR)/dummy.Plo ./$(DEPDIR)/msnaccount.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnaddcontactpage.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msncontact.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msndebugrawcmddlg.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnfiletransfersocket.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msninvitation.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnmessagemanager.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnnotifysocket.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnp2p.Plo ./$(DEPDIR)/msnprotocol.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnsocket.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/msnswitchboardsocket.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/sha1.Plo \
-+@AMDEP_TRUE@	@AMDEP_TRUE@	./$(DEPDIR)/sslloginhandler.Plo
-+#>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+#>- 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 2
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+#>- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-+#>- 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+#>- 	$(AM_CXXFLAGS) $(CXXFLAGS)
-+#>+ 3
-+LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(DEFS) \
-+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS)
-+CXXLD = $(CXX)
-+#>- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
-+#>- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+#>+ 2
-+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(KDE_CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+DIST_SOURCES = $(kopete_msn_la_SOURCES) \
-+	$(libkopete_msn_shared_la_SOURCES)
-+DATA = $(mydata_DATA) $(service_DATA)
-+
-+
-+#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-+#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
-+#>- 	all-recursive install-data-recursive install-exec-recursive \
-+#>- 	installdirs-recursive install-recursive uninstall-recursive \
-+#>- 	check-recursive installcheck-recursive
-+#>+ 5
-+RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-+	ps-recursive install-info-recursive uninstall-info-recursive \
-+	all-recursive install-data-recursive install-exec-recursive \
-+	installdirs-recursive install-recursive uninstall-recursive \
-+	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
-+DIST_COMMON = $(srcdir)/Makefile.in Makefile.am TODO
-+DIST_SUBDIRS = $(SUBDIRS)
-+SOURCES = $(kopete_msn_la_SOURCES) $(libkopete_msn_shared_la_SOURCES)
-+
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
- .SUFFIXES: .cpp .lo .o .obj
--$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
--#>- 	@for dep in $?; do \
--#>- 	  case '$(am__configure_deps)' in \
--#>- 	    *$$dep*) \
--#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--#>- 		&& exit 0; \
--#>- 	      exit 1;; \
--#>- 	  esac; \
--#>- 	done; \
--#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kopete/protocols/msn/Makefile'; \
-+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --foreign  kopete/protocols/msn/Makefile
--#>+ 12
--	@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kopete/protocols/msn/Makefile'; \
-+#>- 	  $(AUTOMAKE) --gnu  kopete/protocols/msn/Makefile
-+#>+ 3
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign  kopete/protocols/msn/Makefile
-+	  $(AUTOMAKE) --gnu  kopete/protocols/msn/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kopete/protocols/msn/Makefile.in
--.PRECIOUS: Makefile
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
--	@case '$?' in \
--	  *config.status*) \
--	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
--	  *) \
--	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
--	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
--	esac;
--
--$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--
--$(top_srcdir)/configure:  $(am__configure_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
--$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
--	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+kde_moduleLTLIBRARIES_INSTALL = $(INSTALL)
- install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(kde_moduledir)" || $(mkdir_p) "$(DESTDIR)$(kde_moduledir)"
-+	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir)
- 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(kde_moduledir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(kde_moduledir)/$$f"; \
-+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	    echo " $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f"; \
-+	    $(LIBTOOL) --mode=install $(kde_moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(kde_moduledir)/$$f; \
- 	  else :; fi; \
- 	done
- 
- uninstall-kde_moduleLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
--	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(kde_moduledir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(kde_moduledir)/$$p"; \
-+	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
-+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(kde_moduledir)/$$p; \
- 	done
- 
- clean-kde_moduleLTLIBRARIES:
- 	-test -z "$(kde_module_LTLIBRARIES)" || rm -f $(kde_module_LTLIBRARIES)
- 	@list='$(kde_module_LTLIBRARIES)'; for p in $$list; do \
- 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
--	  test "$$dir" != "$$p" || dir=.; \
-+	  test "$$dir" = "$$p" && dir=.; \
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
-+libLTLIBRARIES_INSTALL = $(INSTALL)
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    f=$(am__strip_dir) \
--	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
--	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
-+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
- 	  else :; fi; \
- 	done
- 
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  p=$(am__strip_dir) \
--	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
--	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
- 	done
- 
- clean-libLTLIBRARIES:
- 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
--	  test "$$dir" != "$$p" || dir=.; \
-+	  test "$$dir" = "$$p" && dir=.; \
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
-@@ -569,7 +546,7 @@
- 	$(CXXLINK) -rpath $(libdir) $(libkopete_msn_shared_la_LDFLAGS) $(libkopete_msn_shared_la_OBJECTS) $(libkopete_msn_shared_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--	-rm -f *.$(OBJEXT)
-+	-rm -f *.$(OBJEXT) core *.core
- 
- distclean-compile:
- 	-rm -f *.tab.c
-@@ -588,27 +565,40 @@
+@@ -588,6 +587,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnsocket.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msnswitchboardsocket.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Plo@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sslloginhandler.Plo@am__quote@
  
  .cpp.o:
--@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
- .cpp.obj:
--@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
--@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
- 
- .cpp.lo:
--@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-+@am__fastdepCXX_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-+@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
-+@am__fastdepCXX_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-+@am__fastdepCXX_TRUE@	fi
- @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
-+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+@am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -619,39 +609,41 @@
- distclean-libtool:
- 	-rm -f libtool
- uninstall-info-am:
-+mydataDATA_INSTALL = $(INSTALL_DATA)
- install-mydataDATA: $(mydata_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(mydatadir)" || $(mkdir_p) "$(DESTDIR)$(mydatadir)"
-+	$(mkinstalldirs) $(DESTDIR)$(mydatadir)
- 	@list='$(mydata_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(mydataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(mydatadir)/$$f'"; \
--	  $(mydataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(mydatadir)/$$f"; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " $(mydataDATA_INSTALL) $$d$$p $(DESTDIR)$(mydatadir)/$$f"; \
-+	  $(mydataDATA_INSTALL) $$d$$p $(DESTDIR)$(mydatadir)/$$f; \
- 	done
- 
- uninstall-mydataDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(mydata_DATA)'; for p in $$list; do \
--	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(mydatadir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(mydatadir)/$$f"; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " rm -f $(DESTDIR)$(mydatadir)/$$f"; \
-+	  rm -f $(DESTDIR)$(mydatadir)/$$f; \
- 	done
-+serviceDATA_INSTALL = $(INSTALL_DATA)
- install-serviceDATA: $(service_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
-+	$(mkinstalldirs) $(DESTDIR)$(servicedir)
- 	@list='$(service_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
--	  f=$(am__strip_dir) \
--	  echo " $(serviceDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(servicedir)/$$f'"; \
--	  $(serviceDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(servicedir)/$$f"; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " $(serviceDATA_INSTALL) $$d$$p $(DESTDIR)$(servicedir)/$$f"; \
-+	  $(serviceDATA_INSTALL) $$d$$p $(DESTDIR)$(servicedir)/$$f; \
- 	done
- 
- uninstall-serviceDATA:
- 	@$(NORMAL_UNINSTALL)
- 	@list='$(service_DATA)'; for p in $$list; do \
--	  f=$(am__strip_dir) \
--	  echo " rm -f '$(DESTDIR)$(servicedir)/$$f'"; \
--	  rm -f "$(DESTDIR)$(servicedir)/$$f"; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " rm -f $(DESTDIR)$(servicedir)/$$f"; \
-+	  rm -f $(DESTDIR)$(servicedir)/$$f; \
- 	done
- 
- # This directory's subdirectories are mostly independent; you can cd
-@@ -713,6 +705,14 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+CTAGS = ctags
-+CTAGSFLAGS =
-+
-+tags: TAGS
-+
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -721,22 +721,19 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
--tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	if (etags --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
--	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
--	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test ! -f $$subdir/TAGS || \
-+	    test -f $$subdir/TAGS && \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -746,11 +743,10 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
--	  test -n "$$unique" || unique=$$empty_fix; \
--	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	    $$tags $$unique; \
--	fi
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -773,6 +769,12 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+
-+top_distdir = ../../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -786,7 +788,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -801,17 +803,15 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
- 	    || exit 1; \
--	    distdir=`$(am__cd) $(distdir) && pwd`; \
--	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$$top_distdir" \
--	        distdir="$$distdir/$$subdir" \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -821,9 +821,8 @@
- all-am: Makefile $(LTLIBRARIES) $(DATA)
- installdirs: installdirs-recursive
- installdirs-am:
--	for dir in "$(DESTDIR)$(kde_moduledir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(mydatadir)" "$(DESTDIR)$(servicedir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
--	done
-+	$(mkinstalldirs) $(DESTDIR)$(kde_moduledir) $(DESTDIR)$(libdir) $(DESTDIR)$(mydatadir) $(DESTDIR)$(servicedir)
-+
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -844,7 +843,7 @@
- 	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
- 
- distclean-generic:
--	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -853,11 +852,11 @@
- #>+ 1
- clean: kde-rpo-clean  clean-recursive
- 
--#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
--#>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
-+#>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \
-+#>- 	clean-libtool mostlyclean-am
+ @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+@@ -856,7 +856,7 @@
+ #>- clean-am: clean-generic clean-kde_moduleLTLIBRARIES \
+ #>- 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
  #>+ 2
 -clean-am: clean-metasources clean-closures clean-bcheck clean-final  clean-generic clean-kde_moduleLTLIBRARIES \
--	clean-libLTLIBRARIES clean-libtool mostlyclean-am
-+clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \
-+	clean-libtool mostlyclean-am
++clean-am: clean-metasources clean-closures clean-bcheck  clean-generic clean-kde_moduleLTLIBRARIES \
+ 	clean-libLTLIBRARIES clean-libtool mostlyclean-am
  
  distclean: distclean-recursive
- 	-rm -rf ./$(DEPDIR)
-@@ -869,8 +868,6 @@
- 
- dvi-am:
- 
--html: html-recursive
--
- info: info-recursive
- 
- info-am:
-@@ -915,23 +912,27 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-kde_moduleLTLIBRARIES \
--	clean-libLTLIBRARIES clean-libtool clean-recursive ctags \
--	ctags-recursive distclean distclean-compile distclean-generic \
--	distclean-libtool distclean-recursive distclean-tags distdir \
--	dvi dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-kde_moduleLTLIBRARIES \
--	install-libLTLIBRARIES install-man install-mydataDATA \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-+	clean-generic clean-kde_moduleLTLIBRARIES clean-libLTLIBRARIES \
-+	clean-libtool clean-recursive ctags ctags-recursive distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive \
-+	install-kde_moduleLTLIBRARIES install-libLTLIBRARIES \
-+	install-man install-mydataDATA install-recursive \
- 	install-serviceDATA install-strip installcheck installcheck-am \
--	installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
--	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-info-am \
--	uninstall-kde_moduleLTLIBRARIES uninstall-libLTLIBRARIES \
--	uninstall-mydataDATA uninstall-serviceDATA
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
-+	tags-recursive uninstall uninstall-am uninstall-info-am \
-+	uninstall-info-recursive uninstall-kde_moduleLTLIBRARIES \
-+	uninstall-libLTLIBRARIES uninstall-mydataDATA \
-+	uninstall-recursive uninstall-serviceDATA
- 
- 
- dummy.cpp: $(srcdir)/Makefile.am
-@@ -965,18 +966,18 @@
- mocs: msnmessagemanager.moc
- 
- #>+ 3
--msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
--	$(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
-+msncontact.moc: $(srcdir)/msncontact.h
-+	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
- 
- #>+ 2
--mocs: msnfiletransfersocket.moc
-+mocs: msncontact.moc
- 
- #>+ 3
--msncontact.moc: $(srcdir)/msncontact.h
--	$(MOC) $(srcdir)/msncontact.h -o msncontact.moc
-+msnfiletransfersocket.moc: $(srcdir)/msnfiletransfersocket.h
-+	$(MOC) $(srcdir)/msnfiletransfersocket.h -o msnfiletransfersocket.moc
- 
- #>+ 2
--mocs: msncontact.moc
-+mocs: msnfiletransfersocket.moc
- 
- #>+ 3
- msnprotocol.moc: $(srcdir)/msnprotocol.h
-@@ -986,6 +987,13 @@
+@@ -986,6 +986,13 @@
  mocs: msnprotocol.moc
  
  #>+ 3
@@ -779,7 +91,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.
  msnaccount.moc: $(srcdir)/msnaccount.h
  	$(MOC) $(srcdir)/msnaccount.h -o msnaccount.moc
  
-@@ -1000,18 +1008,18 @@
+@@ -1000,18 +1007,18 @@
  mocs: msnsocket.moc
  
  #>+ 3
@@ -804,43 +116,20 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.
  
  #>+ 3
  msnp2p.moc: $(srcdir)/msnp2p.h
-@@ -1038,10 +1046,10 @@
+@@ -1038,10 +1045,10 @@
  
  #>+ 3
  clean-metasources:
 -	-rm -f  msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc msnaccount.moc msnsocket.moc msnnotifysocket.moc msnswitchboardsocket.moc msnp2p.moc msnaddcontactpage.moc
-+	-rm -f  msndebugrawcmddlg.moc msnmessagemanager.moc msncontact.moc msnfiletransfersocket.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
++	-rm -f  msndebugrawcmddlg.moc msnmessagemanager.moc msnfiletransfersocket.moc msncontact.moc msnprotocol.moc sslloginhandler.moc msnaccount.moc msnsocket.moc msnswitchboardsocket.moc msnnotifysocket.moc msnp2p.moc msnaddcontactpage.moc
  
  #>+ 2
 -KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h Makefile.am 
-+KDE_DIST=kopete_msn.desktop msncontact.h msnp2p.h msnmessagemanager.h msnchatui.rc Changelog msnsocket.h ReleaseNotes msndebugrawcmddlg.h msnaccount.h msnfiletransfersocket.h sha1.h sslloginhandler.h msninvitation.h Makefile.in msnswitchboardsocket.h msnprotocol.h msnnotifysocket.h msnaddcontactpage.h 
++KDE_DIST=msndebugrawcmddlg.h kopete_msn.desktop msncontact.h msnaccount.h msnp2p.h msnfiletransfersocket.h sha1.h msnmessagemanager.h msnchatui.rc sslloginhandler.h msninvitation.h Makefile.in Changelog msnswitchboardsocket.h msnsocket.h msnprotocol.h msnnotifysocket.h ReleaseNotes msnaddcontactpage.h Makefile.am 
  
  #>+ 3
  clean-closures:
-@@ -1050,19 +1058,10 @@
- #>+ 2
- docs-am:
- 
--#>+ 15
-+#>+ 6
- force-reedit:
--		@for dep in $?; do \
--	  case '$(am__configure_deps)' in \
--	    *$$dep*) \
--	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
--		&& exit 0; \
--	      exit 1;; \
--	  esac; \
--	done; \
--	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  kopete/protocols/msn/Makefile'; \
--	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign  kopete/protocols/msn/Makefile
-+		cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  kopete/protocols/msn/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit kopete/protocols/msn/Makefile.in
- 
- 
-@@ -1088,37 +1087,21 @@
+@@ -1088,37 +1095,21 @@
  	done
  
  
@@ -882,7 +171,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.
  
  #>+ 3
  cvs-clean:
-@@ -1128,7 +1111,7 @@
+@@ -1128,7 +1119,7 @@
  kde-rpo-clean:
  	-rm -f *.rpo
  
@@ -891,7 +180,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.
  msnnotifysocket.lo: msnnotifysocket.moc 
  msnprotocol.lo: msnprotocol.moc 
  msncontact.o: msncontact.moc 
-@@ -1139,17 +1122,19 @@
+@@ -1139,17 +1130,19 @@
  msnmessagemanager.lo: msnmessagemanager.moc 
  msndebugrawcmddlg.o: msndebugrawcmddlg.moc 
  msnsocket.lo: msnsocket.moc 
@@ -913,9 +202,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/Makefile.in kdenetwork-3.3.
  msnaddcontactpage.lo: msnaddcontactpage.moc 
  msnp2p.o: msnp2p.moc 
  msnfiletransfersocket.lo: msnfiletransfersocket.moc 
-diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp
---- kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp	2004-08-05 21:26:24.000000000 +0200
-+++ kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp	2005-05-22 19:35:27.000000000 +0200
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.cpp
+--- kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.cpp	2004-08-05 22:26:24.000000000 +0300
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.cpp	2005-05-19 23:40:15.000000000 +0300
 @@ -23,6 +23,7 @@
  #include "msnnotifysocket.h"
  #include "msncontact.h"
@@ -924,23 +213,26 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw
  
  #include <qregexp.h>
  
-@@ -47,6 +48,7 @@
+@@ -47,7 +48,8 @@
  : MSNSocket( account )
  {
  	m_newstatus = MSNProtocol::protocol()->NLN;
+-	
 +	m_sslLoginHandler=0l;
- 	
++
  	m_isHotmailAccount=false;
  	m_ping=false;
-@@ -67,6 +69,7 @@
+ 
+@@ -66,7 +68,7 @@
+ 
  MSNNotifySocket::~MSNNotifySocket()
  {
- 	delete m_tmpMailFile;
+-	delete m_tmpMailFile;
 +	delete m_sslLoginHandler;
  	kdDebug(14140) << k_funcinfo << endl;
  }
  
-@@ -246,7 +249,7 @@
+@@ -246,7 +248,7 @@
  	
  	if ( cmd == "VER" )
  	{
@@ -949,7 +241,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw
  /*
  		struct utsname utsBuf;
  		uname ( &utsBuf );
-@@ -264,27 +267,16 @@
+@@ -264,26 +266,15 @@
  	{
  		if( data.section( ' ', 1, 1 ) == "S" )
  		{
@@ -980,17 +272,14 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw
 -			// This should force kio to download the page even is we are in the konqueror offline mode.  [see bug #68483]
 -			job->addMetaData("cache", "reload");
 -			QObject::connect( job, SIGNAL(result( KIO::Job *)), this, SLOT(slotAuthJobDone( KIO::Job *)) );
--		}
 +			m_sslLoginHandler->login( data.section( ' ' , 2 , 2 ), m_account->accountId() , m_password );
-+  		}
+ 		}
  		else
  		{
- 			// Successful auth
-@@ -569,77 +561,22 @@
- 	}
+@@ -570,76 +561,20 @@
  }
  
--
+ 
 -void MSNNotifySocket::slotAuthJobDataReceived ( KIO::Job */*job*/,const  QByteArray &data)
 +void MSNNotifySocket::sslLoginFailed()
  {
@@ -998,7 +287,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw
 -//	kdDebug(14140) << "MSNNotifySocket::slotAuthJobDataReceived: " << data << endl;
 +	disconnect();
  }
- 
+-
 -void MSNNotifySocket::slotAuthJobDone ( KIO::Job *job)
 +void MSNNotifySocket::sslLoginIncorrect()
  {
@@ -1060,13 +349,13 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw
 -
 -		QRegExp rx(/*URL=http://memberservices.passport.net/memberservice.srf*/"\\?did=[0-9]*&(t=[0-9A-Za-z!$*]*&p=[0-9A-Za-z!$*]*)\"");
 -		rx.search(m_authData);
-+	m_badPassword = true;
-+	disconnect();
-+}
- 
+-
 -		m_badPassword=true;  //if this disconnect, that mean the password was bad
 -		sendCommand("USR" , "TWN S " + rx.cap(1));
 -	}
++	m_badPassword = true;
++	disconnect();
++}
 +void MSNNotifySocket::sslLoginSucceeded(QString a)
 +{
 +	sendCommand("USR" , "TWN S " + a);
@@ -1075,9 +364,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.cpp kdenetw
  }
  
  
-diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h
---- kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h	2004-06-25 11:10:14.000000000 +0200
-+++ kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h	2005-05-22 19:35:27.000000000 +0200
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.h
+--- kdenetwork-3.3.2/kopete/protocols/msn/msnnotifysocket.h	2004-06-25 12:10:14.000000000 +0300
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnnotifysocket.h	2005-05-19 23:37:35.000000000 +0300
 @@ -29,6 +29,7 @@
  class MSNDispatchSocket;
  class MSNAccount;
@@ -1086,11 +375,10 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor
  
  #include <kio/job.h>
  
-@@ -137,9 +138,9 @@
- 	void slotResetKeepAlive();
+@@ -138,8 +139,9 @@
+ 
  
  
--
 -	void slotAuthJobDataReceived ( KIO::Job *, const QByteArray &data);
 -	void slotAuthJobDone ( KIO::Job *);
 +	void sslLoginFailed();
@@ -1099,7 +387,7 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor
  
  
  private:
-@@ -171,7 +172,7 @@
+@@ -171,7 +173,7 @@
  	QString m_kv;
  	QString m_sid;
  	QString m_loginTime;
@@ -1108,9 +396,21 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/msnnotifysocket.h kdenetwor
  
  	QTimer *m_keepaliveTimer;
  
-diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp
---- kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp	2005-05-22 19:35:27.000000000 +0200
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/msnsocket.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/msnsocket.cpp
+--- kdenetwork-3.3.2/kopete/protocols/msn/msnsocket.cpp	2004-10-03 10:43:34.000000000 +0300
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/msnsocket.cpp	2005-05-19 23:41:29.000000000 +0300
+@@ -133,7 +133,7 @@
+ 
+ void MSNSocket::slotSocketError( int error )
+ {
+-	kdDebug( 14140 ) << k_funcinfo << "Error: " << error << endl;
++	kdWarning( 14140 ) << k_funcinfo << "Error: " << error << " (" << m_socket->errorString() << ")" << endl;
+ 
+ 	QString errormsg = i18n( "There was an error while connecting to the MSN server.\nError message:\n" );
+ 	if ( error == KSocketBase::LookupFailure )
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.cpp
+--- kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.cpp	1970-01-01 03:00:00.000000000 +0300
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.cpp	2005-05-19 18:10:06.000000000 +0300
 @@ -0,0 +1,453 @@
 +//Imported from KMess (2005-05-19)
 +
@@ -1565,9 +865,9 @@ diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.cpp kdenetw
 +  }
 +}
 +
-diff -Nur kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.h kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h
---- kdenetwork-3.3.2.orig/kopete/protocols/msn/sslloginhandler.h	1970-01-01 01:00:00.000000000 +0100
-+++ kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h	2005-05-22 19:35:27.000000000 +0200
+diff -U3 -r --new-file kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.h
+--- kdenetwork-3.3.2/kopete/protocols/msn/sslloginhandler.h	1970-01-01 03:00:00.000000000 +0300
++++ kdenetwork-3.3.2-new/kopete/protocols/msn/sslloginhandler.h	2005-05-19 18:10:06.000000000 +0300
 @@ -0,0 +1,96 @@
 +//Imported from KMess  - 2005-05-19
 +
diff --git a/kde-base/kdenetwork/files/lisa b/kde-base/kdenetwork/files/lisa
index 3c5749f16743..f252b2b39257 100644
--- a/kde-base/kdenetwork/files/lisa
+++ b/kde-base/kdenetwork/files/lisa
@@ -1,24 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/lisa,v 1.1 2002/05/13 07:59:56 danarmak Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/lisa,v 1.1.1.1 2005/11/30 10:13:34 chriswhite Exp $
 
 depend() {
     use net
 }
 
 start() {
-
     ebegin "Starting lisa"
     start-stop-daemon --start -x _KDEDIR_/bin/lisa -q -- $LISACONF 1>/dev/null
     eend $? "Failed to start lisa"
-
 }
 
 stop() {
-
     ebegin "Stopping lisa"
     start-stop-daemon --stop -x _KDEDIR_/bin/lisa -q
     eend $? "Failed to stop lisa"
-
 }
diff --git a/kde-base/kdenetwork/files/reslisa b/kde-base/kdenetwork/files/reslisa
index 54c156230417..aad0850ffa63 100644
--- a/kde-base/kdenetwork/files/reslisa
+++ b/kde-base/kdenetwork/files/reslisa
@@ -1,24 +1,20 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/reslisa,v 1.1 2002/05/13 07:59:56 danarmak Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/files/reslisa,v 1.1.1.1 2005/11/30 10:13:34 chriswhite Exp $
 
 depend() {
     use net
 }
 
 start() {
-
     ebegin "Starting reslisa"
     start-stop-daemon --start -x _KDEDIR_/bin/reslisa -q -- 1>/dev/null
     eend $? "Failed to start reslisa"
-
 }
 
 stop() {
-
     ebegin "Stopping reslisa"
     start-stop-daemon --stop -x _KDEDIR_/bin/reslisa -q
     eend $? "Failed to stop reslisa"
-
 }
diff --git a/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild
index 11f97484a135..a7ea84e59251 100644
--- a/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.3.2-r2.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/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild,v 1.1 2005/07/21 14:13:29 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE network apps: kopete, kppp, kget..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="slp samba wifi ssl"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild
index 6b4d23a75cb3..ee494dc6e7e3 100644
--- a/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.4.1-r1.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/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild,v 1.1 2005/07/21 14:13:29 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE network apps: kopete, kppp, kget..."
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="rdesktop slp ssl wifi"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild
index 22ccfbff3baa..250a981ec432 100644
--- a/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.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/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild,v 1.1 2005/07/28 13:03:19 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild
index 5d8b8279be05..e6e9af681d5f 100644
--- a/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.4.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/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild,v 1.1 2005/10/12 13:26:46 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE network apps: kopete, kppp, kget..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="rdesktop slp ssl wifi xmms"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild
index 494198ef3b29..d115552651db 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.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/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild
index c3bf65dcec97..a54ccd281360 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.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/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:41 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild
index c9e3beb95304..8d0ae0ac8bca 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5.0_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/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:35:50 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist eutils
 
@@ -14,7 +14,7 @@ DEPEND="~kde-base/kdebase-${PV}
 	dev-libs/libxml2
 	net-dns/libidn
 	>=dev-libs/glib-2
-	sametime? ( >=net-libs/meanwhile-0.4.2 )
+	sametime? ( =net-libs/meanwhile-0.4* )
 	slp? ( net-libs/openslp )
 	wifi? ( net-wireless/wireless-tools )
 	xmms? ( media-sound/xmms )"
diff --git a/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild b/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild
index 01b34edb89a1..2fa25ac2550f 100644
--- a/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild
+++ b/kde-base/kdenetwork/kdenetwork-3.5_beta1.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/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild,v 1.1 2005/09/21 17:24:56 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 inherit kde-dist
 
@@ -13,17 +13,19 @@ DEPEND="~kde-base/kdebase-${PV}
 	dev-libs/libxslt
 	dev-libs/libxml2
 	net-dns/libidn
+	>=dev-libs/glib-2
 	sametime? ( >=net-libs/meanwhile-0.4.2 )
 	slp? ( net-libs/openslp )
 	wifi? ( net-wireless/wireless-tools )
 	xmms? ( media-sound/xmms )"
+# glib: for webcam support in Kopete.
 
 RDEPEND="${DEPEND}
 	rdesktop? ( >=net-misc/rdesktop-1.4.1 )
 	dev-lang/perl
 	ssl? ( app-crypt/qca-tls
 	       dev-perl/IO-Socket-SSL )"
-# perl: for KSirc
+# perl: for KSirc.
 # qca-tls: for Kopete jabber plugin.
 # IO-Socket-SSL: for SSL support in KSirc.
 
diff --git a/kde-base/kdenetwork/metadata.xml b/kde-base/kdenetwork/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdenetwork/metadata.xml
+++ b/kde-base/kdenetwork/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index d353656d4605..976b62db31b4 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-base/kdepasswd/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kdepasswd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdepasswd-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdepasswd-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdepasswd-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdepasswd-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdepasswd-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdepasswd-3.5_beta1.ebuild,
+  kdepasswd-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdepasswd-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.5.0_beta2.ebuild:
+  New version.
+
+*kdepasswd-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdepasswd-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdepasswd-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepasswd-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdepasswd-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepasswd-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdepasswd-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdepasswd-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdepasswd-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdepasswd-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdepasswd-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdepasswd-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdepasswd-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdepasswd-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdepasswd-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdepasswd-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepasswd-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdepasswd-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdepasswd-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdepasswd-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepasswd-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdepasswd-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdepasswd/Manifest b/kde-base/kdepasswd/Manifest
index dd55763ca84d..bbabd4c41bc7 100644
--- a/kde-base/kdepasswd/Manifest
+++ b/kde-base/kdepasswd/Manifest
@@ -1,4 +1,26 @@
-MD5 675655ed36fdc8ca587894acf5b8feb3 kdepasswd-3.4.0_alpha1.ebuild 493
-MD5 675655ed36fdc8ca587894acf5b8feb3 kdepasswd-3.4.0_beta1.ebuild 493
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdepasswd-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdepasswd-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4fda0ecc9f61cb8ce89a786dfb5473b1 ChangeLog 3650
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdepasswd-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdepasswd-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdepasswd-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdepasswd-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdepasswd-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdepasswd-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdepasswd-3.5_beta1 69
+MD5 81dd768912a60b59cde4322ff2f02db9 kdepasswd-3.4.1.ebuild 518
+MD5 44e32e90f31926671d2c21f593504750 kdepasswd-3.4.2.ebuild 531
+MD5 8dc8d46446d60fcbb299d73479d6405e kdepasswd-3.4.3.ebuild 527
+MD5 7d7d45a20f90653f0644702277964b98 kdepasswd-3.5.0.ebuild 472
+MD5 b852cd3ac6a98305f06c6ee27879f305 kdepasswd-3.5.0_beta2.ebuild 477
+MD5 26a8abe97bcdc98db8bc7b9a3cb1431b kdepasswd-3.5.0_rc1.ebuild 476
+MD5 3db6efc7645b08208d64ade6d7792de0 kdepasswd-3.5_beta1.ebuild 510
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj68ntT9W3vfTuoRAng/AJ9KhYJ+jnIgCIzP7kgtqC6X+nc5CwCgo+Dt
+P9Ku5iRO+sgy3b8/yd4lwTU=
+=4djQ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepasswd/files/digest-kdepasswd-3.4.1 b/kde-base/kdepasswd/files/digest-kdepasswd-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdepasswd/files/digest-kdepasswd-3.4.1
+++ b/kde-base/kdepasswd/files/digest-kdepasswd-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdepasswd/files/digest-kdepasswd-3.4.2 b/kde-base/kdepasswd/files/digest-kdepasswd-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdepasswd/files/digest-kdepasswd-3.4.2
+++ b/kde-base/kdepasswd/files/digest-kdepasswd-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdepasswd/kdepasswd-3.4.1.ebuild b/kde-base/kdepasswd/kdepasswd-3.4.1.ebuild
index cfa67a7b922e..afdaad5bc531 100644
--- a/kde-base/kdepasswd/kdepasswd-3.4.1.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.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/kde-base/kdepasswd/kdepasswd-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kdepasswd/kdepasswd-3.4.2.ebuild b/kde-base/kdepasswd/kdepasswd-3.4.2.ebuild
index d448701a59fc..1f99dede06d4 100644
--- a/kde-base/kdepasswd/kdepasswd-3.4.2.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.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/kde-base/kdepasswd/kdepasswd-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kdepasswd/kdepasswd-3.4.3.ebuild b/kde-base/kdepasswd/kdepasswd-3.4.3.ebuild
index 4a567169a42d..ee7b6605b4be 100644
--- a/kde-base/kdepasswd/kdepasswd-3.4.3.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.4.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/kde-base/kdepasswd/kdepasswd-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kdepasswd/kdepasswd-3.5.0.ebuild b/kde-base/kdepasswd/kdepasswd-3.5.0.ebuild
index 93dbede6a378..34e7259c152e 100644
--- a/kde-base/kdepasswd/kdepasswd-3.5.0.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.5.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/kde-base/kdepasswd/kdepasswd-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdepasswd/kdepasswd-3.5.0_beta2.ebuild b/kde-base/kdepasswd/kdepasswd-3.5.0_beta2.ebuild
index beb3ec21ff0c..2725be305ebd 100644
--- a/kde-base/kdepasswd/kdepasswd-3.5.0_beta2.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.5.0_beta2.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/kde-base/kdepasswd/kdepasswd-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kdepasswd/kdepasswd-3.5.0_rc1.ebuild b/kde-base/kdepasswd/kdepasswd-3.5.0_rc1.ebuild
index e39a5540c648..11215e4b257a 100644
--- a/kde-base/kdepasswd/kdepasswd-3.5.0_rc1.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.5.0_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/kde-base/kdepasswd/kdepasswd-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdepasswd/kdepasswd-3.5_beta1.ebuild b/kde-base/kdepasswd/kdepasswd-3.5_beta1.ebuild
index 2aeaa5c748f6..f4113b8de8a5 100644
--- a/kde-base/kdepasswd/kdepasswd-3.5_beta1.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-3.5_beta1.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/kde-base/kdepasswd/kdepasswd-3.5_beta1.ebuild,v 1.1 2005/09/22 18:34:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE GUI for passwd"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kdepasswd/metadata.xml b/kde-base/kdepasswd/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdepasswd/metadata.xml
+++ b/kde-base/kdepasswd/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog
index de49a0c4992c..b71ffa2de889 100644
--- a/kde-base/kdepim-kioslaves/ChangeLog
+++ b/kde-base/kdepim-kioslaves/ChangeLog
@@ -1,6 +1,136 @@
 # ChangeLog for kde-base/kdepim-kioslaves
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-kioslaves-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-kioslaves-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdepim-kioslaves-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdepim-kioslaves-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kioslaves-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdepim-kioslaves-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kioslaves-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdepim-kioslaves-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdepim-kioslaves-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*kdepim-kioslaves-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kioslaves-3.5.0_beta2.ebuild:
+  New version.
+
+*kdepim-kioslaves-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kioslaves-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdepim-kioslaves-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdepim-kioslaves-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-kioslaves-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdepim-kioslaves-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-kioslaves-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdepim-kioslaves-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdepim-kioslaves-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdepim-sasl.patch, +kdepim-kioslaves-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdepim-kioslaves-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdepim-kioslaves-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-kioslaves-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  26 May 2005; Dan Armak <danarmak@gentoo.org>
+  kdepim-kioslaves-3.4.1.ebuild:
+  Add KMCOMPILEONLY=libemailfunctions, necessary to compile 3.4.1.
+
+*kdepim-kioslaves-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-kioslaves-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-kioslaves-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdepim-kioslaves-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdepim-kioslaves-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdepim-kioslaves-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-kioslaves-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdepim-kioslaves-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-kioslaves-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdepim-kioslaves-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-kioslaves-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  18 Jan 2005; Simone Gotti <motaboy@gentoo.org>
+  kdepim-kioslaves-3.4.0_beta1.ebuild:
+  Remove sasl USE flag and make it a fixed dep. Fixes bug #78290.
+
+  18 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  kdepim-kioslaves-3.4.0_beta1.ebuild:
+  Added optional dep on cyrus-sasl. sasl is needed to build the sieve ioslave,
+  and to enable authentication support in the imap4 ioslave.
 
 *kdepim-kioslaves-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdepim-kioslaves/Manifest b/kde-base/kdepim-kioslaves/Manifest
index 6cc2cecf8da0..6ff583f5bdc6 100644
--- a/kde-base/kdepim-kioslaves/Manifest
+++ b/kde-base/kdepim-kioslaves/Manifest
@@ -1,4 +1,27 @@
-MD5 fb2f9791e9a0bc51f3ced8c972a8f923 kdepim-kioslaves-3.4.0_alpha1.ebuild 404
-MD5 fb2f9791e9a0bc51f3ced8c972a8f923 kdepim-kioslaves-3.4.0_beta1.ebuild 404
-MD5 892303ffe022b31a222f9efab549727b files/digest-kdepim-kioslaves-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kdepim-kioslaves-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 13cf1d539b2591dcac15402414811f1a ChangeLog 4590
+MD5 4781ed6b323012399cdd6a4c4f5070f0 files/configure-fix-kdepim-sasl.patch 1750
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kdepim-kioslaves-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kdepim-kioslaves-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kdepim-kioslaves-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kdepim-kioslaves-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kdepim-kioslaves-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kdepim-kioslaves-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kdepim-kioslaves-3.5_beta1 68
+MD5 58e12ae1cb38bb037aca5d8f4f5f6dcc kdepim-kioslaves-3.4.1.ebuild 600
+MD5 129500cb7462d0899369a77aacc3f993 kdepim-kioslaves-3.4.2.ebuild 716
+MD5 9c751551643bd304d52082f0bfd0d82d kdepim-kioslaves-3.4.3.ebuild 712
+MD5 3939df3d3ac8703c851ad68eba644f8d kdepim-kioslaves-3.5.0.ebuild 643
+MD5 2a906452f5c291c78f76527010ec0f41 kdepim-kioslaves-3.5.0_beta2.ebuild 652
+MD5 6ded27c1cba01bf54a8eb9180ffebfc0 kdepim-kioslaves-3.5.0_rc1.ebuild 653
+MD5 771bd74c53db6747f17753c5bec20b8a kdepim-kioslaves-3.5_beta1.ebuild 641
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvMrntT9W3vfTuoRAp9lAJ44eXjGNcwIUqnaY7vdNF/PPU5rUACbBSCE
+n8rOxuZJFPntzrs/9bIMNqQ=
+=2NMd
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.1 b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.1
+++ b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.2 b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.2
+++ b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.1.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.1.ebuild
index 5bad84b8283f..7d5d5cce2272 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.1.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -10,12 +10,12 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdepim package"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-libs/cyrus-sasl-2
-		$(deprange $PV $MAXKDEVER kde-base/libkmime)"
+	$(deprange $PV $MAXKDEVER kde-base/libkmime)"
 
 KMCOPYLIB="libkmime libkmime/"
 KMEXTRACTONLY="libkmime/"
-
+KMCOMPILEONLY="libemailfunctions"
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.2.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.2.ebuild
index 4e9ca1a47b4f..055e5a0eade3 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.2.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdepim package"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="sasl"
 DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange 3.4.1 $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild
index 67e64d0b0017..7e155112697d 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdepim package"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="sasl"
 DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange 3.4.1 $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0.ebuild
index 9ffbe31b2dcd..6375f5d21722 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_beta2.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_beta2.ebuild
index 334aeb3789d2..73b045f8f77d 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_beta2.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_beta2.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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdepim package"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="sasl"
 DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange 3.5_beta1 $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_rc1.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_rc1.ebuild
index 35cf2d71ed26..d37d172820af 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_rc1.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5_beta1.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5_beta1.ebuild
index e2a16fda2136..ed2cadcc79eb 100644
--- a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5_beta1.ebuild
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5_beta1.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/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5_beta1.ebuild,v 1.1 2005/09/22 18:35:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kioslaves
@@ -10,7 +10,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdepim package"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="sasl"
 DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
 	$(deprange $PV $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/kdepim-kioslaves/metadata.xml b/kde-base/kdepim-kioslaves/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdepim-kioslaves/metadata.xml
+++ b/kde-base/kdepim-kioslaves/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdepim-kresources/ChangeLog b/kde-base/kdepim-kresources/ChangeLog
index 99d5d50da2c3..4f9cde6198c6 100644
--- a/kde-base/kdepim-kresources/ChangeLog
+++ b/kde-base/kdepim-kresources/ChangeLog
@@ -1,6 +1,139 @@
 # ChangeLog for kde-base/kdepim-kresources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/ChangeLog,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-kresources-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-kresources-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdepim-kresources-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdepim-kresources-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kresources-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdepim-kresources-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kresources-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdepim-kresources-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdepim-kresources-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  kdepim-kresources-3.5.0_beta2.ebuild:
+  Fix compilation for this version.
+
+*kdepim-kresources-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kresources-3.5.0_beta2.ebuild:
+  New version.
+
+*kdepim-kresources-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-kresources-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdepim-kresources-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdepim-kresources-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-kresources-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  18 Sep 2005; Caleb Tennis <caleb@gentoo.org>
+  kdepim-kresources-3.4.1.ebuild, kdepim-kresources-3.4.2.ebuild,
+  kdepim-kresources-3.5_alpha1.ebuild:
+  Up gpgme deps to 1.0.2
+
+*kdepim-kresources-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-kresources-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdepim-kresources-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdepim-kresources-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-kresources-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdepim-kresources-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kdepim-kresources-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-kresources-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdepim-kresources-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> 
+  +kdepim-kresources-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-kresources-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdepim-kresources-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdepim-kresources-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdepim-kresources-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-kresources-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdepim-kresources-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-kresources-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  06 Feb 2005; Simone Gotti <motaboy@gentoo.org>
+  kdepim-kresources-3.4.0_beta2.ebuild:
+  Add extraction of "libemailfuctions" dir needed for the compilation.
+
+*kdepim-kresources-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-kresources-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdepim-kresources-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdepim-kresources/Manifest b/kde-base/kdepim-kresources/Manifest
index d6b66b8bc131..43b7d16b1703 100644
--- a/kde-base/kdepim-kresources/Manifest
+++ b/kde-base/kdepim-kresources/Manifest
@@ -1,5 +1,27 @@
-MD5 c5e0abd5b0cb9b46bd6812215b0b67ad kdepim-kresources-3.4.0_alpha1.ebuild 1479
-MD5 c5e0abd5b0cb9b46bd6812215b0b67ad kdepim-kresources-3.4.0_beta1.ebuild 1479
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kdepim-kresources-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-kdepim-kresources-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a691041a55b19d2e874f2e94f470b705 ChangeLog 4561
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kdepim-kresources-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kdepim-kresources-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kdepim-kresources-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kdepim-kresources-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kdepim-kresources-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kdepim-kresources-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kdepim-kresources-3.5_beta1 68
 MD5 54ceeeba45d6d32a321821536b100e40 files/use-installed-kode.diff 687
+MD5 0a2cbfdefb831eac9e2513108f3d5e0b kdepim-kresources-3.4.1.ebuild 1232
+MD5 fe6bf70826d578fd3c7c156c2100329f kdepim-kresources-3.4.2.ebuild 1248
+MD5 42b1dc4612c79e5288664afaf71717e7 kdepim-kresources-3.4.3.ebuild 1241
+MD5 c5b0c4ed9cfcf5cc49108195addbd2a8 kdepim-kresources-3.5.0.ebuild 1300
+MD5 a02ad46ba870efee2b8fca4a445bfc6a kdepim-kresources-3.5.0_beta2.ebuild 1309
+MD5 d7555a965e465699b428d279c262995f kdepim-kresources-3.5.0_rc1.ebuild 1310
+MD5 ded2e75747453250c35e61384f4e7cd1 kdepim-kresources-3.5_beta1.ebuild 1242
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvLFntT9W3vfTuoRAtekAJwKVIKav9Rb6HAfVAgrT1b8hw240QCgm7Ie
+KOpiQGoB1fxuyuMk1hNKw40=
+=iTkz
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.1 b/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.1
+++ b/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.2 b/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.2
+++ b/kde-base/kdepim-kresources/files/digest-kdepim-kresources-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.4.1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.4.1.ebuild
index 0a7186a866f0..9d687bcccbea 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.4.1.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.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/kde-base/kdepim-kresources/kdepim-kresources-3.4.1.ebuild,v 1.1 2005/05/25 21:23:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
@@ -9,14 +9,14 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM groupware plugin collection"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kaddressbook)
 $(deprange $PV $MAXKDEVER kde-base/kode)
-	>=app-crypt/gpgme-0.4.0"
+	>=app-crypt/gpgme-1.0.2"
 KMCOPYLIB="
 	libkcal libkcal
 	libkpimexchange libkpimexchange
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.4.2.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.4.2.ebuild
index 6bd644bd5c97..a032f0e82aa4 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.4.2.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.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/kde-base/kdepim-kresources/kdepim-kresources-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
@@ -9,14 +9,14 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM groupware plugin collection"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange 3.4.1 $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/kaddressbook)
 $(deprange 3.4.1 $MAXKDEVER kde-base/kode)
-	>=app-crypt/gpgme-0.4.0"
+	>=app-crypt/gpgme-1.0.2"
 KMCOPYLIB="
 	libkcal libkcal
 	libkpimexchange libkpimexchange
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.4.3.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.4.3.ebuild
index 5a92de3bbff2..9366c1b29d46 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.4.3.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.4.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/kde-base/kdepim-kresources/kdepim-kresources-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM groupware plugin collection"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.5.0.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.5.0.ebuild
index 16c683884377..364e4e068b33 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.5.0.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.5.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/kde-base/kdepim-kresources/kdepim-kresources-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_beta2.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_beta2.ebuild
index 44276721f317..71934c4e0673 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_beta2.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_beta2.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/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM groupware plugin collection"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
@@ -25,7 +25,6 @@ KMCOPYLIB="
 	libkabinterfaces kaddressbook/interfaces/"
 
 KMEXTRACTONLY="
-	libkcal/
 	korganizer/
 	libkpimexchange/configure.in.in
 	libkdepim/
@@ -35,16 +34,18 @@ KMEXTRACTONLY="
 
 KMCOMPILEONLY="
 	knotes/
+	libkcal/
 	kaddressbook/common/
 	"
 PATCHES="$FILESDIR/use-installed-kode.diff"
 
 src_compile() {
-	export DO_NOT_COMPILE="knotes"
+	export DO_NOT_COMPILE="knotes libkcal"
 
 	kde-meta_src_compile myconf configure
 
 	cd knotes/; make libknotesresources.la
+	cd $S/libkcal/libical/src/libical; make ical.h
 
 	kde-meta_src_compile make
 }
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_rc1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_rc1.ebuild
index bc73b7b9806b..ea8d12b50afc 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_rc1.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_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/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
diff --git a/kde-base/kdepim-kresources/kdepim-kresources-3.5_beta1.ebuild b/kde-base/kdepim-kresources/kdepim-kresources-3.5_beta1.ebuild
index 7e6e2f53a435..cd2fb5368266 100644
--- a/kde-base/kdepim-kresources/kdepim-kresources-3.5_beta1.ebuild
+++ b/kde-base/kdepim-kresources/kdepim-kresources-3.5_beta1.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/kde-base/kdepim-kresources/kdepim-kresources-3.5_beta1.ebuild,v 1.1 2005/09/22 18:36:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kresources/kdepim-kresources-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=kresources
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM groupware plugin collection"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
diff --git a/kde-base/kdepim-kresources/metadata.xml b/kde-base/kdepim-kresources/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdepim-kresources/metadata.xml
+++ b/kde-base/kdepim-kresources/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdepim-meta/ChangeLog b/kde-base/kdepim-meta/ChangeLog
index 37de225dc3b9..cc9e51c319b3 100644
--- a/kde-base/kdepim-meta/ChangeLog
+++ b/kde-base/kdepim-meta/ChangeLog
@@ -1,6 +1,136 @@
 # ChangeLog for kde-base/kdepim-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdepim-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdepim-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdepim-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdepim-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdepim-meta-3.5_beta1.ebuild, kdepim-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdepim-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdepim-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-meta-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdepim-meta-3.5_beta1.ebuild:
+  Add akregator to the list of kdepim derived ebuilds.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdepim-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdepim-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdepim-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdepim-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdepim-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdepim-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdepim-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdepim-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdepim-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdepim-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdepim-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdepim-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdepim-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> kdepim-meta-3.4.0.ebuild:
+  Make kpilot optional and do not depend on kmobile (#87350).
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdepim-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdepim-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdepim-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdepim-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdepim-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  13 Feb 2005; Simone Gotti <motaboy@gentoo.org>
+  kdepim-meta-3.4.0_beta2.ebuild:
+  Add deps on kontact-specialdates.
+
+*kdepim-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kdepim-meta-3.4.0_beta1-r1 (18 Jan 2005)
+
+  18 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-meta-3.4.0_beta1-r1.ebuild:
+  New revision that includes the new package kdepim-specialdates.
 
 *kdepim-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdepim-meta/Manifest b/kde-base/kdepim-meta/Manifest
index b4d579785131..622aa2d97507 100644
--- a/kde-base/kdepim-meta/Manifest
+++ b/kde-base/kdepim-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 89228ca549e523049a0383e4bffb5a1c kdepim-meta-3.4.0_beta1.ebuild 1880
-MD5 89228ca549e523049a0383e4bffb5a1c kdepim-meta-3.4.0_alpha1.ebuild 1880
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.4.0_alpha1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 933c305c57f65523e49e02b9b3feea05 ChangeLog 4565
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdepim-meta-3.5_beta1 0
+MD5 db83d821df9465d8e0efea98297bd079 kdepim-meta-3.4.1.ebuild 2104
+MD5 69746fd92d06014f21f9ad48f6edfb8a kdepim-meta-3.4.2.ebuild 2137
+MD5 bcb037439d3495a8744949cfb9d104c7 kdepim-meta-3.4.3.ebuild 2125
+MD5 63a71408587c042c7c7c8136d220f535 kdepim-meta-3.5.0.ebuild 2065
+MD5 1c9ce46bf150ba06c76f59ccc941dd0d kdepim-meta-3.5.0_beta2.ebuild 2181
+MD5 230c2a8b30336ca13174b8ab3cb43b1c kdepim-meta-3.5.0_rc1.ebuild 2196
+MD5 46a3918931321d90d542c58579f3585c kdepim-meta-3.5_beta1.ebuild 2143
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhveAntT9W3vfTuoRApy8AJ9k6pQW11vxYGkeJHAsz9g0ixkTzwCfVxSw
+ggsQQAgZDnZBk4ywiyYaQCM=
+=wV6p
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.4.1.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.4.1.ebuild
index 1f1c0ef393b5..cff28b98b4be 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.4.1.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.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/kde-base/kdepim-meta/kdepim-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="pda"
 
 RDEPEND="
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.4.2.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.4.2.ebuild
index 3a635eadaf1f..b5b7b33904dc 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.4.2.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.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/kde-base/kdepim-meta/kdepim-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pda"
 
 RDEPEND="
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.4.3.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.4.3.ebuild
index f40151ab92c0..cf694b3b0a7b 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.4.3.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.4.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/kde-base/kdepim-meta/kdepim-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="pda"
 
 RDEPEND="
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.5.0.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.5.0.ebuild
index d91bbd8266a4..1364028c08d6 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.5.0.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.5.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/kde-base/kdepim-meta/kdepim-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -47,6 +47,3 @@ RDEPEND="
 	$(deprange $PV $MAXKDEVER kde-base/libksieve)
 	$(deprange $PV $MAXKDEVER kde-base/mimelib)
 	$(deprange $PV $MAXKDEVER kde-base/networkstatus)"
-
-# not compiled by default
-#	$(deprange $PV $MAXKDEVER kde-base/kmobile)
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.5.0_beta2.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.5.0_beta2.ebuild
index e6a95de56a89..f0fd7eadfdc2 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.5.0_beta2.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/kde-base/kdepim-meta/kdepim-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="pda"
 
 RDEPEND="
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.5.0_rc1.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.5.0_rc1.ebuild
index 3b63bbb2dd9c..71337eba0017 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.5.0_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/kde-base/kdepim-meta/kdepim-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdepim-meta/kdepim-meta-3.5_beta1.ebuild b/kde-base/kdepim-meta/kdepim-meta-3.5_beta1.ebuild
index e4d455cbb3d8..55140b8b06ef 100644
--- a/kde-base/kdepim-meta/kdepim-meta-3.5_beta1.ebuild
+++ b/kde-base/kdepim-meta/kdepim-meta-3.5_beta1.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/kde-base/kdepim-meta/kdepim-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:50:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-meta/kdepim-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,10 +9,11 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="pda"
 
 RDEPEND="
+	$(deprange $PV $MAXKDEVER kde-base/akregator)
 	$(deprange $PV $MAXKDEVER kde-base/certmanager)
 	$(deprange $PV $MAXKDEVER kde-base/kaddressbook)
 	$(deprange $PV $MAXKDEVER kde-base/kalarm)
diff --git a/kde-base/kdepim-meta/metadata.xml b/kde-base/kdepim-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdepim-meta/metadata.xml
+++ b/kde-base/kdepim-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index 79e81557470a..313b0fd809b8 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-wizards-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-wizards-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdepim-wizards-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdepim-wizards-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-wizards-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdepim-wizards-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-wizards-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdepim-wizards-3.5_beta1.ebuild, kdepim-wizards-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdepim-wizards-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-wizards-3.5.0_beta2.ebuild:
+  New version.
+
+*kdepim-wizards-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-wizards-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdepim-wizards-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdepim-wizards-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-wizards-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdepim-wizards-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdepim-wizards-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdepim-wizards-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdepim-wizards-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdepim-wizards-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdepim-wizards-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdepim-wizards-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-wizards-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdepim-wizards-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdepim-wizards-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdepim-wizards-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdepim-wizards-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdepim-wizards-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdepim-wizards-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdepim-wizards-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdepim-wizards-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-wizards-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdepim-wizards-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdepim-wizards-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdepim-wizards-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest
index 19ad764f6311..ae5e978691d5 100644
--- a/kde-base/kdepim-wizards/Manifest
+++ b/kde-base/kdepim-wizards/Manifest
@@ -1,4 +1,26 @@
-MD5 293b180b59ea1fb849a3b39cf9c67d7e kdepim-wizards-3.4.0_alpha1.ebuild 1871
-MD5 293b180b59ea1fb849a3b39cf9c67d7e kdepim-wizards-3.4.0_beta1.ebuild 1871
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kdepim-wizards-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-kdepim-wizards-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 61e02aa0aa8d778eedc249e4aabc90be ChangeLog 3859
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kdepim-wizards-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kdepim-wizards-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kdepim-wizards-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kdepim-wizards-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kdepim-wizards-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kdepim-wizards-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kdepim-wizards-3.5_beta1 68
+MD5 92126b82bcf471e050d502f8f6205a71 kdepim-wizards-3.4.1.ebuild 2244
+MD5 42269dac2386e8af3adf8b3ceae72f26 kdepim-wizards-3.4.2.ebuild 2259
+MD5 1277cff08d8cd947d871df5165f48a62 kdepim-wizards-3.4.3.ebuild 2253
+MD5 47c999fade73109be2da2c911bb23368 kdepim-wizards-3.5.0.ebuild 2081
+MD5 7b7cc600d703530101b79ea8b7aead24 kdepim-wizards-3.5.0_beta2.ebuild 2086
+MD5 8722cd5f880485ffd64471c65384f392 kdepim-wizards-3.5.0_rc1.ebuild 2085
+MD5 a310ac9995d4fc5ace931e41d0ee3e7a kdepim-wizards-3.5_beta1.ebuild 2236
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvNfntT9W3vfTuoRAnsXAJ0Vmq3VxiqLfafwJiWPl+UUbQ/kUgCggQ4i
+WM33wtOX1TK3uAW2UNk7ep4=
+=kuPU
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.1 b/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.1
+++ b/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.2 b/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.2
+++ b/kde-base/kdepim-wizards/files/digest-kdepim-wizards-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.4.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.4.1.ebuild
index d54554d8622f..cf9fe19e76dd 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.4.1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.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/kde-base/kdepim-wizards/kdepim-wizards-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDEPIM wizards"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.4.2.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.4.2.ebuild
index 6dbc5e02b9dd..d30cbe0cfb49 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.4.2.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.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/kde-base/kdepim-wizards/kdepim-wizards-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDEPIM wizards"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.4.3.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.4.3.ebuild
index 6ec9c930f35e..0589ef6aaafd 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.4.3.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.4.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/kde-base/kdepim-wizards/kdepim-wizards-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDEPIM wizards"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.5.0.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.5.0.ebuild
index ccaf87f23064..be7850b31dca 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.5.0.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.5.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/kde-base/kdepim-wizards/kdepim-wizards-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_beta2.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_beta2.ebuild
index 4e7a20208346..c8e28ce92f07 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_beta2.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_beta2.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/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDEPIM wizards"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_rc1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_rc1.ebuild
index 417e72b7a627..be39672d95f5 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_rc1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_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/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-3.5_beta1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-3.5_beta1.ebuild
index 77345f47c2fb..b838d0cdb4eb 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-3.5_beta1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-3.5_beta1.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/kde-base/kdepim-wizards/kdepim-wizards-3.5_beta1.ebuild,v 1.1 2005/09/22 18:37:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdepim
 KMMODULE=wizards
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDEPIM wizards"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV
diff --git a/kde-base/kdepim-wizards/metadata.xml b/kde-base/kdepim-wizards/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdepim-wizards/metadata.xml
+++ b/kde-base/kdepim-wizards/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdepim/ChangeLog b/kde-base/kdepim/ChangeLog
index 6586e2d90067..a7b1ea5556f6 100644
--- a/kde-base/kdepim/ChangeLog
+++ b/kde-base/kdepim/ChangeLog
@@ -1,6 +1,717 @@
 # ChangeLog for kde-base/kdepim
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/ChangeLog,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdepim-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdepim-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdepim-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdepim-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdepim-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  Mark 3.4.1-r2 stable on alpha
+
+*kdepim-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdepim-3.5.0_beta2.ebuild:
+  New version.
+
+*kdepim-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdepim-3.4.3.ebuild:
+  New version.
+
+*kdepim-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdepim-3.4.2-r1.ebuild:
+  Keyworded ~mips.
+
+  29 Sep 2005; Hardave Riar <hardave@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  Adding back dropped ~mips keyword.
+
+*kdepim-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.5_beta1.ebuild:
+  New version.
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  Stable on amd64.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  stable on ia64
+
+*kdepim-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdepim-3.4.1-r2.ebuild:
+  Stable on ppc.
+
+  07 Aug 2005; Jason Wever <weeve@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  Stable on SPARC.
+
+*kdepim-3.4.2-r1 (02 Aug 2005)
+
+  02 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.2-partnode.patch, +kdepim-3.4.2-r1.ebuild:
+  Add patch to fix problem with attachments (kde bug 109003).
+
+  28 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  Stable on hppa.
+
+*kdepim-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.2-gcc32.patch, +files/kdepim-3.4-configure.patch,
+  +kdepim-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Add patch to fix compilation with
+  gcc 3.2 (#99643).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdepim-3.4.1-r1.ebuild,
+  kdepim-3.4.1-r2.ebuild:
+  Stable on hppa.
+
+  21 Jul 2005; Carsten Lohrke <carlo@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  stable on x86
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdepim-3.4.1-r1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdepim-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  06 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kdepim-3.3.2-r1.ebuild:
+  Stable on x86.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdepim-3.4.1-r2.ebuild:
+  Add ~alpha keyword.
+
+  01 Jul 2005; Hardave Riar <hardave@gentoo.org> kdepim-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Dan Armak <danarmak@gentoo.org> kdepim-3.4.0-r1.ebuild,
+  kdepim-3.4.1.ebuild, kdepim-3.4.1-r1.ebuild, kdepim-3.4.1-r2.ebuild:
+  Removed blocking dep on the old net-www/akregator package, which has been
+  removed from the tree.
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdepim-3.4.1-r1.ebuild,
+  kdepim-3.4.1-r2.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdepim-3.4.1-r2 (01 Jul 2005)
+
+  01 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kmail-3.4.1-shift+click-crash.diff, +kdepim-3.4.1-r2.ebuild:
+  fixing crash on shift+click in kmail reader, #97549
+
+*kdepim-3.4.1-r1 (08 Jun 2005)
+
+  08 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.1-akregator-unread.patch, +kdepim-3.4.1-r1.ebuild:
+  Fix regression in akregator (#95455).
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.1-kpilot-fix.patch, kdepim-3.4.1.ebuild:
+  Add last minute fix for critical kpilot bug (kde bug 106324).
+
+*kdepim-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.4.1.ebuild:
+  New version.
+
+  11 May 2005; Aron Griffis <agriffis@gentoo.org> kdepim-3.4.0-r1.ebuild:
+  add ~ia64
+
+*kdepim-3.3.2-r1 (26 Apr 2005)
+
+  26 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdepim-3.3.2-kmail-imap-preview.diff, +kdepim-3.3.2-r1.ebuild:
+  imap preview fix, #76054
+
+  23 Apr 2005; Donnie Berkholz <spyderous@gentoo.org>; :
+  Remove ASCII NUL, which made the ChangeLog think it was binary.
+
+*kdepim-3.4.0-r1 (24 Mar 2005)
+
+  24 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.0-akregator-fix.patch, +kdepim-3.4.0-r1.ebuild,
+  -kdepim-3.4.0.ebuild:
+  Add patch to avoid akregator messing with the archive (#86477).
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdepim-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdepim-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.0-fix-imap-resource-type.patch, +kdepim-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final. Add last-minute patch from KDE developers.
+
+*kdepim-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdepim-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> :
+  Added ~sparc keyword.
+
+*kdepim-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdepim-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdepim-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdepim-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdepim-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Added blockers on net-www/akregator and
+  app-pda/kitchensync.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdepim-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdepim-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdepim-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdepim-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdepim-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdepim-3.3.1.ebuild:
+  stable on amd64
+
+  02 Dec 2004; Carsten Lohrke <carlo@gentoo.org> kdepim-3.3.0-r1.ebuild:
+  stable on x86
+
+  02 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdepim-3.3.0-r1.ebuild:
+  stable on amd64, bug #72616
+
+  02 Dec 2004; Daniel Black <dragonheart@gentoo.org> kdepim-3.3.0.ebuild:
+  Removing GPGME_CONFIG=/usr/bin/gpgme4-config cause this is in gpgme-0.4*
+
+  02 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0.ebuild:
+  Modify 3.3.0 ebuild so that we can push >=3.3.0-r1 since it has better gpgme
+  support
+
+  27 Nov 2004; Markus Rothe <corsair@gentoo.org> kdepim-3.3.0-r1.ebuild:
+  Stable on ppc64; bug #72616
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdepim-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdepim-3.3.1.ebuild:
+  Stable on ppc.
+
+  07 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  +files/kdepim-3.2.3-cjk.diff, kdepim-3.2.2.ebuild, kdepim-3.2.3.ebuild,
+  kdepim-3.3.0-r1.ebuild, kdepim-3.3.0.ebuild, kdepim-3.3.1.ebuild:
+  Added cjk patch. Thanks to Jackey Yang <043936y@acadiau.ca>; bug #53050.
+
+  06 Nov 2004; Markus Rothe <corsair@gentoo.org> kdepim-3.3.1.ebuild:
+  Marked ~ppc64
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdepim-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdepim-3.3.1.ebuild:
+  ~alpha keyword.
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.1.ebuild:
+  Readd ~sparc as gnokii has been ~sparc'd
+
+*kdepim-3.3.1 (12 Oct 2004)
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdepim-3.3.0-r1.ebuild:
+  Stable on hppa.
+
+  28 Sep 2004; Jason Wever <weeve@gentoo.org> kdepim-3.3.0-r1.ebuild:
+  Stable on sparc wrt bug #64485.
+
+  19 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0-r1.ebuild:
+  Add in gnokii as a dep of this package (Bug #40360)
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdepim-3.3.0.ebuild:
+  Stable on amd64
+
+  18 Sep 2004; Daniel Black <dragonheart@gentoo.org> kdepim-3.3.0.ebuild:
+  changed gpgme dependancy to =app-crypt/gpgme-0.4* because it will fail with
+  >=gpgme-0.9.0. Solved bug #63501
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdepim-3.3.0.ebuild:
+  Stable on sparc.
+
+  13 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  files/kdepim-3.3.0-spam-assistant.patch, kdepim-3.3.0-r1.ebuild:
+  fixed spam-assistant patch, thanks to Alberto Garcia Hierro
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0.ebuild:
+  Mark 3.3.0 x86 stable. Also, change the crypt dep to gpgme-0.4.0.I'll catch
+  some flack for this regression, but it's the only current way to get this x86
+  stable before the whole gnupg/gpgme mess gets sorted out.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdepim-3.2.1.ebuild:
+  Remove stale versions
+
+*kdepim-3.3.0-r1 (03 Sep 2004)
+
+  03 Sep 2004; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdepim-3.3.0-spam-assistant.patch, +kdepim-3.3.0-r1.ebuild:
+  adjusted gpgme dependency, kmail spam-assistant patch
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdepim-3.1.5.ebuild, kdepim-3.2.1.ebuild, kdepim-3.3.0.ebuild:
+  Masked kdepim-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdepim-3.1.5.ebuild, kdepim-3.2.1.ebuild:
+  Masked kdepim-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdepim-3.1.5.ebuild:
+  Masked kdepim-3.1.5.ebuild stable for ppc
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdepim-3.3.0.ebuild:
+  stable on ppc64, bug #58237
+
+*kdepim-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0.ebuild,
+  kdepim-3.3.0_beta2-r1.ebuild, kdepim-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdepim-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0_rc1.ebuild,
+  kdepim-3.3.0_rc2.ebuild:
+  add _rc2, remove _rc1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdepim-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdepim-3.3.0_rc1 (06 Aug 2004)
+
+  06 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0_rc1.ebuild:
+  Add _rc1, remove _beta1
+
+*kdepim-3.3.0_beta2-r1 (28 Jul 2004)
+
+  28 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.3.0_beta2-r1.ebuild:
+  Make some revisions based on #58640
+
+*kdepim-3.3.0_beta2-r1 (28 Jul 2004)
+
+  28 Jul 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.3.0_beta2-r1.ebuild:
+  some dependency differences - see bug #58640
+
+*kdepim-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.3.0_beta2.ebuild:
+  new beta
+
+*kdepim-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdepim-3.3.0_alpha1.ebuild,
+  +kdepim-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdepim-3.2.2.ebuild:
+  Stable on alpha.
+
+  16 Jun 2004; Jason Wever <weeve@gentoo.org> kdepim-3.2.3.ebuild:
+  Re-added ~sparc keyword in relation to bug #54092.
+
+*kdepim-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdepim-3.2.2.ebuild:
+  stable on amd64
+
+*kdepim-3.3.0_alpha1 (25 May 2004)
+
+  25 May 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.3.0_alpha1.ebuild:
+  3.3alpha1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdepim-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2003; Daniel Ostrow <dostrow@gentoo.org> kdepim-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdepim-3.2.2.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdepim-3.2.1.ebuild:
+  Add inherit eutils
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdepim-3.0.5b.ebuild:
+  Remove old version
+
+*kdepim-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdepim-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdepim-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdepim-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.4.ebuild:
+  x86 stable and version bump
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.1.ebuild,
+  files/kpilot-parallel-make-fix.patch:
+  Adding a patch which fixes parallel make problems in the 3.2 branch
+
+*kdepim-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdepim-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  25 Feb 2004; Guy Martin <gmsoft@gentoo.org> kdepim-3.2.0-r2.ebuild:
+  Marked stable on hppa.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdepim-3.2.0-r2.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> :
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdepim-3.2.0-r2.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Marked ~ppc
+
+*kdepim-3.2.0-r2 (05 Feb 2004)
+
+  05 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> kdepim-3.2.0-r1.ebuild
+  files/kmfilter.cpp.patch:
+  Add pop filtering problem patch
+
+*kdepim-3.2.0-r1 (04 Feb 2004)
+
+  04 Feb 2004; Paul de Vrieze <pauldv@gentoo.org> kdepim-3.2.0-r1.ebuild,
+  files/KMail-inboxEater-BRANCH.diff:
+  A new version that applies the kmail patch from the packagers list. We don't
+  want users to loose messages.
+
+*kdepim-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0.ebuild,
+  kdepim-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdepim-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdepim-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.0.4.ebuild,
+  kdepim-3.1.2-r1.ebuild, kdepim-3.1.2.ebuild, kdepim-3.2.0_beta1.ebuild,
+  kdepim-3.2.0_beta2.ebuild, kdepim-3.2.0_rc1.ebuild,
+  files/kdepim-3.1.2-libmal-support.diff:
+  New version, removing old versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdepim-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdepim-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.5.ebuild:
+  New version
+  repoman commit
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdepim-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdepim-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+  24 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_beta2.ebuild:
+  minor dependency fixes
+
+*kdepim-3.2.0_beta2 (02 Dec 2003)
+
+  02 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdepim-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdepim-3.1.4.ebuild:
+  Marked ppc
+
+  08 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_beta1.ebuild:
+  Add cryptplug support (bug #32989)
+
+*kdepim-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdepim-3.1.4.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-2.2.2-r1.ebuild,
+  kdepim-2.2.2-r1.ebuild, kdepim-3.1.1.ebuild, kdepim-3.1.1.ebuild,
+  kdepim-3.1.3.ebuild, kdepim-3.1.3.ebuild, files/kdepim-2.2.2-gentoo.diff,
+  files/kdepim-3.1.3-gcc33.diff, files/post-2.2.2-kdepim.diff:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.4.ebuild:
+  Added sparc keyword.
+
+*kdepim-3.2.0_alpha2 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_alpha1.ebuild,
+  kdepim-3.2.0_alpha1.ebuild, kdepim-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.4.ebuild:
+  marking x86 stable
+
+*kdepim-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.4.ebuild:
+  new version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.3.ebuild:
+  Marked stable for sparc.
+
+*kdepim-3.2.0_alpha1
+
+  15 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.2.0_alpha1.ebuild:
+  Add new version, clean up ebuild a bit.
+
+  09 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.3.ebuild:
+  x86 stable
+
+  01 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdepim-3.1.3.ebuild:
+  Add patch from bug #26022
+
+  30 Aug 2003; Alastair Tse <liquidx@gentoo.org> kdepim-2.2.2-r1.ebuild,
+  kdepim-3.0.4.ebuild, kdepim-3.0.5b.ebuild, kdepim-3.1.1.ebuild,
+  kdepim-3.1.2-r1.ebuild, kdepim-3.1.2.ebuild, kdepim-3.1.3.ebuild:
+  moved dev-libs/pilot-link to app-pda/pilot-link
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+  03 Aug 2003; <paul@gentoo.org> kdepim-3.1.3.ebuild:
+  This kde version does not need the patch, it is allready patched
+
+*kdepim-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdepim-3.1.3.ebuild:
+  Version bump
+
+*kdepim-3.1.2-r1 (04 Jul 2003)
+  04 Jul 2003; Michele Balisitreri <brain@gentoo.org> kdepim-3.1.2-r1.ebuild:
+  Fixes bug #22992.
+  
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdepim-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdepim-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdepim-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdepim-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdepim-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdepim-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdepim-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdepim-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdepim-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdepim-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdepim-3.1.ebuild:
+  Added ~alpha to keywords
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdepim-2.2.2.ebuild,
+  kdepim-3.0.2.ebuild, kdepim-3.0.3.ebuild, kdepim-3.1_rc6.ebuild:
+  removed old ebuilds
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdepim-3.1.ebuild:
+  added ~sparc to keywords
+
+  30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change ebuilds to use kde_src_unpack() instead of base_src_unpack(). This
+  does not affect in any way the compiled output, or any ebuild not suffering
+  rfom the 'languageChange undeclared' bug, which it fixes.
+
+*kdepim-2.2.2-r1 (17 Jan 2003)
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdepim-2.2.2-r1.ebuild:
+  new version, fixes #12520
+
+  17 Jan 2003; Dan Armak <danarmak@gentoo.org> kdepim-2.2.2.ebuild  :
+
+  Disable building kpilot, beacuse it cannot be built under gcc3.2.1/glibc
+  2.3.1. Oh, and if anyone still use kde 2 under Gentoo, we'd like to hear
+  about it :-)
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdepim-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdepim-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+*kdepim-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdepim-3.1_rc6.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org>  kdepim-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdepim-3.1.ebuild:
+  Added ppc keyword
+
+  23 Nov 2002; Dan Armak <danarmak@gentoo.org> kdepim-3.1_rc3.ebuild,
+  kdepim-3.1.ebuild :
+
+  Enforce MAKEOPTS+=-j1 - reported by DocTomoe as necessary for ppc at least.
+
+*kdepim-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdepim-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdepim-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdepim-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+  30 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Change dep on pilot-link to >=0.11.1-r1 to take advantage of a recent
+  bugfix in that new revision (#5615).
+
+*kdepim-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  23 Jul 2002; Ryan Phillips <rphillips@gentoo.org> kdepim-3.0.2.ebuild :
+
+  Applied patch so kde compiles with qt-3.0.5.
+  Patches submitted by Richard D. Jackson
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : 
+  
+  New stability release.
+
+*kdepim-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdepim-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdepim-3.0-r1 (30 Apr 2002)
+
+  30 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+  Fix bug #2259 (kpilot not being built); make kpilot building possible
+  and conditional on pda use flag
+
+*kdepim-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdepim-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdepim/Manifest b/kde-base/kdepim/Manifest
index ab043cf0608d..10f87ea58f46 100644
--- a/kde-base/kdepim/Manifest
+++ b/kde-base/kdepim/Manifest
@@ -1,15 +1,44 @@
-MD5 692b11ee455064b79eea0cd9049a7f18 kdepim-3.0.4.ebuild 570
-MD5 ff2edd11e26a2c2272da9f18be999b47 kdepim-3.1.ebuild 744
-MD5 6db7ab3add89fcfc032d0939ff0ee9f0 kdepim-3.0.5a.ebuild 579
-MD5 3f723d81f879e92d8e7304f5ea6668fa kdepim-3.1.1.ebuild 753
-MD5 1a6297f8f2f99c6ddf058d3aa3e54862 kdepim-2.2.2-r1.ebuild 697
-MD5 0ea4b6f0490e8c20050a92e957cc552b ChangeLog 4629
-MD5 2d0a203ebe2c85c806027544bbe0fa35 kdepim-3.0.5b.ebuild 580
-MD5 ce5fa57255f8b647438149e6fc6c0cd0 files/digest-kdepim-3.0.4 66
-MD5 d4b7a2d165d35d1c82d4b79713209870 files/digest-kdepim-3.1.1 66
-MD5 defed5584278061993ff62ee9777e813 files/digest-kdepim-3.0.5a 67
-MD5 e7a964df0edbdbe6597412ff98899cd2 files/digest-kdepim-3.0.5b 276
-MD5 4eb39815b3a53d49d091b47c9124fe1c files/digest-kdepim-3.1 64
-MD5 b6096c1f83c6be572d1fe8fa91bd9d83 files/post-2.2.2-kdepim.diff 7037
-MD5 9531924495b374de9fc7acf45105c3d7 files/kdepim-2.2.2-gentoo.diff 1054
-MD5 25b7171189f4ffbf21eb256a43758295 files/digest-kdepim-2.2.2-r1 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76a98084156065ff593a7b631afd2524 ChangeLog 22900
+MD5 38f90eca12bd5623fc7f28e814efd1a2 files/digest-kdepim-3.3.2 66
+MD5 38f90eca12bd5623fc7f28e814efd1a2 files/digest-kdepim-3.3.2-r1 66
+MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1 67
+MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1-r1 67
+MD5 1e18066c2900b78b7dad11a29ed0f002 files/digest-kdepim-3.4.1-r2 67
+MD5 0ff2af5e4e7ab4d292ff00305302b6b2 files/digest-kdepim-3.4.2 67
+MD5 0ff2af5e4e7ab4d292ff00305302b6b2 files/digest-kdepim-3.4.2-r1 67
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kdepim-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kdepim-3.5.0 67
+MD5 6c76eec1332f6cc580b1b0fe566039fc files/digest-kdepim-3.5.0_beta2 68
+MD5 882838f05ad3eee0570f8285e33b2753 files/digest-kdepim-3.5.0_rc1 71
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kdepim-3.5_beta1 68
+MD5 678530a6c8baabd5d9cbe817b5c571f2 files/kdepim-3.2.3-cjk.diff 6957
+MD5 c516924ee249a2899621263d30ac3676 files/kdepim-3.3.2-kmail-imap-preview.diff 667
+MD5 cdef4c59d15d12f305392988443237bd files/kdepim-3.4-configure.patch 4618
+MD5 b6a29865e7aefe8e3858bd65de651d3d files/kdepim-3.4.1-akregator-unread.patch 673
+MD5 0324965cf9c67cc4750d7a14cec3ef1f files/kdepim-3.4.1-kpilot-fix.patch 4635
+MD5 dbcc0fbc697ad83e081e07c4f7a3c58f files/kdepim-3.4.2-gcc32.patch 5997
+MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
+MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516
+MD5 403cf4b40608c3fd05e41860aa074a60 kdepim-3.3.2-r1.ebuild 739
+MD5 13ff8d47a95d1b4f4e870bcbea1e162b kdepim-3.3.2.ebuild 673
+MD5 74f0231c3966c44b4e8cfd5aa18887d5 kdepim-3.4.1-r1.ebuild 1008
+MD5 8cd935fe9371d89682261cf0b47096f1 kdepim-3.4.1-r2.ebuild 1091
+MD5 a252026b91b7bfe04775d6853857eb00 kdepim-3.4.1.ebuild 881
+MD5 76b3776e2267fb61c040baede74cbcfc kdepim-3.4.2-r1.ebuild 1103
+MD5 00f99ae1a1b1e152e071f2f91da7e96f kdepim-3.4.2.ebuild 973
+MD5 b98cfabeeff677e0b9bb92759f64dccc kdepim-3.4.3.ebuild 866
+MD5 0ca37d70d22c45a224accc9ad9b1526e kdepim-3.5.0.ebuild 670
+MD5 4000bb872fe5ff6ae994e965aa5efa98 kdepim-3.5.0_beta2.ebuild 674
+MD5 50d60c464da2a1b2c9d8ab178ddb2e41 kdepim-3.5.0_rc1.ebuild 672
+MD5 e54ada1924345a94de83f8f6095bd9e0 kdepim-3.5_beta1.ebuild 672
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhve6ntT9W3vfTuoRAlYYAJ47yWPH6XfyWrMBDGFIJkZfTMfq6ACgnftB
+uKlt1RwZXCTq9/4mP90+tgk=
+=IcCv
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim/files/kdepim-3.4-configure.patch b/kde-base/kdepim/files/kdepim-3.4-configure.patch
index d7024288d3e7..05535e4e1e3f 100644
--- a/kde-base/kdepim/files/kdepim-3.4-configure.patch
+++ b/kde-base/kdepim/files/kdepim-3.4-configure.patch
@@ -44,7 +44,7 @@ diff -Nur kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in kdepim-3.4.2/kad
 --- kdepim-3.4.2.orig/kaddressbook/xxport/configure.in.in	2005-05-23 14:12:19.000000000 +0200
 +++ kdepim-3.4.2/kaddressbook/xxport/configure.in.in	2005-07-26 14:11:23.000000000 +0200
 @@ -1,6 +1,2 @@
- # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $
+ # $Id: kdepim-3.4-configure.patch,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 -
 -KDE_CHECK_BLUETOOTH
 -KDE_CHECK_GNOKII
@@ -100,7 +100,7 @@ diff -Nur kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in kdepim-3.4.2/
 --- kdepim-3.4.2.orig/kmobile/devices/gnokii/configure.in.in	2005-05-23 14:11:26.000000000 +0200
 +++ kdepim-3.4.2/kmobile/devices/gnokii/configure.in.in	2005-07-26 14:11:23.000000000 +0200
 @@ -1,7 +1,2 @@
- # $Id: kdepim-3.4-configure.patch,v 1.1 2005/07/28 12:58:14 greg_g Exp $
+ # $Id: kdepim-3.4-configure.patch,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 -
 -# check for libgnokii (Nokia mobile phone library)
 -KDE_CHECK_GNOKII
diff --git a/kde-base/kdepim/kdepim-3.3.2-r1.ebuild b/kde-base/kdepim/kdepim-3.3.2-r1.ebuild
index e60ef49d3709..f2c432016509 100644
--- a/kde-base/kdepim/kdepim-3.3.2-r1.ebuild
+++ b/kde-base/kdepim/kdepim-3.3.2-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.2-r1.ebuild,v 1.1 2005/04/26 16:01:07 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="crypt gnokii pda cjk"
 
 DEPEND=">=kde-base/kdebase-3.3.0
 	pda? ( app-pda/pilot-link dev-libs/libmal )
-	gnokii? ( net-dialup/gnokii )
+	gnokii? ( app-mobilephone/gnokii )
 	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
 
 src_unpack() {
diff --git a/kde-base/kdepim/kdepim-3.3.2.ebuild b/kde-base/kdepim/kdepim-3.3.2.ebuild
index 999196c8e6ba..db7241177a11 100644
--- a/kde-base/kdepim/kdepim-3.3.2.ebuild
+++ b/kde-base/kdepim/kdepim-3.3.2.ebuild
@@ -1,17 +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/kde-base/kdepim/kdepim-3.3.2.ebuild,v 1.1 2004/12/09 01:56:03 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
-KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~ppc ~alpha ~ppc64"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="crypt gnokii pda cjk"
 
 DEPEND=">=kde-base/kdebase-3.3.0
 	pda? ( app-pda/pilot-link dev-libs/libmal )
-	gnokii? ( net-dialup/gnokii )
+	gnokii? ( app-mobilephone/gnokii )
 	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
 
 src_unpack() {
diff --git a/kde-base/kdepim/kdepim-3.4.1-r1.ebuild b/kde-base/kdepim/kdepim-3.4.1-r1.ebuild
index a1d3fcb839f2..3e4f70d7346d 100644
--- a/kde-base/kdepim/kdepim-3.4.1-r1.ebuild
+++ b/kde-base/kdepim/kdepim-3.4.1-r1.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.1-r1.ebuild,v 1.1 2005/06/08 21:59:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="amd64 ~ia64 ~mips ppc sparc x86 hppa"
 IUSE="crypt gnokii pda"
 
 DEPEND="~kde-base/kdebase-${PV}
 	>=dev-libs/cyrus-sasl-2
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( app-mobilephone/gnokii )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )
-	!net-www/akregator"
+	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
 
 src_unpack() {
 	kde_src_unpack
diff --git a/kde-base/kdepim/kdepim-3.4.1-r2.ebuild b/kde-base/kdepim/kdepim-3.4.1-r2.ebuild
index c47f2d93ac1f..d5697e814e91 100644
--- a/kde-base/kdepim/kdepim-3.4.1-r2.ebuild
+++ b/kde-base/kdepim/kdepim-3.4.1-r2.ebuild
@@ -1,20 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.1-r2.ebuild,v 1.1 2005/07/01 00:56:23 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="crypt gnokii pda"
 
 DEPEND="~kde-base/kdebase-${PV}
 	>=dev-libs/cyrus-sasl-2
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( app-mobilephone/gnokii )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )
-	!net-www/akregator"
+	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
 
 src_unpack() {
 	kde_src_unpack
diff --git a/kde-base/kdepim/kdepim-3.4.1.ebuild b/kde-base/kdepim/kdepim-3.4.1.ebuild
index b6d641281e59..dac6874cab35 100644
--- a/kde-base/kdepim/kdepim-3.4.1.ebuild
+++ b/kde-base/kdepim/kdepim-3.4.1.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/kde-base/kdepim/kdepim-3.4.1.ebuild,v 1.1 2005/05/27 08:55:22 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
-inherit kde-dist
+inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
@@ -13,8 +13,14 @@ DEPEND="~kde-base/kdebase-${PV}
 	>=dev-libs/cyrus-sasl-2
 	pda? ( app-pda/pilot-link dev-libs/libmal )
 	gnokii? ( app-mobilephone/gnokii )
-	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )
-	!net-www/akregator"
+	crypt? ( >=app-crypt/gpgme-0.9.0-r1 )"
+
+src_unpack() {
+	kde_src_unpack
+
+	# Last minute fix. Applied for 3.4.2.
+	epatch "${FILESDIR}/${P}-kpilot-fix.patch"
+}
 
 src_compile() {
 	# needed to detect pi-notepad.h, used by the kpilot notepad conduit.
diff --git a/kde-base/kdepim/kdepim-3.4.2-r1.ebuild b/kde-base/kdepim/kdepim-3.4.2-r1.ebuild
index 060843da8731..c33c5caa23a7 100644
--- a/kde-base/kdepim/kdepim-3.4.2-r1.ebuild
+++ b/kde-base/kdepim/kdepim-3.4.2-r1.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/kde-base/kdepim/kdepim-3.4.2-r1.ebuild,v 1.1 2005/08/02 11:29:08 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="crypt gnokii pda"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdepim/kdepim-3.4.2.ebuild b/kde-base/kdepim/kdepim-3.4.2.ebuild
index 150a802ea89c..0a07c788b6b4 100644
--- a/kde-base/kdepim/kdepim-3.4.2.ebuild
+++ b/kde-base/kdepim/kdepim-3.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/kde-base/kdepim/kdepim-3.4.2.ebuild,v 1.1 2005/07/28 12:58:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdepim/kdepim-3.4.3.ebuild b/kde-base/kdepim/kdepim-3.4.3.ebuild
index 9b396bdc3a0b..1323c554ac63 100644
--- a/kde-base/kdepim/kdepim-3.4.3.ebuild
+++ b/kde-base/kdepim/kdepim-3.4.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/kde-base/kdepim/kdepim-3.4.3.ebuild,v 1.1 2005/10/12 13:27:31 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE PIM (Personal Information Management) apps: korganizer, kmail, knode..."
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="crypt gnokii pda"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdepim/kdepim-3.5.0.ebuild b/kde-base/kdepim/kdepim-3.5.0.ebuild
index f5998d55e5b3..3042de4394b4 100644
--- a/kde-base/kdepim/kdepim-3.5.0.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.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/kde-base/kdepim/kdepim-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild b/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild
index 94cfbd44586c..30a5eb2bd29f 100644
--- a/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.0_beta2.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/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild b/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild
index d3b1c57eb471..7ef754f87012 100644
--- a/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild
+++ b/kde-base/kdepim/kdepim-3.5.0_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/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:38:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdepim/kdepim-3.5_beta1.ebuild b/kde-base/kdepim/kdepim-3.5_beta1.ebuild
index cdaa5e1db181..b13d66f1bb0c 100644
--- a/kde-base/kdepim/kdepim-3.5_beta1.ebuild
+++ b/kde-base/kdepim/kdepim-3.5_beta1.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/kde-base/kdepim/kdepim-3.5_beta1.ebuild,v 1.1 2005/09/21 17:25:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim/kdepim-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdepim/metadata.xml b/kde-base/kdepim/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdepim/metadata.xml
+++ b/kde-base/kdepim/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeprint/ChangeLog b/kde-base/kdeprint/ChangeLog
index 242b3a2ed4d0..13414ffe0e49 100644
--- a/kde-base/kdeprint/ChangeLog
+++ b/kde-base/kdeprint/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kdeprint
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/ChangeLog,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeprint-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdeprint-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdeprint-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeprint-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeprint-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdeprint-3.5_beta1.ebuild,
+  kdeprint-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeprint-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeprint-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeprint-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeprint-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeprint-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdeprint-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeprint-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdeprint-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdeprint-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeprint-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeprint-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdeprint-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeprint-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdeprint-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdeprint-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeprint-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeprint-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdeprint-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeprint-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeprint-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdeprint-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeprint-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeprint/Manifest b/kde-base/kdeprint/Manifest
index b9e8bc960314..6d95030e1222 100644
--- a/kde-base/kdeprint/Manifest
+++ b/kde-base/kdeprint/Manifest
@@ -1,4 +1,26 @@
-MD5 b742d742888a0a4385b3f3a89d82f424 kdeprint-3.4.0_beta1.ebuild 488
-MD5 b742d742888a0a4385b3f3a89d82f424 kdeprint-3.4.0_alpha1.ebuild 488
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdeprint-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdeprint-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 59446f97e4ef20484893e2779f8d1662 ChangeLog 3605
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdeprint-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdeprint-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdeprint-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdeprint-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdeprint-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdeprint-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdeprint-3.5_beta1 69
+MD5 eef4cc9fa42b2f45b85e576280f93cd9 kdeprint-3.4.1.ebuild 510
+MD5 f640b99375ba6c2c98e77127dff658e0 kdeprint-3.4.2.ebuild 523
+MD5 04cf7fa9eea75abb322f7b1b7d6a211a kdeprint-3.4.3.ebuild 519
+MD5 d1a9fbc175163c9b433f3f0c697bd4f8 kdeprint-3.5.0.ebuild 499
+MD5 f50fb8a17c5fef4864c61e3d3e01dd7e kdeprint-3.5.0_beta2.ebuild 504
+MD5 5e50f915cb0a05ac0864f4d8f28762a5 kdeprint-3.5.0_rc1.ebuild 503
+MD5 59dd13887e1abaafc878b5d835b2e1de kdeprint-3.5_beta1.ebuild 502
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkB5ntT9W3vfTuoRAqkYAJ42l+eOcE3vDZ7ZDbuQQ2eHU9/DrACeKUxK
+z6oplOY1qD4D45+R3ge3ylI=
+=T/Oy
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeprint/files/digest-kdeprint-3.4.1 b/kde-base/kdeprint/files/digest-kdeprint-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdeprint/files/digest-kdeprint-3.4.1
+++ b/kde-base/kdeprint/files/digest-kdeprint-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdeprint/files/digest-kdeprint-3.4.2 b/kde-base/kdeprint/files/digest-kdeprint-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdeprint/files/digest-kdeprint-3.4.2
+++ b/kde-base/kdeprint/files/digest-kdeprint-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdeprint/kdeprint-3.4.1.ebuild b/kde-base/kdeprint/kdeprint-3.4.1.ebuild
index ff1d7e9e5160..d8da08592c74 100644
--- a/kde-base/kdeprint/kdeprint-3.4.1.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.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/kde-base/kdeprint/kdeprint-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE printer queue/device manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
diff --git a/kde-base/kdeprint/kdeprint-3.4.2.ebuild b/kde-base/kdeprint/kdeprint-3.4.2.ebuild
index 80a8986466cc..b01c4040c34c 100644
--- a/kde-base/kdeprint/kdeprint-3.4.2.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.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/kde-base/kdeprint/kdeprint-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE printer queue/device manager"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
diff --git a/kde-base/kdeprint/kdeprint-3.4.3.ebuild b/kde-base/kdeprint/kdeprint-3.4.3.ebuild
index d281d00be5dd..e2dab39cbdf4 100644
--- a/kde-base/kdeprint/kdeprint-3.4.3.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.4.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/kde-base/kdeprint/kdeprint-3.4.3.ebuild,v 1.1 2005/10/13 00:09:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE printer queue/device manager"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
diff --git a/kde-base/kdeprint/kdeprint-3.5.0.ebuild b/kde-base/kdeprint/kdeprint-3.5.0.ebuild
index 9fcbab42849b..6098b4971a6d 100644
--- a/kde-base/kdeprint/kdeprint-3.5.0.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.5.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/kde-base/kdeprint/kdeprint-3.5.0.ebuild,v 1.1 2005/11/22 22:14:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdeprint/kdeprint-3.5.0_beta2.ebuild b/kde-base/kdeprint/kdeprint-3.5.0_beta2.ebuild
index 22f9706ffaa3..74c7f06c108a 100644
--- a/kde-base/kdeprint/kdeprint-3.5.0_beta2.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.5.0_beta2.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/kde-base/kdeprint/kdeprint-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE printer queue/device manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
diff --git a/kde-base/kdeprint/kdeprint-3.5.0_rc1.ebuild b/kde-base/kdeprint/kdeprint-3.5.0_rc1.ebuild
index 0f3d320661e7..588c851bd1bd 100644
--- a/kde-base/kdeprint/kdeprint-3.5.0_rc1.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.5.0_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/kde-base/kdeprint/kdeprint-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdeprint/kdeprint-3.5_beta1.ebuild b/kde-base/kdeprint/kdeprint-3.5_beta1.ebuild
index f4cf77661b62..cd6efd7e6271 100644
--- a/kde-base/kdeprint/kdeprint-3.5_beta1.ebuild
+++ b/kde-base/kdeprint/kdeprint-3.5_beta1.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/kde-base/kdeprint/kdeprint-3.5_beta1.ebuild,v 1.1 2005/09/22 18:38:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeprint/kdeprint-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE printer queue/device manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="cups"
 
 DEPEND="cups? ( net-print/cups )"
diff --git a/kde-base/kdeprint/metadata.xml b/kde-base/kdeprint/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeprint/metadata.xml
+++ b/kde-base/kdeprint/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesdk-kfile-plugins/ChangeLog b/kde-base/kdesdk-kfile-plugins/ChangeLog
index 280fcf7862ab..227165e988be 100644
--- a/kde-base/kdesdk-kfile-plugins/ChangeLog
+++ b/kde-base/kdesdk-kfile-plugins/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/kdesdk-kfile-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
+
+*kdesdk-kfile-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-kfile-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdesdk-kfile-plugins-3.5_beta1.ebuild,
+  kdesdk-kfile-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdesdk-kfile-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-kfile-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesdk-kfile-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesdk-kfile-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-kfile-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdesdk-kfile-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-kfile-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kdesdk-kfile-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-kfile-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdesdk-kfile-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kfile-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-kfile-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kdesdk-kfile-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdesdk-kfile-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdesdk-kfile-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-kfile-plugins-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesdk-kfile-plugins-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kfile-plugins-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdesdk-kfile-plugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kfile-plugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdesdk-kfile-plugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesdk-kfile-plugins/Manifest b/kde-base/kdesdk-kfile-plugins/Manifest
index b9e70348483a..b088aadca1f3 100644
--- a/kde-base/kdesdk-kfile-plugins/Manifest
+++ b/kde-base/kdesdk-kfile-plugins/Manifest
@@ -1,4 +1,10 @@
-MD5 67d7ac3e43400043c6d402b349b6f24d kdesdk-kfile-plugins-3.4.0_alpha1.ebuild 314
-MD5 67d7ac3e43400043c6d402b349b6f24d kdesdk-kfile-plugins-3.4.0_beta1.ebuild 314
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kdesdk-kfile-plugins-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kdesdk-kfile-plugins-3.4.0_beta1 210
+MD5 cfc0765db4618c41b3cdffdfcb267daf ChangeLog 3073
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kdesdk-kfile-plugins-3.4.1 206
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kdesdk-kfile-plugins-3.5.0 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kdesdk-kfile-plugins-3.5.0_beta2 210
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-kfile-plugins-3.5_beta1 67
+MD5 dea57ac825fddb92be7edb74b24c4251 kdesdk-kfile-plugins-3.4.1.ebuild 465
+MD5 8be1802fccc46ce54b8d1bf6db54cfca kdesdk-kfile-plugins-3.5.0.ebuild 448
+MD5 074b46690e0d15d196054af3d1c9768a kdesdk-kfile-plugins-3.5.0_beta2.ebuild 460
+MD5 80d750966280354f5de6afaa53963a9d kdesdk-kfile-plugins-3.5_beta1.ebuild 451
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdesdk-kfile-plugins/files/digest-kdesdk-kfile-plugins-3.4.1 b/kde-base/kdesdk-kfile-plugins/files/digest-kdesdk-kfile-plugins-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kdesdk-kfile-plugins/files/digest-kdesdk-kfile-plugins-3.4.1
+++ b/kde-base/kdesdk-kfile-plugins/files/digest-kdesdk-kfile-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.4.1.ebuild b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.4.1.ebuild
index 8efe55b7ddab..d685d63967ef 100644
--- a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.4.1.ebuild
+++ b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="kfile-plugins"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins for .cpp, .h, .diff and .ts files"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0.ebuild b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0.ebuild
index 38635348ac03..ad407a397de1 100644
--- a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0.ebuild
+++ b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.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/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="kfile-plugins"
diff --git a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0_beta2.ebuild b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0_beta2.ebuild
index de775d4a2de4..4dd0a34bd464 100644
--- a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="kfile-plugins"
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins for .cpp, .h, .diff and .ts files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5_beta1.ebuild b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5_beta1.ebuild
index 954dc207b3d5..1ff72ec532d4 100644
--- a/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5_beta1.ebuild
+++ b/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5_beta1.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/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 18:38:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kfile-plugins/kdesdk-kfile-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="kfile-plugins"
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kfile plugins for .cpp, .h, .diff and .ts files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdesdk-kfile-plugins/metadata.xml b/kde-base/kdesdk-kfile-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesdk-kfile-plugins/metadata.xml
+++ b/kde-base/kdesdk-kfile-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesdk-kioslaves/ChangeLog b/kde-base/kdesdk-kioslaves/ChangeLog
index 67bc0e1ab752..8b7d0c4303b8 100644
--- a/kde-base/kdesdk-kioslaves/ChangeLog
+++ b/kde-base/kdesdk-kioslaves/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kdesdk-kioslaves
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/ChangeLog,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-kioslaves-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-kioslaves-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdesdk-kioslaves-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdesdk-kioslaves-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-kioslaves-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdesdk-kioslaves-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-kioslaves-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdesdk-kioslaves-3.5_beta1.ebuild, kdesdk-kioslaves-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdesdk-kioslaves-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-kioslaves-3.5.0_beta2.ebuild:
+  New version.
+
+*kdesdk-kioslaves-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-kioslaves-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesdk-kioslaves-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesdk-kioslaves-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-kioslaves-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdesdk-kioslaves-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-kioslaves-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kdesdk-kioslaves-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kioslaves-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdesdk-kioslaves-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-kioslaves-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdesdk-kioslaves-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kioslaves-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-kioslaves-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdesdk-kioslaves-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdesdk-kioslaves-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kdesdk-kioslaves-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-kioslaves-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesdk-kioslaves-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kioslaves-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdesdk-kioslaves-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-kioslaves-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdesdk-kioslaves-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesdk-kioslaves/Manifest b/kde-base/kdesdk-kioslaves/Manifest
index 8335d2d9996b..39150d394191 100644
--- a/kde-base/kdesdk-kioslaves/Manifest
+++ b/kde-base/kdesdk-kioslaves/Manifest
@@ -1,4 +1,16 @@
-MD5 800913b8844371afe76d8949c36de007 kdesdk-kioslaves-3.4.0_beta1.ebuild 345
-MD5 800913b8844371afe76d8949c36de007 kdesdk-kioslaves-3.4.0_alpha1.ebuild 345
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kdesdk-kioslaves-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kdesdk-kioslaves-3.4.0_beta1 210
+MD5 1f7be8505964acd812418e5ec378deb3 ChangeLog 3733
+MD5 39608e34e5602a69914845a449bc1b7b kdesdk-kioslaves-3.4.1.ebuild 481
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 c0006eb663c9464c4e294fe73a063956 kdesdk-kioslaves-3.4.2.ebuild 491
+MD5 2c4d15036a4e4ce430bedbec0082bf85 kdesdk-kioslaves-3.5_beta1.ebuild 474
+MD5 375f821886282a5f95f1e38cc456b3be kdesdk-kioslaves-3.4.3.ebuild 486
+MD5 1c77f49effd8dff0153f7e07fc2337da kdesdk-kioslaves-3.5.0_beta2.ebuild 476
+MD5 ef48787f9e4318e03fd7b14003747cbf kdesdk-kioslaves-3.5.0_rc1.ebuild 475
+MD5 2c2dbf2d3ea41e120946e18924a0e8d2 kdesdk-kioslaves-3.5.0.ebuild 471
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kdesdk-kioslaves-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-kdesdk-kioslaves-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-kioslaves-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kdesdk-kioslaves-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kdesdk-kioslaves-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-kdesdk-kioslaves-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kdesdk-kioslaves-3.5.0 66
diff --git a/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.1 b/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.1
+++ b/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.2 b/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.2
+++ b/kde-base/kdesdk-kioslaves/files/digest-kdesdk-kioslaves-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.1.ebuild
index f8421c08d3d3..2a295302fefc 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.1.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
@@ -9,6 +9,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="dev-util/subversion"
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.2.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.2.ebuild
index f9b6a375b20c..bf91c6e264ab 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.2.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.3.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.3.ebuild
index d4d2a53499dc..3278a2b949a1 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.3.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="dev-util/subversion"
 
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0.ebuild
index 6a6a587ee39b..3708d0283b2b 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_beta2.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_beta2.ebuild
index 72fdafb2a817..14641274270a 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_beta2.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_beta2.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-util/subversion"
 
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_rc1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_rc1.ebuild
index a241275cbb18..5b90e83297ad 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_rc1.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
diff --git a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5_beta1.ebuild b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5_beta1.ebuild
index ce59a1554231..c3cc6579fac5 100644
--- a/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5_beta1.ebuild
+++ b/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5_beta1.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/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5_beta1.ebuild,v 1.1 2005/09/22 18:40:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-kioslaves/kdesdk-kioslaves-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE=kioslave
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kioslaves from kdesdk package: the subversion kioslave"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-util/subversion"
 
diff --git a/kde-base/kdesdk-kioslaves/metadata.xml b/kde-base/kdesdk-kioslaves/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesdk-kioslaves/metadata.xml
+++ b/kde-base/kdesdk-kioslaves/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesdk-meta/ChangeLog b/kde-base/kdesdk-meta/ChangeLog
index d0440a6582eb..fa1af9f8ba3f 100644
--- a/kde-base/kdesdk-meta/ChangeLog
+++ b/kde-base/kdesdk-meta/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/kdesdk-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kdesdk-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdesdk-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdesdk-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdesdk-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdesdk-meta-3.5_beta1.ebuild, kdesdk-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdesdk-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdesdk-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesdk-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesdk-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdesdk-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdesdk-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kdesdk-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdesdk-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdesdk-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdesdk-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdesdk-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> kdesdk-meta-3.4.0.ebuild:
+  Make suport for subversion optional.
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdesdk-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdesdk-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdesdk-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdesdk-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesdk-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdesdk-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdesdk-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesdk-meta/Manifest b/kde-base/kdesdk-meta/Manifest
index 6d9dc10ee486..404f855fbb18 100644
--- a/kde-base/kdesdk-meta/Manifest
+++ b/kde-base/kdesdk-meta/Manifest
@@ -1,4 +1,16 @@
-MD5 0744bb9d7fe5a1e52932148776b8ddd4 kdesdk-meta-3.4.0_alpha1.ebuild 1000
-MD5 0744bb9d7fe5a1e52932148776b8ddd4 kdesdk-meta-3.4.0_beta1.ebuild 1000
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.4.0_beta1 0
+MD5 ca48aec37af0742671d0e7d5aaf5558a ChangeLog 3888
+MD5 d7d74ad03e831442c3c9c22bce75ff3d kdesdk-meta-3.4.1.ebuild 1154
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 a408c890b609771bd640704bb99f1113 kdesdk-meta-3.4.2.ebuild 1174
+MD5 93b7f6f03ffb43bf3f26efdb90fff37d kdesdk-meta-3.5_beta1.ebuild 1145
+MD5 740967f85e9d9ce6190627af848d5dd3 kdesdk-meta-3.4.3.ebuild 1169
+MD5 485ad74e8aa1b852b8f13def34ea9cc4 kdesdk-meta-3.5.0_beta2.ebuild 1165
+MD5 c9715ef634224d04626265afb6ad465f kdesdk-meta-3.5.0_rc1.ebuild 1188
+MD5 082e0cd3f1c8beec22e3079c07384d29 kdesdk-meta-3.5.0.ebuild 1142
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.5_beta1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdesdk-meta-3.5.0 0
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.4.1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.4.1.ebuild
index eb0a4d7de63f..bc64043af10c 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.4.1.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.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/kde-base/kdesdk-meta/kdesdk-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE="subversion"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.4.2.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.4.2.ebuild
index 20aa0a1d7327..ff141c7b6ffd 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.4.2.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.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/kde-base/kdesdk-meta/kdesdk-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.4.3.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.4.3.ebuild
index 7b7ece176322..e7ff23d3c377 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.4.3.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.4.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/kde-base/kdesdk-meta/kdesdk-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE="subversion"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.5.0.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.5.0.ebuild
index 575f97af66b6..28a048812860 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.5.0.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.5.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/kde-base/kdesdk-meta/kdesdk-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_beta2.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_beta2.ebuild
index cc49f413d4ea..8fa83c8e50bd 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_beta2.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/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="subversion"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_rc1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_rc1.ebuild
index daac56f12a9d..a872b27bb6da 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_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/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdesdk-meta/kdesdk-meta-3.5_beta1.ebuild b/kde-base/kdesdk-meta/kdesdk-meta-3.5_beta1.ebuild
index 494070ed9fd0..7c4eadf60e69 100644
--- a/kde-base/kdesdk-meta/kdesdk-meta-3.5_beta1.ebuild
+++ b/kde-base/kdesdk-meta/kdesdk-meta-3.5_beta1.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/kde-base/kdesdk-meta/kdesdk-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:51:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-meta/kdesdk-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="subversion"
 
 RDEPEND="
diff --git a/kde-base/kdesdk-meta/metadata.xml b/kde-base/kdesdk-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesdk-meta/metadata.xml
+++ b/kde-base/kdesdk-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesdk-misc/ChangeLog b/kde-base/kdesdk-misc/ChangeLog
index bbbd9e0928dc..ff6d7c1ffe84 100644
--- a/kde-base/kdesdk-misc/ChangeLog
+++ b/kde-base/kdesdk-misc/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for kde-base/kdesdk-misc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/ChangeLog,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
+
+*kdesdk-misc-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-misc-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdesdk-misc-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesdk-misc-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesdk-misc-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-misc-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdesdk-misc-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-misc-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdesdk-misc-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdesdk-misc-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdesdk-misc-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-misc-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdesdk-misc-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdesdk-misc-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdesdk-misc-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdesdk-misc-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-misc-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesdk-misc-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-misc-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdesdk-misc-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesdk-misc/Manifest b/kde-base/kdesdk-misc/Manifest
index 843488b17978..3a7a0717cc24 100644
--- a/kde-base/kdesdk-misc/Manifest
+++ b/kde-base/kdesdk-misc/Manifest
@@ -1,4 +1,8 @@
-MD5 3240d58a8cd9c4d0dcbbc9f67a32d9eb kdesdk-misc-3.4.0_beta1.ebuild 395
-MD5 3240d58a8cd9c4d0dcbbc9f67a32d9eb kdesdk-misc-3.4.0_alpha1.ebuild 395
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kdesdk-misc-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kdesdk-misc-3.4.0_beta1 210
+MD5 34ccd062b338f2368f31a51eab458d37 ChangeLog 2496
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kdesdk-misc-3.4.1 206
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kdesdk-misc-3.5.0 66
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-misc-3.5_beta1 67
+MD5 6b6b44fe221c713810ca58463a95350e kdesdk-misc-3.4.1.ebuild 528
+MD5 4f21c2e446565c495cba629a475fb4db kdesdk-misc-3.5.0.ebuild 511
+MD5 9a9b4e7545aa5f2a8ecdf2400dbc89a9 kdesdk-misc-3.5_beta1.ebuild 521
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdesdk-misc/files/digest-kdesdk-misc-3.4.1 b/kde-base/kdesdk-misc/files/digest-kdesdk-misc-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kdesdk-misc/files/digest-kdesdk-misc-3.4.1
+++ b/kde-base/kdesdk-misc/files/digest-kdesdk-misc-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-3.4.1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-3.4.1.ebuild
index c33fca65e370..6f7a83b17ff0 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-3.4.1.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-3.4.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 KMNAME=kdesdk
 KMNOMODULE="true"
 KMNODOCS="true"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kdesdk-misc - Various files and utilities"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 
 KMEXTRA="kdepalettes/
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-3.5.0.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-3.5.0.ebuild
index fca995d6b0b8..c29f06738bd4 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-3.5.0.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-3.5.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/kde-base/kdesdk-misc/kdesdk-misc-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 KMNAME=kdesdk
 KMNOMODULE="true"
diff --git a/kde-base/kdesdk-misc/kdesdk-misc-3.5_beta1.ebuild b/kde-base/kdesdk-misc/kdesdk-misc-3.5_beta1.ebuild
index eaaf906a51bb..b7e8d36b8e71 100644
--- a/kde-base/kdesdk-misc/kdesdk-misc-3.5_beta1.ebuild
+++ b/kde-base/kdesdk-misc/kdesdk-misc-3.5_beta1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-3.5_beta1.ebuild,v 1.1 2005/09/22 18:40:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-misc/kdesdk-misc-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 KMNAME=kdesdk
 KMNOMODULE="true"
 KMNODOCS="true"
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kdesdk-misc - Various files and utilities"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="kdepalettes/
diff --git a/kde-base/kdesdk-misc/metadata.xml b/kde-base/kdesdk-misc/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesdk-misc/metadata.xml
+++ b/kde-base/kdesdk-misc/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesdk-scripts/ChangeLog b/kde-base/kdesdk-scripts/ChangeLog
index a9bd41b8e550..88e2b8b17c3b 100644
--- a/kde-base/kdesdk-scripts/ChangeLog
+++ b/kde-base/kdesdk-scripts/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/kdesdk-scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/ChangeLog,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
+
+*kdesdk-scripts-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-scripts-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdesdk-scripts-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-scripts-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdesdk-scripts-3.5_beta1.ebuild, kdesdk-scripts-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdesdk-scripts-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-scripts-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesdk-scripts-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesdk-scripts-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-scripts-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdesdk-scripts-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesdk-scripts-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdesdk-scripts-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-scripts-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdesdk-scripts-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-scripts-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kdesdk-scripts-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdesdk-scripts-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdesdk-scripts-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdesdk-scripts-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdesdk-scripts-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesdk-scripts-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-scripts-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdesdk-scripts-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdesdk-scripts-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdesdk-scripts-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesdk-scripts/Manifest b/kde-base/kdesdk-scripts/Manifest
index 4361b1a3c07c..15996758ff2e 100644
--- a/kde-base/kdesdk-scripts/Manifest
+++ b/kde-base/kdesdk-scripts/Manifest
@@ -1,4 +1,12 @@
-MD5 cedacabe713affd32250b6ca2f395eb9 kdesdk-scripts-3.4.0_alpha1.ebuild 333
-MD5 cedacabe713affd32250b6ca2f395eb9 kdesdk-scripts-3.4.0_beta1.ebuild 333
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kdesdk-scripts-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kdesdk-scripts-3.4.0_beta1 210
+MD5 61858ae37650bacaa78f3452736a3f5b ChangeLog 3054
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kdesdk-scripts-3.4.1 206
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kdesdk-scripts-3.5.0 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kdesdk-scripts-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-kdesdk-scripts-3.5.0_rc1 292
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-scripts-3.5_beta1 67
+MD5 eff54b2716b45f779abc8ea75a7f5d1b kdesdk-scripts-3.4.1.ebuild 471
+MD5 80e0fa172fc0f539a3f4de684e29e3f6 kdesdk-scripts-3.5.0.ebuild 454
+MD5 1abd313a7554aba54a73842bec78e3bd kdesdk-scripts-3.5.0_beta2.ebuild 459
+MD5 87da3761dd5828ac03d2333c7adce4bb kdesdk-scripts-3.5.0_rc1.ebuild 458
+MD5 fcd70728540900438ee5aa8496d7bf36 kdesdk-scripts-3.5_beta1.ebuild 457
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdesdk-scripts/files/digest-kdesdk-scripts-3.4.1 b/kde-base/kdesdk-scripts/files/digest-kdesdk-scripts-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kdesdk-scripts/files/digest-kdesdk-scripts-3.4.1
+++ b/kde-base/kdesdk-scripts/files/digest-kdesdk-scripts-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.4.1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.4.1.ebuild
index 5043f238ab93..e29c9fd58dcb 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-3.4.1.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="scripts"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0.ebuild
index 7c239c7a430e..55d1b0bb9703 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.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/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="scripts"
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_beta2.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_beta2.ebuild
index 388af8b13e6b..e3f99c331584 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_beta2.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_beta2.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/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="scripts"
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_rc1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_rc1.ebuild
index a2534c18f89c..81d91e15dbc3 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_rc1.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_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/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="scripts"
diff --git a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5_beta1.ebuild b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5_beta1.ebuild
index 75bf7d429f43..a4ff8a48a47f 100644
--- a/kde-base/kdesdk-scripts/kdesdk-scripts-3.5_beta1.ebuild
+++ b/kde-base/kdesdk-scripts/kdesdk-scripts-3.5_beta1.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/kde-base/kdesdk-scripts/kdesdk-scripts-3.5_beta1.ebuild,v 1.1 2005/09/22 18:41:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk-scripts/kdesdk-scripts-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdesdk
 KMMODULE="scripts"
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kdesdk Scripts - Some useful scripts for the development of applications"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdesdk-scripts/metadata.xml b/kde-base/kdesdk-scripts/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesdk-scripts/metadata.xml
+++ b/kde-base/kdesdk-scripts/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesdk/ChangeLog b/kde-base/kdesdk/ChangeLog
index c9d6b88bc06e..f586cb806b02 100644
--- a/kde-base/kdesdk/ChangeLog
+++ b/kde-base/kdesdk/ChangeLog
@@ -1,6 +1,451 @@
 # ChangeLog for kde-base/kdesdk
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/ChangeLog,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdesdk-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdesdk-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdesdk-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdesdk-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.5.0_rc1.ebuild:
+  New version.
+
+*kdesdk-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdesdk-3.5.0_beta2.ebuild:
+  New version.
+
+*kdesdk-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesdk-3.4.3.ebuild:
+  New version.
+
+*kdesdk-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.4.3.ebuild:
+  New version.
+
+*kdesdk-3.5_beta1-r1 (28 Sep 2005)
+
+  28 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdesdk-3.5_beta1-crash.patch, -kdesdk-3.5_beta1.ebuild,
+  +kdesdk-3.5_beta1-r1.ebuild:
+  Added patch to fix umbrello crash on starting.
+
+*kdesdk-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdesdk-3.5_beta1-compile.patch, +kdesdk-3.5_beta1.ebuild:
+  New version.
+
+*kdesdk-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdesdk-3.5-configure-db.patch,
+  +files/kdesdk-3.5_alpha1-compile.patch, +kdesdk-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kdesdk-3.4.1.ebuild:
+  Stable on ppc.
+
+  05 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdesdk-3.4.1.ebuild:
+  Stable on sparc
+
+  03 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kdesdk-3.4.2.ebuild:
+  Add dependency on graphviz (#100916).
+
+  28 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdesdk-3.4.1.ebuild,
+  kdesdk-3.4.2.ebuild:
+  Stable on hppa.
+
+*kdesdk-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdesdk-3.4-configure.patch, +kdesdk-3.4.2.ebuild:
+  New version. Add configure patch (#81966). Add dependency on sys-libs/db.
+
+  04 Jul 2005; Jason Wever <weeve@gentoo.org> kdesdk-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+  28 Jun 2005; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.3.ebuild:
+  Calltree isn't in portage anymore, remove dep (I don't think it will work
+  with callgrind out of the box)
+
+*kdesdk-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.4.1.ebuild:
+  New version.
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> kdesdk-3.4.0.ebuild:
+  Add optional suport for subversion.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdesdk-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdesdk-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdesdk-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.4.0_rc1.ebuild:
+  New version.
+
+*kdesdk-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.4.0_beta2.ebuild:
+  Version bump.
+
+  08 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  kdesdk-3.3.1.ebuild, kdesdk-3.3.2.ebuild:
+  Pushing to stable on ppc with pvdabeel's approval to stay in line with rest
+  of kde.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdesdk-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+*kdesdk-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdesdk-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdesdk-3.3.2.ebuild:
+  Stable on sparc
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdesdk-3.3.2.ebuild:
+  Stable on hppa.
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdesdk-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.3.2.ebuild:
+  x86 stable
+
+  13 Dec 2004; Benjamin Schindler <config@gentoo.org> kdesdk-3.3.0.ebuild:
+  Stable on amd64
+
+*kdesdk-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.3.2.ebuild:
+  Version bump
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+*kdesdk-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.3.1.ebuild:
+  Version bump
+
+  06 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdesdk-3.3.0.ebuild:
+  Stable on hppa.
+
+  29 Sep 2004; Carsten Lohrke <carlo@gentoo.org> kdesdk-3.2.3.ebuild,
+  kdesdk-3.3.0.ebuild:
+  updated DESCRIPTION slightly
+
+  23 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.3.0.ebuild:
+  Change the dep to callgrind, as that's what the package 
+  is called now
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdesdk-3.2.1.ebuild:
+  marking 3.3.0 x86 stable
+
+  03 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.3.0.ebuild:
+  Add cvs as a runtime dep of kdesdk
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdesdk-3.1.5.ebuild, kdesdk-3.2.0.ebuild, kdesdk-3.2.1.ebuild,
+  kdesdk-3.2.2.ebuild, kdesdk-3.3.0.ebuild:
+  Masked kdesdk-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdesdk-3.1.5.ebuild, kdesdk-3.2.0.ebuild, kdesdk-3.2.1.ebuild,
+  kdesdk-3.2.2.ebuild:
+  Masked kdesdk-3.2.3.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdesdk-3.1.5.ebuild, kdesdk-3.2.0.ebuild, kdesdk-3.2.1.ebuild,
+  kdesdk-3.2.2.ebuild:
+  Masked kdesdk-3.2.2.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdesdk-3.1.5.ebuild, kdesdk-3.2.0.ebuild, kdesdk-3.2.1.ebuild:
+  Masked kdesdk-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdesdk-3.1.5.ebuild, kdesdk-3.2.0.ebuild:
+  Masked kdesdk-3.2.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdesdk-3.1.5.ebuild:
+  Masked kdesdk-3.1.5.ebuild stable for ppc
+
+*kdesdk-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.3.0.ebuild,
+  kdesdk-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdesdk-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.3.0_beta1.ebuild,
+  kdesdk-3.3.0_rc2.ebuild:
+  Add _rc2, remove _beta1
+
+  09 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdesdk-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdesdk-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.3.0_beta2.ebuild:
+  new beta
+
+*kdesdk-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdesdk-3.3.0_alpha1.ebuild,
+  +kdesdk-3.3.0_beta1.ebuild:
+  New beta, remove alpha
+
+*kdesdk-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdesdk-3.2.2.ebuild:
+  stable on amd64
+
+*kdesdk-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.3.0_alpha1.ebuild:
+  3.3 alpha 1 - hardmasked
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.2.2.ebuild:
+  Stable on sparc.
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdesdk-3.0.5b.ebuild:
+  Remove old version
+
+*kdesdk-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org> +kdesdk-3.2.2.ebuild:
+  Version bump
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.4.ebuild,
+  kdesdk-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kdesdk-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  23 Feb 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> :
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdesdk-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdesdk-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0.ebuild,
+  kdesdk-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  25 Jan 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0_rc1:
+  Make calltree dep an x86 only dep as it's for valgrind is which for x86 only.
+
+
+*kdesdk-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.0.4.ebuild,
+  kdesdk-3.1.2.ebuild, kdesdk-3.2.0_beta1-r1.ebuild,
+  kdesdk-3.2.0_beta2.ebuild, kdesdk-3.2.0_rc1.ebuild:
+  New version, removing older versions
+
+*kdesdk-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.5.ebuild:
+  New version
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.1.4.ebuild:
+  Marked stable on sparc.
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdesdk-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdesdk-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0_beta2.ebuild:
+  New beta version
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdesdk-3.1.4.ebuild:
+  Marked ppc
+
+*kdesdk-3.2.0_beta1-r1 (05 Nov 2003)
+
+  05 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0_beta1-r1.ebuild:
+  Put in blocking deps against umbrello and kcachegrind.
+  Add kcachegrind deps so it builds.
+
+*kdesdk-3.2.0_beta1 (01 Nov 2003)
+
+  01 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0_beta1.ebuild:
+  New beta version
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-2.2.2-r1.ebuild,
+  kdesdk-2.2.2-r1.ebuild, kdesdk-3.1.1.ebuild, kdesdk-3.1.1.ebuild,
+  kdesdk-3.1.3.ebuild, kdesdk-3.1.3.ebuild, files/kdesdk-2.2.2-gentoo.diff:
+  removing stale versions
+
+*kdesdk-3.2.0_alpha2 (25 Sep 2003)
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.4.ebuild:
+  marking x86 stable
+
+*kdesdk-3.1.4 (16 Sep 2003)
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.4.ebuild:
+  New version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdesdk-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.3.ebuild:
+  x86 stable
+
+*kdesdk-3.1.3 (06 Aug 2003)
+
+  06 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdesdk-3.1.3.ebuild:
+  New version of KDE.
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1 
+
+*kdesdk-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdesdk-3.1.2.ebuild:
+  New version of KDE.
+
+*kdesdk-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdesdk-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdesdk-3.1.1 (14 Mar 2003)
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdesdk-3.1.1.ebuild:
+  version bump
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdesdk-2.2.2.ebuild,
+  kdesdk-3.0.2.ebuild, kdesdk-3.0.3.ebuild, kdesdk-3.1_rc6.ebuild:
+  removed old ebuilds
+
+*kdesdk-2.2.2-r1 (17 Jan 2003)
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdesdk-3.1.ebuild:
+  added ~sparc to keywords
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdesdk-2.2.2-r1.ebuild:
+  new version, fixes #12520
+
+*kdesdk-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdesdk-3.1_rc6.ebuild:
+  version bump
+
+*kdesdk-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdesdk-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdesdk-3.0.5a.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*kdesdk-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdesdk-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdesdk-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdesdk-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdesdk-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : : : : : : : :
+
+  New stability release.
+
+*kdesdk-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdesdk-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdesdk-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdesdk-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdesdk/Manifest b/kde-base/kdesdk/Manifest
index 002835d3af7d..d02e2cb2395a 100644
--- a/kde-base/kdesdk/Manifest
+++ b/kde-base/kdesdk/Manifest
@@ -1,14 +1,32 @@
-MD5 2f6d4d9c34d9c33783193e7b27caf510 kdesdk-3.1.ebuild 308
-MD5 d29e7dadf471f8a524bd0d2d77e3d2ce kdesdk-3.0.5a.ebuild 327
-MD5 dd022a9ce711fa89a564de5fcf659f9a kdesdk-3.0.4.ebuild 318
-MD5 37ff80f8f4c4c79a16d60a8f4b5f9370 kdesdk-2.2.2-r1.ebuild 525
-MD5 f162342dd6a24d1fe9407b115417c014 kdesdk-3.1.1.ebuild 310
-MD5 ce3e412d065b62401130070e5b498e62 kdesdk-3.0.5b.ebuild 329
-MD5 3614790dae236412a041bf96ce58e692 ChangeLog 3037
-MD5 e6c4829fcdb280108dcff69be0553960 files/digest-kdesdk-2.2.2-r1 131
-MD5 b38a426f5d7fc0a9679f467892059329 files/kdesdk-2.2.2-gentoo.diff 1062
-MD5 8aeaed4631590b1c686d4ddff85ee95d files/digest-kdesdk-3.0.4 66
-MD5 e7476a61e7c8d9c228c84d56cc50ddf5 files/digest-kdesdk-3.1.1 66
-MD5 fc2f7066ef31027bd98e449622f48083 files/digest-kdesdk-3.1 64
-MD5 b82585f85bb5a3d6da06b296965c4602 files/digest-kdesdk-3.0.5a 67
-MD5 d18ba202d291a6ba4a4ef422cdee53bd files/digest-kdesdk-3.0.5b 204
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8b10904953791ad752ad26a3f7610627 ChangeLog 13630
+MD5 05b78a43919e346c710b79326bac8ad5 files/digest-kdesdk-3.3.2 66
+MD5 e9178add9702e87b7fe025e8f7a2f8db files/digest-kdesdk-3.4.1 66
+MD5 086313a32c0a92f42f8050236d4494ab files/digest-kdesdk-3.4.2 66
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kdesdk-3.4.3 66
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kdesdk-3.5.0 66
+MD5 6790f4c90852defa39996e310f2b3546 files/digest-kdesdk-3.5.0_beta2 67
+MD5 91f470949aff86398f9ef07d6b1242fe files/digest-kdesdk-3.5.0_rc1 70
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kdesdk-3.5_beta1-r1 67
+MD5 72d5f7e9416a5e70c188be7159797367 files/kdesdk-3.4-configure.patch 2511
+MD5 ad23546d0ec5bf0193c3135d739a332b files/kdesdk-3.5-configure-db.patch 1736
+MD5 e909850d57bdca22b0b476f1acf0fd5d files/kdesdk-3.5_beta1-compile.patch 1406
+MD5 bb0014fd062d56a11c42435a49d483cb files/kdesdk-3.5_beta1-crash.patch 729
+MD5 b4802bd82fc3d12e6f743beb36b8acda kdesdk-3.3.2.ebuild 503
+MD5 27813b6ec7aceda1c7af98816ddefc95 kdesdk-3.4.1.ebuild 513
+MD5 5e0cc8faaf27dcdcc64b297cc2fc1c71 kdesdk-3.4.2.ebuild 1259
+MD5 edb11434601f3b17936480fd2d8c6b37 kdesdk-3.4.3.ebuild 1263
+MD5 67a8107e34e10bcdda5d6c25a0eca47c kdesdk-3.5.0.ebuild 1073
+MD5 ea6570d0f2e7115d9e066f343f19745d kdesdk-3.5.0_beta2.ebuild 1077
+MD5 ff02e48a5503c727b775bc51ab597467 kdesdk-3.5.0_rc1.ebuild 1075
+MD5 bb37c4f64262b36746a2a90378716bda kdesdk-3.5_beta1-r1.ebuild 1404
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyfEntT9W3vfTuoRAhzuAKCSEiiD4PkwupM4XywD07fv0Jbx1QCfeRZ6
+zW/WXgLl0kUp2j8Skl6yczs=
+=EcVp
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
index 8933c41f59f7..0f33340d4b6d 100644
--- a/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
+++ b/kde-base/kdesdk/files/kdesdk-3.4-configure.patch
@@ -1,6 +1,32 @@
+diff -Nur kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in
+--- kdesdk-3.4.2.orig/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in	2005-05-23 14:08:28.000000000 +0200
++++ kdesdk-3.4.2/kbabel/kbabeldict/modules/dbsearchengine/configure.in.in	2005-07-28 16:28:56.000000000 +0200
+@@ -1,3 +1,10 @@
++AC_ARG_WITH(berkeley-db,
++  [AC_HELP_STRING(--with-berkeley-db,
++    [enable the dictionary plugin based on Berkeley DB IV @<:@default=check@:>@])],
++  [], with_berkeley_db=check)
++
++LIB_DBIV=""
++if test "x$with_berkeley_db" != xno; then
+ 
+ AC_MSG_CHECKING([for Berkeley Database IV])
+ 
+@@ -122,6 +129,11 @@
+ DBIV_INCLUDES="$ac_db_includes"
+ DBIV_NAME="$ac_db_name"
+ 
++if test "x$with_berkeley_db" != xcheck && test -z "$LIB_DBIV"; then
++  AC_MSG_ERROR([--with-berkeley-db was given, but test for Berkeley DB IV failed])
++fi
++fi
++
+ AC_SUBST(DBIV_INCLUDES)
+ AC_SUBST(DBIV_LDFLAGS)
+ AC_SUBST(DBIV_NAME)
 diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/svn/configure.in.bot
 --- kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot	2005-05-23 14:08:56.000000000 +0200
-+++ kdesdk-3.4.2/kioslave/svn/configure.in.bot	2005-07-26 14:17:35.000000000 +0200
++++ kdesdk-3.4.2/kioslave/svn/configure.in.bot	2005-07-28 16:28:38.000000000 +0200
 @@ -1,4 +1,4 @@
 -if test -z "$SVN_SUBDIR"; then
 +if test "x$with_subversion" = xcheck && test -z "$SVN_SUBDIR"; then
@@ -14,7 +40,7 @@ diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.bot kdesdk-3.4.2/kioslave/
 -
 diff -Nur kdesdk-3.4.2.orig/kioslave/svn/configure.in.in kdesdk-3.4.2/kioslave/svn/configure.in.in
 --- kdesdk-3.4.2.orig/kioslave/svn/configure.in.in	2005-05-23 14:08:56.000000000 +0200
-+++ kdesdk-3.4.2/kioslave/svn/configure.in.in	2005-07-26 14:17:59.000000000 +0200
++++ kdesdk-3.4.2/kioslave/svn/configure.in.in	2005-07-28 16:28:38.000000000 +0200
 @@ -1,3 +1,11 @@
 +AC_ARG_WITH(subversion,
 +  [AC_HELP_STRING(--with-subversion,
diff --git a/kde-base/kdesdk/kdesdk-3.3.2.ebuild b/kde-base/kdesdk/kdesdk-3.3.2.ebuild
index 03dee5de8b92..33b5476dcd0d 100644
--- a/kde-base/kdesdk/kdesdk-3.3.2.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.3.2.ebuild
@@ -1,11 +1,11 @@
-# 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/kde-base/kdesdk/kdesdk-3.3.2.ebuild,v 1.1 2004/12/09 02:07:43 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 inherit eutils kde-dist
 
 IUSE=""
 DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~hppa"
+KEYWORDS="x86 amd64 sparc ppc hppa"
 
 DEPEND="x86? ( dev-util/callgrind )
 	media-gfx/graphviz
diff --git a/kde-base/kdesdk/kdesdk-3.4.1.ebuild b/kde-base/kdesdk/kdesdk-3.4.1.ebuild
index e67a325d1f8a..36b823fd56d1 100644
--- a/kde-base/kdesdk/kdesdk-3.4.1.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.4.1.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/kde-base/kdesdk/kdesdk-3.4.1.ebuild,v 1.1 2005/05/27 08:56:02 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 hppa ppc sparc x86"
 IUSE="subversion"
 
 DEPEND="x86? ( dev-util/callgrind )
diff --git a/kde-base/kdesdk/kdesdk-3.4.2.ebuild b/kde-base/kdesdk/kdesdk-3.4.2.ebuild
index 1cc8ec7b985b..0e1adfc407c5 100644
--- a/kde-base/kdesdk/kdesdk-3.4.2.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.4.2.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.2.ebuild,v 1.1 2005/07/28 13:04:00 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="subversion"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~hppa"
+IUSE="berkdb subversion"
 
 DEPEND="x86? ( dev-util/callgrind )
-	media-gfx/graphviz
 	sys-devel/flex
 	subversion? ( dev-util/subversion )
-	|| ( =sys-libs/db-4.3*
-	     =sys-libs/db-4.2* )"
+	berkdb? ( || ( =sys-libs/db-4.3*
+	               =sys-libs/db-4.2* ) )"
 
 RDEPEND="${DEPEND}
-	dev-util/cvs"
+	dev-util/cvs
+	media-gfx/graphviz"
 
 src_unpack() {
 	kde_src_unpack
@@ -32,12 +32,16 @@ src_unpack() {
 src_compile() {
 	local myconf="$(use_with subversion)"
 
-	if has_version "=sys-libs/db-4.3*"; then
-		myconf="${myconf} --with-db-name=db-4.3
-		        --with-db-include-dir=/usr/include/db4.3"
-	elif has_version "=sys-libs/db-4.2*"; then
-		myconf="${myconf} --with-db-name=db-4.2
-		        --with-db-include-dir=/usr/include/db4.2"
+	if use berkdb; then
+		if has_version "=sys-libs/db-4.3*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.3
+			        --with-db-include-dir=/usr/include/db4.3"
+		elif has_version "=sys-libs/db-4.2*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-name=db-4.2
+			        --with-db-include-dir=/usr/include/db4.2"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
 	fi
 
 	kde_src_compile
diff --git a/kde-base/kdesdk/kdesdk-3.4.3.ebuild b/kde-base/kdesdk/kdesdk-3.4.3.ebuild
index 22cd7b55ad5d..4f4794013922 100644
--- a/kde-base/kdesdk/kdesdk-3.4.3.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.4.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/kde-base/kdesdk/kdesdk-3.4.3.ebuild,v 1.1 2005/10/12 13:29:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE SDK: Cervisia, KBabel, KCachegrind, Kompare, Umbrello,..."
 
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc sparc ~x86"
 IUSE="berkdb subversion"
 
 DEPEND="x86? ( dev-util/callgrind )
diff --git a/kde-base/kdesdk/kdesdk-3.5.0.ebuild b/kde-base/kdesdk/kdesdk-3.5.0.ebuild
index 02795061c881..6b1572a81bb4 100644
--- a/kde-base/kdesdk/kdesdk-3.5.0.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.5.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/kde-base/kdesdk/kdesdk-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdesdk/kdesdk-3.5.0_beta2.ebuild b/kde-base/kdesdk/kdesdk-3.5.0_beta2.ebuild
index 00f00616513a..9124fdcc8e86 100644
--- a/kde-base/kdesdk/kdesdk-3.5.0_beta2.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.5.0_beta2.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/kde-base/kdesdk/kdesdk-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild b/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild
index 98e2ad6232b5..95d52ce2ceb8 100644
--- a/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.5.0_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/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:45:33 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild b/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild
index 598f1e1de388..dbee3763d51d 100644
--- a/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild
+++ b/kde-base/kdesdk/kdesdk-3.5_beta1-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/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild,v 1.1 2005/09/28 14:26:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesdk/kdesdk-3.5_beta1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdesdk/metadata.xml b/kde-base/kdesdk/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesdk/metadata.xml
+++ b/kde-base/kdesdk/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 0369c416796b..0be2eee47894 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdesktop-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdesktop-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdesktop-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdesktop-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdesktop-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdesktop-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kdesktop-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.5.0_beta2.ebuild:
+  New version.
+
+*kdesktop-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kdesktop-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesktop-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesktop-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesktop-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdesktop-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesktop-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdesktop-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdesktop-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdesktop-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdesktop-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdesktop-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org> kdesktop-3.4.0.ebuild,
+  kdesktop-3.4.1.ebuild:
+  install kdeeject with kdialog instead kdesktop, #89867
+
+*kdesktop-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdesktop-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdesktop-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdesktop-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdesktop-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdesktop-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesktop-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdesktop-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdesktop-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  02 Feb 2005; Dan Armak <danarmak@gentoo.org> kdesktop-3.4.0_beta1.ebuild:
+  Add support for SVG files in the kdesktop background settings module; closes
+  bug #80272.
 
 *kdesktop-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesktop/Manifest b/kde-base/kdesktop/Manifest
index 522446e4ce51..2a6b033dce59 100644
--- a/kde-base/kdesktop/Manifest
+++ b/kde-base/kdesktop/Manifest
@@ -1,4 +1,26 @@
-MD5 69a700f885446a8bff4bbd24a2d4af51 kdesktop-3.4.0_alpha1.ebuild 1407
-MD5 69a700f885446a8bff4bbd24a2d4af51 kdesktop-3.4.0_beta1.ebuild 1407
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdesktop-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdesktop-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aec3856dea048825d0bc3f66d44f0ba2 ChangeLog 3999
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesktop-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdesktop-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdesktop-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdesktop-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdesktop-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdesktop-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdesktop-3.5_beta1 69
+MD5 ffb8567a9ab217b33273996584a848f5 kdesktop-3.4.1.ebuild 1355
+MD5 72704bb9b1063c9447f0101cb11d95b5 kdesktop-3.4.2.ebuild 1370
+MD5 52fa26378f17bcfadfeea857f14b9bde kdesktop-3.4.3.ebuild 1366
+MD5 81c2eada58052745ead72afffccafd54 kdesktop-3.5.0.ebuild 1230
+MD5 e1b4e831c39866b8068891d73d736cbf kdesktop-3.5.0_beta2.ebuild 1233
+MD5 9fbc5128813eb77689da8fb0a6070ee7 kdesktop-3.5.0_rc1.ebuild 1234
+MD5 8d141f45f0b93d0828b924ea6aa4f8f2 kdesktop-3.5_beta1.ebuild 1231
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj5NntT9W3vfTuoRApb/AKCGVs7xFdXDsqLVDjaENHfvwh7NawCgkpPs
+2cHMYRtssIHOdmrewoVvdKw=
+=qV0A
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.4.1 b/kde-base/kdesktop/files/digest-kdesktop-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdesktop/files/digest-kdesktop-3.4.1
+++ b/kde-base/kdesktop/files/digest-kdesktop-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.4.2 b/kde-base/kdesktop/files/digest-kdesktop-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdesktop/files/digest-kdesktop-3.4.2
+++ b/kde-base/kdesktop/files/digest-kdesktop-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdesktop/kdesktop-3.4.1.ebuild b/kde-base/kdesktop/kdesktop-3.4.1.ebuild
index 789c300699e7..1c9e803a6087 100644
--- a/kde-base/kdesktop/kdesktop-3.4.1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.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/kde-base/kdesktop/kdesktop-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE desktop"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="$DEPEND
@@ -20,7 +20,7 @@ $(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# there's a dep here
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kcheckpass)
-	sys-apps/eject"
+$(deprange $PV $MAXKDEVER kde-base/kdialog)"
 
 KMCOPYLIB="libkonq libkonq/"
 KMEXTRACTONLY="kcheckpass/kcheckpass.h
@@ -36,6 +36,9 @@ src_install() {
 	kde-meta_src_install
 
 	rmdir ${D}/${PREFIX}/share/templates/.source/emptydir
+
+	# we install this script with kdialog, will not be needed in >=kde-3.4.2 (bug 89867)
+	rm ${D}/${PREFIX}/bin/kdeeject
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdesktop/kdesktop-3.4.2.ebuild b/kde-base/kdesktop/kdesktop-3.4.2.ebuild
index b173134d5592..e187b689962b 100644
--- a/kde-base/kdesktop/kdesktop-3.4.2.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.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/kde-base/kdesktop/kdesktop-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE desktop"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="$DEPEND
diff --git a/kde-base/kdesktop/kdesktop-3.4.3.ebuild b/kde-base/kdesktop/kdesktop-3.4.3.ebuild
index 5e8983f8d0cc..478588d2dc21 100644
--- a/kde-base/kdesktop/kdesktop-3.4.3.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.4.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/kde-base/kdesktop/kdesktop-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE desktop"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="$DEPEND
diff --git a/kde-base/kdesktop/kdesktop-3.5.0.ebuild b/kde-base/kdesktop/kdesktop-3.5.0.ebuild
index f4b0d8841b88..9004625f9d2d 100644
--- a/kde-base/kdesktop/kdesktop-3.5.0.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.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/kde-base/kdesktop/kdesktop-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdesktop/kdesktop-3.5.0_beta2.ebuild b/kde-base/kdesktop/kdesktop-3.5.0_beta2.ebuild
index c8b0b9c1ca10..997e44887365 100644
--- a/kde-base/kdesktop/kdesktop-3.5.0_beta2.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.0_beta2.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/kde-base/kdesktop/kdesktop-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE desktop"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="$DEPEND
diff --git a/kde-base/kdesktop/kdesktop-3.5.0_rc1.ebuild b/kde-base/kdesktop/kdesktop-3.5.0_rc1.ebuild
index a826e412d1d2..49bd0c602cf7 100644
--- a/kde-base/kdesktop/kdesktop-3.5.0_rc1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5.0_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/kde-base/kdesktop/kdesktop-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdesktop/kdesktop-3.5_beta1.ebuild b/kde-base/kdesktop/kdesktop-3.5_beta1.ebuild
index 336261ff2260..c24a566b261b 100644
--- a/kde-base/kdesktop/kdesktop-3.5_beta1.ebuild
+++ b/kde-base/kdesktop/kdesktop-3.5_beta1.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/kde-base/kdesktop/kdesktop-3.5_beta1.ebuild,v 1.1 2005/09/22 18:42:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE desktop"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="$DEPEND
@@ -36,9 +36,6 @@ src_install() {
 	kde-meta_src_install
 
 	rmdir ${D}/${PREFIX}/share/templates/.source/emptydir
-
-	# we install this script with kdialog, will not be needed in >=kde-3.4.2 (bug 89867)
-	rm ${D}/${PREFIX}/bin/kdeeject
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdesktop/metadata.xml b/kde-base/kdesktop/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesktop/metadata.xml
+++ b/kde-base/kdesktop/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdesu/ChangeLog b/kde-base/kdesu/ChangeLog
index 0e43324b1f34..237addb672ef 100644
--- a/kde-base/kdesu/ChangeLog
+++ b/kde-base/kdesu/ChangeLog
@@ -1,6 +1,82 @@
 # ChangeLog for kde-base/kdesu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/ChangeLog,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
+
+*kdesu-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesu-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdesu-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdesu-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org> kdesu-3.5_beta1.ebuild:
+  Keyword ~ppc
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> kdesu-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdesu-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdesu-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesu-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdesu-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdesu-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdesu-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdesu-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdesu-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdesu-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdesu-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdesu-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdesu-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdesu-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdesu-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdesu-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdesu-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdesu-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdesu-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdesu-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdesu-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdesu/Manifest b/kde-base/kdesu/Manifest
index 71b43e17add1..8c7503206e83 100644
--- a/kde-base/kdesu/Manifest
+++ b/kde-base/kdesu/Manifest
@@ -1,4 +1,10 @@
-MD5 2071493520d0e74aa289c4e8fe6c406e kdesu-3.4.0_alpha1.ebuild 361
-MD5 2071493520d0e74aa289c4e8fe6c406e kdesu-3.4.0_beta1.ebuild 361
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdesu-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdesu-3.4.0_alpha1 69
+MD5 d36ab1181b7164e3c223fe3b116be299 ChangeLog 2872
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdesu-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdesu-3.5.0 68
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdesu-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdesu-3.5_beta1 69
+MD5 a6da71a58b3249e90acd36fdd8dbeb64 kdesu-3.4.1.ebuild 390
+MD5 89384222baafd6926ed39ec4098a8514 kdesu-3.5.0.ebuild 372
+MD5 18af578b14ebdf33d76395325656029b kdesu-3.5.0_rc1.ebuild 376
+MD5 a0f8d4ceac531a548992580f8b8d8b86 kdesu-3.5_beta1.ebuild 381
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdesu/files/digest-kdesu-3.4.1 b/kde-base/kdesu/files/digest-kdesu-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdesu/files/digest-kdesu-3.4.1
+++ b/kde-base/kdesu/files/digest-kdesu-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdesu/kdesu-3.4.1.ebuild b/kde-base/kdesu/kdesu-3.4.1.ebuild
index 0588a99f72f9..1067fec4cdae 100644
--- a/kde-base/kdesu/kdesu-3.4.1.ebuild
+++ b/kde-base/kdesu/kdesu-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: gui for su(1)"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kdesu/kdesu-3.5.0.ebuild b/kde-base/kdesu/kdesu-3.5.0.ebuild
index cfa2d5e40ffc..c0cc7aaa54ee 100644
--- a/kde-base/kdesu/kdesu-3.5.0.ebuild
+++ b/kde-base/kdesu/kdesu-3.5.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/kde-base/kdesu/kdesu-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdesu/kdesu-3.5.0_rc1.ebuild b/kde-base/kdesu/kdesu-3.5.0_rc1.ebuild
index 54c5534210b6..d3c1c8621c3f 100644
--- a/kde-base/kdesu/kdesu-3.5.0_rc1.ebuild
+++ b/kde-base/kdesu/kdesu-3.5.0_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/kde-base/kdesu/kdesu-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:27 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdesu/kdesu-3.5_beta1.ebuild b/kde-base/kdesu/kdesu-3.5_beta1.ebuild
index 79569a0b5e88..5a09f1b55422 100644
--- a/kde-base/kdesu/kdesu-3.5_beta1.ebuild
+++ b/kde-base/kdesu/kdesu-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5_beta1.ebuild,v 1.1 2005/09/22 18:43:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesu/kdesu-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_beta2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: gui for su(1)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kdesu/metadata.xml b/kde-base/kdesu/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdesu/metadata.xml
+++ b/kde-base/kdesu/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdetoys-meta/ChangeLog b/kde-base/kdetoys-meta/ChangeLog
index 66ea9e8f0075..7bac17c75ef6 100644
--- a/kde-base/kdetoys-meta/ChangeLog
+++ b/kde-base/kdetoys-meta/ChangeLog
@@ -1,6 +1,119 @@
 # ChangeLog for kde-base/kdetoys-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdetoys-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdetoys-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdetoys-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdetoys-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdetoys-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdetoys-meta-3.5_beta1.ebuild, kdetoys-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdetoys-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdetoys-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdetoys-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdetoys-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdetoys-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdetoys-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdetoys-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdetoys-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdetoys-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdetoys-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdetoys-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdetoys-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdetoys-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdetoys-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdetoys-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdetoys-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdetoys-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdetoys-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdetoys-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdetoys-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdetoys-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdetoys-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdetoys-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdetoys-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdetoys-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdetoys-meta/Manifest b/kde-base/kdetoys-meta/Manifest
index 89faa481735c..6e7770feaf59 100644
--- a/kde-base/kdetoys-meta/Manifest
+++ b/kde-base/kdetoys-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 53fc24c42844b1a028359c55e9a3f00a kdetoys-meta-3.4.0_alpha1.ebuild 728
-MD5 53fc24c42844b1a028359c55e9a3f00a kdetoys-meta-3.4.0_beta1.ebuild 728
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a2bbd8421a8b9c4540e854ab8e243b8c ChangeLog 4014
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdetoys-meta-3.5_beta1 0
+MD5 ce1f15c41a4b11e43a331d24b8ff0150 kdetoys-meta-3.4.1.ebuild 857
+MD5 ca231c20af0ae5484670b1782bb3ccd7 kdetoys-meta-3.4.2.ebuild 874
+MD5 673b87cfa74dea7584e254239334bec9 kdetoys-meta-3.4.3.ebuild 870
+MD5 8ab8865dfb7b78315ee4829edfadbdf7 kdetoys-meta-3.5.0.ebuild 846
+MD5 906c5b7294bdad2574303dd848b35584 kdetoys-meta-3.5.0_beta2.ebuild 857
+MD5 c1e324073e92338a003e7df904bf85e2 kdetoys-meta-3.5.0_rc1.ebuild 856
+MD5 f706a1dbeb5aa88667a4633af3c6888a kdetoys-meta-3.5_beta1.ebuild 849
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvowntT9W3vfTuoRAjsJAJ4h/gzKguiJQ1mRQhgU/mJIozX4LQCcC9/4
+BHhXf5QZlfJNE5kCbaPl1Vc=
+=4AtA
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.4.1.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.4.1.ebuild
index 400f1b3ff8f7..6b23d7176ab8 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.4.1.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.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/kde-base/kdetoys-meta/kdetoys-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.4.2.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.4.2.ebuild
index 9bcf2e8a0ded..1cb8a85c4ee2 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.4.2.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.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/kde-base/kdetoys-meta/kdetoys-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.4.3.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.4.3.ebuild
index 4f369f6ac8b2..4d6e4ee371a5 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.4.3.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.4.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/kde-base/kdetoys-meta/kdetoys-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.5.0.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.5.0.ebuild
index 96cfcaddd6e8..e4f951fe7416 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.5.0.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.5.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/kde-base/kdetoys-meta/kdetoys-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_beta2.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_beta2.ebuild
index 262661c9f874..98b6c60c187e 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_beta2.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/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_rc1.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_rc1.ebuild
index bae495d68391..627d6b8ad7ac 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_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/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdetoys-meta/kdetoys-meta-3.5_beta1.ebuild b/kde-base/kdetoys-meta/kdetoys-meta-3.5_beta1.ebuild
index 878ffcb4b38d..ac7eb290e656 100644
--- a/kde-base/kdetoys-meta/kdetoys-meta-3.5_beta1.ebuild
+++ b/kde-base/kdetoys-meta/kdetoys-meta-3.5_beta1.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/kde-base/kdetoys-meta/kdetoys-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:52:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys-meta/kdetoys-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdetoys-meta/metadata.xml b/kde-base/kdetoys-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdetoys-meta/metadata.xml
+++ b/kde-base/kdetoys-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdetoys/ChangeLog b/kde-base/kdetoys/ChangeLog
index 826a788ae6cd..778bfe0d722f 100644
--- a/kde-base/kdetoys/ChangeLog
+++ b/kde-base/kdetoys/ChangeLog
@@ -1,6 +1,489 @@
 # ChangeLog for kde-base/kdetoys
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/ChangeLog,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdetoys-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdetoys-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdetoys-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdetoys-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.5.0_rc1.ebuild:
+  New version.
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdetoys-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdetoys-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdetoys-3.5.0_beta2.ebuild:
+  New version.
+
+*kdetoys-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdetoys-3.4.3.ebuild:
+  New version.
+
+*kdetoys-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdetoys-3.4.2.ebuild:
+  Keyworded ~mips.
+
+*kdetoys-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdetoys-3.4.1.ebuild:
+  stable on ia64
+
+*kdetoys-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdetoys-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdetoys-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdetoys-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.2.ebuild:
+  New version.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdetoys-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdetoys-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdetoys-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdetoys-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdetoys-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdetoys-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdetoys-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.1.ebuild:
+  New version.
+
+  12 May 2005; Aron Griffis <agriffis@gentoo.org> kdetoys-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdetoys-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdetoys-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdetoys-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdetoys-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdetoys-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdetoys-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org> kdetoys-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdetoys-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+*kdetoys-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdetoys-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdetoys-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdetoys-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdetoys-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdetoys-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdetoys-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdetoys-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdetoys-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdetoys-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdetoys-3.3.1.ebuild:
+  Stable on ppc.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdetoys-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdetoys-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdetoys-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdetoys-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdetoys-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdetoys-3.2.1.ebuild:
+  marking 3.3.0 x86 stable
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdetoys-3.1.5.ebuild, kdetoys-3.2.1.ebuild, kdetoys-3.3.0.ebuild:
+  Masked kdetoys-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdetoys-3.1.5.ebuild, kdetoys-3.2.1.ebuild:
+  Masked kdetoys-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdetoys-3.1.5.ebuild:
+  Masked kdetoys-3.1.5.ebuild stable for ppc
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdetoys-3.3.0.ebuild:
+  stable on ppc64 bug #58295
+
+*kdetoys-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.3.0.ebuild,
+  kdetoys-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdetoys-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> -kdetoys-3.3.0_beta1.ebuild,
+  +kdetoys-3.3.0_rc2.ebuild:
+  New _rc, remove _beta
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdetoys-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdetoys-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.3.0_beta2.ebuild:
+  new beta
+
+*kdetoys-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdetoys-3.3.0_alpha1.ebuild,
+  +kdetoys-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdetoys-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdetoys-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdetoys-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdetoys-3.2.2.ebuild:
+  stable on amd64
+
+*kdetoys-3.3.0_alpha1 (26 May 2004)
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> +kdetoys-3.3.0_alpha1.ebuild:
+  3.3 alpha 1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdetoys-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 May 2004; Daniel Ostrow <dostrow@gentoo.org> kdetoys-3.2.2.ebuild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.2.2.ebuild:
+  Stable on sparc.
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdetoys-3.0.5b.ebuild:
+  Remove old version
+
+*kdetoys-3.2.2 (20 Apr 2004)
+
+  20 Apr 2004; Travis Tilley <lv@gentoo.org> +kdetoys-3.2.2.ebuild:
+  version bump (needed to fix 48430)
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdetoys-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.2.1.ebuild:
+  Marked stable on sparc.
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.1.4.ebuild,
+  kdetoys-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+*kdetoys-3.2.1 (09 Mar 2004)
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.2.1.ebuild:
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdetoys-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdetoys-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdetoys-3.2.0 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.2.0.ebuild,
+  kdetoys-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdetoys-3.1.5.ebuild:
+  stable on alpha and ia64
+
+*kdetoys-3.2.0_rc1 (18 Jan 2004)
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.0.4.ebuild,
+  kdetoys-3.1.2.ebuild, kdetoys-3.2.0_beta1.ebuild,
+  kdetoys-3.2.0_beta2.ebuild, kdetoys-3.2.0_rc1.ebuild:
+  New version, remove older versions
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdetoys-3.1.5.ebuild:
+  Marked stable on hppa.
+
+*kdetoys-3.1.5 (14 Jan 2004)
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdetoys-3.1.5.ebuild:
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdetoys-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdetoys-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdetoys-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdetoys-3.2.0_beta2.ebuild:
+  New Beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdetoys-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdetoys-3.1.4.ebuild:
+  Marked ppc
+
+*kdetoys-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdetoys-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdetoys-3.1.4.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdetoys-2.2.2.ebuild,
+  kdetoys-2.2.2.ebuild, kdetoys-3.1.1.ebuild, kdetoys-3.1.1.ebuild,
+  kdetoys-3.1.3.ebuild, kdetoys-3.1.3.ebuild:
+  removing stale versions
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdetoys-3.1.4.ebuild:
+  marking x86 stable
+
+*kdetoys-3.1.4 (16 Sep 2003) 
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdetoys-3.1.4.ebuild:
+  New version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdetoys-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+*kdetoys-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdetoys-3.1.3.ebuild:
+  Version bump
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdetoys-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdetoys-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdetoys-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdetoys-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdetoys-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdetoys-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdetoys-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdetoys-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdetoys-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdetoys-3.1.ebuild:
+  Added ~alpha to keywords
+
+  12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kdetoys-3.0.2.ebuild,
+  kdetoys-3.0.3.ebuild, kdetoys-3.1_rc6.ebuild: removed old ebuilds
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdetoys-3.1.ebuild:
+  added ~sparc to keywords
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdetoys-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdetoys-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdetoys-3.1_rc6.ebuild:
+  version bump
+
+*kdetoys-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdetoys-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdetoys-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdetoys-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdetoys-3.1.ebuild:
+  Added ppc keyword
+
+*kdetoys-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdetoys-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdetoys-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdetoys-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdetoys-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : : : : : : : : :
+
+  New stability release.
+
+*kdetoys-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdetoys-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdetoys-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdetoys-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdetoys/Manifest b/kde-base/kdetoys/Manifest
index c6120dc76066..ab78acc951c6 100644
--- a/kde-base/kdetoys/Manifest
+++ b/kde-base/kdetoys/Manifest
@@ -1,13 +1,28 @@
-MD5 f0b3c93b48cdba064c5ab69f5a3468a2 kdetoys-3.1.ebuild 309
-MD5 e32b18e8041e1816b9b3f98208f7b1b8 kdetoys-3.0.5a.ebuild 318
-MD5 adf0976ba9719191fc853fd0dace18b1 kdetoys-3.0.4.ebuild 309
-MD5 bd2d87f1ed7578ff054c68f5f60188fd kdetoys-2.2.2.ebuild 306
-MD5 a1f57167189672e642f2a2fc7c16bd00 kdetoys-3.1.1.ebuild 311
-MD5 22745ad199e417a06cf40b8f13d6723b ChangeLog 3518
-MD5 5e67048b9e11237afa75e9d532af3f89 kdetoys-3.0.5b.ebuild 320
-MD5 40eb7ca7f3115363ebf63748555e1ecb files/digest-kdetoys-3.0.5a 68
-MD5 89871b8a6a65766b6632b0978b154f2d files/digest-kdetoys-3.0.5b 68
-MD5 3fa9ac11e44c3b929e82fa6dfcfdfc2d files/digest-kdetoys-2.2.2 67
-MD5 4d45d3e4ccc23bce0dfae7275cb4c6c9 files/digest-kdetoys-3.0.4 67
-MD5 69f111d3b85bca2f3ccaf74a12e993e1 files/digest-kdetoys-3.1.1 67
-MD5 88ba253408c6f222a2ddc2cac86ec395 files/digest-kdetoys-3.1 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a99e5d293d0d9dc098f3297c47a4ed17 ChangeLog 14676
+MD5 0cfc1e7d7a127fc26acfa1078576bee2 files/digest-kdetoys-3.3.2 67
+MD5 b4ab9eee9546403dcb646ccba45ef2e3 files/digest-kdetoys-3.4.1 67
+MD5 cec4c0358c295f328944405dc17ded2b files/digest-kdetoys-3.4.2 67
+MD5 4792409083f3033f880840748c1ec31a files/digest-kdetoys-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-kdetoys-3.5.0 67
+MD5 f17b4a30ade1b048994696363119fcb6 files/digest-kdetoys-3.5.0_beta2 68
+MD5 d4cddbda435eda3a23533c6471357fe0 files/digest-kdetoys-3.5.0_rc1 71
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-kdetoys-3.5_beta1 68
+MD5 32ff2ded43ee9348388f418a3130f732 kdetoys-3.3.2.ebuild 330
+MD5 1269dcaad6492eb9f45bfd14e5dea39b kdetoys-3.4.1.ebuild 325
+MD5 10a265db43def67ff6a8ce0398854c52 kdetoys-3.4.2.ebuild 331
+MD5 46b8653568f4b9bf2f817677a65516bb kdetoys-3.4.3.ebuild 327
+MD5 59f2078fc97757db2cced53aad238610 kdetoys-3.5.0.ebuild 326
+MD5 71f0b15922c61fd248d816db416d72a3 kdetoys-3.5.0_beta2.ebuild 330
+MD5 bf3c1be02358440d3086ace92e341a9c kdetoys-3.5.0_rc1.ebuild 328
+MD5 b1473927fc483d6ff85110c6c42d9b10 kdetoys-3.5_beta1.ebuild 328
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvplntT9W3vfTuoRAk2DAJ0dnURK3jLqz2D+1al1iP26C/sy8wCfYQyV
+BvRc07Tue1svOuh1DbMnp+U=
+=QVr3
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdetoys/kdetoys-3.3.2.ebuild b/kde-base/kdetoys/kdetoys-3.3.2.ebuild
index 9abeda607b6c..29d74221572a 100644
--- a/kde-base/kdetoys/kdetoys-3.3.2.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.3.2.ebuild
@@ -1,10 +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/kde-base/kdetoys/kdetoys-3.3.2.ebuild,v 1.1 2004/12/09 02:03:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE toys"
 
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdetoys/kdetoys-3.4.1.ebuild b/kde-base/kdetoys/kdetoys-3.4.1.ebuild
index 8acaf9a4d77f..8c0566749cc4 100644
--- a/kde-base/kdetoys/kdetoys-3.4.1.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.4.1.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/kde-base/kdetoys/kdetoys-3.4.1.ebuild,v 1.1 2005/05/27 08:56:36 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE toys"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE=""
diff --git a/kde-base/kdetoys/kdetoys-3.4.2.ebuild b/kde-base/kdetoys/kdetoys-3.4.2.ebuild
index 6126014745a5..f6ddc73216cc 100644
--- a/kde-base/kdetoys/kdetoys-3.4.2.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.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/kde-base/kdetoys/kdetoys-3.4.2.ebuild,v 1.1 2005/07/28 12:58:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdetoys/kdetoys-3.4.3.ebuild b/kde-base/kdetoys/kdetoys-3.4.3.ebuild
index bc03b158e8e8..ca0958b484ef 100644
--- a/kde-base/kdetoys/kdetoys-3.4.3.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.4.3.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/kde-base/kdetoys/kdetoys-3.4.3.ebuild,v 1.1 2005/10/12 13:28:03 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE toys"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE=""
diff --git a/kde-base/kdetoys/kdetoys-3.5.0.ebuild b/kde-base/kdetoys/kdetoys-3.5.0.ebuild
index 71c33533bbdc..c98755467a41 100644
--- a/kde-base/kdetoys/kdetoys-3.5.0.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.5.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/kde-base/kdetoys/kdetoys-3.5.0.ebuild,v 1.1 2005/11/22 22:14:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdetoys/kdetoys-3.5.0_beta2.ebuild b/kde-base/kdetoys/kdetoys-3.5.0_beta2.ebuild
index bcd618fca9ba..fc301f408d01 100644
--- a/kde-base/kdetoys/kdetoys-3.5.0_beta2.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.5.0_beta2.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/kde-base/kdetoys/kdetoys-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild b/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild
index 5d60c89b91ce..0fb19aade38c 100644
--- a/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.5.0_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/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:39:55 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdetoys/kdetoys-3.5_beta1.ebuild b/kde-base/kdetoys/kdetoys-3.5_beta1.ebuild
index 91c1ec40dd03..360614e2c40c 100644
--- a/kde-base/kdetoys/kdetoys-3.5_beta1.ebuild
+++ b/kde-base/kdetoys/kdetoys-3.5_beta1.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/kde-base/kdetoys/kdetoys-3.5_beta1.ebuild,v 1.1 2005/09/21 17:26:13 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdetoys/kdetoys-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdetoys/metadata.xml b/kde-base/kdetoys/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdetoys/metadata.xml
+++ b/kde-base/kdetoys/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeutils-meta/ChangeLog b/kde-base/kdeutils-meta/ChangeLog
index 30ec54a8fadb..a2fd259c32de 100644
--- a/kde-base/kdeutils-meta/ChangeLog
+++ b/kde-base/kdeutils-meta/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for kde-base/kdeutils-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeutils-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdeutils-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeutils-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeutils-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdeutils-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdeutils-meta-3.5_beta1.ebuild, kdeutils-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdeutils-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeutils-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdeutils-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdeutils-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeutils-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdeutils-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdeutils-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdeutils-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdeutils-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdeutils-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeutils-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdeutils-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdeutils-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdeutils-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdeutils-meta-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdeutils-meta-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeutils-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeutils-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdeutils-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeutils-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdeutils-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeutils-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdeutils-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdeutils-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdeutils-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdeutils-meta/Manifest b/kde-base/kdeutils-meta/Manifest
index b84ea33ee040..915756028fd3 100644
--- a/kde-base/kdeutils-meta/Manifest
+++ b/kde-base/kdeutils-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 875a5a1481e776a2877157ecd58baa6d kdeutils-meta-3.4.0_beta1.ebuild 1163
-MD5 875a5a1481e776a2877157ecd58baa6d kdeutils-meta-3.4.0_alpha1.ebuild 1163
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.4.0_beta1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.4.0_alpha1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bf59a7b5d03c229e4382c23702b58a96 ChangeLog 4057
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdeutils-meta-3.5_beta1 0
+MD5 fe6afb4316caa27b96c4573484e9b23f kdeutils-meta-3.4.1.ebuild 1212
+MD5 c8c516fb64409e74c2eb12f2386dd79c kdeutils-meta-3.4.2.ebuild 1235
+MD5 42edae2f6adb711d9de0489c96d3b889 kdeutils-meta-3.4.3.ebuild 1229
+MD5 fe7c8904a3cbb964148880ecafc3df00 kdeutils-meta-3.5.0.ebuild 1251
+MD5 86dd7cdc62a8ad271157e5383cc174a5 kdeutils-meta-3.5.0_beta2.ebuild 1280
+MD5 661be9b20cdee3f5ba0260b8be88f04e kdeutils-meta-3.5.0_rc1.ebuild 1289
+MD5 7f60d1f4e5c7e9870f0163ba3ae53802 kdeutils-meta-3.5_beta1.ebuild 1254
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv5VntT9W3vfTuoRAloiAJ4varRe7fUFsYZYEzzsQHGeN5quVQCfc417
+T5S58GLe45UQn6eDlMUKfWk=
+=VkiP
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.4.1.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.4.1.ebuild
index 9fff16c97fa2..e598b65d9203 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.4.1.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.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/kde-base/kdeutils-meta/kdeutils-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,10 +9,9 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="crypt lirc"
 
-# We don't add kcardtools because it needs a libksmartcard from kdelibs that it's not alway installed"
 RDEPEND="
 	$(deprange $PV $MAXKDEVER kde-base/ark)
 	$(deprange $PV $MAXKDEVER kde-base/kcalc)
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.4.2.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.4.2.ebuild
index 3d56065f911c..fb91275bf2ab 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.4.2.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.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/kde-base/kdeutils-meta/kdeutils-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="crypt lirc"
 
 RDEPEND="
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.4.3.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.4.3.ebuild
index 4be586813a21..6efe24bb9f64 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.4.3.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.4.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/kde-base/kdeutils-meta/kdeutils-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="crypt lirc"
 
 RDEPEND="
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.5.0.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.5.0.ebuild
index 8f3bc2f80895..3da595fa3b01 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.5.0.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.5.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/kde-base/kdeutils-meta/kdeutils-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_beta2.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_beta2.ebuild
index f8c56a7fb3e0..fe2f7cc17982 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_beta2.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/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="crypt lirc"
 
 RDEPEND="
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_rc1.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_rc1.ebuild
index c28311e7734b..3dd3ccc2bea8 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_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/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdeutils-meta/kdeutils-meta-3.5_beta1.ebuild b/kde-base/kdeutils-meta/kdeutils-meta-3.5_beta1.ebuild
index af3807af5bed..e308ab1b4070 100644
--- a/kde-base/kdeutils-meta/kdeutils-meta-3.5_beta1.ebuild
+++ b/kde-base/kdeutils-meta/kdeutils-meta-3.5_beta1.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/kde-base/kdeutils-meta/kdeutils-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:53:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils-meta/kdeutils-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="crypt lirc"
 
 RDEPEND="
diff --git a/kde-base/kdeutils-meta/metadata.xml b/kde-base/kdeutils-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeutils-meta/metadata.xml
+++ b/kde-base/kdeutils-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 8419cf1dbcd1..af02b8e5d498 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,534 @@
 # ChangeLog for kde-base/kdeutils
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.1 2002/02/01 21:53:29 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdeutils-3.4.3-r1.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdeutils-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdeutils-3.4.3-r1.ebuild:
+  Stable on sparc wrt #112842
+
+*kdeutils-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeutils-3.5_rc1-unicode.patch, +kdeutils-3.5.0_rc1.ebuild:
+  New version.
+
+*kdeutils-3.4.3-r1 (19 Oct 2005)
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeutils-3.4.3-klaptopdaemon.patch, +kdeutils-3.4.3-r1.ebuild,
+  kdeutils-3.5.0_beta2.ebuild:
+  Add patch to fix error messages in klaptopdaemon (#109421).
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdeutils-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdeutils-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeutils-3.5.0_beta2.ebuild:
+  New version.
+
+*kdeutils-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdeutils-3.4.3.ebuild:
+  New version.
+
+*kdeutils-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeutils-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdeutils-3.4.2.ebuild:
+  Keyworded ~mips.
+
+  25 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kdeutils-3.5_beta1.ebuild:
+  Added missing dependency over gmp as per bug #107197.
+
+*kdeutils-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeutils-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdeutils-3.4.1.ebuild:
+  stable on ia64
+
+*kdeutils-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeutils-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease. x11-misc/superkaramba is now included in this package.
+
+  04 Aug 2005; Joseph Jezak <josejx@gentoo.org> kdeutils-3.4.2.ebuild:
+  Added pbbuttonsd dependency for bug #94731.
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdeutils-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+*kdeutils-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeutils-3.4-configure.patch, +kdeutils-3.4.2.ebuild:
+  New version. Add configure patch (#81966).
+
+  25 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdeutils-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeutils-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdeutils-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdeutils-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdeutils-3.3.2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdeutils-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdeutils-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeutils-3.4.1.ebuild:
+  New version.
+
+  10 May 2005; Aron Griffis <agriffis@gentoo.org> kdeutils-3.4.0.ebuild:
+  add ~ia64
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdeutils-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdeutils-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeutils-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+*kdeutils-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeutils-3.4.0_rc1.ebuild:
+  New version.
+
+  22 Feb 2005; Hardave Riar <hardave@gentoo.org> kdeutils-3.3.2.ebuild:
+  Marked ~mips
+
+  15 Feb 2005; Jason Wever <weeve@gentoo.org> kdeutils-3.4.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdeutils-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdeutils-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdeutils-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdeutils-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+  15 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> kdeutils-3.4.0_beta1.ebuild:
+  Added support for net-analyzer/net-snmp (for a ksim plugin).
+
+*kdeutils-3.4.0_beta1 (14 Jan 2005)
+
+  14 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdeutils-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Make support for kgpg optional, based on the
+  'crypt' USE flag.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdeutils-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdeutils-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdeutils-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdeutils-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdeutils-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdeutils-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdeutils-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeutils-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdeutils-3.3.1.ebuild:
+  Stable on ppc.
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdeutils-3.3.1.ebuild:
+  ~alpha keyword.
+
+*kdeutils-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdeutils-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdeutils-3.3.0.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdeutils-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.3.0.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> -kdeutils-3.2.1.ebuild:
+  3.3.0 x86 stable
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeutils-3.1.5.ebuild, kdeutils-3.2.1.ebuild, kdeutils-3.3.0.ebuild:
+  Masked kdeutils-3.3.0.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeutils-3.1.5.ebuild, kdeutils-3.2.1.ebuild:
+  Masked kdeutils-3.2.1.ebuild stable for ppc
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdeutils-3.1.5.ebuild:
+  Masked kdeutils-3.1.5.ebuild stable for ppc
+
+  22 Aug 2004; Tom Gall <tgall@gentoo.org> kdeutils-3.3.0.ebuild:
+  stable on ppc64, bug #58305
+
+*kdeutils-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.3.0.ebuild,
+  kdeutils-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdeutils-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.3.0_beta1.ebuild,
+  kdeutils-3.3.0_rc2.ebuild:
+  add _rc2, remove _beta1
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> kdeutils-3.2.3.ebuild:
+  Stable on hppa.
+
+*kdeutils-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdeutils-3.3.0_beta2.ebuild:
+  New beta
+
+*kdeutils-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdeutils-3.3.0_alpha1.ebuild,
+  +kdeutils-3.3.0_beta1.ebuild:
+  Add beta, remove alpha
+
+  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> kdeutils-3.2.2.ebuild:
+  Stable on alpha.
+
+*kdeutils-3.2.3 (10 Jun 2004)
+
+  10 Jun 2004; Caleb Tennis <caleb@gentoo.org> +kdeutils-3.2.3.ebuild:
+  Version bump
+
+  01 Jun 2004; Travis Tilley <lv@gentoo.org> kdeutils-3.2.2.ebuild:
+  stable on amd64
+
+  26 May 2004; Caleb Tennis <caleb@gentoo.org> :
+  3.3 alpha1 - hardmasked
+
+  24 May 2004; Guy Martin <gmsoft@gentoo.org> kdeutils-3.2.2.ebuild:
+  Marked stable on hppa.
+
+  23 MAy 2004; Daniel Ostrow <dostrow@gentoo.org> kdeutils-3.2.2.euild:
+  Stable on ppc.
+
+  15 May 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.2.2.ebuild:
+  Stable on sparc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kdeutils-3.2.2.ebuild:
+  Add inherit eutils
+
+  26 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdeutils-3.2.2-gcc34-compile.patch:
+  GCC 3.4 compile fix
+
+  24 Apr 2004; Bret Curtis <psi29a@gentoo.org> kdeutils-3.2.2.ebuild:
+  Added to ~mips
+
+  20 Apr 2004; Caleb Tennis <caleb@gentoo.org> -kdeutils-3.0.5b.ebuild:
+  Removing old version
+
+*kdeutils-3.2.2 (19 Apr 2004)
+
+  19 Apr 2004; Caleb Tennis <caleb@gentoo.org>
+  +files/kdeutils-3.2.2-tarfix.patch, +kdeutils-3.2.2.ebuild:
+  Version bump
+
+  17 Apr 2004; Travis Tilley <lv@gentoo.org> kdeutils-3.2.1.ebuild:
+  stable on amd64
+
+  15 Mar 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.2.1.ebuild:
+  Marked stable on sparc.
+
+*kdeutils-3.2.1 (12 Mar 2004)
+
+  12 Mar 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.4.ebuild,
+  kdeutils-3.2.1.ebuild:
+  x86 stable and version cleanups
+
+  09 Mar 2004; Caleb Tennis <caleb@gentoo.org> :
+  Version bump
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.1.5.ebuild:
+  Marked stable on sparc.
+
+  15 Feb 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.2.0.ebuild:
+  Marked stable on sparc.
+
+  10 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.2.0.ebuild:
+  x86 stable
+
+  10 Feb 2004; Lars Weiler <pylon@gentoo.org> kdeutils-3.2.0.ebuild:
+  Stable on ppc.
+
+  05 Feb 2004; Luca Barbato <lu_zero@gentoo.org> kdeutils-3.2.0.ebuild:
+  Marked ~ppc
+
+*kdeutils-3.2.0 (02 Feb 2004)
+*kdeutils-3.2.0_rc1 (02 Feb 2004)
+
+  02 Feb 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.2.0.ebuild,
+  kdeutils-3.2.0_rc1.ebuild:
+  New version, remove _rc
+
+  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeutils-3.1.5.ebuild:
+  stable on alpha and ia64
+
+  18 Jan 2004; Caleb Tennis <caleb@gentoo.org> kdeutils-3.0.4.ebuild,
+  kdeutils-3.1.2.ebuild, kdeutils-3.2.0_beta1.ebuild,
+  kdeutils-3.2.0_beta2.ebuild:
+  New version, remove older versions
+
+*kdeutils-3.1.5 (16 Jan 2004)
+
+  16 Jan 2004; Martin Guy <gmsoft@gentoo.org> kdeutils-3.1.5.ebuild:
+  Marked stable on hppa.
+
+  14 Jan 2004; Caleb Tennis <caleb@gentoo.org> :
+  New version
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> kdeutils-3.1.4.ebuild:
+  stable on alpha
+
+  04 Jan 2004; Jason Wever <weeve@gentoo.org> kdeutils-3.2.0_beta2.ebuild:
+  Added ~sparc keyword.
+
+*kdeutils-3.2.0_beta2 (03 Dec 2003)
+
+  03 Dec 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.2.0_beta2.ebuild:
+  New beta version
+
+  29 Nov 2003; Brad House <brad_mssw@gentoo.org> kdeutils-3.1.4.ebuild:
+  mark stable on amd64
+
+  20 Nov 2003; Luca Barbato <lu_zero@gentoo.org> kdeutils-3.1.4.ebuild:
+  Marked ppc
+
+*kdeutils-3.2.0_beta1 (03 Nov 2003)
+
+  03 Nov 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.2.0_beta1.ebuild:
+  New beta version
+
+  04 Oct 2003; Brad House <brad_mssw@gentoo.org> kdeutils-3.1.4.ebuild:
+  add ~amd64 flag
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-2.2.2-r1.ebuild,
+  kdeutils-2.2.2-r1.ebuild, kdeutils-3.1.1.ebuild, kdeutils-3.1.1.ebuild,
+  kdeutils-3.1.3.ebuild, kdeutils-3.1.3.ebuild,
+  files/kdeutils-2.2.2-gentoo.diff, files/kdeutils-3.1.3-gcc33.diff:
+  removing stale versions
+
+*kdeutils-3.2.0_alpha2 (27 Sep 2003)
+
+  27 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.2.0_alpha2.ebuild:
+  new alpha version
+
+  26 Sep 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.1.4.ebuild:
+  Added sparc keyword.
+
+  25 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.4.ebuild:
+  marking x86 stable
+
+*kdeutils-3.1.4
+
+  16 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.4.ebuild:
+  New version
+
+  16 Sep 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.1.3.ebuild:
+  Marked stable for sparc.
+
+  07 Sep 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.3.ebuild:
+  x86 stable
+
+  13 Aug 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.1.3.ebuild:
+  Added ~sparc to keywords.
+
+  06 Aug 2003; Caleb Tennis <caleb@gentoo.org> kdeutils-3.1.3.ebuild:
+  Minor fix for gcc33 builds.
+
+*kdeutils-3.1.3 (29 Jul 2003)
+
+  29 Jul 2003; Paul de Vrieze <pauldv@gentoo.org> kdeutils-3.1.3.ebuild:
+  Version bump
+
+  21 Jun 2003; Caleb Tennis <caleb@gentoo.org>:
+  Removing old ebuilds: 3.0.5a, 3.1
+
+  16 Jun 2003; Will Woods <wwoods@gentoo.org> kdeutils-3.1.2.ebuild:
+  Marked stable for alpha
+
+  20 May 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.1.2.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeutils-3.1.2 (19 May 2003)
+
+  19 May 2003; Dan Armak <danarmak@gentoo.org> kdeutils-3.1.2.ebuild:
+  New version of KDE.
+
+  28 Apr 2003; Lars Weiler <pylon@gentoo.org> kdeutils-3.1.1.ebuild:
+  Set ppc in KEYWORDS
+
+*kdeutils-3.0.5b (08 Apr 2003)
+
+  08 Apr 2003; Hannes Mehnert <hannes@gentoo.org> kdeutils-3.0.5b.ebuild:
+  A security patch release fixing a kghostview vulnerability. See GLSA.
+  Also includes misc other fixes.
+
+*kdeutils-3.1.1 (14 Mar 2003)
+
+  19 Mar 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.1.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  14 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kdeutils-3.1.1.ebuild:
+  version bump
+
+  15 Feb 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+*kdeutils-3.1 (01 Feb 2003)
+
+  28 Feb 2003; Will Woods <wwoods@gentoo.org> kdeutils-3.1.ebuild:
+  Added ~alpha to keywords
+
+*kdeutils-2.2.2-r1 (17 Jan 2003)
+
+  01 Feb 2003; Jack Morgan <jmorgan@gentoo.org> kdeutils-3.1.ebuild:
+  added ~sparc to keywords
+
+  17 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdeutils-2.2.2-r1.ebuild:
+  new version, fixes #12520
+
+  08 Jan 2003; Mark Guertin <gerk@gentoo.org> kdeutils-3.1_rc6.ebuild:
+  added ~ppc to keywords
+
+*kdeutils-3.1_rc6 (05 Jan 2003)
+
+  05 Jan 2003; Hannes Mehnert <hannes@gentoo.org> kdeutils-3.1_rc6.ebuild:
+  version bump
+
+*kdeutils-3.0.5a (21 Dec 2002)
+
+  06 Jan 2003; Jason Wever <weeve@gentoo.org> kdeutils-3.0.5a.ebuild:
+  Added ~sparc keyword
+
+  21 Dec 2002; Hannes Mehnert <hannes@gentoo.org> kdeutils-3.0.5a.ebuild:
+  version bump
+
+  08 Dec 2002; Jack Morgan <jmorgan@gentoo.org> kdeutils-3.1_rc5.ebuild :
+  Added sparc keyword
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Dec 2002; Olivier Reisch <doctomoe@gentoo.org> kdeutils-3.1.ebuild:
+  Added ppc keyword
+
+*kdeutils-3.1_rc3 (12 Nov 2002)
+
+  12 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc3
+
+*kdeutils-3.1_rc2 (04 Nov 2002)
+
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> ChangeLog:
+  kde-3.1_rc2
+
+*kdeutils-3.0.4 (09 Oct 2002)
+
+  09 Oct 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  KDE 3.0.4, the latest bugfix release.
+
+*kdeutils-3.0.3 (19 Aug 2002)
+
+  19 Aug 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  New bugfix release. Enjoy!
+
+*kdeutils-3.0.2 (03 Jul 2002)
+
+  01 Aug 2002; Mark Guertin <gerk@gentoo.org> kde-3.0.2.ebuild :
+  Added ppc to keywords
+
+  03 Jul 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  : : : : : : : : : : : : : : : :
+
+  New stability release.
+
+*kdeutils-3.0.1.20020604 (4 Jun 2002)
+
+  4 Jun 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  This is a snapshot of the KDE CVS's KDE_3_0_x branch from June 6th.
+  This branch contains only bugfixes to the 3.0 release (the 3.0.1 release
+  was also of this kind).
+
+*kdeutils-3.0.1 (24 May 2002)
+
+  24 May 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  Bugfix release (KDE 3.0.1).
+
+*kdeutils-3.0 (4 Apr 2002)
+
+  4 Apr 2002; Dan Armak <danarmak@gentoo.org> Changelog :
+
+  KDE 3.0 ebuilds. Based on the well-tested kde3pre ebuild set.
 
 *kdeutils-2.2.2 (1 Feb 2002)
 
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index f987a0c45ffa..bfdd62d79346 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,14 +1,33 @@
-MD5 cda56391aea661fc0b8463734440a517 kdeutils-3.0.5b.ebuild 326
-MD5 6e0cd4c2c425fbf54e616da66523953b kdeutils-3.1.ebuild 371
-MD5 bb14ef05b7474da665a5513965a9e588 kdeutils-3.0.4.ebuild 315
-MD5 d50a78219e4ab6057ca3576370854a7c kdeutils-3.0.5a.ebuild 324
-MD5 0691898a870b0f00ce2e9fe3fd65bb71 kdeutils-2.2.2-r1.ebuild 522
-MD5 1353cd39da189359c2749a8e731450ed ChangeLog 3546
-MD5 bda81060ba609cfe65b9a61b508afbb9 kdeutils-3.1.1.ebuild 373
-MD5 91b4ffe4f39481359ec0f0dbd0b044dc files/digest-kdeutils-3.0.4 68
-MD5 f3aa73cde1897347bab9a94d797283ce files/digest-kdeutils-3.1.1 68
-MD5 833411a8feba0e3dca65b52e228b0cf8 files/digest-kdeutils-2.2.2-r1 136
-MD5 c75518e983f185a25a4348750ae1ca2f files/digest-kdeutils-3.0.5a 69
-MD5 c94af5761c9b62565499475ce2371863 files/digest-kdeutils-3.0.5b 69
-MD5 e02290749430420019b24b468f03dace files/kdeutils-2.2.2-gentoo.diff 857
-MD5 3d02df27e30b43ef656629bcdcea0c25 files/digest-kdeutils-3.1 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ef10faf8a75483b606e5df6fba16e6cd ChangeLog 16221
+MD5 95a30bd883c334e2f6c5f417ac53c9c9 files/digest-kdeutils-3.3.2 68
+MD5 4534ccb147438685553826778c267aac files/digest-kdeutils-3.4.1 68
+MD5 5ec470abb58c9e1fe99f0410cb14dffd files/digest-kdeutils-3.4.2 68
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kdeutils-3.4.3 68
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kdeutils-3.4.3-r1 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kdeutils-3.5.0 68
+MD5 fca6164743bb92c10536a5d235d30a34 files/digest-kdeutils-3.5.0_beta2 69
+MD5 a1d922897e6bb939ad0ca099030009cc files/digest-kdeutils-3.5.0_rc1 72
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kdeutils-3.5_beta1 69
+MD5 e733c7ad1c42938d7b945ea0f6f563ab files/kdeutils-3.4-configure.patch 2539
+MD5 0ebe4d00a1fd5845db2172027d12f531 files/kdeutils-3.4.3-klaptopdaemon.patch 1895
+MD5 4d4886bdfe9b726be039bfa25d3ced38 files/kdeutils-3.5_rc1-unicode.patch 1236
+MD5 41ded646b6eaf390c425e03bb9d21df1 kdeutils-3.3.2.ebuild 395
+MD5 9981cd5b2ebaac3d28a6158e5f4b05c0 kdeutils-3.4.1.ebuild 556
+MD5 326614fcd8c1c2f949a93435d1ae2965 kdeutils-3.4.2.ebuild 869
+MD5 667d1b659f6e3ff7ffce9aefa5ce794b kdeutils-3.4.3-r1.ebuild 982
+MD5 195b86327e8bd5a018eba7ff40e80bda kdeutils-3.4.3.ebuild 875
+MD5 5d3b66abe017b84f259c0a9e1d00a306 kdeutils-3.5.0.ebuild 923
+MD5 93a37675dcf8f312f34d3b4d892bee0d kdeutils-3.5.0_beta2.ebuild 920
+MD5 e2fff0786e9586bb1026e79b598b99b2 kdeutils-3.5.0_rc1.ebuild 998
+MD5 d66758faf6f5acb722211615afe4c566 kdeutils-3.5_beta1.ebuild 780
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv6UntT9W3vfTuoRAvyCAJ0S0eD/yuwTUReTKSOS4ZCT/Tkt7gCgqX+z
+QlcBimQUT/2QbpBlPeEeYy8=
+=scPH
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils/kdeutils-3.3.2.ebuild b/kde-base/kdeutils/kdeutils-3.3.2.ebuild
index 0ab7e6863de8..91203a4d3f4f 100644
--- a/kde-base/kdeutils/kdeutils-3.3.2.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.3.2.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/kdeutils/kdeutils-3.3.2.ebuild,v 1.1 2004/12/09 02:00:36 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE utilities"
 
-KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc ~hppa ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeutils/kdeutils-3.4.1.ebuild b/kde-base/kdeutils/kdeutils-3.4.1.ebuild
index cd799fe7803b..36b68395dec3 100644
--- a/kde-base/kdeutils/kdeutils-3.4.1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.4.1.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/kde-base/kdeutils/kdeutils-3.4.1.ebuild,v 1.1 2005/05/27 08:57:16 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE utilities"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="crypt snmp"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeutils/kdeutils-3.4.2.ebuild b/kde-base/kdeutils/kdeutils-3.4.2.ebuild
index 7cda92312c01..1caeb01e7c1a 100644
--- a/kde-base/kdeutils/kdeutils-3.4.2.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.4.2.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.2.ebuild,v 1.1 2005/07/28 13:04:37 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE utilities"
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
-IUSE="crypt snmp"
+IUSE="crypt snmp pbbuttonsd"
 
 DEPEND="~kde-base/kdebase-${PV}
-	snmp? ( net-analyzer/net-snmp )"
+	snmp? ( net-analyzer/net-snmp )
+	pbbuttonsd? ( app-laptop/pbbuttonsd )"
 
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/gnupg )"
@@ -26,7 +27,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf="$(use_with snmp)"
+	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)"
 
 	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"
 
diff --git a/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild b/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild
index b9b6a8e0ab11..b2d3260513d3 100644
--- a/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.4.3-r1.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/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild,v 1.1 2005/10/19 14:34:28 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE utilities"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="crypt snmp pbbuttonsd"
 
 DEPEND="~kde-base/kdebase-${PV}
diff --git a/kde-base/kdeutils/kdeutils-3.4.3.ebuild b/kde-base/kdeutils/kdeutils-3.4.3.ebuild
index 7471463d674c..dd4e9a00975f 100644
--- a/kde-base/kdeutils/kdeutils-3.4.3.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.4.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/kde-base/kdeutils/kdeutils-3.4.3.ebuild,v 1.1 2005/10/12 13:28:37 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdeutils/kdeutils-3.5.0.ebuild b/kde-base/kdeutils/kdeutils-3.5.0.ebuild
index 88ba59dfe783..c884d285cc0f 100644
--- a/kde-base/kdeutils/kdeutils-3.5.0.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.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/kde-base/kdeutils/kdeutils-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild b/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild
index ecea50427d9d..11fbf6905c6b 100644
--- a/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.0_beta2.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/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist
 
@@ -20,6 +20,13 @@ RDEPEND="${DEPEND}
 	crypt? ( app-crypt/gnupg )
 	!x11-misc/superkaramba"
 
+src_unpack() {
+	kde_src_unpack
+
+	# Fix output of klaptopdaemon (kde bug 103437).
+	epatch "${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
+}
+
 src_compile() {
 	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
 	              $(use_with xmms)"
diff --git a/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild b/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild
index 4623434d1f47..44dfe92e829f 100644
--- a/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.0_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/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:41:26 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist eutils
 
diff --git a/kde-base/kdeutils/kdeutils-3.5_beta1.ebuild b/kde-base/kdeutils/kdeutils-3.5_beta1.ebuild
index e99c50962171..ceb8295cde6a 100644
--- a/kde-base/kdeutils/kdeutils-3.5_beta1.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5_beta1.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/kde-base/kdeutils/kdeutils-3.5_beta1.ebuild,v 1.1 2005/09/21 17:26:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 inherit kde-dist
 
@@ -13,7 +13,8 @@ DEPEND="~kde-base/kdebase-${PV}
 	snmp? ( net-analyzer/net-snmp )
 	pbbuttonsd? ( app-laptop/pbbuttonsd )
 	dev-lang/python
-	xmms? ( media-sound/xmms )"
+	xmms? ( media-sound/xmms )
+	dev-libs/gmp"
 
 RDEPEND="${DEPEND}
 	crypt? ( app-crypt/gnupg )
diff --git a/kde-base/kdeutils/metadata.xml b/kde-base/kdeutils/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdeutils/metadata.xml
+++ b/kde-base/kdeutils/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdewebdev-meta/ChangeLog b/kde-base/kdewebdev-meta/ChangeLog
index 557cfab19d9e..b2db757918aa 100644
--- a/kde-base/kdewebdev-meta/ChangeLog
+++ b/kde-base/kdewebdev-meta/ChangeLog
@@ -1,6 +1,125 @@
 # ChangeLog for kde-base/kdewebdev-meta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/ChangeLog,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdewebdev-meta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kdewebdev-meta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdewebdev-meta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdewebdev-meta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-meta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdewebdev-meta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-meta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kdewebdev-meta-3.5_beta1.ebuild, kdewebdev-meta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdewebdev-meta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-meta-3.5.0_beta2.ebuild:
+  New version.
+
+*kdewebdev-meta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-meta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdewebdev-meta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdewebdev-meta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdewebdev-meta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  09 Sep 2005; Carsten Lohrke <carlo@gentoo.org>
+  kdewebdev-meta-3.5_alpha1.ebuild:
+  slot 3.4 -> 3.5
+
+*kdewebdev-meta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdewebdev-meta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdewebdev-meta-3.4.2.ebuild:
+  Stable on alpha.
+
+*kdewebdev-meta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-meta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdewebdev-meta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdewebdev-meta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kdewebdev-meta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org>
+  kdewebdev-meta-3.4.0.ebuild, kdewebdev-meta-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> kdewebdev-meta-3.4.0.ebuild,
+  kdewebdev-meta-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kdewebdev-meta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-meta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kdewebdev-meta-3.4.0.ebuild:
+  Added to ~ppc
+
+  15 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdewebdev-meta-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdewebdev-meta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdewebdev-meta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdewebdev-meta-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdewebdev-meta-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdewebdev-meta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kdewebdev-meta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdewebdev-meta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdewebdev-meta/Manifest b/kde-base/kdewebdev-meta/Manifest
index 8d277c346c88..add69451802b 100644
--- a/kde-base/kdewebdev-meta/Manifest
+++ b/kde-base/kdewebdev-meta/Manifest
@@ -1,4 +1,26 @@
-MD5 4b332872205344b4901d9694cd81665a kdewebdev-meta-3.4.0_alpha1.ebuild 614
-MD5 4b332872205344b4901d9694cd81665a kdewebdev-meta-3.4.0_beta1.ebuild 614
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.4.0_alpha1 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.4.0_beta1 0
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7c5270e58d8564f7201bb46b915c41fe ChangeLog 4154
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.4.1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.4.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.4.3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.5.0 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.5.0_beta2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.5.0_rc1 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-kdewebdev-meta-3.5_beta1 0
+MD5 f1b5338a7e3191c8c29a5a1ee7d7068d kdewebdev-meta-3.4.1.ebuild 747
+MD5 573b24ac6190fe235bf2cba2e9157703 kdewebdev-meta-3.4.2.ebuild 762
+MD5 616369f2f8a9299b3ba7ec8396a68e0c kdewebdev-meta-3.4.3.ebuild 756
+MD5 0ad08a753873cef4e0bdefeda3c5e986 kdewebdev-meta-3.5.0.ebuild 736
+MD5 a45d49ebd8add425927a3baac8d08eb7 kdewebdev-meta-3.5.0_beta2.ebuild 747
+MD5 782028ca2839402f898dc8e5358e70aa kdewebdev-meta-3.5.0_rc1.ebuild 740
+MD5 0dcfe2ed687dfda886225e6de07f3cf8 kdewebdev-meta-3.5_beta1.ebuild 739
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxaintT9W3vfTuoRAq7FAKCylsuZaXNuLZgyXWPrzU7tBn3UrwCeOqH3
+TM5tIpg9F1LwWUgwOMgGhfE=
+=c5LT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.1.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.1.ebuild
index 7642058197e0..8557e0036305 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.1.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.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/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.2.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.2.ebuild
index 7f830ab375ea..03d0aca771fd 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.2.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.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/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.3.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.3.ebuild
index 834d1cbc0457..9ecd16df5d19 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.3.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.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/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.4"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0.ebuild
index d90665e12484..02056996ce45 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.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/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_beta2.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_beta2.ebuild
index a83c6ff02b19..9e0fa77b15be 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_beta2.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_beta2.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/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_rc1.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_rc1.ebuild
index 8141bc5ae7b2..0a79bd2a55e6 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_rc1.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_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/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
diff --git a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5_beta1.ebuild b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5_beta1.ebuild
index f7541229e9bf..b52b94134527 100644
--- a/kde-base/kdewebdev-meta/kdewebdev-meta-3.5_beta1.ebuild
+++ b/kde-base/kdewebdev-meta/kdewebdev-meta-3.5_beta1.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/kde-base/kdewebdev-meta/kdewebdev-meta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:54:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev-meta/kdewebdev-meta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 MAXKDEVER=$PV
 
 inherit kde-functions
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.kde.org/"
 
 LICENSE="GPL-2"
 SLOT="3.5"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/kde-base/kdewebdev-meta/metadata.xml b/kde-base/kdewebdev-meta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdewebdev-meta/metadata.xml
+++ b/kde-base/kdewebdev-meta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdewebdev/ChangeLog b/kde-base/kdewebdev/ChangeLog
index f8f5fbaf57f7..8dbf4efa71a7 100644
--- a/kde-base/kdewebdev/ChangeLog
+++ b/kde-base/kdewebdev/ChangeLog
@@ -1,6 +1,300 @@
 # ChangeLog for kde-base/kdewebdev
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.1 2004/05/27 01:57:17 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/ChangeLog,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdewebdev-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kdewebdev-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kdewebdev-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdewebdev-3.5.0_rc1 (16 Nov 2005)
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdewebdev-3.5.0_rc1.ebuild:
+  New version.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> kdewebdev-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdewebdev-3.5.0_beta2 (15 Oct 2005)
+
+  15 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdewebdev-3.5.0_beta2.ebuild:
+  New version.
+
+*kdewebdev-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdewebdev-3.4.3.ebuild:
+  New version.
+
+*kdewebdev-3.4.3 (12 Oct 2005)
+
+  12 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +kdewebdev-3.4.3.ebuild:
+  New version.
+
+  06 Oct 2005; Hardave Riar <hardave@gentoo.org> kdewebdev-3.4.2.ebuild:
+  Keyworded ~mips.
+
+*kdewebdev-3.5_beta1 (21 Sep 2005)
+
+  21 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdewebdev-3.5_beta1.ebuild:
+  New version.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> kdewebdev-3.4.1.ebuild:
+  stable on ia64
+
+*kdewebdev-3.5_alpha1 (24 Aug 2005)
+
+  24 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdewebdev-3.5_alpha1.ebuild:
+  KDE 3.5 prerelease.
+
+  30 Jul 2005; Dan Armak <danarmak@gentoo.org> kdewebdev-3.4.2.ebuild:
+  Removed ~mips keyword, because kdelibs-3.4.2 doesn't have it. The mips team
+  should readd it soon, I'm not sure why it's gone from kdelibs. This is
+  preparatory to unmasking.
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kdewebdev-3.4.1.ebuild,
+  kdewebdev-3.4.2.ebuild:
+  Add workaround for bug #98345.
+
+*kdewebdev-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kdewebdev-3.4.2.ebuild:
+  New version.
+
+  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> kdewebdev-3.4.1.ebuild:
+  Stable on hppa.
+
+  14 Jul 2005; Hardave Riar <hardave@gentoo.org> kdewebdev-3.4.1.ebuild:
+  Keyworded ~mips
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdewebdev-3.4.1.ebuild:
+  Stable on SPARC.
+
+  04 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> kdewebdev-3.4.1.ebuild:
+  Add ~alpha keyword.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> kdewebdev-3.3.2-r2.ebuild:
+  Stable on mips
+
+  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> kdewebdev-3.4.1.ebuild:
+  Marked ppc stable for bug #97544.
+
+*kdewebdev-3.4.1 (27 May 2005)
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org> +kdewebdev-3.4.1.ebuild:
+  New version.
+
+  05 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdewebdev-3.3.2-r2.ebuild:
+  Stable on hppa.
+
+  05 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdewebdev-3.3.2-r2.ebuild:
+  Stable on alpha + ia64, bug 89092.
+
+  04 May 2005; Markus Rothe <corsair@gentoo.org> kdewebdev-3.3.2-r2.ebuild:
+  Stable on ppc64; bug #89092
+
+  03 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kdewebdev-3.3.2-r2.ebuild:
+  Stable on ppc.
+
+  03 May 2005; Jason Wever <weeve@gentoo.org> kdewebdev-3.3.2-r2.ebuild:
+  Stable on SPARC wrt security bug #89092.
+
+  03 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  kdewebdev-3.3.2-r2.ebuild:
+  stable on amd64 wrt #89092
+
+*kdewebdev-3.4.0-r2 (02 May 2005)
+*kdewebdev-3.3.2-r2 (02 May 2005)
+
+  02 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/quanta-3.4.0-vpl.patch, -files/post-3.4-kdewebdev.diff,
+  +files/post-3.4-kdewebdev-2.diff, +kdewebdev-3.3.2-r2.ebuild,
+  -kdewebdev-3.4.0.ebuild, -kdewebdev-3.4.0-r1.ebuild,
+  +kdewebdev-3.4.0-r2.ebuild:
+  new Kommander patch, fixing a bug in the previous one; fix for Quanta vpl
+  editor
+
+  20 Apr 2005; Lars Weiler <pylon@gentoo.org> kdewebdev-3.3.2-r1.ebuild:
+  Stable on ppc; bug #89092.
+
+  20 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kdewebdev-3.3.2-r1.ebuild:
+  Stable on alpha + ia64, bug 89092.
+
+  20 Apr 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdewebdev-3.3.2-r1.ebuild:
+  Stable on amd64, bug 89092.
+
+  20 Apr 2005; Jason Wever <weeve@gentoo.org> kdewebdev-3.3.2-r1.ebuild:
+  Stable on SPARC wrt security bug #89092.
+
+  20 Apr 2005; Markus Rothe <corsair@gentoo.org> kdewebdev-3.3.2-r1.ebuild:
+  Stable on ppc64; bug #89092
+
+*kdewebdev-3.4.0-r1 (20 Apr 2005)
+*kdewebdev-3.3.2-r1 (20 Apr 2005)
+
+  20 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.4-kdewebdev.diff, +kdewebdev-3.3.2-r1.ebuild,
+  +kdewebdev-3.4.0-r1.ebuild:
+  Kommander untrusted code execution, #89092
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdewebdev-3.4.0.ebuild:
+  Added to ~ppc
+
+*kdewebdev-3.4.0 (14 Mar 2005)
+
+  14 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> +kdewebdev-3.4.0.ebuild:
+  Ebuild for KDE 3.4 final.
+
+  14 Mar 2005; Hardave Riar <hardave@gentoo.org> kdewebdev-3.3.2.ebuild:
+  Marked ~mips.
+
+  28 Feb 2005; Jason Wever <weeve@gentoo.org> kdewebdev-3.4.0_rc1.ebuild:
+  Added ~sparc keyword.
+
+*kdewebdev-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> +kdewebdev-3.4.0_rc1.ebuild:
+  New version.
+
+*kdewebdev-3.4.0_beta2 (09 Feb 2005)
+
+  09 Feb 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kdewebdev-3.4.0_beta2.ebuild:
+  Version bump.
+
+  02 Feb 2005; Heinrich Wendel <lanius@gentoo.org>
+  kdewebdev-3.4.0_beta1.ebuild:
+  mark ~amd64
+
+  23 Jan 2005; Markus Rothe <corsair@gentoo.org> kdewebdev-3.3.2.ebuild:
+  Stable on ppc64; bug #78619
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kdewebdev-3.4.0_beta1.ebuild:
+  Added blocking dep on media-gfx/kimagemapeditor, an older version of an app
+  now included here.
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kdewebdev-3.4.0_beta1.ebuild:
+  Added blocking dep on app-text/kfilereplace, an older version of an app now
+  included here.
+
+*kdewebdev-3.4.0_beta1 (13 Jan 2005)
+
+  13 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> +kdewebdev-3.4.0_beta1.ebuild:
+  Introducing kde-3.4.0_beta1. Add blocker on app-editors/quanta.
+
+  04 Jan 2005; Guy Martin <gmsoft@gentoo.org> kdewebdev-3.3.2.ebuild:
+  Stable on hppa.
+
+  29 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> kdewebdev-3.3.2.ebuild:
+  Stable on alpha, bug 72750.
+
+  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> kdewebdev-3.3.2.ebuild:
+  Stable on amd64.
+
+  27 Dec 2004; Caleb Tennis <caleb@gentoo.org> kdewebdev-3.3.2.ebuild:
+  x86 stable
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> kdewebdev-3.3.1.ebuild:
+  Stable on ppc64
+
+*kdewebdev-3.3.2 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org> +kdewebdev-3.3.2.ebuild:
+  Version bump
+
+  06 Dec 2004; Jason Huebel <jhuebel@gentoo.org> kdewebdev-3.3.1.ebuild:
+  stable on amd64
+
+  17 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdewebdev-3.3.1.ebuild:
+  Stable on alpha.
+
+  08 Nov 2004; Lars Weiler <pylon@gentoo.org> kdewebdev-3.3.1.ebuild:
+  Stable on ppc.
+
+  06 Nov 2004; Markus Rothe <corsair@gentoo.org> kdewebdev-3.3.1.ebuild:
+  Marked ~ppc64
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdewebdev-3.3.1.ebuild:
+  x86 stable
+
+  04 Nov 2004; Jason Wever <weeve@gentoo.org> kdewebdev-3.3.1.ebuild:
+  Stable on sparc wrt security bug #69936.
+
+  03 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> kdewebdev-3.3.1.ebuild:
+  ~alpha keyword.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> kdewebdev-3.3.0-r1.ebuild:
+  stable on amd64.
+
+*kdewebdev-3.3.1 (13 Oct 2004)
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> +kdewebdev-3.3.1.ebuild:
+  Version bump
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> kdewebdev-3.3.0-r1.ebuild:
+  Stable on hppa.
+
+  19 Sep 2004; Malcolm Lashley <malc@gentoo.org> kdewebdev-3.3.0.ebuild:
+  Stable on amd64
+
+  14 Sep 2004; Jason Wever <weeve@gentoo.org> kdewebdev-3.3.0-r1.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Caleb Tennis <caleb@gentoo.org> :
+  Marking 3.3.0 x86 stable
+
+  01 Sep 2004; Tom Gall <tgall@gentoo.org> kdewebdev-3.3.0-r1.ebuild:
+  stable on ppc64, bug #62167
+
+  30 Aug 2004; Carsten Lohrke <carlo@gentoo.org> kdewebdev-3.3.0-r1.ebuild:
+  block media-gfx/kimagemapeditor
+
+*kdewebdev-3.3.0-r1 (30 Aug 2004)
+
+  30 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdewebdev-3.3.0-r1.ebuild,
+  files/3.3.0-kafka-configure.in.in.patch:
+  Add a patch to include VPL in Quanta
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  kdewebdev-3.3.0.ebuild:
+  Masked kdewebdev-3.3.0.ebuild stable for ppc
+
+*kdewebdev-3.3.0 (19 Aug 2004)
+
+  19 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdewebdev-3.3.0.ebuild,
+  kdewebdev-3.3.0_beta2.ebuild:
+  3.3.0 final
+
+*kdewebdev-3.3.0_rc2 (10 Aug 2004)
+
+  10 Aug 2004; Caleb Tennis <caleb@gentoo.org> kdewebdev-3.3.0_beta1.ebuild,
+  kdewebdev-3.3.0_rc2.ebuild:
+  remove _beta1, add _rc2
+
+*kdewebdev-3.3.0_beta2 (23 Jul 2004)
+
+  23 Jul 2004; Caleb Tennis <caleb@gentoo.org> +kdewebdev-3.3.0_beta2.ebuild:
+  New beta
+
+*kdewebdev-3.3.0_beta1 (08 Jul 2004)
+
+  08 Jul 2004; Caleb Tennis <caleb@gentoo.org> -kdewebdev-3.3.0_alpha1.ebuild:
+  Add beta, remove alpha
 
 *kdewebdev-3.3.0_alpha1 (26 May 2004)
 
diff --git a/kde-base/kdewebdev/Manifest b/kde-base/kdewebdev/Manifest
index 633e9273ceb0..663e8ef5048c 100644
--- a/kde-base/kdewebdev/Manifest
+++ b/kde-base/kdewebdev/Manifest
@@ -1,2 +1,29 @@
-MD5 f46cea1d88bd9a67417c1dfd7cacd044 kdewebdev-3.3.0_alpha1.ebuild 384
-MD5 a71caa1e019b64ee305b0b38d8bc9448 files/digest-kdewebdev-3.3.0_alpha1 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cb76d7fcc76ba7308419520312eeeca9 ChangeLog 9337
+MD5 5c18da2078103b3b7c13439cc5980e13 files/digest-kdewebdev-3.3.2-r2 69
+MD5 94ceb356a311fd77a423e29df704051e files/digest-kdewebdev-3.4.1 69
+MD5 d8037944499434322bc1a939ec5ecf39 files/digest-kdewebdev-3.4.2 69
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-kdewebdev-3.4.3 69
+MD5 1b9c64625ee8bb6581dafc883b1d0ee1 files/digest-kdewebdev-3.5.0 69
+MD5 ffc57982196e2f3a80e0fa7cdcacfc60 files/digest-kdewebdev-3.5.0_beta2 70
+MD5 d7983e15f0cdc695451b0c3a976c28d1 files/digest-kdewebdev-3.5.0_rc1 73
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-kdewebdev-3.5_beta1 70
+MD5 64933746cbdc378bd6d40e0b56eac91f files/post-3.4-kdewebdev-2.diff 2703
+MD5 c44af4e971a0c10fd3adf8e95e093215 kdewebdev-3.3.2-r2.ebuild 509
+MD5 7f457d67d0123ce8072096bdbc90c5d0 kdewebdev-3.4.1.ebuild 574
+MD5 46bda3cba97f5cd548b43d37647331b0 kdewebdev-3.4.2.ebuild 500
+MD5 e3aa9025a63c806854fd7ffcb130a343 kdewebdev-3.4.3.ebuild 484
+MD5 1f5b44feb22774ca90f2a1fb10bd0ac1 kdewebdev-3.5.0.ebuild 483
+MD5 c5f9ade83119d5702e264dc8e494a2ff kdewebdev-3.5.0_beta2.ebuild 487
+MD5 5fb84179256f81c72573c56be8cc898b kdewebdev-3.5.0_rc1.ebuild 485
+MD5 fd4f3d21bf48ea4b18b96f11445353a6 kdewebdev-3.5_beta1.ebuild 485
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxbXntT9W3vfTuoRAolrAKCqPsqeelPZLiMHYlB6gulVjvZe5gCdHV4I
+9pBl4y+/ZikLMD6ue+KgxVE=
+=UhL6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdewebdev/kdewebdev-3.3.2-r2.ebuild b/kde-base/kdewebdev/kdewebdev-3.3.2-r2.ebuild
index 3b58bb55dbdd..17bf3f49beef 100644
--- a/kde-base/kdewebdev/kdewebdev-3.3.2-r2.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.3.2-r2.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/kde-base/kdewebdev/kdewebdev-3.3.2-r2.ebuild,v 1.1 2005/05/02 23:13:20 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.3.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist eutils
 
 DESCRIPTION="KDE web development - Quanta"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~mips"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="doc"
 
 DEPEND="~kde-base/kdebase-${PV}
@@ -15,4 +15,4 @@ DEPEND="~kde-base/kdebase-${PV}
 src_unpack(){
 	kde_src_unpack
 	epatch ${FILESDIR}/post-3.4-kdewebdev-2.diff
-}
\ No newline at end of file
+}
diff --git a/kde-base/kdewebdev/kdewebdev-3.4.1.ebuild b/kde-base/kdewebdev/kdewebdev-3.4.1.ebuild
index 96393b6bbb0d..c4088290819f 100644
--- a/kde-base/kdewebdev/kdewebdev-3.4.1.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.4.1.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.4.1.ebuild,v 1.1 2005/05/27 08:57:45 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
-inherit kde-dist
+inherit kde-dist flag-o-matic
 
 DESCRIPTION="KDE web development - Quanta"
 
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="doc tidy"
 
-DEPEND="~kde-base/kdebase-${PV}
-	doc? ( app-doc/quanta-docs )"
+DEPEND="~kde-base/kdebase-${PV}"
 
 RDEPEND="${DEPEND}
-	tidy? ( app-text/htmltidy )"
+	tidy? ( app-text/htmltidy )
+	doc? ( app-doc/quanta-docs )"
+
+# Remove this when libxslt-1.1.14-r1 goes stable (#98345)
+append-flags -DFORCE_DEBUGGER
diff --git a/kde-base/kdewebdev/kdewebdev-3.4.2.ebuild b/kde-base/kdewebdev/kdewebdev-3.4.2.ebuild
index 9303b553c090..fb58751d63a4 100644
--- a/kde-base/kdewebdev/kdewebdev-3.4.2.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.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/kde-base/kdewebdev/kdewebdev-3.4.2.ebuild,v 1.1 2005/07/28 12:59:21 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist
 
@@ -9,7 +9,7 @@ DESCRIPTION="KDE web development - Quanta"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="doc tidy"
 
-DEPEND="dev-libs/libxslt
+DEPEND=">=dev-libs/libxslt-1.1.14-r1
 	dev-libs/libxml2"
 
 RDEPEND="${DEPEND}
diff --git a/kde-base/kdewebdev/kdewebdev-3.4.3.ebuild b/kde-base/kdewebdev/kdewebdev-3.4.3.ebuild
index d979040319ef..d672da7d6b4f 100644
--- a/kde-base/kdewebdev/kdewebdev-3.4.3.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.4.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/kde-base/kdewebdev/kdewebdev-3.4.3.ebuild,v 1.1 2005/10/12 13:30:28 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist
 
 DESCRIPTION="KDE web development - Quanta"
 
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc sparc ~x86"
 IUSE="doc tidy"
 
 DEPEND="dev-libs/libxslt
diff --git a/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild b/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild
index 10526310b87f..c08469d36917 100644
--- a/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.5.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/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdewebdev/kdewebdev-3.5.0_beta2.ebuild b/kde-base/kdewebdev/kdewebdev-3.5.0_beta2.ebuild
index 08d8cdba6627..368327f8fd0c 100644
--- a/kde-base/kdewebdev/kdewebdev-3.5.0_beta2.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.5.0_beta2.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/kde-base/kdewebdev/kdewebdev-3.5.0_beta2.ebuild,v 1.1 2005/10/15 11:08:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild b/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild
index abbcaa406c7c..3088bd7c4786 100644
--- a/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.5.0_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/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild,v 1.1 2005/11/16 10:46:38 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdewebdev/kdewebdev-3.5_beta1.ebuild b/kde-base/kdewebdev/kdewebdev-3.5_beta1.ebuild
index b1729242388b..2c2bbe8be097 100644
--- a/kde-base/kdewebdev/kdewebdev-3.5_beta1.ebuild
+++ b/kde-base/kdewebdev/kdewebdev-3.5_beta1.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/kde-base/kdewebdev/kdewebdev-3.5_beta1.ebuild,v 1.1 2005/09/21 17:28:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdewebdev/kdewebdev-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 inherit kde-dist
 
diff --git a/kde-base/kdewebdev/metadata.xml b/kde-base/kdewebdev/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdewebdev/metadata.xml
+++ b/kde-base/kdewebdev/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdf/ChangeLog b/kde-base/kdf/ChangeLog
index db1473f9d391..e51c30098cb2 100644
--- a/kde-base/kdf/ChangeLog
+++ b/kde-base/kdf/ChangeLog
@@ -1,6 +1,95 @@
 # ChangeLog for kde-base/kdf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/ChangeLog,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdf-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdf-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdf-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdf-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdf-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdf-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdf-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdf-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+*kdf-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdf-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -kdf-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdf-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kdf-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdf-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdf-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kdf-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdf-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdf-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdf-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdf-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdf-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdf-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdf-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdf-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdf-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdf-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdf-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdf-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdf-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdf-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdf-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdf-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdf/Manifest b/kde-base/kdf/Manifest
index ff23b3d914a9..e34564b490bb 100644
--- a/kde-base/kdf/Manifest
+++ b/kde-base/kdf/Manifest
@@ -1,4 +1,22 @@
-MD5 24895abe2c4f24cb08477a0eee6ed855 kdf-3.4.0_alpha1.ebuild 270
-MD5 24895abe2c4f24cb08477a0eee6ed855 kdf-3.4.0_beta1.ebuild 270
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kdf-3.4.0_beta1 216
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kdf-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5437a3c6db62bec6d83415a118a7a964 ChangeLog 3238
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kdf-3.4.1 212
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kdf-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kdf-3.5.0 68
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kdf-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kdf-3.5_beta1 69
+MD5 f007e558c29a0839c7f7a52bc77fc9a3 kdf-3.4.1.ebuild 392
+MD5 879fc4708e6108cf3ddcc5a9115af6d3 kdf-3.4.3.ebuild 391
+MD5 b0bca773f2908c3a1cb47a8dc085f94b kdf-3.5.0.ebuild 370
+MD5 9bee6ee1642f747b8a6a316e45eae9f8 kdf-3.5.0_rc1.ebuild 374
+MD5 5d864a692d4bfbcd77ecda8dc749fd9f kdf-3.5_beta1.ebuild 381
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvuJntT9W3vfTuoRAsnXAKCDlTHN0XZLCliy6Y6TlnO0/EMRPwCgg7iE
+xWpGWa9iaJFQVNQAU0rdIx0=
+=FyOv
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdf/files/digest-kdf-3.4.1 b/kde-base/kdf/files/digest-kdf-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kdf/files/digest-kdf-3.4.1
+++ b/kde-base/kdf/files/digest-kdf-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kdf/kdf-3.4.1.ebuild b/kde-base/kdf/kdf-3.4.1.ebuild
index 6580957b2652..0e1d660aca85 100644
--- a/kde-base/kdf/kdf-3.4.1.ebuild
+++ b/kde-base/kdf/kdf-3.4.1.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/kde-base/kdf/kdf-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE free disk space utility"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdf/kdf-3.4.3.ebuild b/kde-base/kdf/kdf-3.4.3.ebuild
index f3a13485c89b..6bb59bf9ed05 100644
--- a/kde-base/kdf/kdf-3.4.3.ebuild
+++ b/kde-base/kdf/kdf-3.4.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/kde-base/kdf/kdf-3.4.3.ebuild,v 1.1 2005/10/13 00:09:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE free disk space utility"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kdf/kdf-3.5.0.ebuild b/kde-base/kdf/kdf-3.5.0.ebuild
index cd4023d4a230..9266b25ba4d1 100644
--- a/kde-base/kdf/kdf-3.5.0.ebuild
+++ b/kde-base/kdf/kdf-3.5.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/kde-base/kdf/kdf-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kdf/kdf-3.5.0_rc1.ebuild b/kde-base/kdf/kdf-3.5.0_rc1.ebuild
index ce05c00e6cf9..019379ef0baa 100644
--- a/kde-base/kdf/kdf-3.5.0_rc1.ebuild
+++ b/kde-base/kdf/kdf-3.5.0_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/kde-base/kdf/kdf-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kdf/kdf-3.5_beta1.ebuild b/kde-base/kdf/kdf-3.5_beta1.ebuild
index bab4570f0f06..da7f63b3c5b0 100644
--- a/kde-base/kdf/kdf-3.5_beta1.ebuild
+++ b/kde-base/kdf/kdf-3.5_beta1.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/kde-base/kdf/kdf-3.5_beta1.ebuild,v 1.1 2005/09/22 18:44:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdf/kdf-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_beta2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE free disk space utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdf/metadata.xml b/kde-base/kdf/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdf/metadata.xml
+++ b/kde-base/kdf/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdialog/ChangeLog b/kde-base/kdialog/ChangeLog
index c541fd91b2d3..07907a9fad1a 100644
--- a/kde-base/kdialog/ChangeLog
+++ b/kde-base/kdialog/ChangeLog
@@ -1,6 +1,97 @@
 # ChangeLog for kde-base/kdialog
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/ChangeLog,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
+
+*kdialog-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdialog-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdialog-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdialog-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kdialog-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kdialog-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdialog-3.5.0_beta2.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kdialog-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdialog-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdialog-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdialog-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kdialog-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kdialog-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdialog-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdialog-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdialog-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdialog-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdialog-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Diego Pettenò <flameeyes@gentoo.org> kdialog-3.4.1.ebuild:
+  Moved dependency to virtual/eject.
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org> +files/kdeeject-3.4.0,
+  +files/kdeeject-3.4.1, kdialog-3.4.0.ebuild, kdialog-3.4.1.ebuild:
+  install kdeeject with kdialog, #89867
+
+*kdialog-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdialog-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdialog-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdialog-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdialog-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdialog-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kdialog-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdialog-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdialog-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdialog-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdialog/Manifest b/kde-base/kdialog/Manifest
index 6fb072e47571..cf58074db319 100644
--- a/kde-base/kdialog/Manifest
+++ b/kde-base/kdialog/Manifest
@@ -1,4 +1,13 @@
-MD5 483fe28f950702025ec0e284aae45480 kdialog-3.4.0_alpha1.ebuild 420
-MD5 483fe28f950702025ec0e284aae45480 kdialog-3.4.0_beta1.ebuild 420
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdialog-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdialog-3.4.0_beta1 216
+MD5 0210630041d72f373a651511fb5c13e0 ChangeLog 3361
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdialog-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdialog-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdialog-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdialog-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdialog-3.5_beta1 69
+MD5 6eadcc709c52bce0bf5eddfa4bf2f6cb files/kdeeject-3.4.1 983
+MD5 f7632117052a07b0225ee73f89e0a82c kdialog-3.4.1.ebuild 618
+MD5 e62123f40baa1534c5c1a1add326d74e kdialog-3.5.0.ebuild 479
+MD5 2063da5f059e47e9fd4b475986b44667 kdialog-3.5.0_beta2.ebuild 482
+MD5 25148ffa07686e5102fc46e4e0fc777b kdialog-3.5.0_rc1.ebuild 483
+MD5 0f976713d54de730190430e786b1d1e2 kdialog-3.5_beta1.ebuild 480
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdialog/files/digest-kdialog-3.4.1 b/kde-base/kdialog/files/digest-kdialog-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdialog/files/digest-kdialog-3.4.1
+++ b/kde-base/kdialog/files/digest-kdialog-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdialog/kdialog-3.4.1.ebuild b/kde-base/kdialog/kdialog-3.4.1.ebuild
index 69dc40f9152a..3314fd783358 100644
--- a/kde-base/kdialog/kdialog-3.4.1.ebuild
+++ b/kde-base/kdialog/kdialog-3.4.1.ebuild
@@ -1,14 +1,24 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.4.1.ebuild,v 1.1 2005/05/25 21:23:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
+RDEPEND="virtual/eject"
+
 KMNODOCS=true
+
+src_install() {
+	kde-meta_src_install
+	# see bug 89867
+	cp ${FILESDIR}/kdeeject-${PV} ${T}/kdeeject
+	into ${PREFIX}
+	dobin ${T}/kdeeject
+}
diff --git a/kde-base/kdialog/kdialog-3.5.0.ebuild b/kde-base/kdialog/kdialog-3.5.0.ebuild
index 053c5dc430cc..97c3d0a79b17 100644
--- a/kde-base/kdialog/kdialog-3.5.0.ebuild
+++ b/kde-base/kdialog/kdialog-3.5.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/kde-base/kdialog/kdialog-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdialog/kdialog-3.5.0_beta2.ebuild b/kde-base/kdialog/kdialog-3.5.0_beta2.ebuild
index a4ebbc8d387a..a668d94af339 100644
--- a/kde-base/kdialog/kdialog-3.5.0_beta2.ebuild
+++ b/kde-base/kdialog/kdialog-3.5.0_beta2.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/kde-base/kdialog/kdialog-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="virtual/eject"
diff --git a/kde-base/kdialog/kdialog-3.5.0_rc1.ebuild b/kde-base/kdialog/kdialog-3.5.0_rc1.ebuild
index bfaf10733c9a..57619bd7edcc 100644
--- a/kde-base/kdialog/kdialog-3.5.0_rc1.ebuild
+++ b/kde-base/kdialog/kdialog-3.5.0_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/kde-base/kdialog/kdialog-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdialog/kdialog-3.5_beta1.ebuild b/kde-base/kdialog/kdialog-3.5_beta1.ebuild
index ad0011d8c87d..c8fbecdd019e 100644
--- a/kde-base/kdialog/kdialog-3.5_beta1.ebuild
+++ b/kde-base/kdialog/kdialog-3.5_beta1.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/kde-base/kdialog/kdialog-3.5_beta1.ebuild,v 1.1 2005/09/22 18:45:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdialog/kdialog-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,17 +8,10 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDialog can be used to show nice dialog boxes from shell scripts"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/eject"
 
+KMEXTRA="kdeeject"
 KMNODOCS=true
-
-src_install() {
-	kde-meta_src_install
-	# see bug 89867
-#	cp ${FILESDIR}/kdeeject-${PV} ${T}/kdeeject
-#	into ${PREFIX}
-#	dobin ${T}/kdeeject
-}
diff --git a/kde-base/kdialog/metadata.xml b/kde-base/kdialog/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdialog/metadata.xml
+++ b/kde-base/kdialog/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdict/ChangeLog b/kde-base/kdict/ChangeLog
index 3602c8bc6e40..31c211a00b27 100644
--- a/kde-base/kdict/ChangeLog
+++ b/kde-base/kdict/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/kdict
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/ChangeLog,v 1.1 2005/01/15 02:24:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/ChangeLog,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdict-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdict-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdict-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kdict-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdict-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdict-3.5_beta1.ebuild,
+  kdict-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdict-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdict-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdict-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdict-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdict-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdict-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdict-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdict-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdict-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdict-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdict-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdict-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdict-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdict-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdict-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdict-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdict-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdict-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdict-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdict-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdict-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdict-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdict-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdict-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdict-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdict/Manifest b/kde-base/kdict/Manifest
index e97f4ed5e59b..cab32751a41d 100644
--- a/kde-base/kdict/Manifest
+++ b/kde-base/kdict/Manifest
@@ -1,4 +1,22 @@
-MD5 e994c675b2ce05554c1f257dc75d34f4 kdict-3.4.0_beta1.ebuild 288
-MD5 e994c675b2ce05554c1f257dc75d34f4 kdict-3.4.0_alpha1.ebuild 288
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kdict-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kdict-3.4.0_beta1 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d77f270725d95782883f39dd81fbdb89 ChangeLog 3235
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kdict-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kdict-3.4.2 296
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdict-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kdict-3.5.0_beta2 222
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kdict-3.5_beta1 71
+MD5 67da4a4f39d1419c3dacc9e8b75b13af kdict-3.4.1.ebuild 403
+MD5 aff72f03e926d46d7869f815b1254ba6 kdict-3.4.2.ebuild 415
+MD5 6815f60e228bb4dd70f11ef27d3948fe kdict-3.5.0.ebuild 392
+MD5 558801d885df0ea8815a677e6abf47c0 kdict-3.5.0_beta2.ebuild 404
+MD5 255d21d501b3de4851411a79677d1603 kdict-3.5_beta1.ebuild 395
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDhuNsntT9W3vfTuoRAg5OAJdpotqXBmglI8AKzHhrikos/h1qAJ0QOCsQ
+LjxYgqzsHRsLQxJSNbbmgQ==
+=LVLK
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdict/files/digest-kdict-3.4.1 b/kde-base/kdict/files/digest-kdict-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kdict/files/digest-kdict-3.4.1
+++ b/kde-base/kdict/files/digest-kdict-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kdict/files/digest-kdict-3.4.2 b/kde-base/kdict/files/digest-kdict-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kdict/files/digest-kdict-3.4.2
+++ b/kde-base/kdict/files/digest-kdict-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kdict/kdict-3.4.1.ebuild b/kde-base/kdict/kdict-3.4.1.ebuild
index 8b5321addf53..34e4cb7f21ed 100644
--- a/kde-base/kdict/kdict-3.4.1.ebuild
+++ b/kde-base/kdict/kdict-3.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/kde-base/kdict/kdict-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/kdict-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE dict client (for dict.org-like servers)"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdict/kdict-3.4.2.ebuild b/kde-base/kdict/kdict-3.4.2.ebuild
index cb278f8e8766..56984047b595 100644
--- a/kde-base/kdict/kdict-3.4.2.ebuild
+++ b/kde-base/kdict/kdict-3.4.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/kde-base/kdict/kdict-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/kdict-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE dict client (for dict.org-like servers)"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kdict/kdict-3.5.0.ebuild b/kde-base/kdict/kdict-3.5.0.ebuild
index a7ce0dd105d9..d7d3cc62c5a2 100644
--- a/kde-base/kdict/kdict-3.5.0.ebuild
+++ b/kde-base/kdict/kdict-3.5.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/kde-base/kdict/kdict-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/kdict-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kdict/kdict-3.5.0_beta2.ebuild b/kde-base/kdict/kdict-3.5.0_beta2.ebuild
index ddd1d44eda9e..1dc56ee0afa0 100644
--- a/kde-base/kdict/kdict-3.5.0_beta2.ebuild
+++ b/kde-base/kdict/kdict-3.5.0_beta2.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/kde-base/kdict/kdict-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/kdict-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE dict client (for dict.org-like servers)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdict/kdict-3.5_beta1.ebuild b/kde-base/kdict/kdict-3.5_beta1.ebuild
index 2a7d74508ef6..62dc4f45537b 100644
--- a/kde-base/kdict/kdict-3.5_beta1.ebuild
+++ b/kde-base/kdict/kdict-3.5_beta1.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/kde-base/kdict/kdict-3.5_beta1.ebuild,v 1.1 2005/09/22 18:46:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdict/kdict-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE dict client (for dict.org-like servers)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kdict/metadata.xml b/kde-base/kdict/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdict/metadata.xml
+++ b/kde-base/kdict/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 21b02b071b88..cc3f4c76397d 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,122 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdm-3.4.3-r1.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdm-3.4.3-r1.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdm-3.4.3-r1.ebuild:
+  Stable on sparc wrt #112842
+
+*kdm-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdm-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+*kdm-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org> kdm-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kdm-3.4.3-r1 (19 Oct 2005)
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.3-noimake.patch, +files/kdebase-3.4.3-xdmcp.patch,
+  +files/kdebase-3.5.0_beta2-noimake.patch, +kdm-3.4.3-r1.ebuild,
+  kdm-3.5.0_beta2.ebuild:
+  Add patch to fix segfault in XDMCP (#109528). Add patch to compile without
+  imake (#102780).
+
+*kdm-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.5.0_beta2.ebuild:
+  New version.
+
+*kdm-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> kdm-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -kdm-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdm-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kdm-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdm-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kdm-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdm-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdm-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdm-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdm-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdm-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdm-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdm-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kdm-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdm-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdm-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdm-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdm-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdm-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdm-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  02 Feb 2005; Dan Armak <danarmak@gentoo.org> kdm-3.4.0_beta1.ebuild:
+  Add support for SVG files; closes bug #80272.
 
 *kdm-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 856ce9352bbd..302449a5702d 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,8 +1,31 @@
-MD5 b5f7310334df85226b60031ebb1a5cbb kdm-3.4.0_beta1.ebuild 1409
-MD5 b5f7310334df85226b60031ebb1a5cbb kdm-3.4.0_alpha1.ebuild 1409
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kdm-3.4.0_alpha1 69
-MD5 b048371a651391ef2bb4166e40e6adff files/kde.pam 405
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kdm-3.4.0_beta1 216
-MD5 ca0fc4bf60b72dd1b8d42cb7e2be5a75 files/agent-shutdown.sh 204
-MD5 2b5419b0b173138e22fe03f4157d5660 files/kde-np.pam 379
-MD5 510d05672fcad238e92db44fbfa65f89 files/agent-startup.sh 209
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 499cfea177ab1f9ffb3dcea753603a67 ChangeLog 4163
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kdm-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kdm-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdm-3.4.3 68
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kdm-3.4.3-r1 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kdm-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kdm-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kdm-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kdm-3.5_beta1 69
+MD5 cbfa9f15423035b33eb50456dfb04691 files/kdebase-3.4.3-noimake.patch 2214
+MD5 789aca95df83dac88fe68a3cbeeea13a files/kdebase-3.4.3-xdmcp.patch 614
+MD5 472a5c5b9ade622637e00a6d28e69614 files/kdebase-3.5.0_beta2-noimake.patch 2248
+MD5 f8fabdf3377ba617123c9c4ed476270c kdm-3.4.1.ebuild 2429
+MD5 32da1a4ba2aef00f40978e17c71c0da2 kdm-3.4.2.ebuild 2442
+MD5 01862d08745cc6680523e06450da7089 kdm-3.4.3-r1.ebuild 2690
+MD5 f5e3f03ba2148dd882645285c61bcc69 kdm-3.4.3.ebuild 2444
+MD5 3c9eb8f9389738b11437ce53df206bde kdm-3.5.0.ebuild 2167
+MD5 0b3d5efcf6d3227661e0290c083c3ffa kdm-3.5.0_beta2.ebuild 2254
+MD5 1574550589765e8cd46c659bba3865b8 kdm-3.5.0_rc1.ebuild 2171
+MD5 58c86c0390310e05337fc8a0082cfbe2 kdm-3.5_beta1.ebuild 2097
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj4qntT9W3vfTuoRAu9NAJ4xrZNwwR4Qe+/uCWAFxNSyl4s6uQCcCnLK
+Hpkt0cV7BZL3NwKkKic8Jcg=
+=2Pz/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/files/digest-kdm-3.4.1 b/kde-base/kdm/files/digest-kdm-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kdm/files/digest-kdm-3.4.1
+++ b/kde-base/kdm/files/digest-kdm-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kdm/files/digest-kdm-3.4.2 b/kde-base/kdm/files/digest-kdm-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kdm/files/digest-kdm-3.4.2
+++ b/kde-base/kdm/files/digest-kdm-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kdm/kdm-3.4.1.ebuild b/kde-base/kdm/kdm-3.4.1.ebuild
index 34688762d9a0..1388e028dabf 100644
--- a/kde-base/kdm/kdm-3.4.1.ebuild
+++ b/kde-base/kdm/kdm-3.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/kde-base/kdm/kdm-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="pam"
 
 KMEXTRA="kdmlib/"
@@ -16,7 +16,7 @@ KMEXTRACTONLY="libkonq/konq_defaults.h
 	    kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
 KMCOMPILEONLY="kcontrol/background"
 DEPEND="$DEPEND
-	pam? ( sys-libs/pam ~kde-base/kdebase-pam-4 )
+	pam? ( kde-base/kdebase-pam )
 	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
 	# Requires the desktop background settings and kdm modules,
 	# so until we separate the kcontrol modules into separate ebuilds :-),
diff --git a/kde-base/kdm/kdm-3.4.2.ebuild b/kde-base/kdm/kdm-3.4.2.ebuild
index bed52ae67b06..ccb1f477b3c9 100644
--- a/kde-base/kdm/kdm-3.4.2.ebuild
+++ b/kde-base/kdm/kdm-3.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/kde-base/kdm/kdm-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="pam"
 
 KMEXTRA="kdmlib/"
diff --git a/kde-base/kdm/kdm-3.4.3-r1.ebuild b/kde-base/kdm/kdm-3.4.3-r1.ebuild
index 530cd95d4272..a731a26ac0b8 100644
--- a/kde-base/kdm/kdm-3.4.3-r1.ebuild
+++ b/kde-base/kdm/kdm-3.4.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/kde-base/kdm/kdm-3.4.3-r1.ebuild,v 1.1 2005/10/19 13:52:14 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="pam"
 
 KMEXTRA="kdmlib/"
diff --git a/kde-base/kdm/kdm-3.4.3.ebuild b/kde-base/kdm/kdm-3.4.3.ebuild
index 2c4146d5e6c8..5e5c0cee4f59 100644
--- a/kde-base/kdm/kdm-3.4.3.ebuild
+++ b/kde-base/kdm/kdm-3.4.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/kde-base/kdm/kdm-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdm/kdm-3.5.0.ebuild b/kde-base/kdm/kdm-3.5.0.ebuild
index 626b0753775d..71c4e25d493d 100644
--- a/kde-base/kdm/kdm-3.5.0.ebuild
+++ b/kde-base/kdm/kdm-3.5.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/kde-base/kdm/kdm-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdm/kdm-3.5.0_beta2.ebuild b/kde-base/kdm/kdm-3.5.0_beta2.ebuild
index 3988aa375372..8b79c672f46e 100644
--- a/kde-base/kdm/kdm-3.5.0_beta2.ebuild
+++ b/kde-base/kdm/kdm-3.5.0_beta2.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/kde-base/kdm/kdm-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="pam"
 
 KMEXTRA="kdmlib/"
@@ -24,11 +24,17 @@ DEPEND="$DEPEND
 	# so until we separate the kcontrol modules into separate ebuilds :-),
 	# there's a dep here
 
+# Avoid using imake (kde bug 114466).
+PATCHES="${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch"
 
 src_compile() {
-	use pam \
-		&& myconf="$myconf --with-pam=yes" \
-		|| myconf="$myconf --with-pam=no --with-shadow"
+	local myconf="--with-x-binaries-dir=/usr/bin"
+
+	if use pam; then
+		myconf="${myconf} --with-pam=yes"
+	else
+		myconf="${myconf} --with-pam=no --with-shadow"
+	fi
 
 	kde-meta_src_compile myconf configure
 	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
diff --git a/kde-base/kdm/kdm-3.5.0_rc1.ebuild b/kde-base/kdm/kdm-3.5.0_rc1.ebuild
index 0683821f3032..6ddd8942d176 100644
--- a/kde-base/kdm/kdm-3.5.0_rc1.ebuild
+++ b/kde-base/kdm/kdm-3.5.0_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/kde-base/kdm/kdm-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kdm/kdm-3.5_beta1.ebuild b/kde-base/kdm/kdm-3.5_beta1.ebuild
index a26668e4aba4..d4c570cff5e3 100644
--- a/kde-base/kdm/kdm-3.5_beta1.ebuild
+++ b/kde-base/kdm/kdm-3.5_beta1.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/kde-base/kdm/kdm-3.5_beta1.ebuild,v 1.1 2005/09/22 18:46:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:23 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="pam"
 
 KMEXTRA="kdmlib/"
@@ -39,19 +39,9 @@ src_install() {
 	kde-meta_src_install
 	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
 
-	# We tell kdm to /use session files from /usr/share/xsessions.
-	# I've removed some other kdmrc mods from here, since it's not clear why
-	# the default aren't ok (and I'm not sure about the benefits of using
-	# the xdm configfiles under /etc/X11 instead of our own ones),
-	# and it's the Gentoo Way to avoid modifying upstream behaviour.
-	# Tell me if you don't like this. --danarmak
-	cd ${D}/${KDEDIR}/share/config/kdm || die
+	# Customize the kdmrc configuration
 	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
-		-e "s:#GreetFont=:GreetFont=Sans Serif,24,-1,5,50,0,0,0,0,0\n#GreetFont=:" \
-		-e "s:#StdFont=:StdFont=Sans Serif,12,-1,5,50,0,0,0,0,0\n#StdFont=:" \
-		-e "s:#FailFont=:FailFont=Sans Serif,12,-1,5,75,0,0,0,0,0\n#FailFont=:" \
-		-e "s:#AntiAliasing=:AntiAliasing=true\n#AntiAliasing=:" \
-		kdmrc
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
 }
 
 pkg_postinst() {
diff --git a/kde-base/kdm/metadata.xml b/kde-base/kdm/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdm/metadata.xml
+++ b/kde-base/kdm/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdnssd/ChangeLog b/kde-base/kdnssd/ChangeLog
index c31aaa5929db..a4ab55a72800 100644
--- a/kde-base/kdnssd/ChangeLog
+++ b/kde-base/kdnssd/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for kde-base/kdnssd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/ChangeLog,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdnssd-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdnssd-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdnssd-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kdnssd-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdnssd-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdnssd-3.5_beta1.ebuild,
+  kdnssd-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdnssd-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdnssd-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdnssd-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdnssd-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdnssd-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdnssd-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdnssd-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdnssd-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdnssd-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kdnssd-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdnssd-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdnssd-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdnssd-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kdnssd-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdnssd-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdnssd-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdnssd-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdnssd-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdnssd-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdnssd-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdnssd-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdnssd/Manifest b/kde-base/kdnssd/Manifest
index e3f45f1c0c9a..7a9a7ee48ea3 100644
--- a/kde-base/kdnssd/Manifest
+++ b/kde-base/kdnssd/Manifest
@@ -1,4 +1,24 @@
-MD5 04c2a8fc90d0fc9d00ecd0e246491683 kdnssd-3.4.0_beta1.ebuild 322
-MD5 04c2a8fc90d0fc9d00ecd0e246491683 kdnssd-3.4.0_alpha1.ebuild 322
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kdnssd-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kdnssd-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 650e65b93a66f964590e817cfbc73350 ChangeLog 3413
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kdnssd-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kdnssd-3.4.2 296
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kdnssd-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kdnssd-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kdnssd-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kdnssd-3.5_beta1 71
+MD5 b347b6571ea46568938d0742ca46e5c8 kdnssd-3.4.1.ebuild 439
+MD5 7c1ed2d1ced94603c6b417e0fb7799a1 kdnssd-3.4.2.ebuild 450
+MD5 8fb711517c429733e43f252dc4ba8924 kdnssd-3.5.0.ebuild 428
+MD5 d2f67dba87d57de636782cf960b5b773 kdnssd-3.5.0_beta2.ebuild 433
+MD5 88a9acc1e29e35497859718345be4483 kdnssd-3.5.0_rc1.ebuild 432
+MD5 57738949a8c5f757d4ec7723cf4a058a kdnssd-3.5_beta1.ebuild 431
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuOintT9W3vfTuoRAu8eAJ94HBKIU4tep7lzGDXD6Mf53UZKWgCeIedT
+VfmV8KshM/n/YmCQ1mbWd9o=
+=7iGT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdnssd/files/digest-kdnssd-3.4.1 b/kde-base/kdnssd/files/digest-kdnssd-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kdnssd/files/digest-kdnssd-3.4.1
+++ b/kde-base/kdnssd/files/digest-kdnssd-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kdnssd/files/digest-kdnssd-3.4.2 b/kde-base/kdnssd/files/digest-kdnssd-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kdnssd/files/digest-kdnssd-3.4.2
+++ b/kde-base/kdnssd/files/digest-kdnssd-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kdnssd/kdnssd-3.4.1.ebuild b/kde-base/kdnssd/kdnssd-3.4.1.ebuild
index 1f685e83814c..8348bf5718c5 100644
--- a/kde-base/kdnssd/kdnssd-3.4.1.ebuild
+++ b/kde-base/kdnssd/kdnssd-3.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/kde-base/kdnssd/kdnssd-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kdnssd/kdnssd-3.4.2.ebuild b/kde-base/kdnssd/kdnssd-3.4.2.ebuild
index f7dd996532e4..9c0597b6034e 100644
--- a/kde-base/kdnssd/kdnssd-3.4.2.ebuild
+++ b/kde-base/kdnssd/kdnssd-3.4.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/kde-base/kdnssd/kdnssd-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kdnssd/kdnssd-3.5.0.ebuild b/kde-base/kdnssd/kdnssd-3.5.0.ebuild
index bf923eff365f..0fb6f07c7da4 100644
--- a/kde-base/kdnssd/kdnssd-3.5.0.ebuild
+++ b/kde-base/kdnssd/kdnssd-3.5.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/kde-base/kdnssd/kdnssd-3.5.0.ebuild,v 1.1 2005/11/22 22:14:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kdnssd/kdnssd-3.5.0_beta2.ebuild b/kde-base/kdnssd/kdnssd-3.5.0_beta2.ebuild
index dbaf78eb66f9..5c71491cdea9 100644
--- a/kde-base/kdnssd/kdnssd-3.5.0_beta2.ebuild
+++ b/kde-base/kdnssd/kdnssd-3.5.0_beta2.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/kde-base/kdnssd/kdnssd-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdnssd/kdnssd-3.5.0_rc1.ebuild b/kde-base/kdnssd/kdnssd-3.5.0_rc1.ebuild
index 75cb91c95204..ceb22e11a0a1 100644
--- a/kde-base/kdnssd/kdnssd-3.5.0_rc1.ebuild
+++ b/kde-base/kdnssd/kdnssd-3.5.0_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/kde-base/kdnssd/kdnssd-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kdnssd/kdnssd-3.5_beta1.ebuild b/kde-base/kdnssd/kdnssd-3.5_beta1.ebuild
index e0efffcbc6db..cd4c9d10cec7 100644
--- a/kde-base/kdnssd/kdnssd-3.5_beta1.ebuild
+++ b/kde-base/kdnssd/kdnssd-3.5_beta1.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/kde-base/kdnssd/kdnssd-3.5_beta1.ebuild,v 1.1 2005/09/22 18:47:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdnssd/kdnssd-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A DNSSD (DNS Service Discovery - part of Rendezvous) ioslave and kded module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kdnssd/metadata.xml b/kde-base/kdnssd/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdnssd/metadata.xml
+++ b/kde-base/kdnssd/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kdvi/ChangeLog b/kde-base/kdvi/ChangeLog
index 99cdcd0b27b6..7d33ac84bb91 100644
--- a/kde-base/kdvi/ChangeLog
+++ b/kde-base/kdvi/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/kdvi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/ChangeLog,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kdvi-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kdvi-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kdvi-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kdvi-3.5.0 (22 Nov 2005)
+
+  22 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kdvi-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kdvi-3.5_beta1.ebuild,
+  kdvi-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kdvi-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.5.0_beta2.ebuild:
+  New version.
+
+*kdvi-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kdvi-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kdvi-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kviewshell-qt-3.3.5.patch, kdvi-3.4.2.ebuild,
+  +kdvi-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kdvi-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kdvi-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kdvi-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kdvi-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kdvi-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kdvi-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kdvi-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kdvi-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kdvi-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kdvi-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kdvi-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kdvi-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kdvi-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kdvi-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kdvi-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kdvi-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kdvi-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kdvi/Manifest b/kde-base/kdvi/Manifest
index b58c2b349963..fa4f9435f5e6 100644
--- a/kde-base/kdvi/Manifest
+++ b/kde-base/kdvi/Manifest
@@ -1,5 +1,17 @@
-MD5 57264107d6d9b7065ce7b69030d996e9 kdvi-3.4.0_beta1.ebuild 600
-MD5 57264107d6d9b7065ce7b69030d996e9 kdvi-3.4.0_alpha1.ebuild 600
-MD5 b415d97354c9487f035eaf2bb2dcf57c files/kdvi-configure-check-freetype.diff 1192
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kdvi-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kdvi-3.4.0_alpha1 72
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 5342089dff96322a4646e89812f37077 kdvi-3.5_beta1.ebuild 679
+MD5 6c874721b31774ec7ab2dd3a879850da ChangeLog 3548
+MD5 6e5fdcba7f99d0ab4d661e2d0649816f kdvi-3.4.2.ebuild 703
+MD5 1363dbfcc81f06409d53a2d4e68d6612 kdvi-3.5.0_beta2.ebuild 595
+MD5 447bd5d5559630546ae862da592e8770 kdvi-3.5.0.ebuild 590
+MD5 19debbd3fd7b7b65993a7ceca97e6b3d kdvi-3.4.3.ebuild 646
+MD5 eb67462ffead7956b0dcfe1cd4f869a8 kdvi-3.5.0_rc1.ebuild 594
+MD5 0a3f067dd1b66b620c60400b05c86006 kdvi-3.4.1.ebuild 637
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kdvi-3.5.0_rc1 312
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kdvi-3.4.1 221
+MD5 0459ac16349d79da6246392e2454796b files/digest-kdvi-3.5.0 71
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kdvi-3.4.2 300
+MD5 339eca37408cf1043fc3ec09e4e66db5 files/kviewshell-qt-3.3.5.patch 469
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kdvi-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kdvi-3.5_beta1 72
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kdvi-3.4.3 71
diff --git a/kde-base/kdvi/files/digest-kdvi-3.4.1 b/kde-base/kdvi/files/digest-kdvi-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kdvi/files/digest-kdvi-3.4.1
+++ b/kde-base/kdvi/files/digest-kdvi-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kdvi/files/digest-kdvi-3.4.2 b/kde-base/kdvi/files/digest-kdvi-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kdvi/files/digest-kdvi-3.4.2
+++ b/kde-base/kdvi/files/digest-kdvi-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kdvi/kdvi-3.4.1.ebuild b/kde-base/kdvi/kdvi-3.4.1.ebuild
index 22f80a714073..470569b1040f 100644
--- a/kde-base/kdvi/kdvi-3.4.1.ebuild
+++ b/kde-base/kdvi/kdvi-3.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/kde-base/kdvi/kdvi-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE DVI viewer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="tetex"
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="
diff --git a/kde-base/kdvi/kdvi-3.4.2.ebuild b/kde-base/kdvi/kdvi-3.4.2.ebuild
index ca1e0917e7cd..c8a19c03e32c 100644
--- a/kde-base/kdvi/kdvi-3.4.2.ebuild
+++ b/kde-base/kdvi/kdvi-3.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/kde-base/kdvi/kdvi-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE DVI viewer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="tetex"
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="
@@ -23,3 +23,6 @@ RDEPEND="${DEPEND}
 	)"
 
 KMCOMPILEONLY="kviewshell/"
+
+PATCHES="${FILESDIR}/kviewshell-qt-3.3.5.patch"
+
diff --git a/kde-base/kdvi/kdvi-3.4.3.ebuild b/kde-base/kdvi/kdvi-3.4.3.ebuild
index d61b824e34d7..bf685473a858 100644
--- a/kde-base/kdvi/kdvi-3.4.3.ebuild
+++ b/kde-base/kdvi/kdvi-3.4.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/kde-base/kdvi/kdvi-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE DVI viewer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="tetex"
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="
@@ -23,6 +23,3 @@ RDEPEND="${DEPEND}
 	)"
 
 KMCOMPILEONLY="kviewshell/"
-
-PATCHES="${FILESDIR}/kviewshell-qt-3.3.5.patch"
-
diff --git a/kde-base/kdvi/kdvi-3.5.0.ebuild b/kde-base/kdvi/kdvi-3.5.0.ebuild
index e6a0d2e54b99..cc8485dae0f7 100644
--- a/kde-base/kdvi/kdvi-3.5.0.ebuild
+++ b/kde-base/kdvi/kdvi-3.5.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/kde-base/kdvi/kdvi-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kdvi/kdvi-3.5.0_beta2.ebuild b/kde-base/kdvi/kdvi-3.5.0_beta2.ebuild
index ef6c20f0b44c..2e4ccbf0ea0b 100644
--- a/kde-base/kdvi/kdvi-3.5.0_beta2.ebuild
+++ b/kde-base/kdvi/kdvi-3.5.0_beta2.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/kde-base/kdvi/kdvi-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE DVI viewer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="tetex"
 
 DEPEND="
@@ -23,6 +23,3 @@ RDEPEND="${DEPEND}
 	)"
 
 KMCOMPILEONLY="kviewshell/"
-
-PATCHES="${FILESDIR}/kviewshell-qt-3.3.5.patch"
-
diff --git a/kde-base/kdvi/kdvi-3.5.0_rc1.ebuild b/kde-base/kdvi/kdvi-3.5.0_rc1.ebuild
index 1388796c11f6..b6955719af60 100644
--- a/kde-base/kdvi/kdvi-3.5.0_rc1.ebuild
+++ b/kde-base/kdvi/kdvi-3.5.0_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/kde-base/kdvi/kdvi-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kdvi/kdvi-3.5_beta1.ebuild b/kde-base/kdvi/kdvi-3.5_beta1.ebuild
index 1127f1a09e09..8c498fd87c90 100644
--- a/kde-base/kdvi/kdvi-3.5_beta1.ebuild
+++ b/kde-base/kdvi/kdvi-3.5_beta1.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/kde-base/kdvi/kdvi-3.5_beta1.ebuild,v 1.1 2005/09/22 18:48:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdvi/kdvi-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE DVI viewer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="tetex"
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="
diff --git a/kde-base/kdvi/metadata.xml b/kde-base/kdvi/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kdvi/metadata.xml
+++ b/kde-base/kdvi/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kedit/ChangeLog b/kde-base/kedit/ChangeLog
index 890efa7a1d80..afc9c5fc9c46 100644
--- a/kde-base/kedit/ChangeLog
+++ b/kde-base/kedit/ChangeLog
@@ -1,6 +1,99 @@
 # ChangeLog for kde-base/kedit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/ChangeLog,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kedit-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kedit-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kedit-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kedit-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kedit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kedit-3.5_beta1.ebuild,
+  kedit-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kedit-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kedit-3.5.0_beta2.ebuild:
+  New version.
+
+*kedit-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kedit-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kedit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kedit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kedit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kedit-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kedit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kedit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kedit-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kedit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kedit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kedit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kedit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kedit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kedit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kedit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kedit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kedit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kedit-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kedit-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kedit-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kedit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kedit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kedit-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kedit/Manifest b/kde-base/kedit/Manifest
index ab2795b15be5..116c71406a4a 100644
--- a/kde-base/kedit/Manifest
+++ b/kde-base/kedit/Manifest
@@ -1,4 +1,22 @@
-MD5 489aa5f5c4a8e45bd6255bf9244bcdf7 kedit-3.4.0_alpha1.ebuild 271
-MD5 489aa5f5c4a8e45bd6255bf9244bcdf7 kedit-3.4.0_beta1.ebuild 271
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kedit-3.4.0_beta1 216
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kedit-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0c48cfe0c1e19e04a4c7545744385f9a ChangeLog 3325
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kedit-3.4.1 212
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kedit-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kedit-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kedit-3.5.0_beta2 216
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kedit-3.5_beta1 69
+MD5 07ddffddc00da72b15066dc0d1da4686 kedit-3.4.1.ebuild 397
+MD5 a1a29230d1124045e21fc167fd17946f kedit-3.4.3.ebuild 396
+MD5 b874237909f3857a734c15791b93e6e3 kedit-3.5.0.ebuild 375
+MD5 b07c945940ef6d66912d12b2199a8cda kedit-3.5.0_beta2.ebuild 387
+MD5 d22f53204859e99c64764fdf84595770 kedit-3.5_beta1.ebuild 378
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvvIntT9W3vfTuoRAvgTAJ0bTzZy7K/K3aTPwXIWYoBODDPbjwCginYn
+mKpsZTBgyv3qB/KBHTDuxug=
+=m0d4
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kedit/files/digest-kedit-3.4.1 b/kde-base/kedit/files/digest-kedit-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kedit/files/digest-kedit-3.4.1
+++ b/kde-base/kedit/files/digest-kedit-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kedit/kedit-3.4.1.ebuild b/kde-base/kedit/kedit-3.4.1.ebuild
index 6495344ffc18..aec8fc2fa496 100644
--- a/kde-base/kedit/kedit-3.4.1.ebuild
+++ b/kde-base/kedit/kedit-3.4.1.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/kde-base/kedit/kedit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/kedit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: very simple text editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kedit/kedit-3.4.3.ebuild b/kde-base/kedit/kedit-3.4.3.ebuild
index c039a557f293..6e6fcfa6e664 100644
--- a/kde-base/kedit/kedit-3.4.3.ebuild
+++ b/kde-base/kedit/kedit-3.4.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/kde-base/kedit/kedit-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/kedit-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: very simple text editor"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kedit/kedit-3.5.0.ebuild b/kde-base/kedit/kedit-3.5.0.ebuild
index a172e628562d..285186ab894b 100644
--- a/kde-base/kedit/kedit-3.5.0.ebuild
+++ b/kde-base/kedit/kedit-3.5.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/kde-base/kedit/kedit-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/kedit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kedit/kedit-3.5.0_beta2.ebuild b/kde-base/kedit/kedit-3.5.0_beta2.ebuild
index 8982ae5b20b9..99c6aa28a626 100644
--- a/kde-base/kedit/kedit-3.5.0_beta2.ebuild
+++ b/kde-base/kedit/kedit-3.5.0_beta2.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/kde-base/kedit/kedit-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:53 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/kedit-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: very simple text editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kedit/kedit-3.5_beta1.ebuild b/kde-base/kedit/kedit-3.5_beta1.ebuild
index 339eb056f771..d1401b6504ce 100644
--- a/kde-base/kedit/kedit-3.5_beta1.ebuild
+++ b/kde-base/kedit/kedit-3.5_beta1.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/kde-base/kedit/kedit-3.5_beta1.ebuild,v 1.1 2005/09/22 18:49:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kedit/kedit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: very simple text editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kedit/metadata.xml b/kde-base/kedit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kedit/metadata.xml
+++ b/kde-base/kedit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/keduca/ChangeLog b/kde-base/keduca/ChangeLog
index b528a1c62e07..f70c15006336 100644
--- a/kde-base/keduca/ChangeLog
+++ b/kde-base/keduca/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/keduca
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/ChangeLog,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> keduca-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> keduca-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> keduca-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*keduca-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +keduca-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> keduca-3.5_beta1.ebuild,
+  keduca-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*keduca-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +keduca-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -keduca-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*keduca-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +keduca-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*keduca-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +keduca-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> keduca-3.4.2.ebuild:
+  ~alpha keyword.
+
+*keduca-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +keduca-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> keduca-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> keduca-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> keduca-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*keduca-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +keduca-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> keduca-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> keduca-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> keduca-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> keduca-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> keduca-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*keduca-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +keduca-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*keduca-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +keduca-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *keduca-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/keduca/Manifest b/kde-base/keduca/Manifest
index 4a35c21d4ed0..1d6384627ef3 100644
--- a/kde-base/keduca/Manifest
+++ b/kde-base/keduca/Manifest
@@ -1,4 +1,22 @@
-MD5 3012bb53922c0be869f1ff95a812d970 keduca-3.4.0_alpha1.ebuild 288
-MD5 3012bb53922c0be869f1ff95a812d970 keduca-3.4.0_beta1.ebuild 288
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-keduca-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-keduca-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 345c0e28af80abf9707db8d6e5ce9883 ChangeLog 3270
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-keduca-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-keduca-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-keduca-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-keduca-3.5.0_beta2 212
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-keduca-3.5_beta1 68
+MD5 113baec7e490835c4b0240eae6d7ce44 keduca-3.4.1.ebuild 405
+MD5 3134a98a83605fc08f99d13989c1a1c8 keduca-3.4.2.ebuild 416
+MD5 dba505b5136f604730d2b5e3c8134449 keduca-3.5.0.ebuild 394
+MD5 457318293f2f5b4cc254f5905dbc4b8a keduca-3.5.0_beta2.ebuild 406
+MD5 b63b67e99e50abe10b20834b7fa565d7 keduca-3.5_beta1.ebuild 397
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlFFntT9W3vfTuoRAtvTAKCvJalhQJi3kNlWrgLHt9THsUQZcwCeJN0H
+Xt2qmwHpR5JPsMhlbHx5ZT4=
+=XG4x
+-----END PGP SIGNATURE-----
diff --git a/kde-base/keduca/files/digest-keduca-3.4.1 b/kde-base/keduca/files/digest-keduca-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/keduca/files/digest-keduca-3.4.1
+++ b/kde-base/keduca/files/digest-keduca-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/keduca/files/digest-keduca-3.4.2 b/kde-base/keduca/files/digest-keduca-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/keduca/files/digest-keduca-3.4.2
+++ b/kde-base/keduca/files/digest-keduca-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/keduca/keduca-3.4.1.ebuild b/kde-base/keduca/keduca-3.4.1.ebuild
index a61069306455..f7a1c6bd052b 100644
--- a/kde-base/keduca/keduca-3.4.1.ebuild
+++ b/kde-base/keduca/keduca-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Form-based tests and exams"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/keduca/keduca-3.4.2.ebuild b/kde-base/keduca/keduca-3.4.2.ebuild
index d51a60a86217..de36650a74e7 100644
--- a/kde-base/keduca/keduca-3.4.2.ebuild
+++ b/kde-base/keduca/keduca-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Form-based tests and exams"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/keduca/keduca-3.5.0.ebuild b/kde-base/keduca/keduca-3.5.0.ebuild
index bd6e1f21747d..f6278acc528d 100644
--- a/kde-base/keduca/keduca-3.5.0.ebuild
+++ b/kde-base/keduca/keduca-3.5.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/kde-base/keduca/keduca-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/keduca/keduca-3.5.0_beta2.ebuild b/kde-base/keduca/keduca-3.5.0_beta2.ebuild
index cd39d8b92b03..c81912238350 100644
--- a/kde-base/keduca/keduca-3.5.0_beta2.ebuild
+++ b/kde-base/keduca/keduca-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Form-based tests and exams"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/keduca/keduca-3.5_beta1.ebuild b/kde-base/keduca/keduca-3.5_beta1.ebuild
index 955351c33143..ea78cfde5180 100644
--- a/kde-base/keduca/keduca-3.5_beta1.ebuild
+++ b/kde-base/keduca/keduca-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.5_beta1.ebuild,v 1.1 2005/09/22 18:50:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/keduca/keduca-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:20 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: Form-based tests and exams"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/keduca/metadata.xml b/kde-base/keduca/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/keduca/metadata.xml
+++ b/kde-base/keduca/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kenolaba/ChangeLog b/kde-base/kenolaba/ChangeLog
index e8d7d3e20f82..6bf75d4e43e9 100644
--- a/kde-base/kenolaba/ChangeLog
+++ b/kde-base/kenolaba/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kenolaba
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/ChangeLog,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kenolaba-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kenolaba-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kenolaba-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kenolaba-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kenolaba-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kenolaba-3.5_beta1.ebuild,
+  kenolaba-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kenolaba-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.5.0_beta2.ebuild:
+  New version.
+
+*kenolaba-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kenolaba-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kenolaba-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kenolaba-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kenolaba-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kenolaba-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kenolaba-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kenolaba-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kenolaba-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kenolaba-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kenolaba-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kenolaba-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kenolaba-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kenolaba-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kenolaba-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kenolaba-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kenolaba-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kenolaba-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kenolaba-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kenolaba-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kenolaba-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kenolaba/Manifest b/kde-base/kenolaba/Manifest
index 3c778c91f06b..bd4f03037a30 100644
--- a/kde-base/kenolaba/Manifest
+++ b/kde-base/kenolaba/Manifest
@@ -1,4 +1,26 @@
-MD5 fad1817723b35113c2f70ab50cc7cf93 kenolaba-3.4.0_beta1.ebuild 429
-MD5 fad1817723b35113c2f70ab50cc7cf93 kenolaba-3.4.0_alpha1.ebuild 429
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kenolaba-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kenolaba-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 247fb4746ac78a1a0afd3147bb9e8938 ChangeLog 3605
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kenolaba-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kenolaba-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kenolaba-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kenolaba-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kenolaba-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kenolaba-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kenolaba-3.5_beta1 70
+MD5 73a2e72b10109c770a98c5ef32b52357 kenolaba-3.4.1.ebuild 550
+MD5 33c5a113e81f4401958371eae7790db0 kenolaba-3.4.2.ebuild 563
+MD5 ea18c9278bee1c204176e19ebb0cde8a kenolaba-3.4.3.ebuild 559
+MD5 42e68d296ec426769fad692e133494a3 kenolaba-3.5.0.ebuild 502
+MD5 387a57be832e3e6e8e3c80d6a88379b4 kenolaba-3.5.0_beta2.ebuild 507
+MD5 1ab2921b52af5884212961770fd05876 kenolaba-3.5.0_rc1.ebuild 506
+MD5 f43e81c1a7de675e913e62223a08e0c4 kenolaba-3.5_beta1.ebuild 542
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlywntT9W3vfTuoRAlC0AKCafxgXO9F7qJuXemO7ZDumJlTmeACfeXpp
+WsY6VeHTVPeQtlH5GpSFrs0=
+=0La1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kenolaba/files/digest-kenolaba-3.4.1 b/kde-base/kenolaba/files/digest-kenolaba-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kenolaba/files/digest-kenolaba-3.4.1
+++ b/kde-base/kenolaba/files/digest-kenolaba-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kenolaba/files/digest-kenolaba-3.4.2 b/kde-base/kenolaba/files/digest-kenolaba-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kenolaba/files/digest-kenolaba-3.4.2
+++ b/kde-base/kenolaba/files/digest-kenolaba-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kenolaba/kenolaba-3.4.1.ebuild b/kde-base/kenolaba/kenolaba-3.4.1.ebuild
index 9a8c28dc7803..03f88b44e330 100644
--- a/kde-base/kenolaba/kenolaba-3.4.1.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Board game inspired by Abalone"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kenolaba/kenolaba-3.4.2.ebuild b/kde-base/kenolaba/kenolaba-3.4.2.ebuild
index a2fa92bec20f..a4f72e18ad23 100644
--- a/kde-base/kenolaba/kenolaba-3.4.2.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Board game inspired by Abalone"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kenolaba/kenolaba-3.4.3.ebuild b/kde-base/kenolaba/kenolaba-3.4.3.ebuild
index d49f9e40b681..dd28b8254bf8 100644
--- a/kde-base/kenolaba/kenolaba-3.4.3.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Board game inspired by Abalone"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kenolaba/kenolaba-3.5.0.ebuild b/kde-base/kenolaba/kenolaba-3.5.0.ebuild
index a302e92c8645..d74971355da5 100644
--- a/kde-base/kenolaba/kenolaba-3.5.0.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.5.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/kde-base/kenolaba/kenolaba-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kenolaba/kenolaba-3.5.0_beta2.ebuild b/kde-base/kenolaba/kenolaba-3.5.0_beta2.ebuild
index 17e1a2a92a5f..3c7e08d0bc25 100644
--- a/kde-base/kenolaba/kenolaba-3.5.0_beta2.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Board game inspired by Abalone"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kenolaba/kenolaba-3.5.0_rc1.ebuild b/kde-base/kenolaba/kenolaba-3.5.0_rc1.ebuild
index d79af7d4a62f..722f8b8d3c8e 100644
--- a/kde-base/kenolaba/kenolaba-3.5.0_rc1.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.5.0_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/kde-base/kenolaba/kenolaba-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kenolaba/kenolaba-3.5_beta1.ebuild b/kde-base/kenolaba/kenolaba-3.5_beta1.ebuild
index f04db7ca445d..ed0c65817fb9 100644
--- a/kde-base/kenolaba/kenolaba-3.5_beta1.ebuild
+++ b/kde-base/kenolaba/kenolaba-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.5_beta1.ebuild,v 1.1 2005/09/22 18:51:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kenolaba/kenolaba-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Board game inspired by Abalone"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kenolaba/metadata.xml b/kde-base/kenolaba/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kenolaba/metadata.xml
+++ b/kde-base/kenolaba/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kfax/ChangeLog b/kde-base/kfax/ChangeLog
index b09813b82a17..4832fb8ab87d 100644
--- a/kde-base/kfax/ChangeLog
+++ b/kde-base/kfax/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for kde-base/kfax
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/ChangeLog,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kfax-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kfax-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kfax-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kfax-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfax-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kfax-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfax-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kfax-3.5_beta1.ebuild,
+  kfax-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kfax-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfax-3.5.0_beta2.ebuild:
+  New version.
+
+*kfax-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfax-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kfax-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  24 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> kfax-3.5_beta1.ebuild:
+  Compilation fix.
+
+*kfax-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kfax-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kfax-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfax-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kfax-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kfax-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kfax-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kfax-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kfax-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kfax-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kfax-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kfax-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kfax-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kfax-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kfax-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kfax-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kfax-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> kfax-3.4.0_beta1.ebuild:
+  Add missing dep on tiff, needed for kfaxview. Closes bug #78317.
 
 *kfax-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kfax/Manifest b/kde-base/kfax/Manifest
index 20cd2f0e3d93..8919e27e13ee 100644
--- a/kde-base/kfax/Manifest
+++ b/kde-base/kfax/Manifest
@@ -1,4 +1,24 @@
-MD5 b20c8a1dd5b44f0a6b62ddd25e0a0c08 kfax-3.4.0_alpha1.ebuild 445
-MD5 b20c8a1dd5b44f0a6b62ddd25e0a0c08 kfax-3.4.0_beta1.ebuild 445
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kfax-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kfax-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d378386b7335c953734749e064522fdd ChangeLog 3437
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kfax-3.4.1 221
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kfax-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kfax-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kfax-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kfax-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kfax-3.5_beta1 72
+MD5 ec9ed2c0766fbaf6ab10db80f58bbd2d kfax-3.4.1.ebuild 578
+MD5 9a2bf06847bdfd556e2940965d423462 kfax-3.4.3.ebuild 583
+MD5 f7b63b92acd427eb68fa8c71d4125bbe kfax-3.5.0.ebuild 554
+MD5 ebfebc8e5d69fc331c623fcf5eeaf83f kfax-3.5.0_beta2.ebuild 559
+MD5 f2d19a0fb03c589f86eac8abe53e6939 kfax-3.5.0_rc1.ebuild 558
+MD5 98296c9df291d3110b4690e7a28acae5 kfax-3.5_beta1.ebuild 593
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmW7ntT9W3vfTuoRAgGPAJ9o+OyWwKXyEWIcJ39vhjHOn0wK3ACfd8HN
+WtH+m7pdXO+hf5pK3csvFGQ=
+=i8Jb
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kfax/files/digest-kfax-3.4.1 b/kde-base/kfax/files/digest-kfax-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kfax/files/digest-kfax-3.4.1
+++ b/kde-base/kfax/files/digest-kfax-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kfax/kfax-3.4.1.ebuild b/kde-base/kfax/kfax-3.4.1.ebuild
index 605f44e7807e..81eca0254a36 100644
--- a/kde-base/kfax/kfax-3.4.1.ebuild
+++ b/kde-base/kfax/kfax-3.4.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE G3/G4 fax viewer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="media-libs/tiff
-$(deprange $PV $MAXKDEVER kde-base/kviewshell)"
+$(deprange $PV 3.4.2 kde-base/kviewshell)"
 
 KMEXTRA="kfaxview"
 KMCOPYLIB="libkmultipage kviewshell"
diff --git a/kde-base/kfax/kfax-3.4.3.ebuild b/kde-base/kfax/kfax-3.4.3.ebuild
index 49cad4dfc5d4..cc49be29c855 100644
--- a/kde-base/kfax/kfax-3.4.3.ebuild
+++ b/kde-base/kfax/kfax-3.4.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/kde-base/kfax/kfax-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE G3/G4 fax viewer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="media-libs/tiff
diff --git a/kde-base/kfax/kfax-3.5.0.ebuild b/kde-base/kfax/kfax-3.5.0.ebuild
index a1b70e01e5a4..dfe29b33b5e4 100644
--- a/kde-base/kfax/kfax-3.5.0.ebuild
+++ b/kde-base/kfax/kfax-3.5.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/kde-base/kfax/kfax-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kfax/kfax-3.5.0_beta2.ebuild b/kde-base/kfax/kfax-3.5.0_beta2.ebuild
index 96d322249f7a..c363da8ac5b1 100644
--- a/kde-base/kfax/kfax-3.5.0_beta2.ebuild
+++ b/kde-base/kfax/kfax-3.5.0_beta2.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/kde-base/kfax/kfax-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE G3/G4 fax viewer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="media-libs/tiff
diff --git a/kde-base/kfax/kfax-3.5.0_rc1.ebuild b/kde-base/kfax/kfax-3.5.0_rc1.ebuild
index 2bf1fccadf7c..6f5ad789d26b 100644
--- a/kde-base/kfax/kfax-3.5.0_rc1.ebuild
+++ b/kde-base/kfax/kfax-3.5.0_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/kde-base/kfax/kfax-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kfax/kfax-3.5_beta1.ebuild b/kde-base/kfax/kfax-3.5_beta1.ebuild
index 7badb2de49df..d159a977607c 100644
--- a/kde-base/kfax/kfax-3.5_beta1.ebuild
+++ b/kde-base/kfax/kfax-3.5_beta1.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/kde-base/kfax/kfax-3.5_beta1.ebuild,v 1.1 2005/09/22 18:52:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfax/kfax-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE G3/G4 fax viewer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/kviewshell-$PV"
 DEPEND="media-libs/tiff
@@ -16,4 +16,5 @@ $(deprange $PV $MAXKDEVER kde-base/kviewshell)"
 
 KMEXTRA="kfaxview"
 KMCOPYLIB="libkmultipage kviewshell"
-KMEXTRACTONLY="kviewshell/"
\ No newline at end of file
+KMEXTRACTONLY="kviewshell/"
+KMCOMPILEONLY="kviewshell"
diff --git a/kde-base/kfax/metadata.xml b/kde-base/kfax/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kfax/metadata.xml
+++ b/kde-base/kfax/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kfilereplace/ChangeLog b/kde-base/kfilereplace/ChangeLog
index 12adb3e28cbb..f8d10af1ba8b 100644
--- a/kde-base/kfilereplace/ChangeLog
+++ b/kde-base/kfilereplace/ChangeLog
@@ -1,6 +1,114 @@
 # ChangeLog for kde-base/kfilereplace
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/ChangeLog,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kfilereplace-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kfilereplace-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kfilereplace-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kfilereplace-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfilereplace-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kfilereplace-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfilereplace-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kfilereplace-3.5_beta1.ebuild, kfilereplace-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kfilereplace-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfilereplace-3.5.0_beta2.ebuild:
+  New version.
+
+*kfilereplace-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfilereplace-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kfilereplace-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kfilereplace-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfilereplace-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kfilereplace-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfilereplace-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kfilereplace-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kfilereplace-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kfilereplace-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kfilereplace-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kfilereplace-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kfilereplace-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org> kfilereplace-3.4.0.ebuild,
+  kfilereplace-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> kfilereplace-3.4.0.ebuild,
+  kfilereplace-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kfilereplace-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kfilereplace-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kfilereplace-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kfilereplace-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kfilereplace-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kfilereplace-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kfilereplace-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kfilereplace-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kfilereplace-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kfilereplace-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kfilereplace/Manifest b/kde-base/kfilereplace/Manifest
index f1c5da2d3bce..45042efb7f19 100644
--- a/kde-base/kfilereplace/Manifest
+++ b/kde-base/kfilereplace/Manifest
@@ -1,4 +1,26 @@
-MD5 ce21f858b10c0d67e63370601957f34a kfilereplace-3.4.0_alpha1.ebuild 277
-MD5 ce21f858b10c0d67e63370601957f34a kfilereplace-3.4.0_beta1.ebuild 277
-MD5 07dc9f44e293d1ac9c7b66b68f28492f files/digest-kfilereplace-3.4.0_beta1 219
-MD5 01932d35a126a5610a6c4a35de90a2b6 files/digest-kfilereplace-3.4.0_alpha1 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4cfe30c2d709fefa17016a96b8b55fc5 ChangeLog 3819
+MD5 e951879abebc3cb3931132db3f1c508a files/digest-kfilereplace-3.4.1 215
+MD5 aa19f6252c3ee8966919f391f9ccd717 files/digest-kfilereplace-3.4.2 292
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-kfilereplace-3.4.3 69
+MD5 1b9c64625ee8bb6581dafc883b1d0ee1 files/digest-kfilereplace-3.5.0 69
+MD5 f707b83e603df2763351c664d0943915 files/digest-kfilereplace-3.5.0_beta2 219
+MD5 50a5dfc5bdebb9f91775752768b4ca60 files/digest-kfilereplace-3.5.0_rc1 304
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-kfilereplace-3.5_beta1 70
+MD5 72fad9e92547ed3b4523564598a35607 kfilereplace-3.4.1.ebuild 395
+MD5 21a155d22717d5d1b48afa394f069254 kfilereplace-3.4.2.ebuild 408
+MD5 d443c447515ec6bddbfded6965d04ee2 kfilereplace-3.4.3.ebuild 404
+MD5 b34fa7cf0f41c1b1f305ecbc9e864c8f kfilereplace-3.5.0.ebuild 384
+MD5 99e2844fc17a4c055469cceeaf340164 kfilereplace-3.5.0_beta2.ebuild 389
+MD5 ead319fe6fcd085dbd5bf0c194cc5fd0 kfilereplace-3.5.0_rc1.ebuild 388
+MD5 2eb8cccb39021314d9b499a1f5e98404 kfilereplace-3.5_beta1.ebuild 387
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxTKntT9W3vfTuoRAt0VAJ4w3jcTqsLrMf6nZfSts6s/lAe1fACgj5Ab
+GH7iP4vXl+1f3cT0xR94oI4=
+=5cfT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kfilereplace/files/digest-kfilereplace-3.4.1 b/kde-base/kfilereplace/files/digest-kfilereplace-3.4.1
index 797b2dac2533..ff993687a657 100644
--- a/kde-base/kfilereplace/files/digest-kfilereplace-3.4.1
+++ b/kde-base/kfilereplace/files/digest-kfilereplace-3.4.1
@@ -1,2 +1,3 @@
 MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
 MD5 d5c9e5c72731aead950ab29a4d620af8 kdewebdev-3.4.1.tar.bz2 5966577
diff --git a/kde-base/kfilereplace/files/digest-kfilereplace-3.4.2 b/kde-base/kfilereplace/files/digest-kfilereplace-3.4.2
index 5497b6e4be9f..18c726d6f0c5 100644
--- a/kde-base/kfilereplace/files/digest-kfilereplace-3.4.2
+++ b/kde-base/kfilereplace/files/digest-kfilereplace-3.4.2
@@ -1 +1,4 @@
+MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
+MD5 fadb59f001c317dd0f843be81f4157d9 kdewebdev-3.4.1-3.4.2.tar.xdelta 220130
 MD5 99dbd9bf9b2a1451544b35f73efe7dba kdewebdev-3.4.2.tar.bz2 5968773
diff --git a/kde-base/kfilereplace/kfilereplace-3.4.1.ebuild b/kde-base/kfilereplace/kfilereplace-3.4.1.ebuild
index 8895686ebe8a..249d753076d2 100644
--- a/kde-base/kfilereplace/kfilereplace-3.4.1.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE batch search&replace tool"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kfilereplace/kfilereplace-3.4.2.ebuild b/kde-base/kfilereplace/kfilereplace-3.4.2.ebuild
index 03d1d7d35c6e..67c263368c3f 100644
--- a/kde-base/kfilereplace/kfilereplace-3.4.2.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.4.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE batch search&replace tool"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kfilereplace/kfilereplace-3.4.3.ebuild b/kde-base/kfilereplace/kfilereplace-3.4.3.ebuild
index bf4ccd939f6c..f700f48e53cf 100644
--- a/kde-base/kfilereplace/kfilereplace-3.4.3.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.4.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE batch search&replace tool"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kfilereplace/kfilereplace-3.5.0.ebuild b/kde-base/kfilereplace/kfilereplace-3.5.0.ebuild
index 7873fe17b319..21ab58464717 100644
--- a/kde-base/kfilereplace/kfilereplace-3.5.0.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.5.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/kde-base/kfilereplace/kfilereplace-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kfilereplace/kfilereplace-3.5.0_beta2.ebuild b/kde-base/kfilereplace/kfilereplace-3.5.0_beta2.ebuild
index 715bd6084667..acf57278d885 100644
--- a/kde-base/kfilereplace/kfilereplace-3.5.0_beta2.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.5.0_beta2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE batch search&replace tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kfilereplace/kfilereplace-3.5.0_rc1.ebuild b/kde-base/kfilereplace/kfilereplace-3.5.0_rc1.ebuild
index c9d1084dd31b..2a70444222d4 100644
--- a/kde-base/kfilereplace/kfilereplace-3.5.0_rc1.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.5.0_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/kde-base/kfilereplace/kfilereplace-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kfilereplace/kfilereplace-3.5_beta1.ebuild b/kde-base/kfilereplace/kfilereplace-3.5_beta1.ebuild
index 44eb8f5c1be1..52383fcd5fe5 100644
--- a/kde-base/kfilereplace/kfilereplace-3.5_beta1.ebuild
+++ b/kde-base/kfilereplace/kfilereplace-3.5_beta1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.5_beta1.ebuild,v 1.1 2005/09/22 18:53:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfilereplace/kfilereplace-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:22 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE batch search&replace tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kfilereplace/metadata.xml b/kde-base/kfilereplace/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kfilereplace/metadata.xml
+++ b/kde-base/kfilereplace/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kfind/ChangeLog b/kde-base/kfind/ChangeLog
index 1e7fff140d64..0306a65f8b4d 100644
--- a/kde-base/kfind/ChangeLog
+++ b/kde-base/kfind/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kfind
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/ChangeLog,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kfind-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kfind-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kfind-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kfind-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kfind-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kfind-3.5_beta1.ebuild,
+  kfind-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kfind-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.5.0_beta2.ebuild:
+  New version.
+
+*kfind-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kfind-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kfind-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfind-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kfind-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfind-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kfind-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kfind-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kfind-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kfind-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kfind-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kfind-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kfind-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kfind-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kfind-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kfind-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kfind-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kfind-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kfind-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kfind-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kfind-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kfind/Manifest b/kde-base/kfind/Manifest
index f3389c175163..b923bdbbaa8f 100644
--- a/kde-base/kfind/Manifest
+++ b/kde-base/kfind/Manifest
@@ -1,4 +1,26 @@
-MD5 3cea48fb4afb03354fd7a0ea62a56793 kfind-3.4.0_beta1.ebuild 479
-MD5 3cea48fb4afb03354fd7a0ea62a56793 kfind-3.4.0_alpha1.ebuild 479
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kfind-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kfind-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0b87cf957b078b4da7f3bf236b1c0a40 ChangeLog 3488
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kfind-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kfind-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kfind-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kfind-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kfind-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kfind-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kfind-3.5_beta1 69
+MD5 ca1c00ee43f73a5cfb21b287a87aa946 kfind-3.4.1.ebuild 496
+MD5 77c2d7ad47599ddee089326a3ac58a4a kfind-3.4.2.ebuild 509
+MD5 7ebf286b2aafe972c71082e5fee870eb kfind-3.4.3.ebuild 505
+MD5 0e1fd01b37da4730350dff0f8579ee97 kfind-3.5.0.ebuild 452
+MD5 9e96845604cd513431ab0d56ad232d9f kfind-3.5.0_beta2.ebuild 457
+MD5 f06c661501bb3ca1104eba4ff3c5bf24 kfind-3.5.0_rc1.ebuild 456
+MD5 498b15a3f7cca0f70092c577b38df1fc kfind-3.5_beta1.ebuild 488
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkDTntT9W3vfTuoRAnWfAJ4gLysG6c6SiTalnuME8A9ZJEsJgQCfc8Lc
+Rozq1kd3jDuVNW6bdgGir/g=
+=Mjud
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kfind/files/digest-kfind-3.4.1 b/kde-base/kfind/files/digest-kfind-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kfind/files/digest-kfind-3.4.1
+++ b/kde-base/kfind/files/digest-kfind-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kfind/files/digest-kfind-3.4.2 b/kde-base/kfind/files/digest-kfind-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kfind/files/digest-kfind-3.4.2
+++ b/kde-base/kfind/files/digest-kfind-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kfind/kfind-3.4.1.ebuild b/kde-base/kfind/kfind-3.4.1.ebuild
index e9946cb50397..6baa77fd6e77 100644
--- a/kde-base/kfind/kfind-3.4.1.ebuild
+++ b/kde-base/kfind/kfind-3.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/kde-base/kfind/kfind-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE file find utility"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)"
diff --git a/kde-base/kfind/kfind-3.4.2.ebuild b/kde-base/kfind/kfind-3.4.2.ebuild
index 4b7e1e85577f..d1b57b1c5262 100644
--- a/kde-base/kfind/kfind-3.4.2.ebuild
+++ b/kde-base/kfind/kfind-3.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/kde-base/kfind/kfind-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE file find utility"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)"
diff --git a/kde-base/kfind/kfind-3.4.3.ebuild b/kde-base/kfind/kfind-3.4.3.ebuild
index 4fb7acb60d8d..58b4d9910007 100644
--- a/kde-base/kfind/kfind-3.4.3.ebuild
+++ b/kde-base/kfind/kfind-3.4.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/kde-base/kfind/kfind-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE file find utility"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)"
diff --git a/kde-base/kfind/kfind-3.5.0.ebuild b/kde-base/kfind/kfind-3.5.0.ebuild
index de9a3a917412..07b4565c5583 100644
--- a/kde-base/kfind/kfind-3.5.0.ebuild
+++ b/kde-base/kfind/kfind-3.5.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/kde-base/kfind/kfind-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kfind/kfind-3.5.0_beta2.ebuild b/kde-base/kfind/kfind-3.5.0_beta2.ebuild
index da5add334473..44bc60aa0959 100644
--- a/kde-base/kfind/kfind-3.5.0_beta2.ebuild
+++ b/kde-base/kfind/kfind-3.5.0_beta2.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/kde-base/kfind/kfind-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE file find utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)"
diff --git a/kde-base/kfind/kfind-3.5.0_rc1.ebuild b/kde-base/kfind/kfind-3.5.0_rc1.ebuild
index b4671c1409bd..1750c4cbe15b 100644
--- a/kde-base/kfind/kfind-3.5.0_rc1.ebuild
+++ b/kde-base/kfind/kfind-3.5.0_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/kde-base/kfind/kfind-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kfind/kfind-3.5_beta1.ebuild b/kde-base/kfind/kfind-3.5_beta1.ebuild
index acf5441de206..c074292b3fc4 100644
--- a/kde-base/kfind/kfind-3.5_beta1.ebuild
+++ b/kde-base/kfind/kfind-3.5_beta1.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/kde-base/kfind/kfind-3.5_beta1.ebuild,v 1.1 2005/09/22 18:54:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfind/kfind-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE file find utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)"
diff --git a/kde-base/kfind/metadata.xml b/kde-base/kfind/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kfind/metadata.xml
+++ b/kde-base/kfind/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kfloppy/ChangeLog b/kde-base/kfloppy/ChangeLog
index ad788b05a3b8..ec011b972d86 100644
--- a/kde-base/kfloppy/ChangeLog
+++ b/kde-base/kfloppy/ChangeLog
@@ -1,6 +1,86 @@
 # ChangeLog for kde-base/kfloppy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/ChangeLog,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
+
+*kfloppy-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfloppy-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kfloppy-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfloppy-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kfloppy-3.5_beta1.ebuild,
+  kfloppy-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kfloppy-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfloppy-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kfloppy-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kfloppy-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfloppy-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kfloppy-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kfloppy-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfloppy-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kfloppy-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kfloppy-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kfloppy-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kfloppy-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kfloppy-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kfloppy-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kfloppy-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kfloppy-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kfloppy-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kfloppy-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kfloppy-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kfloppy-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kfloppy-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kfloppy-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kfloppy/Manifest b/kde-base/kfloppy/Manifest
index 8bba1871ef40..52c244ed72ff 100644
--- a/kde-base/kfloppy/Manifest
+++ b/kde-base/kfloppy/Manifest
@@ -1,4 +1,12 @@
-MD5 40bf9f6aeb88e2df318093bb745ca03a kfloppy-3.4.0_beta1.ebuild 311
-MD5 40bf9f6aeb88e2df318093bb745ca03a kfloppy-3.4.0_alpha1.ebuild 311
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kfloppy-3.4.0_beta1 216
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kfloppy-3.4.0_alpha1 69
+MD5 59d4309e8540e36b66fdfadb8cdd142c ChangeLog 2997
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kfloppy-3.4.1 212
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kfloppy-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kfloppy-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kfloppy-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kfloppy-3.5_beta1 69
+MD5 6775decbb959fdc4db484d80772230e3 kfloppy-3.4.1.ebuild 442
+MD5 9ffa7642a50eb597e43e981a0736f941 kfloppy-3.5.0.ebuild 419
+MD5 b64d11e5ffe45743f45501207c2e82c1 kfloppy-3.5.0_beta2.ebuild 424
+MD5 8ac648aa9844346e2bc48f604432e7d2 kfloppy-3.5.0_rc1.ebuild 423
+MD5 00ea0c4808333e227122592346edb167 kfloppy-3.5_beta1.ebuild 422
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kfloppy/files/digest-kfloppy-3.4.1 b/kde-base/kfloppy/files/digest-kfloppy-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kfloppy/files/digest-kfloppy-3.4.1
+++ b/kde-base/kfloppy/files/digest-kfloppy-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kfloppy/kfloppy-3.4.1.ebuild b/kde-base/kfloppy/kfloppy-3.4.1.ebuild
index 7b491d8ac7cd..d089f1f85d4d 100644
--- a/kde-base/kfloppy/kfloppy-3.4.1.ebuild
+++ b/kde-base/kfloppy/kfloppy-3.4.1.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/kde-base/kfloppy/kfloppy-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kfloppy/kfloppy-3.5.0.ebuild b/kde-base/kfloppy/kfloppy-3.5.0.ebuild
index ee2e5e59b5d7..2242c7ed72f5 100644
--- a/kde-base/kfloppy/kfloppy-3.5.0.ebuild
+++ b/kde-base/kfloppy/kfloppy-3.5.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/kde-base/kfloppy/kfloppy-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kfloppy/kfloppy-3.5.0_beta2.ebuild b/kde-base/kfloppy/kfloppy-3.5.0_beta2.ebuild
index aafaf4ccb568..932995aed8fb 100644
--- a/kde-base/kfloppy/kfloppy-3.5.0_beta2.ebuild
+++ b/kde-base/kfloppy/kfloppy-3.5.0_beta2.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/kde-base/kfloppy/kfloppy-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kfloppy/kfloppy-3.5.0_rc1.ebuild b/kde-base/kfloppy/kfloppy-3.5.0_rc1.ebuild
index c353b540c686..d95c19d581bb 100644
--- a/kde-base/kfloppy/kfloppy-3.5.0_rc1.ebuild
+++ b/kde-base/kfloppy/kfloppy-3.5.0_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/kde-base/kfloppy/kfloppy-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kfloppy/kfloppy-3.5_beta1.ebuild b/kde-base/kfloppy/kfloppy-3.5_beta1.ebuild
index 9fbc657d0682..7f13cb163abb 100644
--- a/kde-base/kfloppy/kfloppy-3.5_beta1.ebuild
+++ b/kde-base/kfloppy/kfloppy-3.5_beta1.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/kde-base/kfloppy/kfloppy-3.5_beta1.ebuild,v 1.1 2005/09/22 18:55:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfloppy/kfloppy-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KFloppy - formats disks and puts a DOS or ext2fs filesystem on them."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kfloppy/metadata.xml b/kde-base/kfloppy/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kfloppy/metadata.xml
+++ b/kde-base/kfloppy/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kfouleggs/ChangeLog b/kde-base/kfouleggs/ChangeLog
index 6bdc787c33ae..502b4d9fd38a 100644
--- a/kde-base/kfouleggs/ChangeLog
+++ b/kde-base/kfouleggs/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kfouleggs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/ChangeLog,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kfouleggs-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kfouleggs-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kfouleggs-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kfouleggs-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kfouleggs-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kfouleggs-3.5_beta1.ebuild,
+  kfouleggs-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kfouleggs-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.5.0_beta2.ebuild:
+  New version.
+
+*kfouleggs-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kfouleggs-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kfouleggs-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfouleggs-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kfouleggs-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kfouleggs-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kfouleggs-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kfouleggs-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kfouleggs-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kfouleggs-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kfouleggs-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kfouleggs-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kfouleggs-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kfouleggs-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kfouleggs-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kfouleggs-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kfouleggs-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kfouleggs-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kfouleggs-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kfouleggs-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kfouleggs-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kfouleggs-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kfouleggs/Manifest b/kde-base/kfouleggs/Manifest
index 8f4ce9e68a27..138a5a459220 100644
--- a/kde-base/kfouleggs/Manifest
+++ b/kde-base/kfouleggs/Manifest
@@ -1,4 +1,26 @@
-MD5 9303e74b03de410b451e843fcf72b976 kfouleggs-3.4.0_alpha1.ebuild 580
-MD5 9303e74b03de410b451e843fcf72b976 kfouleggs-3.4.0_beta1.ebuild 580
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kfouleggs-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kfouleggs-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 31f867619658880f40180951428c1cbe ChangeLog 3650
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kfouleggs-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kfouleggs-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kfouleggs-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kfouleggs-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kfouleggs-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kfouleggs-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kfouleggs-3.5_beta1 70
+MD5 76655851bc58e2362c923a77891742ea kfouleggs-3.4.1.ebuild 703
+MD5 284d5146795cda90a5326e29452d914d kfouleggs-3.4.2.ebuild 716
+MD5 2740bda1956aebe3c5b543d0ea90fd4c kfouleggs-3.4.3.ebuild 712
+MD5 1d2a2eae8528442dcb91efb327afe5c7 kfouleggs-3.5.0.ebuild 630
+MD5 ce13af90e7db2ae68e8a887ded965649 kfouleggs-3.5.0_beta2.ebuild 635
+MD5 0425cac66adcc958a9a1e54b5d576c64 kfouleggs-3.5.0_rc1.ebuild 634
+MD5 c99d8fcd9c049ebad031ac53fd8befd5 kfouleggs-3.5_beta1.ebuild 695
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl1tntT9W3vfTuoRApOFAKCZyF4NHLRp9uzTNxOsKcF187roNACfVY8U
+oIWMY9MlbyrTu0SLB4MxiWU=
+=V+6h
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kfouleggs/files/digest-kfouleggs-3.4.1 b/kde-base/kfouleggs/files/digest-kfouleggs-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kfouleggs/files/digest-kfouleggs-3.4.1
+++ b/kde-base/kfouleggs/files/digest-kfouleggs-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kfouleggs/files/digest-kfouleggs-3.4.2 b/kde-base/kfouleggs/files/digest-kfouleggs-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kfouleggs/files/digest-kfouleggs-3.4.2
+++ b/kde-base/kfouleggs/files/digest-kfouleggs-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kfouleggs/kfouleggs-3.4.1.ebuild b/kde-base/kfouleggs/kfouleggs-3.4.1.ebuild
index 0906b9b1f0cb..4c06d4a5130e 100644
--- a/kde-base/kfouleggs/kfouleggs-3.4.1.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE games: KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/kfouleggs/kfouleggs-3.4.2.ebuild b/kde-base/kfouleggs/kfouleggs-3.4.2.ebuild
index 934bb3167612..e0e95a1ab7f1 100644
--- a/kde-base/kfouleggs/kfouleggs-3.4.2.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE games: KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/kfouleggs/kfouleggs-3.4.3.ebuild b/kde-base/kfouleggs/kfouleggs-3.4.3.ebuild
index 878b4c299e52..6cd465d0e350 100644
--- a/kde-base/kfouleggs/kfouleggs-3.4.3.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE games: KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/kfouleggs/kfouleggs-3.5.0.ebuild b/kde-base/kfouleggs/kfouleggs-3.5.0.ebuild
index 80d84cbff97b..e534fbf3053d 100644
--- a/kde-base/kfouleggs/kfouleggs-3.5.0.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.5.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/kde-base/kfouleggs/kfouleggs-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kfouleggs/kfouleggs-3.5.0_beta2.ebuild b/kde-base/kfouleggs/kfouleggs-3.5.0_beta2.ebuild
index 7a39a488d2aa..4e63051fc41c 100644
--- a/kde-base/kfouleggs/kfouleggs-3.5.0_beta2.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE games: KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/kfouleggs/kfouleggs-3.5.0_rc1.ebuild b/kde-base/kfouleggs/kfouleggs-3.5.0_rc1.ebuild
index 2d89a9624f00..c3345830b707 100644
--- a/kde-base/kfouleggs/kfouleggs-3.5.0_rc1.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.5.0_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/kde-base/kfouleggs/kfouleggs-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kfouleggs/kfouleggs-3.5_beta1.ebuild b/kde-base/kfouleggs/kfouleggs-3.5_beta1.ebuild
index deb54ff99a28..cac8c4fe0cbf 100644
--- a/kde-base/kfouleggs/kfouleggs-3.5_beta1.ebuild
+++ b/kde-base/kfouleggs/kfouleggs-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.5_beta1.ebuild,v 1.1 2005/09/22 18:56:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kfouleggs/kfouleggs-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE games: KFoulEggs is an adaptation of the well-known (at least in Japan) PuyoPuyo game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/kfouleggs/metadata.xml b/kde-base/kfouleggs/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kfouleggs/metadata.xml
+++ b/kde-base/kfouleggs/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kgamma/ChangeLog b/kde-base/kgamma/ChangeLog
index d0deb7624d90..efa5f7c14cd0 100644
--- a/kde-base/kgamma/ChangeLog
+++ b/kde-base/kgamma/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for kde-base/kgamma
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/ChangeLog,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kgamma-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kgamma-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kgamma-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kgamma-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kgamma-3.5_beta1.ebuild,
+  kgamma-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kgamma-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.5.0_beta2.ebuild:
+  New version.
+
+*kgamma-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kgamma-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kgamma-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kgamma-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kgamma-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kgamma-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kgamma-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kgamma-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kgamma-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kgamma-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kgamma-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kgamma-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kgamma-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kgamma-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kgamma-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kgamma-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kgamma-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kgamma-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kgamma-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kgamma-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kgamma-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kgamma/Manifest b/kde-base/kgamma/Manifest
index 2d6a24131cc4..4b2c0387845b 100644
--- a/kde-base/kgamma/Manifest
+++ b/kde-base/kgamma/Manifest
@@ -1,3 +1,24 @@
-MD5 df920449f147c61cf511ed75b6bbf3a5 kgamma-3.4.0_alpha1.ebuild 311
-MD5 df920449f147c61cf511ed75b6bbf3a5 kgamma-3.4.0_beta1.ebuild 311
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kgamma-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ae53e727e3657d5063eebafa451dc9e4 ChangeLog 3384
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kgamma-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kgamma-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kgamma-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kgamma-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kgamma-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kgamma-3.5_beta1 72
+MD5 91b30754f620ffbdb6f6832caa934459 kgamma-3.4.1.ebuild 403
+MD5 6c4f1ee8ac0071db4bf3cb33b4060bab kgamma-3.4.2.ebuild 416
+MD5 79d9026a411e9c0c8cac0400d71d2102 kgamma-3.4.3.ebuild 412
+MD5 12c1fcbdfacdde571e861d5d8d293a9d kgamma-3.5.0.ebuild 392
+MD5 8fb4e27b9f3d9ab7fa1ace8c0577c5b6 kgamma-3.5.0_beta2.ebuild 404
+MD5 b28b5e9c2813dae4e77989974d114be4 kgamma-3.5_beta1.ebuild 395
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmXvntT9W3vfTuoRAhImAJ9XE3gRGiuAwZ/oCUbNgAyM61/o7wCgiZF1
+HrK6y59RjsMqnZVsCu8KmAM=
+=fBKl
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kgamma/files/digest-kgamma-3.4.1 b/kde-base/kgamma/files/digest-kgamma-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kgamma/files/digest-kgamma-3.4.1
+++ b/kde-base/kgamma/files/digest-kgamma-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kgamma/files/digest-kgamma-3.4.2 b/kde-base/kgamma/files/digest-kgamma-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kgamma/files/digest-kgamma-3.4.2
+++ b/kde-base/kgamma/files/digest-kgamma-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kgamma/kgamma-3.4.1.ebuild b/kde-base/kgamma/kgamma-3.4.1.ebuild
index 3fa68411cde2..37cd2d51208c 100644
--- a/kde-base/kgamma/kgamma-3.4.1.ebuild
+++ b/kde-base/kgamma/kgamma-3.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/kde-base/kgamma/kgamma-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kgamma/kgamma-3.4.2.ebuild b/kde-base/kgamma/kgamma-3.4.2.ebuild
index 95a01a7c307f..e313bb4a935c 100644
--- a/kde-base/kgamma/kgamma-3.4.2.ebuild
+++ b/kde-base/kgamma/kgamma-3.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/kde-base/kgamma/kgamma-3.4.2.ebuild,v 1.1 2005/07/28 21:16:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kgamma/kgamma-3.4.3.ebuild b/kde-base/kgamma/kgamma-3.4.3.ebuild
index 378099cfd9bd..febc376c0480 100644
--- a/kde-base/kgamma/kgamma-3.4.3.ebuild
+++ b/kde-base/kgamma/kgamma-3.4.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/kde-base/kgamma/kgamma-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kgamma/kgamma-3.5.0.ebuild b/kde-base/kgamma/kgamma-3.5.0.ebuild
index 05c90ede9cdc..7fc648f3f0a3 100644
--- a/kde-base/kgamma/kgamma-3.5.0.ebuild
+++ b/kde-base/kgamma/kgamma-3.5.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/kde-base/kgamma/kgamma-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kgamma/kgamma-3.5.0_beta2.ebuild b/kde-base/kgamma/kgamma-3.5.0_beta2.ebuild
index d885f35d2dad..de4181fa3b6e 100644
--- a/kde-base/kgamma/kgamma-3.5.0_beta2.ebuild
+++ b/kde-base/kgamma/kgamma-3.5.0_beta2.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/kde-base/kgamma/kgamma-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kgamma/kgamma-3.5_beta1.ebuild b/kde-base/kgamma/kgamma-3.5_beta1.ebuild
index f468055febe9..0b7f6d967874 100644
--- a/kde-base/kgamma/kgamma-3.5_beta1.ebuild
+++ b/kde-base/kgamma/kgamma-3.5_beta1.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/kde-base/kgamma/kgamma-3.5_beta1.ebuild,v 1.1 2005/09/22 18:57:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgamma/kgamma-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:15 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screen gamma values kcontrol module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kgamma/metadata.xml b/kde-base/kgamma/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kgamma/metadata.xml
+++ b/kde-base/kgamma/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kgeography/ChangeLog b/kde-base/kgeography/ChangeLog
index 36cf3ebc68ed..e90e946963bb 100644
--- a/kde-base/kgeography/ChangeLog
+++ b/kde-base/kgeography/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for kde-base/kgeography
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.1 2005/09/24 10:24:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/ChangeLog,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
+
+*kgeography-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgeography-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kgeography-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgeography-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kgeography-3.5_beta1.ebuild,
+  kgeography-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kgeography-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgeography-3.5.0_beta2.ebuild:
+  New version.
 
 *kgeography-3.5_beta1 (24 Sep 2005)
 
diff --git a/kde-base/kgeography/Manifest b/kde-base/kgeography/Manifest
index c22858f86706..1a93bd4a6692 100644
--- a/kde-base/kgeography/Manifest
+++ b/kde-base/kgeography/Manifest
@@ -1,3 +1,10 @@
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 25efa64ec128d7d02971dfcc961c6421 kgeography-3.5_beta1.ebuild 392
+MD5 499075f63ba51d71d08a0be3c1ceca44 ChangeLog 997
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kgeography-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kgeography-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kgeography-3.5.0_rc1 294
 MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kgeography-3.5_beta1 68
+MD5 cbf53c751013baab22d5fa07335d65a1 kgeography-3.5.0.ebuild 388
+MD5 69df939632e33f4448f2121cd8755660 kgeography-3.5.0_beta2.ebuild 393
+MD5 7c108b3fdda5342f42d16da63b381e52 kgeography-3.5.0_rc1.ebuild 392
+MD5 56c533b43637c7b1e6ec874cc65896fb kgeography-3.5_beta1.ebuild 391
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kgeography/kgeography-3.5.0.ebuild b/kde-base/kgeography/kgeography-3.5.0.ebuild
index 6cf313c0cb02..e5b397d1a2ea 100644
--- a/kde-base/kgeography/kgeography-3.5.0.ebuild
+++ b/kde-base/kgeography/kgeography-3.5.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/kde-base/kgeography/kgeography-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kgeography/kgeography-3.5.0_beta2.ebuild b/kde-base/kgeography/kgeography-3.5.0_beta2.ebuild
index 7b65fa8e26cb..0d90a3438a3b 100644
--- a/kde-base/kgeography/kgeography-3.5.0_beta2.ebuild
+++ b/kde-base/kgeography/kgeography-3.5.0_beta2.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/kde-base/kgeography/kgeography-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kgeography/kgeography-3.5.0_rc1.ebuild b/kde-base/kgeography/kgeography-3.5.0_rc1.ebuild
index 7e00f510a091..0841156ce8d7 100644
--- a/kde-base/kgeography/kgeography-3.5.0_rc1.ebuild
+++ b/kde-base/kgeography/kgeography-3.5.0_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/kde-base/kgeography/kgeography-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kgeography/kgeography-3.5_beta1.ebuild b/kde-base/kgeography/kgeography-3.5_beta1.ebuild
index f2d35f3186f2..7aa5af029e02 100644
--- a/kde-base/kgeography/kgeography-3.5_beta1.ebuild
+++ b/kde-base/kgeography/kgeography-3.5_beta1.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/kde-base/kgeography/kgeography-3.5_beta1.ebuild,v 1.1 2005/09/24 10:24:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgeography/kgeography-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: a geography learning tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kget/ChangeLog b/kde-base/kget/ChangeLog
index 324a5f3fc7e6..14721e2d16c0 100644
--- a/kde-base/kget/ChangeLog
+++ b/kde-base/kget/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/kget
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/ChangeLog,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kget-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kget-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kget-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kget-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kget-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kget-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kget-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kget-3.5_beta1.ebuild,
+  kget-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kget-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kget-3.5.0_beta2.ebuild:
+  New version.
+
+*kget-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kget-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kget-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kget-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kget-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kget-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kget-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kget-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kget-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kget-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kget-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kget-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kget-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kget-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kget-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kget-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kget-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kget-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kget-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kget-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kget-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kget-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kget-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kget-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kget-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kget/Manifest b/kde-base/kget/Manifest
index fa7d133f8cc3..5c92757572d6 100644
--- a/kde-base/kget/Manifest
+++ b/kde-base/kget/Manifest
@@ -1,4 +1,26 @@
-MD5 a27a54e4ed733a33f79c330768c0e94a kget-3.4.0_alpha1.ebuild 282
-MD5 a27a54e4ed733a33f79c330768c0e94a kget-3.4.0_beta1.ebuild 282
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kget-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kget-3.4.0_beta1 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 846ff4b426d9e3cd17ebc1d988406a4b ChangeLog 3447
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kget-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kget-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kget-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kget-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kget-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kget-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kget-3.5_beta1 71
+MD5 49f5f21c49d28bf8ac99daf2bb59d575 kget-3.4.1.ebuild 395
+MD5 724b80e184d58c3f2699784b38ffd257 kget-3.4.2.ebuild 408
+MD5 a7fc0ea29898ed96a283fbeb2ce16e0e kget-3.4.3.ebuild 404
+MD5 960ce84ae0030410604d42508abbb766 kget-3.5.0.ebuild 384
+MD5 6094525c0093d3061c23e999a295056f kget-3.5.0_beta2.ebuild 389
+MD5 7369b5d2ce36db504c988724fb17ad0d kget-3.5.0_rc1.ebuild 388
+MD5 7227bdfc09fb2c7e2a669e82581b4e88 kget-3.5_beta1.ebuild 387
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuPYntT9W3vfTuoRAgJcAJ90V796kuZ9Rw+FFs2AQyzmCayGlACdHIi9
+jC+KHDZ3F+7sHf/hAfBc5q4=
+=UHR1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kget/files/digest-kget-3.4.1 b/kde-base/kget/files/digest-kget-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kget/files/digest-kget-3.4.1
+++ b/kde-base/kget/files/digest-kget-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kget/files/digest-kget-3.4.2 b/kde-base/kget/files/digest-kget-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kget/files/digest-kget-3.4.2
+++ b/kde-base/kget/files/digest-kget-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kget/kget-3.4.1.ebuild b/kde-base/kget/kget-3.4.1.ebuild
index 3b068eeb8254..dea93d0eea92 100644
--- a/kde-base/kget/kget-3.4.1.ebuild
+++ b/kde-base/kget/kget-3.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/kde-base/kget/kget-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kget/kget-3.4.2.ebuild b/kde-base/kget/kget-3.4.2.ebuild
index b3514ff0d36d..9587cb371c07 100644
--- a/kde-base/kget/kget-3.4.2.ebuild
+++ b/kde-base/kget/kget-3.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/kde-base/kget/kget-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kget/kget-3.4.3.ebuild b/kde-base/kget/kget-3.4.3.ebuild
index 76e0498f0d46..d54bb4648c1b 100644
--- a/kde-base/kget/kget-3.4.3.ebuild
+++ b/kde-base/kget/kget-3.4.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/kde-base/kget/kget-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kget/kget-3.5.0.ebuild b/kde-base/kget/kget-3.5.0.ebuild
index 611bc4059e2b..8bf431c8d2d3 100644
--- a/kde-base/kget/kget-3.5.0.ebuild
+++ b/kde-base/kget/kget-3.5.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/kde-base/kget/kget-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kget/kget-3.5.0_beta2.ebuild b/kde-base/kget/kget-3.5.0_beta2.ebuild
index cd8a88b69073..1b5d3097f511 100644
--- a/kde-base/kget/kget-3.5.0_beta2.ebuild
+++ b/kde-base/kget/kget-3.5.0_beta2.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/kde-base/kget/kget-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kget/kget-3.5.0_rc1.ebuild b/kde-base/kget/kget-3.5.0_rc1.ebuild
index 77d8acdad288..20f711866705 100644
--- a/kde-base/kget/kget-3.5.0_rc1.ebuild
+++ b/kde-base/kget/kget-3.5.0_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/kde-base/kget/kget-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kget/kget-3.5_beta1.ebuild b/kde-base/kget/kget-3.5_beta1.ebuild
index 062cd7906475..c2d304b13764 100644
--- a/kde-base/kget/kget-3.5_beta1.ebuild
+++ b/kde-base/kget/kget-3.5_beta1.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/kde-base/kget/kget-3.5_beta1.ebuild,v 1.1 2005/09/22 18:58:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kget/kget-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="An advanced download manager for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kget/metadata.xml b/kde-base/kget/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kget/metadata.xml
+++ b/kde-base/kget/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kghostview/ChangeLog b/kde-base/kghostview/ChangeLog
index e340cc52fae7..cc32a3ee13b9 100644
--- a/kde-base/kghostview/ChangeLog
+++ b/kde-base/kghostview/ChangeLog
@@ -1,6 +1,114 @@
 # ChangeLog for kde-base/kghostview
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/ChangeLog,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kghostview-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kghostview-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kghostview-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kghostview-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kghostview-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kghostview-3.5_beta1.ebuild,
+  kghostview-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kghostview-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.5.0_beta2.ebuild:
+  New version.
+
+*kghostview-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kghostview-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kghostview-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kghostview-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kghostview-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kghostview-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kghostview-3.4.2.ebuild:
+  ~alpha keyword.
+
+  05 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4-gcc4.patch, kghostview-3.4.2.ebuild:
+  Add patch to fix compilation with gcc4 (#101384).
+
+*kghostview-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kghostview-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kghostview-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kghostview-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kghostview-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kghostview-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kghostview-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kghostview-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kghostview-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kghostview-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kghostview-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kghostview-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kghostview-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kghostview-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kghostview-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kghostview/Manifest b/kde-base/kghostview/Manifest
index 44d7746f1284..0205f43a8040 100644
--- a/kde-base/kghostview/Manifest
+++ b/kde-base/kghostview/Manifest
@@ -1,4 +1,27 @@
-MD5 ca1a3abf4ef3ff755298e0a006e0763d kghostview-3.4.0_alpha1.ebuild 395
-MD5 ca1a3abf4ef3ff755298e0a006e0763d kghostview-3.4.0_beta1.ebuild 395
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kghostview-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kghostview-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39d6ad8953e58154eacec071226e7019 ChangeLog 3856
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kghostview-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kghostview-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kghostview-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kghostview-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kghostview-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kghostview-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kghostview-3.5_beta1 72
+MD5 c52515e268cbff75a6f7b7d1ee1fad47 files/kdegraphics-3.4-gcc4.patch 1226
+MD5 7bf336ee8e49a2aea158cb57735bdb9e kghostview-3.4.1.ebuild 520
+MD5 6ec0dc30cd76eb94471e5d617b0b14a5 kghostview-3.4.2.ebuild 649
+MD5 32122cdda24101de6ca89f28a2ed48fa kghostview-3.4.3.ebuild 531
+MD5 5e3545aadaa8598a7d4796fbbc0f3d94 kghostview-3.5.0.ebuild 510
+MD5 8689ad53c3905de27ebe93fb61e9ff18 kghostview-3.5.0_beta2.ebuild 515
+MD5 12026f338adf248035be11edd1755080 kghostview-3.5.0_rc1.ebuild 514
+MD5 d36e4a49b719abe177f434531a52480f kghostview-3.5_beta1.ebuild 513
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmZXntT9W3vfTuoRAkQ6AKCXbWfQTMEBYCLWRte3O/EeguY6rACgqZa4
+qQAKmla6+ZvqSSQjVpq9AFA=
+=NO20
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kghostview/files/digest-kghostview-3.4.1 b/kde-base/kghostview/files/digest-kghostview-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kghostview/files/digest-kghostview-3.4.1
+++ b/kde-base/kghostview/files/digest-kghostview-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kghostview/files/digest-kghostview-3.4.2 b/kde-base/kghostview/files/digest-kghostview-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kghostview/files/digest-kghostview-3.4.2
+++ b/kde-base/kghostview/files/digest-kghostview-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kghostview/kghostview-3.4.1.ebuild b/kde-base/kghostview/kghostview-3.4.1.ebuild
index 6844da4f5802..cb3e79052939 100644
--- a/kde-base/kghostview/kghostview-3.4.1.ebuild
+++ b/kde-base/kghostview/kghostview-3.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/kde-base/kghostview/kghostview-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
diff --git a/kde-base/kghostview/kghostview-3.4.2.ebuild b/kde-base/kghostview/kghostview-3.4.2.ebuild
index 7caee514edfa..e1103723b6ca 100644
--- a/kde-base/kghostview/kghostview-3.4.2.ebuild
+++ b/kde-base/kghostview/kghostview-3.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/kde-base/kghostview/kghostview-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,8 +8,11 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
 KMEXTRA="kfile-plugins/ps"
+
+# Fix compilation with gcc4 (kde bug 110249). Applied for 3.4.3.
+PATCHES1="${FILESDIR}/kdegraphics-3.4-gcc4.patch"
diff --git a/kde-base/kghostview/kghostview-3.4.3.ebuild b/kde-base/kghostview/kghostview-3.4.3.ebuild
index 2586773c06f8..adee77a39e68 100644
--- a/kde-base/kghostview/kghostview-3.4.3.ebuild
+++ b/kde-base/kghostview/kghostview-3.4.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/kde-base/kghostview/kghostview-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,11 +8,10 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
+
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
-KMEXTRA="kfile-plugins/ps"
 
-# Fix compilation with gcc4 (kde bug 110249). Applied for 3.4.3.
-PATCHES1="${FILESDIR}/kdegraphics-3.4-gcc4.patch"
+KMEXTRA="kfile-plugins/ps"
diff --git a/kde-base/kghostview/kghostview-3.5.0.ebuild b/kde-base/kghostview/kghostview-3.5.0.ebuild
index 104111499479..00229921cdad 100644
--- a/kde-base/kghostview/kghostview-3.5.0.ebuild
+++ b/kde-base/kghostview/kghostview-3.5.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/kde-base/kghostview/kghostview-3.5.0.ebuild,v 1.1 2005/11/22 22:14:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kghostview/kghostview-3.5.0_beta2.ebuild b/kde-base/kghostview/kghostview-3.5.0_beta2.ebuild
index 71df2829965c..327981e134c5 100644
--- a/kde-base/kghostview/kghostview-3.5.0_beta2.ebuild
+++ b/kde-base/kghostview/kghostview-3.5.0_beta2.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/kde-base/kghostview/kghostview-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
diff --git a/kde-base/kghostview/kghostview-3.5.0_rc1.ebuild b/kde-base/kghostview/kghostview-3.5.0_rc1.ebuild
index 72576e4e88bc..5bf8166c2098 100644
--- a/kde-base/kghostview/kghostview-3.5.0_rc1.ebuild
+++ b/kde-base/kghostview/kghostview-3.5.0_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/kde-base/kghostview/kghostview-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kghostview/kghostview-3.5_beta1.ebuild b/kde-base/kghostview/kghostview-3.5_beta1.ebuild
index 57ede5a82d0a..d21da932a810 100644
--- a/kde-base/kghostview/kghostview-3.5_beta1.ebuild
+++ b/kde-base/kghostview/kghostview-3.5_beta1.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/kde-base/kghostview/kghostview-3.5_beta1.ebuild,v 1.1 2005/09/22 18:59:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kghostview/kghostview-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Viewer for PostScript (.ps, .eps) and Portable Document Format (.pdf) files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="${DEPEND}
 	virtual/ghostscript"
diff --git a/kde-base/kghostview/metadata.xml b/kde-base/kghostview/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kghostview/metadata.xml
+++ b/kde-base/kghostview/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kgoldrunner/ChangeLog b/kde-base/kgoldrunner/ChangeLog
index c279c8020ab6..b8cdcff15b24 100644
--- a/kde-base/kgoldrunner/ChangeLog
+++ b/kde-base/kgoldrunner/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kgoldrunner
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.1 2005/01/15 02:24:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/ChangeLog,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kgoldrunner-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kgoldrunner-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kgoldrunner-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kgoldrunner-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgoldrunner-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kgoldrunner-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgoldrunner-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kgoldrunner-3.5_beta1.ebuild, kgoldrunner-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kgoldrunner-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgoldrunner-3.5.0_beta2.ebuild:
+  New version.
+
+*kgoldrunner-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgoldrunner-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kgoldrunner-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kgoldrunner-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kgoldrunner-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kgoldrunner-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kgoldrunner-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kgoldrunner-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kgoldrunner-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kgoldrunner-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kgoldrunner-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kgoldrunner-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kgoldrunner-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kgoldrunner-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kgoldrunner-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kgoldrunner-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kgoldrunner-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kgoldrunner-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kgoldrunner-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kgoldrunner-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kgoldrunner-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kgoldrunner-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kgoldrunner-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kgoldrunner-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kgoldrunner-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kgoldrunner/Manifest b/kde-base/kgoldrunner/Manifest
index 9c53185cb656..3c6102251e83 100644
--- a/kde-base/kgoldrunner/Manifest
+++ b/kde-base/kgoldrunner/Manifest
@@ -1,4 +1,26 @@
-MD5 bfde00ef14444d7293dd8109c78a8870 kgoldrunner-3.4.0_beta1.ebuild 453
-MD5 bfde00ef14444d7293dd8109c78a8870 kgoldrunner-3.4.0_alpha1.ebuild 453
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kgoldrunner-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kgoldrunner-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1e718378efc547b0dfd39120b587f057 ChangeLog 3734
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kgoldrunner-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kgoldrunner-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kgoldrunner-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kgoldrunner-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kgoldrunner-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kgoldrunner-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kgoldrunner-3.5_beta1 70
+MD5 74560d2d825c242d4b689aa60dda3bf0 kgoldrunner-3.4.1.ebuild 580
+MD5 12918bb501998be21add2060085e314b kgoldrunner-3.4.2.ebuild 593
+MD5 e770720a47c607e5a4a1c50d7733d43b kgoldrunner-3.4.3.ebuild 589
+MD5 c1f821f6e599854e37aab72a8d4895df kgoldrunner-3.5.0.ebuild 530
+MD5 f8a97837eebf6cfb2fd038692aadc626 kgoldrunner-3.5.0_beta2.ebuild 535
+MD5 af370ea4d59c3cad7d4640cdbaf8336e kgoldrunner-3.5.0_rc1.ebuild 534
+MD5 0e3737137c24c342b101ad63b182107a kgoldrunner-3.5_beta1.ebuild 572
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl2lntT9W3vfTuoRAiW2AJ43sq02po1vNq3I+b5M4zMNDpOycgCgrMqN
+FwJ8KYEUS5Hsl60rUdK9mw8=
+=jlKA
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.1 b/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.1
+++ b/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.2 b/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.2
+++ b/kde-base/kgoldrunner/files/digest-kgoldrunner-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.4.1.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.4.1.ebuild
index a5587c4ea9f8..f759f418938c 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.4.1.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.4.2.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.4.2.ebuild
index d049afa28295..737c98707d4c 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.4.2.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.4.3.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.4.3.ebuild
index 15d2218dcf04..83458df0bd80 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.4.3.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.5.0.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.5.0.ebuild
index ffce195247ba..fe40506ccb87 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.5.0.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.5.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/kde-base/kgoldrunner/kgoldrunner-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.5.0_beta2.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.5.0_beta2.ebuild
index 1ff6ef86adc0..70f3d372b647 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.5.0_beta2.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.5.0_rc1.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.5.0_rc1.ebuild
index 25496ad0eb7c..79e60eadee68 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.5.0_rc1.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.5.0_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/kde-base/kgoldrunner/kgoldrunner-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kgoldrunner/kgoldrunner-3.5_beta1.ebuild b/kde-base/kgoldrunner/kgoldrunner-3.5_beta1.ebuild
index a7bf4012ba3e..b664faa1a248 100644
--- a/kde-base/kgoldrunner/kgoldrunner-3.5_beta1.ebuild
+++ b/kde-base/kgoldrunner/kgoldrunner-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.5_beta1.ebuild,v 1.1 2005/09/22 19:00:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgoldrunner/kgoldrunner-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KGoldrunner is a game of action and puzzle solving"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kgoldrunner/metadata.xml b/kde-base/kgoldrunner/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kgoldrunner/metadata.xml
+++ b/kde-base/kgoldrunner/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kgpg/ChangeLog b/kde-base/kgpg/ChangeLog
index 1e212b3f5f26..e63a7e96af2e 100644
--- a/kde-base/kgpg/ChangeLog
+++ b/kde-base/kgpg/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/kgpg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/ChangeLog,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kgpg-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kgpg-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kgpg-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kgpg-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kgpg-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+*kgpg-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.5.0_beta2.ebuild:
+  New version.
+
+*kgpg-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.4.3.ebuild:
+  New version.
+
+  08 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> kgpg-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kgpg-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kgpg-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kgpg-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kgpg-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kgpg-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kgpg-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kgpg-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kgpg-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kgpg-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kgpg-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kgpg-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kgpg-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kgpg-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kgpg-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kgpg-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kgpg-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kgpg-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kgpg-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kgpg-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kgpg-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kgpg/Manifest b/kde-base/kgpg/Manifest
index e1ca30c52c9c..b48e440f20a8 100644
--- a/kde-base/kgpg/Manifest
+++ b/kde-base/kgpg/Manifest
@@ -1,4 +1,26 @@
-MD5 cad664a8d511302fae9ec84af8120307 kgpg-3.4.0_beta1.ebuild 303
-MD5 cad664a8d511302fae9ec84af8120307 kgpg-3.4.0_alpha1.ebuild 303
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kgpg-3.4.0_beta1 216
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kgpg-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 57b8c737b4f182bd7a4f60fa704441dc ChangeLog 3421
+MD5 ab3eb220e894b7f84a4ae20d6f35d26e files/digest-kgpg-3.4.1 212
+MD5 528dfb138277c74810b95fa05d2770a8 files/digest-kgpg-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kgpg-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kgpg-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kgpg-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kgpg-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kgpg-3.5_beta1 69
+MD5 0b1c25a5c228b68be4eed5c4eec8bbd7 kgpg-3.4.1.ebuild 416
+MD5 577a26f3cb828acad5319ecb41be39c9 kgpg-3.4.2.ebuild 429
+MD5 884167b6704c1da8c3de284da41a71e1 kgpg-3.4.3.ebuild 425
+MD5 7f6eaa3e7167e76ed3411ec25619178d kgpg-3.5.0.ebuild 405
+MD5 2fd9f8815c7698fe32c359a9e584fb52 kgpg-3.5.0_beta2.ebuild 411
+MD5 6580f1f496c3e54af069af3020edc7e9 kgpg-3.5.0_rc1.ebuild 409
+MD5 255706721ebd9b5d4c9a7419cf9c0d98 kgpg-3.5_beta1.ebuild 411
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvwGntT9W3vfTuoRAkfoAJ9aLN+kL9qSLs64k60RVZfAfBJjAgCcCAqf
+5yz5cmwCxf80UwVTdyLx6rU=
+=oyjE
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kgpg/files/digest-kgpg-3.4.1 b/kde-base/kgpg/files/digest-kgpg-3.4.1
index 617d35b66a27..e135a5f2e5ea 100644
--- a/kde-base/kgpg/files/digest-kgpg-3.4.1
+++ b/kde-base/kgpg/files/digest-kgpg-3.4.1
@@ -1,2 +1,3 @@
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kgpg/files/digest-kgpg-3.4.2 b/kde-base/kgpg/files/digest-kgpg-3.4.2
index 14ea8b02ce39..6ddf73a1e0da 100644
--- a/kde-base/kgpg/files/digest-kgpg-3.4.2
+++ b/kde-base/kgpg/files/digest-kgpg-3.4.2
@@ -1 +1,4 @@
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/kgpg/kgpg-3.4.1.ebuild b/kde-base/kgpg/kgpg-3.4.1.ebuild
index 041832d1b0d6..9a7c5a4edb0a 100644
--- a/kde-base/kgpg/kgpg-3.4.1.ebuild
+++ b/kde-base/kgpg/kgpg-3.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/kde-base/kgpg/kgpg-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kgpg/kgpg-3.4.2.ebuild b/kde-base/kgpg/kgpg-3.4.2.ebuild
index ae06ca92d33d..337c480274a4 100644
--- a/kde-base/kgpg/kgpg-3.4.2.ebuild
+++ b/kde-base/kgpg/kgpg-3.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/kde-base/kgpg/kgpg-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kgpg/kgpg-3.4.3.ebuild b/kde-base/kgpg/kgpg-3.4.3.ebuild
index 570ef8974a03..a2ab3837c266 100644
--- a/kde-base/kgpg/kgpg-3.4.3.ebuild
+++ b/kde-base/kgpg/kgpg-3.4.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/kde-base/kgpg/kgpg-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kgpg/kgpg-3.5.0.ebuild b/kde-base/kgpg/kgpg-3.5.0.ebuild
index 20b1ff800629..2f0d5fe90367 100644
--- a/kde-base/kgpg/kgpg-3.5.0.ebuild
+++ b/kde-base/kgpg/kgpg-3.5.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/kde-base/kgpg/kgpg-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kgpg/kgpg-3.5.0_beta2.ebuild b/kde-base/kgpg/kgpg-3.5.0_beta2.ebuild
index 43a74657662e..1d3e95ba9bec 100644
--- a/kde-base/kgpg/kgpg-3.5.0_beta2.ebuild
+++ b/kde-base/kgpg/kgpg-3.5.0_beta2.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/kde-base/kgpg/kgpg-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kgpg/kgpg-3.5.0_rc1.ebuild b/kde-base/kgpg/kgpg-3.5.0_rc1.ebuild
index 148fa758d0d0..4b8624e72b07 100644
--- a/kde-base/kgpg/kgpg-3.5.0_rc1.ebuild
+++ b/kde-base/kgpg/kgpg-3.5.0_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/kde-base/kgpg/kgpg-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:28 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kgpg/kgpg-3.5_beta1.ebuild b/kde-base/kgpg/kgpg-3.5_beta1.ebuild
index 01e1e465a078..7c3aa64dc9cb 100644
--- a/kde-base/kgpg/kgpg-3.5_beta1.ebuild
+++ b/kde-base/kgpg/kgpg-3.5_beta1.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/kde-base/kgpg/kgpg-3.5_beta1.ebuild,v 1.1 2005/09/22 19:01:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kgpg/kgpg-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE gpg keyring manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="$DEPEND
diff --git a/kde-base/kgpg/metadata.xml b/kde-base/kgpg/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kgpg/metadata.xml
+++ b/kde-base/kgpg/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/khangman/ChangeLog b/kde-base/khangman/ChangeLog
index e2e3ebc58386..51f6664ee344 100644
--- a/kde-base/khangman/ChangeLog
+++ b/kde-base/khangman/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/khangman
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/ChangeLog,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> khangman-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> khangman-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> khangman-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*khangman-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*khangman-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> khangman-3.5_beta1.ebuild,
+  khangman-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*khangman-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.5.0_beta2.ebuild:
+  New version.
+
+*khangman-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -khangman-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*khangman-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khangman-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*khangman-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khangman-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> khangman-3.4.2.ebuild:
+  ~alpha keyword.
+
+*khangman-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> khangman-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> khangman-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> khangman-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*khangman-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> khangman-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> khangman-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> khangman-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> khangman-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*khangman-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> khangman-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*khangman-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +khangman-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *khangman-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/khangman/Manifest b/kde-base/khangman/Manifest
index 452a96974084..4482c698892b 100644
--- a/kde-base/khangman/Manifest
+++ b/kde-base/khangman/Manifest
@@ -1,4 +1,26 @@
-MD5 98c1145691cdc27e2a03e8b8a4d1b976 khangman-3.4.0_alpha1.ebuild 440
-MD5 98c1145691cdc27e2a03e8b8a4d1b976 khangman-3.4.0_beta1.ebuild 440
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-khangman-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-khangman-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 31c0cd89203a14db95edd87c219cc275 ChangeLog 3579
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-khangman-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-khangman-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-khangman-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-khangman-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-khangman-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-khangman-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-khangman-3.5_beta1 68
+MD5 4dedcc4fed51647a43272d0049888a63 khangman-3.4.1.ebuild 561
+MD5 55e6e6832fe5e34f563546ecd3bb5ff1 khangman-3.4.2.ebuild 574
+MD5 f772c3f20a801d74016e443f1827609b khangman-3.4.3.ebuild 572
+MD5 1f641029fe4e5af1d897e1ab261c6fa1 khangman-3.5.0.ebuild 515
+MD5 5ee008cf34ea3b937670d6bc61baf41f khangman-3.5.0_beta2.ebuild 520
+MD5 ccce0cec0d4be3400832e73d7f583fd4 khangman-3.5.0_rc1.ebuild 519
+MD5 a67e87725193192662e276e297113473 khangman-3.5_beta1.ebuild 553
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlGfntT9W3vfTuoRAh5cAKCTgumLBSn8pdkQQy4B03trOgaxmgCeI89Q
+HVlqZRonrRj5HhuY218IORE=
+=nI3J
+-----END PGP SIGNATURE-----
diff --git a/kde-base/khangman/files/digest-khangman-3.4.1 b/kde-base/khangman/files/digest-khangman-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/khangman/files/digest-khangman-3.4.1
+++ b/kde-base/khangman/files/digest-khangman-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/khangman/files/digest-khangman-3.4.2 b/kde-base/khangman/files/digest-khangman-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/khangman/files/digest-khangman-3.4.2
+++ b/kde-base/khangman/files/digest-khangman-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/khangman/khangman-3.4.1.ebuild b/kde-base/khangman/khangman-3.4.1.ebuild
index 7e82cd5cec69..b83991056f31 100644
--- a/kde-base/khangman/khangman-3.4.1.ebuild
+++ b/kde-base/khangman/khangman-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/khangman/khangman-3.4.2.ebuild b/kde-base/khangman/khangman-3.4.2.ebuild
index d2c40e05e9e7..7cb134e0adf8 100644
--- a/kde-base/khangman/khangman-3.4.2.ebuild
+++ b/kde-base/khangman/khangman-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/khangman/khangman-3.4.3.ebuild b/kde-base/khangman/khangman-3.4.3.ebuild
index c94b8891ecaf..94ee26ed7cbb 100644
--- a/kde-base/khangman/khangman-3.4.3.ebuild
+++ b/kde-base/khangman/khangman-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.2 $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/khangman/khangman-3.5.0.ebuild b/kde-base/khangman/khangman-3.5.0.ebuild
index 4cc5a9fbb863..715dacbc6233 100644
--- a/kde-base/khangman/khangman-3.5.0.ebuild
+++ b/kde-base/khangman/khangman-3.5.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/kde-base/khangman/khangman-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/khangman/khangman-3.5.0_beta2.ebuild b/kde-base/khangman/khangman-3.5.0_beta2.ebuild
index 20a82af4b12f..d5fcf6ebbed5 100644
--- a/kde-base/khangman/khangman-3.5.0_beta2.ebuild
+++ b/kde-base/khangman/khangman-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 
diff --git a/kde-base/khangman/khangman-3.5.0_rc1.ebuild b/kde-base/khangman/khangman-3.5.0_rc1.ebuild
index 131b0e1d8589..8678cfec1de8 100644
--- a/kde-base/khangman/khangman-3.5.0_rc1.ebuild
+++ b/kde-base/khangman/khangman-3.5.0_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/kde-base/khangman/khangman-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/khangman/khangman-3.5_beta1.ebuild b/kde-base/khangman/khangman-3.5_beta1.ebuild
index 63b647d46c26..7f5eb720ae95 100644
--- a/kde-base/khangman/khangman-3.5_beta1.ebuild
+++ b/kde-base/khangman/khangman-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.5_beta1.ebuild,v 1.1 2005/09/22 19:02:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khangman/khangman-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:59 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Classical hangman game for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/khangman/metadata.xml b/kde-base/khangman/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/khangman/metadata.xml
+++ b/kde-base/khangman/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/khelpcenter/ChangeLog b/kde-base/khelpcenter/ChangeLog
index ba20f2bec841..0339c9780def 100644
--- a/kde-base/khelpcenter/ChangeLog
+++ b/kde-base/khelpcenter/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for kde-base/khelpcenter
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  khelpcenter-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> khelpcenter-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  khelpcenter-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*khelpcenter-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +khelpcenter-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*khelpcenter-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +khelpcenter-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  khelpcenter-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*khelpcenter-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +khelpcenter-3.5.0_beta2.ebuild:
+  New version.
+
+*khelpcenter-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +khelpcenter-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  khelpcenter-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -khelpcenter-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*khelpcenter-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khelpcenter-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*khelpcenter-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khelpcenter-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  khelpcenter-3.4.2.ebuild:
+  ~alpha keyword.
+
+*khelpcenter-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +khelpcenter-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> khelpcenter-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> khelpcenter-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> khelpcenter-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*khelpcenter-3.4.1-r1 (10 Jun 2005)
+
+  10 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +khelpcenter-3.4.1-r1.ebuild:
+  Add missing documentation (#89912).
+
+*khelpcenter-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +khelpcenter-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> khelpcenter-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> khelpcenter-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> khelpcenter-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> khelpcenter-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*khelpcenter-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  khelpcenter-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*khelpcenter-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +khelpcenter-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *khelpcenter-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/khelpcenter/Manifest b/kde-base/khelpcenter/Manifest
index 2bf9f97133c0..f1a414bad344 100644
--- a/kde-base/khelpcenter/Manifest
+++ b/kde-base/khelpcenter/Manifest
@@ -1,4 +1,28 @@
-MD5 620e458d8f6925d6b43431a3e1cbba70 khelpcenter-3.4.0_alpha1.ebuild 362
-MD5 620e458d8f6925d6b43431a3e1cbba70 khelpcenter-3.4.0_beta1.ebuild 362
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-khelpcenter-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-khelpcenter-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 449ea8c6e3e313afddd4bcaa3a4d12ae ChangeLog 3939
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-khelpcenter-3.4.1 212
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-khelpcenter-3.4.1-r1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-khelpcenter-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-khelpcenter-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-khelpcenter-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-khelpcenter-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-khelpcenter-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-khelpcenter-3.5_beta1 69
+MD5 46bb74648b8cd9ba339e2df64932ca40 khelpcenter-3.4.1-r1.ebuild 472
+MD5 a158fe8d8cf86fa350a761f90c9394d4 khelpcenter-3.4.1.ebuild 399
+MD5 de16b613dd354c9f6358995c94e460c3 khelpcenter-3.4.2.ebuild 482
+MD5 d0459db34381944779de13df59a41cca khelpcenter-3.4.3.ebuild 478
+MD5 b3f852a1c7e3513f37bb4cc98dbce5c8 khelpcenter-3.5.0.ebuild 463
+MD5 673c0b6dd39047cb43981ba97c43ed8b khelpcenter-3.5.0_beta2.ebuild 466
+MD5 6098e318d9ff7ab9e07f1adb3254ed61 khelpcenter-3.5.0_rc1.ebuild 467
+MD5 9c3da7a029e48bd7bd812648e7761a00 khelpcenter-3.5_beta1.ebuild 464
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjudntT9W3vfTuoRAuNYAJwPRitccC4ZeHRef1op4jSd6ktRBACgnItb
+ppHHsSRyWEahWvjA+BxmvEc=
+=VttQ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/khelpcenter/files/digest-khelpcenter-3.4.1 b/kde-base/khelpcenter/files/digest-khelpcenter-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/khelpcenter/files/digest-khelpcenter-3.4.1
+++ b/kde-base/khelpcenter/files/digest-khelpcenter-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/khelpcenter/files/digest-khelpcenter-3.4.2 b/kde-base/khelpcenter/files/digest-khelpcenter-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/khelpcenter/files/digest-khelpcenter-3.4.2
+++ b/kde-base/khelpcenter/files/digest-khelpcenter-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/khelpcenter/khelpcenter-3.4.1-r1.ebuild b/kde-base/khelpcenter/khelpcenter-3.4.1-r1.ebuild
index d8757e693f15..938828278278 100644
--- a/kde-base/khelpcenter/khelpcenter-3.4.1-r1.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.4.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/kde-base/khelpcenter/khelpcenter-3.4.1-r1.ebuild,v 1.1 2005/06/10 13:39:50 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 KMEXTRA="doc/faq
diff --git a/kde-base/khelpcenter/khelpcenter-3.4.1.ebuild b/kde-base/khelpcenter/khelpcenter-3.4.1.ebuild
index 9d42d3cc418e..c93f39dd2e70 100644
--- a/kde-base/khelpcenter/khelpcenter-3.4.1.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.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/kde-base/khelpcenter/khelpcenter-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE=""
 
 
diff --git a/kde-base/khelpcenter/khelpcenter-3.4.2.ebuild b/kde-base/khelpcenter/khelpcenter-3.4.2.ebuild
index 070d32d87b7c..bb66e0073862 100644
--- a/kde-base/khelpcenter/khelpcenter-3.4.2.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.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/kde-base/khelpcenter/khelpcenter-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 KMEXTRA="doc/faq
diff --git a/kde-base/khelpcenter/khelpcenter-3.4.3.ebuild b/kde-base/khelpcenter/khelpcenter-3.4.3.ebuild
index a897c4784562..d53da91a2150 100644
--- a/kde-base/khelpcenter/khelpcenter-3.4.3.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.4.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/kde-base/khelpcenter/khelpcenter-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 KMEXTRA="doc/faq
diff --git a/kde-base/khelpcenter/khelpcenter-3.5.0.ebuild b/kde-base/khelpcenter/khelpcenter-3.5.0.ebuild
index e72b11a6c3d6..42f812aa2a37 100644
--- a/kde-base/khelpcenter/khelpcenter-3.5.0.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.5.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/kde-base/khelpcenter/khelpcenter-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/khelpcenter/khelpcenter-3.5.0_beta2.ebuild b/kde-base/khelpcenter/khelpcenter-3.5.0_beta2.ebuild
index 054a2965b275..cd9ebcc07b4e 100644
--- a/kde-base/khelpcenter/khelpcenter-3.5.0_beta2.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.5.0_beta2.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/kde-base/khelpcenter/khelpcenter-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 KMEXTRA="doc/faq
diff --git a/kde-base/khelpcenter/khelpcenter-3.5.0_rc1.ebuild b/kde-base/khelpcenter/khelpcenter-3.5.0_rc1.ebuild
index 147e2ed4ff07..e1ecfaeb9dc5 100644
--- a/kde-base/khelpcenter/khelpcenter-3.5.0_rc1.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.5.0_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/kde-base/khelpcenter/khelpcenter-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/khelpcenter/khelpcenter-3.5_beta1.ebuild b/kde-base/khelpcenter/khelpcenter-3.5_beta1.ebuild
index 595f06934787..b247122ae04d 100644
--- a/kde-base/khelpcenter/khelpcenter-3.5_beta1.ebuild
+++ b/kde-base/khelpcenter/khelpcenter-3.5_beta1.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/kde-base/khelpcenter/khelpcenter-3.5_beta1.ebuild,v 1.1 2005/09/22 19:03:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khelpcenter/khelpcenter-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The KDE Help Center"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="doc/faq
diff --git a/kde-base/khelpcenter/metadata.xml b/kde-base/khelpcenter/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/khelpcenter/metadata.xml
+++ b/kde-base/khelpcenter/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/khexedit/ChangeLog b/kde-base/khexedit/ChangeLog
index 4a30ca31b513..854e60476717 100644
--- a/kde-base/khexedit/ChangeLog
+++ b/kde-base/khexedit/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/khexedit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/ChangeLog,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> khexedit-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> khexedit-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> khexedit-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*khexedit-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*khexedit-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> khexedit-3.5_beta1.ebuild,
+  khexedit-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org> khexedit-3.5.0_beta2.ebuild:
+  Removed no longer necessary patch.
+
+*khexedit-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.5.0_beta2.ebuild:
+  New version.
+
+*khexedit-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -khexedit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*khexedit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khexedit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*khexedit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khexedit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> khexedit-3.4.2.ebuild:
+  ~alpha keyword.
+
+*khexedit-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> khexedit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> khexedit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> khexedit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*khexedit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> khexedit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> khexedit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> khexedit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> khexedit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*khexedit-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> khexedit-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*khexedit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +khexedit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *khexedit-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/khexedit/Manifest b/kde-base/khexedit/Manifest
index 00c544b844f1..17a65529bd48 100644
--- a/kde-base/khexedit/Manifest
+++ b/kde-base/khexedit/Manifest
@@ -1,5 +1,27 @@
-MD5 0d36a7c688775ad5bb73fc78dc9c9bae khexedit-3.4.0_beta1.ebuild 308
-MD5 0d36a7c688775ad5bb73fc78dc9c9bae khexedit-3.4.0_alpha1.ebuild 308
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-khexedit-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-khexedit-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d60ad74e82017def67d9e46f5f462e29 ChangeLog 3731
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-khexedit-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-khexedit-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-khexedit-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-khexedit-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-khexedit-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-khexedit-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-khexedit-3.5_beta1 69
 MD5 e47625e9b59633298d5be5ff567712b7 files/khexedit-configure-magic.diff 462
+MD5 4e7981cce0a3f29017cccda806207c9c khexedit-3.4.1.ebuild 429
+MD5 4212821034a16dfed2c2f683f6f51ba5 khexedit-3.4.2.ebuild 442
+MD5 f06c22b6702d9686b00a8ce72989e0e1 khexedit-3.4.3.ebuild 439
+MD5 52110d4f3453b07a5ccf4ee25188ab91 khexedit-3.5.0.ebuild 369
+MD5 b379a02da14cf13eca3b3efdc4e447ab khexedit-3.5.0_beta2.ebuild 374
+MD5 b2ee4c689cf964c501a98d863fee7be0 khexedit-3.5.0_rc1.ebuild 373
+MD5 c2b7fad914a9b6dcae077f0cd036febf khexedit-3.5_beta1.ebuild 421
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvxIntT9W3vfTuoRAjkTAJ9zHeXblnzSSvMq5BPPoqkdnpCrmgCfd7Mi
+5DAxpfFUQyB0tOk+MirE3zc=
+=R0Zn
+-----END PGP SIGNATURE-----
diff --git a/kde-base/khexedit/files/digest-khexedit-3.4.1 b/kde-base/khexedit/files/digest-khexedit-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/khexedit/files/digest-khexedit-3.4.1
+++ b/kde-base/khexedit/files/digest-khexedit-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/khexedit/files/digest-khexedit-3.4.2 b/kde-base/khexedit/files/digest-khexedit-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/khexedit/files/digest-khexedit-3.4.2
+++ b/kde-base/khexedit/files/digest-khexedit-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/khexedit/khexedit-3.4.1.ebuild b/kde-base/khexedit/khexedit-3.4.1.ebuild
index bb2d422894cb..3d27fe7fdc5d 100644
--- a/kde-base/khexedit/khexedit-3.4.1.ebuild
+++ b/kde-base/khexedit/khexedit-3.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/kde-base/khexedit/khexedit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE hex editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 PATCHES="$FILESDIR/khexedit-configure-magic.diff"
\ No newline at end of file
diff --git a/kde-base/khexedit/khexedit-3.4.2.ebuild b/kde-base/khexedit/khexedit-3.4.2.ebuild
index 45ca4e4b1918..b853a6ab8a34 100644
--- a/kde-base/khexedit/khexedit-3.4.2.ebuild
+++ b/kde-base/khexedit/khexedit-3.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/kde-base/khexedit/khexedit-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE hex editor"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 PATCHES="$FILESDIR/khexedit-configure-magic.diff"
\ No newline at end of file
diff --git a/kde-base/khexedit/khexedit-3.4.3.ebuild b/kde-base/khexedit/khexedit-3.4.3.ebuild
index 4b014d0aa363..d2069b4e16fa 100644
--- a/kde-base/khexedit/khexedit-3.4.3.ebuild
+++ b/kde-base/khexedit/khexedit-3.4.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/kde-base/khexedit/khexedit-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE hex editor"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
-PATCHES="$FILESDIR/khexedit-configure-magic.diff"
\ No newline at end of file
+PATCHES="$FILESDIR/khexedit-configure-magic.diff"
diff --git a/kde-base/khexedit/khexedit-3.5.0.ebuild b/kde-base/khexedit/khexedit-3.5.0.ebuild
index 3c60c99060c1..4b162d29378f 100644
--- a/kde-base/khexedit/khexedit-3.5.0.ebuild
+++ b/kde-base/khexedit/khexedit-3.5.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/kde-base/khexedit/khexedit-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/khexedit/khexedit-3.5.0_beta2.ebuild b/kde-base/khexedit/khexedit-3.5.0_beta2.ebuild
index 5e4bbfe0c662..4b2f56b0f74c 100644
--- a/kde-base/khexedit/khexedit-3.5.0_beta2.ebuild
+++ b/kde-base/khexedit/khexedit-3.5.0_beta2.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/kde-base/khexedit/khexedit-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE hex editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES="$FILESDIR/khexedit-configure-magic.diff"
\ No newline at end of file
diff --git a/kde-base/khexedit/khexedit-3.5.0_rc1.ebuild b/kde-base/khexedit/khexedit-3.5.0_rc1.ebuild
index 72c650e9898d..7aa8c6b5bca5 100644
--- a/kde-base/khexedit/khexedit-3.5.0_rc1.ebuild
+++ b/kde-base/khexedit/khexedit-3.5.0_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/kde-base/khexedit/khexedit-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/khexedit/khexedit-3.5_beta1.ebuild b/kde-base/khexedit/khexedit-3.5_beta1.ebuild
index e688d3610dde..1c1eaa822f3c 100644
--- a/kde-base/khexedit/khexedit-3.5_beta1.ebuild
+++ b/kde-base/khexedit/khexedit-3.5_beta1.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/kde-base/khexedit/khexedit-3.5_beta1.ebuild,v 1.1 2005/09/22 19:04:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khexedit/khexedit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE hex editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 PATCHES="$FILESDIR/khexedit-configure-magic.diff"
\ No newline at end of file
diff --git a/kde-base/khexedit/metadata.xml b/kde-base/khexedit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/khexedit/metadata.xml
+++ b/kde-base/khexedit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/khotkeys/ChangeLog b/kde-base/khotkeys/ChangeLog
index b613e1010928..4400a521bad6 100644
--- a/kde-base/khotkeys/ChangeLog
+++ b/kde-base/khotkeys/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/khotkeys
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/ChangeLog,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> khotkeys-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> khotkeys-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> khotkeys-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*khotkeys-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*khotkeys-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  khotkeys-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*khotkeys-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.5.0_beta2.ebuild:
+  New version.
+
+*khotkeys-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  khotkeys-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -khotkeys-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*khotkeys-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/khotkeys-qt-3.3.5.patch, khotkeys-3.4.2.ebuild,
+  +khotkeys-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*khotkeys-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +khotkeys-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> khotkeys-3.4.2.ebuild:
+  ~alpha keyword.
+
+*khotkeys-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> khotkeys-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> khotkeys-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> khotkeys-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*khotkeys-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> khotkeys-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> khotkeys-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> khotkeys-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> khotkeys-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*khotkeys-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> khotkeys-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*khotkeys-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +khotkeys-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *khotkeys-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/khotkeys/Manifest b/kde-base/khotkeys/Manifest
index b7ac17299050..b17c9cb67c23 100644
--- a/kde-base/khotkeys/Manifest
+++ b/kde-base/khotkeys/Manifest
@@ -1,4 +1,27 @@
-MD5 0b750ab691c187453dc75a9049dcdaed khotkeys-3.4.0_alpha1.ebuild 361
-MD5 0b750ab691c187453dc75a9049dcdaed khotkeys-3.4.0_beta1.ebuild 361
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-khotkeys-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-khotkeys-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c1fc19d5f963cd6cdc306eef8cef8cb1 ChangeLog 3705
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-khotkeys-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-khotkeys-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-khotkeys-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-khotkeys-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-khotkeys-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-khotkeys-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-khotkeys-3.5_beta1 69
+MD5 0e8a254162dbb8519bdd6b4a332b920f files/khotkeys-qt-3.3.5.patch 441
+MD5 51330a32c6197d220bb44ef01c8b94ec khotkeys-3.4.1.ebuild 384
+MD5 b4fcb29bb7e550874e315084ff94d427 khotkeys-3.4.2.ebuild 443
+MD5 a581fef2a5199d32bb2efd651969a654 khotkeys-3.4.3.ebuild 391
+MD5 851fbcdccc429b266014370cdcae7820 khotkeys-3.5.0.ebuild 376
+MD5 8e07b5c22f04fb02258098cb2c533a19 khotkeys-3.5.0_beta2.ebuild 379
+MD5 7ba5c916c5095d5aeab6652b80392efb khotkeys-3.5.0_rc1.ebuild 380
+MD5 065c926ef9379c8a2fed21cb7ddccd02 khotkeys-3.5_beta1.ebuild 421
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjvsntT9W3vfTuoRAhDKAJ9bG+f3zyF9hnseoDbAaFa+/wiJCgCgrRQ0
+UwkyphKfQlqcCU8/O5+pAbE=
+=ALoO
+-----END PGP SIGNATURE-----
diff --git a/kde-base/khotkeys/files/digest-khotkeys-3.4.1 b/kde-base/khotkeys/files/digest-khotkeys-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/khotkeys/files/digest-khotkeys-3.4.1
+++ b/kde-base/khotkeys/files/digest-khotkeys-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/khotkeys/files/digest-khotkeys-3.4.2 b/kde-base/khotkeys/files/digest-khotkeys-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/khotkeys/files/digest-khotkeys-3.4.2
+++ b/kde-base/khotkeys/files/digest-khotkeys-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/khotkeys/khotkeys-3.4.1.ebuild b/kde-base/khotkeys/khotkeys-3.4.1.ebuild
index 7ad8513704ce..68598a5e24eb 100644
--- a/kde-base/khotkeys/khotkeys-3.4.1.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.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/kde-base/khotkeys/khotkeys-3.4.1.ebuild,v 1.1 2005/05/25 21:23:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/khotkeys/khotkeys-3.4.2.ebuild b/kde-base/khotkeys/khotkeys-3.4.2.ebuild
index a195afc9a777..d3064cf9d7e0 100644
--- a/kde-base/khotkeys/khotkeys-3.4.2.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.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/kde-base/khotkeys/khotkeys-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,8 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
+PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
 
diff --git a/kde-base/khotkeys/khotkeys-3.4.3.ebuild b/kde-base/khotkeys/khotkeys-3.4.3.ebuild
index a1c8334ce18d..6e911c4e74f4 100644
--- a/kde-base/khotkeys/khotkeys-3.4.3.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.4.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/kde-base/khotkeys/khotkeys-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,8 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
-
diff --git a/kde-base/khotkeys/khotkeys-3.5.0.ebuild b/kde-base/khotkeys/khotkeys-3.5.0.ebuild
index d5d665ccd14a..0793858e4809 100644
--- a/kde-base/khotkeys/khotkeys-3.5.0.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.5.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/kde-base/khotkeys/khotkeys-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/khotkeys/khotkeys-3.5.0_beta2.ebuild b/kde-base/khotkeys/khotkeys-3.5.0_beta2.ebuild
index 82798af185cc..9978483ecf99 100644
--- a/kde-base/khotkeys/khotkeys-3.5.0_beta2.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.5.0_beta2.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/kde-base/khotkeys/khotkeys-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
-
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
diff --git a/kde-base/khotkeys/khotkeys-3.5.0_rc1.ebuild b/kde-base/khotkeys/khotkeys-3.5.0_rc1.ebuild
index c5186103348b..182c4e0c0796 100644
--- a/kde-base/khotkeys/khotkeys-3.5.0_rc1.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.5.0_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/kde-base/khotkeys/khotkeys-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/khotkeys/khotkeys-3.5_beta1.ebuild b/kde-base/khotkeys/khotkeys-3.5_beta1.ebuild
index 7254482b7b86..53b25c1bc960 100644
--- a/kde-base/khotkeys/khotkeys-3.5_beta1.ebuild
+++ b/kde-base/khotkeys/khotkeys-3.5_beta1.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/kde-base/khotkeys/khotkeys-3.5_beta1.ebuild,v 1.1 2005/09/22 19:05:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/khotkeys/khotkeys-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:11 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: hotkey daemon"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
diff --git a/kde-base/khotkeys/metadata.xml b/kde-base/khotkeys/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/khotkeys/metadata.xml
+++ b/kde-base/khotkeys/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kicker-applets/ChangeLog b/kde-base/kicker-applets/ChangeLog
index 546104c685c4..35421b63a7c6 100644
--- a/kde-base/kicker-applets/ChangeLog
+++ b/kde-base/kicker-applets/ChangeLog
@@ -1,6 +1,119 @@
 # ChangeLog for kde-base/kicker-applets
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.1 2005/02/11 16:31:18 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/ChangeLog,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kicker-applets-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kicker-applets-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kicker-applets-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kicker-applets-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kicker-applets-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kicker-applets-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kicker-applets-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kicker-applets-3.5_beta1.ebuild, kicker-applets-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kicker-applets-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kicker-applets-3.5.0_beta2.ebuild:
+  New version.
+
+*kicker-applets-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kicker-applets-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kicker-applets-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kicker-applets-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kicker-applets-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kicker-applets-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kicker-applets-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kicker-applets-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kicker-applets-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdeaddons-xmms.patch, +kicker-applets-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kicker-applets-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kicker-applets-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kicker-applets-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kicker-applets-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kicker-applets-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kicker-applets-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kicker-applets-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kicker-applets-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kicker-applets-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kicker-applets-3.4.0_rc1 (08 Mar 2005)
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kicker-applets-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kicker-applets-3.4.0_beta1-r1 (11 Feb 2005)
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +kicker-applets-3.4.0_beta1-r1.ebuild, -kicker-applets-3.4.0_beta1.ebuild,
+  +kicker-applets-3.4.0_beta2-r1.ebuild, -kicker-applets-3.4.0_beta2.ebuild:
+  bump to get docs changes
+
+  11 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  kicker-applets-3.4.0_beta1.ebuild, kicker-applets-3.4.0_beta2.ebuild:
+  put docs in ebuild
 
 *kicker-applets-3.4.0_beta1 (11 Feb 2005)
 
diff --git a/kde-base/kicker-applets/Manifest b/kde-base/kicker-applets/Manifest
index 0a2b27c005f7..1fc0941ae5bc 100644
--- a/kde-base/kicker-applets/Manifest
+++ b/kde-base/kicker-applets/Manifest
@@ -1,4 +1,27 @@
-MD5 db22acb531060fa5913b346d6040c019 kicker-applets-3.4.0_beta2.ebuild 728
-MD5 db22acb531060fa5913b346d6040c019 kicker-applets-3.4.0_beta1.ebuild 728
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-kicker-applets-3.4.0_beta1 219
-MD5 9009a89a3313cb85f25a0d66683e48ed files/digest-kicker-applets-3.4.0_beta2 298
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ee9bf9d9d4d7a1a9469ab74e2741b35e ChangeLog 3962
+MD5 a1717c6a0c5ce2efbdca2ecac8ac058e files/configure-fix-kdeaddons-xmms.patch 691
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-kicker-applets-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-kicker-applets-3.4.2 291
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-kicker-applets-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-kicker-applets-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-kicker-applets-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-kicker-applets-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-kicker-applets-3.5_beta1 70
+MD5 8bf1434a3b4545130c6db9ea2542c6dd kicker-applets-3.4.1.ebuild 634
+MD5 6f2ba54a38d4dbe069094105ed2332ea kicker-applets-3.4.2.ebuild 689
+MD5 0510ed792be1280e08b1270bca6e8816 kicker-applets-3.4.3.ebuild 685
+MD5 280e37d02bb3b476427a93d7bc4ce3ef kicker-applets-3.5.0.ebuild 548
+MD5 d74df8f59fda4cde4525e44883a8ed35 kicker-applets-3.5.0_beta2.ebuild 553
+MD5 3da9e884f90b7542346cb16d171aa2e8 kicker-applets-3.5.0_rc1.ebuild 552
+MD5 9686ed025e824f56a5972d815c814085 kicker-applets-3.5_beta1.ebuild 612
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxe6ntT9W3vfTuoRAtInAJ9lSr8pK5DdOjVN+EqN2nNaa+hTcgCeM7iC
+00GMaSIB7fmVZvbdOZNiKro=
+=djQU
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kicker-applets/files/digest-kicker-applets-3.4.1 b/kde-base/kicker-applets/files/digest-kicker-applets-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/kicker-applets/files/digest-kicker-applets-3.4.1
+++ b/kde-base/kicker-applets/files/digest-kicker-applets-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/kicker-applets/files/digest-kicker-applets-3.4.2 b/kde-base/kicker-applets/files/digest-kicker-applets-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/kicker-applets/files/digest-kicker-applets-3.4.2
+++ b/kde-base/kicker-applets/files/digest-kicker-applets-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/kicker-applets/kicker-applets-3.4.1.ebuild b/kde-base/kicker-applets/kicker-applets-3.4.1.ebuild
index f938112b8bc7..bc91cea06159 100644
--- a/kde-base/kicker-applets/kicker-applets-3.4.1.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.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/kde-base/kicker-applets/kicker-applets-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applets"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="xmms"
 OLDDEPEND="~kde-base/kicker-$PV
 	xmms? ( media-sound/xmms )"
diff --git a/kde-base/kicker-applets/kicker-applets-3.4.2.ebuild b/kde-base/kicker-applets/kicker-applets-3.4.2.ebuild
index 8e7458d9bf5c..232b2def8a2d 100644
--- a/kde-base/kicker-applets/kicker-applets-3.4.2.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.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/kde-base/kicker-applets/kicker-applets-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applets"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xmms"
 OLDDEPEND="~kde-base/kicker-$PV
 	xmms? ( media-sound/xmms )"
diff --git a/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild b/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild
index 17e8bd4959e5..e838deea9941 100644
--- a/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.4.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/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applets"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="xmms"
 OLDDEPEND="~kde-base/kicker-$PV
 	xmms? ( media-sound/xmms )"
diff --git a/kde-base/kicker-applets/kicker-applets-3.5.0.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.0.ebuild
index 5206c846746a..cb3158ba07c7 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5.0.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5.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/kde-base/kicker-applets/kicker-applets-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
diff --git a/kde-base/kicker-applets/kicker-applets-3.5.0_beta2.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.0_beta2.ebuild
index 0c4ab5566936..c9fe84b45237 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5.0_beta2.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5.0_beta2.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/kde-base/kicker-applets/kicker-applets-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applets"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="xmms"
 DEPEND="xmms? ( media-sound/xmms )
 $(deprange-dual $PV $MAXKDEVER kde-base/kicker)"
diff --git a/kde-base/kicker-applets/kicker-applets-3.5.0_rc1.ebuild b/kde-base/kicker-applets/kicker-applets-3.5.0_rc1.ebuild
index adec228670ce..ba12614ca250 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5.0_rc1.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5.0_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/kde-base/kicker-applets/kicker-applets-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
diff --git a/kde-base/kicker-applets/kicker-applets-3.5_beta1.ebuild b/kde-base/kicker-applets/kicker-applets-3.5_beta1.ebuild
index 824cbdd942ce..a7df7e3b9583 100644
--- a/kde-base/kicker-applets/kicker-applets-3.5_beta1.ebuild
+++ b/kde-base/kicker-applets/kicker-applets-3.5_beta1.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/kde-base/kicker-applets/kicker-applets-3.5_beta1.ebuild,v 1.1 2005/09/22 19:07:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker-applets/kicker-applets-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="kicker-applets doc/kicker-applets"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kicker applets"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="xmms"
 OLDDEPEND="~kde-base/kicker-$PV
 	xmms? ( media-sound/xmms )"
diff --git a/kde-base/kicker-applets/metadata.xml b/kde-base/kicker-applets/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kicker-applets/metadata.xml
+++ b/kde-base/kicker-applets/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index 17c1ab52457a..ecb3857d93aa 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kicker
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kicker-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kicker-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kicker-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kicker-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kicker-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org> kicker-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kicker-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.5.0_beta2.ebuild:
+  New version.
+
+*kicker-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kicker-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kicker-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kicker-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kicker-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kicker-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kicker-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kicker-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kicker-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kicker-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kicker-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kicker-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kicker-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kicker-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kicker-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kicker-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kicker-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kicker-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kicker-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kicker-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kicker-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kicker-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kicker/Manifest b/kde-base/kicker/Manifest
index b3e607ec685a..4965d9e555fa 100644
--- a/kde-base/kicker/Manifest
+++ b/kde-base/kicker/Manifest
@@ -1,5 +1,27 @@
-MD5 94e1275c1ed4440f376db98b9ebb8b50 kicker-3.4.0_beta1.ebuild 612
-MD5 94e1275c1ed4440f376db98b9ebb8b50 kicker-3.4.0_alpha1.ebuild 612
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5807c706bf53149d263efba51aac0662 ChangeLog 3607
 MD5 07e3f3f7982d29e2317f32f209e06573 files/applets-configure.in.in.diff 606
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kicker-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kicker-3.4.0_alpha1 69
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kicker-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kicker-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kicker-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kicker-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kicker-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kicker-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kicker-3.5_beta1 69
+MD5 3f169df7532dad28d299bdb3c4683484 kicker-3.4.1.ebuild 680
+MD5 cc9e587f4748ebb5f8aadab99eba7b8f kicker-3.4.2.ebuild 693
+MD5 a23284505ee6c8f9bd7f908324dc5f44 kicker-3.4.3.ebuild 689
+MD5 2af86edd9a43920219d1a139d800b967 kicker-3.5.0.ebuild 639
+MD5 91100fa38d20a0e534e483346a177775 kicker-3.5.0_beta2.ebuild 642
+MD5 7b51799cc58b38de913ea41407680323 kicker-3.5.0_rc1.ebuild 643
+MD5 9460e8723d620b98e6668e7d74e6a031 kicker-3.5_beta1.ebuild 675
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjpvntT9W3vfTuoRAhgEAJwIvt/P0oV8OdTtkd5KqsARiQO+CACeKaAp
+4NNTZEiSlc3BXPnpKubRK20=
+=0Z1C
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kicker/files/digest-kicker-3.4.1 b/kde-base/kicker/files/digest-kicker-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kicker/files/digest-kicker-3.4.1
+++ b/kde-base/kicker/files/digest-kicker-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kicker/files/digest-kicker-3.4.2 b/kde-base/kicker/files/digest-kicker-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kicker/files/digest-kicker-3.4.2
+++ b/kde-base/kicker/files/digest-kicker-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kicker/kicker-3.4.1.ebuild b/kde-base/kicker/kicker-3.4.1.ebuild
index 37140495f8dc..3f77f6c004f7 100644
--- a/kde-base/kicker/kicker-3.4.1.ebuild
+++ b/kde-base/kicker/kicker-3.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/kde-base/kicker/kicker-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE panel housing varous applets"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 PATCHES="$FILESDIR/applets-configure.in.in.diff"
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kicker/kicker-3.4.2.ebuild b/kde-base/kicker/kicker-3.4.2.ebuild
index c977f1e6112e..47a839ae0028 100644
--- a/kde-base/kicker/kicker-3.4.2.ebuild
+++ b/kde-base/kicker/kicker-3.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/kde-base/kicker/kicker-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE panel housing varous applets"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 PATCHES="$FILESDIR/applets-configure.in.in.diff"
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kicker/kicker-3.4.3.ebuild b/kde-base/kicker/kicker-3.4.3.ebuild
index a86218d1f7f3..86eb5bce416f 100644
--- a/kde-base/kicker/kicker-3.4.3.ebuild
+++ b/kde-base/kicker/kicker-3.4.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/kde-base/kicker/kicker-3.4.3.ebuild,v 1.1 2005/10/13 00:10:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE panel housing varous applets"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 PATCHES="$FILESDIR/applets-configure.in.in.diff"
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kicker/kicker-3.5.0.ebuild b/kde-base/kicker/kicker-3.5.0.ebuild
index 82d685c08bca..fedbf503e2d0 100644
--- a/kde-base/kicker/kicker-3.5.0.ebuild
+++ b/kde-base/kicker/kicker-3.5.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/kde-base/kicker/kicker-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kicker/kicker-3.5.0_beta2.ebuild b/kde-base/kicker/kicker-3.5.0_beta2.ebuild
index 380489cab9a1..f013dd5cc690 100644
--- a/kde-base/kicker/kicker-3.5.0_beta2.ebuild
+++ b/kde-base/kicker/kicker-3.5.0_beta2.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/kde-base/kicker/kicker-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:54 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE panel housing varous applets"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 PATCHES="$FILESDIR/applets-configure.in.in.diff"
 
diff --git a/kde-base/kicker/kicker-3.5.0_rc1.ebuild b/kde-base/kicker/kicker-3.5.0_rc1.ebuild
index f245e2180a43..22fd71fcc187 100644
--- a/kde-base/kicker/kicker-3.5.0_rc1.ebuild
+++ b/kde-base/kicker/kicker-3.5.0_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/kde-base/kicker/kicker-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kicker/kicker-3.5_beta1.ebuild b/kde-base/kicker/kicker-3.5_beta1.ebuild
index 6319dee71cc3..120e8311dabf 100644
--- a/kde-base/kicker/kicker-3.5_beta1.ebuild
+++ b/kde-base/kicker/kicker-3.5_beta1.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/kde-base/kicker/kicker-3.5_beta1.ebuild,v 1.1 2005/09/22 19:06:08 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE panel housing varous applets"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 PATCHES="$FILESDIR/applets-configure.in.in.diff"
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/kicker/metadata.xml b/kde-base/kicker/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kicker/metadata.xml
+++ b/kde-base/kicker/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kiconedit/ChangeLog b/kde-base/kiconedit/ChangeLog
index 551202bde2cb..5f0da725d3f1 100644
--- a/kde-base/kiconedit/ChangeLog
+++ b/kde-base/kiconedit/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/kiconedit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/ChangeLog,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kiconedit-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kiconedit-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kiconedit-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kiconedit-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kiconedit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kiconedit-3.5_beta1.ebuild,
+  kiconedit-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kiconedit-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kiconedit-3.5.0_beta2.ebuild:
+  New version.
+
+*kiconedit-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kiconedit-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kiconedit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kiconedit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kiconedit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kiconedit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kiconedit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kiconedit-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kiconedit-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kiconedit-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kiconedit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kiconedit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kiconedit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kiconedit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kiconedit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kiconedit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kiconedit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kiconedit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kiconedit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kiconedit-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kiconedit-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kiconedit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kiconedit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kiconedit-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kiconedit/Manifest b/kde-base/kiconedit/Manifest
index a68c5d0acb18..39d649666beb 100644
--- a/kde-base/kiconedit/Manifest
+++ b/kde-base/kiconedit/Manifest
@@ -1,4 +1,24 @@
-MD5 91a8bf6f5c5cab9210bf77e0399666f7 kiconedit-3.4.0_alpha1.ebuild 261
-MD5 91a8bf6f5c5cab9210bf77e0399666f7 kiconedit-3.4.0_beta1.ebuild 261
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kiconedit-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kiconedit-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4491599db37d1209d97161c244500300 ChangeLog 3474
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kiconedit-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kiconedit-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kiconedit-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kiconedit-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kiconedit-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kiconedit-3.5_beta1 72
+MD5 ca6f2bb6b975f12082a94d769b885ba6 kiconedit-3.4.1.ebuild 384
+MD5 ab55457ffdad53f8593c7826a7dec4af kiconedit-3.4.2.ebuild 397
+MD5 0026f799116fd7cfe1db839f63056318 kiconedit-3.4.3.ebuild 394
+MD5 70219f24398d09438a3f10957bbda618 kiconedit-3.5.0.ebuild 373
+MD5 12f3908477eea4800697689bbef37ebd kiconedit-3.5.0_beta2.ebuild 385
+MD5 aca38cbc91b79eb8ddcda2a78e8de31a kiconedit-3.5_beta1.ebuild 376
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmagntT9W3vfTuoRAseGAJ9uJ1d6xdMT0dXQQwuVpeU5XVDHAwCgmeYE
+D91+qugDMRrLf/UgzD5YNbo=
+=LD4Q
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kiconedit/files/digest-kiconedit-3.4.1 b/kde-base/kiconedit/files/digest-kiconedit-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kiconedit/files/digest-kiconedit-3.4.1
+++ b/kde-base/kiconedit/files/digest-kiconedit-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kiconedit/files/digest-kiconedit-3.4.2 b/kde-base/kiconedit/files/digest-kiconedit-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kiconedit/files/digest-kiconedit-3.4.2
+++ b/kde-base/kiconedit/files/digest-kiconedit-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kiconedit/kiconedit-3.4.1.ebuild b/kde-base/kiconedit/kiconedit-3.4.1.ebuild
index 28d1c4032282..8b31a7d058be 100644
--- a/kde-base/kiconedit/kiconedit-3.4.1.ebuild
+++ b/kde-base/kiconedit/kiconedit-3.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/kde-base/kiconedit/kiconedit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/kiconedit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Icon Editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kiconedit/kiconedit-3.4.2.ebuild b/kde-base/kiconedit/kiconedit-3.4.2.ebuild
index 719fbd6023b3..47651a73c4b5 100644
--- a/kde-base/kiconedit/kiconedit-3.4.2.ebuild
+++ b/kde-base/kiconedit/kiconedit-3.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/kde-base/kiconedit/kiconedit-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/kiconedit-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Icon Editor"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kiconedit/kiconedit-3.4.3.ebuild b/kde-base/kiconedit/kiconedit-3.4.3.ebuild
index 4695528bf51d..28506c064e93 100644
--- a/kde-base/kiconedit/kiconedit-3.4.3.ebuild
+++ b/kde-base/kiconedit/kiconedit-3.4.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/kde-base/kiconedit/kiconedit-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/kiconedit-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Icon Editor"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kiconedit/kiconedit-3.5.0.ebuild b/kde-base/kiconedit/kiconedit-3.5.0.ebuild
index c278f7bcdb4d..060a73b37c41 100644
--- a/kde-base/kiconedit/kiconedit-3.5.0.ebuild
+++ b/kde-base/kiconedit/kiconedit-3.5.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/kde-base/kiconedit/kiconedit-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/kiconedit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kiconedit/kiconedit-3.5.0_beta2.ebuild b/kde-base/kiconedit/kiconedit-3.5.0_beta2.ebuild
index 5c5f18eb1054..3100ce1cdf93 100644
--- a/kde-base/kiconedit/kiconedit-3.5.0_beta2.ebuild
+++ b/kde-base/kiconedit/kiconedit-3.5.0_beta2.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/kde-base/kiconedit/kiconedit-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/kiconedit-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Icon Editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kiconedit/kiconedit-3.5_beta1.ebuild b/kde-base/kiconedit/kiconedit-3.5_beta1.ebuild
index 5cdd8153684f..2abbcad595e1 100644
--- a/kde-base/kiconedit/kiconedit-3.5_beta1.ebuild
+++ b/kde-base/kiconedit/kiconedit-3.5_beta1.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/kde-base/kiconedit/kiconedit-3.5_beta1.ebuild,v 1.1 2005/09/22 19:08:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiconedit/kiconedit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Icon Editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kiconedit/metadata.xml b/kde-base/kiconedit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kiconedit/metadata.xml
+++ b/kde-base/kiconedit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kig/ChangeLog b/kde-base/kig/ChangeLog
index a5138eebe717..ef84aabc5b74 100644
--- a/kde-base/kig/ChangeLog
+++ b/kde-base/kig/ChangeLog
@@ -1,6 +1,132 @@
 # ChangeLog for kde-base/kig
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/ChangeLog,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kig-3.4.3-r10.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kig-3.4.3-r10.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kig-3.4.3-r10.ebuild:
+  Stable on sparc wrt #112842
+
+*kig-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kig-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kig-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kig-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  23 Oct 2005; Carsten Lohrke <carlo@gentoo.org> kig-3.4.3.ebuild:
+  minor fix
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kig-3.5_beta1.ebuild,
+  kig-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kig-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kig-3.5.0_beta2.ebuild:
+  New version.
+
+*kig-3.4.3-r10 (13 Oct 2005)
+
+  13 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> kig-3.4.3.ebuild,
+  +kig-3.4.3-r10.ebuild:
+  Provide a version of kig that does not depend on boost.
+
+*kig-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kig-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -kig-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kig-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kig-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kig-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kig-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kig-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kig-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kig-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kig-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kig-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kig-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org> kig-3.4.1.ebuild:
+  Correct option passed to configure. Previously, ebuild may have incorrectly
+  enabeld python scripting if boost were detected.
+
+*kig-3.4.1-r10 (29 Jun 2005)
+
+  29 Jun 2005; Dan Armak <danarmak@gentoo.org> kig-3.4.1.ebuild,
+  +kig-3.4.1-r10.ebuild:
+  Added new revision identical to the old one, and removed kig-scripting
+  support in 3.4.1 (the old revision). The intention is to keyword only the
+  3.4.1 ebuild stable, and leave -r10 at ~arch, because the version of boost
+  necessary for kig-scripting support doesn't yet haev stable keywwords.
+
+*kig-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kig-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kig-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kig-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  24 Mar 2005; Gregorio Guidi <greg_g@gentoo.org> kig-3.4.0.ebuild:
+  Use local flag 'kig-scripting' instead of 'python' to enable scripting
+  support, disabling it by default (#85925).
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kig-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kig-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kig-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kig-3.4.0_rc1 (28 Feb 2005)
+
+  28 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> kig-3.4.0_rc1.ebuild:
+  Add optional support for python scripting.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kig-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kig-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kig-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kig/Manifest b/kde-base/kig/Manifest
index a895e6239e03..249f75f57232 100644
--- a/kde-base/kig/Manifest
+++ b/kde-base/kig/Manifest
@@ -1,4 +1,30 @@
-MD5 64bf765f98aed971af1d39d1f1d901ef kig-3.4.0_beta1.ebuild 274
-MD5 64bf765f98aed971af1d39d1f1d901ef kig-3.4.0_alpha1.ebuild 274
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kig-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kig-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2c4924784a22de5db6407fbfd583154a ChangeLog 4577
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kig-3.4.1 208
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kig-3.4.1-r10 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kig-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kig-3.4.3 67
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kig-3.4.3-r10 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kig-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kig-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kig-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kig-3.5_beta1 68
+MD5 dfe79135e2e5a11856bd38de1b00639b kig-3.4.1-r10.ebuild 555
+MD5 1f153cd8ce4a7266ce239f61c6dcca8b kig-3.4.1.ebuild 435
+MD5 e4ad8498983c1d267a8a9f93d3f22a94 kig-3.4.2.ebuild 556
+MD5 ce09b7a185106e5bd064c58f377637cf kig-3.4.3-r10.ebuild 557
+MD5 9c7be46c69e5bcb19aced09d8b875f0a kig-3.4.3.ebuild 647
+MD5 7c46617119b95c0c840944edf70c026f kig-3.5.0.ebuild 532
+MD5 23b651f989bbc75cf04f90662f000f1f kig-3.5.0_beta2.ebuild 537
+MD5 9c71cefcd3fee031336460bd69a3e40a kig-3.5.0_rc1.ebuild 536
+MD5 0043f0835fd1241008b64eb1b58cae52 kig-3.5_beta1.ebuild 535
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlJpntT9W3vfTuoRAn4BAJ9jatHNkyh6j+rLh/hSRzuzxgHruACfUrSe
+6VquUEpaGyPHGqAFfMfeYqY=
+=oBc6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kig/files/digest-kig-3.4.1 b/kde-base/kig/files/digest-kig-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kig/files/digest-kig-3.4.1
+++ b/kde-base/kig/files/digest-kig-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kig/files/digest-kig-3.4.2 b/kde-base/kig/files/digest-kig-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kig/files/digest-kig-3.4.2
+++ b/kde-base/kig/files/digest-kig-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kig/kig-3.4.1-r10.ebuild b/kde-base/kig/kig-3.4.1-r10.ebuild
index 28f894f7a60d..7b276ee175e4 100644
--- a/kde-base/kig/kig-3.4.1-r10.ebuild
+++ b/kde-base/kig/kig-3.4.1-r10.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/kde-base/kig/kig-3.4.1-r10.ebuild,v 1.1 2005/06/29 19:15:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.1-r10.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kig/kig-3.4.1.ebuild b/kde-base/kig/kig-3.4.1.ebuild
index 5945458f868e..562cbbd8f335 100644
--- a/kde-base/kig/kig-3.4.1.ebuild
+++ b/kde-base/kig/kig-3.4.1.ebuild
@@ -1,18 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~x86 ~amd64"
-IUSE="kig-scripting"
-DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
+DEPEND=""
 
-src_compile() {
-	myconf="${myconf} $(use_enable kig-scripting kig-python-scripting)"
-
-	kde_src_compile
-}
+myconf="${myconf} --disable-kig-python-scripting"
diff --git a/kde-base/kig/kig-3.4.2.ebuild b/kde-base/kig/kig-3.4.2.ebuild
index 6dc622b49561..604cd8d9ba16 100644
--- a/kde-base/kig/kig-3.4.2.ebuild
+++ b/kde-base/kig/kig-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="kig-scripting"
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
 
diff --git a/kde-base/kig/kig-3.4.3-r10.ebuild b/kde-base/kig/kig-3.4.3-r10.ebuild
index 281768986159..b7e9f0e5eb3e 100644
--- a/kde-base/kig/kig-3.4.3-r10.ebuild
+++ b/kde-base/kig/kig-3.4.3-r10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.3-r10.ebuild,v 1.1 2005/10/13 07:51:01 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.3-r10.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="kig-scripting"
 
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
diff --git a/kde-base/kig/kig-3.4.3.ebuild b/kde-base/kig/kig-3.4.3.ebuild
index 6bf562db5bb0..932fd8a5e2fb 100644
--- a/kde-base/kig/kig-3.4.3.ebuild
+++ b/kde-base/kig/kig-3.4.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/kde-base/kig/kig-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -8,11 +8,15 @@ inherit kde-meta
 
 DESCRIPTION="KDE Interactive Geometry tool"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="kig-scripting"
-DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
+#IUSE="kig-scripting"
+IUSE=""
+
+# Waiting for stabilization.
+#DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
 
 src_compile() {
-	myconf="${myconf} $(use_enable kig-scripting kig-python-scripting)"
+	#myconf="${myconf} $(use_enable kig-scripting kig-python-scripting)"
+	myconf="${myconf} --disable-kig-python-scripting"
 
 	kde_src_compile
 }
diff --git a/kde-base/kig/kig-3.5.0.ebuild b/kde-base/kig/kig-3.5.0.ebuild
index ba129a54c91a..df0c99434a92 100644
--- a/kde-base/kig/kig-3.5.0.ebuild
+++ b/kde-base/kig/kig-3.5.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/kde-base/kig/kig-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kig/kig-3.5.0_beta2.ebuild b/kde-base/kig/kig-3.5.0_beta2.ebuild
index 63754225699e..69a3240160ba 100644
--- a/kde-base/kig/kig-3.5.0_beta2.ebuild
+++ b/kde-base/kig/kig-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="kig-scripting"
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
 
diff --git a/kde-base/kig/kig-3.5.0_rc1.ebuild b/kde-base/kig/kig-3.5.0_rc1.ebuild
index 9e00d6e955ff..c41665af40b0 100644
--- a/kde-base/kig/kig-3.5.0_rc1.ebuild
+++ b/kde-base/kig/kig-3.5.0_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/kde-base/kig/kig-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kig/kig-3.5_beta1.ebuild b/kde-base/kig/kig-3.5_beta1.ebuild
index c756a14aa860..dfb35d786612 100644
--- a/kde-base/kig/kig-3.5_beta1.ebuild
+++ b/kde-base/kig/kig-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.5_beta1.ebuild,v 1.1 2005/09/22 19:09:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kig/kig-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Interactive Geometry tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="kig-scripting"
 DEPEND="kig-scripting? ( >=dev-libs/boost-1.32 )"
 
diff --git a/kde-base/kig/metadata.xml b/kde-base/kig/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kig/metadata.xml
+++ b/kde-base/kig/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kimagemapeditor/ChangeLog b/kde-base/kimagemapeditor/ChangeLog
index e52a8bad7597..a5bea90bf68d 100644
--- a/kde-base/kimagemapeditor/ChangeLog
+++ b/kde-base/kimagemapeditor/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for kde-base/kimagemapeditor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/ChangeLog,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kimagemapeditor-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kimagemapeditor-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kimagemapeditor-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kimagemapeditor-3.5.0 (22 Nov 2005)
+
+  22 Nov 2005; Dan Armak <danarmak@gentoo.org> +kimagemapeditor-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kimagemapeditor-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kimagemapeditor-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kimagemapeditor-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+*kimagemapeditor-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kimagemapeditor-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kimagemapeditor-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kimagemapeditor-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kimagemapeditor-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kimagemapeditor-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kimagemapeditor-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kimagemapeditor-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kimagemapeditor-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kimagemapeditor-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kimagemapeditor-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kimagemapeditor-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kimagemapeditor-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org>
+  kimagemapeditor-3.4.0.ebuild, kimagemapeditor-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> kimagemapeditor-3.4.0.ebuild,
+  kimagemapeditor-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kimagemapeditor-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kimagemapeditor-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kimagemapeditor-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kimagemapeditor-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kimagemapeditor-3.4.0_rc1 (10 Mar 2005)
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kimagemapeditor-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kimagemapeditor-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kimagemapeditor-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kimagemapeditor-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kimagemapeditor/Manifest b/kde-base/kimagemapeditor/Manifest
index 42dcdd4ffc25..9d3739e9390e 100644
--- a/kde-base/kimagemapeditor/Manifest
+++ b/kde-base/kimagemapeditor/Manifest
@@ -1,4 +1,14 @@
-MD5 a70d50dc189b4ac8ab9c7c88533eb873 kimagemapeditor-3.4.0_beta1.ebuild 276
-MD5 a70d50dc189b4ac8ab9c7c88533eb873 kimagemapeditor-3.4.0_alpha1.ebuild 276
-MD5 01932d35a126a5610a6c4a35de90a2b6 files/digest-kimagemapeditor-3.4.0_alpha1 70
-MD5 07dc9f44e293d1ac9c7b66b68f28492f files/digest-kimagemapeditor-3.4.0_beta1 219
+MD5 c9fcfc94e13133ee39146688caf7a8d4 ChangeLog 3738
+MD5 e951879abebc3cb3931132db3f1c508a files/digest-kimagemapeditor-3.4.1 215
+MD5 aa19f6252c3ee8966919f391f9ccd717 files/digest-kimagemapeditor-3.4.2 292
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-kimagemapeditor-3.4.3 69
+MD5 eefd34bb06d5f84a5f77adf4a6e69fdf files/digest-kimagemapeditor-3.5.0 69
+MD5 50a5dfc5bdebb9f91775752768b4ca60 files/digest-kimagemapeditor-3.5.0_rc1 304
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-kimagemapeditor-3.5_beta1 70
+MD5 e7931928e133dc7f3db0efb9eb8975c1 kimagemapeditor-3.4.1.ebuild 400
+MD5 7b060ffc2d95147cb3a0c4a863a8ce1e kimagemapeditor-3.4.2.ebuild 413
+MD5 6123007cc7108b4828f6a32bfaa11a80 kimagemapeditor-3.4.3.ebuild 409
+MD5 e4fc9244e87bfde50debe4f36d864778 kimagemapeditor-3.5.0.ebuild 389
+MD5 d86aeff9c97fb5fc9c53ae268cce5929 kimagemapeditor-3.5.0_rc1.ebuild 393
+MD5 d848e60721e3a3c335c345efced9acd4 kimagemapeditor-3.5_beta1.ebuild 400
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.1 b/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.1
index 797b2dac2533..ff993687a657 100644
--- a/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.1
+++ b/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.1
@@ -1,2 +1,3 @@
 MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
 MD5 d5c9e5c72731aead950ab29a4d620af8 kdewebdev-3.4.1.tar.bz2 5966577
diff --git a/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.2 b/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.2
index 5497b6e4be9f..18c726d6f0c5 100644
--- a/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.2
+++ b/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.4.2
@@ -1 +1,4 @@
+MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
+MD5 fadb59f001c317dd0f843be81f4157d9 kdewebdev-3.4.1-3.4.2.tar.xdelta 220130
 MD5 99dbd9bf9b2a1451544b35f73efe7dba kdewebdev-3.4.2.tar.bz2 5968773
diff --git a/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.5.0 b/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.5.0
index e61788371b75..b701cc05ce4a 100644
--- a/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.5.0
+++ b/kde-base/kimagemapeditor/files/digest-kimagemapeditor-3.5.0
@@ -1 +1 @@
-MD5 c2ab1f88b43cf409a8ccaca38ba37650 kdewebdev-3.5.0.tar.bz2 6022145
+MD5 58bb4d025fa125c5ad0dc43769ba9786 kdewebdev-3.5.0.tar.bz2 6021886
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.4.1.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-3.4.1.ebuild
index 6a2d95016fda..c6abde3ef28b 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.4.1.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-3.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: An HTML imagemap editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.4.2.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-3.4.2.ebuild
index 318d6cab3979..8cc43c2e11e4 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.4.2.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-3.4.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.4.2.ebuild,v 1.1 2005/07/28 21:16:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: An HTML imagemap editor"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.4.3.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-3.4.3.ebuild
index 54e0cb08f24a..c4684eac5f5a 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.4.3.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-3.4.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: An HTML imagemap editor"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.5.0.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-3.5.0.ebuild
index d02027db8e7c..0dd601c0ab40 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.5.0.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-3.5.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/kde-base/kimagemapeditor/kimagemapeditor-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.5.0_rc1.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-3.5.0_rc1.ebuild
index e3c449a3053f..8cbd6f8a9f54 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.5.0_rc1.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-3.5.0_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/kde-base/kimagemapeditor/kimagemapeditor-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kimagemapeditor/kimagemapeditor-3.5_beta1.ebuild b/kde-base/kimagemapeditor/kimagemapeditor-3.5_beta1.ebuild
index da63ea292748..ddbfe4a3ddc6 100644
--- a/kde-base/kimagemapeditor/kimagemapeditor-3.5_beta1.ebuild
+++ b/kde-base/kimagemapeditor/kimagemapeditor-3.5_beta1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.5_beta1.ebuild,v 1.1 2005/09/22 19:10:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kimagemapeditor/kimagemapeditor-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdewebdev
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_beta2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: An HTML imagemap editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kimagemapeditor/metadata.xml b/kde-base/kimagemapeditor/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kimagemapeditor/metadata.xml
+++ b/kde-base/kimagemapeditor/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kitchensync/ChangeLog b/kde-base/kitchensync/ChangeLog
index 0968f9563674..3b3b52f82b21 100644
--- a/kde-base/kitchensync/ChangeLog
+++ b/kde-base/kitchensync/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for kde-base/kitchensync
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/ChangeLog,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kitchensync-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kitchensync-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kitchensync-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kitchensync-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kitchensync-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kitchensync-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kitchensync-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kitchensync-3.5_beta1.ebuild, kitchensync-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kitchensync-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kitchensync-3.5.0_beta2.ebuild:
+  New version.
+
+*kitchensync-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kitchensync-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kitchensync-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kitchensync-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kitchensync-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kitchensync-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kitchensync-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kitchensync-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kitchensync-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kitchensync-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kitchensync-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kitchensync-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kitchensync-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kitchensync-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kitchensync-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  23 May 2005; Carsten Lohrke <carlo@gentoo.org> kitchensync-3.4.0.ebuild:
+  dependency correction, #93216
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kitchensync-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kitchensync-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kitchensync-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kitchensync-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kitchensync-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kitchensync-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kitchensync-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kitchensync-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kitchensync-3.4.0_beta1-r1 (21 Jan 2005)
+
+  21 Jan 2005; Dan Armak <danarmak@gentoo.org>
+  +kitchensync-3.4.0_beta1-r1.ebuild:
+  This new revision includes the kontact multisynk plugin. It wasn't
+  previously included anywhere else.
 
 *kitchensync-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kitchensync/Manifest b/kde-base/kitchensync/Manifest
index 59c0ffb9cd88..366d3c1334df 100644
--- a/kde-base/kitchensync/Manifest
+++ b/kde-base/kitchensync/Manifest
@@ -1,4 +1,26 @@
-MD5 8673feadfc7601c6e6b3c84900ed1124 kitchensync-3.4.0_beta1.ebuild 532
-MD5 8673feadfc7601c6e6b3c84900ed1124 kitchensync-3.4.0_alpha1.ebuild 532
-MD5 892303ffe022b31a222f9efab549727b files/digest-kitchensync-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kitchensync-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8fb6c707eb9f5f86e17e707c403b963f ChangeLog 4046
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kitchensync-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kitchensync-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kitchensync-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kitchensync-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kitchensync-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kitchensync-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kitchensync-3.5_beta1 68
+MD5 f461d1f7ec28fd73d1dd2117055452ba kitchensync-3.4.1.ebuild 895
+MD5 38ed1d66047ed62b769b32569493ec3c kitchensync-3.4.2.ebuild 908
+MD5 331a6f1545a72533147b485101c4dbb3 kitchensync-3.4.3.ebuild 904
+MD5 7b515d9c82e243b31057d03dc50152f6 kitchensync-3.5.0.ebuild 825
+MD5 f1cd4f602b6f75fdf8429e6d53be2416 kitchensync-3.5.0_beta2.ebuild 830
+MD5 7f397508a40235d271dbaa6bdb8865ce kitchensync-3.5.0_rc1.ebuild 829
+MD5 7f6d5ed3612dd3519401f2c9703848db kitchensync-3.5_beta1.ebuild 887
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvS0ntT9W3vfTuoRAqUaAKCBSl9XI5rlNKQgJd+jC9H/QU9kdgCgi5aV
+dq4jwy4AcX0wIZ6PPbWvKxo=
+=A8OT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kitchensync/files/digest-kitchensync-3.4.1 b/kde-base/kitchensync/files/digest-kitchensync-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kitchensync/files/digest-kitchensync-3.4.1
+++ b/kde-base/kitchensync/files/digest-kitchensync-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kitchensync/files/digest-kitchensync-3.4.2 b/kde-base/kitchensync/files/digest-kitchensync-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kitchensync/files/digest-kitchensync-3.4.2
+++ b/kde-base/kitchensync/files/digest-kitchensync-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kitchensync/kitchensync-3.4.1.ebuild b/kde-base/kitchensync/kitchensync-3.4.1.ebuild
index c6c09d90cbf1..b8a6081d38c4 100644
--- a/kde-base/kitchensync/kitchensync-3.4.1.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.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/kde-base/kitchensync/kitchensync-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Synchronize Data with KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV"
diff --git a/kde-base/kitchensync/kitchensync-3.4.2.ebuild b/kde-base/kitchensync/kitchensync-3.4.2.ebuild
index d2dab0da6e06..5237c92d7843 100644
--- a/kde-base/kitchensync/kitchensync-3.4.2.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.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/kde-base/kitchensync/kitchensync-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Synchronize Data with KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV"
diff --git a/kde-base/kitchensync/kitchensync-3.4.3.ebuild b/kde-base/kitchensync/kitchensync-3.4.3.ebuild
index 4bf0f558e09c..5c06f4261b9a 100644
--- a/kde-base/kitchensync/kitchensync-3.4.3.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.4.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/kde-base/kitchensync/kitchensync-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Synchronize Data with KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV"
diff --git a/kde-base/kitchensync/kitchensync-3.5.0.ebuild b/kde-base/kitchensync/kitchensync-3.5.0.ebuild
index 88182fcc98b3..debef7133dc0 100644
--- a/kde-base/kitchensync/kitchensync-3.5.0.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.5.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/kde-base/kitchensync/kitchensync-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kitchensync/kitchensync-3.5.0_beta2.ebuild b/kde-base/kitchensync/kitchensync-3.5.0_beta2.ebuild
index 2b08fa30abdc..353076aec8b9 100644
--- a/kde-base/kitchensync/kitchensync-3.5.0_beta2.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.5.0_beta2.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/kde-base/kitchensync/kitchensync-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Synchronize Data with KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kontact)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)"
diff --git a/kde-base/kitchensync/kitchensync-3.5.0_rc1.ebuild b/kde-base/kitchensync/kitchensync-3.5.0_rc1.ebuild
index dd1e2c937e81..9495fa58c098 100644
--- a/kde-base/kitchensync/kitchensync-3.5.0_rc1.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.5.0_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/kde-base/kitchensync/kitchensync-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kitchensync/kitchensync-3.5_beta1.ebuild b/kde-base/kitchensync/kitchensync-3.5_beta1.ebuild
index 238aeba2d337..eae437c81c8e 100644
--- a/kde-base/kitchensync/kitchensync-3.5_beta1.ebuild
+++ b/kde-base/kitchensync/kitchensync-3.5_beta1.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/kde-base/kitchensync/kitchensync-3.5_beta1.ebuild,v 1.1 2005/09/22 19:11:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kitchensync/kitchensync-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Synchronize Data with KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV
 	~kde-base/libkcal-$PV"
diff --git a/kde-base/kitchensync/metadata.xml b/kde-base/kitchensync/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kitchensync/metadata.xml
+++ b/kde-base/kitchensync/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kiten/ChangeLog b/kde-base/kiten/ChangeLog
index 348e43762a1f..d888da1c30e8 100644
--- a/kde-base/kiten/ChangeLog
+++ b/kde-base/kiten/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for kde-base/kiten
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/ChangeLog,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kiten-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kiten-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kiten-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kiten-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kiten-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kiten-3.5_beta1.ebuild,
+  kiten-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kiten-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kiten-3.5.0_beta2.ebuild:
+  New version.
+
+*kiten-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kiten-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kiten-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kiten-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kiten-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kiten-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kiten-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kiten-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kiten-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kiten-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kiten-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kiten-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kiten-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kiten-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kiten-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kiten-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kiten-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kiten-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kiten-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kiten-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kiten-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kiten-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kiten-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kiten-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kiten/Manifest b/kde-base/kiten/Manifest
index e3ee789c7947..4668b0bbb91d 100644
--- a/kde-base/kiten/Manifest
+++ b/kde-base/kiten/Manifest
@@ -1,4 +1,24 @@
-MD5 2d1de07b8a84a06b5f6862588f6fcd8c kiten-3.4.0_beta1.ebuild 282
-MD5 2d1de07b8a84a06b5f6862588f6fcd8c kiten-3.4.0_alpha1.ebuild 282
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kiten-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kiten-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cfbb093dd0c3b2eb89e1e52194c6aa9b ChangeLog 3324
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kiten-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kiten-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kiten-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kiten-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kiten-3.5.0_beta2 212
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kiten-3.5_beta1 68
+MD5 24d3ad8da6e438458750749767999a1e kiten-3.4.1.ebuild 397
+MD5 c06ab9115644ddb37083d6e256205efc kiten-3.4.2.ebuild 410
+MD5 d7aed8ee2783c8ad82f239a4f9f805db kiten-3.4.3.ebuild 406
+MD5 93207c6621868e8202e06bb05382be50 kiten-3.5.0.ebuild 386
+MD5 6ca1378ae98d8ba4d9aae3ae226e0df8 kiten-3.5.0_beta2.ebuild 398
+MD5 9e8e1a17f4b67755c2fdf5f3bb7c32d4 kiten-3.5_beta1.ebuild 389
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlKxntT9W3vfTuoRAkcPAJ0feNrd/ySIY65LDJlJoXTsHx1hDwCgsk09
+tXx7aqKvulf0Te8cS5FvQTw=
+=4xkO
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kiten/files/digest-kiten-3.4.1 b/kde-base/kiten/files/digest-kiten-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kiten/files/digest-kiten-3.4.1
+++ b/kde-base/kiten/files/digest-kiten-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kiten/files/digest-kiten-3.4.2 b/kde-base/kiten/files/digest-kiten-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kiten/files/digest-kiten-3.4.2
+++ b/kde-base/kiten/files/digest-kiten-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kiten/kiten-3.4.1.ebuild b/kde-base/kiten/kiten-3.4.1.ebuild
index a9531a8c7b09..1b763b314946 100644
--- a/kde-base/kiten/kiten-3.4.1.ebuild
+++ b/kde-base/kiten/kiten-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kiten/kiten-3.4.2.ebuild b/kde-base/kiten/kiten-3.4.2.ebuild
index 5945b613286a..ce9f1153fb4a 100644
--- a/kde-base/kiten/kiten-3.4.2.ebuild
+++ b/kde-base/kiten/kiten-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kiten/kiten-3.4.3.ebuild b/kde-base/kiten/kiten-3.4.3.ebuild
index 4c13afe342a8..d51724d6e1c2 100644
--- a/kde-base/kiten/kiten-3.4.3.ebuild
+++ b/kde-base/kiten/kiten-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kiten/kiten-3.5.0.ebuild b/kde-base/kiten/kiten-3.5.0.ebuild
index 50cf79a8208a..89e38e129cee 100644
--- a/kde-base/kiten/kiten-3.5.0.ebuild
+++ b/kde-base/kiten/kiten-3.5.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/kde-base/kiten/kiten-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kiten/kiten-3.5.0_beta2.ebuild b/kde-base/kiten/kiten-3.5.0_beta2.ebuild
index b225f0ce245c..342b5942693c 100644
--- a/kde-base/kiten/kiten-3.5.0_beta2.ebuild
+++ b/kde-base/kiten/kiten-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kiten/kiten-3.5_beta1.ebuild b/kde-base/kiten/kiten-3.5_beta1.ebuild
index 96bb40454753..96317ae6fe6d 100644
--- a/kde-base/kiten/kiten-3.5_beta1.ebuild
+++ b/kde-base/kiten/kiten-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.5_beta1.ebuild,v 1.1 2005/09/22 19:12:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kiten/kiten-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Japanese dictionary and reference"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kiten/metadata.xml b/kde-base/kiten/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kiten/metadata.xml
+++ b/kde-base/kiten/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kjots/ChangeLog b/kde-base/kjots/ChangeLog
index 6e87b1883cd7..8365954b0f26 100644
--- a/kde-base/kjots/ChangeLog
+++ b/kde-base/kjots/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for kde-base/kjots
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/ChangeLog,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kjots-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kjots-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kjots-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kjots-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kjots-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kjots-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kjots-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kjots-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kjots-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kjots-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kjots-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kjots-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kjots-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kjots-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kjots-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kjots-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kjots-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kjots-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kjots-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kjots-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kjots-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kjots-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kjots-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kjots-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kjots-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kjots-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kjots-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kjots-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kjots/Manifest b/kde-base/kjots/Manifest
index 9e1b43083f18..28b48d32d1e2 100644
--- a/kde-base/kjots/Manifest
+++ b/kde-base/kjots/Manifest
@@ -1,4 +1,20 @@
-MD5 e5e54dd62c2f4e2aac63f9cc6e906eb8 kjots-3.4.0_beta1.ebuild 274
-MD5 e5e54dd62c2f4e2aac63f9cc6e906eb8 kjots-3.4.0_alpha1.ebuild 274
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kjots-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kjots-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d46a1dbb601133363c4ab2f03ac9704b ChangeLog 3060
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kjots-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-kjots-3.4.2 288
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kjots-3.5.0 68
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kjots-3.5_beta1 69
+MD5 4bfd924cd2599083a4bb8e3958fc6d49 kjots-3.4.1.ebuild 389
+MD5 4439c1c719f439c241d331053696c40c kjots-3.4.2.ebuild 401
+MD5 e734327b8075a835fb987371a529c3ca kjots-3.5.0.ebuild 378
+MD5 f348e0ed9954ac56fe48dee7e8e42035 kjots-3.5_beta1.ebuild 388
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvyOntT9W3vfTuoRApszAJ0T7RnCjiZDcXu/V3lUv1v0OhcTpwCgpOpg
+ayGUbIZLC/mOw6cw1lYp46Y=
+=6awY
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kjots/files/digest-kjots-3.4.1 b/kde-base/kjots/files/digest-kjots-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kjots/files/digest-kjots-3.4.1
+++ b/kde-base/kjots/files/digest-kjots-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kjots/files/digest-kjots-3.4.2 b/kde-base/kjots/files/digest-kjots-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/kjots/files/digest-kjots-3.4.2
+++ b/kde-base/kjots/files/digest-kjots-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/kjots/kjots-3.4.1.ebuild b/kde-base/kjots/kjots-3.4.1.ebuild
index 6a70cb0b22b3..064bc3710ad2 100644
--- a/kde-base/kjots/kjots-3.4.1.ebuild
+++ b/kde-base/kjots/kjots-3.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/kde-base/kjots/kjots-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kjots - KDE note taking utility"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kjots/kjots-3.4.2.ebuild b/kde-base/kjots/kjots-3.4.2.ebuild
index 91edc27c69aa..abf5a94a3dd7 100644
--- a/kde-base/kjots/kjots-3.4.2.ebuild
+++ b/kde-base/kjots/kjots-3.4.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/kde-base/kjots/kjots-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kjots - KDE note taking utility"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kjots/kjots-3.5.0.ebuild b/kde-base/kjots/kjots-3.5.0.ebuild
index bf5233704b36..a6e15844b2e8 100644
--- a/kde-base/kjots/kjots-3.5.0.ebuild
+++ b/kde-base/kjots/kjots-3.5.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/kde-base/kjots/kjots-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kjots/kjots-3.5_beta1.ebuild b/kde-base/kjots/kjots-3.5_beta1.ebuild
index 35be0c9a1a20..51a3547e0543 100644
--- a/kde-base/kjots/kjots-3.5_beta1.ebuild
+++ b/kde-base/kjots/kjots-3.5_beta1.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/kde-base/kjots/kjots-3.5_beta1.ebuild,v 1.1 2005/09/22 19:13:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjots/kjots-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:26 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kjots - KDE note taking utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kjots/metadata.xml b/kde-base/kjots/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kjots/metadata.xml
+++ b/kde-base/kjots/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kjsembed/ChangeLog b/kde-base/kjsembed/ChangeLog
index cfdb231b78ab..5249f44292d9 100644
--- a/kde-base/kjsembed/ChangeLog
+++ b/kde-base/kjsembed/ChangeLog
@@ -1,6 +1,128 @@
 # ChangeLog for kde-base/kjsembed
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/ChangeLog,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/ChangeLog,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kjsembed-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kjsembed-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kjsembed-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kjsembed-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kjsembed-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kjsembed-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+  13 Oct 2005; Brent Baude <ranger@gentoo.org> kjsembed-3.4.1.ebuild:
+  Marking kjsembed-3.4.1 ppc64 stable
+
+*kjsembed-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.4.3.ebuild:
+  New version.
+
+  11 Oct 2005; Aron Griffis <agriffis@gentoo.org> kjsembed-3.4.2.ebuild:
+  Mark 3.4.2 ~ia64
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kjsembed-3.4.1.ebuild,
+  kjsembed-3.4.2.ebuild:
+  Mark 3.4.1 stable on alpha, mark 3.4.2 ~alpha
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kjsembed-3.4.1.ebuild:
+  Stable on ppc.
+
+*kjsembed-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> kjsembed-3.4.1.ebuild:
+  Stable on sparc
+
+  18 Jun 2005; Jose Luis Rivero <yoswink@gentoo.org> kjsembed-3.3.1.ebuild:
+  Keyworded ~alpha since is needed on #95128
+
+  14 Jun 2005; Jason Wever <weeve@gentoo.org> kjsembed-3.3.1.ebuild:
+  Stable on SPARC.
+
+  11 Jun 2005; Markus Rothe <corsair@gentoo.org> kjsembed-3.4.1.ebuild:
+  Added ~ppc64; bug #95128
+
+  29 May 2005; Marcus D. Hanwell <cryos@gentoo.org> kjsembed-3.3.1.ebuild:
+  Stable on amd64.
+
+*kjsembed-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  22 May 2005; Simon Stelling <blubb@gentoo.org> kjsembed-3.4.0.ebuild:
+  added ~amd64 keyword
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kjsembed-3.4.0.ebuild:
+  Added ~sparc keyword due to it being dropped in improper version bumping.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kjsembed-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kjsembed-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  06 Mar 2005; Jason Wever <weeve@gentoo.org> kjsembed-3.3.1.ebuild,
+  kjsembed-3.4.0_rc1.ebuild:
+  Added ~sparc keywords wrt bug #84197.
+
+  06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kjsembed-3.3.1.ebuild:
+  Marked ~amd64, bug 84197.
+
+*kjsembed-3.4.0_rc1 (06 Mar 2005)
+
+  06 Mar 2005; Simone Gotti <motaboy@gentoo.org>
+  kjsembed-3.4.0_beta2.ebuild, kjsembed-3.4.0_rc1.ebuild:
+  Change deprange to deprange-dual for kwin as it's provided by an external
+  module (kdebase). Fixes bug #84218.
+
+  06 Mar 2005; Joseph Jezak <josejx@gentoo.org> kjsembed-3.3.1.ebuild:
+  Marked ~ppc for bug #84197.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> kjsembed-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*kjsembed-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kjsembed-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  11 Dec 2004; Dan Armak <danarmak@gentoo.org> kjsembed-3.3.1.ebuild:
+  Fixed typo: should be KM_MAKEFILESREV - this fixes the generated SRC_URI,
+  and closes #74110.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  kjsembed-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *kjsembed-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/kjsembed/Manifest b/kde-base/kjsembed/Manifest
index c4375c717b25..ae4c671bafdd 100644
--- a/kde-base/kjsembed/Manifest
+++ b/kde-base/kjsembed/Manifest
@@ -1,3 +1,27 @@
-MD5 781cf8039df23f9105bff52d6f4b8fa4 kjsembed-3.3.1.ebuild 337
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 550e6804451479e5eb4fd03d03e7de78 files/digest-kjsembed-3.3.1 149
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e3ff798ee9717415d381b7ed7bfdb0f8 ChangeLog 4818
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-kjsembed-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-kjsembed-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-kjsembed-3.4.2 300
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-kjsembed-3.4.3 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-kjsembed-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-kjsembed-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-kjsembed-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 2ab598379ff4129787909fdbc4339d43 kjsembed-3.3.1.ebuild 680
+MD5 d7596490e67b0da2db1d138218dab8ba kjsembed-3.4.1.ebuild 629
+MD5 90104d9c951529e4ec9b23197274f3d5 kjsembed-3.4.2.ebuild 643
+MD5 b07c849f9ebce575d977f9b7f087d143 kjsembed-3.4.3.ebuild 638
+MD5 3b419a548d087754231a8e0f24f5a29a kjsembed-3.5.0.ebuild 611
+MD5 dd10a1d3b8037807d5b5bc016dd83cd4 kjsembed-3.5.0_beta2.ebuild 616
+MD5 0587c739276cd3859aafbdcbde68b3f3 kjsembed-3.5.0_rc1.ebuild 615
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyRxntT9W3vfTuoRAsvvAKCndggDogvgWjTnocCVH8I4n88AMACeP6fK
+FsUUueVEe4knFgZt21BIV5A=
+=RYwh
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kjsembed/files/digest-kjsembed-3.3.1 b/kde-base/kjsembed/files/digest-kjsembed-3.3.1
index 2abb9cd6b713..a16df2f0cf51 100644
--- a/kde-base/kjsembed/files/digest-kjsembed-3.3.1
+++ b/kde-base/kjsembed/files/digest-kjsembed-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 589895b1b7e323ad546e61cc944f27d8 kjsembed-3.3.1-0-makefiles.tar.bz2 45010
diff --git a/kde-base/kjsembed/files/digest-kjsembed-3.4.1 b/kde-base/kjsembed/files/digest-kjsembed-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/kjsembed/files/digest-kjsembed-3.4.1
+++ b/kde-base/kjsembed/files/digest-kjsembed-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/kjsembed/files/digest-kjsembed-3.4.2 b/kde-base/kjsembed/files/digest-kjsembed-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/kjsembed/files/digest-kjsembed-3.4.2
+++ b/kde-base/kjsembed/files/digest-kjsembed-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/kjsembed/files/no-gtk-glib-check.diff b/kde-base/kjsembed/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/kjsembed/files/no-gtk-glib-check.diff
+++ b/kde-base/kjsembed/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/kjsembed/kjsembed-3.3.1.ebuild b/kde-base/kjsembed/kjsembed-3.3.1.ebuild
index 3c54dd68fdc1..7b3c5766281a 100644
--- a/kde-base/kjsembed/kjsembed-3.3.1.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.3.1.ebuild
@@ -1,15 +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/kde-base/kjsembed/kjsembed-3.3.1.ebuild,v 1.1 2004/11/06 17:23:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE javascript parser and embedder"
-KEYWORDS="~x86"
+HOMEPAGE="http://xmelegance.org/kjsembed/"
+
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 IUSE=""
-#DEPEND="~kde-base/kwin-$PV"
-DEPEND="~kde-base/kdebase-$PV"
+#DEPEND="$(deprange $PV $MAXKDEVER  kde-base/kwin)"
+DEPEND="$(deprange $PV $MAXKDEVER  kde-base/kdebase)"
+OLDDEPEND="~kde-base/kwin-$PV"
+
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
 # Probably missing some deps, too
diff --git a/kde-base/kjsembed/kjsembed-3.4.1.ebuild b/kde-base/kjsembed/kjsembed-3.4.1.ebuild
index b219175807db..290e62c752ca 100644
--- a/kde-base/kjsembed/kjsembed-3.4.1.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.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/kde-base/kjsembed/kjsembed-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,7 +11,7 @@ inherit kde-meta
 DESCRIPTION="KDE javascript parser and embedder"
 HOMEPAGE="http://xmelegance.org/kjsembed/"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)"
 OLDDEPEND="~kde-base/kwin-$PV"
diff --git a/kde-base/kjsembed/kjsembed-3.4.2.ebuild b/kde-base/kjsembed/kjsembed-3.4.2.ebuild
index ad4e83dba60f..f5efe6a95747 100644
--- a/kde-base/kjsembed/kjsembed-3.4.2.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.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/kde-base/kjsembed/kjsembed-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,7 +11,7 @@ inherit kde-meta
 DESCRIPTION="KDE javascript parser and embedder"
 HOMEPAGE="http://xmelegance.org/kjsembed/"
 
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)"
 OLDDEPEND="~kde-base/kwin-$PV"
diff --git a/kde-base/kjsembed/kjsembed-3.4.3.ebuild b/kde-base/kjsembed/kjsembed-3.4.3.ebuild
index 30486695922e..470367de7004 100644
--- a/kde-base/kjsembed/kjsembed-3.4.3.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.4.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/kde-base/kjsembed/kjsembed-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,7 +11,7 @@ inherit kde-meta
 DESCRIPTION="KDE javascript parser and embedder"
 HOMEPAGE="http://xmelegance.org/kjsembed/"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)"
 OLDDEPEND="~kde-base/kwin-$PV"
diff --git a/kde-base/kjsembed/kjsembed-3.5.0.ebuild b/kde-base/kjsembed/kjsembed-3.5.0.ebuild
index 3edb487e13b9..c727b09f8d1d 100644
--- a/kde-base/kjsembed/kjsembed-3.5.0.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.5.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/kde-base/kjsembed/kjsembed-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/kjsembed/kjsembed-3.5.0_beta2.ebuild b/kde-base/kjsembed/kjsembed-3.5.0_beta2.ebuild
index b43ad4188e2f..b20e12332c98 100644
--- a/kde-base/kjsembed/kjsembed-3.5.0_beta2.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.5.0_beta2.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/kde-base/kjsembed/kjsembed-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,7 +11,7 @@ inherit kde-meta
 DESCRIPTION="KDE javascript parser and embedder"
 HOMEPAGE="http://xmelegance.org/kjsembed/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/kwin)"
 OLDDEPEND="~kde-base/kwin-$PV"
diff --git a/kde-base/kjsembed/kjsembed-3.5.0_rc1.ebuild b/kde-base/kjsembed/kjsembed-3.5.0_rc1.ebuild
index bfec655e7d8d..02a59aa9537a 100644
--- a/kde-base/kjsembed/kjsembed-3.5.0_rc1.ebuild
+++ b/kde-base/kjsembed/kjsembed-3.5.0_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/kde-base/kjsembed/kjsembed-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjsembed/kjsembed-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:06 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/kjsembed/metadata.xml b/kde-base/kjsembed/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kjsembed/metadata.xml
+++ b/kde-base/kjsembed/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kjumpingcube/ChangeLog b/kde-base/kjumpingcube/ChangeLog
index 2ad100664e8e..80154f626c2a 100644
--- a/kde-base/kjumpingcube/ChangeLog
+++ b/kde-base/kjumpingcube/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/kjumpingcube
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kjumpingcube-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kjumpingcube-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kjumpingcube-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kjumpingcube-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kjumpingcube-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kjumpingcube-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kjumpingcube-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kjumpingcube-3.5_beta1.ebuild, kjumpingcube-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kjumpingcube-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kjumpingcube-3.5.0_beta2.ebuild:
+  New version.
+
+*kjumpingcube-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kjumpingcube-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kjumpingcube-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kjumpingcube-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kjumpingcube-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kjumpingcube-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kjumpingcube-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kjumpingcube-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kjumpingcube-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kjumpingcube-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kjumpingcube-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kjumpingcube-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kjumpingcube-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kjumpingcube-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kjumpingcube-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kjumpingcube-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kjumpingcube-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kjumpingcube-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kjumpingcube-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kjumpingcube-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kjumpingcube-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kjumpingcube-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kjumpingcube-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kjumpingcube-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kjumpingcube/Manifest b/kde-base/kjumpingcube/Manifest
index 2c00773248e0..614090369c9b 100644
--- a/kde-base/kjumpingcube/Manifest
+++ b/kde-base/kjumpingcube/Manifest
@@ -1,4 +1,26 @@
-MD5 245316307034de70c1de298d677bcd9a kjumpingcube-3.4.0_beta1.ebuild 430
-MD5 245316307034de70c1de298d677bcd9a kjumpingcube-3.4.0_alpha1.ebuild 430
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kjumpingcube-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kjumpingcube-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 69438da500c18d63710148a38206dcd7 ChangeLog 3741
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kjumpingcube-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kjumpingcube-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kjumpingcube-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kjumpingcube-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kjumpingcube-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kjumpingcube-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kjumpingcube-3.5_beta1 70
+MD5 73bbdcb6a9357fbcc65f6d010c1a7f6b kjumpingcube-3.4.1.ebuild 559
+MD5 ab746a29763e566c9cb829647cddb154 kjumpingcube-3.4.2.ebuild 572
+MD5 ca4054cd9e9214a25eb886242e04e136 kjumpingcube-3.4.3.ebuild 568
+MD5 74dcde9ad2f84ee1f26dc00713297b29 kjumpingcube-3.5.0.ebuild 511
+MD5 49a0609e0c8a8e9e2a98ccebcf2355f0 kjumpingcube-3.5.0_beta2.ebuild 516
+MD5 40cfa0f10d4f8c813fd582b7bd2b039a kjumpingcube-3.5.0_rc1.ebuild 515
+MD5 829f3a1b7f90ddd83862867722bb957d kjumpingcube-3.5_beta1.ebuild 551
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl4KntT9W3vfTuoRAiXNAJ4yjhNeZgfVQ9ezkl+BbFnN2e3yAgCdGtiI
+I89dwcF0GIyQIbJmqsKBm+8=
+=NEqA
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.1 b/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.1
+++ b/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.2 b/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.2
+++ b/kde-base/kjumpingcube/files/digest-kjumpingcube-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.4.1.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.4.1.ebuild
index 65b5e8426d47..57f4f07b60f5 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.4.1.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.4.2.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.4.2.ebuild
index 97fac4b7f6b3..e68e9c9e0f99 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.4.2.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.4.3.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.4.3.ebuild
index 1b15981ef46a..1836b436192e 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.4.3.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.5.0.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.5.0.ebuild
index 5df8b5869341..0cbb56747048 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.5.0.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.5.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/kde-base/kjumpingcube/kjumpingcube-3.5.0.ebuild,v 1.1 2005/11/22 22:14:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.5.0_beta2.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.5.0_beta2.ebuild
index 100d5d95879b..cf2a045b1310 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.5.0_beta2.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.5.0_rc1.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.5.0_rc1.ebuild
index a4d18221f957..ab3286e59c75 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.5.0_rc1.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.5.0_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/kde-base/kjumpingcube/kjumpingcube-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kjumpingcube/kjumpingcube-3.5_beta1.ebuild b/kde-base/kjumpingcube/kjumpingcube-3.5_beta1.ebuild
index 0d0a4610a14a..e33e1a9d11cf 100644
--- a/kde-base/kjumpingcube/kjumpingcube-3.5_beta1.ebuild
+++ b/kde-base/kjumpingcube/kjumpingcube-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.5_beta1.ebuild,v 1.1 2005/09/22 19:14:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kjumpingcube/kjumpingcube-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Tactical one or two player game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kjumpingcube/metadata.xml b/kde-base/kjumpingcube/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kjumpingcube/metadata.xml
+++ b/kde-base/kjumpingcube/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index a0edcd69cb1e..b187bf54aee9 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  klaptopdaemon-3.4.3-r1.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  klaptopdaemon-3.4.3-r1.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  klaptopdaemon-3.4.3-r1.ebuild:
+  Stable on sparc wrt #112842
+
+*klaptopdaemon-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klaptopdaemon-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klaptopdaemon-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klaptopdaemon-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  29 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  klaptopdaemon-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  klaptopdaemon-3.5_beta1.ebuild, klaptopdaemon-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klaptopdaemon-3.4.3-r1 (19 Oct 2005)
+
+  19 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> +klaptopdaemon-3.4.3-r1.ebuild:
+  Add patch to fix error messages (#109421).
+
+*klaptopdaemon-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klaptopdaemon-3.5.0_beta2.ebuild:
+  New version.
+
+*klaptopdaemon-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +klaptopdaemon-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klaptopdaemon-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klaptopdaemon-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klaptopdaemon-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klaptopdaemon-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klaptopdaemon-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  klaptopdaemon-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klaptopdaemon-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klaptopdaemon-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klaptopdaemon-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> klaptopdaemon-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klaptopdaemon-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*klaptopdaemon-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klaptopdaemon-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> klaptopdaemon-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> klaptopdaemon-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klaptopdaemon-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klaptopdaemon-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klaptopdaemon-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  klaptopdaemon-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klaptopdaemon-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +klaptopdaemon-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klaptopdaemon-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klaptopdaemon/Manifest b/kde-base/klaptopdaemon/Manifest
index 43db5095e4e9..e55a4656922e 100644
--- a/kde-base/klaptopdaemon/Manifest
+++ b/kde-base/klaptopdaemon/Manifest
@@ -1,4 +1,29 @@
-MD5 9fa6257feb86dc831f93637ba35336b2 klaptopdaemon-3.4.0_beta1.ebuild 308
-MD5 9fa6257feb86dc831f93637ba35336b2 klaptopdaemon-3.4.0_alpha1.ebuild 308
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-klaptopdaemon-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-klaptopdaemon-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d42caedf82a01096ce1c5bdfac899336 ChangeLog 4084
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-klaptopdaemon-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-klaptopdaemon-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-klaptopdaemon-3.4.3 68
+MD5 7693585dde083d1c2cc205db10692163 files/digest-klaptopdaemon-3.4.3-r1 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-klaptopdaemon-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-klaptopdaemon-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-klaptopdaemon-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-klaptopdaemon-3.5_beta1 69
+MD5 0ebe4d00a1fd5845db2172027d12f531 files/kdeutils-3.4.3-klaptopdaemon.patch 1895
+MD5 0320d9f781bb671bfdff8e5f0109af90 klaptopdaemon-3.4.1.ebuild 441
+MD5 ea3bc9741dfa723bfb69fc5a2dcc55a1 klaptopdaemon-3.4.2.ebuild 454
+MD5 6dd731ac6a99d99d0ef41f58e8562fe0 klaptopdaemon-3.4.3-r1.ebuild 558
+MD5 ab6083b48166c84be09c79a163caa182 klaptopdaemon-3.4.3.ebuild 456
+MD5 39726627d97e87dffcbed8f21af30491 klaptopdaemon-3.5.0.ebuild 540
+MD5 598d6805f91ea02aead02b0eb0f6d1f2 klaptopdaemon-3.5.0_beta2.ebuild 543
+MD5 d432cc56c996ffd25049a82d9e42efd5 klaptopdaemon-3.5.0_rc1.ebuild 544
+MD5 b4b20bf857a3a869a5d476360a550291 klaptopdaemon-3.5_beta1.ebuild 433
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvzSntT9W3vfTuoRAmcKAKCOxX7BYjdTu26mmTJ1enGsaKZcdACaAzZN
+alA2GAvkLQaNBnGqAFc1/Mg=
+=3fkV
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.1 b/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.1
+++ b/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.2 b/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.2
+++ b/kde-base/klaptopdaemon/files/digest-klaptopdaemon-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.4.1.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.4.1.ebuild
index 98af290f7c7c..fbb42e989c51 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.4.1.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.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/kde-base/klaptopdaemon/klaptopdaemon-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.4.2.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.4.2.ebuild
index 52e345747e88..b5357167e898 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.4.2.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.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/kde-base/klaptopdaemon/klaptopdaemon-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.4.3-r1.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.4.3-r1.ebuild
index 70dc541f2abc..863e4bea88ad 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.4.3-r1.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.4.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/kde-base/klaptopdaemon/klaptopdaemon-3.4.3-r1.ebuild,v 1.1 2005/10/19 14:35:25 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 # Fix output of klaptopdaemon (kde bug 103437).
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.4.3.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.4.3.ebuild
index 3b6fa6f88c6e..45bfc788e96a 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.4.3.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.4.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/kde-base/klaptopdaemon/klaptopdaemon-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.0.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.0.ebuild
index eb41e892b417..de75c9bb69b8 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.0.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.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/kde-base/klaptopdaemon/klaptopdaemon-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_beta2.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_beta2.ebuild
index 987dba80a9bd..fcd9240e7fea 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_beta2.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_beta2.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/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,6 +8,8 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+# Fix output of klaptopdaemon (kde bug 103437).
+PATCHES="${FILESDIR}/kdeutils-3.4.3-klaptopdaemon.patch"
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_rc1.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_rc1.ebuild
index 8da4bfcda17d..649dc3bb9783 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_rc1.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_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/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/klaptopdaemon/klaptopdaemon-3.5_beta1.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5_beta1.ebuild
index a9ae1c40543f..24cf12a1f634 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5_beta1.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-3.5_beta1.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/kde-base/klaptopdaemon/klaptopdaemon-3.5_beta1.ebuild,v 1.1 2005/09/22 19:15:27 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:55 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="klaptopdaemon - KDE battery monitoring and management for laptops"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/klaptopdaemon/metadata.xml b/kde-base/klaptopdaemon/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klaptopdaemon/metadata.xml
+++ b/kde-base/klaptopdaemon/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klatin/ChangeLog b/kde-base/klatin/ChangeLog
index bc07db411c2b..5a77c6a3d304 100644
--- a/kde-base/klatin/ChangeLog
+++ b/kde-base/klatin/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/klatin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/ChangeLog,v 1.1 2005/01/15 02:24:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/ChangeLog,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> klatin-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> klatin-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> klatin-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*klatin-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klatin-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> klatin-3.5_beta1.ebuild,
+  klatin-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klatin-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.5.0_beta2.ebuild:
+  New version.
+
+*klatin-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klatin-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klatin-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klatin-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klatin-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klatin-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> klatin-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klatin-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klatin-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> klatin-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klatin-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*klatin-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> klatin-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> klatin-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klatin-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klatin-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klatin-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> klatin-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klatin-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +klatin-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klatin-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klatin/Manifest b/kde-base/klatin/Manifest
index 1f2cb92d582d..fe5cf9a651ef 100644
--- a/kde-base/klatin/Manifest
+++ b/kde-base/klatin/Manifest
@@ -1,4 +1,26 @@
-MD5 a1703bbd6f5a0f7c01137205310d5663 klatin-3.4.0_alpha1.ebuild 459
-MD5 a1703bbd6f5a0f7c01137205310d5663 klatin-3.4.0_beta1.ebuild 459
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-klatin-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-klatin-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a99d127245598320b1469aa07eb7992 ChangeLog 3503
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-klatin-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-klatin-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-klatin-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-klatin-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-klatin-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-klatin-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-klatin-3.5_beta1 68
+MD5 bba0c9dc6d023d114f7e220ba034bc14 klatin-3.4.1.ebuild 576
+MD5 83781ec0d64b7cb0d91207ecdbd6261b klatin-3.4.2.ebuild 589
+MD5 6f6a150bfba829da1a6bb7c0e028c42c klatin-3.4.3.ebuild 587
+MD5 fff1ce301d8419da00f40539461b031a klatin-3.5.0.ebuild 528
+MD5 ef9cafaf2db680972d69530667d0e027 klatin-3.5.0_beta2.ebuild 533
+MD5 ba8b0cc616e5f85b59780ea76b799ada klatin-3.5.0_rc1.ebuild 532
+MD5 a93a35f5660013b683ff17fc231264b4 klatin-3.5_beta1.ebuild 568
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlLsntT9W3vfTuoRAiP5AJ9GhUMLYnYZGLk1QgqyfxdQaz2yaACfS8fp
+T6MZGwfcc4HQE7Y0yoq3zzo=
+=Hdo4
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klatin/files/digest-klatin-3.4.1 b/kde-base/klatin/files/digest-klatin-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/klatin/files/digest-klatin-3.4.1
+++ b/kde-base/klatin/files/digest-klatin-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/klatin/files/digest-klatin-3.4.2 b/kde-base/klatin/files/digest-klatin-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/klatin/files/digest-klatin-3.4.2
+++ b/kde-base/klatin/files/digest-klatin-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/klatin/klatin-3.4.1.ebuild b/kde-base/klatin/klatin-3.4.1.ebuild
index 091db7f0c05e..ebdf66f6f4b5 100644
--- a/kde-base/klatin/klatin-3.4.1.ebuild
+++ b/kde-base/klatin/klatin-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLatin - a program to help revise Latin"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
diff --git a/kde-base/klatin/klatin-3.4.2.ebuild b/kde-base/klatin/klatin-3.4.2.ebuild
index adee89af0db6..700763b59e0f 100644
--- a/kde-base/klatin/klatin-3.4.2.ebuild
+++ b/kde-base/klatin/klatin-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLatin - a program to help revise Latin"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
diff --git a/kde-base/klatin/klatin-3.4.3.ebuild b/kde-base/klatin/klatin-3.4.3.ebuild
index 31b78bced1d8..dac00035e4fb 100644
--- a/kde-base/klatin/klatin-3.4.3.ebuild
+++ b/kde-base/klatin/klatin-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLatin - a program to help revise Latin"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
diff --git a/kde-base/klatin/klatin-3.5.0.ebuild b/kde-base/klatin/klatin-3.5.0.ebuild
index a9927eae2591..761987c4dfa8 100644
--- a/kde-base/klatin/klatin-3.5.0.ebuild
+++ b/kde-base/klatin/klatin-3.5.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/kde-base/klatin/klatin-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klatin/klatin-3.5.0_beta2.ebuild b/kde-base/klatin/klatin-3.5.0_beta2.ebuild
index f6fcfd30ad3a..6173b106ae5c 100644
--- a/kde-base/klatin/klatin-3.5.0_beta2.ebuild
+++ b/kde-base/klatin/klatin-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLatin - a program to help revise Latin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/klatin/klatin-3.5.0_rc1.ebuild b/kde-base/klatin/klatin-3.5.0_rc1.ebuild
index 57f6f2256993..dc476ffdb947 100644
--- a/kde-base/klatin/klatin-3.5.0_rc1.ebuild
+++ b/kde-base/klatin/klatin-3.5.0_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/kde-base/klatin/klatin-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klatin/klatin-3.5_beta1.ebuild b/kde-base/klatin/klatin-3.5_beta1.ebuild
index 7741fb82a71e..0864e9b72ccd 100644
--- a/kde-base/klatin/klatin-3.5_beta1.ebuild
+++ b/kde-base/klatin/klatin-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.5_beta1.ebuild,v 1.1 2005/09/22 19:16:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klatin/klatin-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLatin - a program to help revise Latin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdeedu-3.3.1"
 DEPEND="
diff --git a/kde-base/klatin/metadata.xml b/kde-base/klatin/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klatin/metadata.xml
+++ b/kde-base/klatin/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klettres/ChangeLog b/kde-base/klettres/ChangeLog
index f6e8adcfe626..375d96fe1315 100644
--- a/kde-base/klettres/ChangeLog
+++ b/kde-base/klettres/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for kde-base/klettres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/ChangeLog,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> klettres-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> klettres-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> klettres-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*klettres-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klettres-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klettres-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klettres-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> klettres-3.5_beta1.ebuild,
+  klettres-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klettres-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klettres-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klettres-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klettres-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klettres-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klettres-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klettres-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> klettres-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klettres-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klettres-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klettres-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> klettres-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klettres-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*klettres-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klettres-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> klettres-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> klettres-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klettres-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klettres-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klettres-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> klettres-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klettres-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +klettres-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klettres-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klettres/Manifest b/kde-base/klettres/Manifest
index 3cebdc6dc7d8..31accc700979 100644
--- a/kde-base/klettres/Manifest
+++ b/kde-base/klettres/Manifest
@@ -1,4 +1,24 @@
-MD5 1d3afee1032483da9b5a410a4bc9eed9 klettres-3.4.0_alpha1.ebuild 305
-MD5 1d3afee1032483da9b5a410a4bc9eed9 klettres-3.4.0_beta1.ebuild 305
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-klettres-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-klettres-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9624ffd8eaa739b84cac55643a421d3c ChangeLog 3461
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-klettres-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-klettres-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-klettres-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-klettres-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-klettres-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-klettres-3.5_beta1 68
+MD5 2baa58afc1e4497ec77d3ca593a03ee0 klettres-3.4.1.ebuild 426
+MD5 3ca6777c180e85135c7662a92258f194 klettres-3.4.2.ebuild 437
+MD5 f9012117331b358dae6ea56d30b6dacd klettres-3.5.0.ebuild 415
+MD5 5a996c69724748bfe37b714e87ed7338 klettres-3.5.0_beta2.ebuild 420
+MD5 887e7f119479a6776c68527d6c1733c9 klettres-3.5.0_rc1.ebuild 419
+MD5 879c790b66be6326261651fc5d569eba klettres-3.5_beta1.ebuild 418
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlMsntT9W3vfTuoRAk33AJ99wtwRV2NLGZKkh139qMrE3GpJGwCgquIR
+CynZNo9GjIb44ZhP206yGIE=
+=WeXr
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klettres/files/digest-klettres-3.4.1 b/kde-base/klettres/files/digest-klettres-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/klettres/files/digest-klettres-3.4.1
+++ b/kde-base/klettres/files/digest-klettres-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/klettres/files/digest-klettres-3.4.2 b/kde-base/klettres/files/digest-klettres-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/klettres/files/digest-klettres-3.4.2
+++ b/kde-base/klettres/files/digest-klettres-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/klettres/klettres-3.4.1.ebuild b/kde-base/klettres/klettres-3.4.1.ebuild
index d482ccb96bc1..291871e12890 100644
--- a/kde-base/klettres/klettres-3.4.1.ebuild
+++ b/kde-base/klettres/klettres-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klettres/klettres-3.4.2.ebuild b/kde-base/klettres/klettres-3.4.2.ebuild
index 3fd03d497de7..265cea5c3b9e 100644
--- a/kde-base/klettres/klettres-3.4.2.ebuild
+++ b/kde-base/klettres/klettres-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klettres/klettres-3.5.0.ebuild b/kde-base/klettres/klettres-3.5.0.ebuild
index 7ad516565069..5405f8a0b2eb 100644
--- a/kde-base/klettres/klettres-3.5.0.ebuild
+++ b/kde-base/klettres/klettres-3.5.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/kde-base/klettres/klettres-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klettres/klettres-3.5.0_beta2.ebuild b/kde-base/klettres/klettres-3.5.0_beta2.ebuild
index de8d694fbf0e..09b772a70609 100644
--- a/kde-base/klettres/klettres-3.5.0_beta2.ebuild
+++ b/kde-base/klettres/klettres-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klettres/klettres-3.5.0_rc1.ebuild b/kde-base/klettres/klettres-3.5.0_rc1.ebuild
index 2af9480bda47..95e946f98317 100644
--- a/kde-base/klettres/klettres-3.5.0_rc1.ebuild
+++ b/kde-base/klettres/klettres-3.5.0_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/kde-base/klettres/klettres-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klettres/klettres-3.5_beta1.ebuild b/kde-base/klettres/klettres-3.5_beta1.ebuild
index bc6457191aa5..9bae4a6f3af4 100644
--- a/kde-base/klettres/klettres-3.5_beta1.ebuild
+++ b/kde-base/klettres/klettres-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.5_beta1.ebuild,v 1.1 2005/09/22 19:17:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klettres/klettres-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KLettres helps a very young child or an adult learning "
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klettres/metadata.xml b/kde-base/klettres/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klettres/metadata.xml
+++ b/kde-base/klettres/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klickety/ChangeLog b/kde-base/klickety/ChangeLog
index 4cd5d1d7fca3..c1760d02ed43 100644
--- a/kde-base/klickety/ChangeLog
+++ b/kde-base/klickety/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/klickety
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/ChangeLog,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> klickety-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> klickety-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> klickety-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*klickety-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klickety-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> klickety-3.5_beta1.ebuild,
+  klickety-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klickety-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.5.0_beta2.ebuild:
+  New version.
+
+*klickety-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klickety-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klickety-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klickety-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klickety-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klickety-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> klickety-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klickety-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klickety-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> klickety-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klickety-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*klickety-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> klickety-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> klickety-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klickety-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klickety-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klickety-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> klickety-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klickety-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +klickety-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klickety-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klickety/Manifest b/kde-base/klickety/Manifest
index 5a02f146b34b..290bd1b9ae6e 100644
--- a/kde-base/klickety/Manifest
+++ b/kde-base/klickety/Manifest
@@ -1,4 +1,26 @@
-MD5 099fd5b1991589f2d81adbdc07b80603 klickety-3.4.0_beta1.ebuild 547
-MD5 099fd5b1991589f2d81adbdc07b80603 klickety-3.4.0_alpha1.ebuild 547
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-klickety-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-klickety-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 701ecd70f443738ed67f3174526b45ee ChangeLog 3579
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-klickety-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-klickety-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-klickety-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-klickety-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-klickety-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-klickety-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-klickety-3.5_beta1 70
+MD5 d52a11b8dd15b07e71dcc44f59d01f8a klickety-3.4.1.ebuild 668
+MD5 5a279a42c6b8fa3cd751fc7d5601137e klickety-3.4.2.ebuild 681
+MD5 69e6e037eff5f3b7329894069d7f2124 klickety-3.4.3.ebuild 677
+MD5 2be176d7d46a68822ad7e471d8d33b78 klickety-3.5.0.ebuild 595
+MD5 b951948ef9ff35c21d8899244528b157 klickety-3.5.0_beta2.ebuild 600
+MD5 93a8c81d55a252bb18c75b6440773a51 klickety-3.5.0_rc1.ebuild 599
+MD5 1ef13f9e431e031b7f24d725873b2857 klickety-3.5_beta1.ebuild 660
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl5IntT9W3vfTuoRArhPAJsGGcVNYt8c2KGBoYfemD2BTlNUgACgkDF1
+ifQOTN5bttsJeXdZjcEMbQ8=
+=JlHT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klickety/files/digest-klickety-3.4.1 b/kde-base/klickety/files/digest-klickety-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/klickety/files/digest-klickety-3.4.1
+++ b/kde-base/klickety/files/digest-klickety-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/klickety/files/digest-klickety-3.4.2 b/kde-base/klickety/files/digest-klickety-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/klickety/files/digest-klickety-3.4.2
+++ b/kde-base/klickety/files/digest-klickety-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/klickety/klickety-3.4.1.ebuild b/kde-base/klickety/klickety-3.4.1.ebuild
index 883142db8417..b9fe8b1ecc44 100644
--- a/kde-base/klickety/klickety-3.4.1.ebuild
+++ b/kde-base/klickety/klickety-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Klickety is an adaptation of the "clickomania" game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/klickety/klickety-3.4.2.ebuild b/kde-base/klickety/klickety-3.4.2.ebuild
index 1bffa8c861b4..7f6b27d7fecd 100644
--- a/kde-base/klickety/klickety-3.4.2.ebuild
+++ b/kde-base/klickety/klickety-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Klickety is an adaptation of the "clickomania" game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/klickety/klickety-3.4.3.ebuild b/kde-base/klickety/klickety-3.4.3.ebuild
index 056affdb3259..02dc423c103c 100644
--- a/kde-base/klickety/klickety-3.4.3.ebuild
+++ b/kde-base/klickety/klickety-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Klickety is an adaptation of the "clickomania" game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/klickety/klickety-3.5.0.ebuild b/kde-base/klickety/klickety-3.5.0.ebuild
index ed64c3e36133..9415dc00c507 100644
--- a/kde-base/klickety/klickety-3.5.0.ebuild
+++ b/kde-base/klickety/klickety-3.5.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/kde-base/klickety/klickety-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klickety/klickety-3.5.0_beta2.ebuild b/kde-base/klickety/klickety-3.5.0_beta2.ebuild
index 1ba3d5c0e3ec..eef0cfbce840 100644
--- a/kde-base/klickety/klickety-3.5.0_beta2.ebuild
+++ b/kde-base/klickety/klickety-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Klickety is an adaptation of the "clickomania" game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/klickety/klickety-3.5.0_rc1.ebuild b/kde-base/klickety/klickety-3.5.0_rc1.ebuild
index 4409d15c7e52..b924b3a161a8 100644
--- a/kde-base/klickety/klickety-3.5.0_rc1.ebuild
+++ b/kde-base/klickety/klickety-3.5.0_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/kde-base/klickety/klickety-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klickety/klickety-3.5_beta1.ebuild b/kde-base/klickety/klickety-3.5_beta1.ebuild
index 193727fd74e3..cd92f4435429 100644
--- a/kde-base/klickety/klickety-3.5_beta1.ebuild
+++ b/kde-base/klickety/klickety-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.5_beta1.ebuild,v 1.1 2005/09/22 19:18:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klickety/klickety-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Klickety is an adaptation of the "clickomania" game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)
 $(deprange $PV $MAXKDEVER kde-base/libksirtet)"
diff --git a/kde-base/klickety/metadata.xml b/kde-base/klickety/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klickety/metadata.xml
+++ b/kde-base/klickety/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klines/ChangeLog b/kde-base/klines/ChangeLog
index 7d019ac99e15..c0c6c7085d60 100644
--- a/kde-base/klines/ChangeLog
+++ b/kde-base/klines/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/klines
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/ChangeLog,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> klines-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> klines-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> klines-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*klines-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klines-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klines-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klines-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> klines-3.5_beta1.ebuild,
+  klines-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klines-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klines-3.5.0_beta2.ebuild:
+  New version.
+
+*klines-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +klines-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klines-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klines-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klines-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klines-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klines-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> klines-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klines-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klines-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klines-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> klines-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klines-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*klines-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klines-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> klines-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> klines-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klines-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klines-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klines-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> klines-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klines-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +klines-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klines-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klines/Manifest b/kde-base/klines/Manifest
index 78bbeab14608..2eec67bcd64d 100644
--- a/kde-base/klines/Manifest
+++ b/kde-base/klines/Manifest
@@ -1,4 +1,26 @@
-MD5 287519bbee50090f9810e46675cebff2 klines-3.4.0_beta1.ebuild 465
-MD5 287519bbee50090f9810e46675cebff2 klines-3.4.0_alpha1.ebuild 465
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-klines-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-klines-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 827ab41e2d4d74967392761d7c29b263 ChangeLog 3503
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-klines-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-klines-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-klines-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-klines-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-klines-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-klines-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-klines-3.5_beta1 70
+MD5 f8a30ff2b23475765116f02d38ad5894 klines-3.4.1.ebuild 582
+MD5 ecae7980e5ea1cca3bd591d610727de2 klines-3.4.2.ebuild 595
+MD5 6854018337ca3ac6e38f3156edbe7dd7 klines-3.4.3.ebuild 591
+MD5 1d9e4a53d07f0f0e4dd51e9a62cf195b klines-3.5.0.ebuild 534
+MD5 1858cea9cf4df5ea7a26b57bdaeed506 klines-3.5.0_beta2.ebuild 539
+MD5 d1549f387f674d2599ca439ceebf21f3 klines-3.5.0_rc1.ebuild 538
+MD5 f851d4215cf9735c3d92773a1bc382a5 klines-3.5_beta1.ebuild 574
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl6UntT9W3vfTuoRAn5wAKCxHlxjVjPpduCmU/+zocXwmsnt1ACfaAG9
+rdXaxdfV6pzuQMRCS6mcjVM=
+=wdCp
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klines/files/digest-klines-3.4.1 b/kde-base/klines/files/digest-klines-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/klines/files/digest-klines-3.4.1
+++ b/kde-base/klines/files/digest-klines-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/klines/files/digest-klines-3.4.2 b/kde-base/klines/files/digest-klines-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/klines/files/digest-klines-3.4.2
+++ b/kde-base/klines/files/digest-klines-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/klines/klines-3.4.1.ebuild b/kde-base/klines/klines-3.4.1.ebuild
index fd1709c04cb3..bf466c9d399a 100644
--- a/kde-base/klines/klines-3.4.1.ebuild
+++ b/kde-base/klines/klines-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/klines/klines-3.4.2.ebuild b/kde-base/klines/klines-3.4.2.ebuild
index 46d3d74d3bad..bf1b6ea5730d 100644
--- a/kde-base/klines/klines-3.4.2.ebuild
+++ b/kde-base/klines/klines-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/klines/klines-3.4.3.ebuild b/kde-base/klines/klines-3.4.3.ebuild
index b13c87b5ae58..c4aca69307ee 100644
--- a/kde-base/klines/klines-3.4.3.ebuild
+++ b/kde-base/klines/klines-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/klines/klines-3.5.0.ebuild b/kde-base/klines/klines-3.5.0.ebuild
index 40f0a1b766ad..363bf99b401e 100644
--- a/kde-base/klines/klines-3.5.0.ebuild
+++ b/kde-base/klines/klines-3.5.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/kde-base/klines/klines-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klines/klines-3.5.0_beta2.ebuild b/kde-base/klines/klines-3.5.0_beta2.ebuild
index c9f9db87ef73..6149ced691e9 100644
--- a/kde-base/klines/klines-3.5.0_beta2.ebuild
+++ b/kde-base/klines/klines-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/klines/klines-3.5.0_rc1.ebuild b/kde-base/klines/klines-3.5.0_rc1.ebuild
index 9e0a370e82dd..312fc6570ce9 100644
--- a/kde-base/klines/klines-3.5.0_rc1.ebuild
+++ b/kde-base/klines/klines-3.5.0_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/kde-base/klines/klines-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klines/klines-3.5_beta1.ebuild b/kde-base/klines/klines-3.5_beta1.ebuild
index fff36eff5d63..c6bd01a28ef4 100644
--- a/kde-base/klines/klines-3.5_beta1.ebuild
+++ b/kde-base/klines/klines-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.5_beta1.ebuild,v 1.1 2005/09/22 19:19:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klines/klines-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Kolor Lines - a little game about balls and how to get rid of them"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/klines/metadata.xml b/kde-base/klines/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klines/metadata.xml
+++ b/kde-base/klines/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index e9edda2cdfb8..6299eaf773fa 100644
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  klinkstatus-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> klinkstatus-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  klinkstatus-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*klinkstatus-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klinkstatus-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klinkstatus-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klinkstatus-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  klinkstatus-3.5_beta1.ebuild, klinkstatus-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klinkstatus-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klinkstatus-3.5.0_beta2.ebuild:
+  New version.
+
+*klinkstatus-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +klinkstatus-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klinkstatus-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klinkstatus-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klinkstatus-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klinkstatus-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klinkstatus-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  klinkstatus-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klinkstatus-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klinkstatus-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klinkstatus-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> klinkstatus-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klinkstatus-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org> klinkstatus-3.4.0.ebuild,
+  klinkstatus-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> klinkstatus-3.4.0.ebuild,
+  klinkstatus-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*klinkstatus-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klinkstatus-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klinkstatus-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klinkstatus-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klinkstatus-3.4.0_rc1 (10 Mar 2005)
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  klinkstatus-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klinkstatus-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +klinkstatus-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klinkstatus-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klinkstatus/Manifest b/kde-base/klinkstatus/Manifest
index 6678bc3ee9c5..68dc660dfafc 100644
--- a/kde-base/klinkstatus/Manifest
+++ b/kde-base/klinkstatus/Manifest
@@ -1,4 +1,26 @@
-MD5 d54925b12785865ddac37362d6c54c1b klinkstatus-3.4.0_alpha1.ebuild 286
-MD5 d54925b12785865ddac37362d6c54c1b klinkstatus-3.4.0_beta1.ebuild 286
-MD5 01932d35a126a5610a6c4a35de90a2b6 files/digest-klinkstatus-3.4.0_alpha1 70
-MD5 07dc9f44e293d1ac9c7b66b68f28492f files/digest-klinkstatus-3.4.0_beta1 219
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8432cbaeb95f69b4ffe97fc352789ae6 ChangeLog 3747
+MD5 e951879abebc3cb3931132db3f1c508a files/digest-klinkstatus-3.4.1 215
+MD5 aa19f6252c3ee8966919f391f9ccd717 files/digest-klinkstatus-3.4.2 292
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-klinkstatus-3.4.3 69
+MD5 1b9c64625ee8bb6581dafc883b1d0ee1 files/digest-klinkstatus-3.5.0 69
+MD5 f707b83e603df2763351c664d0943915 files/digest-klinkstatus-3.5.0_beta2 219
+MD5 50a5dfc5bdebb9f91775752768b4ca60 files/digest-klinkstatus-3.5.0_rc1 304
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-klinkstatus-3.5_beta1 70
+MD5 d9f351c365471c037ce5c8e009cfbfa0 klinkstatus-3.4.1.ebuild 413
+MD5 cb5bf1648cdd6cdc875843165469ba2e klinkstatus-3.4.2.ebuild 426
+MD5 9cddab7d5af6fd4e5e943c0b2153be65 klinkstatus-3.4.3.ebuild 422
+MD5 fe2ac72b65c7fd320afb633d11acfa2b klinkstatus-3.5.0.ebuild 402
+MD5 7d84dc6f42710bb8de1214ad42fce910 klinkstatus-3.5.0_beta2.ebuild 407
+MD5 6dcf5ce5de8382503edac1a3f6304b1a klinkstatus-3.5.0_rc1.ebuild 406
+MD5 9a277cb411faef2a51e5571847043eb9 klinkstatus-3.5_beta1.ebuild 405
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxVXntT9W3vfTuoRApXsAJ0SoG8C+IVuSNw1wu1dei0G1K9jngCdGYmk
+lpoKUPtjdsg3VWILvUNG7ws=
+=hJfK
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klinkstatus/files/digest-klinkstatus-3.4.1 b/kde-base/klinkstatus/files/digest-klinkstatus-3.4.1
index 797b2dac2533..ff993687a657 100644
--- a/kde-base/klinkstatus/files/digest-klinkstatus-3.4.1
+++ b/kde-base/klinkstatus/files/digest-klinkstatus-3.4.1
@@ -1,2 +1,3 @@
 MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
 MD5 d5c9e5c72731aead950ab29a4d620af8 kdewebdev-3.4.1.tar.bz2 5966577
diff --git a/kde-base/klinkstatus/files/digest-klinkstatus-3.4.2 b/kde-base/klinkstatus/files/digest-klinkstatus-3.4.2
index 5497b6e4be9f..18c726d6f0c5 100644
--- a/kde-base/klinkstatus/files/digest-klinkstatus-3.4.2
+++ b/kde-base/klinkstatus/files/digest-klinkstatus-3.4.2
@@ -1 +1,4 @@
+MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
+MD5 fadb59f001c317dd0f843be81f4157d9 kdewebdev-3.4.1-3.4.2.tar.xdelta 220130
 MD5 99dbd9bf9b2a1451544b35f73efe7dba kdewebdev-3.4.2.tar.bz2 5968773
diff --git a/kde-base/klinkstatus/klinkstatus-3.4.1.ebuild b/kde-base/klinkstatus/klinkstatus-3.4.1.ebuild
index d880123b4dbd..2835085a3d87 100644
--- a/kde-base/klinkstatus/klinkstatus-3.4.1.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE link status checker for html pages"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klinkstatus/klinkstatus-3.4.2.ebuild b/kde-base/klinkstatus/klinkstatus-3.4.2.ebuild
index 4e9319047a5a..1d77b5a42eb6 100644
--- a/kde-base/klinkstatus/klinkstatus-3.4.2.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE link status checker for html pages"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klinkstatus/klinkstatus-3.4.3.ebuild b/kde-base/klinkstatus/klinkstatus-3.4.3.ebuild
index 3db00fb9f49e..41ba040ba844 100644
--- a/kde-base/klinkstatus/klinkstatus-3.4.3.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE link status checker for html pages"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klinkstatus/klinkstatus-3.5.0.ebuild b/kde-base/klinkstatus/klinkstatus-3.5.0.ebuild
index 034c8e8b5efd..5f6efee06a3c 100644
--- a/kde-base/klinkstatus/klinkstatus-3.5.0.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.5.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/kde-base/klinkstatus/klinkstatus-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klinkstatus/klinkstatus-3.5.0_beta2.ebuild b/kde-base/klinkstatus/klinkstatus-3.5.0_beta2.ebuild
index 51223dc10f1a..5c602f8144ce 100644
--- a/kde-base/klinkstatus/klinkstatus-3.5.0_beta2.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE link status checker for html pages"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klinkstatus/klinkstatus-3.5.0_rc1.ebuild b/kde-base/klinkstatus/klinkstatus-3.5.0_rc1.ebuild
index a03b952335b8..7263c789fafe 100644
--- a/kde-base/klinkstatus/klinkstatus-3.5.0_rc1.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.5.0_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/kde-base/klinkstatus/klinkstatus-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/klinkstatus/klinkstatus-3.5_beta1.ebuild b/kde-base/klinkstatus/klinkstatus-3.5_beta1.ebuild
index 92a604b4f8be..41a415d7450b 100644
--- a/kde-base/klinkstatus/klinkstatus-3.5_beta1.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.5_beta1.ebuild,v 1.1 2005/09/22 19:20:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:54 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE link status checker for html pages"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/klinkstatus/metadata.xml b/kde-base/klinkstatus/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klinkstatus/metadata.xml
+++ b/kde-base/klinkstatus/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/klipper/ChangeLog b/kde-base/klipper/ChangeLog
index 951d2b081c10..f433763dcd57 100644
--- a/kde-base/klipper/ChangeLog
+++ b/kde-base/klipper/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/klipper
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/ChangeLog,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> klipper-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> klipper-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> klipper-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*klipper-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*klipper-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> klipper-3.5_beta1.ebuild,
+  klipper-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*klipper-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.5.0_beta2.ebuild:
+  New version.
+
+*klipper-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -klipper-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*klipper-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klipper-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*klipper-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +klipper-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> klipper-3.4.2.ebuild:
+  ~alpha keyword.
+
+*klipper-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> klipper-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> klipper-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> klipper-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*klipper-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> klipper-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> klipper-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> klipper-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> klipper-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*klipper-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> klipper-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*klipper-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +klipper-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *klipper-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/klipper/Manifest b/kde-base/klipper/Manifest
index cabcf6a9d242..e1f7ab1cb204 100644
--- a/kde-base/klipper/Manifest
+++ b/kde-base/klipper/Manifest
@@ -1,4 +1,26 @@
-MD5 da8f0a8e50c22551010c0d3d0dac0c24 klipper-3.4.0_alpha1.ebuild 391
-MD5 da8f0a8e50c22551010c0d3d0dac0c24 klipper-3.4.0_beta1.ebuild 391
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-klipper-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-klipper-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 045944f297ea42490884cc9d43a6e47a ChangeLog 3541
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-klipper-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-klipper-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-klipper-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-klipper-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-klipper-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-klipper-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-klipper-3.5_beta1 69
+MD5 00a48ff403c655bd021fe3740f04ce9c klipper-3.4.1.ebuild 412
+MD5 9d2381ef0103b302864d2b3ddc7b4d73 klipper-3.4.2.ebuild 425
+MD5 46d283d9e0837d5f1e1e1a539fbc2ee7 klipper-3.4.3.ebuild 421
+MD5 32018e8e8034880f860d63255b47dc34 klipper-3.5.0.ebuild 401
+MD5 429cc39e44f21e85f9a7c714eaf730de klipper-3.5.0_beta2.ebuild 406
+MD5 814d128ab201f9ff9b0ef5f12692e0c5 klipper-3.5.0_rc1.ebuild 405
+MD5 3ad0d4280cb39899056c373b05c87587 klipper-3.5_beta1.ebuild 404
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkEWntT9W3vfTuoRAlUtAJ9Pdo9BlbEmvRnikiLn5e8ZUa+RvwCcCwGV
+kAmWJZiuUQ3uE3XjigC0YXo=
+=cS7T
+-----END PGP SIGNATURE-----
diff --git a/kde-base/klipper/files/digest-klipper-3.4.1 b/kde-base/klipper/files/digest-klipper-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/klipper/files/digest-klipper-3.4.1
+++ b/kde-base/klipper/files/digest-klipper-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/klipper/files/digest-klipper-3.4.2 b/kde-base/klipper/files/digest-klipper-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/klipper/files/digest-klipper-3.4.2
+++ b/kde-base/klipper/files/digest-klipper-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/klipper/klipper-3.4.1.ebuild b/kde-base/klipper/klipper-3.4.1.ebuild
index c941a581e3d7..a4a67358fa3e 100644
--- a/kde-base/klipper/klipper-3.4.1.ebuild
+++ b/kde-base/klipper/klipper-3.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/kde-base/klipper/klipper-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker applet for KDE and X clipboard management"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/klipper/klipper-3.4.2.ebuild b/kde-base/klipper/klipper-3.4.2.ebuild
index 26d2ab0b851d..91fdbafc80ff 100644
--- a/kde-base/klipper/klipper-3.4.2.ebuild
+++ b/kde-base/klipper/klipper-3.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/kde-base/klipper/klipper-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker applet for KDE and X clipboard management"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/klipper/klipper-3.4.3.ebuild b/kde-base/klipper/klipper-3.4.3.ebuild
index 038c1073f3c5..84dfe141012c 100644
--- a/kde-base/klipper/klipper-3.4.3.ebuild
+++ b/kde-base/klipper/klipper-3.4.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/kde-base/klipper/klipper-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker applet for KDE and X clipboard management"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/klipper/klipper-3.5.0.ebuild b/kde-base/klipper/klipper-3.5.0.ebuild
index ed1d6370ee04..8b6def992777 100644
--- a/kde-base/klipper/klipper-3.5.0.ebuild
+++ b/kde-base/klipper/klipper-3.5.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/kde-base/klipper/klipper-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/klipper/klipper-3.5.0_beta2.ebuild b/kde-base/klipper/klipper-3.5.0_beta2.ebuild
index c0d08729ae77..551b8f68eadb 100644
--- a/kde-base/klipper/klipper-3.5.0_beta2.ebuild
+++ b/kde-base/klipper/klipper-3.5.0_beta2.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/kde-base/klipper/klipper-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker applet for KDE and X clipboard management"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/klipper/klipper-3.5.0_rc1.ebuild b/kde-base/klipper/klipper-3.5.0_rc1.ebuild
index 38b6ed66adb6..d84488a7212b 100644
--- a/kde-base/klipper/klipper-3.5.0_rc1.ebuild
+++ b/kde-base/klipper/klipper-3.5.0_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/kde-base/klipper/klipper-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/klipper/klipper-3.5_beta1.ebuild b/kde-base/klipper/klipper-3.5_beta1.ebuild
index 932a3c1bd5dc..ef2afe4dad84 100644
--- a/kde-base/klipper/klipper-3.5_beta1.ebuild
+++ b/kde-base/klipper/klipper-3.5_beta1.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/kde-base/klipper/klipper-3.5_beta1.ebuild,v 1.1 2005/09/22 19:21:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klipper/klipper-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker applet for KDE and X clipboard management"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/klipper/metadata.xml b/kde-base/klipper/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/klipper/metadata.xml
+++ b/kde-base/klipper/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmag/ChangeLog b/kde-base/kmag/ChangeLog
index 71cb1bdf0487..ebd28a6793eb 100644
--- a/kde-base/kmag/ChangeLog
+++ b/kde-base/kmag/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/kmag
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/ChangeLog,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmag-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmag-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmag-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmag-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmag-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmag-3.5_beta1.ebuild,
+  kmag-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmag-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.5.0_beta2.ebuild:
+  New version.
+
+*kmag-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmag-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmag-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kmag-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmag-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmag-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmag-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmag-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmag-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmag-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmag-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmag-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmag-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmag-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmag-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmag-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmag-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmag-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmag-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmag-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmag-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmag/Manifest b/kde-base/kmag/Manifest
index 548865646ffa..801801dd716b 100644
--- a/kde-base/kmag/Manifest
+++ b/kde-base/kmag/Manifest
@@ -1,4 +1,16 @@
-MD5 c4f14bf3e6ab7c497e3ab56cbfadb84d kmag-3.4.0_beta1.ebuild 275
-MD5 c4f14bf3e6ab7c497e3ab56cbfadb84d kmag-3.4.0_alpha1.ebuild 275
-MD5 66b4de7b06e1e62dd8abc1e60ec1187b files/digest-kmag-3.4.0_alpha1 77
-MD5 c5420b3dc1848daf59305d1f2ff74a83 files/digest-kmag-3.4.0_beta1 240
+MD5 4778a466d64239fe41a56521bf56c68f ChangeLog 3427
+MD5 19c05d6c1ac39ca43f4b1485ea23586d kmag-3.4.1.ebuild 388
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 c7c8dbe64461ad978a6481c99be2b5f0 kmag-3.4.2.ebuild 401
+MD5 ce1cfb9d046d87b460a1f7b1f2510914 kmag-3.5_beta1.ebuild 380
+MD5 584f6bdd49919d981650615bf32a639d kmag-3.4.3.ebuild 399
+MD5 a9025d20b23454e2e4312e5875ac2058 kmag-3.5.0_beta2.ebuild 382
+MD5 1aa4169566aae0ad6acea690f71887fb kmag-3.5.0_rc1.ebuild 381
+MD5 9295721e4e10fe2fe51e262fd48eb2eb kmag-3.5.0.ebuild 377
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-kmag-3.4.1 236
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-kmag-3.4.2 320
+MD5 174790e90449897638084f6c4bea761f files/digest-kmag-3.5_beta1 77
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kmag-3.4.3 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-kmag-3.5.0_beta2 240
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-kmag-3.5.0_rc1 332
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kmag-3.5.0 76
diff --git a/kde-base/kmag/files/digest-kmag-3.4.1 b/kde-base/kmag/files/digest-kmag-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/kmag/files/digest-kmag-3.4.1
+++ b/kde-base/kmag/files/digest-kmag-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/kmag/files/digest-kmag-3.4.2 b/kde-base/kmag/files/digest-kmag-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/kmag/files/digest-kmag-3.4.2
+++ b/kde-base/kmag/files/digest-kmag-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/kmag/kmag-3.4.1.ebuild b/kde-base/kmag/kmag-3.4.1.ebuild
index 0163e65193e1..6e822f340027 100644
--- a/kde-base/kmag/kmag-3.4.1.ebuild
+++ b/kde-base/kmag/kmag-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmag/kmag-3.4.2.ebuild b/kde-base/kmag/kmag-3.4.2.ebuild
index fc8b7bee84f0..767862c72f82 100644
--- a/kde-base/kmag/kmag-3.4.2.ebuild
+++ b/kde-base/kmag/kmag-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmag/kmag-3.4.3.ebuild b/kde-base/kmag/kmag-3.4.3.ebuild
index c104774165a9..ab5ac364181a 100644
--- a/kde-base/kmag/kmag-3.4.3.ebuild
+++ b/kde-base/kmag/kmag-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmag/kmag-3.5.0.ebuild b/kde-base/kmag/kmag-3.5.0.ebuild
index ef82be1a14e3..1f8221f0f21e 100644
--- a/kde-base/kmag/kmag-3.5.0.ebuild
+++ b/kde-base/kmag/kmag-3.5.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/kde-base/kmag/kmag-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmag/kmag-3.5.0_beta2.ebuild b/kde-base/kmag/kmag-3.5.0_beta2.ebuild
index b6a39c623f77..7a2a830d0591 100644
--- a/kde-base/kmag/kmag-3.5.0_beta2.ebuild
+++ b/kde-base/kmag/kmag-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmag/kmag-3.5.0_rc1.ebuild b/kde-base/kmag/kmag-3.5.0_rc1.ebuild
index eddc34da2ec8..a44c99a57bcf 100644
--- a/kde-base/kmag/kmag-3.5.0_rc1.ebuild
+++ b/kde-base/kmag/kmag-3.5.0_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/kde-base/kmag/kmag-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmag/kmag-3.5_beta1.ebuild b/kde-base/kmag/kmag-3.5_beta1.ebuild
index a74a85e88daf..c4953dfcdd36 100644
--- a/kde-base/kmag/kmag-3.5_beta1.ebuild
+++ b/kde-base/kmag/kmag-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.5_beta1.ebuild,v 1.1 2005/09/22 19:22:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmag/kmag-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE screen magnifier"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmag/metadata.xml b/kde-base/kmag/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmag/metadata.xml
+++ b/kde-base/kmag/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmahjongg/ChangeLog b/kde-base/kmahjongg/ChangeLog
index 3401b2e89358..9d573d5c8867 100644
--- a/kde-base/kmahjongg/ChangeLog
+++ b/kde-base/kmahjongg/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kmahjongg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/ChangeLog,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmahjongg-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmahjongg-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kmahjongg-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmahjongg-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmahjongg-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmahjongg-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmahjongg-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmahjongg-3.5_beta1.ebuild,
+  kmahjongg-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmahjongg-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmahjongg-3.5.0_beta2.ebuild:
+  New version.
+
+*kmahjongg-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmahjongg-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmahjongg-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmahjongg-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmahjongg-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmahjongg-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmahjongg-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmahjongg-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmahjongg-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmahjongg-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmahjongg-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmahjongg-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmahjongg-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmahjongg-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmahjongg-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmahjongg-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmahjongg-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmahjongg-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmahjongg-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmahjongg-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmahjongg-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmahjongg-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kmahjongg-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmahjongg-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmahjongg/Manifest b/kde-base/kmahjongg/Manifest
index d27d5b57a17d..1ef544869b2d 100644
--- a/kde-base/kmahjongg/Manifest
+++ b/kde-base/kmahjongg/Manifest
@@ -1,4 +1,26 @@
-MD5 23d89dd96822c73c6473b0f287220735 kmahjongg-3.4.0_beta1.ebuild 410
-MD5 23d89dd96822c73c6473b0f287220735 kmahjongg-3.4.0_alpha1.ebuild 410
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kmahjongg-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kmahjongg-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bf1e39b8b1e3d1ac723fe442f51cbe5a ChangeLog 3623
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kmahjongg-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kmahjongg-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kmahjongg-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kmahjongg-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kmahjongg-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kmahjongg-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kmahjongg-3.5_beta1 70
+MD5 39eb2fed1920fc8c5dfc43f5cd105b6c kmahjongg-3.4.1.ebuild 533
+MD5 3afcbda6f0ff27af980378a4798413d9 kmahjongg-3.4.2.ebuild 546
+MD5 9fae07ab3b8be340c4f49148a9554fb3 kmahjongg-3.4.3.ebuild 542
+MD5 a26f0e22dc3238e9d1567842bd563d30 kmahjongg-3.5.0.ebuild 485
+MD5 f116643daba2016aab47693e3efe227c kmahjongg-3.5.0_beta2.ebuild 490
+MD5 e9438dc4117fb1ec92aeee740de91f7e kmahjongg-3.5.0_rc1.ebuild 489
+MD5 304c0557461c41c833c26db29b56e1da kmahjongg-3.5_beta1.ebuild 525
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl7MntT9W3vfTuoRAkPIAJ0RbgwX6Au61DPEfPM2R7N6mxajXwCglrxw
+jF1kWVDPyMQPEg8B8NEZsPc=
+=fwk/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmahjongg/files/digest-kmahjongg-3.4.1 b/kde-base/kmahjongg/files/digest-kmahjongg-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kmahjongg/files/digest-kmahjongg-3.4.1
+++ b/kde-base/kmahjongg/files/digest-kmahjongg-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kmahjongg/files/digest-kmahjongg-3.4.2 b/kde-base/kmahjongg/files/digest-kmahjongg-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kmahjongg/files/digest-kmahjongg-3.4.2
+++ b/kde-base/kmahjongg/files/digest-kmahjongg-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kmahjongg/kmahjongg-3.4.1.ebuild b/kde-base/kmahjongg/kmahjongg-3.4.1.ebuild
index efee6f5c7dba..461e6e6b13c7 100644
--- a/kde-base/kmahjongg/kmahjongg-3.4.1.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kmahjongg/kmahjongg-3.4.2.ebuild b/kde-base/kmahjongg/kmahjongg-3.4.2.ebuild
index 24a91ce6fbb8..01ce50b766b4 100644
--- a/kde-base/kmahjongg/kmahjongg-3.4.2.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kmahjongg/kmahjongg-3.4.3.ebuild b/kde-base/kmahjongg/kmahjongg-3.4.3.ebuild
index 0fff19d2e431..ee3efbf72f97 100644
--- a/kde-base/kmahjongg/kmahjongg-3.4.3.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kmahjongg/kmahjongg-3.5.0.ebuild b/kde-base/kmahjongg/kmahjongg-3.5.0.ebuild
index bfde83f4826a..858503627b62 100644
--- a/kde-base/kmahjongg/kmahjongg-3.5.0.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.5.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/kde-base/kmahjongg/kmahjongg-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmahjongg/kmahjongg-3.5.0_beta2.ebuild b/kde-base/kmahjongg/kmahjongg-3.5.0_beta2.ebuild
index 4c8d018a9c8c..37a6512045d5 100644
--- a/kde-base/kmahjongg/kmahjongg-3.5.0_beta2.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kmahjongg/kmahjongg-3.5.0_rc1.ebuild b/kde-base/kmahjongg/kmahjongg-3.5.0_rc1.ebuild
index 366ab62dc2ab..a917d7d42616 100644
--- a/kde-base/kmahjongg/kmahjongg-3.5.0_rc1.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.5.0_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/kde-base/kmahjongg/kmahjongg-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:29 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmahjongg/kmahjongg-3.5_beta1.ebuild b/kde-base/kmahjongg/kmahjongg-3.5_beta1.ebuild
index 7b0e4ab147dc..62ab85fb671d 100644
--- a/kde-base/kmahjongg/kmahjongg-3.5_beta1.ebuild
+++ b/kde-base/kmahjongg/kmahjongg-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.5_beta1.ebuild,v 1.1 2005/09/22 19:23:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmahjongg/kmahjongg-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mahjongg for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kmahjongg/metadata.xml b/kde-base/kmahjongg/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmahjongg/metadata.xml
+++ b/kde-base/kmahjongg/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index 236153f7973d..b6605f40785a 100644
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,148 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmail-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmail-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmail-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmail-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmail-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmail-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org> kmail-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org> kmail-3.5.0_beta2.ebuild:
+  Removed no longer necessary patch.
+
+*kmail-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.5.0_beta2.ebuild:
+  New version.
+
+*kmail-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmail-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmail-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kmail-qt-3.3.5.patch, +kmail-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/kmail-3.5_alpha1-kdeenablefinal-fix.diff, kmail-3.5_alpha1.ebuild:
+  Fix for compilation with kdeenablefinal (from kde svn).
+
+*kmail-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmail-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org> kmail-3.4.1-r1.ebuild:
+  Stable on amd64.
+
+  25 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmail-3.4.1-r1.ebuild:
+  Stable on sparc
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> kmail-3.4.1-r1.ebuild:
+  Stable on ppc.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmail-3.4.2-r1.ebuild:
+  ~alpha keyword.
+
+  03 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> kmail-3.4.2-r1.ebuild:
+  Add dependency on kcontrol (#100406).
+
+*kmail-3.4.2-r1 (02 Aug 2005)
+
+  02 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.2-partnode.patch, +kmail-3.4.2-r1.ebuild:
+  Add patch to fix problem with attachments (kde bug 109003).
+
+*kmail-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  21 Jul 2005; Carsten Lohrke <carlo@gentoo.org> kmail-3.4.1-r1.ebuild:
+  stable on x86
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmail-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmail-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmail-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmail-3.4.1-r1 (01 Jul 2005)
+
+  01 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kmail-3.4.1-shift+click-crash.diff, +kmail-3.4.1-r1.ebuild:
+  fixing crash on shift+click in kmail reader, #97549
+
+*kmail-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmail-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmail-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmail-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmail-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmail-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmail-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmail-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmail-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  21 Jan 2005; Dan Armak <danarmak@gentoo.org> kmail-3.4.0_beta1.ebuild:
+  Made the runtime dep on kontact a compile-time dep as well.
+
+  16 Jan 2005; Simone Gotti <motaboy@gentoo.org> kmail-3.4.0_beta1.ebuild:
+  Add kdepim-kioslaves as an RDEPEND. Fixes bug #78187.
 
 *kmail-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index 520f10b12a77..c5d2557b8050 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,4 +1,33 @@
-MD5 5eb282f3ce0242a584c7af39fe95b95f kmail-3.4.0_alpha1.ebuild 1434
-MD5 5eb282f3ce0242a584c7af39fe95b95f kmail-3.4.0_beta1.ebuild 1434
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kmail-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-kmail-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b9eceadd349ad1a4e37b426b4f2dbc25 ChangeLog 5032
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1-r1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2-r1 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kmail-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kmail-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kmail-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kmail-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kmail-3.5_beta1 68
+MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
+MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516
+MD5 9375e74788e629b37a3636e9a64804e0 files/kmail-qt-3.3.5.patch 446
+MD5 b9964e02eff2a443f6299bb15de581b4 kmail-3.4.1-r1.ebuild 1674
+MD5 aa82a9cf16faab980f09bd8763b742d1 kmail-3.4.1.ebuild 1610
+MD5 393bf626aee24f4dd500ca341e1d314c kmail-3.4.2-r1.ebuild 1856
+MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
+MD5 f0881d6600f939394e4b0c3dc126a75f kmail-3.4.3.ebuild 1728
+MD5 e5590dd2e4de6a31b5faf1587cbc35e8 kmail-3.5.0.ebuild 1707
+MD5 e8f3224ed7cdff7890a48253e9602f10 kmail-3.5.0_beta2.ebuild 1728
+MD5 cdef176c0dd05d05f5d7492185d0d993 kmail-3.5.0_rc1.ebuild 1737
+MD5 2d770be580f0a9225574df6a380b7d78 kmail-3.5_beta1.ebuild 1748
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvUJntT9W3vfTuoRAvblAJ0b4dq5z+OsmvbtFtA0Pg4VYBSFMACeKjuF
+zHq9whgNYU1pdT3l77UySDQ=
+=zf+i
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmail/files/digest-kmail-3.4.1 b/kde-base/kmail/files/digest-kmail-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kmail/files/digest-kmail-3.4.1
+++ b/kde-base/kmail/files/digest-kmail-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kmail/files/digest-kmail-3.4.2 b/kde-base/kmail/files/digest-kmail-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kmail/files/digest-kmail-3.4.2
+++ b/kde-base/kmail/files/digest-kmail-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kmail/files/digest-kmail-3.4.2-r1 b/kde-base/kmail/files/digest-kmail-3.4.2-r1
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kmail/files/digest-kmail-3.4.2-r1
+++ b/kde-base/kmail/files/digest-kmail-3.4.2-r1
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kmail/kmail-3.4.1-r1.ebuild b/kde-base/kmail/kmail-3.4.1-r1.ebuild
index a59db77881ee..c3885f24e412 100644
--- a/kde-base/kmail/kmail-3.4.1-r1.ebuild
+++ b/kde-base/kmail/kmail-3.4.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/kde-base/kmail/kmail-3.4.1-r1.ebuild,v 1.1 2005/07/01 00:53:18 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mail client"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
@@ -20,8 +20,8 @@ $(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/kontact)"
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves)
-$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
-$(deprange $PV $MAXKDEVER kde-base/kmailcvt)"
+$(deprange $PV $MAXKDEVER kde-base/kmailcvt)
+$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)"
 
 KMCOPYLIB="
 	libkdepim libkdepim/
@@ -52,4 +52,4 @@ KMEXTRA="
 	plugins/kmail/
 	kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
 
-PATCHES="${FILESDIR}/kmail-3.4.1-shift+click-crash.diff"
\ No newline at end of file
+PATCHES="${FILESDIR}/kmail-3.4.1-shift+click-crash.diff"
diff --git a/kde-base/kmail/kmail-3.4.1.ebuild b/kde-base/kmail/kmail-3.4.1.ebuild
index 8db6ec366c66..dfc0bc19036b 100644
--- a/kde-base/kmail/kmail-3.4.1.ebuild
+++ b/kde-base/kmail/kmail-3.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/kde-base/kmail/kmail-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mail client"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/kmail/kmail-3.4.2-r1.ebuild b/kde-base/kmail/kmail-3.4.2-r1.ebuild
index a7bb2a1e1f4a..c482ced516fd 100644
--- a/kde-base/kmail/kmail-3.4.2-r1.ebuild
+++ b/kde-base/kmail/kmail-3.4.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/kde-base/kmail/kmail-3.4.2-r1.ebuild,v 1.1 2005/08/02 11:26:42 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mail client"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
@@ -21,7 +21,8 @@ $(deprange $PV $MAXKDEVER kde-base/kontact)"
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves)
 $(deprange 3.4.1 $MAXKDEVER kde-base/kmailcvt)
-$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)"
+$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)
+$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)" # for the "looknfeel" icon, and probably others.
 
 KMCOPYLIB="
 	libkdepim libkdepim/
diff --git a/kde-base/kmail/kmail-3.4.2.ebuild b/kde-base/kmail/kmail-3.4.2.ebuild
index 349a95fcee52..3ea97e4aa862 100644
--- a/kde-base/kmail/kmail-3.4.2.ebuild
+++ b/kde-base/kmail/kmail-3.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/kde-base/kmail/kmail-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -10,17 +10,17 @@ inherit kde-meta eutils
 DESCRIPTION="KDE mail client"
 KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-DEPEND="$(deprange 3.4.1-r1 $MAXKDEVER kde-base/libkdenetwork)
+DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
-$(deprange 3.4.1-r1 $MAXKDEVER kde-base/libkpimidentities)
+$(deprange 3.4.1 $MAXKDEVER kde-base/libkpimidentities)
 $(deprange $PV $MAXKDEVER kde-base/mimelib)
-$(deprange 3.4.1-r1 $MAXKDEVER kde-base/libksieve)
+$(deprange 3.4.1 $MAXKDEVER kde-base/libksieve)
 $(deprange $PV $MAXKDEVER kde-base/certmanager)
 $(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/kontact)"
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kdepim-kioslaves)
-$(deprange 3.4.1-r1 $MAXKDEVER kde-base/kmailcvt)
+$(deprange 3.4.1 $MAXKDEVER kde-base/kmailcvt)
 $(deprange-dual $PV $MAXKDEVER kde-base/kdebase-kioslaves)"
 
 KMCOPYLIB="
diff --git a/kde-base/kmail/kmail-3.4.3.ebuild b/kde-base/kmail/kmail-3.4.3.ebuild
index 874e73125fd1..76a5d0104b36 100644
--- a/kde-base/kmail/kmail-3.4.3.ebuild
+++ b/kde-base/kmail/kmail-3.4.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/kde-base/kmail/kmail-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mail client"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/kmail/kmail-3.5.0.ebuild b/kde-base/kmail/kmail-3.5.0.ebuild
index dba4aa8f7a14..c24373017bed 100644
--- a/kde-base/kmail/kmail-3.5.0.ebuild
+++ b/kde-base/kmail/kmail-3.5.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/kde-base/kmail/kmail-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kmail/kmail-3.5.0_beta2.ebuild b/kde-base/kmail/kmail-3.5.0_beta2.ebuild
index 7f67f7b1a2d5..2f0173feca2a 100644
--- a/kde-base/kmail/kmail-3.5.0_beta2.ebuild
+++ b/kde-base/kmail/kmail-3.5.0_beta2.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/kde-base/kmail/kmail-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mail client"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.5_beta1 $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
@@ -53,4 +53,3 @@ KMEXTRA="
 	plugins/kmail/
 	kontact/plugins/kmail/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
 
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
diff --git a/kde-base/kmail/kmail-3.5.0_rc1.ebuild b/kde-base/kmail/kmail-3.5.0_rc1.ebuild
index a28921f781fa..fe29f0559d8f 100644
--- a/kde-base/kmail/kmail-3.5.0_rc1.ebuild
+++ b/kde-base/kmail/kmail-3.5.0_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/kde-base/kmail/kmail-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kmail/kmail-3.5_beta1.ebuild b/kde-base/kmail/kmail-3.5_beta1.ebuild
index 26892073da0b..a9b922c58aba 100644
--- a/kde-base/kmail/kmail-3.5_beta1.ebuild
+++ b/kde-base/kmail/kmail-3.5_beta1.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/kde-base/kmail/kmail-3.5_beta1.ebuild,v 1.1 2005/09/22 19:24:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mail client"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/kmail/metadata.xml b/kde-base/kmail/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmail/metadata.xml
+++ b/kde-base/kmail/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmailcvt/ChangeLog b/kde-base/kmailcvt/ChangeLog
index 0f1ed1b38b2f..1f41d0a2cd84 100644
--- a/kde-base/kmailcvt/ChangeLog
+++ b/kde-base/kmailcvt/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/kmailcvt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/ChangeLog,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmailcvt-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmailcvt-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmailcvt-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmailcvt-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmailcvt-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmailcvt-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kmailcvt-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*kmailcvt-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmailcvt-3.5.0_beta2.ebuild:
+  New version.
+
+*kmailcvt-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmailcvt-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmailcvt-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmailcvt-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmailcvt-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmailcvt-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmailcvt-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kmailcvt-3.4.1-r1.ebuild:
+  ~alpha keyword.
+
+*kmailcvt-3.4.1-r1 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/fix-kmailcvt-compilation.diff, +kmailcvt-3.4.1-r1.ebuild:
+  Compilation fix, committed to upstream cvs but missed the 3.4.2 release. Bug
+  #99643.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmailcvt-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmailcvt-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmailcvt-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmailcvt-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmailcvt-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmailcvt-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmailcvt-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmailcvt-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmailcvt-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmailcvt-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmailcvt-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmailcvt-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmailcvt-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmailcvt-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmailcvt/Manifest b/kde-base/kmailcvt/Manifest
index 1e3a9a8ba977..104f0215a04f 100644
--- a/kde-base/kmailcvt/Manifest
+++ b/kde-base/kmailcvt/Manifest
@@ -1,4 +1,25 @@
-MD5 7652470af770a77799b9f74aeca5fad0 kmailcvt-3.4.0_alpha1.ebuild 263
-MD5 7652470af770a77799b9f74aeca5fad0 kmailcvt-3.4.0_beta1.ebuild 263
-MD5 892303ffe022b31a222f9efab549727b files/digest-kmailcvt-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kmailcvt-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc291f3049d629013109895a56cb39d4 ChangeLog 3622
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmailcvt-3.4.1 208
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmailcvt-3.4.1-r1 208
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kmailcvt-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kmailcvt-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kmailcvt-3.5.0_beta2 212
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kmailcvt-3.5_beta1 68
+MD5 5b0dda9287797546fcf34f2ca390d165 files/fix-kmailcvt-compilation.diff 5790
+MD5 4840c4d850f6d4f468b7e2217ec22b61 kmailcvt-3.4.1-r1.ebuild 471
+MD5 cef98d58639182ee17a50ebbdc116f34 kmailcvt-3.4.1.ebuild 384
+MD5 61522331cd3a277e650e9a06380a657e kmailcvt-3.4.3.ebuild 393
+MD5 c01f960609aa93d8524f636a30f1b078 kmailcvt-3.5.0.ebuild 377
+MD5 38cdd4caa87030d169920d87daca7c16 kmailcvt-3.5.0_beta2.ebuild 389
+MD5 5ab92d8621cb17f96bf468c482e62c5c kmailcvt-3.5_beta1.ebuild 375
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvSBntT9W3vfTuoRAh4ZAKCEzIaqnoNDlEgVkTienYnHt6ZtJACfbn51
+P0uuRSfGKUvCG/C8q87OlSw=
+=tBDk
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1 b/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1
+++ b/kde-base/kmailcvt/files/digest-kmailcvt-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild b/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild
index 147df57830f6..7e7f5f605e63 100644
--- a/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-3.4.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/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild,v 1.1 2005/07/28 11:31:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=3.4.2
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KMail Import Filters"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 PATCHES="$FILESDIR/fix-kmailcvt-compilation.diff" # remove for 3.4.3
diff --git a/kde-base/kmailcvt/kmailcvt-3.4.1.ebuild b/kde-base/kmailcvt/kmailcvt-3.4.1.ebuild
index db7d90779a3e..f3bfaf58955a 100644
--- a/kde-base/kmailcvt/kmailcvt-3.4.1.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-3.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/kde-base/kmailcvt/kmailcvt-3.4.1.ebuild,v 1.1 2005/05/25 21:23:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KMail Import Filters"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/kmailcvt/kmailcvt-3.4.3.ebuild b/kde-base/kmailcvt/kmailcvt-3.4.3.ebuild
index 017d3c823b2a..0ceae4820a94 100644
--- a/kde-base/kmailcvt/kmailcvt-3.4.3.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-3.4.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/kde-base/kmailcvt/kmailcvt-3.4.3.ebuild,v 1.1 2005/10/13 00:10:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KMail Import Filters"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/kmailcvt/kmailcvt-3.5.0.ebuild b/kde-base/kmailcvt/kmailcvt-3.5.0.ebuild
index 7557df183097..8f2acf31e141 100644
--- a/kde-base/kmailcvt/kmailcvt-3.5.0.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-3.5.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/kde-base/kmailcvt/kmailcvt-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kmailcvt/kmailcvt-3.5.0_beta2.ebuild b/kde-base/kmailcvt/kmailcvt-3.5.0_beta2.ebuild
index 6acddcb1ed2f..d42217701fa4 100644
--- a/kde-base/kmailcvt/kmailcvt-3.5.0_beta2.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-3.5.0_beta2.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/kde-base/kmailcvt/kmailcvt-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KMail Import Filters"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
diff --git a/kde-base/kmailcvt/kmailcvt-3.5_beta1.ebuild b/kde-base/kmailcvt/kmailcvt-3.5_beta1.ebuild
index 0787ffea82e8..64bc2e25cade 100644
--- a/kde-base/kmailcvt/kmailcvt-3.5_beta1.ebuild
+++ b/kde-base/kmailcvt/kmailcvt-3.5_beta1.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/kde-base/kmailcvt/kmailcvt-3.5_beta1.ebuild,v 1.1 2005/09/22 19:25:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmailcvt/kmailcvt-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KMail Import Filters"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kmailcvt/metadata.xml b/kde-base/kmailcvt/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmailcvt/metadata.xml
+++ b/kde-base/kmailcvt/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmathtool/ChangeLog b/kde-base/kmathtool/ChangeLog
index faec6532d73e..b7204cab982c 100644
--- a/kde-base/kmathtool/ChangeLog
+++ b/kde-base/kmathtool/ChangeLog
@@ -1,6 +1,76 @@
 # ChangeLog for kde-base/kmathtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmathtool/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmathtool/ChangeLog,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmathtool-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ChangeLog:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmathtool-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmathtool-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmathtool-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmathtool-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmathtool-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmathtool-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmathtool-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmathtool-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmathtool-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmathtool-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmathtool-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmathtool-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmathtool-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmathtool-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmathtool-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmathtool-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmathtool-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmathtool-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kmathtool-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kmathtool-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmathtool-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmathtool/Manifest b/kde-base/kmathtool/Manifest
index e5cd098db80b..42a7d583b931 100644
--- a/kde-base/kmathtool/Manifest
+++ b/kde-base/kmathtool/Manifest
@@ -1,4 +1,16 @@
-MD5 02d97139565b0b98a991ab72dcecaa2d kmathtool-3.4.0_beta1.ebuild 297
-MD5 02d97139565b0b98a991ab72dcecaa2d kmathtool-3.4.0_alpha1.ebuild 297
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kmathtool-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kmathtool-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bec6774f85f5216150f66acc1a435e96 ChangeLog 2679
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kmathtool-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kmathtool-3.4.2 282
+MD5 4c2aef939dea6d37d9aa094fc24ea5bc kmathtool-3.4.1.ebuild 420
+MD5 46d2a302c0baeda8faa729c9ca06cb52 kmathtool-3.4.2.ebuild 433
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlO4ntT9W3vfTuoRAlcAAJ4mUMHyYJ/XJ5YLXZHNOBSqkzs/TwCeLYZm
+dGS5pkidhxaEbXOJkEMOO30=
+=d9Bm
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmathtool/files/digest-kmathtool-3.4.1 b/kde-base/kmathtool/files/digest-kmathtool-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kmathtool/files/digest-kmathtool-3.4.1
+++ b/kde-base/kmathtool/files/digest-kmathtool-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kmathtool/files/digest-kmathtool-3.4.2 b/kde-base/kmathtool/files/digest-kmathtool-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kmathtool/files/digest-kmathtool-3.4.2
+++ b/kde-base/kmathtool/files/digest-kmathtool-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kmathtool/kmathtool-3.4.1.ebuild b/kde-base/kmathtool/kmathtool-3.4.1.ebuild
index 730654ac8451..4429462fd8d1 100644
--- a/kde-base/kmathtool/kmathtool-3.4.1.ebuild
+++ b/kde-base/kmathtool/kmathtool-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmathtool/kmathtool-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmathtool/kmathtool-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KMathTool is a collection of little math tools."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmathtool/kmathtool-3.4.2.ebuild b/kde-base/kmathtool/kmathtool-3.4.2.ebuild
index d235a1d7c2fd..d83a920e39ad 100644
--- a/kde-base/kmathtool/kmathtool-3.4.2.ebuild
+++ b/kde-base/kmathtool/kmathtool-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmathtool/kmathtool-3.4.2.ebuild,v 1.1 2005/07/28 21:16:18 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmathtool/kmathtool-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: KMathTool is a collection of little math tools."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmathtool/metadata.xml b/kde-base/kmathtool/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmathtool/metadata.xml
+++ b/kde-base/kmathtool/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmenuedit/ChangeLog b/kde-base/kmenuedit/ChangeLog
index 7b48d491a7f0..92ea188a292b 100644
--- a/kde-base/kmenuedit/ChangeLog
+++ b/kde-base/kmenuedit/ChangeLog
@@ -1,6 +1,95 @@
 # ChangeLog for kde-base/kmenuedit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/ChangeLog,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
+
+*kmenuedit-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmenuedit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmenuedit-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmenuedit-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmenuedit-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  19 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kmenuedit-3.5.0_beta2.ebuild:
+  Added ~x86 keyword.
+
+*kmenuedit-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmenuedit-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmenuedit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmenuedit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmenuedit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kmenuedit-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kmenuedit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmenuedit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmenuedit-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmenuedit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmenuedit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmenuedit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmenuedit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmenuedit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmenuedit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kmenuedit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmenuedit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmenuedit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmenuedit-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmenuedit-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmenuedit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kmenuedit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmenuedit-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmenuedit/Manifest b/kde-base/kmenuedit/Manifest
index c957f0230174..b14e85a1891c 100644
--- a/kde-base/kmenuedit/Manifest
+++ b/kde-base/kmenuedit/Manifest
@@ -1,4 +1,12 @@
-MD5 fb2f222f3477c378c372afc4b3116aee kmenuedit-3.4.0_alpha1.ebuild 358
-MD5 fb2f222f3477c378c372afc4b3116aee kmenuedit-3.4.0_beta1.ebuild 358
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kmenuedit-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kmenuedit-3.4.0_beta1 216
+MD5 a71b286a056df7815265bafea7f922f2 ChangeLog 3245
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kmenuedit-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kmenuedit-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kmenuedit-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kmenuedit-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kmenuedit-3.5_beta1 69
+MD5 10650147ff0668214ad3451f7b31d946 kmenuedit-3.4.1.ebuild 395
+MD5 cdb2a02a8ccc84c992013244bf61c0bc kmenuedit-3.5.0.ebuild 372
+MD5 d6dfce6366328ef7084180777d904e90 kmenuedit-3.5.0_beta2.ebuild 380
+MD5 74d56aed3bddc7eac895a60c74130c12 kmenuedit-3.5.0_rc1.ebuild 376
+MD5 ac834b26aa37a67f11040a264b9d0a77 kmenuedit-3.5_beta1.ebuild 375
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kmenuedit/files/digest-kmenuedit-3.4.1 b/kde-base/kmenuedit/files/digest-kmenuedit-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kmenuedit/files/digest-kmenuedit-3.4.1
+++ b/kde-base/kmenuedit/files/digest-kmenuedit-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kmenuedit/kmenuedit-3.4.1.ebuild b/kde-base/kmenuedit/kmenuedit-3.4.1.ebuild
index 1bd1f12ca68a..ef2a55754491 100644
--- a/kde-base/kmenuedit/kmenuedit-3.4.1.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE menu editor"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kmenuedit/kmenuedit-3.5.0.ebuild b/kde-base/kmenuedit/kmenuedit-3.5.0.ebuild
index 7689976a1b8e..091044fd7d2f 100644
--- a/kde-base/kmenuedit/kmenuedit-3.5.0.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-3.5.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/kde-base/kmenuedit/kmenuedit-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kmenuedit/kmenuedit-3.5.0_beta2.ebuild b/kde-base/kmenuedit/kmenuedit-3.5.0_beta2.ebuild
index 57407d455101..183820125b66 100644
--- a/kde-base/kmenuedit/kmenuedit-3.5.0_beta2.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-3.5.0_beta2.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/kde-base/kmenuedit/kmenuedit-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE menu editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kmenuedit/kmenuedit-3.5.0_rc1.ebuild b/kde-base/kmenuedit/kmenuedit-3.5.0_rc1.ebuild
index efe887513f63..d0142f118e47 100644
--- a/kde-base/kmenuedit/kmenuedit-3.5.0_rc1.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-3.5.0_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/kde-base/kmenuedit/kmenuedit-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kmenuedit/kmenuedit-3.5_beta1.ebuild b/kde-base/kmenuedit/kmenuedit-3.5_beta1.ebuild
index 6131dad5658e..03078b93b802 100644
--- a/kde-base/kmenuedit/kmenuedit-3.5_beta1.ebuild
+++ b/kde-base/kmenuedit/kmenuedit-3.5_beta1.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/kde-base/kmenuedit/kmenuedit-3.5_beta1.ebuild,v 1.1 2005/09/22 19:27:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmenuedit/kmenuedit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE menu editor"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kmenuedit/metadata.xml b/kde-base/kmenuedit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmenuedit/metadata.xml
+++ b/kde-base/kmenuedit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmessedwords/ChangeLog b/kde-base/kmessedwords/ChangeLog
index 8aaac4f6e50e..9148b9b36835 100644
--- a/kde-base/kmessedwords/ChangeLog
+++ b/kde-base/kmessedwords/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for kde-base/kmessedwords
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmessedwords/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmessedwords/ChangeLog,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmessedwords-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmessedwords-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kmessedwords-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ChangeLog:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmessedwords-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmessedwords-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmessedwords-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmessedwords-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmessedwords-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kmessedwords-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmessedwords-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmessedwords-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmessedwords-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmessedwords-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmessedwords-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmessedwords-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmessedwords-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmessedwords-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmessedwords-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmessedwords-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmessedwords-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmessedwords-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmessedwords-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmessedwords-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kmessedwords-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmessedwords-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmessedwords/Manifest b/kde-base/kmessedwords/Manifest
index 2ca3a5af7044..999eb45ba134 100644
--- a/kde-base/kmessedwords/Manifest
+++ b/kde-base/kmessedwords/Manifest
@@ -1,4 +1,16 @@
-MD5 a91fa3e69642d506e1d9b0efad1be740 kmessedwords-3.4.0_alpha1.ebuild 267
-MD5 a91fa3e69642d506e1d9b0efad1be740 kmessedwords-3.4.0_beta1.ebuild 267
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kmessedwords-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kmessedwords-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e1816a45b2798d81ab7ab42f4e55141b ChangeLog 3078
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kmessedwords-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kmessedwords-3.4.2 282
+MD5 2d357c2a7915df58a3b456c06f6e1b9c kmessedwords-3.4.1.ebuild 396
+MD5 c2d1177517cf3827dfbc0c605aa4cf4f kmessedwords-3.4.2.ebuild 407
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlQCntT9W3vfTuoRAiT7AJ4+hrLSrFz/7kBebN1Osps3ZqoOYQCff8EY
+VU9FWQQU7zw4/6j+RJ9SmXk=
+=68Ju
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmessedwords/files/digest-kmessedwords-3.4.1 b/kde-base/kmessedwords/files/digest-kmessedwords-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kmessedwords/files/digest-kmessedwords-3.4.1
+++ b/kde-base/kmessedwords/files/digest-kmessedwords-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kmessedwords/files/digest-kmessedwords-3.4.2 b/kde-base/kmessedwords/files/digest-kmessedwords-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kmessedwords/files/digest-kmessedwords-3.4.2
+++ b/kde-base/kmessedwords/files/digest-kmessedwords-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kmessedwords/kmessedwords-3.4.1.ebuild b/kde-base/kmessedwords/kmessedwords-3.4.1.ebuild
index d7440b22397e..d6d82b6d5ab3 100644
--- a/kde-base/kmessedwords/kmessedwords-3.4.1.ebuild
+++ b/kde-base/kmessedwords/kmessedwords-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmessedwords/kmessedwords-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmessedwords/kmessedwords-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Letter Order Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmessedwords/kmessedwords-3.4.2.ebuild b/kde-base/kmessedwords/kmessedwords-3.4.2.ebuild
index 4019d39dd79c..23aa6d121905 100644
--- a/kde-base/kmessedwords/kmessedwords-3.4.2.ebuild
+++ b/kde-base/kmessedwords/kmessedwords-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmessedwords/kmessedwords-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmessedwords/kmessedwords-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Letter Order Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmessedwords/metadata.xml b/kde-base/kmessedwords/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmessedwords/metadata.xml
+++ b/kde-base/kmessedwords/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmid/ChangeLog b/kde-base/kmid/ChangeLog
index 8f20c1688ea2..fa680b8e6809 100644
--- a/kde-base/kmid/ChangeLog
+++ b/kde-base/kmid/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/kmid
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/ChangeLog,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmid-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmid-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmid-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmid-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmid-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmid-3.5_beta1.ebuild,
+  kmid-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmid-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmid-3.5.0_beta2.ebuild:
+  New version.
+
+*kmid-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmid-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmid-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmid-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kmid-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kmid-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kmid-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmid-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmid-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmid-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmid-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmid-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmid-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmid-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmid-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmid-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmid-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmid-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmid-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmid-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmid-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmid-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmid/Manifest b/kde-base/kmid/Manifest
index 8be3326648c6..1c3291e2613a 100644
--- a/kde-base/kmid/Manifest
+++ b/kde-base/kmid/Manifest
@@ -1,4 +1,22 @@
-MD5 c88865c2d50178f965db594220400ba8 kmid-3.4.0_beta1.ebuild 263
-MD5 c88865c2d50178f965db594220400ba8 kmid-3.4.0_alpha1.ebuild 263
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kmid-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kmid-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 be90aa2cb048204f4e32d8aa579942d2 ChangeLog 3230
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kmid-3.4.1 227
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kmid-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kmid-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kmid-3.5.0_beta2 231
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kmid-3.5_beta1 74
+MD5 8bc3e2056d87c5e50fed9c3798ef720b kmid-3.4.1.ebuild 387
+MD5 1116159599b18168e8367071aa097c50 kmid-3.4.3.ebuild 386
+MD5 3c98c6cb92eb324e32e639bce9e31f91 kmid-3.5.0.ebuild 365
+MD5 fb6d2e0c45b4e8a4d0d2ce4324d87e46 kmid-3.5.0_beta2.ebuild 377
+MD5 04a28dfd2588ea018cf12752dede1e39 kmid-3.5_beta1.ebuild 368
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm0hntT9W3vfTuoRApI8AJ94exn7spKqPzT1DMnqPF/kZgaERgCgpfIo
+wpN3Ew1qn8lMAd23dtHNV8c=
+=Sfja
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmid/files/digest-kmid-3.4.1 b/kde-base/kmid/files/digest-kmid-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kmid/files/digest-kmid-3.4.1
+++ b/kde-base/kmid/files/digest-kmid-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kmid/kmid-3.4.1.ebuild b/kde-base/kmid/kmid-3.4.1.ebuild
index b94c19accc3a..a65b5fb9c316 100644
--- a/kde-base/kmid/kmid-3.4.1.ebuild
+++ b/kde-base/kmid/kmid-3.4.1.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/kde-base/kmid/kmid-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/kmid-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdemultimedia
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE midi player"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmid/kmid-3.4.3.ebuild b/kde-base/kmid/kmid-3.4.3.ebuild
index 43e15df73f61..2f980991367d 100644
--- a/kde-base/kmid/kmid-3.4.3.ebuild
+++ b/kde-base/kmid/kmid-3.4.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/kde-base/kmid/kmid-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/kmid-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE midi player"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kmid/kmid-3.5.0.ebuild b/kde-base/kmid/kmid-3.5.0.ebuild
index 737b382f6e64..4cd246913492 100644
--- a/kde-base/kmid/kmid-3.5.0.ebuild
+++ b/kde-base/kmid/kmid-3.5.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/kde-base/kmid/kmid-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/kmid-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kmid/kmid-3.5.0_beta2.ebuild b/kde-base/kmid/kmid-3.5.0_beta2.ebuild
index 823224fcc96e..aecd882e9e81 100644
--- a/kde-base/kmid/kmid-3.5.0_beta2.ebuild
+++ b/kde-base/kmid/kmid-3.5.0_beta2.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/kde-base/kmid/kmid-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:55 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/kmid-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdemultimedia
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE midi player"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmid/kmid-3.5_beta1.ebuild b/kde-base/kmid/kmid-3.5_beta1.ebuild
index 6d6150bbbf7d..ecab3bf3e90a 100644
--- a/kde-base/kmid/kmid-3.5_beta1.ebuild
+++ b/kde-base/kmid/kmid-3.5_beta1.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/kde-base/kmid/kmid-3.5_beta1.ebuild,v 1.1 2005/09/22 19:29:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmid/kmid-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE midi player"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmid/metadata.xml b/kde-base/kmid/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmid/metadata.xml
+++ b/kde-base/kmid/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmilo/ChangeLog b/kde-base/kmilo/ChangeLog
index a4a59281813b..768d6e576d7c 100644
--- a/kde-base/kmilo/ChangeLog
+++ b/kde-base/kmilo/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for kde-base/kmilo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/ChangeLog,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmilo-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmilo-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmilo-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmilo-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmilo-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmilo-3.5_beta1.ebuild,
+  kmilo-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmilo-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.5.0_beta2.ebuild:
+  New version.
+
+*kmilo-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmilo-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  24 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> kmilo-3.5_beta1.ebuild:
+  Removing powerbook patch as it breaks configure.
+
+*kmilo-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmilo-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmilo-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmilo-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmilo-3.4.2.ebuild:
+  ~alpha keyword.
+
+  04 Aug 2005; Joseph Jezak <josejx@gentoo.org> kmilo-3.4.2.ebuild:
+  Added pbbuttonsd dependency for bug #94731.
+
+  30 Jul 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/configure-fix-kdeutils-powerbook.patch, kmilo-3.4.2.ebuild:
+  Add configure patch for pbbuttonsd detection (#94731).
+
+*kmilo-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmilo-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmilo-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmilo-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmilo-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmilo-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmilo-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmilo-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmilo-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmilo-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmilo-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmilo-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmilo-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmilo-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmilo/Manifest b/kde-base/kmilo/Manifest
index 07b21d5e41f5..8bca299d0428 100644
--- a/kde-base/kmilo/Manifest
+++ b/kde-base/kmilo/Manifest
@@ -1,4 +1,27 @@
-MD5 d2524c0bfa83431327e81673c6e83fcb kmilo-3.4.0_beta1.ebuild 376
-MD5 d2524c0bfa83431327e81673c6e83fcb kmilo-3.4.0_alpha1.ebuild 376
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kmilo-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kmilo-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d1f7f402e3a3b9978d46504a1513b261 ChangeLog 3885
+MD5 5d037ef26f37a68c80d8bf524a4ef444 files/configure-fix-kdeutils-powerbook.patch 949
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kmilo-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-kmilo-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kmilo-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kmilo-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kmilo-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kmilo-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kmilo-3.5_beta1 69
+MD5 f7bc22b6085ca5d2020f9e5a8169920c kmilo-3.4.1.ebuild 491
+MD5 3a890e6248cd4d6ebd5838c4658931f1 kmilo-3.4.2.ebuild 735
+MD5 b55c4b7bdad27cbdb3f3c726784e4ee7 kmilo-3.4.3.ebuild 729
+MD5 3d417b0fa5959dadd5dd4108ac056c02 kmilo-3.5.0.ebuild 649
+MD5 86b5a66e99a5c9552cb87aa7e302f179 kmilo-3.5.0_beta2.ebuild 654
+MD5 01601dd3431e913e80f5381c07f57e24 kmilo-3.5.0_rc1.ebuild 653
+MD5 09c492bfc42d45d9169ae56f92c16178 kmilo-3.5_beta1.ebuild 652
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv0sntT9W3vfTuoRAii9AJ48JVyqxOHxeeFLdxD7DTTgSo7PRQCeNQew
+6lVbgt37FAtWIbCMcT5Vv8Y=
+=XtjV
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmilo/files/digest-kmilo-3.4.1 b/kde-base/kmilo/files/digest-kmilo-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kmilo/files/digest-kmilo-3.4.1
+++ b/kde-base/kmilo/files/digest-kmilo-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kmilo/files/digest-kmilo-3.4.2 b/kde-base/kmilo/files/digest-kmilo-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/kmilo/files/digest-kmilo-3.4.2
+++ b/kde-base/kmilo/files/digest-kmilo-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/kmilo/kmilo-3.4.1.ebuild b/kde-base/kmilo/kmilo-3.4.1.ebuild
index a4af6a19a271..46a5ccb6314a 100644
--- a/kde-base/kmilo/kmilo-3.4.1.ebuild
+++ b/kde-base/kmilo/kmilo-3.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/kde-base/kmilo/kmilo-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -9,5 +9,5 @@ inherit kde-meta eutils
 
 DESCRIPTION="kmilo - a kded module that can be extended to support various types of hardware
 input devices that exist, such as those on keyboards."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmilo/kmilo-3.4.2.ebuild b/kde-base/kmilo/kmilo-3.4.2.ebuild
index 0db03d7b59b8..4899a36d2f45 100644
--- a/kde-base/kmilo/kmilo-3.4.2.ebuild
+++ b/kde-base/kmilo/kmilo-3.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/kde-base/kmilo/kmilo-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -9,5 +9,15 @@ inherit kde-meta eutils
 
 DESCRIPTION="kmilo - a kded module that can be extended to support various types of hardware
 input devices that exist, such as those on keyboards."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pbbuttonsd"
+DEPEND="pbbuttonsd? ( app-laptop/pbbuttonsd )"
+RDEPEND="${DEPEND}"
+
+PATCHES="$FILESDIR/configure-fix-kdeutils-powerbook.patch"
+
+src_compile() {
+	local myconf="$(use_with pbbuttonsd powerbook)"
+
+	kde-meta_src_compile
+}
diff --git a/kde-base/kmilo/kmilo-3.4.3.ebuild b/kde-base/kmilo/kmilo-3.4.3.ebuild
index 55d3a5d39858..ef2943738c3b 100644
--- a/kde-base/kmilo/kmilo-3.4.3.ebuild
+++ b/kde-base/kmilo/kmilo-3.4.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/kde-base/kmilo/kmilo-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -9,7 +9,7 @@ inherit kde-meta eutils
 
 DESCRIPTION="kmilo - a kded module that can be extended to support various types of hardware
 input devices that exist, such as those on keyboards."
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="pbbuttonsd"
 DEPEND="pbbuttonsd? ( app-laptop/pbbuttonsd )"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kmilo/kmilo-3.5.0.ebuild b/kde-base/kmilo/kmilo-3.5.0.ebuild
index 81bd1344b4b0..199987e0b735 100644
--- a/kde-base/kmilo/kmilo-3.5.0.ebuild
+++ b/kde-base/kmilo/kmilo-3.5.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/kde-base/kmilo/kmilo-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kmilo/kmilo-3.5.0_beta2.ebuild b/kde-base/kmilo/kmilo-3.5.0_beta2.ebuild
index 8a2d0c11c375..380bd7be1dc1 100644
--- a/kde-base/kmilo/kmilo-3.5.0_beta2.ebuild
+++ b/kde-base/kmilo/kmilo-3.5.0_beta2.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/kde-base/kmilo/kmilo-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -9,7 +9,7 @@ inherit kde-meta eutils
 
 DESCRIPTION="kmilo - a kded module that can be extended to support various types of hardware
 input devices that exist, such as those on keyboards."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="pbbuttonsd"
 DEPEND="pbbuttonsd? ( app-laptop/pbbuttonsd )"
 RDEPEND="${DEPEND}"
diff --git a/kde-base/kmilo/kmilo-3.5.0_rc1.ebuild b/kde-base/kmilo/kmilo-3.5.0_rc1.ebuild
index 4a93a2bd8e51..2eb9ee96c357 100644
--- a/kde-base/kmilo/kmilo-3.5.0_rc1.ebuild
+++ b/kde-base/kmilo/kmilo-3.5.0_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/kde-base/kmilo/kmilo-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kmilo/kmilo-3.5_beta1.ebuild b/kde-base/kmilo/kmilo-3.5_beta1.ebuild
index 4ced9aaf5729..3f46bc134b37 100644
--- a/kde-base/kmilo/kmilo-3.5_beta1.ebuild
+++ b/kde-base/kmilo/kmilo-3.5_beta1.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/kde-base/kmilo/kmilo-3.5_beta1.ebuild,v 1.1 2005/09/22 19:30:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmilo/kmilo-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:57 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -9,13 +9,11 @@ inherit kde-meta eutils
 
 DESCRIPTION="kmilo - a kded module that can be extended to support various types of hardware
 input devices that exist, such as those on keyboards."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="pbbuttonsd"
 DEPEND="pbbuttonsd? ( app-laptop/pbbuttonsd )"
 RDEPEND="${DEPEND}"
 
-PATCHES="$FILESDIR/configure-fix-kdeutils-powerbook.patch"
-
 src_compile() {
 	local myconf="$(use_with pbbuttonsd powerbook)"
 
diff --git a/kde-base/kmilo/metadata.xml b/kde-base/kmilo/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmilo/metadata.xml
+++ b/kde-base/kmilo/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmines/ChangeLog b/kde-base/kmines/ChangeLog
index b63b6b288dc8..e143374ebc00 100644
--- a/kde-base/kmines/ChangeLog
+++ b/kde-base/kmines/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kmines
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/ChangeLog,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmines-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmines-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmines-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmines-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmines-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmines-3.5_beta1.ebuild,
+  kmines-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmines-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.5.0_beta2.ebuild:
+  New version.
+
+*kmines-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmines-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmines-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmines-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmines-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmines-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmines-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmines-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmines-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmines-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmines-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmines-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmines-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmines-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmines-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmines-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmines-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmines-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmines-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmines-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmines-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmines/Manifest b/kde-base/kmines/Manifest
index ac4631008077..e3030dab1049 100644
--- a/kde-base/kmines/Manifest
+++ b/kde-base/kmines/Manifest
@@ -1,4 +1,26 @@
-MD5 fad0657232d9f0be3de97fb0668f89b7 kmines-3.4.0_beta1.ebuild 434
-MD5 fad0657232d9f0be3de97fb0668f89b7 kmines-3.4.0_alpha1.ebuild 434
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kmines-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kmines-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dcc7773acdf27a4596df0b084c1c8fae ChangeLog 3503
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kmines-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kmines-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kmines-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kmines-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kmines-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kmines-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kmines-3.5_beta1 70
+MD5 883a4eef046f00a1b42a692e9a97aa44 kmines-3.4.1.ebuild 551
+MD5 937699e6622a4e1f1f41a2c308825a81 kmines-3.4.2.ebuild 564
+MD5 5230893a781bc2edcbb07ec2aa29b6ef kmines-3.4.3.ebuild 560
+MD5 503cb3171d09b2153ac73d6bdd10ea65 kmines-3.5.0.ebuild 501
+MD5 ee683e71d132ab5465846558c12e0dbb kmines-3.5.0_beta2.ebuild 506
+MD5 4dd9db64f2848739809256e15d377d56 kmines-3.5.0_rc1.ebuild 505
+MD5 6a16a53d63c627fd456d0a6dae216d1c kmines-3.5_beta1.ebuild 543
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl8IntT9W3vfTuoRAqq2AJ9GJ9Hk5mShGcewT3OBljcOSy2EdgCeJfq9
+xIO8W7pHuF12v1+COPVaQGA=
+=03GI
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmines/files/digest-kmines-3.4.1 b/kde-base/kmines/files/digest-kmines-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kmines/files/digest-kmines-3.4.1
+++ b/kde-base/kmines/files/digest-kmines-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kmines/files/digest-kmines-3.4.2 b/kde-base/kmines/files/digest-kmines-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kmines/files/digest-kmines-3.4.2
+++ b/kde-base/kmines/files/digest-kmines-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kmines/kmines-3.4.1.ebuild b/kde-base/kmines/kmines-3.4.1.ebuild
index c42fa84a1dde..1bcc1e5bfac1 100644
--- a/kde-base/kmines/kmines-3.4.1.ebuild
+++ b/kde-base/kmines/kmines-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kmines/kmines-3.4.2.ebuild b/kde-base/kmines/kmines-3.4.2.ebuild
index 928900cf4268..e200b6734fff 100644
--- a/kde-base/kmines/kmines-3.4.2.ebuild
+++ b/kde-base/kmines/kmines-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kmines/kmines-3.4.3.ebuild b/kde-base/kmines/kmines-3.4.3.ebuild
index 184323f450c7..e46495b2778f 100644
--- a/kde-base/kmines/kmines-3.4.3.ebuild
+++ b/kde-base/kmines/kmines-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kmines/kmines-3.5.0.ebuild b/kde-base/kmines/kmines-3.5.0.ebuild
index 59ea1ae5ec99..7c301b5a0c99 100644
--- a/kde-base/kmines/kmines-3.5.0.ebuild
+++ b/kde-base/kmines/kmines-3.5.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/kde-base/kmines/kmines-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmines/kmines-3.5.0_beta2.ebuild b/kde-base/kmines/kmines-3.5.0_beta2.ebuild
index 73fa34aef497..4d04c509ae20 100644
--- a/kde-base/kmines/kmines-3.5.0_beta2.ebuild
+++ b/kde-base/kmines/kmines-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kmines/kmines-3.5.0_rc1.ebuild b/kde-base/kmines/kmines-3.5.0_rc1.ebuild
index 238613a153a5..e6cd4a73cecd 100644
--- a/kde-base/kmines/kmines-3.5.0_rc1.ebuild
+++ b/kde-base/kmines/kmines-3.5.0_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/kde-base/kmines/kmines-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmines/kmines-3.5_beta1.ebuild b/kde-base/kmines/kmines-3.5_beta1.ebuild
index 80c4440430d3..d23dda2d91ec 100644
--- a/kde-base/kmines/kmines-3.5_beta1.ebuild
+++ b/kde-base/kmines/kmines-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.5_beta1.ebuild,v 1.1 2005/09/22 19:31:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmines/kmines-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KMines is a classic mine sweeper game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kmines/metadata.xml b/kde-base/kmines/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmines/metadata.xml
+++ b/kde-base/kmines/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmix/ChangeLog b/kde-base/kmix/ChangeLog
index 4e5859462d52..ff678cc2e81e 100644
--- a/kde-base/kmix/ChangeLog
+++ b/kde-base/kmix/ChangeLog
@@ -1,6 +1,103 @@
 # ChangeLog for kde-base/kmix
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/ChangeLog,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmix-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmix-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmix-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmix-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmix-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmix-3.5_beta1.ebuild,
+  kmix-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmix-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.5.0_beta2.ebuild:
+  New version.
+
+*kmix-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmix-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmix-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kmix-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmix-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmix-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmix-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmix-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmix-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmix-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmix-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmix-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmix-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmix-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmix-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmix-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmix-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmix-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmix-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmix-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmix/Manifest b/kde-base/kmix/Manifest
index 933769cd4139..b9694376d64c 100644
--- a/kde-base/kmix/Manifest
+++ b/kde-base/kmix/Manifest
@@ -1,4 +1,26 @@
-MD5 3fd31a1b73d67c1583f3642ed21e027f kmix-3.4.0_alpha1.ebuild 520
-MD5 3fd31a1b73d67c1583f3642ed21e027f kmix-3.4.0_beta1.ebuild 520
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kmix-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kmix-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 62da722149ff9b8e215438dbdf04023b ChangeLog 3390
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kmix-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-kmix-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kmix-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kmix-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kmix-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kmix-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kmix-3.5_beta1 74
+MD5 efd480324bf6d05ab8cfe9d653ab3126 kmix-3.4.1.ebuild 632
+MD5 e70691f209477d688d1aaf1c289287e5 kmix-3.4.2.ebuild 645
+MD5 2bcebfccf41c7787738c5445c9733863 kmix-3.4.3.ebuild 642
+MD5 b3bbd97569732d326a8093b746234888 kmix-3.5.0.ebuild 621
+MD5 7292154f54cf324257b1832d60bc10a7 kmix-3.5.0_beta2.ebuild 626
+MD5 690ae0f5826f424d0557ee74fe19acd8 kmix-3.5.0_rc1.ebuild 625
+MD5 7e574915603a910245342bc313240073 kmix-3.5_beta1.ebuild 624
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm1ZntT9W3vfTuoRApkpAKCGEwRQCD8k7FtthyP3DdlFV6R70wCfbBBZ
+1yNKNadgjqHQHWag3uuNWOw=
+=vadd
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmix/files/digest-kmix-3.4.1 b/kde-base/kmix/files/digest-kmix-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kmix/files/digest-kmix-3.4.1
+++ b/kde-base/kmix/files/digest-kmix-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kmix/files/digest-kmix-3.4.2 b/kde-base/kmix/files/digest-kmix-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/kmix/files/digest-kmix-3.4.2
+++ b/kde-base/kmix/files/digest-kmix-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kmix/kmix-3.4.1.ebuild b/kde-base/kmix/kmix-3.4.1.ebuild
index 7146bb101010..93e81d982937 100644
--- a/kde-base/kmix/kmix-3.4.1.ebuild
+++ b/kde-base/kmix/kmix-3.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/kde-base/kmix/kmix-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts mixer gui"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="alsa"
 DEPEND="alsa? ( media-libs/alsa-lib )"
 KMEXTRACTONLY="kscd/configure.in.in"
diff --git a/kde-base/kmix/kmix-3.4.2.ebuild b/kde-base/kmix/kmix-3.4.2.ebuild
index 582ebbfc422f..f37f48ad5977 100644
--- a/kde-base/kmix/kmix-3.4.2.ebuild
+++ b/kde-base/kmix/kmix-3.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/kde-base/kmix/kmix-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts mixer gui"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="alsa"
 DEPEND="alsa? ( media-libs/alsa-lib )"
 KMEXTRACTONLY="kscd/configure.in.in"
diff --git a/kde-base/kmix/kmix-3.4.3.ebuild b/kde-base/kmix/kmix-3.4.3.ebuild
index 0a84ef525160..abaf5f5e7247 100644
--- a/kde-base/kmix/kmix-3.4.3.ebuild
+++ b/kde-base/kmix/kmix-3.4.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/kde-base/kmix/kmix-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts mixer gui"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="alsa"
 DEPEND="alsa? ( media-libs/alsa-lib )"
 KMEXTRACTONLY="kscd/configure.in.in"
@@ -18,4 +18,4 @@ src_compile() {
 	use alsa && myconf="$myconf --with-alsa --with-arts-alsa" || myconf="$myconf --without-alsa --disable-alsa"
 
 	kde-meta_src_compile
-}
\ No newline at end of file
+}
diff --git a/kde-base/kmix/kmix-3.5.0.ebuild b/kde-base/kmix/kmix-3.5.0.ebuild
index 837c5565725d..014c7a9beb78 100644
--- a/kde-base/kmix/kmix-3.5.0.ebuild
+++ b/kde-base/kmix/kmix-3.5.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/kde-base/kmix/kmix-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kmix/kmix-3.5.0_beta2.ebuild b/kde-base/kmix/kmix-3.5.0_beta2.ebuild
index 62401f331fdc..c6b6613ea72b 100644
--- a/kde-base/kmix/kmix-3.5.0_beta2.ebuild
+++ b/kde-base/kmix/kmix-3.5.0_beta2.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/kde-base/kmix/kmix-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts mixer gui"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa"
 DEPEND="alsa? ( media-libs/alsa-lib )"
 KMEXTRACTONLY="kscd/configure.in.in"
diff --git a/kde-base/kmix/kmix-3.5.0_rc1.ebuild b/kde-base/kmix/kmix-3.5.0_rc1.ebuild
index aeba17b2753b..3ffe0dbf43f7 100644
--- a/kde-base/kmix/kmix-3.5.0_rc1.ebuild
+++ b/kde-base/kmix/kmix-3.5.0_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/kde-base/kmix/kmix-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kmix/kmix-3.5_beta1.ebuild b/kde-base/kmix/kmix-3.5_beta1.ebuild
index 663ab3e4ee18..03033dee762b 100644
--- a/kde-base/kmix/kmix-3.5_beta1.ebuild
+++ b/kde-base/kmix/kmix-3.5_beta1.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/kde-base/kmix/kmix-3.5_beta1.ebuild,v 1.1 2005/09/22 19:32:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmix/kmix-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:17 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="aRts mixer gui"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa"
 DEPEND="alsa? ( media-libs/alsa-lib )"
 KMEXTRACTONLY="kscd/configure.in.in"
diff --git a/kde-base/kmix/metadata.xml b/kde-base/kmix/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmix/metadata.xml
+++ b/kde-base/kmix/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmobile/ChangeLog b/kde-base/kmobile/ChangeLog
index fbdf7a5adcad..a92b4d8e8b9e 100644
--- a/kde-base/kmobile/ChangeLog
+++ b/kde-base/kmobile/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for kde-base/kmobile
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmobile/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmobile/ChangeLog,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmobile-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  -files/kmobile-3.5.0_beta2-fix-compilation.diff,
+  -kmobile-3.5_beta1.ebuild, -kmobile-3.5.0_beta2.ebuild,
+  -kmobile-3.5.0_rc1.ebuild, -kmobile-3.5.0.ebuild:
+  Remove ebuilds for kmobile-3.5.x (#112589).
+
+*kmobile-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmobile-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmobile-3.5_beta1.ebuild,
+  kmobile-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  16 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  +files/kmobile-3.5.0_beta2-fix-compilation.diff,
+  kmobile-3.5.0_beta2.ebuild:
+  Added patch to fix compilation.
+
+*kmobile-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.5.0_beta2.ebuild:
+  New version.
+
+*kmobile-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.4.3.ebuild:
+  New version.
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  kmobile-3.5_beta1.ebuild:
+  Add dependency over libkcal and symlinked in soruce code as per bug #107977.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmobile-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmobile-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmobile-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmobile-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmobile-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kmobile-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+*kmobile-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmobile-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmobile-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmobile-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmobile-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmobile-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmobile-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmobile-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmobile-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmobile/Manifest b/kde-base/kmobile/Manifest
index 09eb7f01f0b8..edb7d13ad6b0 100644
--- a/kde-base/kmobile/Manifest
+++ b/kde-base/kmobile/Manifest
@@ -1,4 +1,18 @@
-MD5 899c72702423b27889bc05f124d6ed16 kmobile-3.4.0_alpha1.ebuild 296
-MD5 899c72702423b27889bc05f124d6ed16 kmobile-3.4.0_beta1.ebuild 296
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kmobile-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-kmobile-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0ee1e032ccb839ec8498b04245ad93a4 ChangeLog 3444
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmobile-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmobile-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kmobile-3.4.3 67
+MD5 0bfc5ae2f7e3bb5ddb20e0b42839dfc2 kmobile-3.4.1.ebuild 418
+MD5 e7b2221358d3558e1277bab295038faa kmobile-3.4.2.ebuild 421
+MD5 7f14b958563142fc9e6fe004b289d6b0 kmobile-3.4.3.ebuild 416
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvVwntT9W3vfTuoRAoK4AJ4sL6tyxSDqw1PviJE8hUsGsF5XIQCfbRtY
+ZJ9DYA0XyO++th0HhearLXQ=
+=Ch80
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmobile/files/digest-kmobile-3.4.1 b/kde-base/kmobile/files/digest-kmobile-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kmobile/files/digest-kmobile-3.4.1
+++ b/kde-base/kmobile/files/digest-kmobile-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kmobile/files/digest-kmobile-3.4.2 b/kde-base/kmobile/files/digest-kmobile-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kmobile/files/digest-kmobile-3.4.2
+++ b/kde-base/kmobile/files/digest-kmobile-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kmobile/kmobile-3.4.1.ebuild b/kde-base/kmobile/kmobile-3.4.1.ebuild
index 9ddd45e87f7d..2e3f8fc06682 100644
--- a/kde-base/kmobile/kmobile-3.4.1.ebuild
+++ b/kde-base/kmobile/kmobile-3.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/kde-base/kmobile/kmobile-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmobile/kmobile-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mobile devices manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
 IUSE=""
 DEPEND="app-mobilephone/gnokii"
diff --git a/kde-base/kmobile/kmobile-3.4.2.ebuild b/kde-base/kmobile/kmobile-3.4.2.ebuild
index 23fd37552096..bc1035b54980 100644
--- a/kde-base/kmobile/kmobile-3.4.2.ebuild
+++ b/kde-base/kmobile/kmobile-3.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/kde-base/kmobile/kmobile-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmobile/kmobile-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kmobile/kmobile-3.4.3.ebuild b/kde-base/kmobile/kmobile-3.4.3.ebuild
index 1594e355a4f4..3244a6fa206e 100644
--- a/kde-base/kmobile/kmobile-3.4.3.ebuild
+++ b/kde-base/kmobile/kmobile-3.4.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/kde-base/kmobile/kmobile-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmobile/kmobile-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mobile devices manager"
-KEYWORDS=" ~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
 IUSE=""
 DEPEND="app-mobilephone/gnokii"
diff --git a/kde-base/kmobile/metadata.xml b/kde-base/kmobile/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmobile/metadata.xml
+++ b/kde-base/kmobile/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmoon/ChangeLog b/kde-base/kmoon/ChangeLog
index f7ff23f626e1..be1a6042b580 100644
--- a/kde-base/kmoon/ChangeLog
+++ b/kde-base/kmoon/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kmoon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/ChangeLog,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmoon-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmoon-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmoon-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmoon-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmoon-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmoon-3.5_beta1.ebuild,
+  kmoon-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmoon-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.5.0_beta2.ebuild:
+  New version.
+
+*kmoon-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmoon-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmoon-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmoon-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmoon-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmoon-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmoon-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmoon-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmoon-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmoon-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmoon-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmoon-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmoon-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmoon-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmoon-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmoon-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmoon-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmoon-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmoon-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmoon-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmoon-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmoon/Manifest b/kde-base/kmoon/Manifest
index 43891270131f..0896fa2426bb 100644
--- a/kde-base/kmoon/Manifest
+++ b/kde-base/kmoon/Manifest
@@ -1,4 +1,26 @@
-MD5 b93c00a47d4e36f2398b6642406ee557 kmoon-3.4.0_beta1.ebuild 267
-MD5 b93c00a47d4e36f2398b6642406ee557 kmoon-3.4.0_alpha1.ebuild 267
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-kmoon-3.4.0_beta1 212
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-kmoon-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f51f9a42ec282f52e9f4698529b043ad ChangeLog 3465
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-kmoon-3.4.1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-kmoon-3.4.2 282
+MD5 4792409083f3033f880840748c1ec31a files/digest-kmoon-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-kmoon-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-kmoon-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-kmoon-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-kmoon-3.5_beta1 68
+MD5 d28639bb2adf6ef1962a01badc8ddf97 kmoon-3.4.1.ebuild 382
+MD5 ba862c567ee76fcf8c0cf25e23731df5 kmoon-3.4.2.ebuild 395
+MD5 095e428c8d06510bab2697283530f5b4 kmoon-3.4.3.ebuild 392
+MD5 f1a365802733e36703998835ca111835 kmoon-3.5.0.ebuild 371
+MD5 cdb5837f446612b1a0563ab4ca6358af kmoon-3.5.0_beta2.ebuild 376
+MD5 144340ce4b2b664357de260d92d14662 kmoon-3.5.0_rc1.ebuild 375
+MD5 cd69f09b2c77950264fc8828fb5a9061 kmoon-3.5_beta1.ebuild 374
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvh2ntT9W3vfTuoRAsnqAJ49/bXznL14pJBzPZPYRmgcPsyVtgCeKH4c
+udMy/zr9zsfYyg7E0jYpL10=
+=3Rt6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmoon/files/digest-kmoon-3.4.1 b/kde-base/kmoon/files/digest-kmoon-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/kmoon/files/digest-kmoon-3.4.1
+++ b/kde-base/kmoon/files/digest-kmoon-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/kmoon/files/digest-kmoon-3.4.2 b/kde-base/kmoon/files/digest-kmoon-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/kmoon/files/digest-kmoon-3.4.2
+++ b/kde-base/kmoon/files/digest-kmoon-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/kmoon/kmoon-3.4.1.ebuild b/kde-base/kmoon/kmoon-3.4.1.ebuild
index b41628b9dfa0..6902f5f2fde6 100644
--- a/kde-base/kmoon/kmoon-3.4.1.ebuild
+++ b/kde-base/kmoon/kmoon-3.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/kde-base/kmoon/kmoon-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE moon phase display"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kmoon/kmoon-3.4.2.ebuild b/kde-base/kmoon/kmoon-3.4.2.ebuild
index 0e3b73245e69..f922e382c06a 100644
--- a/kde-base/kmoon/kmoon-3.4.2.ebuild
+++ b/kde-base/kmoon/kmoon-3.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/kde-base/kmoon/kmoon-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE moon phase display"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kmoon/kmoon-3.4.3.ebuild b/kde-base/kmoon/kmoon-3.4.3.ebuild
index 3d9b7fd708a2..2f8a8f05f51b 100644
--- a/kde-base/kmoon/kmoon-3.4.3.ebuild
+++ b/kde-base/kmoon/kmoon-3.4.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/kde-base/kmoon/kmoon-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE moon phase display"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND=""
\ No newline at end of file
+DEPEND=""
diff --git a/kde-base/kmoon/kmoon-3.5.0.ebuild b/kde-base/kmoon/kmoon-3.5.0.ebuild
index a05419a7512c..068beb833625 100644
--- a/kde-base/kmoon/kmoon-3.5.0.ebuild
+++ b/kde-base/kmoon/kmoon-3.5.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/kde-base/kmoon/kmoon-3.5.0.ebuild,v 1.1 2005/11/22 22:14:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kmoon/kmoon-3.5.0_beta2.ebuild b/kde-base/kmoon/kmoon-3.5.0_beta2.ebuild
index 2abaccdbde65..79e7ff170904 100644
--- a/kde-base/kmoon/kmoon-3.5.0_beta2.ebuild
+++ b/kde-base/kmoon/kmoon-3.5.0_beta2.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/kde-base/kmoon/kmoon-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE moon phase display"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kmoon/kmoon-3.5.0_rc1.ebuild b/kde-base/kmoon/kmoon-3.5.0_rc1.ebuild
index 6d65b3cc8e1b..e558efba9d53 100644
--- a/kde-base/kmoon/kmoon-3.5.0_rc1.ebuild
+++ b/kde-base/kmoon/kmoon-3.5.0_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/kde-base/kmoon/kmoon-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kmoon/kmoon-3.5_beta1.ebuild b/kde-base/kmoon/kmoon-3.5_beta1.ebuild
index a811b7010d31..aef8c37b3320 100644
--- a/kde-base/kmoon/kmoon-3.5_beta1.ebuild
+++ b/kde-base/kmoon/kmoon-3.5_beta1.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/kde-base/kmoon/kmoon-3.5_beta1.ebuild,v 1.1 2005/09/22 19:34:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmoon/kmoon-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE moon phase display"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kmoon/metadata.xml b/kde-base/kmoon/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmoon/metadata.xml
+++ b/kde-base/kmoon/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmousetool/ChangeLog b/kde-base/kmousetool/ChangeLog
index 540286000bc2..ef953b2743f0 100644
--- a/kde-base/kmousetool/ChangeLog
+++ b/kde-base/kmousetool/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/kmousetool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/ChangeLog,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmousetool-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmousetool-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kmousetool-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmousetool-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmousetool-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmousetool-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmousetool-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmousetool-3.5_beta1.ebuild,
+  kmousetool-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmousetool-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmousetool-3.5.0_beta2.ebuild:
+  New version.
+
+*kmousetool-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmousetool-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmousetool-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmousetool-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmousetool-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmousetool-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmousetool-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kmousetool-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmousetool-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmousetool-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmousetool-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmousetool-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmousetool-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmousetool-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmousetool-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmousetool-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmousetool-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmousetool-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmousetool-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmousetool-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmousetool-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmousetool-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kmousetool-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmousetool-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmousetool/Manifest b/kde-base/kmousetool/Manifest
index e59391e8d3f5..87606c3550ed 100644
--- a/kde-base/kmousetool/Manifest
+++ b/kde-base/kmousetool/Manifest
@@ -1,4 +1,16 @@
-MD5 26321f761b592f03ab44d2f692c97854 kmousetool-3.4.0_alpha1.ebuild 316
-MD5 26321f761b592f03ab44d2f692c97854 kmousetool-3.4.0_beta1.ebuild 316
-MD5 c5420b3dc1848daf59305d1f2ff74a83 files/digest-kmousetool-3.4.0_beta1 240
-MD5 66b4de7b06e1e62dd8abc1e60ec1187b files/digest-kmousetool-3.4.0_alpha1 77
+MD5 7eaf204970e6b8b508cde403d90e50c8 ChangeLog 3665
+MD5 6d95fc66445c9437b2e82429eaad1d0a kmousetool-3.4.1.ebuild 430
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 8ec595992afa616499f9582a9684c792 kmousetool-3.4.2.ebuild 443
+MD5 bd866f20b54c24fb346f84916ecff905 kmousetool-3.5_beta1.ebuild 422
+MD5 26a2242e861f34e8180fc11c905a6006 kmousetool-3.4.3.ebuild 441
+MD5 194280870d1daae84631226f5842308e kmousetool-3.5.0_beta2.ebuild 424
+MD5 eb479880cd8c31a42a0c777b16f0960d kmousetool-3.5.0_rc1.ebuild 423
+MD5 dbc04a426bf4ef658127c547b39cd396 kmousetool-3.5.0.ebuild 419
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-kmousetool-3.4.1 236
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-kmousetool-3.4.2 320
+MD5 174790e90449897638084f6c4bea761f files/digest-kmousetool-3.5_beta1 77
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kmousetool-3.4.3 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-kmousetool-3.5.0_beta2 240
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-kmousetool-3.5.0_rc1 332
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kmousetool-3.5.0 76
diff --git a/kde-base/kmousetool/files/digest-kmousetool-3.4.1 b/kde-base/kmousetool/files/digest-kmousetool-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/kmousetool/files/digest-kmousetool-3.4.1
+++ b/kde-base/kmousetool/files/digest-kmousetool-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/kmousetool/files/digest-kmousetool-3.4.2 b/kde-base/kmousetool/files/digest-kmousetool-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/kmousetool/files/digest-kmousetool-3.4.2
+++ b/kde-base/kmousetool/files/digest-kmousetool-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/kmousetool/kmousetool-3.4.1.ebuild b/kde-base/kmousetool/kmousetool-3.4.1.ebuild
index 4e07b6f1485d..7357a7eaa33c 100644
--- a/kde-base/kmousetool/kmousetool-3.4.1.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.4.1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE accessibility tool: translates mouse hovering into clicks"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kmousetool/kmousetool-3.4.2.ebuild b/kde-base/kmousetool/kmousetool-3.4.2.ebuild
index 44c3d47964b1..1d9467d121ab 100644
--- a/kde-base/kmousetool/kmousetool-3.4.2.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.4.2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE accessibility tool: translates mouse hovering into clicks"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kmousetool/kmousetool-3.4.3.ebuild b/kde-base/kmousetool/kmousetool-3.4.3.ebuild
index 0148d094614e..80c5cac171e9 100644
--- a/kde-base/kmousetool/kmousetool-3.4.3.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.4.3.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE accessibility tool: translates mouse hovering into clicks"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kmousetool/kmousetool-3.5.0.ebuild b/kde-base/kmousetool/kmousetool-3.5.0.ebuild
index bbdabc61b14a..6328bec59058 100644
--- a/kde-base/kmousetool/kmousetool-3.5.0.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.5.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/kde-base/kmousetool/kmousetool-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmousetool/kmousetool-3.5.0_beta2.ebuild b/kde-base/kmousetool/kmousetool-3.5.0_beta2.ebuild
index e103ba409319..42386463652c 100644
--- a/kde-base/kmousetool/kmousetool-3.5.0_beta2.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.5.0_beta2.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE accessibility tool: translates mouse hovering into clicks"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kmousetool/kmousetool-3.5.0_rc1.ebuild b/kde-base/kmousetool/kmousetool-3.5.0_rc1.ebuild
index f4af7cbc3ee1..83e166572d1f 100644
--- a/kde-base/kmousetool/kmousetool-3.5.0_rc1.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.5.0_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/kde-base/kmousetool/kmousetool-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmousetool/kmousetool-3.5_beta1.ebuild b/kde-base/kmousetool/kmousetool-3.5_beta1.ebuild
index 5622535dc20a..f43cead2c177 100644
--- a/kde-base/kmousetool/kmousetool-3.5_beta1.ebuild
+++ b/kde-base/kmousetool/kmousetool-3.5_beta1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.5_beta1.ebuild,v 1.1 2005/09/22 19:35:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmousetool/kmousetool-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE accessibility tool: translates mouse hovering into clicks"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/kmousetool/metadata.xml b/kde-base/kmousetool/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmousetool/metadata.xml
+++ b/kde-base/kmousetool/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmouth/ChangeLog b/kde-base/kmouth/ChangeLog
index ee2ab946cf41..51b3c7666634 100644
--- a/kde-base/kmouth/ChangeLog
+++ b/kde-base/kmouth/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kmouth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/ChangeLog,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmouth-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmouth-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmouth-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmouth-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmouth-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmouth-3.5_beta1.ebuild,
+  kmouth-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmouth-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.5.0_beta2.ebuild:
+  New version.
+
+*kmouth-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmouth-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmouth-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmouth-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmouth-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmouth-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmouth-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmouth-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmouth-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmouth-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmouth-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmouth-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmouth-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmouth-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmouth-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmouth-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmouth-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmouth-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmouth-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmouth-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmouth-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmouth/Manifest b/kde-base/kmouth/Manifest
index 3d03531a5138..0fcdf6b5ce4d 100644
--- a/kde-base/kmouth/Manifest
+++ b/kde-base/kmouth/Manifest
@@ -1,4 +1,16 @@
-MD5 3573cbab6624208885cb0331c487c910 kmouth-3.4.0_alpha1.ebuild 308
-MD5 3573cbab6624208885cb0331c487c910 kmouth-3.4.0_beta1.ebuild 308
-MD5 c5420b3dc1848daf59305d1f2ff74a83 files/digest-kmouth-3.4.0_beta1 240
-MD5 66b4de7b06e1e62dd8abc1e60ec1187b files/digest-kmouth-3.4.0_alpha1 77
+MD5 92d75da7ad2f0430774c953be1c8b23e ChangeLog 3505
+MD5 a9a1d3eeb3bf7257eae053ed10ab6910 kmouth-3.4.1.ebuild 425
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 5d4e24e370f2f2ac4b9629b2efb94908 kmouth-3.4.2.ebuild 438
+MD5 8646dcb772239829c4f30d31a1f8e2c9 kmouth-3.5_beta1.ebuild 417
+MD5 5d67e0dcfb68786abeedaaf6d7d82958 kmouth-3.4.3.ebuild 436
+MD5 df925cc7491a281f0ee8b8a2df756ada kmouth-3.5.0_beta2.ebuild 419
+MD5 80a4e7e54ae3e94863adbd7a24a5c888 kmouth-3.5.0_rc1.ebuild 418
+MD5 c997cc2dc6276f907e040103e39a2d0e kmouth-3.5.0.ebuild 414
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-kmouth-3.4.1 236
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-kmouth-3.4.2 320
+MD5 174790e90449897638084f6c4bea761f files/digest-kmouth-3.5_beta1 77
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kmouth-3.4.3 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-kmouth-3.5.0_beta2 240
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-kmouth-3.5.0_rc1 332
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kmouth-3.5.0 76
diff --git a/kde-base/kmouth/files/digest-kmouth-3.4.1 b/kde-base/kmouth/files/digest-kmouth-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/kmouth/files/digest-kmouth-3.4.1
+++ b/kde-base/kmouth/files/digest-kmouth-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/kmouth/files/digest-kmouth-3.4.2 b/kde-base/kmouth/files/digest-kmouth-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/kmouth/files/digest-kmouth-3.4.2
+++ b/kde-base/kmouth/files/digest-kmouth-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/kmouth/kmouth-3.4.1.ebuild b/kde-base/kmouth/kmouth-3.4.1.ebuild
index d44012e5a814..ef0ad4861ac2 100644
--- a/kde-base/kmouth/kmouth-3.4.1.ebuild
+++ b/kde-base/kmouth/kmouth-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A type-and-say front end for speech synthesizers"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmouth/kmouth-3.4.2.ebuild b/kde-base/kmouth/kmouth-3.4.2.ebuild
index 86652698bbd0..111603cc0440 100644
--- a/kde-base/kmouth/kmouth-3.4.2.ebuild
+++ b/kde-base/kmouth/kmouth-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A type-and-say front end for speech synthesizers"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmouth/kmouth-3.4.3.ebuild b/kde-base/kmouth/kmouth-3.4.3.ebuild
index cb709f9efeb7..493404f40533 100644
--- a/kde-base/kmouth/kmouth-3.4.3.ebuild
+++ b/kde-base/kmouth/kmouth-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A type-and-say front end for speech synthesizers"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmouth/kmouth-3.5.0.ebuild b/kde-base/kmouth/kmouth-3.5.0.ebuild
index a46fef37cd8f..b8a05467c5b5 100644
--- a/kde-base/kmouth/kmouth-3.5.0.ebuild
+++ b/kde-base/kmouth/kmouth-3.5.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/kde-base/kmouth/kmouth-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmouth/kmouth-3.5.0_beta2.ebuild b/kde-base/kmouth/kmouth-3.5.0_beta2.ebuild
index 648e8b5d79f1..7b89c4e30996 100644
--- a/kde-base/kmouth/kmouth-3.5.0_beta2.ebuild
+++ b/kde-base/kmouth/kmouth-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A type-and-say front end for speech synthesizers"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmouth/kmouth-3.5.0_rc1.ebuild b/kde-base/kmouth/kmouth-3.5.0_rc1.ebuild
index 2e85b6229437..5e90f55679c5 100644
--- a/kde-base/kmouth/kmouth-3.5.0_rc1.ebuild
+++ b/kde-base/kmouth/kmouth-3.5.0_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/kde-base/kmouth/kmouth-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmouth/kmouth-3.5_beta1.ebuild b/kde-base/kmouth/kmouth-3.5_beta1.ebuild
index dfa104f8b0be..5ef6a299b96d 100644
--- a/kde-base/kmouth/kmouth-3.5_beta1.ebuild
+++ b/kde-base/kmouth/kmouth-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.5_beta1.ebuild,v 1.1 2005/09/22 19:36:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmouth/kmouth-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A type-and-say front end for speech synthesizers"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmouth/metadata.xml b/kde-base/kmouth/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmouth/metadata.xml
+++ b/kde-base/kmouth/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmplot/ChangeLog b/kde-base/kmplot/ChangeLog
index d202d8609009..2f91dc8d56e9 100644
--- a/kde-base/kmplot/ChangeLog
+++ b/kde-base/kmplot/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kmplot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.1 2005/01/15 02:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/ChangeLog,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmplot-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmplot-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmplot-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmplot-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kmplot-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmplot-3.5_beta1.ebuild,
+  kmplot-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmplot-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.5.0_beta2.ebuild:
+  New version.
+
+*kmplot-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmplot-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmplot-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmplot-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmplot-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmplot-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmplot-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmplot-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmplot-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kmplot-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmplot-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmplot-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmplot-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmplot-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmplot-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmplot-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kmplot-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmplot-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kmplot-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmplot-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmplot-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmplot/Manifest b/kde-base/kmplot/Manifest
index 2074b64ae691..51a3defd32e2 100644
--- a/kde-base/kmplot/Manifest
+++ b/kde-base/kmplot/Manifest
@@ -1,4 +1,26 @@
-MD5 1f5e57eec3bb11860f179a258547a51b kmplot-3.4.0_alpha1.ebuild 282
-MD5 1f5e57eec3bb11860f179a258547a51b kmplot-3.4.0_beta1.ebuild 282
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kmplot-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kmplot-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 58ab28791af2eaf9241d1b5c849b3f99 ChangeLog 3503
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kmplot-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kmplot-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kmplot-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kmplot-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kmplot-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kmplot-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kmplot-3.5_beta1 68
+MD5 065052692eb7e59f51e63fd0a3f69ff3 kmplot-3.4.1.ebuild 399
+MD5 fda73ec9cd11ff1b3a8c94c2f57ab4c2 kmplot-3.4.2.ebuild 412
+MD5 f84b1e3bad9374c28f8d9b8d9f7b04c0 kmplot-3.4.3.ebuild 408
+MD5 cb6c4f73b2005af50bae7a122e251b11 kmplot-3.5.0.ebuild 388
+MD5 bfd5d16860cb8187a4d6179e111bb711 kmplot-3.5.0_beta2.ebuild 393
+MD5 3fde74005c1b0e18d0bdf76dd73d1dcc kmplot-3.5.0_rc1.ebuild 392
+MD5 6b3809bc97a43cbc1bd91944011144b0 kmplot-3.5_beta1.ebuild 391
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlQ9ntT9W3vfTuoRAlbCAJ9UW4AFj4aKevIXjhDksueu7sOXzACdGys0
+SH3NWZsOLi/tADcDpVZ/7Yc=
+=9nsc
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmplot/files/digest-kmplot-3.4.1 b/kde-base/kmplot/files/digest-kmplot-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kmplot/files/digest-kmplot-3.4.1
+++ b/kde-base/kmplot/files/digest-kmplot-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kmplot/files/digest-kmplot-3.4.2 b/kde-base/kmplot/files/digest-kmplot-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kmplot/files/digest-kmplot-3.4.2
+++ b/kde-base/kmplot/files/digest-kmplot-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kmplot/kmplot-3.4.1.ebuild b/kde-base/kmplot/kmplot-3.4.1.ebuild
index b75e7d217ac0..fd5fded2ddd5 100644
--- a/kde-base/kmplot/kmplot-3.4.1.ebuild
+++ b/kde-base/kmplot/kmplot-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmplot/kmplot-3.4.2.ebuild b/kde-base/kmplot/kmplot-3.4.2.ebuild
index 5702e212d59c..29a76d338a60 100644
--- a/kde-base/kmplot/kmplot-3.4.2.ebuild
+++ b/kde-base/kmplot/kmplot-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmplot/kmplot-3.4.3.ebuild b/kde-base/kmplot/kmplot-3.4.3.ebuild
index 839fa60c4d90..50666be68f6c 100644
--- a/kde-base/kmplot/kmplot-3.4.3.ebuild
+++ b/kde-base/kmplot/kmplot-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmplot/kmplot-3.5.0.ebuild b/kde-base/kmplot/kmplot-3.5.0.ebuild
index 05960066c42d..6c390c6ac892 100644
--- a/kde-base/kmplot/kmplot-3.5.0.ebuild
+++ b/kde-base/kmplot/kmplot-3.5.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/kde-base/kmplot/kmplot-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmplot/kmplot-3.5.0_beta2.ebuild b/kde-base/kmplot/kmplot-3.5.0_beta2.ebuild
index 89049e2bdf84..6b7da84f6ecd 100644
--- a/kde-base/kmplot/kmplot-3.5.0_beta2.ebuild
+++ b/kde-base/kmplot/kmplot-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmplot/kmplot-3.5.0_rc1.ebuild b/kde-base/kmplot/kmplot-3.5.0_rc1.ebuild
index 2bab06b2418d..3db43c77753c 100644
--- a/kde-base/kmplot/kmplot-3.5.0_rc1.ebuild
+++ b/kde-base/kmplot/kmplot-3.5.0_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/kde-base/kmplot/kmplot-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kmplot/kmplot-3.5_beta1.ebuild b/kde-base/kmplot/kmplot-3.5_beta1.ebuild
index ddaec27ee707..fb4167e0f2a7 100644
--- a/kde-base/kmplot/kmplot-3.5_beta1.ebuild
+++ b/kde-base/kmplot/kmplot-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.5_beta1.ebuild,v 1.1 2005/09/22 19:37:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmplot/kmplot-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:10 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Mathematical function plotter for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kmplot/metadata.xml b/kde-base/kmplot/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmplot/metadata.xml
+++ b/kde-base/kmplot/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmrml/ChangeLog b/kde-base/kmrml/ChangeLog
index 803ec722c86f..5e97bc28d61e 100644
--- a/kde-base/kmrml/ChangeLog
+++ b/kde-base/kmrml/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/kmrml
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/ChangeLog,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kmrml-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kmrml-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kmrml-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kmrml-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmrml-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmrml-3.5_beta1.ebuild,
+  kmrml-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmrml-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmrml-3.5.0_beta2.ebuild:
+  New version.
+
+*kmrml-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmrml-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmrml-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmrml-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmrml-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmrml-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmrml-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kmrml-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kmrml-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kmrml-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmrml-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kmrml-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmrml-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmrml-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmrml-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmrml-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kmrml-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmrml-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmrml-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kmrml-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kmrml-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmrml-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmrml-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmrml/Manifest b/kde-base/kmrml/Manifest
index 50cd4a67e40d..173bf3645c43 100644
--- a/kde-base/kmrml/Manifest
+++ b/kde-base/kmrml/Manifest
@@ -1,4 +1,24 @@
-MD5 d084a25dfdce12214da6faf83c181120 kmrml-3.4.0_beta1.ebuild 308
-MD5 d084a25dfdce12214da6faf83c181120 kmrml-3.4.0_alpha1.ebuild 308
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kmrml-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kmrml-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2af9dc3835bc5b26cd57140068c13bc2 ChangeLog 3220
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kmrml-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kmrml-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kmrml-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kmrml-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kmrml-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kmrml-3.5_beta1 72
+MD5 6b3549223a1b6d11f2f46b5dc8179059 kmrml-3.4.1.ebuild 423
+MD5 52290ba8c3f1af8d628ca8381427bc33 kmrml-3.4.2.ebuild 436
+MD5 f3d177211d43b7171d6c3d54cc607318 kmrml-3.4.3.ebuild 433
+MD5 022442138671d89e351b3e4b648e2cdb kmrml-3.5.0.ebuild 412
+MD5 5a58cb48ee0f4165f356fa69b975e54b kmrml-3.5.0_beta2.ebuild 424
+MD5 c51ba1b4e0dd786c564ec3eb4e1a59ab kmrml-3.5_beta1.ebuild 415
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmbintT9W3vfTuoRAnBcAJ96n1///p68xjVORHWJpDhO+Rs/mACgolGk
+3YjWuy7GAWajyDi+bkXSs/g=
+=AcYg
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kmrml/files/digest-kmrml-3.4.1 b/kde-base/kmrml/files/digest-kmrml-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kmrml/files/digest-kmrml-3.4.1
+++ b/kde-base/kmrml/files/digest-kmrml-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kmrml/files/digest-kmrml-3.4.2 b/kde-base/kmrml/files/digest-kmrml-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kmrml/files/digest-kmrml-3.4.2
+++ b/kde-base/kmrml/files/digest-kmrml-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kmrml/kmrml-3.4.1.ebuild b/kde-base/kmrml/kmrml-3.4.1.ebuild
index 3b587d7eae75..97a00bed29a7 100644
--- a/kde-base/kmrml/kmrml-3.4.1.ebuild
+++ b/kde-base/kmrml/kmrml-3.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/kde-base/kmrml/kmrml-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/kmrml-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KIO and konqueror plugins for MRML - an image indexing service"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmrml/kmrml-3.4.2.ebuild b/kde-base/kmrml/kmrml-3.4.2.ebuild
index 8a37a9b9c03e..48ed46322fbd 100644
--- a/kde-base/kmrml/kmrml-3.4.2.ebuild
+++ b/kde-base/kmrml/kmrml-3.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/kde-base/kmrml/kmrml-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/kmrml-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KIO and konqueror plugins for MRML - an image indexing service"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmrml/kmrml-3.4.3.ebuild b/kde-base/kmrml/kmrml-3.4.3.ebuild
index b98925180899..5de4ea81b09d 100644
--- a/kde-base/kmrml/kmrml-3.4.3.ebuild
+++ b/kde-base/kmrml/kmrml-3.4.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/kde-base/kmrml/kmrml-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/kmrml-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KIO and konqueror plugins for MRML - an image indexing service"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kmrml/kmrml-3.5.0.ebuild b/kde-base/kmrml/kmrml-3.5.0.ebuild
index b97685ef92c6..738b9024497f 100644
--- a/kde-base/kmrml/kmrml-3.5.0.ebuild
+++ b/kde-base/kmrml/kmrml-3.5.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/kde-base/kmrml/kmrml-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/kmrml-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kmrml/kmrml-3.5.0_beta2.ebuild b/kde-base/kmrml/kmrml-3.5.0_beta2.ebuild
index c94f617a4fd6..7d52953f9261 100644
--- a/kde-base/kmrml/kmrml-3.5.0_beta2.ebuild
+++ b/kde-base/kmrml/kmrml-3.5.0_beta2.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/kde-base/kmrml/kmrml-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/kmrml-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KIO and konqueror plugins for MRML - an image indexing service"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmrml/kmrml-3.5_beta1.ebuild b/kde-base/kmrml/kmrml-3.5_beta1.ebuild
index bca35812e861..490f59799a07 100644
--- a/kde-base/kmrml/kmrml-3.5_beta1.ebuild
+++ b/kde-base/kmrml/kmrml-3.5_beta1.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/kde-base/kmrml/kmrml-3.5_beta1.ebuild,v 1.1 2005/09/22 19:38:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmrml/kmrml-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KIO and konqueror plugins for MRML - an image indexing service"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kmrml/metadata.xml b/kde-base/kmrml/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmrml/metadata.xml
+++ b/kde-base/kmrml/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kmtrace/ChangeLog b/kde-base/kmtrace/ChangeLog
index 1342a4650c4e..1c9db5bbb2c5 100644
--- a/kde-base/kmtrace/ChangeLog
+++ b/kde-base/kmtrace/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for kde-base/kmtrace
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/ChangeLog,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
+
+*kmtrace-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kmtrace-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kmtrace-3.5_beta1.ebuild,
+  kmtrace-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kmtrace-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kmtrace-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kmtrace-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kmtrace-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmtrace-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kmtrace-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kmtrace-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kmtrace-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kmtrace-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kmtrace-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kmtrace-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kmtrace-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kmtrace-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kmtrace-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kmtrace-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmtrace-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kmtrace-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kmtrace-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kmtrace-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kmtrace/Manifest b/kde-base/kmtrace/Manifest
index 972d65a05c28..4028a28c22bf 100644
--- a/kde-base/kmtrace/Manifest
+++ b/kde-base/kmtrace/Manifest
@@ -1,5 +1,10 @@
-MD5 3322544b4403fa3078184efd2d43b15c kmtrace-3.4.0_beta1.ebuild 438
-MD5 3322544b4403fa3078184efd2d43b15c kmtrace-3.4.0_alpha1.ebuild 438
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kmtrace-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kmtrace-3.4.0_alpha1 67
-MD5 e7464365b16610b1c4062a72eff0db18 files/liberty-link.diff 383
+MD5 59ab6fcde42e2029865aa48382f62f96 ChangeLog 2584
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kmtrace-3.4.1 206
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kmtrace-3.5.0 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kmtrace-3.5.0_beta2 210
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kmtrace-3.5_beta1 67
+MD5 5409014e438344caac1fa2df5cd7c11a kmtrace-3.4.1.ebuild 526
+MD5 14e0a75e0fe2a7e60e5d91ad87902609 kmtrace-3.5.0.ebuild 509
+MD5 9fcda73af88ad86516c1d8ff63cdef92 kmtrace-3.5.0_beta2.ebuild 521
+MD5 d3421769fec58a3d1af6895fdbe68257 kmtrace-3.5_beta1.ebuild 512
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kmtrace/files/digest-kmtrace-3.4.1 b/kde-base/kmtrace/files/digest-kmtrace-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kmtrace/files/digest-kmtrace-3.4.1
+++ b/kde-base/kmtrace/files/digest-kmtrace-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kmtrace/kmtrace-3.4.1.ebuild b/kde-base/kmtrace/kmtrace-3.4.1.ebuild
index 942a8158663c..ebe37788010a 100644
--- a/kde-base/kmtrace/kmtrace-3.4.1.ebuild
+++ b/kde-base/kmtrace/kmtrace-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/kmtrace-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/kmtrace-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kmtrace - A KDE tool to assist with malloc debugging using glibc's \"mtrace\" functionality"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="sys-libs/glibc" # any other libc won't work, says the README file
 
diff --git a/kde-base/kmtrace/kmtrace-3.5.0.ebuild b/kde-base/kmtrace/kmtrace-3.5.0.ebuild
index 845ce40998a7..6d605e085f1f 100644
--- a/kde-base/kmtrace/kmtrace-3.5.0.ebuild
+++ b/kde-base/kmtrace/kmtrace-3.5.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/kde-base/kmtrace/kmtrace-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/kmtrace-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kmtrace/kmtrace-3.5.0_beta2.ebuild b/kde-base/kmtrace/kmtrace-3.5.0_beta2.ebuild
index f05604c89724..2a45964ad836 100644
--- a/kde-base/kmtrace/kmtrace-3.5.0_beta2.ebuild
+++ b/kde-base/kmtrace/kmtrace-3.5.0_beta2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/kmtrace-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/kmtrace-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kmtrace - A KDE tool to assist with malloc debugging using glibc's \"mtrace\" functionality"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="sys-libs/glibc" # any other libc won't work, says the README file
 
diff --git a/kde-base/kmtrace/kmtrace-3.5_beta1.ebuild b/kde-base/kmtrace/kmtrace-3.5_beta1.ebuild
index 748bf96f18d3..4403a151250a 100644
--- a/kde-base/kmtrace/kmtrace-3.5_beta1.ebuild
+++ b/kde-base/kmtrace/kmtrace-3.5_beta1.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/kde-base/kmtrace/kmtrace-3.5_beta1.ebuild,v 1.1 2005/09/22 19:39:26 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmtrace/kmtrace-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kmtrace - A KDE tool to assist with malloc debugging using glibc's \"mtrace\" functionality"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="sys-libs/glibc" # any other libc won't work, says the README file
 
diff --git a/kde-base/kmtrace/metadata.xml b/kde-base/kmtrace/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kmtrace/metadata.xml
+++ b/kde-base/kmtrace/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/knetattach/ChangeLog b/kde-base/knetattach/ChangeLog
index f3b626879b51..b4da40774d9d 100644
--- a/kde-base/knetattach/ChangeLog
+++ b/kde-base/knetattach/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/knetattach
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/ChangeLog,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> knetattach-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> knetattach-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  knetattach-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*knetattach-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +knetattach-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*knetattach-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +knetattach-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> knetattach-3.5_beta1.ebuild,
+  knetattach-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*knetattach-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +knetattach-3.5.0_beta2.ebuild:
+  New version.
+
+*knetattach-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +knetattach-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -knetattach-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*knetattach-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knetattach-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*knetattach-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knetattach-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  knetattach-3.4.2.ebuild:
+  ~alpha keyword.
+
+*knetattach-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +knetattach-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> knetattach-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> knetattach-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> knetattach-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*knetattach-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +knetattach-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> knetattach-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> knetattach-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> knetattach-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> knetattach-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*knetattach-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  knetattach-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*knetattach-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +knetattach-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *knetattach-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/knetattach/Manifest b/kde-base/knetattach/Manifest
index 58f8b63023f6..a0d649b2d885 100644
--- a/kde-base/knetattach/Manifest
+++ b/kde-base/knetattach/Manifest
@@ -1,4 +1,26 @@
-MD5 a4c191f7f658516df9bb3327cec01b4e knetattach-3.4.0_alpha1.ebuild 360
-MD5 a4c191f7f658516df9bb3327cec01b4e knetattach-3.4.0_beta1.ebuild 360
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-knetattach-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-knetattach-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c0add9b5e41f36f1ad97724a2f6d71fc ChangeLog 3663
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-knetattach-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-knetattach-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-knetattach-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-knetattach-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-knetattach-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-knetattach-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-knetattach-3.5_beta1 69
+MD5 9da2056fb7b18814bb5579865fa3d886 knetattach-3.4.1.ebuild 387
+MD5 1b2c24e119b3cc70ecbef9e83891fd0e knetattach-3.4.2.ebuild 400
+MD5 3cc28ecd40a8aad69c1d72a5571d2c32 knetattach-3.4.3.ebuild 396
+MD5 41ecc52824e60009c0a7ef7db2647909 knetattach-3.5.0.ebuild 376
+MD5 aa3ae8a3853883b05df7877cf6da0dc9 knetattach-3.5.0_beta2.ebuild 381
+MD5 3103ac032bdb2d36e2d6767a9e1e7fa4 knetattach-3.5.0_rc1.ebuild 380
+MD5 b4c64851c2b5b98ba39fd3ceb0cd30f4 knetattach-3.5_beta1.ebuild 379
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkFxntT9W3vfTuoRAh6cAKCf3zNZElFwyUOG9iHxf5D/5f1vHQCffZub
+zmXA9b/edbUar3b66xEuxng=
+=60Tz
+-----END PGP SIGNATURE-----
diff --git a/kde-base/knetattach/files/digest-knetattach-3.4.1 b/kde-base/knetattach/files/digest-knetattach-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/knetattach/files/digest-knetattach-3.4.1
+++ b/kde-base/knetattach/files/digest-knetattach-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/knetattach/files/digest-knetattach-3.4.2 b/kde-base/knetattach/files/digest-knetattach-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/knetattach/files/digest-knetattach-3.4.2
+++ b/kde-base/knetattach/files/digest-knetattach-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/knetattach/knetattach-3.4.1.ebuild b/kde-base/knetattach/knetattach-3.4.1.ebuild
index c45c8fb4ac6a..a56fe89199f5 100644
--- a/kde-base/knetattach/knetattach-3.4.1.ebuild
+++ b/kde-base/knetattach/knetattach-3.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/kde-base/knetattach/knetattach-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/knetattach/knetattach-3.4.2.ebuild b/kde-base/knetattach/knetattach-3.4.2.ebuild
index 0e21391cd3dd..2c34420ed3a4 100644
--- a/kde-base/knetattach/knetattach-3.4.2.ebuild
+++ b/kde-base/knetattach/knetattach-3.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/kde-base/knetattach/knetattach-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/knetattach/knetattach-3.4.3.ebuild b/kde-base/knetattach/knetattach-3.4.3.ebuild
index 28ca817821ea..465752ffd42c 100644
--- a/kde-base/knetattach/knetattach-3.4.3.ebuild
+++ b/kde-base/knetattach/knetattach-3.4.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/kde-base/knetattach/knetattach-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/knetattach/knetattach-3.5.0.ebuild b/kde-base/knetattach/knetattach-3.5.0.ebuild
index f5710eb5fba1..2ace42ef2ff5 100644
--- a/kde-base/knetattach/knetattach-3.5.0.ebuild
+++ b/kde-base/knetattach/knetattach-3.5.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/kde-base/knetattach/knetattach-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/knetattach/knetattach-3.5.0_beta2.ebuild b/kde-base/knetattach/knetattach-3.5.0_beta2.ebuild
index 4cdaf070ef43..5032d729c66e 100644
--- a/kde-base/knetattach/knetattach-3.5.0_beta2.ebuild
+++ b/kde-base/knetattach/knetattach-3.5.0_beta2.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/kde-base/knetattach/knetattach-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/knetattach/knetattach-3.5.0_rc1.ebuild b/kde-base/knetattach/knetattach-3.5.0_rc1.ebuild
index 34b4b24af5bc..7ce97aa96852 100644
--- a/kde-base/knetattach/knetattach-3.5.0_rc1.ebuild
+++ b/kde-base/knetattach/knetattach-3.5.0_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/kde-base/knetattach/knetattach-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/knetattach/knetattach-3.5_beta1.ebuild b/kde-base/knetattach/knetattach-3.5_beta1.ebuild
index 429e3947bc5f..c693a9fb4203 100644
--- a/kde-base/knetattach/knetattach-3.5_beta1.ebuild
+++ b/kde-base/knetattach/knetattach-3.5_beta1.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/kde-base/knetattach/knetattach-3.5_beta1.ebuild,v 1.1 2005/09/22 19:40:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knetattach/knetattach-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:22 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network wizard"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/knetattach/metadata.xml b/kde-base/knetattach/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/knetattach/metadata.xml
+++ b/kde-base/knetattach/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/knewsticker-scripts/ChangeLog b/kde-base/knewsticker-scripts/ChangeLog
index 9c8210cb5551..1ad591328f0d 100644
--- a/kde-base/knewsticker-scripts/ChangeLog
+++ b/kde-base/knewsticker-scripts/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/knewsticker-scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  knewsticker-scripts-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  knewsticker-scripts-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  knewsticker-scripts-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*knewsticker-scripts-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-scripts-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*knewsticker-scripts-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-scripts-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  knewsticker-scripts-3.5_beta1.ebuild,
+  knewsticker-scripts-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  knewsticker-scripts-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*knewsticker-scripts-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-scripts-3.5.0_beta2.ebuild:
+  New version.
+
+*knewsticker-scripts-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-scripts-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -knewsticker-scripts-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*knewsticker-scripts-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knewsticker-scripts-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*knewsticker-scripts-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knewsticker-scripts-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  knewsticker-scripts-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  knewsticker-scripts-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  knewsticker-scripts-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  knewsticker-scripts-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*knewsticker-scripts-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +knewsticker-scripts-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  knewsticker-scripts-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  knewsticker-scripts-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  knewsticker-scripts-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  knewsticker-scripts-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  knewsticker-scripts-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*knewsticker-scripts-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +knewsticker-scripts-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *knewsticker-scripts-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/knewsticker-scripts/Manifest b/kde-base/knewsticker-scripts/Manifest
index 9fb295368aa6..de1d00008190 100644
--- a/kde-base/knewsticker-scripts/Manifest
+++ b/kde-base/knewsticker-scripts/Manifest
@@ -1,4 +1,24 @@
-MD5 757a4ba3dcaa8e3bf9e2bab0deb810cc knewsticker-scripts-3.4.0_alpha1.ebuild 365
-MD5 757a4ba3dcaa8e3bf9e2bab0deb810cc knewsticker-scripts-3.4.0_beta1.ebuild 365
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-knewsticker-scripts-3.4.0_alpha1 70
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-knewsticker-scripts-3.4.0_beta1 219
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 78ac8c56c616db94512005c50e9d14be ChangeLog 3875
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-knewsticker-scripts-3.4.1 215
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-knewsticker-scripts-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-knewsticker-scripts-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-knewsticker-scripts-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-knewsticker-scripts-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-knewsticker-scripts-3.5_beta1 70
+MD5 1202799de5a32c9aa62044367944c1e4 knewsticker-scripts-3.4.1.ebuild 520
+MD5 ad226a634c9b82ab2491a6b1c16d5b0e knewsticker-scripts-3.4.3.ebuild 522
+MD5 97b68c8cfc352f357a160d247e1c8a0d knewsticker-scripts-3.5.0.ebuild 465
+MD5 fe6ae04f9a8620125006b2b71c194554 knewsticker-scripts-3.5.0_beta2.ebuild 470
+MD5 ad11845d539256d9e9a70884341007db knewsticker-scripts-3.5.0_rc1.ebuild 469
+MD5 c40f24a2ccfd4e7cc860d7baf87b9a44 knewsticker-scripts-3.5_beta1.ebuild 505
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxgmntT9W3vfTuoRAqAiAKC0HJ6SGDZ7Zl6gePQOV54bXq0aeQCbBE1K
+z70bM8qqy1yESgNdWuvnVrk=
+=wr73
+-----END PGP SIGNATURE-----
diff --git a/kde-base/knewsticker-scripts/files/digest-knewsticker-scripts-3.4.1 b/kde-base/knewsticker-scripts/files/digest-knewsticker-scripts-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/knewsticker-scripts/files/digest-knewsticker-scripts-3.4.1
+++ b/kde-base/knewsticker-scripts/files/digest-knewsticker-scripts-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.1.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.1.ebuild
index de5d84e16ce9..3b90cd633ad8 100644
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.1.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeaddons
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Kicker applet - RSS news ticker"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/knewsticker)"
+DEPEND="$(deprange-dual $PV 3.4.2 kde-base/knewsticker)"
 OLDDEPEND="~kde-base/knewsticker-$PV"
 
 
diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.3.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.3.ebuild
index c2e9b9a07263..b349a9f372ab 100644
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.3.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Kicker applet - RSS news ticker"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/knewsticker)"
 OLDDEPEND="~kde-base/knewsticker-$PV"
diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0.ebuild
index acb43c17db1a..47c5ab555ef1 100644
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.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/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_beta2.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_beta2.ebuild
index 19e09e774815..7c3adace132f 100644
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_beta2.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Kicker applet - RSS news ticker"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/knewsticker)"
 
diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_rc1.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_rc1.ebuild
index 4bc499a23072..af210b510546 100644
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_rc1.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_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/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5_beta1.ebuild b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5_beta1.ebuild
index 115910280237..76ec9b6e26db 100644
--- a/kde-base/knewsticker-scripts/knewsticker-scripts-3.5_beta1.ebuild
+++ b/kde-base/knewsticker-scripts/knewsticker-scripts-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5_beta1.ebuild,v 1.1 2005/09/22 19:42:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker-scripts/knewsticker-scripts-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Kicker applet - RSS news ticker"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/knewsticker)"
 OLDDEPEND="~kde-base/knewsticker-$PV"
diff --git a/kde-base/knewsticker-scripts/metadata.xml b/kde-base/knewsticker-scripts/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/knewsticker-scripts/metadata.xml
+++ b/kde-base/knewsticker-scripts/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/knewsticker/ChangeLog b/kde-base/knewsticker/ChangeLog
index 079a338f6680..7e0f70dffada 100644
--- a/kde-base/knewsticker/ChangeLog
+++ b/kde-base/knewsticker/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/knewsticker
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/ChangeLog,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  knewsticker-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> knewsticker-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  knewsticker-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*knewsticker-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*knewsticker-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  knewsticker-3.5_beta1.ebuild, knewsticker-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*knewsticker-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-3.5.0_beta2.ebuild:
+  New version.
+
+*knewsticker-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -knewsticker-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*knewsticker-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knewsticker-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*knewsticker-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knewsticker-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  knewsticker-3.4.2.ebuild:
+  ~alpha keyword.
+
+*knewsticker-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> knewsticker-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> knewsticker-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> knewsticker-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*knewsticker-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +knewsticker-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> knewsticker-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> knewsticker-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> knewsticker-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> knewsticker-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*knewsticker-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  knewsticker-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*knewsticker-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +knewsticker-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *knewsticker-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/knewsticker/Manifest b/kde-base/knewsticker/Manifest
index 33e7cc72307a..9e4e47413f86 100644
--- a/kde-base/knewsticker/Manifest
+++ b/kde-base/knewsticker/Manifest
@@ -1,4 +1,26 @@
-MD5 b0176384e4fbda14d1354c09ffe2e498 knewsticker-3.4.0_beta1.ebuild 404
-MD5 b0176384e4fbda14d1354c09ffe2e498 knewsticker-3.4.0_alpha1.ebuild 404
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-knewsticker-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-knewsticker-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9cda9d718a54fcd9b9393a85ffb7c9cc ChangeLog 3703
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-knewsticker-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-knewsticker-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-knewsticker-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-knewsticker-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-knewsticker-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-knewsticker-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-knewsticker-3.5_beta1 71
+MD5 c16c5dc1fe778fe64278c50c2b02c25d knewsticker-3.4.1.ebuild 540
+MD5 4a534134239b16e110819ccbe10be0e6 knewsticker-3.4.2.ebuild 555
+MD5 55e6f463d5027a2ee96e2b1b5ede5da0 knewsticker-3.4.3.ebuild 552
+MD5 44001562cc35960eb32c6a84bd5cdfef knewsticker-3.5.0.ebuild 495
+MD5 b251457ec26199ceb760216b3d84a0b4 knewsticker-3.5.0_beta2.ebuild 506
+MD5 f08fa36bdd2b10627f66c9bc794e16da knewsticker-3.5.0_rc1.ebuild 505
+MD5 03523fc46dd972db726ae71da19b0a72 knewsticker-3.5_beta1.ebuild 532
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuQUntT9W3vfTuoRAsFsAJ490/koudnLTDjz05prxZOxOxg1xQCgp96m
+f4ocY1/GuEoevD6J8R+jU90=
+=qVaM
+-----END PGP SIGNATURE-----
diff --git a/kde-base/knewsticker/files/digest-knewsticker-3.4.1 b/kde-base/knewsticker/files/digest-knewsticker-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/knewsticker/files/digest-knewsticker-3.4.1
+++ b/kde-base/knewsticker/files/digest-knewsticker-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/knewsticker/files/digest-knewsticker-3.4.2 b/kde-base/knewsticker/files/digest-knewsticker-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/knewsticker/files/digest-knewsticker-3.4.2
+++ b/kde-base/knewsticker/files/digest-knewsticker-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/knewsticker/knewsticker-3.4.1.ebuild b/kde-base/knewsticker/knewsticker-3.4.1.ebuild
index 2347e250828a..19a47d90d448 100644
--- a/kde-base/knewsticker/knewsticker-3.4.1.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.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/kde-base/knewsticker/knewsticker-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker plugin: rss news ticker"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/librss-3.3.1"
 DEPEND="
diff --git a/kde-base/knewsticker/knewsticker-3.4.2.ebuild b/kde-base/knewsticker/knewsticker-3.4.2.ebuild
index d102a8fedad3..33b3ad4d7ee9 100644
--- a/kde-base/knewsticker/knewsticker-3.4.2.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.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/kde-base/knewsticker/knewsticker-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker plugin: rss news ticker"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/librss-3.3.1"
 DEPEND="
diff --git a/kde-base/knewsticker/knewsticker-3.4.3.ebuild b/kde-base/knewsticker/knewsticker-3.4.3.ebuild
index c8e3a6d87432..62163b20303b 100644
--- a/kde-base/knewsticker/knewsticker-3.4.3.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.4.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/kde-base/knewsticker/knewsticker-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker plugin: rss news ticker"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/librss-3.3.1"
 DEPEND="
diff --git a/kde-base/knewsticker/knewsticker-3.5.0.ebuild b/kde-base/knewsticker/knewsticker-3.5.0.ebuild
index ea17157d9cf7..d93c19472c18 100644
--- a/kde-base/knewsticker/knewsticker-3.5.0.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.5.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/kde-base/knewsticker/knewsticker-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/knewsticker/knewsticker-3.5.0_beta2.ebuild b/kde-base/knewsticker/knewsticker-3.5.0_beta2.ebuild
index 5bdcd7e93d4e..2925ad2f1170 100644
--- a/kde-base/knewsticker/knewsticker-3.5.0_beta2.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.5.0_beta2.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/kde-base/knewsticker/knewsticker-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker plugin: rss news ticker"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/knewsticker/knewsticker-3.5.0_rc1.ebuild b/kde-base/knewsticker/knewsticker-3.5.0_rc1.ebuild
index d9baf0c67b5f..0bc643811a34 100644
--- a/kde-base/knewsticker/knewsticker-3.5.0_rc1.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.5.0_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/kde-base/knewsticker/knewsticker-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/knewsticker/knewsticker-3.5_beta1.ebuild b/kde-base/knewsticker/knewsticker-3.5_beta1.ebuild
index b14313b3c1c6..2b138a66858b 100644
--- a/kde-base/knewsticker/knewsticker-3.5_beta1.ebuild
+++ b/kde-base/knewsticker/knewsticker-3.5_beta1.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/kde-base/knewsticker/knewsticker-3.5_beta1.ebuild,v 1.1 2005/09/22 19:41:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knewsticker/knewsticker-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kicker plugin: rss news ticker"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/librss-3.3.1"
 DEPEND="
diff --git a/kde-base/knewsticker/metadata.xml b/kde-base/knewsticker/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/knewsticker/metadata.xml
+++ b/kde-base/knewsticker/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index 93bdc6ca20eb..e49598865b5c 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> knode-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> knode-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> knode-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*knode-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +knode-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*knode-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +knode-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> knode-3.5_beta1.ebuild,
+  knode-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*knode-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +knode-3.5.0_beta2.ebuild:
+  New version.
+
+*knode-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +knode-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -knode-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  23 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> knode-3.5_beta1.ebuild:
+  Added extra libemailfunctions dir to fix compilation errors.
+
+*knode-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knode-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*knode-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knode-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> knode-3.4.2.ebuild:
+  ~alpha keyword.
+
+*knode-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +knode-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> knode-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> knode-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> knode-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*knode-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +knode-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> knode-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> knode-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> knode-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> knode-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*knode-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> knode-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*knode-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +knode-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> knode-3.4.0_beta1.ebuild:
+  Added missing dep on libkmime.
 
 *knode-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/knode/Manifest b/kde-base/knode/Manifest
index bca0a44a704b..d597cec6be11 100644
--- a/kde-base/knode/Manifest
+++ b/kde-base/knode/Manifest
@@ -1,4 +1,26 @@
-MD5 e551466698ce7ddde20c22bcc2d0822f knode-3.4.0_alpha1.ebuild 752
-MD5 e551466698ce7ddde20c22bcc2d0822f knode-3.4.0_beta1.ebuild 752
-MD5 892303ffe022b31a222f9efab549727b files/digest-knode-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-knode-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 36d7b8b49d13e02cbf0ffcfdee318744 ChangeLog 3712
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-knode-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-knode-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-knode-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-knode-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-knode-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-knode-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-knode-3.5_beta1 68
+MD5 016657b19b87bd0b96689330350d410f knode-3.4.1.ebuild 912
+MD5 e4fcd154680487c975f2d6265b26bca7 knode-3.4.2.ebuild 929
+MD5 68beb2a8863e5701fa8e3dfd550ead29 knode-3.4.3.ebuild 925
+MD5 d579f246190e09ad066c7d5e931b86df knode-3.5.0.ebuild 920
+MD5 8becad0105bc791cfa002e68e6fa4537 knode-3.5.0_beta2.ebuild 937
+MD5 08d068e43fc1b584ca61819e37c2b846 knode-3.5.0_rc1.ebuild 936
+MD5 ff62f1f95c57d7b3c9e2f1395f49e9c7 knode-3.5_beta1.ebuild 923
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvWkntT9W3vfTuoRAk/NAJ9SA6cGrdKwVirzkG8vFORCJvPMXQCfVIwW
+6VLhx8SUKOnDc4hfhcIiEag=
+=G1Bw
+-----END PGP SIGNATURE-----
diff --git a/kde-base/knode/files/digest-knode-3.4.1 b/kde-base/knode/files/digest-knode-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/knode/files/digest-knode-3.4.1
+++ b/kde-base/knode/files/digest-knode-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/knode/files/digest-knode-3.4.2 b/kde-base/knode/files/digest-knode-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/knode/files/digest-knode-3.4.2
+++ b/kde-base/knode/files/digest-knode-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/knode/knode-3.4.1.ebuild b/kde-base/knode/knode-3.4.1.ebuild
index 3d88da4b0072..151f36621d5d 100644
--- a/kde-base/knode/knode-3.4.1.ebuild
+++ b/kde-base/knode/knode-3.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/kde-base/knode/knode-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
diff --git a/kde-base/knode/knode-3.4.2.ebuild b/kde-base/knode/knode-3.4.2.ebuild
index 8768fc8c2edd..f92355c3b480 100644
--- a/kde-base/knode/knode-3.4.2.ebuild
+++ b/kde-base/knode/knode-3.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/kde-base/knode/knode-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange 3.4.1 $MAXKDEVER kde-base/libkdenetwork)
diff --git a/kde-base/knode/knode-3.4.3.ebuild b/kde-base/knode/knode-3.4.3.ebuild
index d3f608c3fcec..78ef53751769 100644
--- a/kde-base/knode/knode-3.4.3.ebuild
+++ b/kde-base/knode/knode-3.4.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/kde-base/knode/knode-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange 3.4.1 $MAXKDEVER kde-base/libkdenetwork)
diff --git a/kde-base/knode/knode-3.5.0.ebuild b/kde-base/knode/knode-3.5.0.ebuild
index 30b512cb6149..ebbf4ab057db 100644
--- a/kde-base/knode/knode-3.5.0.ebuild
+++ b/kde-base/knode/knode-3.5.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/kde-base/knode/knode-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/knode/knode-3.5.0_beta2.ebuild b/kde-base/knode/knode-3.5.0_beta2.ebuild
index b01bb7e32c5e..3067444f65e1 100644
--- a/kde-base/knode/knode-3.5.0_beta2.ebuild
+++ b/kde-base/knode/knode-3.5.0_beta2.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/kde-base/knode/knode-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange 3.5_beta1 $MAXKDEVER kde-base/libkdenetwork)
diff --git a/kde-base/knode/knode-3.5.0_rc1.ebuild b/kde-base/knode/knode-3.5.0_rc1.ebuild
index 2af7d406a85d..046ec082570a 100644
--- a/kde-base/knode/knode-3.5.0_rc1.ebuild
+++ b/kde-base/knode/knode-3.5.0_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/kde-base/knode/knode-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/knode/knode-3.5_beta1.ebuild b/kde-base/knode/knode-3.5_beta1.ebuild
index f9fdf8484d49..11f6f4ac1147 100644
--- a/kde-base/knode/knode-3.5_beta1.ebuild
+++ b/kde-base/knode/knode-3.5_beta1.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/kde-base/knode/knode-3.5_beta1.ebuild,v 1.1 2005/09/22 19:43:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A newsreader for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdepim)
 $(deprange $PV $MAXKDEVER kde-base/libkdenetwork)
@@ -25,5 +25,6 @@ KMEXTRACTONLY="
 	libkdenetwork/
 	kontact/interfaces
 	libkmime
-	libkpgp"
+	libkpgp
+	libemailfunctions"
 KMEXTRA="kontact/plugins/knode" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
diff --git a/kde-base/knode/metadata.xml b/kde-base/knode/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/knode/metadata.xml
+++ b/kde-base/knode/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/knotes/ChangeLog b/kde-base/knotes/ChangeLog
index 54c965597d09..e433e44344f1 100644
--- a/kde-base/knotes/ChangeLog
+++ b/kde-base/knotes/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/knotes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/ChangeLog,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> knotes-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> knotes-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> knotes-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*knotes-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +knotes-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*knotes-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +knotes-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> knotes-3.5_beta1.ebuild,
+  knotes-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> knotes-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*knotes-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +knotes-3.5.0_beta2.ebuild:
+  New version.
+
+*knotes-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +knotes-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -knotes-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*knotes-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knotes-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*knotes-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +knotes-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> knotes-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> knotes-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> knotes-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> knotes-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*knotes-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +knotes-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> knotes-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> knotes-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> knotes-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> knotes-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*knotes-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> knotes-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*knotes-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +knotes-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *knotes-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/knotes/Manifest b/kde-base/knotes/Manifest
index 1028ff17a4ab..e7582774c7b5 100644
--- a/kde-base/knotes/Manifest
+++ b/kde-base/knotes/Manifest
@@ -1,4 +1,24 @@
-MD5 27e3ed71753d3288af42c0ac242d94fd knotes-3.4.0_alpha1.ebuild 690
-MD5 27e3ed71753d3288af42c0ac242d94fd knotes-3.4.0_beta1.ebuild 690
-MD5 892303ffe022b31a222f9efab549727b files/digest-knotes-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-knotes-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2d40208f2996817b15645b3dd4d8b028 ChangeLog 3480
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-knotes-3.4.1 208
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-knotes-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-knotes-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-knotes-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-knotes-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-knotes-3.5_beta1 68
+MD5 19686bdbeedd9decb70ec55c9c862c4e knotes-3.4.1.ebuild 803
+MD5 f336ba6ee7114080c7a04e391a763a45 knotes-3.4.3.ebuild 817
+MD5 9bfc99839247a45b4cf0a6bffb487c27 knotes-3.5.0.ebuild 796
+MD5 7a18a5f30e8834b06dfe4887e0fbcadf knotes-3.5.0_beta2.ebuild 801
+MD5 f484ac7815b9599f8af0aa8c4a45f6c2 knotes-3.5.0_rc1.ebuild 800
+MD5 d0855b7887d6603f2709089dca661392 knotes-3.5_beta1.ebuild 799
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvXYntT9W3vfTuoRAs89AKCmFiM3WC3IZaZ8OCCEsYsxEdBwwgCgmxOc
+xNXwjjFA1h586c+6WgqoCMQ=
+=Oj/x
+-----END PGP SIGNATURE-----
diff --git a/kde-base/knotes/files/digest-knotes-3.4.1 b/kde-base/knotes/files/digest-knotes-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/knotes/files/digest-knotes-3.4.1
+++ b/kde-base/knotes/files/digest-knotes-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/knotes/knotes-3.4.1.ebuild b/kde-base/knotes/knotes-3.4.1.ebuild
index 3e954d12283b..962b500c1df0 100644
--- a/kde-base/knotes/knotes-3.4.1.ebuild
+++ b/kde-base/knotes/knotes-3.4.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Notes"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
-$(deprange $PV $MAXKDEVER kde-base/libkdepim)
-$(deprange $PV $MAXKDEVER kde-base/kontact)"
+DEPEND="$(deprange $PV 3.4.2 kde-base/libkcal)
+$(deprange $PV 3.4.2 kde-base/libkdepim)
+$(deprange $PV 3.4.2 kde-base/kontact)"
 KMCOPYLIB="
 	libkcal libkcal
 	libkdepim libkdepim
diff --git a/kde-base/knotes/knotes-3.4.3.ebuild b/kde-base/knotes/knotes-3.4.3.ebuild
index ba1ec4cc020e..cc69dfc5afa6 100644
--- a/kde-base/knotes/knotes-3.4.3.ebuild
+++ b/kde-base/knotes/knotes-3.4.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/kde-base/knotes/knotes-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Notes"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
@@ -21,4 +21,4 @@ KMEXTRACTONLY="
 	libkcal/
 	libkdepim/
 	kontact/interfaces"
-KMEXTRA="kontact/plugins/knotes" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
\ No newline at end of file
+KMEXTRA="kontact/plugins/knotes" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
diff --git a/kde-base/knotes/knotes-3.5.0.ebuild b/kde-base/knotes/knotes-3.5.0.ebuild
index 77d4247d939b..ce9804f27601 100644
--- a/kde-base/knotes/knotes-3.5.0.ebuild
+++ b/kde-base/knotes/knotes-3.5.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/kde-base/knotes/knotes-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/knotes/knotes-3.5.0_beta2.ebuild b/kde-base/knotes/knotes-3.5.0_beta2.ebuild
index 86b9dd3fc302..c93ad73d2ef7 100644
--- a/kde-base/knotes/knotes-3.5.0_beta2.ebuild
+++ b/kde-base/knotes/knotes-3.5.0_beta2.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/kde-base/knotes/knotes-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Notes"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/knotes/knotes-3.5.0_rc1.ebuild b/kde-base/knotes/knotes-3.5.0_rc1.ebuild
index 363de11b08b8..71929b71729d 100644
--- a/kde-base/knotes/knotes-3.5.0_rc1.ebuild
+++ b/kde-base/knotes/knotes-3.5.0_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/kde-base/knotes/knotes-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/knotes/knotes-3.5_beta1.ebuild b/kde-base/knotes/knotes-3.5_beta1.ebuild
index defc32b0fe10..bb4056ceafaf 100644
--- a/kde-base/knotes/knotes-3.5_beta1.ebuild
+++ b/kde-base/knotes/knotes-3.5_beta1.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/kde-base/knotes/knotes-3.5_beta1.ebuild,v 1.1 2005/09/22 19:44:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knotes/knotes-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:36 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Notes"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/knotes/metadata.xml b/kde-base/knotes/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/knotes/metadata.xml
+++ b/kde-base/knotes/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kode/ChangeLog b/kde-base/kode/ChangeLog
index 584a2953ad00..dd8d4706205a 100644
--- a/kde-base/kode/ChangeLog
+++ b/kde-base/kode/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/kode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kode-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kode-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kode-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kode-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kode-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org> kode-3.5_beta1.ebuild:
+  Keyword ~ppc and ~x86
+
+*kode-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kode-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kode-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kode-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kode-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kode-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kode-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kode-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kode-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kode-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kode-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kode-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kode-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kode-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kode-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kode-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kode-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kode-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kode-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kode-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kode-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kode-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kode/Manifest b/kde-base/kode/Manifest
index 83afec305e37..4a3d97831f8c 100644
--- a/kde-base/kode/Manifest
+++ b/kde-base/kode/Manifest
@@ -1,4 +1,20 @@
-MD5 b8cbca717739240c0486aafc7f4769a3 kode-3.4.0_alpha1.ebuild 261
-MD5 b8cbca717739240c0486aafc7f4769a3 kode-3.4.0_beta1.ebuild 261
-MD5 892303ffe022b31a222f9efab549727b files/digest-kode-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kode-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2527710b17a7853c52fcabb8324bc799 ChangeLog 3013
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kode-3.4.1 208
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kode-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kode-3.5.0 67
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kode-3.5_beta1 68
+MD5 3b6dedfbeddb8eb849bc3c7b1b726d2f kode-3.4.1.ebuild 385
+MD5 d9cead14ec086b8168b48e70c896be43 kode-3.4.3.ebuild 383
+MD5 09a0f3b42de5b3bea65b1cebd20c3e0b kode-3.5.0.ebuild 368
+MD5 9ec566b38da9dfcb7cb1ec96ba2b04e2 kode-3.5_beta1.ebuild 378
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvJFntT9W3vfTuoRAruuAKCS7I3ejVXxi6Ia97Z8wwsokdMkKgCfXMol
+5PybC9C4SSfsR8BajmwvmIY=
+=6zFV
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kode/files/digest-kode-3.4.1 b/kde-base/kode/files/digest-kode-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kode/files/digest-kode-3.4.1
+++ b/kde-base/kode/files/digest-kode-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kode/kode-3.4.1.ebuild b/kde-base/kode/kode-3.4.1.ebuild
index d9a513bbf20d..087000819b5b 100644
--- a/kde-base/kode/kode-3.4.1.ebuild
+++ b/kde-base/kode/kode-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdepim
 
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kpgp library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kode/kode-3.4.3.ebuild b/kde-base/kode/kode-3.4.3.ebuild
index 70936a9451fa..504e389a9ef3 100644
--- a/kde-base/kode/kode-3.4.3.ebuild
+++ b/kde-base/kode/kode-3.4.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/kde-base/kode/kode-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdepim
 
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kpgp library"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kode/kode-3.5.0.ebuild b/kde-base/kode/kode-3.5.0.ebuild
index 4da1eed03a3e..0b4c4eb878bd 100644
--- a/kde-base/kode/kode-3.5.0.ebuild
+++ b/kde-base/kode/kode-3.5.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/kde-base/kode/kode-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdepim
 
diff --git a/kde-base/kode/kode-3.5_beta1.ebuild b/kde-base/kode/kode-3.5_beta1.ebuild
index b8c51fa1db21..f4ead69042f9 100644
--- a/kde-base/kode/kode-3.5_beta1.ebuild
+++ b/kde-base/kode/kode-3.5_beta1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-3.5_beta1.ebuild,v 1.1 2005/09/22 19:45:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kode/kode-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdepim
 
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kpgp library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kode/metadata.xml b/kde-base/kode/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kode/metadata.xml
+++ b/kde-base/kode/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kodo/ChangeLog b/kde-base/kodo/ChangeLog
index 921fb76c6279..f0a8e36db395 100644
--- a/kde-base/kodo/ChangeLog
+++ b/kde-base/kodo/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/kodo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kodo-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kodo-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kodo-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kodo-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kodo-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kodo-3.5_beta1.ebuild,
+  kodo-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kodo-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.5.0_beta2.ebuild:
+  New version.
+
+*kodo-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kodo-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kodo-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kodo-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kodo-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kodo-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kodo-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kodo-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kodo-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kodo-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kodo-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kodo-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kodo-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kodo-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kodo-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kodo-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kodo-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kodo-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kodo-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kodo-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kodo-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kodo/Manifest b/kde-base/kodo/Manifest
index c9d934ee5c46..9d5ee0f21603 100644
--- a/kde-base/kodo/Manifest
+++ b/kde-base/kodo/Manifest
@@ -1,4 +1,26 @@
-MD5 31ea71ff6aaa5f7754f5f5cd6658721e kodo-3.4.0_alpha1.ebuild 299
-MD5 31ea71ff6aaa5f7754f5f5cd6658721e kodo-3.4.0_beta1.ebuild 299
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-kodo-3.4.0_alpha1 68
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-kodo-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 60ac2ea242ec2176bd6e0fb2df2df64e ChangeLog 3425
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-kodo-3.4.1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-kodo-3.4.2 282
+MD5 4792409083f3033f880840748c1ec31a files/digest-kodo-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-kodo-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-kodo-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-kodo-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-kodo-3.5_beta1 68
+MD5 0239358fc632ebb04cb5a8481939c50b kodo-3.4.1.ebuild 412
+MD5 8386a0c00558be1f089f35d692b8c9f0 kodo-3.4.2.ebuild 425
+MD5 b6fe116d33fc68f1068a9086fea247ac kodo-3.4.3.ebuild 422
+MD5 0ad18f7578342819e771f713c9a0ab66 kodo-3.5.0.ebuild 401
+MD5 d8f1e5b2f6e9948d66e4346cc7002e7b kodo-3.5.0_beta2.ebuild 406
+MD5 cbb9159d45b512d65d59de31c071bce6 kodo-3.5.0_rc1.ebuild 405
+MD5 e7c56dde2b6c4f1301ef96772fd1d295 kodo-3.5_beta1.ebuild 404
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhviuntT9W3vfTuoRAmUqAKCgaehTNyeM2q0+YoYHxa2RTVneLACeMb6l
+KlNNdC/RlE2BR396leXyY+Y=
+=T2io
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kodo/files/digest-kodo-3.4.1 b/kde-base/kodo/files/digest-kodo-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/kodo/files/digest-kodo-3.4.1
+++ b/kde-base/kodo/files/digest-kodo-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/kodo/files/digest-kodo-3.4.2 b/kde-base/kodo/files/digest-kodo-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/kodo/files/digest-kodo-3.4.2
+++ b/kde-base/kodo/files/digest-kodo-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/kodo/kodo-3.4.1.ebuild b/kde-base/kodo/kodo-3.4.1.ebuild
index a35952529639..ae372156d678 100644
--- a/kde-base/kodo/kodo-3.4.1.ebuild
+++ b/kde-base/kodo/kodo-3.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/kde-base/kodo/kodo-3.4.1.ebuild,v 1.1 2005/05/25 21:23:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: measure the desktop mileage of your mouse pointer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kodo/kodo-3.4.2.ebuild b/kde-base/kodo/kodo-3.4.2.ebuild
index ceaacbab98f9..0f9e75f03376 100644
--- a/kde-base/kodo/kodo-3.4.2.ebuild
+++ b/kde-base/kodo/kodo-3.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/kde-base/kodo/kodo-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: measure the desktop mileage of your mouse pointer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kodo/kodo-3.4.3.ebuild b/kde-base/kodo/kodo-3.4.3.ebuild
index b2cfc4980232..7159a4348303 100644
--- a/kde-base/kodo/kodo-3.4.3.ebuild
+++ b/kde-base/kodo/kodo-3.4.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/kde-base/kodo/kodo-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: measure the desktop mileage of your mouse pointer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND=""
\ No newline at end of file
+DEPEND=""
diff --git a/kde-base/kodo/kodo-3.5.0.ebuild b/kde-base/kodo/kodo-3.5.0.ebuild
index e80fee4ee129..b3a880cd0cd4 100644
--- a/kde-base/kodo/kodo-3.5.0.ebuild
+++ b/kde-base/kodo/kodo-3.5.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/kde-base/kodo/kodo-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kodo/kodo-3.5.0_beta2.ebuild b/kde-base/kodo/kodo-3.5.0_beta2.ebuild
index 1326ef9e0806..af457d278277 100644
--- a/kde-base/kodo/kodo-3.5.0_beta2.ebuild
+++ b/kde-base/kodo/kodo-3.5.0_beta2.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/kde-base/kodo/kodo-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: measure the desktop mileage of your mouse pointer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kodo/kodo-3.5.0_rc1.ebuild b/kde-base/kodo/kodo-3.5.0_rc1.ebuild
index fba95f63b615..013ddf74c698 100644
--- a/kde-base/kodo/kodo-3.5.0_rc1.ebuild
+++ b/kde-base/kodo/kodo-3.5.0_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/kde-base/kodo/kodo-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kodo/kodo-3.5_beta1.ebuild b/kde-base/kodo/kodo-3.5_beta1.ebuild
index 4a91a96e15c8..e34aa915a286 100644
--- a/kde-base/kodo/kodo-3.5_beta1.ebuild
+++ b/kde-base/kodo/kodo-3.5_beta1.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/kde-base/kodo/kodo-3.5_beta1.ebuild,v 1.1 2005/09/22 19:46:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kodo/kodo-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: measure the desktop mileage of your mouse pointer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kodo/metadata.xml b/kde-base/kodo/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kodo/metadata.xml
+++ b/kde-base/kodo/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kolf/ChangeLog b/kde-base/kolf/ChangeLog
index 436e2febe2e5..18fd821b738f 100644
--- a/kde-base/kolf/ChangeLog
+++ b/kde-base/kolf/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for kde-base/kolf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/ChangeLog,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kolf-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kolf-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kolf-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kolf-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kolf-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kolf-3.5_beta1.ebuild,
+  kolf-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kolf-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.5.0_beta2.ebuild:
+  New version.
+
+*kolf-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kolf-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kolf-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kolf-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kolf-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kolf-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kolf-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kolf-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kolf-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kolf-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kolf-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kolf-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kolf-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kolf-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kolf-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kolf-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kolf-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kolf-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kolf-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kolf/Manifest b/kde-base/kolf/Manifest
index bbac3301c2c9..c9d679f841c0 100644
--- a/kde-base/kolf/Manifest
+++ b/kde-base/kolf/Manifest
@@ -1,4 +1,26 @@
-MD5 b261dcabea98960b35ff2f3d72252d62 kolf-3.4.0_alpha1.ebuild 569
-MD5 b261dcabea98960b35ff2f3d72252d62 kolf-3.4.0_beta1.ebuild 569
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kolf-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kolf-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 257c4a5b609eed079110aaa8f62c78dc ChangeLog 3260
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kolf-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kolf-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kolf-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kolf-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kolf-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kolf-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kolf-3.5_beta1 70
+MD5 f13e44dee96fae9fdd48e09da2c6eacf kolf-3.4.1.ebuild 681
+MD5 657d6fcf1aee7725dc6310fde11f13a5 kolf-3.4.2.ebuild 694
+MD5 a98beea74d39a2b0df6a33d7697755bd kolf-3.4.3.ebuild 690
+MD5 3358c2a2a940f3aea8a6d34694319f6b kolf-3.5.0.ebuild 633
+MD5 a5d34b318264735a53fc7532c76a66cc kolf-3.5.0_beta2.ebuild 638
+MD5 da4a417c1959c2d54f0f6b7bf8be0df2 kolf-3.5.0_rc1.ebuild 637
+MD5 7c224fb40e1650e1c5dc5702bdf5c8dc kolf-3.5_beta1.ebuild 673
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl9IntT9W3vfTuoRAkXCAJ9/Cg6bgEpogBqpjLQl8KpJ3sgGHgCfWa7T
+uuVsCoIpmtJoUkmzk8JecBA=
+=S2q0
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kolf/files/digest-kolf-3.4.1 b/kde-base/kolf/files/digest-kolf-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kolf/files/digest-kolf-3.4.1
+++ b/kde-base/kolf/files/digest-kolf-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kolf/files/digest-kolf-3.4.2 b/kde-base/kolf/files/digest-kolf-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kolf/files/digest-kolf-3.4.2
+++ b/kde-base/kolf/files/digest-kolf-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kolf/kolf-3.4.1.ebuild b/kde-base/kolf/kolf-3.4.1.ebuild
index 60a8c07d4032..78f64cdc59aa 100644
--- a/kde-base/kolf/kolf-3.4.1.ebuild
+++ b/kde-base/kolf/kolf-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kolf/kolf-3.4.2.ebuild b/kde-base/kolf/kolf-3.4.2.ebuild
index 01252587965f..c9c40c306913 100644
--- a/kde-base/kolf/kolf-3.4.2.ebuild
+++ b/kde-base/kolf/kolf-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kolf/kolf-3.4.3.ebuild b/kde-base/kolf/kolf-3.4.3.ebuild
index 1a3c10eb1a1e..e74873ae1897 100644
--- a/kde-base/kolf/kolf-3.4.3.ebuild
+++ b/kde-base/kolf/kolf-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.4.3.ebuild,v 1.1 2005/10/13 00:10:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kolf/kolf-3.5.0.ebuild b/kde-base/kolf/kolf-3.5.0.ebuild
index ef2e89128191..f2c5fc45f4ac 100644
--- a/kde-base/kolf/kolf-3.5.0.ebuild
+++ b/kde-base/kolf/kolf-3.5.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/kde-base/kolf/kolf-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kolf/kolf-3.5.0_beta2.ebuild b/kde-base/kolf/kolf-3.5.0_beta2.ebuild
index cb4405621da9..e1800af0921e 100644
--- a/kde-base/kolf/kolf-3.5.0_beta2.ebuild
+++ b/kde-base/kolf/kolf-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kolf/kolf-3.5.0_rc1.ebuild b/kde-base/kolf/kolf-3.5.0_rc1.ebuild
index 25c22b1e0473..95994e8567d4 100644
--- a/kde-base/kolf/kolf-3.5.0_rc1.ebuild
+++ b/kde-base/kolf/kolf-3.5.0_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/kde-base/kolf/kolf-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kolf/kolf-3.5_beta1.ebuild b/kde-base/kolf/kolf-3.5_beta1.ebuild
index 7c3ebe2fe125..9904e8f005a3 100644
--- a/kde-base/kolf/kolf-3.5_beta1.ebuild
+++ b/kde-base/kolf/kolf-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.5_beta1.ebuild,v 1.1 2005/09/22 19:47:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolf/kolf-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Minigolf Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kolf/metadata.xml b/kde-base/kolf/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kolf/metadata.xml
+++ b/kde-base/kolf/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kolourpaint/ChangeLog b/kde-base/kolourpaint/ChangeLog
index 99a3bce3a5be..462a5719d09a 100644
--- a/kde-base/kolourpaint/ChangeLog
+++ b/kde-base/kolourpaint/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for kde-base/kolourpaint
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/ChangeLog,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kolourpaint-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kolourpaint-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kolourpaint-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kolourpaint-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kolourpaint-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kolourpaint-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kolourpaint-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kolourpaint-3.5_beta1.ebuild, kolourpaint-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  kolourpaint-3.5.0_beta2.ebuild:
+  Removed no longer necessary patch.
+
+*kolourpaint-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kolourpaint-3.5.0_beta2.ebuild:
+  New version.
+
+*kolourpaint-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kolourpaint-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kolourpaint-3.5_beta1-compile-fix.patch,
+  kolourpaint-3.5_beta1.ebuild:
+  Patched so that it builds successfully.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kolourpaint-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kolourpaint-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kolourpaint-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kolourpaint-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kolourpaint-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kolourpaint-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kolourpaint-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kolourpaint-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kolourpaint-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kolourpaint-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kolourpaint-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kolourpaint-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kolourpaint-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kolourpaint-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kolourpaint-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kolourpaint-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kolourpaint-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kolourpaint-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kolourpaint-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kolourpaint-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kolourpaint-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kolourpaint-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kolourpaint/Manifest b/kde-base/kolourpaint/Manifest
index 9f874689df67..f730d72edf2f 100644
--- a/kde-base/kolourpaint/Manifest
+++ b/kde-base/kolourpaint/Manifest
@@ -1,4 +1,27 @@
-MD5 325b1e3171571f0755f6c4b17fc931c7 kolourpaint-3.4.0_beta1.ebuild 300
-MD5 325b1e3171571f0755f6c4b17fc931c7 kolourpaint-3.4.0_alpha1.ebuild 300
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kolourpaint-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kolourpaint-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b2f1c9e1afce77e5c1c2e9bffa73c141 ChangeLog 3999
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kolourpaint-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kolourpaint-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kolourpaint-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kolourpaint-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kolourpaint-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kolourpaint-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kolourpaint-3.5_beta1 72
+MD5 2101ba9939546290111b1732a8ff440b files/kolourpaint-3.5_beta1-compile-fix.patch 1120
+MD5 a44022fb1411ba50607f4c25d6b75bf6 kolourpaint-3.4.1.ebuild 395
+MD5 5d1fec3c0695e48ce0adf2843a0b54ac kolourpaint-3.4.2.ebuild 408
+MD5 737cca537e4e619295cccd9e6ddaebdc kolourpaint-3.4.3.ebuild 404
+MD5 c2d7882bec419749b29435f9a05a946e kolourpaint-3.5.0.ebuild 385
+MD5 b479d9201028fde9b4b74c5767589731 kolourpaint-3.5.0_beta2.ebuild 390
+MD5 230a590e6122fccb3b8bc513ce9a8b8a kolourpaint-3.5.0_rc1.ebuild 389
+MD5 d27a9f14e7dd06fb37e8b4e81d0295c8 kolourpaint-3.5_beta1.ebuild 494
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmcnntT9W3vfTuoRAug4AKC0pkYiqGlYcI7YF6aLVxjHAIX1PACggvLu
+Y9VA/T0Fu5lG7AhljtOtdjM=
+=hGdq
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kolourpaint/files/digest-kolourpaint-3.4.1 b/kde-base/kolourpaint/files/digest-kolourpaint-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kolourpaint/files/digest-kolourpaint-3.4.1
+++ b/kde-base/kolourpaint/files/digest-kolourpaint-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kolourpaint/files/digest-kolourpaint-3.4.2 b/kde-base/kolourpaint/files/digest-kolourpaint-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kolourpaint/files/digest-kolourpaint-3.4.2
+++ b/kde-base/kolourpaint/files/digest-kolourpaint-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kolourpaint/kolourpaint-3.4.1.ebuild b/kde-base/kolourpaint/kolourpaint-3.4.1.ebuild
index 2a24de53476c..74a325e59a4a 100644
--- a/kde-base/kolourpaint/kolourpaint-3.4.1.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.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/kde-base/kolourpaint/kolourpaint-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kolourpaint/kolourpaint-3.4.2.ebuild b/kde-base/kolourpaint/kolourpaint-3.4.2.ebuild
index 964b29527983..549d65fc58d4 100644
--- a/kde-base/kolourpaint/kolourpaint-3.4.2.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.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/kde-base/kolourpaint/kolourpaint-3.4.2.ebuild,v 1.1 2005/07/28 21:16:19 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/kde-base/kolourpaint/kolourpaint-3.4.3.ebuild b/kde-base/kolourpaint/kolourpaint-3.4.3.ebuild
index b16f118cb7cd..1cfe5478f94f 100644
--- a/kde-base/kolourpaint/kolourpaint-3.4.3.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.4.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/kde-base/kolourpaint/kolourpaint-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/kolourpaint/kolourpaint-3.5.0.ebuild b/kde-base/kolourpaint/kolourpaint-3.5.0.ebuild
index 20d9da4253a0..84a230beb3c9 100644
--- a/kde-base/kolourpaint/kolourpaint-3.5.0.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.5.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/kde-base/kolourpaint/kolourpaint-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kolourpaint/kolourpaint-3.5.0_beta2.ebuild b/kde-base/kolourpaint/kolourpaint-3.5.0_beta2.ebuild
index 13f70ebbbb3f..3799c502236b 100644
--- a/kde-base/kolourpaint/kolourpaint-3.5.0_beta2.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.5.0_beta2.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/kde-base/kolourpaint/kolourpaint-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,8 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-# The setCustomAuthorText function seems to have been removed.
-PATCHES="$FILESDIR/${P}-compile-fix.patch"
diff --git a/kde-base/kolourpaint/kolourpaint-3.5.0_rc1.ebuild b/kde-base/kolourpaint/kolourpaint-3.5.0_rc1.ebuild
index f3daa151623e..58b77c73a2d6 100644
--- a/kde-base/kolourpaint/kolourpaint-3.5.0_rc1.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.5.0_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/kde-base/kolourpaint/kolourpaint-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:30 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kolourpaint/kolourpaint-3.5_beta1.ebuild b/kde-base/kolourpaint/kolourpaint-3.5_beta1.ebuild
index c7744a8da762..129486786ed9 100644
--- a/kde-base/kolourpaint/kolourpaint-3.5_beta1.ebuild
+++ b/kde-base/kolourpaint/kolourpaint-3.5_beta1.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/kde-base/kolourpaint/kolourpaint-3.5_beta1.ebuild,v 1.1 2005/09/22 19:48:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kolourpaint/kolourpaint-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,8 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Paint Program for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
+
+# The setCustomAuthorText function seems to have been removed.
+PATCHES="$FILESDIR/${P}-compile-fix.patch"
diff --git a/kde-base/kolourpaint/metadata.xml b/kde-base/kolourpaint/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kolourpaint/metadata.xml
+++ b/kde-base/kolourpaint/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kommander/ChangeLog b/kde-base/kommander/ChangeLog
index 452eac737b3a..86d7f70c9135 100644
--- a/kde-base/kommander/ChangeLog
+++ b/kde-base/kommander/ChangeLog
@@ -1,6 +1,132 @@
 # ChangeLog for kde-base/kommander
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/ChangeLog,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kommander-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kommander-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kommander-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kommander-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kommander-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kommander-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kommander-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kommander-3.5_beta1.ebuild,
+  kommander-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kommander-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kommander-3.5.0_beta2.ebuild:
+  New version.
+
+*kommander-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kommander-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kommander-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kommander-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kommander-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kommander-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kommander-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kommander-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kommander-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kommander-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kommander-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kommander-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kommander-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org> kommander-3.4.0-r2.ebuild,
+  kommander-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> kommander-3.4.0-r2.ebuild,
+  kommander-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+  26 May 2005; Dan Armak <danarmak@gentoo.org> kommander-3.4.1.ebuild:
+  Remove patch included upstream in 3.4.1.
+
+*kommander-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kommander-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+*kommander-3.4.0-r2 (02 May 2005)
+
+  02 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/post-3.4-kdewebdev.diff, +files/post-3.4-kdewebdev-2.diff,
+  -kommander-3.4.0.ebuild, -kommander-3.4.0-r1.ebuild,
+  +kommander-3.4.0-r2.ebuild:
+  new patch, fixing a bug in the previous one
+
+  20 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  files/post-3.4-kdewebdev.diff:
+  bah, fixed patch
+
+*kommander-3.4.0-r1 (19 Apr 2005)
+
+  19 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.4-kdewebdev.diff, +kommander-3.4.0-r1.ebuild:
+  Untrusted code execution, #89092
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kommander-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kommander-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kommander-3.4.0_rc1 (10 Mar 2005)
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kommander-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kommander-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kommander-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kommander-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kommander/Manifest b/kde-base/kommander/Manifest
index decbedf1d0e0..a3b804bfdc10 100644
--- a/kde-base/kommander/Manifest
+++ b/kde-base/kommander/Manifest
@@ -1,4 +1,27 @@
-MD5 a53595aeac68b9813b028ecf103b1816 kommander-3.4.0_alpha1.ebuild 279
-MD5 a53595aeac68b9813b028ecf103b1816 kommander-3.4.0_beta1.ebuild 279
-MD5 07dc9f44e293d1ac9c7b66b68f28492f files/digest-kommander-3.4.0_beta1 219
-MD5 01932d35a126a5610a6c4a35de90a2b6 files/digest-kommander-3.4.0_alpha1 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4e324baa038f1ef2b053b833d51be212 ChangeLog 4352
+MD5 e951879abebc3cb3931132db3f1c508a files/digest-kommander-3.4.1 215
+MD5 aa19f6252c3ee8966919f391f9ccd717 files/digest-kommander-3.4.2 292
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-kommander-3.4.3 69
+MD5 1b9c64625ee8bb6581dafc883b1d0ee1 files/digest-kommander-3.5.0 69
+MD5 f707b83e603df2763351c664d0943915 files/digest-kommander-3.5.0_beta2 219
+MD5 50a5dfc5bdebb9f91775752768b4ca60 files/digest-kommander-3.5.0_rc1 304
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-kommander-3.5_beta1 70
+MD5 64933746cbdc378bd6d40e0b56eac91f files/post-3.4-kdewebdev-2.diff 2703
+MD5 d7ed5766cdc1be112c8f526f7876745f kommander-3.4.1.ebuild 402
+MD5 d10c382abf550bc82b53bf6b9821ecf4 kommander-3.4.2.ebuild 415
+MD5 d1ebb289aa2ac39ebe3cd723577bc8e1 kommander-3.4.3.ebuild 411
+MD5 7db1e28c7c4f47a43814355bc5c970a0 kommander-3.5.0.ebuild 391
+MD5 60006ee956a669d2adf031749cbb188a kommander-3.5.0_beta2.ebuild 396
+MD5 fa865bca4cc44a3499c3785b800761cb kommander-3.5.0_rc1.ebuild 395
+MD5 592c7fddb26d4b3c7cbe41bb549ee8aa kommander-3.5_beta1.ebuild 394
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxWWntT9W3vfTuoRAvVnAJ4ziGKBKscMs3ITfpqQOTCKZO2iJwCeInYm
+6a1mCwj7R4+usih7Jdx6wJA=
+=ImSd
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kommander/files/digest-kommander-3.4.1 b/kde-base/kommander/files/digest-kommander-3.4.1
index 797b2dac2533..ff993687a657 100644
--- a/kde-base/kommander/files/digest-kommander-3.4.1
+++ b/kde-base/kommander/files/digest-kommander-3.4.1
@@ -1,2 +1,3 @@
 MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
 MD5 d5c9e5c72731aead950ab29a4d620af8 kdewebdev-3.4.1.tar.bz2 5966577
diff --git a/kde-base/kommander/files/digest-kommander-3.4.2 b/kde-base/kommander/files/digest-kommander-3.4.2
index 5497b6e4be9f..18c726d6f0c5 100644
--- a/kde-base/kommander/files/digest-kommander-3.4.2
+++ b/kde-base/kommander/files/digest-kommander-3.4.2
@@ -1 +1,4 @@
+MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
+MD5 fadb59f001c317dd0f843be81f4157d9 kdewebdev-3.4.1-3.4.2.tar.xdelta 220130
 MD5 99dbd9bf9b2a1451544b35f73efe7dba kdewebdev-3.4.2.tar.bz2 5968773
diff --git a/kde-base/kommander/kommander-3.4.1.ebuild b/kde-base/kommander/kommander-3.4.1.ebuild
index 908315b0ae84..2ff39a72cfd5 100644
--- a/kde-base/kommander/kommander-3.4.1.ebuild
+++ b/kde-base/kommander/kommander-3.4.1.ebuild
@@ -1,17 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
-src_unpack(){
-	kde-meta_src_unpack
-	epatch ${FILESDIR}/post-3.4-kdewebdev-2.diff
-}
diff --git a/kde-base/kommander/kommander-3.4.2.ebuild b/kde-base/kommander/kommander-3.4.2.ebuild
index e301386f0fc9..47ca6477065c 100644
--- a/kde-base/kommander/kommander-3.4.2.ebuild
+++ b/kde-base/kommander/kommander-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kommander/kommander-3.4.3.ebuild b/kde-base/kommander/kommander-3.4.3.ebuild
index 193cc18f4dfd..4972f0d6fc5d 100644
--- a/kde-base/kommander/kommander-3.4.3.ebuild
+++ b/kde-base/kommander/kommander-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kommander/kommander-3.5.0.ebuild b/kde-base/kommander/kommander-3.5.0.ebuild
index 47d584edcb73..38756d3213c2 100644
--- a/kde-base/kommander/kommander-3.5.0.ebuild
+++ b/kde-base/kommander/kommander-3.5.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/kde-base/kommander/kommander-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kommander/kommander-3.5.0_beta2.ebuild b/kde-base/kommander/kommander-3.5.0_beta2.ebuild
index 208c619ea029..f080ca30b96e 100644
--- a/kde-base/kommander/kommander-3.5.0_beta2.ebuild
+++ b/kde-base/kommander/kommander-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:56 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kommander/kommander-3.5.0_rc1.ebuild b/kde-base/kommander/kommander-3.5.0_rc1.ebuild
index 6e42f45eecd6..cef8d2fa985b 100644
--- a/kde-base/kommander/kommander-3.5.0_rc1.ebuild
+++ b/kde-base/kommander/kommander-3.5.0_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/kde-base/kommander/kommander-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kommander/kommander-3.5_beta1.ebuild b/kde-base/kommander/kommander-3.5_beta1.ebuild
index cdb74a9bb061..e488eba5141e 100644
--- a/kde-base/kommander/kommander-3.5_beta1.ebuild
+++ b/kde-base/kommander/kommander-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.5_beta1.ebuild,v 1.1 2005/09/22 19:49:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kommander/kommander-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE dialog system for scripting"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kommander/metadata.xml b/kde-base/kommander/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kommander/metadata.xml
+++ b/kde-base/kommander/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kompare/ChangeLog b/kde-base/kompare/ChangeLog
index 94773c63fe56..e01ec18173e5 100644
--- a/kde-base/kompare/ChangeLog
+++ b/kde-base/kompare/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for kde-base/kompare
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/ChangeLog,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kompare-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kompare-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kompare-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kompare-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kompare-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kompare-3.5_beta1.ebuild,
+  kompare-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kompare-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.5.0_beta2.ebuild:
+  New version.
+
+*kompare-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kompare-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kompare-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kompare-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kompare-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kompare-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kompare-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kompare-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kompare-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kompare-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kompare-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kompare-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kompare-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kompare-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kompare-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kompare-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kompare-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kompare-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kompare-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kompare/Manifest b/kde-base/kompare/Manifest
index 5459f6a1b26e..684c925577a6 100644
--- a/kde-base/kompare/Manifest
+++ b/kde-base/kompare/Manifest
@@ -1,4 +1,16 @@
-MD5 e678c318a8d2ed5205887c24867b3ca3 kompare-3.4.0_beta1.ebuild 324
-MD5 e678c318a8d2ed5205887c24867b3ca3 kompare-3.4.0_alpha1.ebuild 324
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kompare-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kompare-3.4.0_alpha1 67
+MD5 daefb38e25760c0e0ba45c90e4315127 ChangeLog 3351
+MD5 dfce6af7e27adc161347a56c006b6058 kompare-3.4.1.ebuild 444
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 355fc0c218e4d450356f84dcedf6c595 kompare-3.4.2.ebuild 452
+MD5 3cf802e64494f1044c8465d65188ec29 kompare-3.5_beta1.ebuild 435
+MD5 1249d6d88d623adc28802568487fd1ec kompare-3.4.3.ebuild 448
+MD5 857c502b175df8442422a5715599bd83 kompare-3.5.0_beta2.ebuild 437
+MD5 58b80929490439e5070948dc80570f16 kompare-3.5.0_rc1.ebuild 436
+MD5 cda03878df042d831acd0be1525c1d3c kompare-3.5.0.ebuild 432
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kompare-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-kompare-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kompare-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kompare-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kompare-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-kompare-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kompare-3.5.0 66
diff --git a/kde-base/kompare/files/digest-kompare-3.4.1 b/kde-base/kompare/files/digest-kompare-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kompare/files/digest-kompare-3.4.1
+++ b/kde-base/kompare/files/digest-kompare-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kompare/files/digest-kompare-3.4.2 b/kde-base/kompare/files/digest-kompare-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/kompare/files/digest-kompare-3.4.2
+++ b/kde-base/kompare/files/digest-kompare-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kompare/kompare-3.4.1.ebuild b/kde-base/kompare/kompare-3.4.1.ebuild
index d47bde148253..8e04dba24a31 100644
--- a/kde-base/kompare/kompare-3.4.1.ebuild
+++ b/kde-base/kompare/kompare-3.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/kde-base/kompare/kompare-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A program to view the differences between files and optionally generate a diff"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kompare/kompare-3.4.2.ebuild b/kde-base/kompare/kompare-3.4.2.ebuild
index 1ca95b61cfb2..32822e8a25bb 100644
--- a/kde-base/kompare/kompare-3.4.2.ebuild
+++ b/kde-base/kompare/kompare-3.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/kde-base/kompare/kompare-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kompare/kompare-3.4.3.ebuild b/kde-base/kompare/kompare-3.4.3.ebuild
index a623951f2028..3368a96f0c0d 100644
--- a/kde-base/kompare/kompare-3.4.3.ebuild
+++ b/kde-base/kompare/kompare-3.4.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/kde-base/kompare/kompare-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A program to view the differences between files and optionally generate a diff"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kompare/kompare-3.5.0.ebuild b/kde-base/kompare/kompare-3.5.0.ebuild
index 68d943875e62..762011650be8 100644
--- a/kde-base/kompare/kompare-3.5.0.ebuild
+++ b/kde-base/kompare/kompare-3.5.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/kde-base/kompare/kompare-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kompare/kompare-3.5.0_beta2.ebuild b/kde-base/kompare/kompare-3.5.0_beta2.ebuild
index 48bcca6516bc..c90830001733 100644
--- a/kde-base/kompare/kompare-3.5.0_beta2.ebuild
+++ b/kde-base/kompare/kompare-3.5.0_beta2.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/kde-base/kompare/kompare-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A program to view the differences between files and optionally generate a diff"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kompare/kompare-3.5.0_rc1.ebuild b/kde-base/kompare/kompare-3.5.0_rc1.ebuild
index 4675c82be11d..f295c214af51 100644
--- a/kde-base/kompare/kompare-3.5.0_rc1.ebuild
+++ b/kde-base/kompare/kompare-3.5.0_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/kde-base/kompare/kompare-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kompare/kompare-3.5_beta1.ebuild b/kde-base/kompare/kompare-3.5_beta1.ebuild
index a25d6eefe08a..2e6c1f38a19d 100644
--- a/kde-base/kompare/kompare-3.5_beta1.ebuild
+++ b/kde-base/kompare/kompare-3.5_beta1.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/kde-base/kompare/kompare-3.5_beta1.ebuild,v 1.1 2005/09/22 19:50:22 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kompare/kompare-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:59 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A program to view the differences between files and optionally generate a diff"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kompare/metadata.xml b/kde-base/kompare/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kompare/metadata.xml
+++ b/kde-base/kompare/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konq-plugins/ChangeLog b/kde-base/konq-plugins/ChangeLog
index a394362e4dd4..33c895100b60 100644
--- a/kde-base/konq-plugins/ChangeLog
+++ b/kde-base/konq-plugins/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for kde-base/konq-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.1 2005/02/27 19:21:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  konq-plugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> konq-plugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  konq-plugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*konq-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +konq-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*konq-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +konq-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  konq-plugins-3.5_beta1.ebuild, konq-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*konq-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +konq-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+*konq-plugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +konq-plugins-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -konq-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*konq-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konq-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*konq-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konq-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  konq-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*konq-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +konq-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> konq-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> konq-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> konq-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*konq-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +konq-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  konq-plugins-3.4.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*konq-plugins-3.4.0-r1 (22 Apr 2005)
+
+  22 Apr 2005; Dan Armak <danarmak@gentoo.org>
+  +konq-plugins-3.4.0-r1.ebuild:
+  Don't install the documentation; the kdeaddons-docs-konq-plugins ebuild does
+  that. Fixes file overwriting/ownership conflict. Closes bug #86009.
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> konq-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> konq-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> konq-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*konq-plugins-3.4.0_rc1-r1 (28 Feb 2005)
+
+  28 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +konq-plugins-3.4.0_rc1-r1.ebuild, -konq-plugins-3.4.0_rc1.ebuild:
+  The rc1 ebuild was, by mistake, a copy of the konqueror-arkplugin ebuild.
+  Restoring the correct ebuild (same as the beta2 one) and increasing the rev.
+  Bug 83504, thanks to Tom Shaw for noticing.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*konq-plugins-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +konq-plugins-3.4.0_rc1.ebuild:
+  Adding the split ebuilds to portage. For KDE 3.4, we've created separate
+  ebuilds for all the KDE apps.
 
 *konq-plugins-3.4.0_beta2 (27 Feb 2005)
 
diff --git a/kde-base/konq-plugins/Manifest b/kde-base/konq-plugins/Manifest
index 1a8f9865372d..f900d48cf7a1 100644
--- a/kde-base/konq-plugins/Manifest
+++ b/kde-base/konq-plugins/Manifest
@@ -1,6 +1,26 @@
-MD5 0d6c6a5f7a432c0f3b4d5b00dd90a626 konq-plugins-3.4.0_rc1.ebuild 664
-MD5 6d5874a9d9854d50d7c6e7c0f4c97053 konq-plugins-3.4.0_beta2.ebuild 621
-MD5 b7fd3e48f9aecae00678abf818d1c326 ChangeLog 437
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 9009a89a3313cb85f25a0d66683e48ed files/digest-konq-plugins-3.4.0_beta2 298
-MD5 333f4787d9379a156dba6035f1fca6e3 files/digest-konq-plugins-3.4.0_rc1 383
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2ba8ab49f05922523f69de59f3eb69ec ChangeLog 4115
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-konq-plugins-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-konq-plugins-3.4.2 291
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-konq-plugins-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-konq-plugins-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-konq-plugins-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-konq-plugins-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-konq-plugins-3.5_beta1 70
+MD5 c92307aa366e79b8743fd96262ae8f01 konq-plugins-3.4.1.ebuild 657
+MD5 0216edfe2fd1617b1dac5b8bd42668ff konq-plugins-3.4.2.ebuild 672
+MD5 34dc271f1e844a5f232a06efb76dcad8 konq-plugins-3.4.3.ebuild 668
+MD5 f2d9b68bba3117bbcdf6dc4bfb85b38f konq-plugins-3.5.0.ebuild 646
+MD5 961016923bd82bb5b2aadd951d6c1887 konq-plugins-3.5.0_beta2.ebuild 657
+MD5 eac7734603dadea213bac7b761c61e44 konq-plugins-3.5.0_rc1.ebuild 656
+MD5 fbf898d234aa2e6bed1a397f7742d86e konq-plugins-3.5_beta1.ebuild 649
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxiuntT9W3vfTuoRApjyAJ9adalS8HpzEK052JBiiim+Par4QACfXSLi
+W1EpSSpjHK9JPISSnzqBuUg=
+=sWq1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konq-plugins/files/digest-konq-plugins-3.4.1 b/kde-base/konq-plugins/files/digest-konq-plugins-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/konq-plugins/files/digest-konq-plugins-3.4.1
+++ b/kde-base/konq-plugins/files/digest-konq-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/konq-plugins/files/digest-konq-plugins-3.4.2 b/kde-base/konq-plugins/files/digest-konq-plugins-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/konq-plugins/files/digest-konq-plugins-3.4.2
+++ b/kde-base/konq-plugins/files/digest-konq-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/konq-plugins/konq-plugins-3.4.1.ebuild b/kde-base/konq-plugins/konq-plugins-3.4.1.ebuild
index f89e91f74890..cff424a7ec3b 100644
--- a/kde-base/konq-plugins/konq-plugins-3.4.1.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.4.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
 inherit kde-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="
-$(deprange $PV $MAXKDEVER kde-base/konqueror)
+DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
+RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kdeaddons-docs-konq-plugins)"
 
 # Don't install the akregator plugin, since it depends on akregator, which is
diff --git a/kde-base/konq-plugins/konq-plugins-3.4.2.ebuild b/kde-base/konq-plugins/konq-plugins-3.4.2.ebuild
index a38dea64e66b..6b4f46c176cd 100644
--- a/kde-base/konq-plugins/konq-plugins-3.4.2.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
 inherit kde-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konq-plugins/konq-plugins-3.4.3.ebuild b/kde-base/konq-plugins/konq-plugins-3.4.3.ebuild
index 7f57691b2e19..18e58c1df09b 100644
--- a/kde-base/konq-plugins/konq-plugins-3.4.3.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
 inherit kde-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konq-plugins/konq-plugins-3.5.0.ebuild b/kde-base/konq-plugins/konq-plugins-3.5.0.ebuild
index 724d20090ccb..c93e23fca0d3 100644
--- a/kde-base/konq-plugins/konq-plugins-3.5.0.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.5.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/kde-base/konq-plugins/konq-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
diff --git a/kde-base/konq-plugins/konq-plugins-3.5.0_beta2.ebuild b/kde-base/konq-plugins/konq-plugins-3.5.0_beta2.ebuild
index 8d698bbcc6f1..bfa8d0248f5b 100644
--- a/kde-base/konq-plugins/konq-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
 inherit kde-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konq-plugins/konq-plugins-3.5.0_rc1.ebuild b/kde-base/konq-plugins/konq-plugins-3.5.0_rc1.ebuild
index cce73960aedf..5830fa7bfb3d 100644
--- a/kde-base/konq-plugins/konq-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.5.0_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/kde-base/konq-plugins/konq-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:42 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
diff --git a/kde-base/konq-plugins/konq-plugins-3.5_beta1.ebuild b/kde-base/konq-plugins/konq-plugins-3.5_beta1.ebuild
index b57fb013b6f7..d28107991a29 100644
--- a/kde-base/konq-plugins/konq-plugins-3.5_beta1.ebuild
+++ b/kde-base/konq-plugins/konq-plugins-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 19:51:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konq-plugins/konq-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdeaddons
 KMNODOCS=true
 MAXKDEVER=$PV
 inherit kde-meta
 
 DESCRIPTION="Various plugins for konqueror"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konq-plugins/metadata.xml b/kde-base/konq-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/konq-plugins/metadata.xml
+++ b/kde-base/konq-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konqueror-akregator/ChangeLog b/kde-base/konqueror-akregator/ChangeLog
index 48722f792d8c..c153e74ddae3 100644
--- a/kde-base/konqueror-akregator/ChangeLog
+++ b/kde-base/konqueror-akregator/ChangeLog
@@ -1,6 +1,122 @@
 # ChangeLog for kde-base/konqueror-akregator
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/ChangeLog,v 1.1 2005/01/25 21:53:49 motaboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/ChangeLog,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  konqueror-akregator-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  konqueror-akregator-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  konqueror-akregator-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*konqueror-akregator-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +konqueror-akregator-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*konqueror-akregator-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +konqueror-akregator-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  konqueror-akregator-3.5_beta1.ebuild,
+  konqueror-akregator-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*konqueror-akregator-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +konqueror-akregator-3.5.0_beta2.ebuild:
+  New version.
+
+*konqueror-akregator-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +konqueror-akregator-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -konqueror-akregator-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*konqueror-akregator-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konqueror-akregator-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*konqueror-akregator-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konqueror-akregator-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  konqueror-akregator-3.4.2.ebuild:
+  ~alpha keyword.
+
+*konqueror-akregator-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +konqueror-akregator-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  konqueror-akregator-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  konqueror-akregator-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  konqueror-akregator-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*konqueror-akregator-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +konqueror-akregator-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  konqueror-akregator-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  konqueror-akregator-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  konqueror-akregator-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  konqueror-akregator-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*konqueror-akregator-3.4.0_rc1 (09 Mar 2005)
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  konqueror-akregator-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*konqueror-akregator-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +konqueror-akregator-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *konqueror-akregator-3.4.0_beta1 (25 Jan 2005)
 
diff --git a/kde-base/konqueror-akregator/Manifest b/kde-base/konqueror-akregator/Manifest
index d9926edce7ea..b536195d6014 100644
--- a/kde-base/konqueror-akregator/Manifest
+++ b/kde-base/konqueror-akregator/Manifest
@@ -1,2 +1,26 @@
-MD5 3030b6779f6d7e2ce86f5b181dd4b3e2 konqueror-akregator-3.4.0_beta1.ebuild 751
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-konqueror-akregator-3.4.0_beta1 219
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7eb1021eaecb00b76412d3c4056fea26 ChangeLog 3956
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-konqueror-akregator-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-konqueror-akregator-3.4.2 291
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-konqueror-akregator-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-konqueror-akregator-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-konqueror-akregator-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-konqueror-akregator-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-konqueror-akregator-3.5_beta1 70
+MD5 68b6c01cea68645753003becd3257d6c konqueror-akregator-3.4.1.ebuild 652
+MD5 5e9f31ba95c766a56e4e9800e874cb49 konqueror-akregator-3.4.2.ebuild 667
+MD5 cc8e98654dd54977d08102abeecbd51f konqueror-akregator-3.4.3.ebuild 663
+MD5 0ebae2e9425ec5e95201234ec9b374f7 konqueror-akregator-3.5.0.ebuild 641
+MD5 60d7bafa582925b64b3c45d43019621f konqueror-akregator-3.5.0_beta2.ebuild 652
+MD5 e7887ce898270b6a94253918813d246f konqueror-akregator-3.5.0_rc1.ebuild 651
+MD5 47f28c05fc7f9958e5477c8f9a910104 konqueror-akregator-3.5_beta1.ebuild 644
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxhzntT9W3vfTuoRAoNdAJ4kyIiFfei61j8RL++EmnsgTBPxEACgncpr
+rBHxhQhN4aF532Gq1VusUGc=
+=ju0Z
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.1 b/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.1
+++ b/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.2 b/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.2
+++ b/kde-base/konqueror-akregator/files/digest-konqueror-akregator-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.4.1.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.4.1.ebuild
index 15b507575f73..0fccc3e96a28 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.4.1.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.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/kde-base/konqueror-akregator/konqueror-akregator-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
@@ -9,9 +9,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="konqueror's akregator plugin"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/konqueror)
-$(deprange $PV $MAXKDEVER kde-base/kdeaddons-docs-konq-plugins)"
-RDEPEND="$(deprange $PV $MAXKDEVER kde-base/akregator)"
-
+DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
+RDEPEND="${DEPEND}
+$(deprange $PV $MAXKDEVER kde-base/kdeaddons-docs-konq-plugins)
+$(deprange-dual $PV $MAXKDEVER kde-base/akregator)"
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.4.2.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.4.2.ebuild
index 3977f59c5ea3..92d44f0de8a0 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.4.2.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.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/kde-base/konqueror-akregator/konqueror-akregator-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="konqueror's akregator plugin"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.4.3.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.4.3.ebuild
index 2c3768147835..e437530a8b8f 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.4.3.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.4.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/kde-base/konqueror-akregator/konqueror-akregator-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="konqueror's akregator plugin"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5.0.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5.0.ebuild
index 2ddc0d639114..d0ed763f92d6 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5.0.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5.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/kde-base/konqueror-akregator/konqueror-akregator-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_beta2.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_beta2.ebuild
index 8dc5d5a7d01d..d2b53c525afa 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_beta2.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_beta2.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/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="konqueror's akregator plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_rc1.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_rc1.ebuild
index 3cd37e8b4fac..a667a0c5d190 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_rc1.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_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/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
diff --git a/kde-base/konqueror-akregator/konqueror-akregator-3.5_beta1.ebuild b/kde-base/konqueror-akregator/konqueror-akregator-3.5_beta1.ebuild
index 68c1cafcf17e..c4cc2c1d8b01 100644
--- a/kde-base/konqueror-akregator/konqueror-akregator-3.5_beta1.ebuild
+++ b/kde-base/konqueror-akregator/konqueror-akregator-3.5_beta1.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/kde-base/konqueror-akregator/konqueror-akregator-3.5_beta1.ebuild,v 1.1 2005/09/22 19:53:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror-akregator/konqueror-akregator-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="konq-plugins/akregator"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="konqueror's akregator plugin"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/konqueror)"
 RDEPEND="${DEPEND}
diff --git a/kde-base/konqueror-akregator/metadata.xml b/kde-base/konqueror-akregator/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/konqueror-akregator/metadata.xml
+++ b/kde-base/konqueror-akregator/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index fe6c07754d3b..defdb62a9857 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,126 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.1 2005/01/15 02:24:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> konqueror-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> konqueror-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  konqueror-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*konqueror-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +konqueror-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*konqueror-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +konqueror-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  konqueror-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*konqueror-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +konqueror-3.5.0_beta2.ebuild:
+  New version.
+
+*konqueror-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +konqueror-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  konqueror-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -konqueror-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*konqueror-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konqueror-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*konqueror-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konqueror-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  konqueror-3.4.2-r1.ebuild:
+  ~alpha keyword.
+
+*konqueror-3.4.2-r1 (06 Aug 2005)
+
+  06 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdebase-3.4.2-konqueror-filter.patch, +konqueror-3.4.2-r1.ebuild:
+  Added patch for bug #101501 (Konqueror considers name filters even when a
+  file with the exact name exists).
+
+*konqueror-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +konqueror-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> konqueror-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> konqueror-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> konqueror-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  27 May 2005; Carsten Lohrke <carlo@gentoo.org> konqueror-3.4.0.ebuild,
+  konqueror-3.4.1.ebuild:
+  add kdebase-kioslaves as runtime dependency, #89867
+
+*konqueror-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +konqueror-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> konqueror-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> konqueror-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> konqueror-3.4.0.ebuild,
+  konqueror-3.4.0_beta2.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> konqueror-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*konqueror-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  konqueror-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*konqueror-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +konqueror-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *konqueror-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/konqueror/Manifest b/kde-base/konqueror/Manifest
index b5a454cef783..ec2ed1126744 100644
--- a/kde-base/konqueror/Manifest
+++ b/kde-base/konqueror/Manifest
@@ -1,4 +1,29 @@
-MD5 c2dd7224e32b4e55e9a15873dcb6c686 konqueror-3.4.0_beta1.ebuild 667
-MD5 c2dd7224e32b4e55e9a15873dcb6c686 konqueror-3.4.0_alpha1.ebuild 667
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-konqueror-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-konqueror-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 044a7554366ff9a180ae0781ceba7321 ChangeLog 4159
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-konqueror-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-konqueror-3.4.2 287
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-konqueror-3.4.2-r1 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-konqueror-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-konqueror-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-konqueror-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-konqueror-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-konqueror-3.5_beta1 69
+MD5 3a0e10a5717024b020d970bd121d589a files/kdebase-3.4.2-konqueror-filter.patch 899
+MD5 56e97c5040d28b656c9e7c9c6e05a95f konqueror-3.4.1.ebuild 774
+MD5 0451e0225115ecd1a652e2ecfebc180f konqueror-3.4.2-r1.ebuild 969
+MD5 9de0d7f28bcceea80bbdb2a1b1def058 konqueror-3.4.2.ebuild 780
+MD5 30830bf9c15b28ab628c221309366e5e konqueror-3.4.3.ebuild 782
+MD5 b93d8c7bbb458f9c2ba7525de923b1f1 konqueror-3.5.0.ebuild 733
+MD5 777efc4b6119ade1653374a5d44d8b09 konqueror-3.5.0_beta2.ebuild 736
+MD5 015dc2f4063fd50781c11acb35930c77 konqueror-3.5.0_rc1.ebuild 737
+MD5 54a3cc81c2d2469d05f53b7607d8a081 konqueror-3.5_beta1.ebuild 769
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkGzntT9W3vfTuoRAqa5AJ0R7+jXv1woq/OUKbuSjgonaVy6YQCeJwui
+8nms+L5VifqpAF+feFO/6Ns=
+=Bzdx
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konqueror/files/digest-konqueror-3.4.1 b/kde-base/konqueror/files/digest-konqueror-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/konqueror/files/digest-konqueror-3.4.1
+++ b/kde-base/konqueror/files/digest-konqueror-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/konqueror/files/digest-konqueror-3.4.2 b/kde-base/konqueror/files/digest-konqueror-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/konqueror/files/digest-konqueror-3.4.2
+++ b/kde-base/konqueror/files/digest-konqueror-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/konqueror/files/digest-konqueror-3.4.2-r1 b/kde-base/konqueror/files/digest-konqueror-3.4.2-r1
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/konqueror/files/digest-konqueror-3.4.2-r1
+++ b/kde-base/konqueror/files/digest-konqueror-3.4.2-r1
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/konqueror/konqueror-3.4.1.ebuild b/kde-base/konqueror/konqueror-3.4.1.ebuild
index 13f178ff2d50..d4a6bf703eec 100644
--- a/kde-base/konqueror/konqueror-3.4.1.ebuild
+++ b/kde-base/konqueror/konqueror-3.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/kde-base/konqueror/konqueror-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -9,8 +9,8 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~x86 ~amd64"
-IUSE=""
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="java"
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
 DEPEND="
@@ -18,7 +18,8 @@ $(deprange $PV $MAXKDEVER kde-base/libkonq)"
 
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kcontrol)
-java? ( || ( virtual/jdk virtual/jre ) )"
+$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
+java? ( >=virtual/jre-1.4 )"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY=kdesktop/KDesktopIface.h
diff --git a/kde-base/konqueror/konqueror-3.4.2-r1.ebuild b/kde-base/konqueror/konqueror-3.4.2-r1.ebuild
index de98cf269714..5d8cf88f2ed4 100644
--- a/kde-base/konqueror/konqueror-3.4.2-r1.ebuild
+++ b/kde-base/konqueror/konqueror-3.4.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/kde-base/konqueror/konqueror-3.4.2-r1.ebuild,v 1.1 2005/08/06 10:26:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java"
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/konqueror/konqueror-3.4.2.ebuild b/kde-base/konqueror/konqueror-3.4.2.ebuild
index 677145a08788..99a1832699be 100644
--- a/kde-base/konqueror/konqueror-3.4.2.ebuild
+++ b/kde-base/konqueror/konqueror-3.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/kde-base/konqueror/konqueror-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -10,7 +10,7 @@ inherit kde-meta eutils
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
 KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="java"
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
 DEPEND="
@@ -19,7 +19,7 @@ $(deprange $PV $MAXKDEVER kde-base/libkonq)"
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kcontrol)
 $(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
-java? ( || ( virtual/jdk virtual/jre ) )"
+java? ( >=virtual/jre-1.4 )"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY=kdesktop/KDesktopIface.h
diff --git a/kde-base/konqueror/konqueror-3.4.3.ebuild b/kde-base/konqueror/konqueror-3.4.3.ebuild
index eeb0044df96e..8950e10fec48 100644
--- a/kde-base/konqueror/konqueror-3.4.3.ebuild
+++ b/kde-base/konqueror/konqueror-3.4.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/kde-base/konqueror/konqueror-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="java"
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
@@ -23,13 +23,3 @@ java? ( >=virtual/jre-1.4 )"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY=kdesktop/KDesktopIface.h
-
-src_unpack() {
-	kde-meta_src_unpack
-
-	cd ${S}
-
-	# Avoid name-filter expansion for files that do exists (bug #101501)
-	epatch "${FILESDIR}/kdebase-3.4.2-konqueror-filter.patch"
-}
-
diff --git a/kde-base/konqueror/konqueror-3.5.0.ebuild b/kde-base/konqueror/konqueror-3.5.0.ebuild
index acdd12b70448..66b770b109d2 100644
--- a/kde-base/konqueror/konqueror-3.5.0.ebuild
+++ b/kde-base/konqueror/konqueror-3.5.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/kde-base/konqueror/konqueror-3.5.0.ebuild,v 1.1 2005/11/22 22:14:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
diff --git a/kde-base/konqueror/konqueror-3.5.0_beta2.ebuild b/kde-base/konqueror/konqueror-3.5.0_beta2.ebuild
index d8404e208e2a..9f18c15ef456 100644
--- a/kde-base/konqueror/konqueror-3.5.0_beta2.ebuild
+++ b/kde-base/konqueror/konqueror-3.5.0_beta2.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/kde-base/konqueror/konqueror-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="java"
 
 
diff --git a/kde-base/konqueror/konqueror-3.5.0_rc1.ebuild b/kde-base/konqueror/konqueror-3.5.0_rc1.ebuild
index df98331e06b4..d0329a44a1d3 100644
--- a/kde-base/konqueror/konqueror-3.5.0_rc1.ebuild
+++ b/kde-base/konqueror/konqueror-3.5.0_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/kde-base/konqueror/konqueror-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
diff --git a/kde-base/konqueror/konqueror-3.5_beta1.ebuild b/kde-base/konqueror/konqueror-3.5_beta1.ebuild
index a8570768ce27..2de625a450e6 100644
--- a/kde-base/konqueror/konqueror-3.5_beta1.ebuild
+++ b/kde-base/konqueror/konqueror-3.5_beta1.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/kde-base/konqueror/konqueror-3.5_beta1.ebuild,v 1.1 2005/09/22 19:52:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebase
 # Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Web browser, file manager, ..."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="java"
 
 OLDDEPEND="~kde-base/libkonq-3.3.1"
diff --git a/kde-base/konqueror/metadata.xml b/kde-base/konqueror/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/konqueror/metadata.xml
+++ b/kde-base/konqueror/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konquest/ChangeLog b/kde-base/konquest/ChangeLog
index dce85c9fd0f5..017e98af6366 100644
--- a/kde-base/konquest/ChangeLog
+++ b/kde-base/konquest/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/konquest
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/ChangeLog,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> konquest-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> konquest-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> konquest-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*konquest-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*konquest-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> konquest-3.5_beta1.ebuild,
+  konquest-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*konquest-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.5.0_beta2.ebuild:
+  New version.
+
+*konquest-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -konquest-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*konquest-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konquest-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*konquest-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konquest-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> konquest-3.4.2.ebuild:
+  ~alpha keyword.
+
+*konquest-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> konquest-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> konquest-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> konquest-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*konquest-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> konquest-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> konquest-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> konquest-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> konquest-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*konquest-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> konquest-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*konquest-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +konquest-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *konquest-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/konquest/Manifest b/kde-base/konquest/Manifest
index cfa7a4947f60..83eb9c6e8d7a 100644
--- a/kde-base/konquest/Manifest
+++ b/kde-base/konquest/Manifest
@@ -1,4 +1,26 @@
-MD5 76382c7bc17ad42e5ae41b2f382394dc konquest-3.4.0_beta1.ebuild 420
-MD5 76382c7bc17ad42e5ae41b2f382394dc konquest-3.4.0_alpha1.ebuild 420
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-konquest-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-konquest-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8426427e52551aa02539a88e3f222dec ChangeLog 3579
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-konquest-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-konquest-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-konquest-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-konquest-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-konquest-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-konquest-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-konquest-3.5_beta1 70
+MD5 8a1f33094b2d436757e9b3f61f27c6b2 konquest-3.4.1.ebuild 541
+MD5 a70d650c93c978fe7aca90c2294b3e25 konquest-3.4.2.ebuild 554
+MD5 262bd7e4132a104f476b066bf4dc5721 konquest-3.4.3.ebuild 550
+MD5 0119e3ecad5b6dbcd0ecc66c05dc07fd konquest-3.5.0.ebuild 493
+MD5 de279fa588469f7b031f936af04c7a8e konquest-3.5.0_beta2.ebuild 498
+MD5 00f5eded434469d9ef1e5e752c300224 konquest-3.5.0_rc1.ebuild 497
+MD5 c30ce6b1bb9c3aca69f0df4973a82f3f konquest-3.5_beta1.ebuild 533
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl+TntT9W3vfTuoRAoNoAJ9No+aoq0YCzM+f+mP6u8F61kz7/QCgkuAr
+eseDf8dz0QeyXptGn68Qa4o=
+=SQGM
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konquest/files/digest-konquest-3.4.1 b/kde-base/konquest/files/digest-konquest-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/konquest/files/digest-konquest-3.4.1
+++ b/kde-base/konquest/files/digest-konquest-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/konquest/files/digest-konquest-3.4.2 b/kde-base/konquest/files/digest-konquest-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/konquest/files/digest-konquest-3.4.2
+++ b/kde-base/konquest/files/digest-konquest-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/konquest/konquest-3.4.1.ebuild b/kde-base/konquest/konquest-3.4.1.ebuild
index 86e702ef85a8..f1a2f0947978 100644
--- a/kde-base/konquest/konquest-3.4.1.ebuild
+++ b/kde-base/konquest/konquest-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/konquest/konquest-3.4.2.ebuild b/kde-base/konquest/konquest-3.4.2.ebuild
index a34e241afcd7..76653a098157 100644
--- a/kde-base/konquest/konquest-3.4.2.ebuild
+++ b/kde-base/konquest/konquest-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/konquest/konquest-3.4.3.ebuild b/kde-base/konquest/konquest-3.4.3.ebuild
index f7cab5ffdff5..2450b88fe094 100644
--- a/kde-base/konquest/konquest-3.4.3.ebuild
+++ b/kde-base/konquest/konquest-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/konquest/konquest-3.5.0.ebuild b/kde-base/konquest/konquest-3.5.0.ebuild
index b18ac75cfcab..ec6c0a253742 100644
--- a/kde-base/konquest/konquest-3.5.0.ebuild
+++ b/kde-base/konquest/konquest-3.5.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/kde-base/konquest/konquest-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/konquest/konquest-3.5.0_beta2.ebuild b/kde-base/konquest/konquest-3.5.0_beta2.ebuild
index ab0238db4853..c7cff6684510 100644
--- a/kde-base/konquest/konquest-3.5.0_beta2.ebuild
+++ b/kde-base/konquest/konquest-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/konquest/konquest-3.5.0_rc1.ebuild b/kde-base/konquest/konquest-3.5.0_rc1.ebuild
index 33ece4dfb54f..1a9313ddedcd 100644
--- a/kde-base/konquest/konquest-3.5.0_rc1.ebuild
+++ b/kde-base/konquest/konquest-3.5.0_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/kde-base/konquest/konquest-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/konquest/konquest-3.5_beta1.ebuild b/kde-base/konquest/konquest-3.5_beta1.ebuild
index 3dbbcf7bb003..9977b31b6b4a 100644
--- a/kde-base/konquest/konquest-3.5_beta1.ebuild
+++ b/kde-base/konquest/konquest-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.5_beta1.ebuild,v 1.1 2005/09/22 19:54:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konquest/konquest-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Galactic Strategy KDE Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/konquest/metadata.xml b/kde-base/konquest/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/konquest/metadata.xml
+++ b/kde-base/konquest/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konsole/ChangeLog b/kde-base/konsole/ChangeLog
index 903d74734e8d..4b8433648718 100644
--- a/kde-base/konsole/ChangeLog
+++ b/kde-base/konsole/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/konsole
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/ChangeLog,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> konsole-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> konsole-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> konsole-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*konsole-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*konsole-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  konsole-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*konsole-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.5.0_beta2.ebuild:
+  New version.
+
+*konsole-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  konsole-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -konsole-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*konsole-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konsole-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*konsole-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konsole-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> konsole-3.4.2.ebuild:
+  ~alpha keyword.
+
+*konsole-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> konsole-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> konsole-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> konsole-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*konsole-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> konsole-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> konsole-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> konsole-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> konsole-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*konsole-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> konsole-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*konsole-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +konsole-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *konsole-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/konsole/Manifest b/kde-base/konsole/Manifest
index 83b43c492b4c..ca3da735fd45 100644
--- a/kde-base/konsole/Manifest
+++ b/kde-base/konsole/Manifest
@@ -1,4 +1,26 @@
-MD5 b1c4b52a4e84697871374d8f85f067b9 konsole-3.4.0_alpha1.ebuild 371
-MD5 b1c4b52a4e84697871374d8f85f067b9 konsole-3.4.0_beta1.ebuild 371
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-konsole-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-konsole-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1113d3f58c81ce2aeea5a9a5dec446a8 ChangeLog 3610
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-konsole-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-konsole-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-konsole-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-konsole-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-konsole-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-konsole-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-konsole-3.5_beta1 69
+MD5 6633760e033c5f04ab794e91bfdbff8f konsole-3.4.1.ebuild 392
+MD5 caded7869fdce4348fc731037bbcc504 konsole-3.4.2.ebuild 405
+MD5 834695c454857d1ed148a41a20bac600 konsole-3.4.3.ebuild 401
+MD5 da635c05195efca4034e3e8d2bdef11a konsole-3.5.0.ebuild 386
+MD5 9ac84394b52af594ae612701d2e72b3c konsole-3.5.0_beta2.ebuild 389
+MD5 f926cc875f39681fafb5815b1f4f8554 konsole-3.5.0_rc1.ebuild 390
+MD5 8baaeddbe37fe611397908a85a5ac9ce konsole-3.5_beta1.ebuild 387
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkHxntT9W3vfTuoRApiwAKCUMSHjhplzyAIINanPxeWxSDNHaACeP0fa
+K8CJFaAHVNHWefC+SINTUNY=
+=tl/m
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konsole/files/digest-konsole-3.4.1 b/kde-base/konsole/files/digest-konsole-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/konsole/files/digest-konsole-3.4.1
+++ b/kde-base/konsole/files/digest-konsole-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/konsole/files/digest-konsole-3.4.2 b/kde-base/konsole/files/digest-konsole-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/konsole/files/digest-konsole-3.4.2
+++ b/kde-base/konsole/files/digest-konsole-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/konsole/konsole-3.4.1.ebuild b/kde-base/konsole/konsole-3.4.1.ebuild
index aef1577ba616..ce4562d00ce9 100644
--- a/kde-base/konsole/konsole-3.4.1.ebuild
+++ b/kde-base/konsole/konsole-3.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/kde-base/konsole/konsole-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/konsole/konsole-3.4.2.ebuild b/kde-base/konsole/konsole-3.4.2.ebuild
index ab2c203ec6cd..ad04422e84bf 100644
--- a/kde-base/konsole/konsole-3.4.2.ebuild
+++ b/kde-base/konsole/konsole-3.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/kde-base/konsole/konsole-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="X terminal for use with KDE."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/konsole/konsole-3.4.3.ebuild b/kde-base/konsole/konsole-3.4.3.ebuild
index c5b4c117234d..88a84a4a1800 100644
--- a/kde-base/konsole/konsole-3.4.3.ebuild
+++ b/kde-base/konsole/konsole-3.4.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/kde-base/konsole/konsole-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/konsole/konsole-3.5.0.ebuild b/kde-base/konsole/konsole-3.5.0.ebuild
index ffe858f4c570..07779f0c5f18 100644
--- a/kde-base/konsole/konsole-3.5.0.ebuild
+++ b/kde-base/konsole/konsole-3.5.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/kde-base/konsole/konsole-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/konsole/konsole-3.5.0_beta2.ebuild b/kde-base/konsole/konsole-3.5.0_beta2.ebuild
index d4ff97d736e0..f5311aa29eeb 100644
--- a/kde-base/konsole/konsole-3.5.0_beta2.ebuild
+++ b/kde-base/konsole/konsole-3.5.0_beta2.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/kde-base/konsole/konsole-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/konsole/konsole-3.5.0_rc1.ebuild b/kde-base/konsole/konsole-3.5.0_rc1.ebuild
index 82d84ac0346e..2eb03bcf8fc3 100644
--- a/kde-base/konsole/konsole-3.5.0_rc1.ebuild
+++ b/kde-base/konsole/konsole-3.5.0_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/kde-base/konsole/konsole-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/konsole/konsole-3.5_beta1.ebuild b/kde-base/konsole/konsole-3.5_beta1.ebuild
index 0e90dc519a0c..35eb6fbe1922 100644
--- a/kde-base/konsole/konsole-3.5_beta1.ebuild
+++ b/kde-base/konsole/konsole-3.5_beta1.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/kde-base/konsole/konsole-3.5_beta1.ebuild,v 1.1 2005/09/22 19:54:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsole/konsole-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="X terminal for use with KDE."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/konsole/metadata.xml b/kde-base/konsole/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/konsole/metadata.xml
+++ b/kde-base/konsole/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/konsolekalendar/ChangeLog b/kde-base/konsolekalendar/ChangeLog
index c01a5dc7e32c..ceca36eb67d7 100644
--- a/kde-base/konsolekalendar/ChangeLog
+++ b/kde-base/konsolekalendar/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for kde-base/konsolekalendar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/ChangeLog,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  konsolekalendar-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  konsolekalendar-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  konsolekalendar-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*konsolekalendar-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +konsolekalendar-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*konsolekalendar-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +konsolekalendar-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  konsolekalendar-3.5_beta1.ebuild, konsolekalendar-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  konsolekalendar-3.5.0_beta2.ebuild:
+  Fix compilation for this version.
+
+*konsolekalendar-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +konsolekalendar-3.5.0_beta2.ebuild:
+  New version.
+
+*konsolekalendar-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +konsolekalendar-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -konsolekalendar-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*konsolekalendar-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konsolekalendar-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*konsolekalendar-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +konsolekalendar-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  konsolekalendar-3.4.2.ebuild:
+  ~alpha keyword.
+
+*konsolekalendar-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +konsolekalendar-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> konsolekalendar-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> konsolekalendar-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> konsolekalendar-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*konsolekalendar-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +konsolekalendar-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  konsolekalendar-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> konsolekalendar-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  konsolekalendar-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> konsolekalendar-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*konsolekalendar-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  konsolekalendar-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*konsolekalendar-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +konsolekalendar-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *konsolekalendar-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/konsolekalendar/Manifest b/kde-base/konsolekalendar/Manifest
index b2c65fb803ed..9ce442a1d659 100644
--- a/kde-base/konsolekalendar/Manifest
+++ b/kde-base/konsolekalendar/Manifest
@@ -1,4 +1,26 @@
-MD5 26a0cde4af4dfda4404413179a79809a konsolekalendar-3.4.0_beta1.ebuild 623
-MD5 26a0cde4af4dfda4404413179a79809a konsolekalendar-3.4.0_alpha1.ebuild 623
-MD5 892303ffe022b31a222f9efab549727b files/digest-konsolekalendar-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-konsolekalendar-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 33e7c20057a3b6731c1752de0aca201b ChangeLog 3987
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-konsolekalendar-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-konsolekalendar-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-konsolekalendar-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-konsolekalendar-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-konsolekalendar-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-konsolekalendar-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-konsolekalendar-3.5_beta1 68
+MD5 da77ef764daa627db88692532b3dc6fa konsolekalendar-3.4.1.ebuild 758
+MD5 7e91f5d216341adc1a85677dde3284b1 konsolekalendar-3.4.2.ebuild 771
+MD5 d0dd65ab63fb548575a6a7301d51dfc8 konsolekalendar-3.4.3.ebuild 767
+MD5 1f10fc06a567bc733af98225785d063f konsolekalendar-3.5.0.ebuild 769
+MD5 3058865aee37a8fd4327025154cb1e28 konsolekalendar-3.5.0_beta2.ebuild 774
+MD5 83b4d19b5702d312cf9e592455aea055 konsolekalendar-3.5.0_rc1.ebuild 773
+MD5 66b48edfe4267aaa4f9cf9c8389a0020 konsolekalendar-3.5_beta1.ebuild 750
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvYNntT9W3vfTuoRAlYgAJ9+DdE6hudHTUYkXufZNVbfpcZu7gCgnmRJ
+3s24dRAYcQeAGfYMqq7Ugyo=
+=M16w
+-----END PGP SIGNATURE-----
diff --git a/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.1 b/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.1
+++ b/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.2 b/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.2
+++ b/kde-base/konsolekalendar/files/digest-konsolekalendar-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.4.1.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.4.1.ebuild
index bdf4d4d51cb4..3887fcb0f8e0 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.4.1.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.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/kde-base/konsolekalendar/konsolekalendar-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.4.2.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.4.2.ebuild
index 26dbc7bc7df4..b78c6ec8e18d 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.4.2.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.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/kde-base/konsolekalendar/konsolekalendar-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.4.3.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.4.3.ebuild
index 66f1052ba605..b978d8ee4fc3 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.4.3.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.4.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/kde-base/konsolekalendar/konsolekalendar-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.5.0.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.5.0.ebuild
index 8e577fd90476..7b07155e5b62 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.5.0.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.5.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/kde-base/konsolekalendar/konsolekalendar-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.5.0_beta2.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.5.0_beta2.ebuild
index fdbdf2ed8ac1..1f31c4151cad 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.5.0_beta2.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.5.0_beta2.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/kde-base/konsolekalendar/konsolekalendar-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
@@ -16,8 +16,12 @@ $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
 
 KMCOPYLIB="libkcal libkcal
 	libkdepim libkdepim"
-# libkcal is installed because a lot of headers are needed, but it don't have to be compiled
-KMEXTRACTONLY="
-	libkcal/
-	libkdepim/"
+KMEXTRACTONLY="	libkdepim/"
+KMCOMPILEONLY="libkcal"
 
+src_compile() {
+	export DO_NOT_COMPILE="libkcal"
+	kde-meta_src_compile myconf configure
+	cd $S/libkcal; make htmlexportsettings.h
+	kde-meta_src_compile make
+}
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.5.0_rc1.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.5.0_rc1.ebuild
index 189572085057..0f2c7fd4cc0d 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.5.0_rc1.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.5.0_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/kde-base/konsolekalendar/konsolekalendar-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/konsolekalendar/konsolekalendar-3.5_beta1.ebuild b/kde-base/konsolekalendar/konsolekalendar-3.5_beta1.ebuild
index 3a8ab23c437d..2be7c3577903 100644
--- a/kde-base/konsolekalendar/konsolekalendar-3.5_beta1.ebuild
+++ b/kde-base/konsolekalendar/konsolekalendar-3.5_beta1.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/kde-base/konsolekalendar/konsolekalendar-3.5_beta1.ebuild,v 1.1 2005/09/22 19:56:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konsolekalendar/konsolekalendar-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A command line interface to KDE calendars"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/konsolekalendar/metadata.xml b/kde-base/konsolekalendar/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/konsolekalendar/metadata.xml
+++ b/kde-base/konsolekalendar/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kontact-specialdates/ChangeLog b/kde-base/kontact-specialdates/ChangeLog
index 761b282b2baa..b1014a1971a6 100644
--- a/kde-base/kontact-specialdates/ChangeLog
+++ b/kde-base/kontact-specialdates/ChangeLog
@@ -1,6 +1,122 @@
 # ChangeLog for kde-base/kontact-specialdates
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/ChangeLog,v 1.1 2005/01/18 20:51:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/ChangeLog,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kontact-specialdates-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kontact-specialdates-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kontact-specialdates-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kontact-specialdates-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kontact-specialdates-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kontact-specialdates-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kontact-specialdates-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kontact-specialdates-3.5_beta1.ebuild,
+  kontact-specialdates-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kontact-specialdates-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kontact-specialdates-3.5.0_beta2.ebuild:
+  New version.
+
+*kontact-specialdates-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kontact-specialdates-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kontact-specialdates-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kontact-specialdates-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kontact-specialdates-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kontact-specialdates-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kontact-specialdates-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kontact-specialdates-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kontact-specialdates-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +kontact-specialdates-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  kontact-specialdates-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  kontact-specialdates-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kontact-specialdates-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kontact-specialdates-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +kontact-specialdates-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kontact-specialdates-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org>
+  kontact-specialdates-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kontact-specialdates-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  kontact-specialdates-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kontact-specialdates-3.4.0_rc1 (03 Mar 2005)
+
+  06 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kontact-specialdates-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kontact-specialdates-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kontact-specialdates-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kontact-specialdates-3.4.0_beta1 (18 Jan 2005)
 
diff --git a/kde-base/kontact-specialdates/Manifest b/kde-base/kontact-specialdates/Manifest
index 5ce32ae923b5..0237addd4873 100644
--- a/kde-base/kontact-specialdates/Manifest
+++ b/kde-base/kontact-specialdates/Manifest
@@ -1,3 +1,26 @@
-MD5 301f9780b15d04749e974538b1c0d9ec kontact-specialdates-3.4.0_beta1.ebuild 1120
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kontact-specialdates-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b798d344bd97cbbde414d997e545b63 ChangeLog 4138
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kontact-specialdates-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kontact-specialdates-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kontact-specialdates-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kontact-specialdates-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kontact-specialdates-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kontact-specialdates-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kontact-specialdates-3.5_beta1 68
+MD5 ff077b11ff2c156103c5c3d4320fb66c kontact-specialdates-3.4.1.ebuild 1132
+MD5 3e548f8c524d789a670f319d5ccc5251 kontact-specialdates-3.4.2.ebuild 1145
+MD5 f8d8e0822dc5aecd86c1fd3d92e97c6e kontact-specialdates-3.4.3.ebuild 1141
+MD5 0358791dc7bbc4ad2c1c87114d40813d kontact-specialdates-3.5.0.ebuild 1121
+MD5 d079c92181da3152795087c91aa1d1dd kontact-specialdates-3.5.0_beta2.ebuild 1126
+MD5 9d873ab40a1d44879950d58c6d8d454d kontact-specialdates-3.5.0_rc1.ebuild 1133
+MD5 faeca5543d578b94f51ea0387ad8e6f8 kontact-specialdates-3.5_beta1.ebuild 1124
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvaentT9W3vfTuoRAm+GAJ9ZF2IHwoSYEVO5GYpRlBSy1tKr9ACfbUqq
+Cdf1DxNtk6m7VZi7xIIbXlQ=
+=a1R1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.1 b/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.1
+++ b/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.2 b/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.2
+++ b/kde-base/kontact-specialdates/files/digest-kontact-specialdates-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.4.1.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.4.1.ebuild
index 587908194052..4d7b22c6e891 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.4.1.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.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/kde-base/kontact-specialdates/kontact-specialdates-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Special Dates plugin for Kontact: displays a summary of important holidays and calendar events"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.4.2.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.4.2.ebuild
index 4b1d33225922..af5beb1b7609 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.4.2.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.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/kde-base/kontact-specialdates/kontact-specialdates-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Special Dates plugin for Kontact: displays a summary of important holidays and calendar events"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.4.3.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.4.3.ebuild
index 5bf19fc158af..0ac9a9c02fb2 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.4.3.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.4.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/kde-base/kontact-specialdates/kontact-specialdates-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Special Dates plugin for Kontact: displays a summary of important holidays and calendar events"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.5.0.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.5.0.ebuild
index 51dd7e1e2f27..b93b22aa8351 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.5.0.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.5.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/kde-base/kontact-specialdates/kontact-specialdates-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_beta2.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_beta2.ebuild
index 9e045d482dc6..6175318e937c 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_beta2.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_beta2.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/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Special Dates plugin for Kontact: displays a summary of important holidays and calendar events"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_rc1.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_rc1.ebuild
index 3e13d7ac6f89..4040e7cdf0fd 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_rc1.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_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/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
diff --git a/kde-base/kontact-specialdates/kontact-specialdates-3.5_beta1.ebuild b/kde-base/kontact-specialdates/kontact-specialdates-3.5_beta1.ebuild
index c981bf5fce42..8380c37a1429 100644
--- a/kde-base/kontact-specialdates/kontact-specialdates-3.5_beta1.ebuild
+++ b/kde-base/kontact-specialdates/kontact-specialdates-3.5_beta1.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/kde-base/kontact-specialdates/kontact-specialdates-3.5_beta1.ebuild,v 1.1 2005/09/22 19:57:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact-specialdates/kontact-specialdates-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdepim
 KMNOMODULE=true
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Special Dates plugin for Kontact: displays a summary of important holidays and calendar events"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kontact-specialdates/metadata.xml b/kde-base/kontact-specialdates/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kontact-specialdates/metadata.xml
+++ b/kde-base/kontact-specialdates/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kontact/ChangeLog b/kde-base/kontact/ChangeLog
index a1726b5e2d5e..d96a718e838a 100644
--- a/kde-base/kontact/ChangeLog
+++ b/kde-base/kontact/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/kontact
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/ChangeLog,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kontact-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kontact-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kontact-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kontact-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kontact-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kontact-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kontact-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*kontact-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.5.0_beta2.ebuild:
+  New version.
+
+*kontact-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> kontact-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kontact-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kontact-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kontact-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kontact-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kontact-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kontact-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kontact-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kontact-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kontact-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kontact-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kontact-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kontact-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kontact-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kontact-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kontact-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kontact-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kontact-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kontact-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kontact-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  22 Jan 2005; Dan Armak <danarmak@gentoo.org> kontact-3.4.0_beta1.ebuild:
+  Remove unnecessary dep on akregator. Closes #79061.
 
 *kontact-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kontact/Manifest b/kde-base/kontact/Manifest
index f246cbe337f3..413744d769a5 100644
--- a/kde-base/kontact/Manifest
+++ b/kde-base/kontact/Manifest
@@ -1,4 +1,26 @@
-MD5 965ceb1c29a87af1bd181cf510394c64 kontact-3.4.0_alpha1.ebuild 920
-MD5 965ceb1c29a87af1bd181cf510394c64 kontact-3.4.0_beta1.ebuild 920
-MD5 892303ffe022b31a222f9efab549727b files/digest-kontact-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kontact-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b10f18043ac4b168766b4fb7bc5bd112 ChangeLog 3848
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kontact-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kontact-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kontact-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kontact-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kontact-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kontact-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kontact-3.5_beta1 68
+MD5 bf6c02ee111ecd3a5d8af5991ac75f9d kontact-3.4.1.ebuild 1048
+MD5 9dff7a48160f0e72f3b691d41cb5126b kontact-3.4.2.ebuild 1054
+MD5 08ab5904f6bede79ebbeb011f1a63cfe kontact-3.4.3.ebuild 1048
+MD5 26707949bc0a09f029dfe54c597cbe03 kontact-3.5.0.ebuild 998
+MD5 0049050e17e1bb674491ab561a17ff55 kontact-3.5.0_beta2.ebuild 1001
+MD5 541393294b914ab86564e2302f7efa43 kontact-3.5.0_rc1.ebuild 1002
+MD5 09cd74d7f742e30a4a3daee9a4367b7b kontact-3.5_beta1.ebuild 1031
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvCtntT9W3vfTuoRAqVnAJ9FE0fCmx70z05fT/gNt7yazOIDBQCgrCNe
+wv48yiVL/Tpn2offVfXEZGI=
+=f4VO
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kontact/files/digest-kontact-3.4.1 b/kde-base/kontact/files/digest-kontact-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kontact/files/digest-kontact-3.4.1
+++ b/kde-base/kontact/files/digest-kontact-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kontact/files/digest-kontact-3.4.2 b/kde-base/kontact/files/digest-kontact-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kontact/files/digest-kontact-3.4.2
+++ b/kde-base/kontact/files/digest-kontact-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kontact/kontact-3.4.1.ebuild b/kde-base/kontact/kontact-3.4.1.ebuild
index eef3d3968de2..db10872a74e4 100644
--- a/kde-base/kontact/kontact-3.4.1.ebuild
+++ b/kde-base/kontact/kontact-3.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/kde-base/kontact/kontact-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV"
 DEPEND="
diff --git a/kde-base/kontact/kontact-3.4.2.ebuild b/kde-base/kontact/kontact-3.4.2.ebuild
index 8646e02994a7..dd9cae488369 100644
--- a/kde-base/kontact/kontact-3.4.2.ebuild
+++ b/kde-base/kontact/kontact-3.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/kde-base/kontact/kontact-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV"
 DEPEND="
diff --git a/kde-base/kontact/kontact-3.4.3.ebuild b/kde-base/kontact/kontact-3.4.3.ebuild
index e4c52eb1cb72..4aa7f5b11485 100644
--- a/kde-base/kontact/kontact-3.4.3.ebuild
+++ b/kde-base/kontact/kontact-3.4.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/kde-base/kontact/kontact-3.4.3.ebuild,v 1.1 2005/10/13 00:10:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV"
 DEPEND="
diff --git a/kde-base/kontact/kontact-3.5.0.ebuild b/kde-base/kontact/kontact-3.5.0.ebuild
index dfd2b264a41e..78c0bb4334d4 100644
--- a/kde-base/kontact/kontact-3.5.0.ebuild
+++ b/kde-base/kontact/kontact-3.5.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/kde-base/kontact/kontact-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kontact/kontact-3.5.0_beta2.ebuild b/kde-base/kontact/kontact-3.5.0_beta2.ebuild
index 7bdf6f84adbc..52cd55e7c545 100644
--- a/kde-base/kontact/kontact-3.5.0_beta2.ebuild
+++ b/kde-base/kontact/kontact-3.5.0_beta2.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/kde-base/kontact/kontact-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kontact/kontact-3.5.0_rc1.ebuild b/kde-base/kontact/kontact-3.5.0_rc1.ebuild
index 29cec734e91e..873af38fee5d 100644
--- a/kde-base/kontact/kontact-3.5.0_rc1.ebuild
+++ b/kde-base/kontact/kontact-3.5.0_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/kde-base/kontact/kontact-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kontact/kontact-3.5_beta1.ebuild b/kde-base/kontact/kontact-3.5_beta1.ebuild
index 357a117840c2..567023afa38c 100644
--- a/kde-base/kontact/kontact-3.5_beta1.ebuild
+++ b/kde-base/kontact/kontact-3.5_beta1.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/kde-base/kontact/kontact-3.5_beta1.ebuild,v 1.1 2005/09/22 19:56:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kontact/kontact-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:12 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE personal information manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdepim-$PV"
 DEPEND="
diff --git a/kde-base/kontact/metadata.xml b/kde-base/kontact/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kontact/metadata.xml
+++ b/kde-base/kontact/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kooka/ChangeLog b/kde-base/kooka/ChangeLog
index 31f324c3747e..0c90ca1bf524 100644
--- a/kde-base/kooka/ChangeLog
+++ b/kde-base/kooka/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for kde-base/kooka
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/ChangeLog,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kooka-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kooka-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kooka-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kooka-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kooka-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kooka-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kooka-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kooka-3.5_beta1.ebuild,
+  kooka-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kooka-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kooka-3.5.0_beta2.ebuild:
+  New version.
+
+*kooka-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kooka-3.4.3.ebuild:
+  New version.
+
+  11 Oct 2005; Diego Pettenò <flameeyes@gentoo.org> kooka-3.4.1.ebuild,
+  kooka-3.4.2.ebuild, kooka-3.5_beta1.ebuild:
+  Add media-libs/tiff as dependency as per bug #104794.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kooka-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kooka-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kooka-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kooka-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kooka-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> kooka-3.4.1.ebuild,
+  kooka-3.4.2.ebuild:
+  Stable on ppc64/added ~ppc64
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kooka-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kooka-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdegraphics-kadmos.patch, +kooka-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kooka-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kooka-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  31 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4.1-gocr.patch, kooka-3.4.1.ebuild:
+  Fix detection of gocr (#92779).
+
+*kooka-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kooka-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kooka-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kooka-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kooka-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kooka-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kooka-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kooka-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kooka-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kooka-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kooka/Manifest b/kde-base/kooka/Manifest
index ad84913ade86..7c067fa3e69f 100644
--- a/kde-base/kooka/Manifest
+++ b/kde-base/kooka/Manifest
@@ -1,4 +1,28 @@
-MD5 4728e34bac62236cd7f40b7609bc0f90 kooka-3.4.0_beta1.ebuild 459
-MD5 4728e34bac62236cd7f40b7609bc0f90 kooka-3.4.0_alpha1.ebuild 459
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kooka-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kooka-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 85d32c8f2dec5c206c83279d5f4bc24e ChangeLog 3759
+MD5 51a35089fe1f6247f9cf221c77a57177 files/configure-fix-kdegraphics-kadmos.patch 1714
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kooka-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kooka-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kooka-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kooka-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kooka-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kooka-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kooka-3.5_beta1 72
+MD5 0abb98c262645006a4b116c0635edb49 files/kdegraphics-3.4.1-gocr.patch 454
+MD5 6f27766dd3224f76199cd8d09b3f2be2 kooka-3.4.1.ebuild 690
+MD5 90ad8660103053342c8b3242329df544 kooka-3.4.2.ebuild 1047
+MD5 9c145c6d4b369d6d4fa88afa6ff0f5a8 kooka-3.4.3.ebuild 1040
+MD5 a840f9ed62bb5849adde0c7c1c05791c kooka-3.5.0.ebuild 660
+MD5 4e2510a557ea080056093277e021c2be kooka-3.5.0_beta2.ebuild 665
+MD5 43b5105c62daa808db6cb597393ba4d9 kooka-3.5.0_rc1.ebuild 664
+MD5 4fc9b97e386fe90373b91d0aa9c854db kooka-3.5_beta1.ebuild 697
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmfdntT9W3vfTuoRAhoMAJ9tV/bhvVdEeAmOaUm7rlsNMozvlgCeOjhX
+6Ji7u52E0Ytb+3/5YQqGgZk=
+=XkZk
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kooka/files/digest-kooka-3.4.1 b/kde-base/kooka/files/digest-kooka-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kooka/files/digest-kooka-3.4.1
+++ b/kde-base/kooka/files/digest-kooka-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kooka/files/digest-kooka-3.4.2 b/kde-base/kooka/files/digest-kooka-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kooka/files/digest-kooka-3.4.2
+++ b/kde-base/kooka/files/digest-kooka-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kooka/kooka-3.4.1.ebuild b/kde-base/kooka/kooka-3.4.1.ebuild
index 469e917f42db..f6dfbf9c31c0 100644
--- a/kde-base/kooka/kooka-3.4.1.ebuild
+++ b/kde-base/kooka/kooka-3.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/kde-base/kooka/kooka-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,10 +8,14 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kooka is a KDE application which provides access to scanner hardware"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)"
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)
+	media-libs/tiff"
 OLDDEPEND="~kde-base/libkscan-$PV"
 
 KMCOPYLIB="libkscan libkscan"
-KMEXTRACTONLY="libkscan"
\ No newline at end of file
+KMEXTRACTONLY="libkscan"
+
+# Fix detection of gocr (kde bug 90082).
+PATCHES1="${FILESDIR}/kdegraphics-3.4.1-gocr.patch"
diff --git a/kde-base/kooka/kooka-3.4.2.ebuild b/kde-base/kooka/kooka-3.4.2.ebuild
index 888fcc3087e8..b8cd389666ae 100644
--- a/kde-base/kooka/kooka-3.4.2.ebuild
+++ b/kde-base/kooka/kooka-3.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/kde-base/kooka/kooka-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,9 +8,10 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kooka is a KDE application which provides access to scanner hardware"
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="kadmos"
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)"
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)
+	media-libs/tiff"
 OLDDEPEND="~kde-base/libkscan-$PV"
 
 KMCOPYLIB="libkscan libkscan"
diff --git a/kde-base/kooka/kooka-3.4.3.ebuild b/kde-base/kooka/kooka-3.4.3.ebuild
index cf6c41244a95..8be40d3795d6 100644
--- a/kde-base/kooka/kooka-3.4.3.ebuild
+++ b/kde-base/kooka/kooka-3.4.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/kde-base/kooka/kooka-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kooka is a KDE application which provides access to scanner hardware"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="kadmos"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)
 	media-libs/tiff"
diff --git a/kde-base/kooka/kooka-3.5.0.ebuild b/kde-base/kooka/kooka-3.5.0.ebuild
index bb239b8e71a8..dcee5e50fc12 100644
--- a/kde-base/kooka/kooka-3.5.0.ebuild
+++ b/kde-base/kooka/kooka-3.5.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/kde-base/kooka/kooka-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kooka/kooka-3.5.0_beta2.ebuild b/kde-base/kooka/kooka-3.5.0_beta2.ebuild
index 9b4662922f57..977a51a71819 100644
--- a/kde-base/kooka/kooka-3.5.0_beta2.ebuild
+++ b/kde-base/kooka/kooka-3.5.0_beta2.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/kde-base/kooka/kooka-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kooka is a KDE application which provides access to scanner hardware"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)
 	media-libs/tiff"
diff --git a/kde-base/kooka/kooka-3.5.0_rc1.ebuild b/kde-base/kooka/kooka-3.5.0_rc1.ebuild
index b8aca9d33b89..e7e40e73fecd 100644
--- a/kde-base/kooka/kooka-3.5.0_rc1.ebuild
+++ b/kde-base/kooka/kooka-3.5.0_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/kde-base/kooka/kooka-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kooka/kooka-3.5_beta1.ebuild b/kde-base/kooka/kooka-3.5_beta1.ebuild
index 0359d0e0f544..31eb6a468875 100644
--- a/kde-base/kooka/kooka-3.5_beta1.ebuild
+++ b/kde-base/kooka/kooka-3.5_beta1.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/kde-base/kooka/kooka-3.5_beta1.ebuild,v 1.1 2005/09/22 19:58:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kooka/kooka-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:25 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,9 +8,10 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kooka is a KDE application which provides access to scanner hardware"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)"
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkscan)
+	media-libs/tiff"
 OLDDEPEND="~kde-base/libkscan-$PV"
 
 KMCOPYLIB="libkscan libkscan"
diff --git a/kde-base/kooka/metadata.xml b/kde-base/kooka/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kooka/metadata.xml
+++ b/kde-base/kooka/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 9ce80f837916..817299362c22 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,163 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kopete-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kopete-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kopete-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kopete-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kopete-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  17 Nov 2005; Gregorio Guidi <greg_g@gentoo.org> kopete-3.5.0_rc1.ebuild:
+  Correct dependency on meanwhile (#112808).
+
+  15 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/kopete-3.5.0_rc1-fix.patch, kopete-3.5.0_rc1.ebuild:
+  Patch added to fix compilation issue, closes bug 112354.
+
+*kopete-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kopete-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kopete-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org> kopete-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*kopete-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kopete-3.5.0_beta2.ebuild:
+  New version.
+
+  13 Oct 2005; Gregorio Guidi <greg_g@gentoo.org> kopete-3.4.1.ebuild,
+  kopete-3.4.1-r1.ebuild, kopete-3.4.2.ebuild, kopete-3.4.3.ebuild,
+  kopete-3.5_beta1.ebuild:
+  Add HOMEPAGE (#109054).
+
+*kopete-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kopete-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kopete-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kopete-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kopete-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  19 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> kopete-3.5_alpha1.ebuild:
+  Add support for the Sametime protocol.
+
+*kopete-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kopete-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kopete-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kopete-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdenetwork-gadu.patch,
+  +files/configure-fix-kdenetwork-xmms.patch, +kopete-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  23 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kopete-3.4.1-r1.ebuild:
+  Stable on sparc wrt #99754
+
+  22 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> kopete-3.4.1-r1.ebuild:
+  Marked stable on amd64.
+
+  22 Jul 2005; Joseph Jezak <josejx@gentoo.org> kopete-3.4.1-r1.ebuild:
+  Marked ppc stable for bug #99754.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> kopete-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #99754)
+
+*kopete-3.4.1-r1 (21 Jul 2005)
+
+  21 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> +kopete-3.4.1-r1.ebuild:
+  Fix vulnerabilities in libgadu (#99754).
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kopete-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kopete-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kopete-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org>
+  +files/disable-meanwhile.diff, kopete-3.4.1.ebuild:
+  Force meanwhile support to off. It was unpredictable, was missing a dep, and
+  broke compilation with meanwhile >=0.4. Bug 96778.
+
+*kopete-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kopete-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+*kopete-3.4.0-r2 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.4.0-kopete-tabbed-windows.patch,
+  +kopete-3.4.0-r2.ebuild:
+  Add patch to fix crash in chatwindow (#91423).
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kopete-3.4.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*kopete-3.4.0-r1 (03 Apr 2005)
+
+  03 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.4.0-kopete-logout.patch,
+  +files/kdenetwork-3.4.0-kopete-spaces.patch, +kopete-3.4.0-r1.ebuild:
+  Add patches for bug #86446 (crash on logout) and for bug #87485 (handling of
+  names with spaces).
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kopete-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kopete-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kopete-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kopete-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kopete-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kopete-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kopete-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kopete-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 65c38c3072a9..f192f3f85ebd 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,4 +1,32 @@
-MD5 a80a812bcb4dd44b092e94c757e01584 kopete-3.4.0_beta1.ebuild 347
-MD5 a80a812bcb4dd44b092e94c757e01584 kopete-3.4.0_alpha1.ebuild 347
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kopete-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kopete-3.4.0_beta1 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a4ad5464713f074a08864ee3c53acc96 ChangeLog 5606
+MD5 100ba684bf2f7b3bd7061b488264a21d files/configure-fix-kdenetwork-gadu.patch 2626
+MD5 3a5877277804af9bdafd5fd0e80c9f61 files/configure-fix-kdenetwork-xmms.patch 1183
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kopete-3.4.1 218
+MD5 284887f9ed6a0a0b0efc3a0d88f11868 files/digest-kopete-3.4.1-r1 297
+MD5 1277f401bade54acfa086cf013950252 files/digest-kopete-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kopete-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kopete-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kopete-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kopete-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kopete-3.5_beta1 71
+MD5 2db2170b384350ce6c05cd23c0bb21c7 files/disable-meanwhile.diff 351
+MD5 db3c7f3cc040e55e195767191491acaa files/kopete-3.5.0_rc1-fix.patch 709
+MD5 04a2f0cd98df7d21f30ef36d4c4f20d4 kopete-3.4.1-r1.ebuild 757
+MD5 ec7b8d63a646262499635474f93ffd3b kopete-3.4.1.ebuild 551
+MD5 3d71eb4f7bb9c12d729d0a4792976142 kopete-3.4.2.ebuild 1044
+MD5 5d1938b776a456a4e9b4ee52f1ed6823 kopete-3.4.3.ebuild 1040
+MD5 cead97c411090a0f4ff1ea3ec4297827 kopete-3.5.0.ebuild 961
+MD5 78512e3622661d63f595d83e3c20f461 kopete-3.5.0_beta2.ebuild 966
+MD5 a7ec219e7d827db6fc77a01132e058e1 kopete-3.5.0_rc1.ebuild 1001
+MD5 873857041cd1f0d400a0ae252d367b43 kopete-3.5_beta1.ebuild 961
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuRIntT9W3vfTuoRAr9AAKCzGu9ItKCFhtR/TCASrVggdr6ElQCgj67y
+g30i8nv3K/RPARajFsxRU6Q=
+=UhoA
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/digest-kopete-3.4.1 b/kde-base/kopete/files/digest-kopete-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kopete/files/digest-kopete-3.4.1
+++ b/kde-base/kopete/files/digest-kopete-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kopete/files/digest-kopete-3.4.2 b/kde-base/kopete/files/digest-kopete-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kopete/files/digest-kopete-3.4.2
+++ b/kde-base/kopete/files/digest-kopete-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kopete/kopete-3.4.1-r1.ebuild b/kde-base/kopete/kopete-3.4.1-r1.ebuild
index eb0109e325ab..2cbfa8c42749 100644
--- a/kde-base/kopete/kopete-3.4.1-r1.ebuild
+++ b/kde-base/kopete/kopete-3.4.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/kde-base/kopete/kopete-3.4.1-r1.ebuild,v 1.1 2005/07/21 14:12:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
 RDEPEND="ssl? ( app-crypt/qca-tls )"
diff --git a/kde-base/kopete/kopete-3.4.1.ebuild b/kde-base/kopete/kopete-3.4.1.ebuild
index a25a5e59a715..2e60dd829b27 100644
--- a/kde-base/kopete/kopete-3.4.1.ebuild
+++ b/kde-base/kopete/kopete-3.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/kde-base/kopete/kopete-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,8 +8,12 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~x86 ~amd64"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
 RDEPEND="ssl? ( app-crypt/qca-tls )"
 
+# No meanwhile support. See bug 96778.
+PATCHES="$FILESDIR/disable-meanwhile.diff"
diff --git a/kde-base/kopete/kopete-3.4.2.ebuild b/kde-base/kopete/kopete-3.4.2.ebuild
index 62dceb2e0ad4..faee1ffc5558 100644
--- a/kde-base/kopete/kopete-3.4.2.ebuild
+++ b/kde-base/kopete/kopete-3.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/kde-base/kopete/kopete-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,10 +8,13 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl xmms"
 
-DEPEND="net-libs/libgadu
+DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
 	ssl? ( app-crypt/qca-tls )"
diff --git a/kde-base/kopete/kopete-3.4.3.ebuild b/kde-base/kopete/kopete-3.4.3.ebuild
index e97424dcb764..de10c6866e85 100644
--- a/kde-base/kopete/kopete-3.4.3.ebuild
+++ b/kde-base/kopete/kopete-3.4.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/kde-base/kopete/kopete-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="ssl xmms"
 
 DEPEND="dev-libs/libxslt
diff --git a/kde-base/kopete/kopete-3.5.0.ebuild b/kde-base/kopete/kopete-3.5.0.ebuild
index 7b66535bf822..c99ff398a1bb 100644
--- a/kde-base/kopete/kopete-3.5.0.ebuild
+++ b/kde-base/kopete/kopete-3.5.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/kde-base/kopete/kopete-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kopete/kopete-3.5.0_beta2.ebuild b/kde-base/kopete/kopete-3.5.0_beta2.ebuild
index 0be0cba10a67..e04ee0a15221 100644
--- a/kde-base/kopete/kopete-3.5.0_beta2.ebuild
+++ b/kde-base/kopete/kopete-3.5.0_beta2.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/kde-base/kopete/kopete-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -10,7 +10,7 @@ inherit kde-meta eutils
 DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="sametime ssl xmms"
 
 DEPEND="dev-libs/libxslt
diff --git a/kde-base/kopete/kopete-3.5.0_rc1.ebuild b/kde-base/kopete/kopete-3.5.0_rc1.ebuild
index b43718512a24..d225bfdc1c29 100644
--- a/kde-base/kopete/kopete-3.5.0_rc1.ebuild
+++ b/kde-base/kopete/kopete-3.5.0_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/kde-base/kopete/kopete-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -16,11 +16,13 @@ IUSE="sametime ssl xmms"
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2
 	>=dev-libs/glib-2
-	sametime? ( >=net-libs/meanwhile-0.4.2 )
+	sametime? ( =net-libs/meanwhile-0.4* )
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
 	ssl? ( app-crypt/qca-tls )"
 
+PATCHES="${FILESDIR}/${P}-fix.patch"
+
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.
diff --git a/kde-base/kopete/kopete-3.5_beta1.ebuild b/kde-base/kopete/kopete-3.5_beta1.ebuild
index b3a030013e5c..7bf9c69bc64e 100644
--- a/kde-base/kopete/kopete-3.5_beta1.ebuild
+++ b/kde-base/kopete/kopete-3.5_beta1.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/kde-base/kopete/kopete-3.5_beta1.ebuild,v 1.1 2005/09/22 19:59:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,11 +8,14 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE multi-protocol IM client"
-KEYWORDS="~amd64"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~amd64 ~x86"
 IUSE="sametime ssl xmms"
 
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2
+	>=dev-libs/glib-2
 	sametime? ( >=net-libs/meanwhile-0.4.2 )
 	xmms? ( media-sound/xmms )"
 RDEPEND="$DEPEND
diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index d0216b97a924..74b33e827edb 100644
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> korganizer-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> korganizer-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  korganizer-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*korganizer-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +korganizer-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*korganizer-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +korganizer-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> korganizer-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  korganizer-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*korganizer-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +korganizer-3.5.0_beta2.ebuild:
+  New version.
+
+*korganizer-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +korganizer-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -korganizer-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*korganizer-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +korganizer-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*korganizer-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +korganizer-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  korganizer-3.4.2.ebuild:
+  ~alpha keyword.
+
+*korganizer-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +korganizer-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> korganizer-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> korganizer-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> korganizer-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*korganizer-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +korganizer-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> korganizer-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> korganizer-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> korganizer-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> korganizer-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*korganizer-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  korganizer-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*korganizer-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +korganizer-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *korganizer-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/korganizer/Manifest b/kde-base/korganizer/Manifest
index 83091fe4f0b6..8540df7aefd2 100644
--- a/kde-base/korganizer/Manifest
+++ b/kde-base/korganizer/Manifest
@@ -1,4 +1,26 @@
-MD5 114eea08d816706826694485014cd913 korganizer-3.4.0_alpha1.ebuild 1652
-MD5 114eea08d816706826694485014cd913 korganizer-3.4.0_beta1.ebuild 1652
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-korganizer-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-korganizer-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 76a1718055de60c097f05f6eda39eb15 ChangeLog 3738
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-korganizer-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-korganizer-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-korganizer-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-korganizer-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-korganizer-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-korganizer-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-korganizer-3.5_beta1 68
+MD5 5c29d0f89ffe92e5785210c8adc7f619 korganizer-3.4.1.ebuild 1775
+MD5 d4050f3b2c5989e74656f3a0652e5317 korganizer-3.4.2.ebuild 1792
+MD5 8bc9405115ee20719ade0519225f39fa korganizer-3.4.3.ebuild 1784
+MD5 2b1c8e4e82fae9a063980d98915eafe5 korganizer-3.5.0.ebuild 1769
+MD5 fdeb479c39841ddd751e9fc40c9ed3b8 korganizer-3.5.0_beta2.ebuild 1772
+MD5 9d39a89c7265977e7b4beaefde4cd512 korganizer-3.5.0_rc1.ebuild 1781
+MD5 c37ef8c7ac2a9749fe2ab8c03c337782 korganizer-3.5_beta1.ebuild 1767
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvZrntT9W3vfTuoRAjciAJ4oXgWMzAwllSw4p8M+JetyJoEbMgCgnoEj
++WQD6KTsGD60nEFIA2GybT0=
+=oNMd
+-----END PGP SIGNATURE-----
diff --git a/kde-base/korganizer/files/digest-korganizer-3.4.1 b/kde-base/korganizer/files/digest-korganizer-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/korganizer/files/digest-korganizer-3.4.1
+++ b/kde-base/korganizer/files/digest-korganizer-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/korganizer/files/digest-korganizer-3.4.2 b/kde-base/korganizer/files/digest-korganizer-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/korganizer/files/digest-korganizer-3.4.2
+++ b/kde-base/korganizer/files/digest-korganizer-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/korganizer/korganizer-3.4.1.ebuild b/kde-base/korganizer/korganizer-3.4.1.ebuild
index 5650c331924a..7a6bbdf19704 100644
--- a/kde-base/korganizer/korganizer-3.4.1.ebuild
+++ b/kde-base/korganizer/korganizer-3.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/kde-base/korganizer/korganizer-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/korganizer/korganizer-3.4.2.ebuild b/kde-base/korganizer/korganizer-3.4.2.ebuild
index 6dda40a0bee6..80fcf1a6bd7d 100644
--- a/kde-base/korganizer/korganizer-3.4.2.ebuild
+++ b/kde-base/korganizer/korganizer-3.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/kde-base/korganizer/korganizer-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.1 $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/korganizer/korganizer-3.4.3.ebuild b/kde-base/korganizer/korganizer-3.4.3.ebuild
index d95e34fa0075..078ec6049d6f 100644
--- a/kde-base/korganizer/korganizer-3.4.3.ebuild
+++ b/kde-base/korganizer/korganizer-3.4.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/kde-base/korganizer/korganizer-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/korganizer/korganizer-3.5.0.ebuild b/kde-base/korganizer/korganizer-3.5.0.ebuild
index be0fe68727b4..30e331c1b105 100644
--- a/kde-base/korganizer/korganizer-3.5.0.ebuild
+++ b/kde-base/korganizer/korganizer-3.5.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/kde-base/korganizer/korganizer-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/korganizer/korganizer-3.5.0_beta2.ebuild b/kde-base/korganizer/korganizer-3.5.0_beta2.ebuild
index cc7d3947d5e6..9e81d96ae8d2 100644
--- a/kde-base/korganizer/korganizer-3.5.0_beta2.ebuild
+++ b/kde-base/korganizer/korganizer-3.5.0_beta2.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/kde-base/korganizer/korganizer-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/korganizer/korganizer-3.5.0_rc1.ebuild b/kde-base/korganizer/korganizer-3.5.0_rc1.ebuild
index 74622c1f85a0..24ee82398459 100644
--- a/kde-base/korganizer/korganizer-3.5.0_rc1.ebuild
+++ b/kde-base/korganizer/korganizer-3.5.0_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/kde-base/korganizer/korganizer-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/korganizer/korganizer-3.5_beta1.ebuild b/kde-base/korganizer/korganizer-3.5_beta1.ebuild
index c401697ad3ca..82f7408be9aa 100644
--- a/kde-base/korganizer/korganizer-3.5_beta1.ebuild
+++ b/kde-base/korganizer/korganizer-3.5_beta1.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/kde-base/korganizer/korganizer-3.5_beta1.ebuild,v 1.1 2005/09/22 20:00:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A Personal Organizer for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkpimexchange)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)
diff --git a/kde-base/korganizer/metadata.xml b/kde-base/korganizer/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/korganizer/metadata.xml
+++ b/kde-base/korganizer/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/korn/ChangeLog b/kde-base/korn/ChangeLog
index da6864ccd4f7..36df669ded0e 100644
--- a/kde-base/korn/ChangeLog
+++ b/kde-base/korn/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/korn
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/ChangeLog,v 1.1 2005/01/15 02:24:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/ChangeLog,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> korn-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> korn-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> korn-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*korn-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +korn-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*korn-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +korn-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> korn-3.5_beta1.ebuild,
+  korn-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*korn-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +korn-3.5.0_beta2.ebuild:
+  New version.
+
+*korn-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +korn-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -korn-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*korn-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +korn-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*korn-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +korn-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> korn-3.4.2.ebuild:
+  ~alpha keyword.
+
+*korn-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +korn-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> korn-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> korn-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> korn-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  12 Jun 2005; Carsten Lohrke <carlo@gentoo.org> korn-3.4.0.ebuild,
+  korn-3.4.1.ebuild:
+  corrected dependencies, #95801
+
+*korn-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +korn-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> korn-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> korn-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> korn-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> korn-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*korn-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> korn-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*korn-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +korn-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  16 Jan 2005; Simone Gotti <motaboy@gentoo.org> korn-3.4.0_beta1.ebuild:
+  Fix bug #78208.
 
 *korn-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/korn/Manifest b/kde-base/korn/Manifest
index 1af45cda54a2..3e8e6645c4d1 100644
--- a/kde-base/korn/Manifest
+++ b/kde-base/korn/Manifest
@@ -1,4 +1,26 @@
-MD5 39d44f9758d66055b9fb99b841dff2da korn-3.4.0_alpha1.ebuild 624
-MD5 39d44f9758d66055b9fb99b841dff2da korn-3.4.0_beta1.ebuild 624
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-korn-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-korn-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6cb3efc2946b571fa724a594cb679349 ChangeLog 3641
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-korn-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-korn-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-korn-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-korn-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-korn-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-korn-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-korn-3.5_beta1 68
+MD5 f9e5153175532e5ce88e049f61939cc4 korn-3.4.1.ebuild 773
+MD5 b2717f375d62dc3a62ec65b8276c4d77 korn-3.4.2.ebuild 788
+MD5 27d4c1fa086800750afb87ce2f7debd2 korn-3.4.3.ebuild 786
+MD5 9bcc0dc57f44beabcaf5b90b7d029ac0 korn-3.5.0.ebuild 706
+MD5 c318dcd119661ba7421b1cc9954cf2b4 korn-3.5.0_beta2.ebuild 723
+MD5 07c8de9fe73016ddf4cf0a279b87a105 korn-3.5.0_rc1.ebuild 722
+MD5 d9b2f5b27523401dfb2f37b898ce7a12 korn-3.5_beta1.ebuild 765
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvbSntT9W3vfTuoRAjD8AJ0UKE7z6h15rx1D9dCQ2B9dkTUv3wCgmH4a
+ITPvwpjDxqnqZ3X2rY/2TKU=
+=FMk1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/korn/files/digest-korn-3.4.1 b/kde-base/korn/files/digest-korn-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/korn/files/digest-korn-3.4.1
+++ b/kde-base/korn/files/digest-korn-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/korn/files/digest-korn-3.4.2 b/kde-base/korn/files/digest-korn-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/korn/files/digest-korn-3.4.2
+++ b/kde-base/korn/files/digest-korn-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/korn/korn-3.4.1.ebuild b/kde-base/korn/korn-3.4.1.ebuild
index e21fa315cb6a..cc426cc4f3b0 100644
--- a/kde-base/korn/korn-3.4.1.ebuild
+++ b/kde-base/korn/korn-3.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/kde-base/korn/korn-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,12 +8,13 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mailbox checker"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/mimelib)
 $(deprange $PV $MAXKDEVER kde-base/libkmime)"
 OLDDEPEND="~kde-base/mimelib-$PV ~kde-base/libkmime-$PV"
-
+RDEPEND="${DEPEND}
+	kde-base/kdepim-kioslaves"
 KMCOPYLIB="libmimelib mimelib
 	libkmime libkmime"
 # libkcal is installed because a lot of headers are needed, but it don't have to be compiled
diff --git a/kde-base/korn/korn-3.4.2.ebuild b/kde-base/korn/korn-3.4.2.ebuild
index 05faa0a8da63..50ed4a086582 100644
--- a/kde-base/korn/korn-3.4.2.ebuild
+++ b/kde-base/korn/korn-3.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/kde-base/korn/korn-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mailbox checker"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/mimelib)
 $(deprange 3.4.1 $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/korn/korn-3.4.3.ebuild b/kde-base/korn/korn-3.4.3.ebuild
index 0fafc1929239..c19024177e76 100644
--- a/kde-base/korn/korn-3.4.3.ebuild
+++ b/kde-base/korn/korn-3.4.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/kde-base/korn/korn-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mailbox checker"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.2 $MAXKDEVER kde-base/mimelib)
 $(deprange 3.4.1 $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/korn/korn-3.5.0.ebuild b/kde-base/korn/korn-3.5.0.ebuild
index 4e9b0556c0c7..c0852938efb8 100644
--- a/kde-base/korn/korn-3.5.0.ebuild
+++ b/kde-base/korn/korn-3.5.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/kde-base/korn/korn-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/korn/korn-3.5.0_beta2.ebuild b/kde-base/korn/korn-3.5.0_beta2.ebuild
index 11664c5c0da8..97b4f4b6d98f 100644
--- a/kde-base/korn/korn-3.5.0_beta2.ebuild
+++ b/kde-base/korn/korn-3.5.0_beta2.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/kde-base/korn/korn-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mailbox checker"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange 3.5_beta1 $MAXKDEVER kde-base/mimelib)
 $(deprange 3.5_beta1 $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/korn/korn-3.5.0_rc1.ebuild b/kde-base/korn/korn-3.5.0_rc1.ebuild
index 2d97cf4943de..d082c90cbc7f 100644
--- a/kde-base/korn/korn-3.5.0_rc1.ebuild
+++ b/kde-base/korn/korn-3.5.0_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/kde-base/korn/korn-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/korn/korn-3.5_beta1.ebuild b/kde-base/korn/korn-3.5_beta1.ebuild
index f049db790caf..39567e3407c2 100644
--- a/kde-base/korn/korn-3.5_beta1.ebuild
+++ b/kde-base/korn/korn-3.5_beta1.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/kde-base/korn/korn-3.5_beta1.ebuild,v 1.1 2005/09/22 20:01:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korn/korn-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:13 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mailbox checker"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/mimelib)
 $(deprange $PV $MAXKDEVER kde-base/libkmime)"
diff --git a/kde-base/korn/metadata.xml b/kde-base/korn/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/korn/metadata.xml
+++ b/kde-base/korn/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/korundum/ChangeLog b/kde-base/korundum/ChangeLog
index acc691d7f4b4..04ac205727cf 100644
--- a/kde-base/korundum/ChangeLog
+++ b/kde-base/korundum/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/korundum
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/ChangeLog,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> korundum-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> korundum-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*korundum-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*korundum-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> korundum-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*korundum-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*korundum-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.4.3.ebuild:
+  New version.
+
+*korundum-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> korundum-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*korundum-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org> korundum-3.4.0.ebuild:
+  Added ~amd64 keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> korundum-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> korundum-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*korundum-3.3.2-r1 (19 Feb 2005)
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.3.2-r1.ebuild,
+  +korundum-3.4.0_beta2-r1.ebuild:
+  Moved all versions to SLOT 0, because they install in /usr, and the
+  different SLOTs were overwriting one another. Bug 80858.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> korundum-3.3.2.ebuild:
+  Added x86 (stable) keyword.
+
+*korundum-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +korundum-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*korundum-3.3.2 (25 Dec 2004)
+
+  25 Dec 2004; Dan Armak <danarmak@gentoo.org> korundum-3.3.1.ebuild,
+  +korundum-3.3.2.ebuild:
+  New ebuild for 3.3.2.
+
+  11 Dec 2004; Dan Armak <danarmak@gentoo.org> korundum-3.3.1.ebuild:
+  Fixed typo: should be KM_MAKEFILESREV - this fixes the generated SRC_URI,
+  and closes #74110.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  korundum-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *korundum-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/korundum/Manifest b/kde-base/korundum/Manifest
index ea36d4f74d35..cffae5414364 100644
--- a/kde-base/korundum/Manifest
+++ b/kde-base/korundum/Manifest
@@ -1,3 +1,27 @@
-MD5 2f37c4c1f9eac25951e344ec6a4bf031 korundum-3.3.1.ebuild 405
-MD5 c2df1b6591321df574d4613b45e0e711 files/digest-korundum-3.3.1 149
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e9e277adefd5ef8ae349d77e4f6012dc ChangeLog 3644
+MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-korundum-3.3.2-r1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-korundum-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-korundum-3.4.2 300
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-korundum-3.4.3 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-korundum-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-korundum-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-korundum-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 eb15c0d4539fdbe6a7c7b6bd10820f7a korundum-3.3.2-r1.ebuild 1086
+MD5 3d3324748c4a3ed4495e9ad9d765a81a korundum-3.4.1.ebuild 1101
+MD5 8d4896027e14644e52a9743af9a123e4 korundum-3.4.2.ebuild 1107
+MD5 e67edef7145a54fbf514de48407904ec korundum-3.4.3.ebuild 1103
+MD5 0f80055560009e66e82e814c52a84a6d korundum-3.5.0.ebuild 1094
+MD5 0ecfb73427c35fff372424d14b741fc3 korundum-3.5.0_beta2.ebuild 1099
+MD5 ba78b2968177c108496666503646fecc korundum-3.5.0_rc1.ebuild 1098
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyT8ntT9W3vfTuoRAkMYAJ9y0+S/r0uA3uBjIg2vz0PcIL23fgCfWVrQ
+oP3hSaGef6uY89tnKpdFh6A=
+=AtiQ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/korundum/files/digest-korundum-3.3.2-r1 b/kde-base/korundum/files/digest-korundum-3.3.2-r1
index 8ca0b2bead4b..1b3b65c42a2e 100644
--- a/kde-base/korundum/files/digest-korundum-3.3.2-r1
+++ b/kde-base/korundum/files/digest-korundum-3.3.2-r1
@@ -1,4 +1 @@
-MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
-MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
-MD5 224bbb908b607ec9b2c3f1ff1cde1907 kdebindings-3.3.1-3.3.2.tar.xdelta 603690
 MD5 a8ae8e2ef4dd3680d0756adf76086d85 kdebindings-3.3.2.tar.bz2 7131727
diff --git a/kde-base/korundum/files/digest-korundum-3.4.1 b/kde-base/korundum/files/digest-korundum-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/korundum/files/digest-korundum-3.4.1
+++ b/kde-base/korundum/files/digest-korundum-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/korundum/files/digest-korundum-3.4.2 b/kde-base/korundum/files/digest-korundum-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/korundum/files/digest-korundum-3.4.2
+++ b/kde-base/korundum/files/digest-korundum-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/korundum/files/no-gtk-glib-check.diff b/kde-base/korundum/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/korundum/files/no-gtk-glib-check.diff
+++ b/kde-base/korundum/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/korundum/korundum-3.3.2-r1.ebuild b/kde-base/korundum/korundum-3.3.2-r1.ebuild
index de34bc6a288d..094651e6fc50 100644
--- a/kde-base/korundum/korundum-3.3.2-r1.ebuild
+++ b/kde-base/korundum/korundum-3.3.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/kde-base/korundum/korundum-3.3.2-r1.ebuild,v 1.1 2005/02/19 15:36:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
diff --git a/kde-base/korundum/korundum-3.4.1.ebuild b/kde-base/korundum/korundum-3.4.1.ebuild
index 12c6d3cfe2e8..5ef374f5b02e 100644
--- a/kde-base/korundum/korundum-3.4.1.ebuild
+++ b/kde-base/korundum/korundum-3.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/kde-base/korundum/korundum-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
@@ -13,7 +13,7 @@ inherit kde-meta
 DESCRIPTION="KDE ruby bindings"
 HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 OLDDEPEND=">=virtual/ruby-1.8 ~kde-base/qtruby-$PV ~kde-base/smoke-3.3.1"
 DEPEND=" >=virtual/ruby-1.8
diff --git a/kde-base/korundum/korundum-3.4.2.ebuild b/kde-base/korundum/korundum-3.4.2.ebuild
index 25d8e1ff2c5d..b346bf2f97e3 100644
--- a/kde-base/korundum/korundum-3.4.2.ebuild
+++ b/kde-base/korundum/korundum-3.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/kde-base/korundum/korundum-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
diff --git a/kde-base/korundum/korundum-3.4.3.ebuild b/kde-base/korundum/korundum-3.4.3.ebuild
index 063d56296695..3440badeca07 100644
--- a/kde-base/korundum/korundum-3.4.3.ebuild
+++ b/kde-base/korundum/korundum-3.4.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/kde-base/korundum/korundum-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
@@ -13,7 +13,7 @@ inherit kde-meta
 DESCRIPTION="KDE ruby bindings"
 HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
 
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 OLDDEPEND=">=virtual/ruby-1.8 ~kde-base/qtruby-$PV ~kde-base/smoke-3.3.1"
 DEPEND=" >=virtual/ruby-1.8
diff --git a/kde-base/korundum/korundum-3.5.0.ebuild b/kde-base/korundum/korundum-3.5.0.ebuild
index 1522b135984c..3cabc7dc9234 100644
--- a/kde-base/korundum/korundum-3.5.0.ebuild
+++ b/kde-base/korundum/korundum-3.5.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/kde-base/korundum/korundum-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
diff --git a/kde-base/korundum/korundum-3.5.0_beta2.ebuild b/kde-base/korundum/korundum-3.5.0_beta2.ebuild
index 917ff3d1d275..e2a2b426badf 100644
--- a/kde-base/korundum/korundum-3.5.0_beta2.ebuild
+++ b/kde-base/korundum/korundum-3.5.0_beta2.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/kde-base/korundum/korundum-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
@@ -13,7 +13,7 @@ inherit kde-meta
 DESCRIPTION="KDE ruby bindings"
 HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND=">=virtual/ruby-1.8 ~kde-base/qtruby-$PV ~kde-base/smoke-3.3.1"
 DEPEND=" >=virtual/ruby-1.8
diff --git a/kde-base/korundum/korundum-3.5.0_rc1.ebuild b/kde-base/korundum/korundum-3.5.0_rc1.ebuild
index 9d1fbb9d9c55..21d374810957 100644
--- a/kde-base/korundum/korundum-3.5.0_rc1.ebuild
+++ b/kde-base/korundum/korundum-3.5.0_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/kde-base/korundum/korundum-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korundum/korundum-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt libsmokekde smoke/kde"
diff --git a/kde-base/korundum/metadata.xml b/kde-base/korundum/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/korundum/metadata.xml
+++ b/kde-base/korundum/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpackage/ChangeLog b/kde-base/kpackage/ChangeLog
index 03be5ef68cce..5d4e7e6cc2da 100644
--- a/kde-base/kpackage/ChangeLog
+++ b/kde-base/kpackage/ChangeLog
@@ -1,6 +1,77 @@
 # ChangeLog for kde-base/kpackage
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/ChangeLog,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpackage-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+*kpackage-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpackage-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpackage-3.5_beta1.ebuild,
+  kpackage-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpackage-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.5.0_beta2.ebuild:
+  New version.
+
+*kpackage-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpackage-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpackage-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpackage-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpackage-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpackage-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kpackage-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+*kpackage-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpackage-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpackage-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpackage-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpackage-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpackage-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpackage/Manifest b/kde-base/kpackage/Manifest
index 055621756d11..a9f68f9bf1ec 100644
--- a/kde-base/kpackage/Manifest
+++ b/kde-base/kpackage/Manifest
@@ -1,3 +1,26 @@
-MD5 3ec0f86245da0c0a5d6edc4b01ccf8de kpackage-3.4.0_beta1.ebuild 317
-MD5 3ec0f86245da0c0a5d6edc4b01ccf8de kpackage-3.4.0_alpha1.ebuild 317
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-kpackage-3.4.0_beta1 215
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1dff67cf552b1251f684bf01153c1d45 ChangeLog 2626
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-kpackage-3.4.1 211
+MD5 9d1b64c1a3fcf3755ead7efab419928f files/digest-kpackage-3.4.2 286
+MD5 80b3c1753e84c4d6d9caf0502325b7b4 files/digest-kpackage-3.4.3 68
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-kpackage-3.5.0 68
+MD5 64ad1da64ecad951c67e7899dbfa8bd7 files/digest-kpackage-3.5.0_beta2 215
+MD5 068810fa15f0ff2384c05e1d80dd3754 files/digest-kpackage-3.5.0_rc1 298
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-kpackage-3.5_beta1 69
+MD5 10cf39315da282f65e8d8559adfe6111 kpackage-3.4.1.ebuild 430
+MD5 77367f93b958ae31556b9d853c2a43cd kpackage-3.4.2.ebuild 433
+MD5 7fd241e042504ebf268a8efb9282a025 kpackage-3.4.3.ebuild 428
+MD5 3373cfdd2503fe48d2a399c6d6662dc7 kpackage-3.5.0.ebuild 427
+MD5 26562b0e759b6f9ddd0d4bd071a72a1e kpackage-3.5.0_beta2.ebuild 432
+MD5 8d81b6eec076706291ce49f49c2482f5 kpackage-3.5.0_rc1.ebuild 431
+MD5 5be96b50ebc34f0594e61214a02b833f kpackage-3.5_beta1.ebuild 430
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhknNntT9W3vfTuoRAm00AKCmvwoc/VWa7Mui90bkOcW/+i1rIACeNGla
+eLVslgQi/I7xYXigJcwY2sA=
+=XI1y
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpackage/files/digest-kpackage-3.4.1 b/kde-base/kpackage/files/digest-kpackage-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/kpackage/files/digest-kpackage-3.4.1
+++ b/kde-base/kpackage/files/digest-kpackage-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/kpackage/files/digest-kpackage-3.4.2 b/kde-base/kpackage/files/digest-kpackage-3.4.2
index 704ba375213a..7a7584d3ac0d 100644
--- a/kde-base/kpackage/files/digest-kpackage-3.4.2
+++ b/kde-base/kpackage/files/digest-kpackage-3.4.2
@@ -1 +1,4 @@
+MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
+MD5 b4066d3c4962fdb0d5ae5820bb09ce8d kdeadmin-3.4.1-3.4.2.tar.xdelta 63771
 MD5 ef1d4be02bbe384d46e807421dd52fed kdeadmin-3.4.2.tar.bz2 1520873
diff --git a/kde-base/kpackage/kpackage-3.4.1.ebuild b/kde-base/kpackage/kpackage-3.4.1.ebuild
index e80080434d32..107fc9fa5186 100644
--- a/kde-base/kpackage/kpackage-3.4.1.ebuild
+++ b/kde-base/kpackage/kpackage-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE package manager (deb, rpm etc support; rudimentary ebuild support)"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpackage/kpackage-3.4.2.ebuild b/kde-base/kpackage/kpackage-3.4.2.ebuild
index 1e15f24e6b9a..e7ee50b96221 100644
--- a/kde-base/kpackage/kpackage-3.4.2.ebuild
+++ b/kde-base/kpackage/kpackage-3.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/kde-base/kpackage/kpackage-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpackage/kpackage-3.4.3.ebuild b/kde-base/kpackage/kpackage-3.4.3.ebuild
index d5369401ef53..b7ea8ff52b5c 100644
--- a/kde-base/kpackage/kpackage-3.4.3.ebuild
+++ b/kde-base/kpackage/kpackage-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE package manager (deb, rpm etc support; rudimentary ebuild support)"
-KEYWORDS=" ~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpackage/kpackage-3.5.0.ebuild b/kde-base/kpackage/kpackage-3.5.0.ebuild
index 507e034bc0c9..c9e8b751f6f3 100644
--- a/kde-base/kpackage/kpackage-3.5.0.ebuild
+++ b/kde-base/kpackage/kpackage-3.5.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/kde-base/kpackage/kpackage-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpackage/kpackage-3.5.0_beta2.ebuild b/kde-base/kpackage/kpackage-3.5.0_beta2.ebuild
index bd5ab2647331..d1d61bf7c4d5 100644
--- a/kde-base/kpackage/kpackage-3.5.0_beta2.ebuild
+++ b/kde-base/kpackage/kpackage-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE package manager (deb, rpm etc support; rudimentary ebuild support)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpackage/kpackage-3.5.0_rc1.ebuild b/kde-base/kpackage/kpackage-3.5.0_rc1.ebuild
index ad91482b2e9b..488ffcc12556 100644
--- a/kde-base/kpackage/kpackage-3.5.0_rc1.ebuild
+++ b/kde-base/kpackage/kpackage-3.5.0_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/kde-base/kpackage/kpackage-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpackage/kpackage-3.5_beta1.ebuild b/kde-base/kpackage/kpackage-3.5_beta1.ebuild
index e751959d2c4e..f0f8904f7c5d 100644
--- a/kde-base/kpackage/kpackage-3.5_beta1.ebuild
+++ b/kde-base/kpackage/kpackage-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.5_beta1.ebuild,v 1.1 2005/09/22 20:02:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpackage/kpackage-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE package manager (deb, rpm etc support; rudimentary ebuild support)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpackage/metadata.xml b/kde-base/kpackage/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpackage/metadata.xml
+++ b/kde-base/kpackage/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpager/ChangeLog b/kde-base/kpager/ChangeLog
index b27de621fa57..d1a2dec39438 100644
--- a/kde-base/kpager/ChangeLog
+++ b/kde-base/kpager/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/kpager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/ChangeLog,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpager-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpager-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kpager-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kpager-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpager-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpager-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpager-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  23 Oct 2005; Douglas Russell <puggy@gentoo.org> kpager-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpager-3.5_beta1.ebuild,
+  kpager-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpager-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpager-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpager-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpager-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpager-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpager-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpager-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kpager-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpager-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpager-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpager-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kpager-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpager-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpager-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpager-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpager-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kpager-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpager-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpager-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpager-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kpager-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpager-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpager-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpager-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpager/Manifest b/kde-base/kpager/Manifest
index ff0ac515c09b..ba58a0603b03 100644
--- a/kde-base/kpager/Manifest
+++ b/kde-base/kpager/Manifest
@@ -1,4 +1,24 @@
-MD5 a256fcc45671d39bb1ade704b9d8f160 kpager-3.4.0_alpha1.ebuild 371
-MD5 a256fcc45671d39bb1ade704b9d8f160 kpager-3.4.0_beta1.ebuild 371
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kpager-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kpager-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 be1abe41f0fe236246a8289aa6d2357b ChangeLog 3482
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kpager-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kpager-3.4.2 287
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kpager-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kpager-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kpager-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kpager-3.5_beta1 69
+MD5 503aba0b3e78759016f2b275744aad19 kpager-3.4.1.ebuild 390
+MD5 1a1369a207d319626b47e37b7aa0de26 kpager-3.4.2.ebuild 401
+MD5 fc32dc2b514ff47c7270cd1a2394ce81 kpager-3.5.0.ebuild 384
+MD5 a24870006a6166582ad273c532cc6ae7 kpager-3.5.0_beta2.ebuild 387
+MD5 672238d98045de5dd5cecd4872c77cdc kpager-3.5.0_rc1.ebuild 388
+MD5 2cd8608de391e276496b35b89626fcfe kpager-3.5_beta1.ebuild 382
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkI0ntT9W3vfTuoRAlveAKC1FwRKYbFPwqPPpuTSufJ807oIhgCfRctB
+irZdYXwFf4NujycNouUZ7DY=
+=+P6E
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpager/files/digest-kpager-3.4.1 b/kde-base/kpager/files/digest-kpager-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kpager/files/digest-kpager-3.4.1
+++ b/kde-base/kpager/files/digest-kpager-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kpager/files/digest-kpager-3.4.2 b/kde-base/kpager/files/digest-kpager-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kpager/files/digest-kpager-3.4.2
+++ b/kde-base/kpager/files/digest-kpager-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kpager/kpager-3.4.1.ebuild b/kde-base/kpager/kpager-3.4.1.ebuild
index 8ae1e8e191a8..73b4fb060ffd 100644
--- a/kde-base/kpager/kpager-3.4.1.ebuild
+++ b/kde-base/kpager/kpager-3.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/kde-base/kpager/kpager-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Virtual Desktop Overview"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kpager/kpager-3.4.2.ebuild b/kde-base/kpager/kpager-3.4.2.ebuild
index af39ab641cf7..7eafc0b18cba 100644
--- a/kde-base/kpager/kpager-3.4.2.ebuild
+++ b/kde-base/kpager/kpager-3.4.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.4.2.ebuild,v 1.1 2005/07/28 21:16:20 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Virtual Desktop Overview"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kpager/kpager-3.5.0.ebuild b/kde-base/kpager/kpager-3.5.0.ebuild
index d3b703b888f7..a243292028a7 100644
--- a/kde-base/kpager/kpager-3.5.0.ebuild
+++ b/kde-base/kpager/kpager-3.5.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/kde-base/kpager/kpager-3.5.0.ebuild,v 1.1 2005/11/22 22:14:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kpager/kpager-3.5.0_beta2.ebuild b/kde-base/kpager/kpager-3.5.0_beta2.ebuild
index ea1b79f5f9ba..6c9f89690863 100644
--- a/kde-base/kpager/kpager-3.5.0_beta2.ebuild
+++ b/kde-base/kpager/kpager-3.5.0_beta2.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/kde-base/kpager/kpager-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Virtual Desktop Overview"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kpager/kpager-3.5.0_rc1.ebuild b/kde-base/kpager/kpager-3.5.0_rc1.ebuild
index 20932ecbf09e..f6119e020b18 100644
--- a/kde-base/kpager/kpager-3.5.0_rc1.ebuild
+++ b/kde-base/kpager/kpager-3.5.0_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/kde-base/kpager/kpager-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kpager/kpager-3.5_beta1.ebuild b/kde-base/kpager/kpager-3.5_beta1.ebuild
index 1228797300cf..8d02876c7f62 100644
--- a/kde-base/kpager/kpager-3.5_beta1.ebuild
+++ b/kde-base/kpager/kpager-3.5_beta1.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/kde-base/kpager/kpager-3.5_beta1.ebuild,v 1.1 2005/09/22 20:03:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpager/kpager-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:58 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Virtual Desktop Overview"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kpager/metadata.xml b/kde-base/kpager/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpager/metadata.xml
+++ b/kde-base/kpager/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpat/ChangeLog b/kde-base/kpat/ChangeLog
index f6e98dcd08c6..336b3e876c9b 100644
--- a/kde-base/kpat/ChangeLog
+++ b/kde-base/kpat/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for kde-base/kpat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/ChangeLog,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpat-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpat-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kpat-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kpat-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpat-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpat-3.5_beta1.ebuild,
+  kpat-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpat-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.5.0_beta2.ebuild:
+  New version.
+
+*kpat-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpat-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpat-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kpat-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpat-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpat-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kpat-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpat-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  26 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kpat-3.4.1.ebuild:
+  Add missing dependency on kdebase-data (#99043).
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpat-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kpat-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpat-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpat-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpat-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kpat-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpat-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpat-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpat-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kpat-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpat-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpat-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpat-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpat/Manifest b/kde-base/kpat/Manifest
index 0052f98c3320..b2ecfc5310c5 100644
--- a/kde-base/kpat/Manifest
+++ b/kde-base/kpat/Manifest
@@ -1,4 +1,26 @@
-MD5 62563956e1393bdac80a007776276298 kpat-3.4.0_beta1.ebuild 414
-MD5 62563956e1393bdac80a007776276298 kpat-3.4.0_alpha1.ebuild 414
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kpat-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kpat-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8266c2435cf858afa0a72dbb07d766e7 ChangeLog 3546
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kpat-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kpat-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kpat-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kpat-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kpat-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kpat-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kpat-3.5_beta1 70
+MD5 03ad99fddd67c9bc3850c3d6ae741b03 kpat-3.4.1.ebuild 604
+MD5 b9d1e25d4ad1e4bf60175ef2a73bce62 kpat-3.4.2.ebuild 616
+MD5 bac2511ffcfddbf4720423b8c9411a1b kpat-3.4.3.ebuild 612
+MD5 0ead1e8267fa70abcb8497611607953b kpat-3.5.0.ebuild 553
+MD5 81d41ce7f9536c6c30f76220cd190c9e kpat-3.5.0_beta2.ebuild 558
+MD5 6662710438498e40a372ae5089bfd4d4 kpat-3.5.0_rc1.ebuild 557
+MD5 4e56345a60ced4d29b7572504ff35526 kpat-3.5_beta1.ebuild 595
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl/QntT9W3vfTuoRAnosAJ4mNgY98fPMRKRc2SW8GNPcW6OTowCgriaA
+V2tAJViGJp4sx+Nnk91DicU=
+=ViIu
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpat/files/digest-kpat-3.4.1 b/kde-base/kpat/files/digest-kpat-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kpat/files/digest-kpat-3.4.1
+++ b/kde-base/kpat/files/digest-kpat-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kpat/files/digest-kpat-3.4.2 b/kde-base/kpat/files/digest-kpat-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kpat/files/digest-kpat-3.4.2
+++ b/kde-base/kpat/files/digest-kpat-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kpat/kpat-3.4.1.ebuild b/kde-base/kpat/kpat-3.4.1.ebuild
index 44103a7622e6..65627f476307 100644
--- a/kde-base/kpat/kpat-3.4.1.ebuild
+++ b/kde-base/kpat/kpat-3.4.1.ebuild
@@ -1,17 +1,20 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.4.1.ebuild,v 1.1 2005/05/25 21:23:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE patience game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
+RDEPEND="${DEPEND}
+	$(deprange-dual $PV $MAXKDEVER kde-base/kdebase-data)"
+
 KMEXTRACTONLY=libkdegames
 KMCOPYLIB="libkdegames libkdegames"
diff --git a/kde-base/kpat/kpat-3.4.2.ebuild b/kde-base/kpat/kpat-3.4.2.ebuild
index 230c03beee84..68ea67b49082 100644
--- a/kde-base/kpat/kpat-3.4.2.ebuild
+++ b/kde-base/kpat/kpat-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE patience game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpat/kpat-3.4.3.ebuild b/kde-base/kpat/kpat-3.4.3.ebuild
index b3766c9ab4ae..49593d3cc405 100644
--- a/kde-base/kpat/kpat-3.4.3.ebuild
+++ b/kde-base/kpat/kpat-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE patience game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpat/kpat-3.5.0.ebuild b/kde-base/kpat/kpat-3.5.0.ebuild
index 2e067aa87f1a..1a59065a3f9f 100644
--- a/kde-base/kpat/kpat-3.5.0.ebuild
+++ b/kde-base/kpat/kpat-3.5.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/kde-base/kpat/kpat-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpat/kpat-3.5.0_beta2.ebuild b/kde-base/kpat/kpat-3.5.0_beta2.ebuild
index 7e6e969c6cde..f33bfce68d6b 100644
--- a/kde-base/kpat/kpat-3.5.0_beta2.ebuild
+++ b/kde-base/kpat/kpat-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE patience game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kpat/kpat-3.5.0_rc1.ebuild b/kde-base/kpat/kpat-3.5.0_rc1.ebuild
index 53d6e8fa2a4e..0081af5bcd49 100644
--- a/kde-base/kpat/kpat-3.5.0_rc1.ebuild
+++ b/kde-base/kpat/kpat-3.5.0_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/kde-base/kpat/kpat-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpat/kpat-3.5_beta1.ebuild b/kde-base/kpat/kpat-3.5_beta1.ebuild
index ba076f3ad8eb..4f389d050010 100644
--- a/kde-base/kpat/kpat-3.5_beta1.ebuild
+++ b/kde-base/kpat/kpat-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5_beta1.ebuild,v 1.1 2005/09/22 20:04:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpat/kpat-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE patience game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpat/metadata.xml b/kde-base/kpat/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpat/metadata.xml
+++ b/kde-base/kpat/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpdf/ChangeLog b/kde-base/kpdf/ChangeLog
index b1af859cd00a..42721b06ecf2 100644
--- a/kde-base/kpdf/ChangeLog
+++ b/kde-base/kpdf/ChangeLog
@@ -1,6 +1,144 @@
 # ChangeLog for kde-base/kpdf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/ChangeLog,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpdf-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpdf-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kpdf-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kpdf-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpdf-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpdf-3.5_beta1.ebuild,
+  kpdf-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpdf-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.5.0_beta2.ebuild:
+  New version.
+
+*kpdf-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpdf-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpdf-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kpdf-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  19 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> kpdf-3.5_alpha1.ebuild:
+  Do not pass configure switches for DRM anymore (see bug 83838).
+
+*kpdf-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpdf-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kpdf-3.4.2-r2.ebuild:
+  ~alpha keyword.
+
+  08 Aug 2005; Jory A. Pratt <anarchy@gentoo.org> kpdf-3.4.1-r1.ebuild:
+  Stable on ppc wrt bug #100263
+
+  07 Aug 2005; Jason Wever <weeve@gentoo.org> kpdf-3.4.1-r1.ebuild:
+  Stable on SPARC wrt security bug #100263.
+
+  07 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> kpdf-3.4.1-r1.ebuild:
+  Stable on amd64.
+
+  07 Aug 2005; Markus Rothe <corsair@gentoo.org> kpdf-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #100263)
+
+*kpdf-3.4.2-r2 (06 Aug 2005)
+
+  06 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdegraphics-3.4.2-kpdf-contentcrash.patch, +kpdf-3.4.2-r2.ebuild:
+  Added patch to fix crashes while expanding content tree. Closes bug #101558.
+
+*kpdf-3.4.2-r1 (05 Aug 2005)
+
+  05 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdegraphics-3.4.2-kpdf-fix.patch, +kpdf-3.4.2-r1.ebuild:
+  Add patch to fix regression in kpdf (#101119).
+
+*kpdf-3.4.1-r1 (03 Aug 2005)
+
+  03 Aug 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.4.1-kdegraphics-4.diff, +kpdf-3.4.1-r1.ebuild:
+  Yet another xpdf fix.
+
+*kpdf-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpdf-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kpdf-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpdf-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpdf-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpdf-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kpdf-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpdf-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpdf-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpdf-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kpdf-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpdf-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpdf-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kpdf-3.4.0_beta1-r1 (29 Jan 2005)
+
+  29 Jan 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/CAN-2005-0064_kde-3.4.patch, +kpdf-3.4.0_beta1-r1.ebuild:
+  fix for xpdf makeFileKey2 stack overflow, #78619
 
 *kpdf-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpdf/Manifest b/kde-base/kpdf/Manifest
index 808d7c9cec3c..8f0ba3f01af3 100644
--- a/kde-base/kpdf/Manifest
+++ b/kde-base/kpdf/Manifest
@@ -1,4 +1,35 @@
-MD5 d31707e3c0ce01814d14134569fba824 kpdf-3.4.0_beta1.ebuild 311
-MD5 d31707e3c0ce01814d14134569fba824 kpdf-3.4.0_alpha1.ebuild 311
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kpdf-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kpdf-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74af10e2fc403cf2eb9690a818080477 ChangeLog 4791
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1 221
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpdf-3.4.1-r1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpdf-3.4.2 300
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpdf-3.4.2-r1 300
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpdf-3.4.2-r2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kpdf-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kpdf-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kpdf-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kpdf-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kpdf-3.5_beta1 72
+MD5 653bd55a1e87c51731d0b0512051774e files/kdegraphics-3.4.2-kpdf-contentcrash.patch 749
+MD5 4caddebea4d845abb2de6dbbfe1b979a files/kdegraphics-3.4.2-kpdf-fix.patch 1024
+MD5 ec3b95efe9139f4259d6de213fe4b87b files/post-3.4.1-kdegraphics-4.diff 1827
+MD5 493fdf9a2dc94e56301161f38122b422 kpdf-3.4.1-r1.ebuild 627
+MD5 710200655b097652c4ea66ea6e5931db kpdf-3.4.1.ebuild 569
+MD5 da8c7b95896e393c3af5901801f76253 kpdf-3.4.2-r1.ebuild 698
+MD5 26ec262357d5acdd4fbe2e83d488e692 kpdf-3.4.2-r2.ebuild 816
+MD5 9d42c07d0672b69a347a437c76b5e024 kpdf-3.4.2.ebuild 578
+MD5 73d838ef9808bb8eb4d46c8fa00e5d96 kpdf-3.4.3.ebuild 578
+MD5 2668f45e19def8779c07eb2a8ca004f8 kpdf-3.5.0.ebuild 561
+MD5 b89a12a3801612d6e49ab481ed5ed94f kpdf-3.5.0_beta2.ebuild 566
+MD5 74724a86c7c553fe9f7410a582b58c23 kpdf-3.5.0_rc1.ebuild 565
+MD5 5444244bf974076f757cacf29e81a5aa kpdf-3.5_beta1.ebuild 564
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmg/ntT9W3vfTuoRAviZAJ0YifGBpb+WebTRBohEYZXkEJlhXACeLIGz
+vH2cl4axB0WIKCLqQYUqE6E=
+=VL3p
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.1 b/kde-base/kpdf/files/digest-kpdf-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kpdf/files/digest-kpdf-3.4.1
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.2 b/kde-base/kpdf/files/digest-kpdf-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kpdf/files/digest-kpdf-3.4.2
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.2-r1 b/kde-base/kpdf/files/digest-kpdf-3.4.2-r1
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kpdf/files/digest-kpdf-3.4.2-r1
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.2-r1
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kpdf/files/digest-kpdf-3.4.2-r2 b/kde-base/kpdf/files/digest-kpdf-3.4.2-r2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kpdf/files/digest-kpdf-3.4.2-r2
+++ b/kde-base/kpdf/files/digest-kpdf-3.4.2-r2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kpdf/kpdf-3.4.1-r1.ebuild b/kde-base/kpdf/kpdf-3.4.1-r1.ebuild
index 81bbc447e6e5..a9911db6b577 100644
--- a/kde-base/kpdf/kpdf-3.4.1-r1.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.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/kde-base/kpdf/kpdf-3.4.1-r1.ebuild,v 1.1 2005/08/03 17:05:26 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="nodrm"
 KMEXTRA="kfile-plugins/pdf"
 
diff --git a/kde-base/kpdf/kpdf-3.4.1.ebuild b/kde-base/kpdf/kpdf-3.4.1.ebuild
index cb75d0c8b5ab..954b32f59e86 100644
--- a/kde-base/kpdf/kpdf-3.4.1.ebuild
+++ b/kde-base/kpdf/kpdf-3.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/kde-base/kpdf/kpdf-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="nodrm"
 KMEXTRA="kfile-plugins/pdf"
 
diff --git a/kde-base/kpdf/kpdf-3.4.2-r1.ebuild b/kde-base/kpdf/kpdf-3.4.2-r1.ebuild
index d7cba0692734..7890a366eaa4 100644
--- a/kde-base/kpdf/kpdf-3.4.2-r1.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.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/kde-base/kpdf/kpdf-3.4.2-r1.ebuild,v 1.1 2005/08/05 10:51:56 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kpdf/kpdf-3.4.2-r2.ebuild b/kde-base/kpdf/kpdf-3.4.2-r2.ebuild
index d35a06ab88b0..551818d731d7 100644
--- a/kde-base/kpdf/kpdf-3.4.2-r2.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.2-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/kde-base/kpdf/kpdf-3.4.2-r2.ebuild,v 1.1 2005/08/06 19:41:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nodrm"
 KMEXTRA="kfile-plugins/pdf"
 
diff --git a/kde-base/kpdf/kpdf-3.4.2.ebuild b/kde-base/kpdf/kpdf-3.4.2.ebuild
index 25573cec7485..0d35cb2a5101 100644
--- a/kde-base/kpdf/kpdf-3.4.2.ebuild
+++ b/kde-base/kpdf/kpdf-3.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/kde-base/kpdf/kpdf-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kpdf/kpdf-3.4.3.ebuild b/kde-base/kpdf/kpdf-3.4.3.ebuild
index 430ab12e4281..0c701c0eedf6 100644
--- a/kde-base/kpdf/kpdf-3.4.3.ebuild
+++ b/kde-base/kpdf/kpdf-3.4.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/kde-base/kpdf/kpdf-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="nodrm"
 KMEXTRA="kfile-plugins/pdf"
 
diff --git a/kde-base/kpdf/kpdf-3.5.0.ebuild b/kde-base/kpdf/kpdf-3.5.0.ebuild
index e1ea06acf983..f64aa4ae0351 100644
--- a/kde-base/kpdf/kpdf-3.5.0.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.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/kde-base/kpdf/kpdf-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kpdf/kpdf-3.5.0_beta2.ebuild b/kde-base/kpdf/kpdf-3.5.0_beta2.ebuild
index 434658e80834..b38af63d5f2b 100644
--- a/kde-base/kpdf/kpdf-3.5.0_beta2.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.0_beta2.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/kde-base/kpdf/kpdf-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRA="kfile-plugins/pdf"
 
diff --git a/kde-base/kpdf/kpdf-3.5.0_rc1.ebuild b/kde-base/kpdf/kpdf-3.5.0_rc1.ebuild
index 89bddb74eb7a..008a1ce19bdd 100644
--- a/kde-base/kpdf/kpdf-3.5.0_rc1.ebuild
+++ b/kde-base/kpdf/kpdf-3.5.0_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/kde-base/kpdf/kpdf-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kpdf/kpdf-3.5_beta1.ebuild b/kde-base/kpdf/kpdf-3.5_beta1.ebuild
index 627a00b3df91..f981b8ff33c8 100644
--- a/kde-base/kpdf/kpdf-3.5_beta1.ebuild
+++ b/kde-base/kpdf/kpdf-3.5_beta1.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/kde-base/kpdf/kpdf-3.5_beta1.ebuild,v 1.1 2005/09/22 20:05:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpdf/kpdf-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kpdf, a kde pdf viewer based on xpdf"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRA="kfile-plugins/pdf"
 
diff --git a/kde-base/kpdf/metadata.xml b/kde-base/kpdf/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpdf/metadata.xml
+++ b/kde-base/kpdf/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpercentage/ChangeLog b/kde-base/kpercentage/ChangeLog
index 599b1cd77fb3..752f1ea243c9 100644
--- a/kde-base/kpercentage/ChangeLog
+++ b/kde-base/kpercentage/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/kpercentage
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/ChangeLog,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kpercentage-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpercentage-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kpercentage-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kpercentage-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpercentage-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kpercentage-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpercentage-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpercentage-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpercentage-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpercentage-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpercentage-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kpercentage-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpercentage-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpercentage-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpercentage-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kpercentage-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpercentage-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpercentage-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpercentage-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpercentage-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kpercentage-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpercentage-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpercentage-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpercentage-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kpercentage-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpercentage-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kpercentage-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpercentage-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpercentage/Manifest b/kde-base/kpercentage/Manifest
index 55f461d2a6d8..a38d0f81eeda 100644
--- a/kde-base/kpercentage/Manifest
+++ b/kde-base/kpercentage/Manifest
@@ -1,4 +1,20 @@
-MD5 d1f5a8ade4f854ca98d0f2adfb771aed kpercentage-3.4.0_alpha1.ebuild 326
-MD5 d1f5a8ade4f854ca98d0f2adfb771aed kpercentage-3.4.0_beta1.ebuild 326
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kpercentage-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kpercentage-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7da457ae789b4bdc1b9c2a05405fc59f ChangeLog 3258
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kpercentage-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kpercentage-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kpercentage-3.5.0 67
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kpercentage-3.5_beta1 68
+MD5 2820532f23e42c235e0005b185700960 kpercentage-3.4.1.ebuild 453
+MD5 fb254cfb3ca78ca6e7d2a60430cb8be9 kpercentage-3.4.2.ebuild 464
+MD5 a14ea51092a7b68ee70ba66ed280b38a kpercentage-3.5.0.ebuild 442
+MD5 0d6f734c89d1a6cb56dfaa2209199699 kpercentage-3.5_beta1.ebuild 452
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlR3ntT9W3vfTuoRApSCAJ99u8oQfy1HzVOocpSUchg8ufSw1wCdHCkq
+718TBHUoEb+RCHNwI7ibaGg=
+=dmpp
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpercentage/files/digest-kpercentage-3.4.1 b/kde-base/kpercentage/files/digest-kpercentage-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kpercentage/files/digest-kpercentage-3.4.1
+++ b/kde-base/kpercentage/files/digest-kpercentage-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kpercentage/files/digest-kpercentage-3.4.2 b/kde-base/kpercentage/files/digest-kpercentage-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kpercentage/files/digest-kpercentage-3.4.2
+++ b/kde-base/kpercentage/files/digest-kpercentage-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kpercentage/kpercentage-3.4.1.ebuild b/kde-base/kpercentage/kpercentage-3.4.1.ebuild
index d04b3e4415d8..6eef8751f2d6 100644
--- a/kde-base/kpercentage/kpercentage-3.4.1.ebuild
+++ b/kde-base/kpercentage/kpercentage-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE educational: A program to improve your skills in calculating with percentages"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpercentage/kpercentage-3.4.2.ebuild b/kde-base/kpercentage/kpercentage-3.4.2.ebuild
index 483f14c0beb6..a9be62413d1d 100644
--- a/kde-base/kpercentage/kpercentage-3.4.2.ebuild
+++ b/kde-base/kpercentage/kpercentage-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE educational: A program to improve your skills in calculating with percentages"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpercentage/kpercentage-3.5.0.ebuild b/kde-base/kpercentage/kpercentage-3.5.0.ebuild
index a606cc063b92..5e2dfb9a6452 100644
--- a/kde-base/kpercentage/kpercentage-3.5.0.ebuild
+++ b/kde-base/kpercentage/kpercentage-3.5.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/kde-base/kpercentage/kpercentage-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpercentage/kpercentage-3.5_beta1.ebuild b/kde-base/kpercentage/kpercentage-3.5_beta1.ebuild
index 74383e188745..9b5fece1db07 100644
--- a/kde-base/kpercentage/kpercentage-3.5_beta1.ebuild
+++ b/kde-base/kpercentage/kpercentage-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.5_beta1.ebuild,v 1.1 2005/09/22 20:06:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpercentage/kpercentage-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:27 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE educational: A program to improve your skills in calculating with percentages"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kpercentage/metadata.xml b/kde-base/kpercentage/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpercentage/metadata.xml
+++ b/kde-base/kpercentage/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpersonalizer/ChangeLog b/kde-base/kpersonalizer/ChangeLog
index 6f2e5536396c..4e1ff4688aee 100644
--- a/kde-base/kpersonalizer/ChangeLog
+++ b/kde-base/kpersonalizer/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/kpersonalizer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/ChangeLog,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kpersonalizer-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpersonalizer-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kpersonalizer-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kpersonalizer-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpersonalizer-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpersonalizer-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpersonalizer-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kpersonalizer-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kpersonalizer-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpersonalizer-3.5.0_beta2.ebuild:
+  New version.
+
+*kpersonalizer-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpersonalizer-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kpersonalizer-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpersonalizer-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpersonalizer-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpersonalizer-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpersonalizer-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpersonalizer-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kpersonalizer-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpersonalizer-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpersonalizer-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpersonalizer-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kpersonalizer-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpersonalizer-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpersonalizer-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpersonalizer-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpersonalizer-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kpersonalizer-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpersonalizer-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpersonalizer-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpersonalizer-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kpersonalizer-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpersonalizer-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kpersonalizer-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpersonalizer-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpersonalizer/Manifest b/kde-base/kpersonalizer/Manifest
index 198336ac4728..e58d1b867f64 100644
--- a/kde-base/kpersonalizer/Manifest
+++ b/kde-base/kpersonalizer/Manifest
@@ -1,4 +1,26 @@
-MD5 964041fc924dfce733a524155dfd3328 kpersonalizer-3.4.0_beta1.ebuild 368
-MD5 964041fc924dfce733a524155dfd3328 kpersonalizer-3.4.0_alpha1.ebuild 368
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kpersonalizer-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kpersonalizer-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 32178e3171039ebb7e8116164978ffa5 ChangeLog 3848
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kpersonalizer-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kpersonalizer-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kpersonalizer-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kpersonalizer-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kpersonalizer-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kpersonalizer-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kpersonalizer-3.5_beta1 69
+MD5 8813ba5f121b35e19fe79572207ef851 kpersonalizer-3.4.1.ebuild 401
+MD5 a91c6e82ca3cea74a65b1c0a554a49d9 kpersonalizer-3.4.2.ebuild 414
+MD5 9f8c7c6792d5ff3467be213aceab1dfa kpersonalizer-3.4.3.ebuild 410
+MD5 f1df5dbc556662848a08ef236c7f1059 kpersonalizer-3.5.0.ebuild 419
+MD5 7be93a44b99934157d2bb989f78f3cdb kpersonalizer-3.5.0_beta2.ebuild 422
+MD5 6af82e60ce011ad8d4155524c42fbe93 kpersonalizer-3.5.0_rc1.ebuild 423
+MD5 051bd70c4c708849edcf38ac717a8bc7 kpersonalizer-3.5_beta1.ebuild 420
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj1intT9W3vfTuoRAhC5AKCAmdRnevygjZiOLQ5BvM0y4IlTMACfRobJ
+ZckPVjpwq9ips8RZfMfF84A=
+=+yJu
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.1 b/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.1
+++ b/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.2 b/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.2
+++ b/kde-base/kpersonalizer/files/digest-kpersonalizer-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.4.1.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.4.1.ebuild
index a3a42692608d..1172ea6baeed 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.4.1.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.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/kde-base/kpersonalizer/kpersonalizer-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE basic settings wizard"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.4.2.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.4.2.ebuild
index 87cc62662ae0..8dd0ca70e480 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.4.2.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.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/kde-base/kpersonalizer/kpersonalizer-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE basic settings wizard"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.4.3.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.4.3.ebuild
index fa4e978e3734..a95e1fb2a2ed 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.4.3.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.4.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/kde-base/kpersonalizer/kpersonalizer-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE basic settings wizard"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.5.0.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.5.0.ebuild
index 5ec344deccbd..d4cae287f3eb 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.5.0.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.5.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/kde-base/kpersonalizer/kpersonalizer-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.5.0_beta2.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.5.0_beta2.ebuild
index 4958c6ea7fe8..a079d89b24be 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.5.0_beta2.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.5.0_beta2.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/kde-base/kpersonalizer/kpersonalizer-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE basic settings wizard"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 KMEXTRACTONLY="libkonq"
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.5.0_rc1.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.5.0_rc1.ebuild
index c7a97a87aeeb..00aa505ecf51 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.5.0_rc1.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.5.0_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/kde-base/kpersonalizer/kpersonalizer-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:31 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:55 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kpersonalizer/kpersonalizer-3.5_beta1.ebuild b/kde-base/kpersonalizer/kpersonalizer-3.5_beta1.ebuild
index e8800afeb57f..83fa97687692 100644
--- a/kde-base/kpersonalizer/kpersonalizer-3.5_beta1.ebuild
+++ b/kde-base/kpersonalizer/kpersonalizer-3.5_beta1.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/kde-base/kpersonalizer/kpersonalizer-3.5_beta1.ebuild,v 1.1 2005/09/22 20:07:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpersonalizer/kpersonalizer-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE basic settings wizard"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRACTONLY="libkonq"
diff --git a/kde-base/kpersonalizer/metadata.xml b/kde-base/kpersonalizer/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpersonalizer/metadata.xml
+++ b/kde-base/kpersonalizer/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpf/ChangeLog b/kde-base/kpf/ChangeLog
index af60d9ce7bb2..53ecaef6e6c2 100644
--- a/kde-base/kpf/ChangeLog
+++ b/kde-base/kpf/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for kde-base/kpf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/ChangeLog,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpf-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpf-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kpf-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kpf-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpf-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpf-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpf-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpf-3.5_beta1.ebuild,
+  kpf-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpf-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpf-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> -kpf-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpf-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kpf-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpf-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kpf-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kpf-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpf-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpf-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpf-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kpf-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpf-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpf-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpf-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpf-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kpf-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpf-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpf-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kpf-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kpf-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpf-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpf-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpf/Manifest b/kde-base/kpf/Manifest
index 55ec2df36cf0..5e072faa7b6a 100644
--- a/kde-base/kpf/Manifest
+++ b/kde-base/kpf/Manifest
@@ -1,4 +1,24 @@
-MD5 a0625f1e3f2c002320082f7157187b29 kpf-3.4.0_alpha1.ebuild 277
-MD5 a0625f1e3f2c002320082f7157187b29 kpf-3.4.0_beta1.ebuild 277
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kpf-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kpf-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9ccae39d0b9683c92bf22617001562d1 ChangeLog 3173
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kpf-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kpf-3.4.2 296
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kpf-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kpf-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kpf-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kpf-3.5_beta1 71
+MD5 ac5c14365e8decd61ab1846d495bd1db kpf-3.4.1.ebuild 388
+MD5 4fea4a3725e81e26b6e2fc7f8d07c0e7 kpf-3.4.2.ebuild 400
+MD5 f3c8c48d3dacdd4f20037ffe8c9d31b9 kpf-3.5.0.ebuild 377
+MD5 967f92f018df35c4ae04d180022b2a68 kpf-3.5.0_beta2.ebuild 382
+MD5 5c9f227a9fc3e34a3534c62e1e8f2cb2 kpf-3.5.0_rc1.ebuild 381
+MD5 f0bedf721db47f60149171e0835af8a2 kpf-3.5_beta1.ebuild 380
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuSHntT9W3vfTuoRAmHjAJ0dQqZy6b38IvveY6mhaO0gZZEmRACgguB+
+TafWguo0QXT96e7HB1fL3Js=
+=yRmw
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpf/files/digest-kpf-3.4.1 b/kde-base/kpf/files/digest-kpf-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kpf/files/digest-kpf-3.4.1
+++ b/kde-base/kpf/files/digest-kpf-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kpf/files/digest-kpf-3.4.2 b/kde-base/kpf/files/digest-kpf-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kpf/files/digest-kpf-3.4.2
+++ b/kde-base/kpf/files/digest-kpf-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kpf/kpf-3.4.1.ebuild b/kde-base/kpf/kpf-3.4.1.ebuild
index 1a580bc24561..3cc49024a08f 100644
--- a/kde-base/kpf/kpf-3.4.1.ebuild
+++ b/kde-base/kpf/kpf-3.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/kde-base/kpf/kpf-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/kpf-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker file server (http) applet"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kpf/kpf-3.4.2.ebuild b/kde-base/kpf/kpf-3.4.2.ebuild
index 78b9a3cb144f..9e8386148edd 100644
--- a/kde-base/kpf/kpf-3.4.2.ebuild
+++ b/kde-base/kpf/kpf-3.4.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/kde-base/kpf/kpf-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/kpf-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker file server (http) applet"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kpf/kpf-3.5.0.ebuild b/kde-base/kpf/kpf-3.5.0.ebuild
index 5e4d2967f4fc..390b277cfdab 100644
--- a/kde-base/kpf/kpf-3.5.0.ebuild
+++ b/kde-base/kpf/kpf-3.5.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/kde-base/kpf/kpf-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/kpf-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kpf/kpf-3.5.0_beta2.ebuild b/kde-base/kpf/kpf-3.5.0_beta2.ebuild
index 6e382438997b..7d524c7b9c3a 100644
--- a/kde-base/kpf/kpf-3.5.0_beta2.ebuild
+++ b/kde-base/kpf/kpf-3.5.0_beta2.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/kde-base/kpf/kpf-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:57 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/kpf-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker file server (http) applet"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kpf/kpf-3.5.0_rc1.ebuild b/kde-base/kpf/kpf-3.5.0_rc1.ebuild
index 9012e5851b6b..6980d58e1f7c 100644
--- a/kde-base/kpf/kpf-3.5.0_rc1.ebuild
+++ b/kde-base/kpf/kpf-3.5.0_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/kde-base/kpf/kpf-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/kpf-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:45 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kpf/kpf-3.5_beta1.ebuild b/kde-base/kpf/kpf-3.5_beta1.ebuild
index 86455f4ecce9..fbac22114d76 100644
--- a/kde-base/kpf/kpf-3.5_beta1.ebuild
+++ b/kde-base/kpf/kpf-3.5_beta1.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/kde-base/kpf/kpf-3.5_beta1.ebuild,v 1.1 2005/09/22 20:08:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpf/kpf-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker file server (http) applet"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kpf/metadata.xml b/kde-base/kpf/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpf/metadata.xml
+++ b/kde-base/kpf/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpilot/ChangeLog b/kde-base/kpilot/ChangeLog
index a9f43eed0b9b..f8f82cd12d67 100644
--- a/kde-base/kpilot/ChangeLog
+++ b/kde-base/kpilot/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/kpilot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/ChangeLog,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpilot-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kpilot-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kpilot-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpilot-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpilot-3.5_beta1.ebuild,
+  kpilot-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpilot-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.5.0_beta2.ebuild:
+  New version.
+
+*kpilot-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpilot-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpilot-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpilot-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpilot-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpilot-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kpilot-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpilot-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kpilot-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  27 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdepim-3.4.1-kpilot-fix.patch, kpilot-3.4.1.ebuild:
+  Add last minute fix for critical kpilot bug (kde bug 106324).
+
+*kpilot-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kpilot-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpilot-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpilot-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpilot-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kpilot-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpilot-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpilot-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpilot-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpilot/Manifest b/kde-base/kpilot/Manifest
index cf7d7be58e54..87d6d64a2140 100644
--- a/kde-base/kpilot/Manifest
+++ b/kde-base/kpilot/Manifest
@@ -1,4 +1,27 @@
-MD5 b89a6d87f16cfce1033efbe9c9d79756 kpilot-3.4.0_beta1.ebuild 890
-MD5 b89a6d87f16cfce1033efbe9c9d79756 kpilot-3.4.0_alpha1.ebuild 890
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-kpilot-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-kpilot-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8c6f7ac356a373681997fd8cbd4ba5ad ChangeLog 3297
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kpilot-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kpilot-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kpilot-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-kpilot-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-kpilot-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-kpilot-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-kpilot-3.5_beta1 68
+MD5 0324965cf9c67cc4750d7a14cec3ef1f files/kdepim-3.4.1-kpilot-fix.patch 4635
+MD5 9e5c5c72645fab49c126a5482586917c kpilot-3.4.1.ebuild 1269
+MD5 40fadfcdd74e0ac0a5ea92b83d5b7131 kpilot-3.4.2.ebuild 1185
+MD5 2aee145ce58d93d902ed7d81cb6168fb kpilot-3.4.3.ebuild 1179
+MD5 521fd30864a17e54329e178a6a1a331c kpilot-3.5.0.ebuild 1172
+MD5 7f6a6d20dd21f2d78d0156cb9ffefc13 kpilot-3.5.0_beta2.ebuild 1177
+MD5 2a5b9fd1b61f2e4b118e15f59ba88669 kpilot-3.5.0_rc1.ebuild 1176
+MD5 fab4bc234c7638cef5f0dcb6bfd01712 kpilot-3.5_beta1.ebuild 1175
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvcJntT9W3vfTuoRAoffAJ9AjSin+MYhP5ovoWVKUoZgp9TDwgCePESD
+4sMBy+hnPLSXzEDEc53yXvk=
+=3VF0
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpilot/files/digest-kpilot-3.4.1 b/kde-base/kpilot/files/digest-kpilot-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/kpilot/files/digest-kpilot-3.4.1
+++ b/kde-base/kpilot/files/digest-kpilot-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/kpilot/files/digest-kpilot-3.4.2 b/kde-base/kpilot/files/digest-kpilot-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/kpilot/files/digest-kpilot-3.4.2
+++ b/kde-base/kpilot/files/digest-kpilot-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/kpilot/kpilot-3.4.1.ebuild b/kde-base/kpilot/kpilot-3.4.1.ebuild
index 6b13d9a54124..d0b622183681 100644
--- a/kde-base/kpilot/kpilot-3.4.1.ebuild
+++ b/kde-base/kpilot/kpilot-3.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/kde-base/kpilot/kpilot-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KPilot - HotSync software for KDE"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE=""
 DEPEND="app-pda/pilot-link
 	dev-libs/libmal
@@ -29,6 +29,9 @@ KMEXTRA="
 	kfile-plugins/palm-databases
 	kontact/plugins/kpilot/" # We add here the kontact's plugin instead of compiling it with kontact because it needs a lot of this programs deps.
 
+# Last minute fix. Applied for 3.4.2.
+PATCHES1="${FILESDIR}/kdepim-3.4.1-kpilot-fix.patch"
+
 src_compile() {
 	# needed to detect pi-notepad.h, used by the kpilot notepad conduit.
 	myconf="${myconf} --with-extra-includes=/usr/include/libpisock"
diff --git a/kde-base/kpilot/kpilot-3.4.2.ebuild b/kde-base/kpilot/kpilot-3.4.2.ebuild
index 83b230bfb62f..78201feee2f3 100644
--- a/kde-base/kpilot/kpilot-3.4.2.ebuild
+++ b/kde-base/kpilot/kpilot-3.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/kde-base/kpilot/kpilot-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kpilot/kpilot-3.4.3.ebuild b/kde-base/kpilot/kpilot-3.4.3.ebuild
index 03c5b73dfb31..ec45860eeb65 100644
--- a/kde-base/kpilot/kpilot-3.4.3.ebuild
+++ b/kde-base/kpilot/kpilot-3.4.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/kde-base/kpilot/kpilot-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KPilot - HotSync software for KDE"
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND="app-pda/pilot-link
 	dev-libs/libmal
diff --git a/kde-base/kpilot/kpilot-3.5.0.ebuild b/kde-base/kpilot/kpilot-3.5.0.ebuild
index 55eaa8c8d63a..9f9243294783 100644
--- a/kde-base/kpilot/kpilot-3.5.0.ebuild
+++ b/kde-base/kpilot/kpilot-3.5.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/kde-base/kpilot/kpilot-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kpilot/kpilot-3.5.0_beta2.ebuild b/kde-base/kpilot/kpilot-3.5.0_beta2.ebuild
index f9eece3627d8..f15f4616b0d5 100644
--- a/kde-base/kpilot/kpilot-3.5.0_beta2.ebuild
+++ b/kde-base/kpilot/kpilot-3.5.0_beta2.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/kde-base/kpilot/kpilot-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KPilot - HotSync software for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="app-pda/pilot-link
 	dev-libs/libmal
diff --git a/kde-base/kpilot/kpilot-3.5.0_rc1.ebuild b/kde-base/kpilot/kpilot-3.5.0_rc1.ebuild
index 15341de71a30..6d486aa193d3 100644
--- a/kde-base/kpilot/kpilot-3.5.0_rc1.ebuild
+++ b/kde-base/kpilot/kpilot-3.5.0_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/kde-base/kpilot/kpilot-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/kpilot/kpilot-3.5_beta1.ebuild b/kde-base/kpilot/kpilot-3.5_beta1.ebuild
index 67427d0b8348..a008f064d083 100644
--- a/kde-base/kpilot/kpilot-3.5_beta1.ebuild
+++ b/kde-base/kpilot/kpilot-3.5_beta1.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/kde-base/kpilot/kpilot-3.5_beta1.ebuild,v 1.1 2005/09/22 20:09:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpilot/kpilot-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KPilot - HotSync software for KDE"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="app-pda/pilot-link
 	dev-libs/libmal
diff --git a/kde-base/kpilot/metadata.xml b/kde-base/kpilot/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpilot/metadata.xml
+++ b/kde-base/kpilot/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpoker/ChangeLog b/kde-base/kpoker/ChangeLog
index 431c5274df96..fbda1d176b33 100644
--- a/kde-base/kpoker/ChangeLog
+++ b/kde-base/kpoker/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kpoker
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/ChangeLog,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kpoker-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpoker-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kpoker-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kpoker-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpoker-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kpoker-3.5_beta1.ebuild,
+  kpoker-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpoker-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.5.0_beta2.ebuild:
+  New version.
+
+*kpoker-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpoker-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpoker-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpoker-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpoker-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpoker-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kpoker-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpoker-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpoker-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kpoker-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpoker-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpoker-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpoker-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kpoker-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpoker-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpoker-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpoker-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kpoker-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpoker-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kpoker-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpoker-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpoker/Manifest b/kde-base/kpoker/Manifest
index 4c670f2ec8c4..29bbedd82043 100644
--- a/kde-base/kpoker/Manifest
+++ b/kde-base/kpoker/Manifest
@@ -1,4 +1,26 @@
-MD5 4a41a1e0bc40afe105c1a4d8accb63f9 kpoker-3.4.0_beta1.ebuild 411
-MD5 4a41a1e0bc40afe105c1a4d8accb63f9 kpoker-3.4.0_alpha1.ebuild 411
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kpoker-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kpoker-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 942c6083e86b25c8329fde86c3469f36 ChangeLog 3503
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kpoker-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kpoker-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kpoker-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kpoker-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kpoker-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kpoker-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kpoker-3.5_beta1 70
+MD5 9049dbbf96296bf83c76c2df1b7824fe kpoker-3.4.1.ebuild 528
+MD5 d84b74f740fcfd74b8b9ffaf21d57ba1 kpoker-3.4.2.ebuild 541
+MD5 693b1a88ef8615c22c72532d7a051fef kpoker-3.4.3.ebuild 537
+MD5 d784632f2a88c436a230fac9005fcccb kpoker-3.5.0.ebuild 478
+MD5 0d04ea29a7d7bd9eca5d827b43adeb6c kpoker-3.5.0_beta2.ebuild 483
+MD5 302f013398733d7747f11cf96d320e9f kpoker-3.5.0_rc1.ebuild 482
+MD5 d05ade82074e867cc90f3894c33ebb61 kpoker-3.5_beta1.ebuild 520
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmALntT9W3vfTuoRAj+VAKCFlMrT4EZRUae+OfPMUVgBfKk4KwCfXwoS
+bL3t8WMwi7ODtH1LR0h2A9I=
+=fy6Q
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpoker/files/digest-kpoker-3.4.1 b/kde-base/kpoker/files/digest-kpoker-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kpoker/files/digest-kpoker-3.4.1
+++ b/kde-base/kpoker/files/digest-kpoker-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kpoker/files/digest-kpoker-3.4.2 b/kde-base/kpoker/files/digest-kpoker-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kpoker/files/digest-kpoker-3.4.2
+++ b/kde-base/kpoker/files/digest-kpoker-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kpoker/kpoker-3.4.1.ebuild b/kde-base/kpoker/kpoker-3.4.1.ebuild
index e9cf04ac880f..906b18dc5198 100644
--- a/kde-base/kpoker/kpoker-3.4.1.ebuild
+++ b/kde-base/kpoker/kpoker-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE poker game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpoker/kpoker-3.4.2.ebuild b/kde-base/kpoker/kpoker-3.4.2.ebuild
index 35ac2ff405a4..f4f200510362 100644
--- a/kde-base/kpoker/kpoker-3.4.2.ebuild
+++ b/kde-base/kpoker/kpoker-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE poker game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpoker/kpoker-3.4.3.ebuild b/kde-base/kpoker/kpoker-3.4.3.ebuild
index 9d1dba61592d..b0b980c5406b 100644
--- a/kde-base/kpoker/kpoker-3.4.3.ebuild
+++ b/kde-base/kpoker/kpoker-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE poker game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpoker/kpoker-3.5.0.ebuild b/kde-base/kpoker/kpoker-3.5.0.ebuild
index 5358c8ea905a..dea3b50311f0 100644
--- a/kde-base/kpoker/kpoker-3.5.0.ebuild
+++ b/kde-base/kpoker/kpoker-3.5.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/kde-base/kpoker/kpoker-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpoker/kpoker-3.5.0_beta2.ebuild b/kde-base/kpoker/kpoker-3.5.0_beta2.ebuild
index c8fb7a81e97f..bd27757e7ad7 100644
--- a/kde-base/kpoker/kpoker-3.5.0_beta2.ebuild
+++ b/kde-base/kpoker/kpoker-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE poker game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kpoker/kpoker-3.5.0_rc1.ebuild b/kde-base/kpoker/kpoker-3.5.0_rc1.ebuild
index e23f7581555e..249bba1f1482 100644
--- a/kde-base/kpoker/kpoker-3.5.0_rc1.ebuild
+++ b/kde-base/kpoker/kpoker-3.5.0_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/kde-base/kpoker/kpoker-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kpoker/kpoker-3.5_beta1.ebuild b/kde-base/kpoker/kpoker-3.5_beta1.ebuild
index 10e7f12b0434..8b429503c8f5 100644
--- a/kde-base/kpoker/kpoker-3.5_beta1.ebuild
+++ b/kde-base/kpoker/kpoker-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.5_beta1.ebuild,v 1.1 2005/09/22 20:10:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpoker/kpoker-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:52 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE poker game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkdegames-3.3.1"
 DEPEND="
diff --git a/kde-base/kpoker/metadata.xml b/kde-base/kpoker/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpoker/metadata.xml
+++ b/kde-base/kpoker/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kpovmodeler/ChangeLog b/kde-base/kpovmodeler/ChangeLog
index 64352ca73a4f..d6c4216e4dbf 100644
--- a/kde-base/kpovmodeler/ChangeLog
+++ b/kde-base/kpovmodeler/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/kpovmodeler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/ChangeLog,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kpovmodeler-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kpovmodeler-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kpovmodeler-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kpovmodeler-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpovmodeler-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kpovmodeler-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kpovmodeler-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kpovmodeler-3.5_beta1.ebuild, kpovmodeler-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kpovmodeler-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpovmodeler-3.5.0_beta2.ebuild:
+  New version.
+
+*kpovmodeler-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kpovmodeler-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kpovmodeler-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kpovmodeler-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpovmodeler-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kpovmodeler-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kpovmodeler-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kpovmodeler-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kpovmodeler-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kpovmodeler-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kpovmodeler-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kpovmodeler-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kpovmodeler-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kpovmodeler-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kpovmodeler-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kpovmodeler-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kpovmodeler-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kpovmodeler-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kpovmodeler-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kpovmodeler-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kpovmodeler-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kpovmodeler-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kpovmodeler-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kpovmodeler-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kpovmodeler/Manifest b/kde-base/kpovmodeler/Manifest
index 47077ba3c22b..a966c6335c04 100644
--- a/kde-base/kpovmodeler/Manifest
+++ b/kde-base/kpovmodeler/Manifest
@@ -1,4 +1,26 @@
-MD5 12cd5cb2b9cf3f88619eeeba3e3a1a32 kpovmodeler-3.4.0_beta1.ebuild 353
-MD5 12cd5cb2b9cf3f88619eeeba3e3a1a32 kpovmodeler-3.4.0_alpha1.ebuild 353
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kpovmodeler-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kpovmodeler-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5ab5679dae10b5e31f3c2a4d963ef089 ChangeLog 3703
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kpovmodeler-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kpovmodeler-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kpovmodeler-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kpovmodeler-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kpovmodeler-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kpovmodeler-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kpovmodeler-3.5_beta1 72
+MD5 7cd6730f4fdc82cf4871455ad1022de4 kpovmodeler-3.4.1.ebuild 467
+MD5 9e25d8e20b4c35fa155c6a3b885859fe kpovmodeler-3.4.2.ebuild 505
+MD5 f36ceb8d046da093245b91c2feadb9a4 kpovmodeler-3.4.3.ebuild 501
+MD5 e051f3baef8e96d99ec9033dc8c62afd kpovmodeler-3.5.0.ebuild 481
+MD5 714b6cdf772dec26e45121a6099b8142 kpovmodeler-3.5.0_beta2.ebuild 486
+MD5 d2889cc8798b07ad6df34aebb06f1d00 kpovmodeler-3.5.0_rc1.ebuild 485
+MD5 bd1bdb12bf8c5db3c7711a3a669ea011 kpovmodeler-3.5_beta1.ebuild 484
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmiHntT9W3vfTuoRAmJZAJ9UT+PRCnIg5sEz7AaDN5RuvHvAXACgnUzW
+TihC2rPM5n1udTiHnkw1XQA=
+=qdg9
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.1 b/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.1
+++ b/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.2 b/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.2
+++ b/kde-base/kpovmodeler/files/digest-kpovmodeler-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.4.1.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.4.1.ebuild
index 566b5079c64c..8c959d563e6a 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.4.1.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.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/kde-base/kpovmodeler/kpovmodeler-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Modeler for POV-Ray Scenes"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="virtual/opengl"
 RDEPEND="${DEPEND}
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.4.2.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.4.2.ebuild
index a073cb9267c5..6b758f6eb159 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.4.2.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.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/kde-base/kpovmodeler/kpovmodeler-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,8 +8,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Modeler for POV-Ray Scenes"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
-DEPEND="virtual/opengl"
+DEPEND="virtual/opengl
+	>=media-libs/freetype-2"
 RDEPEND="${DEPEND}
 	media-gfx/povray"
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.4.3.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.4.3.ebuild
index 993b04dd1f6b..e3650a8f6483 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.4.3.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.4.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/kde-base/kpovmodeler/kpovmodeler-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Modeler for POV-Ray Scenes"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="virtual/opengl
 	>=media-libs/freetype-2"
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.5.0.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.5.0.ebuild
index b5f4f68039bb..f1f16a7ed36f 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.5.0.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.5.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/kde-base/kpovmodeler/kpovmodeler-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.5.0_beta2.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.5.0_beta2.ebuild
index 2fede5766662..2614ee97d693 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.5.0_beta2.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.5.0_beta2.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/kde-base/kpovmodeler/kpovmodeler-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Modeler for POV-Ray Scenes"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="virtual/opengl
 	>=media-libs/freetype-2"
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.5.0_rc1.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.5.0_rc1.ebuild
index 16c75a6859b0..50bc1e7896f5 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.5.0_rc1.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.5.0_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/kde-base/kpovmodeler/kpovmodeler-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kpovmodeler/kpovmodeler-3.5_beta1.ebuild b/kde-base/kpovmodeler/kpovmodeler-3.5_beta1.ebuild
index d17de2e3bd07..1b73ac9957e0 100644
--- a/kde-base/kpovmodeler/kpovmodeler-3.5_beta1.ebuild
+++ b/kde-base/kpovmodeler/kpovmodeler-3.5_beta1.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/kde-base/kpovmodeler/kpovmodeler-3.5_beta1.ebuild,v 1.1 2005/09/22 20:11:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kpovmodeler/kpovmodeler-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Modeler for POV-Ray Scenes"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="virtual/opengl
 	>=media-libs/freetype-2"
diff --git a/kde-base/kpovmodeler/metadata.xml b/kde-base/kpovmodeler/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kpovmodeler/metadata.xml
+++ b/kde-base/kpovmodeler/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kppp/ChangeLog b/kde-base/kppp/ChangeLog
index a6926397c807..e72f052f5267 100644
--- a/kde-base/kppp/ChangeLog
+++ b/kde-base/kppp/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/kppp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/ChangeLog,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kppp-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kppp-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kppp-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kppp-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kppp-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kppp-3.5_beta1.ebuild,
+  kppp-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kppp-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.5.0_beta2.ebuild:
+  New version.
+
+*kppp-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kppp-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kppp-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kppp-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kppp-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kppp-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kppp-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kppp-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kppp-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kppp-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kppp-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kppp-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kppp-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kppp-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kppp-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kppp-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kppp-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kppp-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kppp-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kppp-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kppp-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kppp/Manifest b/kde-base/kppp/Manifest
index dd8b71133380..ec0e55acc85b 100644
--- a/kde-base/kppp/Manifest
+++ b/kde-base/kppp/Manifest
@@ -1,4 +1,26 @@
-MD5 f96404e0f340f069662fdc690ba33da2 kppp-3.4.0_beta1.ebuild 280
-MD5 f96404e0f340f069662fdc690ba33da2 kppp-3.4.0_alpha1.ebuild 280
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kppp-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kppp-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77ebb8005ce9ca7562cd84ca78c69ab3 ChangeLog 3425
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kppp-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kppp-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kppp-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kppp-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kppp-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kppp-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kppp-3.5_beta1 71
+MD5 ce44f87b14d346a7cd53aaf9096a21d6 kppp-3.4.1.ebuild 393
+MD5 06e47599ed78b05cfbbdd6b07849268b kppp-3.4.2.ebuild 406
+MD5 51c389bd889a021b1e445ba844763a2b kppp-3.4.3.ebuild 403
+MD5 e5c1affa1d77fab7e8e17b567c54b4c6 kppp-3.5.0.ebuild 382
+MD5 1f6fab7d97c3115d8e4f7abacc09ed90 kppp-3.5.0_beta2.ebuild 387
+MD5 b3c9310ea52b4652d2b16aaf786bfbfa kppp-3.5.0_rc1.ebuild 386
+MD5 3c2e5dac41d41ee37bd213d2369cf38c kppp-3.5_beta1.ebuild 385
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuS6ntT9W3vfTuoRArFmAJ92pNBiXLu6tebYCAU3uIrs3E1xSwCfVj5q
+L4crUv7IEGEwKv775yCdAIQ=
+=wutS
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kppp/files/digest-kppp-3.4.1 b/kde-base/kppp/files/digest-kppp-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kppp/files/digest-kppp-3.4.1
+++ b/kde-base/kppp/files/digest-kppp-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kppp/files/digest-kppp-3.4.2 b/kde-base/kppp/files/digest-kppp-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kppp/files/digest-kppp-3.4.2
+++ b/kde-base/kppp/files/digest-kppp-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kppp/kppp-3.4.1.ebuild b/kde-base/kppp/kppp-3.4.1.ebuild
index 1bf0b9b23fa7..87d621fe6966 100644
--- a/kde-base/kppp/kppp-3.4.1.ebuild
+++ b/kde-base/kppp/kppp-3.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/kde-base/kppp/kppp-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialer and front-end to pppd"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kppp/kppp-3.4.2.ebuild b/kde-base/kppp/kppp-3.4.2.ebuild
index 536d8c80d462..d9da3dcc93f1 100644
--- a/kde-base/kppp/kppp-3.4.2.ebuild
+++ b/kde-base/kppp/kppp-3.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/kde-base/kppp/kppp-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialer and front-end to pppd"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kppp/kppp-3.4.3.ebuild b/kde-base/kppp/kppp-3.4.3.ebuild
index f3113ce460ec..ef64e7d95155 100644
--- a/kde-base/kppp/kppp-3.4.3.ebuild
+++ b/kde-base/kppp/kppp-3.4.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/kde-base/kppp/kppp-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialer and front-end to pppd"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kppp/kppp-3.5.0.ebuild b/kde-base/kppp/kppp-3.5.0.ebuild
index c24ecb923065..35d4c31e34f8 100644
--- a/kde-base/kppp/kppp-3.5.0.ebuild
+++ b/kde-base/kppp/kppp-3.5.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/kde-base/kppp/kppp-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kppp/kppp-3.5.0_beta2.ebuild b/kde-base/kppp/kppp-3.5.0_beta2.ebuild
index d643bd5d5338..ba2cd577e113 100644
--- a/kde-base/kppp/kppp-3.5.0_beta2.ebuild
+++ b/kde-base/kppp/kppp-3.5.0_beta2.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/kde-base/kppp/kppp-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialer and front-end to pppd"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kppp/kppp-3.5.0_rc1.ebuild b/kde-base/kppp/kppp-3.5.0_rc1.ebuild
index df6f585b188d..782a3ed706c1 100644
--- a/kde-base/kppp/kppp-3.5.0_rc1.ebuild
+++ b/kde-base/kppp/kppp-3.5.0_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/kde-base/kppp/kppp-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/kppp/kppp-3.5_beta1.ebuild b/kde-base/kppp/kppp-3.5_beta1.ebuild
index 9554cbc4950c..d6fbe8976e2c 100644
--- a/kde-base/kppp/kppp-3.5_beta1.ebuild
+++ b/kde-base/kppp/kppp-3.5_beta1.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/kde-base/kppp/kppp-3.5_beta1.ebuild,v 1.1 2005/09/22 20:12:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kppp/kppp-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A dialer and front-end to pppd"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kppp/metadata.xml b/kde-base/kppp/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kppp/metadata.xml
+++ b/kde-base/kppp/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/krdc/ChangeLog b/kde-base/krdc/ChangeLog
index c028e8b92d85..d2b42748b37a 100644
--- a/kde-base/krdc/ChangeLog
+++ b/kde-base/krdc/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for kde-base/krdc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/ChangeLog,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> krdc-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> krdc-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> krdc-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*krdc-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*krdc-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> krdc-3.5_beta1.ebuild,
+  krdc-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*krdc-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.5.0_beta2.ebuild:
+  New version.
+
+*krdc-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -krdc-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*krdc-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +krdc-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*krdc-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +krdc-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> krdc-3.4.2.ebuild:
+  ~alpha keyword.
+
+*krdc-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> krdc-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> krdc-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> krdc-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Gregorio Guidi <greg_g@gentoo.org> krdc-3.4.1.ebuild:
+  Depend on rdesktop >= 1.4.1 (#94036).
+
+*krdc-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> krdc-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> krdc-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> krdc-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> krdc-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*krdc-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> krdc-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*krdc-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +krdc-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *krdc-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/krdc/Manifest b/kde-base/krdc/Manifest
index 9b01c03696f8..4823503c2501 100644
--- a/kde-base/krdc/Manifest
+++ b/kde-base/krdc/Manifest
@@ -1,4 +1,26 @@
-MD5 7bc6fd68d93863f45d4b8071d9d83b77 krdc-3.4.0_alpha1.ebuild 508
-MD5 7bc6fd68d93863f45d4b8071d9d83b77 krdc-3.4.0_beta1.ebuild 508
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-krdc-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-krdc-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 58e2be660cef791fa009d14457be7a3f ChangeLog 3535
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-krdc-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-krdc-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-krdc-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-krdc-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-krdc-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-krdc-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-krdc-3.5_beta1 71
+MD5 0aa35602ea647c007ee72533a0954bb3 krdc-3.4.1.ebuild 619
+MD5 e596c609911ab994b70a3e6dc450dae1 krdc-3.4.2.ebuild 632
+MD5 351887e92b0e622af5b969b7cfab3334 krdc-3.4.3.ebuild 628
+MD5 b7199da223244ae543a258fe29a5fef0 krdc-3.5.0.ebuild 608
+MD5 7997c4b75b5bd192d7ca743d26222f0e krdc-3.5.0_beta2.ebuild 613
+MD5 ca645627e3884e7408ca46274898b33e krdc-3.5.0_rc1.ebuild 612
+MD5 d8f9e0d5706c48e54634c0f98414e49d krdc-3.5_beta1.ebuild 611
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuTuntT9W3vfTuoRAkkVAKCsytlkPxNOXok4FTgHi1EhumjxeACfX4sp
+sf1To8GqQT/udltl/I8EBPw=
+=lBjL
+-----END PGP SIGNATURE-----
diff --git a/kde-base/krdc/files/digest-krdc-3.4.1 b/kde-base/krdc/files/digest-krdc-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/krdc/files/digest-krdc-3.4.1
+++ b/kde-base/krdc/files/digest-krdc-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/krdc/files/digest-krdc-3.4.2 b/kde-base/krdc/files/digest-krdc-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/krdc/files/digest-krdc-3.4.2
+++ b/kde-base/krdc/files/digest-krdc-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/krdc/krdc-3.4.1.ebuild b/kde-base/krdc/krdc-3.4.1.ebuild
index 28d9744d20d4..b4738c8df1d6 100644
--- a/kde-base/krdc/krdc-3.4.1.ebuild
+++ b/kde-base/krdc/krdc-3.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/kde-base/krdc/krdc-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,12 +8,12 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) cient"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="rdesktop slp"
 DEPEND=">=dev-libs/openssl-0.9.6b
 	slp? ( net-libs/openslp )"
 RDEPEND="${DEPEND}
-	rdesktop? ( >=net-misc/rdesktop-1.3.1-r1 )"
+	rdesktop? ( >=net-misc/rdesktop-1.4.1 )"
 
 src_compile() {
 	myconf="$myconf `use_enable slp`"
diff --git a/kde-base/krdc/krdc-3.4.2.ebuild b/kde-base/krdc/krdc-3.4.2.ebuild
index b57ceff6c40c..8eb08106cce4 100644
--- a/kde-base/krdc/krdc-3.4.2.ebuild
+++ b/kde-base/krdc/krdc-3.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/kde-base/krdc/krdc-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) cient"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="rdesktop slp"
 DEPEND=">=dev-libs/openssl-0.9.6b
 	slp? ( net-libs/openslp )"
diff --git a/kde-base/krdc/krdc-3.4.3.ebuild b/kde-base/krdc/krdc-3.4.3.ebuild
index fa86abef5547..fa8721417565 100644
--- a/kde-base/krdc/krdc-3.4.3.ebuild
+++ b/kde-base/krdc/krdc-3.4.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/kde-base/krdc/krdc-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) cient"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="rdesktop slp"
 DEPEND=">=dev-libs/openssl-0.9.6b
 	slp? ( net-libs/openslp )"
diff --git a/kde-base/krdc/krdc-3.5.0.ebuild b/kde-base/krdc/krdc-3.5.0.ebuild
index d1c3a62543b1..5e0923b5f6fa 100644
--- a/kde-base/krdc/krdc-3.5.0.ebuild
+++ b/kde-base/krdc/krdc-3.5.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/kde-base/krdc/krdc-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/krdc/krdc-3.5.0_beta2.ebuild b/kde-base/krdc/krdc-3.5.0_beta2.ebuild
index 1e749d8f6768..a8f759ccf8c7 100644
--- a/kde-base/krdc/krdc-3.5.0_beta2.ebuild
+++ b/kde-base/krdc/krdc-3.5.0_beta2.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/kde-base/krdc/krdc-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) cient"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="rdesktop slp"
 DEPEND=">=dev-libs/openssl-0.9.6b
 	slp? ( net-libs/openslp )"
diff --git a/kde-base/krdc/krdc-3.5.0_rc1.ebuild b/kde-base/krdc/krdc-3.5.0_rc1.ebuild
index 5922dce91329..435954725617 100644
--- a/kde-base/krdc/krdc-3.5.0_rc1.ebuild
+++ b/kde-base/krdc/krdc-3.5.0_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/kde-base/krdc/krdc-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/krdc/krdc-3.5_beta1.ebuild b/kde-base/krdc/krdc-3.5_beta1.ebuild
index 42bde10f00e2..f5e3cb79cb6b 100644
--- a/kde-base/krdc/krdc-3.5_beta1.ebuild
+++ b/kde-base/krdc/krdc-3.5_beta1.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/kde-base/krdc/krdc-3.5_beta1.ebuild,v 1.1 2005/09/22 20:13:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krdc/krdc-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE remote desktop connection (RDP and VNC) cient"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="rdesktop slp"
 DEPEND=">=dev-libs/openssl-0.9.6b
 	slp? ( net-libs/openslp )"
diff --git a/kde-base/krdc/metadata.xml b/kde-base/krdc/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/krdc/metadata.xml
+++ b/kde-base/krdc/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kreadconfig/ChangeLog b/kde-base/kreadconfig/ChangeLog
index 5c4d56ded2d2..eae9014944f5 100644
--- a/kde-base/kreadconfig/ChangeLog
+++ b/kde-base/kreadconfig/ChangeLog
@@ -1,6 +1,82 @@
 # ChangeLog for kde-base/kreadconfig
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/ChangeLog,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
+
+*kreadconfig-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kreadconfig-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kreadconfig-3.5_beta1.ebuild:
+  Keyword ~ppc
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  kreadconfig-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kreadconfig-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kreadconfig-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kreadconfig-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kreadconfig-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kreadconfig-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kreadconfig-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kreadconfig-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kreadconfig-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kreadconfig-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kreadconfig-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kreadconfig-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kreadconfig-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kreadconfig-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kreadconfig-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kreadconfig-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kreadconfig-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kreadconfig-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kreadconfig-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kreadconfig-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kreadconfig-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kreadconfig/Manifest b/kde-base/kreadconfig/Manifest
index 73e48127def1..013b87abe8ff 100644
--- a/kde-base/kreadconfig/Manifest
+++ b/kde-base/kreadconfig/Manifest
@@ -1,4 +1,8 @@
-MD5 b88a9673d388acbc2ce5efc802874cf2 kreadconfig-3.4.0_beta1.ebuild 395
-MD5 b88a9673d388acbc2ce5efc802874cf2 kreadconfig-3.4.0_alpha1.ebuild 395
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kreadconfig-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kreadconfig-3.4.0_alpha1 69
+MD5 fbfd092a740697eecf528cb58fb197dd ChangeLog 2903
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kreadconfig-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kreadconfig-3.5.0 68
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kreadconfig-3.5_beta1 69
+MD5 5e2deb4e6f1ad7ea0ac70b04e05a7a74 kreadconfig-3.4.1.ebuild 436
+MD5 89f8fac76738dcec63e20a8d676ebc8b kreadconfig-3.5.0.ebuild 418
+MD5 18e1f72acd1f901943b8f108921f796e kreadconfig-3.5_beta1.ebuild 428
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kreadconfig/files/digest-kreadconfig-3.4.1 b/kde-base/kreadconfig/files/digest-kreadconfig-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kreadconfig/files/digest-kreadconfig-3.4.1
+++ b/kde-base/kreadconfig/files/digest-kreadconfig-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kreadconfig/kreadconfig-3.4.1.ebuild b/kde-base/kreadconfig/kreadconfig-3.4.1.ebuild
index 8b6d93ba7b67..a7abd3b7ef56 100644
--- a/kde-base/kreadconfig/kreadconfig-3.4.1.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Read KConfig entries - for use in shell scripts"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kreadconfig/kreadconfig-3.5.0.ebuild b/kde-base/kreadconfig/kreadconfig-3.5.0.ebuild
index 6108d2a974d9..d80ce9fd2ccf 100644
--- a/kde-base/kreadconfig/kreadconfig-3.5.0.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-3.5.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/kde-base/kreadconfig/kreadconfig-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kreadconfig/kreadconfig-3.5_beta1.ebuild b/kde-base/kreadconfig/kreadconfig-3.5_beta1.ebuild
index ad1b83a0ad8a..02643cdbb585 100644
--- a/kde-base/kreadconfig/kreadconfig-3.5_beta1.ebuild
+++ b/kde-base/kreadconfig/kreadconfig-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-3.5_beta1.ebuild,v 1.1 2005/09/22 20:14:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreadconfig/kreadconfig-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Read KConfig entries - for use in shell scripts"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kreadconfig/metadata.xml b/kde-base/kreadconfig/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kreadconfig/metadata.xml
+++ b/kde-base/kreadconfig/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/krec/ChangeLog b/kde-base/krec/ChangeLog
index 78a82b0794e4..e16e2635c687 100644
--- a/kde-base/krec/ChangeLog
+++ b/kde-base/krec/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/krec
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/ChangeLog,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> krec-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> krec-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> krec-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*krec-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +krec-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*krec-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +krec-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> krec-3.5_beta1.ebuild,
+  krec-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*krec-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +krec-3.5.0_beta2.ebuild:
+  New version.
+
+*krec-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +krec-3.4.3.ebuild:
+  New version.
+
+  27 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> krec-3.5_beta1.ebuild:
+  Fix compilation error (#107163).
+
+  25 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> krec-3.5_beta1.ebuild:
+  Compile arts/gui as that seems to be needed as per bug #107163.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -krec-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*krec-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +krec-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*krec-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +krec-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> krec-3.4.2.ebuild:
+  ~alpha keyword.
+
+*krec-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +krec-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> krec-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> krec-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> krec-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  26 May 2005; Gregorio Guidi <greg_g@gentoo.org> krec-3.4.1.ebuild:
+  Change flag 'oggvorbis' into 'vorbis' (#89592).
+
+*krec-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +krec-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> krec-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> krec-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> krec-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> krec-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> krec-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*krec-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +krec-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *krec-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/krec/Manifest b/kde-base/krec/Manifest
index ec293a7e1f2b..1726f527bc98 100644
--- a/kde-base/krec/Manifest
+++ b/kde-base/krec/Manifest
@@ -1,4 +1,26 @@
-MD5 99e64930dae74e48de421729289fd5a1 krec-3.4.0_alpha1.ebuild 1036
-MD5 99e64930dae74e48de421729289fd5a1 krec-3.4.0_beta1.ebuild 1036
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-krec-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-krec-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 70f55868217ab748fa61fe421e48c92d ChangeLog 3762
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-krec-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-krec-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-krec-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-krec-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-krec-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-krec-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-krec-3.5_beta1 74
+MD5 3c4bdf7d457e879c9d19df3be0d0d0c3 krec-3.4.1.ebuild 1137
+MD5 d1bb5c295eb347f6d44fd764b2cb9069 krec-3.4.2.ebuild 1152
+MD5 8058eb68d6ce8ce8fd806439a0f66ec2 krec-3.4.3.ebuild 1148
+MD5 bcfa81cfc2449dda1835fe269072e076 krec-3.5.0.ebuild 880
+MD5 60cf84f9e4adb6f2176b7347dac680fc krec-3.5.0_beta2.ebuild 885
+MD5 3bc3e7d1b5f26373f6cd86166152fc4b krec-3.5.0_rc1.ebuild 884
+MD5 c9161be5b85ac5b5328424595380ac76 krec-3.5_beta1.ebuild 1013
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm2TntT9W3vfTuoRAmueAKCNJsJNp9rYTJrXmOA3n8PWl+JaCwCeO/Dl
+oj1rkuXKfUq6YbMxem3APXM=
+=D82h
+-----END PGP SIGNATURE-----
diff --git a/kde-base/krec/files/digest-krec-3.4.1 b/kde-base/krec/files/digest-krec-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/krec/files/digest-krec-3.4.1
+++ b/kde-base/krec/files/digest-krec-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/krec/files/digest-krec-3.4.2 b/kde-base/krec/files/digest-krec-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/krec/files/digest-krec-3.4.2
+++ b/kde-base/krec/files/digest-krec-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/krec/krec-3.4.1.ebuild b/kde-base/krec/krec-3.4.1.ebuild
index ce86e2be18ac..54c9be63c12c 100644
--- a/kde-base/krec/krec-3.4.1.ebuild
+++ b/kde-base/krec/krec-3.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/kde-base/krec/krec-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,14 +8,14 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE sound recorder"
-KEYWORDS="~x86 ~amd64"
-IUSE="oggvorbis encode"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="vorbis encode"
 OLDDEPEND="
 	~kde-base/kdemultimedia-arts-$PV
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	encode? ( media-sound/lame )"
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	encode? ( media-sound/lame )"
 
 KMCOPYLIB="libartsgui_kde arts/gui/kde/
@@ -32,7 +32,7 @@ pkg_setup() {
 }
 
 src_compile() {
-	use oggvorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis"
+	use vorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis"
 	use encode && myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
 	kde-meta_src_compile
-}
\ No newline at end of file
+}
diff --git a/kde-base/krec/krec-3.4.2.ebuild b/kde-base/krec/krec-3.4.2.ebuild
index 7c6c77fce7c0..cb2267381c4c 100644
--- a/kde-base/krec/krec-3.4.2.ebuild
+++ b/kde-base/krec/krec-3.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/kde-base/krec/krec-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE sound recorder"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="vorbis encode"
 OLDDEPEND="
 	~kde-base/kdemultimedia-arts-$PV
diff --git a/kde-base/krec/krec-3.4.3.ebuild b/kde-base/krec/krec-3.4.3.ebuild
index 0145f041f9a7..aae90374d6e0 100644
--- a/kde-base/krec/krec-3.4.3.ebuild
+++ b/kde-base/krec/krec-3.4.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/kde-base/krec/krec-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE sound recorder"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="vorbis encode"
 OLDDEPEND="
 	~kde-base/kdemultimedia-arts-$PV
diff --git a/kde-base/krec/krec-3.5.0.ebuild b/kde-base/krec/krec-3.5.0.ebuild
index 0d95170f16a7..6f3b1ad57f6b 100644
--- a/kde-base/krec/krec-3.5.0.ebuild
+++ b/kde-base/krec/krec-3.5.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/kde-base/krec/krec-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/krec/krec-3.5.0_beta2.ebuild b/kde-base/krec/krec-3.5.0_beta2.ebuild
index 4ae7604c0d07..25021eb0b56a 100644
--- a/kde-base/krec/krec-3.5.0_beta2.ebuild
+++ b/kde-base/krec/krec-3.5.0_beta2.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/kde-base/krec/krec-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE sound recorder"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="encode mp3 vorbis"
 
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
diff --git a/kde-base/krec/krec-3.5.0_rc1.ebuild b/kde-base/krec/krec-3.5.0_rc1.ebuild
index c8157bba4a4d..c4b54da990f9 100644
--- a/kde-base/krec/krec-3.5.0_rc1.ebuild
+++ b/kde-base/krec/krec-3.5.0_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/kde-base/krec/krec-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:32 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/krec/krec-3.5_beta1.ebuild b/kde-base/krec/krec-3.5_beta1.ebuild
index f2e60701599e..cb6880278f8b 100644
--- a/kde-base/krec/krec-3.5_beta1.ebuild
+++ b/kde-base/krec/krec-3.5_beta1.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/kde-base/krec/krec-3.5_beta1.ebuild,v 1.1 2005/09/22 20:15:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krec/krec-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:33 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,21 +8,18 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE sound recorder"
-KEYWORDS="~amd64"
-IUSE="vorbis encode"
+KEYWORDS="~amd64 ~x86"
+IUSE="encode mp3 vorbis"
 OLDDEPEND="
 	~kde-base/kdemultimedia-arts-$PV
-	vorbis? ( media-libs/libvorbis )
-	encode? ( media-sound/lame )"
+	encode? ( mp3? ( media-sound/lame )
+	          vorbis? ( media-libs/libvorbis ) )"
+
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
-	vorbis? ( media-libs/libvorbis )
-	encode? ( media-sound/lame )"
+	encode? ( mp3? ( media-sound/lame )
+	          vorbis? ( media-libs/libvorbis ) )"
 
-KMCOPYLIB="libartsgui_kde arts/gui/kde/
-	libartscontrolsupport arts/tools/"
-KMEXTRACTONLY="
-	arts/
-	kioslave/audiocd/configure.in.in"
+KMCOMPILEONLY="arts"
 
 pkg_setup() {
 	if ! useq arts; then
@@ -32,7 +29,11 @@ pkg_setup() {
 }
 
 src_compile() {
-	use vorbis && myconf="$myconf --with-vorbis=/usr" || myconf="$myconf --without-vorbis"
-	use encode && myconf="$myconf --with-lame=/usr" || myconf="$myconf --without-lame"
+	if use encode; then
+		myconf="$(use_with mp3 lame) $(use_with vorbis)"
+	else
+		myconf="--without-lame --without-vorbis"
+	fi
+
 	kde-meta_src_compile
 }
diff --git a/kde-base/krec/metadata.xml b/kde-base/krec/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/krec/metadata.xml
+++ b/kde-base/krec/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kregexpeditor/ChangeLog b/kde-base/kregexpeditor/ChangeLog
index a67ee513965e..7f054deaa086 100644
--- a/kde-base/kregexpeditor/ChangeLog
+++ b/kde-base/kregexpeditor/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/kregexpeditor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/ChangeLog,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kregexpeditor-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kregexpeditor-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kregexpeditor-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kregexpeditor-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kregexpeditor-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kregexpeditor-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kregexpeditor-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kregexpeditor-3.5_beta1.ebuild, kregexpeditor-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kregexpeditor-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kregexpeditor-3.5.0_beta2.ebuild:
+  New version.
+
+*kregexpeditor-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kregexpeditor-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kregexpeditor-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kregexpeditor-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kregexpeditor-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kregexpeditor-3.4.1-r1 (20 Sep 2005)
+
+  20 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +kregexpeditor-3.4.1-r1.ebuild, kregexpeditor-3.5_alpha1.ebuild:
+  Add missing documentation (#105071).
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kregexpeditor-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kregexpeditor-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kregexpeditor-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kregexpeditor-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kregexpeditor-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kregexpeditor-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kregexpeditor-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kregexpeditor-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kregexpeditor-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kregexpeditor-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kregexpeditor-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kregexpeditor-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kregexpeditor-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kregexpeditor-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kregexpeditor-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kregexpeditor-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kregexpeditor-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kregexpeditor/Manifest b/kde-base/kregexpeditor/Manifest
index 217fc2a024f5..8de23c8dd33f 100644
--- a/kde-base/kregexpeditor/Manifest
+++ b/kde-base/kregexpeditor/Manifest
@@ -1,4 +1,26 @@
-MD5 84bb12648bf791bde2052e5b6c372c01 kregexpeditor-3.4.0_alpha1.ebuild 279
-MD5 84bb12648bf791bde2052e5b6c372c01 kregexpeditor-3.4.0_beta1.ebuild 279
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kregexpeditor-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kregexpeditor-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cb042923d3682cf5f4c7378cab609db0 ChangeLog 3835
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kregexpeditor-3.4.1 212
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kregexpeditor-3.4.1-r1 212
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kregexpeditor-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kregexpeditor-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-kregexpeditor-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-kregexpeditor-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kregexpeditor-3.5_beta1 69
+MD5 0d2726deffd1ecb49751c7fe4f21a194 kregexpeditor-3.4.1-r1.ebuild 451
+MD5 423ef3625e90b6424ac0043842ee8e7c kregexpeditor-3.4.1.ebuild 421
+MD5 c54dce37a6eb9d432a5827313ae96610 kregexpeditor-3.4.3.ebuild 448
+MD5 e31a049651e453516fe37b506498e695 kregexpeditor-3.5.0.ebuild 428
+MD5 4610b9250268ba5edb2359fc5bf04ca1 kregexpeditor-3.5.0_beta2.ebuild 433
+MD5 f1f482a8115c67708c4d5658e52a9d6a kregexpeditor-3.5.0_rc1.ebuild 432
+MD5 c9e5816d375325c966ef98d7c2cd0ad2 kregexpeditor-3.5_beta1.ebuild 431
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv1/ntT9W3vfTuoRAtFSAJsFPbKsbYfnUFVytGr5m51tot2g1ACfV1hP
+lcnw0hr6wKfIltOEbfPufmg=
+=8ky4
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kregexpeditor/files/digest-kregexpeditor-3.4.1 b/kde-base/kregexpeditor/files/digest-kregexpeditor-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kregexpeditor/files/digest-kregexpeditor-3.4.1
+++ b/kde-base/kregexpeditor/files/digest-kregexpeditor-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.4.1-r1.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.4.1-r1.ebuild
index 604ac1f64f63..931b52b540b4 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.4.1-r1.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.4.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/kde-base/kregexpeditor/kregexpeditor-3.4.1-r1.ebuild,v 1.1 2005/09/20 10:19:15 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=3.4.2
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.4.1.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.4.1.ebuild
index 42aa529b476a..0246fa617735 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.4.1.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.4.1.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/kde-base/kregexpeditor/kregexpeditor-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Editor for Regular Expressions"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.4.3.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.4.3.ebuild
index d8799ea28039..56a3f10865a9 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.4.3.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.4.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/kde-base/kregexpeditor/kregexpeditor-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Editor for Regular Expressions"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 KMEXTRA="doc/KRegExpEditor"
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.5.0.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.5.0.ebuild
index 0c978c8b83b0..08642d801061 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.5.0.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.5.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/kde-base/kregexpeditor/kregexpeditor-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.5.0_beta2.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.5.0_beta2.ebuild
index d7ba8373ba24..2994c7cce08b 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.5.0_beta2.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.5.0_beta2.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/kde-base/kregexpeditor/kregexpeditor-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Editor for Regular Expressions"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="doc/KRegExpEditor"
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.5.0_rc1.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.5.0_rc1.ebuild
index c7db289b9976..3b6d2e8b2774 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.5.0_rc1.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.5.0_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/kde-base/kregexpeditor/kregexpeditor-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/kregexpeditor/kregexpeditor-3.5_beta1.ebuild b/kde-base/kregexpeditor/kregexpeditor-3.5_beta1.ebuild
index 9347872fb330..9d06b46b687c 100644
--- a/kde-base/kregexpeditor/kregexpeditor-3.5_beta1.ebuild
+++ b/kde-base/kregexpeditor/kregexpeditor-3.5_beta1.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/kde-base/kregexpeditor/kregexpeditor-3.5_beta1.ebuild,v 1.1 2005/09/22 20:16:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kregexpeditor/kregexpeditor-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Editor for Regular Expressions"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 KMEXTRA="doc/KRegExpEditor"
diff --git a/kde-base/kregexpeditor/metadata.xml b/kde-base/kregexpeditor/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kregexpeditor/metadata.xml
+++ b/kde-base/kregexpeditor/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kreversi/ChangeLog b/kde-base/kreversi/ChangeLog
index 3fc972882b5c..21c24bc1efa9 100644
--- a/kde-base/kreversi/ChangeLog
+++ b/kde-base/kreversi/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kreversi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/ChangeLog,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kreversi-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kreversi-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kreversi-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kreversi-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kreversi-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kreversi-3.5_beta1.ebuild,
+  kreversi-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kreversi-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.5.0_beta2.ebuild:
+  New version.
+
+*kreversi-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kreversi-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kreversi-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kreversi-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kreversi-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kreversi-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kreversi-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kreversi-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kreversi-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kreversi-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kreversi-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kreversi-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kreversi-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kreversi-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kreversi-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kreversi-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kreversi-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kreversi-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kreversi-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kreversi-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kreversi-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kreversi/Manifest b/kde-base/kreversi/Manifest
index c42aff52be7b..d69af55a528a 100644
--- a/kde-base/kreversi/Manifest
+++ b/kde-base/kreversi/Manifest
@@ -1,4 +1,26 @@
-MD5 cdf08d94aecda81ee547c04f84862746 kreversi-3.4.0_alpha1.ebuild 408
-MD5 cdf08d94aecda81ee547c04f84862746 kreversi-3.4.0_beta1.ebuild 408
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kreversi-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kreversi-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e1b2b2bdeb4a90853d13a127f2f807b6 ChangeLog 3579
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kreversi-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kreversi-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kreversi-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kreversi-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kreversi-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kreversi-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kreversi-3.5_beta1 70
+MD5 38b3bb8f867a9907672a330907ccbe1d kreversi-3.4.1.ebuild 529
+MD5 82a506874554ca02c995a416c2f9eb20 kreversi-3.4.2.ebuild 542
+MD5 79c1afe121d13ebb5191d6d01d356f6b kreversi-3.4.3.ebuild 538
+MD5 50744539257418bd1665f066178d8e5d kreversi-3.5.0.ebuild 481
+MD5 078891b011d4fe1972de411ff9386560 kreversi-3.5.0_beta2.ebuild 486
+MD5 4eb018946be395af240d6375e6ccc950 kreversi-3.5.0_rc1.ebuild 485
+MD5 21a4065eddd28ad31f05c5f37eb62a98 kreversi-3.5_beta1.ebuild 521
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmBHntT9W3vfTuoRAmJVAJ9UYw9luBr/4T9ELnHXnBJ2QEq4LQCeIwBT
+ldsZIAI2I93nmt2t+RukBtU=
+=1Nxw
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kreversi/files/digest-kreversi-3.4.1 b/kde-base/kreversi/files/digest-kreversi-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kreversi/files/digest-kreversi-3.4.1
+++ b/kde-base/kreversi/files/digest-kreversi-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kreversi/files/digest-kreversi-3.4.2 b/kde-base/kreversi/files/digest-kreversi-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kreversi/files/digest-kreversi-3.4.2
+++ b/kde-base/kreversi/files/digest-kreversi-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kreversi/kreversi-3.4.1.ebuild b/kde-base/kreversi/kreversi-3.4.1.ebuild
index 2016e87da7e8..be7c461174f5 100644
--- a/kde-base/kreversi/kreversi-3.4.1.ebuild
+++ b/kde-base/kreversi/kreversi-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kreversi/kreversi-3.4.2.ebuild b/kde-base/kreversi/kreversi-3.4.2.ebuild
index 83ef1311753e..72731d25c836 100644
--- a/kde-base/kreversi/kreversi-3.4.2.ebuild
+++ b/kde-base/kreversi/kreversi-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kreversi/kreversi-3.4.3.ebuild b/kde-base/kreversi/kreversi-3.4.3.ebuild
index a1be1eb7d8c8..dae317bcf860 100644
--- a/kde-base/kreversi/kreversi-3.4.3.ebuild
+++ b/kde-base/kreversi/kreversi-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.4.3.ebuild,v 1.1 2005/10/13 00:10:04 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kreversi/kreversi-3.5.0.ebuild b/kde-base/kreversi/kreversi-3.5.0.ebuild
index c4660f41ee90..e114043be3c8 100644
--- a/kde-base/kreversi/kreversi-3.5.0.ebuild
+++ b/kde-base/kreversi/kreversi-3.5.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/kde-base/kreversi/kreversi-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kreversi/kreversi-3.5.0_beta2.ebuild b/kde-base/kreversi/kreversi-3.5.0_beta2.ebuild
index 93b1628f828c..702585a7b1eb 100644
--- a/kde-base/kreversi/kreversi-3.5.0_beta2.ebuild
+++ b/kde-base/kreversi/kreversi-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kreversi/kreversi-3.5.0_rc1.ebuild b/kde-base/kreversi/kreversi-3.5.0_rc1.ebuild
index 990109a405cc..a4c08d9f3611 100644
--- a/kde-base/kreversi/kreversi-3.5.0_rc1.ebuild
+++ b/kde-base/kreversi/kreversi-3.5.0_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/kde-base/kreversi/kreversi-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kreversi/kreversi-3.5_beta1.ebuild b/kde-base/kreversi/kreversi-3.5_beta1.ebuild
index da67b713aa1b..0b5c53a3a71b 100644
--- a/kde-base/kreversi/kreversi-3.5_beta1.ebuild
+++ b/kde-base/kreversi/kreversi-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.5_beta1.ebuild,v 1.1 2005/09/22 20:17:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kreversi/kreversi-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Board Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kreversi/metadata.xml b/kde-base/kreversi/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kreversi/metadata.xml
+++ b/kde-base/kreversi/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog
index a2f4a76e8ffd..03db461ab8a8 100644
--- a/kde-base/krfb/ChangeLog
+++ b/kde-base/krfb/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/krfb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> krfb-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> krfb-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> krfb-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*krfb-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*krfb-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> krfb-3.5_beta1.ebuild,
+  krfb-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*krfb-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.5.0_beta2.ebuild:
+  New version.
+
+*krfb-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -krfb-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*krfb-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +krfb-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*krfb-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +krfb-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> krfb-3.4.2.ebuild:
+  ~alpha keyword.
+
+*krfb-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> krfb-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> krfb-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> krfb-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*krfb-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> krfb-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> krfb-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> krfb-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> krfb-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*krfb-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> krfb-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*krfb-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +krfb-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *krfb-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/krfb/Manifest b/kde-base/krfb/Manifest
index 1bcdd27a25a1..04b2302881fd 100644
--- a/kde-base/krfb/Manifest
+++ b/kde-base/krfb/Manifest
@@ -1,4 +1,26 @@
-MD5 5bdd8e275ec57d63c7ecfd8d023b74e1 krfb-3.4.0_beta1.ebuild 402
-MD5 5bdd8e275ec57d63c7ecfd8d023b74e1 krfb-3.4.0_alpha1.ebuild 402
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-krfb-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-krfb-3.4.0_beta1 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b3a3a201e51a328e9c034603b8a4dd5d ChangeLog 3425
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-krfb-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-krfb-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-krfb-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-krfb-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-krfb-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-krfb-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-krfb-3.5_beta1 71
+MD5 93d80d3629660ba4ee9ded624f23e937 krfb-3.4.1.ebuild 515
+MD5 bd811de4bbf079f0ea66e861e800af91 krfb-3.4.2.ebuild 528
+MD5 ef751e0d4864338b03f21dc30a60f14a krfb-3.4.3.ebuild 525
+MD5 49db04d781cb0b33bdaaed7cc0dd59f5 krfb-3.5.0.ebuild 504
+MD5 0ff2dae4a167fc7258cfbefaeac1f66b krfb-3.5.0_beta2.ebuild 509
+MD5 8055f7466eefc6ff854940c47605cd6a krfb-3.5.0_rc1.ebuild 508
+MD5 5cd04ee50b7dc0a85e302eadb98f4f24 krfb-3.5_beta1.ebuild 507
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuUgntT9W3vfTuoRAoPWAJ94wX3D3ethGWSo6TU1u9UOYAGVPQCfU0RS
+iuP0ax1AqQxyz5w4t/N1uV4=
+=nrfb
+-----END PGP SIGNATURE-----
diff --git a/kde-base/krfb/files/digest-krfb-3.4.1 b/kde-base/krfb/files/digest-krfb-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/krfb/files/digest-krfb-3.4.1
+++ b/kde-base/krfb/files/digest-krfb-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/krfb/files/digest-krfb-3.4.2 b/kde-base/krfb/files/digest-krfb-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/krfb/files/digest-krfb-3.4.2
+++ b/kde-base/krfb/files/digest-krfb-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/krfb/krfb-3.4.1.ebuild b/kde-base/krfb/krfb-3.4.1.ebuild
index 89fd8c4e8668..87ceaf119cc0 100644
--- a/kde-base/krfb/krfb-3.4.1.ebuild
+++ b/kde-base/krfb/krfb-3.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/kde-base/krfb/krfb-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="slp"
 DEPEND="slp? ( net-libs/openslp )"
 
diff --git a/kde-base/krfb/krfb-3.4.2.ebuild b/kde-base/krfb/krfb-3.4.2.ebuild
index 1136c0f2ce03..88727d343e72 100644
--- a/kde-base/krfb/krfb-3.4.2.ebuild
+++ b/kde-base/krfb/krfb-3.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/kde-base/krfb/krfb-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="slp"
 DEPEND="slp? ( net-libs/openslp )"
 
diff --git a/kde-base/krfb/krfb-3.4.3.ebuild b/kde-base/krfb/krfb-3.4.3.ebuild
index 3dd18d6fd91b..3ee39856e6f1 100644
--- a/kde-base/krfb/krfb-3.4.3.ebuild
+++ b/kde-base/krfb/krfb-3.4.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/kde-base/krfb/krfb-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,11 +8,11 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="slp"
 DEPEND="slp? ( net-libs/openslp )"
 
 src_compile() {
 	myconf="$myconf `use_enable slp`"
 	kde-meta_src_compile
-}
\ No newline at end of file
+}
diff --git a/kde-base/krfb/krfb-3.5.0.ebuild b/kde-base/krfb/krfb-3.5.0.ebuild
index 44e92ba511c7..e6c41a11a0d3 100644
--- a/kde-base/krfb/krfb-3.5.0.ebuild
+++ b/kde-base/krfb/krfb-3.5.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/kde-base/krfb/krfb-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/krfb/krfb-3.5.0_beta2.ebuild b/kde-base/krfb/krfb-3.5.0_beta2.ebuild
index 56a38763b60d..38f377d7f515 100644
--- a/kde-base/krfb/krfb-3.5.0_beta2.ebuild
+++ b/kde-base/krfb/krfb-3.5.0_beta2.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/kde-base/krfb/krfb-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="slp"
 DEPEND="slp? ( net-libs/openslp )"
 
diff --git a/kde-base/krfb/krfb-3.5.0_rc1.ebuild b/kde-base/krfb/krfb-3.5.0_rc1.ebuild
index 0282d237babd..64c5f370869d 100644
--- a/kde-base/krfb/krfb-3.5.0_rc1.ebuild
+++ b/kde-base/krfb/krfb-3.5.0_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/kde-base/krfb/krfb-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/krfb/krfb-3.5_beta1.ebuild b/kde-base/krfb/krfb-3.5_beta1.ebuild
index e63be18ba227..3de5d6ed4f38 100644
--- a/kde-base/krfb/krfb-3.5_beta1.ebuild
+++ b/kde-base/krfb/krfb-3.5_beta1.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/kde-base/krfb/krfb-3.5_beta1.ebuild,v 1.1 2005/09/22 20:18:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="VNC-compatible server to share KDE desktops"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="slp"
 DEPEND="slp? ( net-libs/openslp )"
 
diff --git a/kde-base/krfb/metadata.xml b/kde-base/krfb/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/krfb/metadata.xml
+++ b/kde-base/krfb/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kruler/ChangeLog b/kde-base/kruler/ChangeLog
index af7088b03dce..ea57b7b5d4af 100644
--- a/kde-base/kruler/ChangeLog
+++ b/kde-base/kruler/ChangeLog
@@ -1,6 +1,99 @@
 # ChangeLog for kde-base/kruler
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/ChangeLog,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kruler-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kruler-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kruler-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kruler-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kruler-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kruler-3.5_beta1.ebuild,
+  kruler-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kruler-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kruler-3.5.0_beta2.ebuild:
+  New version.
+
+*kruler-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kruler-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kruler-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kruler-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kruler-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kruler-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kruler-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kruler-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kruler-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kruler-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kruler-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kruler-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kruler-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kruler-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kruler-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kruler-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kruler-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kruler-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kruler-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kruler-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kruler-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kruler-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kruler-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kruler/Manifest b/kde-base/kruler/Manifest
index 3de777e35675..db076e327af3 100644
--- a/kde-base/kruler/Manifest
+++ b/kde-base/kruler/Manifest
@@ -1,4 +1,22 @@
-MD5 34dbacbd2065f721c3e3557a0e89f967 kruler-3.4.0_beta1.ebuild 290
-MD5 34dbacbd2065f721c3e3557a0e89f967 kruler-3.4.0_alpha1.ebuild 290
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kruler-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kruler-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8768df213ea3ec41bf8ed37d6911b75d ChangeLog 3337
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kruler-3.4.1 221
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kruler-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kruler-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kruler-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kruler-3.5_beta1 72
+MD5 a6188fc7a1e097ae44320a5bf7be2366 kruler-3.4.1.ebuild 418
+MD5 4359901206018b8b8b3661a8efe66312 kruler-3.4.3.ebuild 417
+MD5 046bdff18c007a96c2a5684f1b9cef50 kruler-3.5.0.ebuild 396
+MD5 af22f6b4403245a5c09286d345ec5815 kruler-3.5.0_beta2.ebuild 408
+MD5 e37aab005ce26a114274cf6b056779a8 kruler-3.5_beta1.ebuild 399
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmi6ntT9W3vfTuoRAriKAJ9pF0fpBIYBAOcR3+iR0IqsJQMOGgCfc6mh
+K1KepuJ6wkt/Q9wDSPHxgsQ=
+=dOOE
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kruler/files/digest-kruler-3.4.1 b/kde-base/kruler/files/digest-kruler-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kruler/files/digest-kruler-3.4.1
+++ b/kde-base/kruler/files/digest-kruler-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kruler/kruler-3.4.1.ebuild b/kde-base/kruler/kruler-3.4.1.ebuild
index 0151cddb432a..9822333ddf30 100644
--- a/kde-base/kruler/kruler-3.4.1.ebuild
+++ b/kde-base/kruler/kruler-3.4.1.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/kde-base/kruler/kruler-3.4.1.ebuild,v 1.1 2005/05/25 21:23:10 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A screen ruler for the K Desktop Environment"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kruler/kruler-3.4.3.ebuild b/kde-base/kruler/kruler-3.4.3.ebuild
index 8a62aa03d139..3f99b1fdac4f 100644
--- a/kde-base/kruler/kruler-3.4.3.ebuild
+++ b/kde-base/kruler/kruler-3.4.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/kde-base/kruler/kruler-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A screen ruler for the K Desktop Environment"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kruler/kruler-3.5.0.ebuild b/kde-base/kruler/kruler-3.5.0.ebuild
index 65c7845f94c2..50d697446c2e 100644
--- a/kde-base/kruler/kruler-3.5.0.ebuild
+++ b/kde-base/kruler/kruler-3.5.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/kde-base/kruler/kruler-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kruler/kruler-3.5.0_beta2.ebuild b/kde-base/kruler/kruler-3.5.0_beta2.ebuild
index 91379edfb97e..66bfd0a4f281 100644
--- a/kde-base/kruler/kruler-3.5.0_beta2.ebuild
+++ b/kde-base/kruler/kruler-3.5.0_beta2.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/kde-base/kruler/kruler-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A screen ruler for the K Desktop Environment"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kruler/kruler-3.5_beta1.ebuild b/kde-base/kruler/kruler-3.5_beta1.ebuild
index d60bffe04014..a2da4fb54cbb 100644
--- a/kde-base/kruler/kruler-3.5_beta1.ebuild
+++ b/kde-base/kruler/kruler-3.5_beta1.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/kde-base/kruler/kruler-3.5_beta1.ebuild,v 1.1 2005/09/22 20:19:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kruler/kruler-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A screen ruler for the K Desktop Environment"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kruler/metadata.xml b/kde-base/kruler/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kruler/metadata.xml
+++ b/kde-base/kruler/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksame/ChangeLog b/kde-base/ksame/ChangeLog
index 8357a4e8480b..027fef4365c1 100644
--- a/kde-base/ksame/ChangeLog
+++ b/kde-base/ksame/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ksame
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ChangeLog,v 1.1 2005/01/15 02:24:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ChangeLog,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksame-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksame-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksame-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksame-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksame-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksame-3.5_beta1.ebuild,
+  ksame-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksame-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.5.0_beta2.ebuild:
+  New version.
+
+*ksame-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksame-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksame-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksame-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksame-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksame-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksame-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksame-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksame-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksame-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksame-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksame-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksame-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksame-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksame-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksame-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksame-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksame-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksame-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksame-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksame-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksame/Manifest b/kde-base/ksame/Manifest
index bbe4bdee3f1f..cce876d23ee7 100644
--- a/kde-base/ksame/Manifest
+++ b/kde-base/ksame/Manifest
@@ -1,4 +1,26 @@
-MD5 370711c82ab061278e4bdceaf10b0c79 ksame-3.4.0_beta1.ebuild 463
-MD5 370711c82ab061278e4bdceaf10b0c79 ksame-3.4.0_alpha1.ebuild 463
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ksame-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ksame-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a3698a5e48063624d33732ff9876d6b4 ChangeLog 3488
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ksame-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ksame-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ksame-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ksame-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ksame-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ksame-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ksame-3.5_beta1 70
+MD5 4982caa8d215131333ab264686458f37 ksame-3.4.1.ebuild 578
+MD5 71e76be79360b017968532622926d874 ksame-3.4.2.ebuild 591
+MD5 4b22b63de9256e59c73b1555f1c966cd ksame-3.4.3.ebuild 587
+MD5 ca8a24d16c92306e4627503683d19a89 ksame-3.5.0.ebuild 530
+MD5 44d77be5dfb1015cd658997f1a70adb3 ksame-3.5.0_beta2.ebuild 535
+MD5 33722548da74fc7a1fd174dfc36c521f ksame-3.5.0_rc1.ebuild 534
+MD5 8eabdab2e3d16aec0b62a173c4532a24 ksame-3.5_beta1.ebuild 570
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmCJntT9W3vfTuoRArgCAJsHiSPjR1KNoRhYxXz20h3kAcYr8ACeMABA
+pGYXRfN8JQK7XivS7aazg9E=
+=pKYR
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksame/files/digest-ksame-3.4.1 b/kde-base/ksame/files/digest-ksame-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ksame/files/digest-ksame-3.4.1
+++ b/kde-base/ksame/files/digest-ksame-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ksame/files/digest-ksame-3.4.2 b/kde-base/ksame/files/digest-ksame-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ksame/files/digest-ksame-3.4.2
+++ b/kde-base/ksame/files/digest-ksame-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ksame/ksame-3.4.1.ebuild b/kde-base/ksame/ksame-3.4.1.ebuild
index 5317344b1dda..22f4fc821b72 100644
--- a/kde-base/ksame/ksame-3.4.1.ebuild
+++ b/kde-base/ksame/ksame-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksame/ksame-3.4.2.ebuild b/kde-base/ksame/ksame-3.4.2.ebuild
index 218d670fb7ee..9a1377527743 100644
--- a/kde-base/ksame/ksame-3.4.2.ebuild
+++ b/kde-base/ksame/ksame-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksame/ksame-3.4.3.ebuild b/kde-base/ksame/ksame-3.4.3.ebuild
index 6236c4c8e195..aef7658d0e62 100644
--- a/kde-base/ksame/ksame-3.4.3.ebuild
+++ b/kde-base/ksame/ksame-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksame/ksame-3.5.0.ebuild b/kde-base/ksame/ksame-3.5.0.ebuild
index 9b392994e379..f16b0bf2171d 100644
--- a/kde-base/ksame/ksame-3.5.0.ebuild
+++ b/kde-base/ksame/ksame-3.5.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/kde-base/ksame/ksame-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksame/ksame-3.5.0_beta2.ebuild b/kde-base/ksame/ksame-3.5.0_beta2.ebuild
index ca2da2da71a0..6d302e11b4ef 100644
--- a/kde-base/ksame/ksame-3.5.0_beta2.ebuild
+++ b/kde-base/ksame/ksame-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ksame/ksame-3.5.0_rc1.ebuild b/kde-base/ksame/ksame-3.5.0_rc1.ebuild
index 604c9817cf57..b3e85d3cdfc1 100644
--- a/kde-base/ksame/ksame-3.5.0_rc1.ebuild
+++ b/kde-base/ksame/ksame-3.5.0_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/kde-base/ksame/ksame-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksame/ksame-3.5_beta1.ebuild b/kde-base/ksame/ksame-3.5_beta1.ebuild
index b37dd6713f54..14639b9b8076 100644
--- a/kde-base/ksame/ksame-3.5_beta1.ebuild
+++ b/kde-base/ksame/ksame-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.5_beta1.ebuild,v 1.1 2005/09/22 20:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksame/ksame-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Same Game - a little game about balls and how to get rid of them"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksame/metadata.xml b/kde-base/ksame/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksame/metadata.xml
+++ b/kde-base/ksame/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksayit/ChangeLog b/kde-base/ksayit/ChangeLog
index 9b7e6e727bb7..613c95592692 100644
--- a/kde-base/ksayit/ChangeLog
+++ b/kde-base/ksayit/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/ksayit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.1 2005/01/21 19:05:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
+
+*ksayit-3.4.3-r1 (27 Nov 2005)
+
+  27 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/ksayit-3.4.3-pointer.patch, +ksayit-3.4.3-r1.ebuild:
+  Fixes glibc problems due to invalid pointers, closes bug 91004, thanks to
+  Chris White <chriswhite@gentoo.org>.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksayit-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksayit-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksayit-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksayit-3.5.0 (22 Nov 2005)
+
+  22 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksayit-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksayit-3.5_beta1.ebuild,
+  ksayit-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksayit-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.5.0_beta2.ebuild:
+  New version.
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> ksayit-3.4.3.ebuild:
+  Correct dep: there's no kdemultimedia-arts-3.4.2, the dep should accept
+  verion 3.4.1.
+
+*ksayit-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksayit-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksayit-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksayit-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksayit-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksayit-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksayit-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksayit-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksayit-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksayit-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksayit-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksayit-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksayit-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> ksayit-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksayit-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksayit-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  11 Feb 2005; Simone Gotti <motaboy@gentoo.org> ksayit-3.4.0_beta2.ebuild:
+  Adds a dep on kde-base/kdemultimedia-arts. Fixes bug #81465.
+
+*ksayit-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksayit-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksayit-3.4.0_beta1 (21 Jan 2005)
 
diff --git a/kde-base/ksayit/Manifest b/kde-base/ksayit/Manifest
index 644f7e460d90..883ec65bca33 100644
--- a/kde-base/ksayit/Manifest
+++ b/kde-base/ksayit/Manifest
@@ -1,3 +1,29 @@
-MD5 ec7810ab06e3426b61aed8503a5758d9 ksayit-3.4.0_beta1.ebuild 431
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 c5420b3dc1848daf59305d1f2ff74a83 files/digest-ksayit-3.4.0_beta1 240
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a4d68108e6ddc81b56e3dfd6caba1f8 ChangeLog 3826
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-ksayit-3.4.1 236
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-ksayit-3.4.2 320
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-ksayit-3.4.3 76
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-ksayit-3.4.3-r1 76
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-ksayit-3.5.0 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-ksayit-3.5.0_beta2 240
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-ksayit-3.5.0_rc1 332
+MD5 174790e90449897638084f6c4bea761f files/digest-ksayit-3.5_beta1 77
+MD5 f5bf9356477cd9c9feb666e6e94915b0 files/ksayit-3.4.3-pointer.patch 536
+MD5 0d3f3e556729870be5c9bde1c883173c ksayit-3.4.1.ebuild 584
+MD5 0bcc0b65d78e83c8636236b5fbf8dc2c ksayit-3.4.2.ebuild 599
+MD5 ad43393a5b4d0055c73ac9a7c3811ba9 ksayit-3.4.3-r1.ebuild 643
+MD5 f4be7b9ce16e5d2cb78e2063ef3fd6e0 ksayit-3.4.3.ebuild 597
+MD5 0bfa0e07a85e73de7482b643f18406de ksayit-3.5.0.ebuild 573
+MD5 8fcb68214a616029986c57a7ac8d8ca5 ksayit-3.5.0_beta2.ebuild 578
+MD5 7be5a04557ccf0e59a1a9221dc641f49 ksayit-3.5.0_rc1.ebuild 577
+MD5 30cbca4e951c409dae06ff518c4d8e70 ksayit-3.5_beta1.ebuild 576
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDijRCntT9W3vfTuoRAracAJ4q/7GEakzg+5+phJtHw3RJ/uFtQgCggP4X
+9GT5BwATLXkLw+hM/HijL3I=
+=8jZU
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksayit/files/digest-ksayit-3.4.1 b/kde-base/ksayit/files/digest-ksayit-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/ksayit/files/digest-ksayit-3.4.1
+++ b/kde-base/ksayit/files/digest-ksayit-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/ksayit/files/digest-ksayit-3.4.2 b/kde-base/ksayit/files/digest-ksayit-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/ksayit/files/digest-ksayit-3.4.2
+++ b/kde-base/ksayit/files/digest-ksayit-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/ksayit/ksayit-3.4.1.ebuild b/kde-base/ksayit/ksayit-3.4.1.ebuild
index c4e570ecab0e..74ba56143a96 100644
--- a/kde-base/ksayit/ksayit-3.4.1.ebuild
+++ b/kde-base/ksayit/ksayit-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KD text-to-speech frontend app"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
diff --git a/kde-base/ksayit/ksayit-3.4.2.ebuild b/kde-base/ksayit/ksayit-3.4.2.ebuild
index 9a7b5707c26e..d0335e5f3431 100644
--- a/kde-base/ksayit/ksayit-3.4.2.ebuild
+++ b/kde-base/ksayit/ksayit-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.2.ebuild,v 1.1 2005/07/28 21:16:21 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KD text-to-speech frontend app"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
diff --git a/kde-base/ksayit/ksayit-3.4.3-r1.ebuild b/kde-base/ksayit/ksayit-3.4.3-r1.ebuild
index d61ff3365dd8..6e4c855bb94f 100644
--- a/kde-base/ksayit/ksayit-3.4.3-r1.ebuild
+++ b/kde-base/ksayit/ksayit-3.4.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/kde-base/ksayit/ksayit-3.4.3-r1.ebuild,v 1.1 2005/11/27 22:33:19 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksayit/ksayit-3.4.3.ebuild b/kde-base/ksayit/ksayit-3.4.3.ebuild
index 78dae54e8920..6d50b2e6793d 100644
--- a/kde-base/ksayit/ksayit-3.4.3.ebuild
+++ b/kde-base/ksayit/ksayit-3.4.3.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KD text-to-speech frontend app"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
-	$(deprange-dual 3.4.2 $MAXKDEVER kde-base/kdemultimedia-arts)"
+	$(deprange-dual 3.4.1 $MAXKDEVER kde-base/kdemultimedia-arts)"
 myconf="--enable-ksayit-audio-plugins"
diff --git a/kde-base/ksayit/ksayit-3.5.0.ebuild b/kde-base/ksayit/ksayit-3.5.0.ebuild
index 30e006dd741c..821d3e84293b 100644
--- a/kde-base/ksayit/ksayit-3.5.0.ebuild
+++ b/kde-base/ksayit/ksayit-3.5.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/kde-base/ksayit/ksayit-3.5.0.ebuild,v 1.1 2005/11/22 22:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksayit/ksayit-3.5.0_beta2.ebuild b/kde-base/ksayit/ksayit-3.5.0_beta2.ebuild
index cfa6a142eba2..f2e9453b0c3d 100644
--- a/kde-base/ksayit/ksayit-3.5.0_beta2.ebuild
+++ b/kde-base/ksayit/ksayit-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KD text-to-speech frontend app"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
diff --git a/kde-base/ksayit/ksayit-3.5.0_rc1.ebuild b/kde-base/ksayit/ksayit-3.5.0_rc1.ebuild
index f80298a9273e..1af93e99b6f3 100644
--- a/kde-base/ksayit/ksayit-3.5.0_rc1.ebuild
+++ b/kde-base/ksayit/ksayit-3.5.0_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/kde-base/ksayit/ksayit-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksayit/ksayit-3.5_beta1.ebuild b/kde-base/ksayit/ksayit-3.5_beta1.ebuild
index 66981ab7b294..ac806ecd4bd4 100644
--- a/kde-base/ksayit/ksayit-3.5_beta1.ebuild
+++ b/kde-base/ksayit/ksayit-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5_beta1.ebuild,v 1.1 2005/09/22 20:21:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksayit/ksayit-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:51 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KD text-to-speech frontend app"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/kttsd)
 	$(deprange $PV $MAXKDEVER kde-base/arts)
diff --git a/kde-base/ksayit/metadata.xml b/kde-base/ksayit/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksayit/metadata.xml
+++ b/kde-base/ksayit/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog
index 2cd35da03f20..a3d592ded197 100644
--- a/kde-base/kscd/ChangeLog
+++ b/kde-base/kscd/ChangeLog
@@ -1,6 +1,103 @@
 # ChangeLog for kde-base/kscd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kscd-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kscd-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kscd-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kscd-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kscd-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kscd-3.5_beta1.ebuild,
+  kscd-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kscd-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.5.0_beta2.ebuild:
+  New version.
+
+*kscd-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kscd-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kscd-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kscd-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kscd-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kscd-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kscd-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kscd-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kscd-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kscd-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kscd-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kscd-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kscd-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kscd-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kscd-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kscd-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kscd-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kscd-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kscd-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kscd-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kscd/Manifest b/kde-base/kscd/Manifest
index 47d46945196b..6577a841a4cb 100644
--- a/kde-base/kscd/Manifest
+++ b/kde-base/kscd/Manifest
@@ -1,4 +1,26 @@
-MD5 a1be3ac7948318f9733f15373d66a10c kscd-3.4.0_beta1.ebuild 446
-MD5 a1be3ac7948318f9733f15373d66a10c kscd-3.4.0_alpha1.ebuild 446
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-kscd-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-kscd-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a83515b934b6a667ee50b5e6bbd6fe58 ChangeLog 3390
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-kscd-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-kscd-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-kscd-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-kscd-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-kscd-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-kscd-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-kscd-3.5_beta1 74
+MD5 72c275ff2754709d9f0e881e9b56be4b kscd-3.4.1.ebuild 788
+MD5 f115f59e19ffa459280e50059a1fac34 kscd-3.4.2.ebuild 801
+MD5 26ded52c9424f844d4e70492b8edeefd kscd-3.4.3.ebuild 797
+MD5 9f1017c72dc67bde4d2b0228c9556d29 kscd-3.5.0.ebuild 741
+MD5 0390490edb59b7b3249c06cbb1dfbb46 kscd-3.5.0_beta2.ebuild 746
+MD5 d75d1b36d80d5bab31949e9d2e2ab346 kscd-3.5.0_rc1.ebuild 745
+MD5 bb717c84d8d971465c9e80d2b6bc91d1 kscd-3.5_beta1.ebuild 780
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm3PntT9W3vfTuoRAl1CAKCfcHmmpEK7VoIxuhlffOTc1eKCnwCglVJ2
+yKA+un/hMvqTbZKraVeNmRk=
+=HSgz
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kscd/files/digest-kscd-3.4.1 b/kde-base/kscd/files/digest-kscd-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/kscd/files/digest-kscd-3.4.1
+++ b/kde-base/kscd/files/digest-kscd-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/kscd/files/digest-kscd-3.4.2 b/kde-base/kscd/files/digest-kscd-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/kscd/files/digest-kscd-3.4.2
+++ b/kde-base/kscd/files/digest-kscd-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/kscd/kscd-3.4.1.ebuild b/kde-base/kscd/kscd-3.4.1.ebuild
index df5ddb8843ab..260d7bf23a4f 100644
--- a/kde-base/kscd/kscd-3.4.1.ebuild
+++ b/kde-base/kscd/kscd-3.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/kde-base/kscd/kscd-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD player"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcddb-3.3.1"
 DEPEND="
diff --git a/kde-base/kscd/kscd-3.4.2.ebuild b/kde-base/kscd/kscd-3.4.2.ebuild
index fde2cae0c202..7a6c2040a8d4 100644
--- a/kde-base/kscd/kscd-3.4.2.ebuild
+++ b/kde-base/kscd/kscd-3.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/kde-base/kscd/kscd-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD player"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcddb-3.3.1"
 DEPEND="
diff --git a/kde-base/kscd/kscd-3.4.3.ebuild b/kde-base/kscd/kscd-3.4.3.ebuild
index 83f9058d1b11..e1ba116b7f17 100644
--- a/kde-base/kscd/kscd-3.4.3.ebuild
+++ b/kde-base/kscd/kscd-3.4.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/kde-base/kscd/kscd-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD player"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcddb-3.3.1"
 DEPEND="
diff --git a/kde-base/kscd/kscd-3.5.0.ebuild b/kde-base/kscd/kscd-3.5.0.ebuild
index bcf16f0364f2..1e116c5f1d43 100644
--- a/kde-base/kscd/kscd-3.5.0.ebuild
+++ b/kde-base/kscd/kscd-3.5.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/kde-base/kscd/kscd-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kscd/kscd-3.5.0_beta2.ebuild b/kde-base/kscd/kscd-3.5.0_beta2.ebuild
index 1319ba4931f7..80afab5e1c5d 100644
--- a/kde-base/kscd/kscd-3.5.0_beta2.ebuild
+++ b/kde-base/kscd/kscd-3.5.0_beta2.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/kde-base/kscd/kscd-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD player"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/kscd/kscd-3.5.0_rc1.ebuild b/kde-base/kscd/kscd-3.5.0_rc1.ebuild
index 305301fd9387..9141231225fc 100644
--- a/kde-base/kscd/kscd-3.5.0_rc1.ebuild
+++ b/kde-base/kscd/kscd-3.5.0_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/kde-base/kscd/kscd-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/kscd/kscd-3.5_beta1.ebuild b/kde-base/kscd/kscd-3.5_beta1.ebuild
index 93137947ff87..dfb22643f849 100644
--- a/kde-base/kscd/kscd-3.5_beta1.ebuild
+++ b/kde-base/kscd/kscd-3.5_beta1.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/kde-base/kscd/kscd-3.5_beta1.ebuild,v 1.1 2005/09/22 20:22:32 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:41 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE CD player"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcddb-3.3.1"
 DEPEND="
diff --git a/kde-base/kscd/metadata.xml b/kde-base/kscd/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kscd/metadata.xml
+++ b/kde-base/kscd/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog
index 2bcd51efb1e0..a44c75a66951 100644
--- a/kde-base/kscreensaver/ChangeLog
+++ b/kde-base/kscreensaver/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for kde-base/kscreensaver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kscreensaver-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kscreensaver-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kscreensaver-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kscreensaver-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kscreensaver-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kscreensaver-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kscreensaver-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kscreensaver-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  kscreensaver-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kscreensaver-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kscreensaver-3.5.0_beta2.ebuild:
+  New version.
+
+*kscreensaver-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kscreensaver-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kscreensaver-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kscreensaver-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kscreensaver-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kscreensaver-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kscreensaver-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kscreensaver-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kscreensaver-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdeartwork-libart.patch,
+  +files/configure-fix-kdeartwork-xscreensaver.patch,
+  +kscreensaver-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kscreensaver-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kscreensaver-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kscreensaver-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kscreensaver-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kscreensaver-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kscreensaver-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kscreensaver-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kscreensaver-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kscreensaver-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kscreensaver-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kscreensaver-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kscreensaver-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kscreensaver-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kscreensaver-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kscreensaver/Manifest b/kde-base/kscreensaver/Manifest
index b9a04b06a5ff..eabe4c7e29d2 100644
--- a/kde-base/kscreensaver/Manifest
+++ b/kde-base/kscreensaver/Manifest
@@ -1,4 +1,28 @@
-MD5 943c2a0aaade9808d76ba70d56dd2d95 kscreensaver-3.4.0_alpha1.ebuild 489
-MD5 943c2a0aaade9808d76ba70d56dd2d95 kscreensaver-3.4.0_beta1.ebuild 489
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kscreensaver-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kscreensaver-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3d5675932d205e0b9cf88afd525cfebc ChangeLog 3913
+MD5 d4f721aede14b18d9aa83c9d9f18900d files/configure-fix-kdeartwork-libart.patch 2503
+MD5 205c13a78065c2decb403b1984abab5f files/configure-fix-kdeartwork-xscreensaver.patch 1577
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kscreensaver-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kscreensaver-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kscreensaver-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kscreensaver-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kscreensaver-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kscreensaver-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kscreensaver-3.5_beta1 69
+MD5 39002f99dacfa6fcdc7ec202e3fe3790 kscreensaver-3.4.1.ebuild 520
+MD5 0af9b25b83b198577161f5dadfd4526e kscreensaver-3.4.2.ebuild 532
+MD5 4ca5c14f755d7c2b3ad802a05beaacd2 kscreensaver-3.4.3.ebuild 528
+MD5 bb771b94df13fb5952151e305d2f59b3 kscreensaver-3.5.0.ebuild 513
+MD5 ad0205b7410093b24946d18320380724 kscreensaver-3.5.0_beta2.ebuild 516
+MD5 8a6185653c0985feca6a8767772119b0 kscreensaver-3.5.0_rc1.ebuild 517
+MD5 9ea5fa0ae3ca1cb3023e865060c835b4 kscreensaver-3.5_beta1.ebuild 511
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkKKntT9W3vfTuoRAsmWAJ9pJlMi3m7PKC3nNwgtq+eZLmVSvQCgnNb9
+VrwphssjDyC8K41DkDdUIBY=
+=FeXu
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kscreensaver/files/digest-kscreensaver-3.4.1 b/kde-base/kscreensaver/files/digest-kscreensaver-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kscreensaver/files/digest-kscreensaver-3.4.1
+++ b/kde-base/kscreensaver/files/digest-kscreensaver-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2 b/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2
+++ b/kde-base/kscreensaver/files/digest-kscreensaver-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kscreensaver/kscreensaver-3.4.1.ebuild b/kde-base/kscreensaver/kscreensaver-3.4.1.ebuild
index 488426cb354e..3ab63b002fd8 100644
--- a/kde-base/kscreensaver/kscreensaver-3.4.1.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.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/kde-base/kscreensaver/kscreensaver-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="opengl"
 
 DEPEND="opengl? ( virtual/opengl )"
diff --git a/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild b/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild
index dfa0c96f32cd..9c2ce12fa851 100644
--- a/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.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/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,11 +8,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="opengl"
-DEPEND="opengl? ( virtual/opengl )
-	media-libs/libart_lgpl" # The below patch provides a configure switch, but we've no USE flag for libart
-PATCHES="$FILESDIR/configure-fix-kdeartwork-libart.patch"
+DEPEND="opengl? ( virtual/opengl )"
 
 src_compile() {
 	myconf="$myconf `use_with opengl gl`"
diff --git a/kde-base/kscreensaver/kscreensaver-3.4.3.ebuild b/kde-base/kscreensaver/kscreensaver-3.4.3.ebuild
index fb08c6ebe41d..7c749b0a102f 100644
--- a/kde-base/kscreensaver/kscreensaver-3.4.3.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.4.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/kde-base/kscreensaver/kscreensaver-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="opengl"
 DEPEND="opengl? ( virtual/opengl )"
 
diff --git a/kde-base/kscreensaver/kscreensaver-3.5.0.ebuild b/kde-base/kscreensaver/kscreensaver-3.5.0.ebuild
index 81d8cd293c47..a406121e20df 100644
--- a/kde-base/kscreensaver/kscreensaver-3.5.0.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.5.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/kde-base/kscreensaver/kscreensaver-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kscreensaver/kscreensaver-3.5.0_beta2.ebuild b/kde-base/kscreensaver/kscreensaver-3.5.0_beta2.ebuild
index 363ec19578cf..5749539add0a 100644
--- a/kde-base/kscreensaver/kscreensaver-3.5.0_beta2.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.5.0_beta2.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/kde-base/kscreensaver/kscreensaver-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="opengl"
 DEPEND="opengl? ( virtual/opengl )"
 
diff --git a/kde-base/kscreensaver/kscreensaver-3.5.0_rc1.ebuild b/kde-base/kscreensaver/kscreensaver-3.5.0_rc1.ebuild
index 0324629af3f4..1d50815e337a 100644
--- a/kde-base/kscreensaver/kscreensaver-3.5.0_rc1.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.5.0_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/kde-base/kscreensaver/kscreensaver-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:32 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kscreensaver/kscreensaver-3.5_beta1.ebuild b/kde-base/kscreensaver/kscreensaver-3.5_beta1.ebuild
index 9064982bb1f1..2cfad5760091 100644
--- a/kde-base/kscreensaver/kscreensaver-3.5_beta1.ebuild
+++ b/kde-base/kscreensaver/kscreensaver-3.5_beta1.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/kde-base/kscreensaver/kscreensaver-3.5_beta1.ebuild,v 1.1 2005/09/22 20:23:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:40 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE screensaver framework"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 DEPEND="opengl? ( virtual/opengl )"
 
diff --git a/kde-base/kscreensaver/metadata.xml b/kde-base/kscreensaver/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kscreensaver/metadata.xml
+++ b/kde-base/kscreensaver/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kshisen/ChangeLog b/kde-base/kshisen/ChangeLog
index 06645b7430c9..ec7b462018a2 100644
--- a/kde-base/kshisen/ChangeLog
+++ b/kde-base/kshisen/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kshisen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/ChangeLog,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kshisen-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kshisen-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kshisen-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kshisen-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kshisen-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kshisen-3.5_beta1.ebuild,
+  kshisen-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kshisen-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.5.0_beta2.ebuild:
+  New version.
+
+*kshisen-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kshisen-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kshisen-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kshisen-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kshisen-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kshisen-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kshisen-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kshisen-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kshisen-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kshisen-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kshisen-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kshisen-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kshisen-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kshisen-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kshisen-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kshisen-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kshisen-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kshisen-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kshisen-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kshisen-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kshisen-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kshisen/Manifest b/kde-base/kshisen/Manifest
index ee2d597dc32f..af8ea93fa471 100644
--- a/kde-base/kshisen/Manifest
+++ b/kde-base/kshisen/Manifest
@@ -1,4 +1,26 @@
-MD5 759869383d6d5b9d7bd3b17151baf42c kshisen-3.4.0_beta1.ebuild 425
-MD5 759869383d6d5b9d7bd3b17151baf42c kshisen-3.4.0_alpha1.ebuild 425
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kshisen-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kshisen-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2cad40323e633d711b87fde151cc6691 ChangeLog 3541
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kshisen-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kshisen-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kshisen-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kshisen-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kshisen-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kshisen-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kshisen-3.5_beta1 70
+MD5 c6e32aeff2e10322968812e85b00a0ce kshisen-3.4.1.ebuild 544
+MD5 89fc7a1ba7d12c04f9e6e057d15a67bc kshisen-3.4.2.ebuild 557
+MD5 c67985b99ed9a5adc88de140715c5981 kshisen-3.4.3.ebuild 553
+MD5 dfe0e2619d4bd7ffa8c07da0d9bdfce7 kshisen-3.5.0.ebuild 496
+MD5 f68f06f889b30a1889dddf6c4fa537b0 kshisen-3.5.0_beta2.ebuild 501
+MD5 cc00bcf99ad9a0fbc6f70890b5a39dc8 kshisen-3.5.0_rc1.ebuild 500
+MD5 869b6838bd54e974de7787652ab03289 kshisen-3.5_beta1.ebuild 536
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmDJntT9W3vfTuoRAkhQAKCoyJFP7RdcckMY1fHSC3300ZY23gCdEvWD
+s4RF23diOiW/+PGRoN4roZI=
+=3UJ9
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kshisen/files/digest-kshisen-3.4.1 b/kde-base/kshisen/files/digest-kshisen-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kshisen/files/digest-kshisen-3.4.1
+++ b/kde-base/kshisen/files/digest-kshisen-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kshisen/files/digest-kshisen-3.4.2 b/kde-base/kshisen/files/digest-kshisen-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kshisen/files/digest-kshisen-3.4.2
+++ b/kde-base/kshisen/files/digest-kshisen-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kshisen/kshisen-3.4.1.ebuild b/kde-base/kshisen/kshisen-3.4.1.ebuild
index 418a32ae79a9..72feeea41274 100644
--- a/kde-base/kshisen/kshisen-3.4.1.ebuild
+++ b/kde-base/kshisen/kshisen-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kshisen/kshisen-3.4.2.ebuild b/kde-base/kshisen/kshisen-3.4.2.ebuild
index 3cb332943e66..7a81a6158c9a 100644
--- a/kde-base/kshisen/kshisen-3.4.2.ebuild
+++ b/kde-base/kshisen/kshisen-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kshisen/kshisen-3.4.3.ebuild b/kde-base/kshisen/kshisen-3.4.3.ebuild
index 7a3628ae27ae..b799c26fdc16 100644
--- a/kde-base/kshisen/kshisen-3.4.3.ebuild
+++ b/kde-base/kshisen/kshisen-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kshisen/kshisen-3.5.0.ebuild b/kde-base/kshisen/kshisen-3.5.0.ebuild
index 461fc3260329..b20e6267f0bc 100644
--- a/kde-base/kshisen/kshisen-3.5.0.ebuild
+++ b/kde-base/kshisen/kshisen-3.5.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/kde-base/kshisen/kshisen-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kshisen/kshisen-3.5.0_beta2.ebuild b/kde-base/kshisen/kshisen-3.5.0_beta2.ebuild
index 18e726a7dde9..ba34801a6fb4 100644
--- a/kde-base/kshisen/kshisen-3.5.0_beta2.ebuild
+++ b/kde-base/kshisen/kshisen-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kshisen/kshisen-3.5.0_rc1.ebuild b/kde-base/kshisen/kshisen-3.5.0_rc1.ebuild
index 83d7213f22b4..ddfb8de0a5b6 100644
--- a/kde-base/kshisen/kshisen-3.5.0_rc1.ebuild
+++ b/kde-base/kshisen/kshisen-3.5.0_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/kde-base/kshisen/kshisen-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kshisen/kshisen-3.5_beta1.ebuild b/kde-base/kshisen/kshisen-3.5_beta1.ebuild
index 9fcb5ececdd5..316d7cada824 100644
--- a/kde-base/kshisen/kshisen-3.5_beta1.ebuild
+++ b/kde-base/kshisen/kshisen-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.5_beta1.ebuild,v 1.1 2005/09/22 20:24:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kshisen/kshisen-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="A KDE game similiar to Mahjongg"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kshisen/metadata.xml b/kde-base/kshisen/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kshisen/metadata.xml
+++ b/kde-base/kshisen/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksig/ChangeLog b/kde-base/ksig/ChangeLog
index 0397f95fb1c1..4b7d77adf117 100644
--- a/kde-base/ksig/ChangeLog
+++ b/kde-base/ksig/ChangeLog
@@ -1,6 +1,73 @@
 # ChangeLog for kde-base/ksig
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ChangeLog,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
+
+*ksig-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksig-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksig-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksig-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksig-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ksig-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> ksig-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*ksig-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksig-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksig-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksig-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksig-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksig-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksig-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksig-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksig-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksig-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksig-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksig-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  08 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksig-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksig-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksig-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksig-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksig/Manifest b/kde-base/ksig/Manifest
index 4d89954cf2da..26c83a6ae8c5 100644
--- a/kde-base/ksig/Manifest
+++ b/kde-base/ksig/Manifest
@@ -1,4 +1,8 @@
-MD5 11cb38306d9c6ce077dbd22c9bbda5bc ksig-3.4.0_alpha1.ebuild 275
-MD5 11cb38306d9c6ce077dbd22c9bbda5bc ksig-3.4.0_beta1.ebuild 275
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-ksig-3.4.0_alpha1 70
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-ksig-3.4.0_beta1 219
+MD5 b96e57cb05eb23eb70c81a2c370f47cb ChangeLog 2612
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-ksig-3.4.1 215
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-ksig-3.5.0 69
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-ksig-3.5_beta1 70
+MD5 9ee06d0c23b0dddaf1f5e9829c7d138c ksig-3.4.1.ebuild 400
+MD5 96d89a30241cba47451a77ce45205e13 ksig-3.5.0.ebuild 377
+MD5 2f7d49742e3f2d457a6b514af7e5cd2f ksig-3.5_beta1.ebuild 387
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/ksig/files/digest-ksig-3.4.1 b/kde-base/ksig/files/digest-ksig-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/ksig/files/digest-ksig-3.4.1
+++ b/kde-base/ksig/files/digest-ksig-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/ksig/ksig-3.4.1.ebuild b/kde-base/ksig/ksig-3.4.1.ebuild
index 05ac062121d5..05daff6bd4a0 100644
--- a/kde-base/ksig/ksig-3.4.1.ebuild
+++ b/kde-base/ksig/ksig-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ksig-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ksig-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeaddons
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE email signature manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ksig/ksig-3.5.0.ebuild b/kde-base/ksig/ksig-3.5.0.ebuild
index 8acbd7bf36ee..855fe2d89c0c 100644
--- a/kde-base/ksig/ksig-3.5.0.ebuild
+++ b/kde-base/ksig/ksig-3.5.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/kde-base/ksig/ksig-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ksig-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksig/ksig-3.5_beta1.ebuild b/kde-base/ksig/ksig-3.5_beta1.ebuild
index 403b4ea0fc79..053625a02769 100644
--- a/kde-base/ksig/ksig-3.5_beta1.ebuild
+++ b/kde-base/ksig/ksig-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ksig-3.5_beta1.ebuild,v 1.1 2005/09/22 20:25:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksig/ksig-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeaddons
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE email signature manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ksig/metadata.xml b/kde-base/ksig/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksig/metadata.xml
+++ b/kde-base/ksig/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksim/ChangeLog b/kde-base/ksim/ChangeLog
index bf6731c31219..f59d48acff1c 100644
--- a/kde-base/ksim/ChangeLog
+++ b/kde-base/ksim/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/ksim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ChangeLog,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksim-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksim-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksim-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksim-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksim-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksim-3.5_beta1.ebuild,
+  ksim-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksim-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.5.0_beta2.ebuild:
+  New version.
+
+*ksim-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksim-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksim-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ksim-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksim-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksim-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksim-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksim-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdeutils-snmp.patch, +ksim-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksim-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksim-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksim-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksim-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksim-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksim-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksim-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksim-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksim-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksim-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksim-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksim-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  16 Jan 2005; Simone Gotti <motaboy@gentoo.org>
+  +files/ksim-3.4.0_beta1-snmpfix.patch, ksim-3.4.0_beta1.ebuild:
+  Fix bug #78204.
 
 *ksim-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksim/Manifest b/kde-base/ksim/Manifest
index e52a355c7612..86ccf3747c0f 100644
--- a/kde-base/ksim/Manifest
+++ b/kde-base/ksim/Manifest
@@ -1,4 +1,27 @@
-MD5 ebb89515c451c82b296e37217902e825 ksim-3.4.0_alpha1.ebuild 269
-MD5 ebb89515c451c82b296e37217902e825 ksim-3.4.0_beta1.ebuild 269
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-ksim-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-ksim-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 984de232e742b06efe108d98ebbf677e ChangeLog 3625
+MD5 8716488f71c42fb9ee3fbd1b310fc91e files/configure-fix-kdeutils-snmp.patch 1445
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-ksim-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-ksim-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-ksim-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-ksim-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-ksim-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-ksim-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-ksim-3.5_beta1 69
+MD5 5b77b9bf0a913ec870c7b924b788f4c8 ksim-3.4.1.ebuild 430
+MD5 e1b7bc8b8f596aa3b2da3dc9e2045627 ksim-3.4.2.ebuild 530
+MD5 81d8bcda761b2a267194e11ccd8ad714 ksim-3.4.3.ebuild 526
+MD5 9d9f280d88a24c372ebfb13702668c19 ksim-3.5.0.ebuild 452
+MD5 298303a3bd3ba338b05bf59d4a22cc2a ksim-3.5.0_beta2.ebuild 457
+MD5 05f2010b8f6a592edec698655fdf3ef4 ksim-3.5.0_rc1.ebuild 456
+MD5 a98c5cff0121d9df7b95e5df287748cd ksim-3.5_beta1.ebuild 455
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv2yntT9W3vfTuoRAkcJAJ9WQBgGkS8uqCOs6nKVIen67z8GPwCfYsLN
+Zu1zgMOVCdHOrmHehvuowlg=
+=dVhF
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksim/files/digest-ksim-3.4.1 b/kde-base/ksim/files/digest-ksim-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/ksim/files/digest-ksim-3.4.1
+++ b/kde-base/ksim/files/digest-ksim-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/ksim/files/digest-ksim-3.4.2 b/kde-base/ksim/files/digest-ksim-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/ksim/files/digest-ksim-3.4.2
+++ b/kde-base/ksim/files/digest-ksim-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/ksim/ksim-3.4.1.ebuild b/kde-base/ksim/ksim-3.4.1.ebuild
index d24ad62b77d7..876570636e18 100644
--- a/kde-base/ksim/ksim-3.4.1.ebuild
+++ b/kde-base/ksim/ksim-3.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/kde-base/ksim/ksim-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Monitor applets"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="snmp"
 
 DEPEND="snmp? ( net-analyzer/net-snmp )"
diff --git a/kde-base/ksim/ksim-3.4.2.ebuild b/kde-base/ksim/ksim-3.4.2.ebuild
index 8835c3df0b7c..f24405e7bee7 100644
--- a/kde-base/ksim/ksim-3.4.2.ebuild
+++ b/kde-base/ksim/ksim-3.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/kde-base/ksim/ksim-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Monitor applets"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="snmp"
 DEPEND="snmp? ( net-analyzer/net-snmp )"
 
diff --git a/kde-base/ksim/ksim-3.4.3.ebuild b/kde-base/ksim/ksim-3.4.3.ebuild
index a9cd9eb34bfa..5b052688e81a 100644
--- a/kde-base/ksim/ksim-3.4.3.ebuild
+++ b/kde-base/ksim/ksim-3.4.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/kde-base/ksim/ksim-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Monitor applets"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="snmp"
 DEPEND="snmp? ( net-analyzer/net-snmp )"
 
diff --git a/kde-base/ksim/ksim-3.5.0.ebuild b/kde-base/ksim/ksim-3.5.0.ebuild
index f23db5f52aa4..727e42882ca4 100644
--- a/kde-base/ksim/ksim-3.5.0.ebuild
+++ b/kde-base/ksim/ksim-3.5.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/kde-base/ksim/ksim-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/ksim/ksim-3.5.0_beta2.ebuild b/kde-base/ksim/ksim-3.5.0_beta2.ebuild
index c336035d844d..ef9e5c060a99 100644
--- a/kde-base/ksim/ksim-3.5.0_beta2.ebuild
+++ b/kde-base/ksim/ksim-3.5.0_beta2.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/kde-base/ksim/ksim-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Monitor applets"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="snmp"
 DEPEND="snmp? ( net-analyzer/net-snmp )"
 
diff --git a/kde-base/ksim/ksim-3.5.0_rc1.ebuild b/kde-base/ksim/ksim-3.5.0_rc1.ebuild
index 646b74324af3..9e29bbb3e09e 100644
--- a/kde-base/ksim/ksim-3.5.0_rc1.ebuild
+++ b/kde-base/ksim/ksim-3.5.0_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/kde-base/ksim/ksim-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/ksim/ksim-3.5_beta1.ebuild b/kde-base/ksim/ksim-3.5_beta1.ebuild
index b6576a82e693..1b6ddbc92d5b 100644
--- a/kde-base/ksim/ksim-3.5_beta1.ebuild
+++ b/kde-base/ksim/ksim-3.5_beta1.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/kde-base/ksim/ksim-3.5_beta1.ebuild,v 1.1 2005/09/22 20:26:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksim/ksim-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Monitor applets"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="snmp"
 DEPEND="snmp? ( net-analyzer/net-snmp )"
 
diff --git a/kde-base/ksim/metadata.xml b/kde-base/ksim/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksim/metadata.xml
+++ b/kde-base/ksim/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksirc/ChangeLog b/kde-base/ksirc/ChangeLog
index e7f87ab031ce..44b54e99f986 100644
--- a/kde-base/ksirc/ChangeLog
+++ b/kde-base/ksirc/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ksirc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ChangeLog,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksirc-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksirc-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksirc-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksirc-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksirc-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksirc-3.5_beta1.ebuild,
+  ksirc-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksirc-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.5.0_beta2.ebuild:
+  New version.
+
+*ksirc-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksirc-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksirc-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksirc-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksirc-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksirc-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksirc-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksirc-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksirc-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksirc-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksirc-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksirc-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksirc-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> ksirc-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksirc-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksirc-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ksirc-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksirc-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ksirc-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksirc-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksirc-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksirc/Manifest b/kde-base/ksirc/Manifest
index 01a20a4bb6a7..4a1dcb484e3f 100644
--- a/kde-base/ksirc/Manifest
+++ b/kde-base/ksirc/Manifest
@@ -1,4 +1,26 @@
-MD5 1cea696288277bc1115f05a63f02506d ksirc-3.4.0_alpha1.ebuild 259
-MD5 1cea696288277bc1115f05a63f02506d ksirc-3.4.0_beta1.ebuild 259
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-ksirc-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-ksirc-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7cad1391a38d07e6a0a49ea684591382 ChangeLog 3465
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-ksirc-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-ksirc-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-ksirc-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-ksirc-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-ksirc-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-ksirc-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-ksirc-3.5_beta1 71
+MD5 902f9e74f11020707a27ba1a286919e1 ksirc-3.4.1.ebuild 437
+MD5 8dd343e006090198338383b3d7a0346b ksirc-3.4.2.ebuild 450
+MD5 10fde0583d6a347a2d92f2b851a29634 ksirc-3.4.3.ebuild 446
+MD5 50cc7954969017819382f815f9880ed2 ksirc-3.5.0.ebuild 426
+MD5 581e2c234882d416629544f445019185 ksirc-3.5.0_beta2.ebuild 431
+MD5 d77fcf907b2336e20652127e0f24715f ksirc-3.5.0_rc1.ebuild 430
+MD5 898be6db9154f6ac31171c363b0b67e5 ksirc-3.5_beta1.ebuild 429
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuVWntT9W3vfTuoRAgzrAJ47QHr57JPXBXv6VyZXGEzwKytW5QCbBgHo
+85OWhcUdX8CUVrTAt62veqg=
+=cfDL
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksirc/files/digest-ksirc-3.4.1 b/kde-base/ksirc/files/digest-ksirc-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/ksirc/files/digest-ksirc-3.4.1
+++ b/kde-base/ksirc/files/digest-ksirc-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/ksirc/files/digest-ksirc-3.4.2 b/kde-base/ksirc/files/digest-ksirc-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/ksirc/files/digest-ksirc-3.4.2
+++ b/kde-base/ksirc/files/digest-ksirc-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/ksirc/ksirc-3.4.1.ebuild b/kde-base/ksirc/ksirc-3.4.1.ebuild
index aaa4757dceb5..839911b0bbd9 100644
--- a/kde-base/ksirc/ksirc-3.4.1.ebuild
+++ b/kde-base/ksirc/ksirc-3.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/kde-base/ksirc/ksirc-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE irc client"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/kde-base/ksirc/ksirc-3.4.2.ebuild b/kde-base/ksirc/ksirc-3.4.2.ebuild
index 85e9de97cb0b..4050c11251cf 100644
--- a/kde-base/ksirc/ksirc-3.4.2.ebuild
+++ b/kde-base/ksirc/ksirc-3.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/kde-base/ksirc/ksirc-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE irc client"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/kde-base/ksirc/ksirc-3.4.3.ebuild b/kde-base/ksirc/ksirc-3.4.3.ebuild
index a90ec1b703da..25c115b0b116 100644
--- a/kde-base/ksirc/ksirc-3.4.3.ebuild
+++ b/kde-base/ksirc/ksirc-3.4.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/kde-base/ksirc/ksirc-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE irc client"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/kde-base/ksirc/ksirc-3.5.0.ebuild b/kde-base/ksirc/ksirc-3.5.0.ebuild
index bc5ce0ae9266..80889e105ecd 100644
--- a/kde-base/ksirc/ksirc-3.5.0.ebuild
+++ b/kde-base/ksirc/ksirc-3.5.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/kde-base/ksirc/ksirc-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/ksirc/ksirc-3.5.0_beta2.ebuild b/kde-base/ksirc/ksirc-3.5.0_beta2.ebuild
index 6001c7986eff..a57b873082bb 100644
--- a/kde-base/ksirc/ksirc-3.5.0_beta2.ebuild
+++ b/kde-base/ksirc/ksirc-3.5.0_beta2.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/kde-base/ksirc/ksirc-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE irc client"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/kde-base/ksirc/ksirc-3.5.0_rc1.ebuild b/kde-base/ksirc/ksirc-3.5.0_rc1.ebuild
index 6925789e1fbe..8619fd59f7c8 100644
--- a/kde-base/ksirc/ksirc-3.5.0_rc1.ebuild
+++ b/kde-base/ksirc/ksirc-3.5.0_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/kde-base/ksirc/ksirc-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/ksirc/ksirc-3.5_beta1.ebuild b/kde-base/ksirc/ksirc-3.5_beta1.ebuild
index 3a65da9ef3ee..a961113b332b 100644
--- a/kde-base/ksirc/ksirc-3.5_beta1.ebuild
+++ b/kde-base/ksirc/ksirc-3.5_beta1.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/kde-base/ksirc/ksirc-3.5_beta1.ebuild,v 1.1 2005/09/22 20:27:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirc/ksirc-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE irc client"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="ssl"
 
 RDEPEND="dev-lang/perl
diff --git a/kde-base/ksirc/metadata.xml b/kde-base/ksirc/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksirc/metadata.xml
+++ b/kde-base/ksirc/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksirtet/ChangeLog b/kde-base/ksirtet/ChangeLog
index 1c8beb2e5c55..b7eb0795b1c2 100644
--- a/kde-base/ksirtet/ChangeLog
+++ b/kde-base/ksirtet/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ksirtet
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ChangeLog,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksirtet-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksirtet-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksirtet-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksirtet-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksirtet-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksirtet-3.5_beta1.ebuild,
+  ksirtet-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksirtet-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.5.0_beta2.ebuild:
+  New version.
+
+*ksirtet-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksirtet-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksirtet-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksirtet-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksirtet-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksirtet-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksirtet-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksirtet-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksirtet-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksirtet-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksirtet-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksirtet-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksirtet-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksirtet-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksirtet-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksirtet-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksirtet-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksirtet-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksirtet-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksirtet-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksirtet-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksirtet/Manifest b/kde-base/ksirtet/Manifest
index 0cdb2463dcae..9636ff7ce5a8 100644
--- a/kde-base/ksirtet/Manifest
+++ b/kde-base/ksirtet/Manifest
@@ -1,4 +1,26 @@
-MD5 e60833194163e6371f487e2bc64e8c1d ksirtet-3.4.0_alpha1.ebuild 473
-MD5 e60833194163e6371f487e2bc64e8c1d ksirtet-3.4.0_beta1.ebuild 473
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ksirtet-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ksirtet-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ec838e4f89c588d49352c089ddb39083 ChangeLog 3566
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ksirtet-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ksirtet-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ksirtet-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ksirtet-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ksirtet-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ksirtet-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ksirtet-3.5_beta1 70
+MD5 3412b7267f8625cd810f900a55d33342 ksirtet-3.4.1.ebuild 592
+MD5 23ad41d4647f676b5719ae19bd3270e3 ksirtet-3.4.2.ebuild 605
+MD5 d17942805c58d001df1c6e675ad70dd9 ksirtet-3.4.3.ebuild 601
+MD5 6b96de36a77b9156c3c8d19541c5670a ksirtet-3.5.0.ebuild 544
+MD5 c3c8835a6d873f0a3776d841ca821aa5 ksirtet-3.5.0_beta2.ebuild 549
+MD5 d388cb2d238a5d63d458a16804cb9e08 ksirtet-3.5.0_rc1.ebuild 548
+MD5 32d1c9b0c3e69a22e2e2ddd2dfc35eb5 ksirtet-3.5_beta1.ebuild 584
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmEEntT9W3vfTuoRAmi+AKCldRtGmKJlRq/NctSVjPzj7TC0YgCeOyW+
+ZhNI99JEaXnR0JM+NeDadMo=
+=gJz/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksirtet/files/digest-ksirtet-3.4.1 b/kde-base/ksirtet/files/digest-ksirtet-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ksirtet/files/digest-ksirtet-3.4.1
+++ b/kde-base/ksirtet/files/digest-ksirtet-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ksirtet/files/digest-ksirtet-3.4.2 b/kde-base/ksirtet/files/digest-ksirtet-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ksirtet/files/digest-ksirtet-3.4.2
+++ b/kde-base/ksirtet/files/digest-ksirtet-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ksirtet/ksirtet-3.4.1.ebuild b/kde-base/ksirtet/ksirtet-3.4.1.ebuild
index 6549619095e0..c411e6a5408c 100644
--- a/kde-base/ksirtet/ksirtet-3.4.1.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksirtet/ksirtet-3.4.2.ebuild b/kde-base/ksirtet/ksirtet-3.4.2.ebuild
index 498e3a5fe529..2881ae9d7cd0 100644
--- a/kde-base/ksirtet/ksirtet-3.4.2.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksirtet/ksirtet-3.4.3.ebuild b/kde-base/ksirtet/ksirtet-3.4.3.ebuild
index 095bc6bff66b..8cdc1390881b 100644
--- a/kde-base/ksirtet/ksirtet-3.4.3.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksirtet/ksirtet-3.5.0.ebuild b/kde-base/ksirtet/ksirtet-3.5.0.ebuild
index 54d2f3390f81..2cc3d738fbb2 100644
--- a/kde-base/ksirtet/ksirtet-3.5.0.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.5.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/kde-base/ksirtet/ksirtet-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksirtet/ksirtet-3.5.0_beta2.ebuild b/kde-base/ksirtet/ksirtet-3.5.0_beta2.ebuild
index 707bbb2e033b..62fcb23c3915 100644
--- a/kde-base/ksirtet/ksirtet-3.5.0_beta2.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ksirtet/ksirtet-3.5.0_rc1.ebuild b/kde-base/ksirtet/ksirtet-3.5.0_rc1.ebuild
index c7d7f9e9946e..f8701721f2d7 100644
--- a/kde-base/ksirtet/ksirtet-3.5.0_rc1.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.5.0_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/kde-base/ksirtet/ksirtet-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksirtet/ksirtet-3.5_beta1.ebuild b/kde-base/ksirtet/ksirtet-3.5_beta1.ebuild
index 85b99a397767..5be468bed1a3 100644
--- a/kde-base/ksirtet/ksirtet-3.5_beta1.ebuild
+++ b/kde-base/ksirtet/ksirtet-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.5_beta1.ebuild,v 1.1 2005/09/22 20:28:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksirtet/ksirtet-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KSirtet is an adaptation of the well-known Tetris game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksirtet/metadata.xml b/kde-base/ksirtet/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksirtet/metadata.xml
+++ b/kde-base/ksirtet/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksmiletris/ChangeLog b/kde-base/ksmiletris/ChangeLog
index 433e668a56b9..3e70a95d7493 100644
--- a/kde-base/ksmiletris/ChangeLog
+++ b/kde-base/ksmiletris/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/ksmiletris
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ChangeLog,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksmiletris-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksmiletris-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ksmiletris-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksmiletris-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksmiletris-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksmiletris-3.5_beta1.ebuild,
+  ksmiletris-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksmiletris-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.5.0_beta2.ebuild:
+  New version.
+
+*ksmiletris-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksmiletris-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksmiletris-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksmiletris-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksmiletris-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksmiletris-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ksmiletris-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksmiletris-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksmiletris-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksmiletris-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksmiletris-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksmiletris-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksmiletris-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksmiletris-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksmiletris-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksmiletris-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ksmiletris-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksmiletris-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksmiletris-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksmiletris-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ksmiletris-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksmiletris-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksmiletris/Manifest b/kde-base/ksmiletris/Manifest
index 2f81b1377fa9..9321faa6e399 100644
--- a/kde-base/ksmiletris/Manifest
+++ b/kde-base/ksmiletris/Manifest
@@ -1,4 +1,26 @@
-MD5 c3296cf0817d8bd38a036bf1e2ad534c ksmiletris-3.4.0_alpha1.ebuild 407
-MD5 c3296cf0817d8bd38a036bf1e2ad534c ksmiletris-3.4.0_beta1.ebuild 407
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ksmiletris-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ksmiletris-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d541cac003335c4fc38aa212974ae017 ChangeLog 3691
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ksmiletris-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ksmiletris-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ksmiletris-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ksmiletris-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ksmiletris-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ksmiletris-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ksmiletris-3.5_beta1 70
+MD5 11d0b674082f3d81df93d6f11162c5e5 ksmiletris-3.4.1.ebuild 532
+MD5 5315c0b44961bb44618d1a789d8b1773 ksmiletris-3.4.2.ebuild 545
+MD5 44218317d0dc274a482fa926387f7b2c ksmiletris-3.4.3.ebuild 541
+MD5 e2bca8271bd156e27808b5a84c714ca0 ksmiletris-3.5.0.ebuild 484
+MD5 70aea9597368430df68b16e91719d6bc ksmiletris-3.5.0_beta2.ebuild 489
+MD5 5915030e0dd6113eb8edae6b53399a76 ksmiletris-3.5.0_rc1.ebuild 488
+MD5 06db9b9c13c7c9660c8836a9f21598cf ksmiletris-3.5_beta1.ebuild 524
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmE5ntT9W3vfTuoRAvNuAKCN4NXiYOCYp/WkollM3xhgmr3r5ACfeoYm
+dy9F1uQ+1UeauUK1TMECOTI=
+=kU8o
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksmiletris/files/digest-ksmiletris-3.4.1 b/kde-base/ksmiletris/files/digest-ksmiletris-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ksmiletris/files/digest-ksmiletris-3.4.1
+++ b/kde-base/ksmiletris/files/digest-ksmiletris-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ksmiletris/files/digest-ksmiletris-3.4.2 b/kde-base/ksmiletris/files/digest-ksmiletris-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ksmiletris/files/digest-ksmiletris-3.4.2
+++ b/kde-base/ksmiletris/files/digest-ksmiletris-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ksmiletris/ksmiletris-3.4.1.ebuild b/kde-base/ksmiletris/ksmiletris-3.4.1.ebuild
index b4247eeb3026..d7eff56e25aa 100644
--- a/kde-base/ksmiletris/ksmiletris-3.4.1.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE SmileTris"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksmiletris/ksmiletris-3.4.2.ebuild b/kde-base/ksmiletris/ksmiletris-3.4.2.ebuild
index 8ab7149bc511..0a09edac365d 100644
--- a/kde-base/ksmiletris/ksmiletris-3.4.2.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE SmileTris"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksmiletris/ksmiletris-3.4.3.ebuild b/kde-base/ksmiletris/ksmiletris-3.4.3.ebuild
index 8616b93dcfc6..16ecff71888a 100644
--- a/kde-base/ksmiletris/ksmiletris-3.4.3.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE SmileTris"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksmiletris/ksmiletris-3.5.0.ebuild b/kde-base/ksmiletris/ksmiletris-3.5.0.ebuild
index fa5497e5a063..0acff68c08af 100644
--- a/kde-base/ksmiletris/ksmiletris-3.5.0.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.5.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/kde-base/ksmiletris/ksmiletris-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksmiletris/ksmiletris-3.5.0_beta2.ebuild b/kde-base/ksmiletris/ksmiletris-3.5.0_beta2.ebuild
index 4719bb2a7db4..196efab761d6 100644
--- a/kde-base/ksmiletris/ksmiletris-3.5.0_beta2.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:58 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE SmileTris"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ksmiletris/ksmiletris-3.5.0_rc1.ebuild b/kde-base/ksmiletris/ksmiletris-3.5.0_rc1.ebuild
index 47bd2a4df96c..eee9f3a7c46c 100644
--- a/kde-base/ksmiletris/ksmiletris-3.5.0_rc1.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.5.0_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/kde-base/ksmiletris/ksmiletris-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksmiletris/ksmiletris-3.5_beta1.ebuild b/kde-base/ksmiletris/ksmiletris-3.5_beta1.ebuild
index 16f0e86708e6..8dde94fe9bf5 100644
--- a/kde-base/ksmiletris/ksmiletris-3.5_beta1.ebuild
+++ b/kde-base/ksmiletris/ksmiletris-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.5_beta1.ebuild,v 1.1 2005/09/22 20:29:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmiletris/ksmiletris-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE SmileTris"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksmiletris/metadata.xml b/kde-base/ksmiletris/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksmiletris/metadata.xml
+++ b/kde-base/ksmiletris/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksmserver/ChangeLog b/kde-base/ksmserver/ChangeLog
index a3fb0cc3de11..9b08c2607776 100644
--- a/kde-base/ksmserver/ChangeLog
+++ b/kde-base/ksmserver/ChangeLog
@@ -1,6 +1,86 @@
 # ChangeLog for kde-base/ksmserver
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ChangeLog,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
+
+*ksmserver-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksmserver-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  ksmserver-3.5_beta1.ebuild:
+  Keyword ~ppc
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  ksmserver-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksmserver-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksmserver-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksmserver-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> ksmserver-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*ksmserver-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksmserver-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksmserver-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksmserver-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksmserver-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksmserver-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksmserver-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksmserver-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksmserver-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ksmserver-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksmserver-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksmserver-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ksmserver-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksmserver-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksmserver-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksmserver-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ksmserver-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksmserver-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest
index dc890c17e5ff..72c3283f9708 100644
--- a/kde-base/ksmserver/Manifest
+++ b/kde-base/ksmserver/Manifest
@@ -1,4 +1,8 @@
-MD5 038e3bce4f0e52c4d753a6b3edc0d015 ksmserver-3.4.0_alpha1.ebuild 479
-MD5 038e3bce4f0e52c4d753a6b3edc0d015 ksmserver-3.4.0_beta1.ebuild 479
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-ksmserver-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-ksmserver-3.4.0_beta1 216
+MD5 4bdf6e5430aa0b3b81e3b3145416173d ChangeLog 2982
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksmserver-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-ksmserver-3.5.0 68
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-ksmserver-3.5_beta1 69
+MD5 90b5829b24636114361b51a0a9cf8795 ksmserver-3.4.1.ebuild 516
+MD5 7f082a9db2a225954c0e6cde4b103984 ksmserver-3.5.0.ebuild 499
+MD5 0ca5fa7a8f0292d0dd1b8c88ea52e84d ksmserver-3.5_beta1.ebuild 509
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/ksmserver/files/digest-ksmserver-3.4.1 b/kde-base/ksmserver/files/digest-ksmserver-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/ksmserver/files/digest-ksmserver-3.4.1
+++ b/kde-base/ksmserver/files/digest-ksmserver-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/ksmserver/ksmserver-3.4.1.ebuild b/kde-base/ksmserver/ksmserver-3.4.1.ebuild
index a6c76dc3b663..e2a09860c38c 100644
--- a/kde-base/ksmserver/ksmserver-3.4.1.ebuild
+++ b/kde-base/ksmserver/ksmserver-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 KMEXTRACTONLY="kdm/kfrontend/themer/"
diff --git a/kde-base/ksmserver/ksmserver-3.5.0.ebuild b/kde-base/ksmserver/ksmserver-3.5.0.ebuild
index 56c4e95696c0..63780dce4786 100644
--- a/kde-base/ksmserver/ksmserver-3.5.0.ebuild
+++ b/kde-base/ksmserver/ksmserver-3.5.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/kde-base/ksmserver/ksmserver-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ksmserver/ksmserver-3.5_beta1.ebuild b/kde-base/ksmserver/ksmserver-3.5_beta1.ebuild
index 123a3a905467..99b33b293ac0 100644
--- a/kde-base/ksmserver/ksmserver-3.5_beta1.ebuild
+++ b/kde-base/ksmserver/ksmserver-3.5_beta1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-3.5_beta1.ebuild,v 1.1 2005/09/22 20:30:13 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:21 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The reliable KDE session manager that talks the standard X11R6"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 KMEXTRACTONLY="kdm/kfrontend/themer/"
 KMCOMPILEONLY="kdmlib/"
-KMNODOCS=true
\ No newline at end of file
+KMNODOCS=true
diff --git a/kde-base/ksmserver/metadata.xml b/kde-base/ksmserver/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksmserver/metadata.xml
+++ b/kde-base/ksmserver/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksnake/ChangeLog b/kde-base/ksnake/ChangeLog
index d9e8d0aa61fe..7ea1a6f5f86e 100644
--- a/kde-base/ksnake/ChangeLog
+++ b/kde-base/ksnake/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ksnake
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ChangeLog,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksnake-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksnake-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksnake-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksnake-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksnake-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksnake-3.5_beta1.ebuild,
+  ksnake-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksnake-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.5.0_beta2.ebuild:
+  New version.
+
+*ksnake-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksnake-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksnake-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksnake-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksnake-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksnake-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksnake-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksnake-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksnake-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksnake-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksnake-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksnake-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksnake-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksnake-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksnake-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksnake-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ksnake-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksnake-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ksnake-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksnake-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksnake-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksnake/Manifest b/kde-base/ksnake/Manifest
index fd9c88a4338a..63e0559743d6 100644
--- a/kde-base/ksnake/Manifest
+++ b/kde-base/ksnake/Manifest
@@ -1,4 +1,26 @@
-MD5 5b50261ae14a078d16acbc4ca87a1b85 ksnake-3.4.0_beta1.ebuild 413
-MD5 5b50261ae14a078d16acbc4ca87a1b85 ksnake-3.4.0_alpha1.ebuild 413
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ksnake-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ksnake-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5c43d7d00f90f34a811d05a8e4f6a7cd ChangeLog 3503
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ksnake-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ksnake-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ksnake-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ksnake-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ksnake-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ksnake-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ksnake-3.5_beta1 70
+MD5 68f96d777aa7827ad6ea7ebf32b97482 ksnake-3.4.1.ebuild 530
+MD5 603b241fb939e022a4dd07a86aa5130d ksnake-3.4.2.ebuild 543
+MD5 213e0c923111b684097d3fe977e5f5b5 ksnake-3.4.3.ebuild 539
+MD5 b1b7b37ce50e22e74550262557b8873e ksnake-3.5.0.ebuild 482
+MD5 aa34b5fa09ba7711afb59cedecb3634a ksnake-3.5.0_beta2.ebuild 487
+MD5 a409b0dde2ced98bd884ba3364bf36ad ksnake-3.5.0_rc1.ebuild 486
+MD5 6b4b1e2de9ada3ae24a8ac39dd48a0ff ksnake-3.5_beta1.ebuild 522
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmFxntT9W3vfTuoRAiEaAJoCbXsOq84ctRedcLTrp42mTMzIQACfTmtg
+GzDQZRGBb9LFwhcE+4PZMk0=
+=y7/o
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksnake/files/digest-ksnake-3.4.1 b/kde-base/ksnake/files/digest-ksnake-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ksnake/files/digest-ksnake-3.4.1
+++ b/kde-base/ksnake/files/digest-ksnake-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ksnake/files/digest-ksnake-3.4.2 b/kde-base/ksnake/files/digest-ksnake-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ksnake/files/digest-ksnake-3.4.2
+++ b/kde-base/ksnake/files/digest-ksnake-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ksnake/ksnake-3.4.1.ebuild b/kde-base/ksnake/ksnake-3.4.1.ebuild
index 5274a009e387..16c935db8f19 100644
--- a/kde-base/ksnake/ksnake-3.4.1.ebuild
+++ b/kde-base/ksnake/ksnake-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Snake Race Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksnake/ksnake-3.4.2.ebuild b/kde-base/ksnake/ksnake-3.4.2.ebuild
index a7f49a3559bb..16cf55e5da38 100644
--- a/kde-base/ksnake/ksnake-3.4.2.ebuild
+++ b/kde-base/ksnake/ksnake-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Snake Race Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksnake/ksnake-3.4.3.ebuild b/kde-base/ksnake/ksnake-3.4.3.ebuild
index 0a7bb19915fd..654d1bcce74f 100644
--- a/kde-base/ksnake/ksnake-3.4.3.ebuild
+++ b/kde-base/ksnake/ksnake-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Snake Race Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksnake/ksnake-3.5.0.ebuild b/kde-base/ksnake/ksnake-3.5.0.ebuild
index 5d9ff7017c61..805688ed6389 100644
--- a/kde-base/ksnake/ksnake-3.5.0.ebuild
+++ b/kde-base/ksnake/ksnake-3.5.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/kde-base/ksnake/ksnake-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksnake/ksnake-3.5.0_beta2.ebuild b/kde-base/ksnake/ksnake-3.5.0_beta2.ebuild
index 421f3b83cd27..ef47359f54da 100644
--- a/kde-base/ksnake/ksnake-3.5.0_beta2.ebuild
+++ b/kde-base/ksnake/ksnake-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Snake Race Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ksnake/ksnake-3.5.0_rc1.ebuild b/kde-base/ksnake/ksnake-3.5.0_rc1.ebuild
index 7e2c5105fd60..4c763690839f 100644
--- a/kde-base/ksnake/ksnake-3.5.0_rc1.ebuild
+++ b/kde-base/ksnake/ksnake-3.5.0_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/kde-base/ksnake/ksnake-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksnake/ksnake-3.5_beta1.ebuild b/kde-base/ksnake/ksnake-3.5_beta1.ebuild
index ba399a793edb..0f9a4fa504c3 100644
--- a/kde-base/ksnake/ksnake-3.5_beta1.ebuild
+++ b/kde-base/ksnake/ksnake-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.5_beta1.ebuild,v 1.1 2005/09/22 20:31:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnake/ksnake-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Snake Race Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksnake/metadata.xml b/kde-base/ksnake/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksnake/metadata.xml
+++ b/kde-base/ksnake/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksnapshot/ChangeLog b/kde-base/ksnapshot/ChangeLog
index 84dcedc72f45..55dc233fad93 100644
--- a/kde-base/ksnapshot/ChangeLog
+++ b/kde-base/ksnapshot/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ksnapshot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ChangeLog,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksnapshot-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksnapshot-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ksnapshot-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksnapshot-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksnapshot-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksnapshot-3.5_beta1.ebuild,
+  ksnapshot-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  15 Oct 2005; Dan Armak <danarmak@gentoo.org> ksnapshot-3.5.0_beta2.ebuild:
+  Remove patch applied upstream.
+
+*ksnapshot-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksnapshot-3.5.0_beta2.ebuild:
+  New version.
+
+*ksnapshot-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksnapshot-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksnapshot-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksnapshot-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/ksnapshot-qt-3.3.5.patch, ksnapshot-3.4.1.ebuild,
+  +ksnapshot-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> ksnapshot-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*ksnapshot-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksnapshot-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksnapshot-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksnapshot-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksnapshot-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksnapshot-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksnapshot-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksnapshot-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksnapshot-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksnapshot-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksnapshot-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksnapshot-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ksnapshot-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ksnapshot-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ksnapshot-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ksnapshot-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksnapshot-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksnapshot/Manifest b/kde-base/ksnapshot/Manifest
index f650d3199c0b..79c20d996796 100644
--- a/kde-base/ksnapshot/Manifest
+++ b/kde-base/ksnapshot/Manifest
@@ -1,4 +1,23 @@
-MD5 e44f30c4bc27cd4ccd15dc9e6234d7cc ksnapshot-3.4.0_alpha1.ebuild 268
-MD5 e44f30c4bc27cd4ccd15dc9e6234d7cc ksnapshot-3.4.0_beta1.ebuild 268
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-ksnapshot-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-ksnapshot-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9acd281df4d9bd48ad463737ce1956a1 ChangeLog 3618
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-ksnapshot-3.4.1 221
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-ksnapshot-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-ksnapshot-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-ksnapshot-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-ksnapshot-3.5_beta1 72
+MD5 b8b19abbbc49524d1043eeed31098905 files/ksnapshot-qt-3.3.5.patch 621
+MD5 0aa08a65a12a76768433cefa5248ce5c ksnapshot-3.4.1.ebuild 450
+MD5 d908db633a1ff4dd6cddeb62e3a2f3c1 ksnapshot-3.4.3.ebuild 401
+MD5 0688fb6a500a088e32a9c3450733cbb5 ksnapshot-3.5.0.ebuild 382
+MD5 179e0583740d8cd1a6dec1d9bfcdac18 ksnapshot-3.5.0_beta2.ebuild 394
+MD5 2ec5b49d0dcf056e3256053c6310da89 ksnapshot-3.5_beta1.ebuild 429
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmjyntT9W3vfTuoRAuDbAJ9hXZuCDlZxhbl4w+rryaHnEaAarwCgryp2
+ag4GS1pXKrBbYgYuJFST8t4=
+=RKDT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksnapshot/files/digest-ksnapshot-3.4.1 b/kde-base/ksnapshot/files/digest-ksnapshot-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/ksnapshot/files/digest-ksnapshot-3.4.1
+++ b/kde-base/ksnapshot/files/digest-ksnapshot-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/ksnapshot/ksnapshot-3.4.1.ebuild b/kde-base/ksnapshot/ksnapshot-3.4.1.ebuild
index 723465415f0f..92657a90b0e3 100644
--- a/kde-base/ksnapshot/ksnapshot-3.4.1.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-3.4.1.ebuild
@@ -1,12 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
\ No newline at end of file
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE=""
+
+PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
+
diff --git a/kde-base/ksnapshot/ksnapshot-3.4.3.ebuild b/kde-base/ksnapshot/ksnapshot-3.4.3.ebuild
index 7cbbc87cf4ac..7781c055e21a 100644
--- a/kde-base/ksnapshot/ksnapshot-3.4.3.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-3.4.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/kde-base/ksnapshot/ksnapshot-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,8 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
-
diff --git a/kde-base/ksnapshot/ksnapshot-3.5.0.ebuild b/kde-base/ksnapshot/ksnapshot-3.5.0.ebuild
index aa06b327c5cf..34900a4b10c9 100644
--- a/kde-base/ksnapshot/ksnapshot-3.5.0.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-3.5.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/kde-base/ksnapshot/ksnapshot-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/ksnapshot/ksnapshot-3.5.0_beta2.ebuild b/kde-base/ksnapshot/ksnapshot-3.5.0_beta2.ebuild
index 7654cb8c2a75..543d39265b59 100644
--- a/kde-base/ksnapshot/ksnapshot-3.5.0_beta2.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-3.5.0_beta2.ebuild
@@ -1,15 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
-
diff --git a/kde-base/ksnapshot/ksnapshot-3.5_beta1.ebuild b/kde-base/ksnapshot/ksnapshot-3.5_beta1.ebuild
index 44dffe419b88..a67aa8005ed1 100644
--- a/kde-base/ksnapshot/ksnapshot-3.5_beta1.ebuild
+++ b/kde-base/ksnapshot/ksnapshot-3.5_beta1.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/kde-base/ksnapshot/ksnapshot-3.5_beta1.ebuild,v 1.1 2005/09/22 20:31:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksnapshot/ksnapshot-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Screenshot Utility"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
diff --git a/kde-base/ksnapshot/metadata.xml b/kde-base/ksnapshot/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksnapshot/metadata.xml
+++ b/kde-base/ksnapshot/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksokoban/ChangeLog b/kde-base/ksokoban/ChangeLog
index 2f7b1c40c1dc..d46f77c27fbd 100644
--- a/kde-base/ksokoban/ChangeLog
+++ b/kde-base/ksokoban/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ksokoban
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ChangeLog,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksokoban-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksokoban-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksokoban-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksokoban-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksokoban-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksokoban-3.5_beta1.ebuild,
+  ksokoban-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksokoban-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.5.0_beta2.ebuild:
+  New version.
+
+*ksokoban-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksokoban-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksokoban-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksokoban-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksokoban-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksokoban-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksokoban-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksokoban-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksokoban-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksokoban-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksokoban-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksokoban-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksokoban-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksokoban-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksokoban-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksokoban-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksokoban-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksokoban-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksokoban-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksokoban-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksokoban-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksokoban/Manifest b/kde-base/ksokoban/Manifest
index 77178af0ad18..25374c532725 100644
--- a/kde-base/ksokoban/Manifest
+++ b/kde-base/ksokoban/Manifest
@@ -1,4 +1,26 @@
-MD5 66f039737140cf80875025c531725622 ksokoban-3.4.0_alpha1.ebuild 428
-MD5 66f039737140cf80875025c531725622 ksokoban-3.4.0_beta1.ebuild 428
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ksokoban-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ksokoban-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1ae82a963e27d4bcd9e89d60e6d5ee2d ChangeLog 3605
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ksokoban-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ksokoban-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ksokoban-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ksokoban-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ksokoban-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ksokoban-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ksokoban-3.5_beta1 70
+MD5 1ba6e4b8955f6531be68ac85460f4a76 ksokoban-3.4.1.ebuild 549
+MD5 976a8d361928453f731aeace546ca282 ksokoban-3.4.2.ebuild 562
+MD5 cc4ed5db1eb6dbbca3eda05027b6e144 ksokoban-3.4.3.ebuild 558
+MD5 487a318dfde2ef038e06b50fa2c12850 ksokoban-3.5.0.ebuild 501
+MD5 ca78a7ab504d5cd5f6f9e263b197a20a ksokoban-3.5.0_beta2.ebuild 506
+MD5 681464d82f27feaf469db5248e9657ae ksokoban-3.5.0_rc1.ebuild 505
+MD5 932d6d36421cc177a17c02dd220576c6 ksokoban-3.5_beta1.ebuild 541
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmGontT9W3vfTuoRAlFSAJ0fSS3oHjctBxlra3TbA6ETqfeSTQCffp+i
+Pxb4KLuCVGlelnnFTGtYmwg=
+=K/yT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksokoban/files/digest-ksokoban-3.4.1 b/kde-base/ksokoban/files/digest-ksokoban-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ksokoban/files/digest-ksokoban-3.4.1
+++ b/kde-base/ksokoban/files/digest-ksokoban-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ksokoban/files/digest-ksokoban-3.4.2 b/kde-base/ksokoban/files/digest-ksokoban-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ksokoban/files/digest-ksokoban-3.4.2
+++ b/kde-base/ksokoban/files/digest-ksokoban-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ksokoban/ksokoban-3.4.1.ebuild b/kde-base/ksokoban/ksokoban-3.4.1.ebuild
index 51b8fbfcaae4..e6772bfc5b17 100644
--- a/kde-base/ksokoban/ksokoban-3.4.1.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The japanese warehouse keeper game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksokoban/ksokoban-3.4.2.ebuild b/kde-base/ksokoban/ksokoban-3.4.2.ebuild
index 9c4c63742e46..62602cc80861 100644
--- a/kde-base/ksokoban/ksokoban-3.4.2.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.4.2.ebuild,v 1.1 2005/07/28 21:16:22 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The japanese warehouse keeper game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksokoban/ksokoban-3.4.3.ebuild b/kde-base/ksokoban/ksokoban-3.4.3.ebuild
index 647e1eb1dc1c..2c9c1abb9b66 100644
--- a/kde-base/ksokoban/ksokoban-3.4.3.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The japanese warehouse keeper game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksokoban/ksokoban-3.5.0.ebuild b/kde-base/ksokoban/ksokoban-3.5.0.ebuild
index 5676ddbec9fb..e62ca7f26630 100644
--- a/kde-base/ksokoban/ksokoban-3.5.0.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.5.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/kde-base/ksokoban/ksokoban-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksokoban/ksokoban-3.5.0_beta2.ebuild b/kde-base/ksokoban/ksokoban-3.5.0_beta2.ebuild
index 9aebf5486eeb..cafc3a1d8361 100644
--- a/kde-base/ksokoban/ksokoban-3.5.0_beta2.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The japanese warehouse keeper game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ksokoban/ksokoban-3.5.0_rc1.ebuild b/kde-base/ksokoban/ksokoban-3.5.0_rc1.ebuild
index 3d8b10e18a81..5343e480a973 100644
--- a/kde-base/ksokoban/ksokoban-3.5.0_rc1.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.5.0_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/kde-base/ksokoban/ksokoban-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksokoban/ksokoban-3.5_beta1.ebuild b/kde-base/ksokoban/ksokoban-3.5_beta1.ebuild
index 64aad4487561..51d78aa1d935 100644
--- a/kde-base/ksokoban/ksokoban-3.5_beta1.ebuild
+++ b/kde-base/ksokoban/ksokoban-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.5_beta1.ebuild,v 1.1 2005/09/22 20:32:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksokoban/ksokoban-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="The japanese warehouse keeper game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ksokoban/metadata.xml b/kde-base/ksokoban/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksokoban/metadata.xml
+++ b/kde-base/ksokoban/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kspaceduel/ChangeLog b/kde-base/kspaceduel/ChangeLog
index 29613c0c7dd1..532a92a9ac2c 100644
--- a/kde-base/kspaceduel/ChangeLog
+++ b/kde-base/kspaceduel/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/kspaceduel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/ChangeLog,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kspaceduel-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kspaceduel-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kspaceduel-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kspaceduel-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kspaceduel-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kspaceduel-3.5_beta1.ebuild,
+  kspaceduel-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kspaceduel-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.5.0_beta2.ebuild:
+  New version.
+
+*kspaceduel-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kspaceduel-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kspaceduel-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kspaceduel-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kspaceduel-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kspaceduel-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kspaceduel-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kspaceduel-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kspaceduel-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kspaceduel-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kspaceduel-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kspaceduel-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kspaceduel-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kspaceduel-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kspaceduel-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kspaceduel-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kspaceduel-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kspaceduel-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kspaceduel-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kspaceduel-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kspaceduel-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kspaceduel-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kspaceduel/Manifest b/kde-base/kspaceduel/Manifest
index 80aefae6bd01..71cbb759669f 100644
--- a/kde-base/kspaceduel/Manifest
+++ b/kde-base/kspaceduel/Manifest
@@ -1,4 +1,26 @@
-MD5 e20cc08cb6f7e9986d297f291d931852 kspaceduel-3.4.0_alpha1.ebuild 408
-MD5 e20cc08cb6f7e9986d297f291d931852 kspaceduel-3.4.0_beta1.ebuild 408
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kspaceduel-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kspaceduel-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 132b638a2d20f27914031343843c5628 ChangeLog 3691
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kspaceduel-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kspaceduel-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kspaceduel-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kspaceduel-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kspaceduel-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kspaceduel-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kspaceduel-3.5_beta1 70
+MD5 2427e0b5586605512fa47cd5b3173bbc kspaceduel-3.4.1.ebuild 533
+MD5 15a727a402747625f159dddfb514d9d1 kspaceduel-3.4.2.ebuild 546
+MD5 ce81d0a21efca003cba2768a73883575 kspaceduel-3.4.3.ebuild 542
+MD5 8fd760d404862c05e13f4e55a5be9be1 kspaceduel-3.5.0.ebuild 485
+MD5 93723221028f3221b35a35d0ee4404a7 kspaceduel-3.5.0_beta2.ebuild 490
+MD5 48efdefe23a4e7d661da4ba183a4b1e1 kspaceduel-3.5.0_rc1.ebuild 489
+MD5 b2472115ec2e2d398782ac96a7387369 kspaceduel-3.5_beta1.ebuild 525
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmHuntT9W3vfTuoRAqOiAJ48RlpMr3ql4qoT0IoiO6f9FnMZYACdG8+Y
+B6UtBaKl2ZMttHQsiKqtAlc=
+=vFuz
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kspaceduel/files/digest-kspaceduel-3.4.1 b/kde-base/kspaceduel/files/digest-kspaceduel-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kspaceduel/files/digest-kspaceduel-3.4.1
+++ b/kde-base/kspaceduel/files/digest-kspaceduel-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kspaceduel/files/digest-kspaceduel-3.4.2 b/kde-base/kspaceduel/files/digest-kspaceduel-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kspaceduel/files/digest-kspaceduel-3.4.2
+++ b/kde-base/kspaceduel/files/digest-kspaceduel-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kspaceduel/kspaceduel-3.4.1.ebuild b/kde-base/kspaceduel/kspaceduel-3.4.1.ebuild
index 044924e76033..be7069fa8efa 100644
--- a/kde-base/kspaceduel/kspaceduel-3.4.1.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kspaceduel/kspaceduel-3.4.2.ebuild b/kde-base/kspaceduel/kspaceduel-3.4.2.ebuild
index 905a18c4199a..f07bf2e33f38 100644
--- a/kde-base/kspaceduel/kspaceduel-3.4.2.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kspaceduel/kspaceduel-3.4.3.ebuild b/kde-base/kspaceduel/kspaceduel-3.4.3.ebuild
index 4657f2dfd859..f22038241e2c 100644
--- a/kde-base/kspaceduel/kspaceduel-3.4.3.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kspaceduel/kspaceduel-3.5.0.ebuild b/kde-base/kspaceduel/kspaceduel-3.5.0.ebuild
index 17aead62ce90..af964df16597 100644
--- a/kde-base/kspaceduel/kspaceduel-3.5.0.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.5.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/kde-base/kspaceduel/kspaceduel-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kspaceduel/kspaceduel-3.5.0_beta2.ebuild b/kde-base/kspaceduel/kspaceduel-3.5.0_beta2.ebuild
index d43bc94a3824..4bafb9164c3c 100644
--- a/kde-base/kspaceduel/kspaceduel-3.5.0_beta2.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kspaceduel/kspaceduel-3.5.0_rc1.ebuild b/kde-base/kspaceduel/kspaceduel-3.5.0_rc1.ebuild
index 499e0161dad4..a6dc8c8074c8 100644
--- a/kde-base/kspaceduel/kspaceduel-3.5.0_rc1.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.5.0_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/kde-base/kspaceduel/kspaceduel-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kspaceduel/kspaceduel-3.5_beta1.ebuild b/kde-base/kspaceduel/kspaceduel-3.5_beta1.ebuild
index 09c648a64e1a..9531e038b009 100644
--- a/kde-base/kspaceduel/kspaceduel-3.5_beta1.ebuild
+++ b/kde-base/kspaceduel/kspaceduel-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.5_beta1.ebuild,v 1.1 2005/09/22 20:33:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspaceduel/kspaceduel-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:05 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Space Game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kspaceduel/metadata.xml b/kde-base/kspaceduel/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kspaceduel/metadata.xml
+++ b/kde-base/kspaceduel/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksplashml/ChangeLog b/kde-base/ksplashml/ChangeLog
index 01121809496b..f77075e27921 100644
--- a/kde-base/ksplashml/ChangeLog
+++ b/kde-base/ksplashml/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/ksplashml
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ChangeLog,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksplashml-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksplashml-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ksplashml-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksplashml-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksplashml-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org> ChangeLog:
+  Keyword ~ppc
+
+*ksplashml-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.5.0_beta2.ebuild:
+  New version.
+
+*ksplashml-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  ksplashml-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksplashml-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksplashml-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksplashml-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksplashml-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksplashml-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksplashml-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksplashml-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksplashml-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksplashml-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksplashml-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksplashml-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksplashml-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ksplashml-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksplashml-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksplashml-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ksplashml-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksplashml-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksplashml-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*ksplashml-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ksplashml-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksplashml-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksplashml/Manifest b/kde-base/ksplashml/Manifest
index ff885b95af89..807de0914297 100644
--- a/kde-base/ksplashml/Manifest
+++ b/kde-base/ksplashml/Manifest
@@ -1,4 +1,26 @@
-MD5 a488cf15ff569e6e07c4c5342b3c7591 ksplashml-3.4.0_beta1.ebuild 679
-MD5 a488cf15ff569e6e07c4c5342b3c7591 ksplashml-3.4.0_alpha1.ebuild 679
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-ksplashml-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-ksplashml-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6ae19bc65ae3a107b9552a2092718e28 ChangeLog 3698
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksplashml-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ksplashml-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ksplashml-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-ksplashml-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-ksplashml-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-ksplashml-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-ksplashml-3.5_beta1 69
+MD5 74938eb37f676ad3d3846ae958978035 ksplashml-3.4.1.ebuild 450
+MD5 b0a0fa51cd7386f08ac2e0d0c14ba792 ksplashml-3.4.2.ebuild 463
+MD5 facad2dda5fe75856b5532edf9fdde58 ksplashml-3.4.3.ebuild 459
+MD5 b027e943e84f8c6000825d4d0eb9ad57 ksplashml-3.5.0.ebuild 444
+MD5 45d8270d8609821750991f3c1ca08e3e ksplashml-3.5.0_beta2.ebuild 447
+MD5 9baa1dbf855b68a5de6a57cd53d2b693 ksplashml-3.5.0_rc1.ebuild 448
+MD5 153e2c5778110437c73967f286ea9836 ksplashml-3.5_beta1.ebuild 445
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj0jntT9W3vfTuoRAr60AJsHdsPIxJLTFxoSknu0k9Ey5zhZ9gCglmcX
++fgjJt1386G7Oba1Zqi+SUQ=
+=hhDf
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksplashml/files/digest-ksplashml-3.4.1 b/kde-base/ksplashml/files/digest-ksplashml-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/ksplashml/files/digest-ksplashml-3.4.1
+++ b/kde-base/ksplashml/files/digest-ksplashml-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/ksplashml/files/digest-ksplashml-3.4.2 b/kde-base/ksplashml/files/digest-ksplashml-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/ksplashml/files/digest-ksplashml-3.4.2
+++ b/kde-base/ksplashml/files/digest-ksplashml-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/ksplashml/ksplashml-3.4.1.ebuild b/kde-base/ksplashml/ksplashml-3.4.1.ebuild
index 65370578de8f..cfd535d84bfe 100644
--- a/kde-base/ksplashml/ksplashml-3.4.1.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.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/kde-base/ksplashml/ksplashml-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/ksplashml/ksplashml-3.4.2.ebuild b/kde-base/ksplashml/ksplashml-3.4.2.ebuild
index fe5d9f733320..a639e14eb22d 100644
--- a/kde-base/ksplashml/ksplashml-3.4.2.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.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/kde-base/ksplashml/ksplashml-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/ksplashml/ksplashml-3.4.3.ebuild b/kde-base/ksplashml/ksplashml-3.4.3.ebuild
index b11f96ec03f2..75c7203e0d24 100644
--- a/kde-base/ksplashml/ksplashml-3.4.3.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.4.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/kde-base/ksplashml/ksplashml-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/ksplashml/ksplashml-3.5.0.ebuild b/kde-base/ksplashml/ksplashml-3.5.0.ebuild
index 0a46cce85930..c343fd5a457e 100644
--- a/kde-base/ksplashml/ksplashml-3.5.0.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.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/kde-base/ksplashml/ksplashml-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ksplashml/ksplashml-3.5.0_beta2.ebuild b/kde-base/ksplashml/ksplashml-3.5.0_beta2.ebuild
index 1c683aa7aa5f..fe24465ab704 100644
--- a/kde-base/ksplashml/ksplashml-3.5.0_beta2.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.0_beta2.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/kde-base/ksplashml/ksplashml-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
diff --git a/kde-base/ksplashml/ksplashml-3.5.0_rc1.ebuild b/kde-base/ksplashml/ksplashml-3.5.0_rc1.ebuild
index 8b49398dcecd..094f87501783 100644
--- a/kde-base/ksplashml/ksplashml-3.5.0_rc1.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5.0_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/kde-base/ksplashml/ksplashml-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ksplashml/ksplashml-3.5_beta1.ebuild b/kde-base/ksplashml/ksplashml-3.5_beta1.ebuild
index 412c06c76497..9ec51dbc4692 100644
--- a/kde-base/ksplashml/ksplashml-3.5_beta1.ebuild
+++ b/kde-base/ksplashml/ksplashml-3.5_beta1.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/kde-base/ksplashml/ksplashml-3.5_beta1.ebuild,v 1.1 2005/09/22 20:34:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplashml/ksplashml-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE splashscreen framework (the splashscreen of KDE itself, not of individual apps)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/ksplashml/metadata.xml b/kde-base/ksplashml/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksplashml/metadata.xml
+++ b/kde-base/ksplashml/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kspy/ChangeLog b/kde-base/kspy/ChangeLog
index a440ab5d67df..88ae888a3066 100644
--- a/kde-base/kspy/ChangeLog
+++ b/kde-base/kspy/ChangeLog
@@ -1,6 +1,64 @@
 # ChangeLog for kde-base/kspy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kspy/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspy/ChangeLog,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
+
+*kspy-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kspy-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kspy-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kspy-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kspy-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kspy-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kspy-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kspy-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kspy-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kspy-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kspy-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kspy-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kspy-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kspy-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kspy-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kspy-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kspy-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kspy-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kspy-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kspy-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kspy/Manifest b/kde-base/kspy/Manifest
index e8b4bd43ee44..17bd1409701a 100644
--- a/kde-base/kspy/Manifest
+++ b/kde-base/kspy/Manifest
@@ -1,4 +1,8 @@
-MD5 bc5c3aec119ce171ba708036ccef9b77 kspy-3.4.0_alpha1.ebuild 337
-MD5 bc5c3aec119ce171ba708036ccef9b77 kspy-3.4.0_beta1.ebuild 337
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kspy-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kspy-3.4.0_beta1 210
+MD5 d2929e0b3f78204c595a303d53c1f9eb ChangeLog 2327
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kspy-3.4.1 206
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kspy-3.5.0 66
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kspy-3.5_beta1 67
+MD5 1a29cea7bfa2298de065486f106ab76b kspy-3.4.1.ebuild 456
+MD5 22bfc2c6d2a2fa728f989304aca75bb8 kspy-3.5.0.ebuild 439
+MD5 1f256bf4fb1ee44cf312fc8237a1a24b kspy-3.5_beta1.ebuild 449
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kspy/files/digest-kspy-3.4.1 b/kde-base/kspy/files/digest-kspy-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kspy/files/digest-kspy-3.4.1
+++ b/kde-base/kspy/files/digest-kspy-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kspy/kspy-3.4.1.ebuild b/kde-base/kspy/kspy-3.4.1.ebuild
index 9d70d9a4559f..5043d07b514d 100644
--- a/kde-base/kspy/kspy-3.4.1.ebuild
+++ b/kde-base/kspy/kspy-3.4.1.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/kde-base/kspy/kspy-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspy/kspy-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kspy - an utility intended to help developers examine the internal state of a Qt/KDE application"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kspy/kspy-3.5.0.ebuild b/kde-base/kspy/kspy-3.5.0.ebuild
index eaa3f7daca2f..25f94a7fab39 100644
--- a/kde-base/kspy/kspy-3.5.0.ebuild
+++ b/kde-base/kspy/kspy-3.5.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/kde-base/kspy/kspy-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspy/kspy-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kspy/kspy-3.5_beta1.ebuild b/kde-base/kspy/kspy-3.5_beta1.ebuild
index 20d50757f4b4..bc1cfb63a8a9 100644
--- a/kde-base/kspy/kspy-3.5_beta1.ebuild
+++ b/kde-base/kspy/kspy-3.5_beta1.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/kde-base/kspy/kspy-3.5_beta1.ebuild,v 1.1 2005/09/22 20:35:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kspy/kspy-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kspy - an utility intended to help developers examine the internal state of a Qt/KDE application"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kspy/metadata.xml b/kde-base/kspy/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kspy/metadata.xml
+++ b/kde-base/kspy/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kstars/ChangeLog b/kde-base/kstars/ChangeLog
index d378d29d6e03..d735477b8528 100644
--- a/kde-base/kstars/ChangeLog
+++ b/kde-base/kstars/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kstars
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/ChangeLog,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kstars-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kstars-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kstars-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kstars-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kstars-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kstars-3.5_beta1.ebuild,
+  kstars-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kstars-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.5.0_beta2.ebuild:
+  New version.
+
+*kstars-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kstars-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  23 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> kstars-3.5_beta1.ebuild:
+  Fixes to enable compilation.
+
+*kstars-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kstars-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kstars-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kstars-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kstars-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kstars-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kstars-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kstars-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kstars-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kstars-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kstars-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  24 Mar 2005; Daniel Goller <morfic@gentoo.org> kstars-3.4.0.ebuild:
+  remove old patch on ppc and ppc64
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kstars-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kstars-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kstars-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kstars-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kstars-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+*kstars-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kstars-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kstars-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kstars/Manifest b/kde-base/kstars/Manifest
index 152f098bb039..18431f8f9694 100644
--- a/kde-base/kstars/Manifest
+++ b/kde-base/kstars/Manifest
@@ -1,4 +1,26 @@
-MD5 3906edaf9f8a333ed60138f1dc78650f kstars-3.4.0_beta1.ebuild 701
-MD5 3906edaf9f8a333ed60138f1dc78650f kstars-3.4.0_alpha1.ebuild 701
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kstars-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kstars-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8eff1b801576f6794230f24e60d3d88e ChangeLog 3743
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kstars-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kstars-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kstars-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kstars-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kstars-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kstars-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kstars-3.5_beta1 68
+MD5 2903c2a4c1065de2e18011a06826afaa kstars-3.4.1.ebuild 649
+MD5 18f1b2297565b1d2b59343c697865d65 kstars-3.4.2.ebuild 662
+MD5 9258c2e84d05faa6f45da0415857e57d kstars-3.4.3.ebuild 660
+MD5 01d22fce1e55301a213c77e81558084d kstars-3.5.0.ebuild 657
+MD5 01bdbf5f52fed3b1904baac22218acc7 kstars-3.5.0_beta2.ebuild 662
+MD5 80db5c5e7f7e07a169c61236737bd0da kstars-3.5.0_rc1.ebuild 661
+MD5 79749813def409c1fde782006d333a5b kstars-3.5_beta1.ebuild 695
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlS6ntT9W3vfTuoRAoosAJ0cbUXMRBzvLzBpwPbXdQf+CkFQXwCgoigL
+x10pfPsB6yYKlqWQy/A+nZQ=
+=Qdab
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kstars/files/digest-kstars-3.4.1 b/kde-base/kstars/files/digest-kstars-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kstars/files/digest-kstars-3.4.1
+++ b/kde-base/kstars/files/digest-kstars-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kstars/files/digest-kstars-3.4.2 b/kde-base/kstars/files/digest-kstars-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kstars/files/digest-kstars-3.4.2
+++ b/kde-base/kstars/files/digest-kstars-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kstars/kstars-3.4.1.ebuild b/kde-base/kstars/kstars-3.4.1.ebuild
index 635b7b020f5c..046f2e482b9f 100644
--- a/kde-base/kstars/kstars-3.4.1.ebuild
+++ b/kde-base/kstars/kstars-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/kstars/kstars-3.4.2.ebuild b/kde-base/kstars/kstars-3.4.2.ebuild
index ecabb1b2751a..6572c56ca062 100644
--- a/kde-base/kstars/kstars-3.4.2.ebuild
+++ b/kde-base/kstars/kstars-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/kstars/kstars-3.4.3.ebuild b/kde-base/kstars/kstars-3.4.3.ebuild
index 53d6448883b2..6dcfcb1856c3 100644
--- a/kde-base/kstars/kstars-3.4.3.ebuild
+++ b/kde-base/kstars/kstars-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.4.3.ebuild,v 1.1 2005/10/13 00:10:05 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange 3.4.2 $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
diff --git a/kde-base/kstars/kstars-3.5.0.ebuild b/kde-base/kstars/kstars-3.5.0.ebuild
index e6c00af56699..a137c9fc79ae 100644
--- a/kde-base/kstars/kstars-3.5.0.ebuild
+++ b/kde-base/kstars/kstars-3.5.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/kde-base/kstars/kstars-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kstars/kstars-3.5.0_beta2.ebuild b/kde-base/kstars/kstars-3.5.0_beta2.ebuild
index 1f1b0a755a6b..b46cd92b940c 100644
--- a/kde-base/kstars/kstars-3.5.0_beta2.ebuild
+++ b/kde-base/kstars/kstars-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 
diff --git a/kde-base/kstars/kstars-3.5.0_rc1.ebuild b/kde-base/kstars/kstars-3.5.0_rc1.ebuild
index 70267ae95d12..aba2b0833351 100644
--- a/kde-base/kstars/kstars-3.5.0_rc1.ebuild
+++ b/kde-base/kstars/kstars-3.5.0_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/kde-base/kstars/kstars-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kstars/kstars-3.5_beta1.ebuild b/kde-base/kstars/kstars-3.5_beta1.ebuild
index 22eb0c48484e..f989b68a3746 100644
--- a/kde-base/kstars/kstars-3.5_beta1.ebuild
+++ b/kde-base/kstars/kstars-3.5_beta1.ebuild
@@ -1,20 +1,23 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.5_beta1.ebuild,v 1.1 2005/09/22 20:36:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstars/kstars-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:37 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Desktop Planetarium"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 OLDDEPEND="~kde-base/libkdeedu-$PV"
 
-KMEXTRACTONLY="libkdeedu/extdate libkdeedu/kdeeduplot"
+KMEXTRACTONLY="libkdeedu/extdate
+	libkdeedu/kdeeduplot
+	libkdeedu/kdeeduui"
 KMCOPYLIB="libextdate libkdeedu/extdate
-	    libkdeeduplot libkdeedu/kdeeduplot"
+	    libkdeeduplot libkdeedu/kdeeduplot
+		libkdeeduui libkdeedu/kdeeduui"
 
 src_unpack () {
 	kde-meta_src_unpack
diff --git a/kde-base/kstars/metadata.xml b/kde-base/kstars/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kstars/metadata.xml
+++ b/kde-base/kstars/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kstart/ChangeLog b/kde-base/kstart/ChangeLog
index 4420cdfcdcc7..e9e895ef90c5 100644
--- a/kde-base/kstart/ChangeLog
+++ b/kde-base/kstart/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for kde-base/kstart
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/ChangeLog,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
+
+*kstart-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kstart-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kstart-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kstart-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kstart-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kstart-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kstart-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kstart-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kstart-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kstart-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kstart-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kstart-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kstart-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kstart-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kstart-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kstart-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kstart-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kstart-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kstart-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kstart-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kstart-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kstart-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kstart-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kstart-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kstart/Manifest b/kde-base/kstart/Manifest
index cfcff9932a70..712e2db9ce45 100644
--- a/kde-base/kstart/Manifest
+++ b/kde-base/kstart/Manifest
@@ -1,4 +1,8 @@
-MD5 e09600444aa304f216bf9c9c16166255 kstart-3.4.0_alpha1.ebuild 409
-MD5 e09600444aa304f216bf9c9c16166255 kstart-3.4.0_beta1.ebuild 409
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kstart-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kstart-3.4.0_beta1 216
+MD5 969e08a2281f33125c71ea510d562bb5 ChangeLog 2771
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kstart-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kstart-3.5.0 68
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kstart-3.5_beta1 69
+MD5 224c754027a438d08120e4a708a25eb7 kstart-3.4.1.ebuild 440
+MD5 c999935920c87057629fc7389bdde6f4 kstart-3.5.0.ebuild 417
+MD5 027836b147c0b29fc74ecf26f4f8e31b kstart-3.5_beta1.ebuild 427
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kstart/files/digest-kstart-3.4.1 b/kde-base/kstart/files/digest-kstart-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kstart/files/digest-kstart-3.4.1
+++ b/kde-base/kstart/files/digest-kstart-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kstart/kstart-3.4.1.ebuild b/kde-base/kstart/kstart-3.4.1.ebuild
index d6c7b3f75793..64d11fd4f687 100644
--- a/kde-base/kstart/kstart-3.4.1.ebuild
+++ b/kde-base/kstart/kstart-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kstart/kstart-3.5.0.ebuild b/kde-base/kstart/kstart-3.5.0.ebuild
index 028a6c9dee73..2cd360a38615 100644
--- a/kde-base/kstart/kstart-3.5.0.ebuild
+++ b/kde-base/kstart/kstart-3.5.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/kde-base/kstart/kstart-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kstart/kstart-3.5_beta1.ebuild b/kde-base/kstart/kstart-3.5_beta1.ebuild
index 1a1273bb8c92..ed133ba3c3f5 100644
--- a/kde-base/kstart/kstart-3.5_beta1.ebuild
+++ b/kde-base/kstart/kstart-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-3.5_beta1.ebuild,v 1.1 2005/09/22 20:37:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kstart/kstart-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Utility to launch applications with special window properties"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kstart/metadata.xml b/kde-base/kstart/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kstart/metadata.xml
+++ b/kde-base/kstart/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksvg/ChangeLog b/kde-base/ksvg/ChangeLog
index 5f25d437e190..ac945d5776bf 100644
--- a/kde-base/ksvg/ChangeLog
+++ b/kde-base/ksvg/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/ksvg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ChangeLog,v 1.1 2005/02/11 15:51:17 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ChangeLog,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksvg-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksvg-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksvg-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksvg-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksvg-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksvg-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksvg-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksvg-3.5_beta1.ebuild,
+  ksvg-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksvg-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksvg-3.5.0_beta2.ebuild:
+  New version.
+
+*ksvg-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksvg-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksvg-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksvg-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ksvg-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksvg-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksvg-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksvg-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksvg-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksvg-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksvg-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksvg-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksvg-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksvg-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksvg-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksvg-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ksvg-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksvg-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksvg-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ksvg-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksvg-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  13 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> ksvg-3.4.0_beta2-r1.ebuild:
+  Added dependency on fribidi (#81852).
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> ksvg-3.4.0_beta2-r1.ebuild:
+  I realized I was wrong to add both blocking deps and a move instruction.
+  Removing the blocking deps.
 
 *ksvg-3.4.0_beta2-r1 (11 Feb 2005)
 
diff --git a/kde-base/ksvg/Manifest b/kde-base/ksvg/Manifest
index 245fa6bd039c..b39240743c36 100644
--- a/kde-base/ksvg/Manifest
+++ b/kde-base/ksvg/Manifest
@@ -1,3 +1,26 @@
-MD5 fffcf020b9e48418d67cb42ccaf26254 ksvg-3.4.0_beta2-r1.ebuild 497
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 541d4705ae9b7241e2705097fae207f8 files/digest-ksvg-3.4.0_beta2-r1 306
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dc2e7f39be192fab19d0d687a15eb6ab ChangeLog 3528
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-ksvg-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-ksvg-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-ksvg-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-ksvg-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-ksvg-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-ksvg-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-ksvg-3.5_beta1 72
+MD5 787a122b056c3c913abd0e620d623251 ksvg-3.4.1.ebuild 467
+MD5 e1c2cb0d2cccb98b0776cc2e421972bd ksvg-3.4.2.ebuild 528
+MD5 5c5717d1576319e3437b2f3e466eac82 ksvg-3.4.3.ebuild 524
+MD5 3f820a493c43e4fdcfa8eed2dd4a59ce ksvg-3.5.0.ebuild 504
+MD5 66d74f2cacbd7dcf0b9305b38ae5f5a6 ksvg-3.5.0_beta2.ebuild 509
+MD5 b784a1d28abde87d4555aed32fe14218 ksvg-3.5.0_rc1.ebuild 508
+MD5 897f93c9b98276c1d61c08c7d99766f5 ksvg-3.5_beta1.ebuild 507
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmkvntT9W3vfTuoRAnJFAJ4xx322ljuf5kdHA2bkounvr5EU3QCfY7uo
+TRPPl7KWjVAByA2aCYSLrvg=
+=6Ir6
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksvg/files/digest-ksvg-3.4.1 b/kde-base/ksvg/files/digest-ksvg-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/ksvg/files/digest-ksvg-3.4.1
+++ b/kde-base/ksvg/files/digest-ksvg-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/ksvg/files/digest-ksvg-3.4.2 b/kde-base/ksvg/files/digest-ksvg-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/ksvg/files/digest-ksvg-3.4.2
+++ b/kde-base/ksvg/files/digest-ksvg-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/ksvg/ksvg-3.4.1.ebuild b/kde-base/ksvg/ksvg-3.4.1.ebuild
index ba403825384d..705bcb30d4e9 100644
--- a/kde-base/ksvg/ksvg-3.4.1.ebuild
+++ b/kde-base/ksvg/ksvg-3.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/kde-base/ksvg/ksvg-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="SVG viewer library and embeddable kpart"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="media-libs/libart_lgpl
diff --git a/kde-base/ksvg/ksvg-3.4.2.ebuild b/kde-base/ksvg/ksvg-3.4.2.ebuild
index ae3c10c2b1a7..d5b40083b74e 100644
--- a/kde-base/ksvg/ksvg-3.4.2.ebuild
+++ b/kde-base/ksvg/ksvg-3.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/kde-base/ksvg/ksvg-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,9 +8,11 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="SVG viewer library and embeddable kpart"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-DEPEND="media-libs/libart_lgpl
+DEPEND=">=media-libs/freetype-2
+	media-libs/fontconfig
+	media-libs/libart_lgpl
 	media-libs/lcms
 	dev-libs/fribidi"
diff --git a/kde-base/ksvg/ksvg-3.4.3.ebuild b/kde-base/ksvg/ksvg-3.4.3.ebuild
index 233994cbe06e..60e32d75ab71 100644
--- a/kde-base/ksvg/ksvg-3.4.3.ebuild
+++ b/kde-base/ksvg/ksvg-3.4.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/kde-base/ksvg/ksvg-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="SVG viewer library and embeddable kpart"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/freetype-2
diff --git a/kde-base/ksvg/ksvg-3.5.0.ebuild b/kde-base/ksvg/ksvg-3.5.0.ebuild
index 2736794fa3b6..f88d9ccc2d70 100644
--- a/kde-base/ksvg/ksvg-3.5.0.ebuild
+++ b/kde-base/ksvg/ksvg-3.5.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/kde-base/ksvg/ksvg-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/ksvg/ksvg-3.5.0_beta2.ebuild b/kde-base/ksvg/ksvg-3.5.0_beta2.ebuild
index b016d7635d32..f8dc6e58615b 100644
--- a/kde-base/ksvg/ksvg-3.5.0_beta2.ebuild
+++ b/kde-base/ksvg/ksvg-3.5.0_beta2.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/kde-base/ksvg/ksvg-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="SVG viewer library and embeddable kpart"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/freetype-2
diff --git a/kde-base/ksvg/ksvg-3.5.0_rc1.ebuild b/kde-base/ksvg/ksvg-3.5.0_rc1.ebuild
index 49d45b33fbf8..a037864f86fa 100644
--- a/kde-base/ksvg/ksvg-3.5.0_rc1.ebuild
+++ b/kde-base/ksvg/ksvg-3.5.0_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/kde-base/ksvg/ksvg-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/ksvg/ksvg-3.5_beta1.ebuild b/kde-base/ksvg/ksvg-3.5_beta1.ebuild
index ec654768d38e..8c49c1a91c8b 100644
--- a/kde-base/ksvg/ksvg-3.5_beta1.ebuild
+++ b/kde-base/ksvg/ksvg-3.5_beta1.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/kde-base/ksvg/ksvg-3.5_beta1.ebuild,v 1.1 2005/09/22 20:38:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksvg/ksvg-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="SVG viewer library and embeddable kpart"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/freetype-2
diff --git a/kde-base/ksvg/metadata.xml b/kde-base/ksvg/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksvg/metadata.xml
+++ b/kde-base/ksvg/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksync/ChangeLog b/kde-base/ksync/ChangeLog
index 0bc31204a9a0..dcc6aeecea32 100644
--- a/kde-base/ksync/ChangeLog
+++ b/kde-base/ksync/ChangeLog
@@ -1,6 +1,104 @@
 # ChangeLog for kde-base/ksync
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ChangeLog,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksync-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksync-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ksync-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksync-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksync-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksync-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksync-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksync-3.5_beta1.ebuild,
+  ksync-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> ksync-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*ksync-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksync-3.5.0_beta2.ebuild:
+  New version.
+
+*ksync-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksync-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksync-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksync-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksync-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksync-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksync-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksync-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksync-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ksync-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksync-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksync-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksync-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksync-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> ksync-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksync-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksync-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ksync-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ksync-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ksync-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksync-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksync-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksync/Manifest b/kde-base/ksync/Manifest
index 0ba1d99e50ab..21d1960e5e80 100644
--- a/kde-base/ksync/Manifest
+++ b/kde-base/ksync/Manifest
@@ -1,4 +1,24 @@
-MD5 15a9a383c2f8c6708efece2ae40923a3 ksync-3.4.0_beta1.ebuild 407
-MD5 15a9a383c2f8c6708efece2ae40923a3 ksync-3.4.0_alpha1.ebuild 407
-MD5 892303ffe022b31a222f9efab549727b files/digest-ksync-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-ksync-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 045843824641a2eda9f02b787979e5a7 ChangeLog 3443
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-ksync-3.4.1 208
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-ksync-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-ksync-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-ksync-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-ksync-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-ksync-3.5_beta1 68
+MD5 521ed1d679fa08dbd31159c2e4a9a029 ksync-3.4.1.ebuild 528
+MD5 d348548919ca40c1cf19b75fcf64fea5 ksync-3.4.3.ebuild 531
+MD5 3fa642e67b03646a2a59d8fa58802b7c ksync-3.5.0.ebuild 478
+MD5 6c045c30496a2bac8df80c2586ced954 ksync-3.5.0_beta2.ebuild 483
+MD5 1423cdfb2cd18c807afe41fe1ac0219d ksync-3.5.0_rc1.ebuild 482
+MD5 f28160baf6a170e17ad2a18be4b0631f ksync-3.5_beta1.ebuild 514
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvc/ntT9W3vfTuoRAnytAJ9hiB83SXD4sVHp/98Kumkk2XEkTgCfWYEH
+bglxHVSgkyLD43rwIHTIwUw=
+=nAPb
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksync/files/digest-ksync-3.4.1 b/kde-base/ksync/files/digest-ksync-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/ksync/files/digest-ksync-3.4.1
+++ b/kde-base/ksync/files/digest-ksync-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/ksync/ksync-3.4.1.ebuild b/kde-base/ksync/ksync-3.4.1.ebuild
index e81f1e4a2664..e0d0c3b1be23 100644
--- a/kde-base/ksync/ksync-3.4.1.ebuild
+++ b/kde-base/ksync/ksync-3.4.1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.4.1.ebuild,v 1.1 2005/05/25 21:23:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE pda synchronizer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)"
+DEPEND="$(deprange $PV 3.4.2 kde-base/libkcal)"
 OLDDEPEND="~kde-base/libkcal-$PV"
 
 KMCOPYLIB="
diff --git a/kde-base/ksync/ksync-3.4.3.ebuild b/kde-base/ksync/ksync-3.4.3.ebuild
index f2e75838df4d..503d27e49bc1 100644
--- a/kde-base/ksync/ksync-3.4.3.ebuild
+++ b/kde-base/ksync/ksync-3.4.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/kde-base/ksync/ksync-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE pda synchronizer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)"
 OLDDEPEND="~kde-base/libkcal-$PV"
diff --git a/kde-base/ksync/ksync-3.5.0.ebuild b/kde-base/ksync/ksync-3.5.0.ebuild
index 8b308812850e..c596b9501f25 100644
--- a/kde-base/ksync/ksync-3.5.0.ebuild
+++ b/kde-base/ksync/ksync-3.5.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/kde-base/ksync/ksync-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/ksync/ksync-3.5.0_beta2.ebuild b/kde-base/ksync/ksync-3.5.0_beta2.ebuild
index 210e72cffb81..0971fb501621 100644
--- a/kde-base/ksync/ksync-3.5.0_beta2.ebuild
+++ b/kde-base/ksync/ksync-3.5.0_beta2.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/kde-base/ksync/ksync-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE pda synchronizer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)"
 
diff --git a/kde-base/ksync/ksync-3.5.0_rc1.ebuild b/kde-base/ksync/ksync-3.5.0_rc1.ebuild
index f44145329eea..690cf463a24a 100644
--- a/kde-base/ksync/ksync-3.5.0_rc1.ebuild
+++ b/kde-base/ksync/ksync-3.5.0_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/kde-base/ksync/ksync-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/ksync/ksync-3.5_beta1.ebuild b/kde-base/ksync/ksync-3.5_beta1.ebuild
index ecc41a483188..6747151d71d9 100644
--- a/kde-base/ksync/ksync-3.5_beta1.ebuild
+++ b/kde-base/ksync/ksync-3.5_beta1.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/kde-base/ksync/ksync-3.5_beta1.ebuild,v 1.1 2005/09/22 20:39:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksync/ksync-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:53 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE pda synchronizer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkcal)"
 OLDDEPEND="~kde-base/libkcal-$PV"
diff --git a/kde-base/ksync/metadata.xml b/kde-base/ksync/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksync/metadata.xml
+++ b/kde-base/ksync/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksysguard/ChangeLog b/kde-base/ksysguard/ChangeLog
index 3fcf9a9ac27e..a7a211b39968 100644
--- a/kde-base/ksysguard/ChangeLog
+++ b/kde-base/ksysguard/ChangeLog
@@ -1,6 +1,134 @@
 # ChangeLog for kde-base/ksysguard
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ChangeLog,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksysguard-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ksysguard-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ksysguard-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ksysguard-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksysguard-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksysguard-3.5_beta1.ebuild,
+  ksysguard-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksysguard-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.5.0_beta2.ebuild:
+  New version.
+
+*ksysguard-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksysguard-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksysguard-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksysguard-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  19 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  ksysguard-3.5_alpha1.ebuild:
+  Add support for zeroconf.
+
+*ksysguard-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksysguard-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ksysguard-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ksysguard-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksysguard-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksysguard-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksysguard-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksysguard-3.4.1-r1 (07 Jun 2005)
+
+  07 Jun 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdebase-3.4.1-configure.patch, +ksysguard-3.4.1-r1.ebuild:
+  Add patch to properly respect USE flags (#81966).
+
+*ksysguard-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksysguard-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ksysguard-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksysguard-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksysguard-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ksysguard-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  28 Feb 2005; Dan Armak <danarmak@gentoo.org> ksysguard-3.4.0_rc1.ebuild:
+  Update the dep on lm-sensors to read lm_sensors for RC1 as well.
+
+*ksysguard-3.4.0_rc1 (27 Feb 2005)
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksysguard-3.4.0_rc1.ebuild:
+  Ebuild for 3.4.0 RC1.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  ksysguard-3.4.0_beta2.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  ksysguard-3.4.0_beta1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+*ksysguard-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ksysguard-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> ksysguard-3.4.0_beta1.ebuild:
+  Added missing (optional) dep on lm_sensors. ksysguard can use lm_sensors as
+  an info source.
 
 *ksysguard-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksysguard/Manifest b/kde-base/ksysguard/Manifest
index b300bea5385c..901feeda3d30 100644
--- a/kde-base/ksysguard/Manifest
+++ b/kde-base/ksysguard/Manifest
@@ -1,4 +1,29 @@
-MD5 0a3a9f848189e4f28f43858aae10de47 ksysguard-3.4.0_alpha1.ebuild 359
-MD5 0a3a9f848189e4f28f43858aae10de47 ksysguard-3.4.0_beta1.ebuild 359
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-ksysguard-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-ksysguard-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 40d12eddc2d144cc17f7e09bbfcc0ca3 ChangeLog 4596
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksysguard-3.4.1 212
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksysguard-3.4.1-r1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ksysguard-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ksysguard-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-ksysguard-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-ksysguard-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-ksysguard-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-ksysguard-3.5_beta1 69
+MD5 430a0cdfc39b2da16bcf5cd41b65b1d6 files/kdebase-3.4.1-configure.patch 1248
+MD5 4d73618fea5e571d8486e8d253f6915e ksysguard-3.4.1-r1.ebuild 582
+MD5 9fe1b72a5365ccbc9e7b788ddbc4f6b7 ksysguard-3.4.1.ebuild 446
+MD5 ae2847a5d3a13f0813b8aefef185e54a ksysguard-3.4.2.ebuild 592
+MD5 7935330ea22835120e64b277a892b4eb ksysguard-3.4.3.ebuild 588
+MD5 8ecdc36b04492e07e70d1070918dacfb ksysguard-3.5.0.ebuild 606
+MD5 a03c5db3051e4f1e189569701e73558b ksysguard-3.5.0_beta2.ebuild 611
+MD5 8ec1fc0d1dd991856e5812ae8ad8a696 ksysguard-3.5.0_rc1.ebuild 610
+MD5 520221e02b6423c7708cc15e8f438518 ksysguard-3.5_beta1.ebuild 609
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkLrntT9W3vfTuoRAggYAJ9Ww6YJIge2j711aym6bXEW5r8Q+QCdGhEF
+0cUa8S8gGnbJWm2bxsgQi/o=
+=+FWd
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksysguard/files/digest-ksysguard-3.4.1 b/kde-base/ksysguard/files/digest-ksysguard-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/ksysguard/files/digest-ksysguard-3.4.1
+++ b/kde-base/ksysguard/files/digest-ksysguard-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/ksysguard/files/digest-ksysguard-3.4.2 b/kde-base/ksysguard/files/digest-ksysguard-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/ksysguard/files/digest-ksysguard-3.4.2
+++ b/kde-base/ksysguard/files/digest-ksysguard-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild b/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild
index 37ea2856db87..a944ee842019 100644
--- a/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.4.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/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild,v 1.1 2005/06/07 13:02:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Guard"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="lm_sensors"
 DEPEND="lm_sensors? ( sys-apps/lm_sensors )"
 
diff --git a/kde-base/ksysguard/ksysguard-3.4.1.ebuild b/kde-base/ksysguard/ksysguard-3.4.1.ebuild
index ce2aa929f4d0..784391b28d20 100644
--- a/kde-base/ksysguard/ksysguard-3.4.1.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.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/kde-base/ksysguard/ksysguard-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Guard"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE="lm_sensors"
 DEPEND="lm_sensors? ( sys-apps/lm_sensors )"
 
diff --git a/kde-base/ksysguard/ksysguard-3.4.2.ebuild b/kde-base/ksysguard/ksysguard-3.4.2.ebuild
index 16269d7a25e5..c675078316d0 100644
--- a/kde-base/ksysguard/ksysguard-3.4.2.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.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/kde-base/ksysguard/ksysguard-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Guard"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="lm_sensors"
 DEPEND="lm_sensors? ( sys-apps/lm_sensors )"
 
diff --git a/kde-base/ksysguard/ksysguard-3.4.3.ebuild b/kde-base/ksysguard/ksysguard-3.4.3.ebuild
index ad253ed95c69..dcb87a0323d6 100644
--- a/kde-base/ksysguard/ksysguard-3.4.3.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.4.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/kde-base/ksysguard/ksysguard-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Guard"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="lm_sensors"
 DEPEND="lm_sensors? ( sys-apps/lm_sensors )"
 
diff --git a/kde-base/ksysguard/ksysguard-3.5.0.ebuild b/kde-base/ksysguard/ksysguard-3.5.0.ebuild
index f2576a00c1ff..aa1b6ca28b32 100644
--- a/kde-base/ksysguard/ksysguard-3.5.0.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.5.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/kde-base/ksysguard/ksysguard-3.5.0.ebuild,v 1.1 2005/11/22 22:14:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ksysguard/ksysguard-3.5.0_beta2.ebuild b/kde-base/ksysguard/ksysguard-3.5.0_beta2.ebuild
index d04ea74aa932..b29ec6bc5af9 100644
--- a/kde-base/ksysguard/ksysguard-3.5.0_beta2.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.5.0_beta2.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/kde-base/ksysguard/ksysguard-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Guard"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="lm_sensors zeroconf"
 DEPEND="lm_sensors? ( sys-apps/lm_sensors )
 	zeroconf? ( net-misc/mDNSResponder )"
diff --git a/kde-base/ksysguard/ksysguard-3.5.0_rc1.ebuild b/kde-base/ksysguard/ksysguard-3.5.0_rc1.ebuild
index 24faa0e30c31..cec0e7898be6 100644
--- a/kde-base/ksysguard/ksysguard-3.5.0_rc1.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.5.0_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/kde-base/ksysguard/ksysguard-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ksysguard/ksysguard-3.5_beta1.ebuild b/kde-base/ksysguard/ksysguard-3.5_beta1.ebuild
index fe8523b06996..360973ec422c 100644
--- a/kde-base/ksysguard/ksysguard-3.5_beta1.ebuild
+++ b/kde-base/ksysguard/ksysguard-3.5_beta1.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/kde-base/ksysguard/ksysguard-3.5_beta1.ebuild,v 1.1 2005/09/22 20:40:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysguard/ksysguard-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE System Guard"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="lm_sensors zeroconf"
 DEPEND="lm_sensors? ( sys-apps/lm_sensors )
 	zeroconf? ( net-misc/mDNSResponder )"
diff --git a/kde-base/ksysguard/metadata.xml b/kde-base/ksysguard/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksysguard/metadata.xml
+++ b/kde-base/ksysguard/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksystraycmd/ChangeLog b/kde-base/ksystraycmd/ChangeLog
index 26365b175a62..adda12174b39 100644
--- a/kde-base/ksystraycmd/ChangeLog
+++ b/kde-base/ksystraycmd/ChangeLog
@@ -1,6 +1,78 @@
 # ChangeLog for kde-base/ksystraycmd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.1 2005/01/15 02:24:38 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
+
+*ksystraycmd-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksystraycmd-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  ksystraycmd-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksystraycmd-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksystraycmd-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksystraycmd-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> ksystraycmd-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*ksystraycmd-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksystraycmd-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ksystraycmd-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ksystraycmd-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ksystraycmd-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ksystraycmd-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ksystraycmd-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksystraycmd-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ksystraycmd-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ksystraycmd-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksystraycmd-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksystraycmd-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ksystraycmd-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*ksystraycmd-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ksystraycmd-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksystraycmd-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksystraycmd/Manifest b/kde-base/ksystraycmd/Manifest
index ddc68abaa179..3adfb81c5a73 100644
--- a/kde-base/ksystraycmd/Manifest
+++ b/kde-base/ksystraycmd/Manifest
@@ -1,4 +1,8 @@
-MD5 96afacce776d258dcdf527e59373a318 ksystraycmd-3.4.0_alpha1.ebuild 400
-MD5 96afacce776d258dcdf527e59373a318 ksystraycmd-3.4.0_beta1.ebuild 400
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-ksystraycmd-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-ksystraycmd-3.4.0_alpha1 69
+MD5 3b1702d0b7a721c607f261135ace4307 ChangeLog 2804
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ksystraycmd-3.4.1 212
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-ksystraycmd-3.5.0 68
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-ksystraycmd-3.5_beta1 69
+MD5 0cbc9c3617c87ba44a5440af47fdcdac ksystraycmd-3.4.1.ebuild 441
+MD5 97119369760aada15ab135637a21ea2d ksystraycmd-3.5.0.ebuild 418
+MD5 8332fe7594ff90c1e40cf7b9da75106a ksystraycmd-3.5_beta1.ebuild 428
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/ksystraycmd/files/digest-ksystraycmd-3.4.1 b/kde-base/ksystraycmd/files/digest-ksystraycmd-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/ksystraycmd/files/digest-ksystraycmd-3.4.1
+++ b/kde-base/ksystraycmd/files/digest-ksystraycmd-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/ksystraycmd/ksystraycmd-3.4.1.ebuild b/kde-base/ksystraycmd/ksystraycmd-3.4.1.ebuild
index 9c5296a77200..e35be19c48a0 100644
--- a/kde-base/ksystraycmd/ksystraycmd-3.4.1.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Allows any application to be kept in the system tray"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/ksystraycmd/ksystraycmd-3.5.0.ebuild b/kde-base/ksystraycmd/ksystraycmd-3.5.0.ebuild
index 993300ee7813..9b80b905ef51 100644
--- a/kde-base/ksystraycmd/ksystraycmd-3.5.0.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-3.5.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/kde-base/ksystraycmd/ksystraycmd-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ksystraycmd/ksystraycmd-3.5_beta1.ebuild b/kde-base/ksystraycmd/ksystraycmd-3.5_beta1.ebuild
index d1d91ce08962..2a113737f423 100644
--- a/kde-base/ksystraycmd/ksystraycmd-3.5_beta1.ebuild
+++ b/kde-base/ksystraycmd/ksystraycmd-3.5_beta1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-3.5_beta1.ebuild,v 1.1 2005/09/22 20:41:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksystraycmd/ksystraycmd-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:03 chriswhite Exp $
 
 KMNAME=kdebase
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Allows any application to be kept in the system tray"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/ksystraycmd/metadata.xml b/kde-base/ksystraycmd/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksystraycmd/metadata.xml
+++ b/kde-base/ksystraycmd/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ksysv/ChangeLog b/kde-base/ksysv/ChangeLog
index c93059971027..28182e282441 100644
--- a/kde-base/ksysv/ChangeLog
+++ b/kde-base/ksysv/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for kde-base/ksysv
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ChangeLog,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ksysv-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+*ksysv-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksysv-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ksysv-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ksysv-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ksysv-3.5_beta1.ebuild,
+  ksysv-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ksysv-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ksysv-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ksysv-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ksysv-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksysv-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ksysv-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ksysv-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*ksysv-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ksysv-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+*ksysv-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ksysv-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ksysv-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ksysv-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ksysv-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ksysv-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ksysv-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ksysv/Manifest b/kde-base/ksysv/Manifest
index de8f470ddd62..af3354f33feb 100644
--- a/kde-base/ksysv/Manifest
+++ b/kde-base/ksysv/Manifest
@@ -1,3 +1,24 @@
-MD5 c794652912c44899727a3cb27875ed31 ksysv-3.4.0_beta1.ebuild 293
-MD5 c794652912c44899727a3cb27875ed31 ksysv-3.4.0_alpha1.ebuild 293
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-ksysv-3.4.0_beta1 215
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 15458b933fc6c9a86f499cc8a8a10f89 ChangeLog 2430
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-ksysv-3.4.1 211
+MD5 9d1b64c1a3fcf3755ead7efab419928f files/digest-ksysv-3.4.2 286
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-ksysv-3.5.0 68
+MD5 64ad1da64ecad951c67e7899dbfa8bd7 files/digest-ksysv-3.5.0_beta2 215
+MD5 068810fa15f0ff2384c05e1d80dd3754 files/digest-ksysv-3.5.0_rc1 298
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-ksysv-3.5_beta1 69
+MD5 a86018eb13aca0ca09136468a60e6448 ksysv-3.4.1.ebuild 400
+MD5 4e7972605fe0490a3c3812d3da23e21c ksysv-3.4.2.ebuild 400
+MD5 c8e56b1488fe4b012fc8e0fc17b5a601 ksysv-3.5.0.ebuild 397
+MD5 09554027b945124b7dbc27f60116a924 ksysv-3.5.0_beta2.ebuild 402
+MD5 a4ec0716705abd99e9dc4b6307b30669 ksysv-3.5.0_rc1.ebuild 401
+MD5 19bce219c75e250c6d751c41908eac8b ksysv-3.5_beta1.ebuild 400
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkoMntT9W3vfTuoRArijAJ45VQOpKaIuMA68GO4bnj8QG0MrdACgj27k
+SJ1iJP5HfhKKz5RV1pVLewg=
+=Ucal
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ksysv/files/digest-ksysv-3.4.1 b/kde-base/ksysv/files/digest-ksysv-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/ksysv/files/digest-ksysv-3.4.1
+++ b/kde-base/ksysv/files/digest-ksysv-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/ksysv/files/digest-ksysv-3.4.2 b/kde-base/ksysv/files/digest-ksysv-3.4.2
index 704ba375213a..7a7584d3ac0d 100644
--- a/kde-base/ksysv/files/digest-ksysv-3.4.2
+++ b/kde-base/ksysv/files/digest-ksysv-3.4.2
@@ -1 +1,4 @@
+MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
+MD5 b4066d3c4962fdb0d5ae5820bb09ce8d kdeadmin-3.4.1-3.4.2.tar.xdelta 63771
 MD5 ef1d4be02bbe384d46e807421dd52fed kdeadmin-3.4.2.tar.bz2 1520873
diff --git a/kde-base/ksysv/ksysv-3.4.1.ebuild b/kde-base/ksysv/ksysv-3.4.1.ebuild
index f98efa4b10af..0a5e04a3b360 100644
--- a/kde-base/ksysv/ksysv-3.4.1.ebuild
+++ b/kde-base/ksysv/ksysv-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Editor for Sys-V like init configurations"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ksysv/ksysv-3.4.2.ebuild b/kde-base/ksysv/ksysv-3.4.2.ebuild
index bd16355d719c..d0a70aa88428 100644
--- a/kde-base/ksysv/ksysv-3.4.2.ebuild
+++ b/kde-base/ksysv/ksysv-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Editor for Sys-V like init configurations"
-KEYWORDS=" ~x86 ~amd64 ~ppc"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ksysv/ksysv-3.5.0.ebuild b/kde-base/ksysv/ksysv-3.5.0.ebuild
index 507be6815acf..1cf08d1c5743 100644
--- a/kde-base/ksysv/ksysv-3.5.0.ebuild
+++ b/kde-base/ksysv/ksysv-3.5.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/kde-base/ksysv/ksysv-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksysv/ksysv-3.5.0_beta2.ebuild b/kde-base/ksysv/ksysv-3.5.0_beta2.ebuild
index ed503cb3be44..30e7b49531bd 100644
--- a/kde-base/ksysv/ksysv-3.5.0_beta2.ebuild
+++ b/kde-base/ksysv/ksysv-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Editor for Sys-V like init configurations"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ksysv/ksysv-3.5.0_rc1.ebuild b/kde-base/ksysv/ksysv-3.5.0_rc1.ebuild
index d94f2aac3d54..4f1cd861410f 100644
--- a/kde-base/ksysv/ksysv-3.5.0_rc1.ebuild
+++ b/kde-base/ksysv/ksysv-3.5.0_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/kde-base/ksysv/ksysv-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ksysv/ksysv-3.5_beta1.ebuild b/kde-base/ksysv/ksysv-3.5_beta1.ebuild
index 4be597b511c8..937505e07aed 100644
--- a/kde-base/ksysv/ksysv-3.5_beta1.ebuild
+++ b/kde-base/ksysv/ksysv-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.5_beta1.ebuild,v 1.1 2005/09/22 20:42:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ksysv/ksysv-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Editor for Sys-V like init configurations"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ksysv/metadata.xml b/kde-base/ksysv/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ksysv/metadata.xml
+++ b/kde-base/ksysv/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktalkd/ChangeLog b/kde-base/ktalkd/ChangeLog
index f13b85e2f29a..7a6f540d8f07 100644
--- a/kde-base/ktalkd/ChangeLog
+++ b/kde-base/ktalkd/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for kde-base/ktalkd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ChangeLog,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktalkd-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktalkd-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktalkd-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*ktalkd-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktalkd-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktalkd-3.5_beta1.ebuild,
+  ktalkd-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ktalkd-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktalkd-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktalkd-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktalkd-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktalkd-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktalkd-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktalkd-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktalkd-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktalkd-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktalkd-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktalkd-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktalkd-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktalkd-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktalkd-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktalkd-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktalkd-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> ktalkd-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktalkd-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktalkd-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktalkd-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ktalkd-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktalkd-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktalkd-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktalkd-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktalkd/Manifest b/kde-base/ktalkd/Manifest
index d59cea580892..d69a4db1a85e 100644
--- a/kde-base/ktalkd/Manifest
+++ b/kde-base/ktalkd/Manifest
@@ -1,4 +1,22 @@
-MD5 46425c4d30c708d3ac954de7bf2cd815 ktalkd-3.4.0_alpha1.ebuild 293
-MD5 46425c4d30c708d3ac954de7bf2cd815 ktalkd-3.4.0_beta1.ebuild 293
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-ktalkd-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-ktalkd-3.4.0_beta1 223
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e87c2008c1ed7bd7dfdf25bce4259298 ChangeLog 3246
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-ktalkd-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-ktalkd-3.4.2 296
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-ktalkd-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-ktalkd-3.5.0_beta2 222
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-ktalkd-3.5_beta1 71
+MD5 31bbc0147664aff938ed4bce7ef0044d ktalkd-3.4.1.ebuild 410
+MD5 90952c824801013857c3d224733c3b6d ktalkd-3.4.2.ebuild 422
+MD5 214b3f5bed3dbe3e46b915f2ad4f1292 ktalkd-3.5.0.ebuild 399
+MD5 f60a325758deea6d49242bc150a2bde2 ktalkd-3.5.0_beta2.ebuild 411
+MD5 fddf97353c8061194aceb43f2b3f815c ktalkd-3.5_beta1.ebuild 402
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuWMntT9W3vfTuoRAvosAKCKy5QzzhrMYG7NibQcnn+bvl31zgCgmF8S
+FoQV8lYX7f4SShHwpliVHiY=
+=mUX7
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktalkd/files/digest-ktalkd-3.4.1 b/kde-base/ktalkd/files/digest-ktalkd-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/ktalkd/files/digest-ktalkd-3.4.1
+++ b/kde-base/ktalkd/files/digest-ktalkd-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/ktalkd/files/digest-ktalkd-3.4.2 b/kde-base/ktalkd/files/digest-ktalkd-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/ktalkd/files/digest-ktalkd-3.4.2
+++ b/kde-base/ktalkd/files/digest-ktalkd-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/ktalkd/ktalkd-3.4.1.ebuild b/kde-base/ktalkd/ktalkd-3.4.1.ebuild
index 4138c96d15ee..1ee5e7a81443 100644
--- a/kde-base/ktalkd/ktalkd-3.4.1.ebuild
+++ b/kde-base/ktalkd/ktalkd-3.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/kde-base/ktalkd/ktalkd-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE talk daemon"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/kcmktalkd"
\ No newline at end of file
diff --git a/kde-base/ktalkd/ktalkd-3.4.2.ebuild b/kde-base/ktalkd/ktalkd-3.4.2.ebuild
index 9f8aa10c165e..6dbe7ce695b7 100644
--- a/kde-base/ktalkd/ktalkd-3.4.2.ebuild
+++ b/kde-base/ktalkd/ktalkd-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE talk daemon"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-KMEXTRA="doc/kcontrol/kcmktalkd"
\ No newline at end of file
+KMEXTRA="doc/kcontrol/kcmktalkd"
diff --git a/kde-base/ktalkd/ktalkd-3.5.0.ebuild b/kde-base/ktalkd/ktalkd-3.5.0.ebuild
index 5a7971a860a5..e143818b9c0b 100644
--- a/kde-base/ktalkd/ktalkd-3.5.0.ebuild
+++ b/kde-base/ktalkd/ktalkd-3.5.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/kde-base/ktalkd/ktalkd-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/ktalkd/ktalkd-3.5.0_beta2.ebuild b/kde-base/ktalkd/ktalkd-3.5.0_beta2.ebuild
index 74d796810bee..bd235c19c539 100644
--- a/kde-base/ktalkd/ktalkd-3.5.0_beta2.ebuild
+++ b/kde-base/ktalkd/ktalkd-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:41:59 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE talk daemon"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/kcmktalkd"
\ No newline at end of file
diff --git a/kde-base/ktalkd/ktalkd-3.5_beta1.ebuild b/kde-base/ktalkd/ktalkd-3.5_beta1.ebuild
index d1b3fc01f0df..18243ff24402 100644
--- a/kde-base/ktalkd/ktalkd-3.5_beta1.ebuild
+++ b/kde-base/ktalkd/ktalkd-3.5_beta1.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/kde-base/ktalkd/ktalkd-3.5_beta1.ebuild,v 1.1 2005/09/22 20:44:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktalkd/ktalkd-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE talk daemon"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/kcmktalkd"
\ No newline at end of file
diff --git a/kde-base/ktalkd/metadata.xml b/kde-base/ktalkd/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktalkd/metadata.xml
+++ b/kde-base/ktalkd/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kteatime/ChangeLog b/kde-base/kteatime/ChangeLog
index a1591ab342bf..c5d81f001188 100644
--- a/kde-base/kteatime/ChangeLog
+++ b/kde-base/kteatime/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kteatime
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/ChangeLog,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kteatime-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kteatime-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kteatime-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kteatime-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kteatime-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kteatime-3.5_beta1.ebuild,
+  kteatime-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kteatime-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.5.0_beta2.ebuild:
+  New version.
+
+*kteatime-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kteatime-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kteatime-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kteatime-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kteatime-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kteatime-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kteatime-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kteatime-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kteatime-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kteatime-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kteatime-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kteatime-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kteatime-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kteatime-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kteatime-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kteatime-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kteatime-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kteatime-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kteatime-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kteatime-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kteatime-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kteatime/Manifest b/kde-base/kteatime/Manifest
index 1cdf630ed32d..0a67b7b5ec31 100644
--- a/kde-base/kteatime/Manifest
+++ b/kde-base/kteatime/Manifest
@@ -1,4 +1,26 @@
-MD5 78cd41bea9e962422a8c3f78800e6cf6 kteatime-3.4.0_alpha1.ebuild 285
-MD5 78cd41bea9e962422a8c3f78800e6cf6 kteatime-3.4.0_beta1.ebuild 285
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-kteatime-3.4.0_beta1 212
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-kteatime-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ad7f247458c3759fb7538c1a95bd87ea ChangeLog 3579
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-kteatime-3.4.1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-kteatime-3.4.2 282
+MD5 4792409083f3033f880840748c1ec31a files/digest-kteatime-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-kteatime-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-kteatime-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-kteatime-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-kteatime-3.5_beta1 68
+MD5 af0a30ecdc38444c3c83fb4e0a2402bb kteatime-3.4.1.ebuild 406
+MD5 2fdc498738cdc31447139040b201af91 kteatime-3.4.2.ebuild 419
+MD5 0062af811d26b8c35d9979b0f00bbe8f kteatime-3.4.3.ebuild 416
+MD5 66cfe535bbb772ecca75db54b4b0cb48 kteatime-3.5.0.ebuild 395
+MD5 8db31b84300d4623dec99eecdcdb7f5f kteatime-3.5.0_beta2.ebuild 400
+MD5 243993e8648a11f1c767bca4bdc5c310 kteatime-3.5.0_rc1.ebuild 399
+MD5 0299864d672ff31ccee9cbf8d0d8b025 kteatime-3.5_beta1.ebuild 398
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvjyntT9W3vfTuoRAlSdAKC0JFmiW2ToALGlUoY4+hSIOjmcAgCeLTK6
+BnQMuLlemqMyxQiwZPU2RGk=
+=2Z+j
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kteatime/files/digest-kteatime-3.4.1 b/kde-base/kteatime/files/digest-kteatime-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/kteatime/files/digest-kteatime-3.4.1
+++ b/kde-base/kteatime/files/digest-kteatime-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/kteatime/files/digest-kteatime-3.4.2 b/kde-base/kteatime/files/digest-kteatime-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/kteatime/files/digest-kteatime-3.4.2
+++ b/kde-base/kteatime/files/digest-kteatime-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/kteatime/kteatime-3.4.1.ebuild b/kde-base/kteatime/kteatime-3.4.1.ebuild
index b6a32579216b..d33d2422298f 100644
--- a/kde-base/kteatime/kteatime-3.4.1.ebuild
+++ b/kde-base/kteatime/kteatime-3.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/kde-base/kteatime/kteatime-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kteatime/kteatime-3.4.2.ebuild b/kde-base/kteatime/kteatime-3.4.2.ebuild
index ad0d4311e2be..02b4559be29f 100644
--- a/kde-base/kteatime/kteatime-3.4.2.ebuild
+++ b/kde-base/kteatime/kteatime-3.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/kde-base/kteatime/kteatime-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kteatime/kteatime-3.4.3.ebuild b/kde-base/kteatime/kteatime-3.4.3.ebuild
index 68378ac9cd80..a5f9059b603d 100644
--- a/kde-base/kteatime/kteatime-3.4.3.ebuild
+++ b/kde-base/kteatime/kteatime-3.4.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/kde-base/kteatime/kteatime-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND=""
\ No newline at end of file
+DEPEND=""
diff --git a/kde-base/kteatime/kteatime-3.5.0.ebuild b/kde-base/kteatime/kteatime-3.5.0.ebuild
index da3ee219e799..c4f7221ba0f5 100644
--- a/kde-base/kteatime/kteatime-3.5.0.ebuild
+++ b/kde-base/kteatime/kteatime-3.5.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/kde-base/kteatime/kteatime-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kteatime/kteatime-3.5.0_beta2.ebuild b/kde-base/kteatime/kteatime-3.5.0_beta2.ebuild
index 940b4bad7155..e96d78684eb3 100644
--- a/kde-base/kteatime/kteatime-3.5.0_beta2.ebuild
+++ b/kde-base/kteatime/kteatime-3.5.0_beta2.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/kde-base/kteatime/kteatime-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kteatime/kteatime-3.5.0_rc1.ebuild b/kde-base/kteatime/kteatime-3.5.0_rc1.ebuild
index 5cbd004d50b1..76ba6fe44bb1 100644
--- a/kde-base/kteatime/kteatime-3.5.0_rc1.ebuild
+++ b/kde-base/kteatime/kteatime-3.5.0_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/kde-base/kteatime/kteatime-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kteatime/kteatime-3.5_beta1.ebuild b/kde-base/kteatime/kteatime-3.5_beta1.ebuild
index 30f70cc1fd1b..20250381ac96 100644
--- a/kde-base/kteatime/kteatime-3.5_beta1.ebuild
+++ b/kde-base/kteatime/kteatime-3.5_beta1.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/kde-base/kteatime/kteatime-3.5_beta1.ebuild,v 1.1 2005/09/22 20:44:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kteatime/kteatime-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE utility for making a fine cup of tea"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kteatime/metadata.xml b/kde-base/kteatime/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kteatime/metadata.xml
+++ b/kde-base/kteatime/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktimer/ChangeLog b/kde-base/ktimer/ChangeLog
index 5d8d70c979b2..aecc8d81cb44 100644
--- a/kde-base/ktimer/ChangeLog
+++ b/kde-base/ktimer/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ktimer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ChangeLog,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktimer-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktimer-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktimer-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ktimer-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ktimer-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktimer-3.5_beta1.ebuild,
+  ktimer-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ktimer-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.5.0_beta2.ebuild:
+  New version.
+
+*ktimer-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktimer-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktimer-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktimer-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktimer-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktimer-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktimer-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktimer-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktimer-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktimer-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktimer-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktimer-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktimer-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ktimer-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktimer-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktimer-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktimer-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ktimer-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktimer-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktimer-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktimer-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktimer/Manifest b/kde-base/ktimer/Manifest
index 389c46e4c930..892661f18a57 100644
--- a/kde-base/ktimer/Manifest
+++ b/kde-base/ktimer/Manifest
@@ -1,4 +1,26 @@
-MD5 923ec11c8a0ef530a22aa9ac68d36866 ktimer-3.4.0_beta1.ebuild 252
-MD5 923ec11c8a0ef530a22aa9ac68d36866 ktimer-3.4.0_alpha1.ebuild 252
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-ktimer-3.4.0_beta1 216
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-ktimer-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e652eb97ce05588ef584d97a452d363a ChangeLog 3503
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-ktimer-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-ktimer-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-ktimer-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-ktimer-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-ktimer-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-ktimer-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-ktimer-3.5_beta1 69
+MD5 59554bee92283a43daa907187ca871f5 ktimer-3.4.1.ebuild 369
+MD5 8971381d61ae1826c01047af967ec0ae ktimer-3.4.2.ebuild 382
+MD5 ba5dee29e0ea680a08a8ed9797b5a783 ktimer-3.4.3.ebuild 379
+MD5 ce80feb55f2823ee39c832346639e0e1 ktimer-3.5.0.ebuild 358
+MD5 d8df334fc5debb6dde29b713ea25a92e ktimer-3.5.0_beta2.ebuild 363
+MD5 7230b7fdb17bd19031d20dab0b52ce70 ktimer-3.5.0_rc1.ebuild 362
+MD5 69a0dc0833a116498173bedfa5bf1357 ktimer-3.5_beta1.ebuild 361
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv3kntT9W3vfTuoRAn14AJ9DIEoGaux5qCGzMvW45zFmfFBY8QCfUKlj
+z+ooESg6BQ7AESypgnTXQgo=
+=yKxN
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktimer/files/digest-ktimer-3.4.1 b/kde-base/ktimer/files/digest-ktimer-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/ktimer/files/digest-ktimer-3.4.1
+++ b/kde-base/ktimer/files/digest-ktimer-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/ktimer/files/digest-ktimer-3.4.2 b/kde-base/ktimer/files/digest-ktimer-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/ktimer/files/digest-ktimer-3.4.2
+++ b/kde-base/ktimer/files/digest-ktimer-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/ktimer/ktimer-3.4.1.ebuild b/kde-base/ktimer/ktimer-3.4.1.ebuild
index 8b27ac5c8003..b878e1f2c083 100644
--- a/kde-base/ktimer/ktimer-3.4.1.ebuild
+++ b/kde-base/ktimer/ktimer-3.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/kde-base/ktimer/ktimer-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Timer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/ktimer/ktimer-3.4.2.ebuild b/kde-base/ktimer/ktimer-3.4.2.ebuild
index 48b734757eb4..604c1056bfba 100644
--- a/kde-base/ktimer/ktimer-3.4.2.ebuild
+++ b/kde-base/ktimer/ktimer-3.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/kde-base/ktimer/ktimer-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Timer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/ktimer/ktimer-3.4.3.ebuild b/kde-base/ktimer/ktimer-3.4.3.ebuild
index 85e5a5101507..eeab128dffd0 100644
--- a/kde-base/ktimer/ktimer-3.4.3.ebuild
+++ b/kde-base/ktimer/ktimer-3.4.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/kde-base/ktimer/ktimer-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Timer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/ktimer/ktimer-3.5.0.ebuild b/kde-base/ktimer/ktimer-3.5.0.ebuild
index dc08cbf1c4ad..dd91fc58f175 100644
--- a/kde-base/ktimer/ktimer-3.5.0.ebuild
+++ b/kde-base/ktimer/ktimer-3.5.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/kde-base/ktimer/ktimer-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/ktimer/ktimer-3.5.0_beta2.ebuild b/kde-base/ktimer/ktimer-3.5.0_beta2.ebuild
index 413ed42897d5..d2a02bf3129f 100644
--- a/kde-base/ktimer/ktimer-3.5.0_beta2.ebuild
+++ b/kde-base/ktimer/ktimer-3.5.0_beta2.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/kde-base/ktimer/ktimer-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Timer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/ktimer/ktimer-3.5.0_rc1.ebuild b/kde-base/ktimer/ktimer-3.5.0_rc1.ebuild
index 7318726958a2..114a6a59b7b4 100644
--- a/kde-base/ktimer/ktimer-3.5.0_rc1.ebuild
+++ b/kde-base/ktimer/ktimer-3.5.0_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/kde-base/ktimer/ktimer-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
diff --git a/kde-base/ktimer/ktimer-3.5_beta1.ebuild b/kde-base/ktimer/ktimer-3.5_beta1.ebuild
index cd41cfb019b0..b298913ac428 100644
--- a/kde-base/ktimer/ktimer-3.5_beta1.ebuild
+++ b/kde-base/ktimer/ktimer-3.5_beta1.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/kde-base/ktimer/ktimer-3.5_beta1.ebuild,v 1.1 2005/09/22 20:45:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktimer/ktimer-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:07 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Timer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/ktimer/metadata.xml b/kde-base/ktimer/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktimer/metadata.xml
+++ b/kde-base/ktimer/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktip/ChangeLog b/kde-base/ktip/ChangeLog
index 2012be6b4800..9dd0c5f5e654 100644
--- a/kde-base/ktip/ChangeLog
+++ b/kde-base/ktip/ChangeLog
@@ -1,6 +1,103 @@
 # ChangeLog for kde-base/ktip
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ChangeLog,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktip-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktip-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktip-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ktip-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ktip-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktip-3.5_beta1.ebuild,
+  ktip-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ktip-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.5.0_beta2.ebuild:
+  New version.
+
+*ktip-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktip-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktip-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ktip-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktip-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktip-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktip-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktip-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktip-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> ktip-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktip-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktip-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktip-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ktip-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktip-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktip-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> :
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktip-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktip-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktip-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktip/Manifest b/kde-base/ktip/Manifest
index 0c14c66e1984..78527251f152 100644
--- a/kde-base/ktip/Manifest
+++ b/kde-base/ktip/Manifest
@@ -1,4 +1,26 @@
-MD5 efaebbf102746536c9fe61f655fe52c4 ktip-3.4.0_alpha1.ebuild 371
-MD5 efaebbf102746536c9fe61f655fe52c4 ktip-3.4.0_beta1.ebuild 371
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-ktip-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-ktip-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 becc791210572263ca8dd9a96fa99b3f ChangeLog 3373
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-ktip-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-ktip-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-ktip-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-ktip-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-ktip-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-ktip-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-ktip-3.5_beta1 69
+MD5 714cdec14532c8effa7385165a847ad5 ktip-3.4.1.ebuild 386
+MD5 eac8411130f691aadd011eb5dd19420a ktip-3.4.2.ebuild 399
+MD5 890f4c80b5a6c228481368c325b40654 ktip-3.4.3.ebuild 395
+MD5 e1a472a5963aba0f9dd1d91d77aa5c26 ktip-3.5.0.ebuild 375
+MD5 7d52f07571c21e8dd21174fbb4cdd625 ktip-3.5.0_beta2.ebuild 380
+MD5 0e693c7dcca0f6fecc2b21a482c45176 ktip-3.5.0_rc1.ebuild 379
+MD5 cc09b948dd856141826c7a1aa621fd59 ktip-3.5_beta1.ebuild 378
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkM3ntT9W3vfTuoRAtJwAJ9xKEsgqHTlbotQhV61qe3mWMNk0gCfT+pP
+UcCsPUHDqEeuAGz6jBvPSNA=
+=mSzF
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktip/files/digest-ktip-3.4.1 b/kde-base/ktip/files/digest-ktip-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/ktip/files/digest-ktip-3.4.1
+++ b/kde-base/ktip/files/digest-ktip-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/ktip/files/digest-ktip-3.4.2 b/kde-base/ktip/files/digest-ktip-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/ktip/files/digest-ktip-3.4.2
+++ b/kde-base/ktip/files/digest-ktip-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/ktip/ktip-3.4.1.ebuild b/kde-base/ktip/ktip-3.4.1.ebuild
index a61455a84e55..5a27c61d2616 100644
--- a/kde-base/ktip/ktip-3.4.1.ebuild
+++ b/kde-base/ktip/ktip-3.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/kde-base/ktip/ktip-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tip-of-the-day displayer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/ktip/ktip-3.4.2.ebuild b/kde-base/ktip/ktip-3.4.2.ebuild
index 325bd5861d38..ed3b529ed842 100644
--- a/kde-base/ktip/ktip-3.4.2.ebuild
+++ b/kde-base/ktip/ktip-3.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/kde-base/ktip/ktip-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tip-of-the-day displayer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/ktip/ktip-3.4.3.ebuild b/kde-base/ktip/ktip-3.4.3.ebuild
index d17ac3fad9b1..36abaa7bb43a 100644
--- a/kde-base/ktip/ktip-3.4.3.ebuild
+++ b/kde-base/ktip/ktip-3.4.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/kde-base/ktip/ktip-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tip-of-the-day displayer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/ktip/ktip-3.5.0.ebuild b/kde-base/ktip/ktip-3.5.0.ebuild
index d571b0cf6a76..38e967b25057 100644
--- a/kde-base/ktip/ktip-3.5.0.ebuild
+++ b/kde-base/ktip/ktip-3.5.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/kde-base/ktip/ktip-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ktip/ktip-3.5.0_beta2.ebuild b/kde-base/ktip/ktip-3.5.0_beta2.ebuild
index 0fe92dbdc25e..1119b406d358 100644
--- a/kde-base/ktip/ktip-3.5.0_beta2.ebuild
+++ b/kde-base/ktip/ktip-3.5.0_beta2.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/kde-base/ktip/ktip-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tip-of-the-day displayer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/ktip/ktip-3.5.0_rc1.ebuild b/kde-base/ktip/ktip-3.5.0_rc1.ebuild
index 1f208bcc86fa..ef1b2d0e3976 100644
--- a/kde-base/ktip/ktip-3.5.0_rc1.ebuild
+++ b/kde-base/ktip/ktip-3.5.0_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/kde-base/ktip/ktip-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/ktip/ktip-3.5_beta1.ebuild b/kde-base/ktip/ktip-3.5_beta1.ebuild
index 0bce436af675..a25a24bf34f7 100644
--- a/kde-base/ktip/ktip-3.5_beta1.ebuild
+++ b/kde-base/ktip/ktip-3.5_beta1.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/kde-base/ktip/ktip-3.5_beta1.ebuild,v 1.1 2005/09/22 20:46:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktip/ktip-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:00 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE tip-of-the-day displayer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/ktip/metadata.xml b/kde-base/ktip/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktip/metadata.xml
+++ b/kde-base/ktip/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktnef/ChangeLog b/kde-base/ktnef/ChangeLog
index 989c15bdef8c..500db2842ba6 100644
--- a/kde-base/ktnef/ChangeLog
+++ b/kde-base/ktnef/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for kde-base/ktnef
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ChangeLog,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktnef-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktnef-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktnef-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ktnef-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ktnef-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktnef-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org> ktnef-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*ktnef-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.5.0_beta2.ebuild:
+  New version.
+
+*ktnef-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> ktnef-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktnef-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktnef-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktnef-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktnef-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktnef-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktnef-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktnef-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktnef-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktnef-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktnef-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktnef-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktnef-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ktnef-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktnef-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktnef-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktnef-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ktnef-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  29 Sep 2004; Simone Gotti <motaboy@gentoo.org> ktnef-3.4.0_beta2.ebuild:
+  Remove the dep on kde-base/libkdepim as it's not needed and the issue was
+  fixed in the eclass.
+
+  09 Feb 2005; Simone Gotti <motaboy@gentoo.org> ktnef-3.4.0_beta2.ebuild:
+  Added dependency on kde-base/libkdepim. Fixes bug #81407.
+
+*ktnef-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktnef-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktnef-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktnef/Manifest b/kde-base/ktnef/Manifest
index 305fa05e14dd..aa38eca1d7dc 100644
--- a/kde-base/ktnef/Manifest
+++ b/kde-base/ktnef/Manifest
@@ -1,4 +1,26 @@
-MD5 1fffefe295f7ef865692c366651b8674 ktnef-3.4.0_alpha1.ebuild 292
-MD5 1fffefe295f7ef865692c366651b8674 ktnef-3.4.0_beta1.ebuild 292
-MD5 892303ffe022b31a222f9efab549727b files/digest-ktnef-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-ktnef-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 81a962a05019b6eab8dcfbe2d29c21a6 ChangeLog 3949
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-ktnef-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-ktnef-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-ktnef-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-ktnef-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-ktnef-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-ktnef-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-ktnef-3.5_beta1 68
+MD5 2f91e99783b4f6d4af0db4b4a6d8810f ktnef-3.4.1.ebuild 416
+MD5 6084e984b9bc3ab97bbfe11d0f98511a ktnef-3.4.2.ebuild 420
+MD5 212e00c03e4d758ee5cd6b737f3f6309 ktnef-3.4.3.ebuild 416
+MD5 9e9f2ed82ba254831ce559cca044c3e9 ktnef-3.5.0.ebuild 401
+MD5 9a36d72449a83752a3905f0272d242ed ktnef-3.5.0_beta2.ebuild 404
+MD5 3a8357e94a97492b3419f8bb1b621b6c ktnef-3.5.0_rc1.ebuild 405
+MD5 59f109bc2aad748e30b99a8f25cb604c ktnef-3.5_beta1.ebuild 399
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhugIntT9W3vfTuoRAihRAJ9HI9Cql+AQ3xlmmxlz0MKXqr4p0ACfUKPN
+I6rvYMX9f/tf8hCIY/oshAI=
+=4b3G
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktnef/files/digest-ktnef-3.4.1 b/kde-base/ktnef/files/digest-ktnef-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/ktnef/files/digest-ktnef-3.4.1
+++ b/kde-base/ktnef/files/digest-ktnef-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/ktnef/files/digest-ktnef-3.4.2 b/kde-base/ktnef/files/digest-ktnef-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/ktnef/files/digest-ktnef-3.4.2
+++ b/kde-base/ktnef/files/digest-ktnef-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/ktnef/ktnef-3.4.1.ebuild b/kde-base/ktnef/ktnef-3.4.1.ebuild
index a4783e673e3d..06e8461bdcd8 100644
--- a/kde-base/ktnef/ktnef-3.4.1.ebuild
+++ b/kde-base/ktnef/ktnef-3.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/kde-base/ktnef/ktnef-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Viewer for mail attachments using TNEF format"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/ktnef/ktnef-3.4.2.ebuild b/kde-base/ktnef/ktnef-3.4.2.ebuild
index 7d5c83d585dc..c51ef6cb85b8 100644
--- a/kde-base/ktnef/ktnef-3.4.2.ebuild
+++ b/kde-base/ktnef/ktnef-3.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/kde-base/ktnef/ktnef-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Viewer for mail attachments using TNEF format"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/ktnef/ktnef-3.4.3.ebuild b/kde-base/ktnef/ktnef-3.4.3.ebuild
index 4246f61b9f6a..30e66b28e63d 100644
--- a/kde-base/ktnef/ktnef-3.4.3.ebuild
+++ b/kde-base/ktnef/ktnef-3.4.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/kde-base/ktnef/ktnef-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Viewer for mail attachments using TNEF format"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/ktnef/ktnef-3.5.0.ebuild b/kde-base/ktnef/ktnef-3.5.0.ebuild
index 4c6c22ffca1c..2b9436a24876 100644
--- a/kde-base/ktnef/ktnef-3.5.0.ebuild
+++ b/kde-base/ktnef/ktnef-3.5.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/kde-base/ktnef/ktnef-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/ktnef/ktnef-3.5.0_beta2.ebuild b/kde-base/ktnef/ktnef-3.5.0_beta2.ebuild
index f1e7271edb37..159bfe0a3338 100644
--- a/kde-base/ktnef/ktnef-3.5.0_beta2.ebuild
+++ b/kde-base/ktnef/ktnef-3.5.0_beta2.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/kde-base/ktnef/ktnef-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Viewer for mail attachments using TNEF format"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
diff --git a/kde-base/ktnef/ktnef-3.5.0_rc1.ebuild b/kde-base/ktnef/ktnef-3.5.0_rc1.ebuild
index c6df5bb12e72..c781eba8b34f 100644
--- a/kde-base/ktnef/ktnef-3.5.0_rc1.ebuild
+++ b/kde-base/ktnef/ktnef-3.5.0_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/kde-base/ktnef/ktnef-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/ktnef/ktnef-3.5_beta1.ebuild b/kde-base/ktnef/ktnef-3.5_beta1.ebuild
index 850f808f9290..48be5bfb65ce 100644
--- a/kde-base/ktnef/ktnef-3.5_beta1.ebuild
+++ b/kde-base/ktnef/ktnef-3.5_beta1.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/kde-base/ktnef/ktnef-3.5_beta1.ebuild,v 1.1 2005/09/22 20:47:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktnef/ktnef-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Viewer for mail attachments using TNEF format"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/ktnef/metadata.xml b/kde-base/ktnef/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktnef/metadata.xml
+++ b/kde-base/ktnef/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktouch/ChangeLog b/kde-base/ktouch/ChangeLog
index d2813f37683b..d1edb1b06669 100644
--- a/kde-base/ktouch/ChangeLog
+++ b/kde-base/ktouch/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/ktouch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ChangeLog,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktouch-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktouch-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktouch-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ktouch-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ktouch-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktouch-3.5_beta1.ebuild,
+  ktouch-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ktouch-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.5.0_beta2.ebuild:
+  New version.
+
+*ktouch-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.4.3.ebuild:
+  New version.
+
+  27 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> ktouch-3.5_beta1.ebuild:
+  Add missing dependency (#107391).
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktouch-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+  23 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> ktouch-3.5_beta1.ebuild:
+  Fixes to enable compilation.
+
+*ktouch-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktouch-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktouch-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktouch-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktouch-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktouch-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktouch-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktouch-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktouch-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktouch-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktouch-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ktouch-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktouch-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktouch-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktouch-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ktouch-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktouch-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktouch-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktouch-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktouch/Manifest b/kde-base/ktouch/Manifest
index 99ba03f02357..2b9c68958899 100644
--- a/kde-base/ktouch/Manifest
+++ b/kde-base/ktouch/Manifest
@@ -1,4 +1,26 @@
-MD5 87b30e39debae2a28ebeffd2c81d7fed ktouch-3.4.0_beta1.ebuild 309
-MD5 87b30e39debae2a28ebeffd2c81d7fed ktouch-3.4.0_alpha1.ebuild 309
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-ktouch-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-ktouch-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ec6d25e674cd277bfa4330a22df4af95 ChangeLog 3724
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-ktouch-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-ktouch-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-ktouch-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-ktouch-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-ktouch-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-ktouch-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-ktouch-3.5_beta1 68
+MD5 efaf8d02d7a1a0d04de75b0f13d880da ktouch-3.4.1.ebuild 426
+MD5 5e1e319fb7514047f6ca35538b3b5724 ktouch-3.4.2.ebuild 439
+MD5 8290e98a04e886c6b8ba21ffa07b8bc4 ktouch-3.4.3.ebuild 435
+MD5 7307c61f5f573060b5a682f1d9a4566b ktouch-3.5.0.ebuild 545
+MD5 fec41cf30f77fe716a042b4c254103f3 ktouch-3.5.0_beta2.ebuild 550
+MD5 4f3dbee9ff0d97985fb1f00ac7a57036 ktouch-3.5.0_rc1.ebuild 549
+MD5 bf8c4bb6dc7634e6743d1f4bd2b262bb ktouch-3.5_beta1.ebuild 548
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlUDntT9W3vfTuoRAsfwAJ9i7OWV+gfxdpcIv1jCn1vL60W96QCcD6x3
+WKKkMcDr4tENfyXJ8EMF3AE=
+=8X5I
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktouch/files/digest-ktouch-3.4.1 b/kde-base/ktouch/files/digest-ktouch-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/ktouch/files/digest-ktouch-3.4.1
+++ b/kde-base/ktouch/files/digest-ktouch-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/ktouch/files/digest-ktouch-3.4.2 b/kde-base/ktouch/files/digest-ktouch-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/ktouch/files/digest-ktouch-3.4.2
+++ b/kde-base/ktouch/files/digest-ktouch-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/ktouch/ktouch-3.4.1.ebuild b/kde-base/ktouch/ktouch-3.4.1.ebuild
index 49d363962bf1..bde1aa36a5b5 100644
--- a/kde-base/ktouch/ktouch-3.4.1.ebuild
+++ b/kde-base/ktouch/ktouch-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ktouch/ktouch-3.4.2.ebuild b/kde-base/ktouch/ktouch-3.4.2.ebuild
index 9f4c32eb356b..8bc56b009011 100644
--- a/kde-base/ktouch/ktouch-3.4.2.ebuild
+++ b/kde-base/ktouch/ktouch-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ktouch/ktouch-3.4.3.ebuild b/kde-base/ktouch/ktouch-3.4.3.ebuild
index e008e72589d5..6b72e0597a20 100644
--- a/kde-base/ktouch/ktouch-3.4.3.ebuild
+++ b/kde-base/ktouch/ktouch-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/ktouch/ktouch-3.5.0.ebuild b/kde-base/ktouch/ktouch-3.5.0.ebuild
index ba1a3e7194fa..3e0970b85a39 100644
--- a/kde-base/ktouch/ktouch-3.5.0.ebuild
+++ b/kde-base/ktouch/ktouch-3.5.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/kde-base/ktouch/ktouch-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ktouch/ktouch-3.5.0_beta2.ebuild b/kde-base/ktouch/ktouch-3.5.0_beta2.ebuild
index c3d8832947bf..8068c967d2ca 100644
--- a/kde-base/ktouch/ktouch-3.5.0_beta2.ebuild
+++ b/kde-base/ktouch/ktouch-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 
diff --git a/kde-base/ktouch/ktouch-3.5.0_rc1.ebuild b/kde-base/ktouch/ktouch-3.5.0_rc1.ebuild
index daa02fccdff9..029fe0273b53 100644
--- a/kde-base/ktouch/ktouch-3.5.0_rc1.ebuild
+++ b/kde-base/ktouch/ktouch-3.5.0_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/kde-base/ktouch/ktouch-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ktouch/ktouch-3.5_beta1.ebuild b/kde-base/ktouch/ktouch-3.5_beta1.ebuild
index 24676dac906a..80137f0ea260 100644
--- a/kde-base/ktouch/ktouch-3.5_beta1.ebuild
+++ b/kde-base/ktouch/ktouch-3.5_beta1.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.5_beta1.ebuild,v 1.1 2005/09/22 20:48:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktouch/ktouch-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A program that helps you to learn and practice touch typing"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-DEPEND=""
+RDEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdeedu)"
 
+KMEXTRACTONLY="libkdeedu/kdeeduplot"
+KMCOPYLIB="libkdeeduplot libkdeedu/kdeeduplot"
diff --git a/kde-base/ktouch/metadata.xml b/kde-base/ktouch/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktouch/metadata.xml
+++ b/kde-base/ktouch/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktron/ChangeLog b/kde-base/ktron/ChangeLog
index 4f4bed591263..61280ac5c1ca 100644
--- a/kde-base/ktron/ChangeLog
+++ b/kde-base/ktron/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/ktron
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ChangeLog,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktron-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktron-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktron-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ktron-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ktron-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktron-3.5_beta1.ebuild,
+  ktron-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ktron-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.5.0_beta2.ebuild:
+  New version.
+
+*ktron-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktron-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktron-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktron-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktron-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktron-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktron-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktron-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktron-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktron-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktron-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktron-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktron-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ktron-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktron-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktron-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktron-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ktron-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktron-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktron-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktron-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktron/Manifest b/kde-base/ktron/Manifest
index c0a48e295583..7baf51c4a53e 100644
--- a/kde-base/ktron/Manifest
+++ b/kde-base/ktron/Manifest
@@ -1,4 +1,26 @@
-MD5 31ea6f815e7f5c13e783cd1b3dca9ea9 ktron-3.4.0_beta1.ebuild 407
-MD5 31ea6f815e7f5c13e783cd1b3dca9ea9 ktron-3.4.0_alpha1.ebuild 407
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ktron-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ktron-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 749ca5bdf682c18589d50343905ba612 ChangeLog 3465
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ktron-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ktron-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ktron-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ktron-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ktron-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ktron-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ktron-3.5_beta1 70
+MD5 f25caa3b0e2ebd1ba1288c208e2f2b66 ktron-3.4.1.ebuild 522
+MD5 15b0d896b87e3847259f088450c01151 ktron-3.4.2.ebuild 535
+MD5 27bf813b66b24dc757b4441df5aa0e7f ktron-3.4.3.ebuild 531
+MD5 2179eead4d236cb7e1342edf8b74fe52 ktron-3.5.0.ebuild 474
+MD5 4db390e7bf6a5a6cc5a6af35e1302e9c ktron-3.5.0_beta2.ebuild 479
+MD5 428fefae31e0f9bfea656ade3221e156 ktron-3.5.0_rc1.ebuild 478
+MD5 c8b8f95591eb12fbbce8bd2037b20cb5 ktron-3.5_beta1.ebuild 514
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmIqntT9W3vfTuoRAiadAJwO6tbFnaUXL3eiafQLkZFNxzBuagCfefzv
+2cKLK1nbFZCSE9IkiVJ+hNw=
+=KHqc
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktron/files/digest-ktron-3.4.1 b/kde-base/ktron/files/digest-ktron-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ktron/files/digest-ktron-3.4.1
+++ b/kde-base/ktron/files/digest-ktron-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ktron/files/digest-ktron-3.4.2 b/kde-base/ktron/files/digest-ktron-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ktron/files/digest-ktron-3.4.2
+++ b/kde-base/ktron/files/digest-ktron-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ktron/ktron-3.4.1.ebuild b/kde-base/ktron/ktron-3.4.1.ebuild
index 0f864180135e..9f0af3324c67 100644
--- a/kde-base/ktron/ktron-3.4.1.ebuild
+++ b/kde-base/ktron/ktron-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE tron game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktron/ktron-3.4.2.ebuild b/kde-base/ktron/ktron-3.4.2.ebuild
index a975b8b9163f..d66714526051 100644
--- a/kde-base/ktron/ktron-3.4.2.ebuild
+++ b/kde-base/ktron/ktron-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE tron game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktron/ktron-3.4.3.ebuild b/kde-base/ktron/ktron-3.4.3.ebuild
index 4810bd291241..0cbf7a3994b2 100644
--- a/kde-base/ktron/ktron-3.4.3.ebuild
+++ b/kde-base/ktron/ktron-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE tron game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktron/ktron-3.5.0.ebuild b/kde-base/ktron/ktron-3.5.0.ebuild
index 0955cfbbcffc..46eea531dc06 100644
--- a/kde-base/ktron/ktron-3.5.0.ebuild
+++ b/kde-base/ktron/ktron-3.5.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/kde-base/ktron/ktron-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ktron/ktron-3.5.0_beta2.ebuild b/kde-base/ktron/ktron-3.5.0_beta2.ebuild
index f78c147cb17d..09090b61c2f9 100644
--- a/kde-base/ktron/ktron-3.5.0_beta2.ebuild
+++ b/kde-base/ktron/ktron-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE tron game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ktron/ktron-3.5.0_rc1.ebuild b/kde-base/ktron/ktron-3.5.0_rc1.ebuild
index f4c66578aeba..97ba88d8073f 100644
--- a/kde-base/ktron/ktron-3.5.0_rc1.ebuild
+++ b/kde-base/ktron/ktron-3.5.0_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/kde-base/ktron/ktron-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ktron/ktron-3.5_beta1.ebuild b/kde-base/ktron/ktron-3.5_beta1.ebuild
index 9279dd8e4850..d73fadf96886 100644
--- a/kde-base/ktron/ktron-3.5_beta1.ebuild
+++ b/kde-base/ktron/ktron-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.5_beta1.ebuild,v 1.1 2005/09/22 20:49:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktron/ktron-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:31 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE tron game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktron/metadata.xml b/kde-base/ktron/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktron/metadata.xml
+++ b/kde-base/ktron/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kttsd/ChangeLog b/kde-base/kttsd/ChangeLog
index 2d74358ff6fd..865adba8ab42 100644
--- a/kde-base/kttsd/ChangeLog
+++ b/kde-base/kttsd/ChangeLog
@@ -1,6 +1,105 @@
 # ChangeLog for kde-base/kttsd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.1 2005/01/21 18:58:43 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kttsd-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kttsd-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kttsd-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kttsd-3.5.0 (22 Nov 2005)
+
+  22 Nov 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kttsd-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kttsd-3.5_beta1.ebuild,
+  kttsd-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kttsd-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.5.0_beta2.ebuild:
+  New version.
+
+*kttsd-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kttsd-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kttsd-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kttsd-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kttsd-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kttsd-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kttsd-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kttsd-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kttsd-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kttsd-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kttsd-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  15 Jun 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/kdeaccessibility-3.4.0-noarts.patch, kttsd-3.4.1.ebuild:
+  add gstreamer patch, same as in kdeaccessibility
+
+*kttsd-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kttsd-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kttsd-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kttsd-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kttsd-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kttsd-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kttsd-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kttsd-3.4.0_beta1 (21 Jan 2005)
 
diff --git a/kde-base/kttsd/Manifest b/kde-base/kttsd/Manifest
index f1cfa29b1c34..19b78ed7db8b 100644
--- a/kde-base/kttsd/Manifest
+++ b/kde-base/kttsd/Manifest
@@ -1,3 +1,17 @@
-MD5 97ad352d31ac9cc759b7b29d73494b11 kttsd-3.4.0_beta1.ebuild 1113
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 c5420b3dc1848daf59305d1f2ff74a83 files/digest-kttsd-3.4.0_beta1 240
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 3d1a3931f4bbbf592f1962a16982f184 kttsd-3.5.0_beta2.ebuild 905
+MD5 5fc50253c205fd398f9f2a86d2a6c788 kttsd-3.4.2.ebuild 1182
+MD5 a4e71a136698bd8906872d87e843cb83 kttsd-3.4.3.ebuild 1180
+MD5 78c0d3ea1b72ea65840e22871702d8af kttsd-3.5.0_rc1.ebuild 904
+MD5 ce04d8f5138430625ab3a123c801088e kttsd-3.5_beta1.ebuild 903
+MD5 b2331265e063d790c680e422cd4165e2 ChangeLog 3405
+MD5 9fc807155b8caa022ff21d560c3af9a8 kttsd-3.5.0.ebuild 900
+MD5 3f87cd5313f5f4d6b6c33e5d2009b675 kttsd-3.4.1.ebuild 1162
+MD5 e40e61649226223ac8c5051bc56cd28a files/digest-kttsd-3.4.2 320
+MD5 a4a2fe961dac0445daa5ceffc2e2c841 files/kdeaccessibility-3.4.0-noarts.patch 3826
+MD5 a2ff872942277aa4226570c6c728c417 files/digest-kttsd-3.4.1 236
+MD5 174790e90449897638084f6c4bea761f files/digest-kttsd-3.5_beta1 77
+MD5 2d4ea47288659c63d4b4d855015669bc files/digest-kttsd-3.5.0_rc1 332
+MD5 69f79fb831b8a4318ac609aefa806adb files/digest-kttsd-3.4.3 76
+MD5 f33393ffa45cd6993ed65a63d5d5ea49 files/digest-kttsd-3.5.0_beta2 240
+MD5 307469289d5167258f2faa3684e12eb2 files/digest-kttsd-3.5.0 76
diff --git a/kde-base/kttsd/files/digest-kttsd-3.4.1 b/kde-base/kttsd/files/digest-kttsd-3.4.1
index 4ac404fc39e1..b00dfc3b21a6 100644
--- a/kde-base/kttsd/files/digest-kttsd-3.4.1
+++ b/kde-base/kttsd/files/digest-kttsd-3.4.1
@@ -1,2 +1,3 @@
 MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
 MD5 a8f51420c214bbf36efa54c99e24fdd9 kdeaccessibility-3.4.1.tar.bz2 7469093
diff --git a/kde-base/kttsd/files/digest-kttsd-3.4.2 b/kde-base/kttsd/files/digest-kttsd-3.4.2
index 5ba00f2cfc19..ac16a75a10cc 100644
--- a/kde-base/kttsd/files/digest-kttsd-3.4.2
+++ b/kde-base/kttsd/files/digest-kttsd-3.4.2
@@ -1 +1,4 @@
+MD5 274bd9335219f0fefb6fdc4a17891cf7 kdeaccessibility-3.4.0.tar.bz2 7220617
+MD5 eaa2de4a0db60d504156074cfb8755fd kdeaccessibility-3.4.0-3.4.1.tar.xdelta 291441
+MD5 c6dc0b08d763004a81fbe0420a6db1ab kdeaccessibility-3.4.1-3.4.2.tar.xdelta 112310
 MD5 9ad0e81fc51de5513d778a2e4104d2c3 kdeaccessibility-3.4.2.tar.bz2 7413579
diff --git a/kde-base/kttsd/kttsd-3.4.1.ebuild b/kde-base/kttsd/kttsd-3.4.1.ebuild
index 4ef195455830..5614ac96bce0 100644
--- a/kde-base/kttsd/kttsd-3.4.1.ebuild
+++ b/kde-base/kttsd/kttsd-3.4.1.ebuild
@@ -1,25 +1,42 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE text-to-speech subsystem"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="gstreamer"
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/arts)
+DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
 	gstreamer? ( >=media-libs/gstreamer-0.8.7 )
 	>=dev-util/pkgconfig-0.9.0"
 
-RDEPEND="
-|| ( app-accessibility/festival
-app-accessibility/epos
-app-accessibility/flite
-app-accessibility/freetts
-)"
+RDEPEND="${DEPEND}
+	arts? ( || ( app-accessibility/festival
+		     app-accessibility/epos
+		     app-accessibility/flite
+		     app-accessibility/freetts ) )
 
-myconf="$(use_enable gstreamer kttsd-gstreamer)"
+	gstreamer? ( || ( app-accessibility/festival
+		     app-accessibility/epos
+		     app-accessibility/flite ) )"
 
+pkg_setup() {
+	kde_pkg_setup
+	if use gstreamer; then
+		ewarn "gstreamer support in kdeaccessibility is experimental"
+	fi
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+	epatch ${FILESDIR}/kdeaccessibility-3.4.0-noarts.patch
+}
+
+src_compile() {
+	myconf="$(use_enable gstreamer kttsd-gstreamer)"
+	kde-meta_src_compile
+}
diff --git a/kde-base/kttsd/kttsd-3.4.2.ebuild b/kde-base/kttsd/kttsd-3.4.2.ebuild
index 992529b4436d..2adbee10287b 100644
--- a/kde-base/kttsd/kttsd-3.4.2.ebuild
+++ b/kde-base/kttsd/kttsd-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
+inherit kde-meta eutils
 
 DESCRIPTION="KDE text-to-speech subsystem"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="gstreamer"
 DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
diff --git a/kde-base/kttsd/kttsd-3.4.3.ebuild b/kde-base/kttsd/kttsd-3.4.3.ebuild
index 7cfc81df11bd..f82185902df5 100644
--- a/kde-base/kttsd/kttsd-3.4.3.ebuild
+++ b/kde-base/kttsd/kttsd-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE text-to-speech subsystem"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="gstreamer"
 DEPEND="arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)
diff --git a/kde-base/kttsd/kttsd-3.5.0.ebuild b/kde-base/kttsd/kttsd-3.5.0.ebuild
index 82f48b08f6ec..79bab6462989 100644
--- a/kde-base/kttsd/kttsd-3.5.0.ebuild
+++ b/kde-base/kttsd/kttsd-3.5.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/kde-base/kttsd/kttsd-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kttsd/kttsd-3.5.0_beta2.ebuild b/kde-base/kttsd/kttsd-3.5.0_beta2.ebuild
index 7435986762f8..22d024cb1f65 100644
--- a/kde-base/kttsd/kttsd-3.5.0_beta2.ebuild
+++ b/kde-base/kttsd/kttsd-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE text-to-speech subsystem"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa gstreamer"
 DEPEND="media-libs/akode
 	alsa? ( media-libs/alsa-lib )
diff --git a/kde-base/kttsd/kttsd-3.5.0_rc1.ebuild b/kde-base/kttsd/kttsd-3.5.0_rc1.ebuild
index e13e247b1b34..5b694768e4d7 100644
--- a/kde-base/kttsd/kttsd-3.5.0_rc1.ebuild
+++ b/kde-base/kttsd/kttsd-3.5.0_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/kde-base/kttsd/kttsd-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kttsd/kttsd-3.5_beta1.ebuild b/kde-base/kttsd/kttsd-3.5_beta1.ebuild
index 634891444363..f5fadf95ea50 100644
--- a/kde-base/kttsd/kttsd-3.5_beta1.ebuild
+++ b/kde-base/kttsd/kttsd-3.5_beta1.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5_beta1.ebuild,v 1.1 2005/09/22 20:50:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kttsd/kttsd-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:24 chriswhite Exp $
 KMNAME=kdeaccessibility
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE text-to-speech subsystem"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="alsa gstreamer"
-DEPEND="alsa? ( media-libs/alsa-lib )
+DEPEND="media-libs/akode
+	alsa? ( media-libs/alsa-lib )
 	gstreamer? ( >=media-libs/gstreamer-0.8.7
 	             >=media-libs/gst-plugins-0.8.7 )
 	$(deprange-dual $PV $MAXKDEVER kde-base/kcontrol)"
@@ -24,11 +25,8 @@ DEPEND="${DEPEND}
 	dev-util/pkgconfig"
 
 src_compile() {
-	local myconf="$(use_with alsa) $(use_with gstreamer)"
-
-	# Compile without akode support until there's a
-	# standalone release of akode.
-	myconf="${myconf} --without-akode"
+	local myconf="--with-akode
+	              $(use_with alsa) $(use_with gstreamer)"
 
 	kde-meta_src_compile
 }
diff --git a/kde-base/kttsd/metadata.xml b/kde-base/kttsd/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kttsd/metadata.xml
+++ b/kde-base/kttsd/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktuberling/ChangeLog b/kde-base/ktuberling/ChangeLog
index 8e7859135250..67347e8f7128 100644
--- a/kde-base/ktuberling/ChangeLog
+++ b/kde-base/ktuberling/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/ktuberling
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ChangeLog,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktuberling-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktuberling-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ktuberling-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*ktuberling-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktuberling-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*ktuberling-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktuberling-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktuberling-3.5_beta1.ebuild,
+  ktuberling-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*ktuberling-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktuberling-3.5.0_beta2.ebuild:
+  New version.
+
+*ktuberling-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +ktuberling-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktuberling-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktuberling-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktuberling-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktuberling-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktuberling-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ktuberling-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktuberling-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktuberling-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktuberling-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktuberling-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktuberling-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktuberling-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktuberling-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktuberling-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> ktuberling-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktuberling-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktuberling-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktuberling-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  ktuberling-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktuberling-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +ktuberling-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktuberling-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktuberling/Manifest b/kde-base/ktuberling/Manifest
index 6f881f83a645..2b9891180adf 100644
--- a/kde-base/ktuberling/Manifest
+++ b/kde-base/ktuberling/Manifest
@@ -1,4 +1,26 @@
-MD5 b63e8984d2b972485c9453bf2b57bb09 ktuberling-3.4.0_alpha1.ebuild 419
-MD5 b63e8984d2b972485c9453bf2b57bb09 ktuberling-3.4.0_beta1.ebuild 419
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-ktuberling-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-ktuberling-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6496df0c8b3d139893da4234c57b7b51 ChangeLog 3663
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-ktuberling-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-ktuberling-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-ktuberling-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-ktuberling-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-ktuberling-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-ktuberling-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-ktuberling-3.5_beta1 70
+MD5 47f3638d71a0d8fd8364dec6f2a54440 ktuberling-3.4.1.ebuild 544
+MD5 037fad6ac34aaaa59e760dd8d6772cd5 ktuberling-3.4.2.ebuild 557
+MD5 535080671fb851afe3d2cb60a40650a3 ktuberling-3.4.3.ebuild 553
+MD5 616a6af7ca07bc858116826e1e214062 ktuberling-3.5.0.ebuild 496
+MD5 c3faaebc584e5fc3b79d2b3b269fa93a ktuberling-3.5.0_beta2.ebuild 501
+MD5 a37092fcd3a30948ed7cd07ccff47da1 ktuberling-3.5.0_rc1.ebuild 500
+MD5 754cbdd076f39fbe11f0de83a1b3f486 ktuberling-3.5_beta1.ebuild 536
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmJ5ntT9W3vfTuoRAoV1AKCfyWvaJuG67EVRIn1S657E/fQTnQCfeKtJ
+n4kZTLr69JAQ0XtmuYGKMV4=
+=iu7b
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktuberling/files/digest-ktuberling-3.4.1 b/kde-base/ktuberling/files/digest-ktuberling-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/ktuberling/files/digest-ktuberling-3.4.1
+++ b/kde-base/ktuberling/files/digest-ktuberling-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/ktuberling/files/digest-ktuberling-3.4.2 b/kde-base/ktuberling/files/digest-ktuberling-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/ktuberling/files/digest-ktuberling-3.4.2
+++ b/kde-base/ktuberling/files/digest-ktuberling-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/ktuberling/ktuberling-3.4.1.ebuild b/kde-base/ktuberling/ktuberling-3.4.1.ebuild
index 55682b3ec561..0062ec8bf0a5 100644
--- a/kde-base/ktuberling/ktuberling-3.4.1.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktuberling/ktuberling-3.4.2.ebuild b/kde-base/ktuberling/ktuberling-3.4.2.ebuild
index 35105fca6d85..d1fe427bcb83 100644
--- a/kde-base/ktuberling/ktuberling-3.4.2.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.4.2.ebuild,v 1.1 2005/07/28 21:16:23 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktuberling/ktuberling-3.4.3.ebuild b/kde-base/ktuberling/ktuberling-3.4.3.ebuild
index fed06ba5ddfa..ff7930ab3bd3 100644
--- a/kde-base/ktuberling/ktuberling-3.4.3.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktuberling/ktuberling-3.5.0.ebuild b/kde-base/ktuberling/ktuberling-3.5.0.ebuild
index ad73edec068b..be6ba3e6b077 100644
--- a/kde-base/ktuberling/ktuberling-3.5.0.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.5.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/kde-base/ktuberling/ktuberling-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ktuberling/ktuberling-3.5.0_beta2.ebuild b/kde-base/ktuberling/ktuberling-3.5.0_beta2.ebuild
index b0f63c12bfed..f7b521338fd6 100644
--- a/kde-base/ktuberling/ktuberling-3.5.0_beta2.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/ktuberling/ktuberling-3.5.0_rc1.ebuild b/kde-base/ktuberling/ktuberling-3.5.0_rc1.ebuild
index 0ca3a4aad9b9..995c2ee2aa8b 100644
--- a/kde-base/ktuberling/ktuberling-3.5.0_rc1.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.5.0_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/kde-base/ktuberling/ktuberling-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/ktuberling/ktuberling-3.5_beta1.ebuild b/kde-base/ktuberling/ktuberling-3.5_beta1.ebuild
index 08d39ae2d51d..202994a351ae 100644
--- a/kde-base/ktuberling/ktuberling-3.5_beta1.ebuild
+++ b/kde-base/ktuberling/ktuberling-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.5_beta1.ebuild,v 1.1 2005/09/22 20:51:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktuberling/ktuberling-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:08 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: potato game for kids"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/ktuberling/metadata.xml b/kde-base/ktuberling/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktuberling/metadata.xml
+++ b/kde-base/ktuberling/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kturtle/ChangeLog b/kde-base/kturtle/ChangeLog
index 3c81441464f8..5361e07ab3fb 100644
--- a/kde-base/kturtle/ChangeLog
+++ b/kde-base/kturtle/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for kde-base/kturtle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/ChangeLog,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kturtle-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kturtle-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kturtle-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kturtle-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kturtle-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kturtle-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kturtle-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kturtle-3.5_beta1.ebuild,
+  kturtle-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kturtle-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kturtle-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kturtle-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kturtle-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kturtle-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kturtle-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kturtle-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kturtle-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kturtle-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kturtle-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kturtle-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kturtle-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kturtle-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kturtle-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kturtle-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kturtle-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kturtle-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kturtle-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kturtle-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kturtle-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kturtle-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kturtle-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kturtle-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kturtle-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kturtle/Manifest b/kde-base/kturtle/Manifest
index ee8cdae628e4..a3e3d9af56fe 100644
--- a/kde-base/kturtle/Manifest
+++ b/kde-base/kturtle/Manifest
@@ -1,4 +1,24 @@
-MD5 ffb7e781b62e6a5255dbdcfc05c230ee kturtle-3.4.0_beta1.ebuild 699
-MD5 ffb7e781b62e6a5255dbdcfc05c230ee kturtle-3.4.0_alpha1.ebuild 699
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kturtle-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kturtle-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d2de44f5893e59b1ce91e03b269597da ChangeLog 3425
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kturtle-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kturtle-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kturtle-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kturtle-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kturtle-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kturtle-3.5_beta1 68
+MD5 ede15a7280792bd7f89e0ab85db99d68 kturtle-3.4.1.ebuild 440
+MD5 58ffc3aaca4c214fec248eda71cc2934 kturtle-3.4.2.ebuild 451
+MD5 eb23b282ed9703565bce26cd9998592a kturtle-3.5.0.ebuild 429
+MD5 3986170396419d12dd398b7f6910a555 kturtle-3.5.0_beta2.ebuild 434
+MD5 bfbb571f2108ed88b342e12444ec73bc kturtle-3.5.0_rc1.ebuild 433
+MD5 cdfc654fca1392460b5632b49ff0555f kturtle-3.5_beta1.ebuild 432
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlVBntT9W3vfTuoRAm0TAJ4+qTnqHApEvZltGuiiJCLO/BYTNwCeJdlF
+UpcM5797rHg46lxA7dOCFq8=
+=FGLI
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kturtle/files/digest-kturtle-3.4.1 b/kde-base/kturtle/files/digest-kturtle-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kturtle/files/digest-kturtle-3.4.1
+++ b/kde-base/kturtle/files/digest-kturtle-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kturtle/files/digest-kturtle-3.4.2 b/kde-base/kturtle/files/digest-kturtle-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kturtle/files/digest-kturtle-3.4.2
+++ b/kde-base/kturtle/files/digest-kturtle-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kturtle/kturtle-3.4.1.ebuild b/kde-base/kturtle/kturtle-3.4.1.ebuild
index 881eaf085c67..b8f3a482401d 100644
--- a/kde-base/kturtle/kturtle-3.4.1.ebuild
+++ b/kde-base/kturtle/kturtle-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kturtle/kturtle-3.4.2.ebuild b/kde-base/kturtle/kturtle-3.4.2.ebuild
index d50ee0b20f15..7f4bd707b1f2 100644
--- a/kde-base/kturtle/kturtle-3.4.2.ebuild
+++ b/kde-base/kturtle/kturtle-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kturtle/kturtle-3.5.0.ebuild b/kde-base/kturtle/kturtle-3.5.0.ebuild
index ed264b848bc8..eb83d06944e7 100644
--- a/kde-base/kturtle/kturtle-3.5.0.ebuild
+++ b/kde-base/kturtle/kturtle-3.5.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/kde-base/kturtle/kturtle-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kturtle/kturtle-3.5.0_beta2.ebuild b/kde-base/kturtle/kturtle-3.5.0_beta2.ebuild
index bd364f84c02d..814723994ad6 100644
--- a/kde-base/kturtle/kturtle-3.5.0_beta2.ebuild
+++ b/kde-base/kturtle/kturtle-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kturtle/kturtle-3.5.0_rc1.ebuild b/kde-base/kturtle/kturtle-3.5.0_rc1.ebuild
index 8e24a79ef1ce..f1e655ca0cc1 100644
--- a/kde-base/kturtle/kturtle-3.5.0_rc1.ebuild
+++ b/kde-base/kturtle/kturtle-3.5.0_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/kde-base/kturtle/kturtle-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kturtle/kturtle-3.5_beta1.ebuild b/kde-base/kturtle/kturtle-3.5_beta1.ebuild
index e628f355a269..f19bede087a0 100644
--- a/kde-base/kturtle/kturtle-3.5_beta1.ebuild
+++ b/kde-base/kturtle/kturtle-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.5_beta1.ebuild,v 1.1 2005/09/22 20:52:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kturtle/kturtle-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:25 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Educational programming environment using the Logo programming language"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kturtle/metadata.xml b/kde-base/kturtle/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kturtle/metadata.xml
+++ b/kde-base/kturtle/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/ktux/ChangeLog b/kde-base/ktux/ChangeLog
index 9ee660e29033..0939ce67c873 100644
--- a/kde-base/ktux/ChangeLog
+++ b/kde-base/ktux/ChangeLog
@@ -1,6 +1,89 @@
 # ChangeLog for kde-base/ktux
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ChangeLog,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ktux-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> ktux-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> ktux-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*ktux-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +ktux-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ktux-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -ktux-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*ktux-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +ktux-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*ktux-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +ktux-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ktux-3.4.2.ebuild:
+  ~alpha keyword.
+
+*ktux-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +ktux-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> ktux-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> ktux-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ktux-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*ktux-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +ktux-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> ktux-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> ktux-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> ktux-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> ktux-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*ktux-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> ktux-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*ktux-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +ktux-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *ktux-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/ktux/Manifest b/kde-base/ktux/Manifest
index 43f1f6d578ce..4ea793e6af45 100644
--- a/kde-base/ktux/Manifest
+++ b/kde-base/ktux/Manifest
@@ -1,4 +1,20 @@
-MD5 062a3df99f45d2766e976c03c52daf4d ktux-3.4.0_beta1.ebuild 292
-MD5 062a3df99f45d2766e976c03c52daf4d ktux-3.4.0_alpha1.ebuild 292
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-ktux-3.4.0_alpha1 68
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-ktux-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 50bdba76d045c66b038471607b599b2a ChangeLog 3027
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-ktux-3.4.1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-ktux-3.4.2 282
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-ktux-3.5.0 67
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-ktux-3.5_beta1 68
+MD5 774e93586bf6c1bf70939025191581ef ktux-3.4.1.ebuild 405
+MD5 bed9af6df39911c507af45359d7c77d8 ktux-3.4.2.ebuild 417
+MD5 903e9953398dc1086ff95cd55c088c4f ktux-3.5.0.ebuild 394
+MD5 5b641dbc81447b7a29abe1d16335cdba ktux-3.5_beta1.ebuild 404
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvlOntT9W3vfTuoRAmM3AKCgjAQKluabWI+rFtfg9kdtHsNdGQCfXHXH
+kQ8WDq8ofVbzFa3OG4Yr1Ps=
+=w6Ij
+-----END PGP SIGNATURE-----
diff --git a/kde-base/ktux/files/digest-ktux-3.4.1 b/kde-base/ktux/files/digest-ktux-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/ktux/files/digest-ktux-3.4.1
+++ b/kde-base/ktux/files/digest-ktux-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/ktux/files/digest-ktux-3.4.2 b/kde-base/ktux/files/digest-ktux-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/ktux/files/digest-ktux-3.4.2
+++ b/kde-base/ktux/files/digest-ktux-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/ktux/ktux-3.4.1.ebuild b/kde-base/ktux/ktux-3.4.1.ebuild
index 9bf20619054d..33061b7e81f7 100644
--- a/kde-base/ktux/ktux-3.4.1.ebuild
+++ b/kde-base/ktux/ktux-3.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/kde-base/ktux/ktux-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/ktux/ktux-3.4.2.ebuild b/kde-base/ktux/ktux-3.4.2.ebuild
index 53d1e13d3ab9..7f8473c29393 100644
--- a/kde-base/ktux/ktux-3.4.2.ebuild
+++ b/kde-base/ktux/ktux-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdetoys
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND=""
\ No newline at end of file
+DEPEND=""
diff --git a/kde-base/ktux/ktux-3.5.0.ebuild b/kde-base/ktux/ktux-3.5.0.ebuild
index ff2fbddddce6..cf3c2a1f2d2a 100644
--- a/kde-base/ktux/ktux-3.5.0.ebuild
+++ b/kde-base/ktux/ktux-3.5.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/kde-base/ktux/ktux-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/ktux/ktux-3.5_beta1.ebuild b/kde-base/ktux/ktux-3.5_beta1.ebuild
index 756e2efa1dae..1bf5e224840a 100644
--- a/kde-base/ktux/ktux-3.5_beta1.ebuild
+++ b/kde-base/ktux/ktux-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-3.5_beta1.ebuild,v 1.1 2005/09/22 20:53:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/ktux/ktux-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdetoys
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: screensaver featuring the Space-Faring Tux"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/ktux/metadata.xml b/kde-base/ktux/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/ktux/metadata.xml
+++ b/kde-base/ktux/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kuickshow/ChangeLog b/kde-base/kuickshow/ChangeLog
index eff4f299fb8c..0644c8691913 100644
--- a/kde-base/kuickshow/ChangeLog
+++ b/kde-base/kuickshow/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/kuickshow
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/ChangeLog,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
+
+*kuickshow-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kuickshow-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kuickshow-3.5_beta1.ebuild,
+  kuickshow-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kuickshow-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kuickshow-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kuickshow-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kuickshow-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kuickshow-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kuickshow-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kuickshow-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kuickshow-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kuickshow-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kuickshow-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kuickshow-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kuickshow-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kuickshow-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kuickshow-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kuickshow-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kuickshow-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kuickshow-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kuickshow-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kuickshow-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kuickshow-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kuickshow-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kuickshow-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kuickshow-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kuickshow/Manifest b/kde-base/kuickshow/Manifest
index a1ae3ab3f2b6..8cae4d5682fa 100644
--- a/kde-base/kuickshow/Manifest
+++ b/kde-base/kuickshow/Manifest
@@ -1,4 +1,10 @@
-MD5 5f2545b4768efdd3c9ad84c04e6ce586 kuickshow-3.4.0_beta1.ebuild 310
-MD5 5f2545b4768efdd3c9ad84c04e6ce586 kuickshow-3.4.0_alpha1.ebuild 310
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kuickshow-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kuickshow-3.4.0_alpha1 72
+MD5 1401a8d53642b2e5a9ce04af4bfde9a8 ChangeLog 3020
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kuickshow-3.4.1 221
+MD5 0459ac16349d79da6246392e2454796b files/digest-kuickshow-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kuickshow-3.5.0_beta2 225
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kuickshow-3.5_beta1 72
+MD5 1017bce04e454ee3ec21e72fad731db5 kuickshow-3.4.1.ebuild 445
+MD5 3f3fee04835a674a0e64cf9ca84ed711 kuickshow-3.5.0.ebuild 422
+MD5 7f89649182fe5ea47f42f1a7b47b3e07 kuickshow-3.5.0_beta2.ebuild 434
+MD5 83af57928492e852a43f5fd92093575d kuickshow-3.5_beta1.ebuild 425
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kuickshow/files/digest-kuickshow-3.4.1 b/kde-base/kuickshow/files/digest-kuickshow-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kuickshow/files/digest-kuickshow-3.4.1
+++ b/kde-base/kuickshow/files/digest-kuickshow-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kuickshow/kuickshow-3.4.1.ebuild b/kde-base/kuickshow/kuickshow-3.4.1.ebuild
index b732f9044ae7..a8ac60490f3f 100644
--- a/kde-base/kuickshow/kuickshow-3.4.1.ebuild
+++ b/kde-base/kuickshow/kuickshow-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/kuickshow-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/kuickshow-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A fast and versatile image viewer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="media-libs/imlib"
\ No newline at end of file
diff --git a/kde-base/kuickshow/kuickshow-3.5.0.ebuild b/kde-base/kuickshow/kuickshow-3.5.0.ebuild
index 144eed95f47f..d59cf79afc2b 100644
--- a/kde-base/kuickshow/kuickshow-3.5.0.ebuild
+++ b/kde-base/kuickshow/kuickshow-3.5.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/kde-base/kuickshow/kuickshow-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/kuickshow-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kuickshow/kuickshow-3.5.0_beta2.ebuild b/kde-base/kuickshow/kuickshow-3.5.0_beta2.ebuild
index 22eed767a8ee..00985b20fbfb 100644
--- a/kde-base/kuickshow/kuickshow-3.5.0_beta2.ebuild
+++ b/kde-base/kuickshow/kuickshow-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/kuickshow-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/kuickshow-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdegraphics
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A fast and versatile image viewer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-libs/imlib"
\ No newline at end of file
diff --git a/kde-base/kuickshow/kuickshow-3.5_beta1.ebuild b/kde-base/kuickshow/kuickshow-3.5_beta1.ebuild
index 59dcf815854f..3e1f4a52b725 100644
--- a/kde-base/kuickshow/kuickshow-3.5_beta1.ebuild
+++ b/kde-base/kuickshow/kuickshow-3.5_beta1.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/kde-base/kuickshow/kuickshow-3.5_beta1.ebuild,v 1.1 2005/09/22 20:55:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuickshow/kuickshow-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: A fast and versatile image viewer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-libs/imlib"
\ No newline at end of file
diff --git a/kde-base/kuickshow/metadata.xml b/kde-base/kuickshow/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kuickshow/metadata.xml
+++ b/kde-base/kuickshow/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kuiviewer/ChangeLog b/kde-base/kuiviewer/ChangeLog
index 1ff81eac96c3..49cfd97820f9 100644
--- a/kde-base/kuiviewer/ChangeLog
+++ b/kde-base/kuiviewer/ChangeLog
@@ -1,6 +1,93 @@
 # ChangeLog for kde-base/kuiviewer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/ChangeLog,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> kuiviewer-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kuiviewer-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kuiviewer-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kuiviewer-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kuiviewer-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kuiviewer-3.5_beta1.ebuild,
+  kuiviewer-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kuiviewer-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kuiviewer-3.5.0_beta2.ebuild:
+  New version.
+
+*kuiviewer-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kuiviewer-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kuiviewer-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kuiviewer-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kuiviewer-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kuiviewer-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kuiviewer-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*kuiviewer-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kuiviewer-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kuiviewer-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kuiviewer-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kuiviewer-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kuiviewer-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kuiviewer-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kuiviewer-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kuiviewer-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kuiviewer-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kuiviewer-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*kuiviewer-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kuiviewer-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kuiviewer-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kuiviewer/Manifest b/kde-base/kuiviewer/Manifest
index 20fb2c2f91a5..8742e444ac0c 100644
--- a/kde-base/kuiviewer/Manifest
+++ b/kde-base/kuiviewer/Manifest
@@ -1,4 +1,14 @@
-MD5 c8f2a40e5b199fad11b0f6a287705058 kuiviewer-3.4.0_alpha1.ebuild 281
-MD5 c8f2a40e5b199fad11b0f6a287705058 kuiviewer-3.4.0_beta1.ebuild 281
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-kuiviewer-3.4.0_beta1 210
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-kuiviewer-3.4.0_alpha1 67
+MD5 24f350aa773fe66bc56ce5c5968d8f59 ChangeLog 3172
+MD5 2e53ca88a63eca2bd4ef5c5e82499f55 kuiviewer-3.4.1.ebuild 405
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 b4ce96aa13413692645be3adf3f06279 kuiviewer-3.4.2.ebuild 413
+MD5 c51277b086a319003e47d6db58048632 kuiviewer-3.5_beta1.ebuild 396
+MD5 3d1a8671776e229c2cd3902bc201f3fb kuiviewer-3.4.3.ebuild 409
+MD5 ee63884166a34676af3f475c020bd5f5 kuiviewer-3.5.0_beta2.ebuild 405
+MD5 4a36fc812c343c80fa4822e864376c80 kuiviewer-3.5.0.ebuild 393
+MD5 9b4e9e38740207531ab771519519d01e files/digest-kuiviewer-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-kuiviewer-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-kuiviewer-3.5_beta1 67
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-kuiviewer-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-kuiviewer-3.5.0_beta2 210
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-kuiviewer-3.5.0 66
diff --git a/kde-base/kuiviewer/files/digest-kuiviewer-3.4.1 b/kde-base/kuiviewer/files/digest-kuiviewer-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/kuiviewer/files/digest-kuiviewer-3.4.1
+++ b/kde-base/kuiviewer/files/digest-kuiviewer-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/kuiviewer/files/digest-kuiviewer-3.4.2 b/kde-base/kuiviewer/files/digest-kuiviewer-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/kuiviewer/files/digest-kuiviewer-3.4.2
+++ b/kde-base/kuiviewer/files/digest-kuiviewer-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/kuiviewer/kuiviewer-3.4.1.ebuild b/kde-base/kuiviewer/kuiviewer-3.4.1.ebuild
index 7bcd762379e3..f39330ffc93f 100644
--- a/kde-base/kuiviewer/kuiviewer-3.4.1.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-3.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/kde-base/kuiviewer/kuiviewer-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KUIViewer - Displays Designer's UI files"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kuiviewer/kuiviewer-3.4.2.ebuild b/kde-base/kuiviewer/kuiviewer-3.4.2.ebuild
index 423e29260201..239e47f8177c 100644
--- a/kde-base/kuiviewer/kuiviewer-3.4.2.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-3.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/kde-base/kuiviewer/kuiviewer-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kuiviewer/kuiviewer-3.4.3.ebuild b/kde-base/kuiviewer/kuiviewer-3.4.3.ebuild
index 46c9021a2389..6687755202ce 100644
--- a/kde-base/kuiviewer/kuiviewer-3.4.3.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-3.4.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/kde-base/kuiviewer/kuiviewer-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KUIViewer - Displays Designer's UI files"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kuiviewer/kuiviewer-3.5.0.ebuild b/kde-base/kuiviewer/kuiviewer-3.5.0.ebuild
index d7fa64644038..cf40fec1d78d 100644
--- a/kde-base/kuiviewer/kuiviewer-3.5.0.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-3.5.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/kde-base/kuiviewer/kuiviewer-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/kuiviewer/kuiviewer-3.5.0_beta2.ebuild b/kde-base/kuiviewer/kuiviewer-3.5.0_beta2.ebuild
index 1bef5e386fac..04d9a001b1b2 100644
--- a/kde-base/kuiviewer/kuiviewer-3.5.0_beta2.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-3.5.0_beta2.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/kde-base/kuiviewer/kuiviewer-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdesdk
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KUIViewer - Displays Designer's UI files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kuiviewer/kuiviewer-3.5_beta1.ebuild b/kde-base/kuiviewer/kuiviewer-3.5_beta1.ebuild
index 853cdc9d7d71..1dccf7c66d3f 100644
--- a/kde-base/kuiviewer/kuiviewer-3.5_beta1.ebuild
+++ b/kde-base/kuiviewer/kuiviewer-3.5_beta1.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/kde-base/kuiviewer/kuiviewer-3.5_beta1.ebuild,v 1.1 2005/09/22 20:55:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuiviewer/kuiviewer-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:56 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KUIViewer - Displays Designer's UI files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kuiviewer/metadata.xml b/kde-base/kuiviewer/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kuiviewer/metadata.xml
+++ b/kde-base/kuiviewer/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kuser/ChangeLog b/kde-base/kuser/ChangeLog
index 87d469f23eec..fc5eddc31422 100644
--- a/kde-base/kuser/ChangeLog
+++ b/kde-base/kuser/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/kuser
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/ChangeLog,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kuser-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kuser-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kuser-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kuser-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kuser-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kuser-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kuser-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kuser-3.5_beta1.ebuild,
+  kuser-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kuser-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kuser-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kuser-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kuser-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kuser-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kuser-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kuser-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kuser-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kuser-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kuser-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kuser-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kuser-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kuser-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kuser-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kuser-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kuser-3.4.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+*kuser-3.4.0-r1 (08 Apr 2005)
+
+  08 Apr 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeadmin-3.4.0-kuser.patch, +kuser-3.4.0-r1.ebuild:
+  Add patch to fix /etc/passwd corruption (#87405).
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kuser-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kuser-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kuser-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kuser-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kuser-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kuser-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kuser-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kuser-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kuser/Manifest b/kde-base/kuser/Manifest
index 5beb99762491..8ec667f4d07d 100644
--- a/kde-base/kuser/Manifest
+++ b/kde-base/kuser/Manifest
@@ -1,4 +1,24 @@
-MD5 9863f61833c9f6f857ddf71978d567a3 kuser-3.4.0_alpha1.ebuild 317
-MD5 9863f61833c9f6f857ddf71978d567a3 kuser-3.4.0_beta1.ebuild 317
-MD5 5c80d63263041da2a3656e9484510f15 files/digest-kuser-3.4.0_alpha1 69
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-kuser-3.4.0_beta1 215
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 252437828c6b9fffaf6320d87f3ddc24 ChangeLog 3551
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-kuser-3.4.1 211
+MD5 9d1b64c1a3fcf3755ead7efab419928f files/digest-kuser-3.4.2 286
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-kuser-3.5.0 68
+MD5 64ad1da64ecad951c67e7899dbfa8bd7 files/digest-kuser-3.5.0_beta2 215
+MD5 068810fa15f0ff2384c05e1d80dd3754 files/digest-kuser-3.5.0_rc1 298
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-kuser-3.5_beta1 69
+MD5 ca122bd190bbbaf818d187d5aaf78759 kuser-3.4.1.ebuild 440
+MD5 bea5576b39861d56969afe23175cbeff kuser-3.4.2.ebuild 451
+MD5 9f65ee7fa0ed92c6546ecfd7a74a333e kuser-3.5.0.ebuild 429
+MD5 08712033c325ca4b7e791421b3baec11 kuser-3.5.0_beta2.ebuild 434
+MD5 cc7539825ea0f422ec96a42160e9fce2 kuser-3.5.0_rc1.ebuild 433
+MD5 1b051513784b6fa7ba48775a89a55154 kuser-3.5_beta1.ebuild 432
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkpJntT9W3vfTuoRAmZhAKCc2BZ0Fu4x2SQAITU2hsXJyQ0YPACfeEYr
+b1GcvjEv6fPHhu4zr2Iqd8Y=
+=P/iW
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kuser/files/digest-kuser-3.4.1 b/kde-base/kuser/files/digest-kuser-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/kuser/files/digest-kuser-3.4.1
+++ b/kde-base/kuser/files/digest-kuser-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/kuser/files/digest-kuser-3.4.2 b/kde-base/kuser/files/digest-kuser-3.4.2
index 704ba375213a..7a7584d3ac0d 100644
--- a/kde-base/kuser/files/digest-kuser-3.4.2
+++ b/kde-base/kuser/files/digest-kuser-3.4.2
@@ -1 +1,4 @@
+MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
+MD5 b4066d3c4962fdb0d5ae5820bb09ce8d kdeadmin-3.4.1-3.4.2.tar.xdelta 63771
 MD5 ef1d4be02bbe384d46e807421dd52fed kdeadmin-3.4.2.tar.bz2 1520873
diff --git a/kde-base/kuser/kuser-3.4.1.ebuild b/kde-base/kuser/kuser-3.4.1.ebuild
index b25d65c96312..b5ce34cfc0af 100644
--- a/kde-base/kuser/kuser-3.4.1.ebuild
+++ b/kde-base/kuser/kuser-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE user (/etc/passwd and other methods) manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kuser/kuser-3.4.2.ebuild b/kde-base/kuser/kuser-3.4.2.ebuild
index 5e74b23a146e..8fa2e7f01118 100644
--- a/kde-base/kuser/kuser-3.4.2.ebuild
+++ b/kde-base/kuser/kuser-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE user (/etc/passwd and other methods) manager"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kuser/kuser-3.5.0.ebuild b/kde-base/kuser/kuser-3.5.0.ebuild
index a13b4c275ca5..cfc0ef6fc56d 100644
--- a/kde-base/kuser/kuser-3.5.0.ebuild
+++ b/kde-base/kuser/kuser-3.5.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/kde-base/kuser/kuser-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kuser/kuser-3.5.0_beta2.ebuild b/kde-base/kuser/kuser-3.5.0_beta2.ebuild
index 4cfbb1e84b3b..fb35bd344a22 100644
--- a/kde-base/kuser/kuser-3.5.0_beta2.ebuild
+++ b/kde-base/kuser/kuser-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE user (/etc/passwd and other methods) manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kuser/kuser-3.5.0_rc1.ebuild b/kde-base/kuser/kuser-3.5.0_rc1.ebuild
index 1f13674dd360..75e0a048fdbe 100644
--- a/kde-base/kuser/kuser-3.5.0_rc1.ebuild
+++ b/kde-base/kuser/kuser-3.5.0_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/kde-base/kuser/kuser-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kuser/kuser-3.5_beta1.ebuild b/kde-base/kuser/kuser-3.5_beta1.ebuild
index 8aeaaf61e41d..096e03538387 100644
--- a/kde-base/kuser/kuser-3.5_beta1.ebuild
+++ b/kde-base/kuser/kuser-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.5_beta1.ebuild,v 1.1 2005/09/22 20:56:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kuser/kuser-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:20 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE user (/etc/passwd and other methods) manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kuser/metadata.xml b/kde-base/kuser/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kuser/metadata.xml
+++ b/kde-base/kuser/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kverbos/ChangeLog b/kde-base/kverbos/ChangeLog
index 7c5607ad5814..4b8986a2430e 100644
--- a/kde-base/kverbos/ChangeLog
+++ b/kde-base/kverbos/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for kde-base/kverbos
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/ChangeLog,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kverbos-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kverbos-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kverbos-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*kverbos-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kverbos-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kverbos-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kverbos-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kverbos-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kverbos-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kverbos-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kverbos-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kverbos-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kverbos-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kverbos-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kverbos-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kverbos-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kverbos-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kverbos-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kverbos-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kverbos-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kverbos-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kverbos-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kverbos-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kverbos-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kverbos-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kverbos-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kverbos-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kverbos-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kverbos/Manifest b/kde-base/kverbos/Manifest
index 29985dc34e86..202041b839c0 100644
--- a/kde-base/kverbos/Manifest
+++ b/kde-base/kverbos/Manifest
@@ -1,4 +1,20 @@
-MD5 e0cc312965bfe2f9a1d663340fc7f9e4 kverbos-3.4.0_alpha1.ebuild 279
-MD5 e0cc312965bfe2f9a1d663340fc7f9e4 kverbos-3.4.0_beta1.ebuild 279
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kverbos-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kverbos-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77fb9c4c86eb0001900713c87aa451b8 ChangeLog 3122
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kverbos-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kverbos-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kverbos-3.5.0 67
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kverbos-3.5_beta1 68
+MD5 2d6f45d1c0d651baaa1edb61c1a9a60d kverbos-3.4.1.ebuild 398
+MD5 a3c644540e5500645588c171700b6fb5 kverbos-3.4.2.ebuild 409
+MD5 97a8f175024fb8337e5a063d0e0fe139 kverbos-3.5.0.ebuild 387
+MD5 28c383ac04f29ec27e332d843ab1ce77 kverbos-3.5_beta1.ebuild 397
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlWEntT9W3vfTuoRAucgAJ0TQDKu/LOEMsUdA9qLA3vAklvm7gCfekLI
+uiEPRXaxgpunfBe+V6/PKd0=
+=7aFp
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kverbos/files/digest-kverbos-3.4.1 b/kde-base/kverbos/files/digest-kverbos-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kverbos/files/digest-kverbos-3.4.1
+++ b/kde-base/kverbos/files/digest-kverbos-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kverbos/files/digest-kverbos-3.4.2 b/kde-base/kverbos/files/digest-kverbos-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kverbos/files/digest-kverbos-3.4.2
+++ b/kde-base/kverbos/files/digest-kverbos-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kverbos/kverbos-3.4.1.ebuild b/kde-base/kverbos/kverbos-3.4.1.ebuild
index 11b03c29a314..554e17c0edb4 100644
--- a/kde-base/kverbos/kverbos-3.4.1.ebuild
+++ b/kde-base/kverbos/kverbos-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: language teaching"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kverbos/kverbos-3.4.2.ebuild b/kde-base/kverbos/kverbos-3.4.2.ebuild
index 62d636fb03cf..23ece1a59966 100644
--- a/kde-base/kverbos/kverbos-3.4.2.ebuild
+++ b/kde-base/kverbos/kverbos-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: language teaching"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kverbos/kverbos-3.5.0.ebuild b/kde-base/kverbos/kverbos-3.5.0.ebuild
index 2b8789e2ac8f..236e44cc7951 100644
--- a/kde-base/kverbos/kverbos-3.5.0.ebuild
+++ b/kde-base/kverbos/kverbos-3.5.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/kde-base/kverbos/kverbos-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kverbos/kverbos-3.5_beta1.ebuild b/kde-base/kverbos/kverbos-3.5_beta1.ebuild
index fad59830a405..bc21b8957b98 100644
--- a/kde-base/kverbos/kverbos-3.5_beta1.ebuild
+++ b/kde-base/kverbos/kverbos-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.5_beta1.ebuild,v 1.1 2005/09/22 20:57:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kverbos/kverbos-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: language teaching"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kverbos/metadata.xml b/kde-base/kverbos/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kverbos/metadata.xml
+++ b/kde-base/kverbos/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kview/ChangeLog b/kde-base/kview/ChangeLog
index 6414efe3d656..2dde32aad5b2 100644
--- a/kde-base/kview/ChangeLog
+++ b/kde-base/kview/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kview
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/ChangeLog,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kview-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kview-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kview-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kview-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kview-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kview-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kview-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kview-3.5_beta1.ebuild,
+  kview-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kview-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kview-3.5.0_beta2.ebuild:
+  New version.
+
+*kview-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kview-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kview-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kview-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kview-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kview-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kview-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kview-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kview-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kview-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kview-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kview-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kview-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kview-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kview-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kview-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kview-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kview-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kview-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kview-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kview-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kview-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kview-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kview-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kview/Manifest b/kde-base/kview/Manifest
index fc587e3d1b3e..ba3019de6614 100644
--- a/kde-base/kview/Manifest
+++ b/kde-base/kview/Manifest
@@ -1,4 +1,26 @@
-MD5 442b5f7e9b0e30ca32f5cc0b8c8fbc82 kview-3.4.0_alpha1.ebuild 261
-MD5 442b5f7e9b0e30ca32f5cc0b8c8fbc82 kview-3.4.0_beta1.ebuild 261
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kview-3.4.0_beta1 225
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kview-3.4.0_alpha1 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 befb7354ab0d9d12c1af0984d237820b ChangeLog 3465
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kview-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kview-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kview-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kview-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kview-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kview-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kview-3.5_beta1 72
+MD5 ac6678af014cece07fc8d1b3945a907f kview-3.4.1.ebuild 376
+MD5 ecd242e68ddcf6d213b5a0e399afba03 kview-3.4.2.ebuild 389
+MD5 5ef5c5d16dc99f8bfd5ac57f3777d351 kview-3.4.3.ebuild 386
+MD5 8f028da550b23a491c96d6b5b741f29e kview-3.5.0.ebuild 365
+MD5 070d67b6acdb80009979f172c5553478 kview-3.5.0_beta2.ebuild 370
+MD5 bfdb3961e3faa24e66b08705b3a22d13 kview-3.5.0_rc1.ebuild 369
+MD5 4aa114ebaf4e0afbfa978aeb445ff1d0 kview-3.5_beta1.ebuild 368
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhml+ntT9W3vfTuoRAnFaAJoDm+z2sCAMg43xe5ruh8bb1RnKWQCdGy4C
+YhVXSuCDztakBn4+aXJ90I4=
+=ucrN
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kview/files/digest-kview-3.4.1 b/kde-base/kview/files/digest-kview-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kview/files/digest-kview-3.4.1
+++ b/kde-base/kview/files/digest-kview-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kview/files/digest-kview-3.4.2 b/kde-base/kview/files/digest-kview-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kview/files/digest-kview-3.4.2
+++ b/kde-base/kview/files/digest-kview-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kview/kview-3.4.1.ebuild b/kde-base/kview/kview-3.4.1.ebuild
index 8fabd8aab491..de1521ef8885 100644
--- a/kde-base/kview/kview-3.4.1.ebuild
+++ b/kde-base/kview/kview-3.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/kde-base/kview/kview-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kde image viwer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kview/kview-3.4.2.ebuild b/kde-base/kview/kview-3.4.2.ebuild
index e23fd3ecb477..e5bc43090fae 100644
--- a/kde-base/kview/kview-3.4.2.ebuild
+++ b/kde-base/kview/kview-3.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/kde-base/kview/kview-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kde image viwer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kview/kview-3.4.3.ebuild b/kde-base/kview/kview-3.4.3.ebuild
index e8a53d153cce..04790de6930c 100644
--- a/kde-base/kview/kview-3.4.3.ebuild
+++ b/kde-base/kview/kview-3.4.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/kde-base/kview/kview-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kde image viwer"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kview/kview-3.5.0.ebuild b/kde-base/kview/kview-3.5.0.ebuild
index e97500e5ab64..792a37f6a2aa 100644
--- a/kde-base/kview/kview-3.5.0.ebuild
+++ b/kde-base/kview/kview-3.5.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/kde-base/kview/kview-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kview/kview-3.5.0_beta2.ebuild b/kde-base/kview/kview-3.5.0_beta2.ebuild
index d3eed2ff5fae..3042164b24b8 100644
--- a/kde-base/kview/kview-3.5.0_beta2.ebuild
+++ b/kde-base/kview/kview-3.5.0_beta2.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/kde-base/kview/kview-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kde image viwer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kview/kview-3.5.0_rc1.ebuild b/kde-base/kview/kview-3.5.0_rc1.ebuild
index 487e7f9c1ee6..fe872e07b7cc 100644
--- a/kde-base/kview/kview-3.5.0_rc1.ebuild
+++ b/kde-base/kview/kview-3.5.0_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/kde-base/kview/kview-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kview/kview-3.5_beta1.ebuild b/kde-base/kview/kview-3.5_beta1.ebuild
index 5e92d3ea146b..21e631325caa 100644
--- a/kde-base/kview/kview-3.5_beta1.ebuild
+++ b/kde-base/kview/kview-3.5_beta1.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/kde-base/kview/kview-3.5_beta1.ebuild,v 1.1 2005/09/22 20:58:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kview/kview-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:48 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="kde image viwer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kview/metadata.xml b/kde-base/kview/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kview/metadata.xml
+++ b/kde-base/kview/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kviewshell/ChangeLog b/kde-base/kviewshell/ChangeLog
index 1a36c1702b0e..c9d771296834 100644
--- a/kde-base/kviewshell/ChangeLog
+++ b/kde-base/kviewshell/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/kviewshell
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/ChangeLog,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kviewshell-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kviewshell-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kviewshell-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kviewshell-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kviewshell-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kviewshell-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kviewshell-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kviewshell-3.5_beta1.ebuild,
+  kviewshell-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org>
+  kviewshell-3.5.0_beta2.ebuild:
+  Removed patched applied upstream.
+
+*kviewshell-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kviewshell-3.5.0_beta2.ebuild:
+  New version.
+
+*kviewshell-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kviewshell-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kviewshell-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kviewshell-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kviewshell-qt-3.3.5.patch, kviewshell-3.4.2.ebuild,
+  +kviewshell-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kviewshell-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kviewshell-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kviewshell-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kviewshell-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kviewshell-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kviewshell-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kviewshell-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kviewshell-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kviewshell-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kviewshell-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kviewshell-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kviewshell-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kviewshell-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kviewshell-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kviewshell-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kviewshell-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kviewshell-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kviewshell-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kviewshell-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kviewshell/Manifest b/kde-base/kviewshell/Manifest
index a4176b939311..f63916de6536 100644
--- a/kde-base/kviewshell/Manifest
+++ b/kde-base/kviewshell/Manifest
@@ -1,4 +1,27 @@
-MD5 1e16fe308dca3dd47f70a2673b1e0114 kviewshell-3.4.0_beta1.ebuild 292
-MD5 1e16fe308dca3dd47f70a2673b1e0114 kviewshell-3.4.0_alpha1.ebuild 292
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-kviewshell-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-kviewshell-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 51019c63539a41e052cceb9a1fce7374 ChangeLog 3841
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-kviewshell-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-kviewshell-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-kviewshell-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-kviewshell-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-kviewshell-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-kviewshell-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-kviewshell-3.5_beta1 72
+MD5 339eca37408cf1043fc3ec09e4e66db5 files/kviewshell-qt-3.3.5.patch 469
+MD5 c90e809e5a7b27ae4809d31bb1bfaefe kviewshell-3.4.1.ebuild 417
+MD5 bf8cd2a605ca59751c3572a7c340f611 kviewshell-3.4.2.ebuild 479
+MD5 0f1fc526a1e0cfe2f47a07c734fcd1ca kviewshell-3.4.3.ebuild 427
+MD5 16bdf9273765a53a2f779ce462e35769 kviewshell-3.5.0.ebuild 408
+MD5 01595167d89556c43ed1870271411cd1 kviewshell-3.5.0_beta2.ebuild 413
+MD5 09faadeacf68e2391354541ecb1b1ceb kviewshell-3.5.0_rc1.ebuild 412
+MD5 c0b6f66737bf8843cdca465ce1560cbc kviewshell-3.5_beta1.ebuild 455
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmUqntT9W3vfTuoRAjSMAJ49YPZjyCGvPdxe7XegoVr94HNJpgCfR1vd
+2DsbgaeXaR4558ZdNv7NkS8=
+=lveG
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kviewshell/files/digest-kviewshell-3.4.1 b/kde-base/kviewshell/files/digest-kviewshell-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/kviewshell/files/digest-kviewshell-3.4.1
+++ b/kde-base/kviewshell/files/digest-kviewshell-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/kviewshell/files/digest-kviewshell-3.4.2 b/kde-base/kviewshell/files/digest-kviewshell-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/kviewshell/files/digest-kviewshell-3.4.2
+++ b/kde-base/kviewshell/files/digest-kviewshell-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/kviewshell/kviewshell-3.4.1.ebuild b/kde-base/kviewshell/kviewshell-3.4.1.ebuild
index 88d759114087..d819bd25ff63 100644
--- a/kde-base/kviewshell/kviewshell-3.4.1.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.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/kde-base/kviewshell/kviewshell-3.4.1.ebuild,v 1.1 2005/05/25 21:23:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Generic framework for viewer applications"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kviewshell/kviewshell-3.4.2.ebuild b/kde-base/kviewshell/kviewshell-3.4.2.ebuild
index b801d93f5713..8679730c0699 100644
--- a/kde-base/kviewshell/kviewshell-3.4.2.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.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/kde-base/kviewshell/kviewshell-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,5 +8,8 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Generic framework for viewer applications"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
+
diff --git a/kde-base/kviewshell/kviewshell-3.4.3.ebuild b/kde-base/kviewshell/kviewshell-3.4.3.ebuild
index 58f25c2aa11b..0c208c0592fb 100644
--- a/kde-base/kviewshell/kviewshell-3.4.3.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.4.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/kde-base/kviewshell/kviewshell-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,8 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Generic framework for viewer applications"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
-
diff --git a/kde-base/kviewshell/kviewshell-3.5.0.ebuild b/kde-base/kviewshell/kviewshell-3.5.0.ebuild
index dc8e455a52e7..77343dbfa6b1 100644
--- a/kde-base/kviewshell/kviewshell-3.5.0.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5.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/kde-base/kviewshell/kviewshell-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kviewshell/kviewshell-3.5.0_beta2.ebuild b/kde-base/kviewshell/kviewshell-3.5.0_beta2.ebuild
index 3f6773f64378..506e9c4ff905 100644
--- a/kde-base/kviewshell/kviewshell-3.5.0_beta2.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5.0_beta2.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/kde-base/kviewshell/kviewshell-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,8 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Generic framework for viewer applications"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
-
diff --git a/kde-base/kviewshell/kviewshell-3.5.0_rc1.ebuild b/kde-base/kviewshell/kviewshell-3.5.0_rc1.ebuild
index 4868057ebb4c..a8720a24e8ec 100644
--- a/kde-base/kviewshell/kviewshell-3.5.0_rc1.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5.0_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/kde-base/kviewshell/kviewshell-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/kviewshell/kviewshell-3.5_beta1.ebuild b/kde-base/kviewshell/kviewshell-3.5_beta1.ebuild
index 7df692b85785..2085ed60dfc4 100644
--- a/kde-base/kviewshell/kviewshell-3.5_beta1.ebuild
+++ b/kde-base/kviewshell/kviewshell-3.5_beta1.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/kde-base/kviewshell/kviewshell-3.5_beta1.ebuild,v 1.1 2005/09/22 20:59:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kviewshell/kviewshell-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:29 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Generic framework for viewer applications"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 PATCHES="${FILESDIR}/${PN}-qt-3.3.5.patch"
diff --git a/kde-base/kviewshell/metadata.xml b/kde-base/kviewshell/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kviewshell/metadata.xml
+++ b/kde-base/kviewshell/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kvoctrain/ChangeLog b/kde-base/kvoctrain/ChangeLog
index 72cc5c785ed9..123dc029ad62 100644
--- a/kde-base/kvoctrain/ChangeLog
+++ b/kde-base/kvoctrain/ChangeLog
@@ -1,6 +1,134 @@
 # ChangeLog for kde-base/kvoctrain
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/ChangeLog,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kvoctrain-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kvoctrain-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kvoctrain-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kvoctrain-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kvoctrain-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kvoctrain-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kvoctrain-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kvoctrain-3.5_beta1.ebuild,
+  kvoctrain-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kvoctrain-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kvoctrain-3.5.0_beta2.ebuild:
+  New version.
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> kvoctrain-3.4.3.ebuild:
+  Added ~alpha keyword (with OK from alpha team member kloeri) since
+  kdeedu-3.4.3 has it.
+
+*kvoctrain-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kvoctrain-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kvoctrain-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kvoctrain-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kvoctrain-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kvoctrain-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kvoctrain-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  kvoctrain-3.4.1-r1.ebuild:
+  Stable on ppc.
+
+  16 Aug 2005; Jason Wever <weeve@gentoo.org> kvoctrain-3.4.1-r1.ebuild:
+  Stable on SPARC wrt security bug #102577.
+
+  15 Aug 2005; Luis Medinas <metalgod@gentoo.org> kvoctrain-3.4.1-r1.ebuild:
+  Stable on AMD64. Closes bug #102577
+
+  15 Aug 2005; Markus Rothe <corsair@gentoo.org> kvoctrain-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #102577)
+
+*kvoctrain-3.4.2-r1 (14 Aug 2005)
+*kvoctrain-3.4.1-r1 (14 Aug 2005)
+
+  14 Aug 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/post-3.4.2-kdeedu.diff, +kvoctrain-3.4.1-r1.ebuild,
+  +kvoctrain-3.4.2-r1.ebuild:
+  temp file vulnerability, #102151
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kvoctrain-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kvoctrain-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kvoctrain-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kvoctrain-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kvoctrain-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kvoctrain-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kvoctrain-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kvoctrain-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kvoctrain-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kvoctrain-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kvoctrain-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kvoctrain-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kvoctrain-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kvoctrain-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kvoctrain-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kvoctrain-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kvoctrain-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kvoctrain/Manifest b/kde-base/kvoctrain/Manifest
index 68aa48ba472e..b2c9a2bf8411 100644
--- a/kde-base/kvoctrain/Manifest
+++ b/kde-base/kvoctrain/Manifest
@@ -1,4 +1,31 @@
-MD5 e0a2b411f6f9524eaa5b91ecb4876786 kvoctrain-3.4.0_alpha1.ebuild 280
-MD5 e0a2b411f6f9524eaa5b91ecb4876786 kvoctrain-3.4.0_beta1.ebuild 280
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kvoctrain-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kvoctrain-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 41266468176fd6b32a3ecb69fac6156b ChangeLog 4476
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kvoctrain-3.4.1 208
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kvoctrain-3.4.1-r1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kvoctrain-3.4.2 282
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kvoctrain-3.4.2-r1 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kvoctrain-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kvoctrain-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kvoctrain-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kvoctrain-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kvoctrain-3.5_beta1 68
+MD5 0e82c5810df3b04370188ba13cc50203 files/post-3.4.2-kdeedu.diff 1876
+MD5 e7a910820e20283225007708ae5fd24f kvoctrain-3.4.1-r1.ebuild 451
+MD5 8284d599d20f0383033231206708527e kvoctrain-3.4.1.ebuild 403
+MD5 a96e66b5dcec36db53b76fc341836f2c kvoctrain-3.4.2-r1.ebuild 455
+MD5 ca8c48071edcecf35a1214f245c75ddc kvoctrain-3.4.2.ebuild 416
+MD5 f20600aa41d7e984b7f56cce0b27a0b9 kvoctrain-3.4.3.ebuild 412
+MD5 6b68a6877c1e289ef652d6d7266fb7e5 kvoctrain-3.5.0.ebuild 391
+MD5 039907b236f3159cadb21120a7368ec4 kvoctrain-3.5.0_beta2.ebuild 396
+MD5 4e4e88081adb8e3a4c34aa531da16d9b kvoctrain-3.5.0_rc1.ebuild 395
+MD5 3b8e2f547cb7830dc94aca2e965f7335 kvoctrain-3.5_beta1.ebuild 394
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlb/ntT9W3vfTuoRAjRfAJ45WAyqxYepZFk5s1YgpFnVZPujbACgkYdf
+Hg9/yXw5VKSiAW2rntaiyJ4=
+=bFlu
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kvoctrain/files/digest-kvoctrain-3.4.1 b/kde-base/kvoctrain/files/digest-kvoctrain-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kvoctrain/files/digest-kvoctrain-3.4.1
+++ b/kde-base/kvoctrain/files/digest-kvoctrain-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2 b/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2
+++ b/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2-r1 b/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2-r1
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2-r1
+++ b/kde-base/kvoctrain/files/digest-kvoctrain-3.4.2-r1
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kvoctrain/kvoctrain-3.4.1-r1.ebuild b/kde-base/kvoctrain/kvoctrain-3.4.1-r1.ebuild
index 532c8abac4c9..c44edc20c019 100644
--- a/kde-base/kvoctrain/kvoctrain-3.4.1-r1.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.4.1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.1-r1.ebuild,v 1.1 2005/08/14 23:28:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kvoctrain/kvoctrain-3.4.1.ebuild b/kde-base/kvoctrain/kvoctrain-3.4.1.ebuild
index a78f044cdf9d..5d5ce1788d99 100644
--- a/kde-base/kvoctrain/kvoctrain-3.4.1.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kvoctrain/kvoctrain-3.4.2-r1.ebuild b/kde-base/kvoctrain/kvoctrain-3.4.2-r1.ebuild
index 886176c3ba84..512814555d8a 100644
--- a/kde-base/kvoctrain/kvoctrain-3.4.2-r1.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.4.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/kde-base/kvoctrain/kvoctrain-3.4.2-r1.ebuild,v 1.1 2005/08/14 23:28:24 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kvoctrain/kvoctrain-3.4.2.ebuild b/kde-base/kvoctrain/kvoctrain-3.4.2.ebuild
index 82ec543bbd8d..5f5c6353dfce 100644
--- a/kde-base/kvoctrain/kvoctrain-3.4.2.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kvoctrain/kvoctrain-3.4.3.ebuild b/kde-base/kvoctrain/kvoctrain-3.4.3.ebuild
index eee9827913c4..f46cc85de0e5 100644
--- a/kde-base/kvoctrain/kvoctrain-3.4.3.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kvoctrain/kvoctrain-3.5.0.ebuild b/kde-base/kvoctrain/kvoctrain-3.5.0.ebuild
index 620f44ad14d2..ff71eee76966 100644
--- a/kde-base/kvoctrain/kvoctrain-3.5.0.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.5.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/kde-base/kvoctrain/kvoctrain-3.5.0.ebuild,v 1.1 2005/11/22 22:14:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kvoctrain/kvoctrain-3.5.0_beta2.ebuild b/kde-base/kvoctrain/kvoctrain-3.5.0_beta2.ebuild
index 455cc077d32b..84e2ecdf55b4 100644
--- a/kde-base/kvoctrain/kvoctrain-3.5.0_beta2.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.5.0_beta2.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/kde-base/kvoctrain/kvoctrain-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kvoctrain/kvoctrain-3.5.0_rc1.ebuild b/kde-base/kvoctrain/kvoctrain-3.5.0_rc1.ebuild
index 0bdde9a62fe6..34199484cac7 100644
--- a/kde-base/kvoctrain/kvoctrain-3.5.0_rc1.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.5.0_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/kde-base/kvoctrain/kvoctrain-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kvoctrain/kvoctrain-3.5_beta1.ebuild b/kde-base/kvoctrain/kvoctrain-3.5_beta1.ebuild
index 23ceeb90134d..c7a5a1b54ca7 100644
--- a/kde-base/kvoctrain/kvoctrain-3.5_beta1.ebuild
+++ b/kde-base/kvoctrain/kvoctrain-3.5_beta1.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/kde-base/kvoctrain/kvoctrain-3.5_beta1.ebuild,v 1.1 2005/09/22 21:00:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kvoctrain/kvoctrain-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:00 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE Educational: vocabulary trainer"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kvoctrain/metadata.xml b/kde-base/kvoctrain/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kvoctrain/metadata.xml
+++ b/kde-base/kvoctrain/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kwalletmanager/ChangeLog b/kde-base/kwalletmanager/ChangeLog
index 7961d826cb61..74e48765fd19 100644
--- a/kde-base/kwalletmanager/ChangeLog
+++ b/kde-base/kwalletmanager/ChangeLog
@@ -1,6 +1,108 @@
 # ChangeLog for kde-base/kwalletmanager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/ChangeLog,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kwalletmanager-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  kwalletmanager-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kwalletmanager-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kwalletmanager-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwalletmanager-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kwalletmanager-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+*kwalletmanager-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwalletmanager-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kwalletmanager-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kwalletmanager-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwalletmanager-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kwalletmanager-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwalletmanager-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> ChangeLog:
+  ~alpha keyword.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kwalletmanager-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kwalletmanager-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kwalletmanager-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kwalletmanager-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kwalletmanager-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  kwalletmanager-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kwalletmanager-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kwalletmanager-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  kwalletmanager-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kwalletmanager-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  kwalletmanager-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kwalletmanager-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kwalletmanager-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kwalletmanager-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kwalletmanager-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kwalletmanager-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kwalletmanager-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kwalletmanager/Manifest b/kde-base/kwalletmanager/Manifest
index 5d8791753968..9875967b21d4 100644
--- a/kde-base/kwalletmanager/Manifest
+++ b/kde-base/kwalletmanager/Manifest
@@ -1,4 +1,22 @@
-MD5 7d3e5c89d5d15ecdbe4b01d42613d74b kwalletmanager-3.4.0_alpha1.ebuild 286
-MD5 7d3e5c89d5d15ecdbe4b01d42613d74b kwalletmanager-3.4.0_beta1.ebuild 286
-MD5 d329630a6f718e3d3af7fe3acaf81446 files/digest-kwalletmanager-3.4.0_alpha1 69
-MD5 88e740876cecf9b079bcc6622808dbb1 files/digest-kwalletmanager-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ce7a89799ad4a0f8fee792c0a9709c80 ChangeLog 3572
+MD5 e29bbb2db20451106f7980c7008328fa files/digest-kwalletmanager-3.4.1 212
+MD5 062bb93297f13fe72d1e78a55a449788 files/digest-kwalletmanager-3.4.2 288
+MD5 7693585dde083d1c2cc205db10692163 files/digest-kwalletmanager-3.4.3 68
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-kwalletmanager-3.5.0 68
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-kwalletmanager-3.5_beta1 69
+MD5 08d9da04ac9ad3511ff31ec0478cbd94 kwalletmanager-3.4.1.ebuild 419
+MD5 9239e1a3c3a8e8be42dd2570fa95daa3 kwalletmanager-3.4.2.ebuild 432
+MD5 3dc995bf81ed97419e0c69e78b4a889c kwalletmanager-3.4.3.ebuild 429
+MD5 eb281bebf57069704c42de90a9e90138 kwalletmanager-3.5.0.ebuild 408
+MD5 39927893d4f2f5de1b45ebbeb12fe95c kwalletmanager-3.5_beta1.ebuild 418
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhv4YntT9W3vfTuoRAjzkAJ9ObpY74pOS4ovo3r0LDZFGfU6ceACgm7IE
+Z20wc/fmiO3uJyKTp2YT/Xs=
+=whYH
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.1 b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.1
index 617d35b66a27..ef5a06fe43bc 100644
--- a/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.1
+++ b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.1
@@ -1,2 +1,3 @@
 MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
 MD5 0c3ef37a96ce9f5b0b3ee5d0b31ef4e4 kdeutils-3.4.1.tar.bz2 2287376
diff --git a/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.2 b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.2
index 14ea8b02ce39..d6aa7ce3d392 100644
--- a/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.2
+++ b/kde-base/kwalletmanager/files/digest-kwalletmanager-3.4.2
@@ -1 +1,4 @@
+MD5 cb7e5402eedaca816e210d460e22e53a kdeutils-3.4.0.tar.bz2 2328791
+MD5 f19aa06922a8b35bb7181248dbafc91a kdeutils-3.4.0-3.4.1.tar.xdelta 162715
+MD5 8581f454fe4baf54e7666eec41474588 kdeutils-3.4.1-3.4.2.tar.xdelta 150534
 MD5 62500e5ee043937592ebc6ad91dd670d kdeutils-3.4.2.tar.bz2 2290150
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.4.1.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.4.1.ebuild
index bf3fb92be437..2e31396a4c00 100644
--- a/kde-base/kwalletmanager/kwalletmanager-3.4.1.ebuild
+++ b/kde-base/kwalletmanager/kwalletmanager-3.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/kde-base/kwalletmanager/kwalletmanager-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdeutils
 KMMODULE=kwallet
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.4.2.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.4.2.ebuild
index 32b7171a026d..6a57cad3cf9f 100644
--- a/kde-base/kwalletmanager/kwalletmanager-3.4.2.ebuild
+++ b/kde-base/kwalletmanager/kwalletmanager-3.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/kde-base/kwalletmanager/kwalletmanager-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdeutils
 KMMODULE=kwallet
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.4.3.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.4.3.ebuild
index bc3d6f532154..8f67c53b7179 100644
--- a/kde-base/kwalletmanager/kwalletmanager-3.4.3.ebuild
+++ b/kde-base/kwalletmanager/kwalletmanager-3.4.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/kde-base/kwalletmanager/kwalletmanager-3.4.3.ebuild,v 1.1 2005/10/13 00:10:06 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdeutils
 KMMODULE=kwallet
@@ -9,5 +9,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.5.0.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.5.0.ebuild
index 893512a9aae1..6e942af30c21 100644
--- a/kde-base/kwalletmanager/kwalletmanager-3.5.0.ebuild
+++ b/kde-base/kwalletmanager/kwalletmanager-3.5.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/kde-base/kwalletmanager/kwalletmanager-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdeutils
 KMMODULE=kwallet
diff --git a/kde-base/kwalletmanager/kwalletmanager-3.5_beta1.ebuild b/kde-base/kwalletmanager/kwalletmanager-3.5_beta1.ebuild
index 425455b162df..d4dfec992aed 100644
--- a/kde-base/kwalletmanager/kwalletmanager-3.5_beta1.ebuild
+++ b/kde-base/kwalletmanager/kwalletmanager-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.5_beta1.ebuild,v 1.1 2005/09/22 21:01:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletmanager/kwalletmanager-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdeutils
 KMMODULE=kwallet
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Wallet Management Tool"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/kwalletmanager/metadata.xml b/kde-base/kwalletmanager/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kwalletmanager/metadata.xml
+++ b/kde-base/kwalletmanager/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kweather/ChangeLog b/kde-base/kweather/ChangeLog
index ae90c828cc77..1170d89e61c5 100644
--- a/kde-base/kweather/ChangeLog
+++ b/kde-base/kweather/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/kweather
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/ChangeLog,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kweather-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kweather-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kweather-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kweather-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kweather-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kweather-3.5_beta1.ebuild,
+  kweather-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kweather-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.5.0_beta2.ebuild:
+  New version.
+
+*kweather-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kweather-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kweather-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kweather-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kweather-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kweather-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kweather-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kweather-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kweather-3.4.1-r1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kweather-3.4.1-r1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kweather-3.4.1-r1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kweather-3.4.1-r1 (13 Jun 2005)
+
+  13 Jun 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kweather-3.4.1-fix-icon-size.diff, +kweather-3.4.1-r1.ebuild:
+  taskbar icon size fix, #95286
+
+*kweather-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kweather-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kweather-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kweather-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kweather-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kweather-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kweather-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kweather-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kweather-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kweather-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kweather/Manifest b/kde-base/kweather/Manifest
index f75430f54f6d..40f51c706c05 100644
--- a/kde-base/kweather/Manifest
+++ b/kde-base/kweather/Manifest
@@ -1,4 +1,29 @@
-MD5 4d3059a9bce0b4be0314c83a9171be99 kweather-3.4.0_alpha1.ebuild 271
-MD5 4d3059a9bce0b4be0314c83a9171be99 kweather-3.4.0_beta1.ebuild 271
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-kweather-3.4.0_alpha1 68
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-kweather-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6cfcbb6068f91185356deffce841e765 ChangeLog 3775
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-kweather-3.4.1 208
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-kweather-3.4.1-r1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-kweather-3.4.2 282
+MD5 4792409083f3033f880840748c1ec31a files/digest-kweather-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-kweather-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-kweather-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-kweather-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-kweather-3.5_beta1 68
+MD5 dc4e14a043c6a61fbfa9e149a285fef8 files/kweather-3.4.1-fix-icon-size.diff 534
+MD5 3c5cb569b353184571fde5e93fb7c2b1 kweather-3.4.1-r1.ebuild 451
+MD5 ded899b7f4c97daf259ac5ab7f26eed7 kweather-3.4.1.ebuild 400
+MD5 41146ed745d8b48aa9e9d7f77557d3bc kweather-3.4.2.ebuild 406
+MD5 5d6c8db9f7d48375d8819b9d22021eb3 kweather-3.4.3.ebuild 402
+MD5 187349de68922a588774989456409b02 kweather-3.5.0.ebuild 382
+MD5 deaf6d0697e7769fdaf52a6603a09c21 kweather-3.5.0_beta2.ebuild 387
+MD5 e33b2a538e5f511ba67dd0a7179c1324 kweather-3.5.0_rc1.ebuild 386
+MD5 bc47b30f81171adb19d0d8104204cdc6 kweather-3.5_beta1.ebuild 385
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvmantT9W3vfTuoRAiqoAJ9OyFzFNE1zQs1eu6/YohAde++uiwCgiRlB
+34nruR6st/E80r2BMCkgBBk=
+=Volr
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kweather/files/digest-kweather-3.4.1 b/kde-base/kweather/files/digest-kweather-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/kweather/files/digest-kweather-3.4.1
+++ b/kde-base/kweather/files/digest-kweather-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/kweather/files/digest-kweather-3.4.2 b/kde-base/kweather/files/digest-kweather-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/kweather/files/digest-kweather-3.4.2
+++ b/kde-base/kweather/files/digest-kweather-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/kweather/kweather-3.4.1-r1.ebuild b/kde-base/kweather/kweather-3.4.1-r1.ebuild
index 4a0b85e7f9dd..3cbc4df2cc8b 100644
--- a/kde-base/kweather/kweather-3.4.1-r1.ebuild
+++ b/kde-base/kweather/kweather-3.4.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/kde-base/kweather/kweather-3.4.1-r1.ebuild,v 1.1 2005/06/13 00:22:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE weather status display"
-KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 PATCHES="${FILESDIR}/kweather-3.4.1-fix-icon-size.diff"
\ No newline at end of file
diff --git a/kde-base/kweather/kweather-3.4.1.ebuild b/kde-base/kweather/kweather-3.4.1.ebuild
index 0d3af1aa9044..29e609345b7b 100644
--- a/kde-base/kweather/kweather-3.4.1.ebuild
+++ b/kde-base/kweather/kweather-3.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/kde-base/kweather/kweather-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE weather status display"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~ppc ~sparc"
 IUSE=""
 DEPEND=""
\ No newline at end of file
diff --git a/kde-base/kweather/kweather-3.4.2.ebuild b/kde-base/kweather/kweather-3.4.2.ebuild
index 2cb1f4387b34..73c446b141a8 100644
--- a/kde-base/kweather/kweather-3.4.2.ebuild
+++ b/kde-base/kweather/kweather-3.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/kde-base/kweather/kweather-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE weather status display"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kweather/kweather-3.4.3.ebuild b/kde-base/kweather/kweather-3.4.3.ebuild
index 4c13694f380c..93d36fcce36e 100644
--- a/kde-base/kweather/kweather-3.4.3.ebuild
+++ b/kde-base/kweather/kweather-3.4.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/kde-base/kweather/kweather-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE weather status display"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kweather/kweather-3.5.0.ebuild b/kde-base/kweather/kweather-3.5.0.ebuild
index 45b25084a8fe..9e4ccbe81dda 100644
--- a/kde-base/kweather/kweather-3.5.0.ebuild
+++ b/kde-base/kweather/kweather-3.5.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/kde-base/kweather/kweather-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kweather/kweather-3.5.0_beta2.ebuild b/kde-base/kweather/kweather-3.5.0_beta2.ebuild
index e7c2904e281b..358e4a50e688 100644
--- a/kde-base/kweather/kweather-3.5.0_beta2.ebuild
+++ b/kde-base/kweather/kweather-3.5.0_beta2.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/kde-base/kweather/kweather-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE weather status display"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kweather/kweather-3.5.0_rc1.ebuild b/kde-base/kweather/kweather-3.5.0_rc1.ebuild
index f39353b37df5..8d468b5f43bd 100644
--- a/kde-base/kweather/kweather-3.5.0_rc1.ebuild
+++ b/kde-base/kweather/kweather-3.5.0_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/kde-base/kweather/kweather-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kweather/kweather-3.5_beta1.ebuild b/kde-base/kweather/kweather-3.5_beta1.ebuild
index cd363f16686b..ac18ac96211e 100644
--- a/kde-base/kweather/kweather-3.5_beta1.ebuild
+++ b/kde-base/kweather/kweather-3.5_beta1.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/kde-base/kweather/kweather-3.5_beta1.ebuild,v 1.1 2005/09/22 21:02:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kweather/kweather-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE weather status display"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/kweather/metadata.xml b/kde-base/kweather/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kweather/metadata.xml
+++ b/kde-base/kweather/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kwifimanager/ChangeLog b/kde-base/kwifimanager/ChangeLog
index 4645c75a2451..99ce19b39414 100644
--- a/kde-base/kwifimanager/ChangeLog
+++ b/kde-base/kwifimanager/ChangeLog
@@ -1,6 +1,102 @@
 # ChangeLog for kde-base/kwifimanager
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/ChangeLog,v 1.1 2005/01/15 02:24:39 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/ChangeLog,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kwifimanager-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kwifimanager-3.4.3.ebuild:
+  Stable on ppc64
+
+*kwifimanager-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwifimanager-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kwifimanager-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwifimanager-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kwifimanager-3.5_beta1.ebuild, kwifimanager-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kwifimanager-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwifimanager-3.5.0_beta2.ebuild:
+  New version.
+
+*kwifimanager-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwifimanager-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kwifimanager-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kwifimanager-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwifimanager-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kwifimanager-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwifimanager-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> kwifimanager-3.4.2.ebuild:
+  Don't try to apply patch that is already in 3.4.2.
+
+*kwifimanager-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kwifimanager-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kwifimanager-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kwifimanager-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  29 Jun 2005; Dan Armak <danarmak@gentoo.org>
+  +files/wireless-extensions-api.diff, kwifimanager-3.4.1.ebuild:
+  Fix bug 94719: add patch from upstream branch cvs allowing kwifimanager to
+  compile with wireless extensions 28_pre8.
+
+  02 Jun 2005; Gregorio Guidi <greg_g@gentoo.org> kwifimanager-3.4.1.ebuild:
+  Correct dependency on wireless-tools for bug #94719.
+
+*kwifimanager-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kwifimanager-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kwifimanager-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kwifimanager-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kwifimanager-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kwifimanager-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kwifimanager-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kwifimanager-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kwifimanager/Manifest b/kde-base/kwifimanager/Manifest
index 5d82f9bd9faa..c3d4c76376ff 100644
--- a/kde-base/kwifimanager/Manifest
+++ b/kde-base/kwifimanager/Manifest
@@ -1,4 +1,27 @@
-MD5 9b39ae38d09b546c7fb76f0efea3a584 kwifimanager-3.4.0_beta1.ebuild 359
-MD5 9b39ae38d09b546c7fb76f0efea3a584 kwifimanager-3.4.0_alpha1.ebuild 359
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-kwifimanager-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-kwifimanager-3.4.0_alpha1 71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d641d45e2d555e417374bafb31a3df78 ChangeLog 3648
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-kwifimanager-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-kwifimanager-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-kwifimanager-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-kwifimanager-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-kwifimanager-3.5.0_beta2 222
+MD5 e3ae49bd33349d36b78d2df93d49089e files/digest-kwifimanager-3.5.0_rc1 308
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-kwifimanager-3.5_beta1 71
+MD5 426360bf289efe11a499f1fa89bb2f4b files/wireless-extensions-api.diff 528
+MD5 be6641f0ea4623cf43ebc5e05038d5e3 kwifimanager-3.4.1.ebuild 555
+MD5 57e7e35f19d9e6b9da2a87718504b127 kwifimanager-3.4.2.ebuild 487
+MD5 3378afd2f78f75bc77f6ca8ce171ec22 kwifimanager-3.4.3.ebuild 481
+MD5 c7eb0d06f61cb4ff9433ceb3ebdf33ed kwifimanager-3.5.0.ebuild 474
+MD5 275b3faa064c7a8bd5164020265e9fbd kwifimanager-3.5.0_beta2.ebuild 479
+MD5 710ed504426999e58e42843d11bf1d0d kwifimanager-3.5.0_rc1.ebuild 478
+MD5 c509c083edcc0e04dc78a9d1df9028cf kwifimanager-3.5_beta1.ebuild 477
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuYDntT9W3vfTuoRAuzkAJ9uVBEc4SN656YnTRcBhqrrKA176gCgqVWx
+W4CGVdYuSM+UVtPT77SxoUQ=
+=o+Sr
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kwifimanager/files/digest-kwifimanager-3.4.1 b/kde-base/kwifimanager/files/digest-kwifimanager-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/kwifimanager/files/digest-kwifimanager-3.4.1
+++ b/kde-base/kwifimanager/files/digest-kwifimanager-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/kwifimanager/files/digest-kwifimanager-3.4.2 b/kde-base/kwifimanager/files/digest-kwifimanager-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/kwifimanager/files/digest-kwifimanager-3.4.2
+++ b/kde-base/kwifimanager/files/digest-kwifimanager-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild b/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild
index 55a7fb5706d9..e681c3803099 100644
--- a/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.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/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
@@ -9,7 +9,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE wifi (wireless network) gui"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
-DEPEND=">=net-wireless/wireless-tools-25"
-KMEXTRA="doc/kwifimanager"
\ No newline at end of file
+DEPEND="net-wireless/wireless-tools"
+KMEXTRA="doc/kwifimanager"
+
+PATCHES="$FILESDIR/wireless-extensions-api.diff" # In cvs, remove for 3.4.2
diff --git a/kde-base/kwifimanager/kwifimanager-3.4.2.ebuild b/kde-base/kwifimanager/kwifimanager-3.4.2.ebuild
index 0d6811bda9af..1a9d0fe01f13 100644
--- a/kde-base/kwifimanager/kwifimanager-3.4.2.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.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/kde-base/kwifimanager/kwifimanager-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
@@ -14,4 +14,3 @@ IUSE=""
 DEPEND="net-wireless/wireless-tools"
 KMEXTRA="doc/kwifimanager"
 
-PATCHES="$FILESDIR/wireless-extensions-api.diff" # In cvs, remove for 3.4.2
diff --git a/kde-base/kwifimanager/kwifimanager-3.4.3.ebuild b/kde-base/kwifimanager/kwifimanager-3.4.3.ebuild
index fd2eb9d113f7..1d78807808e8 100644
--- a/kde-base/kwifimanager/kwifimanager-3.4.3.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.4.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/kde-base/kwifimanager/kwifimanager-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE wifi (wireless network) gui"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ppc64 ~x86"
 IUSE=""
 DEPEND="net-wireless/wireless-tools"
 KMEXTRA="doc/kwifimanager"
diff --git a/kde-base/kwifimanager/kwifimanager-3.5.0.ebuild b/kde-base/kwifimanager/kwifimanager-3.5.0.ebuild
index bd5e381307b0..8adfe4aeaa03 100644
--- a/kde-base/kwifimanager/kwifimanager-3.5.0.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.5.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/kde-base/kwifimanager/kwifimanager-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
diff --git a/kde-base/kwifimanager/kwifimanager-3.5.0_beta2.ebuild b/kde-base/kwifimanager/kwifimanager-3.5.0_beta2.ebuild
index 1427fe2e738b..932600075084 100644
--- a/kde-base/kwifimanager/kwifimanager-3.5.0_beta2.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.5.0_beta2.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/kde-base/kwifimanager/kwifimanager-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE wifi (wireless network) gui"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="net-wireless/wireless-tools"
 KMEXTRA="doc/kwifimanager"
diff --git a/kde-base/kwifimanager/kwifimanager-3.5.0_rc1.ebuild b/kde-base/kwifimanager/kwifimanager-3.5.0_rc1.ebuild
index 3c5b701b4d67..7b41b61b11fc 100644
--- a/kde-base/kwifimanager/kwifimanager-3.5.0_rc1.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.5.0_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/kde-base/kwifimanager/kwifimanager-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
diff --git a/kde-base/kwifimanager/kwifimanager-3.5_beta1.ebuild b/kde-base/kwifimanager/kwifimanager-3.5_beta1.ebuild
index ff46863f710f..f34fc5fe3064 100644
--- a/kde-base/kwifimanager/kwifimanager-3.5_beta1.ebuild
+++ b/kde-base/kwifimanager/kwifimanager-3.5_beta1.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/kde-base/kwifimanager/kwifimanager-3.5_beta1.ebuild,v 1.1 2005/09/22 21:04:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwifimanager/kwifimanager-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:48 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=wifi
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE wifi (wireless network) gui"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="net-wireless/wireless-tools"
 KMEXTRA="doc/kwifimanager"
diff --git a/kde-base/kwifimanager/metadata.xml b/kde-base/kwifimanager/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kwifimanager/metadata.xml
+++ b/kde-base/kwifimanager/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index d33628f6eb29..2cd177dee98e 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,116 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kwin-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kwin-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kwin-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kwin-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kwin-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  21 Oct 2005; Douglas Russell <puggy@gentoo.org> kwin-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*kwin-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.5.0_beta2.ebuild:
+  New version.
+
+*kwin-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> kwin-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kwin-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kwin-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kwin-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> kwin-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kwin-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwin-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kwin-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kwin-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kwin-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kwin-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> ChangeLog:
+  Stable on ppc64 (bug #97544)
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kwin-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kwin-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kwin-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kwin-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kwin-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kwin-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  06 Mar 2005; Jason Wever <weeve@gentoo.org> kwin-3.4.0_rc1.ebuild:
+  Added ~sparc keyword to satisfy deps wrt bug #84197.
+
+*kwin-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kwin-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kwin-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kwin-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kwin-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 5bce61c5dfce..e517f95ed8fd 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,4 +1,26 @@
-MD5 1ee6135b431cec8bf664cbb4a0488e70 kwin-3.4.0_alpha1.ebuild 362
-MD5 1ee6135b431cec8bf664cbb4a0488e70 kwin-3.4.0_beta1.ebuild 362
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kwin-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kwin-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3f26d9b9779b4866b4bdcc7dce1549da ChangeLog 3806
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kwin-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kwin-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kwin-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kwin-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kwin-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kwin-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kwin-3.5_beta1 69
+MD5 2809511699650a8a076be8791e4d1567 kwin-3.4.1.ebuild 384
+MD5 83701c6ee016cca9476c28a71b8b6f8d kwin-3.4.2.ebuild 388
+MD5 2a89eed436c5f08d64a6032ae19bb459 kwin-3.4.3.ebuild 384
+MD5 5eea5e23a535648652098d23c249092f kwin-3.5.0.ebuild 369
+MD5 55ea2cc38568d41b969f117275d6039a kwin-3.5.0_beta2.ebuild 372
+MD5 9d809ccabc91983f809a86f2e2c69840 kwin-3.5.0_rc1.ebuild 373
+MD5 96b1e0acf16e5b12bbdc043ef11c977a kwin-3.5_beta1.ebuild 370
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhj3CntT9W3vfTuoRAqK6AKCRSBnZ7Gp8UB6zLrp1vawCcHLlmwCggD8r
+d4vGWuSS0AOMSE70rSjCpJE=
+=Fmof
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/digest-kwin-3.4.1 b/kde-base/kwin/files/digest-kwin-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kwin/files/digest-kwin-3.4.1
+++ b/kde-base/kwin/files/digest-kwin-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kwin/files/digest-kwin-3.4.2 b/kde-base/kwin/files/digest-kwin-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kwin/files/digest-kwin-3.4.2
+++ b/kde-base/kwin/files/digest-kwin-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kwin/kwin-3.4.1.ebuild b/kde-base/kwin/kwin-3.4.1.ebuild
index 92f592d1f12b..d72f83c52c80 100644
--- a/kde-base/kwin/kwin-3.4.1.ebuild
+++ b/kde-base/kwin/kwin-3.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/kde-base/kwin/kwin-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/kwin/kwin-3.4.2.ebuild b/kde-base/kwin/kwin-3.4.2.ebuild
index bba1d507ad6d..30bd31504883 100644
--- a/kde-base/kwin/kwin-3.4.2.ebuild
+++ b/kde-base/kwin/kwin-3.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/kde-base/kwin/kwin-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/kwin/kwin-3.4.3.ebuild b/kde-base/kwin/kwin-3.4.3.ebuild
index 2f1a4e3bf880..cdca8d1f7af9 100644
--- a/kde-base/kwin/kwin-3.4.3.ebuild
+++ b/kde-base/kwin/kwin-3.4.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/kde-base/kwin/kwin-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/kwin/kwin-3.5.0.ebuild b/kde-base/kwin/kwin-3.5.0.ebuild
index ec8d5302fd42..f763e71f1b78 100644
--- a/kde-base/kwin/kwin-3.5.0.ebuild
+++ b/kde-base/kwin/kwin-3.5.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/kde-base/kwin/kwin-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kwin/kwin-3.5.0_beta2.ebuild b/kde-base/kwin/kwin-3.5.0_beta2.ebuild
index 9f1a4d3e1775..6558d7d35496 100644
--- a/kde-base/kwin/kwin-3.5.0_beta2.ebuild
+++ b/kde-base/kwin/kwin-3.5.0_beta2.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/kde-base/kwin/kwin-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
diff --git a/kde-base/kwin/kwin-3.5.0_rc1.ebuild b/kde-base/kwin/kwin-3.5.0_rc1.ebuild
index 6367de78fb91..f3fec15bf9cd 100644
--- a/kde-base/kwin/kwin-3.5.0_rc1.ebuild
+++ b/kde-base/kwin/kwin-3.5.0_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/kde-base/kwin/kwin-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kwin/kwin-3.5_beta1.ebuild b/kde-base/kwin/kwin-3.5_beta1.ebuild
index 373d85c91585..9321709ccbd4 100644
--- a/kde-base/kwin/kwin-3.5_beta1.ebuild
+++ b/kde-base/kwin/kwin-3.5_beta1.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/kde-base/kwin/kwin-3.5_beta1.ebuild,v 1.1 2005/09/22 21:05:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:54 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
diff --git a/kde-base/kwin/metadata.xml b/kde-base/kwin/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kwin/metadata.xml
+++ b/kde-base/kwin/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kwin4/ChangeLog b/kde-base/kwin4/ChangeLog
index 9c9a7ae1bf49..081b20ce9c08 100644
--- a/kde-base/kwin4/ChangeLog
+++ b/kde-base/kwin4/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/kwin4
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/ChangeLog,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kwin4-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kwin4-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kwin4-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kwin4-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kwin4-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kwin4-3.5_beta1.ebuild,
+  kwin4-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kwin4-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.5.0_beta2.ebuild:
+  New version.
+
+*kwin4-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kwin4-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kwin4-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwin4-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kwin4-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwin4-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kwin4-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kwin4-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kwin4-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kwin4-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kwin4-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kwin4-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kwin4-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kwin4-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kwin4-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kwin4-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kwin4-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kwin4-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kwin4-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kwin4-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kwin4-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kwin4/Manifest b/kde-base/kwin4/Manifest
index 6a2072a10b01..778744e975af 100644
--- a/kde-base/kwin4/Manifest
+++ b/kde-base/kwin4/Manifest
@@ -1,4 +1,26 @@
-MD5 f8ecf9365d5a0c5d3e671f7c4774bfc9 kwin4-3.4.0_alpha1.ebuild 416
-MD5 f8ecf9365d5a0c5d3e671f7c4774bfc9 kwin4-3.4.0_beta1.ebuild 416
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-kwin4-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-kwin4-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d3b653e5f0383c8b529d27d9f338b18e ChangeLog 3465
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-kwin4-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-kwin4-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-kwin4-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-kwin4-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-kwin4-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-kwin4-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-kwin4-3.5_beta1 70
+MD5 71072951d04777e363b3911695f06d09 kwin4-3.4.1.ebuild 531
+MD5 d62704bfb32bf64c814d811d415d70ea kwin4-3.4.2.ebuild 544
+MD5 6dfa67b0ff0185697b116819767a8221 kwin4-3.4.3.ebuild 540
+MD5 cc85753b131e698b399ec6271bceeb12 kwin4-3.5.0.ebuild 483
+MD5 51a12a1c7ab530c62c21e2490e6b74eb kwin4-3.5.0_beta2.ebuild 488
+MD5 30a4e53e37041ebcbd29764ecf1539f5 kwin4-3.5.0_rc1.ebuild 487
+MD5 0d92cee742e45c22925b600d94969878 kwin4-3.5_beta1.ebuild 523
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmKyntT9W3vfTuoRAuIXAJ9v2CnAcmbkLjxiaa5wPpz+s/gpfACeJQ3r
+kYgCVgKJ/s7HxnEugT6HF5w=
+=3eMh
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kwin4/files/digest-kwin4-3.4.1 b/kde-base/kwin4/files/digest-kwin4-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/kwin4/files/digest-kwin4-3.4.1
+++ b/kde-base/kwin4/files/digest-kwin4-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/kwin4/files/digest-kwin4-3.4.2 b/kde-base/kwin4/files/digest-kwin4-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/kwin4/files/digest-kwin4-3.4.2
+++ b/kde-base/kwin4/files/digest-kwin4-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/kwin4/kwin4-3.4.1.ebuild b/kde-base/kwin4/kwin4-3.4.1.ebuild
index 3e66e1de848c..35e82871c068 100644
--- a/kde-base/kwin4/kwin4-3.4.1.ebuild
+++ b/kde-base/kwin4/kwin4-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kde four-in-a-row game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kwin4/kwin4-3.4.2.ebuild b/kde-base/kwin4/kwin4-3.4.2.ebuild
index 25e293b8a662..dfccda29fb49 100644
--- a/kde-base/kwin4/kwin4-3.4.2.ebuild
+++ b/kde-base/kwin4/kwin4-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kde four-in-a-row game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kwin4/kwin4-3.4.3.ebuild b/kde-base/kwin4/kwin4-3.4.3.ebuild
index d9f260c3a57b..c46e228579fb 100644
--- a/kde-base/kwin4/kwin4-3.4.3.ebuild
+++ b/kde-base/kwin4/kwin4-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kde four-in-a-row game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kwin4/kwin4-3.5.0.ebuild b/kde-base/kwin4/kwin4-3.5.0.ebuild
index 83428f85a067..fb59a41d8783 100644
--- a/kde-base/kwin4/kwin4-3.5.0.ebuild
+++ b/kde-base/kwin4/kwin4-3.5.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/kde-base/kwin4/kwin4-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kwin4/kwin4-3.5.0_beta2.ebuild b/kde-base/kwin4/kwin4-3.5.0_beta2.ebuild
index ed7207bb1700..cb55a2243a4b 100644
--- a/kde-base/kwin4/kwin4-3.5.0_beta2.ebuild
+++ b/kde-base/kwin4/kwin4-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:00 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kde four-in-a-row game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/kwin4/kwin4-3.5.0_rc1.ebuild b/kde-base/kwin4/kwin4-3.5.0_rc1.ebuild
index 140786b91283..d936a50550fb 100644
--- a/kde-base/kwin4/kwin4-3.5.0_rc1.ebuild
+++ b/kde-base/kwin4/kwin4-3.5.0_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/kde-base/kwin4/kwin4-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kwin4/kwin4-3.5_beta1.ebuild b/kde-base/kwin4/kwin4-3.5_beta1.ebuild
index e9701e5dd9d3..05ead47229fb 100644
--- a/kde-base/kwin4/kwin4-3.5_beta1.ebuild
+++ b/kde-base/kwin4/kwin4-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.5_beta1.ebuild,v 1.1 2005/09/22 21:06:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin4/kwin4-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="kde four-in-a-row game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/kwin4/metadata.xml b/kde-base/kwin4/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kwin4/metadata.xml
+++ b/kde-base/kwin4/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kwordquiz/ChangeLog b/kde-base/kwordquiz/ChangeLog
index b1aeb8d54847..5ba49254ac65 100644
--- a/kde-base/kwordquiz/ChangeLog
+++ b/kde-base/kwordquiz/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kwordquiz
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/ChangeLog,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kwordquiz-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kwordquiz-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kwordquiz-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kwordquiz-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwordquiz-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kwordquiz-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kwordquiz-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kwordquiz-3.5_beta1.ebuild,
+  kwordquiz-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kwordquiz-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwordquiz-3.5.0_beta2.ebuild:
+  New version.
+
+*kwordquiz-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kwordquiz-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kwordquiz-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kwordquiz-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwordquiz-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kwordquiz-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kwordquiz-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kwordquiz-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kwordquiz-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kwordquiz-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kwordquiz-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kwordquiz-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kwordquiz-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kwordquiz-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kwordquiz-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kwordquiz-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> kwordquiz-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kwordquiz-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kwordquiz-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kwordquiz-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kwordquiz-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kwordquiz-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kwordquiz-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kwordquiz-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kwordquiz/Manifest b/kde-base/kwordquiz/Manifest
index 2d3a8d58a3b0..b49eda50ef5d 100644
--- a/kde-base/kwordquiz/Manifest
+++ b/kde-base/kwordquiz/Manifest
@@ -1,4 +1,26 @@
-MD5 d57a4ab500403d0e1a8b1e53a2acc388 kwordquiz-3.4.0_alpha1.ebuild 303
-MD5 d57a4ab500403d0e1a8b1e53a2acc388 kwordquiz-3.4.0_beta1.ebuild 303
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-kwordquiz-3.4.0_alpha1 68
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-kwordquiz-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d86413b943a64d289d373f3c95f0a58c ChangeLog 3623
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-kwordquiz-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-kwordquiz-3.4.2 282
+MD5 e6c244e749eb5eaea2195aab1a2b3f23 files/digest-kwordquiz-3.4.3 67
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-kwordquiz-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-kwordquiz-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-kwordquiz-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-kwordquiz-3.5_beta1 68
+MD5 420f797ecebd62921d1fc3239fddd387 kwordquiz-3.4.1.ebuild 426
+MD5 052e332e72e01ef863e047e6d6dfe959 kwordquiz-3.4.2.ebuild 439
+MD5 8cb9e646fb12397e1182026ac33d935f kwordquiz-3.4.3.ebuild 435
+MD5 b35cb9d14780f2bbe930d8264cf39361 kwordquiz-3.5.0.ebuild 415
+MD5 88d933c4917ea22c074f0775e9e1aaa4 kwordquiz-3.5.0_beta2.ebuild 420
+MD5 293067089007d31cf7d39fb491bb155f kwordquiz-3.5.0_rc1.ebuild 419
+MD5 f16265fce79d4ed76c2af956069c1a16 kwordquiz-3.5_beta1.ebuild 418
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlc9ntT9W3vfTuoRAgiAAJ9Gf1H+pLk4U6F17Ys0/vgVHumMogCaA63e
+2F3fXwrewdyqSMRxZac82Yw=
+=y5pr
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kwordquiz/files/digest-kwordquiz-3.4.1 b/kde-base/kwordquiz/files/digest-kwordquiz-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/kwordquiz/files/digest-kwordquiz-3.4.1
+++ b/kde-base/kwordquiz/files/digest-kwordquiz-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/kwordquiz/files/digest-kwordquiz-3.4.2 b/kde-base/kwordquiz/files/digest-kwordquiz-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/kwordquiz/files/digest-kwordquiz-3.4.2
+++ b/kde-base/kwordquiz/files/digest-kwordquiz-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/kwordquiz/kwordquiz-3.4.1.ebuild b/kde-base/kwordquiz/kwordquiz-3.4.1.ebuild
index 079a48dd7be7..a2ca3c95635c 100644
--- a/kde-base/kwordquiz/kwordquiz-3.4.1.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kwordquiz/kwordquiz-3.4.2.ebuild b/kde-base/kwordquiz/kwordquiz-3.4.2.ebuild
index 629d04013117..745c9b2a67f2 100644
--- a/kde-base/kwordquiz/kwordquiz-3.4.2.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kwordquiz/kwordquiz-3.4.3.ebuild b/kde-base/kwordquiz/kwordquiz-3.4.3.ebuild
index 4e5a8f589e6a..eee5f940036b 100644
--- a/kde-base/kwordquiz/kwordquiz-3.4.3.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kwordquiz/kwordquiz-3.5.0.ebuild b/kde-base/kwordquiz/kwordquiz-3.5.0.ebuild
index af465b9ed85f..7a81f0788c09 100644
--- a/kde-base/kwordquiz/kwordquiz-3.5.0.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.5.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/kde-base/kwordquiz/kwordquiz-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kwordquiz/kwordquiz-3.5.0_beta2.ebuild b/kde-base/kwordquiz/kwordquiz-3.5.0_beta2.ebuild
index 1b17c3c1ead9..312cbf6e64d3 100644
--- a/kde-base/kwordquiz/kwordquiz-3.5.0_beta2.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kwordquiz/kwordquiz-3.5.0_rc1.ebuild b/kde-base/kwordquiz/kwordquiz-3.5.0_rc1.ebuild
index ba2cb1bef66f..2c98d5a35355 100644
--- a/kde-base/kwordquiz/kwordquiz-3.5.0_rc1.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.5.0_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/kde-base/kwordquiz/kwordquiz-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kwordquiz/kwordquiz-3.5_beta1.ebuild b/kde-base/kwordquiz/kwordquiz-3.5_beta1.ebuild
index bfee0ea25243..e89bb512b3a3 100644
--- a/kde-base/kwordquiz/kwordquiz-3.5_beta1.ebuild
+++ b/kde-base/kwordquiz/kwordquiz-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.5_beta1.ebuild,v 1.1 2005/09/22 21:07:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwordquiz/kwordquiz-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:51 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: A powerful flashcard and vocabulary learning program"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kwordquiz/metadata.xml b/kde-base/kwordquiz/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kwordquiz/metadata.xml
+++ b/kde-base/kwordquiz/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kworldwatch/ChangeLog b/kde-base/kworldwatch/ChangeLog
index b74d2650651e..c2a66e2badf3 100644
--- a/kde-base/kworldwatch/ChangeLog
+++ b/kde-base/kworldwatch/ChangeLog
@@ -1,6 +1,120 @@
 # ChangeLog for kde-base/kworldwatch
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/ChangeLog,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> ChangeLog:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kworldwatch-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kworldwatch-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kworldwatch-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kworldwatch-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kworldwatch-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kworldwatch-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kworldwatch-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  kworldwatch-3.5_beta1.ebuild, kworldwatch-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kworldwatch-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kworldwatch-3.5.0_beta2.ebuild:
+  New version.
+
+*kworldwatch-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kworldwatch-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kworldwatch-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kworldwatch-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kworldwatch-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kworldwatch-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kworldwatch-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  kworldwatch-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kworldwatch-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kworldwatch-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kworldwatch-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kworldwatch-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kworldwatch-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kworldwatch-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kworldwatch-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kworldwatch-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> kworldwatch-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kworldwatch-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kworldwatch-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kworldwatch-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kworldwatch-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kworldwatch-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kworldwatch-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*kworldwatch-3.4.0_beta1-r1 (04 Feb 2005)
+
+  04 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +kworldwatch-3.4.0_beta1-r1.ebuild:
+  Install the documentation, which was missing.
 
 *kworldwatch-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kworldwatch/Manifest b/kde-base/kworldwatch/Manifest
index 28aa85520c41..1843764a16ce 100644
--- a/kde-base/kworldwatch/Manifest
+++ b/kde-base/kworldwatch/Manifest
@@ -1,4 +1,26 @@
-MD5 9f68c9696939727eb310b398888908f8 kworldwatch-3.4.0_beta1.ebuild 310
-MD5 9f68c9696939727eb310b398888908f8 kworldwatch-3.4.0_alpha1.ebuild 310
-MD5 602c2c663bebe1af788c1bc95755b9d9 files/digest-kworldwatch-3.4.0_alpha1 68
-MD5 5224e7a7ada9a24776f67cfcd38bd62d files/digest-kworldwatch-3.4.0_beta1 212
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 41bad8bded91498cad40bde472561ea0 ChangeLog 3975
+MD5 dd51237c7f58169a5ba9d85f9d6fbf7e files/digest-kworldwatch-3.4.1 208
+MD5 51760bf43f61d4083bb13b322559c21f files/digest-kworldwatch-3.4.2 282
+MD5 4792409083f3033f880840748c1ec31a files/digest-kworldwatch-3.4.3 67
+MD5 fc43cf1b5d793f48d2131d421d051d95 files/digest-kworldwatch-3.5.0 67
+MD5 4ae7eba9ab986e6234dba1ff579990e1 files/digest-kworldwatch-3.5.0_beta2 212
+MD5 3d41e8340efb549d39c73e6c9bc0897e files/digest-kworldwatch-3.5.0_rc1 294
+MD5 7edab32df6e3405c16e1002962773ef4 files/digest-kworldwatch-3.5_beta1 68
+MD5 d72f0fe6eee3a7e82aeb6ac4f1bdc157 kworldwatch-3.4.1.ebuild 518
+MD5 e29100203047ae02c86e0776950b0097 kworldwatch-3.4.2.ebuild 531
+MD5 a9740c361e5e68120cb2f64bfae31d76 kworldwatch-3.4.3.ebuild 527
+MD5 48530a03a0b7be207bc8f73ac6d09b7b kworldwatch-3.5.0.ebuild 507
+MD5 af22a9c15091fb53476f1c11f4facbf6 kworldwatch-3.5.0_beta2.ebuild 512
+MD5 51a6807f073d2c622e1ba5c7c3dfa171 kworldwatch-3.5.0_rc1.ebuild 511
+MD5 1fd0b9a5b3d8ab0431e9faa917a3b6b5 kworldwatch-3.5_beta1.ebuild 510
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvnXntT9W3vfTuoRAqQ/AJ9YQ6KRf37ggfCv/bH/Uog3GboJegCeOrfw
+2edRZzUT+f0ntZ5YiI9npqo=
+=wiMc
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kworldwatch/files/digest-kworldwatch-3.4.1 b/kde-base/kworldwatch/files/digest-kworldwatch-3.4.1
index 936f78fc11f6..cd47876e7190 100644
--- a/kde-base/kworldwatch/files/digest-kworldwatch-3.4.1
+++ b/kde-base/kworldwatch/files/digest-kworldwatch-3.4.1
@@ -1,2 +1,3 @@
 MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
 MD5 8c9ad215fe076942bc9195eca5a9175f kdetoys-3.4.1.tar.bz2 3200295
diff --git a/kde-base/kworldwatch/files/digest-kworldwatch-3.4.2 b/kde-base/kworldwatch/files/digest-kworldwatch-3.4.2
index ef7ae126ed24..94ab42949a21 100644
--- a/kde-base/kworldwatch/files/digest-kworldwatch-3.4.2
+++ b/kde-base/kworldwatch/files/digest-kworldwatch-3.4.2
@@ -1 +1,4 @@
+MD5 aad06c1e9cc8909bba4db4f3a746f666 kdetoys-3.4.0.tar.bz2 3182523
+MD5 364d16d0b78c4d28e00d635ffee51501 kdetoys-3.4.0-3.4.1.tar.xdelta 69353
+MD5 cd438a1ab4f09e395122077ec613ce2e kdetoys-3.4.1-3.4.2.tar.xdelta 53497
 MD5 86f954b4233937eb4cc7dd8f97bbe39f kdetoys-3.4.2.tar.bz2 3204626
diff --git a/kde-base/kworldwatch/kworldwatch-3.4.1.ebuild b/kde-base/kworldwatch/kworldwatch-3.4.1.ebuild
index 12df7abd3af3..e10f28c62cff 100644
--- a/kde-base/kworldwatch/kworldwatch-3.4.1.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.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/kde-base/kworldwatch/kworldwatch-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE program that displays the part of the Earth lit up by the Sun"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kworldwatch/kworldwatch-3.4.2.ebuild b/kde-base/kworldwatch/kworldwatch-3.4.2.ebuild
index 03a8a5c0176c..182ececdcc42 100644
--- a/kde-base/kworldwatch/kworldwatch-3.4.2.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.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/kde-base/kworldwatch/kworldwatch-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE program that displays the part of the Earth lit up by the Sun"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kworldwatch/kworldwatch-3.4.3.ebuild b/kde-base/kworldwatch/kworldwatch-3.4.3.ebuild
index 48c860a9d6d5..a2a664d2be43 100644
--- a/kde-base/kworldwatch/kworldwatch-3.4.3.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.4.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/kde-base/kworldwatch/kworldwatch-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE program that displays the part of the Earth lit up by the Sun"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kworldwatch/kworldwatch-3.5.0.ebuild b/kde-base/kworldwatch/kworldwatch-3.5.0.ebuild
index bbb0f7d6b120..a43fe4b2e327 100644
--- a/kde-base/kworldwatch/kworldwatch-3.5.0.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.5.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/kde-base/kworldwatch/kworldwatch-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kworldwatch/kworldwatch-3.5.0_beta2.ebuild b/kde-base/kworldwatch/kworldwatch-3.5.0_beta2.ebuild
index 95e683ebcbb3..869d24f609b1 100644
--- a/kde-base/kworldwatch/kworldwatch-3.5.0_beta2.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.5.0_beta2.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/kde-base/kworldwatch/kworldwatch-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE program that displays the part of the Earth lit up by the Sun"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kworldwatch/kworldwatch-3.5.0_rc1.ebuild b/kde-base/kworldwatch/kworldwatch-3.5.0_rc1.ebuild
index 422c40a45b8a..cdcc495b6e64 100644
--- a/kde-base/kworldwatch/kworldwatch-3.5.0_rc1.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.5.0_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/kde-base/kworldwatch/kworldwatch-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
diff --git a/kde-base/kworldwatch/kworldwatch-3.5_beta1.ebuild b/kde-base/kworldwatch/kworldwatch-3.5_beta1.ebuild
index 31bbf308acad..65402cc76036 100644
--- a/kde-base/kworldwatch/kworldwatch-3.5_beta1.ebuild
+++ b/kde-base/kworldwatch/kworldwatch-3.5_beta1.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/kde-base/kworldwatch/kworldwatch-3.5_beta1.ebuild,v 1.1 2005/09/22 21:08:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kworldwatch/kworldwatch-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdetoys
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE program that displays the part of the Earth lit up by the Sun"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/kworldwatch/metadata.xml b/kde-base/kworldwatch/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kworldwatch/metadata.xml
+++ b/kde-base/kworldwatch/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kxkb/ChangeLog b/kde-base/kxkb/ChangeLog
index 8db20c870dd1..ed89d8e233b3 100644
--- a/kde-base/kxkb/ChangeLog
+++ b/kde-base/kxkb/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/kxkb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/ChangeLog,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kxkb-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kxkb-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kxkb-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kxkb-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  19 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kxkb-3.5.0_rc1-modularx.patch, kxkb-3.5.0_rc1.ebuild:
+  Added backport of revision 481658 to let kxkb find the data while using
+  modular X.
+
+*kxkb-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kxkb-3.5_beta1.ebuild,
+  kxkb-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kxkb-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.5.0_beta2.ebuild:
+  New version.
+
+*kxkb-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kxkb-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kxkb-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +kxkb-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*kxkb-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kxkb-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kxkb-3.4.2.ebuild:
+  ~alpha keyword.
+
+*kxkb-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kxkb-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> kxkb-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kxkb-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*kxkb-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> kxkb-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> kxkb-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kxkb-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kxkb-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kxkb-3.4.0_rc1 (01 Mar 2005)
+
+  01 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kxkb-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kxkb-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kxkb-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kxkb-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index 78649d02c0cd..c40935998645 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -1,4 +1,27 @@
-MD5 e0c855b7edf45a5c93f5c42ed6bd78fd kxkb-3.4.0_beta1.ebuild 384
-MD5 e0c855b7edf45a5c93f5c42ed6bd78fd kxkb-3.4.0_alpha1.ebuild 384
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-kxkb-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-kxkb-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b5a1aa169ef6abaa01c6bb66a7a6790a ChangeLog 3629
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kxkb-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kxkb-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kxkb-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-kxkb-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-kxkb-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-kxkb-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-kxkb-3.5_beta1 69
+MD5 6dfdd0c3f860e595b1ba5ba09d4f32f7 files/kxkb-3.5.0_rc1-modularx.patch 672
+MD5 421bfb1b3a38ff0fa7428dca89981ff3 kxkb-3.4.1.ebuild 399
+MD5 fba2ac6062d3c7e87e6c3762ee19c245 kxkb-3.4.2.ebuild 412
+MD5 fc776c6d9728edb3aa786f29f6571d3b kxkb-3.4.3.ebuild 408
+MD5 e6393fba9ce4adb6bc9b0d52b48152ee kxkb-3.5.0.ebuild 387
+MD5 681771e7197b4ec5df0f660984442616 kxkb-3.5.0_beta2.ebuild 393
+MD5 9b049a9fb60ebe37aa2681057e2a87f2 kxkb-3.5.0_rc1.ebuild 536
+MD5 502fb2bcf8ae48d72ec2e1fc034d98d3 kxkb-3.5_beta1.ebuild 391
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkN7ntT9W3vfTuoRAoD9AJ9Gff95C5CGxHdWt1Asqsznm8r+LACeP+EZ
+gvzm/4/LzpU0CV6zeqy4bzY=
+=3O20
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kxkb/files/digest-kxkb-3.4.1 b/kde-base/kxkb/files/digest-kxkb-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/kxkb/files/digest-kxkb-3.4.1
+++ b/kde-base/kxkb/files/digest-kxkb-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/kxkb/files/digest-kxkb-3.4.2 b/kde-base/kxkb/files/digest-kxkb-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/kxkb/files/digest-kxkb-3.4.2
+++ b/kde-base/kxkb/files/digest-kxkb-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/kxkb/kxkb-3.4.1.ebuild b/kde-base/kxkb/kxkb-3.4.1.ebuild
index 28136d665aa2..bba5cdcece21 100644
--- a/kde-base/kxkb/kxkb-3.4.1.ebuild
+++ b/kde-base/kxkb/kxkb-3.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/kde-base/kxkb/kxkb-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker applet for management of X keymaps"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/kxkb/kxkb-3.4.2.ebuild b/kde-base/kxkb/kxkb-3.4.2.ebuild
index 4a747da907d6..811ca9bb49ce 100644
--- a/kde-base/kxkb/kxkb-3.4.2.ebuild
+++ b/kde-base/kxkb/kxkb-3.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/kde-base/kxkb/kxkb-3.4.2.ebuild,v 1.1 2005/07/28 21:16:24 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker applet for management of X keymaps"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kxkb/kxkb-3.4.3.ebuild b/kde-base/kxkb/kxkb-3.4.3.ebuild
index c781037d31a1..efd375860267 100644
--- a/kde-base/kxkb/kxkb-3.4.3.ebuild
+++ b/kde-base/kxkb/kxkb-3.4.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/kde-base/kxkb/kxkb-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker applet for management of X keymaps"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kxkb/kxkb-3.5.0.ebuild b/kde-base/kxkb/kxkb-3.5.0.ebuild
index 6cb995fd047d..c7adbd3b02f5 100644
--- a/kde-base/kxkb/kxkb-3.5.0.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.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/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/kxkb/kxkb-3.5.0_beta2.ebuild b/kde-base/kxkb/kxkb-3.5.0_beta2.ebuild
index 17065f2e8530..6e28d7f35061 100644
--- a/kde-base/kxkb/kxkb-3.5.0_beta2.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.0_beta2.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/kde-base/kxkb/kxkb-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker applet for management of X keymaps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild b/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild
index bc952735e6d2..c2cafd305cc6 100644
--- a/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild
+++ b/kde-base/kxkb/kxkb-3.5.0_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/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -11,4 +11,6 @@ DESCRIPTION="Kicker applet for management of X keymaps"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-
+# Make sure that modularx share dir is checked while using kxkb. Already
+# committed for 3.5.0 final.
+PATCHES="${FILESDIR}/${P}-modularx.patch"
diff --git a/kde-base/kxkb/kxkb-3.5_beta1.ebuild b/kde-base/kxkb/kxkb-3.5_beta1.ebuild
index 089ef32b0cc9..263ca7111641 100644
--- a/kde-base/kxkb/kxkb-3.5_beta1.ebuild
+++ b/kde-base/kxkb/kxkb-3.5_beta1.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/kde-base/kxkb/kxkb-3.5_beta1.ebuild,v 1.1 2005/09/22 21:09:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxkb/kxkb-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Kicker applet for management of X keymaps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/kxkb/metadata.xml b/kde-base/kxkb/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kxkb/metadata.xml
+++ b/kde-base/kxkb/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/kxsldbg/ChangeLog b/kde-base/kxsldbg/ChangeLog
index 1d1c8858c919..1e90b9ccd55c 100644
--- a/kde-base/kxsldbg/ChangeLog
+++ b/kde-base/kxsldbg/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/kxsldbg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/ChangeLog,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> kxsldbg-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> kxsldbg-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kxsldbg-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*kxsldbg-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +kxsldbg-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*kxsldbg-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +kxsldbg-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> kxsldbg-3.5_beta1.ebuild,
+  kxsldbg-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*kxsldbg-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +kxsldbg-3.5.0_beta2.ebuild:
+  New version.
+
+*kxsldbg-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +kxsldbg-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -kxsldbg-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*kxsldbg-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kxsldbg-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> kxsldbg-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*kxsldbg-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +kxsldbg-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> kxsldbg-3.4.1.ebuild:
+  ~alpha keyword.
+
+  28 Jul 2005; Gregorio Guidi <greg_g@gentoo.org> kxsldbg-3.4.1.ebuild:
+  Add workaround for bug #98345.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> kxsldbg-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> kxsldbg-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> kxsldbg-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org> kxsldbg-3.4.0.ebuild,
+  kxsldbg-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> kxsldbg-3.4.0.ebuild,
+  kxsldbg-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*kxsldbg-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +kxsldbg-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> kxsldbg-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> kxsldbg-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*kxsldbg-3.4.0_rc1 (10 Mar 2005)
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> kxsldbg-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*kxsldbg-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +kxsldbg-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *kxsldbg-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/kxsldbg/Manifest b/kde-base/kxsldbg/Manifest
index e9195ad7cc91..7acc9265b6bb 100644
--- a/kde-base/kxsldbg/Manifest
+++ b/kde-base/kxsldbg/Manifest
@@ -1,4 +1,24 @@
-MD5 1420d49f477067ae423255cb66d5e881 kxsldbg-3.4.0_alpha1.ebuild 300
-MD5 1420d49f477067ae423255cb66d5e881 kxsldbg-3.4.0_beta1.ebuild 300
-MD5 07dc9f44e293d1ac9c7b66b68f28492f files/digest-kxsldbg-3.4.0_beta1 219
-MD5 01932d35a126a5610a6c4a35de90a2b6 files/digest-kxsldbg-3.4.0_alpha1 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47d22051fee97437540b2f3e6b27305f ChangeLog 3659
+MD5 e951879abebc3cb3931132db3f1c508a files/digest-kxsldbg-3.4.1 215
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-kxsldbg-3.4.3 69
+MD5 1b9c64625ee8bb6581dafc883b1d0ee1 files/digest-kxsldbg-3.5.0 69
+MD5 f707b83e603df2763351c664d0943915 files/digest-kxsldbg-3.5.0_beta2 219
+MD5 50a5dfc5bdebb9f91775752768b4ca60 files/digest-kxsldbg-3.5.0_rc1 304
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-kxsldbg-3.5_beta1 70
+MD5 8ba11655c4d4ca65b708a40eb4f0b850 kxsldbg-3.4.1.ebuild 567
+MD5 095e4734802b79ab2758bf8af268d45d kxsldbg-3.4.3.ebuild 475
+MD5 271c6a5547f85ada4a8a5eaa640956c9 kxsldbg-3.5.0.ebuild 453
+MD5 ca6f1c92d092a78578e6c80cdb412ba2 kxsldbg-3.5.0_beta2.ebuild 549
+MD5 9504d04874f753519d0147fd39bf43c5 kxsldbg-3.5.0_rc1.ebuild 548
+MD5 b1016cdcee3c194420b02b442a6ed842 kxsldbg-3.5_beta1.ebuild 547
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxY1ntT9W3vfTuoRAgZyAJ9lMkT7qiAv3mnUIBhyk6beWLr5AgCbByUg
+D4aWqakdG10fs2IdrciqR18=
+=Q+qa
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kxsldbg/files/digest-kxsldbg-3.4.1 b/kde-base/kxsldbg/files/digest-kxsldbg-3.4.1
index 797b2dac2533..ff993687a657 100644
--- a/kde-base/kxsldbg/files/digest-kxsldbg-3.4.1
+++ b/kde-base/kxsldbg/files/digest-kxsldbg-3.4.1
@@ -1,2 +1,3 @@
 MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
 MD5 d5c9e5c72731aead950ab29a4d620af8 kdewebdev-3.4.1.tar.bz2 5966577
diff --git a/kde-base/kxsldbg/kxsldbg-3.4.1.ebuild b/kde-base/kxsldbg/kxsldbg-3.4.1.ebuild
index c4b4f007c486..12f793f0424d 100644
--- a/kde-base/kxsldbg/kxsldbg-3.4.1.ebuild
+++ b/kde-base/kxsldbg/kxsldbg-3.4.1.ebuild
@@ -1,13 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdewebdev
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
-inherit kde-meta
+inherit kde-meta flag-o-matic
 
 DESCRIPTION="A KDE KPart Application for xsldbg, an XSLT debugger"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND=""
 
+DEPEND="dev-libs/libxslt
+	dev-libs/libxml2"
+
+# Remove this when libxslt-1.1.14-r1 goes stable (#98345)
+append-flags -DFORCE_DEBUGGER
diff --git a/kde-base/kxsldbg/kxsldbg-3.4.3.ebuild b/kde-base/kxsldbg/kxsldbg-3.4.3.ebuild
index 63a15c7ce2c2..04487d5413ba 100644
--- a/kde-base/kxsldbg/kxsldbg-3.4.3.ebuild
+++ b/kde-base/kxsldbg/kxsldbg-3.4.3.ebuild
@@ -1,17 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta flag-o-matic
 
 DESCRIPTION="A KDE KPart Application for xsldbg, an XSLT debugger"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2"
-
-# Remove this when libxslt-1.1.14-r1 goes stable (#98345)
-append-flags -DFORCE_DEBUGGER
diff --git a/kde-base/kxsldbg/kxsldbg-3.5.0.ebuild b/kde-base/kxsldbg/kxsldbg-3.5.0.ebuild
index cb0ac7aed57b..36e7c4c9b539 100644
--- a/kde-base/kxsldbg/kxsldbg-3.5.0.ebuild
+++ b/kde-base/kxsldbg/kxsldbg-3.5.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/kde-base/kxsldbg/kxsldbg-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
@@ -12,6 +12,3 @@ IUSE=""
 
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2"
-
-# Remove this when libxslt-1.1.14-r1 goes stable (#98345)
-append-flags -DFORCE_DEBUGGER
diff --git a/kde-base/kxsldbg/kxsldbg-3.5.0_beta2.ebuild b/kde-base/kxsldbg/kxsldbg-3.5.0_beta2.ebuild
index 9f4533d415c3..61489cdcda3f 100644
--- a/kde-base/kxsldbg/kxsldbg-3.5.0_beta2.ebuild
+++ b/kde-base/kxsldbg/kxsldbg-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta flag-o-matic
 
 DESCRIPTION="A KDE KPart Application for xsldbg, an XSLT debugger"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libxslt
diff --git a/kde-base/kxsldbg/kxsldbg-3.5.0_rc1.ebuild b/kde-base/kxsldbg/kxsldbg-3.5.0_rc1.ebuild
index 3077ef4792fc..c25fedd76a8d 100644
--- a/kde-base/kxsldbg/kxsldbg-3.5.0_rc1.ebuild
+++ b/kde-base/kxsldbg/kxsldbg-3.5.0_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/kde-base/kxsldbg/kxsldbg-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:11 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/kxsldbg/kxsldbg-3.5_beta1.ebuild b/kde-base/kxsldbg/kxsldbg-3.5_beta1.ebuild
index 0818a582adba..3d853fe28818 100644
--- a/kde-base/kxsldbg/kxsldbg-3.5_beta1.ebuild
+++ b/kde-base/kxsldbg/kxsldbg-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.5_beta1.ebuild,v 1.1 2005/09/22 21:10:12 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kxsldbg/kxsldbg-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:10 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta flag-o-matic
 
 DESCRIPTION="A KDE KPart Application for xsldbg, an XSLT debugger"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libxslt
diff --git a/kde-base/kxsldbg/metadata.xml b/kde-base/kxsldbg/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/kxsldbg/metadata.xml
+++ b/kde-base/kxsldbg/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkcal/ChangeLog b/kde-base/libkcal/ChangeLog
index bd3868c7e894..2da10b4e2957 100644
--- a/kde-base/libkcal/ChangeLog
+++ b/kde-base/libkcal/ChangeLog
@@ -1,6 +1,112 @@
 # ChangeLog for kde-base/libkcal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/ChangeLog,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libkcal-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkcal-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> libkcal-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkcal-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkcal-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libkcal-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkcal-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*libkcal-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.5.0_beta2.ebuild:
+  New version.
+
+*libkcal-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> libkcal-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkcal-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkcal-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkcal-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkcal-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkcal-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkcal-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkcal-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkcal-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkcal-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkcal-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkcal-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkcal-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkcal-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkcal-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkcal-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkcal-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkcal-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkcal-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +libkcal-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkcal-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkcal/Manifest b/kde-base/libkcal/Manifest
index 5571e5f3fdbf..8812f2e52ce8 100644
--- a/kde-base/libkcal/Manifest
+++ b/kde-base/libkcal/Manifest
@@ -1,4 +1,26 @@
-MD5 0cc7c8e9f48708ca9a099aea225c91c1 libkcal-3.4.0_alpha1.ebuild 462
-MD5 0cc7c8e9f48708ca9a099aea225c91c1 libkcal-3.4.0_beta1.ebuild 462
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkcal-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkcal-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a986e06a4aedde85e596f72273d2134c ChangeLog 3718
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkcal-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-libkcal-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-libkcal-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkcal-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-libkcal-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-libkcal-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkcal-3.5_beta1 68
+MD5 76a87ae1b7164ffa47cfdda982cf88f5 libkcal-3.4.1.ebuild 590
+MD5 a2affe5ca8838ab9cf0ddc3fbed740be libkcal-3.4.2.ebuild 594
+MD5 6905344dd9cf2be4f0ee4a67965557e4 libkcal-3.4.3.ebuild 590
+MD5 3dbb8d11c2d1d97370c6ca5e4164d7a5 libkcal-3.5.0.ebuild 544
+MD5 e2fdbadb6f72222e7637417e5bbfaa70 libkcal-3.5.0_beta2.ebuild 547
+MD5 b72a75a66db5b642e38bfdb7ec244909 libkcal-3.5.0_rc1.ebuild 548
+MD5 6dc11485f059715fd4246981afdf1a61 libkcal-3.5_beta1.ebuild 573
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhugwntT9W3vfTuoRAo8zAKCveRECaoCDPInSaiqDsWvtkpiNGgCgi6ZW
+tOmOEk4mGmS63oLMl5JoZcA=
+=6bZh
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkcal/files/digest-libkcal-3.4.1 b/kde-base/libkcal/files/digest-libkcal-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkcal/files/digest-libkcal-3.4.1
+++ b/kde-base/libkcal/files/digest-libkcal-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkcal/files/digest-libkcal-3.4.2 b/kde-base/libkcal/files/digest-libkcal-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/libkcal/files/digest-libkcal-3.4.2
+++ b/kde-base/libkcal/files/digest-libkcal-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/libkcal/libkcal-3.4.1.ebuild b/kde-base/libkcal/libkcal-3.4.1.ebuild
index 52e7be9d4f58..1c0331b5ebf4 100644
--- a/kde-base/libkcal/libkcal-3.4.1.ebuild
+++ b/kde-base/libkcal/libkcal-3.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/kde-base/libkcal/libkcal-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kcal library for korganizer etc"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/ktnef-$PV"
 DEPEND="
diff --git a/kde-base/libkcal/libkcal-3.4.2.ebuild b/kde-base/libkcal/libkcal-3.4.2.ebuild
index c5db19058882..0f357a620c71 100644
--- a/kde-base/libkcal/libkcal-3.4.2.ebuild
+++ b/kde-base/libkcal/libkcal-3.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/kde-base/libkcal/libkcal-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kcal library for korganizer etc"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/ktnef-$PV"
 DEPEND="
diff --git a/kde-base/libkcal/libkcal-3.4.3.ebuild b/kde-base/libkcal/libkcal-3.4.3.ebuild
index 5b979e081ac3..2d17b4d5a4ea 100644
--- a/kde-base/libkcal/libkcal-3.4.3.ebuild
+++ b/kde-base/libkcal/libkcal-3.4.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/kde-base/libkcal/libkcal-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kcal library for korganizer etc"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/ktnef-$PV"
 DEPEND="
diff --git a/kde-base/libkcal/libkcal-3.5.0.ebuild b/kde-base/libkcal/libkcal-3.5.0.ebuild
index acb44a698408..93dc50db14b1 100644
--- a/kde-base/libkcal/libkcal-3.5.0.ebuild
+++ b/kde-base/libkcal/libkcal-3.5.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/kde-base/libkcal/libkcal-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkcal/libkcal-3.5.0_beta2.ebuild b/kde-base/libkcal/libkcal-3.5.0_beta2.ebuild
index 5908f75e0edd..07930e7661e2 100644
--- a/kde-base/libkcal/libkcal-3.5.0_beta2.ebuild
+++ b/kde-base/libkcal/libkcal-3.5.0_beta2.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/kde-base/libkcal/libkcal-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kcal library for korganizer etc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/libkcal/libkcal-3.5.0_rc1.ebuild b/kde-base/libkcal/libkcal-3.5.0_rc1.ebuild
index c13144226336..88d6dbe23254 100644
--- a/kde-base/libkcal/libkcal-3.5.0_rc1.ebuild
+++ b/kde-base/libkcal/libkcal-3.5.0_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/kde-base/libkcal/libkcal-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkcal/libkcal-3.5_beta1.ebuild b/kde-base/libkcal/libkcal-3.5_beta1.ebuild
index 3d711dce5e0c..85432d4cdbd0 100644
--- a/kde-base/libkcal/libkcal-3.5_beta1.ebuild
+++ b/kde-base/libkcal/libkcal-3.5_beta1.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/kde-base/libkcal/libkcal-3.5_beta1.ebuild,v 1.1 2005/09/22 21:11:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcal/libkcal-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kcal library for korganizer etc"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/ktnef-$PV"
 DEPEND="
diff --git a/kde-base/libkcal/metadata.xml b/kde-base/libkcal/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkcal/metadata.xml
+++ b/kde-base/libkcal/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkcddb/ChangeLog b/kde-base/libkcddb/ChangeLog
index 256778ab7d51..4c960da473b2 100644
--- a/kde-base/libkcddb/ChangeLog
+++ b/kde-base/libkcddb/ChangeLog
@@ -1,6 +1,109 @@
 # ChangeLog for kde-base/libkcddb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/ChangeLog,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libkcddb-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkcddb-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> libkcddb-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkcddb-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkcddb-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libkcddb-3.5_beta1.ebuild,
+  libkcddb-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*libkcddb-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.5.0_beta2.ebuild:
+  New version.
+
+*libkcddb-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkcddb-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkcddb-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkcddb-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkcddb-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkcddb-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkcddb-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkcddb-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkcddb-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkcddb-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkcddb-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkcddb-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkcddb-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> libkcddb-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkcddb-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkcddb-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkcddb-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkcddb-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkcddb-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkcddb-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +libkcddb-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkcddb-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkcddb/Manifest b/kde-base/libkcddb/Manifest
index 6809be9aebf5..4fc924ada59e 100644
--- a/kde-base/libkcddb/Manifest
+++ b/kde-base/libkcddb/Manifest
@@ -1,4 +1,26 @@
-MD5 55c6e3f231d7d41343b58f2188edb6ea libkcddb-3.4.0_beta1.ebuild 268
-MD5 55c6e3f231d7d41343b58f2188edb6ea libkcddb-3.4.0_alpha1.ebuild 268
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-libkcddb-3.4.0_alpha1 74
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-libkcddb-3.4.0_beta1 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c98b42b6dcfefbf938e805b3b5d76a80 ChangeLog 3713
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-libkcddb-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-libkcddb-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-libkcddb-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-libkcddb-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-libkcddb-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-libkcddb-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-libkcddb-3.5_beta1 74
+MD5 74329c5b5d4a466f60bb139613c80ca5 libkcddb-3.4.1.ebuild 389
+MD5 fc11b71c2ca8dc699727bcfe4139ad30 libkcddb-3.4.2.ebuild 402
+MD5 592c1c53d78166069440515c9505cbef libkcddb-3.4.3.ebuild 399
+MD5 837148d210281031074e0d6e1e082f4b libkcddb-3.5.0.ebuild 378
+MD5 bc99c6579429dccee6d89736ea34d93e libkcddb-3.5.0_beta2.ebuild 383
+MD5 82bef772dcb2a5f3f2e2c13e7c0dfd09 libkcddb-3.5.0_rc1.ebuild 382
+MD5 745e1499957aaf54bd645b3a00c0aec6 libkcddb-3.5_beta1.ebuild 381
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmvVntT9W3vfTuoRAhKgAJ9Nw0NrPQsd0O9APdn9vbV9jRBV4gCgqG/u
+pazpkTrzRDLzcLCl3XB89og=
+=tJ/y
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkcddb/files/digest-libkcddb-3.4.1 b/kde-base/libkcddb/files/digest-libkcddb-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/libkcddb/files/digest-libkcddb-3.4.1
+++ b/kde-base/libkcddb/files/digest-libkcddb-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/libkcddb/files/digest-libkcddb-3.4.2 b/kde-base/libkcddb/files/digest-libkcddb-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/libkcddb/files/digest-libkcddb-3.4.2
+++ b/kde-base/libkcddb/files/digest-libkcddb-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/libkcddb/libkcddb-3.4.1.ebuild b/kde-base/libkcddb/libkcddb-3.4.1.ebuild
index fc2d3b3b1749..1c32e3a73390 100644
--- a/kde-base/libkcddb/libkcddb-3.4.1.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.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/kde-base/libkcddb/libkcddb-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/libkcddb/libkcddb-3.4.2.ebuild b/kde-base/libkcddb/libkcddb-3.4.2.ebuild
index 348dadd89e23..1e96ae3d9e63 100644
--- a/kde-base/libkcddb/libkcddb-3.4.2.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.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/kde-base/libkcddb/libkcddb-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/libkcddb/libkcddb-3.4.3.ebuild b/kde-base/libkcddb/libkcddb-3.4.3.ebuild
index b075819329dd..788216505308 100644
--- a/kde-base/libkcddb/libkcddb-3.4.3.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.4.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/kde-base/libkcddb/libkcddb-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
\ No newline at end of file
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
+IUSE=""
diff --git a/kde-base/libkcddb/libkcddb-3.5.0.ebuild b/kde-base/libkcddb/libkcddb-3.5.0.ebuild
index a95220355f2d..a39038bceb42 100644
--- a/kde-base/libkcddb/libkcddb-3.5.0.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.5.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/kde-base/libkcddb/libkcddb-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/libkcddb/libkcddb-3.5.0_beta2.ebuild b/kde-base/libkcddb/libkcddb-3.5.0_beta2.ebuild
index 1e014c2b4676..29df9e0d0b10 100644
--- a/kde-base/libkcddb/libkcddb-3.5.0_beta2.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.5.0_beta2.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/kde-base/libkcddb/libkcddb-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/libkcddb/libkcddb-3.5.0_rc1.ebuild b/kde-base/libkcddb/libkcddb-3.5.0_rc1.ebuild
index a100dcf636f3..dcf21866d37a 100644
--- a/kde-base/libkcddb/libkcddb-3.5.0_rc1.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.5.0_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/kde-base/libkcddb/libkcddb-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/libkcddb/libkcddb-3.5_beta1.ebuild b/kde-base/libkcddb/libkcddb-3.5_beta1.ebuild
index eb6100292499..3807f0e1bef8 100644
--- a/kde-base/libkcddb/libkcddb-3.5_beta1.ebuild
+++ b/kde-base/libkcddb/libkcddb-3.5_beta1.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/kde-base/libkcddb/libkcddb-3.5_beta1.ebuild,v 1.1 2005/09/22 21:11:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkcddb/libkcddb-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:05 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library for CDDB"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/libkcddb/metadata.xml b/kde-base/libkcddb/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkcddb/metadata.xml
+++ b/kde-base/libkcddb/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkdeedu/ChangeLog b/kde-base/libkdeedu/ChangeLog
index 6177744354b1..1b065c95d5dc 100644
--- a/kde-base/libkdeedu/ChangeLog
+++ b/kde-base/libkdeedu/ChangeLog
@@ -1,6 +1,99 @@
 # ChangeLog for kde-base/libkdeedu
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/ChangeLog,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libkdeedu-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkdeedu-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkdeedu-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*libkdeedu-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdeedu-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkdeedu-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdeedu-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libkdeedu-3.5_beta1.ebuild,
+  libkdeedu-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*libkdeedu-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkdeedu-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkdeedu-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkdeedu-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdeedu-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkdeedu-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdeedu-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkdeedu-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkdeedu-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkdeedu-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkdeedu-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkdeedu-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkdeedu-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkdeedu-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkdeedu-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkdeedu-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkdeedu-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkdeedu-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkdeedu-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkdeedu-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*libkdeedu-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkdeedu-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkdeedu-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkdeedu/Manifest b/kde-base/libkdeedu/Manifest
index 15004aaf67e6..0828990dfa6e 100644
--- a/kde-base/libkdeedu/Manifest
+++ b/kde-base/libkdeedu/Manifest
@@ -1,4 +1,24 @@
-MD5 a310c921ef23e0621c90ae50843fb4f5 libkdeedu-3.4.0_alpha1.ebuild 284
-MD5 a310c921ef23e0621c90ae50843fb4f5 libkdeedu-3.4.0_beta1.ebuild 284
-MD5 521fc13bde64ce3aa9c5fc4213337476 files/digest-libkdeedu-3.4.0_beta1 212
-MD5 2f8ae5d56e22103d2da191f4da825a5e files/digest-libkdeedu-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c1998c87b8ee878d78bf8634b3698574 ChangeLog 3395
+MD5 c5fa588b242d6077e2c13bc01f2e0761 files/digest-libkdeedu-3.4.1 208
+MD5 b190e5cce85ed284d453d1a2e85c1e67 files/digest-libkdeedu-3.4.2 282
+MD5 9c4d55683f93bc4ade8253a467f2cdfb files/digest-libkdeedu-3.5.0 67
+MD5 d47df4f385ff7eb56f23fef8afe30b6b files/digest-libkdeedu-3.5.0_beta2 212
+MD5 f647450f646f8c5727d8cb51fe855bcc files/digest-libkdeedu-3.5.0_rc1 294
+MD5 bb87804db4b06c40fdff58984b70c393 files/digest-libkdeedu-3.5_beta1 68
+MD5 ce9f4b7c582fb22c4e0004c371cb37aa libkdeedu-3.4.1.ebuild 407
+MD5 e3eb22cf6add48627fc8965e876433f2 libkdeedu-3.4.2.ebuild 418
+MD5 3d2a1ba58f408e54329e9afceae5f7cf libkdeedu-3.5.0.ebuild 396
+MD5 f33359d8280bce2c2c5faedf9fd7d1d5 libkdeedu-3.5.0_beta2.ebuild 401
+MD5 c8d7de5a44a639dd7b2910d0458ecc03 libkdeedu-3.5.0_rc1.ebuild 400
+MD5 30d66a80af19fa4cf512ef05c016db0f libkdeedu-3.5_beta1.ebuild 399
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhlBRntT9W3vfTuoRAt7VAKCsiUlslURFPzr4DjYToTR7WcUkZwCcCnPn
+jCozCmnSYNfKQfS1SUWeg1o=
+=qYxg
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkdeedu/files/digest-libkdeedu-3.4.1 b/kde-base/libkdeedu/files/digest-libkdeedu-3.4.1
index f451aa7e9578..e56c0fb82557 100644
--- a/kde-base/libkdeedu/files/digest-libkdeedu-3.4.1
+++ b/kde-base/libkdeedu/files/digest-libkdeedu-3.4.1
@@ -1,2 +1,3 @@
 MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
 MD5 9fa1db1cf500c0fc594b0f5d291bbf69 kdeedu-3.4.1.tar.bz2 24009520
diff --git a/kde-base/libkdeedu/files/digest-libkdeedu-3.4.2 b/kde-base/libkdeedu/files/digest-libkdeedu-3.4.2
index 733395bad924..42c1b5100538 100644
--- a/kde-base/libkdeedu/files/digest-libkdeedu-3.4.2
+++ b/kde-base/libkdeedu/files/digest-libkdeedu-3.4.2
@@ -1 +1,4 @@
+MD5 c2aab0c4f6439abb6c0eb09413b6532c kdeedu-3.4.0.tar.bz2 23559284
+MD5 c79198c40ad9f34a47debbf4548c8363 kdeedu-3.4.0-3.4.1.tar.xdelta 651600
+MD5 dda04b7ff04602558b97f34e8aa33daa kdeedu-3.4.1-3.4.2.tar.xdelta 430474
 MD5 e2c5cc083868dd4c35c1b50e04eb40eb kdeedu-3.4.2.tar.bz2 24028133
diff --git a/kde-base/libkdeedu/libkdeedu-3.4.1.ebuild b/kde-base/libkdeedu/libkdeedu-3.4.1.ebuild
index bf116716fd2b..26fcc513623a 100644
--- a/kde-base/libkdeedu/libkdeedu-3.4.1.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="common library for kde educational apps"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdeedu/libkdeedu-3.4.2.ebuild b/kde-base/libkdeedu/libkdeedu-3.4.2.ebuild
index 61ede5fb3a29..d14785f575a8 100644
--- a/kde-base/libkdeedu/libkdeedu-3.4.2.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeedu
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="common library for kde educational apps"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdeedu/libkdeedu-3.5.0.ebuild b/kde-base/libkdeedu/libkdeedu-3.5.0.ebuild
index 4558011393bc..632645fc55b5 100644
--- a/kde-base/libkdeedu/libkdeedu-3.5.0.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-3.5.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/kde-base/libkdeedu/libkdeedu-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/libkdeedu/libkdeedu-3.5.0_beta2.ebuild b/kde-base/libkdeedu/libkdeedu-3.5.0_beta2.ebuild
index bef2797dd411..5ef1f384141d 100644
--- a/kde-base/libkdeedu/libkdeedu-3.5.0_beta2.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="common library for kde educational apps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdeedu/libkdeedu-3.5.0_rc1.ebuild b/kde-base/libkdeedu/libkdeedu-3.5.0_rc1.ebuild
index 0a6599859329..60b59901ba1f 100644
--- a/kde-base/libkdeedu/libkdeedu-3.5.0_rc1.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-3.5.0_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/kde-base/libkdeedu/libkdeedu-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/libkdeedu/libkdeedu-3.5_beta1.ebuild b/kde-base/libkdeedu/libkdeedu-3.5_beta1.ebuild
index 59f0a47992cb..918096e2b30a 100644
--- a/kde-base/libkdeedu/libkdeedu-3.5_beta1.ebuild
+++ b/kde-base/libkdeedu/libkdeedu-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.5_beta1.ebuild,v 1.1 2005/09/22 21:13:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdeedu/libkdeedu-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 KMNAME=kdeedu
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="common library for kde educational apps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdeedu/metadata.xml b/kde-base/libkdeedu/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkdeedu/metadata.xml
+++ b/kde-base/libkdeedu/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkdegames/ChangeLog b/kde-base/libkdegames/ChangeLog
index af0c881790bc..bc78b899ad7d 100644
--- a/kde-base/libkdegames/ChangeLog
+++ b/kde-base/libkdegames/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/libkdegames
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/ChangeLog,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkdegames-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkdegames-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkdegames-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkdegames-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdegames-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkdegames-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdegames-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  libkdegames-3.5_beta1.ebuild, libkdegames-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*libkdegames-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkdegames-3.5.0_beta2.ebuild:
+  New version.
+
+*libkdegames-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkdegames-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkdegames-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkdegames-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdegames-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkdegames-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdegames-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libkdegames-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkdegames-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkdegames-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkdegames-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkdegames-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkdegames-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkdegames-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkdegames-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkdegames-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkdegames-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkdegames-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkdegames-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkdegames-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkdegames-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkdegames-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkdegames-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkdegames-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkdegames/Manifest b/kde-base/libkdegames/Manifest
index d9658c3e4d39..d4a41ba73d93 100644
--- a/kde-base/libkdegames/Manifest
+++ b/kde-base/libkdegames/Manifest
@@ -1,4 +1,26 @@
-MD5 1b919472062bbdf12212f973e4ba2f07 libkdegames-3.4.0_beta1.ebuild 297
-MD5 1b919472062bbdf12212f973e4ba2f07 libkdegames-3.4.0_alpha1.ebuild 297
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-libkdegames-3.4.0_beta1 216
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-libkdegames-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cbf033c7d71f9ba3a1c0aecf71e0ac9b ChangeLog 3703
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-libkdegames-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-libkdegames-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-libkdegames-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-libkdegames-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-libkdegames-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-libkdegames-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-libkdegames-3.5_beta1 70
+MD5 297d16110d664a5a551adb6e92ad880c libkdegames-3.4.1.ebuild 424
+MD5 948134448cee4780547e59b72d0b2866 libkdegames-3.4.2.ebuild 679
+MD5 a8c6b8990490e162e4e9a3b29f438332 libkdegames-3.4.3.ebuild 675
+MD5 c988be306842e3d9891de206d11993de libkdegames-3.5.0.ebuild 637
+MD5 4c24d7e785544666ff48ea52dae02b84 libkdegames-3.5.0_beta2.ebuild 642
+MD5 d1165507dc6f452e005060c5e9e5e801 libkdegames-3.5.0_rc1.ebuild 641
+MD5 5dc4f89166100dcc059a9c3a87cb6984 libkdegames-3.5_beta1.ebuild 658
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhkgGntT9W3vfTuoRAtYZAJ45An7nvXbIon5c8RKq74YzNgUsmwCgl6S5
++aXHmc2gzL6vyfuf33iK1ro=
+=GOPS
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkdegames/files/digest-libkdegames-3.4.1 b/kde-base/libkdegames/files/digest-libkdegames-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/libkdegames/files/digest-libkdegames-3.4.1
+++ b/kde-base/libkdegames/files/digest-libkdegames-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/libkdegames/files/digest-libkdegames-3.4.2 b/kde-base/libkdegames/files/digest-libkdegames-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/libkdegames/files/digest-libkdegames-3.4.2
+++ b/kde-base/libkdegames/files/digest-libkdegames-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/libkdegames/libkdegames-3.4.1.ebuild b/kde-base/libkdegames/libkdegames-3.4.1.ebuild
index 010659431035..ed21006a0797 100644
--- a/kde-base/libkdegames/libkdegames-3.4.1.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.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/kde-base/libkdegames/libkdegames-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 KMNAME=kdegames
 KM_MAKEFILESREV=1
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="library common to many KDE games"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdegames/libkdegames-3.4.2.ebuild b/kde-base/libkdegames/libkdegames-3.4.2.ebuild
index 0ea3d17a2282..0edb4adeca7f 100644
--- a/kde-base/libkdegames/libkdegames-3.4.2.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.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/kde-base/libkdegames/libkdegames-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 KMNAME=kdegames
 KM_MAKEFILESREV=1
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="library common to many KDE games"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdegames/libkdegames-3.4.3.ebuild b/kde-base/libkdegames/libkdegames-3.4.3.ebuild
index 361a14365074..a41bdb8ff2a8 100644
--- a/kde-base/libkdegames/libkdegames-3.4.3.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.4.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/kde-base/libkdegames/libkdegames-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 KM_MAKEFILESREV=1
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="library common to many KDE games"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdegames/libkdegames-3.5.0.ebuild b/kde-base/libkdegames/libkdegames-3.5.0.ebuild
index f007ad9df794..bf2afff1302b 100644
--- a/kde-base/libkdegames/libkdegames-3.5.0.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.5.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/kde-base/libkdegames/libkdegames-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/libkdegames/libkdegames-3.5.0_beta2.ebuild b/kde-base/libkdegames/libkdegames-3.5.0_beta2.ebuild
index 7b5e1441d631..ff64d64f64f7 100644
--- a/kde-base/libkdegames/libkdegames-3.5.0_beta2.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:46 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="library common to many KDE games"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdegames/libkdegames-3.5.0_rc1.ebuild b/kde-base/libkdegames/libkdegames-3.5.0_rc1.ebuild
index 9326ef25aa5d..d748956ade1f 100644
--- a/kde-base/libkdegames/libkdegames-3.5.0_rc1.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.5.0_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/kde-base/libkdegames/libkdegames-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/libkdegames/libkdegames-3.5_beta1.ebuild b/kde-base/libkdegames/libkdegames-3.5_beta1.ebuild
index bbf190ae97e0..2c0fb6398ea0 100644
--- a/kde-base/libkdegames/libkdegames-3.5_beta1.ebuild
+++ b/kde-base/libkdegames/libkdegames-3.5_beta1.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/kde-base/libkdegames/libkdegames-3.5_beta1.ebuild,v 1.1 2005/09/22 21:14:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdegames/libkdegames-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 KMNAME=kdegames
 KM_MAKEFILESREV=1
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="library common to many KDE games"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/libkdegames/metadata.xml b/kde-base/libkdegames/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkdegames/metadata.xml
+++ b/kde-base/libkdegames/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkdenetwork/ChangeLog b/kde-base/libkdenetwork/ChangeLog
index 42800928fe0c..2a1ac4de5ebd 100644
--- a/kde-base/libkdenetwork/ChangeLog
+++ b/kde-base/libkdenetwork/ChangeLog
@@ -1,6 +1,88 @@
 # ChangeLog for kde-base/libkdenetwork
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/ChangeLog,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
+
+*libkdenetwork-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdenetwork-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkdenetwork-3.5_beta1.ebuild:
+  Keyword ~ppc and ~x86
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkdenetwork-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkdenetwork-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdenetwork-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  18 Sep 2005; Caleb Tennis <caleb@gentoo.org> libkdenetwork-3.4.1.ebuild,
+  libkdenetwork-3.5_alpha1.ebuild:
+  Up gpgme dep to 1.0.2
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  libkdenetwork-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*libkdenetwork-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdenetwork-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libkdenetwork-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkdenetwork-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkdenetwork-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkdenetwork-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkdenetwork-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkdenetwork-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkdenetwork-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkdenetwork-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkdenetwork-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkdenetwork-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkdenetwork-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkdenetwork-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkdenetwork-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkdenetwork-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkdenetwork-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkdenetwork/Manifest b/kde-base/libkdenetwork/Manifest
index 132b6382e34c..21f3561f2878 100644
--- a/kde-base/libkdenetwork/Manifest
+++ b/kde-base/libkdenetwork/Manifest
@@ -1,4 +1,8 @@
-MD5 c3ebcc93345d97b8a53df148de83153b libkdenetwork-3.4.0_alpha1.ebuild 314
-MD5 c3ebcc93345d97b8a53df148de83153b libkdenetwork-3.4.0_beta1.ebuild 314
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkdenetwork-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkdenetwork-3.4.0_beta1 213
+MD5 82eda3ae7b1b52f25a26bd155f6e3af2 ChangeLog 3105
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkdenetwork-3.4.1 208
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkdenetwork-3.5.0 67
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkdenetwork-3.5_beta1 68
+MD5 eca12bb55fcc283016c05e1b0fa01552 libkdenetwork-3.4.1.ebuild 457
+MD5 16ab546a96f829c76b74ff0673477c06 libkdenetwork-3.5.0.ebuild 439
+MD5 135635b0cede370aab93a687432f274a libkdenetwork-3.5_beta1.ebuild 449
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/libkdenetwork/files/digest-libkdenetwork-3.4.1 b/kde-base/libkdenetwork/files/digest-libkdenetwork-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkdenetwork/files/digest-libkdenetwork-3.4.1
+++ b/kde-base/libkdenetwork/files/digest-libkdenetwork-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkdenetwork/libkdenetwork-3.4.1.ebuild b/kde-base/libkdenetwork/libkdenetwork-3.4.1.ebuild
index a26d93108c91..d531fa8905f6 100644
--- a/kde-base/libkdenetwork/libkdenetwork-3.4.1.ebuild
+++ b/kde-base/libkdenetwork/libkdenetwork-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/libkdenetwork-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/libkdenetwork-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="library common to many KDE network apps"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND=">=app-crypt/gpgme-0.4.0"
+DEPEND=">=app-crypt/gpgme-1.0.2"
diff --git a/kde-base/libkdenetwork/libkdenetwork-3.5.0.ebuild b/kde-base/libkdenetwork/libkdenetwork-3.5.0.ebuild
index da41ee25cdec..38ff252f7329 100644
--- a/kde-base/libkdenetwork/libkdenetwork-3.5.0.ebuild
+++ b/kde-base/libkdenetwork/libkdenetwork-3.5.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/kde-base/libkdenetwork/libkdenetwork-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/libkdenetwork-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkdenetwork/libkdenetwork-3.5_beta1.ebuild b/kde-base/libkdenetwork/libkdenetwork-3.5_beta1.ebuild
index b2c96d37a9e6..66b1921f720a 100644
--- a/kde-base/libkdenetwork/libkdenetwork-3.5_beta1.ebuild
+++ b/kde-base/libkdenetwork/libkdenetwork-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/libkdenetwork-3.5_beta1.ebuild,v 1.1 2005/09/22 21:14:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdenetwork/libkdenetwork-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="library common to many KDE network apps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=">=app-crypt/gpgme-1.0.2"
diff --git a/kde-base/libkdenetwork/metadata.xml b/kde-base/libkdenetwork/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkdenetwork/metadata.xml
+++ b/kde-base/libkdenetwork/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 6330953dd0ab..64c19c28ffb5 100644
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,115 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libkdepim-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkdepim-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkdepim-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkdepim-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdepim-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkdepim-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkdepim-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libkdepim-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkdepim-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*libkdepim-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkdepim-3.5.0_beta2.ebuild:
+  New version.
+
+*libkdepim-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkdepim-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org> libkdepim-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkdepim-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkdepim-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdepim-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkdepim-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkdepim-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkdepim-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkdepim-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkdepim-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkdepim-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkdepim-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkdepim-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkdepim-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkdepim-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkdepim-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkdepim-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkdepim-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkdepim-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkdepim-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkdepim-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkdepim-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkdepim-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkdepim-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest
index 77f81045ffb4..f9d3c3195652 100644
--- a/kde-base/libkdepim/Manifest
+++ b/kde-base/libkdepim/Manifest
@@ -1,4 +1,26 @@
-MD5 53bbe427cc29e552f9fb02914f2d8f48 libkdepim-3.4.0_beta1.ebuild 419
-MD5 53bbe427cc29e552f9fb02914f2d8f48 libkdepim-3.4.0_alpha1.ebuild 419
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkdepim-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkdepim-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 80a253155dfcee2de8cde8c667d65391 ChangeLog 3802
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkdepim-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-libkdepim-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-libkdepim-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkdepim-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-libkdepim-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-libkdepim-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkdepim-3.5_beta1 68
+MD5 3d81dacf5ddb8f4838c35595882d4376 libkdepim-3.4.1.ebuild 551
+MD5 19370076a7e24292cd8a17415d568838 libkdepim-3.4.2.ebuild 555
+MD5 cd5f1c49689de7400ef04ec93397169d libkdepim-3.4.3.ebuild 551
+MD5 323c6ae9b5764f87b53d3e6a37a364c3 libkdepim-3.5.0.ebuild 503
+MD5 6b33ba7127d98e5e3578da6b9c4fb798 libkdepim-3.5.0_beta2.ebuild 506
+MD5 526286c464c02aaa70499a7ad221c7c3 libkdepim-3.5.0_rc1.ebuild 507
+MD5 8ed3f476c507c6b3745fa6e6c655c63c libkdepim-3.5_beta1.ebuild 534
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuhWntT9W3vfTuoRAlu4AJ48MA0FtIC4tTQCj81xWkzepE1QsQCbBdk0
+Vi+OkysDofowN6XZUA3zSgY=
+=6sYJ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkdepim/files/digest-libkdepim-3.4.1 b/kde-base/libkdepim/files/digest-libkdepim-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkdepim/files/digest-libkdepim-3.4.1
+++ b/kde-base/libkdepim/files/digest-libkdepim-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkdepim/files/digest-libkdepim-3.4.2 b/kde-base/libkdepim/files/digest-libkdepim-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/libkdepim/files/digest-libkdepim-3.4.2
+++ b/kde-base/libkdepim/files/digest-libkdepim-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/libkdepim/libkdepim-3.4.1.ebuild b/kde-base/libkdepim/libkdepim-3.4.1.ebuild
index 7756b0eb0b3f..63ce52475681 100644
--- a/kde-base/libkdepim/libkdepim-3.4.1.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.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/kde-base/libkdepim/libkdepim-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="common library for KDE PIM apps"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
diff --git a/kde-base/libkdepim/libkdepim-3.4.2.ebuild b/kde-base/libkdepim/libkdepim-3.4.2.ebuild
index f748a13bd96a..06c327f91040 100644
--- a/kde-base/libkdepim/libkdepim-3.4.2.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.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/kde-base/libkdepim/libkdepim-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="common library for KDE PIM apps"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
diff --git a/kde-base/libkdepim/libkdepim-3.4.3.ebuild b/kde-base/libkdepim/libkdepim-3.4.3.ebuild
index 078642221d91..e7fb47a3e082 100644
--- a/kde-base/libkdepim/libkdepim-3.4.3.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.4.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/kde-base/libkdepim/libkdepim-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="common library for KDE PIM apps"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
diff --git a/kde-base/libkdepim/libkdepim-3.5.0.ebuild b/kde-base/libkdepim/libkdepim-3.5.0.ebuild
index e9193f128b63..65a3109da180 100644
--- a/kde-base/libkdepim/libkdepim-3.5.0.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5.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/kde-base/libkdepim/libkdepim-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkdepim/libkdepim-3.5.0_beta2.ebuild b/kde-base/libkdepim/libkdepim-3.5.0_beta2.ebuild
index c28623159e03..ec006afc0bdd 100644
--- a/kde-base/libkdepim/libkdepim-3.5.0_beta2.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5.0_beta2.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/kde-base/libkdepim/libkdepim-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="common library for KDE PIM apps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-base/libkdepim/libkdepim-3.5.0_rc1.ebuild b/kde-base/libkdepim/libkdepim-3.5.0_rc1.ebuild
index 16ee6e01e3d1..d788c237bd5e 100644
--- a/kde-base/libkdepim/libkdepim-3.5.0_rc1.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5.0_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/kde-base/libkdepim/libkdepim-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkdepim/libkdepim-3.5_beta1.ebuild b/kde-base/libkdepim/libkdepim-3.5_beta1.ebuild
index de05dfb99597..a4d4779573f4 100644
--- a/kde-base/libkdepim/libkdepim-3.5_beta1.ebuild
+++ b/kde-base/libkdepim/libkdepim-3.5_beta1.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/kde-base/libkdepim/libkdepim-3.5_beta1.ebuild,v 1.1 2005/09/22 21:15:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:14 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="common library for KDE PIM apps"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
diff --git a/kde-base/libkdepim/metadata.xml b/kde-base/libkdepim/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkdepim/metadata.xml
+++ b/kde-base/libkdepim/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkholidays/ChangeLog b/kde-base/libkholidays/ChangeLog
index fee9b558adbd..a2d54710a643 100644
--- a/kde-base/libkholidays/ChangeLog
+++ b/kde-base/libkholidays/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/libkholidays
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkholidays-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkholidays-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkholidays-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkholidays-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkholidays-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  libkholidays-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkholidays-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*libkholidays-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkholidays-3.5.0_beta2.ebuild:
+  New version.
+
+*libkholidays-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkholidays-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkholidays-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkholidays-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkholidays-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkholidays-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkholidays-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libkholidays-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkholidays-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkholidays-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkholidays-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkholidays-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkholidays-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkholidays-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkholidays-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkholidays-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> libkholidays-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkholidays-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkholidays-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkholidays-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkholidays-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkholidays-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkholidays-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkholidays-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkholidays/Manifest b/kde-base/libkholidays/Manifest
index 20f063d4bec0..fc9bd128efa8 100644
--- a/kde-base/libkholidays/Manifest
+++ b/kde-base/libkholidays/Manifest
@@ -1,4 +1,24 @@
-MD5 819bd18f6e53c8bd684498edfe5a96ad libkholidays-3.4.0_alpha1.ebuild 283
-MD5 819bd18f6e53c8bd684498edfe5a96ad libkholidays-3.4.0_beta1.ebuild 283
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkholidays-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkholidays-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67cc7791ac0e3070dad06f1a8e871446 ChangeLog 3663
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkholidays-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-libkholidays-3.4.2 282
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-libkholidays-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkholidays-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-libkholidays-3.5.0_beta2 212
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkholidays-3.5_beta1 68
+MD5 6eda33cb46a34f650baa8541c779c97a libkholidays-3.4.1.ebuild 406
+MD5 cef438030188c387a397414826bb8736 libkholidays-3.4.2.ebuild 419
+MD5 bef3c9856b0b7491de0893b90bc37ba2 libkholidays-3.4.3.ebuild 415
+MD5 d2496556baaaab00894c97799cf2c109 libkholidays-3.5.0.ebuild 400
+MD5 df2611ea773e1c9bb643835afd74c444 libkholidays-3.5.0_beta2.ebuild 412
+MD5 4887b23f4a11e2859410fef1c494f656 libkholidays-3.5_beta1.ebuild 398
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvOzntT9W3vfTuoRAiUPAJ9ju2T6iFMAYlPTPlmNZBlpZbi8qwCgh+Qb
+bSOMYdIORYeAlJ66x9/TGOg=
+=ZtL5
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkholidays/files/digest-libkholidays-3.4.1 b/kde-base/libkholidays/files/digest-libkholidays-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkholidays/files/digest-libkholidays-3.4.1
+++ b/kde-base/libkholidays/files/digest-libkholidays-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkholidays/files/digest-libkholidays-3.4.2 b/kde-base/libkholidays/files/digest-libkholidays-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/libkholidays/files/digest-libkholidays-3.4.2
+++ b/kde-base/libkholidays/files/digest-libkholidays-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/libkholidays/libkholidays-3.4.1.ebuild b/kde-base/libkholidays/libkholidays-3.4.1.ebuild
index ec24d1cce27c..0cafe7fad228 100644
--- a/kde-base/libkholidays/libkholidays-3.4.1.ebuild
+++ b/kde-base/libkholidays/libkholidays-3.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/kde-base/libkholidays/libkholidays-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library to compute holidays."
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/libkholidays/libkholidays-3.4.2.ebuild b/kde-base/libkholidays/libkholidays-3.4.2.ebuild
index c4dcd112836f..2cb17faf2689 100644
--- a/kde-base/libkholidays/libkholidays-3.4.2.ebuild
+++ b/kde-base/libkholidays/libkholidays-3.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/kde-base/libkholidays/libkholidays-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library to compute holidays."
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkholidays/libkholidays-3.4.3.ebuild b/kde-base/libkholidays/libkholidays-3.4.3.ebuild
index 820063bb1756..72b8b0eeeb9e 100644
--- a/kde-base/libkholidays/libkholidays-3.4.3.ebuild
+++ b/kde-base/libkholidays/libkholidays-3.4.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/kde-base/libkholidays/libkholidays-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdepim
 
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library to compute holidays."
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkholidays/libkholidays-3.5.0.ebuild b/kde-base/libkholidays/libkholidays-3.5.0.ebuild
index 37730e64e28e..6c5b067f6145 100644
--- a/kde-base/libkholidays/libkholidays-3.5.0.ebuild
+++ b/kde-base/libkholidays/libkholidays-3.5.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/kde-base/libkholidays/libkholidays-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
diff --git a/kde-base/libkholidays/libkholidays-3.5.0_beta2.ebuild b/kde-base/libkholidays/libkholidays-3.5.0_beta2.ebuild
index 852c6402cbdd..f59ed335df98 100644
--- a/kde-base/libkholidays/libkholidays-3.5.0_beta2.ebuild
+++ b/kde-base/libkholidays/libkholidays-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library to compute holidays."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkholidays/libkholidays-3.5_beta1.ebuild b/kde-base/libkholidays/libkholidays-3.5_beta1.ebuild
index 85fbcd785532..6e0d355c1ce3 100644
--- a/kde-base/libkholidays/libkholidays-3.5_beta1.ebuild
+++ b/kde-base/libkholidays/libkholidays-3.5_beta1.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/kde-base/libkholidays/libkholidays-3.5_beta1.ebuild,v 1.1 2005/09/22 21:16:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkholidays/libkholidays-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE library to compute holidays."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkholidays/metadata.xml b/kde-base/libkholidays/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkholidays/metadata.xml
+++ b/kde-base/libkholidays/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkmime/ChangeLog b/kde-base/libkmime/ChangeLog
index 7b23420546ee..4ee680e07289 100644
--- a/kde-base/libkmime/ChangeLog
+++ b/kde-base/libkmime/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for kde-base/libkmime
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/ChangeLog,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
+
+*libkmime-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkmime-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org> libkmime-3.5_beta1.ebuild:
+  Keyword ~ppc and ~x86
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkmime-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkmime-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkmime-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> libkmime-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*libkmime-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkmime-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkmime-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkmime-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkmime-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkmime-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkmime-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkmime-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkmime-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> libkmime-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkmime-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkmime-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkmime-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkmime-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkmime-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +libkmime-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkmime-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkmime/Manifest b/kde-base/libkmime/Manifest
index 62168dd88de4..d4060c191ff1 100644
--- a/kde-base/libkmime/Manifest
+++ b/kde-base/libkmime/Manifest
@@ -1,4 +1,8 @@
-MD5 819bd18f6e53c8bd684498edfe5a96ad libkmime-3.4.0_alpha1.ebuild 283
-MD5 819bd18f6e53c8bd684498edfe5a96ad libkmime-3.4.0_beta1.ebuild 283
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkmime-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkmime-3.4.0_beta1 213
+MD5 84ad58796f54f1fd870e73d62383b78a ChangeLog 2825
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkmime-3.4.1 208
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkmime-3.5.0 67
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkmime-3.5_beta1 68
+MD5 66eee958280e92fae21fcb2505a726b4 libkmime-3.4.1.ebuild 416
+MD5 91999b27cd20b88ef41dd674748df8b8 libkmime-3.5.0.ebuild 398
+MD5 08e9896a34271407c54948059771d290 libkmime-3.5_beta1.ebuild 408
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/libkmime/files/digest-libkmime-3.4.1 b/kde-base/libkmime/files/digest-libkmime-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkmime/files/digest-libkmime-3.4.1
+++ b/kde-base/libkmime/files/digest-libkmime-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkmime/libkmime-3.4.1.ebuild b/kde-base/libkmime/libkmime-3.4.1.ebuild
index 840044bcfb8f..e3c1ff597c94 100644
--- a/kde-base/libkmime/libkmime-3.4.1.ebuild
+++ b/kde-base/libkmime/libkmime-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/libkmime-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/libkmime-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kmime library for Message Handling"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/libkmime/libkmime-3.5.0.ebuild b/kde-base/libkmime/libkmime-3.5.0.ebuild
index e2f881801f98..1ae47d393b52 100644
--- a/kde-base/libkmime/libkmime-3.5.0.ebuild
+++ b/kde-base/libkmime/libkmime-3.5.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/kde-base/libkmime/libkmime-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/libkmime-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
diff --git a/kde-base/libkmime/libkmime-3.5_beta1.ebuild b/kde-base/libkmime/libkmime-3.5_beta1.ebuild
index 3b002592c0e0..bcda8ecea55a 100644
--- a/kde-base/libkmime/libkmime-3.5_beta1.ebuild
+++ b/kde-base/libkmime/libkmime-3.5_beta1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/libkmime-3.5_beta1.ebuild,v 1.1 2005/09/22 21:17:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkmime/libkmime-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:39 chriswhite Exp $
 
 KMNAME=kdepim
 
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE kmime library for Message Handling"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkmime/metadata.xml b/kde-base/libkmime/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkmime/metadata.xml
+++ b/kde-base/libkmime/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkonq/ChangeLog b/kde-base/libkonq/ChangeLog
index 133ad3a8abf2..f34f5259ab3f 100644
--- a/kde-base/libkonq/ChangeLog
+++ b/kde-base/libkonq/ChangeLog
@@ -1,6 +1,111 @@
 # ChangeLog for kde-base/libkonq
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/ChangeLog,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libkonq-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkonq-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> libkonq-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkonq-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkonq-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkonq-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*libkonq-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.5.0_beta2.ebuild:
+  New version.
+
+*libkonq-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  libkonq-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkonq-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkonq-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkonq-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkonq-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkonq-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkonq-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkonq-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkonq-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkonq-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkonq-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkonq-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkonq-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> libkonq-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkonq-3.4.0.ebuild,
+  libkonq-3.4.0_beta2.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkonq-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkonq-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkonq-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkonq-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +libkonq-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkonq-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkonq/Manifest b/kde-base/libkonq/Manifest
index 1fb91f574e62..b7372d7e1f49 100644
--- a/kde-base/libkonq/Manifest
+++ b/kde-base/libkonq/Manifest
@@ -1,4 +1,26 @@
-MD5 22499c2e6c7e3c8307d6272602f97f09 libkonq-3.4.0_alpha1.ebuild 375
-MD5 22499c2e6c7e3c8307d6272602f97f09 libkonq-3.4.0_beta1.ebuild 375
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-libkonq-3.4.0_alpha1 69
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-libkonq-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 321df39a2c5fe04dd3039976e13008e9 ChangeLog 3640
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-libkonq-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-libkonq-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-libkonq-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-libkonq-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-libkonq-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-libkonq-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-libkonq-3.5_beta1 69
+MD5 3136bcddab4b7ca984aa4bc5967fa062 libkonq-3.4.1.ebuild 396
+MD5 9320f6e8847cf27a1364813959d3e2b4 libkonq-3.4.2.ebuild 409
+MD5 72f475472d818e4ba06d891baa373821 libkonq-3.4.3.ebuild 405
+MD5 0a93e9908247c27884013e32b3966431 libkonq-3.5.0.ebuild 390
+MD5 ca85a869e1604c0d8ddf6037f6218ae4 libkonq-3.5.0_beta2.ebuild 393
+MD5 ad19c7e40cb938b06b184155674a7d4c libkonq-3.5.0_rc1.ebuild 394
+MD5 f0665d3abd9f35972fc8f9e978b91465 libkonq-3.5_beta1.ebuild 391
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhjpIntT9W3vfTuoRAqqkAJ9sgVvp2UzpFI+PZufptE1SH1OFogCcCz/c
+MyFG1EJIPe+MDMNyvC81rKQ=
+=+38I
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkonq/files/digest-libkonq-3.4.1 b/kde-base/libkonq/files/digest-libkonq-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/libkonq/files/digest-libkonq-3.4.1
+++ b/kde-base/libkonq/files/digest-libkonq-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/libkonq/files/digest-libkonq-3.4.2 b/kde-base/libkonq/files/digest-libkonq-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/libkonq/files/digest-libkonq-3.4.2
+++ b/kde-base/libkonq/files/digest-libkonq-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/libkonq/libkonq-3.4.1.ebuild b/kde-base/libkonq/libkonq-3.4.1.ebuild
index a5f4e64e877d..32ec32919c94 100644
--- a/kde-base/libkonq/libkonq-3.4.1.ebuild
+++ b/kde-base/libkonq/libkonq-3.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/kde-base/libkonq/libkonq-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/libkonq/libkonq-3.4.2.ebuild b/kde-base/libkonq/libkonq-3.4.2.ebuild
index 89a4256eb9f2..494b989c886b 100644
--- a/kde-base/libkonq/libkonq-3.4.2.ebuild
+++ b/kde-base/libkonq/libkonq-3.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/kde-base/libkonq/libkonq-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkonq/libkonq-3.4.3.ebuild b/kde-base/libkonq/libkonq-3.4.3.ebuild
index af70d318a256..b452c801e35d 100644
--- a/kde-base/libkonq/libkonq-3.4.3.ebuild
+++ b/kde-base/libkonq/libkonq-3.4.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/kde-base/libkonq/libkonq-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkonq/libkonq-3.5.0.ebuild b/kde-base/libkonq/libkonq-3.5.0.ebuild
index 845610f79c8e..2bb7bc2c0469 100644
--- a/kde-base/libkonq/libkonq-3.5.0.ebuild
+++ b/kde-base/libkonq/libkonq-3.5.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/kde-base/libkonq/libkonq-3.5.0.ebuild,v 1.1 2005/11/22 22:14:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/libkonq/libkonq-3.5.0_beta2.ebuild b/kde-base/libkonq/libkonq-3.5.0_beta2.ebuild
index a21b04ab7ba5..4f79bfe59f92 100644
--- a/kde-base/libkonq/libkonq-3.5.0_beta2.ebuild
+++ b/kde-base/libkonq/libkonq-3.5.0_beta2.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/kde-base/libkonq/libkonq-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkonq/libkonq-3.5.0_rc1.ebuild b/kde-base/libkonq/libkonq-3.5.0_rc1.ebuild
index d6df48ecd6e3..52912260fef6 100644
--- a/kde-base/libkonq/libkonq-3.5.0_rc1.ebuild
+++ b/kde-base/libkonq/libkonq-3.5.0_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/kde-base/libkonq/libkonq-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/libkonq/libkonq-3.5_beta1.ebuild b/kde-base/libkonq/libkonq-3.5_beta1.ebuild
index d0c76430e1e1..5d5718166cac 100644
--- a/kde-base/libkonq/libkonq-3.5_beta1.ebuild
+++ b/kde-base/libkonq/libkonq-3.5_beta1.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/kde-base/libkonq/libkonq-3.5_beta1.ebuild,v 1.1 2005/09/22 21:18:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkonq/libkonq-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="The embeddable part of konqueror"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/libkonq/metadata.xml b/kde-base/libkonq/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkonq/metadata.xml
+++ b/kde-base/libkonq/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkpgp/ChangeLog b/kde-base/libkpgp/ChangeLog
index 7eba7ae3fa73..d26df645f4b5 100644
--- a/kde-base/libkpgp/ChangeLog
+++ b/kde-base/libkpgp/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for kde-base/libkpgp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/ChangeLog,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
+
+*libkpgp-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkpgp-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org> libkpgp-3.5_beta1.ebuild:
+  Keyword ~ppc and ~x86
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkpgp-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkpgp-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkpgp-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> libkpgp-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*libkpgp-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkpgp-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkpgp-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkpgp-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkpgp-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libkpgp-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkpgp-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkpgp-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libkpgp-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkpgp-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkpgp-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkpgp-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkpgp-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkpgp-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkpgp-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +libkpgp-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkpgp-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkpgp/Manifest b/kde-base/libkpgp/Manifest
index 31160bb422a3..6d9b71a99252 100644
--- a/kde-base/libkpgp/Manifest
+++ b/kde-base/libkpgp/Manifest
@@ -1,4 +1,8 @@
-MD5 2d0a63b9daed4990238e0af2bb3d0636 libkpgp-3.4.0_alpha1.ebuild 279
-MD5 2d0a63b9daed4990238e0af2bb3d0636 libkpgp-3.4.0_beta1.ebuild 279
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkpgp-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkpgp-3.4.0_beta1 213
+MD5 79c271f3ce3d9410967c48ceb3203ea3 ChangeLog 2798
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkpgp-3.4.1 208
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkpgp-3.5.0 67
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkpgp-3.5_beta1 68
+MD5 b097cf90bb7beb0b90dbc5d48b9d0af4 libkpgp-3.4.1.ebuild 410
+MD5 3cd57797cdcbbf9ea19ba8a6be240206 libkpgp-3.5.0.ebuild 392
+MD5 0464d013c0cc36bfe513f7d71a7c3302 libkpgp-3.5_beta1.ebuild 402
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/libkpgp/files/digest-libkpgp-3.4.1 b/kde-base/libkpgp/files/digest-libkpgp-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkpgp/files/digest-libkpgp-3.4.1
+++ b/kde-base/libkpgp/files/digest-libkpgp-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkpgp/libkpgp-3.4.1.ebuild b/kde-base/libkpgp/libkpgp-3.4.1.ebuild
index 27f199c2574e..a579970adf3c 100644
--- a/kde-base/libkpgp/libkpgp-3.4.1.ebuild
+++ b/kde-base/libkpgp/libkpgp-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE pgp abstraction library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/libkpgp/libkpgp-3.5.0.ebuild b/kde-base/libkpgp/libkpgp-3.5.0.ebuild
index 9daf23fa3f9e..5994de4a9bcb 100644
--- a/kde-base/libkpgp/libkpgp-3.5.0.ebuild
+++ b/kde-base/libkpgp/libkpgp-3.5.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/kde-base/libkpgp/libkpgp-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkpgp/libkpgp-3.5_beta1.ebuild b/kde-base/libkpgp/libkpgp-3.5_beta1.ebuild
index 24eb944b2670..bec767e55243 100644
--- a/kde-base/libkpgp/libkpgp-3.5_beta1.ebuild
+++ b/kde-base/libkpgp/libkpgp-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-3.5_beta1.ebuild,v 1.1 2005/09/22 21:18:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpgp/libkpgp-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:30 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE pgp abstraction library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND=""
diff --git a/kde-base/libkpgp/metadata.xml b/kde-base/libkpgp/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkpgp/metadata.xml
+++ b/kde-base/libkpgp/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkpimexchange/ChangeLog b/kde-base/libkpimexchange/ChangeLog
index 3d1896cf0984..e389a62483e2 100644
--- a/kde-base/libkpimexchange/ChangeLog
+++ b/kde-base/libkpimexchange/ChangeLog
@@ -1,6 +1,119 @@
 # ChangeLog for kde-base/libkpimexchange
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/ChangeLog,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkpimexchange-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  libkpimexchange-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkpimexchange-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkpimexchange-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkpimexchange-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkpimexchange-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkpimexchange-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  libkpimexchange-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  20 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkpimexchange-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  libkpimexchange-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*libkpimexchange-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkpimexchange-3.5.0_beta2.ebuild:
+  New version.
+
+*libkpimexchange-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkpimexchange-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkpimexchange-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkpimexchange-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkpimexchange-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkpimexchange-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkpimexchange-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libkpimexchange-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkpimexchange-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libkpimexchange-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  libkpimexchange-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkpimexchange-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +libkpimexchange-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  libkpimexchange-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> libkpimexchange-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  libkpimexchange-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkpimexchange-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkpimexchange-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkpimexchange-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkpimexchange-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkpimexchange-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkpimexchange-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkpimexchange/Manifest b/kde-base/libkpimexchange/Manifest
index 0ae7bd9df96b..a426e2d60919 100644
--- a/kde-base/libkpimexchange/Manifest
+++ b/kde-base/libkpimexchange/Manifest
@@ -1,4 +1,24 @@
-MD5 efb89b0edb24474a56a33d90335a7f2a libkpimexchange-3.4.0_alpha1.ebuild 821
-MD5 efb89b0edb24474a56a33d90335a7f2a libkpimexchange-3.4.0_beta1.ebuild 821
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkpimexchange-3.4.0_alpha1 68
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkpimexchange-3.4.0_beta1 213
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95370baa4d09e7435ab8bcf82b44abf6 ChangeLog 3912
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkpimexchange-3.4.1 208
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-libkpimexchange-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkpimexchange-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-libkpimexchange-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-libkpimexchange-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkpimexchange-3.5_beta1 68
+MD5 26596c7dc6ebbbcb8f61ef8078b79563 libkpimexchange-3.4.1.ebuild 960
+MD5 2365032ea82b40f6a2c0b2a4884d9708 libkpimexchange-3.4.3.ebuild 964
+MD5 141b9fabc93523483f2e0d7a8bc59908 libkpimexchange-3.5.0.ebuild 916
+MD5 1972ef9cec95a39d33a977d1781e8c8a libkpimexchange-3.5.0_beta2.ebuild 919
+MD5 4073f2d080f78df25184267e343a0040 libkpimexchange-3.5.0_rc1.ebuild 920
+MD5 a9b933cf7f12a39865b0ca337ca8673e libkpimexchange-3.5_beta1.ebuild 946
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvKHntT9W3vfTuoRAkN1AJ9NAVkiHdbQoF/wS0jJpILdMNhRBQCfTcq0
+ugyJn0CdsuyDZs/p76oimts=
+=Ykjw
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkpimexchange/files/digest-libkpimexchange-3.4.1 b/kde-base/libkpimexchange/files/digest-libkpimexchange-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkpimexchange/files/digest-libkpimexchange-3.4.1
+++ b/kde-base/libkpimexchange/files/digest-libkpimexchange-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkpimexchange/libkpimexchange-3.4.1.ebuild b/kde-base/libkpimexchange/libkpimexchange-3.4.1.ebuild
index 348f4a8ca3d3..c71a036e485b 100644
--- a/kde-base/libkpimexchange/libkpimexchange-3.4.1.ebuild
+++ b/kde-base/libkpimexchange/libkpimexchange-3.4.1.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.4.1.ebuild,v 1.1 2005/05/25 21:23:13 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM exchange library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
-$(deprange $PV $MAXKDEVER kde-base/libkcal)"
+$(deprange $PV 3.4.2 kde-base/libkcal)"
 
 KMCOPYLIB="libkcal libkcal"
 # libkcal is installed because a lot of headers are needed, but it don't have to be compiled
diff --git a/kde-base/libkpimexchange/libkpimexchange-3.4.3.ebuild b/kde-base/libkpimexchange/libkpimexchange-3.4.3.ebuild
index 641885bafbf8..ac42c292f608 100644
--- a/kde-base/libkpimexchange/libkpimexchange-3.4.3.ebuild
+++ b/kde-base/libkpimexchange/libkpimexchange-3.4.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/kde-base/libkpimexchange/libkpimexchange-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM exchange library"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
@@ -30,4 +30,4 @@ src_compile() {
 	cd ${S}/libkcal/libical/src/libicalss && make icalss.h
 
 	kde-meta_src_compile make
-}
\ No newline at end of file
+}
diff --git a/kde-base/libkpimexchange/libkpimexchange-3.5.0.ebuild b/kde-base/libkpimexchange/libkpimexchange-3.5.0.ebuild
index 3fef20837795..e9b4b02d4743 100644
--- a/kde-base/libkpimexchange/libkpimexchange-3.5.0.ebuild
+++ b/kde-base/libkpimexchange/libkpimexchange-3.5.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/kde-base/libkpimexchange/libkpimexchange-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkpimexchange/libkpimexchange-3.5.0_beta2.ebuild b/kde-base/libkpimexchange/libkpimexchange-3.5.0_beta2.ebuild
index c511ac9d6a81..b2f27cbdb24d 100644
--- a/kde-base/libkpimexchange/libkpimexchange-3.5.0_beta2.ebuild
+++ b/kde-base/libkpimexchange/libkpimexchange-3.5.0_beta2.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/kde-base/libkpimexchange/libkpimexchange-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM exchange library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="
@@ -30,4 +30,4 @@ src_compile() {
 	cd ${S}/libkcal/libical/src/libicalss && make icalss.h
 
 	kde-meta_src_compile make
-}
\ No newline at end of file
+}
diff --git a/kde-base/libkpimexchange/libkpimexchange-3.5.0_rc1.ebuild b/kde-base/libkpimexchange/libkpimexchange-3.5.0_rc1.ebuild
index f15b202829cf..002e6e4e0624 100644
--- a/kde-base/libkpimexchange/libkpimexchange-3.5.0_rc1.ebuild
+++ b/kde-base/libkpimexchange/libkpimexchange-3.5.0_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/kde-base/libkpimexchange/libkpimexchange-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkpimexchange/libkpimexchange-3.5_beta1.ebuild b/kde-base/libkpimexchange/libkpimexchange-3.5_beta1.ebuild
index b133ef609e18..f66fe7ce9d2c 100644
--- a/kde-base/libkpimexchange/libkpimexchange-3.5_beta1.ebuild
+++ b/kde-base/libkpimexchange/libkpimexchange-3.5_beta1.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/kde-base/libkpimexchange/libkpimexchange-3.5_beta1.ebuild,v 1.1 2005/09/22 21:19:35 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimexchange/libkpimexchange-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:26 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM exchange library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 OLDDEPEND="~kde-base/libkcal-$PV"
 DEPEND="
diff --git a/kde-base/libkpimexchange/metadata.xml b/kde-base/libkpimexchange/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkpimexchange/metadata.xml
+++ b/kde-base/libkpimexchange/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkpimidentities/ChangeLog b/kde-base/libkpimidentities/ChangeLog
index bd2aa012c184..a29dd7b3574e 100644
--- a/kde-base/libkpimidentities/ChangeLog
+++ b/kde-base/libkpimidentities/ChangeLog
@@ -1,6 +1,123 @@
 # ChangeLog for kde-base/libkpimidentities
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/ChangeLog,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkpimidentities-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  libkpimidentities-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libkpimidentities-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkpimidentities-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkpimidentities-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkpimidentities-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkpimidentities-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  libkpimidentities-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libkpimidentities-3.5.0_beta2.ebuild:
+  Keyword ~ppc and ~x86
+
+*libkpimidentities-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkpimidentities-3.5.0_beta2.ebuild:
+  New version.
+
+*libkpimidentities-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkpimidentities-3.4.3.ebuild:
+  New version.
+
+  03 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  libkpimidentities-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkpimidentities-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkpimidentities-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkpimidentities-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkpimidentities-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkpimidentities-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libkpimidentities-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org>
+  libkpimidentities-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org>
+  libkpimidentities-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  libkpimidentities-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libkpimidentities-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +libkpimidentities-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  libkpimidentities-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org>
+  libkpimidentities-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  libkpimidentities-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  libkpimidentities-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkpimidentities-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libkpimidentities-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkpimidentities-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libkpimidentities-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkpimidentities-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkpimidentities/Manifest b/kde-base/libkpimidentities/Manifest
index bd9d87b07c04..0b55f088a5cd 100644
--- a/kde-base/libkpimidentities/Manifest
+++ b/kde-base/libkpimidentities/Manifest
@@ -1,4 +1,24 @@
-MD5 e0595c91402837408f34d60a39d98209 libkpimidentities-3.4.0_beta1.ebuild 582
-MD5 e0595c91402837408f34d60a39d98209 libkpimidentities-3.4.0_alpha1.ebuild 582
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libkpimidentities-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-libkpimidentities-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 723a832882fe811d5c858f6a70807434 ChangeLog 3994
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libkpimidentities-3.4.1 208
+MD5 1abd06c61033b13feaa26798ccacf032 files/digest-libkpimidentities-3.4.3 67
+MD5 d39afb82a428db364187e1039af79947 files/digest-libkpimidentities-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-libkpimidentities-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-libkpimidentities-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libkpimidentities-3.5_beta1 68
+MD5 1c3ab0d2b7a13abc55cfa16d232efff9 libkpimidentities-3.4.1.ebuild 720
+MD5 10c16bf62f0046a6145bae57b4ac08e4 libkpimidentities-3.4.3.ebuild 728
+MD5 fff19743d9c3f946cf7da470afb86451 libkpimidentities-3.5.0.ebuild 652
+MD5 9afec0743a2ace961d6a05b831448287 libkpimidentities-3.5.0_beta2.ebuild 655
+MD5 86209cd7a4d2e6e64738db0ff7af88f7 libkpimidentities-3.5.0_rc1.ebuild 656
+MD5 64c986e1ab5e5eb0cd9dc8f290f6bcfc libkpimidentities-3.5_beta1.ebuild 711
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvCNntT9W3vfTuoRAhErAJ9hRrhqxEIovGT22lKd+UM+/HbV4QCeN2yz
+I/H2IgTe78cb+jVeeUh5KTk=
+=wwrV
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkpimidentities/files/digest-libkpimidentities-3.4.1 b/kde-base/libkpimidentities/files/digest-libkpimidentities-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libkpimidentities/files/digest-libkpimidentities-3.4.1
+++ b/kde-base/libkpimidentities/files/digest-libkpimidentities-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libkpimidentities/libkpimidentities-3.4.1.ebuild b/kde-base/libkpimidentities/libkpimidentities-3.4.1.ebuild
index 09fc62104e04..dd39349bbb40 100644
--- a/kde-base/libkpimidentities/libkpimidentities-3.4.1.ebuild
+++ b/kde-base/libkpimidentities/libkpimidentities-3.4.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM identities library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/certmanager)
-$(deprange $PV $MAXKDEVER kde-base/libkdepim)"
+DEPEND="$(deprange $PV 3.4.2 kde-base/certmanager)
+$(deprange $PV 3.4.2 kde-base/libkdepim)"
 OLDDEPEND="~kde-base/certmanager-$PV ~kde-base/libkdepim-$PV"
 
 KMCOPYLIB="
diff --git a/kde-base/libkpimidentities/libkpimidentities-3.4.3.ebuild b/kde-base/libkpimidentities/libkpimidentities-3.4.3.ebuild
index b88bef3cfc65..c825720b768a 100644
--- a/kde-base/libkpimidentities/libkpimidentities-3.4.3.ebuild
+++ b/kde-base/libkpimidentities/libkpimidentities-3.4.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/kde-base/libkpimidentities/libkpimidentities-3.4.3.ebuild,v 1.1 2005/10/13 00:10:07 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM identities library"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/certmanager)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/libkpimidentities/libkpimidentities-3.5.0.ebuild b/kde-base/libkpimidentities/libkpimidentities-3.5.0.ebuild
index 728978609b93..a534ca035c4f 100644
--- a/kde-base/libkpimidentities/libkpimidentities-3.5.0.ebuild
+++ b/kde-base/libkpimidentities/libkpimidentities-3.5.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/kde-base/libkpimidentities/libkpimidentities-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkpimidentities/libkpimidentities-3.5.0_beta2.ebuild b/kde-base/libkpimidentities/libkpimidentities-3.5.0_beta2.ebuild
index 8b49e699f5c9..c429904e0bcb 100644
--- a/kde-base/libkpimidentities/libkpimidentities-3.5.0_beta2.ebuild
+++ b/kde-base/libkpimidentities/libkpimidentities-3.5.0_beta2.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/kde-base/libkpimidentities/libkpimidentities-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM identities library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/certmanager)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/libkpimidentities/libkpimidentities-3.5.0_rc1.ebuild b/kde-base/libkpimidentities/libkpimidentities-3.5.0_rc1.ebuild
index 2946bba56a66..55bec87610ac 100644
--- a/kde-base/libkpimidentities/libkpimidentities-3.5.0_rc1.ebuild
+++ b/kde-base/libkpimidentities/libkpimidentities-3.5.0_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/kde-base/libkpimidentities/libkpimidentities-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libkpimidentities/libkpimidentities-3.5_beta1.ebuild b/kde-base/libkpimidentities/libkpimidentities-3.5_beta1.ebuild
index 0cfd812897fb..2b9e65676552 100644
--- a/kde-base/libkpimidentities/libkpimidentities-3.5_beta1.ebuild
+++ b/kde-base/libkpimidentities/libkpimidentities-3.5_beta1.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/kde-base/libkpimidentities/libkpimidentities-3.5_beta1.ebuild,v 1.1 2005/09/22 21:20:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkpimidentities/libkpimidentities-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:24 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE PIM identities library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/certmanager)
 $(deprange $PV $MAXKDEVER kde-base/libkdepim)"
diff --git a/kde-base/libkpimidentities/metadata.xml b/kde-base/libkpimidentities/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkpimidentities/metadata.xml
+++ b/kde-base/libkpimidentities/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libkscan/ChangeLog b/kde-base/libkscan/ChangeLog
index d8d3443ca964..e6f31dd5d248 100644
--- a/kde-base/libkscan/ChangeLog
+++ b/kde-base/libkscan/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/libkscan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/ChangeLog,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libkscan-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libkscan-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> libkscan-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libkscan-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libkscan-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libkscan-3.5_beta1.ebuild,
+  libkscan-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*libkscan-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.5.0_beta2.ebuild:
+  New version.
+
+*libkscan-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libkscan-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libkscan-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkscan-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libkscan-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libkscan-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  05 Sep 2005; Markus Rothe <corsair@gentoo.org> libkscan-3.4.1.ebuild,
+  libkscan-3.4.2.ebuild:
+  Stable on ppc64/added ~ppc64
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libkscan-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libkscan-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libkscan-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> libkscan-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+*libkscan-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> :
+  Added ~sparc keyword.
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libkscan-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libkscan-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libkscan-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libkscan-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> libkscan-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libkscan-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +libkscan-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libkscan-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libkscan/Manifest b/kde-base/libkscan/Manifest
index 94d8fcbc6ed5..b1b3ea9de369 100644
--- a/kde-base/libkscan/Manifest
+++ b/kde-base/libkscan/Manifest
@@ -1,4 +1,26 @@
-MD5 1938f5f9397d32579d6a329011a0e221 libkscan-3.4.0_alpha1.ebuild 298
-MD5 1938f5f9397d32579d6a329011a0e221 libkscan-3.4.0_beta1.ebuild 298
-MD5 f85ff1154cc1ce2a3fcc01be1098fca8 files/digest-libkscan-3.4.0_alpha1 72
-MD5 2ed7b7cff3ca3ea63807d913c938cf52 files/digest-libkscan-3.4.0_beta1 225
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e300922949bcaa6990e6c30bb68d9b86 ChangeLog 3577
+MD5 1334abaee53983ad0a0810adeafef453 files/digest-libkscan-3.4.1 221
+MD5 cb94e5a98246b8c80e29c3d668e4be9d files/digest-libkscan-3.4.2 300
+MD5 ad9f9a5920cdd067ae76d39d768fce5f files/digest-libkscan-3.4.3 71
+MD5 0459ac16349d79da6246392e2454796b files/digest-libkscan-3.5.0 71
+MD5 34075fd4ff1990fb26dfc1ac0482a541 files/digest-libkscan-3.5.0_beta2 225
+MD5 c67126eaeeb2137106bb079f5d529d71 files/digest-libkscan-3.5.0_rc1 312
+MD5 40554f7678788d1d4cdcf0824da8434f files/digest-libkscan-3.5_beta1 72
+MD5 b08f99582e1ffcb136938310a6575a98 libkscan-3.4.1.ebuild 421
+MD5 1e3c65e6a3875a7f1a222e41869fb87d libkscan-3.4.2.ebuild 433
+MD5 f146f49980238cd6159a794f1617676e libkscan-3.4.3.ebuild 429
+MD5 16343266911c9aa1950262cf2d10470b libkscan-3.5.0.ebuild 408
+MD5 11fc742dcc5ef9626d8a2c40cd6b1133 libkscan-3.5.0_beta2.ebuild 413
+MD5 60ece1dba96c36d3941f314a41c745c2 libkscan-3.5.0_rc1.ebuild 412
+MD5 133293bbc4ee0df6607bfab39d44ecbe libkscan-3.5_beta1.ebuild 411
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmehntT9W3vfTuoRAmjRAJ0dnH/jWvcK830F0/qZNpjl1RYerACghHrK
++h549l3S6mtvJySBWXkl5N8=
+=KCs5
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libkscan/files/digest-libkscan-3.4.1 b/kde-base/libkscan/files/digest-libkscan-3.4.1
index d65381fd13e0..5cce6072f68f 100644
--- a/kde-base/libkscan/files/digest-libkscan-3.4.1
+++ b/kde-base/libkscan/files/digest-libkscan-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
 MD5 d91ef530a416bd8407abb28103bc049c kdegraphics-3.4.1.tar.bz2 6581563
diff --git a/kde-base/libkscan/files/digest-libkscan-3.4.2 b/kde-base/libkscan/files/digest-libkscan-3.4.2
index 80c5b0d96ab2..89781c20f0ac 100644
--- a/kde-base/libkscan/files/digest-libkscan-3.4.2
+++ b/kde-base/libkscan/files/digest-libkscan-3.4.2
@@ -1 +1,4 @@
+MD5 5a0a32e314422e2ce051290c08390367 kdegraphics-3.4.0.tar.bz2 6667685
+MD5 233069e4d1846e828ac2385167cf38b1 kdegraphics-3.4.0-3.4.1.tar.xdelta 292428
+MD5 e7497324632baeb932975c561d18372d kdegraphics-3.4.1-3.4.2.tar.xdelta 271381
 MD5 50916460952c4142329a7c6a47fe1530 kdegraphics-3.4.2.tar.bz2 6579227
diff --git a/kde-base/libkscan/libkscan-3.4.1.ebuild b/kde-base/libkscan/libkscan-3.4.1.ebuild
index 0e7c2ef9ae01..edcad404a23a 100644
--- a/kde-base/libkscan/libkscan-3.4.1.ebuild
+++ b/kde-base/libkscan/libkscan-3.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/kde-base/libkscan/libkscan-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE scanner library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="media-gfx/sane-backends"
\ No newline at end of file
diff --git a/kde-base/libkscan/libkscan-3.4.2.ebuild b/kde-base/libkscan/libkscan-3.4.2.ebuild
index e7a61d05ec1d..a66b5aef4cf9 100644
--- a/kde-base/libkscan/libkscan-3.4.2.ebuild
+++ b/kde-base/libkscan/libkscan-3.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/kde-base/libkscan/libkscan-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE scanner library"
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="media-gfx/sane-backends"
\ No newline at end of file
diff --git a/kde-base/libkscan/libkscan-3.4.3.ebuild b/kde-base/libkscan/libkscan-3.4.3.ebuild
index eadf9099d07b..11119987f815 100644
--- a/kde-base/libkscan/libkscan-3.4.3.ebuild
+++ b/kde-base/libkscan/libkscan-3.4.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/kde-base/libkscan/libkscan-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE scanner library"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
-DEPEND="media-gfx/sane-backends"
\ No newline at end of file
+DEPEND="media-gfx/sane-backends"
diff --git a/kde-base/libkscan/libkscan-3.5.0.ebuild b/kde-base/libkscan/libkscan-3.5.0.ebuild
index 28f454162ce7..85273c96a120 100644
--- a/kde-base/libkscan/libkscan-3.5.0.ebuild
+++ b/kde-base/libkscan/libkscan-3.5.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/kde-base/libkscan/libkscan-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/libkscan/libkscan-3.5.0_beta2.ebuild b/kde-base/libkscan/libkscan-3.5.0_beta2.ebuild
index d9ae5fdaf8fa..e9c4f4d5d627 100644
--- a/kde-base/libkscan/libkscan-3.5.0_beta2.ebuild
+++ b/kde-base/libkscan/libkscan-3.5.0_beta2.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/kde-base/libkscan/libkscan-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE scanner library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-gfx/sane-backends"
\ No newline at end of file
diff --git a/kde-base/libkscan/libkscan-3.5.0_rc1.ebuild b/kde-base/libkscan/libkscan-3.5.0_rc1.ebuild
index 0d908256a87c..7743c367cc15 100644
--- a/kde-base/libkscan/libkscan-3.5.0_rc1.ebuild
+++ b/kde-base/libkscan/libkscan-3.5.0_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/kde-base/libkscan/libkscan-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
diff --git a/kde-base/libkscan/libkscan-3.5_beta1.ebuild b/kde-base/libkscan/libkscan-3.5_beta1.ebuild
index 326018a60b2f..bebde6601123 100644
--- a/kde-base/libkscan/libkscan-3.5_beta1.ebuild
+++ b/kde-base/libkscan/libkscan-3.5_beta1.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/kde-base/libkscan/libkscan-3.5_beta1.ebuild,v 1.1 2005/09/22 21:21:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkscan/libkscan-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:16 chriswhite Exp $
 
 KMNAME=kdegraphics
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE scanner library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-gfx/sane-backends"
\ No newline at end of file
diff --git a/kde-base/libkscan/metadata.xml b/kde-base/libkscan/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libkscan/metadata.xml
+++ b/kde-base/libkscan/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libksieve/ChangeLog b/kde-base/libksieve/ChangeLog
index c57256f420bd..697815f704a1 100644
--- a/kde-base/libksieve/ChangeLog
+++ b/kde-base/libksieve/ChangeLog
@@ -1,6 +1,77 @@
 # ChangeLog for kde-base/libksieve
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/ChangeLog,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
+
+*libksieve-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libksieve-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  libksieve-3.5_beta1.ebuild:
+  Keyword ~ppc and ~x86
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libksieve-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libksieve-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libksieve-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> libksieve-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*libksieve-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libksieve-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> libksieve-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libksieve-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libksieve-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libksieve-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libksieve-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libksieve-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libksieve-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> libksieve-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libksieve-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libksieve-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libksieve-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*libksieve-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libksieve-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libksieve-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libksieve/Manifest b/kde-base/libksieve/Manifest
index 95906bf8dc55..aae7bbaba1bb 100644
--- a/kde-base/libksieve/Manifest
+++ b/kde-base/libksieve/Manifest
@@ -1,4 +1,8 @@
-MD5 c004a2eb732971f594a37d85090bfa84 libksieve-3.4.0_beta1.ebuild 340
-MD5 c004a2eb732971f594a37d85090bfa84 libksieve-3.4.0_alpha1.ebuild 340
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-libksieve-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-libksieve-3.4.0_alpha1 68
+MD5 ec0e0ed636181ab03618f6719d0dd69d ChangeLog 2750
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-libksieve-3.4.1 208
+MD5 d39afb82a428db364187e1039af79947 files/digest-libksieve-3.5.0 67
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-libksieve-3.5_beta1 68
+MD5 3cb35eb35ca38ddbc212d2e7d31df44c libksieve-3.4.1.ebuild 475
+MD5 d8d17f9b85d63887464426ca46ac138f libksieve-3.5.0.ebuild 457
+MD5 88c907182864167fb93b814633eb2d83 libksieve-3.5_beta1.ebuild 467
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/libksieve/files/digest-libksieve-3.4.1 b/kde-base/libksieve/files/digest-libksieve-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/libksieve/files/digest-libksieve-3.4.1
+++ b/kde-base/libksieve/files/digest-libksieve-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/libksieve/libksieve-3.4.1.ebuild b/kde-base/libksieve/libksieve-3.4.1.ebuild
index 17bff16f0e8f..e596d261f3f2 100644
--- a/kde-base/libksieve/libksieve-3.4.1.ebuild
+++ b/kde-base/libksieve/libksieve-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="library enable support for sieve (imap server-side filtering standard) in kde apps, used by kmail"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/libksieve/libksieve-3.5.0.ebuild b/kde-base/libksieve/libksieve-3.5.0.ebuild
index decac1bf1634..c7873aa0100f 100644
--- a/kde-base/libksieve/libksieve-3.5.0.ebuild
+++ b/kde-base/libksieve/libksieve-3.5.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/kde-base/libksieve/libksieve-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/libksieve/libksieve-3.5_beta1.ebuild b/kde-base/libksieve/libksieve-3.5_beta1.ebuild
index 6d969b5ac83a..258b19765fff 100644
--- a/kde-base/libksieve/libksieve-3.5_beta1.ebuild
+++ b/kde-base/libksieve/libksieve-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-3.5_beta1.ebuild,v 1.1 2005/09/22 21:22:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksieve/libksieve-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:01 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="library enable support for sieve (imap server-side filtering standard) in kde apps, used by kmail"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
diff --git a/kde-base/libksieve/metadata.xml b/kde-base/libksieve/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libksieve/metadata.xml
+++ b/kde-base/libksieve/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/libksirtet/ChangeLog b/kde-base/libksirtet/ChangeLog
index a8b188bb8c69..862e0fdb25a7 100644
--- a/kde-base/libksirtet/ChangeLog
+++ b/kde-base/libksirtet/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/libksirtet
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/ChangeLog,v 1.1 2005/01/15 02:24:40 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/ChangeLog,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> libksirtet-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> libksirtet-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libksirtet-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*libksirtet-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +libksirtet-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*libksirtet-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +libksirtet-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> libksirtet-3.5_beta1.ebuild,
+  libksirtet-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*libksirtet-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +libksirtet-3.5.0_beta2.ebuild:
+  New version.
+
+*libksirtet-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +libksirtet-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libksirtet-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*libksirtet-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libksirtet-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*libksirtet-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +libksirtet-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  libksirtet-3.4.2.ebuild:
+  ~alpha keyword.
+
+*libksirtet-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +libksirtet-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> libksirtet-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> libksirtet-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> libksirtet-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*libksirtet-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +libksirtet-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> libksirtet-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> libksirtet-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> libksirtet-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> libksirtet-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*libksirtet-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  libksirtet-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*libksirtet-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +libksirtet-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *libksirtet-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/libksirtet/Manifest b/kde-base/libksirtet/Manifest
index 83f5d79aca95..708f54c6e81c 100644
--- a/kde-base/libksirtet/Manifest
+++ b/kde-base/libksirtet/Manifest
@@ -1,4 +1,26 @@
-MD5 523da0c2e2db80df227455379da3598f libksirtet-3.4.0_beta1.ebuild 427
-MD5 523da0c2e2db80df227455379da3598f libksirtet-3.4.0_alpha1.ebuild 427
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-libksirtet-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-libksirtet-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 19881ab8d8efbebeea6eb7c04609073f ChangeLog 3663
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-libksirtet-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-libksirtet-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-libksirtet-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-libksirtet-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-libksirtet-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-libksirtet-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-libksirtet-3.5_beta1 70
+MD5 1717aeaf9b29dc40754db17acdb6f869 libksirtet-3.4.1.ebuild 552
+MD5 67a086dcfe93a1929347c9f58678d7c6 libksirtet-3.4.2.ebuild 565
+MD5 d29d1622f76138dde0b266132684399e libksirtet-3.4.3.ebuild 561
+MD5 369586a5cdd91cc97da22e275e80b7cb libksirtet-3.5.0.ebuild 504
+MD5 b6d059b0d85715ae7f511349e541c885 libksirtet-3.5.0_beta2.ebuild 509
+MD5 c0d1e082338d5eee73e3cc8f4ace82cd libksirtet-3.5.0_rc1.ebuild 508
+MD5 630bb9e2b9e3ce262fd65683dd3b5b86 libksirtet-3.5_beta1.ebuild 544
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhl0pntT9W3vfTuoRAtPJAJ9AFCZYXMTTML51bgEKqm1daYSW1ACfV40V
+1Dfv0pV8tqbihpisDaC6ij0=
+=xBSo
+-----END PGP SIGNATURE-----
diff --git a/kde-base/libksirtet/files/digest-libksirtet-3.4.1 b/kde-base/libksirtet/files/digest-libksirtet-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/libksirtet/files/digest-libksirtet-3.4.1
+++ b/kde-base/libksirtet/files/digest-libksirtet-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/libksirtet/files/digest-libksirtet-3.4.2 b/kde-base/libksirtet/files/digest-libksirtet-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/libksirtet/files/digest-libksirtet-3.4.2
+++ b/kde-base/libksirtet/files/digest-libksirtet-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/libksirtet/libksirtet-3.4.1.ebuild b/kde-base/libksirtet/libksirtet-3.4.1.ebuild
index 5c4bd72ad21c..937630cad823 100644
--- a/kde-base/libksirtet/libksirtet-3.4.1.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE library used by several games"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/libksirtet/libksirtet-3.4.2.ebuild b/kde-base/libksirtet/libksirtet-3.4.2.ebuild
index 880669ff45f3..e66e0381b814 100644
--- a/kde-base/libksirtet/libksirtet-3.4.2.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE library used by several games"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/libksirtet/libksirtet-3.4.3.ebuild b/kde-base/libksirtet/libksirtet-3.4.3.ebuild
index 4f9c8eac1041..10f98ec065ff 100644
--- a/kde-base/libksirtet/libksirtet-3.4.3.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE library used by several games"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/libksirtet/libksirtet-3.5.0.ebuild b/kde-base/libksirtet/libksirtet-3.5.0.ebuild
index fe3439362730..47ef320c41ec 100644
--- a/kde-base/libksirtet/libksirtet-3.5.0.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.5.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/kde-base/libksirtet/libksirtet-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/libksirtet/libksirtet-3.5.0_beta2.ebuild b/kde-base/libksirtet/libksirtet-3.5.0_beta2.ebuild
index 26f27521c17e..4679a573597b 100644
--- a/kde-base/libksirtet/libksirtet-3.5.0_beta2.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE library used by several games"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/libksirtet/libksirtet-3.5.0_rc1.ebuild b/kde-base/libksirtet/libksirtet-3.5.0_rc1.ebuild
index b21960e27421..305af1c0c234 100644
--- a/kde-base/libksirtet/libksirtet-3.5.0_rc1.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.5.0_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/kde-base/libksirtet/libksirtet-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/libksirtet/libksirtet-3.5_beta1.ebuild b/kde-base/libksirtet/libksirtet-3.5_beta1.ebuild
index ed480948025f..d76979015e60 100644
--- a/kde-base/libksirtet/libksirtet-3.5_beta1.ebuild
+++ b/kde-base/libksirtet/libksirtet-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.5_beta1.ebuild,v 1.1 2005/09/22 21:23:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libksirtet/libksirtet-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:19 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE library used by several games"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/libksirtet/metadata.xml b/kde-base/libksirtet/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/libksirtet/metadata.xml
+++ b/kde-base/libksirtet/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/librss/ChangeLog b/kde-base/librss/ChangeLog
index 8e2d3268cfa7..458b5a330842 100644
--- a/kde-base/librss/ChangeLog
+++ b/kde-base/librss/ChangeLog
@@ -1,6 +1,74 @@
 # ChangeLog for kde-base/librss
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/librss/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/librss/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+*librss-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +librss-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> librss-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -librss-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*librss-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +librss-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> librss-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*librss-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +librss-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> librss-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> librss-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> librss-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> librss-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*librss-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +librss-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> librss-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> librss-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> librss-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> librss-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> librss-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*librss-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +librss-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *librss-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/librss/Manifest b/kde-base/librss/Manifest
index df3f1d881a68..a6123d48535c 100644
--- a/kde-base/librss/Manifest
+++ b/kde-base/librss/Manifest
@@ -1,4 +1,8 @@
-MD5 0651232c6d804cb2cbff6850423ff545 librss-3.4.0_alpha1.ebuild 260
-MD5 0651232c6d804cb2cbff6850423ff545 librss-3.4.0_beta1.ebuild 260
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-librss-3.4.0_alpha1 71
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-librss-3.4.0_beta1 223
+MD5 e69e783d8d22f5d15517cc58434c24f1 ChangeLog 2666
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-librss-3.4.1 218
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-librss-3.5.0 70
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-librss-3.5_beta1 71
+MD5 c6352692c36a094a2fc4affbd7bfad09 librss-3.4.1.ebuild 389
+MD5 52eb8e8ce7f497dd2e13a5cb968c08ce librss-3.5.0.ebuild 366
+MD5 48b162564f83eaa189f91131e7621637 librss-3.5_beta1.ebuild 376
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/librss/files/digest-librss-3.4.1 b/kde-base/librss/files/digest-librss-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/librss/files/digest-librss-3.4.1
+++ b/kde-base/librss/files/digest-librss-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/librss/librss-3.4.1.ebuild b/kde-base/librss/librss-3.4.1.ebuild
index be9bcb8bacb8..2978743c97a2 100644
--- a/kde-base/librss/librss-3.4.1.ebuild
+++ b/kde-base/librss/librss-3.4.1.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/kde-base/librss/librss-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/librss/librss-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE rss library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/librss/librss-3.5.0.ebuild b/kde-base/librss/librss-3.5.0.ebuild
index 962f2fc6d5a4..2959760c5a82 100644
--- a/kde-base/librss/librss-3.5.0.ebuild
+++ b/kde-base/librss/librss-3.5.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/kde-base/librss/librss-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/librss/librss-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
diff --git a/kde-base/librss/librss-3.5_beta1.ebuild b/kde-base/librss/librss-3.5_beta1.ebuild
index 015d50bfde76..1c2b43efc3d6 100644
--- a/kde-base/librss/librss-3.5_beta1.ebuild
+++ b/kde-base/librss/librss-3.5_beta1.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/kde-base/librss/librss-3.5_beta1.ebuild,v 1.1 2005/09/22 21:24:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/librss/librss-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdenetwork
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE rss library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
\ No newline at end of file
diff --git a/kde-base/librss/metadata.xml b/kde-base/librss/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/librss/metadata.xml
+++ b/kde-base/librss/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/lilo-config/ChangeLog b/kde-base/lilo-config/ChangeLog
index b01d17be082b..4bcde85b7e08 100644
--- a/kde-base/lilo-config/ChangeLog
+++ b/kde-base/lilo-config/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for kde-base/lilo-config
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/ChangeLog,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
+
+*lilo-config-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +lilo-config-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*lilo-config-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +lilo-config-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  lilo-config-3.5_beta1.ebuild, lilo-config-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*lilo-config-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +lilo-config-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -lilo-config-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*lilo-config-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +lilo-config-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*lilo-config-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +lilo-config-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*lilo-config-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +lilo-config-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> lilo-config-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> lilo-config-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*lilo-config-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +lilo-config-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *lilo-config-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/lilo-config/Manifest b/kde-base/lilo-config/Manifest
index 6382333c8f32..775828895bcb 100644
--- a/kde-base/lilo-config/Manifest
+++ b/kde-base/lilo-config/Manifest
@@ -1,5 +1,13 @@
-MD5 e4b06866707e8dc1f09328adc499bf40 lilo-config-3.4.0_beta1.ebuild 310
-MD5 e4b06866707e8dc1f09328adc499bf40 lilo-config-3.4.0_alpha1.ebuild 310
+MD5 111f4ca4b34358c44b8aa71c1aae31f2 ChangeLog 2374
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-lilo-config-3.4.1 211
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-lilo-config-3.5.0 68
+MD5 64ad1da64ecad951c67e7899dbfa8bd7 files/digest-lilo-config-3.5.0_beta2 215
+MD5 068810fa15f0ff2384c05e1d80dd3754 files/digest-lilo-config-3.5.0_rc1 298
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-lilo-config-3.5_beta1 69
 MD5 d593b6b8d568cef10aecca256d8dd6be files/never-disable.diff 281
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-lilo-config-3.4.0_beta1 215
-MD5 5c80d63263041da2a3656e9484510f15 files/digest-lilo-config-3.4.0_alpha1 69
+MD5 3572049f2805b7eecbab3928e232d837 lilo-config-3.4.1.ebuild 431
+MD5 b58d4d130e37db62dcd368bfa49f37a9 lilo-config-3.5.0.ebuild 426
+MD5 60a25a88f2e0a5b6a6782b8ca9b044be lilo-config-3.5.0_beta2.ebuild 431
+MD5 d74fbb4827ab6c82bbe612360d71efb8 lilo-config-3.5.0_rc1.ebuild 430
+MD5 9aa434d2bece99e185f0a90cde22e4f1 lilo-config-3.5_beta1.ebuild 429
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/lilo-config/files/digest-lilo-config-3.4.1 b/kde-base/lilo-config/files/digest-lilo-config-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/lilo-config/files/digest-lilo-config-3.4.1
+++ b/kde-base/lilo-config/files/digest-lilo-config-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/lilo-config/lilo-config-3.4.1.ebuild b/kde-base/lilo-config/lilo-config-3.4.1.ebuild
index 9253785cdba8..1bc24c63eb55 100644
--- a/kde-base/lilo-config/lilo-config-3.4.1.ebuild
+++ b/kde-base/lilo-config/lilo-config-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE LiLo kcontrol module"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/lilo-config/lilo-config-3.5.0.ebuild b/kde-base/lilo-config/lilo-config-3.5.0.ebuild
index 9d3d45037f92..e0946ee97ca9 100644
--- a/kde-base/lilo-config/lilo-config-3.5.0.ebuild
+++ b/kde-base/lilo-config/lilo-config-3.5.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/kde-base/lilo-config/lilo-config-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/lilo-config/lilo-config-3.5.0_beta2.ebuild b/kde-base/lilo-config/lilo-config-3.5.0_beta2.ebuild
index 15555eee8302..029a704e1322 100644
--- a/kde-base/lilo-config/lilo-config-3.5.0_beta2.ebuild
+++ b/kde-base/lilo-config/lilo-config-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE LiLo kcontrol module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/lilo-config/lilo-config-3.5.0_rc1.ebuild b/kde-base/lilo-config/lilo-config-3.5.0_rc1.ebuild
index 08d49a2321dc..4edecd43675d 100644
--- a/kde-base/lilo-config/lilo-config-3.5.0_rc1.ebuild
+++ b/kde-base/lilo-config/lilo-config-3.5.0_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/kde-base/lilo-config/lilo-config-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/lilo-config/lilo-config-3.5_beta1.ebuild b/kde-base/lilo-config/lilo-config-3.5_beta1.ebuild
index f4448395ab0e..351d3ca5897b 100644
--- a/kde-base/lilo-config/lilo-config-3.5_beta1.ebuild
+++ b/kde-base/lilo-config/lilo-config-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.5_beta1.ebuild,v 1.1 2005/09/22 21:25:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lilo-config/lilo-config-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:57 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE LiLo kcontrol module"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/lilo-config/metadata.xml b/kde-base/lilo-config/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/lilo-config/metadata.xml
+++ b/kde-base/lilo-config/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/lisa/ChangeLog b/kde-base/lisa/ChangeLog
index 89f4a7552c7f..e8400163b347 100644
--- a/kde-base/lisa/ChangeLog
+++ b/kde-base/lisa/ChangeLog
@@ -1,6 +1,100 @@
 # ChangeLog for kde-base/lisa
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/ChangeLog,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> lisa-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> lisa-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> lisa-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*lisa-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +lisa-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> lisa-3.5_beta1.ebuild,
+  lisa-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*lisa-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +lisa-3.5.0_beta2.ebuild:
+  New version.
+
+*lisa-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +lisa-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -lisa-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*lisa-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> +lisa-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*lisa-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +lisa-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> lisa-3.4.2.ebuild:
+  ~alpha keyword.
+
+*lisa-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +lisa-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> lisa-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> lisa-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> lisa-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*lisa-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +lisa-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> lisa-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> lisa-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> lisa-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> lisa-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*lisa-3.4.0_rc1 (07 Mar 2005)
+
+  07 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> lisa-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*lisa-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +lisa-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *lisa-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/lisa/Manifest b/kde-base/lisa/Manifest
index df1eba48904a..591e60da8a15 100644
--- a/kde-base/lisa/Manifest
+++ b/kde-base/lisa/Manifest
@@ -1,8 +1,28 @@
-MD5 761fca3b6d252e15434db4fcee283412 lisa-3.4.0_alpha1.ebuild 981
-MD5 761fca3b6d252e15434db4fcee283412 lisa-3.4.0_beta1.ebuild 981
-MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
-MD5 8f9373cda4770eab4d67c6adf6621547 files/reslisa 562
-MD5 01dd2bacee59738f96d17c77774a5102 files/reslisa.conf 450
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dd9d116d8b79f094ba4831f9e5e66c60 ChangeLog 3356
+MD5 92bc3a39b10976f1a0aa8342b525a4ab files/digest-lisa-3.4.1 218
+MD5 1277f401bade54acfa086cf013950252 files/digest-lisa-3.4.2 296
+MD5 c259b2aa6bede478d4afff87117e9685 files/digest-lisa-3.4.3 70
+MD5 c1796dff01cbd770e451d9686766c581 files/digest-lisa-3.5.0 70
+MD5 e48a9939e32d172601a814622502aa3b files/digest-lisa-3.5.0_beta2 222
+MD5 16b903e400a8cf2d73f3c237799238db files/digest-lisa-3.5_beta1 71
+MD5 286554f1aa942a969d3521d60b4f4def files/lisa 532
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
-MD5 4af013c3a73d9988c67cfbfcc7fff890 files/digest-lisa-3.4.0_beta1 223
-MD5 09cbac9d8b68d5bd4514c50df459e782 files/digest-lisa-3.4.0_alpha1 71
+MD5 18120584a2975ce21312780ef0eaf12b files/reslisa 556
+MD5 01dd2bacee59738f96d17c77774a5102 files/reslisa.conf 450
+MD5 529ae72a16e0bc3ddbf409b7635d622e lisa-3.4.1.ebuild 1003
+MD5 375c5ed27d74f4028a5305008e772fad lisa-3.4.2.ebuild 1016
+MD5 085b3cbd4e77b4f2fd1549871afaad34 lisa-3.4.3.ebuild 1013
+MD5 8a31275b3eb9845b6af314a124af86cc lisa-3.5.0.ebuild 992
+MD5 8acc748bc7b24e5172d468d71a104896 lisa-3.5.0_beta2.ebuild 1004
+MD5 4519ae2cc417f02007c47e9b3143fe4f lisa-3.5_beta1.ebuild 995
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhuZFntT9W3vfTuoRAqDhAJ0Tvuy1bu2TQ/N/dYWsD3t8liHzewCfXMTF
+7ljrV3c4KxGJUBOybE2gPCI=
+=zIxT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/lisa/files/digest-lisa-3.4.1 b/kde-base/lisa/files/digest-lisa-3.4.1
index 3bfd3edff0dd..dd003cf7c92f 100644
--- a/kde-base/lisa/files/digest-lisa-3.4.1
+++ b/kde-base/lisa/files/digest-lisa-3.4.1
@@ -1,2 +1,3 @@
 MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
 MD5 cfdec84537bd20f032b9b27c74bc28ba kdenetwork-3.4.1.tar.bz2 7388991
diff --git a/kde-base/lisa/files/digest-lisa-3.4.2 b/kde-base/lisa/files/digest-lisa-3.4.2
index ff4633b1c9db..d6a69ebee64e 100644
--- a/kde-base/lisa/files/digest-lisa-3.4.2
+++ b/kde-base/lisa/files/digest-lisa-3.4.2
@@ -1 +1,4 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
+MD5 d5272b943692bb360b4245908ef9e32a kdenetwork-3.4.0-3.4.1.tar.xdelta 827657
+MD5 a5fb2f18f5ec8c9974bea9be27714e91 kdenetwork-3.4.1-3.4.2.tar.xdelta 342828
 MD5 f803a0800d722983e6cc2b4c87ca435e kdenetwork-3.4.2.tar.bz2 7392788
diff --git a/kde-base/lisa/files/lisa b/kde-base/lisa/files/lisa
index f0da1fa0413f..1fa48d1a582d 100755
--- a/kde-base/lisa/files/lisa
+++ b/kde-base/lisa/files/lisa
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/files/lisa,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/files/lisa,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 depend() {
     use net
diff --git a/kde-base/lisa/files/reslisa b/kde-base/lisa/files/reslisa
index c37d8851410a..c1f962e79b3d 100755
--- a/kde-base/lisa/files/reslisa
+++ b/kde-base/lisa/files/reslisa
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/files/reslisa,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/files/reslisa,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 depend() {
     use net
diff --git a/kde-base/lisa/lisa-3.4.1.ebuild b/kde-base/lisa/lisa-3.4.1.ebuild
index 370e29781209..de2d4f6d0a54 100644
--- a/kde-base/lisa/lisa-3.4.1.ebuild
+++ b/kde-base/lisa/lisa-3.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/kde-base/lisa/lisa-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=lanbrowsing
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Lan Information Server - allows KDE desktops to share information over a network"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/lanbrowser"
 
diff --git a/kde-base/lisa/lisa-3.4.2.ebuild b/kde-base/lisa/lisa-3.4.2.ebuild
index 9b1352ff0b5d..89a9b58144f7 100644
--- a/kde-base/lisa/lisa-3.4.2.ebuild
+++ b/kde-base/lisa/lisa-3.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/kde-base/lisa/lisa-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=lanbrowsing
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Lan Information Server - allows KDE desktops to share information over a network"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/lanbrowser"
 
diff --git a/kde-base/lisa/lisa-3.4.3.ebuild b/kde-base/lisa/lisa-3.4.3.ebuild
index 6609320d746b..c39fcd35f5f4 100644
--- a/kde-base/lisa/lisa-3.4.3.ebuild
+++ b/kde-base/lisa/lisa-3.4.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/kde-base/lisa/lisa-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=lanbrowsing
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Lan Information Server - allows KDE desktops to share information over a network"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/lanbrowser"
 
@@ -31,4 +31,4 @@ src_install() {
 	for x in /etc/lisarc /etc/reslisarc; do
 		echo '# Default lisa/reslisa configfile' > $D/$x
 	done
-}
\ No newline at end of file
+}
diff --git a/kde-base/lisa/lisa-3.5.0.ebuild b/kde-base/lisa/lisa-3.5.0.ebuild
index b5f5affd6820..a9fed2b712be 100644
--- a/kde-base/lisa/lisa-3.5.0.ebuild
+++ b/kde-base/lisa/lisa-3.5.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/kde-base/lisa/lisa-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=lanbrowsing
diff --git a/kde-base/lisa/lisa-3.5.0_beta2.ebuild b/kde-base/lisa/lisa-3.5.0_beta2.ebuild
index c96278ebcf16..3fe6af7436eb 100644
--- a/kde-base/lisa/lisa-3.5.0_beta2.ebuild
+++ b/kde-base/lisa/lisa-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:01 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:49 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=lanbrowsing
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Lan Information Server - allows KDE desktops to share information over a network"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/lanbrowser"
 
diff --git a/kde-base/lisa/lisa-3.5_beta1.ebuild b/kde-base/lisa/lisa-3.5_beta1.ebuild
index c48f9cbeb283..c1241d3c4f82 100644
--- a/kde-base/lisa/lisa-3.5_beta1.ebuild
+++ b/kde-base/lisa/lisa-3.5_beta1.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/kde-base/lisa/lisa-3.5_beta1.ebuild,v 1.1 2005/09/22 21:26:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lisa/lisa-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:50 chriswhite Exp $
 
 KMNAME=kdenetwork
 KMMODULE=lanbrowsing
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE Lan Information Server - allows KDE desktops to share information over a network"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 KMEXTRA="doc/kcontrol/lanbrowser"
 
diff --git a/kde-base/lisa/metadata.xml b/kde-base/lisa/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/lisa/metadata.xml
+++ b/kde-base/lisa/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/lskat/ChangeLog b/kde-base/lskat/ChangeLog
index 6fad6f7e8660..66d70e61e5ee 100644
--- a/kde-base/lskat/ChangeLog
+++ b/kde-base/lskat/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for kde-base/lskat
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/ChangeLog,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> lskat-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> lskat-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> lskat-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*lskat-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*lskat-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> lskat-3.5_beta1.ebuild,
+  lskat-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*lskat-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.5.0_beta2.ebuild:
+  New version.
+
+*lskat-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -lskat-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*lskat-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +lskat-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*lskat-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +lskat-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> lskat-3.4.2.ebuild:
+  ~alpha keyword.
+
+*lskat-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> lskat-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> lskat-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> lskat-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*lskat-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> lskat-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> lskat-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> lskat-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> lskat-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*lskat-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> lskat-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*lskat-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +lskat-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *lskat-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/lskat/Manifest b/kde-base/lskat/Manifest
index d075561ed7f3..dab288f7a466 100644
--- a/kde-base/lskat/Manifest
+++ b/kde-base/lskat/Manifest
@@ -1,4 +1,26 @@
-MD5 33df505df071ffd31216d01e26b1a680 lskat-3.4.0_beta1.ebuild 407
-MD5 33df505df071ffd31216d01e26b1a680 lskat-3.4.0_alpha1.ebuild 407
-MD5 b35124f462cce0e0518bb5468c406f9d files/digest-lskat-3.4.0_alpha1 69
-MD5 039057bfd4af6b157cd2b7b08f08d23d files/digest-lskat-3.4.0_beta1 216
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0cd3662e0df1dd53c36e6ea4ce58893d ChangeLog 3465
+MD5 7f12555bf2fdc56b256b49f72230e062 files/digest-lskat-3.4.1 212
+MD5 b780128b9240f26d24e96f1b7d8a0208 files/digest-lskat-3.4.2 288
+MD5 bafb1bf1d1decae41875c6a20c9d5dca files/digest-lskat-3.4.3 68
+MD5 80f840bfb21ccf27fc7b0da926a5bcbd files/digest-lskat-3.5.0 69
+MD5 b6349ba4ffa313babdf28579b63915f9 files/digest-lskat-3.5.0_beta2 218
+MD5 894962ff94814330209ff99f0ab9f1cb files/digest-lskat-3.5.0_rc1 302
+MD5 cec48d7b091caec0087349ff3924ad36 files/digest-lskat-3.5_beta1 70
+MD5 6ea8165c40aba6b4855bbf80074b49f0 lskat-3.4.1.ebuild 522
+MD5 7f8aff6a39412ead1516c8725486c435 lskat-3.4.2.ebuild 535
+MD5 bd4c9740609c6067d42917a4caa59ad8 lskat-3.4.3.ebuild 531
+MD5 238cc4991378a57f005e8ce8c4cea2bd lskat-3.5.0.ebuild 474
+MD5 748e04946907cca10817faad416cba03 lskat-3.5.0_beta2.ebuild 479
+MD5 11ba8135237ebec8cee3ff00212c9cb4 lskat-3.5.0_rc1.ebuild 478
+MD5 5e6363eaa64163cee134b5d6cff3f756 lskat-3.5_beta1.ebuild 514
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhmMSntT9W3vfTuoRAheBAKCYamXlAwxdsC7eSZelthfMj7OldgCbBr5o
+Jd1Iu/jmANUQF3rQRihyYao=
+=sPhT
+-----END PGP SIGNATURE-----
diff --git a/kde-base/lskat/files/digest-lskat-3.4.1 b/kde-base/lskat/files/digest-lskat-3.4.1
index c603034b88ca..8ffa35c5f305 100644
--- a/kde-base/lskat/files/digest-lskat-3.4.1
+++ b/kde-base/lskat/files/digest-lskat-3.4.1
@@ -1,2 +1,3 @@
 MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
 MD5 6af3f45a1c959324c44d4b08bd552f16 kdegames-3.4.1.tar.bz2 9428849
diff --git a/kde-base/lskat/files/digest-lskat-3.4.2 b/kde-base/lskat/files/digest-lskat-3.4.2
index 29ea832570b2..9e46897b21e8 100644
--- a/kde-base/lskat/files/digest-lskat-3.4.2
+++ b/kde-base/lskat/files/digest-lskat-3.4.2
@@ -1 +1,4 @@
+MD5 ab144b71caeda34579817b01855ec287 kdegames-3.4.0.tar.bz2 9509119
+MD5 e043c95a4d7f947f33d7468910bab8fd kdegames-3.4.0-3.4.1.tar.xdelta 413438
+MD5 bfb1fdd77fcba8f20ec16c54806c69a6 kdegames-3.4.1-3.4.2.tar.xdelta 320672
 MD5 0213806b5cf7956f12d8d3a830ea2208 kdegames-3.4.2.tar.bz2 9450681
diff --git a/kde-base/lskat/lskat-3.4.1.ebuild b/kde-base/lskat/lskat-3.4.1.ebuild
index 77c060d3585c..7f8a8f0f3df4 100644
--- a/kde-base/lskat/lskat-3.4.1.ebuild
+++ b/kde-base/lskat/lskat-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE card game"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/lskat/lskat-3.4.2.ebuild b/kde-base/lskat/lskat-3.4.2.ebuild
index 4bbd0924fa6e..959a9973849e 100644
--- a/kde-base/lskat/lskat-3.4.2.ebuild
+++ b/kde-base/lskat/lskat-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE card game"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/lskat/lskat-3.4.3.ebuild b/kde-base/lskat/lskat-3.4.3.ebuild
index f4bc481fb396..aa19f560452f 100644
--- a/kde-base/lskat/lskat-3.4.3.ebuild
+++ b/kde-base/lskat/lskat-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE card game"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/lskat/lskat-3.5.0.ebuild b/kde-base/lskat/lskat-3.5.0.ebuild
index 83240a9aaacc..799819bcc10e 100644
--- a/kde-base/lskat/lskat-3.5.0.ebuild
+++ b/kde-base/lskat/lskat-3.5.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/kde-base/lskat/lskat-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/lskat/lskat-3.5.0_beta2.ebuild b/kde-base/lskat/lskat-3.5.0_beta2.ebuild
index 73617257b16b..fa170ba81f21 100644
--- a/kde-base/lskat/lskat-3.5.0_beta2.ebuild
+++ b/kde-base/lskat/lskat-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE card game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 
diff --git a/kde-base/lskat/lskat-3.5.0_rc1.ebuild b/kde-base/lskat/lskat-3.5.0_rc1.ebuild
index 4f86ff157a74..0d8cbee969f4 100644
--- a/kde-base/lskat/lskat-3.5.0_rc1.ebuild
+++ b/kde-base/lskat/lskat-3.5.0_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/kde-base/lskat/lskat-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/lskat/lskat-3.5_beta1.ebuild b/kde-base/lskat/lskat-3.5_beta1.ebuild
index e94d60189e7a..5b1dee70e287 100644
--- a/kde-base/lskat/lskat-3.5_beta1.ebuild
+++ b/kde-base/lskat/lskat-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.5_beta1.ebuild,v 1.1 2005/09/22 21:27:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lskat/lskat-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:23 chriswhite Exp $
 KMNAME=kdegames
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE card game"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkdegames)"
 OLDDEPEND="~kde-base/libkdegames-$PV"
diff --git a/kde-base/lskat/metadata.xml b/kde-base/lskat/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/lskat/metadata.xml
+++ b/kde-base/lskat/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/metadata.xml b/kde-base/metadata.xml
index f365462c2571..f53c5b79d7d4 100644
--- a/kde-base/metadata.xml
+++ b/kde-base/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The kde-base category contains core KDE packages.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie kde-base enthält die Basispakete für KDE.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría kde-base contiene los paquetes base de KDE.
+	</longdescription>
+	<longdescription lang="ja">
+		kde-baseカテゴリーにはKDEのコア・パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De kde-base categorie bevat de basispakketten van KDE.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm kde-base chứa các gói KDE cốt lõi.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria kde-base contiene i pacchetti base di KDE.
+	</longdescription>
 </catmetadata>
 
diff --git a/kde-base/mimelib/ChangeLog b/kde-base/mimelib/ChangeLog
index c2dcae88ebbb..5f4aab3f7e84 100644
--- a/kde-base/mimelib/ChangeLog
+++ b/kde-base/mimelib/ChangeLog
@@ -1,6 +1,90 @@
 # ChangeLog for kde-base/mimelib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/ChangeLog,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> mimelib-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> mimelib-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> mimelib-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*mimelib-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +mimelib-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  18 Oct 2005; Douglas Russell <puggy@gentoo.org> mimelib-3.5_beta1.ebuild:
+  Keyword ~ppc and ~x86
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -mimelib-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*mimelib-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mimelib-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*mimelib-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mimelib-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> mimelib-3.4.2.ebuild:
+  ~alpha keyword.
+
+*mimelib-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +mimelib-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> mimelib-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> mimelib-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> mimelib-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*mimelib-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +mimelib-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> mimelib-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> mimelib-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> mimelib-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> mimelib-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*mimelib-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> mimelib-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*mimelib-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +mimelib-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *mimelib-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/mimelib/Manifest b/kde-base/mimelib/Manifest
index e9061db66d3a..4ed286cfa766 100644
--- a/kde-base/mimelib/Manifest
+++ b/kde-base/mimelib/Manifest
@@ -1,4 +1,20 @@
-MD5 34ba3b7a40256a955ccacf7a6eafeeb4 mimelib-3.4.0_alpha1.ebuild 259
-MD5 34ba3b7a40256a955ccacf7a6eafeeb4 mimelib-3.4.0_beta1.ebuild 259
-MD5 91d4f5b007e372c77780c153cb54c612 files/digest-mimelib-3.4.0_beta1 213
-MD5 892303ffe022b31a222f9efab549727b files/digest-mimelib-3.4.0_alpha1 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 77df677f56c2a0f701ba3b114abacfb2 ChangeLog 3122
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-mimelib-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-mimelib-3.4.2 282
+MD5 d39afb82a428db364187e1039af79947 files/digest-mimelib-3.5.0 67
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-mimelib-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 2739af1ccf73445db9a3428c766a36c5 mimelib-3.4.1.ebuild 378
+MD5 3d80b9f98567c4f50990550a2270dc2b mimelib-3.4.2.ebuild 389
+MD5 5df816e1423b9e45ef98b75dd526fafd mimelib-3.5.0.ebuild 372
+MD5 061138f6cf79149ae7985a006c860b8a mimelib-3.5_beta1.ebuild 382
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvQXntT9W3vfTuoRAob5AJkBo8LuW4bmmNIWr/HdhA7Y4rJswwCfZDFf
+DrtqQV3CMBkgM0Dqg1Sd6Uk=
+=amNQ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/mimelib/files/digest-mimelib-3.4.1 b/kde-base/mimelib/files/digest-mimelib-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/mimelib/files/digest-mimelib-3.4.1
+++ b/kde-base/mimelib/files/digest-mimelib-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/mimelib/files/digest-mimelib-3.4.2 b/kde-base/mimelib/files/digest-mimelib-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/mimelib/files/digest-mimelib-3.4.2
+++ b/kde-base/mimelib/files/digest-mimelib-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/mimelib/metadata.xml b/kde-base/mimelib/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/mimelib/metadata.xml
+++ b/kde-base/mimelib/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/mimelib/mimelib-3.4.1.ebuild b/kde-base/mimelib/mimelib-3.4.1.ebuild
index 56ebcb39e362..842270f044db 100644
--- a/kde-base/mimelib/mimelib-3.4.1.ebuild
+++ b/kde-base/mimelib/mimelib-3.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/kde-base/mimelib/mimelib-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/mimelib-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,6 +8,6 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mime library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
diff --git a/kde-base/mimelib/mimelib-3.4.2.ebuild b/kde-base/mimelib/mimelib-3.4.2.ebuild
index f66b13d91faa..6ebccb725f64 100644
--- a/kde-base/mimelib/mimelib-3.4.2.ebuild
+++ b/kde-base/mimelib/mimelib-3.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/mimelib-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/mimelib-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mime library"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
diff --git a/kde-base/mimelib/mimelib-3.5.0.ebuild b/kde-base/mimelib/mimelib-3.5.0.ebuild
index a006003c69b9..63f097c13d5d 100644
--- a/kde-base/mimelib/mimelib-3.5.0.ebuild
+++ b/kde-base/mimelib/mimelib-3.5.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/kde-base/mimelib/mimelib-3.5.0.ebuild,v 1.1 2005/11/22 22:14:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/mimelib-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/mimelib/mimelib-3.5_beta1.ebuild b/kde-base/mimelib/mimelib-3.5_beta1.ebuild
index 371f80b1e45c..02966fb715bc 100644
--- a/kde-base/mimelib/mimelib-3.5_beta1.ebuild
+++ b/kde-base/mimelib/mimelib-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/mimelib-3.5_beta1.ebuild,v 1.1 2005/09/22 21:27:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mimelib/mimelib-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:35 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mime library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
diff --git a/kde-base/mpeglib/ChangeLog b/kde-base/mpeglib/ChangeLog
index 6e7958ac8ae7..0a2c27e3cc08 100644
--- a/kde-base/mpeglib/ChangeLog
+++ b/kde-base/mpeglib/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/mpeglib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/ChangeLog,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
+
+*mpeglib-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +mpeglib-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  13 Nov 2005; Diego Pettenò <flameeyes@gentoo.org>
+  mpeglib-3.5.0_rc1.ebuild:
+  Remove patch as rc1 uses a different way to find out the types (uses
+  sys/types.h).
+
+*mpeglib-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +mpeglib-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> mpeglib-3.5_beta1.ebuild,
+  mpeglib-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*mpeglib-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +mpeglib-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -mpeglib-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*mpeglib-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mpeglib-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  12 Sep 2005; Aron Griffis <agriffis@gentoo.org> mpeglib-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*mpeglib-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +mpeglib-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> mpeglib-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> mpeglib-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> mpeglib-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> mpeglib-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*mpeglib-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +mpeglib-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> mpeglib-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> mpeglib-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> mpeglib-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> mpeglib-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> mpeglib-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*mpeglib-3.4.0_rc1 (06 Mar 2005)
+
+  06 Mar 2005; Simone Gotti <motaboy@gentoo.org>
+  +files/kdemultimedia-3.4.0_beta1-amd64.patch, +mpeglib-3.4.0_rc1.ebuild:
+  Apply patch kdemultimedia-3.4.0_beta1-amd64.patch as it's done in
+  kdemultimedia monolithic ebuild. So updated the version to rc1. Fixes bug
+  #80943.
+
+*mpeglib-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +mpeglib-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *mpeglib-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/mpeglib/Manifest b/kde-base/mpeglib/Manifest
index 8c578c108ad0..009819edc730 100644
--- a/kde-base/mpeglib/Manifest
+++ b/kde-base/mpeglib/Manifest
@@ -1,5 +1,13 @@
-MD5 e0e1f4bd0a184ee356e99b26b177ffeb mpeglib-3.4.0_beta1.ebuild 356
-MD5 e0e1f4bd0a184ee356e99b26b177ffeb mpeglib-3.4.0_alpha1.ebuild 356
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-mpeglib-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-mpeglib-3.4.0_alpha1 74
-MD5 0af60268ec8424c72256db89062b6f31 files/kdemultimedia-64bit.patch 634
+MD5 ed0811cc5cfd36e66dbf3e45fb3dcc48 ChangeLog 3505
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-mpeglib-3.4.1 227
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-mpeglib-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-mpeglib-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-mpeglib-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-mpeglib-3.5_beta1 74
+MD5 b7a984a57c27e1e62a606d90d0c39437 files/kdemultimedia-3.4.0-amd64.patch 523
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 4316e87ea935012e5f9221a99ea1f119 mpeglib-3.4.1.ebuild 531
+MD5 3da5241f2a0b04e80c83e231c99caa20 mpeglib-3.5.0.ebuild 453
+MD5 fd99a2fed1b6244e03d7c32ee5c2ad32 mpeglib-3.5.0_beta2.ebuild 513
+MD5 7c27babca3c2547487a9df2417c88e6e mpeglib-3.5.0_rc1.ebuild 458
+MD5 20e0854de7b69578daa93898beedb6d2 mpeglib-3.5_beta1.ebuild 511
diff --git a/kde-base/mpeglib/files/digest-mpeglib-3.4.1 b/kde-base/mpeglib/files/digest-mpeglib-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/mpeglib/files/digest-mpeglib-3.4.1
+++ b/kde-base/mpeglib/files/digest-mpeglib-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/mpeglib/metadata.xml b/kde-base/mpeglib/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/mpeglib/metadata.xml
+++ b/kde-base/mpeglib/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/mpeglib/mpeglib-3.4.1.ebuild b/kde-base/mpeglib/mpeglib-3.4.1.ebuild
index 35ea291ed371..05773c7c3e31 100644
--- a/kde-base/mpeglib/mpeglib-3.4.1.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.4.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdemultimedia
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mpeg library"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND="media-sound/cdparanoia"
 
diff --git a/kde-base/mpeglib/mpeglib-3.5.0.ebuild b/kde-base/mpeglib/mpeglib-3.5.0.ebuild
index de70f6ea8150..67f74947338c 100644
--- a/kde-base/mpeglib/mpeglib-3.5.0.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.5.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/kde-base/mpeglib/mpeglib-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/mpeglib/mpeglib-3.5.0_beta2.ebuild b/kde-base/mpeglib/mpeglib-3.5.0_beta2.ebuild
index a5985b6d4440..54a758f6e24a 100644
--- a/kde-base/mpeglib/mpeglib-3.5.0_beta2.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.5.0_beta2.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/kde-base/mpeglib/mpeglib-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mpeg library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-sound/cdparanoia"
 
diff --git a/kde-base/mpeglib/mpeglib-3.5.0_rc1.ebuild b/kde-base/mpeglib/mpeglib-3.5.0_rc1.ebuild
index b6451f013b7d..aea6dcbf4e29 100644
--- a/kde-base/mpeglib/mpeglib-3.5.0_rc1.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.5.0_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/kde-base/mpeglib/mpeglib-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -13,5 +13,3 @@ IUSE=""
 DEPEND="media-sound/cdparanoia"
 
 myconf="--with-cdparanoia --enable-cdparanoia"
-
-PATCHES="${FILESDIR}/kdemultimedia-3.4.0-amd64.patch"
diff --git a/kde-base/mpeglib/mpeglib-3.5_beta1.ebuild b/kde-base/mpeglib/mpeglib-3.5_beta1.ebuild
index 1b406e72adc8..f597185fdeb0 100644
--- a/kde-base/mpeglib/mpeglib-3.5_beta1.ebuild
+++ b/kde-base/mpeglib/mpeglib-3.5_beta1.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/kde-base/mpeglib/mpeglib-3.5_beta1.ebuild,v 1.1 2005/09/22 21:29:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/mpeglib/mpeglib-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:38 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE mpeg library"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="media-sound/cdparanoia"
 
diff --git a/kde-base/networkstatus/ChangeLog b/kde-base/networkstatus/ChangeLog
index d8507bfbe360..05a84f4b28d0 100644
--- a/kde-base/networkstatus/ChangeLog
+++ b/kde-base/networkstatus/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/networkstatus
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/ChangeLog,v 1.1 2005/02/05 19:31:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/ChangeLog,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  networkstatus-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> networkstatus-3.4.2.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  networkstatus-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*networkstatus-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +networkstatus-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*networkstatus-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +networkstatus-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  networkstatus-3.5_beta1.ebuild, networkstatus-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*networkstatus-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +networkstatus-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -networkstatus-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*networkstatus-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +networkstatus-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*networkstatus-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +networkstatus-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  networkstatus-3.4.2.ebuild:
+  ~alpha keyword.
+
+*networkstatus-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +networkstatus-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> networkstatus-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> networkstatus-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> networkstatus-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*networkstatus-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +networkstatus-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> networkstatus-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> networkstatus-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> networkstatus-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> networkstatus-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*networkstatus-3.4.0_rc1 (03 Mar 2005)
+
+  03 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  networkstatus-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
 
 *networkstatus-3.4.0_beta2 (05 Feb 2005)
 
diff --git a/kde-base/networkstatus/Manifest b/kde-base/networkstatus/Manifest
index 2e2cfeba92d1..7b15bc35d4e2 100644
--- a/kde-base/networkstatus/Manifest
+++ b/kde-base/networkstatus/Manifest
@@ -1,3 +1,24 @@
-MD5 f77f5463e34604a749b4ceae9001d268 networkstatus-3.4.0_beta2.ebuild 394
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 32c86b29152d344c2bfa8b6554a1034c files/digest-networkstatus-3.4.0_beta2 290
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 37f48fe07952d69eb1091779b5af3be8 ChangeLog 3302
+MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-networkstatus-3.4.1 208
+MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-networkstatus-3.4.2 282
+MD5 d39afb82a428db364187e1039af79947 files/digest-networkstatus-3.5.0 67
+MD5 272c5df8f8a9b01e08acbeb4bb050f61 files/digest-networkstatus-3.5.0_beta2 212
+MD5 39c26c9a143b35fc1a4cfab677f4b572 files/digest-networkstatus-3.5.0_rc1 294
+MD5 e4e6543138c08f4f74d9c68aa53f6c06 files/digest-networkstatus-3.5_beta1 68
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 e99f178608901d861b2f73237e1c9b22 networkstatus-3.4.1.ebuild 418
+MD5 5642e157fe1c03d914fd62a2a1060c9a networkstatus-3.4.2.ebuild 429
+MD5 ef762d1e7fad6c802f6e68422b1e81d6 networkstatus-3.5.0.ebuild 407
+MD5 9870a6e590dcf9e84f99045840830fb9 networkstatus-3.5.0_beta2.ebuild 412
+MD5 9d3fc84928352825101c87cb6803a1cf networkstatus-3.5.0_rc1.ebuild 411
+MD5 1b35df147ce88bcde59e3c3e967257d2 networkstatus-3.5_beta1.ebuild 410
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhvRLntT9W3vfTuoRAkpuAJ4mmWritPdyILJubuHmDf+6ny/VvwCfc26a
+1dBd383NcDpzxpAd/cEYVTY=
+=n3N1
+-----END PGP SIGNATURE-----
diff --git a/kde-base/networkstatus/files/digest-networkstatus-3.4.1 b/kde-base/networkstatus/files/digest-networkstatus-3.4.1
index 50c8351c10a7..1ff7d92e997f 100644
--- a/kde-base/networkstatus/files/digest-networkstatus-3.4.1
+++ b/kde-base/networkstatus/files/digest-networkstatus-3.4.1
@@ -1,2 +1,3 @@
 MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
 MD5 e5515aa230558bac8651e9cd9f8f9673 kdepim-3.4.1.tar.bz2 11345538
diff --git a/kde-base/networkstatus/files/digest-networkstatus-3.4.2 b/kde-base/networkstatus/files/digest-networkstatus-3.4.2
index 6ac9eb92b059..d02c378923af 100644
--- a/kde-base/networkstatus/files/digest-networkstatus-3.4.2
+++ b/kde-base/networkstatus/files/digest-networkstatus-3.4.2
@@ -1 +1,4 @@
+MD5 7f8cc9a40c0190c5a6723f6325bcba06 kdepim-3.4.0.tar.bz2 11441545
+MD5 dea739570f660581aac9d264f5ab7c17 kdepim-3.4.0-3.4.1.tar.xdelta 689503
+MD5 bed079698df3b9d211e032814965b083 kdepim-3.4.1-3.4.2.tar.xdelta 534400
 MD5 e7bd012faa559bcf2a949b6a8ed5ff7f kdepim-3.4.2.tar.bz2 11368492
diff --git a/kde-base/networkstatus/metadata.xml b/kde-base/networkstatus/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/networkstatus/metadata.xml
+++ b/kde-base/networkstatus/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/networkstatus/networkstatus-3.4.1.ebuild b/kde-base/networkstatus/networkstatus-3.4.1.ebuild
index aae20695c4dd..462081321a90 100644
--- a/kde-base/networkstatus/networkstatus-3.4.1.ebuild
+++ b/kde-base/networkstatus/networkstatus-3.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/kde-base/networkstatus/networkstatus-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/networkstatus-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network connection status tracking daemon"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/networkstatus/networkstatus-3.4.2.ebuild b/kde-base/networkstatus/networkstatus-3.4.2.ebuild
index 9f01a91abb70..b82c898475af 100644
--- a/kde-base/networkstatus/networkstatus-3.4.2.ebuild
+++ b/kde-base/networkstatus/networkstatus-3.4.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/kde-base/networkstatus/networkstatus-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/networkstatus-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network connection status tracking daemon"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/networkstatus/networkstatus-3.5.0.ebuild b/kde-base/networkstatus/networkstatus-3.5.0.ebuild
index fa01ff7ee677..1aaf3ef6ce08 100644
--- a/kde-base/networkstatus/networkstatus-3.5.0.ebuild
+++ b/kde-base/networkstatus/networkstatus-3.5.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/kde-base/networkstatus/networkstatus-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/networkstatus-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:07 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/networkstatus/networkstatus-3.5.0_beta2.ebuild b/kde-base/networkstatus/networkstatus-3.5.0_beta2.ebuild
index 22f18d87ea5e..a8e3df61ae61 100644
--- a/kde-base/networkstatus/networkstatus-3.5.0_beta2.ebuild
+++ b/kde-base/networkstatus/networkstatus-3.5.0_beta2.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/kde-base/networkstatus/networkstatus-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/networkstatus-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network connection status tracking daemon"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/networkstatus/networkstatus-3.5.0_rc1.ebuild b/kde-base/networkstatus/networkstatus-3.5.0_rc1.ebuild
index 02ea8356c52a..f38d88dc954f 100644
--- a/kde-base/networkstatus/networkstatus-3.5.0_rc1.ebuild
+++ b/kde-base/networkstatus/networkstatus-3.5.0_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/kde-base/networkstatus/networkstatus-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/networkstatus-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
diff --git a/kde-base/networkstatus/networkstatus-3.5_beta1.ebuild b/kde-base/networkstatus/networkstatus-3.5_beta1.ebuild
index 4e06715b2a7c..9b128beebc0d 100644
--- a/kde-base/networkstatus/networkstatus-3.5_beta1.ebuild
+++ b/kde-base/networkstatus/networkstatus-3.5_beta1.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/kde-base/networkstatus/networkstatus-3.5_beta1.ebuild,v 1.1 2005/09/22 21:30:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/networkstatus/networkstatus-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 
 KMNAME=kdepim
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE network connection status tracking daemon"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
diff --git a/kde-base/noatun-plugins/ChangeLog b/kde-base/noatun-plugins/ChangeLog
index 7a8ed45277e7..f4dd8cfabd3a 100644
--- a/kde-base/noatun-plugins/ChangeLog
+++ b/kde-base/noatun-plugins/ChangeLog
@@ -1,6 +1,107 @@
 # ChangeLog for kde-base/noatun-plugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.1 2005/02/11 18:35:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  noatun-plugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org>
+  noatun-plugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  noatun-plugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*noatun-plugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +noatun-plugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*noatun-plugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +noatun-plugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  noatun-plugins-3.5_beta1.ebuild, noatun-plugins-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*noatun-plugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +noatun-plugins-3.5.0_beta2.ebuild:
+  New version.
+
+*noatun-plugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +noatun-plugins-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -noatun-plugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*noatun-plugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +noatun-plugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*noatun-plugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +noatun-plugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  noatun-plugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+  29 Jul 2005; Dan Armak <danarmak@gentoo.org> noatun-plugins-3.4.2.ebuild:
+  Add missing fix from the 3.4.1 ebuild to help configure find the berkdb
+  headers. This is a compilation fix
+
+*noatun-plugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org>
+  +files/configure-fix-kdeaddons-db.patch,
+  +files/configure-fix-kdeaddons-sdl.patch, +noatun-plugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> noatun-plugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> noatun-plugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  noatun-plugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*noatun-plugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +noatun-plugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  noatun-plugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> noatun-plugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  noatun-plugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> noatun-plugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
 
 *noatun-plugins-3.4.0_beta2-r1 (11 Feb 2005)
 
diff --git a/kde-base/noatun-plugins/Manifest b/kde-base/noatun-plugins/Manifest
index 9a1f345dec74..faf94ee9c00e 100644
--- a/kde-base/noatun-plugins/Manifest
+++ b/kde-base/noatun-plugins/Manifest
@@ -1,4 +1,29 @@
-MD5 ebdaa6ba110138331fb678b6aab48543 noatun-plugins-3.4.0_beta2-r1.ebuild 1314
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 0924e2eb46a2fcbd55308383402f54f3 files/noatun-oblique-3.4.0_beta2-db-location.diff 625
-MD5 9009a89a3313cb85f25a0d66683e48ed files/digest-noatun-plugins-3.4.0_beta2-r1 298
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1835a57af465823912b07bb92827ace1 ChangeLog 3614
+MD5 440dc255b1315302c2dfbf0f1233f3bf files/configure-fix-kdeaddons-db.patch 1612
+MD5 8ad71a2139b4a330c5adfb4247b84c8c files/configure-fix-kdeaddons-sdl.patch 867
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-noatun-plugins-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-noatun-plugins-3.4.2 291
+MD5 5c3e9d5cad224b1bbe07653e24cf97a3 files/digest-noatun-plugins-3.4.3 69
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-noatun-plugins-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-noatun-plugins-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-noatun-plugins-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-noatun-plugins-3.5_beta1 70
+MD5 6ec5a8a3f0f5ae85d431525c926c27fe files/noatun-oblique-db-location-3.4.0_rc1.diff 625
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 29c3d2be2f371b987d1730480efabc4b noatun-plugins-3.4.1.ebuild 866
+MD5 7aee034eac1d6a331009f0e16647a965 noatun-plugins-3.4.2.ebuild 1216
+MD5 50d5a866986d2c421964c6d9695846fe noatun-plugins-3.4.3.ebuild 1212
+MD5 e38b6b89fed2a3df0c99327164651d2b noatun-plugins-3.5.0.ebuild 1093
+MD5 aa8754924e2e594ebec6d108c107b7a7 noatun-plugins-3.5.0_beta2.ebuild 1098
+MD5 014ef11bd39194fd3c76c57269f5730e noatun-plugins-3.5.0_rc1.ebuild 1097
+MD5 27f351db0e95b0fd178f39b0a9ac8bd4 noatun-plugins-3.5_beta1.ebuild 1096
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxkhntT9W3vfTuoRApoqAKC0ARhZiU4TOfDCuT4i3v4Gl/PaoQCdEq1N
+8R5MAeN0zfaw9FY6R8YDX2g=
+=5qZe
+-----END PGP SIGNATURE-----
diff --git a/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.1 b/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.1
+++ b/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.2 b/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.2
+++ b/kde-base/noatun-plugins/files/digest-noatun-plugins-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/noatun-plugins/metadata.xml b/kde-base/noatun-plugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/noatun-plugins/metadata.xml
+++ b/kde-base/noatun-plugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.4.1.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.4.1.ebuild
index 249de2e301d3..a8bdf9d2caf3 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.4.1.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:27 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Various plugins for noatun"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="arts sdl berkdb"
-DEPEND="$(deprange $PV $MAXKDEVER kde-base/noatun)
+DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/noatun)
 	arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	sdl? ( >=media-libs/libsdl-1.2 )
 	berkdb? ( =sys-libs/db-4.2* )"
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.4.2.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.4.2.ebuild
index 3965b64a85b7..6849f368572e 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.4.2.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.4.2.ebuild
@@ -1,20 +1,37 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Various plugins for noatun"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts sdl berkdb"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/noatun)
 	arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
 	sdl? ( >=media-libs/libsdl-1.2 )
-	berkdb? ( =sys-libs/db-4.2* )"
+	berkdb? ( || ( =sys-libs/db-4.3*
+	               =sys-libs/db-4.2* ) )"
 
 PATCHES="$FILESDIR/configure-fix-kdeaddons-db.patch
 	$FILESDIR/configure-fix-kdeaddons-sdl.patch"
-myconf="$(use_with berkdb berkeley-db) $(use_with sdl) --with-db-lib=db_cxx-4.2"
 
+src_compile() {
+	local myconf="$(use_with sdl)"
+
+	if use berkdb; then
+		if has_version "=sys-libs/db-4.3*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.3
+			        --with-extra-includes=/usr/include/db4.3"
+		elif has_version "=sys-libs/db-4.2*"; then
+			myconf="${myconf} --with-berkeley-db --with-db-lib=db_cxx-4.2
+			        --with-extra-includes=/usr/include/db4.2"
+		fi
+	else
+		myconf="${myconf} --without-berkeley-db"
+	fi
+
+	kde-meta_src_compile
+}
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.4.3.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.4.3.ebuild
index 3494c4bc946d..cee19afccd7b 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.4.3.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Various plugins for noatun"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="arts sdl berkdb"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/noatun)
 	arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.5.0.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.5.0.ebuild
index aa2d9af286c1..955456aa1069 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.5.0.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.5.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/kde-base/noatun-plugins/noatun-plugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.5.0_beta2.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.5.0_beta2.ebuild
index b88995d1f79b..75ce54c05368 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.5.0_beta2.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Various plugins for noatun"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts sdl berkdb"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/noatun)
 	arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.5.0_rc1.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.5.0_rc1.ebuild
index 3420fdfb848e..ffe0890b68be 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.5.0_rc1.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.5.0_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/kde-base/noatun-plugins/noatun-plugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/noatun-plugins/noatun-plugins-3.5_beta1.ebuild b/kde-base/noatun-plugins/noatun-plugins-3.5_beta1.ebuild
index efbc93071fc2..7c95cf299eed 100644
--- a/kde-base/noatun-plugins/noatun-plugins-3.5_beta1.ebuild
+++ b/kde-base/noatun-plugins/noatun-plugins-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5_beta1.ebuild,v 1.1 2005/09/22 21:31:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun-plugins/noatun-plugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:28 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Various plugins for noatun"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="arts sdl berkdb"
 DEPEND="$(deprange-dual $PV $MAXKDEVER kde-base/noatun)
 	arts? ( $(deprange $PV $MAXKDEVER kde-base/arts) )
diff --git a/kde-base/noatun/ChangeLog b/kde-base/noatun/ChangeLog
index 657ff9b25744..c0a46d70cf39 100644
--- a/kde-base/noatun/ChangeLog
+++ b/kde-base/noatun/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/noatun
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/ChangeLog,v 1.1 2005/01/15 02:24:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/ChangeLog,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> noatun-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> noatun-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> noatun-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*noatun-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*noatun-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> noatun-3.5_beta1.ebuild,
+  noatun-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*noatun-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.5.0_beta2.ebuild:
+  New version.
+
+*noatun-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.4.3.ebuild:
+  New version.
+
+  27 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> noatun-3.5_beta1.ebuild:
+  Remove dependencies on specific plugins.
+
+  27 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> noatun-3.5_beta1.ebuild:
+  Fix compilation error (#107064).
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -noatun-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*noatun-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +noatun-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*noatun-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +noatun-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> noatun-3.4.2.ebuild:
+  ~alpha keyword.
+
+*noatun-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> noatun-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> noatun-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> noatun-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*noatun-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> noatun-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> noatun-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> noatun-3.4.0.ebuild:
+  Added to ~ppc
+
+  14 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> noatun-3.4.0.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> noatun-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*noatun-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +noatun-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *noatun-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/noatun/Manifest b/kde-base/noatun/Manifest
index 0006887b75d9..2f5341625f87 100644
--- a/kde-base/noatun/Manifest
+++ b/kde-base/noatun/Manifest
@@ -1,4 +1,26 @@
-MD5 d08f8e26d715c3a6ab0b7605b847ec56 noatun-3.4.0_alpha1.ebuild 880
-MD5 d08f8e26d715c3a6ab0b7605b847ec56 noatun-3.4.0_beta1.ebuild 880
-MD5 43e784a2028b42eff11cfacd5dc9e845 files/digest-noatun-3.4.0_beta1 231
-MD5 fc6c88b42efcb16aaa7a7459489c41b2 files/digest-noatun-3.4.0_alpha1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 04d38c5ffa05cefc82d72e7366729528 ChangeLog 3696
+MD5 5503be4dfa64fd0d3bf2165747a97fb0 files/digest-noatun-3.4.1 227
+MD5 453075362e3201c7f44fea430afec5d5 files/digest-noatun-3.4.2 308
+MD5 05ac286d8f93c4f275aa4cec809fb5a9 files/digest-noatun-3.4.3 73
+MD5 1b36c77494f7990406246d8cc77ad16a files/digest-noatun-3.5.0 73
+MD5 f783b93289974c92ff2e2ca0ba942946 files/digest-noatun-3.5.0_beta2 231
+MD5 235bf312c5ea7d7531c86c374ceddcf5 files/digest-noatun-3.5.0_rc1 320
+MD5 ddf8dc1d73d9fea63d15f91300cf12ba files/digest-noatun-3.5_beta1 74
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 14026293905787d38b90b55673f88c00 noatun-3.4.1.ebuild 996
+MD5 04cb30ceff698aa909979938da920912 noatun-3.4.2.ebuild 1019
+MD5 ca54453b44edb891700b4f3751e43027 noatun-3.4.3.ebuild 1014
+MD5 4c220f11ebf7c6847c4b2b709725fb9f noatun-3.5.0.ebuild 615
+MD5 33bde28bf2b005acb45cb5278eb61624 noatun-3.5.0_beta2.ebuild 620
+MD5 ea2cc09a3841206eefc9de3ba0d11496 noatun-3.5.0_rc1.ebuild 619
+MD5 2e7a7dc6461325b85ab20d2a4dff7b07 noatun-3.5_beta1.ebuild 618
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhm4intT9W3vfTuoRAvHmAJwPRg3ddg95HlVsObOCZk1lBVfZ7QCffEoP
+dNns9BjqcLtp6+8GSEuf2Fk=
+=n28j
+-----END PGP SIGNATURE-----
diff --git a/kde-base/noatun/files/digest-noatun-3.4.1 b/kde-base/noatun/files/digest-noatun-3.4.1
index f2df72c86c35..a679af956640 100644
--- a/kde-base/noatun/files/digest-noatun-3.4.1
+++ b/kde-base/noatun/files/digest-noatun-3.4.1
@@ -1,2 +1,3 @@
 MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
 MD5 db69c9ab845c8295f095dc6394fba047 kdemultimedia-3.4.1.tar.bz2 5547552
diff --git a/kde-base/noatun/files/digest-noatun-3.4.2 b/kde-base/noatun/files/digest-noatun-3.4.2
index 08c6932fbb61..b967cfe010df 100644
--- a/kde-base/noatun/files/digest-noatun-3.4.2
+++ b/kde-base/noatun/files/digest-noatun-3.4.2
@@ -1 +1,4 @@
+MD5 4e42790bbea7c4ac0c436da3c7c664ac kdemultimedia-3.4.0.tar.bz2 5581865
+MD5 c257e5ec41deaae7e0c8c06eaa534070 kdemultimedia-3.4.0-3.4.1.tar.xdelta 277869
+MD5 22b48255648932f7ad536a5a05434890 kdemultimedia-3.4.1-3.4.2.tar.xdelta 499388
 MD5 7da7ba5fd676acfdf662113a4cdfe43c kdemultimedia-3.4.2.tar.bz2 5535960
diff --git a/kde-base/noatun/metadata.xml b/kde-base/noatun/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/noatun/metadata.xml
+++ b/kde-base/noatun/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/noatun/noatun-3.4.1.ebuild b/kde-base/noatun/noatun-3.4.1.ebuild
index aa1a5008c458..d2ef3a98d6ef 100644
--- a/kde-base/noatun/noatun-3.4.1.ebuild
+++ b/kde-base/noatun/noatun-3.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/kde-base/noatun/noatun-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE media player"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="xine audiofile"
 RDEPEND="${DEPEND}
 $(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
diff --git a/kde-base/noatun/noatun-3.4.2.ebuild b/kde-base/noatun/noatun-3.4.2.ebuild
index 0fa882c10e36..cfb650801646 100644
--- a/kde-base/noatun/noatun-3.4.2.ebuild
+++ b/kde-base/noatun/noatun-3.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/kde-base/noatun/noatun-3.4.2.ebuild,v 1.1 2005/07/28 21:16:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE media player"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="xine audiofile"
 RDEPEND="${DEPEND}
 $(deprange 3.4.1 $MAXKDEVER kde-base/kdemultimedia-arts)
diff --git a/kde-base/noatun/noatun-3.4.3.ebuild b/kde-base/noatun/noatun-3.4.3.ebuild
index 0fabe48892a8..900645ce3b39 100644
--- a/kde-base/noatun/noatun-3.4.3.ebuild
+++ b/kde-base/noatun/noatun-3.4.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/kde-base/noatun/noatun-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE media player"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="xine audiofile"
 RDEPEND="${DEPEND}
 $(deprange 3.4.1 $MAXKDEVER kde-base/kdemultimedia-arts)
@@ -27,4 +27,4 @@ pkg_setup() {
 		eerror "${PN} needs the USE=\"arts\" enabled and also the kdelibs compiled with the USE=\"arts\" enabled"
 		die
 	fi
-}
\ No newline at end of file
+}
diff --git a/kde-base/noatun/noatun-3.5.0.ebuild b/kde-base/noatun/noatun-3.5.0.ebuild
index ce802ce05b10..7fbd6cdc2b2e 100644
--- a/kde-base/noatun/noatun-3.5.0.ebuild
+++ b/kde-base/noatun/noatun-3.5.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/kde-base/noatun/noatun-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/noatun/noatun-3.5.0_beta2.ebuild b/kde-base/noatun/noatun-3.5.0_beta2.ebuild
index 8614cb02b34b..b29a891282ed 100644
--- a/kde-base/noatun/noatun-3.5.0_beta2.ebuild
+++ b/kde-base/noatun/noatun-3.5.0_beta2.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/kde-base/noatun/noatun-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE media player"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)"
 
diff --git a/kde-base/noatun/noatun-3.5.0_rc1.ebuild b/kde-base/noatun/noatun-3.5.0_rc1.ebuild
index 9673c3954b06..9b3c8ab483c1 100644
--- a/kde-base/noatun/noatun-3.5.0_rc1.ebuild
+++ b/kde-base/noatun/noatun-3.5.0_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/kde-base/noatun/noatun-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:35 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
diff --git a/kde-base/noatun/noatun-3.5_beta1.ebuild b/kde-base/noatun/noatun-3.5_beta1.ebuild
index fc5cb71d3c2f..77f82a20daef 100644
--- a/kde-base/noatun/noatun-3.5_beta1.ebuild
+++ b/kde-base/noatun/noatun-3.5_beta1.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/kde-base/noatun/noatun-3.5_beta1.ebuild,v 1.1 2005/09/22 21:30:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/noatun/noatun-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:13 chriswhite Exp $
 
 KMNAME=kdemultimedia
 MAXKDEVER=$PV
@@ -8,23 +8,15 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE media player"
-KEYWORDS="~amd64"
-IUSE="xine audiofile"
-RDEPEND="${DEPEND}
-$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)
-$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpeglib)
-$(deprange $PV $MAXKDEVER kde-base/artsplugin-mpg123)
-	xine? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-xine) )
-	audiofile? ( $(deprange $PV $MAXKDEVER kde-base/artsplugin-audiofile) )"
-KMCOPYLIB="
-	libartsgui_kde arts/gui/kde/
-	libartsgui arts/gui/common/
-	libartsmodules arts/modules/"
-KMEXTRACTONLY="arts/"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdemultimedia-arts)"
+
+KMCOMPILEONLY="arts"
 
 pkg_setup() {
 	if ! useq arts; then
 		eerror "${PN} needs the USE=\"arts\" enabled and also the kdelibs compiled with the USE=\"arts\" enabled"
 		die
 	fi
-}
\ No newline at end of file
+}
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 73fb09989a7f..9d2522a75b92 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,113 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
+
+  24 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> nsplugins-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> nsplugins-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nsplugins-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*nsplugins-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +nsplugins-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*nsplugins-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +nsplugins-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  23 Oct 2005; Douglas Russell <puggy@gentoo.org>
+  nsplugins-3.5.0_beta2.ebuild:
+  Keyword ~ppc
+
+*nsplugins-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +nsplugins-3.5.0_beta2.ebuild:
+  New version.
+
+*nsplugins-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +nsplugins-3.4.3.ebuild:
+  New version.
+
+  09 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
+  nsplugins-3.5_beta1.ebuild:
+  Added ~x86 keyword.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -nsplugins-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*nsplugins-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +nsplugins-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*nsplugins-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +nsplugins-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> nsplugins-3.4.2.ebuild:
+  ~alpha keyword.
+
+*nsplugins-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +nsplugins-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> nsplugins-3.4.1.ebuild:
+  Stable on SPARC.
+
+  02 Jul 2005; Lars Weiler <pylon@gentoo.org> nsplugins-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> nsplugins-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*nsplugins-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +nsplugins-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> nsplugins-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> nsplugins-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> nsplugins-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> nsplugins-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*nsplugins-3.4.0_rc1 (02 Mar 2005)
+
+  02 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  nsplugins-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*nsplugins-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +nsplugins-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *nsplugins-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/nsplugins/Manifest b/kde-base/nsplugins/Manifest
index b450a93651e8..a5eb35d0e2c0 100644
--- a/kde-base/nsplugins/Manifest
+++ b/kde-base/nsplugins/Manifest
@@ -1,4 +1,26 @@
-MD5 bf1493be5a07dcbad3a640476f110d61 nsplugins-3.4.0_alpha1.ebuild 381
-MD5 bf1493be5a07dcbad3a640476f110d61 nsplugins-3.4.0_beta1.ebuild 381
-MD5 ec8a5f0c1ed08c8b554530920490e63e files/digest-nsplugins-3.4.0_beta1 216
-MD5 99206d9cd7498b2daddb8b1099b0b24b files/digest-nsplugins-3.4.0_alpha1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dee8b2e7318e65c72eb61fcc41322ad8 ChangeLog 3692
+MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-nsplugins-3.4.1 212
+MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-nsplugins-3.4.2 287
+MD5 b334b621242eaf5a23035e870f09dea6 files/digest-nsplugins-3.4.3 68
+MD5 939dd1c6769066b8e1770100216e2026 files/digest-nsplugins-3.5.0 68
+MD5 b44dde9d2ab94ac82ba56e8b653e6700 files/digest-nsplugins-3.5.0_beta2 216
+MD5 14e4481daa8e322e1222522f8f5b558d files/digest-nsplugins-3.5.0_rc1 299
+MD5 b50fc512a289fe7a1ef658080cb0a0b3 files/digest-nsplugins-3.5_beta1 69
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 2a206743c776af0e8bcf71fba6799322 nsplugins-3.4.1.ebuild 406
+MD5 c5317935094033c492f2bb667d7546ac nsplugins-3.4.2.ebuild 419
+MD5 965740c46615d22c49f308d5a71805d2 nsplugins-3.4.3.ebuild 415
+MD5 8c843c2665dab6311e8f0a4f8356b5dd nsplugins-3.5.0.ebuild 400
+MD5 b1f634228d4e1883cef3cacc1d9d9c67 nsplugins-3.5.0_beta2.ebuild 403
+MD5 76434b72d21904f1c0a0608cb94eb165 nsplugins-3.5.0_rc1.ebuild 404
+MD5 c3480d63fb12a4d74e0dd95ec9045186 nsplugins-3.5_beta1.ebuild 401
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDhkO4ntT9W3vfTuoRAlupAJiyxAvNv65ySjsQwCS2uv9StwLWAKCh2alI
+gYQ1V2ZC0ygRujVXMhK7lA==
+=yrXa
+-----END PGP SIGNATURE-----
diff --git a/kde-base/nsplugins/files/digest-nsplugins-3.4.1 b/kde-base/nsplugins/files/digest-nsplugins-3.4.1
index 7a8ed33cbdb4..518952ccb74d 100644
--- a/kde-base/nsplugins/files/digest-nsplugins-3.4.1
+++ b/kde-base/nsplugins/files/digest-nsplugins-3.4.1
@@ -1,2 +1,3 @@
 MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
 MD5 8fbe0b943721b79f2549064b580acdde kdebase-3.4.1.tar.bz2 22433034
diff --git a/kde-base/nsplugins/files/digest-nsplugins-3.4.2 b/kde-base/nsplugins/files/digest-nsplugins-3.4.2
index d855af2ae699..a5f92d1d76f9 100644
--- a/kde-base/nsplugins/files/digest-nsplugins-3.4.2
+++ b/kde-base/nsplugins/files/digest-nsplugins-3.4.2
@@ -1 +1,4 @@
+MD5 c88659e558ca98dc45377bf8ddfc26c9 kdebase-3.4.0.tar.bz2 22670772
+MD5 3b99262a66edd3c9ad86220ad6cf6579 kdebase-3.4.0-3.4.1.tar.xdelta 1089415
+MD5 7fc67dd6be199ef3208bfc0200a900aa kdebase-3.4.1-3.4.2.tar.xdelta 928157
 MD5 0ea16eb7185ef014d8bd4da4f4530272 kdebase-3.4.2.tar.bz2 22466433
diff --git a/kde-base/nsplugins/metadata.xml b/kde-base/nsplugins/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/nsplugins/metadata.xml
+++ b/kde-base/nsplugins/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/nsplugins/nsplugins-3.4.1.ebuild b/kde-base/nsplugins/nsplugins-3.4.1.ebuild
index 55adb3f3feaf..2b7fcbf62be7 100644
--- a/kde-base/nsplugins/nsplugins-3.4.1.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.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/kde-base/nsplugins/nsplugins-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Netscape plugins support for konqueror"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 
diff --git a/kde-base/nsplugins/nsplugins-3.4.2.ebuild b/kde-base/nsplugins/nsplugins-3.4.2.ebuild
index 6f3fd68b14a3..6f4d3223ccae 100644
--- a/kde-base/nsplugins/nsplugins-3.4.2.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.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/kde-base/nsplugins/nsplugins-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Netscape plugins support for konqueror"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/nsplugins/nsplugins-3.4.3.ebuild b/kde-base/nsplugins/nsplugins-3.4.3.ebuild
index c06e930b2ddf..24d8602dff37 100644
--- a/kde-base/nsplugins/nsplugins-3.4.3.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.4.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/kde-base/nsplugins/nsplugins-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Netscape plugins support for konqueror"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/nsplugins/nsplugins-3.5.0.ebuild b/kde-base/nsplugins/nsplugins-3.5.0.ebuild
index 731ea5f17c72..2a0cdccdcfcc 100644
--- a/kde-base/nsplugins/nsplugins-3.5.0.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.5.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/kde-base/nsplugins/nsplugins-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/nsplugins/nsplugins-3.5.0_beta2.ebuild b/kde-base/nsplugins/nsplugins-3.5.0_beta2.ebuild
index 0b34de9d3d20..6d35ba85cb17 100644
--- a/kde-base/nsplugins/nsplugins-3.5.0_beta2.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.5.0_beta2.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/kde-base/nsplugins/nsplugins-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Netscape plugins support for konqueror"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 
diff --git a/kde-base/nsplugins/nsplugins-3.5.0_rc1.ebuild b/kde-base/nsplugins/nsplugins-3.5.0_rc1.ebuild
index bd7869dea72b..7a14aba684db 100644
--- a/kde-base/nsplugins/nsplugins-3.5.0_rc1.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.5.0_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/kde-base/nsplugins/nsplugins-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
diff --git a/kde-base/nsplugins/nsplugins-3.5_beta1.ebuild b/kde-base/nsplugins/nsplugins-3.5_beta1.ebuild
index 5f59528d91de..54ee0ba9218b 100644
--- a/kde-base/nsplugins/nsplugins-3.5_beta1.ebuild
+++ b/kde-base/nsplugins/nsplugins-3.5_beta1.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/kde-base/nsplugins/nsplugins-3.5_beta1.ebuild,v 1.1 2005/09/22 21:32:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:18 chriswhite Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="Netscape plugins support for konqueror"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 
diff --git a/kde-base/qtjava/ChangeLog b/kde-base/qtjava/ChangeLog
index 96b46aff014a..82a34d6f0ef9 100644
--- a/kde-base/qtjava/ChangeLog
+++ b/kde-base/qtjava/ChangeLog
@@ -1,6 +1,87 @@
 # ChangeLog for kde-base/qtjava
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/ChangeLog,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> qtjava-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> qtjava-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*qtjava-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +qtjava-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*qtjava-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +qtjava-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> qtjava-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*qtjava-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +qtjava-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*qtjava-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +qtjava-3.4.3.ebuild:
+  New version.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> qtjava-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*qtjava-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +qtjava-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> qtjava-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> qtjava-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> qtjava-3.3.2.ebuild:
+  Added x86 (stable) keyword.
+
+*qtjava-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +qtjava-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*qtjava-3.4.0_beta1-r1 (03 Feb 2005)
+
+  03 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +qtjava-3.4.0_beta1-r1.ebuild:
+  Fix target directory for the docs; it used to install in /javalib/. This fix
+  is from the KDE CVS.
+
+*qtjava-3.3.2 (25 Dec 2004)
+
+  25 Dec 2004; Dan Armak <danarmak@gentoo.org> qtjava-3.3.1.ebuild,
+  +qtjava-3.3.2.ebuild:
+  New ebuild for 3.3.2.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  qtjava-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+  12 Nov 2004; Dan Armak <danarmak@gentoo.org> qtjava-3.3.1.ebuild:
+  Don't run java-config in the global part of the ebuild.
 
 *qtjava-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/qtjava/Manifest b/kde-base/qtjava/Manifest
index 10c3b19ef066..68173745dda1 100644
--- a/kde-base/qtjava/Manifest
+++ b/kde-base/qtjava/Manifest
@@ -1,3 +1,25 @@
-MD5 8dd6536e9f40c01dd5bdc8fedf7ab40b qtjava-3.3.1.ebuild 680
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 40d7826397fd0b5022c26147829aa2ba files/digest-qtjava-3.3.1 147
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d69f84af00a5a2bee6a261c1e0866857 ChangeLog 3272
+MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-qtjava-3.3.2 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtjava-3.4.1 221
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtjava-3.4.3 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtjava-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-qtjava-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-qtjava-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 be6ae9de13610751d4b751c0a6e438ba qtjava-3.3.2.ebuild 943
+MD5 38127ecd985ccba4d59543bea433a552 qtjava-3.4.1.ebuild 962
+MD5 1cf984d5dd9c8af6d9b36269d16fbf03 qtjava-3.4.3.ebuild 957
+MD5 1b48a1cc7742383c61e9990b74fb92ba qtjava-3.5.0.ebuild 950
+MD5 41bc788757a84820a6f0593fdf6ecf00 qtjava-3.5.0_beta2.ebuild 955
+MD5 baaf26d1087d7d7c213a74c0de954952 qtjava-3.5.0_rc1.ebuild 954
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyLzntT9W3vfTuoRArGFAKCePU04CABzbM7gd6lIDgHYVJRwtQCfYgH5
+necAeP5g83nhCRUbTbcC5tM=
+=uGvJ
+-----END PGP SIGNATURE-----
diff --git a/kde-base/qtjava/files/digest-qtjava-3.3.2 b/kde-base/qtjava/files/digest-qtjava-3.3.2
index 2c8ca5dff9d8..1b3b65c42a2e 100644
--- a/kde-base/qtjava/files/digest-qtjava-3.3.2
+++ b/kde-base/qtjava/files/digest-qtjava-3.3.2
@@ -1,3 +1 @@
-MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
-MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
-MD5 224bbb908b607ec9b2c3f1ff1cde1907 kdebindings-3.3.1-3.3.2.tar.xdelta 603690
+MD5 a8ae8e2ef4dd3680d0756adf76086d85 kdebindings-3.3.2.tar.bz2 7131727
diff --git a/kde-base/qtjava/files/digest-qtjava-3.4.1 b/kde-base/qtjava/files/digest-qtjava-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/qtjava/files/digest-qtjava-3.4.1
+++ b/kde-base/qtjava/files/digest-qtjava-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/qtjava/files/no-gtk-glib-check.diff b/kde-base/qtjava/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/qtjava/files/no-gtk-glib-check.diff
+++ b/kde-base/qtjava/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/qtjava/metadata.xml b/kde-base/qtjava/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/qtjava/metadata.xml
+++ b/kde-base/qtjava/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/qtjava/qtjava-3.3.2.ebuild b/kde-base/qtjava/qtjava-3.3.2.ebuild
index ac369f6a7739..d4c7d89eb55b 100644
--- a/kde-base/qtjava/qtjava-3.3.2.ebuild
+++ b/kde-base/qtjava/qtjava-3.3.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/kde-base/qtjava/qtjava-3.3.2.ebuild,v 1.1 2004/12/25 15:50:37 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.3.2.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -9,7 +9,9 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Java bindings for QT"
-KEYWORDS="~x86"
+HOMEPAGE="http://developer.kde.org/language-bindings/java/qtjava.html"
+
+KEYWORDS="x86"
 IUSE=""
 DEPEND="virtual/jdk"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/qtjava/qtjava-3.4.1.ebuild b/kde-base/qtjava/qtjava-3.4.1.ebuild
index 5f8599cd1251..51d0606d31f3 100644
--- a/kde-base/qtjava/qtjava-3.4.1.ebuild
+++ b/kde-base/qtjava/qtjava-3.4.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.2
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Java bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/java/qtjava.html"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND="virtual/jdk"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/qtjava/qtjava-3.4.3.ebuild b/kde-base/qtjava/qtjava-3.4.3.ebuild
index 1a219fa55a5d..53964bc31e50 100644
--- a/kde-base/qtjava/qtjava-3.4.3.ebuild
+++ b/kde-base/qtjava/qtjava-3.4.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/kde-base/qtjava/qtjava-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,7 +11,7 @@ inherit kde-meta
 DESCRIPTION="Java bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/java/qtjava.html"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND="virtual/jdk"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/qtjava/qtjava-3.5.0.ebuild b/kde-base/qtjava/qtjava-3.5.0.ebuild
index 0b31165ce26d..9107522f869a 100644
--- a/kde-base/qtjava/qtjava-3.5.0.ebuild
+++ b/kde-base/qtjava/qtjava-3.5.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/kde-base/qtjava/qtjava-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/qtjava/qtjava-3.5.0_beta2.ebuild b/kde-base/qtjava/qtjava-3.5.0_beta2.ebuild
index 746e084eaed9..0c48c2011ee7 100644
--- a/kde-base/qtjava/qtjava-3.5.0_beta2.ebuild
+++ b/kde-base/qtjava/qtjava-3.5.0_beta2.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/kde-base/qtjava/qtjava-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:41 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
@@ -11,7 +11,7 @@ inherit kde-meta
 DESCRIPTION="Java bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/java/qtjava.html"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="virtual/jdk"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/qtjava/qtjava-3.5.0_rc1.ebuild b/kde-base/qtjava/qtjava-3.5.0_rc1.ebuild
index 0a75a9e118f3..c5edb508eaac 100644
--- a/kde-base/qtjava/qtjava-3.5.0_rc1.ebuild
+++ b/kde-base/qtjava/qtjava-3.5.0_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/kde-base/qtjava/qtjava-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtjava/qtjava-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:47 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/qtruby/ChangeLog b/kde-base/qtruby/ChangeLog
index 4756a078ec2c..fb9a69295f4c 100644
--- a/kde-base/qtruby/ChangeLog
+++ b/kde-base/qtruby/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/qtruby
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/ChangeLog,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> qtruby-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> qtruby-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*qtruby-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*qtruby-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> qtruby-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*qtruby-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*qtruby-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.4.3.ebuild:
+  New version.
+
+*qtruby-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+*qtruby-3.4.1-r1 (11 Jul 2005)
+
+  11 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/qtruby-3.4.1-handlers.diff, +qtruby-3.4.1-r1.ebuild:
+  Add a patch which fixes QString memory leak
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> qtruby-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*qtruby-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org> qtruby-3.4.0.ebuild:
+  Added ~amd64 keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> qtruby-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> qtruby-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*qtruby-3.4.0_beta2-r1 (19 Feb 2005)
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.3.2-r1.ebuild,
+  +qtruby-3.4.0_beta2-r1.ebuild:
+  Moved all versions to SLOT 0, because they install in /usr, and the
+  different SLOTs were overwriting one another. Bug 80858.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> qtruby-3.3.2.ebuild:
+  Added x86 (stable) keyword.
+
+*qtruby-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +qtruby-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+*qtruby-3.3.2 (25 Dec 2004)
+
+  25 Dec 2004; Dan Armak <danarmak@gentoo.org> qtruby-3.3.1.ebuild,
+  +qtruby-3.3.2.ebuild:
+  New ebuild for 3.3.2.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  qtruby-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *qtruby-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/qtruby/Manifest b/kde-base/qtruby/Manifest
index d80bb2b7cf99..5d218251deac 100644
--- a/kde-base/qtruby/Manifest
+++ b/kde-base/qtruby/Manifest
@@ -1,3 +1,30 @@
-MD5 ae0d295bc41871738d9eab447213a63f qtruby-3.3.1.ebuild 341
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 3b25fbaffbbe7112846c42054214fa91 files/digest-qtruby-3.3.1 147
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0039771b52647db22a0816b1e278bca9 ChangeLog 3604
+MD5 c4bcc944c1ceb822f4ecd9b288d77bef files/digest-qtruby-3.3.2-r1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtruby-3.4.1 221
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtruby-3.4.1-r1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-qtruby-3.4.2 300
+MD5 f6bd746271de83bcbcacc04a445d590f files/digest-qtruby-3.4.3 71
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtruby-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-qtruby-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-qtruby-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 d859fab9468c7c54cc414ab700d5a16c files/qtruby-3.4.1-handlers.diff 379
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 f779f6e536cce7bf41cb1d9c9299dc75 qtruby-3.3.2-r1.ebuild 964
+MD5 eecff78ef52887dc284d2e9317853e8f qtruby-3.4.1-r1.ebuild 968
+MD5 baacbf2d0922839852335524bb6aeea0 qtruby-3.4.1.ebuild 926
+MD5 ef77385ae6fe6889038523a0288355a2 qtruby-3.4.2.ebuild 932
+MD5 232364c209ee2e956686a5a606c56438 qtruby-3.4.3.ebuild 928
+MD5 c28ece053df537180d8583889f3b11c1 qtruby-3.5.0.ebuild 919
+MD5 d3d489aa2e87533e038b7bc43de0a246 qtruby-3.5.0_beta2.ebuild 924
+MD5 fa795fc48f805790f735ae0789b2b344 qtruby-3.5.0_rc1.ebuild 923
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyQVntT9W3vfTuoRAthoAJ9TkITXl3ytQ75jpk8z4aejOHQH3ACfbrFo
+r8ahfQ5Kqyiprra2jvDhh9s=
+=jOY/
+-----END PGP SIGNATURE-----
diff --git a/kde-base/qtruby/files/digest-qtruby-3.3.2-r1 b/kde-base/qtruby/files/digest-qtruby-3.3.2-r1
index 8ca0b2bead4b..1b3b65c42a2e 100644
--- a/kde-base/qtruby/files/digest-qtruby-3.3.2-r1
+++ b/kde-base/qtruby/files/digest-qtruby-3.3.2-r1
@@ -1,4 +1 @@
-MD5 63f7cd3ae52397c2182527899efb4c80 kdebindings-3.3.0.tar.bz2 7096728
-MD5 880bb5269b4f06fc1437d94e2de26055 kdebindings-3.3.0-3.3.1.tar.xdelta 1208754
-MD5 224bbb908b607ec9b2c3f1ff1cde1907 kdebindings-3.3.1-3.3.2.tar.xdelta 603690
 MD5 a8ae8e2ef4dd3680d0756adf76086d85 kdebindings-3.3.2.tar.bz2 7131727
diff --git a/kde-base/qtruby/files/digest-qtruby-3.4.1 b/kde-base/qtruby/files/digest-qtruby-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/qtruby/files/digest-qtruby-3.4.1
+++ b/kde-base/qtruby/files/digest-qtruby-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/qtruby/files/digest-qtruby-3.4.2 b/kde-base/qtruby/files/digest-qtruby-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/qtruby/files/digest-qtruby-3.4.2
+++ b/kde-base/qtruby/files/digest-qtruby-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/qtruby/files/no-gtk-glib-check.diff b/kde-base/qtruby/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/qtruby/files/no-gtk-glib-check.diff
+++ b/kde-base/qtruby/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/qtruby/metadata.xml b/kde-base/qtruby/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/qtruby/metadata.xml
+++ b/kde-base/qtruby/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/qtruby/qtruby-3.3.2-r1.ebuild b/kde-base/qtruby/qtruby-3.3.2-r1.ebuild
index 706b6b345016..05b3459d6383 100644
--- a/kde-base/qtruby/qtruby-3.3.2-r1.ebuild
+++ b/kde-base/qtruby/qtruby-3.3.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/kde-base/qtruby/qtruby-3.3.2-r1.ebuild,v 1.1 2005/02/19 15:35:45 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
diff --git a/kde-base/qtruby/qtruby-3.4.1-r1.ebuild b/kde-base/qtruby/qtruby-3.4.1-r1.ebuild
index e9804377749b..345464368bd1 100644
--- a/kde-base/qtruby/qtruby-3.4.1-r1.ebuild
+++ b/kde-base/qtruby/qtruby-3.4.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/kde-base/qtruby/qtruby-3.4.1-r1.ebuild,v 1.1 2005/07/11 13:08:09 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
diff --git a/kde-base/qtruby/qtruby-3.4.1.ebuild b/kde-base/qtruby/qtruby-3.4.1.ebuild
index 824493095232..230072d749bc 100644
--- a/kde-base/qtruby/qtruby-3.4.1.ebuild
+++ b/kde-base/qtruby/qtruby-3.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/kde-base/qtruby/qtruby-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Ruby bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND=" >=virtual/ruby-1.8
 $(deprange $PV $MAXKDEVER kde-base/smoke)"
diff --git a/kde-base/qtruby/qtruby-3.4.2.ebuild b/kde-base/qtruby/qtruby-3.4.2.ebuild
index 567ea25de54f..7e030c94ca0e 100644
--- a/kde-base/qtruby/qtruby-3.4.2.ebuild
+++ b/kde-base/qtruby/qtruby-3.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/kde-base/qtruby/qtruby-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
diff --git a/kde-base/qtruby/qtruby-3.4.3.ebuild b/kde-base/qtruby/qtruby-3.4.3.ebuild
index c1e170648e4e..bac81b9d1223 100644
--- a/kde-base/qtruby/qtruby-3.4.3.ebuild
+++ b/kde-base/qtruby/qtruby-3.4.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/kde-base/qtruby/qtruby-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Ruby bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
 
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND=" >=virtual/ruby-1.8
 $(deprange 3.4.2 $MAXKDEVER kde-base/smoke)"
diff --git a/kde-base/qtruby/qtruby-3.5.0.ebuild b/kde-base/qtruby/qtruby-3.5.0.ebuild
index d9585cd4fcf0..a5fdd5a093c8 100644
--- a/kde-base/qtruby/qtruby-3.5.0.ebuild
+++ b/kde-base/qtruby/qtruby-3.5.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/kde-base/qtruby/qtruby-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
diff --git a/kde-base/qtruby/qtruby-3.5.0_beta2.ebuild b/kde-base/qtruby/qtruby-3.5.0_beta2.ebuild
index 282e81007f8c..b27c08b46cff 100644
--- a/kde-base/qtruby/qtruby-3.5.0_beta2.ebuild
+++ b/kde-base/qtruby/qtruby-3.5.0_beta2.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/kde-base/qtruby/qtruby-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Ruby bindings for QT"
 HOMEPAGE="http://developer.kde.org/language-bindings/ruby/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=" >=virtual/ruby-1.8
 $(deprange $PV $MAXKDEVER kde-base/smoke)"
diff --git a/kde-base/qtruby/qtruby-3.5.0_rc1.ebuild b/kde-base/qtruby/qtruby-3.5.0_rc1.ebuild
index babdb597782c..e08cf3970d1d 100644
--- a/kde-base/qtruby/qtruby-3.5.0_rc1.ebuild
+++ b/kde-base/qtruby/qtruby-3.5.0_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/kde-base/qtruby/qtruby-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtruby/qtruby-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:14 chriswhite Exp $
 
 KMNAME=kdebindings
 KMCOPYLIB="libsmokeqt smoke/qt"
diff --git a/kde-base/qtsharp/ChangeLog b/kde-base/qtsharp/ChangeLog
index c6ea5fc086bd..ccc38f19e75d 100644
--- a/kde-base/qtsharp/ChangeLog
+++ b/kde-base/qtsharp/ChangeLog
@@ -1,6 +1,54 @@
 # ChangeLog for kde-base/qtsharp
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/ChangeLog,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
+
+*qtsharp-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +qtsharp-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> qtsharp-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*qtsharp-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +qtsharp-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*qtsharp-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +qtsharp-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> qtsharp-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> qtsharp-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*qtsharp-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +qtsharp-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  12 Dec 2004; Dan Armak <danarmak@gentoo.org> qtsharp-3.3.1.ebuild:
+  Corrected warning message and dep. The ebuild is still masked and
+  nonfunctional.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  qtsharp-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+  17 Nov 2004; Dan Armak <danarmak@gentoo.org> qtsharp-3.3.1.ebuild:
+  Unmasked in package.mask; removing all keywords - this package is broken for
+  now
 
 *qtsharp-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/qtsharp/Manifest b/kde-base/qtsharp/Manifest
index 3f31022e0e0e..59b58f7845d4 100644
--- a/kde-base/qtsharp/Manifest
+++ b/kde-base/qtsharp/Manifest
@@ -1,3 +1,11 @@
-MD5 0c39e84dbddc254341ff201d6a2e61c0 qtsharp-3.3.1.ebuild 451
-MD5 8d45f0d63b51486fcfde06f5d6fd958f files/digest-qtsharp-3.3.1 148
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
+MD5 eff15ec340a2d2455bb640febfa06237 ChangeLog 2374
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-qtsharp-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-qtsharp-3.4.1 221
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-qtsharp-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-qtsharp-3.5.0_beta2 225
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 7ee70f4dc1b54afc14eb5bc230eeee1a qtsharp-3.3.1.ebuild 635
+MD5 9d9756b96be9936090fd8e718db636c5 qtsharp-3.4.1.ebuild 712
+MD5 715e5fc1a9d564162bfcdc8318da660d qtsharp-3.5.0.ebuild 707
+MD5 6cbab11287319a838d3356ddd8497805 qtsharp-3.5.0_beta2.ebuild 719
diff --git a/kde-base/qtsharp/files/digest-qtsharp-3.3.1 b/kde-base/qtsharp/files/digest-qtsharp-3.3.1
index 948fc96dec04..a16df2f0cf51 100644
--- a/kde-base/qtsharp/files/digest-qtsharp-3.3.1
+++ b/kde-base/qtsharp/files/digest-qtsharp-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 1a7a891de41a59654bb09ca0401acfc2 qtsharp-3.3.1-0-makefiles.tar.bz2 21665
diff --git a/kde-base/qtsharp/files/digest-qtsharp-3.4.1 b/kde-base/qtsharp/files/digest-qtsharp-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/qtsharp/files/digest-qtsharp-3.4.1
+++ b/kde-base/qtsharp/files/digest-qtsharp-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/qtsharp/files/no-gtk-glib-check.diff b/kde-base/qtsharp/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/qtsharp/files/no-gtk-glib-check.diff
+++ b/kde-base/qtsharp/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/qtsharp/metadata.xml b/kde-base/qtsharp/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/qtsharp/metadata.xml
+++ b/kde-base/qtsharp/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/qtsharp/qtsharp-3.3.1.ebuild b/kde-base/qtsharp/qtsharp-3.3.1.ebuild
index e9cc62f2d988..e5188ef0ae74 100644
--- a/kde-base/qtsharp/qtsharp-3.3.1.ebuild
+++ b/kde-base/qtsharp/qtsharp-3.3.1.ebuild
@@ -1,17 +1,20 @@
-# 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/kde-base/qtsharp/qtsharp-3.3.1.ebuild,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/qtsharp-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdebindings
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="C# bindings for QT"
 KEYWORDS="~x86"
 IUSE=""
-# DEPEND="dev-dotnet/csant" -- TBA when a csant ebuild exists. Disabled for now to let repoman let me commit this.
+DEPEND="dev-dotnet/pnet"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
 pkg_setup() {
-    ewarn "This package is considered broken by upstream. You're on your own."
-    ewarn "This won't build. Portage doesn't have a csant ebuild yet."
+	ewarn "This package is outdated and should be replaced by dev-dotnet/qtsharp,"
+	ewarn "except that dev-dotnet/qtsharp doesn't fully work yet (?), so this is still here."
 }
diff --git a/kde-base/qtsharp/qtsharp-3.4.1.ebuild b/kde-base/qtsharp/qtsharp-3.4.1.ebuild
index 44f5a0702f7b..fc3fd1c8b64a 100644
--- a/kde-base/qtsharp/qtsharp-3.4.1.ebuild
+++ b/kde-base/qtsharp/qtsharp-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/qtsharp-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/qtsharp-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="C# bindings for QT"
-KEYWORDS="~x86 ~amd64" # broken according to upstream - 3.4a1 README; see also note below
+KEYWORDS="x86 amd64 ~ppc" # broken according to upstream - 3.4a1 README; see also note below
 IUSE=""
 DEPEND="dev-dotnet/pnet"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/qtsharp/qtsharp-3.5.0.ebuild b/kde-base/qtsharp/qtsharp-3.5.0.ebuild
index c9f9d0c0ec47..cccf04c15587 100644
--- a/kde-base/qtsharp/qtsharp-3.5.0.ebuild
+++ b/kde-base/qtsharp/qtsharp-3.5.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/kde-base/qtsharp/qtsharp-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/qtsharp-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
diff --git a/kde-base/qtsharp/qtsharp-3.5.0_beta2.ebuild b/kde-base/qtsharp/qtsharp-3.5.0_beta2.ebuild
index cb0258491959..79e7784193de 100644
--- a/kde-base/qtsharp/qtsharp-3.5.0_beta2.ebuild
+++ b/kde-base/qtsharp/qtsharp-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/qtsharp-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qtsharp/qtsharp-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:50 chriswhite Exp $
 
 KMNAME=kdebindings
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="C# bindings for QT"
-KEYWORDS="~amd64" # broken according to upstream - 3.4a1 README; see also note below
+KEYWORDS="~amd64 ~x86" # broken according to upstream - 3.4a1 README; see also note below
 IUSE=""
 DEPEND="dev-dotnet/pnet"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
diff --git a/kde-base/quanta/ChangeLog b/kde-base/quanta/ChangeLog
index 9982ecf5685d..5f8c375fe2f7 100644
--- a/kde-base/quanta/ChangeLog
+++ b/kde-base/quanta/ChangeLog
@@ -1,6 +1,121 @@
 # ChangeLog for kde-base/quanta
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/ChangeLog,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> quanta-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Markus Rothe <corsair@gentoo.org> quanta-3.4.3.ebuild:
+  Stable on ppc64
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> quanta-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*quanta-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*quanta-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> quanta-3.5_beta1.ebuild,
+  quanta-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*quanta-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.5.0_beta2.ebuild:
+  New version.
+
+*quanta-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.4.3.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -quanta-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*quanta-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +quanta-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*quanta-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +quanta-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> quanta-3.4.2.ebuild:
+  ~alpha keyword.
+
+*quanta-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> quanta-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> quanta-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> quanta-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+  28 May 2005; Markus Rothe <corsair@gentoo.org> quanta-3.4.0.ebuild,
+  quanta-3.4.0-r1.ebuild, quanta-3.4.1.ebuild:
+  Added ~ppc64
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> quanta-3.4.0-r1.ebuild,
+  quanta-3.4.1.ebuild:
+  Really add ~sparc keyword this time.
+
+  28 May 2005; Jason Wever <weeve@gentoo.org> quanta-3.4.0-r1.ebuild,
+  quanta-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+  26 May 2005; Dan Armak <danarmak@gentoo.org> quanta-3.4.1.ebuild:
+  Remove patch included upstream in 3.4.1.
+
+*quanta-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+*quanta-3.4.0-r1 (02 May 2005)
+
+  02 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/quanta-3.4.0-vpl.patch, +quanta-3.4.0-r1.ebuild:
+  fix for vpl editor crash
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> quanta-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> quanta-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*quanta-3.4.0_rc1 (10 Mar 2005)
+
+  10 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> quanta-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*quanta-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +quanta-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *quanta-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/quanta/Manifest b/kde-base/quanta/Manifest
index 701a5e010a77..c0bd808a0154 100644
--- a/kde-base/quanta/Manifest
+++ b/kde-base/quanta/Manifest
@@ -1,4 +1,26 @@
-MD5 2bcb2b3f5b9afa6b65a6354a9932a3fb quanta-3.4.0_alpha1.ebuild 896
-MD5 2bcb2b3f5b9afa6b65a6354a9932a3fb quanta-3.4.0_beta1.ebuild 896
-MD5 01932d35a126a5610a6c4a35de90a2b6 files/digest-quanta-3.4.0_alpha1 70
-MD5 07dc9f44e293d1ac9c7b66b68f28492f files/digest-quanta-3.4.0_beta1 219
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6fb15565cc633f5db3789a7fe0528ecb ChangeLog 3976
+MD5 e951879abebc3cb3931132db3f1c508a files/digest-quanta-3.4.1 215
+MD5 aa19f6252c3ee8966919f391f9ccd717 files/digest-quanta-3.4.2 292
+MD5 5f811f6d3a4356fe91386db8ad46b787 files/digest-quanta-3.4.3 69
+MD5 1b9c64625ee8bb6581dafc883b1d0ee1 files/digest-quanta-3.5.0 69
+MD5 f707b83e603df2763351c664d0943915 files/digest-quanta-3.5.0_beta2 219
+MD5 50a5dfc5bdebb9f91775752768b4ca60 files/digest-quanta-3.5.0_rc1 304
+MD5 dbf048ce767888392930a6446896b4c7 files/digest-quanta-3.5_beta1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 2de271d5cb0564396ad3901ab2879b63 quanta-3.4.1.ebuild 1046
+MD5 5cd5d5288de88797c173db09bd12073c quanta-3.4.2.ebuild 1077
+MD5 d907c7b6e111dc1bc2195385a419211c quanta-3.4.3.ebuild 1071
+MD5 51137b4eb68c497df86d0da1441b5a73 quanta-3.5.0.ebuild 1051
+MD5 0b487fcc16a38ba956a89dff2dbd6634 quanta-3.5.0_beta2.ebuild 1062
+MD5 06905dfa4d76a320e55b6d0403015e13 quanta-3.5.0_rc1.ebuild 1055
+MD5 6d8265acda77aa782286be48117b2673 quanta-3.5_beta1.ebuild 1054
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxZwntT9W3vfTuoRAsTJAJ9ez49i+wIT033CKXAyPGXSO4dMjACgs+HY
+FoaFoye9HB4ruIpY4H0yxLc=
+=9QJI
+-----END PGP SIGNATURE-----
diff --git a/kde-base/quanta/files/digest-quanta-3.4.1 b/kde-base/quanta/files/digest-quanta-3.4.1
index 797b2dac2533..ff993687a657 100644
--- a/kde-base/quanta/files/digest-quanta-3.4.1
+++ b/kde-base/quanta/files/digest-quanta-3.4.1
@@ -1,2 +1,3 @@
 MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
 MD5 d5c9e5c72731aead950ab29a4d620af8 kdewebdev-3.4.1.tar.bz2 5966577
diff --git a/kde-base/quanta/files/digest-quanta-3.4.2 b/kde-base/quanta/files/digest-quanta-3.4.2
index 5497b6e4be9f..18c726d6f0c5 100644
--- a/kde-base/quanta/files/digest-quanta-3.4.2
+++ b/kde-base/quanta/files/digest-quanta-3.4.2
@@ -1 +1,4 @@
+MD5 a131b9a14c5da402417b43ed8bc61df1 kdewebdev-3.4.0.tar.bz2 6243584
+MD5 629518c511c2d3cf50e53aaa6073b6a3 kdewebdev-3.4.0-3.4.1.tar.xdelta 629956
+MD5 fadb59f001c317dd0f843be81f4157d9 kdewebdev-3.4.1-3.4.2.tar.xdelta 220130
 MD5 99dbd9bf9b2a1451544b35f73efe7dba kdewebdev-3.4.2.tar.bz2 5968773
diff --git a/kde-base/quanta/metadata.xml b/kde-base/quanta/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/quanta/metadata.xml
+++ b/kde-base/quanta/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/quanta/quanta-3.4.1.ebuild b/kde-base/quanta/quanta-3.4.1.ebuild
index 173df1624fe6..32315cd5151f 100644
--- a/kde-base/quanta/quanta-3.4.1.ebuild
+++ b/kde-base/quanta/quanta-3.4.1.ebuild
@@ -1,31 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Quanta Plus Web Development Environment"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="doc tidy"
-DEPEND="doc? ( app-doc/quanta-docs )
-	dev-libs/libxml2"
+DEPEND="dev-libs/libxml2"
 RDEPEND="$DEPEND
 $(deprange $PV $MAXKDEVER kde-base/kfilereplace)
 $(deprange $PV $MAXKDEVER kde-base/kimagemapeditor)
 $(deprange $PV $MAXKDEVER kde-base/klinkstatus)
 $(deprange $PV $MAXKDEVER kde-base/kommander)
 $(deprange $PV $MAXKDEVER kde-base/kxsldbg)
-tidy? ( app-text/htmltidy )"
+tidy? ( app-text/htmltidy )
+doc? ( app-doc/quanta-docs )"
 
 KMCOMPILEONLY=lib
 
-src_unpack () {
-	kde-meta_src_unpack
-	epatch ${FILESDIR}/${P}-vpl.patch
-}
-
 # TODO: check why this wasn't needed back in the monolithic ebuild
 src_compile () {
 	myconf="--with-extra-includes=$(xml2-config --cflags | sed -e 's:^-I::')"
diff --git a/kde-base/quanta/quanta-3.4.2.ebuild b/kde-base/quanta/quanta-3.4.2.ebuild
index 5e1bc90ff87e..6f586f3572b5 100644
--- a/kde-base/quanta/quanta-3.4.2.ebuild
+++ b/kde-base/quanta/quanta-3.4.2.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Quanta Plus Web Development Environment"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc tidy"
-DEPEND="dev-libs/libxml2"
+DEPEND="dev-libs/libxslt
+	dev-libs/libxml2"
 RDEPEND="$DEPEND
 $(deprange $PV $MAXKDEVER kde-base/kfilereplace)
 $(deprange $PV $MAXKDEVER kde-base/kimagemapeditor)
diff --git a/kde-base/quanta/quanta-3.4.3.ebuild b/kde-base/quanta/quanta-3.4.3.ebuild
index 71a89f5b2a9c..29c6a0be54c7 100644
--- a/kde-base/quanta/quanta-3.4.3.ebuild
+++ b/kde-base/quanta/quanta-3.4.3.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.4.3.ebuild,v 1.1 2005/10/13 00:10:08 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Quanta Plus Web Development Environment"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ppc64 sparc ~x86"
 IUSE="doc tidy"
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2"
diff --git a/kde-base/quanta/quanta-3.5.0.ebuild b/kde-base/quanta/quanta-3.5.0.ebuild
index 6998102fa3d8..81341b2ea9f7 100644
--- a/kde-base/quanta/quanta-3.5.0.ebuild
+++ b/kde-base/quanta/quanta-3.5.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/kde-base/quanta/quanta-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/quanta/quanta-3.5.0_beta2.ebuild b/kde-base/quanta/quanta-3.5.0_beta2.ebuild
index fa2407e689e0..955f8104e913 100644
--- a/kde-base/quanta/quanta-3.5.0_beta2.ebuild
+++ b/kde-base/quanta/quanta-3.5.0_beta2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Quanta Plus Web Development Environment"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc tidy"
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2"
diff --git a/kde-base/quanta/quanta-3.5.0_rc1.ebuild b/kde-base/quanta/quanta-3.5.0_rc1.ebuild
index 29dd2febfad6..7f86a07f9738 100644
--- a/kde-base/quanta/quanta-3.5.0_rc1.ebuild
+++ b/kde-base/quanta/quanta-3.5.0_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/kde-base/quanta/quanta-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/quanta/quanta-3.5_beta1.ebuild b/kde-base/quanta/quanta-3.5_beta1.ebuild
index bd7811821e76..c970cdf37781 100644
--- a/kde-base/quanta/quanta-3.5_beta1.ebuild
+++ b/kde-base/quanta/quanta-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.5_beta1.ebuild,v 1.1 2005/09/22 21:33:53 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/quanta/quanta-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:06 chriswhite Exp $
 KMNAME=kdewebdev
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Quanta Plus Web Development Environment"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc tidy"
 DEPEND="dev-libs/libxslt
 	dev-libs/libxml2"
diff --git a/kde-base/renamedlg-audio/ChangeLog b/kde-base/renamedlg-audio/ChangeLog
index cbcedec620b5..519bad8e7141 100644
--- a/kde-base/renamedlg-audio/ChangeLog
+++ b/kde-base/renamedlg-audio/ChangeLog
@@ -1,6 +1,98 @@
 # ChangeLog for kde-base/renamedlg-audio
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/ChangeLog,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
+
+*renamedlg-audio-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +renamedlg-audio-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*renamedlg-audio-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +renamedlg-audio-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  renamedlg-audio-3.5_beta1.ebuild, renamedlg-audio-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*renamedlg-audio-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +renamedlg-audio-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -renamedlg-audio-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*renamedlg-audio-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +renamedlg-audio-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  renamedlg-audio-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*renamedlg-audio-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +renamedlg-audio-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  renamedlg-audio-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> renamedlg-audio-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> renamedlg-audio-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  renamedlg-audio-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*renamedlg-audio-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +renamedlg-audio-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  renamedlg-audio-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> renamedlg-audio-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  renamedlg-audio-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> renamedlg-audio-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*renamedlg-audio-3.4.0_rc1 (09 Mar 2005)
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  renamedlg-audio-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*renamedlg-audio-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +renamedlg-audio-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *renamedlg-audio-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/renamedlg-audio/Manifest b/kde-base/renamedlg-audio/Manifest
index 2b022f3c6d9d..289e344f3aaa 100644
--- a/kde-base/renamedlg-audio/Manifest
+++ b/kde-base/renamedlg-audio/Manifest
@@ -1,4 +1,12 @@
-MD5 6a85af2bfd61396417b6b49a84731f8f renamedlg-audio-3.4.0_beta1.ebuild 333
-MD5 6a85af2bfd61396417b6b49a84731f8f renamedlg-audio-3.4.0_alpha1.ebuild 333
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-renamedlg-audio-3.4.0_alpha1 70
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-renamedlg-audio-3.4.0_beta1 219
+MD5 d5a8618805dc18ff22b75729959373c9 ChangeLog 3373
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-renamedlg-audio-3.4.1 215
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-renamedlg-audio-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-renamedlg-audio-3.5.0_beta2 218
+MD5 43efceb4cdcb98066238c7d1f77bf7b4 files/digest-renamedlg-audio-3.5.0_rc1 302
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-renamedlg-audio-3.5_beta1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 835c8ca988e0a528cee017971540fe3d renamedlg-audio-3.4.1.ebuild 480
+MD5 775d91f8b77aa1bb7f3c337441439879 renamedlg-audio-3.5.0.ebuild 457
+MD5 9ed2a4bc22bf55b8d0281508e2a9cd82 renamedlg-audio-3.5.0_beta2.ebuild 462
+MD5 c192aa10525e30f64b2e6d91f69c8090 renamedlg-audio-3.5.0_rc1.ebuild 461
+MD5 22b271d723ca8fd1d5434dde94c9b486 renamedlg-audio-3.5_beta1.ebuild 460
diff --git a/kde-base/renamedlg-audio/files/digest-renamedlg-audio-3.4.1 b/kde-base/renamedlg-audio/files/digest-renamedlg-audio-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/renamedlg-audio/files/digest-renamedlg-audio-3.4.1
+++ b/kde-base/renamedlg-audio/files/digest-renamedlg-audio-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/renamedlg-audio/metadata.xml b/kde-base/renamedlg-audio/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/renamedlg-audio/metadata.xml
+++ b/kde-base/renamedlg-audio/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/renamedlg-audio/renamedlg-audio-3.4.1.ebuild b/kde-base/renamedlg-audio/renamedlg-audio-3.4.1.ebuild
index 85620d54a67d..8464a0855420 100644
--- a/kde-base/renamedlg-audio/renamedlg-audio-3.4.1.ebuild
+++ b/kde-base/renamedlg-audio/renamedlg-audio-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/renamedlg-audio-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/renamedlg-audio-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/audio"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE RenameDlg plugin for audio files"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/renamedlg-audio/renamedlg-audio-3.5.0.ebuild b/kde-base/renamedlg-audio/renamedlg-audio-3.5.0.ebuild
index 9c78471e60f0..03d3daa8fd2b 100644
--- a/kde-base/renamedlg-audio/renamedlg-audio-3.5.0.ebuild
+++ b/kde-base/renamedlg-audio/renamedlg-audio-3.5.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/kde-base/renamedlg-audio/renamedlg-audio-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/renamedlg-audio-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/audio"
diff --git a/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_beta2.ebuild b/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_beta2.ebuild
index a74a039d5e66..f3186928111a 100644
--- a/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_beta2.ebuild
+++ b/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_beta2.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/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/audio"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE RenameDlg plugin for audio files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_rc1.ebuild b/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_rc1.ebuild
index aef2a026a985..00283e035f90 100644
--- a/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_rc1.ebuild
+++ b/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_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/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/renamedlg-audio-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/audio"
diff --git a/kde-base/renamedlg-audio/renamedlg-audio-3.5_beta1.ebuild b/kde-base/renamedlg-audio/renamedlg-audio-3.5_beta1.ebuild
index ec8824f9e469..29d29116e7d5 100644
--- a/kde-base/renamedlg-audio/renamedlg-audio-3.5_beta1.ebuild
+++ b/kde-base/renamedlg-audio/renamedlg-audio-3.5_beta1.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/kde-base/renamedlg-audio/renamedlg-audio-3.5_beta1.ebuild,v 1.1 2005/09/22 21:34:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-audio/renamedlg-audio-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:09 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/audio"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE RenameDlg plugin for audio files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/renamedlg-images/ChangeLog b/kde-base/renamedlg-images/ChangeLog
index 093d996a0db7..e9787bbc8c26 100644
--- a/kde-base/renamedlg-images/ChangeLog
+++ b/kde-base/renamedlg-images/ChangeLog
@@ -1,6 +1,89 @@
 # ChangeLog for kde-base/renamedlg-images
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/ChangeLog,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
+
+*renamedlg-images-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +renamedlg-images-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  renamedlg-images-3.5_beta1.ebuild, renamedlg-images-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*renamedlg-images-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +renamedlg-images-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -renamedlg-images-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*renamedlg-images-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +renamedlg-images-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  renamedlg-images-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*renamedlg-images-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +renamedlg-images-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  renamedlg-images-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> renamedlg-images-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> renamedlg-images-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  renamedlg-images-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*renamedlg-images-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org>
+  +renamedlg-images-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  renamedlg-images-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> renamedlg-images-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
+  renamedlg-images-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org>
+  renamedlg-images-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  renamedlg-images-3.4.0_beta2.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*renamedlg-images-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +renamedlg-images-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *renamedlg-images-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/renamedlg-images/Manifest b/kde-base/renamedlg-images/Manifest
index 5a34bc0805bc..d6119258447b 100644
--- a/kde-base/renamedlg-images/Manifest
+++ b/kde-base/renamedlg-images/Manifest
@@ -1,4 +1,10 @@
-MD5 35541460d4f9ed24b2052545f5ecd3a3 renamedlg-images-3.4.0_alpha1.ebuild 330
-MD5 35541460d4f9ed24b2052545f5ecd3a3 renamedlg-images-3.4.0_beta1.ebuild 330
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-renamedlg-images-3.4.0_alpha1 70
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-renamedlg-images-3.4.0_beta1 219
+MD5 2bcb66a4bf6af41431c89a103fa1f8d2 ChangeLog 3129
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-renamedlg-images-3.4.1 215
+MD5 8388fec393a55f10e04a5ca2466e0dc5 files/digest-renamedlg-images-3.5.0 69
+MD5 c87a32e577bf07599564a43d36f80fef files/digest-renamedlg-images-3.5.0_beta2 218
+MD5 d9f3b4e8b636086a5e9a145444ed5906 files/digest-renamedlg-images-3.5_beta1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 4ce929947ca95e7ffb02e07c4396d4df renamedlg-images-3.4.1.ebuild 479
+MD5 809b479bc838034fd530e4c938c0f464 renamedlg-images-3.5.0.ebuild 456
+MD5 41400ace1007df64f4515887089c2f1a renamedlg-images-3.5.0_beta2.ebuild 468
+MD5 854952eb5cd0501a671a4ebd7d77d85a renamedlg-images-3.5_beta1.ebuild 459
diff --git a/kde-base/renamedlg-images/files/digest-renamedlg-images-3.4.1 b/kde-base/renamedlg-images/files/digest-renamedlg-images-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/renamedlg-images/files/digest-renamedlg-images-3.4.1
+++ b/kde-base/renamedlg-images/files/digest-renamedlg-images-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/renamedlg-images/metadata.xml b/kde-base/renamedlg-images/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/renamedlg-images/metadata.xml
+++ b/kde-base/renamedlg-images/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/renamedlg-images/renamedlg-images-3.4.1.ebuild b/kde-base/renamedlg-images/renamedlg-images-3.4.1.ebuild
index 2f8f1189c88f..48b2bb99da8c 100644
--- a/kde-base/renamedlg-images/renamedlg-images-3.4.1.ebuild
+++ b/kde-base/renamedlg-images/renamedlg-images-3.4.1.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/renamedlg-images-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/renamedlg-images-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/images"
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="renamedlg plugin for image files"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/renamedlg-images/renamedlg-images-3.5.0.ebuild b/kde-base/renamedlg-images/renamedlg-images-3.5.0.ebuild
index 418d1e7333e2..88e6e6d3ff1d 100644
--- a/kde-base/renamedlg-images/renamedlg-images-3.5.0.ebuild
+++ b/kde-base/renamedlg-images/renamedlg-images-3.5.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/kde-base/renamedlg-images/renamedlg-images-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/renamedlg-images-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/images"
diff --git a/kde-base/renamedlg-images/renamedlg-images-3.5.0_beta2.ebuild b/kde-base/renamedlg-images/renamedlg-images-3.5.0_beta2.ebuild
index f5eda64f2a14..be6632d17beb 100644
--- a/kde-base/renamedlg-images/renamedlg-images-3.5.0_beta2.ebuild
+++ b/kde-base/renamedlg-images/renamedlg-images-3.5.0_beta2.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/renamedlg-images-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/renamedlg-images-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/images"
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="renamedlg plugin for image files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/renamedlg-images/renamedlg-images-3.5_beta1.ebuild b/kde-base/renamedlg-images/renamedlg-images-3.5_beta1.ebuild
index af6d116f0655..7021549c05f7 100644
--- a/kde-base/renamedlg-images/renamedlg-images-3.5_beta1.ebuild
+++ b/kde-base/renamedlg-images/renamedlg-images-3.5_beta1.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/kde-base/renamedlg-images/renamedlg-images-3.5_beta1.ebuild,v 1.1 2005/09/22 21:35:50 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/renamedlg-images/renamedlg-images-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:14:12 chriswhite Exp $
 KMNAME=kdeaddons
 KMNOMODULE=true
 KMEXTRA="renamedlgplugins/images"
@@ -9,7 +9,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="renamedlg plugin for image files"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/secpolicy/ChangeLog b/kde-base/secpolicy/ChangeLog
index 81f9f2558a2b..c153a6b594b3 100644
--- a/kde-base/secpolicy/ChangeLog
+++ b/kde-base/secpolicy/ChangeLog
@@ -1,6 +1,81 @@
 # ChangeLog for kde-base/secpolicy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/ChangeLog,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
+
+*secpolicy-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +secpolicy-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> secpolicy-3.5_beta1.ebuild:
+  Adding ~x86 to keywords
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -secpolicy-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*secpolicy-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +secpolicy-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> secpolicy-3.4.1.ebuild:
+  Mark 3.4.1 stable on alpha
+
+*secpolicy-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +secpolicy-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> secpolicy-3.4.1.ebuild:
+  ~alpha keyword.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> secpolicy-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> secpolicy-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> secpolicy-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*secpolicy-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +secpolicy-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> secpolicy-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> secpolicy-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> secpolicy-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> secpolicy-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*secpolicy-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  secpolicy-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*secpolicy-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org>
+  +secpolicy-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *secpolicy-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/secpolicy/Manifest b/kde-base/secpolicy/Manifest
index b554a28ba8d5..779892c2bbe8 100644
--- a/kde-base/secpolicy/Manifest
+++ b/kde-base/secpolicy/Manifest
@@ -1,4 +1,8 @@
-MD5 b543bc2ef7026cd5ebf71dd341104bfb secpolicy-3.4.0_alpha1.ebuild 342
-MD5 b543bc2ef7026cd5ebf71dd341104bfb secpolicy-3.4.0_beta1.ebuild 342
-MD5 5c80d63263041da2a3656e9484510f15 files/digest-secpolicy-3.4.0_alpha1 69
-MD5 06d8b082374f502eb28cb4e5681f0bf7 files/digest-secpolicy-3.4.0_beta1 215
+MD5 84ed783383de44354c33b0bc15edf85d ChangeLog 2856
+MD5 02d4a8eb91816526b12d85dd5cd34169 files/digest-secpolicy-3.4.1 211
+MD5 5e640d90c8921056fae9b3ca328a8093 files/digest-secpolicy-3.5.0 68
+MD5 27e68187b25ba15cc1e9f8981eacca8a files/digest-secpolicy-3.5_beta1 69
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 4da9f5c771b81146b497cf7114a937ea secpolicy-3.4.1.ebuild 477
+MD5 ec5c4f02b134bebd16b2a5c028d1a51d secpolicy-3.5.0.ebuild 454
+MD5 48ac11afe2827e0903e1094d31018066 secpolicy-3.5_beta1.ebuild 464
diff --git a/kde-base/secpolicy/files/digest-secpolicy-3.4.1 b/kde-base/secpolicy/files/digest-secpolicy-3.4.1
index 43da1184af42..c7e9432298bd 100644
--- a/kde-base/secpolicy/files/digest-secpolicy-3.4.1
+++ b/kde-base/secpolicy/files/digest-secpolicy-3.4.1
@@ -1,2 +1,3 @@
 MD5 d1db9fac4faca194cbda1e8189453363 kdeadmin-3.4.0.tar.bz2 1567785
+MD5 7a27a6d4de370ef78e2dcbc163d6bbec kdeadmin-3.4.0-3.4.1.tar.xdelta 68985
 MD5 ee02e3caf664d825838698b44557b0ef kdeadmin-3.4.1.tar.bz2 1523828
diff --git a/kde-base/secpolicy/metadata.xml b/kde-base/secpolicy/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/secpolicy/metadata.xml
+++ b/kde-base/secpolicy/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/secpolicy/secpolicy-3.4.1.ebuild b/kde-base/secpolicy/secpolicy-3.4.1.ebuild
index b1554f682d5f..ba96b637703c 100644
--- a/kde-base/secpolicy/secpolicy-3.4.1.ebuild
+++ b/kde-base/secpolicy/secpolicy-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/secpolicy-3.4.1.ebuild,v 1.1 2005/05/25 21:23:14 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/secpolicy-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Display PAM security policies"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/secpolicy/secpolicy-3.5.0.ebuild b/kde-base/secpolicy/secpolicy-3.5.0.ebuild
index d5d89687b414..34d464a7ef29 100644
--- a/kde-base/secpolicy/secpolicy-3.5.0.ebuild
+++ b/kde-base/secpolicy/secpolicy-3.5.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/kde-base/secpolicy/secpolicy-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/secpolicy-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdeadmin
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
diff --git a/kde-base/secpolicy/secpolicy-3.5_beta1.ebuild b/kde-base/secpolicy/secpolicy-3.5_beta1.ebuild
index 4ebec2349899..8d72e2667bc9 100644
--- a/kde-base/secpolicy/secpolicy-3.5_beta1.ebuild
+++ b/kde-base/secpolicy/secpolicy-3.5_beta1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/secpolicy-3.5_beta1.ebuild,v 1.1 2005/09/22 21:36:47 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/secpolicy/secpolicy-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:13:56 chriswhite Exp $
 KMNAME=kdeadmin
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE: Display PAM security policies"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/smoke/ChangeLog b/kde-base/smoke/ChangeLog
index 18acf4653958..a8ee82d9099d 100644
--- a/kde-base/smoke/ChangeLog
+++ b/kde-base/smoke/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for kde-base/smoke
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/ChangeLog,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> smoke-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> smoke-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+*smoke-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*smoke-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> smoke-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*smoke-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*smoke-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> smoke-3.4.1.ebuild:
+  Added ~sparc keyword.
+
+*smoke-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  18 Apr 2005; Herbie Hopkins <herbs@gentoo.org> smoke-3.4.0.ebuild:
+  Added ~amd64 keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> smoke-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> smoke-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  28 Feb 2005; Caleb Tennis <caleb@gentoo.org>
+  +files/no_knotifywidgetbase.diff:
+  Patch gets rid of knotifywidgetbase.h, which isn't exported
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+  19 Feb 2005; Dan Armak <danarmak@gentoo.org> smoke-3.3.1.ebuild:
+  Disabled enable-final in smoke-3.3.1. It was disabled in 3.4.0_beta2 some
+  time ago. Building smoke with enable-final is possible, but takes at least
+  1.5GB RAM.
+
+  11 Feb 2005; Dan Armak <danarmak@gentoo.org> smoke-3.3.1.ebuild:
+  Added x86 (stable) keyword.
+
+*smoke-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +smoke-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  smoke-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *smoke-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/smoke/Manifest b/kde-base/smoke/Manifest
index 2183237b6049..5d448270097c 100644
--- a/kde-base/smoke/Manifest
+++ b/kde-base/smoke/Manifest
@@ -1,4 +1,26 @@
-MD5 f20c65466830f0da592094c94cd7f3bb smoke-3.3.1.ebuild 433
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9550142e317f6aaa9aa990d7a64f33c6 ChangeLog 3267
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-smoke-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-smoke-3.4.1 221
+MD5 8b94700e5ddd1504207b279995e101c7 files/digest-smoke-3.4.2 300
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-smoke-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-smoke-3.5.0_beta2 225
+MD5 a41ac4f23e006a6c9c1a8c780b3aca01 files/digest-smoke-3.5.0_rc1 312
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
 MD5 92a2bf7b4c3eebd09d53b684b22513af files/parallel-make.diff 1696
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 7f621b97f9a40145be94ed6c01cb1f2d files/digest-smoke-3.3.1 146
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 701f61e8efb8d7e88e99b0512a0098e1 smoke-3.3.1.ebuild 1058
+MD5 d19f393c142dce968ca099403d048e1a smoke-3.4.1.ebuild 1071
+MD5 0838a6715496f1786c4a560c2684af3c smoke-3.4.2.ebuild 1370
+MD5 9c2676178fef8ae840c33bf6899b644f smoke-3.5.0.ebuild 1435
+MD5 4b370de60b93ccc871ffd41a3f059d3f smoke-3.5.0_beta2.ebuild 1440
+MD5 e7b7729b6c3b5acdec5e430c2d045c00 smoke-3.5.0_rc1.ebuild 1439
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhyPyntT9W3vfTuoRAsOWAKCTrqEdX7sv6SofJ3f4UxPjIpRD4ACfY7qT
+s/5QNtcEb3Gcu+rBs4bKyOM=
+=/DmL
+-----END PGP SIGNATURE-----
diff --git a/kde-base/smoke/files/digest-smoke-3.3.1 b/kde-base/smoke/files/digest-smoke-3.3.1
index 64edf11dedc4..a16df2f0cf51 100644
--- a/kde-base/smoke/files/digest-smoke-3.3.1
+++ b/kde-base/smoke/files/digest-smoke-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 a676a142e64fe0575a0d0415101a1b00 smoke-3.3.1-0-makefiles.tar.bz2 19210
diff --git a/kde-base/smoke/files/digest-smoke-3.4.1 b/kde-base/smoke/files/digest-smoke-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/smoke/files/digest-smoke-3.4.1
+++ b/kde-base/smoke/files/digest-smoke-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/smoke/files/digest-smoke-3.4.2 b/kde-base/smoke/files/digest-smoke-3.4.2
index 6a8795734858..487d1b1d2260 100644
--- a/kde-base/smoke/files/digest-smoke-3.4.2
+++ b/kde-base/smoke/files/digest-smoke-3.4.2
@@ -1 +1,4 @@
+MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
+MD5 04031d3888f2a1cf7abbadf0931cc475 kdebindings-3.4.1-3.4.2.tar.xdelta 449690
 MD5 1ee2348e03b0af625679d0bb2c8aad2b kdebindings-3.4.2.tar.bz2 7214122
diff --git a/kde-base/smoke/files/no-gtk-glib-check.diff b/kde-base/smoke/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/smoke/files/no-gtk-glib-check.diff
+++ b/kde-base/smoke/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/smoke/metadata.xml b/kde-base/smoke/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/smoke/metadata.xml
+++ b/kde-base/smoke/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/smoke/smoke-3.3.1.ebuild b/kde-base/smoke/smoke-3.3.1.ebuild
index c5cc4e285e83..2bdcfa65ee63 100644
--- a/kde-base/smoke/smoke-3.3.1.ebuild
+++ b/kde-base/smoke/smoke-3.3.1.ebuild
@@ -1,14 +1,28 @@
-# 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/kde-base/smoke/smoke-3.3.1.ebuild,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
-KEYWORDS="~x86"
+HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
+
+KEYWORDS="x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff $FILESDIR/parallel-make.diff"
 
+# enable-final works, but requires at least 1.5GB of RAM to complete without swapping,
+# so it's best to turn it off here. (I don't have that much RAM, so can't estimate
+# how much would be enough, but it's at least that much... --danarmak)
+src_compile() {
+	kde-meta_src_compile myconf
+	# override myconf's setting of enable-final
+	myconf="$myconf --disable-final"
+	kde-meta_src_compile configure make
+}
diff --git a/kde-base/smoke/smoke-3.4.1.ebuild b/kde-base/smoke/smoke-3.4.1.ebuild
index 9f84d1bf91d0..08315f70f1e9 100644
--- a/kde-base/smoke/smoke-3.4.1.ebuild
+++ b/kde-base/smoke/smoke-3.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/kde-base/smoke/smoke-3.4.1.ebuild,v 1.1 2005/05/25 21:23:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
 HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
 
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND="dev-lang/perl"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff
diff --git a/kde-base/smoke/smoke-3.4.2.ebuild b/kde-base/smoke/smoke-3.4.2.ebuild
index da65252e74af..ec6490774603 100644
--- a/kde-base/smoke/smoke-3.4.2.ebuild
+++ b/kde-base/smoke/smoke-3.4.2.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
 HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
 
-KEYWORDS=" ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc ~x86"
 IUSE=""
 DEPEND="dev-lang/perl
 	dev-python/qscintilla" # QScintilla is an optional dep, there's a configure flag for it, but I don't want
diff --git a/kde-base/smoke/smoke-3.5.0.ebuild b/kde-base/smoke/smoke-3.5.0.ebuild
index d9cc58e8cf5c..926c50d7bd43 100644
--- a/kde-base/smoke/smoke-3.5.0.ebuild
+++ b/kde-base/smoke/smoke-3.5.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/kde-base/smoke/smoke-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
diff --git a/kde-base/smoke/smoke-3.5.0_beta2.ebuild b/kde-base/smoke/smoke-3.5.0_beta2.ebuild
index 05cd481de33e..ddf6ab2d7c86 100644
--- a/kde-base/smoke/smoke-3.5.0_beta2.ebuild
+++ b/kde-base/smoke/smoke-3.5.0_beta2.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/kde-base/smoke/smoke-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
@@ -12,7 +12,7 @@ inherit kde-meta
 DESCRIPTION="Scripting Meta Object Kompiler Engine: a language-agnostic bindings generator for qt and kde"
 HOMEPAGE="http://developer.kde.org/language-bindings/smoke/"
 
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 DEPEND="dev-lang/perl
 	dev-python/qscintilla" # QScintilla is an optional dep, there's a configure flag for it, but I don't want
diff --git a/kde-base/smoke/smoke-3.5.0_rc1.ebuild b/kde-base/smoke/smoke-3.5.0_rc1.ebuild
index 915faf521ddc..51c2c1bb616d 100644
--- a/kde-base/smoke/smoke-3.5.0_rc1.ebuild
+++ b/kde-base/smoke/smoke-3.5.0_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/kde-base/smoke/smoke-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/smoke/smoke-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:13:44 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="kalyptus/kalyptus kalyptus/*.pm"
diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index e87da5205440..41f29517717b 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.1 2005/09/07 13:42:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
+
+  23 Nov 2005; Dan Armak <danarmak@gentoo.org> superkaramba-3.5.0.ebuild:
+  Removed patch applied upstream.
+
+*superkaramba-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +superkaramba-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  16 Nov 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdeutils-3.5_rc1-unicode.patch, superkaramba-3.5.0_rc1.ebuild:
+  Fix compilation with USE=unicode (#112606).
+
+*superkaramba-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +superkaramba-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org>
+  superkaramba-3.5_beta1.ebuild, superkaramba-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*superkaramba-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +superkaramba-3.5.0_beta2.ebuild:
+  New version.
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -superkaramba-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*superkaramba-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +superkaramba-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
 
 *superkaramba-3.5_alpha1 (07 Sep 2005)
 
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index bb93423152f4..5097de62016a 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -1,2 +1,11 @@
-MD5 ab75f28e6fb24541d398fb3f197deb01 superkaramba-3.5_alpha1.ebuild 433
-MD5 aa852c5670b437cbfc2af5900a234661 files/digest-superkaramba-3.5_alpha1 69
+MD5 c7d78b38e10a3126325484620d820c74 ChangeLog 1555
+MD5 84550abe96e8ef6f8f931c2e13b53a6e files/digest-superkaramba-3.5.0 68
+MD5 444e9ea16b9f6261077667552887b9bb files/digest-superkaramba-3.5.0_beta2 216
+MD5 ee73652c24b35ea4a7e56120462fc3b9 files/digest-superkaramba-3.5.0_rc1 300
+MD5 ba38338e687742fb5a9e7458de260898 files/digest-superkaramba-3.5_beta1 69
+MD5 4d4886bdfe9b726be039bfa25d3ced38 files/kdeutils-3.5_rc1-unicode.patch 1236
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ed72ee403f1a58ed6181a66c1990b845 superkaramba-3.5.0.ebuild 454
+MD5 47bcbdb008808143da434e2eede054a7 superkaramba-3.5.0_beta2.ebuild 459
+MD5 2f7a21e8cb0b51bffccd3d0b44e463cf superkaramba-3.5.0_rc1.ebuild 527
+MD5 7c0d06874d198f629fff7f90c4fdbbc3 superkaramba-3.5_beta1.ebuild 457
diff --git a/kde-base/superkaramba/superkaramba-3.5.0.ebuild b/kde-base/superkaramba/superkaramba-3.5.0.ebuild
index ade4fabebfd5..6909e19540db 100644
--- a/kde-base/superkaramba/superkaramba-3.5.0.ebuild
+++ b/kde-base/superkaramba/superkaramba-3.5.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/kde-base/superkaramba/superkaramba-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -13,5 +13,3 @@ IUSE=""
 
 RDEPEND="!x11-misc/superkaramba"
 
-# Remove for rc2.
-PATCHES="${FILESDIR}/kdeutils-3.5_rc1-unicode.patch"
diff --git a/kde-base/superkaramba/superkaramba-3.5.0_beta2.ebuild b/kde-base/superkaramba/superkaramba-3.5.0_beta2.ebuild
index 58c55396b1ca..7651dfe0adec 100644
--- a/kde-base/superkaramba/superkaramba-3.5.0_beta2.ebuild
+++ b/kde-base/superkaramba/superkaramba-3.5.0_beta2.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/kde-base/superkaramba/superkaramba-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="!x11-misc/superkaramba"
diff --git a/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild b/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild
index 20d36f0e6ca1..34120ba70e23 100644
--- a/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild
+++ b/kde-base/superkaramba/superkaramba-3.5.0_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/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -13,3 +13,5 @@ IUSE=""
 
 RDEPEND="!x11-misc/superkaramba"
 
+# Remove for rc2.
+PATCHES="${FILESDIR}/kdeutils-3.5_rc1-unicode.patch"
diff --git a/kde-base/superkaramba/superkaramba-3.5_beta1.ebuild b/kde-base/superkaramba/superkaramba-3.5_beta1.ebuild
index 01f79f4face2..c5d6f81217a7 100644
--- a/kde-base/superkaramba/superkaramba-3.5_beta1.ebuild
+++ b/kde-base/superkaramba/superkaramba-3.5_beta1.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/kde-base/superkaramba/superkaramba-3.5_beta1.ebuild,v 1.1 2005/09/22 21:37:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-3.5_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:49 chriswhite Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -8,7 +8,7 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="A tool to create interactive applets for the KDE desktop."
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="!x11-misc/superkaramba"
diff --git a/kde-base/umbrello/ChangeLog b/kde-base/umbrello/ChangeLog
index 541966ac569e..166170e054fd 100644
--- a/kde-base/umbrello/ChangeLog
+++ b/kde-base/umbrello/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for kde-base/umbrello
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+  25 Nov 2005; Markus Rothe <corsair@gentoo.org> umbrello-3.4.3.ebuild:
+  Stable on ppc64
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> umbrello-3.4.3.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> umbrello-3.4.3.ebuild:
+  Stable on sparc wrt #112842
+
+*umbrello-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+*umbrello-3.5.0_rc1 (12 Nov 2005)
+
+  12 Nov 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.5.0_rc1.ebuild:
+  Ebuild for new version 3.5.0_rc1.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> umbrello-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*umbrello-3.5.0_beta2 (14 Oct 2005)
+
+  14 Oct 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.5.0_beta2.ebuild:
+  New version.
+
+*umbrello-3.4.3 (13 Oct 2005)
+
+  13 Oct 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.4.3.ebuild:
+  New version.
+
+*umbrello-3.5_beta1-r1 (28 Sep 2005)
+
+  28 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/umbrello-qt-3.3.5.patch, +files/kdesdk-3.5_beta1-crash.patch,
+  -umbrello-3.5_beta1.ebuild, +umbrello-3.5_beta1-r1.ebuild:
+  Added patch to fix umbrello crash on starting.
+
+  26 Sep 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdesdk-3.5_beta1-compile.patch, umbrello-3.5_beta1.ebuild:
+  Add patch to fix compilation error (#107167).
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -umbrello-3.5_alpha1.ebuild:
+  Removed 3.5_alpha1.
+
+*umbrello-3.5_beta1 (22 Sep 2005)
+
+  22 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +umbrello-3.5_beta1.ebuild:
+  Bump to 3.5 beta1.
+
+*umbrello-3.5_alpha1 (07 Sep 2005)
+
+  07 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +umbrello-3.5_alpha1.ebuild:
+  Added 3.5_alpha1 split ebuild.
+
+*umbrello-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> umbrello-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> umbrello-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*umbrello-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> umbrello-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> umbrello-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> umbrello-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> umbrello-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*umbrello-3.4.0_rc1 (13 Mar 2005)
+
+  13 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> umbrello-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*umbrello-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +umbrello-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *umbrello-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/umbrello/Manifest b/kde-base/umbrello/Manifest
index 051d93098528..dc33c83b2a33 100644
--- a/kde-base/umbrello/Manifest
+++ b/kde-base/umbrello/Manifest
@@ -1,4 +1,19 @@
-MD5 1fba12d6d09554196be8ab879335593a umbrello-3.4.0_beta1.ebuild 292
-MD5 1fba12d6d09554196be8ab879335593a umbrello-3.4.0_alpha1.ebuild 292
-MD5 6fd89829eb39c6f490ef984b5bb6b1e6 files/digest-umbrello-3.4.0_alpha1 67
-MD5 a859d7dcb2c41d449cdccedc9f23f561 files/digest-umbrello-3.4.0_beta1 210
+MD5 3c601ac8f32bccc66a0e126d98a84713 ChangeLog 3798
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 15c59514c459c17d1785f7a7eaf3efea umbrello-3.4.1.ebuild 390
+MD5 d90d841849894a72dda6b8329d44183b umbrello-3.4.2.ebuild 398
+MD5 94d4e5502048ac39cc91428ad2bef924 umbrello-3.5_beta1-r1.ebuild 550
+MD5 d0743df4acc4a6d0f422454fa0c0b64e umbrello-3.4.3.ebuild 393
+MD5 bf769ffa174a4d2c7561c4cfbb1da22a umbrello-3.5.0_beta2.ebuild 383
+MD5 ab4aea069b2646bc5b097cdd43bb0c08 umbrello-3.5.0_rc1.ebuild 382
+MD5 c926e2a05e1d4766ca779f2cbc888999 umbrello-3.5.0.ebuild 378
+MD5 9b4e9e38740207531ab771519519d01e files/digest-umbrello-3.4.1 206
+MD5 0a38813829924b012d8b632f47abb45d files/digest-umbrello-3.4.2 280
+MD5 2dedaff6e076b2ee7b9ab8535fe74203 files/digest-umbrello-3.5_beta1-r1 67
+MD5 e909850d57bdca22b0b476f1acf0fd5d files/kdesdk-3.5_beta1-compile.patch 1406
+MD5 bb0014fd062d56a11c42435a49d483cb files/kdesdk-3.5_beta1-crash.patch 729
+MD5 0f4007b5db8e59debdab22a1e984546f files/umbrello-qt-3.3.5.patch 788
+MD5 c697e8b36b03bdccd95cf2d3980a0634 files/digest-umbrello-3.4.3 66
+MD5 b094a9766a49e423018d7721adbefd0c files/digest-umbrello-3.5.0_beta2 210
+MD5 9e49e2951bd6cc8a8bbe80e713128480 files/digest-umbrello-3.5.0_rc1 292
+MD5 469dcaaea437b61cd290836f62e67199 files/digest-umbrello-3.5.0 66
diff --git a/kde-base/umbrello/files/digest-umbrello-3.4.1 b/kde-base/umbrello/files/digest-umbrello-3.4.1
index f7fbaf0053c2..d6a2aec32ec5 100644
--- a/kde-base/umbrello/files/digest-umbrello-3.4.1
+++ b/kde-base/umbrello/files/digest-umbrello-3.4.1
@@ -1,2 +1,3 @@
 MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
 MD5 b7073f0f4ac7efe4d6ff33c1ba527668 kdesdk-3.4.1.tar.bz2 4589829
diff --git a/kde-base/umbrello/files/digest-umbrello-3.4.2 b/kde-base/umbrello/files/digest-umbrello-3.4.2
index 944cb4dff1ec..3632fcc7b99c 100644
--- a/kde-base/umbrello/files/digest-umbrello-3.4.2
+++ b/kde-base/umbrello/files/digest-umbrello-3.4.2
@@ -1 +1,4 @@
+MD5 5b88692972e65c5e7d3aafc6400bea2c kdesdk-3.4.0.tar.bz2 4571452
+MD5 f0b0c1d4f103a5013cc86980ccb47a0b kdesdk-3.4.0-3.4.1.tar.xdelta 255144
+MD5 319bb07efcccd47549342eedf78ef1a7 kdesdk-3.4.1-3.4.2.tar.xdelta 191608
 MD5 ec794b8f2a492a188cae8fb38208e1b9 kdesdk-3.4.2.tar.bz2 4596440
diff --git a/kde-base/umbrello/metadata.xml b/kde-base/umbrello/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/umbrello/metadata.xml
+++ b/kde-base/umbrello/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/umbrello/umbrello-3.4.1.ebuild b/kde-base/umbrello/umbrello-3.4.1.ebuild
index 0166f340653e..e036e83d50fe 100644
--- a/kde-base/umbrello/umbrello-3.4.1.ebuild
+++ b/kde-base/umbrello/umbrello-3.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/kde-base/umbrello/umbrello-3.4.1.ebuild,v 1.1 2005/05/25 21:23:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Umbrello UML Modeller"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
 IUSE=""
diff --git a/kde-base/umbrello/umbrello-3.4.2.ebuild b/kde-base/umbrello/umbrello-3.4.2.ebuild
index 49a7a2bc3301..e6d20069fcca 100644
--- a/kde-base/umbrello/umbrello-3.4.2.ebuild
+++ b/kde-base/umbrello/umbrello-3.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/kde-base/umbrello/umbrello-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/umbrello/umbrello-3.4.3.ebuild b/kde-base/umbrello/umbrello-3.4.3.ebuild
index dc39da6fa1b0..3e19e42be808 100644
--- a/kde-base/umbrello/umbrello-3.4.3.ebuild
+++ b/kde-base/umbrello/umbrello-3.4.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/kde-base/umbrello/umbrello-3.4.3.ebuild,v 1.1 2005/10/13 00:10:09 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.4.3.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,5 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Umbrello UML Modeller"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc ~x86"
 IUSE=""
diff --git a/kde-base/umbrello/umbrello-3.5.0.ebuild b/kde-base/umbrello/umbrello-3.5.0.ebuild
index 90b8212e3bb2..1b8a4ac48c7b 100644
--- a/kde-base/umbrello/umbrello-3.5.0.ebuild
+++ b/kde-base/umbrello/umbrello-3.5.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/kde-base/umbrello/umbrello-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/umbrello/umbrello-3.5.0_beta2.ebuild b/kde-base/umbrello/umbrello-3.5.0_beta2.ebuild
index 423a2789ceec..52ea6020cc3f 100644
--- a/kde-base/umbrello/umbrello-3.5.0_beta2.ebuild
+++ b/kde-base/umbrello/umbrello-3.5.0_beta2.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/kde-base/umbrello/umbrello-3.5.0_beta2.ebuild,v 1.1 2005/10/14 18:42:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
@@ -8,10 +8,5 @@ KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta eutils
 
 DESCRIPTION="KDE: Umbrello UML Modeller"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
-
-# Fix compilation. Applied for rc1.
-PATCHES="${FILESDIR}/kdesdk-3.5_beta1-compile.patch
-	${FILESDIR}/kdesdk-3.5_beta1-crash.patch
-	${FILESDIR}/umbrello-qt-3.3.5.patch"
diff --git a/kde-base/umbrello/umbrello-3.5.0_rc1.ebuild b/kde-base/umbrello/umbrello-3.5.0_rc1.ebuild
index 46a322b36a52..cca9b0425340 100644
--- a/kde-base/umbrello/umbrello-3.5.0_rc1.ebuild
+++ b/kde-base/umbrello/umbrello-3.5.0_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/kde-base/umbrello/umbrello-3.5.0_rc1.ebuild,v 1.1 2005/11/12 15:49:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild b/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild
index d632427fff84..7d9f4265c05e 100644
--- a/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild
+++ b/kde-base/umbrello/umbrello-3.5_beta1-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/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild,v 1.1 2005/09/28 14:19:24 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/umbrello/umbrello-3.5_beta1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 KMNAME=kdesdk
 MAXKDEVER=$PV
diff --git a/kde-base/unsermake/ChangeLog b/kde-base/unsermake/ChangeLog
index 1068440e74de..3f6444868b5b 100644
--- a/kde-base/unsermake/ChangeLog
+++ b/kde-base/unsermake/ChangeLog
@@ -1,6 +1,73 @@
 # ChangeLog for kde-base/unsermake
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/ChangeLog,v 1.1 2004/05/05 21:52:34 caleb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/ChangeLog,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  unsermake-0.3.1.4319.0.ebuild, unsermake-0.4.20050710.ebuild:
+  Don't use cp -a.
+
+  19 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  unsermake-0.3.0.4254.0.ebuild:
+  Stable on ppc.
+
+*unsermake-0.4.20050710 (11 Jul 2005)
+
+  11 Jul 2005; Caleb Tennis <caleb@gentoo.org>
+  -unsermake-0.4.20050628-r1.ebuild, +unsermake-0.4.20050710.ebuild:
+  New version
+
+  09 Jul 2005; Jason Wever <weeve@gentoo.org> unsermake-0.3.1.4319.0.ebuild:
+  Added ~sparc keyword.
+
+*unsermake-0.4.20050628-r1 (29 Jun 2005)
+
+  29 Jun 2005; Caleb Tennis <caleb@gentoo.org>
+  -unsermake-0.4.20050628.ebuild, +unsermake-0.4.20050628-r1.ebuild:
+  bump for directory structure fix
+
+*unsermake-0.4.20050628 (29 Jun 2005)
+
+  29 Jun 2005; Caleb Tennis <caleb@gentoo.org>
+  +unsermake-0.4.20050628.ebuild:
+  The latest version from KDE's svn repository.
+  
+  Install the python modules into python/site-packages, and unsermake into
+  /usr/bin. No more need for the UNSERMAKE environment variable.
+
+*unsermake-0.3.1.4319.0 (08 Dec 2004)
+
+  08 Dec 2004; Caleb Tennis <caleb@gentoo.org>
+  +unsermake-0.3.1.4319.0.ebuild:
+  version bump
+
+  13 Oct 2004; Caleb Tennis <caleb@gentoo.org> unsermake-0.3.0.4254.0.ebuild,
+  unsermake-0.3.1.4280.0.ebuild:
+  Change x86 keywording to work better
+
+*unsermake-0.3.1.4280.0 (12 Oct 2004)
+
+  12 Oct 2004; Caleb Tennis <caleb@gentoo.org>
+  +unsermake-0.3.1.4280.0.ebuild:
+  Version bump
+
+  16 Sep 2004; Caleb Tennis <caleb@gentoo.org>
+  -unsermake-0.0_pre20040505.ebuild:
+  new version, remove old versions
+
+  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  unsermake-0.3.0.4137.0.ebuild:
+  Masked unsermake-0.3.0.4137.0.ebuild stable for ppc
+
+*unsermake-0.3.0.4137.0 (30 Jul 2004)
+
+  30 Jul 2004; Caleb Tennis <caleb@gentoo.org> unsermake-0.3.0.4137.0.ebuild:
+  Try out a new version
+
+  27 Jul 2004; Travis Tilley <lv@gentoo.org> unsermake-0.0_pre20040505.ebuild:
+  added ~amd64 keyword
+
+  07 May 2004; David Holm <dholm@gentoo.org> unsermake-0.0_pre20040505.ebuild:
+  Added to ~ppc.
 
 *unsermake-0.0_pre20040505 (05 May 2004)
 
diff --git a/kde-base/unsermake/Manifest b/kde-base/unsermake/Manifest
index 7935dffd4793..9e290155c59c 100644
--- a/kde-base/unsermake/Manifest
+++ b/kde-base/unsermake/Manifest
@@ -1,3 +1,22 @@
-MD5 62e8228a71df01d4498bc0f1135070aa unsermake-0.0_pre20040505.ebuild 467
-MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 37bf9e355a6fc946ad1ab4a03452814c files/digest-unsermake-0.0_pre20040505 78
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 edd1d6ea8b697a4f04b735b764790a23 unsermake-0.3.1.4280.0.ebuild 858
+MD5 dacc026963d39d342f54871db3d7c1a5 ChangeLog 2422
+MD5 9baee2ce19c97f47dc0c5d8136cdaa5e unsermake-0.3.0.4137.0.ebuild 856
+MD5 41a4d7c565ecd4b2130752320aac6ff9 unsermake-0.3.0.4254.0.ebuild 857
+MD5 db2ec45f67176e6dccc5ce0775a7775c unsermake-0.4.20050710.ebuild 993
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 e67aaf30935675264a5d79b3d7a2383f unsermake-0.3.1.4319.0.ebuild 871
+MD5 1db98338b97657d85eb1d6ff88aa8997 files/digest-unsermake-0.4.20050710 74
+MD5 9b14dd6390ec5946a7b8972f5419d6df files/digest-unsermake-0.3.1.4319.0 75
+MD5 7442c1dc17d76eea53e54248028f0799 files/digest-unsermake-0.3.1.4280.0 75
+MD5 86b6b636b11dcd9e76c0fc0b161f6076 files/digest-unsermake-0.3.0.4137.0 75
+MD5 453e59b5f0ce93e5469631de617e93e4 files/digest-unsermake-0.3.0.4254.0 75
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC12Qj5H05b2HAEkRAnufAJ9L4mrKGDEVU6QJcpezNig8Z0mmaACeIwvx
+/uE8EYkibnwljZad0QDO9Cc=
+=XY8D
+-----END PGP SIGNATURE-----
diff --git a/kde-base/unsermake/metadata.xml b/kde-base/unsermake/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/unsermake/metadata.xml
+++ b/kde-base/unsermake/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/unsermake/unsermake-0.3.0.4137.0.ebuild b/kde-base/unsermake/unsermake-0.3.0.4137.0.ebuild
index 3df9c0579ec6..7e15a39a44fd 100644
--- a/kde-base/unsermake/unsermake-0.3.0.4137.0.ebuild
+++ b/kde-base/unsermake/unsermake-0.3.0.4137.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.3.0.4137.0.ebuild,v 1.1 2004/07/30 15:17:48 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.3.0.4137.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Unsermake - Advanced KDE build system"
 HOMEPAGE="http://wiki.kde.org/tiki-index.php?page=unsermake"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc ~amd64"
 LICENSE="GPL-2"
 SLOT=0
 
diff --git a/kde-base/unsermake/unsermake-0.3.0.4254.0.ebuild b/kde-base/unsermake/unsermake-0.3.0.4254.0.ebuild
index bc5d2290440b..13ff7f3bb4fe 100644
--- a/kde-base/unsermake/unsermake-0.3.0.4254.0.ebuild
+++ b/kde-base/unsermake/unsermake-0.3.0.4254.0.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/unsermake/unsermake-0.3.0.4254.0.ebuild,v 1.1 2004/09/16 15:59:22 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.3.0.4254.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Unsermake - Advanced KDE build system"
 HOMEPAGE="http://wiki.kde.org/tiki-index.php?page=unsermake"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 LICENSE="GPL-2"
 SLOT=0
 
diff --git a/kde-base/unsermake/unsermake-0.3.1.4280.0.ebuild b/kde-base/unsermake/unsermake-0.3.1.4280.0.ebuild
index 066c9e2d0ce2..9cdbb1335595 100644
--- a/kde-base/unsermake/unsermake-0.3.1.4280.0.ebuild
+++ b/kde-base/unsermake/unsermake-0.3.1.4280.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.3.1.4280.0.ebuild,v 1.1 2004/10/13 00:01:57 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.3.1.4280.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Unsermake - Advanced KDE build system"
 HOMEPAGE="http://wiki.kde.org/tiki-index.php?page=unsermake"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 SLOT=0
 
diff --git a/kde-base/unsermake/unsermake-0.3.1.4319.0.ebuild b/kde-base/unsermake/unsermake-0.3.1.4319.0.ebuild
index 26924b1c571f..a2534cb60458 100644
--- a/kde-base/unsermake/unsermake-0.3.1.4319.0.ebuild
+++ b/kde-base/unsermake/unsermake-0.3.1.4319.0.ebuild
@@ -1,12 +1,12 @@
-# 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/kde-base/unsermake/unsermake-0.3.1.4319.0.ebuild,v 1.1 2004/12/09 02:59:02 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.3.1.4319.0.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="Unsermake - Advanced KDE build system"
 HOMEPAGE="http://wiki.kde.org/tiki-index.php?page=unsermake"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT=0
 
@@ -21,7 +21,7 @@ src_compile()
 src_install()
 {
 	dodir /usr/kde/unsermake
-	cp -a ${S}/* ${D}/usr/kde/unsermake
+	cp -pPR ${S}/* ${D}/usr/kde/unsermake
 }
 
 pkg_postinst()
diff --git a/kde-base/unsermake/unsermake-0.4.20050710.ebuild b/kde-base/unsermake/unsermake-0.4.20050710.ebuild
index 9ffeddb94a93..1f4a32cc3cbf 100644
--- a/kde-base/unsermake/unsermake-0.4.20050710.ebuild
+++ b/kde-base/unsermake/unsermake-0.4.20050710.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/kde-base/unsermake/unsermake-0.4.20050710.ebuild,v 1.1 2005/07/11 23:07:11 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/unsermake/unsermake-0.4.20050710.ebuild,v 1.1.1.1 2005/11/30 10:13:43 chriswhite Exp $
 
 inherit python
 
@@ -27,9 +27,9 @@ src_install()
 	python_version
 	UNSERMAKEDIR=/usr/lib/python${PYVER}/site-packages/unsermake/
 	dodir ${UNSERMAKEDIR}
-	cp -a ${S}/*.py ${D}/${UNSERMAKEDIR}
-	cp -a ${S}/*.um ${D}/${UNSERMAKEDIR}
-	cp -a ${S}/unsermake ${D}/${UNSERMAKEDIR}
+	cp -pPR ${S}/*.py ${D}/${UNSERMAKEDIR}
+	cp -pPR ${S}/*.um ${D}/${UNSERMAKEDIR}
+	cp -pPR ${S}/unsermake ${D}/${UNSERMAKEDIR}
 	dodir /usr/bin
 	dosym ${UNSERMAKEDIR}/unsermake /usr/bin/unsermake
 }
diff --git a/kde-base/vimpart/ChangeLog b/kde-base/vimpart/ChangeLog
index a5d117c93e22..a913ba25a5d6 100644
--- a/kde-base/vimpart/ChangeLog
+++ b/kde-base/vimpart/ChangeLog
@@ -1,6 +1,70 @@
 # ChangeLog for kde-base/vimpart
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/vimpart/ChangeLog,v 1.1 2005/01/15 02:24:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/vimpart/ChangeLog,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
+
+  25 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> vimpart-3.4.2.ebuild:
+  Stable on amd64, bug 112842.
+
+  24 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> vimpart-3.4.2.ebuild:
+  Stable on sparc wrt #112842
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ChangeLog:
+  Adding ~x86 to keywords
+
+  08 Aug 2005; Bryan Østergaard <kloeri@gentoo.org> vimpart-3.4.2.ebuild:
+  ~alpha keyword.
+
+*vimpart-3.4.2 (28 Jul 2005)
+
+  28 Jul 2005; Dan Armak <danarmak@gentoo.org> +vimpart-3.4.2.ebuild:
+  Version bump to 3.4.2.
+
+  08 Jul 2005; Jason Wever <weeve@gentoo.org> vimpart-3.4.1.ebuild:
+  Stable on SPARC.
+
+  01 Jul 2005; Lars Weiler <pylon@gentoo.org> vimpart-3.4.1.ebuild:
+  Stable on ppc; Bug #97544.
+
+  01 Jul 2005; Markus Rothe <corsair@gentoo.org> vimpart-3.4.1.ebuild:
+  Stable on ppc64 (bug #97544)
+
+*vimpart-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +vimpart-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  27 Apr 2005; Markus Rothe <corsair@gentoo.org> vimpart-3.4.0.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  25 Mar 2005; Jason Wever <weeve@gentoo.org> vimpart-3.4.0.ebuild:
+  Added ~sparc keyword.
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> vimpart-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> vimpart-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+  09 Mar 2005; Marcus D. Hanwell <cryos@gentoo.org> vimpart-3.4.0_rc1.ebuild:
+  Marked ~amd64, keywording KDE split ebuilds, bug 80944.
+
+*vimpart-3.4.0_rc1 (28 Feb 2005)
+
+  28 Feb 2005; Dan Armak <danarmak@gentoo.org> vimpart-3.4.0_beta1.ebuild,
+  vimpart-3.4.0_beta2.ebuild, vimpart-3.4.0_rc1.ebuild:
+  Fix name of patch: it wasn't being applied.
+
+  27 Feb 2005; Dan Armak <danarmak@gentoo.org> :
+  Ebuild for 3.4.0 RC1.
+
+*vimpart-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +vimpart-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
 
 *vimpart-3.4.0_beta1 (15 Jan 2005)
 
diff --git a/kde-base/vimpart/Manifest b/kde-base/vimpart/Manifest
index f55189814d91..c9d6cae1a0bb 100644
--- a/kde-base/vimpart/Manifest
+++ b/kde-base/vimpart/Manifest
@@ -1,5 +1,17 @@
-MD5 5bde722f00c18ba148edd049a2e297ba vimpart-3.4.0_alpha1.ebuild 449
-MD5 5bde722f00c18ba148edd049a2e297ba vimpart-3.4.0_beta1.ebuild 449
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c8f62e442111a4c16d71b6b7eec90ab5 ChangeLog 2654
+MD5 60c005ebe876a0e127dcf1083620803e files/digest-vimpart-3.4.1 215
+MD5 aef1ad04d3f153a78e0b5aa9742d6f9e files/digest-vimpart-3.4.2 291
 MD5 3bec1549e74c6f661045a83198e45290 files/kdeaddons-3.2.0-kvim.diff 363
-MD5 723a604383a2fd8238013a8b609a62f3 files/digest-vimpart-3.4.0_beta1 219
-MD5 b47f9ddbd93d3dd0541fa87746a9fa34 files/digest-vimpart-3.4.0_alpha1 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 74c652e19ac74ee8a1189ca4c79aa401 vimpart-3.4.1.ebuild 574
+MD5 48bb4dcf6c55df15d0d9f054a210e064 vimpart-3.4.2.ebuild 587
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDhxpMntT9W3vfTuoRAo11AKCXcPhpePkfrLjtF8ckc1lVr6AJNwCgmpTM
+J8N1aRPQoi74nt1GBhA/JAA=
+=NEah
+-----END PGP SIGNATURE-----
diff --git a/kde-base/vimpart/files/digest-vimpart-3.4.1 b/kde-base/vimpart/files/digest-vimpart-3.4.1
index 99edca6ae169..ac541cbf683c 100644
--- a/kde-base/vimpart/files/digest-vimpart-3.4.1
+++ b/kde-base/vimpart/files/digest-vimpart-3.4.1
@@ -1,2 +1,3 @@
 MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
 MD5 596c3a7f4ef43e2f0bd760196a6b119b kdeaddons-3.4.1.tar.bz2 1626243
diff --git a/kde-base/vimpart/files/digest-vimpart-3.4.2 b/kde-base/vimpart/files/digest-vimpart-3.4.2
index 554aacd0d674..d18c8d182c14 100644
--- a/kde-base/vimpart/files/digest-vimpart-3.4.2
+++ b/kde-base/vimpart/files/digest-vimpart-3.4.2
@@ -1 +1,4 @@
+MD5 5a0d82ee1bbaeec8dab74b2e5e604f94 kdeaddons-3.4.0.tar.bz2 1670919
+MD5 7daf24bcbf6d211786530c2c86e133d5 kdeaddons-3.4.0-3.4.1.tar.xdelta 120597
+MD5 a136d5b24644463068d75266d5686a0b kdeaddons-3.4.1-3.4.2.tar.xdelta 93540
 MD5 af4fc7fa0dde8894b9d9582ecef7df2a kdeaddons-3.4.2.tar.bz2 1591335
diff --git a/kde-base/vimpart/metadata.xml b/kde-base/vimpart/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/vimpart/metadata.xml
+++ b/kde-base/vimpart/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/vimpart/vimpart-3.4.1.ebuild b/kde-base/vimpart/vimpart-3.4.1.ebuild
index d1d7118d5c9c..6d5aa46c6c01 100644
--- a/kde-base/vimpart/vimpart-3.4.1.ebuild
+++ b/kde-base/vimpart/vimpart-3.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/vimpart/vimpart-3.4.1.ebuild,v 1.1 2005/05/25 21:23:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/vimpart/vimpart-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdeaddons
 MAXKDEVER=$PV
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE embeddable VIM editor part"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 DEPEND=""
 
diff --git a/kde-base/vimpart/vimpart-3.4.2.ebuild b/kde-base/vimpart/vimpart-3.4.2.ebuild
index d71a4f91570b..b3fd5e6da357 100644
--- a/kde-base/vimpart/vimpart-3.4.2.ebuild
+++ b/kde-base/vimpart/vimpart-3.4.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/vimpart/vimpart-3.4.2.ebuild,v 1.1 2005/07/28 21:16:26 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/vimpart/vimpart-3.4.2.ebuild,v 1.1.1.1 2005/11/30 10:13:15 chriswhite Exp $
 KMNAME=kdeaddons
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="KDE embeddable VIM editor part"
-KEYWORDS=" ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~ppc64 sparc ~x86"
 IUSE=""
 DEPEND=""
 
 # use /usr/bin/kvim not /usr/bin/vim
 # fixes 33257
 # is gentoo-specific and wont go upstream, so continue to apply to future versions
-PATCHES=$FILESDIR/kdeaddons-3.2.0-kvim.diff
\ No newline at end of file
+PATCHES=$FILESDIR/kdeaddons-3.2.0-kvim.diff
diff --git a/kde-base/xparts/ChangeLog b/kde-base/xparts/ChangeLog
index 0a252568a0c3..c69996d42b03 100644
--- a/kde-base/xparts/ChangeLog
+++ b/kde-base/xparts/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for kde-base/xparts
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/ChangeLog,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/ChangeLog,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
+
+*xparts-3.5.0 (22 Nov 2005)
+
+  33 Nov 2005; Dan Armak <danarmak@gentoo.org> +xparts-3.5.0.ebuild:
+  Ebuilds for KDE 3.5.0 final. It is not yet released, and is package.masked.
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> xparts-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> xparts-3.5.0_beta2.ebuild:
+  Adding ~x86 to keywords
+
+*xparts-3.5.0_beta2 (19 Oct 2005)
+
+  19 Oct 2005; Dan Armak <danarmak@gentoo.org> +xparts-3.5.0_beta2.ebuild:
+  New version. Reminder: prerelease versions are permanently package.masked.
+
+*xparts-3.4.1 (25 May 2005)
+
+  25 May 2005; Dan Armak <danarmak@gentoo.org> +xparts-3.4.1.ebuild:
+  Ebuilds for KDE 3.4.1. These are package.masked until 3.4.1 is actually
+  released. You can't get the tarballs yet.
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> xparts-3.3.1.ebuild,
+  xparts-3.4.0.ebuild:
+  change dep from net-www/mozilla to www-client/mozilla
+
+  18 Mar 2005; Daniel Goller <morfic@gentoo.org> xparts-3.4.0.ebuild:
+  Added to ~ppc
+
+  13 Mar 2005; Dan Armak <danarmak@gentoo.org> xparts-3.4.0.ebuild:
+  KDE 3.4.0 ebuilds. Note that the tarballs won't be officially released for a
+  few more days.
+
+*xparts-3.4.0_beta2 (05 Feb 2005)
+
+  05 Feb 2005; Dan Armak <danarmak@gentoo.org> +xparts-3.4.0_beta2.ebuild:
+  Ebuild for 3.4.0_beta2. Note that beta2 has NOT been released as of this
+  date. This ebuild is for inside testing by the KDE team, and is of course
+  package.masked.
+
+  10 Dec 2004; Dan Armak <danarmak@gentoo.org> files/no-gtk-glib-check.diff,
+  xparts-3.3.1.ebuild:
+  Fixed compile failure when gtk is not installed.
+
+  25 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
+
+  17 Nov 2004; Dan Armak <danarmak@gentoo.org> xparts-3.3.1.ebuild:
+  Unmasked in package.mask; removing all keywords - this package is broken for
+  now
 
 *xparts-3.3.1 (06 Nov 2004)
 
diff --git a/kde-base/xparts/Manifest b/kde-base/xparts/Manifest
index 15262f631b25..a12c81cea24b 100644
--- a/kde-base/xparts/Manifest
+++ b/kde-base/xparts/Manifest
@@ -1,3 +1,11 @@
-MD5 a7050ab1ab7824505a2b16df7ce414ce xparts-3.3.1.ebuild 1084
-MD5 5b4709a4940e69ed965855ca38b4ee56 files/no-gtk-glib-check.diff 596
-MD5 5f7bc498021ed9d126a6a3bd40c5614e files/digest-xparts-3.3.1 147
+MD5 723bba88df98611a290c417ba53df044 ChangeLog 2457
+MD5 6830fc45ae55313b9f8515babcf58b79 files/digest-xparts-3.3.1 71
+MD5 6a7b860a285423d0fc6516e274fcaaea files/digest-xparts-3.4.1 221
+MD5 b3d2330daa33ba3077c0a2e5d0ffaa31 files/digest-xparts-3.5.0 71
+MD5 7b7cadef2c4eb7dc5409c01c4e689481 files/digest-xparts-3.5.0_beta2 225
+MD5 ffe26fb6d5d193883dfebd69250df2e5 files/no-gtk-glib-check.diff 949
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 ca9550c47090fc658c5e454dc7069f9c xparts-3.3.1.ebuild 1244
+MD5 14e232766ea82cd9591e2c5be9b94194 xparts-3.4.1.ebuild 1201
+MD5 53de29ac424890698c3f15d20df1bace xparts-3.5.0.ebuild 1196
+MD5 f18a4155e4f4013c52d0ae4e2de9e8fc xparts-3.5.0_beta2.ebuild 1208
diff --git a/kde-base/xparts/files/digest-xparts-3.3.1 b/kde-base/xparts/files/digest-xparts-3.3.1
index 4954b8c5ecfb..a16df2f0cf51 100644
--- a/kde-base/xparts/files/digest-xparts-3.3.1
+++ b/kde-base/xparts/files/digest-xparts-3.3.1
@@ -1,2 +1 @@
 MD5 fd64783a92e66a2405b9e25f7322c222 kdebindings-3.3.1.tar.bz2 7168111
-MD5 417a805ec322808f5652e963623af24a xparts-3.3.1-0-makefiles.tar.bz2 22230
diff --git a/kde-base/xparts/files/digest-xparts-3.4.1 b/kde-base/xparts/files/digest-xparts-3.4.1
index 6e4205dc862e..5b7e04575b24 100644
--- a/kde-base/xparts/files/digest-xparts-3.4.1
+++ b/kde-base/xparts/files/digest-xparts-3.4.1
@@ -1,2 +1,3 @@
 MD5 bac87a665ce5e5704f48336122052fb4 kdebindings-3.4.0.tar.bz2 7161497
+MD5 454af86dd8b9cd81b3beb31bd0260fdf kdebindings-3.4.0-3.4.1.tar.xdelta 792004
 MD5 18a4e2c42d34bb86279e691498482951 kdebindings-3.4.1.tar.bz2 7219233
diff --git a/kde-base/xparts/files/no-gtk-glib-check.diff b/kde-base/xparts/files/no-gtk-glib-check.diff
index 90fe098df490..ad9a6fb8977a 100644
--- a/kde-base/xparts/files/no-gtk-glib-check.diff
+++ b/kde-base/xparts/files/no-gtk-glib-check.diff
@@ -1,5 +1,6 @@
---- Makefile.am.orig	2004-10-08 15:23:14.000000000 +0200
-+++ Makefile.am	2004-10-29 22:01:41.662032792 +0200
+diff -urN Makefile.am Makefile.am
+--- Makefile.am	2004-11-29 17:08:25.000000000 +0200
++++ Makefile.am	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -9,8 +10,9 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
---- Makefile.am.in.orig	2004-08-05 21:57:23.000000000 +0300
-+++ Makefile.am.in	2004-10-29 22:01:45.358470848 +0200
+diff -urN Makefile.am.in Makefile.am.in
+--- Makefile.am.in	2004-08-05 21:57:23.000000000 +0300
++++ Makefile.am.in	2004-12-10 20:56:30.534024600 +0200
 @@ -14,8 +14,6 @@
  
  AUTOMAKE_OPTIONS = foreign 1.5
@@ -20,3 +22,16 @@
  EXTRA_DIST = admin 
  
  include admin/deps.am
+diff -urN configure.in.in configure.in.in
+--- configure.in.in	2004-10-03 09:11:28.000000000 +0200
++++ configure.in.in	2004-12-10 20:56:37.916902232 +0200
+@@ -104,9 +104,6 @@
+ 
+ ])
+ 
+-AM_PATH_GLIB([1.2.6])
+-AM_PATH_GTK([1.2.6])
+-
+ # check for CSANT compiler
+ 
+ AC_DEFUN([KDE_CHECK_CSANT],[
diff --git a/kde-base/xparts/metadata.xml b/kde-base/xparts/metadata.xml
index 1a4592f97a10..8d1e86a9cefb 100644
--- a/kde-base/xparts/metadata.xml
+++ b/kde-base/xparts/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>kde-core</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/xparts/xparts-3.3.1.ebuild b/kde-base/xparts/xparts-3.3.1.ebuild
index 36cbfd85e088..287d06326c0b 100644
--- a/kde-base/xparts/xparts-3.3.1.ebuild
+++ b/kde-base/xparts/xparts-3.3.1.ebuild
@@ -1,10 +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/kde-base/xparts/xparts-3.3.1.ebuild,v 1.1 2004/11/06 17:23:33 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
 KMCOPYLIB="libdcopc dcopc"
+KM_MAKEFILESREV=1
+MAXKDEVER=3.3.2
+KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Allows embedding of generic XParts as KDE KParts (broken)"
@@ -12,13 +15,13 @@ KEYWORDS="~x86"
 IUSE="mozilla"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
-	mozilla? ( net-www/mozilla )"
+	mozilla? ( www-client/mozilla )"
 PATCHES="$FILESDIR/no-gtk-glib-check.diff"
 
 pkg_setup() {
-    ewarn "This is considered to be broken by upstream. You're on your own."
+	ewarn "This is considered to be broken by upstream. You're on your own."
 }
-	
+
 src_unpack() {
 	kde-meta_src_unpack
 
diff --git a/kde-base/xparts/xparts-3.4.1.ebuild b/kde-base/xparts/xparts-3.4.1.ebuild
index 3d139f55cc89..224df4570262 100644
--- a/kde-base/xparts/xparts-3.4.1.ebuild
+++ b/kde-base/xparts/xparts-3.4.1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.4.1.ebuild,v 1.1 2005/05/25 21:23:15 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
 KMCOPYLIB="libdcopc dcopc"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.4.3
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Allows embedding of generic XParts as KDE KParts"
-KEYWORDS="~x86 ~amd64" # broken according to upstream - 3.4a1 README
+KEYWORDS="x86 amd64 ~ppc" # broken according to upstream - 3.4a1 README
 IUSE="mozilla"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
diff --git a/kde-base/xparts/xparts-3.5.0.ebuild b/kde-base/xparts/xparts-3.5.0.ebuild
index 54d75e0de78f..d79b4c0ead0d 100644
--- a/kde-base/xparts/xparts-3.5.0.ebuild
+++ b/kde-base/xparts/xparts-3.5.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/kde-base/xparts/xparts-3.5.0.ebuild,v 1.1 2005/11/22 22:14:16 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
diff --git a/kde-base/xparts/xparts-3.5.0_beta2.ebuild b/kde-base/xparts/xparts-3.5.0_beta2.ebuild
index 75ffa564eaf2..eff8d7111968 100644
--- a/kde-base/xparts/xparts-3.5.0_beta2.ebuild
+++ b/kde-base/xparts/xparts-3.5.0_beta2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.5.0_beta2.ebuild,v 1.1 2005/10/19 18:38:42 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/xparts/xparts-3.5.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:13:58 chriswhite Exp $
 
 KMNAME=kdebindings
 KMEXTRACTONLY="dcopc"
 KMCOPYLIB="libdcopc dcopc"
 KM_MAKEFILESREV=1
-MAXKDEVER=$PV
+MAXKDEVER=3.5.0_rc1
 KM_DEPRANGE="$PV $MAXKDEVER"
 inherit kde-meta
 
 DESCRIPTION="Allows embedding of generic XParts as KDE KParts"
-KEYWORDS="~amd64" # broken according to upstream - 3.4a1 README
+KEYWORDS="~amd64 ~x86" # broken according to upstream - 3.4a1 README
 IUSE="mozilla"
 DEPEND="=dev-libs/glib-1.2*
 	=x11-libs/gtk+-1.2*
diff --git a/mail-filter/amavisd-new/ChangeLog b/mail-filter/amavisd-new/ChangeLog
index c0fb21238eaa..d477d2059136 100644
--- a/mail-filter/amavisd-new/ChangeLog
+++ b/mail-filter/amavisd-new/ChangeLog
@@ -1,6 +1,300 @@
-# ChangeLog for net-mail/amavisd-new
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.1 2004/06/03 06:45:44 seemant Exp $
+# ChangeLog for mail-filter/amavisd-new
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/ChangeLog,v 1.1.1.1 2005/11/30 10:12:04 chriswhite Exp $
+
+  26 Oct 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  amavisd-new-2.3.3-r2.ebuild:
+  Stable on amd64, bug 110289.
+
+  26 Oct 2005; Brent Baude <ranger@gentoo.org> amavisd-new-2.3.3-r2.ebuild:
+  Marking amavisd-new-2.3.3-r2 ppc64  stable per bug 110289
+
+  24 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  amavisd-new-2.3.3-r2.ebuild:
+  stable on alpha as per bug #110289
+
+  24 Oct 2005; Brent Baude <ranger@gentoo.org> amavisd-new-2.3.3-r1.ebuild:
+  Marking amavisd-new-2.3.3-r1 stable per bug 110289
+
+*amavisd-new-2.3.3-r2 (24 Oct 2005)
+
+  24 Oct 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/amavisd-new-2.3.3-bsmtp-quarantine.patch,
+  +amavisd-new-2.3.3-r2.ebuild:
+  Applied patch from Thomas Jarosch to prevent quarantine misbehavior if
+  stored as BSMTP files. Security bug #110289.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  amavisd-new-2.3.3-r1.ebuild:
+  Mark 2.3.3-r1 stable on alpha
+
+  12 Oct 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3-r1.ebuild:
+  Stable on x86.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.3.3.ebuild:
+  Stable on ppc64
+
+*amavisd-new-2.3.3-r1 (22 Sep 2005)
+
+  22 Sep 2005; Andrej Kacian <ticho@gentoo.org>
+  +amavisd-new-2.3.3-r1.ebuild:
+  Install amavisd-release utility. Closes bug #100329, reported by valli
+  <gentoo at valli.org>.
+
+  22 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  amavisd-new-2.3.3.ebuild:
+  stable on alpha
+
+  22 Sep 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.3.ebuild:
+  Stable on x86.
+
+  17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  amavisd-new-2.3.2.ebuild:
+  Stable on amd64.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> amavisd-new-2.3.2.ebuild:
+  Mark 2.3.2 stable on alpha
+
+*amavisd-new-2.3.3 (25 Aug 2005)
+
+  25 Aug 2005; Andrej Kacian <ticho@gentoo.org> +amavisd-new-2.3.3.ebuild:
+  Version bump. Bug #103668. Also move user and group creation to pkg_preinst().
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org> -amavisd-new-2.2.1.ebuild,
+  -amavisd-new-2.2.1-r1.ebuild, amavisd-new-2.2.1-r2.ebuild,
+  amavisd-new-2.3.0.ebuild, amavisd-new-2.3.1.ebuild,
+  amavisd-new-2.3.2.ebuild:
+  Removed old ebuilds. Use -1 as shell argument for enewuser, bug #103421.
+
+  04 Aug 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.2.ebuild:
+  Require >=perl-ldap-0.33. See bug #100198.
+
+  24 Jul 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.3.2.ebuild:
+  Stable on ppc64
+
+  22 Jul 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.2.ebuild:
+  Stable on x86.
+
+  09 Jul 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.3.1.ebuild:
+  Stable on ppc64
+
+  08 Jul 2005; Andrej Kacian <ticho@gentoo.org> files/amavisd.rc6:
+  'use logger' instead of 'need logger', as suggested by Jakub Moc <jakub at
+  gentoo.org>.
+
+  07 Jul 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.1.ebuild,
+  amavisd-new-2.3.2.ebuild:
+  2.3.1 stable on x86. Ordered KEYWORDS alphabetically.
+
+  07 Jul 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.2.1.ebuild,
+  amavisd-new-2.2.1-r1.ebuild, amavisd-new-2.2.1-r2.ebuild,
+  amavisd-new-2.3.0.ebuild, amavisd-new-2.3.1.ebuild, amavisd-new-2.3.2.ebuild:
+  Fix typo in postinstallation instructions. Bug #98069, by Mathieu Nantel
+  <mnantel at teclinux.com>.
+
+*amavisd-new-2.3.2 (30 Jun 2005)
+
+  30 Jun 2005; Andrej Kacian <ticho@gentoo.org> +amavisd-new-2.3.2.ebuild:
+  Version bump. Let portage keep track of razor config files (bug #96917, by
+  Kerin Millar <kerframil at gmail.com>).
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.3.0.ebuild:
+  Stable on ppc64
+
+  01 Jun 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.0.ebuild,
+  amavisd-new-2.3.1.ebuild:
+  Display a warning if <=spamassassin-3 is installed. Closes bug #94778, by
+  Christian Zuckschwerdt <zany@triq.net>.
+
+  31 May 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.0.ebuild:
+  Stable on x86.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.3.1.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1-r2.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.3.0.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1-r1.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.3.1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1-r2.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.3.0.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1-r1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-2.2.1-r1.ebuild, amavisd-new-2.2.1-r2.ebuild,
+  amavisd-new-2.2.1.ebuild, amavisd-new-2.3.0.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
+
+  17 May 2005; Andrej Kacian <ticho@gentoo.org>
+  files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch:
+  Fixed QUARANTINEDIR in the config patch. Bug #92954, by Ed Wildgoose <gentoo
+  at wildgooses com>.
+
+*amavisd-new-2.3.1 (10 May 2005)
+
+  10 May 2005; Andrej Kacian <ticho@gentoo.org> +amavisd-new-2.3.1.ebuild:
+  Version bump, reported by Sune Kloppenborg Jeppesen <jaervosz@gentoo.org>.
+  Also removed dependency on dev-perl/Digest-MD5, since Digest::MD5 is now
+  part of perl distribution.
+
+  08 May 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.3.0.ebuild:
+  Fixed qmail-lp-fix patch name for 2.3.0. Thanks go to Francesco Riosa
+  <francesco@pnpitalia.it> for reporting this.
+
+  08 May 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.2.1-r2.ebuild,
+  amavisd-new-2.3.0.ebuild:
+  Added amavisd.conf permission/ownership change to pkg_postinst(), as
+  suggested by Marius Mauch <genone@gentoo.org>.
+
+  06 May 2005; Andrej Kacian <ticho@gentoo.org> amavisd-new-2.2.1-r2.ebuild,
+  amavisd-new-2.3.0.ebuild:
+  Added a warning message regarding bug #91426.
+
+*amavisd-new-2.2.1-r2 (04 May 2005)
+
+  04 May 2005; Andrej Kacian <ticho@gentoo.org>
+  +amavisd-new-2.2.1-r2.ebuild:
+  Version bump on both stable (x86) version to fix security bug #91426 -
+  unsafe amavisd.conf file permissions. Reported by Romang
+  <zataz@zataz.net>.
+
+*amavisd-new-2.3.0 (01 May 2005)
+
+  01 May 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch,
+  +amavisd-new-2.3.0.ebuild:
+  Version bump, along with an ebuild improvement by Christian Zoffoli
+  <xmerlin@gentoo.org>. Closes bug #85756.
+
+*amavisd-new-2.2.1-r1 (20 Apr 2005)
+
+  20 Apr 2005; Andrej Kacian <ticho@gentoo.org>
+  +amavisd-new-2.2.1-r1.ebuild:
+  Revision bump to update dependency on dev-perl/Convert-UUlib. Security bug
+  89501.
+
+  13 Apr 2005; Simon Stelling <blubb@gentoo.org> amavisd-new-2.2.1.ebuild:
+  stable on amd64
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> amavisd-new-2.2.1.ebuild:
+  Stable on ppc64
+
+  05 Mar 2005; TuẼn Văn <langthang@gentoo.org> amavisd-new-2.2.1.ebuild:
+  x86 stable.
+
+  24 Jan 2005; TuẼn Văn <langthang@gentoo.org> amavisd-new-2.2.1.ebuild:
+  tuned deps by Christian Zoffoli <xmerlin@gentoo.org>. Bug #79360.
+
+*amavisd-new-2.2.1 (19 Jan 2005)
+
+  19 Jan 2005; TuẼn Văn <langthang@gentoo.org>
+  +files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch,
+  +files/amavisd-new-2.2.1-qmail-lf-workaround.patch,
+  +amavisd-new-2.2.1.ebuild:
+  Remove amavisd-new-20041222.ebuild. Bring in the ebuild attached in bug
+  #77425 as previous was missing some of the improvements. Thanks to Sune
+  Kloppenborg Jeppesen <jaervosz@gentoo.org>, Christian Zoffoli
+  <xmerlin@gentoo.org> and everyone have contributed.
+
+*amavisd-new-0.20040701 (19 Jan 2005)
+
+  19 Jan 2005; TuẼn Văn <langthang@gentoo.org>
+  +amavisd-new-0.20040701.ebuild, -amavisd-new-20040701.ebuild:
+  rename amavisd-new-20040701 to amavisd-new-0.20040701
+
+  19 Jan 2005; TuẼn Văn <langthang@gentoo.org>
+  -files/addr_extensions_in_sql.patch, -files/lost_connection.patch,
+  -files/sql_timeout.patch, -amavisd-new-20030616_p8.ebuild,
+  -amavisd-new-20030616_p9.ebuild:
+  remove old ebuilds.
+
+*amavisd-new-20041222 (18 Jan 2005)
+
+  18 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +amavisd-new-20041222.ebuild:
+  New version. 2 new helper apps, new config.
+
+  29 Dec 2004; Markus Rothe <corsair@gentoo.org> amavisd-new-20040701.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Dec 2004; Tuan Van <langthang@gentoo.org> amavisd-new-20040701.ebuild:
+  add app-arch/cabextract to RDEPEND. Bug #65248.
+  apply courier patch. Bug #52291.
+  stable on x86 in preparing to abandon date versioning scheme.
+
+  02 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  amavisd-new-20040701.ebuild:
+  Keyword ~alpha, bug 66068.
+
+  27 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  amavisd-new-20040701.ebuild:
+  Corrected perl dep for MIME-tools to reflect the "real" current MIME-tools,
+  not the badly labeled one.
+
+  15 Aug 2004; Jason Wever <weeve@gentoo.org> amavisd-new-20040701.ebuild:
+  Added ~sparc keyword wrt bug #59010.
+
+  31 Jul 2004; Cory Visi <merlin@gentoo.org> amavisd-new-20040701.ebuild:
+  sparc and amd64 keywords were removed last commit; add back amd64 keyword as
+  the dependency on freeze is fixed, opened bug for sparc keyword; added
+  SpamAssassin detection logic to address Bug 58728
+
+  29 Jul 2004; Cory Visi <merlin@gentoo.org> files/amavisd.conf:
+  Removed stray character from amavisd.conf, closing Bug 58697
+
+  29 Jul 2004; Cory Visi <merlin@gentoo.org> amavisd-new-20040701.ebuild:
+  Fix sed logic on init script, closing Bug 58727
+
+*amavisd-new-20040701 (28 Jul 2004)
+
+  28 Jul 2004; Cory Visi <merlin@gentoo.org> amavisd-new-20040701.ebuild,
+  files/amavisd.conf:
+  New official release (v2) - see Bug 56233 for details; numerous app and ebuild
+  changes
+
+  15 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  amavisd-new-20030616_p8.ebuild, amavisd-new-20030616_p9.ebuild:
+  create /var/virusmails directory
+  fixes Bug #47624, Thanks to Davin Boling <davin@postmark.net>
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> amavisd-new-20030616_p9.ebuild:
+  Added to ~ppc.
+
+  03 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
+  amavisd-new-20030616_p8.ebuild, amavisd-new-20030616_p9.ebuild:
+  Change dev-perl/Mail-SpamAssassin to mail-filter/spamassassin in DEPEND strings
 
 *amavisd-new-20030616_p8 (02 Jun 2004)
 
diff --git a/mail-filter/amavisd-new/Manifest b/mail-filter/amavisd-new/Manifest
index b759e1449ea1..baeb4d4b401a 100644
--- a/mail-filter/amavisd-new/Manifest
+++ b/mail-filter/amavisd-new/Manifest
@@ -1,10 +1,31 @@
-MD5 1f1f4cf9c92f92f966361a8ac08aa543 files/amavisd.rc6 305
-MD5 0c677a1cb17705ea75841cabd5d14634 files/digest-amavisd-new-20030616_p8 75
-MD5 f45025857b1aaeeb225782bf7f35c5c3 files/addr_extensions_in_sql.patch 10222
-MD5 0a2364d819d448c49ea72dfe8c2a109a files/digest-amavisd-new-20030616_p9 75
-MD5 b9ac0b985d0cb7da0ab45fa22ebe38c8 files/lost_connection.patch 567
-MD5 3256d64018bee64fa34ed62fb93e44af files/sql_timeout.patch 3282
-MD5 7f1cfdf2c440b5fbe641896ce05ce61c ChangeLog 4130
-MD5 2d5e57cf8d2e3fe7f732094202816f39 amavisd-new-20030616_p8.ebuild 2589
-MD5 8ea5e2ba914fdb717d548ff5f1164959 amavisd-new-20030616_p9.ebuild 2855
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 349200a4e89133278a05775dbf040001 ChangeLog 15498
+MD5 37f2d574a0d3587ed447df3872b842b4 amavisd-new-2.2.1-r2.ebuild 5075
+MD5 59cb95aa4e4ba0f79bffff4edf70e083 amavisd-new-2.3.0.ebuild 5172
+MD5 2ff214f0341b527c1869559c83fb3b4d amavisd-new-2.3.1.ebuild 5156
+MD5 6456afc858f873606f288f47712ad0b9 amavisd-new-2.3.2.ebuild 5386
+MD5 0a5d0d62559d548c3a234d6c268468f8 amavisd-new-2.3.3-r1.ebuild 5431
+MD5 3e669cdc19b7b88c8a3dd1b867eff729 amavisd-new-2.3.3-r2.ebuild 5501
+MD5 5c931181fd3738ed4ec09bdbe5c731bd amavisd-new-2.3.3.ebuild 5413
+MD5 ccd66b725ef1b2e2ed20d4a1057b03b8 files/amavisd-new-2.2.1-amavisd.conf-gentoo.patch 6849
+MD5 ee33de51df853bd8426a4304f264245f files/amavisd-new-2.2.1-qmail-lf-workaround.patch 688
+MD5 a9c49eb16b5fa7dfecd54a436bc07200 files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch 6687
+MD5 bfca14b90ddc76f513a6f96752003da5 files/amavisd-new-2.3.3-bsmtp-quarantine.patch 949
+MD5 1da4ebb5c79b4892074a61f52aff3eff files/amavisd.rc6 310
+MD5 1ec247b48d1de4fdbc2a57fc9b338681 files/digest-amavisd-new-2.2.1-r2 69
+MD5 20d1361125dc21db61b44dec3a13dea2 files/digest-amavisd-new-2.3.0 69
+MD5 d7ee87336e865f363c430fc60f105d44 files/digest-amavisd-new-2.3.1 69
+MD5 64e273484857758e614f8afa7aa14e09 files/digest-amavisd-new-2.3.2 69
+MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3 69
+MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3-r1 69
+MD5 d252feb4cca639dcab4ebd07f2b20a90 files/digest-amavisd-new-2.3.3-r2 69
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDX8c9ntT9W3vfTuoRAgveAKCv9octHQoe2ZNztIo3l/GM3EOZUQCePrOE
+HNRiPkThKyK9/uMRVq4GjCY=
+=ZGe3
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild
index f8566b2b1f18..8f23b0960c67 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.2.1-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/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild,v 1.1 2005/05/04 18:44:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.2.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
 
 inherit eutils
 
@@ -32,14 +32,14 @@ RDEPEND="${DEPEND}
 	dev-perl/Compress-Zlib
 	dev-perl/Convert-TNEF
 	>=dev-perl/Convert-UUlib-1.051
-	dev-perl/MIME-Base64
+	perl-core/MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
 	dev-perl/net-server
 	>=dev-perl/libnet-1.16
-	dev-perl/Digest-MD5
+	perl-core/Digest-MD5
 	dev-perl/IO-stringy
-	>=dev-perl/Time-HiRes-1.49
+	>=perl-core/Time-HiRes-1.49
 	dev-perl/Unix-Syslog
 	>=sys-libs/db-3.1
 	dev-perl/BerkeleyDB
@@ -86,13 +86,15 @@ src_compile() {
 
 src_install() {
 	enewgroup amavis
-	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
 
 	dosbin amavisd amavisd-agent amavisd-nanny
 
+	# install config file with proper permissons/owners
 	insinto /etc
-	insopts -m0600
+	insopts -m0640
 	newins amavisd.conf-sample amavisd.conf
+	fowners root:amavis /etc/amavisd.conf
 	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
 		/etc/amavisd.conf
 	if [ "$(domainname)" = "(none)" ] ; then
@@ -165,6 +167,10 @@ pkg_postinst() {
 		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
 		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
 		einfo "and comment out the line containing: "
-		einfo "@bypass_virus_checks_maps = (1); in /etc/amavisd.conf."
+		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
+	echo
+	ewarn "Adjusting permissions for /etc/amavisd.new (0 for world, owner root:amavis)"
+	chmod o-rwx /etc/amavisd.conf
+	chown root:amavis /etc/amavisd.conf
 }
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild
index af82cfcd7fb6..dfe48e2bfe0e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.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/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild,v 1.1 2005/05/01 20:16:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.0.ebuild,v 1.1.1.1 2005/11/30 10:12:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
@@ -32,14 +32,14 @@ RDEPEND="${DEPEND}
 	dev-perl/Compress-Zlib
 	dev-perl/Convert-TNEF
 	>=dev-perl/Convert-UUlib-1.051
-	dev-perl/MIME-Base64
+	perl-core/MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
 	dev-perl/net-server
 	>=dev-perl/libnet-1.16
-	dev-perl/Digest-MD5
+	perl-core/Digest-MD5
 	dev-perl/IO-stringy
-	>=dev-perl/Time-HiRes-1.49
+	>=perl-core/Time-HiRes-1.49
 	dev-perl/Unix-Syslog
 	>=sys-libs/db-3.1
 	dev-perl/BerkeleyDB
@@ -53,6 +53,13 @@ RDEPEND="${DEPEND}
 AMAVIS_ROOT=/var/amavis
 
 src_unpack() {
+	if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then
+		echo
+		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
+		ewarn "         Consider upgrading your SpamAssassin installation."
+		ebeep 3
+		sleep 5
+	fi
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
@@ -65,7 +72,7 @@ src_unpack() {
 		epatch "amavisd-new-qmqpqq.patch" || die "patch failed"
 
 		einfo "Patching with qmail lf bug workaround."
-		epatch "${FILESDIR}/${P}-qmail-lf-workaround.patch" || die "patch failed"
+		epatch "${FILESDIR}/${PN}-2.2.1-qmail-lf-workaround.patch" || die "patch failed"
 	fi
 
 	epatch "${FILESDIR}/${P}-amavisd.conf-gentoo.patch" || die "patch failed"
@@ -88,7 +95,9 @@ src_install() {
 	dosbin amavisd amavisd-agent amavisd-nanny
 
 	insinto /etc
+	insopts -m0640
 	newins amavisd.conf-sample amavisd.conf
+	fowners root:amavis /etc/amavisd.conf
 	dosed "s:^#\\?\\\$MYHOME[^;]*;:\$MYHOME = '$AMAVIS_ROOT';:" \
 		/etc/amavisd.conf
 	if [ "$(domainname)" = "(none)" ] ; then
@@ -134,7 +143,7 @@ src_install() {
 
 pkg_postinst() {
 	enewgroup amavis
-	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
 
 	for i in whitelist blacklist spam_lovers; do
 		if [ ! -f ${AMAVIS_ROOT}/${i} ]; then
@@ -160,6 +169,11 @@ pkg_postinst() {
 		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
 		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
 		einfo "and comment out the line containing: "
-		einfo "@bypass_virus_checks_maps = (1); in /etc/amavisd.conf."
+		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
+	echo
+	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
+	echo
+	chmod o-rwx /etc/amavisd.conf
+	chown root:amavis /etc/amavisd.conf
 }
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild
index 320b2a2e74b5..e8379172388e 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.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/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild,v 1.1 2005/05/10 14:56:31 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
@@ -32,13 +32,13 @@ RDEPEND="${DEPEND}
 	dev-perl/Compress-Zlib
 	dev-perl/Convert-TNEF
 	>=dev-perl/Convert-UUlib-1.051
-	dev-perl/MIME-Base64
+	perl-core/MIME-Base64
 	>=dev-perl/MIME-tools-5.415
 	>=dev-perl/MailTools-1.58
 	dev-perl/net-server
 	>=dev-perl/libnet-1.16
 	dev-perl/IO-stringy
-	>=dev-perl/Time-HiRes-1.49
+	>=perl-core/Time-HiRes-1.49
 	dev-perl/Unix-Syslog
 	>=sys-libs/db-3.1
 	dev-perl/BerkeleyDB
@@ -52,6 +52,13 @@ RDEPEND="${DEPEND}
 AMAVIS_ROOT=/var/amavis
 
 src_unpack() {
+	if ! $(has_version ">=mail-filter/spamassassin-3.0.0") ; then
+		echo
+		ewarn "WARNING: Amavisd-new will not work with SpamAssassin older than 3.0.0."
+		ewarn "         Consider upgrading your SpamAssassin installation."
+		ebeep 3
+		sleep 5
+	fi
 	unpack ${A}
 	cd ${S}
 	if $(has_version mail-mta/courier) ; then
@@ -135,7 +142,7 @@ src_install() {
 
 pkg_postinst() {
 	enewgroup amavis
-	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
 
 	for i in whitelist blacklist spam_lovers; do
 		if [ ! -f ${AMAVIS_ROOT}/${i} ]; then
@@ -161,10 +168,11 @@ pkg_postinst() {
 		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
 		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
 		einfo "and comment out the line containing: "
-		einfo "@bypass_virus_checks_maps = (1); in /etc/amavisd.conf."
+		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
+	echo
 	chmod o-rwx /etc/amavisd.conf
 	chown root:amavis /etc/amavisd.conf
 }
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild
index 3b31d7e1898f..ceaa183c6871 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.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/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild,v 1.1 2005/06/30 08:48:03 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc ~alpha ~ppc64"
+KEYWORDS="alpha amd64 ~ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 	dev-perl/BerkeleyDB
 	virtual/mta
 	virtual/antivirus
-	ldap? ( dev-perl/perl-ldap )
+	ldap? ( >=dev-perl/perl-ldap-0.33 )
 	mysql? ( dev-perl/DBD-mysql )
 	postgres? ( dev-perl/DBD-Pg )
 	milter? ( >=mail-mta/sendmail-8.12 )"
@@ -155,8 +155,7 @@ src_install() {
 		else
 			einfo "Copying existing razor config files..."
 			insinto ${AMAVIS_ROOT}/.razor
-			doins ${AMAVIS_ROOT}/.razor/razor-agent.conf \
-				${AMAVIS_ROOT}/.razor/server*
+			doins ${AMAVIS_ROOT}/.razor/*.{conf,lst}
 		fi
 	fi
 
@@ -167,7 +166,7 @@ src_install() {
 
 pkg_postinst() {
 	enewgroup amavis
-	enewuser amavis -1 /bin/false ${AMAVIS_ROOT} amavis
+	enewuser amavis -1 -1 ${AMAVIS_ROOT} amavis
 
 	if ! $(has_version mail-filter/spamassassin) ; then
 		echo
@@ -175,7 +174,7 @@ pkg_postinst() {
 		einfo "will be performed without it. Since you do not have SpamAssassin installed,"
 		einfo "all spam checks have been disabled. To enable them, install SpamAssassin"
 		einfo "and comment out the line containing: "
-		einfo "@bypass_virus_checks_maps = (1); in /etc/amavisd.conf."
+		einfo "@bypass_spam_checks_maps = (1); in /etc/amavisd.conf."
 	fi
 	echo
 	ewarn "Adjusting permissions for /etc/amavisd.conf (0 for world, owner root:amavis)"
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild
index bc57d377043b..31218b5b15d2 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.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/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild,v 1.1 2005/09/22 22:59:29 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
index 6a06d0ce80f0..d0bf492ad4b0 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.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/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.1 2005/10/24 09:22:02 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild
index 623eba704213..964405f3208d 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.3.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/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild,v 1.1 2005/08/25 12:34:33 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/amavisd-new-2.3.3.ebuild,v 1.1.1.1 2005/11/30 10:12:04 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.ijs.si/software/amavisd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ppc ppc64 ~sparc x86"
 IUSE="ldap mysql postgres milter"
 
 DEPEND=">=sys-apps/sed-4
diff --git a/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch b/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
index 82d952c6279a..62f6cc66cd8b 100644
--- a/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
+++ b/mail-filter/amavisd-new/files/amavisd-new-2.3.0-amavisd.conf-gentoo.patch
@@ -83,7 +83,7 @@
  #   (the default value is undef, meaning no quarantine)
  #
 -$QUARANTINEDIR = '/var/virusmails';
-+$QUARANTINEDIR = '$MYHOME/quarantine';
++$QUARANTINEDIR = "$MYHOME/quarantine";
  
  #$quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
  
diff --git a/mail-filter/amavisd-new/files/amavisd.rc6 b/mail-filter/amavisd-new/files/amavisd.rc6
index f076cfa145d7..8b566ae62c2c 100644
--- a/mail-filter/amavisd-new/files/amavisd.rc6
+++ b/mail-filter/amavisd-new/files/amavisd.rc6
@@ -1,7 +1,8 @@
 #!/sbin/runscript
 
 depend() {
-	need net logger
+	need net
+	use logger
         before mta
 }
 
diff --git a/mail-filter/anomy-sanitizer/ChangeLog b/mail-filter/anomy-sanitizer/ChangeLog
index 9f48af93b4a7..c2f64cbeb1e9 100644
--- a/mail-filter/anomy-sanitizer/ChangeLog
+++ b/mail-filter/anomy-sanitizer/ChangeLog
@@ -1,6 +1,29 @@
-# ChangeLog for net-mail/anomy-sanitizer
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/anomy-sanitizer/ChangeLog,v 1.1 2004/06/03 06:47:16 seemant Exp $
+# ChangeLog for mail-filter/anomy-sanitizer
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anomy-sanitizer/ChangeLog,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  anomy-sanitizer-1.70.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  anomy-sanitizer-1.67.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+*anomy-sanitizer-1.70 (13 May 2005)
+
+  13 May 2005; Michael Cummings <mcummings@gentoo.org>
+  +anomy-sanitizer-1.70.ebuild:
+  Version bump, bug 78001
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org> anomy-sanitizer-1.67.ebuild:
+  Marked ~amd64.
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> anomy-sanitizer-1.67.ebuild:
+  fix depend syntax 58347
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> anomy-sanitizer-1.67.ebuild:
+  Added to ~ppc.
 
 *anomy-sanitizer-1.67 (02 Jun 2004)
 
diff --git a/mail-filter/anomy-sanitizer/Manifest b/mail-filter/anomy-sanitizer/Manifest
index 07fa4ab2f7a8..4acfd7ebbc16 100644
--- a/mail-filter/anomy-sanitizer/Manifest
+++ b/mail-filter/anomy-sanitizer/Manifest
@@ -1,9 +1,21 @@
-MD5 c6c08c5dec9c8b5994ecc4afadf3758a anomy-sanitizer-1.67.ebuild 2968
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ded64f993bf1999a1a529304aaf26423 ChangeLog 1757
+MD5 1f14ac3e402e2ef4c2c88e07d9994f63 anomy-sanitizer-1.67.ebuild 2952
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 49fe15f8e9d313326c59038186c913b2 ChangeLog 664
+MD5 1590db5859441100b158c2b0bee838a4 anomy-sanitizer-1.70.ebuild 2952
+MD5 9d08cc149086d19bbf4d2f7f0d17e105 files/anomy.conf 6714
 MD5 bfbe48e53cc13347c50082c700ca1981 files/digest-anomy-sanitizer-1.67 72
 MD5 28080935c9282efa29386151ab7036ab files/sample2_mailfilter.sh 1898
 MD5 ea517247fe8f9611e41361de67d49d52 files/sample_e-mail-architecture.png 15409
 MD5 e516d95d8691b03784d4868f0d4dc9ac files/sample_e-mail-architektur.flw 7001
 MD5 021c6f48e4dd016e195dfe39afd39522 files/sample_mailfiler.sh 1725
-MD5 9d08cc149086d19bbf4d2f7f0d17e105 files/anomy.conf 6714
+MD5 ca5a2e524fc83140e046ae2c0c8f0e3e files/digest-anomy-sanitizer-1.70 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClIpOtG5z4I8BtQoRAsIbAKCJQVjY/SPy265JGObUOKnEh3E1CwCfboHF
+kApcCDQKhDOutnsBhrVA2Kk=
+=Zb8X
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.67.ebuild b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.67.ebuild
index 4d927cbe1529..6c579148a56b 100644
--- a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.67.ebuild
+++ b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.67.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/mail-filter/anomy-sanitizer/anomy-sanitizer-1.67.ebuild,v 1.1 2004/06/03 06:47:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anomy-sanitizer/anomy-sanitizer-1.67.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 DESCRIPTION="Perl based e-mail filtering tool, sensitive to html tags, mime types and attachments"
 HOMEPAGE="http://mailtools.anomy.net/"
@@ -8,17 +8,15 @@ SRC_URI="http://mailtools.anomy.net/dist/${PN}-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
-RDEPEND=">=dev-lang/perl
-		>=dev-perl/MIME-Base64-2.12-r2
+RDEPEND="dev-lang/perl
+		>=perl-core/MIME-Base64-2.12-r2
 		>=dev-perl/Mail-Audit-2.1-r1
 		virtual/mta"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${P}
-
 
 DEST="/usr/share/${PN}"
 SANI_WORKDIR="/var/spool/sanitizer"
@@ -107,5 +105,3 @@ pkg_postrm() {
 		userdel -r sanitizer
 	fi
 }
-
-
diff --git a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.70.ebuild b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.70.ebuild
index 120b8836acd1..1fbe9e90a341 100644
--- a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.70.ebuild
+++ b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.70.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/mail-filter/anomy-sanitizer/anomy-sanitizer-1.70.ebuild,v 1.1 2005/05/14 01:47:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anomy-sanitizer/anomy-sanitizer-1.70.ebuild,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 DESCRIPTION="Perl based e-mail filtering tool, sensitive to html tags, mime types and attachments"
 HOMEPAGE="http://mailtools.anomy.net/"
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 RDEPEND="dev-lang/perl
-		>=dev-perl/MIME-Base64-2.12-r2
+		>=perl-core/MIME-Base64-2.12-r2
 		>=dev-perl/Mail-Audit-2.1-r1
 		virtual/mta"
 DEPEND="${RDEPEND}"
diff --git a/mail-filter/anubis/ChangeLog b/mail-filter/anubis/ChangeLog
index 9936edf9bdbc..54e89ba94db8 100644
--- a/mail-filter/anubis/ChangeLog
+++ b/mail-filter/anubis/ChangeLog
@@ -1,6 +1,27 @@
-# ChangeLog for net-mail/anubis
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/ChangeLog,v 1.1 2004/06/03 07:00:48 seemant Exp $
+# ChangeLog for mail-filter/anubis
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/ChangeLog,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
+
+  27 Nov 2004; Andrej Kacian <ticho@gentoo.org> -anubis-3.6.2-r1.ebuild,
+  -anubis-3.6.2.ebuild, anubis-3.9.95.ebuild:
+  3.9.95 stable on x86 as per bug #72618. Removed older versions.
+
+  16 Sep 2004; Daniel Black <dragonheart@gentoo.org> anubis-3.6.2-r1.ebuild,
+  anubis-3.6.2.ebuild:
+  Fixed gpgme dependancy in accordance with bug #63501
+
+  08 Sep 2004; Andrej Kacian <ticho@gentoo.org> anubis-3.9.95.ebuild:
+  Fixed socks support. Removed dependency on dante, as it is not needed - anubis
+  has its own socks4/5 implementation.
+
+*anubis-3.9.95 (08 Sep 2004)
+
+  08 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/3.9.95-authmode.c.patch, +files/3.9.95-transmode.c.patch,
+  +anubis-3.9.95.ebuild:
+  Version bump. Closes #59850, reported by Daniel Black
+  <dragonheart@gentoo.org>, who also provided two patches applied to source by
+  the ebuild.
 
 *anubis-3.6.2 (03 Jun 2004)
 
diff --git a/mail-filter/anubis/Manifest b/mail-filter/anubis/Manifest
index f20b6d7f2b24..ce243d8c940c 100644
--- a/mail-filter/anubis/Manifest
+++ b/mail-filter/anubis/Manifest
@@ -1,7 +1,17 @@
-MD5 df4e3d267c928dccb555ec26cf141669 ChangeLog 824
-MD5 bfc8611ba51a6f6c14e68577d792f2e9 anubis-3.6.2.ebuild 1001
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e9c85de13250da7342e9e67a0f7c2320 ChangeLog 1903
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 209bf4bebe362316d200b7e918739a74 anubis-3.6.2-r1.ebuild 1102
-MD5 24def86bd1cfb613e6c0dcf55194d449 files/digest-anubis-3.6.2 64
+MD5 1e69577237956f04a8fe807f342bb65f anubis-3.9.95.ebuild 1916
+MD5 cc4ec1af9779d9945e617204d549a19f files/3.9.95-transmode.c.patch 321
+MD5 b2320df43592e63e327683a3e82928b1 files/3.9.95-authmode.c.patch 438
+MD5 82fb55fcc52a9af0d23fc2085979e467 files/digest-anubis-3.9.95 65
 MD5 a345a52e49034f67fe700e0464804933 files/3.6.2-secfixes.patch.gz 1455
-MD5 24def86bd1cfb613e6c0dcf55194d449 files/digest-anubis-3.6.2-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBqHVl10xuJSrg3/sRAgEaAJ4uggjEHlMvhdPVJF302BShMMdcPgCfTmUd
+zAg7bUkm839/5pqMpNa8kVY=
+=XIJl
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/anubis/anubis-3.9.95.ebuild b/mail-filter/anubis/anubis-3.9.95.ebuild
index 9796bca534d5..2d56814b3fb8 100644
--- a/mail-filter/anubis/anubis-3.9.95.ebuild
+++ b/mail-filter/anubis/anubis-3.9.95.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/mail-filter/anubis/anubis-3.9.95.ebuild,v 1.1 2004/09/08 19:45:29 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anubis/anubis-3.9.95.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://mirddin.farlep.net/pub/alpha/anubis/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE="crypt dbm guile mysql postgres nls pam pcre sasl socks5 ssl tcpd"
 
 DEPEND="crypt? ( >=app-crypt/gpgme-0.9.0 )
@@ -26,7 +26,6 @@ DEPEND="crypt? ( >=app-crypt/gpgme-0.9.0 )
 	nls? ( sys-devel/gettext )
 	pcre? ( >=dev-libs/libpcre-3.9 )
 	sasl? ( virtual/gsasl )
-	socks5? ( net-misc/dante )
 	ssl?   ( >=dev-libs/openssl-0.9.6 )
 	tcpd?  ( >=sys-apps/tcp-wrappers-7.6 )"
 
@@ -52,7 +51,7 @@ src_compile() {
 
 	use ssl  && myconf="${myconf} --with-openssl"
 	use tcpd && myconf="${myconf} --with-tcp-wrappers"
-	use sock5 && myconf="${myconf} --with-socks-proxy"
+	use socks5 && myconf="${myconf} --with-socks-proxy"
 
 	econf ${myconf} `use_with mysql` `use_with postgres` \
 		`use_with pam` `use_with pcre` `use_with nls` \
diff --git a/mail-filter/ask/ChangeLog b/mail-filter/ask/ChangeLog
index e772b9cee13a..b3baaf0d9cd6 100644
--- a/mail-filter/ask/ChangeLog
+++ b/mail-filter/ask/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for mail-filter/ask
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/ask/ChangeLog,v 1.1 2004/08/07 16:44:41 tomk Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/ask/ChangeLog,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> ask-2.4.1.ebuild:
+  Stable on ppc.
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> ask-2.4.1.ebuild:
+  Stable on x86.
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> ask-2.4.1.ebuild:
+  Added to ~ppc.
+
+  08 Aug 2004; <tomk@gentoo.org> ask-2.4.1.ebuild:
+  Removed redundant functions
 
 *ask-2.4.1 (07 Aug 2004)
 
diff --git a/mail-filter/ask/Manifest b/mail-filter/ask/Manifest
index d8a7e9f0f557..67ffbadad0df 100644
--- a/mail-filter/ask/Manifest
+++ b/mail-filter/ask/Manifest
@@ -1,3 +1,4 @@
-MD5 d99bba6d1c1fca3032589ba3f524d0e1 ask-2.4.1.ebuild 1571
-MD5 18a007e3b7163d193b927747336436e9 ChangeLog 269
+MD5 4954e794ace7393c7cc6a747522f9a0d ask-2.4.1.ebuild 1531
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 83b810b05bd56fc90bca1848d4d2c3a0 ChangeLog 693
 MD5 6d9189406cd0e6df7ea50a6e1d49ecfc files/digest-ask-2.4.1 61
diff --git a/mail-filter/ask/ask-2.4.1.ebuild b/mail-filter/ask/ask-2.4.1.ebuild
index 33e58ae971a8..d06d0866f302 100644
--- a/mail-filter/ask/ask-2.4.1.ebuild
+++ b/mail-filter/ask/ask-2.4.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/mail-filter/ask/ask-2.4.1.ebuild,v 1.1 2004/08/07 16:44:41 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/ask/ask-2.4.1.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 DESCRIPTION="Active Spam Killer: A program to filter spam"
 HOMEPAGE="http://www.paganini.net/ask/index.html"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/a-s-k/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 
 IUSE="procmail"
 RDEPEND=">=dev-lang/python-2.2
@@ -19,29 +19,22 @@ src_install() {
 	into /
 	dobin ask.py asksetup.py askversion.py utils/asksenders.py
 
-	dodir /usr/lib/ask
 	insinto /usr/lib/ask
 	doins askconfig.py asklock.py asklog.py askmail.py askmain.py \
 		 askmessage.py askremote.py
 
-	dodir /usr/share/ask/samples
 	insinto /usr/share/ask/samples
 	doins samples/*
 
-	dodir /usr/share/ask/templates
 	insinto /usr/share/ask/templates
 	doins templates/*
 
-	dodir /usr/share/ask/utils
 	insinto /usr/share/ask/utils
 	doins utils/*
 
 	doman docs/*.1
 
-	dodoc COPYING ChangeLog TODO
-
-	cd docs
-	dodoc ask_doc.*
+	dodoc ChangeLog TODO docs/ask_doc*
 }
 
 pkg_postinst() {
diff --git a/mail-filter/bmf/ChangeLog b/mail-filter/bmf/ChangeLog
index f0cdcc033fc5..0c43efb6f7d7 100644
--- a/mail-filter/bmf/ChangeLog
+++ b/mail-filter/bmf/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for net-mail/bmf
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bmf/ChangeLog,v 1.1 2004/06/03 07:02:01 seemant Exp $
+# ChangeLog for mail-filter/bmf
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bmf/ChangeLog,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> bmf-0.9.4.ebuild:
+  Stable on ppc.
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> bmf-0.9.4.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> bmf-0.9.4.ebuild:
+  Added to ~ppc.
 
 *bmf-0.9.4 (03 Jun 2004)
 
diff --git a/mail-filter/bmf/Manifest b/mail-filter/bmf/Manifest
index cf2401d4f987..f9d79c55c191 100644
--- a/mail-filter/bmf/Manifest
+++ b/mail-filter/bmf/Manifest
@@ -1,4 +1,4 @@
-MD5 36f7fc6c0159f39305774ae990a1d7f3 ChangeLog 370
-MD5 b446dca7229a3f38edb30e17bd915074 bmf-0.9.4.ebuild 969
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 31ef07689b540b17c1b5898d767b45ba ChangeLog 803
+MD5 9ec3b665527d6fc222c787e0efc57538 bmf-0.9.4.ebuild 962
 MD5 1288bea62a320ffa52af6c5e4fa16100 files/digest-bmf-0.9.4 60
diff --git a/mail-filter/bmf/bmf-0.9.4.ebuild b/mail-filter/bmf/bmf-0.9.4.ebuild
index f10754b76d1b..ac33d153ad42 100644
--- a/mail-filter/bmf/bmf-0.9.4.ebuild
+++ b/mail-filter/bmf/bmf-0.9.4.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/mail-filter/bmf/bmf-0.9.4.ebuild,v 1.1 2004/06/03 07:02:01 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bmf/bmf-0.9.4.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 IUSE="mysql berkdb"
 
@@ -10,12 +10,10 @@ SRC_URI="mirror://sourceforge/bmf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
 
-DEPEND="mysql? ( >=mysql-3.23.56 )
-	berkdb? ( >=db-3.2.9 )"
-
-S=${WORKDIR}/${P}
+DEPEND="mysql? ( >=dev-db/mysql-3.23.56 )
+	berkdb? ( >=sys-libs/db-3.2.9 )"
 
 src_compile() {
 	local myconf
diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index fc6e3579798d..024c6145f0ba 100644
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,219 @@
-# ChangeLog for net-mail/bogofilter
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.1 2004/06/03 07:03:43 seemant Exp $
+# ChangeLog for mail-filter/bogofilter
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.1.1.1 2005/11/30 10:11:55 chriswhite Exp $
+
+*bogofilter-0.96.6 (13 Nov 2005)
+
+  13 Nov 2005; Torsten Veller <tove@gentoo.org> +bogofilter-0.96.6.ebuild:
+  Version bump.
+
+*bogofilter-0.96.5 (08 Nov 2005)
+
+  08 Nov 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.14.ebuild,
+  -bogofilter-0.95.2.ebuild, -bogofilter-0.96.2.ebuild,
+  +bogofilter-0.96.5.ebuild:
+  Version bump: 0.96.5 a.k.a. 1.0.0-rc5
+
+*bogofilter-0.96.2 (25 Sep 2005)
+
+  25 Sep 2005; Torsten Veller <tove@gentoo.org> +bogofilter-0.96.2.ebuild:
+  New version.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> bogofilter-0.92.8.ebuild:
+  Mark 0.92.8 stable on alpha
+
+*bogofilter-0.95.2 (12 Jul 2005)
+
+  12 Jul 2005; Torsten Veller <tove@gentoo.org> metadata.xml,
+  +bogofilter-0.95.2.ebuild:
+  Version bump. 0.95.2 supports Unicode (UTF-8).
+  For 64-bit machines that require 8-byte alignment for longword access
+  >=dev-db/sqlite-3.2.2 is needed.
+
+*bogofilter-0.94.14 (09 Jun 2005)
+
+  09 Jun 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.12.ebuild,
+  -bogofilter-0.94.13.ebuild, +bogofilter-0.94.14.ebuild:
+  Bugfix release.
+
+*bogofilter-0.94.13 (31 May 2005)
+
+  31 May 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94-11-ebuild,
+  +bogofilter-0.94.13.ebuild:
+  Bugfix release.
+  The ebuild supports SQLite3 as alternative backend and iconv for
+  charset conversion.
+
+*bogofilter-0.94.12 (18 May 2005)
+
+  18 May 2005; Torsten Veller <tove@gentoo.org> +bogofilter-0.94.12.ebuild:
+  New Stable release.
+
+*bogofilter-0.94.11 (11 May 2005)
+
+  11 May 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.8.ebuild,
+  +bogofilter-0.94.11.ebuild:
+  Version bump.
+
+*bogofilter-0.94.8 (04 May 2005)
+
+  04 May 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.6.ebuild,
+  +bogofilter-0.94.8.ebuild:
+  New Current Version.
+
+*bogofilter-0.94.6 (30 Apr 2005)
+
+  30 Apr 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.4.ebuild,
+  +bogofilter-0.94.6.ebuild:
+  New Current Version.
+
+*bogofilter-0.94.4 (10 Apr 2005)
+
+  10 Apr 2005; Torsten Veller <tove@gentoo.org> +bogofilter-0.94.4.ebuild:
+  New Current Version
+
+*bogofilter-0.94.3 (30 Mar 2005)
+
+  30 Mar 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.2.ebuild,
+  +bogofilter-0.94.3.ebuild:
+  New Current Version.
+
+*bogofilter-0.94.2 (25 Mar 2005)
+
+  25 Mar 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.1.ebuild,
+  +bogofilter-0.94.2.ebuild:
+  New Current Release.
+
+*bogofilter-0.94.1 (17 Mar 2005)
+
+  17 Mar 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.0.ebuild,
+  +bogofilter-0.94.1.ebuild:
+  New Current Version.
+
+*bogofilter-0.94.0 (06 Mar 2005)
+
+  06 Mar 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.93.4.ebuild,
+  +bogofilter-0.94.0.ebuild:
+  Version bump.
+
+*bogofilter-0.93.4 (10 Jan 2005)
+
+  10 Jan 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.93.2.ebuild,
+  +bogofilter-0.93.4.ebuild:
+  Version bump.
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org>
+  bogofilter-0.93.2.ebuild:
+  Dependency update: dev-libs/gsl -> sci-libs/gsl.
+
+*bogofilter-0.93.2 (14 Dec 2004)
+
+  14 Dec 2004; Torsten Veller <tove@gentoo.org> -bogofilter-0.13.7.3.ebuild,
+  -bogofilter-0.17.5.ebuild, -bogofilter-0.92.2.ebuild,
+  -bogofilter-0.92.6.ebuild, -bogofilter-0.92.7.ebuild,
+  +bogofilter-0.93.2.ebuild:
+  Version bump. Closes #73919, reported by Erinn Looney-Triggs.
+  Clean out old ebuilds, #69505.
+
+  02 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bogofilter-0.92.8.ebuild:
+  Stable amd64.
+
+  02 Nov 2004; Kurt Lieber <klieber@gentoo.org> bogofilter-0.92.8.ebuild:
+  tested/stabilized on x86 for 69505.  also marking as ppc since pylon 
+  tested it earlier
+
+  30 Oct 2004; Ferris McCormick <fmccor@gentoo.org> bogofilter-0.92.8.ebuild:
+  Stable for sparc, closing bug 69505.
+
+  30 Oct 2004; Lars Weiler <pylon@gentoo.org> bogofilter-0.92.8.ebuild:
+  Stable on ppc as requested in bug #69505
+
+  23 Oct 2004; Andrej Kacian <ticho@gentoo.org> bogofilter-0.92.8.ebuild:
+  Do not install nonexistent files from the tarball. Fixed according to patch
+  from #68245, submitted by tove <bugs@veller.net>.
+
+*bogofilter-0.92.8 (20 Oct 2004)
+
+  20 Oct 2004; Brandon Low <lostlogic@gentoo.org> +bogofilter-0.92.8.ebuild:
+  Bump
+
+  14 Oct 2004; Andrej Kacian <ticho@gentoo.org> bogofilter-0.92.2.ebuild,
+  bogofilter-0.92.6.ebuild, bogofilter-0.92.7.ebuild:
+  Removed unnecessary einfo block from 0.92.x ebuilds. Sort-of fixes #67425,
+  reported by Daniel Webert <rockoo@rockoo.homelinux.org>.
+
+  11 Oct 2004; Ferris McCormick <fmccor@gentoo.org> bogofilter-0.92.6.ebuild:
+  Stable for sparc.
+
+  11 Oct 2004; Tom Martin <slarti@gentoo.org> bogofilter-0.92.6.ebuild:
+  Stable on amd64.
+
+*bogofilter-0.92.7 (11 Oct 2004)
+
+  11 Oct 2004; Brandon Low <lostlogic@gentoo.org> -bogofilter-0.92.0.ebuild,
+  -bogofilter-0.92.1.ebuild, bogofilter-0.92.6.ebuild,
+  +bogofilter-0.92.7.ebuild:
+  Move 0.92.6 to stable on x86 (other arches, please follow), clean out old
+  ebiulds that do not have any unique keywords, bump the latest unstable to
+  0.92.7
+
+  02 Oct 2004; Jason Wever <weeve@gentoo.org> bogofilter-0.92.2.ebuild:
+  Stable on sparc.
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> bogofilter-0.17.5.ebuild,
+  bogofilter-0.92.1.ebuild, bogofilter-0.92.2.ebuild:
+  Stable on x86.
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> bogofilter-0.92.2.ebuild:
+  Stable on x86.
+
+*bogofilter-0.92.6 (05 Sep 2004)
+
+  05 Sep 2004; Andrej Kacian <ticho@gentoo.org> +bogofilter-0.92.6.ebuild:
+  Version bump. Also moved contrib stuff from /usr/lib/bogofilter/contrib to
+  /usr/share/bogofilter/contrib. Closes #62933, reported by tove
+  <bugs@veller.net>.
+
+*bogofilter-0.92.2 (19 Jul 2004)
+
+  19 Jul 2004; Brandon Low <lostlogic@gentoo.org> +bogofilter-0.92.2.ebuild:
+  Bump
+
+  12 Jul 2004; Brandon Low <lostlogic@gentoo.org> -bogofilter-0.91.1.ebuild:
+  This version has an open bug and is not the latest so zapping it
+
+  12 Jul 2004; Brandon Low <lostlogic@gentoo.org> bogofilter-0.92.0.ebuild:
+  Mark stable on x86, that brings us up-to-date with the bogofilter team for the
+  first time in a long time. Hope this version works as well for the rest of you
+  as it has for me.
+
+*bogofilter-0.92.1 (06 Jul 2004)
+*bogofilter-0.92.0 (06 Jul 2004)
+
+  06 Jul 2004; Brandon Low <lostlogic@gentoo.org> -bogofilter-0.14.5.4.ebuild,
+  -bogofilter-0.15.13.1.ebuild, -bogofilter-0.16.4.ebuild,
+  bogofilter-0.91.1.ebuild, +bogofilter-0.92.0.ebuild,
+  +bogofilter-0.92.1.ebuild:
+  Bump up stable on x86, hope this doesn't break anyone... add 2 new unstable
+  versions for testing... clean up cruft
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  bogofilter-0.13.7.3.ebuild, bogofilter-0.14.5.4.ebuild,
+  bogofilter-0.15.13.1.ebuild, bogofilter-0.16.4.ebuild,
+  bogofilter-0.17.5.ebuild, bogofilter-0.91.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*bogofilter-0.91.1 (06 Jun 2004)
+
+  06 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> -bogofilter-0.91.0.ebuild,
+  +bogofilter-0.91.1.ebuild:
+  Version bump.
+
+*bogofilter-0.91.0 (06 Jun 2004)
+
+  06 Jun 2004; Grant Goodyear <g2boojum@gentoo.org> +bogofilter-0.91.0.ebuild:
+  Version bump, thanks to Daniel Webert (Bug #51089).
 
 *bogofilter-0.15.13.1 (03 Jun 2004)
 
@@ -149,22 +362,22 @@
   Version bump, added ~ppc to keywords
 
 *bogofilter-0.11.2 (02 Jun 2003)
- 
+
   13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Added missing changelog entry.
 
 *bogofilter-0.10.3 (15 Feb. 2003)
 
-  15 Feb. 2003; Christian Birchinger <joker@gentoo.org> ChangeLog  :
+  15 Feb 2003; Christian Birchinger <joker@gentoo.org> ChangeLog  :
 
   Version bump. Added ~sparc keyword.
 
 *bogofilter-0.9.1.2 (8 Dec. 2002)
 
-  8 Dec. 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
+  8 Dec 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
 
   Version bump.  Thanks to Clemens Oertel!
-  
+
 *bogofilter-0.8.0 (11 Nov 2002)
 
   11 Nov 2002; Grant Goodyear <g2boojum@gentoo.org> ChangeLog  :
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 6904e80dd1ba..c22413877cdb 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,12 +1,18 @@
-MD5 23c682cb2599ab79e60b6454bbcc80ff files/digest-bogofilter-0.15.13.1 72
-MD5 23dea37013aa783a31cd6a713e040752 files/digest-bogofilter-0.13.7.3 71
-MD5 0459fc8764bb8f8aa1c64c4c16c0b264 files/digest-bogofilter-0.16.4 69
-MD5 7f9cfa2077f941af6777774d82bc1a4b files/digest-bogofilter-0.17.5 70
-MD5 856317ca43eaa2fe5e6f1029e36b3f1e files/digest-bogofilter-0.14.5.4 71
-MD5 84d3cfe6abb0a5192095bacfb6b8da5b ChangeLog 5722
-MD5 c96885ae65c8e6fbfd6585751692356c bogofilter-0.13.7.3.ebuild 1917
-MD5 0e25e4eb38e661c35a1d11b211a30ce1 bogofilter-0.16.4.ebuild 1817
-MD5 1a37b62e927ea2bb6bf6b73407aba547 bogofilter-0.14.5.4.ebuild 1940
-MD5 7b16b65c1c9aed6fef5c7ce76ca37194 bogofilter-0.17.5.ebuild 1806
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 a07f4ba94adc15e71ad3abe631f5552e bogofilter-0.15.13.1.ebuild 1827
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fd55d1ac2c0d6b29badd5249b6b52303 ChangeLog 13122
+MD5 28717e3faee82dbca88d83de9c9afadc bogofilter-0.92.8.ebuild 1575
+MD5 0fe922bced50c25b4a3a722a910e5bee bogofilter-0.96.5.ebuild 2397
+MD5 1cdbd2008dc3f94c56dee8c593e2b3e1 bogofilter-0.96.6.ebuild 2397
+MD5 1970df6e6d8dabe53d04a6f120d0b8bb files/digest-bogofilter-0.92.8 70
+MD5 4d0b162c16401cd805a8c5bededda302 files/digest-bogofilter-0.96.5 70
+MD5 4f8372b7a34dce5daa3018232ce35491 files/digest-bogofilter-0.96.6 70
+MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDdoaVV3J2n04EauwRAmTvAJ9DFmQx6PjjSOB7AZyAIRikzPxkXwCgx26h
+tzUOLUqqOcuPiYHpnAJoiWg=
+=KWmV
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/bogofilter/bogofilter-0.92.8.ebuild b/mail-filter/bogofilter/bogofilter-0.92.8.ebuild
index 743e0ce5c65d..24d1cc85b944 100644
--- a/mail-filter/bogofilter/bogofilter-0.92.8.ebuild
+++ b/mail-filter/bogofilter/bogofilter-0.92.8.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/mail-filter/bogofilter/bogofilter-0.92.8.ebuild,v 1.1 2004/10/20 19:38:29 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.92.8.ebuild,v 1.1.1.1 2005/11/30 10:11:55 chriswhite Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="doc"
 
 RDEPEND="virtual/libc
@@ -27,8 +27,8 @@ src_install() {
 	doins contrib/{README.*,bogo.R,bogogrep.c,dot-qmail-bogofilter-default}
 	doins contrib/{trainbogo.sh,*.example}
 
-	dodoc AUTHORS CHANGES* COPYING INSTALL METHODS NEWS README
-	dodoc RELEASE.NOTES* TODO doc/{integrating-with-*,*.HOWTO}
+	dodoc AUTHORS CHANGES* COPYING INSTALL NEWS README
+	dodoc RELEASE.NOTES* TODO doc/integrating-with-*
 
 	dodir /usr/share/doc/${PF}/samples
 	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
@@ -39,7 +39,7 @@ src_install() {
 	if use doc; then
 		dohtml doc/*.html
 	else
-		dohtml doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
+		dohtml doc/bogofilter-faq{,-fr}.html doc/bogofilter-tuning.HOWTO.html
 	fi
 }
 
diff --git a/mail-filter/bogofilter/bogofilter-0.96.5.ebuild b/mail-filter/bogofilter/bogofilter-0.96.5.ebuild
index 922b0df3e5ee..6e6f7b5e8e21 100644
--- a/mail-filter/bogofilter/bogofilter-0.96.5.ebuild
+++ b/mail-filter/bogofilter/bogofilter-0.96.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/mail-filter/bogofilter/bogofilter-0.96.5.ebuild,v 1.1 2005/11/08 21:17:35 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.96.5.ebuild,v 1.1.1.1 2005/11/30 10:11:55 chriswhite Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
diff --git a/mail-filter/bogofilter/bogofilter-0.96.6.ebuild b/mail-filter/bogofilter/bogofilter-0.96.6.ebuild
index fbaa5a74c71f..1c0af1e23822 100644
--- a/mail-filter/bogofilter/bogofilter-0.96.6.ebuild
+++ b/mail-filter/bogofilter/bogofilter-0.96.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/mail-filter/bogofilter/bogofilter-0.96.6.ebuild,v 1.1 2005/11/13 00:19:20 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.96.6.ebuild,v 1.1.1.1 2005/11/30 10:11:55 chriswhite Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
diff --git a/mail-filter/bogofilter/metadata.xml b/mail-filter/bogofilter/metadata.xml
index 51f94e3fbe0e..00acb1c62c7b 100644
--- a/mail-filter/bogofilter/metadata.xml
+++ b/mail-filter/bogofilter/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-mail</herd>
+<longdescription>
+	Bogofilter is a mail filter that classifies mail as spam or ham (non-spam)
+	by a statistical analysis of the message's header and content (body). The
+	program is able to learn from the user's classifications and corrections.
+</longdescription>
 </pkgmetadata>
diff --git a/mail-filter/bsfilter/ChangeLog b/mail-filter/bsfilter/ChangeLog
index 5d551e73437a..64f3aa404018 100644
--- a/mail-filter/bsfilter/ChangeLog
+++ b/mail-filter/bsfilter/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for mail-filter/bsfilter
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bsfilter/ChangeLog,v 1.1 2004/07/24 09:31:05 nakano Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bsfilter/ChangeLog,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
+
+*bsfilter-1.0.9 (27 Jul 2005)
+
+  27 Jul 2005; Masatomo Nakano <nakano@gentoo.org> -bsfilter-1.0.6.ebuild,
+  +bsfilter-1.0.9.ebuild:
+  Version bump.
+
+  06 Jul 2005; Masatomo Nakano <nakano@gentoo.org> bsfilter-1.0.7.ebuild:
+  Marked stable on x86.
+
+*bsfilter-1.0.7 (14 May 2005)
+
+  14 May 2005; Masatomo Nakano <nakano@gentoo.org> -bsfilter-1.0.5.ebuild,
+  +bsfilter-1.0.7.ebuild:
+  Version bump.
+
+  25 Jan 2005; Masatomo Nakano <nakano@gentoo.org> bsfilter-1.0.6.ebuild:
+  Makred stable on x86.
+
+*bsfilter-1.0.6 (12 Jan 2005)
+
+  12 Jan 2005; Masatomo Nakano <nakano@gentoo.org> +bsfilter-1.0.6.ebuild:
+  Version bump.
+
+  12 Nov 2004; Masatomo Nakano <nakano@gentoo.org> -bsfilter-1.0.3.ebuild,
+  -bsfilter-1.0.4.ebuild, bsfilter-1.0.5.ebuild:
+  Marked stable on x86.
+
+*bsfilter-1.0.5 (08 Nov 2004)
+
+  08 Nov 2004; Masatomo Nakano <nakano@gentoo.org> +bsfilter-1.0.5.ebuild:
+  Version bump.
+
+  27 Sep 2004; Andrej Kacian <ticho@gentoo.org> bsfilter-1.0.3.ebuild,
+  bsfilter-1.0.4.ebuild:
+  Stable on x86.
+
+*bsfilter-1.0.4 (27 Aug 2004)
+
+  27 Aug 2004; Masatomo Nakano <nakano@gentoo.org> +bsfilter-1.0.4.ebuild:
+  Version bump.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> bsfilter-1.0.3.ebuild:
+  Added to ~ppc.
 
 *bsfilter-1.0.3 (24 Jul 2004)
 
diff --git a/mail-filter/bsfilter/Manifest b/mail-filter/bsfilter/Manifest
index b263f3362df3..d2b4603c3639 100644
--- a/mail-filter/bsfilter/Manifest
+++ b/mail-filter/bsfilter/Manifest
@@ -1,4 +1,6 @@
-MD5 2e53e4f87ec30f537829c97268e859ed bsfilter-1.0.3.ebuild~ 1029
-MD5 0678dd79dbfc332bcbfca5923786482c bsfilter-1.0.3.ebuild 904
-MD5 74aecf048018e94161918d52c3253ba9 .bsfilter-1.0.3.ebuild.swp 12288
-MD5 657c0b5cf28b76ae2ef13e7a2d850990 files/digest-bsfilter-1.0.3 63
+MD5 178d36da0c3bcfe705408d931a954474 bsfilter-1.0.7.ebuild 726
+MD5 fcdca64d586c60684cab39cbee2c6cdc bsfilter-1.0.9.ebuild 727
+MD5 c60a6778a098cf6e9388594fae7b736c ChangeLog 1570
+MD5 38f7e7e07cecf943cd078f4aef09fef1 metadata.xml 250
+MD5 124dd9f137b3dfe888712002c1bd7e23 files/digest-bsfilter-1.0.7 64
+MD5 6d1fbc996053ff0175aa35a1f1d97f07 files/digest-bsfilter-1.0.9 64
diff --git a/mail-filter/bsfilter/bsfilter-1.0.7.ebuild b/mail-filter/bsfilter/bsfilter-1.0.7.ebuild
index 40d3b3c6e5c1..c9c9303c53f2 100644
--- a/mail-filter/bsfilter/bsfilter-1.0.7.ebuild
+++ b/mail-filter/bsfilter/bsfilter-1.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/mail-filter/bsfilter/bsfilter-1.0.7.ebuild,v 1.1 2005/05/14 21:13:26 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bsfilter/bsfilter-1.0.7.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="bayesian spam filter which distinguishes spam and non-spam mail"
 HOMEPAGE="http://bsfilter.org/index-e.html"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge.jp/bsfilter/14691/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="mecab chasen"
 
 DEPEND="virtual/ruby"
diff --git a/mail-filter/bsfilter/bsfilter-1.0.9.ebuild b/mail-filter/bsfilter/bsfilter-1.0.9.ebuild
index fb12f6861fad..96e7775415cd 100644
--- a/mail-filter/bsfilter/bsfilter-1.0.9.ebuild
+++ b/mail-filter/bsfilter/bsfilter-1.0.9.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/mail-filter/bsfilter/bsfilter-1.0.9.ebuild,v 1.1 2005/07/27 19:21:18 nakano Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bsfilter/bsfilter-1.0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="bayesian spam filter which distinguishes spam and non-spam mail"
 HOMEPAGE="http://bsfilter.org/index-e.html"
diff --git a/mail-filter/clamassassin/ChangeLog b/mail-filter/clamassassin/ChangeLog
index ddf42f208dc5..fb4f96c2b25c 100644
--- a/mail-filter/clamassassin/ChangeLog
+++ b/mail-filter/clamassassin/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for mail-filter/clamassassin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/ChangeLog,v 1.1 2004/08/04 23:15:23 slarti Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/ChangeLog,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
+
+  31 Jul 2005; Michael Cummings <mcummings@gentoo.org>
+  clamassassin-1.2.2.ebuild:
+  Keywording sparc
+
+  17 May 2005; Tom Martin <slarti@gentoo.org> clamassassin-1.2.2.ebuild:
+  Add missing IUSE.
+
+  30 Apr 2005; Tom Martin <slarti@gentoo.org> clamassassin-1.2.2.ebuild:
+  Added in support for clamd via a local USE flag.
+
+  26 Apr 2005; Andrej Kacian <ticho@gentoo.org> clamassassin-1.2.2.ebuild:
+  Stable on x86.
+
+  20 Apr 2005; Tom Martin <slarti@gentoo.org> -clamassassin-1.2.0-r1.ebuild,
+  clamassassin-1.2.2.ebuild:
+  1.2.2 stable on amd64, purge 1.2.0-r1. Resolves bug 89639.
+
+  14 Dec 2004; Andrej Kacian <ticho@gentoo.org> clamassassin-1.2.1.ebuild:
+  Stable on x86.
+
+  09 Dec 2004; Tom Martin <slarti@gentoo.org> :
+  Fix ChangeLog - SuperLag was using my ECHANGELOG_USER.
+
+*clamassassin-1.2.2 (09 Dec 2004)
+
+  09 Dec 2004; Aaron Kulbe <superlag@gentoo.org> +clamassassin-1.2.2.ebuild:
+  Version bump -> 1.2.2 for Tom Martin <slarti@gentoo.org>
+
+  01 Nov 2004; Tom Martin <slarti@gentoo.org> clamassassin-1.2.1.ebuild:
+  Stable on amd64.
+
+  16 Oct 2004; Andrej Kacian <ticho@gentoo.org>
+  clamassassin-1.2.0-r1.ebuild:
+  Stable on x86.
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org> clamassassin-1.2.0-r1.ebuild:
+  Stable on amd64, fix DEPEND to point to mail-filter/procmail rather than
+  virtual/mda, as in clamassassin-1.2.1.ebuild.
+
+  22 Sep 2004; Andrej Kacian <ticho@gentoo.org> -clamassassin-1.2.0.ebuild:
+  Removed faulty ebuild.
+
+  20 Sep 2004; Tom Martin <slarti@gentoo.org> clamassassin-1.2.1.ebuild:
+  DEPEND on mail-filter/procmail rather than virtual/mda, bug 64609. Thanks to
+  Kenny Bentley <seriousmoose@yahoo.com> for reporting.
+
+*clamassassin-1.2.1 (31 Aug 2004)
+
+  31 Aug 2004; <ticho@gentoo.org> +clamassassin-1.2.1.ebuild:
+  Version bump, closes #62108. Also updated DEPEND to require clamav-0.75.1
+
+  28 Aug 2004; David Holm <dholm@gentoo.org> clamassassin-1.2.0-r1.ebuild:
+  Added to ~ppc.
+
+*clamassassin-1.2.0-r1 (28 Aug 2004)
+
+  28 Aug 2004; Tom Martin <slarti@gentoo.org> +clamassassin-1.2.0-r1.ebuild:
+  Fix issues with Portage exporting $TMP and breaking the script - $TMP was
+  going inside /var/tmp/portage/clamassassin-${VER}/temp, which is not
+  writeable by anyone so caused data loss. Thanks to Andrej Kacian
+  <andrej@kacian.sk> for the fix, and spider <spider@gentoo.org> for
+  reporting. Bug 61806.
+
+  06 Aug 2004; Tom Martin <slarti@gentoo.org> clamassassin-1.2.0.ebuild:
+  Use $() instead of ``, replace use_enable subject_rewrite with subject-rewrite.
 
 *clamassassin-1.2.0 (05 Aug 2004)
 
diff --git a/mail-filter/clamassassin/Manifest b/mail-filter/clamassassin/Manifest
index ea3f1bd37de4..3f8ea20b88a5 100644
--- a/mail-filter/clamassassin/Manifest
+++ b/mail-filter/clamassassin/Manifest
@@ -1,2 +1,16 @@
-MD5 9f951265d9a24d20bcb8b55ca5f82591 clamassassin-1.2.0.ebuild 775
-MD5 16aa47c42167085b678a375f78fce9ef files/digest-clamassassin-1.2.0 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5025aecac08cd30317b23a48bdb8e1bb ChangeLog 2926
+MD5 9633342e004ddf7cfdd9ad00b9465e8e clamassassin-1.2.1.ebuild 886
+MD5 d3c15b4f5b07c0ab69145d71c8e7f6b7 clamassassin-1.2.2.ebuild 945
+MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223
+MD5 260a237b1e8241e0b63aa29c4bb7807a files/digest-clamassassin-1.2.1 69
+MD5 832949fca57f09aec2601878733d90e9 files/digest-clamassassin-1.2.2 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7MF6tG5z4I8BtQoRAm1sAJ9UXRvROiJEY7mVF6H4a1na2jzx9wCeKJJh
+lq4wPiRaQlTm+a09uzpjRKM=
+=rjIl
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/clamassassin/clamassassin-1.2.1.ebuild b/mail-filter/clamassassin/clamassassin-1.2.1.ebuild
index b12ee7deb4c7..025e0d9264f9 100644
--- a/mail-filter/clamassassin/clamassassin-1.2.1.ebuild
+++ b/mail-filter/clamassassin/clamassassin-1.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/mail-filter/clamassassin/clamassassin-1.2.1.ebuild,v 1.1 2004/08/31 16:10:11 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/clamassassin-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 DESCRIPTION="clamassassin is a simple script for virus scanning (through clamav) an e-mail message as a
 filter (like spamassassin)"
@@ -8,14 +8,12 @@ HOMEPAGE="http://drivel.com/clamassassin/"
 SRC_URI="http://drivel.com/clamassassin/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="x86 amd64 ~ppc"
 IUSE="subject-rewrite"
 DEPEND=">=app-antivirus/clamav-0.75.1
 		sys-apps/debianutils
 		sys-apps/which
-		virtual/mda" # This is because clamassassin needs formail which is
-					 # both in procmail and maildrop. Is this the right
-					 # dependency?
+		mail-filter/procmail"
 
 src_compile() {
 	econf $(use_enable subject-rewrite) || die
diff --git a/mail-filter/clamassassin/clamassassin-1.2.2.ebuild b/mail-filter/clamassassin/clamassassin-1.2.2.ebuild
index cf73e22e63f6..5d0264e40930 100644
--- a/mail-filter/clamassassin/clamassassin-1.2.2.ebuild
+++ b/mail-filter/clamassassin/clamassassin-1.2.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/mail-filter/clamassassin/clamassassin-1.2.2.ebuild,v 1.1 2004/12/09 23:01:58 superlag Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamassassin/clamassassin-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 DESCRIPTION="clamassassin is a simple script for virus scanning (through clamav) an e-mail message as a
 filter (like spamassassin)"
@@ -8,15 +8,18 @@ HOMEPAGE="http://drivel.com/clamassassin/"
 SRC_URI="http://drivel.com/clamassassin/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
-IUSE="subject-rewrite"
+KEYWORDS="x86 amd64 ~ppc ~sparc"
+IUSE="subject-rewrite clamd"
 DEPEND=">=app-antivirus/clamav-0.75.1
 		sys-apps/debianutils
 		sys-apps/which
 		mail-filter/procmail"
 
 src_compile() {
-	econf $(use_enable subject-rewrite) || die
+	econf \
+		$(use_enable subject-rewrite) \
+		$(use_enable clamd clamdscan) \
+		|| die
 	# Fix problems with Portage exporting TMP and breaking clamassassin. #61806
 	sed -i -e "s:${TMP}:/tmp:" clamassassin
 }
diff --git a/mail-filter/clamsmtp/ChangeLog b/mail-filter/clamsmtp/ChangeLog
index 1d7dd59b00e4..30faeb00b394 100644
--- a/mail-filter/clamsmtp/ChangeLog
+++ b/mail-filter/clamsmtp/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for mail-filter/clamsmtp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamsmtp/ChangeLog,v 1.1 2005/05/14 22:51:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamsmtp/ChangeLog,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
+
+*clamsmtp-1.6 (07 Nov 2005)
+
+  07 Nov 2005; Andrej Kacian <ticho@gentoo.org> +clamsmtp-1.6.ebuild:
+  Version bump. Closes bug #111497, by Brad Schuetz <brad.schuetz at gmail.com>.
+
+  03 Oct 2005; Andrej Kacian <ticho@gentoo.org> clamsmtp-1.4.1.ebuild,
+  clamsmtp-1.5.ebuild:
+  Do not install generic COPYING document.
+
+  26 Sep 2005; Andrej Kacian <ticho@gentoo.org> clamsmtp-1.4.1.ebuild,
+  clamsmtp-1.5.ebuild:
+  Stable on amd64, 1.5 stable on both x86 and amd64.
+
+*clamsmtp-1.5 (24 Aug 2005)
+
+  24 Aug 2005; Andrej Kacian <ticho@gentoo.org> +clamsmtp-1.5.ebuild:
+  Version bump.
+
+  24 Aug 2005; Andrej Kacian <ticho@gentoo.org> clamsmtp-1.4.1.ebuild:
+  Stable on x86.
+
+  13 Jun 2005; Andrej Kacian <ticho@gentoo.org> clamsmtp-1.4.1.ebuild:
+  Added ~amd64.
 
 *clamsmtp-1.4.1 (14 May 2005)
 
diff --git a/mail-filter/clamsmtp/Manifest b/mail-filter/clamsmtp/Manifest
index fc32ad7455a1..8eebcb5991f3 100644
--- a/mail-filter/clamsmtp/Manifest
+++ b/mail-filter/clamsmtp/Manifest
@@ -1,3 +1,19 @@
-MD5 61b401da8255b0d9dc9632d567ea0431 clamsmtp-1.4.1.ebuild 1241
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bd5d4742cefdd4e91b627eae7ce25860 ChangeLog 1203
+MD5 5b51706c664b84ea702054f2a65fca0d clamsmtp-1.4.1.ebuild 1348
+MD5 4139a23bf542ae1b235e55b736f26bd5 clamsmtp-1.5.ebuild 1346
+MD5 b188cbefe2018b78edc1ab08f71fea66 clamsmtp-1.6.ebuild 1348
 MD5 baf953395c3097dca31171f7ebade75a files/clamsmtpd.init 462
 MD5 dfac95f01e87493f9f73b59692c19489 files/digest-clamsmtp-1.4.1 66
+MD5 2484eb1d778828a2e967f6f4680aa9d0 files/digest-clamsmtp-1.5 64
+MD5 9f4ff31b5dc33637fdecbf14928db787 files/digest-clamsmtp-1.6 64
+MD5 e4238fef843c6ceb78bd9013a90a918f metadata.xml 465
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDb7TUQlM6RnzZP+IRAgXLAKCjbFbZN9YQQZoYhh8Qk8jYhAV4ywCfd7jM
+hMRVei3PYL482for9H0xea8=
+=fmF5
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/clamsmtp/clamsmtp-1.4.1.ebuild b/mail-filter/clamsmtp/clamsmtp-1.4.1.ebuild
index e01fb7c4c266..4a77e28edaea 100644
--- a/mail-filter/clamsmtp/clamsmtp-1.4.1.ebuild
+++ b/mail-filter/clamsmtp/clamsmtp-1.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/mail-filter/clamsmtp/clamsmtp-1.4.1.ebuild,v 1.1 2005/05/14 22:51:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamsmtp/clamsmtp-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 DESCRIPTION="ClamSMTP is an SMTP filter that allows you to check for viruses using the ClamAV anti-virus software."
 HOMEPAGE="http://memberwebs.com/nielsen/software/clamsmtp/"
@@ -8,7 +8,8 @@ HOMEPAGE="http://memberwebs.com/nielsen/software/clamsmtp/"
 SRC_URI="http://memberwebs.com/nielsen/software/clamsmtp/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 x86"
+IUSE=""
 
 DEPEND="virtual/libc
 		>=sys-apps/sed-4"
@@ -16,7 +17,7 @@ RDEPEND=">=app-antivirus/clamav-0.75"
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS
+	dodoc AUTHORS ChangeLog README NEWS
 	newinitd ${FILESDIR}/clamsmtpd.init clamsmtpd
 	insinto /etc
 	newins doc/clamsmtpd.conf clamsmtpd.conf
diff --git a/mail-filter/clamsmtp/clamsmtp-1.5.ebuild b/mail-filter/clamsmtp/clamsmtp-1.5.ebuild
index 43ffc858a6b3..2b263c998a2c 100644
--- a/mail-filter/clamsmtp/clamsmtp-1.5.ebuild
+++ b/mail-filter/clamsmtp/clamsmtp-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/mail-filter/clamsmtp/clamsmtp-1.5.ebuild,v 1.1 2005/08/24 11:15:43 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamsmtp/clamsmtp-1.5.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 DESCRIPTION="ClamSMTP is an SMTP filter that allows you to check for viruses using the ClamAV anti-virus software."
 HOMEPAGE="http://memberwebs.com/nielsen/software/clamsmtp/"
@@ -8,7 +8,7 @@ HOMEPAGE="http://memberwebs.com/nielsen/software/clamsmtp/"
 SRC_URI="http://memberwebs.com/nielsen/software/clamsmtp/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -17,7 +17,7 @@ RDEPEND=">=app-antivirus/clamav-0.75"
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS COPYING ChangeLog README NEWS
+	dodoc AUTHORS ChangeLog README NEWS
 	newinitd ${FILESDIR}/clamsmtpd.init clamsmtpd
 	insinto /etc
 	newins doc/clamsmtpd.conf clamsmtpd.conf
diff --git a/mail-filter/clamsmtp/clamsmtp-1.6.ebuild b/mail-filter/clamsmtp/clamsmtp-1.6.ebuild
index 6d053a5ce4fd..80e73f0aa9c6 100644
--- a/mail-filter/clamsmtp/clamsmtp-1.6.ebuild
+++ b/mail-filter/clamsmtp/clamsmtp-1.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/mail-filter/clamsmtp/clamsmtp-1.6.ebuild,v 1.1 2005/11/07 20:09:07 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/clamsmtp/clamsmtp-1.6.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 DESCRIPTION="ClamSMTP is an SMTP filter that allows you to check for viruses using the ClamAV anti-virus software."
 HOMEPAGE="http://memberwebs.com/nielsen/software/clamsmtp/"
diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index d5b7eab04763..20ab2a99e49b 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,63 @@
-# ChangeLog for net-mail/dcc
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.1 2004/06/03 07:04:52 seemant Exp $
+# ChangeLog for mail-filter/dcc
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
+
+  12 Nov 2005; Brent Baude <ranger@gentoo.org> dcc-1.3.16.ebuild:
+  Marking dcc-1.3.16 ~ppc64 for bug# 112220
+
+  11 Nov 2005; <mcummings@gentoo.org> dcc-1.3.16.ebuild:
+  Tested and keyworded for ~sparc. Also allows dcc use flag in new
+  spamassassin for sparc.
+
+  16 Sep 2005; Simon Stelling <blubb@gentoo.org> dcc-1.3.16.ebuild:
+  stable on amd64 wrt 105217
+
+  12 Sep 2005; Andrej Kacian <ticho@gentoo.org> dcc-1.2.28.ebuild,
+  dcc-1.2.28-r1.ebuild, dcc-1.2.74.ebuild, dcc-1.3.16.ebuild:
+  Do not use ${HOMEPAGE} in SRC_URI.
+
+  11 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> dcc-1.3.16.ebuild:
+  Stable on ppc.
+
+*dcc-1.3.16 (10 Sep 2005)
+
+  10 Sep 2005; Tom Knight <tomk@gentoo.org> +dcc-1.3.16.ebuild:
+  Version bumped to 1.3.6, fixes security vulnerability, bug #105217
+
+*dcc-1.2.74 (21 Mar 2005)
+
+  21 Mar 2005; Scott W Taylor <swtaylor@gentoo.org> dcc-1.2.28-r1.ebuild,
+  +dcc-1.2.74.ebuild:
+  bump
+
+  17 Mar 2005; Seemant Kulleen <seemant@gentoo.org> dcc-1.2.28.ebuild,
+  dcc-1.2.28-r1.ebuild:
+  Dependency update: net-www/fetch -> www-client/fetch.
+
+  28 Sep 2004; Andrej Kacian <ticho@gentoo.org> metadata.xml:
+  Fixed herd name in metadata.xml.
+
+*dcc-1.2.28-r1 (25 Sep 2004)
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> +dcc-1.2.28-r1.ebuild:
+  Added net-analyzer/rrdtool to RDEPEND, use sed to alter hard-coded paths to
+  rrdtool binary in dcc-stats-* scripts. Closes #43359, reported by
+  Jeremy Huddleston <eradicator@gentoo.org>.
+
+  19 Sep 2004; Scott W Taylor <swtaylor@gentoo.org> dcc-1.2.28.ebuild:
+  fix rdepend. procmail does exist if courier is installed
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> dcc-1.2.28.ebuild:
+  virtual/glibc -> virtual/libc
+
+  15 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> dcc-1.2.28.ebuild:
+  Marked ~amd64.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> dcc-1.2.28.ebuild:
+  Added to ~ppc.
+
+  03 Jun 2004; Seemant Kulleen <seemant@gentoo.org> dcc-1.2.28.ebuild:
+  Change DEPENDency from net-mail/procmail to mail-filter/procmail
 
 *dcc-1.2.28 (03 Jun 2004)
 
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index b94f09f2b7c3..4c5610208e81 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,4 +1,10 @@
-MD5 28242c59b16ea7c8b8f3070bd4d816d8 dcc-1.2.28.ebuild 3071
-MD5 10595585d817c28e26035aab612a4b32 ChangeLog 370
-MD5 2f5d2faaf988e9e5fdad1e48c66f6fc4 metadata.xml 224
+MD5 865014f3457626535fb99b4945bcb165 ChangeLog 2533
+MD5 9820a1516eab5f987d0acc4937109f37 dcc-1.2.28-r1.ebuild 3468
+MD5 088846b45a9f76ff360b59e162aa691b dcc-1.2.28.ebuild 3142
+MD5 44316ec77134d08f57f6b7092d506758 dcc-1.2.74.ebuild 3558
+MD5 7f831a9c1e3a3c3de80c20a29e8de8e3 dcc-1.3.16.ebuild 3568
+MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
 MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28 67
+MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28-r1 67
+MD5 1e48ac518bb2e13c6194d45732e6efa5 files/digest-dcc-1.2.74 67
+MD5 fb9e3179011fd75dc427787fbcd6a028 files/digest-dcc-1.3.16 67
diff --git a/mail-filter/dcc/dcc-1.2.28-r1.ebuild b/mail-filter/dcc/dcc-1.2.28-r1.ebuild
index 7d696ba6bb39..da283f59705d 100644
--- a/mail-filter/dcc/dcc-1.2.28-r1.ebuild
+++ b/mail-filter/dcc/dcc-1.2.28-r1.ebuild
@@ -1,21 +1,21 @@
-# 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/mail-filter/dcc/dcc-1.2.28-r1.ebuild,v 1.1 2004/09/25 15:50:38 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.2.28-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="Distributed Checksum Clearinghouse"
 HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
 MY_P="dcc-dccd-${PV}"
-SRC_URI="${HOMEPAGE}/source/${MY_P}.tar.Z"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ppc amd64"
 IUSE="ipv6"
 
 RDEPEND="dev-lang/perl
 	net-analyzer/rrdtool
 	|| ( mail-filter/procmail mail-mta/courier )
-	|| ( net-misc/wget net-www/fetch net-misc/curl net-ftp/ftp )
+	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
 	virtual/libc"
 DEPEND="sys-apps/sed
 	sys-devel/gcc
diff --git a/mail-filter/dcc/dcc-1.2.28.ebuild b/mail-filter/dcc/dcc-1.2.28.ebuild
index c98d15b43175..23cb53e077cc 100644
--- a/mail-filter/dcc/dcc-1.2.28.ebuild
+++ b/mail-filter/dcc/dcc-1.2.28.ebuild
@@ -1,20 +1,21 @@
-# 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/mail-filter/dcc/dcc-1.2.28.ebuild,v 1.1 2004/06/03 07:04:52 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.2.28.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="Distributed Checksum Clearinghouse"
 HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
 MY_P="dcc-dccd-${PV}"
-SRC_URI="${HOMEPAGE}/source/${MY_P}.tar.Z"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="ipv6"
 
 RDEPEND="dev-lang/perl
-	net-mail/procmail
-	|| ( net-misc/wget net-www/fetch net-misc/curl net-ftp/ftp )
-	virtual/glibc"
+	|| ( mail-filter/procmail mail-mta/courier )
+	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
+	virtual/libc"
 DEPEND="sys-apps/sed
 	sys-devel/gcc
 	${RDEPEND}"
diff --git a/mail-filter/dcc/dcc-1.2.74.ebuild b/mail-filter/dcc/dcc-1.2.74.ebuild
index f11389c0c0f3..4d2e0cba6ab2 100644
--- a/mail-filter/dcc/dcc-1.2.74.ebuild
+++ b/mail-filter/dcc/dcc-1.2.74.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.2.74.ebuild,v 1.1 2005/03/21 17:46:11 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.2.74.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="Distributed Checksum Clearinghouse"
 HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
 MY_P="dcc-dccd-${PV}"
-SRC_URI="${HOMEPAGE}/source/${MY_P}.tar.Z"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
diff --git a/mail-filter/dcc/dcc-1.3.16.ebuild b/mail-filter/dcc/dcc-1.3.16.ebuild
index 2b552a1e20fd..63aaf99b49df 100644
--- a/mail-filter/dcc/dcc-1.3.16.ebuild
+++ b/mail-filter/dcc/dcc-1.3.16.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.16.ebuild,v 1.1 2005/09/10 09:54:13 tomk Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.16.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="Distributed Checksum Clearinghouse"
 HOMEPAGE="http://www.rhyolite.com/anti-spam/dcc/"
 MY_P="dcc-dccd-${PV}"
-SRC_URI="${HOMEPAGE}/source/${MY_P}.tar.Z"
+SRC_URI="http://www.rhyolite.com/anti-spam/dcc/source/${MY_P}.tar.Z"
 
 LICENSE="DCC"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~amd64"
+KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND="dev-lang/perl
diff --git a/mail-filter/dcc/metadata.xml b/mail-filter/dcc/metadata.xml
index 0f6802b938a7..8c852c741509 100644
--- a/mail-filter/dcc/metadata.xml
+++ b/mail-filter/dcc/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>net-herd</herd>
+<herd>net-mail</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
diff --git a/mail-filter/disspam/ChangeLog b/mail-filter/disspam/ChangeLog
index 1f45d328d513..4b55c42647b1 100644
--- a/mail-filter/disspam/ChangeLog
+++ b/mail-filter/disspam/ChangeLog
@@ -1,6 +1,32 @@
-# ChangeLog for net-mail/disspam
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/ChangeLog,v 1.1 2004/06/03 07:06:07 seemant Exp $
+# ChangeLog for mail-filter/disspam
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/ChangeLog,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> disspam-0.14.ebuild:
+  Mark 0.14 stable on alpha
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> disspam-0.14.ebuild:
+  Stable on ppc.
+
+  08 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> disspam-0.14.ebuild:
+  Stable on sparc
+
+  07 Feb 2005; Andrej Kacian <ticho@gentoo.org> disspam-0.12-r1.ebuild,
+  disspam-0.14.ebuild:
+  Stable on x86.
+
+*disspam-0.14 (05 Jan 2005)
+
+  05 Jan 2005; Andrej Kacian <ticho@gentoo.org> +disspam-0.14.ebuild,
+  disspam-0.12-r1.ebuild:
+  Version bump. Some QA fixes, including year 2005 in ebuild headers.
+
+*disspam-0.12-r1 (31 Dec 2004)
+
+  31 Dec 2004; Andrej Kacian <ticho@gentoo.org> +files/0.12-sa302fix.patch,
+  +disspam-0.12-r1.ebuild:
+  Fix API change for spamassassin 3.0.2, if present. Closes #76182, reported
+  by Jeff Mills <hybiepoo@hotmail.com>. Some QA fixes.
 
 *disspam-0.12 (03 Jun 2004)
 
diff --git a/mail-filter/disspam/Manifest b/mail-filter/disspam/Manifest
index be2e842063f0..6d739e7b8a15 100644
--- a/mail-filter/disspam/Manifest
+++ b/mail-filter/disspam/Manifest
@@ -1,6 +1,11 @@
-MD5 63afb93f6de97095e5493f5249e86109 disspam-0.10.ebuild 642
-MD5 750072a90e7a414e3079302dc1c3c285 disspam-0.12.ebuild 830
-MD5 6c59584abaa1ed77ce96e6b13e569be4 ChangeLog 985
+MD5 56bbfbe82cae14e9e1313a4d1545e540 disspam-0.12.ebuild 832
+MD5 f83366b7eebbd95dc20c27082c415858 disspam-0.10.ebuild 640
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 ddb8a156da69c67f9ed6054ee673afc4 files/digest-disspam-0.10 62
+MD5 9e34f16f325b65d0c9af6888098ee017 ChangeLog 2047
+MD5 56457e8f7acac6a07d09f728acf8f57e disspam-0.12-r1.ebuild 1100
+MD5 4f571666a32ab4d1a8eab424acb0cdd8 disspam-0.14.ebuild 853
+MD5 548d657cf971ba884004c6d2a64380fa files/digest-disspam-0.12-r1 63
 MD5 548d657cf971ba884004c6d2a64380fa files/digest-disspam-0.12 63
+MD5 ddb8a156da69c67f9ed6054ee673afc4 files/digest-disspam-0.10 62
+MD5 be17e97b664b6edd999e63392d4341ef files/digest-disspam-0.14 63
+MD5 7f9a737e57d995d4630d4186543669fe files/0.12-sa302fix.patch 617
diff --git a/mail-filter/disspam/disspam-0.10.ebuild b/mail-filter/disspam/disspam-0.10.ebuild
index 712ba63b5cf1..af0a3d1a6683 100644
--- a/mail-filter/disspam/disspam-0.10.ebuild
+++ b/mail-filter/disspam/disspam-0.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/mail-filter/disspam/disspam-0.10.ebuild,v 1.1 2004/06/03 07:06:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/disspam-0.10.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 S=${WORKDIR}/disspam
 DESCRIPTION="A Perl script that removes spam from POP3 mailboxes based on RBLs."
@@ -10,6 +10,7 @@ SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
 SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="x86 sparc"
+IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.1
 	>=dev-perl/libnet-1.11
diff --git a/mail-filter/disspam/disspam-0.12-r1.ebuild b/mail-filter/disspam/disspam-0.12-r1.ebuild
index acd8c1d15a62..710f3ca3518a 100644
--- a/mail-filter/disspam/disspam-0.12-r1.ebuild
+++ b/mail-filter/disspam/disspam-0.12-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/mail-filter/disspam/disspam-0.12-r1.ebuild,v 1.1 2004/12/31 17:29:06 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/disspam-0.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 inherit eutils versionator
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~mips"
+KEYWORDS="x86 ~ppc ~sparc ~hppa ~alpha ~mips"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.1
@@ -33,7 +33,7 @@ src_unpack() {
 		-e 's/\/usr\/local\/bin\/perl/\/usr\/bin\/perl/' disspam.pl || \
 			die "sed disspam.pl failed"
 }
-	
+
 src_install() {
 	dobin disspam.pl
 	dodoc changes.txt configuration.txt readme.txt sample.conf
diff --git a/mail-filter/disspam/disspam-0.12.ebuild b/mail-filter/disspam/disspam-0.12.ebuild
index 000787c0a9ad..f84227a52436 100644
--- a/mail-filter/disspam/disspam-0.12.ebuild
+++ b/mail-filter/disspam/disspam-0.12.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/mail-filter/disspam/disspam-0.12.ebuild,v 1.1 2004/06/03 07:06:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/disspam-0.12.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 S=${WORKDIR}/disspam
 DESCRIPTION="A Perl script that removes spam from POP3 mailboxes based on RBLs."
@@ -10,6 +10,7 @@ SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
 SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="x86 ~ppc sparc ~hppa ~alpha ~mips"
+IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.1
 	>=dev-perl/libnet-1.11
diff --git a/mail-filter/disspam/disspam-0.14.ebuild b/mail-filter/disspam/disspam-0.14.ebuild
index 9254952baa25..548542de5c27 100644
--- a/mail-filter/disspam/disspam-0.14.ebuild
+++ b/mail-filter/disspam/disspam-0.14.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/mail-filter/disspam/disspam-0.14.ebuild,v 1.1 2005/01/05 20:53:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/disspam/disspam-0.14.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 DESCRIPTION="A Perl script that removes spam from POP3 mailboxes based on RBLs."
 HOMEPAGE="http://www.topfx.com/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.topfx.com/dist/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha ~mips"
+KEYWORDS="alpha ~hppa ~mips ppc sparc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.1
diff --git a/mail-filter/disspam/files/0.12-sa302fix.patch b/mail-filter/disspam/files/0.12-sa302fix.patch
index 47396530af30..58f992497056 100644
--- a/mail-filter/disspam/files/0.12-sa302fix.patch
+++ b/mail-filter/disspam/files/0.12-sa302fix.patch
@@ -1,7 +1,17 @@
 diff -bur disspam-orig/disspam.pl disspam/disspam.pl
 --- disspam-orig/disspam.pl	2003-05-07 00:46:14.000000000 +0200
-+++ disspam/disspam.pl	2004-12-31 17:46:38.353945152 +0100
-@@ -766,7 +766,7 @@
++++ disspam/disspam.pl	2004-12-31 18:31:49.006478280 +0100
+@@ -144,7 +144,8 @@
+ 				if ($HEADERHASHES{$hash} =~ /S/) {
+ 
+ 					# It's old spam
+-					$reason = "Message previously detected as spam";
++					#$reason = "Message previously detected as spam";
++					undef $reason
+ 				}
+ 				else {
+ 
+@@ -766,7 +767,7 @@
  
  			#give email SpamAssassin headers
  			$status->rewrite_mail();
diff --git a/mail-filter/dspam/ChangeLog b/mail-filter/dspam/ChangeLog
index 1f8a502f543a..f155462ad2c8 100644
--- a/mail-filter/dspam/ChangeLog
+++ b/mail-filter/dspam/ChangeLog
@@ -1,6 +1,360 @@
 # ChangeLog for mail-filter/dspam
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.1 2004/06/26 16:45:28 st_lim Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.1.1.1 2005/11/30 10:11:56 chriswhite Exp $
+
+  20 Nov 2005; Stefan Briesenick <sbriesen@gentoo.org> dspam-3.6.0.ebuild,
+  dspam-3.6.1.ebuild:
+  added missing 'sqlite3' use-flag.
+
+  16 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.1.ebuild:
+  Patched for bug #112627
+
+*dspam-3.6.1 (09 Nov 2005)
+
+  09 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.6.1.ebuild:
+  Version bump
+
+  06 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.0.ebuild:
+  Fixed bug #81596.  Late. :(
+
+  05 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> ChangeLog:
+  Added sqlite3 as a use flag, and removed older stuff
+
+  05 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.0.ebuild:
+  Enabling sqlite3 again
+
+  05 Nov 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.6.0.ebuild:
+  Added use flag for clamav
+
+*dspam-3.6.0 (17 Oct 2005)
+
+  17 Oct 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.6.0.ebuild:
+  Version bump
+
+*dspam-3.6_rc3 (15 Oct 2005)
+
+  15 Oct 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.6_rc3.ebuild:
+  Version bump long overdue.  :)
+
+*dspam-3.6_rc1 (23 Sep 2005)
+
+  23 Sep 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.9.ebuild,
+  +dspam-3.6_rc1.ebuild:
+  Version bump to 3.6_rc1
+
+  15 Sep 2005; <dang@gentoo.org> dspam-3.4.9.ebuild:
+  Marked ~amd64
+
+  29 Aug 2005; Tom Martin <slarti@gentoo.org> dspam-3.4.9.ebuild:
+  Added in a conditional dependency with (another) local logrotate USE flag.
+  Resolves bug #97447.
+
+*dspam-3.4.9 (08 Aug 2005)
+
+  08 Aug 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-3.4.0.ebuild,
+  -dspam-3.4.0-r1.ebuild, -dspam-3.4.1.ebuild, -dspam-3.4.2.ebuild,
+  -dspam-3.4.5.ebuild, -dspam-3.4.6.ebuild, +dspam-3.4.9.ebuild:
+  Version bump.
+
+  17 Jun 2005; Lim Swee Tat <st_lim@gentoo.org> ChangeLog:
+  Version bump long overdue.
+
+  11 May 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.1.ebuild:
+  Removed the daemon use flag
+
+*dspam-3.4.6 (10 May 2005)
+
+  10 May 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.0-r1.ebuild,
+  dspam-3.4.1.ebuild, dspam-3.4.2.ebuild, dspam-3.4.5.ebuild,
+  +dspam-3.4.6.ebuild:
+  Fixed 88246 and 89740
+
+*dspam-3.4.6 (10 May 2005)
+
+  10 May 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.0-r1.ebuild,
+  dspam-3.4.1.ebuild, dspam-3.4.2.ebuild, dspam-3.4.5.ebuild,
+  +dspam-3.4.6.ebuild:
+  Version bump
+
+*dspam-3.4.5 (27 Apr 2005)
+
+  27 Apr 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.4.5.ebuild:
+  Version bump
+
+*dspam-3.4.2 (05 Apr 2005)
+
+  05 Apr 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.4.2.ebuild:
+  Version bump
+
+  05 Apr 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.1.ebuild:
+  Fixed bug #87358 and #85939
+
+  28 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.1.ebuild:
+  Fixed bug #86099
+
+*dspam-3.4.1 (23 Mar 2005)
+
+  23 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4.0-r1.ebuild,
+  +dspam-3.4.1.ebuild:
+  Added 3.4.1, fixed virtual users.sql
+
+*dspam-3.4.0-r1 (20 Mar 2005)
+
+  20 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> files/dspam.cron,
+  +files/dspam.rc, +dspam-3.4.0-r1.ebuild:
+  Fix bug #85939 and #81596
+
+*dspam-3.4_rc3 (11 Mar 2005)
+
+  11 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4_rc2.ebuild,
+  +dspam-3.4_rc3.ebuild:
+  Fixed 3 birds, uh bugs with one stone - Bugs #84539, #81345, #78727
+
+  09 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-3.2.4.ebuild,
+  -dspam-3.2.6.ebuild, -dspam-3.3.11.ebuild, -dspam-3.3.8.ebuild,
+  -dspam-3.4_beta1.ebuild, -dspam-3.4_beta2.ebuild, -dspam-3.4_beta3.ebuild,
+  -dspam-3.4_rc1.ebuild:
+  Removed the older files/Housekeeping
+
+  09 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4_rc1.ebuild,
+  dspam-3.4_rc2.ebuild:
+  Fixed bug #83779.  Documents were overwritting.  Thanx to mike@nerone.org
+
+*dspam-3.4_rc1 (04 Mar 2005)
+
+  04 Mar 2005; Ciaran McCreesh <ciaranm@gentoo.org> dspam-3.2.4.ebuild,
+  dspam-3.2.6.ebuild, dspam-3.2.7.ebuild, dspam-3.3.11.ebuild,
+  dspam-3.3.8.ebuild, dspam-3.4_beta1.ebuild, dspam-3.4_beta2.ebuild,
+  dspam-3.4_beta3.ebuild, dspam-3.4_rc1.ebuild, dspam-3.4_rc2.ebuild:
+  Move sys-apps/cronbase -> sys-process/cronbase
+
+*dspam-3.4_rc2 (01 Mar 2005)
+
+  01 Mar 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.4_rc2.ebuild:
+  Version bump.  Need to include an init.d daemon for the --enable-daemon option.
+
+*dspam-3.4_beta3 (17 Feb 2005)
+
+  17 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.4_beta3.ebuild:
+  Version bump
+
+*dspam-3.4_beta2 (08 Feb 2005)
+
+  08 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.4_beta1.ebuild,
+  +dspam-3.4_beta2.ebuild:
+  Version bump
+
+*dspam-3.4_beta1 (21 Jan 2005)
+
+  21 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.4.ebuild,
+  dspam-3.2.6.ebuild, dspam-3.3.11.ebuild, dspam-3.3.8.ebuild,
+  dspam-3.4_beta1.ebuild:
+  Trying to fix bug #78768
+  Changing dspam to a userid of 26, one after 25.
+
+  20 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Added courier as a dependency for maildrop
+
+*dspam-3.2.6 (20 Jan 2005)
+
+  20 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.4.ebuild,
+  +dspam-3.2.6.ebuild:
+  Version bump
+
+  17 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Removing 3.3.11, bad packaging upstream
+  Version bump to beta1
+
+*dspam-3.3.11 (14 Jan 2005)
+
+  14 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> dspam-3.3.11.ebuild:
+  Removed the --enable-daemon line
+
+  12 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump to 3.3.11. May need to support bnr and libdclassify and
+  nodalcore engine. Removed many unneeded files from files directory.
+
+*dspam-3.2.3 (05 Jan 2005)
+
+  05 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> -dspam-3.0.0.ebuild,
+  -dspam-3.1.2.ebuild, -dspam-3.2.0.ebuild, -dspam-3.2.1.ebuild,
+  -dspam-3.2.2.ebuild, -dspam-3.2.3.ebuild:
+  Version bump URL Fixed Removed older versions of dspam because the latest
+  version 3.2.4 is finally stable.
+
+  04 Jan 2005; Lim Swee Tat <st_lim@gentoo.org> :
+  There was a bug fix in dspam for 3.2.4.  Upgrade!! Upgrade!!
+
+*dspam-3.3.8 (31 Dec 2004)
+
+  31 Dec 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.3.8.ebuild:
+  Version bumped at last.
+
+  03 Dec 2004; Lim Swee Tat <st_lim@gentoo.org> :
+  Version bump
+
+  28 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.2.ebuild:
+  Fixed bug #71802.
+  Removed --enable-homedir
+  Using sqlite-2.7.7
+  Changing the newdoc to dodoc.
+  newins for sqlite specific files is done with the correct set of insopts
+
+*dspam-3.2.2 (18 Nov 2004)
+
+  18 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.2.2.ebuild:
+  Version bump
+
+  12 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+  dspam-3.2.1.ebuild:
+  Oops on bug #70388.  Reapplying on 3.2.0
+
+  11 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+  dspam-3.2.1.ebuild:
+  Fixed bug #70388, #70647, #70755. Also rearranged some of the wording.
+
+  11 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+  dspam-3.2.1.ebuild:
+  Fixed bug #70755
+
+  11 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+  dspam-3.2.1.ebuild:
+  Removed the mysql41 use flag
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> dspam-3.2.1.ebuild:
+  Add ~alpha and ~ia64
+
+  09 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.1.ebuild:
+  Fixed the problem in Bug #70388
+
+*dspam-3.2.1 (05 Nov 2004)
+
+  05 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild,
+  dspam-3.2.1.ebuild:
+  Fixing bug #68526, removed preferences-extension from sqlite
+
+  02 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> -dspam-3.1.0.ebuild,
+  -dspam-3.1.1.ebuild, -dspam-3.2_rc3.ebuild:
+  Version Bump to 3.2.1.
+
+  28 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.1.1.ebuild,
+  dspam-3.1.2.ebuild, dspam-3.2.0.ebuild, dspam-3.2_beta1.ebuild,
+  dspam-3.2_rc3.ebuild:
+  Removed the text about the corpus. May want to follow spamassassin's
+  ruledujour for dspam corpus.
+
+  27 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild:
+  Fixed bug #68526. Noted that preference-extensions only work when using
+  mysql and not when using db4.
+
+*dspam-3.2.0 (27 Oct 2004)
+
+  27 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2.0.ebuild:
+  Removed the agent, and removed some lines for db4
+
+*dspam-3.2_rc3 (24 Oct 2004)
+
+  24 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild,
+  dspam-3.1.0.ebuild, dspam-3.1.1.ebuild, dspam-3.1.2.ebuild,
+  dspam-3.2_beta1.ebuild, dspam-3.2_rc3.ebuild:
+  Fixed user permissions on the data directory, and provided correct instructions for train.pl
+
+  17 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild,
+  dspam-3.1.0.ebuild, dspam-3.1.1.ebuild, dspam-3.1.2.ebuild,
+  dspam-3.2_beta1.ebuild, -dspam-3.2_rc2.ebuild:
+  Setting up rc3 as preview release 1
+  Updated to solve bug #65629
+  not using courier anymore. Using maildrop
+  Fixed issues with the 3.2 releases that use dspam.conf
+  Pls test rc3.!!!
+  Removing rc2 since that failed miserably. :(
+
+  09 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2_rc2.ebuild:
+  Changed the UntrustedMailerArgs
+
+  09 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.2_rc2.ebuild:
+  Changed the UntrustedMailerArgs
+
+*dspam-3.2_rc2 (09 Oct 2004)
+
+  09 Oct 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild,
+  dspam-3.1.0.ebuild, dspam-3.1.1.ebuild, dspam-3.1.2.ebuild,
+  dspam-3.2_beta1.ebuild, +dspam-3.2_rc2.ebuild:
+  Version bump to 3.2 rc2
+  exim fixed for everything
+
+  28 Sep 2004; Andrej Kacian <ticho@gentoo.org> metadata.xml:
+  Fixed herd name in metadata.xml.
+
+*dspam-3.2_beta1 (25 Sep 2004)
+
+  25 Sep 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.2_beta1.ebuild:
+  Version bumped, but not using the latest features yet.
+
+*dspam-3.1.2 (07 Sep 2004)
+
+  07 Sep 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.1.2.ebuild:
+  Version bump to 3.1.2 but without sqlite support
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> dspam-3.1.0.ebuild,
+  dspam-3.1.1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  26 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.1.1.ebuild:
+  Solved bug #61564 with the help of steveb <tp22a@softhome.net>.
+  Now able to offer a choice of speed optimized or space optimized mysql data.
+
+  23 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.1.1.ebuild:
+  Fixed bug #61200
+
+*dspam-3.1.1 (22 Aug 2004)
+
+  22 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +files/dspam.cron,
+  files/logrotate.dspam, +dspam-3.1.1.ebuild:
+  We waited some time before fixing bug #57838.  My fault.
+  Thanx to steveb <tp22a@softhome.net> for his kind suppport and help.
+  3.1.1 built without chi-square and robinson due to compilation errors.
+
+  31 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.1.0.ebuild:
+  Version bump
+
+*dspam-3.1.0_beta11-r1 31 Jul 2004
+
+  31 Jul 2004;  <> 
+  # INSERT ENTRY HERE
+
+*dspam-3.1.0_beta20 (29 Jul 2004)
+
+  29 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> +dspam-3.1.0_beta20.ebuild:
+  Fixed bug #57838.
+  Added dspam-3.1.0.beta.2 as beta20.
+  Added support for postgres, but lacking the postgres database/user creation
+  script.
+
+  21 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild,
+  dspam-3.1.0_beta11.ebuild:
+  Changed SLOT to "0"
+
+*dspam-3.1.0_beta11 (21 Jul 2004)
+
+  21 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild,
+  dspam-3.1.0_beta11.ebuild:
+  Fixed problem with myconf not taking the delivery-agent options seriously
+
+  21 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> dspam-3.0.0.ebuild:
+  Added information to use the user dspam
+  Added exim,maildrop and cyrus specific delivery agent options
+
+  30 Jun 2004; Lim Swee Tat <st_lim@gentoo.org> files/crontab.db4,
+  files/crontab.mysql:
+  Made a mistake on the cron job. Should not have timing values in
+  /etc/cron.daily
+
+  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> dspam-3.0.0.ebuild:
+  QA - fix use invocation
+
+  27 Jun 2004; David Holm <dholm@gentoo.org> dspam-3.0.0.ebuild:
+  Added to ~ppc.
 
 *dspam-3.0.0 (27 Jun 2004)
 
diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest
index 13a055ca0800..070836f8a276 100644
--- a/mail-filter/dspam/Manifest
+++ b/mail-filter/dspam/Manifest
@@ -1,12 +1,17 @@
-MD5 86c21b7cb6533310100d14d95a4cd019 dspam-3.0.0.ebuild 4692
-MD5 2cd345708a9889a04c472a9e5be7400e files/untrusted.mailer_args 24
-MD5 2a79c945ef6c7e7bd45aa1d46ae99e69 files/mysql_install_db 114
-MD5 e87e8df27c8d229cd1c0c41112c2fb5d files/crontab.mysql 120
-MD5 05dce5dc8cf516655657aa2a4cc5f1da files/digest-dspam-3.0.0 63
-MD5 8b68501138fbe92e10bbd93a03c9f2ab files/upgrade.sql 807
-MD5 cd96721195a9fd9d6dae9513aa8f80ca files/crontab.db4 198
-MD5 84ec40b77696359ae49560588db9b948 files/mysql.data 52
-MD5 4d28e1033d92a16355e678b80a2c9960 files/trusted.users 19
-MD5 9fed58b73e35e02ecc3f9a08dcd94eaa files/mysql_purge_db 73
-MD5 5bcf982f468f4843ef3aa51213cc0023 files/mysql_create_user.sql 194
-MD5 e1ba4c62a02bea82c544851edb5ef2c3 files/README.postfix 304
+MD5 55c172d3d3cb2ca5c839fe84f8e954fb ChangeLog 12415
+MD5 ba82ba9c82d1fc2a39e107b672c55c69 dspam-3.2.7.ebuild 15561
+MD5 392cd158b99d8553da925dca65c89a2b dspam-3.4.9.ebuild 19680
+MD5 f7dd9ff17171e25dc54367c71978616d dspam-3.6.0.ebuild 18457
+MD5 ba1526ce11046ece0f9ef4d66fa3315a dspam-3.6.1.ebuild 18282
+MD5 c12a54112c6fec3530a7b1a368d04ac8 files/README.postfix 309
+MD5 e0469b961385fda4305602dc2519d319 files/README.qmail 2317
+MD5 cd1bdb75fd86304f9453741a910cb8a2 files/crontab.db4 196
+MD5 f2f86e8f7ab440c8537f40fa18a0ee43 files/crontab.mysql 118
+MD5 7735956f416bd58bfcbeee99af43bea0 files/digest-dspam-3.2.7 63
+MD5 bf443ca4bd218fa9d4b8975bf450c347 files/digest-dspam-3.4.9 129
+MD5 03b69dda833751bdda04e5413a9305e0 files/digest-dspam-3.6.0 129
+MD5 5a495629f2b3fbcfabc0f4ae4a9b4e4b files/digest-dspam-3.6.1 129
+MD5 34841f2d2c9d6e057b9839bbe354e34a files/dspam.cron 3478
+MD5 e2850ede85e459ab5479b7d2e79eeb5a files/dspam.rc 1025
+MD5 2163ca41de383f09f4d754e2d35cb158 files/logrotate.dspam 156
+MD5 dbfbe5a3bbe3347938107f5f5bd2197e metadata.xml 308
diff --git a/mail-filter/dspam/dspam-3.2.7.ebuild b/mail-filter/dspam/dspam-3.2.7.ebuild
index 4eee2c016d2a..c461f19f0030 100644
--- a/mail-filter/dspam/dspam-3.2.7.ebuild
+++ b/mail-filter/dspam/dspam-3.2.7.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.7.ebuild,v 1.1 2005/02/20 12:50:24 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.2.7.ebuild,v 1.1.1.1 2005/11/30 10:11:56 chriswhite Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${PN}-${PV}
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
-SRC_URI="http://dspam.nuclearelephant.com/sources/${PN}-${PV}.tar.gz"
+SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz"
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
@@ -14,12 +13,12 @@ IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite large
 DEPEND="exim? ( >=mail-mta/exim-4.34 )
 		mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
 		sqlite? ( <dev-db/sqlite-3 )
-		maildrop? (( >=mail-filter/maildrop-1.5.3 ) || ( >=mail-mta/courier-0.46))
+		maildrop? ( ( >=mail-filter/maildrop-1.5.3 ) || ( >=mail-mta/courier-0.46 ) )
 		postgres? ( >=dev-db/postgresql-7.4.3 )
 		procmail? ( >=mail-filter/procmail-3.22 )
 		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
 		"
-RDEPEND="sys-apps/cronbase
+RDEPEND="sys-process/cronbase
 		app-admin/logrotate"
 KEYWORDS="~x86 ~ppc ~alpha"
 SLOT="0"
diff --git a/mail-filter/dspam/dspam-3.4.9.ebuild b/mail-filter/dspam/dspam-3.4.9.ebuild
index 311119c39554..6303f3af437a 100644
--- a/mail-filter/dspam/dspam-3.4.9.ebuild
+++ b/mail-filter/dspam/dspam-3.4.9.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/mail-filter/dspam/dspam-3.4.9.ebuild,v 1.1 2005/08/08 07:23:22 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.4.9.ebuild,v 1.1.1.1 2005/11/30 10:11:57 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
-IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite sqlite3 large-domain virtual-users"
+IUSE="cyrus debug exim mysql maildrop neural oci8 postgres procmail sqlite sqlite3 large-domain logrotate virtual-users"
 DEPEND="exim? ( >=mail-mta/exim-4.34 )
 		mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
 		maildrop? ( >=mail-filter/maildrop-1.5.3 )
@@ -22,8 +22,8 @@ DEPEND="exim? ( >=mail-mta/exim-4.34 )
 		>=sys-libs/db-4.0
 		"
 RDEPEND="sys-process/cronbase
-		app-admin/logrotate"
-KEYWORDS="~x86 ~ppc ~alpha"
+		logrotate? ( app-admin/logrotate )"
+KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 SLOT="0"
 
 # some FHS-like structure
diff --git a/mail-filter/dspam/dspam-3.6.0.ebuild b/mail-filter/dspam/dspam-3.6.0.ebuild
index 7efa2ad9d457..af3147421046 100644
--- a/mail-filter/dspam/dspam-3.6.0.ebuild
+++ b/mail-filter/dspam/dspam-3.6.0.ebuild
@@ -1,24 +1,30 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6.0.ebuild,v 1.1 2005/10/17 16:11:47 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6.0.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="A statistical-algorithmic hybrid anti-spam filter"
 SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
 		http://dspam.nuclearelephant.com/sources/extras/dspam_sa_trainer.tar.gz"
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
-IUSE="debug mysql neural oci8 postgres sqlite large-domain logrotate virtual-users"
-DEPEND="mysql? ( >=dev-db/mysql-3.23 ) || ( >=sys-libs/db-4.0 )
-		sqlite? ( dev-db/sqlite )
+IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite sqlite3 virtual-users user-homedirs"
+DEPEND="clamav? ( >=app-antivirus/clamav-0.86 )
+		mysql? ( >=dev-db/mysql-3.23 )
+		sqlite? ( <dev-db/sqlite-3* )
+		sqlite3? ( =dev-db/sqlite-3* )
 		postgres? ( >=dev-db/postgresql-7.4.3 )
-		x86? ( cyrus? ( >=net-mail/cyrus-imapd-2.1.15 ) )
 		>=sys-libs/db-4.0
 		"
 RDEPEND="sys-process/cronbase
+		clamav? ( >=app-antivirus/clamav-0.86 )
+		mysql? ( >=dev-db/mysql-3.23 )
+		sqlite? ( <dev-db/sqlite-3 )
+		sqlite3? ( =dev-db/sqlite-3* )
+		postgres? ( >=dev-db/postgresql-7.4.3 )
+		>=sys-libs/db-4.0
 		logrotate? ( app-admin/logrotate )"
 KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 SLOT="0"
@@ -30,7 +36,7 @@ LOGDIR="/var/log/dspam"
 
 pkg_setup() {
 	local multiple_dbs="0"
-	local supported_dbs="mysql postgres oci8 sqlite"
+	local supported_dbs="mysql postgres oci8 sqlite sqlite3"
 	for foo in ${supported_dbs}; do
 		if use ${foo}; then
 			let multiple_dbs="((multiple_dbs + 1 ))"
@@ -73,6 +79,13 @@ pkg_setup() {
 		ewarn "(Control-C to abort)..."
 		epause 30
 	)
+	if use virtual-users && use user-homedirs ; then
+		ewarn "If the users are virtual, then they probably should not have home directories."
+	fi
+	if use user-homedirs ; then
+		ewarn "WARNING: dspam-web will not work with user-homedirs.  Disable this USE flag"
+		ewarn "if you intend on using dspam-web."
+	fi
 	id dspam 2>/dev/null || enewgroup dspam 26
 	id dspam 2>/dev/null || enewuser dspam 26 /bin/bash ${HOMEDIR} dspam
 }
@@ -87,7 +100,8 @@ src_compile() {
 
 	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
 	myconf="${myconf} --sysconfdir=${CONFDIR}"
-	use virtual-users || myconf="${myconf} --enable-homedir"
+	use user-homedirs || myconf="${myconf} --enable-homedir"
+	use clamav || myconf="${myconf} --enable-clamav"
 
 	# enables support for debugging (touch /etc/dspam/.debug to turn on)
 	# optional: even MORE debugging output, use with extreme caution!
@@ -97,6 +111,9 @@ src_compile() {
 	if use sqlite ; then
 		myconf="${myconf} --with-storage-driver=sqlite_drv"
 		myconf="${myconf} --enable-virtual-users"
+	elif use sqlite3 ; then
+		myconf="${myconf} --with-storage-driver=sqlite3_drv"
+		myconf="${myconf} --enable-virtual-users"
 	elif use mysql; then
 		myconf="${myconf} --with-storage-driver=mysql_drv"
 		myconf="${myconf} --with-mysql-includes=/usr/include/mysql"
@@ -212,7 +229,11 @@ src_install () {
 	if use sqlite; then
 		insinto ${CONFDIR}
 		insopts -m644 -o dspam -g dspam
-		newins src/tools.sqlite_drv/purge.sql sqlite_purge.sql
+		newins src/tools.sqlite_drv/purge-2.sql sqlite_purge.sql
+	elif use sqlite3; then
+		insinto ${CONFDIR}
+		insopts -m644 -o dspam -g dspam
+		newins src/tools.sqlite_drv/purge-3.sql sqlite3_purge.sql
 	elif use mysql; then
 		# Use existing configuration if possible
 		if [[ -f ${ROOT}${CONFDIR}/mysql.data ]]; then
@@ -396,7 +417,7 @@ pkg_config () {
 		DSPAM_MySQL_DB="${DSPAM_DB_DATA[4]}"
 
 		ewarn "When prompted for a password, please enter your MySQL root password"
-		ewarn ""
+		ewarn
 
 		einfo "Creating DSPAM MySQL database \"${DSPAM_MySQL_DB}\""
 		/usr/bin/mysqladmin -u root -p create ${DSPAM_MySQL_DB}
@@ -440,7 +461,7 @@ pkg_config () {
 		DSPAM_PgSQL_DB="${DSPAM_DB_DATA[4]}"
 
 		ewarn "When prompted for a password, please enter your PgSQL postgres password"
-		ewarn ""
+		ewarn
 
 		einfo "Creating DSPAM PostgreSQL database \"${DSPAM_PgSQL_DB}\" and user \"${DSPAM_PgSQL_USER}\""
 		/usr/bin/psql -h localhost -d template1 -U postgres -c "CREATE USER ${DSPAM_PgSQL_USER} WITH PASSWORD '${DSPAM_PgSQL_PWD}' NOCREATEDB NOCREATEUSER; CREATE DATABASE ${DSPAM_PgSQL_DB}; GRANT ALL PRIVILEGES ON DATABASE ${DSPAM_PgSQL_DB} TO ${DSPAM_PgSQL_USER}; GRANT ALL PRIVILEGES ON SCHEMA public TO ${DSPAM_PgSQL_USER}; UPDATE pg_database SET datdba=(SELECT usesysid FROM pg_shadow WHERE usename='${DSPAM_PgSQL_USER}') WHERE datname='${DSPAM_PgSQL_DB}';"
@@ -456,7 +477,7 @@ pkg_config () {
 		einfo "We have not enought Oracle knowledge to configure Oracle"
 		einfo "automatically. If you know how, please post a message in"
 		einfo "Gentoo Bugzilla."
-		einfo ""
+		einfo
 		einfo "You need manually to create the Oracle user for DSPAM and"
 		einfo "the necessary database."
 		einfo "But the DSPAM configuration file dspam.conf and oracle.data"
diff --git a/mail-filter/dspam/dspam-3.6.1.ebuild b/mail-filter/dspam/dspam-3.6.1.ebuild
index 4d422158ff41..27f6c41b9153 100644
--- a/mail-filter/dspam/dspam-3.6.1.ebuild
+++ b/mail-filter/dspam/dspam-3.6.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/mail-filter/dspam/dspam-3.6.1.ebuild,v 1.1 2005/11/09 14:31:38 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.6.1.ebuild,v 1.1.1.1 2005/11/30 10:11:56 chriswhite Exp $
 
 inherit eutils
 
@@ -10,13 +10,13 @@ SRC_URI="http://dspam.nuclearelephant.com/sources/${P}.tar.gz
 HOMEPAGE="http://dspam.nuclearelephant.com/"
 LICENSE="GPL-2"
 
-IUSE="clamav debug large-domain logrotate mysql neural oci8 postgres sqlite virtual-users user-homedirs"
+IUSE="berkdb clamav debug large-domain logrotate mysql neural oci8 postgres sqlite sqlite3 virtual-users user-homedirs"
 DEPEND="clamav? ( >=app-antivirus/clamav-0.86 )
 		mysql? ( >=dev-db/mysql-3.23 )
-		sqlite? ( <dev-db/sqlite-3* )
+		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( =dev-db/sqlite-3* )
 		postgres? ( >=dev-db/postgresql-7.4.3 )
-		>=sys-libs/db-4.0
+		berkdb? ( >=sys-libs/db-4.0 )
 		"
 RDEPEND="sys-process/cronbase
 		clamav? ( >=app-antivirus/clamav-0.86 )
@@ -24,7 +24,7 @@ RDEPEND="sys-process/cronbase
 		sqlite? ( <dev-db/sqlite-3 )
 		sqlite3? ( =dev-db/sqlite-3* )
 		postgres? ( >=dev-db/postgresql-7.4.3 )
-		>=sys-libs/db-4.0
+		berkdb? ( >=sys-libs/db-4.0 )
 		logrotate? ( app-admin/logrotate )"
 KEYWORDS="~x86 ~ppc ~alpha ~amd64"
 SLOT="0"
@@ -36,7 +36,7 @@ LOGDIR="/var/log/dspam"
 
 pkg_setup() {
 	local multiple_dbs="0"
-	local supported_dbs="mysql postgres oci8 sqlite sqlite3"
+	local supported_dbs="berkdb mysql postgres oci8 sqlite sqlite3"
 	for foo in ${supported_dbs}; do
 		if use ${foo}; then
 			let multiple_dbs="((multiple_dbs + 1 ))"
@@ -56,28 +56,16 @@ pkg_setup() {
 		einfo "\`echo \"mail-filter/dspam -mysql postgres -oci8 -sqlite -sqlite3\" >> /etc/portage/package.use\`"
 		einfo "to build dspam with Postgres database as your dspam backend."
 		)
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
 	elif [ "${multiple_dbs}" -eq "0" ]; then
 		echo
-		ewarn "You did not select any SQL based database backend. DSPAM will use"
-		ewarn "Berkeley DB for storing data. If you don't want that, then enable"
-		ewarn "one of the following USE flags:"
-		ewarn "${supported_dbs}"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
+		ewarn "You did not select any SQL based database backend."
+		ewarn "DSPAM will use self-contained Hash driver for storing data."
+		ewarn "If you don't want that, then enable one of the following"
+		ewarn "USE flags: ${supported_dbs}"
 	fi
 	has_version ">sys-kernel/linux-headers-2.6" || (
 		einfo "To use the new DSPAM deamon mode, you need to emerge"
 		einfo ">sys-kernel/linux-headers-2.6 and rebuild glibc to support NPTL"
-		echo
-		ewarn "Waiting 30 seconds before starting..."
-		ewarn "(Control-C to abort)..."
-		epause 30
 	)
 	if use virtual-users && use user-homedirs ; then
 		ewarn "If the users are virtual, then they probably should not have home directories."
@@ -100,8 +88,8 @@ src_compile() {
 
 	myconf="${myconf} --with-dspam-home=${HOMEDIR}"
 	myconf="${myconf} --sysconfdir=${CONFDIR}"
-	use user-homedirs || myconf="${myconf} --enable-homedir"
-	use clamav || myconf="${myconf} --enable-clamav"
+	use user-homedirs && myconf="${myconf} --enable-homedir"
+	use clamav && myconf="${myconf} --enable-clamav"
 
 	# enables support for debugging (touch /etc/dspam/.debug to turn on)
 	# optional: even MORE debugging output, use with extreme caution!
@@ -150,8 +138,10 @@ src_compile() {
 		if (expr ${ORACLE_HOME/*\/} : 10 1>/dev/null 2>&1); then
 			myconf="${myconf} --with-oracle-version=10"
 		fi
-	else
+	elif use berkdb ; then
 		myconf="${myconf} --with-storage-driver=libdb4_drv"
+	else
+		myconf="${myconf} --with-storage-driver=hash_drv"
 	fi
 
 	econf ${myconf} || die
diff --git a/mail-filter/dspam/files/README.qmail b/mail-filter/dspam/files/README.qmail
index ab4b12c25a47..539ea3fd10bf 100644
--- a/mail-filter/dspam/files/README.qmail
+++ b/mail-filter/dspam/files/README.qmail
@@ -1,6 +1,6 @@
 DSPAM for Gentoo qmail
-Author - $Author: st_lim $
-Version - $Id: README.qmail,v 1.1 2004/06/26 16:45:28 st_lim Exp $
+Author - $Author: chriswhite $
+Version - $Id: README.qmail,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 These are some steps I took to use dspam with qmail.  If you have a better
 method of using qmail with DSPAM, do send a message to me at
diff --git a/mail-filter/dspam/files/crontab.db4 b/mail-filter/dspam/files/crontab.db4
index 34df7b1833ef..97634d1c45eb 100644
--- a/mail-filter/dspam/files/crontab.db4
+++ b/mail-filter/dspam/files/crontab.db4
@@ -1,2 +1,3 @@
-0 0 */7 * * /usr/bin/dspam_clean -s -p -u 2>&1 > /dev/null
+#!/bin/sh
+/usr/bin/dspam_clean -s -p -u 2>&1 > /dev/null
                                                                                                                                           
diff --git a/mail-filter/dspam/files/crontab.mysql b/mail-filter/dspam/files/crontab.mysql
index 475abdaf5651..e148bf9029cb 100644
--- a/mail-filter/dspam/files/crontab.mysql
+++ b/mail-filter/dspam/files/crontab.mysql
@@ -1,3 +1,4 @@
+#!/bin/sh
 # Remove old signatures and unimportant tokens from the database
-0 0 */7 * * @confdir@/mysql_purge_db 2>&1 > /dev/null
+@confdir@/mysql_purge_db 2>&1 > /dev/null
 
diff --git a/mail-filter/dspam/files/dspam.cron b/mail-filter/dspam/files/dspam.cron
index 9a89e51beba8..7651c018b7b2 100644
--- a/mail-filter/dspam/files/dspam.cron
+++ b/mail-filter/dspam/files/dspam.cron
@@ -16,35 +16,49 @@ DSPAM_HOMEDIR="$(grep ^dspam /etc/passwd|awk -F : '{print $6}')"
 
 if [[ -f "${DSPAM_HOMEDIR}/mysql.data" ]]
 then
-	[[ ! -f "${DSPAM_HOMEDIR}/config/mysql_purge.sql" ]] && exit 3
+	DSPAM_MySQL_PURGE_SQL=""
+	[[ -f "${DSPAM_HOMEDIR}/config/mysql_purge.sql" ]] && DSPAM_MySQL_PURGE_SQL="${DSPAM_HOMEDIR}/config/mysql_purge.sql"
+	[[ -f "${DSPAM_HOMEDIR}/mysql_purge.sql" ]] && DSPAM_MySQL_PURGE_SQL="${DSPAM_HOMEDIR}/mysql_purge.sql"
+	[[ "${DSPAM_MySQL_PURGE_SQL}" == "" ]] && exit 3
 	[[ ! -f "/usr/bin/mysql" ]] && exit 4
 	DSPAM_MySQL_HOST="$(cat ${DSPAM_HOMEDIR}/mysql.data|head -n 1|tail -n 1)"
 	DSPAM_MySQL_PORT="$(cat ${DSPAM_HOMEDIR}/mysql.data|head -n 2|tail -n 1)"
 	DSPAM_MySQL_USER="$(cat ${DSPAM_HOMEDIR}/mysql.data|head -n 3|tail -n 1)"
 	DSPAM_MySQL_PWD="$(cat ${DSPAM_HOMEDIR}/mysql.data|head -n 4|tail -n 1)"
 	DSPAM_MySQL_DB="$(cat ${DSPAM_HOMEDIR}/mysql.data|head -n 5|tail -n 1)"
-	(/usr/bin/mysql -u ${DSPAM_MySQL_USER} -p"${DSPAM_MySQL_PWD}" ${DSPAM_MySQL_DB} < ${DSPAM_HOMEDIR}/config/mysql_purge.sql) 1>/dev/null 2>&1
-	exit $?
+	(/usr/bin/mysql -u ${DSPAM_MySQL_USER} -p"${DSPAM_MySQL_PWD}" ${DSPAM_MySQL_DB} < ${DSPAM_MySQL_PURGE_SQL}) 1>/dev/null 2>&1
+	MYRC="$?"
+	for foo in $(/usr/bin/mysql -u ${DSPAM_MySQL_USER} -p"${DSPAM_MySQL_PWD}" ${DSPAM_MySQL_DB} -e 'SHOW TABLES;' 2>&1 | grep -v "^+\|^Tables_in_${DSPAM_MySQL_DB}")
+	do
+		(/usr/bin/mysql -u ${DSPAM_MySQL_USER} -p"${DSPAM_MySQL_PWD}" ${DSPAM_MySQL_DB} -e "OPTIMIZE TABLE ${foo};") 1>/dev/null 2>&1
+	done
+	exit ${MYRC}
 elif [[ -f "${DSPAM_HOMEDIR}/pgsql.data" ]]
 then
-	[[ ! -f "${DSPAM_HOMEDIR}/config/pgsql_purge.sql" ]] && exit 3
+	DSPAM_PgSQL_PURGE_SQL=""
+	[[ -f "${DSPAM_HOMEDIR}/config/pgsql_purge.sql" ]] && DSPAM_PgSQL_PURGE_SQL="${DSPAM_HOMEDIR}/config/pgsql_purge.sql"
+	[[ -f "${DSPAM_HOMEDIR}/pgsql_purge.sql" ]] && DSPAM_PgSQL_PURGE_SQL="${DSPAM_HOMEDIR}/pgsql_purge.sql"
+	[[ "${DSPAM_PgSQL_PURGE_SQL}" == "" ]] && exit 3
 	[[ ! -f "/usr/bin/psql" ]] && exit 4
 	DSPAM_PgSQL_HOST="$(cat ${DSPAM_HOMEDIR}/pgsql.data|head -n 1|tail -n 1)"
 	DSPAM_PgSQL_PORT="$(cat ${DSPAM_HOMEDIR}/pgsql.data|head -n 2|tail -n 1)"
 	DSPAM_PgSQL_USER="$(cat ${DSPAM_HOMEDIR}/pgsql.data|head -n 3|tail -n 1)"
 	DSPAM_PgSQL_PWD="$(cat ${DSPAM_HOMEDIR}/pgsql.data|head -n 4|tail -n 1)"
 	DSPAM_PgSQL_DB="$(cat ${DSPAM_HOMEDIR}/pgsql.data|head -n 5|tail -n 1)"
-	(PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -U ${DSPAM_PgSQL_USER} -d ${DSPAM_PgSQL_DB} -p ${DSPAM_PgSQL_PORT} -h ${DSPAM_PgSQL_HOST} -f ${DSPAM_HOMEDIR}/config/pgsql_purge.sql) 1>/dev/null 2>&1
+	(PGUSER=${DSPAM_PgSQL_USER} PGPASSWORD=${DSPAM_PgSQL_PWD} /usr/bin/psql -U ${DSPAM_PgSQL_USER} -d ${DSPAM_PgSQL_DB} -p ${DSPAM_PgSQL_PORT} -h ${DSPAM_PgSQL_HOST} -f ${DSPAM_PgSQL_PURGE_SQL}) 1>/dev/null 2>&1
 	exit $?
 elif [[ -f "${DSPAM_HOMEDIR}/oracle.data" ]]
 then
-	[[ ! -f "${DSPAM_HOMEDIR}/config/oracle_purge.sql" ]] && exit 3
+	DSPAM_Oracle_PURGE_SQL=""
+	[[ -f "${DSPAM_HOMEDIR}/config/ora_purge.sql" ]] && DSPAM_Oracle_PURGE_SQL="${DSPAM_HOMEDIR}/config/ora_purge.sql"
+	[[ -f "${DSPAM_HOMEDIR}/ora_purge.sql" ]] && DSPAM_Oracle_PURGE_SQL="${DSPAM_HOMEDIR}/ora_purge.sql"
+	[[ "${DSPAM_Oracle_PURGE_SQL}" == "" ]] && exit 3
 	[[ ! -f "/usr/bin/sqlplus" ]] && exit 4
 	DSPAM_Oracle_DBLINK="$(cat ${DSPAM_HOMEDIR}/oracle.data|head -n 1|tail -n 1)"
 	DSPAM_Oracle_USER="$(cat ${DSPAM_HOMEDIR}/oracle.data|head -n 2|tail -n 1)"
 	DSPAM_Oracle_PWD="$(cat ${DSPAM_HOMEDIR}/oracle.data|head -n 3|tail -n 1)"
 	DSPAM_Oracle_SCHEMA="$(cat ${DSPAM_HOMEDIR}/oracle.data|head -n 4|tail -n 1)"
-	(/usr/bin/sqlplus -s ${DSPAM_Oracle_USER}/${DSPAM_Oracle_PWD} @${DSPAM_HOMEDIR}/config/ora_purge.sql) 1>/dev/null 2>&1
+	(/usr/bin/sqlplus -s ${DSPAM_Oracle_USER}/${DSPAM_Oracle_PWD} @${DSPAM_Oracle_PURGE_SQL}) 1>/dev/null 2>&1
 	exit $?
 else
 	[[ ! -f "/usr/bin/dspam_clean" ]] && exit 4
diff --git a/mail-filter/dspam/files/dspam.rc b/mail-filter/dspam/files/dspam.rc
index e0eeefd82eb2..20fee1245834 100644
--- a/mail-filter/dspam/files/dspam.rc
+++ b/mail-filter/dspam/files/dspam.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/files/dspam.rc,v 1.1 2005/03/21 00:10:30 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/files/dspam.rc,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 depend() {
 	use logger
diff --git a/mail-filter/dspam/files/logrotate.dspam b/mail-filter/dspam/files/logrotate.dspam
index 4f0c19033971..89db6f565c70 100644
--- a/mail-filter/dspam/files/logrotate.dspam
+++ b/mail-filter/dspam/files/logrotate.dspam
@@ -1,5 +1,5 @@
 /var/log/dspam/sql.errors /var/log/dspam/system.log /var/log/dspam/dspam.debug /var/log/dspam/dspam.messages {
 	weekly
 	compress
-	create 0644 root mail
+	create 0644 dspam dspam
 }
diff --git a/mail-filter/dspam/metadata.xml b/mail-filter/dspam/metadata.xml
index 9cfc3ccf6872..847ade6c4031 100644
--- a/mail-filter/dspam/metadata.xml
+++ b/mail-filter/dspam/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>mail-filter</herd>
+<herd>net-mail</herd>
 <maintainer>
   <email>st_lim@gentoo.org</email>
 </maintainer>
diff --git a/mail-filter/gld/ChangeLog b/mail-filter/gld/ChangeLog
index 996e63d57a5d..75f044fa3995 100644
--- a/mail-filter/gld/ChangeLog
+++ b/mail-filter/gld/ChangeLog
@@ -1,8 +1,120 @@
 # ChangeLog for mail-filter/gld
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.1 2004/08/10 00:45:19 slarti Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/ChangeLog,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+  21 Oct 2005; Tom Martin <slarti@gentoo.org>
+  files/gld-1.5.2-mxgrey-fix.patch:
+  Updated patch. Thanks to <kyberneticist@yahoo.com> in bug #108900.
+
+  15 Oct 2005; Tom Martin <slarti@gentoo.org>
+  +files/gld-1.5.2-mxgrey-fix.patch:
+  Accidentally removed a needed patch in the purge a few days ago. Resolves
+  bug #108900.
+
+*gld-1.6 (08 Oct 2005)
+
+  08 Oct 2005; Tom Martin <slarti@gentoo.org>
+  -files/gld-1.5.2-mxgrey-fix.patch, -gld-1.4.ebuild, -gld-1.5.ebuild,
+  -gld-1.5-r1.ebuild, -gld-1.5-r2.ebuild, +gld-1.6.ebuild:
+  Version bump to 1.6 for bug 108124 and also a purge.
+
+  21 Aug 2005; Tom Martin <slarti@gentoo.org>
+  +files/gld-1.5.2-mxgrey-fix.patch, gld-1.5.2.ebuild:
+  Applied patch from martinsw@linux-net.dnsalias.net to resolve bug 102769.
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> gld-1.5.2.ebuild:
+  Stable on ppc.
+
+  01 Jul 2005; Andrej Kacian <ticho@gentoo.org> gld-1.5.2.ebuild:
+  Stable on x86 and amd64. Bug #97619, by Alexander Stoll <as at
+  ha-networks.com>.
+
+  18 Jun 2005; Andrej Kacian <ticho@gentoo.org> files/gld.rc:
+  Initscript provides "postfix_graylist", so postfix can safely start after
+  gld. Bug #55705, by Duncan Hill <gentoo-bugs at nacnud.force9.co.uk>.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> gld-1.5.ebuild:
+  Stable on ppc.
+
+  28 Apr 2005; Andrej Kacian <ticho@gentoo.org> -gld-1.3.ebuild:
+  Removed ebuild because distfile is no longer available.
+
+*gld-1.5.2 (21 Apr 2005)
+
+  21 Apr 2005; Tom Martin <slarti@gentoo.org> +gld-1.5.2.ebuild:
+  Version bump. Resolves bug 88971 in the process. Thanks to Benjamin Smee
+  <ben@disciplina.net> for the fix.
+
+*gld-1.5-r2 (20 Apr 2005)
+
+  20 Apr 2005; Tom Martin <slarti@gentoo.org> files/gld.rc,
+  gld-1.5-r1.ebuild, +gld-1.5-r2.ebuild:
+  Update init script dependencies, bug 88574. Also, fix some trailing whitespace.
+
+  16 Apr 2005; Tom Martin <slarti@gentoo.org> gld-1.5-r1.ebuild:
+  Fix the handling of --with-pgsql. There was no --without-pgsql, and it seems
+  that adding this to econf via $(use_with) was in fact making it install
+  *with* postgres.
+
+  16 Apr 2005; Tom Martin <slarti@gentoo.org> gld-1.5.ebuild,
+  gld-1.5-r1.ebuild:
+  Addition on MY_P to both stable and testing versions. It seems upstream has
+  been changing the contents of tarballs while the name is constant,
+  preventing either version from being built. Also, add postgres to IUSE for
+  1.5-r1, I forgot the first time around.
+
+*gld-1.5-r1 (14 Apr 2005)
+
+  14 Apr 2005; Tom Martin <slarti@gentoo.org> +gld-1.5-r1.ebuild:
+  Revision bump to add postgresql support. Tidied installation of SQL files.
+
+  13 Apr 2005; Andrej Kacian <ticho@gentoo.org> gld-1.5.ebuild:
+  Stable on amd64, security bug #88904.
+
+  13 Apr 2005; Andrej Kacian <ticho@gentoo.org> gld-1.5.ebuild:
+  Fix sql files install location.
+
+*gld-1.5 (13 Apr 2005)
+
+  13 Apr 2005; Andrej Kacian <ticho@gentoo.org> +gld-1.5.ebuild:
+  Version bump due to security bug #88904. Adjust default configuration to be
+  more security-conscious.
+
+  13 Nov 2004; Tom Martin <slarti@gentoo.org> gld-1.3.ebuild,
+  gld-1.4.ebuild:
+  newexe -> newinitd for initscripts.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> gld-1.4.ebuild:
+  Stable on amd64.
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org> gld-1.3.ebuild:
+  Stable on amd64.
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> gld-1.3.ebuild,
+  gld-1.4.ebuild:
+  Stable on x86.
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> gld-1.4.ebuild:
+  Added to ~ppc.
+
+*gld-1.4 (30 Aug 2004)
+
+  30 Aug 2004; Tom Martin <slarti@gentoo.org> +gld-1.4.ebuild:
+  Version bump to 1.4. Thanks to David Holm <dholm@gentoo.org> for reporting in
+  bug 62210.
+
+  13 Aug 2004; Tom Martin <slarti@gentoo.org> gld-1.3.ebuild:
+  Make RDEPEND include DEPEND.
+
+  11 Aug 2004; Tom Martin <slarti@gentoo.org> gld-1.3.ebuild:
+  Fixed DEPEND.
+
+  11 Aug 2004; Tom Martin <slarti@gentoo.org> gld-1.3.ebuild, files/gld.rc:
+  Made the rc-script more verbose, fixed an option order problem with
+  start-stop-daemon. Thanks Tuan Van <langthang@gentoo.org for patch. Added ~x86
+  keyword on behalf of Tuan too.
 
 *gld-1.3 (10 Aug 2004)
 
-  10 Aug 2004; Tom Martin <slarti@gentoo.org> +clamassassin-1.2.0.ebuild:
+  10 Aug 2004; Tom Martin <slarti@gentoo.org> +gld-1.3.ebuild:
   Initial import. I can only test on amd64, so it lacks [~]x86 for the moment.
diff --git a/mail-filter/gld/Manifest b/mail-filter/gld/Manifest
index 3843dac4a260..392e3f15438a 100644
--- a/mail-filter/gld/Manifest
+++ b/mail-filter/gld/Manifest
@@ -1,4 +1,19 @@
-MD5 00b58f6022951bc727c376830eaef918 gld-1.3.ebuild 945
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 94ffdd47b0e8b275ed299208e7fdf8b8 ChangeLog 4450
 MD5 96d50f09283d0a87235b23ce0795499e files/Makefile.in 980
-MD5 fe1fdbfd3fa7ee4baa73b01634cd1255 files/gld.rc6 275
-MD5 a187f47f3f17cf43acfced1abb8f3dd8 files/digest-gld-1.3 55
+MD5 63658f0d53451dbb79e4330fd997bfab files/digest-gld-1.5.2 57
+MD5 f91281c6461e403a77e5351e89e398be files/digest-gld-1.6 55
+MD5 27b82bb6cc99d52bb22a2e19b4d100c9 files/gld-1.5.2-mxgrey-fix.patch 1675
+MD5 4e2b779070d26c7675574fe2420541b8 files/gld.rc 544
+MD5 92553e000dd0a23d31042352b053cbdf gld-1.5.2.ebuild 1562
+MD5 c82f4d42b6f4cb1d4a64e6d031b018d6 gld-1.6.ebuild 1554
+MD5 8a1c6c5f4c13a4109f6f4198fdd1874b metadata.xml 223
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDWSYMCHk4+ZoBpvsRAphHAKCJFfNletmYcom3e6rdV7mQIX91ygCglEj8
+H+FmCHProSohmLqnUDbzFAE=
+=qWqE
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch
index c13e4dc8f971..c33644abb83b 100644
--- a/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch
+++ b/mail-filter/gld/files/gld-1.5.2-mxgrey-fix.patch
@@ -1,20 +1,18 @@
---- gld-1.5.2/greylist.c.orig	2005-08-17 00:44:06.000000000 +0200
-+++ gld-1.5.2/greylist.c	2005-08-17 00:40:32.000000000 +0200
-@@ -181,10 +181,29 @@
+--- gld-1.5.2/greylist.c	2005-04-21 05:41:09.000000000 -0400
++++ gld-1.5.2/greylist.c	2005-10-20 14:05:05.000000000 -0400
+@@ -181,10 +181,28 @@ else
  
  	if(conf->update==1)
  		{
 -  		if(conf->lightd==1 && fnotdomain==1)
 -			snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient);
--
--        	snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
-+
 +		if(ts-n>conf->mini)
 +			{
-+	  		if(conf->lightd==1 && fnotdomain==1)
++			if(conf->lightd==1 && fnotdomain==1)
 +				snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient);
-+
-+        		snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
+ 
+-        	snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
++			snprintf(query,sizeof(query)-1,"update greylist set last=%d,n=n+1 where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
 +		}
 +		else
 +		{
@@ -24,12 +22,12 @@
 +			// In fact this means that the THIRD retry will immidiately pass the greylist, as mxgrey checks only for ip and (n>1).
 +			//
 +			// 2005-08-16   martin@it4linux.de
-+			// 
++			//
 +
 +			if(conf->lightd==1 && fnotdomain==1)
 +				snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,osender,orecipient);
 +
-+	        	snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
++			snprintf(query,sizeof(query)-1,"update greylist set last=%d where ip='%s' and sender='%s' and recipient='%s'",ts,ip,sender,recipient);
 +		}
  
          	SQLQuery(query);
diff --git a/mail-filter/gld/files/gld.rc b/mail-filter/gld/files/gld.rc
index 8651ca38fd13..0a398a225d4c 100644
--- a/mail-filter/gld/files/gld.rc
+++ b/mail-filter/gld/files/gld.rc
@@ -1,16 +1,23 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/files/gld.rc,v 1.1 2004/08/10 00:45:19 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/files/gld.rc,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 depend() {
-	need
-	use dns
+	need net # in case mysql daemon is not local
+	use dns mysql postgresql
 	before postfix
+	provide postfix_greylist
 }
 
 start() {
 	ebegin "Starting gld"
-	start-stop-daemon --start --exec --quiet /usr/bin/gld
+	start-stop-daemon --start --quiet --exec /usr/bin/gld
+	eend $?
 }
 
+stop() {
+	ebegin "Stopping gld"
+	start-stop-daemon --stop --quiet --name gld
+	eend $?
+}
diff --git a/mail-filter/gld/gld-1.5.2.ebuild b/mail-filter/gld/gld-1.5.2.ebuild
index 019db7d2fbe9..3533062ec987 100644
--- a/mail-filter/gld/gld-1.5.2.ebuild
+++ b/mail-filter/gld/gld-1.5.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/mail-filter/gld/gld-1.5.2.ebuild,v 1.1 2005/04/21 17:05:20 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.5.2.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
 HOMEPAGE="http://www.gasmi.net/gld.html"
@@ -8,7 +10,7 @@ SRC_URI="http://www.gasmi.net/down/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE="postgres"
 # Not adding a mysql USE flag. The package defaults to it, so we will too.
 DEPEND="virtual/libc
@@ -19,6 +21,12 @@ DEPEND="virtual/libc
 RDEPEND="${DEPEND}
 	>=mail-mta/postfix-2.1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mxgrey-fix.patch
+}
+
 src_compile() {
 	# It's kind of weird. $(use_with postgres pgsql) won't work...
 	if use postgres ; then
diff --git a/mail-filter/gld/gld-1.6.ebuild b/mail-filter/gld/gld-1.6.ebuild
index c5d00fb67ed4..f5b4d47df465 100644
--- a/mail-filter/gld/gld-1.6.ebuild
+++ b/mail-filter/gld/gld-1.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/mail-filter/gld/gld-1.6.ebuild,v 1.1 2005/10/08 08:36:12 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/gld/gld-1.6.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 DESCRIPTION="A standalone anti-spam greylisting algorithm on top of Postfix"
 HOMEPAGE="http://www.gasmi.net/gld.html"
diff --git a/mail-filter/imapfilter/ChangeLog b/mail-filter/imapfilter/ChangeLog
index 515784f31c2d..97fa8050a3da 100644
--- a/mail-filter/imapfilter/ChangeLog
+++ b/mail-filter/imapfilter/ChangeLog
@@ -1,6 +1,37 @@
-# ChangeLog for net-mail/imapfilter
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/ChangeLog,v 1.1 2004/06/03 07:15:32 seemant Exp $
+# ChangeLog for mail-filter/imapfilter
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/ChangeLog,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  imapfilter-1.0.1.ebuild:
+  Stable on ppc.
+
+  24 Aug 2005; Andrej Kacian <ticho@gentoo.org> imapfilter-1.0.1.ebuild:
+  Stable on x86.
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> imapfilter-1.0.ebuild:
+  Stable on ppc.
+
+*imapfilter-1.0.1 (02 Jun 2005)
+
+  02 Jun 2005; Andrej Kacian <ticho@gentoo.org> +imapfilter-1.0.1.ebuild:
+  Version bump. Closes #79848, by Holger Hoffstätte <holger@wizards.de>.
+
+  10 Aug 2004; Don Seiler <rizzo@gentoo.org> imapfilter-1.0.ebuild:
+  Stable on x86, thanks to rajiv for reminding me.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  imapfilter-0.9.2.ebuild, imapfilter-0.9.4.ebuild, imapfilter-1.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+*imapfilter-1.0 (14 Jun 2004)
+
+  14 Jun 2004; Don Seiler <rizzo@gentoo.org> metadata.xml,
+  +files/imapfilter-1.0.patch, +imapfilter-1.0.ebuild:
+  Version bump.  Thanks to Andreas Grundler.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> imapfilter-0.9.4.ebuild:
+  Added to ~ppc.
 
 *imapfilter-0.9.4 (03 Jun 2004)
 
diff --git a/mail-filter/imapfilter/Manifest b/mail-filter/imapfilter/Manifest
index df61d64bc769..66343246b988 100644
--- a/mail-filter/imapfilter/Manifest
+++ b/mail-filter/imapfilter/Manifest
@@ -1,6 +1,7 @@
-MD5 916f0bfbc8766559d0832a89e6dc8489 imapfilter-0.9.2.ebuild 708
-MD5 3357270aa88b8ff306aa9f4aec073e09 imapfilter-0.9.4.ebuild 698
-MD5 6a4370c976f62896cd1f4d1ea491c945 ChangeLog 868
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 7283ea80cf8bf74903884bdcfd8c1b52 files/digest-imapfilter-0.9.2 68
-MD5 e16654455d8207aa85b816a5837f6492 files/digest-imapfilter-0.9.4 68
+MD5 92e18acbbe54b08ef200f546007430c7 imapfilter-1.0.1.ebuild 798
+MD5 24f6f19855851e9df7f3ee9181ba416e metadata.xml 224
+MD5 8132444c30ab467235a366bbde30536f ChangeLog 2112
+MD5 1e65715ff28011f4530bb35e88bda4e5 imapfilter-1.0.ebuild 768
+MD5 9828bc0a6addcce9ac4657f8884e189f files/digest-imapfilter-1.0 66
+MD5 04e3fa07062998e90e706ecdcf958ad0 files/digest-imapfilter-1.0.1 68
+MD5 35e578391a3859a4ea8d568ab5227125 files/imapfilter-1.0.patch 405
diff --git a/mail-filter/imapfilter/imapfilter-1.0.1.ebuild b/mail-filter/imapfilter/imapfilter-1.0.1.ebuild
index c7533d065486..a29023911e46 100644
--- a/mail-filter/imapfilter/imapfilter-1.0.1.ebuild
+++ b/mail-filter/imapfilter/imapfilter-1.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/mail-filter/imapfilter/imapfilter-1.0.1.ebuild,v 1.1 2005/06/02 23:31:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://imapfilter.hellug.gr/source/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc
diff --git a/mail-filter/imapfilter/imapfilter-1.0.ebuild b/mail-filter/imapfilter/imapfilter-1.0.ebuild
index fcce997229b8..352707a0e0ab 100644
--- a/mail-filter/imapfilter/imapfilter-1.0.ebuild
+++ b/mail-filter/imapfilter/imapfilter-1.0.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/mail-filter/imapfilter/imapfilter-1.0.ebuild,v 1.1 2004/06/14 19:36:50 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/imapfilter/imapfilter-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="An IMAP mail filtering utility"
 HOMEPAGE="http://imapfilter.hellug.gr"
@@ -8,9 +10,10 @@ SRC_URI="http://imapfilter.hellug.gr/source/${P}.tar.bz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="ppc x86"
+IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	dev-libs/openssl
 	dev-lang/lua"
 
@@ -29,4 +32,3 @@ src_install() {
 
 	dodoc LICENSE NEWS README sample.config.lua sample.extend.lua
 }
-
diff --git a/mail-filter/imapfilter/metadata.xml b/mail-filter/imapfilter/metadata.xml
index 51f94e3fbe0e..c25767a02c27 100644
--- a/mail-filter/imapfilter/metadata.xml
+++ b/mail-filter/imapfilter/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-mail</herd>
+<maintainer>
+    <email>ticho@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/libspf/ChangeLog b/mail-filter/libspf/ChangeLog
index 38210cb6b756..2dbc8b9eb231 100644
--- a/mail-filter/libspf/ChangeLog
+++ b/mail-filter/libspf/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for mail-filter/libspf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf/ChangeLog,v 1.1 2005/05/10 01:19:32 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf/ChangeLog,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 *libspf-1.0.0_p3 (10 May 2005)
 
diff --git a/mail-filter/libspf/Manifest b/mail-filter/libspf/Manifest
index 4943c9641365..06fad3974f17 100644
--- a/mail-filter/libspf/Manifest
+++ b/mail-filter/libspf/Manifest
@@ -1,4 +1,4 @@
-MD5 d8fe568db4d12f97b89a1b2271c2250e libspf-1.0.0_p3.ebuild 1105
-MD5 7abea0367efb32eda32e5ed861e7e7ea ChangeLog 278
+MD5 bd3928e4bc21e100dd62fb4e3459699d libspf-1.0.0_p3.ebuild 1209
+MD5 99dd12c468798720ed6fae364826ad09 ChangeLog 369
 MD5 2777a6a82693e62c50d05045375e08de metadata.xml 392
 MD5 84374eaeb5fbeb0695b8d4ea8190f8b1 files/digest-libspf-1.0.0_p3 69
diff --git a/mail-filter/libspf/libspf-1.0.0_p3.ebuild b/mail-filter/libspf/libspf-1.0.0_p3.ebuild
index becb958db2a5..669ba08d2e3c 100644
--- a/mail-filter/libspf/libspf-1.0.0_p3.ebuild
+++ b/mail-filter/libspf/libspf-1.0.0_p3.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/mail-filter/libspf/libspf-1.0.0_p3.ebuild,v 1.1 2005/05/10 01:19:32 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf/libspf-1.0.0_p3.ebuild,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 RESTRICT="nomirror"
 DESCRIPTION="libspf - An ANSI C Implementation of Sender Policy Framework."
diff --git a/mail-filter/libspf2/ChangeLog b/mail-filter/libspf2/ChangeLog
index ee4dfc6aa039..323da1a0cd65 100644
--- a/mail-filter/libspf2/ChangeLog
+++ b/mail-filter/libspf2/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for mail-filter/libspf2
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/ChangeLog,v 1.1 2004/07/25 15:53:26 pfeifer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/ChangeLog,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
+
+  28 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libspf2-1.2.5-r1.ebuild:
+  Stable on sparc wrt #103894
+
+  27 Oct 2005; Simon Stelling <blubb@gentoo.org> libspf2-1.2.5-r1.ebuild:
+  marked stable on amd64 wrt bug 103894
+
+  24 Oct 2005; <mkay@gentoo.org> libspf2-1.2.5-r1.ebuild:
+  stable on x86
+
+  24 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  libspf2-1.2.5-r1.ebuild:
+  Stable on hppa, ppc.
+
+  24 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  libspf2-1.2.5-r1.ebuild:
+  stable on alpha wrt bug #103894
+
+  21 Oct 2005; Simon Stelling <blubb@gentoo.org> libspf2-1.2.5-r1.ebuild:
+  added ~amd64 keyword
+
+  16 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  libspf2-1.2.5-r1.ebuild:
+  marked ~alpha as per bug #103894
+
+  15 Oct 2005; Tom Gall <tgall@gentoo.org> 
+  libspf2-1.2.5-r1.ebuild:
+  ~ppc64 bug #109362
+
+  13 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  libspf2-1.2.5-r1.ebuild:
+  Unstable on hppa.
+
+  02 Oct 2005; Jason Wever <weeve@gentoo.org> libspf2-1.2.5-r1.ebuild:
+  Added ~sparc keyword.
+
+*libspf2-1.2.5-r1 (30 Jul 2005)
+
+  30 Jul 2005; Colin Morey <peitolm@gentoo.org>
+  +files/patch-libspf2-1.2.5-nointernal, +libspf2-1.2.5-r1.ebuild:
+  New ebuild to fix spf_server.h erros, see bugs 58282 and 100569
+
+  15 Jul 2005; David Holm <dholm@gentoo.org> libspf2-1.2.5.ebuild:
+  Added to ~ppc.
+
+*libspf2-1.2.5 (09 May 2005)
+
+  09 May 2005; Jay Pfeifer <pfeifer@gentoo.org> +libspf2-1.2.5.ebuild:
+  Version bump closing bug 91884.
 
 *libspf2-1.0.4 (24 Jul 2004)
 
diff --git a/mail-filter/libspf2/Manifest b/mail-filter/libspf2/Manifest
index 41824c15e258..53accb9a4aa2 100644
--- a/mail-filter/libspf2/Manifest
+++ b/mail-filter/libspf2/Manifest
@@ -1,4 +1,19 @@
-MD5 8d69c7aca012949d73e7584202910af3 ChangeLog 239
-MD5 02852f15841c037e3bb8c2129040a60b metadata.xml 744
-MD5 7c43be4a330a85b5e1b99413aadef20d libspf2-1.0.4.ebuild 996
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f7f37c76163f118855c8df53038cc727 libspf2-1.2.5.ebuild 1102
+MD5 e50e46a4229accf9afa556a893e3a7e9 ChangeLog 1816
+MD5 7592cdf7e52f0ff74af7d26ef10ac79d metadata.xml 673
+MD5 6916c08a5b710fe7d00f7401a4bcce15 libspf2-1.2.5-r1.ebuild 1251
+MD5 53f5f654a4ee10db28906b4ae684b7c8 libspf2-1.0.4.ebuild 1099
 MD5 7e5b1b94c60f5c981f62872ba6e3f59d files/digest-libspf2-1.0.4 65
+MD5 03192942320df4e8f8fcb40e21a7c268 files/digest-libspf2-1.2.5 65
+MD5 03192942320df4e8f8fcb40e21a7c268 files/digest-libspf2-1.2.5-r1 65
+MD5 7f0d294117ec50cb8a321ad12d161c6e files/patch-libspf2-1.2.5-nointernal 384
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDYl7nKRy60XGEcJIRAuWZAJwLGHLeZvmDhNAnTvH9WaM8fwbmJQCghHO6
+SNMtvnXVd/fPWsilbAA/t8Q=
+=+LcX
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/libspf2/libspf2-1.0.4.ebuild b/mail-filter/libspf2/libspf2-1.0.4.ebuild
index f1168fc5bf95..78e80001b0c4 100644
--- a/mail-filter/libspf2/libspf2-1.0.4.ebuild
+++ b/mail-filter/libspf2/libspf2-1.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/mail-filter/libspf2/libspf2-1.0.4.ebuild,v 1.1 2004/07/25 15:53:26 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/libspf2-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair."
 HOMEPAGE="http://www.libspf2.org/"
diff --git a/mail-filter/libspf2/libspf2-1.2.5-r1.ebuild b/mail-filter/libspf2/libspf2-1.2.5-r1.ebuild
index b7fb881cbb9a..326b89a1dbcd 100644
--- a/mail-filter/libspf2/libspf2-1.2.5-r1.ebuild
+++ b/mail-filter/libspf2/libspf2-1.2.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/mail-filter/libspf2/libspf2-1.2.5-r1.ebuild,v 1.1 2005/07/30 10:00:50 peitolm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/libspf2-1.2.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/mail-filter/libspf2/libspf2-1.2.5.ebuild b/mail-filter/libspf2/libspf2-1.2.5.ebuild
index aa4f84605907..8ddd2b3ef6be 100644
--- a/mail-filter/libspf2/libspf2-1.2.5.ebuild
+++ b/mail-filter/libspf2/libspf2-1.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/mail-filter/libspf2/libspf2-1.2.5.ebuild,v 1.1 2005/05/09 23:46:07 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libspf2/libspf2-1.2.5.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair."
 HOMEPAGE="http://www.libspf2.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.libspf2.org/spf/libspf2-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/mail-filter/libspf2/metadata.xml b/mail-filter/libspf2/metadata.xml
index 3a10d9cf5e91..c0529c82b254 100644
--- a/mail-filter/libspf2/metadata.xml
+++ b/mail-filter/libspf2/metadata.xml
@@ -5,7 +5,6 @@
 <maintainer>
   <email>pfeifer@gentoo.org</email>
   <name>Jay Pfeifer</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
 <longdescription>libspf2 implements the Sender Policy Framework, a part of the SPF/SRS protocol pair. libspf2 is a library which allows email systems such as Sendmail, Postfix, Exim, Zmailer and MS Exchange to check SPF records and make sure that the email is authorized by the domain name that it is coming from. This prevents email forgery, commonly used by spammers, scammers and email viruses/worms.</longdescription>
 </pkgmetadata>
diff --git a/mail-filter/libsrs2/ChangeLog b/mail-filter/libsrs2/ChangeLog
index 3767d18f06f3..044b82723724 100644
--- a/mail-filter/libsrs2/ChangeLog
+++ b/mail-filter/libsrs2/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for mail-filter/libsrs2
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/ChangeLog,v 1.1 2004/07/25 15:55:26 pfeifer Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/ChangeLog,v 1.1.1.1 2005/11/30 10:11:56 chriswhite Exp $
+
+*libsrs2-1.0.18 (09 May 2005)
+
+  09 May 2005; Jay Pfeifer <pfeifer@gentoo.org> +libsrs2-1.0.18.ebuild:
+  Version bump.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> libsrs2-1.0.17.ebuild:
+  Added to ~ppc.
+
+*libsrs2-1.0.17 (29 Jul 2004)
+
+  29 Jul 2004; Jay Pfeifer <pfeifer@gentoo.org> : libsrs2-1.0.17.ebuild
+  Version bump.
 
 *libsrs2-1.0.16 (24 Jul 2004)
 
diff --git a/mail-filter/libsrs2/Manifest b/mail-filter/libsrs2/Manifest
index 8bc559368539..e99cce37e8ad 100644
--- a/mail-filter/libsrs2/Manifest
+++ b/mail-filter/libsrs2/Manifest
@@ -1,4 +1,8 @@
-MD5 efa4452431cefcf38cf47f3a6e830e3a ChangeLog 241
-MD5 9fa1abba9e50581a488029ae50fe6a0a libsrs2-1.0.16.ebuild 960
-MD5 ec80b4a042db0390e933ad79a0dfc64b metadata.xml 837
+MD5 296fda8c9fffd52d169d6a1b13ed21f6 libsrs2-1.0.18.ebuild 1069
+MD5 bf9c0442d8a780d0f7c3caa2bbed08a1 libsrs2-1.0.17.ebuild 1067
+MD5 871b42e0c0647c78663d15860f2a0a9c ChangeLog 659
+MD5 ca92e1f2ac7d94dbe5383ac4cb8b8106 libsrs2-1.0.16.ebuild 1064
+MD5 b29a5af97f098568ec51b0ce0d84e97a metadata.xml 766
 MD5 f3b09ef86d29330ec054c14e50e1ebee files/digest-libsrs2-1.0.16 66
+MD5 83aa5f3916c99bff1b596258af34e481 files/digest-libsrs2-1.0.17 66
+MD5 783a3f8d76e935e8943bfe55af9c825c files/digest-libsrs2-1.0.18 66
diff --git a/mail-filter/libsrs2/libsrs2-1.0.16.ebuild b/mail-filter/libsrs2/libsrs2-1.0.16.ebuild
index e272beba7671..099d29e67d86 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.16.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.16.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/mail-filter/libsrs2/libsrs2-1.0.16.ebuild,v 1.1 2004/07/25 15:55:26 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/libsrs2-1.0.16.ebuild,v 1.1.1.1 2005/11/30 10:11:56 chriswhite Exp $
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
 HOMEPAGE="http://www.libsrs2.org/"
diff --git a/mail-filter/libsrs2/libsrs2-1.0.17.ebuild b/mail-filter/libsrs2/libsrs2-1.0.17.ebuild
index 0e1241cfda8c..8ae177feb8ce 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.17.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.17.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/mail-filter/libsrs2/libsrs2-1.0.17.ebuild,v 1.1 2004/07/29 21:45:01 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/libsrs2-1.0.17.ebuild,v 1.1.1.1 2005/11/30 10:11:56 chriswhite Exp $
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
 HOMEPAGE="http://www.libsrs2.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.libsrs2.org/srs/libsrs2-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild b/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
index fa381c6fcda8..ef48734e27fe 100644
--- a/mail-filter/libsrs2/libsrs2-1.0.18.ebuild
+++ b/mail-filter/libsrs2/libsrs2-1.0.18.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/mail-filter/libsrs2/libsrs2-1.0.18.ebuild,v 1.1 2005/05/09 23:51:23 pfeifer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs2/libsrs2-1.0.18.ebuild,v 1.1.1.1 2005/11/30 10:11:55 chriswhite Exp $
 
 DESCRIPTION="libsrs2 is the next generation Sender Rewriting Scheme library"
 HOMEPAGE="http://www.libsrs2.org/"
diff --git a/mail-filter/libsrs2/metadata.xml b/mail-filter/libsrs2/metadata.xml
index c2e5b226cc0e..c80a80031e44 100644
--- a/mail-filter/libsrs2/metadata.xml
+++ b/mail-filter/libsrs2/metadata.xml
@@ -5,7 +5,6 @@
 <maintainer>
   <email>pfeifer@gentoo.org</email>
   <name>Jay Pfeifer</name>
-<!--  <description>Description of the maintainership</description> -->
 </maintainer>
 <longdescription>libsrs2 is the next generation SRS library from the original designer of SRS. It implements the Sender Rewriting Scheme, a part of the SPF/SRS protocol pair. Libsrs2 has been written from an entirely clean codebase with compliance, speed and versatility in mind. It is platform independent and has no external dependencies. It is thread-safe and heap-safe, and is suitable for large scale applications and embedded systems and can operate without many standard system facilities.</longdescription>
 </pkgmetadata>
diff --git a/mail-filter/libsrs_alt/ChangeLog b/mail-filter/libsrs_alt/ChangeLog
index 758c02231e9a..d36554e444a9 100644
--- a/mail-filter/libsrs_alt/ChangeLog
+++ b/mail-filter/libsrs_alt/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for mail-filter/libsrs_alt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs_alt/ChangeLog,v 1.1 2005/07/14 21:01:33 peitolm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs_alt/ChangeLog,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+  28 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  Stable on sparc wrt #103894
+
+  27 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  marked stable on amd64 wrt bug 103894
+
+  24 Oct 2005; Marcin Kryczek <mkay@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  Marked stable on x86
+
+  24 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  Stable on hppa, ppc.
+
+  24 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  stable on alpha wrt bug #103894
+
+  16 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  marked ~alpha as per bug #103894
+
+  15 Oct 2005; Tom Gall <tgall@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  added ~ppc64, bug #109362
+
+  14 Oct 2005; Simon Stelling <blubb@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  added ~amd64 keyword
+
+  13 Oct 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  libsrs_alt-1.0_rc1-r1.ebuild:
+  Unstable on hppa.
+
+  02 Oct 2005; Jason Wever <weeve@gentoo.org> libsrs_alt-1.0_rc1-r1.ebuild:
+  Added ~sparc keyword.
+
+*libsrs_alt-1.0_rc1-r1 (15 Jul 2005)
+
+  15 Jul 2005; Colin Morey <peitolm@gentoo.org>
+  +libsrs_alt-1.0_rc1-r1.ebuild, -libsrs_alt-1.0_rc1.ebuild:
+  brought ~ppc forward to -r1 and removed broken ebuild from tree.
+
+*libsrs_alt-1.0_rc1-r1 (15 Jul 2005)
+
+  15 Jul 2005; Colin Morey <peitolm@gentoo.org>
+  +libsrs_alt-1.0_rc1-r1.ebuild:
+  removing Back RDEPEND.
+
+  15 Jul 2005; David Holm <dholm@gentoo.org> libsrs_alt-1.0_rc1.ebuild:
+  Added to ~ppc.
 
 *libsrs_alt-1.0_rc1 (14 Jul 2005)
 
diff --git a/mail-filter/libsrs_alt/Manifest b/mail-filter/libsrs_alt/Manifest
index 60143d4d9d99..42acd9f1ff01 100644
--- a/mail-filter/libsrs_alt/Manifest
+++ b/mail-filter/libsrs_alt/Manifest
@@ -1,2 +1,14 @@
-MD5 167975b638d55a25faa7a22fca702fdc libsrs_alt-1.0_rc1.ebuild 854
-MD5 5e7dc1e1287f48e6d59858ac6a695851 files/digest-libsrs_alt-1.0_rc1 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 83898bb1ece58c0edcb37ceddcdcc773 libsrs_alt-1.0_rc1-r1.ebuild 982
+MD5 5d65cbb8f9cc8d44ac91910595cc3e2e ChangeLog 1926
+MD5 ae8ed326545606db951ae5e263a3af91 metadata.xml 577
+MD5 5e7dc1e1287f48e6d59858ac6a695851 files/digest-libsrs_alt-1.0_rc1-r1 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDYl6oKRy60XGEcJIRAi7NAJ9T4E3tWra52qFo8E+m6LCs3ORnMgCeKJYT
+Uyoi2uif+z8+eh2HPrrZxlA=
+=8zwg
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/libsrs_alt/libsrs_alt-1.0_rc1-r1.ebuild b/mail-filter/libsrs_alt/libsrs_alt-1.0_rc1-r1.ebuild
index eba8b039e4e6..1e6c91428279 100644
--- a/mail-filter/libsrs_alt/libsrs_alt-1.0_rc1-r1.ebuild
+++ b/mail-filter/libsrs_alt/libsrs_alt-1.0_rc1-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/mail-filter/libsrs_alt/libsrs_alt-1.0_rc1-r1.ebuild,v 1.1 2005/07/15 17:20:50 peitolm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/libsrs_alt/libsrs_alt-1.0_rc1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 MY_PV=${PV%_rc*}
 MY_RC=${PV#*_rc}
@@ -12,7 +12,7 @@ SRC_URI="http://srs.mirtol.com/libsrs_alt-${MY_PV}rc${MY_RC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="alpha amd64 hppa ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/mail-filter/libsrs_alt/metadata.xml b/mail-filter/libsrs_alt/metadata.xml
index 272df89eb5df..cd85ca5d550d 100644
--- a/mail-filter/libsrs_alt/metadata.xml
+++ b/mail-filter/libsrs_alt/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>net-mail</herd>
 <maintainer>
-  <!-- Primary maintainer -->
   <email>peitolm@gentoo.org</email>
   <name>Colin Morey</name>
+  <description>Primary maintainer</description>
 </maintainer>
 <longdescription>
 This is a complete standalone C implementation of the SRS (Sender Rewriting
diff --git a/mail-filter/maildrop/ChangeLog b/mail-filter/maildrop/ChangeLog
index 59c429cb74c3..73eec2e80f81 100644
--- a/mail-filter/maildrop/ChangeLog
+++ b/mail-filter/maildrop/ChangeLog
@@ -1,6 +1,240 @@
-# ChangeLog for net-mail/maildrop
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.1 2004/06/03 07:17:31 seemant Exp $
+# ChangeLog for mail-filter/maildrop
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
+
+  20 Nov 2005; Joseph Jezak <josejx@gentoo.org> maildrop-2.0.1.ebuild:
+  Marked ppc stable for bug #112687.
+
+  19 Nov 2005; Mark Loeser <halcy0n@gentoo.org> maildrop-2.0.1.ebuild:
+  Stable on x86; bug #112687
+
+  16 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org> maildrop-2.0.1.ebuild:
+  Stable on alpha
+
+  19 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1-r2.ebuild, maildrop-2.0.1.ebuild:
+  replace-flags -Os -O2 since it causes segfaults. Discovered by Diego
+  'Flameeyes' Pettenò
+
+  16 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1-r2.ebuild, maildrop-2.0.1.ebuild:
+  fix for bug #109460. Thanks to Marek Szuba <cyberman@if.pw.edu.pl>
+
+*maildrop-2.0.1 (12 Oct 2005)
+
+  12 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  -files/maildrop-2.0.0-fix-maildir_la.patch, -maildrop-2.0.0.ebuild,
+  +maildrop-2.0.1.ebuild:
+  version bump. remove old version
+
+  12 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> maildrop-2.0.0.ebuild:
+  use bindnow-flags
+
+*maildrop-2.0.0 (20 Sep 2005)
+
+  20 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/maildrop-2.0.0-fix-maildir_la.patch,
+  -maildrop-1.8.1.20050828.ebuild, +maildrop-2.0.0.ebuild:
+  version bump. removing development version. add alias to trusted users wrt
+  bug #105230
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  15 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1-r2.ebuild, maildrop-1.8.1.20050828.ebuild:
+  Fix DEPEND atoms
+
+*maildrop-1.8.1-r2 (10 Sep 2005)
+
+  10 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/maildrop-1.8.1-disable-fam.patch, -maildrop-1.8.1-r1.ebuild,
+  +maildrop-1.8.1-r2.ebuild, maildrop-1.8.1.20050828.ebuild:
+  fix 1.8.1 and development versions adding fam use flag. Remove -r1 in favour
+  of -r2
+
+  05 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1-r1.ebuild:
+  Found a possible bug, returning back to ~testing
+
+  05 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1.20050828.ebuild:
+  add missing deps on development version
+
+*maildrop-1.8.1.20050828 (05 Sep 2005)
+
+  05 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1-r1.ebuild, +maildrop-1.8.1.20050828.ebuild:
+  add maildrop development version (p.masked)
+
+  30 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.1-r1.ebuild:
+  stable on alpha and x86
+
+  06 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org> -maildrop-1.8.1.ebuild,
+  maildrop-1.8.1-r1.ebuild:
+  Block mail-mta/courier (as per bug #99253). Also remove
+  maildrop-1.8.1.ebuild, not usable
+
+*maildrop-1.8.1-r1 (29 Jul 2005)
+
+  29 Jul 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +maildrop-1.8.1-r1.ebuild:
+  fix use usage and fix bug #100055
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  maildrop-1.8.0-r3.ebuild:
+  Marked stable on amd64.
+
+  30 Jun 2005; Aron Griffis <agriffis@gentoo.org> maildrop-1.8.0-r3.ebuild:
+  Fix use invocation
+
+*maildrop-1.8.1 (23 Jun 2005)
+
+  23 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> metadata.xml,
+  +maildrop-1.8.1.ebuild:
+  version bump. taking over maintainership
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  maildrop-1.8.0-r3.ebuild:
+  Stable on ppc.
+
+  29 May 2005; <solar@gentoo.org> maildrop-1.8.0-r3.ebuild:
+  - update maildrop to use libc expanded variable elibc_uclibc vs uclibc so
+  USE=-* works
+
+  23 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  maildrop-1.8.0-r3.ebuild:
+  Don't use lazy bindings on maildrop
+
+  08 May 2005; Aron Griffis <agriffis@gentoo.org> maildrop-1.8.0-r3.ebuild:
+  stable on ia64
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org> maildrop-1.7.0-r3.ebuild,
+  maildrop-1.7.0.20040907-r1.ebuild, maildrop-1.8.0-r3.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  05 May 2005; Jeffrey Forman <jforman@gentoo.org> maildrop-1.8.0-r3.ebuild:
+  stable on sparc, bug 91465
+
+  05 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  maildrop-1.8.0-r3.ebuild:
+  Stable on alpha, bug 91465.
+
+  04 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  -maildrop-1.4.0-r1.ebuild, -maildrop-1.5.2.ebuild, -maildrop-1.5.3.ebuild,
+  -maildrop-1.5.3-r1.ebuild, -maildrop-1.7.0.ebuild,
+  -maildrop-1.7.0-r2.ebuild, -maildrop-1.7.0.20040907.ebuild,
+  -maildrop-1.8.0.ebuild, -maildrop-1.8.0-r1.ebuild,
+  -maildrop-1.8.0-r2.ebuild, maildrop-1.8.0-r3.ebuild:
+  cutting off old ebuilds and add a security-related ewarn
+
+*maildrop-1.7.0-r3 (04 May 2005)
+
+  04 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +maildrop-1.7.0-r3.ebuild:
+  fix security bug (#91465), reported by: eromang <eromang@zataz.net>
+
+*maildrop-1.8.0-r3 (10 Mar 2005)
+
+  10 Mar 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +maildrop-1.8.0-r3.ebuild:
+  ebuild cleanup wrt #84684. Thanks to Diego Pettenò
+  <dgp85@users.sourceforge.net>
+
+*maildrop-1.8.0-r2 (16 Feb 2005)
+
+  16 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +maildrop-1.8.0-r2.ebuild:
+  Make maildrop setuid root as it is safe from maildrop man page. wrt #81391
+
+*maildrop-1.8.0-r1 (13 Feb 2005)
+
+  13 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/maildrop-1.8.0-db4.patch, +maildrop-1.8.0-r1.ebuild:
+  Make maildrop use courier-authlib and clean the ebuild. Re-Closes #81391.
+  Thanks to Scott Taylor <swtaylor@gentoo.org> for the initial ebuild.
+
+*maildrop-1.8.0 (09 Feb 2005)
+
+  09 Feb 2005; Fernando J. Pereda <ferdy@gentoo.org> +maildrop-1.8.0.ebuild:
+  Version bump, closes #81391. Reported by: valli <gentoo@valli.org>
+
+  30 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  maildrop-1.7.0.20040907-r1.ebuild:
+  Stable on alpha.
+
+*maildrop-1.7.0.20040907-r1 (28 Dec 2004)
+
+  28 Dec 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/maildrop-1.7.0-0x0B-fix.patch, +maildrop-1.7.0.20040907-r1.ebuild:
+  Apply patch to fix segfault when maildropmysql.cf can not be read. Bug
+  #75846, reported by Ivo Bitter <gentoo@joeniks.nl>. Keeping stable
+  keywords.
+
+  21 Dec 2004; Ferris McCormick <fmccor@gentoo.org>
+  maildrop-1.7.0.20040907.ebuild:
+  Stable for sparc (using MySQL database for lookup, bogofilter as xfilter).
+
+  14 Dec 2004; Andrej Kacian <ticho@gentoo.org> maildrop-1.7.0-r2.ebuild,
+  maildrop-1.7.0.20040907.ebuild, maildrop-1.7.0.ebuild:
+  Stable on x86.
+
+  11 Nov 2004; Aron Griffis <agriffis@gentoo.org> maildrop-1.7.0-r2.ebuild:
+  add ~ia64
+
+  22 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  maildrop-1.7.0.20040907.ebuild:
+  Fixed SRC_URI to download tarball from courier-mta.org instead of
+  sourceforge.net, where it has been removed. Reported by Thomas Kirchner
+  <gentoo@halffull.org>, closes #64961.
+
+  20 Sep 2004; Andrej Kacian <ticho@gentoo.org> -maildrop-1.7.0-r1.ebuild:
+  Removed, because maildrop-1.7.0.20040907.ebuild supersedes it.
+
+*maildrop-1.7.0.20040907 (20 Sep 2004)
+
+  20 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +maildrop-1.7.0.20040907.ebuild:
+  Version bump. Upstream fixed issue in #59608 here.
+
+  20 Sep 2004; Andrej Kacian <ticho@gentoo.org> maildrop-1.7.0-r1.ebuild,
+  maildrop-1.7.0-r2.ebuild, maildrop-1.7.0.ebuild:
+  Updated homepage Closes #64577, reported by Daniel Webert
+  <rockoo@rockoo.homelinux.org>.
+
+*maildrop-1.7.0-r2 (28 Aug 2004)
+
+  28 Aug 2004; Tom Martin <slarti@gentoo.org> +maildrop-1.7.0-r2.ebuild:
+  Revision bump. Added dspam and apache to the list of trusted users to
+  resolve problems with the dspam CGI script. See bug 61670. Thanks to Mark
+  Wagner <mark+gentoo@lanfear.net> for the fix.
+
+*maildrop-1.7.0-r1 (20 Aug 2004)
+
+  20 Aug 2004; Tuan Van <langthang@gentoo.org>
+  +files/maildrop-1.7.0-db4-bdbobj_configure.in.patch,
+  +files/maildrop-1.7.0-db4-configure.in.patch, +maildrop-1.7.0-r1.ebuild:
+  Revision bump. Attemp to fix bug #59608.
+  Add patches to support db-4.x. Remove flag-o-matic.
+
+  06 Aug 2004; Tom Knight <tomk@gentoo.org> maildrop-1.5.3-r1.ebuild,
+  maildrop-1.7.0.ebuild:
+  Fixed use invocation, removed redundant RDEPEND.
+
+  05 Aug 2004; Tom Martin <slarti@gentoo.org> -files/maildrop-1.7.0-db3.patch,
+  maildrop-1.7.0.ebuild:
+  Tidy; removed epatch as it seems to be unnecessary.
+
+*maildrop-1.7.0 (05 Aug 2004)
+
+  05 Aug 2004; Tom Martin <slarti@gentoo.org> +files/maildrop-1.7.0-db3.patch,
+  +maildrop-1.7.0.ebuild:
+  Version bump, thanks to all contributors in bug 34316.
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> maildrop-1.5.2.ebuild,
+  maildrop-1.5.3-r1.ebuild, maildrop-1.5.3.ebuild:
+  Fix use invocation
 
 *maildrop-1.5.3 (03 Jun 2004)
 
diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest
index b86ebeae8cc6..d4db16d47719 100644
--- a/mail-filter/maildrop/Manifest
+++ b/mail-filter/maildrop/Manifest
@@ -1,11 +1,28 @@
-MD5 5dc2f922b24fc2578b5df12d43f809be ChangeLog 5001
-MD5 adff31731f3ce0e575ef71f8d99b69b0 maildrop-1.4.0-r1.ebuild 1652
-MD5 711b4440d058d4d26e7589906f299f01 maildrop-1.5.2.ebuild 2584
-MD5 e27c5e7b9717729bdf44644c7f391a02 maildrop-1.5.3-r1.ebuild 2503
-MD5 1dd5ebb6726aa99a92b8b3ba48eecb63 maildrop-1.5.3.ebuild 2561
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 953fc332e6ec019b91dba0b85d9745e9 files/digest-maildrop-1.4.0-r1 66
-MD5 a0e238f4cd5c4a52dfb06754051b6dfe files/digest-maildrop-1.5.2 67
-MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3 67
-MD5 afbd9f7ee066fa84ac9efd57bce9f461 files/digest-maildrop-1.5.3-r1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6c623e2181c01eeaa62d223718adf3ce ChangeLog 13643
+MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r3 68
+MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
+MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r3 68
+MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1-r2 68
+MD5 95b2557a809befe8206f23973a7012bc files/digest-maildrop-2.0.1 68
+MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
+MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
+MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
+MD5 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
+MD5 e7efb3052fe6605244b78179990197f0 files/maildrop-1.8.1-disable-fam.patch 2511
 MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
+MD5 1b7667f17727f2ff5bb8b8ffa61d69e2 maildrop-1.7.0-r3.ebuild 3318
+MD5 572398e0dc4c55a532433635a82d1408 maildrop-1.7.0.20040907-r1.ebuild 3248
+MD5 3cbb6f6a6e1be7d2339173ab6d4a23cd maildrop-1.8.0-r3.ebuild 3642
+MD5 3afda1bc9f2b87b3b5bd598cb2097421 maildrop-1.8.1-r2.ebuild 3326
+MD5 15aee0b6251604fe586540f0298e81e4 maildrop-2.0.1.ebuild 3442
+MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf91fcsIHjyDViGQRAj+vAJ912xVcYHIRfs8izyjMGdLhwAn0+ACgrBx9
+bnqoMMBQOxCoO9fUEK7wRCk=
+=oGcV
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild b/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild
index 11718d9d2328..94691811fce1 100644
--- a/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0-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/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild,v 1.1 2005/05/04 19:40:31 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0-r3.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
 
 inherit eutils
@@ -16,7 +16,7 @@ KEYWORDS="x86 ~sparc ~alpha ~amd64 ~ia64"
 
 DEPEND="dev-lang/perl
 	virtual/mta
-	berkdb? ( >=sys-libs/db-3* )
+	berkdb? ( >=sys-libs/db-3 )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	mysql? ( >=dev-db/mysql-3.23.51 )
 	ldap? ( >=net-nds/openldap-2.0.23 )"
diff --git a/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild b/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
index b703f9d77bf8..0ed9881016e4 100644
--- a/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild
+++ b/mail-filter/maildrop/maildrop-1.7.0.20040907-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/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild,v 1.1 2004/12/28 00:05:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.7.0.20040907-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 
 inherit eutils
@@ -12,11 +12,11 @@ SRC_URI="http://www.courier-mta.org/beta/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~alpha ~amd64"
+KEYWORDS="x86 sparc alpha ~amd64"
 
 DEPEND="dev-lang/perl
 	virtual/mta
-	berkdb? ( >=sys-libs/db-3* )
+	berkdb? ( >=sys-libs/db-3 )
 	gdbm? ( >=sys-libs/gdbm-1.8.0 )
 	mysql? ( >=dev-db/mysql-3.23.51 )
 	ldap? ( >=net-nds/openldap-2.0.23 )"
diff --git a/mail-filter/maildrop/maildrop-1.8.0-r3.ebuild b/mail-filter/maildrop/maildrop-1.8.0-r3.ebuild
index 4a92c695f407..851666106d0e 100644
--- a/mail-filter/maildrop/maildrop-1.8.0-r3.ebuild
+++ b/mail-filter/maildrop/maildrop-1.8.0-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/mail-filter/maildrop/maildrop-1.8.0-r3.ebuild,v 1.1 2005/03/10 18:25:40 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.0-r3.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -14,13 +14,13 @@ S="${WORKDIR}/${P%%_pre}"
 SLOT="0"
 LICENSE="GPL-2"
 # not in keywords due to missing dependencies: ~arm ~s390 ~ppc64
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc"
-IUSE="mysql ldap gdbm berkdb uclibc debug postgres"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="mysql ldap gdbm berkdb debug postgres"
 
 PROVIDE="virtual/mda"
 
 DEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
-	!gdbm? ( berkdb? ( >=sys-libs/db-3* ) )
+	!gdbm? ( berkdb? ( >=sys-libs/db-3 ) )
 	mysql? ( net-libs/courier-authlib )
 	postgres? ( net-libs/courier-authlib )
 	ldap? ( net-libs/courier-authlib )"
@@ -31,7 +31,10 @@ RDEPEND="${DEPEND}
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	use uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
+
+	# Do not use lazy bindings on /usr/bin/maildrop
+	sed -i -e 's~^maildrop_LDFLAGS =~& -Wl,-z,now~g' maildrop/Makefile.in
+	use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub
 	if use gdbm ; then
 		use berkdb && einfo "Both gdbm and berkdb selected. Using gdbm."
 	else
@@ -58,11 +61,12 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	if use gdbm ; then
+	if use gdbm; then
 		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb; then
+		myconf="${myconf} --with-db=db"
 	else
-		[ use berkdb ] &&  myconf="${myconf} --with-db=db" || \
-			myconf="${myconf} --without-db"
+		myconf="${myconf} --without-db"
 	fi
 
 	if ! use mysql && ! use postgres && ! use ldap ; then
@@ -105,11 +109,24 @@ src_install() {
 	doins ${FILESDIR}/maildroprc
 
 	insinto /etc/maildrop
-	if use mysql
-	then
+	insopts -m0640
+	if use mysql ; then
 		sed -e "s:/var/lib/mysql/mysql.sock:/var/run/mysqld/mysqld.sock:" \
 		 	${S}/maildropmysql.config > ${S}/maildropmysql.cf
 		newins ${S}/maildropmysql.cf maildropmysql.cf
 	fi
 	use ldap && newins ${S}/maildropldap.config maildropldap.cf
 }
+
+pkg_postinst() {
+	if use ldap || use mysql ; then
+		echo
+		ewarn
+		ewarn "Due to a security bug (#91465) you should change the permissions of:"
+		use ldap && ewarn "   /etc/maildrop/maildropldap.cf"
+		use mysql && ewarn "   /etc/maildrop/maildropmysql.cf"
+		ewarn "  by running chmod 0640 on them."
+		ewarn
+		echo
+	fi
+}
diff --git a/mail-filter/maildrop/maildrop-1.8.1-r2.ebuild b/mail-filter/maildrop/maildrop-1.8.1-r2.ebuild
index 4af215962841..19005650a906 100644
--- a/mail-filter/maildrop/maildrop-1.8.1-r2.ebuild
+++ b/mail-filter/maildrop/maildrop-1.8.1-r2.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/mail-filter/maildrop/maildrop-1.8.1-r2.ebuild,v 1.1 2005/09/10 22:42:16 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig flag-o-matic
 
 DESCRIPTION="Mail delivery agent/filter"
 [[ -z ${PV/?.?} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
@@ -29,7 +29,7 @@ DEPEND="!mail-mta/courier
 	!gdbm? (
 		berkdb? (
 			>=sys-libs/db-3
-			~sys-devel/autoconf
+			~sys-devel/autoconf-2.59
 		)
 	)"
 
@@ -57,6 +57,7 @@ src_unpack() {
 	fi
 
 	if ! use fam ; then
+		cd ${S}
 		epatch ${FILESDIR}/${P}-disable-fam.patch
 		cd ${S}/maildir
 		WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (maildir)"
@@ -73,6 +74,8 @@ src_unpack() {
 src_compile() {
 	local myconf
 
+	replace-flags -Os -O2
+
 	if use gdbm ; then
 		myconf="${myconf} --with-db=gdbm"
 	elif use berkdb ; then
diff --git a/mail-filter/maildrop/maildrop-2.0.1.ebuild b/mail-filter/maildrop/maildrop-2.0.1.ebuild
index e34584ca861f..55e54c98b256 100644
--- a/mail-filter/maildrop/maildrop-2.0.1.ebuild
+++ b/mail-filter/maildrop/maildrop-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/mail-filter/maildrop/maildrop-2.0.1.ebuild,v 1.1 2005/10/12 18:38:38 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P%%_pre}"
 SLOT="0"
 LICENSE="GPL-2"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ia64 ppc ~sparc x86"
 IUSE="berkdb debug fam gdbm ldap mysql postgres"
 
 PROVIDE="virtual/mda"
@@ -59,6 +59,7 @@ src_unpack() {
 	fi
 
 	if ! use fam ; then
+		cd ${S}
 		epatch ${FILESDIR}/${PN}-1.8.1-disable-fam.patch
 		cd ${S}/maildir
 		WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (maildir)"
@@ -78,6 +79,8 @@ src_compile() {
 	local mytrustedusers="apache dspam root mail \
 		daemon postmaster qmaild mmdf vmail alias"
 
+	replace-flags -Os -O2
+
 	if use gdbm ; then
 		myconf="${myconf} --with-db=gdbm"
 	elif use berkdb ; then
diff --git a/mail-filter/maildrop/metadata.xml b/mail-filter/maildrop/metadata.xml
index 51f94e3fbe0e..f13b107c15af 100644
--- a/mail-filter/maildrop/metadata.xml
+++ b/mail-filter/maildrop/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>ferdy@gentoo.org</email>
+		<name>Fernando J. Pereda</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/mailfilter/ChangeLog b/mail-filter/mailfilter/ChangeLog
index be6e97b48908..674b220c2748 100644
--- a/mail-filter/mailfilter/ChangeLog
+++ b/mail-filter/mailfilter/ChangeLog
@@ -1,6 +1,64 @@
-# ChangeLog for net-mail/mailfilter
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/ChangeLog,v 1.1 2004/06/03 07:20:45 seemant Exp $
+# ChangeLog for mail-filter/mailfilter
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/ChangeLog,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mailfilter-0.7.1.ebuild:
+  Stable on ppc.
+
+  18 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mailfilter-0.7.1.ebuild:
+  Stable on sparc
+
+  14 Jan 2005; Andrej Kacian <ticho@gentoo.org> mailfilter-0.7.1.ebuild:
+  Stable on x86.
+
+  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mailfilter-0.6.2.ebuild:
+  Stable on sparc
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  14 Dec 2004; Andrej Kacian <ticho@gentoo.org> mailfilter-0.6.2.ebuild:
+  Stable on x86.
+
+*mailfilter-0.7.1 (09 Dec 2004)
+
+  09 Dec 2004; Andrej Kacian <ticho@gentoo.org> files/rcfile.example1,
+  files/rcfile.example2, +mailfilter-0.7.1.ebuild:
+  Version bump. Closes #73113, reported by Holger Hoffstatte
+  <holger@wizards.de>.
+
+  04 Oct 2004; Andrej Kacian <ticho@gentoo.org> mailfilter-0.4.0.ebuild,
+  mailfilter-0.6.1.ebuild, mailfilter-0.6.2.ebuild, mailfilter-0.6.ebuild:
+  Fix some QA issues.
+
+*mailfilter-0.6.2 (04 Oct 2004)
+
+  04 Oct 2004; Andrej Kacian <ticho@gentoo.org> +mailfilter-0.6.2.ebuild:
+  Version bump. Closes #66273, reported by Daniel Webert
+  <rockoo@rockoo.homelinux.org>.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> mailfilter-0.6.1.ebuild:
+  Stable on sparc.
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> mailfilter-0.6.1.ebuild,
+  mailfilter-0.6.ebuild:
+  Stable on x86.
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org> mailfilter-0.6.1.ebuild:
+  Marked ~amd64.
+
+*mailfilter-0.6.1 (08 Aug 2004)
+
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> +mailfilter-0.6.1.ebuild:
+  Version bump.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  mailfilter-0.4.0.ebuild, mailfilter-0.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> mailfilter-0.6.ebuild:
+  Added to ~ppc.
 
 *mailfilter-0.4.0 (03 Jun 2004)
 
diff --git a/mail-filter/mailfilter/Manifest b/mail-filter/mailfilter/Manifest
index 75ebe15f1718..2d26a50076f8 100644
--- a/mail-filter/mailfilter/Manifest
+++ b/mail-filter/mailfilter/Manifest
@@ -1,8 +1,14 @@
-MD5 3457f1485350c4c53437139255477fb2 ChangeLog 778
-MD5 7b4b8025a9637a033af7a169090223ba mailfilter-0.4.0.ebuild 965
+MD5 5d63d08338b668b52c49b0e868b17ee7 mailfilter-0.7.1.ebuild 775
+MD5 7f9d46e4fd429144ecc51a2915884601 mailfilter-0.4.0.ebuild 757
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 56a083a5a3b41c6d7685d9783f89bc96 mailfilter-0.6.ebuild 965
-MD5 99319faac6b64efd8bd8b5eeac8cdde7 files/digest-mailfilter-0.4.0 68
-MD5 24547a38bf50c5c24811a8ac677ce1a7 files/rcfile.example1 3478
-MD5 d457aec252645036a2747352e8fd82b5 files/rcfile.example2 4197
+MD5 cf715965e8d3f4e3b3db021ab3a0149b mailfilter-0.6.ebuild 761
+MD5 fa2b4b3215ff6064a4c0bff3c2b44e26 ChangeLog 2882
+MD5 259e0eaadad2ec513447035094b1166b mailfilter-0.6.2.ebuild 769
+MD5 3294c85dd993ff953b72609051bee392 mailfilter-0.6.1.ebuild 770
+MD5 dbe5cd837ea37123cf7a7be08d9c3264 files/digest-mailfilter-0.7.1 68
+MD5 80c8b3f080ea3338649f7bd79393a000 files/rcfile.example2 4551
+MD5 aaf9b3f667ef284b9780d357f8299768 files/digest-mailfilter-0.6.1 68
+MD5 03103aee47aedcbd4808f9c025b5ec65 files/digest-mailfilter-0.6.2 68
+MD5 7a7f0ff9df118aba4bf9fc845736dc75 files/rcfile.example1 4010
 MD5 cf24facc40700b1105ed164678ea9c31 files/digest-mailfilter-0.6 66
+MD5 99319faac6b64efd8bd8b5eeac8cdde7 files/digest-mailfilter-0.4.0 68
diff --git a/mail-filter/mailfilter/files/rcfile.example1 b/mail-filter/mailfilter/files/rcfile.example1
index 900fd4750bfa..85d3a519cf02 100644
--- a/mail-filter/mailfilter/files/rcfile.example1
+++ b/mail-filter/mailfilter/files/rcfile.example1
@@ -6,38 +6,49 @@
 # -----------------------------------------------------------
 # Logile path (be sure you have write permission in this
 # directory; you MUST specify a logfile)
- 
-LOGFILE=/home/tux/logs/.mailfilter.log
- 
- 
+
+LOGFILE = "$HOME/logs/mailfilter.log"
+
+
 # -----------------------------------------------------------
 # Level of verbosity
+#
+#   0      Silent, show nothing at all
+#   1      Only show errors
+#   2      Only show "Deleted..." messages and errors
+#   3      Default; Show "Deleted..." messages,  errors
+#          and "Examining..." messages
+#   4      Like (3), except this also shows the current
+#          account's username
+#   5      Like (4), except this also shows which filter
+#          matched which string of an e-mail header
+#   6      Debugging mode; prints almost everything
+
+VERBOSE = 3
+
 
-VERBOSE=3
- 
- 
 # -----------------------------------------------------------
-# POP3 server list (do not change the order of the fields!)
-# Note: Port 110 is usually the port POP3 servers use.
-#       Currently only POP3 is supported.
- 
-SERVER=pop.server.com
-USER=username
-PASS=password
-PROTOCOL=pop3
-PORT=110
- 
-SERVER=pop.secondserver.com
-USER=anotherusername
-PASS=anotherusername
-PROTOCOL=pop3
-PORT=110
- 
- 
+# Server list  (Do not change the order of the fields!!)
+# Note: Port 110 is usually the port APOP and POP3 servers use,
+# port 995 is required if (say) POP3/SSL is specified.
+
+SERVER   = "pop.server.com"
+USER     = "username"
+PASS     = "password"
+PROTOCOL = "pop3"
+PORT     = 110
+
+SERVER   = "pop.secondserver.com"
+USER     = "anotherusername"
+PASS     = "anotherusername"
+PROTOCOL = "pop3/ssl"
+PORT     = 995
+
+
 # -----------------------------------------------------------
 # Do you want case sensitive e-mail filters? { yes | no }
- 
-REG_CASE=no
+
+REG_CASE = "no"
 
 
 # -----------------------------------------------------------
@@ -45,73 +56,72 @@ REG_CASE=no
 #
 # (The default is 'basic', don't change unless you know what you
 #  are doing. Extended REs are more complex to set up.)
- 
-REG_TYPE=basic
+
+REG_TYPE = "basic"
 
 
 # -----------------------------------------------------------
 # Maximum e-mail size in bytes that should not be exceeded.
- 
-MAXSIZE_DENY=1000000
+
+MAXSIZE_DENY = 1000000
 
 
 # -----------------------------------------------------------
 # Set maximum line length of any field in the message header
-# (default is 998 characters per line; 0 to disable option)
  
-MAXLENGTH=998
+MAXLENGTH = 998
 
 
 # ----------------------------------------------------------
 # Filter rules for detecting spam (each rule must be placed
-# in a seperate line)
+# in a separate line)
 
 # These filters detect certain unpleasant e-mail subjects:
-DENY=^Subject:.*Get penis enlargement
-DENY=^Subject:.*WIN MONEY
+DENY = "^Subject:.*Get penis enlargement"
+DENY = "^Subject:.*WIN MONEY"
 
 # This one filters mail from a certain person:
-DENY=^From:.*spammer@any_spam_organisation.com
+DENY = "^From:.*spammer@any_spam_organisation\.com"
 
 # This one filters mail from everyone at a certain organisation:
-DENY=^From:.*@any_provider_that_spams.org
+DENY = "^From:.*@any_provider_that_spams\.org"
 
 # We don't want any of those 'LEGAL' messages either
 # while stuff with 'legal' in the subject still interests us:
-DENY_CASE=^Subject:.*LEGAL
+DENY_CASE = "^Subject:.*LEGAL"
 
 
-# -----------------------------------------------------------
+# -----------------------------------------------------------  
 # Normalises the subject strings before parsing, e.g.
 # ',L.E-G,A.L; ,C.A-B`L`E, +.B-O`X` ;D`E`S,C;R,A.MB;L,E.R-]'
 # becomes 'LEGAL CABLE BOX DESCRAMBLER' which can be filtered.
-#
+# 
 # If NORMAL is switched on, Mailfilter tries to apply filters
 # to both the normalised and the original subject.
 
-NORMAL=yes
+NORMAL = "yes"
 
 
 # -----------------------------------------------------------
 # The maximum e-mail size in bytes that messages from friends
 # should not exceed. Set this to 0 if all your friends (ALLOW)
 # can send messages as long as they want.
- 
-MAXSIZE_ALLOW=0
- 
- 
+
+MAXSIZE_ALLOW = 0
+
+
 # ----------------------------------------------------------
 # Set list of friends that always pass, if they do not
 # exceed the message length of MAXSIZE_ALLOW
- 
+
 # This rule allows all mail from a friend who was unlucky enough
 # to have signed up with a spam organisation. With DENY we
 # block everyone else from that domain though! See above!
-ALLOW=^From:.*a_friend_with_account@any_provider_that_spams.org
- 
+ALLOW = "^From:.*a_friend_with_account@any_provider_that_spams.org"
+
 # Of course we allow e-mail from anyone who has something to say about
 # mailfilter:
-ALLOW=^Subject:.*mailfilter
+ALLOW = "^Subject:.*mailfilter"
 
 # We also let our girlfriend send any e-mail she wants:
-ALLOW=^From:.*my_girlfriend@any_provider.com
+ALLOW = "^From:.*my_girlfriend@any_provider\.com"
diff --git a/mail-filter/mailfilter/files/rcfile.example2 b/mail-filter/mailfilter/files/rcfile.example2
index 9439ca38d589..ee995674bfc9 100644
--- a/mail-filter/mailfilter/files/rcfile.example2
+++ b/mail-filter/mailfilter/files/rcfile.example2
@@ -1,7 +1,8 @@
 # -----------------------------------------------------------
-# Example configuration based upon the INSTALL document, but
-# showing some advanced features such as 'Negative Filters',
-# extended Regular Expressions, etc.
+# Example rcfile from the INSTALL document
+# Example configuration based upon the INSTALL document, but 
+# showing some advanced features such as 'Negative Filters', 
+# extended Regular Expressions, etc. 
 # -----------------------------------------------------------
 
 
@@ -9,37 +10,48 @@
 # Logile path (be sure you have write permission in this
 # directory; you MUST specify a logfile)
 
-LOGFILE=/home/tux/logs/.mailfilter.log
+LOGFILE = "$HOME/logs/mailfilter.log"
 
 
 # -----------------------------------------------------------
 # Level of verbosity
+#
+#   0      Silent, show nothing at all
+#   1      Only show errors
+#   2      Only show "Deleted..." messages and errors
+#   3      Default; Show "Deleted..." messages,  errors
+#          and "Examining..." messages
+#   4      Like (3), except this also shows the current
+#          account's username
+#   5      Like (4), except this also shows which filter
+#          matched which string of an e-mail header
+#   6      Debugging mode; prints almost everything
 
-VERBOSE=4
+VERBOSE = 4
 
 
 # -----------------------------------------------------------
-# POP3 server list (do not change the order of the fields!)
-# Note: Port 110 is usually the port POP3 servers use.
-#       Currently only POP3 is supported.
+# Server list  (Do not change the order of the fields!!)
+# Note: Port 110 is usually the port APOP and POP3 servers use,
+# port 995 is required if (say) POP3/SSL is specified.
 
-SERVER=pop.server.com
-USER=username
-PASS=password
-PROTOCOL=pop3
-PORT=110
+SERVER   = "pop.server.com"
+USER     = "username"
+PASS     = "password"
+PROTOCOL = "pop3"
+PORT     = 110
 
-SERVER=pop.secondserver.com
-USER=anotherusername
-PASS=anotherusername
-PROTOCOL=pop3
-PORT=110
+SERVER   = "pop.secondserver.com"
+USER     = "anotherusername"
+PASS     = "anotherusername"
+PROTOCOL = "pop3/ssl"
+PORT     = 995
 
 
 # -----------------------------------------------------------
 # Do you want case sensitive e-mail filters? { yes | no }
- 
-REG_CASE=no
+
+REG_CASE = "no"
 
 
 # -----------------------------------------------------------
@@ -48,58 +60,52 @@ REG_CASE=no
 # (The default is 'basic', don't change unless you know what you
 #  are doing. Extended REs are more complex to set up.)
 
-# We want some additional smartness in our rules. That's why only
-# extended Regular Expressions work for this sample set-up.
-REG_TYPE=extended
+# We want some additional smartness in our rules. That's why only 
+# extended Regular Expressions work for this sample set-up. 
+REG_TYPE = "extended"
 
 
 # -----------------------------------------------------------
 # Maximum e-mail size in bytes that should not be exceeded.
 
-# Accept only 250 KBytes message size. Friends can send more though.
-# (See MAXSIZE_ALLOW for further information.)
-MAXSIZE_DENY=250000
+# Accept only 250 KBytes message size. Friends can send more though. 
+# (See MAXSIZE_ALLOW for further information.) 
+MAXSIZE_DENY = 250000
 
 
 # -----------------------------------------------------------
 # Set maximum line length of any field in the message header
-# (default is 998 characters per line; 0 to disable option)
  
-MAXLENGTH=998
-
+MAXLENGTH = 998
 
-# ----------------------------------------------------------
-# Filter rules for detecting spam (each rule must be placed
-# in a seperate line)
 
-# This one filters mail from a certain person.
-# (We need the back slash before the '.com' since we are using
-# extended Regular Expressions.)
-DENY=^From:.*spammer@any_spam_organisation\.com
+# This one filters mail from a certain person. 
+# (We need the back slash before the '.com' since we are using 
+# extended Regular Expressions.) 
+DENY=^From:.*spammer@any_spam_organisation\.com 
 
 # This one filters mail from everyone at a certain organisation:
-DENY=^From:.*@any_provider_that_spams\.org
+DENY = "^From:.*@any_provider_that_spams\.org"
 
 # We don't want any of those 'LEGAL' messages either
 # while stuff with 'legal' in the subject still interests us:
-DENY_CASE=^Subject:.*LEGAL
+DENY_CASE = "^Subject:.*LEGAL"
 
-# This one demonstrates the use of 'Negative Filters' and the
-# logical OR '|' in Regular Expressions.
-# (Again, the example works only with extended Regular Expressions.)
-# Kill everything not directly addressed to own account:
+# This one demonstrates the use of 'Negative Filters' and the 
+# logical OR '|' in Regular Expressions. 
+# (Again, the example works only with extended Regular Expressions.) 
+# Kill everything not directly addressed to own account: 
 DENY<>(^To|^Cc):(.*username@server\.com|.*anotherusername@secondserver\.com)
 
-
-# -----------------------------------------------------------
+# -----------------------------------------------------------  
 # Normalises the subject strings before parsing, e.g.
 # ',L.E-G,A.L; ,C.A-B`L`E, +.B-O`X` ;D`E`S,C;R,A.MB;L,E.R-]'
 # becomes 'LEGAL CABLE BOX DESCRAMBLER' which can be filtered.
-#
+# 
 # If NORMAL is switched on, Mailfilter tries to apply filters
 # to both the normalised and the original subject.
 
-NORMAL=yes
+NORMAL = "yes"
 
 
 # -----------------------------------------------------------
@@ -107,23 +113,21 @@ NORMAL=yes
 # should not exceed. Set this to 0 if all your friends (ALLOW)
 # can send messages as long as they want.
 
-# Accept only up to 0.5 MBytes message size from those listed
-# in the ALLOW rules
-MAXSIZE_ALLOW=500000
- 
- 
+MAXSIZE_ALLOW = 0
+
+
 # ----------------------------------------------------------
 # Set list of friends that always pass, if they do not
 # exceed the message length of MAXSIZE_ALLOW
- 
+
 # This rule allows all mail from a friend who was unlucky enough
 # to have signed up with a spam organisation. With DENY we
 # block everyone else from that domain though! See above!
-ALLOW=^From:.*a_friend_with_account@any_provider_that_spams\.org
- 
+ALLOW = "^From:.*a_friend_with_account@any_provider_that_spams\.org"
+
 # Of course we allow e-mail from anyone who has something to say about
 # mailfilter:
-ALLOW=^Subject:.*mailfilter
+ALLOW = "^Subject:.*mailfilter"
 
 # We also let our girlfriend send any e-mail she wants:
-ALLOW=^From:.*my_girlfriend@any_provider\.com
+ALLOW = "^From:.*my_girlfriend@any_provider\.com"
diff --git a/mail-filter/mailfilter/mailfilter-0.4.0.ebuild b/mail-filter/mailfilter/mailfilter-0.4.0.ebuild
index 4472c89c0915..8c79154c88a9 100644
--- a/mail-filter/mailfilter/mailfilter-0.4.0.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.4.0.ebuild
@@ -1,38 +1,25 @@
-# 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/mail-filter/mailfilter/mailfilter-0.4.0.ebuild,v 1.1 2004/06/03 07:20:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
-
-DEPEND="virtual/glibc"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-SLOT="0"
+SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc"
+IUSE="nls"
 
-src_compile() {
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
+DEPEND="virtual/libc"
+RDEPEND="nls? ( sys-devel/gettext )"
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man ${myconf} || die "./configure failed"
-	make || die
+src_compile() {
+	econf `use_enable nls` || die
+	emake || die
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
-	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2
-	dodoc README THANKS ChangeLog AUTHORS NEWS TODO
-
+	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2 \
+		README THANKS ChangeLog AUTHORS NEWS TODO
 }
diff --git a/mail-filter/mailfilter/mailfilter-0.6.1.ebuild b/mail-filter/mailfilter/mailfilter-0.6.1.ebuild
index 65b02ccf8a0f..94430be4a446 100644
--- a/mail-filter/mailfilter/mailfilter-0.6.1.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.6.1.ebuild
@@ -1,37 +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/mail-filter/mailfilter/mailfilter-0.6.1.ebuild,v 1.1 2004/08/07 22:39:05 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
-IUSE="nls"
 
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
+SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc ~amd64"
+IUSE="nls"
 
 DEPEND="virtual/libc"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-
 src_compile() {
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man ${myconf} || die "./configure failed"
-	make || die
+	econf `use_enable nls` || die
+	emake || die
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
-	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2
-	dodoc README THANKS ChangeLog AUTHORS NEWS TODO
-
+	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2 \
+		README THANKS ChangeLog AUTHORS NEWS TODO
 }
diff --git a/mail-filter/mailfilter/mailfilter-0.6.2.ebuild b/mail-filter/mailfilter/mailfilter-0.6.2.ebuild
index e918d1241d46..79316c16b83a 100644
--- a/mail-filter/mailfilter/mailfilter-0.6.2.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.6.2.ebuild
@@ -1,37 +1,25 @@
-# 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/mail-filter/mailfilter/mailfilter-0.6.2.ebuild,v 1.1 2004/10/04 09:06:33 ticho Exp $
-
-IUSE="nls"
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
+SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 sparc ~ppc ~amd64"
+IUSE="nls"
 
 DEPEND="virtual/libc"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-
 src_compile() {
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man ${myconf} || die "./configure failed"
-	make || die
+	econf `use_enable nls` || die
+	emake || die
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
-	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2
-	dodoc README THANKS ChangeLog AUTHORS NEWS TODO
-
+	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2 \
+		README THANKS ChangeLog AUTHORS NEWS TODO
 }
diff --git a/mail-filter/mailfilter/mailfilter-0.6.ebuild b/mail-filter/mailfilter/mailfilter-0.6.ebuild
index d3a18b7525d8..b33dbb89dcba 100644
--- a/mail-filter/mailfilter/mailfilter-0.6.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.6.ebuild
@@ -1,38 +1,25 @@
-# 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/mail-filter/mailfilter/mailfilter-0.6.ebuild,v 1.1 2004/06/03 07:20:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.6.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
-IUSE="nls"
-
-S=${WORKDIR}/${P}
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
-SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
+SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE="nls"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
-
 src_compile() {
-
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man ${myconf} || die "./configure failed"
-	make || die
+	econf `use_enable nls` || die
+	emake || die
 }
 
 src_install () {
-
 	make DESTDIR=${D} install || die
-	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2
-	dodoc README THANKS ChangeLog AUTHORS NEWS TODO
-
+	dodoc INSTALL doc/FAQ doc/rcfile.example1 doc/rcfile.example2 \
+		README THANKS ChangeLog AUTHORS NEWS TODO
 }
diff --git a/mail-filter/mailfilter/mailfilter-0.7.1.ebuild b/mail-filter/mailfilter/mailfilter-0.7.1.ebuild
index 24f3b347dc3c..65d53ee5103a 100644
--- a/mail-filter/mailfilter/mailfilter-0.7.1.ebuild
+++ b/mail-filter/mailfilter/mailfilter-0.7.1.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/mail-filter/mailfilter/mailfilter-0.7.1.ebuild,v 1.1 2004/12/09 23:04:15 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mailfilter/mailfilter-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 DESCRIPTION="Mailfilter is a utility to get rid of unwanted spam mails"
 HOMEPAGE="http://mailfilter.sourceforge.net/index.html"
 SRC_URI="mirror://sourceforge/mailfilter/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="ppc sparc x86"
 IUSE="nls"
 
 DEPEND="virtual/libc"
diff --git a/mail-filter/mapson/ChangeLog b/mail-filter/mapson/ChangeLog
index 269b809045c3..481fa6ee4518 100644
--- a/mail-filter/mapson/ChangeLog
+++ b/mail-filter/mapson/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for mail-filter/mapson
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/mapson/ChangeLog,v 1.1 2004/09/06 22:58:42 ticho Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mapson/ChangeLog,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mapson-3.0.ebuild:
+  Stable on ppc.
+
+  01 Nov 2004; Andrej Kacian <ticho@gentoo.org> mapson-3.0.ebuild:
+  Stable on x86
+
+  15 Oct 2004; David Holm <dholm@gentoo.org> mapson-3.0.ebuild:
+  Added to ~ppc.
 
 *mapson-3.0 (07 Sep 2004)
 
diff --git a/mail-filter/mapson/Manifest b/mail-filter/mapson/Manifest
index 09f21a2dcabc..4261d4fa4601 100644
--- a/mail-filter/mapson/Manifest
+++ b/mail-filter/mapson/Manifest
@@ -1,2 +1,4 @@
-MD5 a21341593dcfcde5d7b16f9cdd963e45 mapson-3.0.ebuild 885
+MD5 77564f6564722898a2883f14d45ffdb4 mapson-3.0.ebuild 946
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 774a05196d7939591fdbfdbbf30e8e4b ChangeLog 666
 MD5 cac715815f8f0186f774802fe05b0d7a files/digest-mapson-3.0 62
diff --git a/mail-filter/mapson/mapson-3.0.ebuild b/mail-filter/mapson/mapson-3.0.ebuild
index 5b6ac373bb6b..1951d5e6f1e8 100644
--- a/mail-filter/mapson/mapson-3.0.ebuild
+++ b/mail-filter/mapson/mapson-3.0.ebuild
@@ -1,16 +1,16 @@
-# 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/mail-filter/mapson/mapson-3.0.ebuild,v 1.1 2004/09/06 22:58:42 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/mapson/mapson-3.0.ebuild,v 1.1.1.1 2005/11/30 10:11:51 chriswhite Exp $
 
 DESCRIPTION="A challenge/response-based white-list spam filter"
 HOMEPAGE="http://mapson.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mapson/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="ppc x86"
 
 IUSE="debug"
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/mta"
 
 src_compile() {
diff --git a/mail-filter/metadata.xml b/mail-filter/metadata.xml
index e30552fab650..5a0b4129e053 100644
--- a/mail-filter/metadata.xml
+++ b/mail-filter/metadata.xml
@@ -4,5 +4,30 @@
 	<longdescription lang="en">
 		The mail-filter category contains email filtering software.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie mail-filter enthält Programme zur Filterung von
+		Emails.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría mail-filter contiene programas para filtrar correo
+		electrónico.
+	</longdescription>
+	<longdescription lang="ja">
+		mail-filter カテゴリーにはメールフィルタリング・ソフトウェアが
+		含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De mail-filter categorie bevat filtersoftware voor e-mail.
+	</longdescription>
+	<longdescription lang="sk">
+		Kategória mail-filter obsahuje nástroje na filtrovanie elektronických
+		správ.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm mail-filter chứa các phần mềm lọc email.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria mail-filter contiene programmi per il filtraggio della
+		posta elettronica.
+	</longdescription>
 </catmetadata>
-
diff --git a/mail-filter/normalizemime/ChangeLog b/mail-filter/normalizemime/ChangeLog
index b97d6ca7a7e9..64fab8e09b9e 100644
--- a/mail-filter/normalizemime/ChangeLog
+++ b/mail-filter/normalizemime/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for mail-filter/normalizemime
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/normalizemime/ChangeLog,v 1.1 2004/10/26 21:13:33 slarti Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/normalizemime/ChangeLog,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  normalizemime-1.15.ebuild:
+  Stable on ppc.
+
+  04 Jan 2005; Andrej Kacian <ticho@gentoo.org> normalizemime-1.15.ebuild:
+  Stable on x86.
+
+  03 Jan 2005; Tom Martin <slarti@gentoo.org> normalizemime-1.15.ebuild:
+  Stable on amd64.
+
+  30 Oct 2004; David Holm <dholm@gentoo.org> normalizemime-1.15.ebuild:
+  Added to ~ppc.
+
+  30 Oct 2004; Andrej Kacian <ticho@gentoo.org> normalizemime-1.15.ebuild:
+  Added ~x86 to KEYWORDS.
 
 *normalizemime-1.15 (26 Oct 2004)
 
diff --git a/mail-filter/normalizemime/Manifest b/mail-filter/normalizemime/Manifest
index e141cc98570d..d40e1a7a878e 100644
--- a/mail-filter/normalizemime/Manifest
+++ b/mail-filter/normalizemime/Manifest
@@ -1,2 +1,4 @@
-MD5 2c097cf02de32915e09b94fca81eb54e normalizemime-1.15.ebuild 585
+MD5 72faf8d39c2b85fbce5386b84d59dc9d metadata.xml 241
+MD5 cdd73870d57225eeb090d17c57459b0d ChangeLog 922
+MD5 64e81bf60f8c1e6cdf8800fbaa273176 normalizemime-1.15.ebuild 704
 MD5 fa90eaae09463673cf520a6d68cf512d files/digest-normalizemime-1.15 60
diff --git a/mail-filter/normalizemime/normalizemime-1.15.ebuild b/mail-filter/normalizemime/normalizemime-1.15.ebuild
index cc8001a58cfa..454934aa8049 100644
--- a/mail-filter/normalizemime/normalizemime-1.15.ebuild
+++ b/mail-filter/normalizemime/normalizemime-1.15.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/mail-filter/normalizemime/normalizemime-1.15.ebuild,v 1.1 2004/10/26 21:13:33 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/normalizemime/normalizemime-1.15.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://hyvatti.iki.fi/~jaakko/spam/"
 SRC_URI="http://hyvatti.iki.fi/~jaakko/spam/${PN}.cc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND="sys-devel/gcc
diff --git a/mail-filter/p3scan/ChangeLog b/mail-filter/p3scan/ChangeLog
index fb5c0f197c7f..ecfc5ae68e29 100644
--- a/mail-filter/p3scan/ChangeLog
+++ b/mail-filter/p3scan/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for mail-filter/p3scan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/ChangeLog,v 1.1 2005/06/13 15:49:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/ChangeLog,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
+
+*p3scan-2.3.0 (16 Nov 2005)
+
+  16 Nov 2005; Andrej Kacian <ticho@gentoo.org> +p3scan-2.3.0.ebuild:
+  Version bump.
+
+  24 Oct 2005; Andrej Kacian <ticho@gentoo.org> -p3scan-2.2.ebuild,
+  p3scan-2.2.1.ebuild:
+  2.2.1 stable on x86. Removing 2.2.
+
+*p3scan-2.2.1 (22 Sep 2005)
+
+  22 Sep 2005; Andrej Kacian <ticho@gentoo.org> +p3scan-2.2.1.ebuild:
+  Version bump.
+
+*p3scan-2.2 (16 Sep 2005)
+
+  16 Sep 2005; Andrej Kacian <ticho@gentoo.org> +p3scan-2.2.ebuild:
+  Version bump.
+
+  22 Jul 2005; Andrej Kacian <ticho@gentoo.org> p3scan-2.1.ebuild:
+  Stable on x86.
+
+  14 Jun 2005; David Holm <dholm@gentoo.org> p3scan-2.1.ebuild:
+  Added to ~ppc.
 
 *p3scan-2.1 (13 Jun 2005)
 
diff --git a/mail-filter/p3scan/Manifest b/mail-filter/p3scan/Manifest
index 48e54c4d4f66..3195e10232c4 100644
--- a/mail-filter/p3scan/Manifest
+++ b/mail-filter/p3scan/Manifest
@@ -1,5 +1,19 @@
-MD5 4342f2bef487df09c7441605653c07c3 p3scan-2.1.ebuild 1928
-MD5 f5742d0a239c3ebf705d159b141ae193 ChangeLog 119
-MD5 36d9f272b13fc5cb611787183970922e metadata.xml 409
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 80ffc99aa2e3f7044495139830c7d335 ChangeLog 1154
 MD5 360cf261a5fa438c27e1d3febac36c87 files/digest-p3scan-2.1 62
-MD5 aac72a0ca3a82157edf0a70267313c68 files/p3scan.init 515
+MD5 b975015ac20e9c892caf8c357696247e files/digest-p3scan-2.2.1 64
+MD5 fc5425d8ce9b6c49691ec704ed1a8665 files/digest-p3scan-2.3.0 64
+MD5 ccbcdd1c08592b87665d4d1dd4f394fa files/p3scan.init 612
+MD5 36d9f272b13fc5cb611787183970922e metadata.xml 409
+MD5 855e5cf6d556040bf46dbef3dc0f8fd5 p3scan-2.1.ebuild 2029
+MD5 44df3141e08ac958cf6301ef7a6be362 p3scan-2.2.1.ebuild 2035
+MD5 139aec8c275b608862c2d6f32297baec p3scan-2.3.0.ebuild 2036
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDeounQlM6RnzZP+IRAt0MAKDD0K8nqWHNy69rTxTaDYDvS4DqLACfVsmF
+SKfFfM9cd8wma6Rdbe4r7nM=
+=77p9
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/p3scan/files/p3scan.init b/mail-filter/p3scan/files/p3scan.init
index 74c521a5509f..8a9efde81cb7 100644
--- a/mail-filter/p3scan/files/p3scan.init
+++ b/mail-filter/p3scan/files/p3scan.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/files/p3scan.init,v 1.1 2005/06/13 15:49:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/files/p3scan.init,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/mail-filter/p3scan/p3scan-2.1.ebuild b/mail-filter/p3scan/p3scan-2.1.ebuild
index d6eef0ea397f..34aa5626e90f 100644
--- a/mail-filter/p3scan/p3scan-2.1.ebuild
+++ b/mail-filter/p3scan/p3scan-2.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/mail-filter/p3scan/p3scan-2.1.ebuild,v 1.1 2005/06/13 15:49:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.1.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ RDEPEND="net-firewall/iptables"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 src_compile() {
diff --git a/mail-filter/p3scan/p3scan-2.2.1.ebuild b/mail-filter/p3scan/p3scan-2.2.1.ebuild
index b85d3c56c69e..1e89dfeb3fc7 100644
--- a/mail-filter/p3scan/p3scan-2.2.1.ebuild
+++ b/mail-filter/p3scan/p3scan-2.2.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/mail-filter/p3scan/p3scan-2.2.1.ebuild,v 1.1 2005/09/22 10:50:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.2.1.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ RDEPEND="net-firewall/iptables"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 src_compile() {
diff --git a/mail-filter/p3scan/p3scan-2.3.0.ebuild b/mail-filter/p3scan/p3scan-2.3.0.ebuild
index 3db27808782e..9add6f175af5 100644
--- a/mail-filter/p3scan/p3scan-2.3.0.ebuild
+++ b/mail-filter/p3scan/p3scan-2.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/mail-filter/p3scan/p3scan-2.3.0.ebuild,v 1.1 2005/11/16 01:29:49 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/p3scan/p3scan-2.3.0.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 inherit eutils
 
diff --git a/mail-filter/popfile/ChangeLog b/mail-filter/popfile/ChangeLog
index fcc3a17a102d..22bb7feea900 100644
--- a/mail-filter/popfile/ChangeLog
+++ b/mail-filter/popfile/ChangeLog
@@ -1,6 +1,23 @@
-# ChangeLog for net-mail/popfile
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/ChangeLog,v 1.1 2004/06/03 07:22:04 seemant Exp $
+# ChangeLog for mail-filter/popfile
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/ChangeLog,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> popfile-0.21.1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> popfile-0.20.1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> popfile-0.21.1.ebuild:
+  dev-perl/Digest-MD5 => perl-core/Digest-MD5
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> popfile-0.20.1.ebuild,
+  popfile-0.21.1.ebuild:
+  Add unzip to DEPEND, since the distfile is .zip. Closes #65176, reported by
+  Tom PArker <tom@wiresncode.com>.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> popfile-0.21.1.ebuild:
+  Added to ~ppc.
 
 *popfile-0.20.1 (03 Jun 2004)
 
diff --git a/mail-filter/popfile/Manifest b/mail-filter/popfile/Manifest
index 768d9bcd667b..d8180e1d211c 100644
--- a/mail-filter/popfile/Manifest
+++ b/mail-filter/popfile/Manifest
@@ -1,6 +1,16 @@
-MD5 070a2ba7f4c271577491fd8c197ff44f popfile-0.21.1.ebuild 1133
-MD5 0529d671c126bf6c039b64c65f773a7c ChangeLog 1137
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 771f44c80599da93d15896bbdea1b127 ChangeLog 2035
 MD5 7ffa9bf1b757cbd93afb8c746fcd24e6 metadata.xml 293
-MD5 9a3f7e3fdc55e083c653dd2974752a40 popfile-0.20.1.ebuild 1098
-MD5 d9d12773e8397a1960eab275e3bcc8c4 files/digest-popfile-0.21.1 64
+MD5 226112299276d90459e0977ef46c5cbd popfile-0.20.1.ebuild 1112
+MD5 a082266a54dbe173cb1afb4c36c14baa popfile-0.21.1.ebuild 1153
 MD5 b97d4969666f64a2d8b7c050253dc29b files/digest-popfile-0.20.1 64
+MD5 d9d12773e8397a1960eab275e3bcc8c4 files/digest-popfile-0.21.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFClIp0tG5z4I8BtQoRArriAKCNWZnTNrnKfEvNIrt8moNE/D1H5wCdEGsG
+b1NSR/FIpKviVCqZhIQMWts=
+=MIkY
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/popfile/popfile-0.20.1.ebuild b/mail-filter/popfile/popfile-0.20.1.ebuild
index 5f63fe0363bb..6dd436763c82 100644
--- a/mail-filter/popfile/popfile-0.20.1.ebuild
+++ b/mail-filter/popfile/popfile-0.20.1.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/mail-filter/popfile/popfile-0.20.1.ebuild,v 1.1 2004/06/03 07:22:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/popfile-0.20.1.ebuild,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
 
 IUSE=""
 
@@ -16,8 +16,9 @@ KEYWORDS="x86"
 DEPEND=">=dev-lang/perl-5.8
 	>=dev-perl/BerkeleyDB-0.25
 	dev-perl/Text-Kakasi
-	dev-perl/MIME-Base64
-	dev-perl/HTML-Tagset"
+	perl-core/MIME-Base64
+	dev-perl/HTML-Tagset
+	app-arch/unzip"
 
 
 src_compile() {
diff --git a/mail-filter/popfile/popfile-0.21.1.ebuild b/mail-filter/popfile/popfile-0.21.1.ebuild
index f7213a166417..181bc26cdf88 100644
--- a/mail-filter/popfile/popfile-0.21.1.ebuild
+++ b/mail-filter/popfile/popfile-0.21.1.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/mail-filter/popfile/popfile-0.21.1.ebuild,v 1.1 2004/06/03 07:22:04 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/popfile/popfile-0.21.1.ebuild,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
 
 IUSE=""
 
@@ -11,14 +11,15 @@ SRC_URI="mirror://sourceforge/popfile/${P}.zip"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 DEPEND=">=dev-lang/perl-5.8
-	dev-perl/Digest-MD5
+	perl-core/Digest-MD5
 	dev-perl/Text-Kakasi
-	dev-perl/MIME-Base64
+	perl-core/MIME-Base64
 	dev-perl/HTML-Tagset
-	dev-perl/DBD-SQLite"
+	dev-perl/DBD-SQLite
+	app-arch/unzip"
 
 src_compile() {
 	# do nothing
diff --git a/mail-filter/postgrey/ChangeLog b/mail-filter/postgrey/ChangeLog
index 75ca3530bb5f..ac44ad0bff6a 100644
--- a/mail-filter/postgrey/ChangeLog
+++ b/mail-filter/postgrey/ChangeLog
@@ -1,6 +1,60 @@
 # ChangeLog for mail-filter/postgrey
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/ChangeLog,v 1.1 2005/04/29 00:28:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/ChangeLog,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
+
+  05 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  postgrey-1.21-r2.ebuild:
+  stable on alpha as per bug #111415
+
+*postgrey-1.21-r2 (03 Nov 2005)
+
+  03 Nov 2005; Andrej Kacian <ticho@gentoo.org> +files/postgrey.rc.new-r2,
+  +postgrey-1.21-r2.ebuild:
+  Improve socket permission setting - wait until socket is effectively created
+  and then set the perms. Patch by Arnaud Launay <asl at launay.org>, bug
+  #100733.
+
+  24 Oct 2005; Andrej Kacian <ticho@gentoo.org> postgrey-1.21-r1.ebuild:
+  Stable on x86.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> postgrey-1.21.ebuild:
+  Mark 1.21 stable on alpha
+
+  03 Oct 2005; Andrej Kacian <ticho@gentoo.org> postgrey-1.21.ebuild,
+  postgrey-1.21-r1.ebuild:
+  Do not install generic COPYING document.
+
+  07 Sep 2005; Andrej Kacian <ticho@gentoo.org> files/postgrey.rc,
+  files/postgrey.rc.new:
+  Do not 'use postfix', rather 'before postfix' to avoid circular iuse
+  dependency in initscripts.
+
+*postgrey-1.21-r1 (04 Sep 2005)
+
+  04 Sep 2005; Andrej Kacian <ticho@gentoo.org> files/postgrey.conf,
+  +files/postgrey.conf.new, files/postgrey.rc, +files/postgrey.rc.new,
+  +postgrey-1.21-r1.ebuild:
+  Add support for UNIX socket listening. Patch provided by Arnaud Launay <asl
+  at launay.org>, in bug #100733.
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org> postgrey-1.21.ebuild:
+  Use -1 for shell argument to enewuser. Bug #103421.
+
+  18 Jun 2005; Andrej Kacian <ticho@gentoo.org> files/postgrey.rc:
+  Initscript provides "postfix_graylist", so postfix can safely start after
+  postgrey. Bug #55705, by Duncan Hill <gentoo-bugs at nacnud.force9.co.uk>.
+
+  13 Jun 2005; Andrej Kacian <ticho@gentoo.org> postgrey-1.21.ebuild:
+  Stable on x86 and amd64.
+
+  11 May 2005; Fernando J. Pereda <ferdy@gentoo.org> postgrey-1.21.ebuild:
+  keyworded ~alpha wrt #90856
+
+  29 Apr 2005; Andrej Kacian <ticho@gentoo.org> files/postgrey.rc:
+  Adjusted initscript depend(), "before" is not needed.
+
+  29 Apr 2005; Andrej Kacian <ticho@gentoo.org> postgrey-1.21.ebuild:
+  Added ~amd64 keyword.
 
 *postgrey-1.21 (28 Apr 2005)
 
diff --git a/mail-filter/postgrey/Manifest b/mail-filter/postgrey/Manifest
index 8fddd8857ff5..09d16a7a4908 100644
--- a/mail-filter/postgrey/Manifest
+++ b/mail-filter/postgrey/Manifest
@@ -1,6 +1,23 @@
-MD5 76c6079f6eca8d824431066c277089a9 ChangeLog 121
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ded0bdfcc4401588bac6bd30c5b5054c postgrey-1.21-r1.ebuild 2105
+MD5 3ed3f1b0381de0832425a73ad2d2c1bb postgrey-1.21-r2.ebuild 2108
+MD5 1b89d374553d2a8699a6352b8403bdd2 ChangeLog 2480
 MD5 97640b63104544cebd37ca40384a056b metadata.xml 304
-MD5 398c1974a7d455eb21dfb6b5c3f23c0b postgrey-1.21.ebuild 1826
-MD5 3447d54487d83d885ade1fa55b3e9fd5 files/postgrey.rc 1000
+MD5 b1e7b37dc0abff9d55d28d59dc7f0f7e postgrey-1.21.ebuild 1919
+MD5 2197c50ab163af184389dbf781d6bc21 files/digest-postgrey-1.21-r1 64
+MD5 2197c50ab163af184389dbf781d6bc21 files/digest-postgrey-1.21-r2 64
+MD5 92755b7ca1258447038718aa283825d9 files/postgrey.rc 1906
 MD5 2197c50ab163af184389dbf781d6bc21 files/digest-postgrey-1.21 64
-MD5 8f132f4f3b2a0fef3e209ada3db701b0 files/postgrey.conf 1524
+MD5 658e1b1fbd690aa27418992e73b5360f files/postgrey.rc.new-r2 1984
+MD5 574606b16ba42a5ed86921c12fdac7f5 files/postgrey.rc.new 1910
+MD5 6dfb29bdf769bd95b3da9611e89e9e67 files/postgrey.conf.new 1882
+MD5 be9aa0c5ab50b82e7eb5c465e78abfb6 files/postgrey.conf 2057
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbLF7ViELBEf1JB0RAucKAJ9tkJuebcyg3AHMopITiCxuWxliZgCeO9EF
+yLZYSgH2YLf/eYLTAi/9p/I=
+=raHy
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/postgrey/files/postgrey.conf b/mail-filter/postgrey/files/postgrey.conf
index 09d7b7251d15..9aa7c1727842 100644
--- a/mail-filter/postgrey/files/postgrey.conf
+++ b/mail-filter/postgrey/files/postgrey.conf
@@ -1,26 +1,33 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.conf,v 1.1 2005/04/29 00:28:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.conf,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
 
 # Config file for /etc/init.d/postgrey
 
+# LISTEN TYPE
+#  Set to 'inet' if you want to use a TCP socket.
+#  Set to 'unix' if you want to use an UNIX socket.
+POSTGREY_TYPE="inet"
 
 # HOST
-#  What IP to listen to?
-#  Leave to localhost unless you know what you do.
+#  What IP should postgrey bind to?
+#  Leave unchanged unless you know what are you doing.
+#  (ignored if POSTGREY_TYPE is set to 'unix')
 POSTGREY_HOST="127.0.0.1"
 
-
 # PORT
-#  What PORT to listen to?
-#
+#  What TCP port should postgrey listen on?
+#  (ignored if POSTGREY_TYPE is set to 'unix')
 POSTGREY_PORT="10030"
 
+# SOCKET
+#  Unix socket to listen on, if POSTGREY_TYPE is set to 'unix'.
+#  (ignored if POSTGREY_TYPE is set to 'inet')
+POSTGREY_SOCKET="/var/spool/postfix/private/postgrey"
 
 # PID
 #  Postgrey pid file.
 #  Do not change, if you don't know what this is!
-#
 POSTGREY_PID="/var/run/postgrey.pid"
 
 
diff --git a/mail-filter/postgrey/files/postgrey.rc b/mail-filter/postgrey/files/postgrey.rc
index e0ed88eb32b3..0c208800586d 100644
--- a/mail-filter/postgrey/files/postgrey.rc
+++ b/mail-filter/postgrey/files/postgrey.rc
@@ -1,31 +1,67 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc,v 1.1 2005/04/29 00:28:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
+
+conf="/etc/conf.d/postgrey"
 
 depend() {
 	need net
-	before mta
-	use mta
+	before postfix
+	provide postfix_greylist
+}
+
+conf_error() {
+	eerror "You need to setup ${conf} first"
+	return 1
 }
 
 checkconfig() {
-if [ -z "${POSTGREY_PORT}" ] || [ -z "${POSTGREY_HOST}" ] || [ -z "${POSTGREY_PID}" ]
+if [ -z "${POSTGREY_TYPE}" ]
 	then
-		einfo "The following entries are missing in /etc/conf.d/postgrey:"
-		[ -z "${POSTGREY_HOST}" ] && einfo "  - POSTGREY_HOST"
-		[ -z "${POSTGREY_PORT}" ] && einfo "  - POSTGREY_PORT"
+		einfo "You need to choose the server type you want"
+		einfo "by setting the POSTGREY_TYPE variable in ${conf}."
+	else
+	if [ "x${POSTGREY_TYPE}" = "xinet" ]
+		then
+			if [ -z "${POSTGREY_PORT}" ] || [ -z "${POSTGREY_HOST}" ]
+				then
+					einfo "The following entries are missing in ${conf}:"
+					[ -z "${POSTGREY_HOST}" ] && einfo "  - POSTGREY_HOST"
+					[ -z "${POSTGREY_PORT}" ] && einfo "  - POSTGREY_PORT"
+					conf_error
+			fi
+			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_HOST}:${POSTGREY_PORT}"
+		else
+			if [ -z "${POSTGREY_SOCKET}" ]
+			then
+				einfo "The following entries are missing in ${conf}:"
+				[ -z "${POSTGREY_SOCKET}" ] && einfo "  - POSTGREY_SOCKET"
+				conf_error
+			fi
+			POSTGREY_ADDR="${POSTGREY_TYPE}=${POSTGREY_SOCKET}"
+	fi
+fi
+
+	if [ -z "${POSTGREY_PID}" ]
+		then
+		einfo "The following entries are missing in ${conf}:"
 		[ -z "${POSTGREY_PID}" ] && einfo "  - POSTGREY_PID"
-		eerror "You need to setup variables in /etc/conf.d/postgrey first"
-		return 1
+		conf_error
 	fi
 }
+
 start() {
 	checkconfig || return 1
 	ebegin "Starting Postgrey"
+	
+	# HACK -- start a subshell and corrects perms on the socket...
+	( if [ "x${POSTGREY_TYPE}" = "xunix" ]; then
+	sleep 2 && chmod a+rw,a-x ${POSTGREY_SOCKET}; fi ) &
+
 	start-stop-daemon --start --quiet --background \
 		--exec /usr/sbin/postgrey -- \
-		--inet=${POSTGREY_HOST}:${POSTGREY_PORT} \
+		--${POSTGREY_ADDR} \
 		--daemonize \
 		--pidfile=${POSTGREY_PID} \
 		${POSTGREY_OPTS}
diff --git a/mail-filter/postgrey/files/postgrey.rc.new b/mail-filter/postgrey/files/postgrey.rc.new
index ea384c058571..763b15bd613c 100644
--- a/mail-filter/postgrey/files/postgrey.rc.new
+++ b/mail-filter/postgrey/files/postgrey.rc.new
@@ -1,13 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new,v 1.1 2005/09/04 13:03:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
 
 conf="/etc/conf.d/postgrey"
 
 depend() {
 	need net
-	use postfix
+	before postfix
 	provide postfix_greylist
 }
 
diff --git a/mail-filter/postgrey/files/postgrey.rc.new-r2 b/mail-filter/postgrey/files/postgrey.rc.new-r2
index 7eafd3a47cb5..6f695812f098 100644
--- a/mail-filter/postgrey/files/postgrey.rc.new-r2
+++ b/mail-filter/postgrey/files/postgrey.rc.new-r2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new-r2,v 1.1 2005/11/03 22:38:03 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/files/postgrey.rc.new-r2,v 1.1.1.1 2005/11/30 10:12:03 chriswhite Exp $
 
 conf="/etc/conf.d/postgrey"
 
diff --git a/mail-filter/postgrey/postgrey-1.21-r1.ebuild b/mail-filter/postgrey/postgrey-1.21-r1.ebuild
index 4e374af6a588..4e1523b2199f 100644
--- a/mail-filter/postgrey/postgrey-1.21-r1.ebuild
+++ b/mail-filter/postgrey/postgrey-1.21-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/mail-filter/postgrey/postgrey-1.21-r1.ebuild,v 1.1 2005/09/04 13:03:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.21-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/db-4.1
 	>=mail-mta/postfix-2.1.0"
 
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="~alpha ~amd64 x86"
 
 pkg_setup() {
 	enewgroup ${PN}
@@ -47,7 +47,7 @@ src_install () {
 	doins postgrey_whitelist_clients postgrey_whitelist_recipients
 
 	# documentation
-	dodoc Changes COPYING README
+	dodoc Changes README
 
 	# init.d + conf.d files
 	newinitd ${FILESDIR}/${PN}.rc.new ${PN}
diff --git a/mail-filter/postgrey/postgrey-1.21-r2.ebuild b/mail-filter/postgrey/postgrey-1.21-r2.ebuild
index 72713a5aa1ca..0df7d5649fa0 100644
--- a/mail-filter/postgrey/postgrey-1.21-r2.ebuild
+++ b/mail-filter/postgrey/postgrey-1.21-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/mail-filter/postgrey/postgrey-1.21-r2.ebuild,v 1.1 2005/11/03 22:38:03 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.21-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
 inherit eutils
 
@@ -20,7 +20,7 @@ RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/db-4.1
 	>=mail-mta/postfix-2.1.0"
 
-KEYWORDS="~alpha ~amd64 ~x86"
+KEYWORDS="alpha ~amd64 ~x86"
 
 pkg_setup() {
 	enewgroup ${PN}
diff --git a/mail-filter/postgrey/postgrey-1.21.ebuild b/mail-filter/postgrey/postgrey-1.21.ebuild
index b495ce8bf634..8250396b8725 100644
--- a/mail-filter/postgrey/postgrey-1.21.ebuild
+++ b/mail-filter/postgrey/postgrey-1.21.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/mail-filter/postgrey/postgrey-1.21.ebuild,v 1.1 2005/04/29 00:28:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/postgrey/postgrey-1.21.ebuild,v 1.1.1.1 2005/11/30 10:12:02 chriswhite Exp $
 
 inherit eutils
 
@@ -20,11 +20,11 @@ RDEPEND=">=dev-lang/perl-5.6.0
 	>=sys-libs/db-4.1
 	>=mail-mta/postfix-2.1.0"
 
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 x86"
 
 pkg_setup() {
 	enewgroup postgrey
-	enewuser postgrey -1 /bin/false /dev/null postgrey
+	enewuser postgrey -1 -1 /dev/null postgrey
 }
 
 src_install () {
@@ -47,7 +47,7 @@ src_install () {
 	doins postgrey_whitelist_clients postgrey_whitelist_recipients
 
 	# documentation
-	dodoc Changes COPYING README
+	dodoc Changes README
 
 	# init.d + conf.d files
 	newinitd ${FILESDIR}/postgrey.rc postgrey
diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog
index c7446faaa43c..6eb80b7d493f 100644
--- a/mail-filter/procmail/ChangeLog
+++ b/mail-filter/procmail/ChangeLog
@@ -1,6 +1,78 @@
-# ChangeLog for net-mail/procmail
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.1 2004/06/03 07:23:54 seemant Exp $
+# ChangeLog for mail-filter/procmail
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+  15 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  procmail-3.22-r7.ebuild:
+  stable on alpha
+
+  06 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  procmail-3.22-r7.ebuild:
+  Stable on hppa.
+
+  03 Oct 2005; Daniel Black <dragonheart@gentoo.org> Manifest:
+  digest fix - bug #107938
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> ChangeLog:
+  Stable on ppc.
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> procmail-3.22-r7.ebuild:
+  Mark 3.22-r7 stable on ia64
+
+  28 Sep 2005; Luis Medinas <metalgod@gentoo.org> procmail-3.22-r7.ebuild:
+  Marked stable on amd64
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> procmail-3.22-r7.ebuild:
+  Stable on ppc64
+
+  22 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  procmail-3.22-r7.ebuild:
+  Stable on sparc
+
+  21 Sep 2005; Andrej Kacian <ticho@gentoo.org> procmail-3.22-r7.ebuild:
+  Stable on x86.
+
+*procmail-3.22-r7 (17 Aug 2005)
+
+  17 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/procmail-comsat-segfault.diff, +procmail-3.22-r7.ebuild:
+  fix for bug #102340
+
+  13 Aug 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  procmail-3.22-r6.ebuild:
+  use append-flags instead of assigning directly
+
+  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> procmail-3.22-r6.ebuild:
+  Stable on mips.
+
+  23 May 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/procmail-lazy-bindings.diff, procmail-3.22-r6.ebuild:
+  Don't use lazy bindings neither on procmail nor in lockfile
+
+  27 Jan 2005; Andrej Kacian <ticho@gentoo.org> procmail-3.22-r6.ebuild:
+  Added selinux support. Bug #79751.
+
+  07 Dec 2004; Scott W Taylor <swtaylor@gentoo.org> procmail-3.22-r6.ebuild:
+  remove mail-mta/courier block
+
+  22 Sep 2004; Andrej Kacian <ticho@gentoo.org> procmail-3.22-r6.ebuild:
+  Use epatch instead of patch in src_compile()
+
+  19 Sep 2004; Scott W Taylor <swtaylor@gentoo.org> procmail-3.22-r6.ebuild:
+  procmail is part of courier. don't install it separately
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  procmail-3.22-r6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 Jun 2004; Tom Gall <tgall@gentoo.org> procmail-3.22-r6.ebuild:
+  stable on ppc64, bug #55663
+
+  29 Jun 2004; Cory Visi <merlin@gentoo.org> procmail-3.22-r6.ebuild:
+  Missing mbox in IUSE and fix ebuild typo (Bug 47895 and Bug 44783)
+
+  07 Jun 2004; Aron Griffis <agriffis@gentoo.org> procmail-3.22-r6.ebuild:
+  Fix use invocation
 
 *procmail-3.22-r6 (03 Jun 2004)
 
diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest
index c2273cb60ad3..29546d79f0c9 100644
--- a/mail-filter/procmail/Manifest
+++ b/mail-filter/procmail/Manifest
@@ -1,5 +1,19 @@
-MD5 fe03fa01dce9e1be52fc5458b1c7ad66 ChangeLog 4525
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d2cf10b8e933e19073c113b49bd81828 procmail-3.22-r7.ebuild 1865
+MD5 66b5fb24b12d077d4437c865b1c1d449 procmail-3.22-r6.ebuild 1788
+MD5 73aef6645d38c7aca3df5405e44fdba5 ChangeLog 7109
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 78faa474c91be2f263342d480c57fa5d procmail-3.22-r6.ebuild 1771
-MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r6 65
 MD5 280e86cd3850b13629b0beee3c2c5522 files/gentoo-maildir2.diff 797
+MD5 e0c638b848ae112a847d5ef48cb9f209 files/procmail-lazy-bindings.diff 622
+MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r6 65
+MD5 3b583fb1759a67d82e1f304ea40c2859 files/digest-procmail-3.22-r7 65
+MD5 6c44beee1c99e38bfd3b3bda6979db00 files/procmail-comsat-segfault.diff 822
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUPjRViELBEf1JB0RAiYSAJ4tTr7ui05JngFEbl19qkA0IgRkBACbBfJ/
+plf1e7LjnwhezKtb9NcXw6c=
+=bynu
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/procmail/procmail-3.22-r6.ebuild b/mail-filter/procmail/procmail-3.22-r6.ebuild
index e6ce638472e8..b1b890a036ef 100644
--- a/mail-filter/procmail/procmail-3.22-r6.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r6.ebuild
@@ -1,43 +1,46 @@
-# 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/mail-filter/procmail/procmail-3.22-r6.ebuild,v 1.1 2004/06/03 07:23:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r6.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+inherit eutils flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Mail delivery agent/filter"
-SRC_URI="http://www.procmail.org/${P}.tar.gz"
 HOMEPAGE="http://www.procmail.org/"
-IUSE=""
-DEPEND="virtual/glibc
-	virtual/mta"
-RDEPEND="virtual/glibc"
-PROVIDE="virtual/mda"
+SRC_URI="http://www.procmail.org/${P}.tar.gz"
+
+LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-LICENSE="Artistic | GPL-2"
-KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64 ~mips s390"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 s390 sparc x86"
+IUSE="mbox selinux"
+PROVIDE="virtual/mda"
+
+DEPEND="virtual/libc virtual/mta"
+RDEPEND="virtual/libc
+	selinux? ( sec-policy/selinux-procmail )"
 
 src_compile() {
+	# -finline-functions (implied by -O3) leaves strstr() in an infinite loop.
+	# To work around this, we append -fno-inline-functions to CFLAGS
+	append-flags -fno-inline-functions
 
-# With gcc-3.1 and newer, there is a bug with aggressive optimization caused by
-# -finline-functions (implied by -O3) that leaves strstr() is an infinite loop.
-# To work around this, we append -fno-inline-functions to CFLAGS disable just
-# that optimization and avoid the bug.
-	CFLAGS="${CFLAGS} -fno-inline-functions"
 	sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \
 		-e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \
 		-e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \
 		-i Makefile
 
-	if [ -z "`use mbox`" ];
-	then
+	if ! use mbox ; then
 		echo "# Use maildir-style mailbox in user's home directory" > ${S}/procmailrc
 		echo 'DEFAULT=$HOME/.maildir/' >> ${S}/procmailrc
 		cd ${S}
-		patch -p1 <${FILESDIR}/gentoo-maildir2.diff
+		epatch ${FILESDIR}/gentoo-maildir2.diff
 	else
-		echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmail
+		echo '# Use mbox-style mailbox in /var/spool/mail' > ${S}/procmailrc
 		echo 'DEFAULT=/var/spool/mail/$LOGNAME' >> ${S}/procmailrc
 	fi
 
+	# Do not use lazy bindings on lockfile and procmail
+	epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
+
 	emake || die
 }
 
@@ -64,4 +67,3 @@ src_install () {
 	docinto examples
 	dodoc examples/*
 }
-
diff --git a/mail-filter/procmail/procmail-3.22-r7.ebuild b/mail-filter/procmail/procmail-3.22-r7.ebuild
index e025c946e5fa..7c6e2afd5072 100644
--- a/mail-filter/procmail/procmail-3.22-r7.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r7.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/mail-filter/procmail/procmail-3.22-r7.ebuild,v 1.1 2005/08/17 17:34:48 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r7.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="mbox selinux"
 PROVIDE="virtual/mda"
 
diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 15782cae3cd7..0467cff8018f 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,130 @@
-# ChangeLog for net-mail/qmail-scanner
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.1 2004/07/17 08:48:36 st_lim Exp $
+# ChangeLog for mail-filter/qmail-scanner
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
+
+  23 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  qmail-scanner-1.23-r2.ebuild, qmail-scanner-1.23-r3.ebuild,
+  qmail-scanner-1.24.ebuild, qmail-scanner-1.25.ebuild,
+  qmail-scanner-1.25-r1.ebuild:
+  Use -1 for shell argument to enewuser. Bug #103421.
+
+  12 Jul 2005; Simon Stelling <blubb@gentoo.org>
+  qmail-scanner-1.25-r1.ebuild:
+  stable on amd64
+
+  05 Jun 2005; Jory A. Pratt <anarchy@gentoo.org>
+  qmail-scanner-1.25-r1.ebuild:
+  added addpredict /opt/bdc/plugins.htm
+
+  30 May 2005; Sven Wegener <swegener@gentoo.org>
+  qmail-scanner-1.23-r2.ebuild, qmail-scanner-1.23-r3.ebuild,
+  qmail-scanner-1.24.ebuild, qmail-scanner-1.25.ebuild,
+  qmail-scanner-1.25-r1.ebuild:
+  Moved from gcc.eclass to toolchain-funcs.eclass, bug #92745.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.25-r1.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.25.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.24.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.23-r3.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.23-r2.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.16-r2.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org>
+  qmail-scanner-1.16-r2.ebuild, qmail-scanner-1.23-r2.ebuild,
+  qmail-scanner-1.23-r3.ebuild, qmail-scanner-1.24.ebuild,
+  qmail-scanner-1.25-r1.ebuild, qmail-scanner-1.25.ebuild:
+  dev-perl/DB_File => perl-core/DB_File
+
+  23 May 2005; <anarchy@gentoo.org> qmail-scanner-1.25-r1.ebuild:
+  restricting userpriv usersandbox bug #93447
+
+*qmail-scanner-1.25-r1 (10 Apr 2005)
+
+  10 Apr 2005; Lim Swee Tat <st_lim@gentoo.org>
+  +qmail-scanner-1.25-r1.ebuild:
+  Version bump for the qmail scanner spam assassin patch
+
+  05 Apr 2005; Lim Swee Tat <st_lim@gentoo.org> qmail-scanner-1.25.ebuild:
+  Fixed bug #85365
+
+  22 Mar 2005; <blubb@gentoo.org> qmail-scanner-1.25.ebuild:
+  added ~amd64
+
+*qmail-scanner-1.25 (18 Feb 2005)
+
+  18 Feb 2005; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.25.ebuild:
+  Version bumpped
+
+*qmail-scanner-1.24 (21 Nov 2004)
+
+  21 Nov 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.24.ebuild:
+  Version bump. There are some interesting new options in the new st patch,
+  but not used here.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> qmail-scanner-1.23-r3.ebuild:
+  Stable on sparc.
+
+  09 Sep 2004; Robin Johnson,,604-339-5621,604-298-8414 <robbat2@gentoo.org>
+  qmail-scanner-1.23-r3.ebuild:
+  Stabilize -r3 as perl without suidperl is now stable on x86.
+
+*qmail-scanner-1.23-r3 (31 Aug 2004)
+
+  31 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.23-r3.ebuild:
+  Using latest q-s code of 20040819.
+
+*qmail-scanner-1.23-r2 (18 Aug 2004)
+
+  18 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.23-r2.ebuild:
+  Version bumped the q-s patch. Using new system for using that patch.
+
+  17 Aug 2004; Aron Griffis <agriffis@gentoo.org>
+  qmail-scanner-1.22-r1.ebuild, qmail-scanner-1.23-r1.ebuild:
+  Fix USE-flag usage in DEPEND. Should be spamassassin? instead of plain
+  spamassassin
+
+*qmail-scanner-1.23-r1 (16 Aug 2004)
+
+  16 Aug 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.23-r1.ebuild:
+  Added the qmail-scanner spamassassin patch
+
+*qmail-scanner-1.23 (14 Aug 2004)
+
+  14 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> +qmail-scanner-1.23:
+  Add new version, add more virii. Bug 60201. Spamassassin support NOT yet
+  available.
+
+  09 Aug 2004; Robin H. Johnson <robbat2@gentoo.org>
+  qmail-scanner-1.22-r1.ebuild:
+  Ignore setuid test, IMPORTANT to work under perl-5.8.4-r1.
+
+  29 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> qmail-scanner-1.16-r2.ebuild,
+  qmail-scanner-1.22-r1.ebuild:
+  Fixed bug #57599, by installing the contrib files via dodoc.
+
+*qmail-scanner-1.22-r1 (17 Jul 2004)
+
+  17 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> +qmail-scanner-1.22-r1.ebuild:
+  - Transfered over to the mail-filter category - Added qmail-scanner-1.22 -
+  Using the qmail-scanner-st patch that allows for more options at qmail-scanner
+  - TODO: Add dspam to qmail-scanner
 
   17 Jul 2004; Lim Swee Tat <st_lim@gentoo.org> +metadata.xml,
   +files/qmail-scanner-queue.pl.patch, +files/qmailscanner.cronjob,
diff --git a/mail-filter/qmail-scanner/Manifest b/mail-filter/qmail-scanner/Manifest
index c389ca991146..0be58ea11c26 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -1,13 +1,27 @@
-MD5 b2862c588cff6cef11df50d94fe4febc qmail-scanner-1.16.ebuild 2562
-MD5 3c9f9d1e6a1939991b5558b6ddef15d5 qmail-scanner-1.16-r1.ebuild 2564
-MD5 3b5b76dac0b18229fa56a6c02900bd81 qmail-scanner-1.16-r2.ebuild 1981
-MD5 7e98a265eaa724a906d07db029d6436e ChangeLog 2522
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 cb8fa23f9bbd463f8c4ac0683748cb82 qmail-scanner-1.20.ebuild 4403
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e006e289d10b3c7fce92af8a88abadca qmail-scanner-1.23-r3.ebuild 4926
+MD5 dc661487c83e84ee96b2a0a58d5adcab qmail-scanner-1.24.ebuild 4923
+MD5 cbe8226432164d97611c827769eff304 qmail-scanner-1.25-r1.ebuild 5029
+MD5 07f4c2d13a3303e475b855ed197acb72 qmail-scanner-1.23-r2.ebuild 4928
+MD5 e38875beaf16ef06fcb01c61a720990d qmail-scanner-1.16-r2.ebuild 2319
+MD5 0d4399742121dd7d17b17ad37247cf6c ChangeLog 7304
+MD5 7df733d43f5875dfc63bae636203b8cb metadata.xml 158
+MD5 44b2d926f6fc0a7490ab5deeecf2577d qmail-scanner-1.25.ebuild 4968
 MD5 6f6fc9e3db3985ba4ae5a6203d2d6abf files/qmailscanner.cronjob 50
-MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16 67
-MD5 797efb400e5d84070bd2237518cff4ba files/digest-qmail-scanner-1.20 67
+MD5 b626340aa9646bcd929b6f8ce0e4a0e2 files/digest-qmail-scanner-1.24 139
+MD5 ccef1593fec0a4c9435fe1d5dd881309 files/digest-qmail-scanner-1.25 140
 MD5 055c5ac64c689a669b8ccd6bc5f6553d files/qmailscanner.logrotate 147
 MD5 1d80eca1d4792a4073f51eb59f02960b files/qmail-scanner-queue.pl.patch 240
-MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r1 67
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r2 67
+MD5 c6351759d589862bf81247f857fb2038 files/digest-qmail-scanner-1.23-r2 139
+MD5 109da745344755ce96b85ccb255ff736 files/digest-qmail-scanner-1.23-r3 139
+MD5 ff83ea44513fae0bbfc5bcacbc34e394 files/digest-qmail-scanner-1.25-r1 140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCyPsQlM6RnzZP+IRArBIAKCKzFVnvQvSGZi83Ggg0kAdqTUuKACfWC4A
+iVWgPieYkLhWbQQwEr7ajlE=
+=m3Uu
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/qmail-scanner/metadata.xml b/mail-filter/qmail-scanner/metadata.xml
index 51f94e3fbe0e..210ce3ffc25e 100644
--- a/mail-filter/qmail-scanner/metadata.xml
+++ b/mail-filter/qmail-scanner/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>net-mail</herd>
+<herd>qmail</herd>
 </pkgmetadata>
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild
index 4d93dd82a78b..51bacaf1e378 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild
@@ -1,16 +1,16 @@
-# 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/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild,v 1.1 2004/07/17 08:48:36 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
 DESCRIPTION="E-Mail virus scanner for qmail."
 HOMEPAGE="http://qmail-scanner.sourceforge.net/"
 SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
+	>=perl-core/Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
 	>=mail-filter/maildrop-1.3.9
-	>=dev-perl/DB_File-1.803-r2
+	>=perl-core/DB_File-1.803-r2
 	|| (
 	>=mail-mta/qmail-1.03-r8
 	>=mail-mta/qmail-ldap-1.03-r1
@@ -63,6 +63,21 @@ src_install () {
 	# Install documentation
 	dodoc README CHANGES COPYING
 	dohtml README.html
+
+	# Install the contribs
+	docinto contrib
+	cd ${S}/contrib
+	dodoc spamc-nice.eml
+	dodoc test-clamd.pl
+	dodoc test-trophie.pl
+	dodoc sub-avpdaemon.pl
+	dodoc logging_first_80_chars.eml
+	dodoc spamc-nasty.eml
+	dodoc avpdeamon.init
+	dodoc test_installation.sh
+	dodoc sub-sender-cache.pl
+	dodoc test-sophie.pl
+	dodoc reformime-test.eml
 }
 
 pkg_postinst () {
@@ -74,3 +89,4 @@ pkg_postinst () {
 	einfo "/var/qmail/control/conf-common file and set:"
 	einfo "QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
 }
+
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild
index dc49c793a3cf..c300c003e740 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.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/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild,v 1.1 2004/08/18 14:34:21 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
-inherit fixheadtails gcc eutils
+inherit fixheadtails toolchain-funcs eutils
 
 Q_S_DATE=20040817
 DESCRIPTION="E-Mail virus scanner for qmail."
@@ -14,12 +14,12 @@ IUSE="spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
+	>=perl-core/Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
+	>=perl-core/DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
 	|| (
 	>=mail-mta/qmail-1.03-r8
@@ -32,7 +32,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 
 pkg_setup() {
 	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
+	enewuser qscand 210 -1 /var/spool/qmailscan qscand
 }
 
 pkg_preinst() {
@@ -71,7 +71,7 @@ src_compile () {
 
 	# build for qmail-scanner-queue wrapper, so we don't need suidperl
 	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
+	`tc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
 }
 
 src_install () {
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild
index 089f76f38b19..a78589f75959 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.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/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild,v 1.1 2004/08/30 21:45:46 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
-inherit fixheadtails gcc eutils
+inherit fixheadtails toolchain-funcs eutils
 
 Q_S_DATE=20040819
 DESCRIPTION="E-Mail virus scanner for qmail."
@@ -14,12 +14,12 @@ IUSE="spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 sparc ~ppc"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
+	>=perl-core/Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
+	>=perl-core/DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
 	|| (
 	>=mail-mta/qmail-1.03-r8
@@ -32,7 +32,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 
 pkg_setup() {
 	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
+	enewuser qscand 210 -1 /var/spool/qmailscan qscand
 }
 
 pkg_preinst() {
@@ -71,7 +71,7 @@ src_compile () {
 
 	# build for qmail-scanner-queue wrapper, so we don't need suidperl
 	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
+	`tc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
 }
 
 src_install () {
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild
index 6ecd91c2cb47..5283c68c4ec0 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.24.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/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild,v 1.1 2004/11/22 16:21:23 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
-inherit fixheadtails gcc eutils
+inherit fixheadtails toolchain-funcs eutils
 
 Q_S_DATE=20041101
 DESCRIPTION="E-Mail virus scanner for qmail."
@@ -17,9 +17,9 @@ SLOT="0"
 KEYWORDS="x86 sparc ~ppc"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
+	>=perl-core/Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
+	>=perl-core/DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
 	|| (
 	>=mail-mta/qmail-1.03-r8
@@ -32,7 +32,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 
 pkg_setup() {
 	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
+	enewuser qscand 210 -1 /var/spool/qmailscan qscand
 }
 
 pkg_preinst() {
@@ -71,7 +71,7 @@ src_compile () {
 
 	# build for qmail-scanner-queue wrapper, so we don't need suidperl
 	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
+	`tc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
 }
 
 src_install () {
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
index 0cf6afab689c..63a35231560a 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.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/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild,v 1.1 2005/04/10 15:17:41 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
-inherit fixheadtails gcc eutils
+inherit fixheadtails toolchain-funcs eutils
 
 Q_S_DATE=20050406
 DESCRIPTION="E-Mail virus scanner for qmail."
@@ -14,12 +14,13 @@ IUSE="spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~amd64"
+KEYWORDS="amd64 ~ppc sparc x86"
+RESTRICT="userpriv usersandbox"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
+	>=perl-core/Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
+	>=perl-core/DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
 	|| (
 	>=mail-mta/qmail-1.03-r8
@@ -32,7 +33,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 
 pkg_setup() {
 	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
+	enewuser qscand 210 -1 /var/spool/qmailscan qscand
 }
 
 pkg_preinst() {
@@ -60,6 +61,7 @@ src_compile () {
 	local myconf
 
 	addpredict /var/log/kav/kavscan.log
+	addpredict /opt/bdc/plugins.htm
 
 	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
 
@@ -74,7 +76,7 @@ src_compile () {
 
 	# build for qmail-scanner-queue wrapper, so we don't need suidperl
 	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
+	`tc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
 }
 
 src_install () {
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild
index efbf98f4c31a..70ddfcf544f1 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.25.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/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild,v 1.1 2005/02/18 01:11:15 st_lim Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
-inherit fixheadtails gcc eutils
+inherit fixheadtails toolchain-funcs eutils
 
 Q_S_DATE=20050207
 DESCRIPTION="E-Mail virus scanner for qmail."
@@ -14,12 +14,12 @@ IUSE="spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=dev-perl/Time-HiRes-01.20-r2
+	>=perl-core/Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
-	>=dev-perl/DB_File-1.803-r2
+	>=perl-core/DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
 	|| (
 	>=mail-mta/qmail-1.03-r8
@@ -32,7 +32,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 
 pkg_setup() {
 	enewgroup qscand 210
-	enewuser qscand 210 /bin/false /var/spool/qmailscan qscand
+	enewuser qscand 210 -1 /var/spool/qmailscan qscand
 }
 
 pkg_preinst() {
@@ -58,6 +58,9 @@ src_unpack() {
 
 src_compile () {
 	local myconf
+
+	addpredict /var/log/kav/kavscan.log
+
 	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
 
 	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
@@ -71,7 +74,7 @@ src_compile () {
 
 	# build for qmail-scanner-queue wrapper, so we don't need suidperl
 	cd contrib
-	`gcc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
+	`tc-getCC` ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
 }
 
 src_install () {
diff --git a/mail-filter/razor/ChangeLog b/mail-filter/razor/ChangeLog
index beb39bbaa3d8..1b11db871f02 100644
--- a/mail-filter/razor/ChangeLog
+++ b/mail-filter/razor/ChangeLog
@@ -1,6 +1,175 @@
-# ChangeLog for net-mail/razor
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/ChangeLog,v 1.1 2004/06/03 07:28:42 seemant Exp $
+# ChangeLog for mail-filter/razor
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/ChangeLog,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
+
+  12 Nov 2005; Brent Baude <ranger@gentoo.org> razor-2.72.ebuild:
+  Marking razor-2.72 ~ppc64 for bug# 112220
+
+  20 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> razor-2.77.ebuild:
+  Stable on amd64.
+
+  13 Sep 2005; Aron Griffis <agriffis@gentoo.org> razor-2.77.ebuild:
+  Mark 2.77 stable on alpha
+
+  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> razor-2.77.ebuild:
+  Stable on ppc.
+
+  24 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> razor-2.77.ebuild:
+  Stable on sparc
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> razor-2.77.ebuild:
+  stable on ia64
+
+  24 Aug 2005; Andrej Kacian <ticho@gentoo.org> razor-2.75.ebuild,
+  razor-2.77.ebuild:
+  Stable on x86.
+
+*razor-2.77 (16 Aug 2005)
+
+  16 Aug 2005; Andrej Kacian <ticho@gentoo.org> +razor-2.77.ebuild:
+  Version bump. Closes bug #101070.
+
+  10 Jul 2005; Tom Martin <slarti@gentoo.org> razor-2.75.ebuild:
+  Marked ~ia64.
+
+*razor-2.75 (07 Jul 2005)
+
+  07 Jul 2005; Andrej Kacian <ticho@gentoo.org> -files/razor-taint.patch,
+  -files/razor_uninstall.patch, -razor-2.36-r1.ebuild,
+  -razor-2.40-r1.ebuild, -razor-2.61.ebuild, -razor-2.66.ebuild,
+  +razor-2.75.ebuild:
+  Version bump. Removed older ebuilds and two unused patches.
+
+  03 Jul 2005; Herbie Hopkins <herbs@gentoo.org> razor-2.74.ebuild:
+  Stable on amd64 wrt bug #96776.
+
+  30 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> razor-2.74.ebuild:
+  Stable on alpha, bug 96776.
+
+  30 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> razor-2.74.ebuild:
+  Stable on ppc.
+
+  30 Jun 2005; Andrej Kacian <ticho@gentoo.org> razor-2.74.ebuild:
+  Fixed a sandbox violation. Fix suggested by Kerin Millar <kerframil at
+  gmail.com>, bug #96776.
+
+  30 Jun 2005; Andrej Kacian <ticho@gentoo.org> metadata.xml:
+  Added upstream contact to metadata.xml. Agreed upon by Andrej Kacian <ticho
+  at gentoo org> and Jordan Ritter <jpr5 at darkridge com> on Thu Jun 30
+  03:27:57 CEST 2005.
+
+  29 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> razor-2.74.ebuild:
+  Stable on sparc wrt #96776
+
+  29 Jun 2005; Andrej Kacian <ticho@gentoo.org> razor-2.74.ebuild:
+  Stable on x86, security bug #96776.
+
+*razor-2.74 (29 Jun 2005)
+
+  29 Jun 2005; Andrej Kacian <ticho@gentoo.org> +razor-2.74.ebuild:
+  Version bump, security bug #96776.
+
+  21 Jun 2005; Andrej Kacian <ticho@gentoo.org> razor-2.36-r1.ebuild,
+  razor-2.40-r1.ebuild, razor-2.61.ebuild, razor-2.66.ebuild,
+  razor-2.67.ebuild, razor-2.71.ebuild, razor-2.72.ebuild:
+  Fixed a typo in post-install instructions. Bug #96695, by MAL <mal at
+  komcept.com>.
+
+  18 Jun 2005; Andrej Kacian <ticho@gentoo.org> razor-2.72.ebuild:
+  Stable on x86, bug #95492.
+
+  18 Jun 2005; Simon Stelling <blubb@gentoo.org> razor-2.72.ebuild:
+  stable on amd64 wrt bug 95492
+
+  17 Jun 2005; Fernando J. Pereda <ferdy@gentoo.org> razor-2.72.ebuild:
+  Stable on alpha, wrt bug #95492
+
+  17 Jun 2005; Luca Barbato <lu_zero@gentoo.org> razor-2.72.ebuild:
+  Marked ppc
+
+  17 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> razor-2.72.ebuild:
+  Stable on sparc wrt #95492
+
+*razor-2.72 (17 Jun 2005)
+
+  17 Jun 2005; Tom Martin <slarti@gentoo.org> +razor-2.72.ebuild:
+  Version bump, for security bug 95492.
+
+*razor-2.71 (16 Jun 2005)
+
+  16 Jun 2005; Tom Martin <slarti@gentoo.org> +razor-2.71.ebuild:
+  Version bump with numerous cosmetic fixes.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.67.ebuild:
+  dev-perl/net-ping => perl-core/net-ping migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.66.ebuild:
+  dev-perl/net-ping => perl-core/net-ping migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.61.ebuild:
+  dev-perl/net-ping => perl-core/net-ping migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.40-r1.ebuild:
+  dev-perl/net-ping => perl-core/net-ping migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.36-r1.ebuild:
+  dev-perl/net-ping => perl-core/net-ping migration
+
+*razor-2.67 (25 May 2005)
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.67.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.66.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.61.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.40-r1.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> razor-2.36-r1.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  17 Dec 2004; Aaron Kulbe <superlag@gentoo.org> :
+  Version bump -> 2.67, fix missing changelog entry.
+
+*razor-2.66 (03 Dec 2004)
+
+  03 Dec 2004; Tom Martin <slarti@gentoo.org> +razor-2.66.ebuild:
+  Version bump, resolves bug 73203.
+
+  27 Oct 2004; Tom Martin <slarti@gentoo.org> razor-2.61.ebuild:
+  Stable on amd64 for bug #67910.
+
+  19 Oct 2004; Jason Wever <weeve@gentoo.org> razor-2.61.ebuild:
+  Stable on sparc wrt bug #67910.
+
+  19 Oct 2004; Michael Hanselmann <hansmi@gentoo.org> razor-2.61.ebuild:
+  Stable on ppc.
+
+  19 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> razor-2.40-r1.ebuild,
+  razor-2.61.ebuild:
+  Stable on alpha, bug 67910.
+
+  19 Oct 2004; Andrej Kacian <ticho@gentoo.org> razor-2.40-r1.ebuild,
+  razor-2.61.ebuild:
+  Marked 2.40-r1 and 2.61 stable on x86.
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> razor-2.40-r1.ebuild:
+  Stable amd64.
+
+  09 Jul 2004; Tuan Van <langthang@gentoo.org> :
+  Remove old ebuilds razor-{2.12,2.14,2.20,2.36,2.40}. added IUSE.
+
+  09 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> razor-2.36-r1.ebuild:
+  Stable on ppc.
+
+*razor-2.61 (08 Jul 2004)
+
+  08 Jul 2004; Tuan Van<langthang@gentoo.org> +razor-2.61.ebuild:
+  version bump, close bug #56422.
 
 *razor-2.40-r1 (03 Jun 2004)
 
diff --git a/mail-filter/razor/Manifest b/mail-filter/razor/Manifest
index 61c2fc8ed672..e22d6851fe6f 100644
--- a/mail-filter/razor/Manifest
+++ b/mail-filter/razor/Manifest
@@ -1,19 +1,15 @@
-MD5 d0a8bbc852b9805e6d3d8538a26e890e files/digest-razor-2.12 68
-MD5 1f098b2f3af4b936a9abf9b3ff35f5d9 files/digest-razor-2.14 68
-MD5 e384efda6a508c06a7ce0c4b196d2fb9 files/digest-razor-2.20 68
-MD5 86ce0f71341d41a9cf561083b241c9fb files/digest-razor-2.36 68
-MD5 86ce0f71341d41a9cf561083b241c9fb files/digest-razor-2.36-r1 68
-MD5 d3e9a49fe82b4c304cafaadb03eedb08 files/razor-taint.patch 2125
-MD5 cf27167873572ac8be99c5195762d630 files/razor_uninstall.patch 1765
+MD5 2cc405faae6cf965efc283d575ae46d3 ChangeLog 8372
+MD5 2be3e1984342f154b35258491bff1830 metadata.xml 417
+MD5 866081721ce52da5777970f6cba1d8da razor-2.67.ebuild 2736
+MD5 dd96c10f7ddca9c129d0cfe6e776a8e1 razor-2.71.ebuild 2859
+MD5 7946e575f893768c4cefa92311115e25 razor-2.72.ebuild 2596
+MD5 3d9bd064635f0116eb6c3b56f1aa0a71 razor-2.74.ebuild 2732
+MD5 2754363d6596555faf7c8835c333b8fc razor-2.75.ebuild 2599
+MD5 3c9453ba23724c822780f241bfa8a106 razor-2.77.ebuild 2594
+MD5 7a82279f793cdd8926569fcc1f2c51e6 files/digest-razor-2.67 68
+MD5 a903c073103cad6f1bccaa20ecdabf1e files/digest-razor-2.71 68
+MD5 26398bc0e13b9e5a931da6f14b3334a6 files/digest-razor-2.72 68
+MD5 12cf44d53c23d3ba61aaf5b525f05f45 files/digest-razor-2.74 69
+MD5 d63c1d9a90360d9f739cae1b3ef25622 files/digest-razor-2.75 69
+MD5 e10a413dc2a916a9bb6a2d31b98ce091 files/digest-razor-2.77 69
 MD5 eb86375c84c8a7db9512ca1943fd5a7a files/no-install-razor-agents.patch 292
-MD5 24b659c729fbfbf960ca1521df9840da files/digest-razor-2.40 68
-MD5 24b659c729fbfbf960ca1521df9840da files/digest-razor-2.40-r1 68
-MD5 ffd829187013a5ae3b91960fed26106e ChangeLog 2149
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 189a2b8436bc73c2c6bb15deaf1f5cb2 razor-2.12.ebuild 663
-MD5 8306cb9f1b551f6d6e98053dd11610c6 razor-2.14.ebuild 665
-MD5 6c2c29e0c6c98f139bce5527e9cb88fe razor-2.20.ebuild 2655
-MD5 1ccd844b8a2554477822bf3cd98c2c77 razor-2.36-r1.ebuild 2845
-MD5 340ee18283c74c3122362cae6629d9b6 razor-2.36.ebuild 2674
-MD5 7d8e9ba9667e2e1a9a0f9befdbe84c8c razor-2.40.ebuild 2674
-MD5 3f2ac27aac855f5527b282e189543d66 razor-2.40-r1.ebuild 2738
diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml
index 51f94e3fbe0e..0d613221ba85 100644
--- a/mail-filter/razor/metadata.xml
+++ b/mail-filter/razor/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
+	<herd>net-mail</herd>
+	<maintainer>
+		<email>razor-admin@cloudmark.com</email>
+		<description>
+			A contact designated by upstream developers. This email address
+			should always be added to CC list of any Razor bug that needs
+			upstream care.
+		</description>
+	</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/razor/razor-2.67.ebuild b/mail-filter/razor/razor-2.67.ebuild
index 58273d0b82a3..e5adcfec01f5 100644
--- a/mail-filter/razor/razor-2.67.ebuild
+++ b/mail-filter/razor/razor-2.67.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/mail-filter/razor/razor-2.67.ebuild,v 1.1 2004/12/16 01:13:53 superlag Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.67.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit perl-module eutils
 IUSE=""
@@ -14,8 +14,8 @@ S=${WORKDIR}/razor-agents-${PV}
 
 RDEPEND="dev-lang/perl
 	dev-perl/Net-DNS
-	dev-perl/net-ping
-	dev-perl/Time-HiRes
+	perl-core/net-ping
+	perl-core/Time-HiRes
 	dev-perl/Digest-SHA1
 	dev-perl/URI
 	dev-perl/Digest-Nilsimsa"
@@ -39,7 +39,7 @@ pkg_postinst() {
 	einfo "mechanism. Registration is done with razor-admin -register. It has to be"
 	einfo "manually invoked in either of the following ways:"
 	einfo ""
-	einfo "To register user foo with 's1kret' as password: "
+	einfo "To register user foo with 's1kr3t' as password: "
 	einfo ""
 	einfo "razor-admin -register -user=foo -pass=s1kr3t"
 	einfo ""
diff --git a/mail-filter/razor/razor-2.71.ebuild b/mail-filter/razor/razor-2.71.ebuild
index 4259478919c6..dd97bd0537ea 100644
--- a/mail-filter/razor/razor-2.71.ebuild
+++ b/mail-filter/razor/razor-2.71.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/mail-filter/razor/razor-2.71.ebuild,v 1.1 2005/06/16 16:08:08 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.71.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit perl-module eutils
 IUSE=""
@@ -42,7 +42,7 @@ pkg_postinst() {
 	einfo "mechanism. Registration is done with razor-admin -register. It has to be"
 	einfo "manually invoked in either of the following ways:"
 	einfo ""
-	einfo "To register user foo with 's1kret' as password: "
+	einfo "To register user foo with 's1kr3t' as password: "
 	einfo ""
 	einfo "razor-admin -register -user=foo -pass=s1kr3t"
 	einfo ""
diff --git a/mail-filter/razor/razor-2.72.ebuild b/mail-filter/razor/razor-2.72.ebuild
index 49dfa01b7d1e..1079222ba284 100644
--- a/mail-filter/razor/razor-2.72.ebuild
+++ b/mail-filter/razor/razor-2.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/mail-filter/razor/razor-2.72.ebuild,v 1.1 2005/06/17 08:36:27 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.72.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://razor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/razor/razor-agents-${PV}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
@@ -34,7 +34,7 @@ pkg_postinst() {
 	einfo "mechanism. Registration is done with razor-admin -register. It has to be"
 	einfo "manually invoked in either of the following ways:"
 	einfo ""
-	einfo "To register user foo with 's1kret' as password: "
+	einfo "To register user foo with 's1kr3t' as password: "
 	einfo ""
 	einfo "razor-admin -register -user=foo -pass=s1kr3t"
 	einfo ""
diff --git a/mail-filter/razor/razor-2.74.ebuild b/mail-filter/razor/razor-2.74.ebuild
index 8983ed98c62d..3d34c7e997e6 100644
--- a/mail-filter/razor/razor-2.74.ebuild
+++ b/mail-filter/razor/razor-2.74.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/mail-filter/razor/razor-2.74.ebuild,v 1.1 2005/06/29 02:53:19 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.74.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://razor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/razor/razor-agents-${PV}.tar.bz2"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
@@ -23,6 +23,13 @@ RDEPEND="dev-perl/Net-DNS
 
 S=${WORKDIR}/razor-agents-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e "s:^INSTALLMAN5DIR = :INSTALLMAN5DIR = \\\$(DESTDIR)/:" \
+		Makefile.PL || die "sed failed"
+}
+
 pkg_postinst() {
 	einfo ""
 	einfo "Run 'razor-admin -create' to create a default config file in your"
diff --git a/mail-filter/razor/razor-2.75.ebuild b/mail-filter/razor/razor-2.75.ebuild
index cf2a6b5a5bdf..552c53f7306e 100644
--- a/mail-filter/razor/razor-2.75.ebuild
+++ b/mail-filter/razor/razor-2.75.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/mail-filter/razor/razor-2.75.ebuild,v 1.1 2005/07/07 01:21:46 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.75.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://razor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/razor/razor-agents-${PV}.tar.bz2"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/mail-filter/razor/razor-2.77.ebuild b/mail-filter/razor/razor-2.77.ebuild
index 701da68b4fe1..6d7d967190a3 100644
--- a/mail-filter/razor/razor-2.77.ebuild
+++ b/mail-filter/razor/razor-2.77.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/mail-filter/razor/razor-2.77.ebuild,v 1.1 2005/08/16 02:17:33 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/razor/razor-2.77.ebuild,v 1.1.1.1 2005/11/30 10:11:53 chriswhite Exp $
 
 inherit perl-module
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://razor.sourceforge.net/"
 SRC_URI="mirror://sourceforge/razor/razor-agents-${PV}.tar.bz2"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/mail-filter/rblcheck/ChangeLog b/mail-filter/rblcheck/ChangeLog
index 6948b5ff4dcd..5e18269db231 100644
--- a/mail-filter/rblcheck/ChangeLog
+++ b/mail-filter/rblcheck/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for net-mail/rblcheck
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/rblcheck/ChangeLog,v 1.1 2004/06/03 07:28:31 seemant Exp $
+# ChangeLog for mail-filter/rblcheck
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/rblcheck/ChangeLog,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+  23 May 2005; Fernando J. Pereda <ferdy@gentoo.org> rblcheck-1.5.ebuild:
+  fix CVS Header Error
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> rblcheck-1.5.ebuild:
+  virtual/glibc -> virtual/libc
 
 *rblcheck-1.5 (03 Jun 2004)
 
diff --git a/mail-filter/rblcheck/Manifest b/mail-filter/rblcheck/Manifest
index 18bdde87a4de..bbecdb37613e 100644
--- a/mail-filter/rblcheck/Manifest
+++ b/mail-filter/rblcheck/Manifest
@@ -1,4 +1,14 @@
-MD5 d6c7c15a06489d6e9ff79b4faa2868ea ChangeLog 567
-MD5 b230fb38516767e647fa8224f4a93d1f rblcheck-1.5.ebuild 706
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 32b85747d9e68e28efc2b2e03e91e246 rblcheck-1.5.ebuild 648
+MD5 c29111204a90a6a73b14cf624443d547 ChangeLog 947
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 5b98f78399ffb83e1d63e1e054e8886f files/digest-rblcheck-1.5 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCkZj+ViELBEf1JB0RAialAJ9P1JfSH1RRnhspHrAKXsmTlSjHEwCePPnh
+j0ucwSoq7TA5jLRUEYuKzuQ=
+=6Aym
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/rblcheck/rblcheck-1.5.ebuild b/mail-filter/rblcheck/rblcheck-1.5.ebuild
index cff10af5d6f0..9bdef1da92ff 100644
--- a/mail-filter/rblcheck/rblcheck-1.5.ebuild
+++ b/mail-filter/rblcheck/rblcheck-1.5.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# Author: Enrico Morelli - 05/08/2002
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/rblcheck/rblcheck-1.5.ebuild,v 1.1 2004/06/03 07:28:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/rblcheck/rblcheck-1.5.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Perform lookups in RBL-styles services."
 HOMEPAGE="http://rblcheck.sourceforge.net/"
 SRC_URI="mirror://sourceforge/rblcheck/${P}.tar.gz"
@@ -11,8 +9,9 @@ SRC_URI="mirror://sourceforge/rblcheck/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc sparc alpha hppa mips"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	cd ${S}
diff --git a/mail-filter/scmail/ChangeLog b/mail-filter/scmail/ChangeLog
index 30a048db35e7..b1d26c7eb1b3 100644
--- a/mail-filter/scmail/ChangeLog
+++ b/mail-filter/scmail/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for net-mail/scmail
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/ChangeLog,v 1.1 2004/06/03 07:30:00 seemant Exp $
+# ChangeLog for mail-filter/scmail
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/ChangeLog,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
+
+  09 Sep 2004; Akinori Hattori <hattya@gentoo.org> scmail-1.3.ebuild:
+  stable on x86.
+
+  19 Aug 2004; Akinori Hattori <hattya@gentoo.org>
+  -files/scmail-0.2-gentoo.diff, -scmail-0.2.ebuild:
+  cleaned out old ebuild.
+
+*scmail-1.3 (19 Aug 2004)
+
+  19 Aug 2004; Akinori Hattori <hattya@gentoo.org> +scmail-1.3.ebuild:
+  new upstream release.
+
+  11 Jul 2004; Akinori Hattori <hattya@gentoo.org> scmail-0.2.ebuild,
+  scmail-1.1.ebuild, scmail-1.2.ebuild:
+  dev-lisp/gauche to dev-lang/gauche.
 
 *scmail-1.1 (03 Jun 2004)
 
diff --git a/mail-filter/scmail/Manifest b/mail-filter/scmail/Manifest
index 790961f682d1..edebedee557a 100644
--- a/mail-filter/scmail/Manifest
+++ b/mail-filter/scmail/Manifest
@@ -1,9 +1,8 @@
-MD5 6f75f04c91cf050a9dbc73f552793c69 ChangeLog 1034
+MD5 fcc4d1dd9a6b47cbb39caa21638352c2 ChangeLog 1765
 MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230
-MD5 0d5be44d1a80e5ce3de1c18b076e6e02 scmail-0.2.ebuild 663
-MD5 309f901bb12ebac1a63a6195fa1c23bd scmail-1.1.ebuild 657
-MD5 f7958bcc950d8c9eb35e173bb046e8da scmail-1.2.ebuild 661
-MD5 33e7bd89a7d6f62b2a6711a6a219fd7f files/digest-scmail-0.2 61
+MD5 6760debc120a53cf5a3204f394a589ad scmail-1.1.ebuild 651
+MD5 0b23c8128da8cfa52fed46b1d374e8c4 scmail-1.2.ebuild 656
+MD5 843b5adf609c62016c9b9d90114738d5 scmail-1.3.ebuild 656
 MD5 f194840b9ec31e9f2fc08be9a80dfeee files/digest-scmail-1.1 61
-MD5 f807b3ff180a7c92b84716890eea3570 files/scmail-0.2-gentoo.diff 673
 MD5 effdc88ee51fbd232b5ff03bacae0420 files/digest-scmail-1.2 61
+MD5 d67e67eddc79e432dda8a9d9b7f58a16 files/digest-scmail-1.3 61
diff --git a/mail-filter/scmail/scmail-1.1.ebuild b/mail-filter/scmail/scmail-1.1.ebuild
index b39eb8c2ec03..770962820c10 100644
--- a/mail-filter/scmail/scmail-1.1.ebuild
+++ b/mail-filter/scmail/scmail-1.1.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/mail-filter/scmail/scmail-1.1.ebuild,v 1.1 2004/06/03 07:30:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.1.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ LICENSE="BSD"
 KEYWORDS="x86"
 SLOT="0"
 
-DEPEND=">=dev-lisp/gauche-0.7.4.1"
+DEPEND=">=dev-lang/gauche-0.7.4.1"
 
 src_compile() {
 
diff --git a/mail-filter/scmail/scmail-1.2.ebuild b/mail-filter/scmail/scmail-1.2.ebuild
index 5b995121c998..7ef4436e4551 100644
--- a/mail-filter/scmail/scmail-1.2.ebuild
+++ b/mail-filter/scmail/scmail-1.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/mail-filter/scmail/scmail-1.2.ebuild,v 1.1 2004/06/03 07:30:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ LICENSE="BSD"
 KEYWORDS="x86 ~ppc"
 SLOT="0"
 
-DEPEND=">=dev-lisp/gauche-0.7.4.1"
+DEPEND=">=dev-lang/gauche-0.7.4.1"
 
 src_compile() {
 
diff --git a/mail-filter/scmail/scmail-1.3.ebuild b/mail-filter/scmail/scmail-1.3.ebuild
index 9680c949ddc1..0631906646a3 100644
--- a/mail-filter/scmail/scmail-1.3.ebuild
+++ b/mail-filter/scmail/scmail-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/mail-filter/scmail/scmail-1.3.ebuild,v 1.1 2004/08/19 08:28:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/scmail/scmail-1.3.ebuild,v 1.1.1.1 2005/11/30 10:11:58 chriswhite Exp $
 
 IUSE=""
 
@@ -9,7 +9,7 @@ DESCRIPTION="a mail filter written in Scheme"
 SRC_URI="http://namazu.org/~satoru/scmail/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 
 DEPEND=">=dev-lang/gauche-0.7.4.1"
diff --git a/mail-filter/spamass-milter/ChangeLog b/mail-filter/spamass-milter/ChangeLog
index 5903e3b1c355..acfb3a6b4b4b 100644
--- a/mail-filter/spamass-milter/ChangeLog
+++ b/mail-filter/spamass-milter/ChangeLog
@@ -1,6 +1,33 @@
-# ChangeLog for net-mail/spamass-milter
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/ChangeLog,v 1.1 2004/06/03 07:30:32 seemant Exp $
+# ChangeLog for mail-filter/spamass-milter
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/ChangeLog,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
+
+  13 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  spamass-milter-0.3.0.ebuild:
+  Addded ~amd64 thanks to Burdeiny Michael
+
+  18 Apr 2005; David Holm <dholm@gentoo.org> spamass-milter-0.3.0.ebuild:
+  Who removed ~ppc?!
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  spamass-milter-0.3.0.ebuild:
+  Stable on sparc, x86
+
+*spamass-milter-0.3.0 (09 Feb 2005)
+
+  09 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> metadata.xml,
+  +spamass-milter-0.3.0.ebuild:
+  New upstream wrt #57275, taking over maintainership too
+
+  27 Aug 2004; David Holm <dholm@gentoo.org> spamass-milter-0.2.0.ebuild:
+  Added to ~ppc.
+
+  26 Jun 2004; Jason Wever <weeve@gentoo.org> spamass-milter-0.2.0.ebuild:
+  Stable on sparc.
+
+  03 Jun 2004; Seemant Kulleen <seemant@gentoo.org>
+  spamass-milter-0.2.0.ebuild:
+  Change dev-perl/Mail-SpamAssassin to mail-filter/spamassassin in DEPEND strings
 
 *spamass-milter-0.2.0 (03 Jun 2004)
 
diff --git a/mail-filter/spamass-milter/Manifest b/mail-filter/spamass-milter/Manifest
index a3895fc802aa..b31804215fe5 100644
--- a/mail-filter/spamass-milter/Manifest
+++ b/mail-filter/spamass-milter/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 137c14e631c9102130ff3ebaeb69ab39 ChangeLog 1726
 MD5 6eb8a3de8515f037fac65110c0f01563 files/README.gentoo 756
 MD5 8366b48906aec5d343a1796672b3bea3 files/digest-spamass-milter-0.2.0 72
-MD5 f5a92e95d7ac639242f1fe26b9925ee7 files/spamass-milter.conf 392
-MD5 fa4c5561272bfa8ff700a6c19b4392d1 files/spamass-milter.rc 754
-MD5 012b8812ebef06bdd3f494f1c0321c56 ChangeLog 559
-MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 dfc24bbe694eba2946901b850573ea64 spamass-milter-0.2.0.ebuild 1119
+MD5 61950fa1041550e97fa464db1faafa92 files/digest-spamass-milter-0.3.0 73
+MD5 9b3cd222a3e0e7e2d9efcf05ab733597 files/spamass-milter.conf 388
+MD5 6a292dff25de76c223735d09f8c25c8b files/spamass-milter.rc 750
+MD5 06dd3cc51e395ab6b5a26a08d478a20b metadata.xml 224
+MD5 3c5e71a09169653de6ba7d4f00692de5 spamass-milter-0.2.0.ebuild 1097
+MD5 08a092a3b744343ec727b467b63b5907 spamass-milter-0.3.0.ebuild 1115
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDTmN0KRy60XGEcJIRAu7eAKCgDJ/v3ljXh5+hUtVXwrNspUYuTgCgomax
+oAruTXb8PJKw1vX3MHsPvZY=
+=PHTV
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamass-milter/files/spamass-milter.conf b/mail-filter/spamass-milter/files/spamass-milter.conf
index 01ff8fcc4518..be606ba69534 100644
--- a/mail-filter/spamass-milter/files/spamass-milter.conf
+++ b/mail-filter/spamass-milter/files/spamass-milter.conf
@@ -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/mail-filter/spamass-milter/files/spamass-milter.conf,v 1.1 2004/06/03 07:30:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/files/spamass-milter.conf,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 DAEMON=/usr/sbin/spamass-milter
 SOCKET=/var/run/spamass-milter.sock
diff --git a/mail-filter/spamass-milter/files/spamass-milter.rc b/mail-filter/spamass-milter/files/spamass-milter.rc
index 904d515894bb..9f4acad5bc1a 100644
--- a/mail-filter/spamass-milter/files/spamass-milter.rc
+++ b/mail-filter/spamass-milter/files/spamass-milter.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/mail-filter/spamass-milter/files/spamass-milter.rc,v 1.1 2004/06/03 07:30:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/files/spamass-milter.rc,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 # NB: Config is in /etc/conf.d/spamass-milter
 
diff --git a/mail-filter/spamass-milter/metadata.xml b/mail-filter/spamass-milter/metadata.xml
index 51f94e3fbe0e..2c6a60972f7d 100644
--- a/mail-filter/spamass-milter/metadata.xml
+++ b/mail-filter/spamass-milter/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-mail</herd>
+<maintainer>
+	<email>gustavoz@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/spamass-milter/spamass-milter-0.2.0.ebuild b/mail-filter/spamass-milter/spamass-milter-0.2.0.ebuild
index 9e5abea741df..26747ce6f8a7 100644
--- a/mail-filter/spamass-milter/spamass-milter-0.2.0.ebuild
+++ b/mail-filter/spamass-milter/spamass-milter-0.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/mail-filter/spamass-milter/spamass-milter-0.2.0.ebuild,v 1.1 2004/06/03 07:30:32 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/spamass-milter-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 IUSE=""
 
@@ -10,14 +10,12 @@ SRC_URI="http://savannah.nongnu.org/download/spamass-milt/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="x86 sparc ~ppc"
 
 DEPEND=">=sys-devel/autoconf-2.57
 	>=sys-devel/automake-1.7.2"
 RDEPEND=">=mail-mta/sendmail-8.12.9
-	>=dev-perl/Mail-SpamAssassin-2.53"
-
-S=${WORKDIR}/${P}
+	>=mail-filter/spamassassin-2.53"
 
 src_compile() {
 	econf || die
diff --git a/mail-filter/spamass-milter/spamass-milter-0.3.0.ebuild b/mail-filter/spamass-milter/spamass-milter-0.3.0.ebuild
index ceb0a2492af3..7da6d9ad6dea 100644
--- a/mail-filter/spamass-milter/spamass-milter-0.3.0.ebuild
+++ b/mail-filter/spamass-milter/spamass-milter-0.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/mail-filter/spamass-milter/spamass-milter-0.3.0.ebuild,v 1.1 2005/02/09 18:34:33 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamass-milter/spamass-milter-0.3.0.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://savannah.nongnu.org/download/spamass-milt/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 
 DEPEND=">=sys-devel/autoconf-2.57
 	>=sys-devel/automake-1.7.2"
diff --git a/mail-filter/spamassassin-ruledujour/ChangeLog b/mail-filter/spamassassin-ruledujour/ChangeLog
index 161f3f67a327..e12e092625f5 100644
--- a/mail-filter/spamassassin-ruledujour/ChangeLog
+++ b/mail-filter/spamassassin-ruledujour/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for mail-filter/spamassassin-ruledujour
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/ChangeLog,v 1.1 2004/07/01 10:10:24 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/ChangeLog,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
+
+*spamassassin-ruledujour-20050822 (23 Aug 2005)
+
+  23 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +spamassassin-ruledujour-20050822.ebuild:
+  Version bump.
+
+  29 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  spamassassin-ruledujour-20050106.ebuild:
+  Stable on x86.
+
+  08 Jan 2005; Andrej Kacian <ticho@gentoo.org>
+  spamassassin-ruledujour-20040701.ebuild,
+  spamassassin-ruledujour-20050106.ebuild:
+  Changed mail-client/mailx to virtual/mailx.
+
+  06 Jan 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +spamassassin-ruledujour-20050106.ebuild:
+  Bug #64574 solved in new version.
+
+  25 Sep 2004; Tom Martin <slarti@gentoo.org>
+  spamassassin-ruledujour-20040701.ebuild:
+  Marked ~amd64.
+
+  03 Jul 2004; David Holm <dholm@gentoo.org>
+  spamassassin-ruledujour-20040701.ebuild:
+  Added to ~ppc.
 
 *spamassassin-ruledujour-20040701 (01 Jul 2004)
 
diff --git a/mail-filter/spamassassin-ruledujour/Manifest b/mail-filter/spamassassin-ruledujour/Manifest
index ab63bc21ffad..9b69b1f94af8 100644
--- a/mail-filter/spamassassin-ruledujour/Manifest
+++ b/mail-filter/spamassassin-ruledujour/Manifest
@@ -1,2 +1,8 @@
-MD5 1d839b584da55db889c5c824d4cede54 spamassassin-ruledujour-20040701.ebuild 1244
+MD5 45bc59d94bd9c1675e96e8a8e3dd3aa8 spamassassin-ruledujour-20050106.ebuild 1957
+MD5 7bbde4c6288951c126a578a403f27c0b spamassassin-ruledujour-20040701.ebuild 1408
+MD5 5309b6244ad93c97c00dcb0439a86506 spamassassin-ruledujour-20050822.ebuild 2008
+MD5 de7b362311e3c6344840446e3aa606e0 ChangeLog 1263
+MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
 MD5 998db9369c998907270da8bc9ac54da6 files/digest-spamassassin-ruledujour-20040701 85
+MD5 9d1bea9ead3b9e70de27441abf853ea6 files/digest-spamassassin-ruledujour-20050106 85
+MD5 8e3465fb4f56e79c4d28902f6c7edfd0 files/digest-spamassassin-ruledujour-20050822 85
diff --git a/mail-filter/spamassassin-ruledujour/metadata.xml b/mail-filter/spamassassin-ruledujour/metadata.xml
index 0f6802b938a7..8c852c741509 100644
--- a/mail-filter/spamassassin-ruledujour/metadata.xml
+++ b/mail-filter/spamassassin-ruledujour/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>net-herd</herd>
+<herd>net-mail</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
diff --git a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild
index 2adce15c448a..daa35fdfa95a 100644
--- a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild
+++ b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.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/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild,v 1.1 2004/07/01 10:10:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20040701.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
 DESCRIPTION="SpamAssassin - Rules Du Jour & My Rules Du Jour"
 HOMEPAGE="http://www.exit0.us/index.php/RulesDuJour http://www.rulesemporium.com/rules.htm"
 SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 DEPEND="" # this is correct!
 RDEPEND="app-shells/bash
@@ -17,7 +17,8 @@ RDEPEND="app-shells/bash
 		 sys-apps/sed
 		 dev-lang/perl
 		 sys-apps/coreutils
-		 virtual/cron"
+		 virtual/cron
+		 virtual/mailx"
 
 src_install() {
 	SPAMASSASSIN_CONFDIR=/etc/mail/spamassassin
@@ -38,6 +39,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "If you want RulesDuJour to run automatically, be sure to" 
+	einfo "If you want RulesDuJour to run automatically, be sure to"
 	einfo "chmod +x /etc/cron.daily/myrulesdujour"
 }
diff --git a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild
index 7fe8de0a4950..ffd1cb8d04de 100644
--- a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild
+++ b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild,v 1.1 2005/01/07 06:13:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050106.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
 DESCRIPTION="SpamAssassin - Rules Du Jour & My Rules Du Jour"
 HOMEPAGE="http://www.exit0.us/index.php/RulesDuJour http://www.rulesemporium.com/rules.htm"
 SRC_URI="mirror://gentoo/${P}.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 DEPEND="" # this is correct!
 RDEPEND="app-shells/bash
@@ -18,7 +18,7 @@ RDEPEND="app-shells/bash
 		 dev-lang/perl
 		 sys-apps/coreutils
 		 virtual/cron
-		 mail-client/mailx"
+		 virtual/mailx"
 
 SPAMASSASSIN_CONFDIR=/etc/mail/spamassassin
 SPAMASSASSIN_LIBDIR=/var/lib/spamassassin
@@ -29,7 +29,7 @@ src_install() {
 	# new config files
 	insinto /etc/rulesdujour
 	doins bin/config bin/rulesets
-	
+
 	# rules_du_jour itself
 	exeinto ${SPAMASSASSIN_LIBDIR}
 
diff --git a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050822.ebuild b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050822.ebuild
index 442f698d685f..2dc4c205c213 100644
--- a/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050822.ebuild
+++ b/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050822.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/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050822.ebuild,v 1.1 2005/08/23 04:01:01 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin-ruledujour/spamassassin-ruledujour-20050822.ebuild,v 1.1.1.1 2005/11/30 10:11:52 chriswhite Exp $
 
 DESCRIPTION="SpamAssassin - Rules Du Jour & My Rules Du Jour"
 HOMEPAGE="http://www.exit0.us/index.php?pagename=RulesDuJour http://www.rulesemporium.com/rules.htm"
diff --git a/mail-filter/spamassassin/ChangeLog b/mail-filter/spamassassin/ChangeLog
index 2faf6437b812..dbe8bf0c6233 100644
--- a/mail-filter/spamassassin/ChangeLog
+++ b/mail-filter/spamassassin/ChangeLog
@@ -1,6 +1,357 @@
-# ChangeLog for dev-perl/Mail-SpamAssassin
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.1 2004/06/04 04:26:45 seemant Exp $
+# ChangeLog for mail-filter/spamassassin
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/ChangeLog,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
+
+  17 Nov 2005; Homer Parker <hparker@gentoo.org> spamassassin-3.1.0.ebuild:
+  Stable on amd64 fixing bug 112063
+
+  14 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
+  spamassassin-3.1.0.ebuild:
+  Stable on hppa, ppc.
+
+  14 Nov 2005; Markus Rothe <corsair@gentoo.org> spamassassin-3.1.0.ebuild:
+  Stable on ppc64; bug #112063
+
+  13 Nov 2005; Mark Loeser <halcy0n@gentoo.org> spamassassin-3.1.0.ebuild:
+  Stable on x86; bug #112063
+
+  13 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  spamassassin-3.1.0.ebuild:
+  stable on alpha wrt bug #112063
+
+  13 Nov 2005; Jason Wever <weeve@gentoo.org> spamassassin-3.1.0.ebuild:
+  Stable on SPARC wrt bug #112063.
+
+  12 Nov 2005; Brent Baude <ranger@gentoo.org> spamassassin-3.1.0-r1.ebuild:
+  Marking spamassassin-3.1.0-r1 ~ppc64 for bug# 112220
+
+  12 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.1.0.ebuild, spamassassin-3.1.0-r1.ebuild:
+  SA 3.1.0 needs the lateste archive-tar
+
+  12 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  spamassassin-3.1.0-r1.ebuild:
+  marked ~alpha as per bug #112220
+
+*spamassassin-3.1.0-r1 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.1.0-r1.ebuild:
+  3.1.0-r1 adds additional use flags and support, which are not supported by
+  all architectures atm. Bug 112220 has been created to track this.
+
+*spamassassin-3.1.0 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.1.0.ebuild:
+  Upstream bump, ebuild worked heavily by Brian G. Peterson in bug 106028.
+  Should also close bug (request for said bump). Additional use flag information that Brian added needed to be removed for the time being - not all arch's are up to date on the relevant dependancies. Will open a bug against arch's for 3.1.0-r1.ebuild.
+
+  16 Aug 2005; Michael Cummings <mcummings@gentoo.org> files/3.0.0-spamd.conf,
+  +files/secrets.cf, -spamassassin-2.64-r1.ebuild,
+  -spamassassin-3.0.2-r1.ebuild, -spamassassin-3.0.3.ebuild,
+  spamassassin-3.0.4.ebuild:
+  Cleaning up; bug 91430 resolved, added secrets.cf and a note to the local.cf
+  file
+
+  28 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  files/3.0.0-spamd.init, spamassassin-3.0.4.ebuild:
+  Bug 96704
+
+  28 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  files/3.0.0-spamd.init, spamassassin-3.0.4.ebuild:
+  Bug 85205
+
+  28 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.4.ebuild:
+  Bug 96669
+
+  18 Jun 2005; Thomas Matthijs <axxo@gentoo.org> spamassassin-3.0.4.ebuild:
+  stable on x86
+
+  17 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  spamassassin-3.0.4.ebuild:
+  Stable on hppa. bug #94722
+
+  17 Jun 2005; Markus Rothe <corsair@gentoo.org> spamassassin-3.0.4.ebuild:
+  Stable on ppc64; bug #94722
+
+  16 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  spamassassin-3.0.4.ebuild:
+  Stable on alpha + ia64.
+
+  10 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  files/3.0.0-spamd.init:
+  init addition for pidfile location
+
+  09 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.2-r1.ebuild:
+  3.0.2-r1 tested on mips, keywording
+
+  09 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  -spamassassin-2.63-r1.ebuild, -spamassassin-2.63.ebuild,
+  -spamassassin-2.64.ebuild, -spamassassin-3.0.0-r1.ebuild,
+  -spamassassin-3.0.0.ebuild, -spamassassin-3.0.1.ebuild,
+  -spamassassin-3.0.2.ebuild:
+  Cleaning. Next task: get mips bumped
+
+  08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  spamassassin-3.0.4.ebuild:
+  Stable on sparc wrt #94722
+
+  08 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  spamassassin-3.0.4.ebuild:
+  Stable on ppc.
+
+  08 Jun 2005; Simon Stelling <blubb@gentoo.org> spamassassin-3.0.4.ebuild:
+  marking stable on amd64 wrt bug 94722
+
+*spamassassin-3.0.4 (08 Jun 2005)
+
+  08 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.0.4.ebuild:
+  Version bump, bug forthcoming
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64-r1.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63-r1.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64.ebuild:
+  dev-perl/Time-Local => perl-core/Time-Local migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64-r1.ebuild:
+  dev-perl/Time-Local => perl-core/Time-Local migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63.ebuild:
+  dev-perl/Time-Local => perl-core/Time-Local migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63-r1.ebuild:
+  dev-perl/Time-Local => perl-core/Time-Local migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.3.ebuild:
+  dev-perl/Time-HiRes => perl-core/Time-HiRes migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.3.ebuild:
+  dev-perl/Storable => perl-core/Storable migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.3.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.2.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.2-r1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64-r1.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63-r1.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.64-r1.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63-r1.ebuild:
+  dev-perl/File-Spec => perl-core/File-Spec migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-2.63-r1.ebuild, spamassassin-2.63.ebuild,
+  spamassassin-2.64-r1.ebuild, spamassassin-2.64.ebuild,
+  spamassassin-3.0.0-r1.ebuild, spamassassin-3.0.0.ebuild,
+  spamassassin-3.0.1.ebuild, spamassassin-3.0.2-r1.ebuild,
+  spamassassin-3.0.2.ebuild, spamassassin-3.0.3.ebuild:
+  dev-perl/DB_File => perl-core/DB_File
+
+  10 May 2005; Sven Wegener <swegener@gentoo.org> files/3.0.0-spamd.conf,
+  files/3.0.0-spamd.init, files/spamd.conf, files/spamd.init,
+  spamassassin-3.0.3.ebuild:
+  Moved the declaration of the pid file location from init.d script to conf.d
+  file. Overriding the value might be needed if we run spamd as non-root. Some
+  general ebuild cleanup.
+
+*spamassassin-3.0.3 (04 May 2005)
+
+  04 May 2005; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.0.3.ebuild:
+  New version released
+
+  02 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
+  spamassassin-2.64-r1.ebuild:
+  stable on mips
+
+*spamassassin-3.0.2-r1 (30 Jan 2005)
+
+  30 Jan 2005; Michael Cummings <mcummings@gentoo.org> files/3.0.0-spamd.conf,
+  files/spamd.conf, spamassassin-2.63-r1.ebuild, spamassassin-2.63.ebuild,
+  +spamassassin-2.64-r1.ebuild, spamassassin-2.64.ebuild,
+  spamassassin-3.0.0-r1.ebuild, spamassassin-3.0.0.ebuild,
+  +spamassassin-3.0.2-r1.ebuild:
+  Version bump to reflect bug 76168.
+
+  24 Jan 2005; Michael Cummings <mcummings@gentoo.org> files/3.0.0-spamd.conf:
+  Bug 76168 - removing -i from default config file so that SA is only listening
+  on localhost rather than all available interfaces.
+
+  27 Dec 2004; Guy Martin <gmsoft@gentoo.org> spamassassin-3.0.2.ebuild:
+  Stable on hppa.
+
+  27 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  spamassassin-3.0.2.ebuild:
+  Stable on alpha, bug 64133.
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spamassassin-3.0.2.ebuild:
+  Stable sparc.
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  spamassassin-3.0.2.ebuild:
+  Stable x86.
+
+  23 Dec 2004; Simon Stelling <blubb@gentoo.org> spamassassin-3.0.2.ebuild:
+  stable on amd64; bug #64133
+
+  23 Dec 2004; <SeJo@gentoo.org> spamassassin-3.0.2.ebuild:
+  stable on ppc glsa: 64133
+
+  20 Dec 2004; Markus Rothe <corsair@gentoo.org> spamassassin-3.0.2.ebuild:
+  Stable on ppc64
+
+*spamassassin-3.0.2 (20 Dec 2004)
+
+  20 Dec 2004; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.0.2.ebuild:
+  New version; closes bug 74731
+  Updates:
+  SA-bug 4005: Yahoo groups messages flagged as forged
+  SA-bug 4030: incapable Net::DNS module usage should be a warning
+  SA-bug 2462: detect legitimate SMTP AUTH submission, to avoid false positives on Dynablock-style rules
+  SA-bug 4019: Needed to add in RPAD call wherever token was used in a select
+  SA-bug 3961: Docu fix for two contradicting explanations of the -x switch
+  SA-bug 4014: change spamcop_submission_address to correct name, spamcop_to_address
+  SA-bug 3990: two small regexp errors in RegistrarBoundaries
+  SA-bug 3967: fix performance issues with USERPASS and RATWARE_STORM_URI
+  SA-bug 3953: Provide better debug output for sa-learn --restore
+  SA-bug 3816: deal with 'rewrite_header Subject' markup when no Subject header previously existed
+  SA-bug 3950: Exim 'sender_fullhost' var was not recognized by Received header parser
+  SA-bug 3942: EvalTests::_check_recipients() would sometimes parse out the wrong addresses/overwrite entries on the array/etc
+  SA-bug 3941: spamcop now only wants max 2 day old mail
+  SA-bug 3930: uridnsbl plugin didn't respect the uridnsbl_max_domains value
+
+*spamassassin-3.0.1 (20 Dec 2004)
+
+  20 Dec 2004; Michael Cummings <mcummings@gentoo.org>
+  files/3.0.0-spamd.conf, files/spamd.conf, spamassassin-3.0.0-r1.ebuild,
+  spamassassin-3.0.0.ebuild, spamassassin-3.0.1.ebuild:
+  Added note regarding potential for DoS against spamd when used against an
+  untrusted network. Should resolve bug 64133 for now.
+
+  26 Oct 2004; Michael Cummings <mcummings@gentoo.org> :
+  Bug 68841. - excessive memory-usage fixes - bug fixed which stopped DCC, Pyzor
+  working with amavisd - deprecate RCVD_IN_RFC_IPWHOIS - user_prefs were staying
+  active between different spamd users, fixed - user_prefs blacklist entries
+  were not working in spamd, fixed - excessive time and memory consumption when
+  ok_languages is used, fixed - sa-learn -u switch to specify the username for
+  virtual environments - avoid bug in Sys::Hostname::Long that renames the
+  hostname when "make test" is run - whitelist the top 125 queried SURBL domains
+  common in nonspam
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/3.0.0-spamd.init:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  26 Sep 2004; Tom Gall <tgall@gentoo.org> spamassassin-2.64.ebuild:
+  stable on ppc64, bug #59483
+
+*spamassassin-3.0.0-r1 (24 Sep 2004)
+
+  24 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  +spamassassin-3.0.0-r1.ebuild, spamassassin-3.0.0.ebuild:
+  Mistake on my part with importing the DATADIR that was used in the pre-release
+  ebuild. Corrected in both 3 and 3-r1 just to be safe. Addresses bug 65102.
+
+  22 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  spamassassin-3.0.0.ebuild:
+  <= not >= for razor less than 2.4. axxo - good catch
+
+*spamassassin-3.0.0 (22 Sep 2004)
+
+  22 Sep 2004; Michael Cummings <mcummings@gentoo.org>
+  +files/3.0.0-spamd.conf, +files/3.0.0-spamd.init,
+  +spamassassin-3.0.0.ebuild:
+  New version of spamassassin. Read the UPDATES and CHANGES if upgrading!!This
+  should close out bug 58057.
+
+  06 Aug 2004; Aron Griffis <agriffis@gentoo.org> spamassassin-2.64.ebuild:
+  stable on alpha and ia64 #59483
+
+  05 Aug 2004; Tom Martin <slarti@gentoo.org> spamassassin-2.64.ebuild:
+  Marked stable on amd64 for bug 59483.
+
+*spamassassin-2.64 (05 Aug 2004)
+
+  05 Aug 2004; <squash@gentoo.org> spamassassin-2.64.ebuild:
+  sparc-ified
+
+  21 Jul 2004; Tom Gall <tgall@gentoo.org> spamassassin-2.63-r1.ebuild:
+  stable on ppc64, bug #57585
+
+*spamassassin-2.63-r1 (04 Jul 2004)
+
+  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org>
+  spamassassin-2.63-r1.ebuild:
+  add in functionality from bug #49448, qmail-spamc.
+
+  08 Jun 2004; Robert Coie <rac@gentoo.org> spamassassin-2.63.ebuild:
+  Add Time-Local and Getopt-Long to the stuff that perl can fill
+
+  06 Jun 2004; Robert Coie <rac@gentoo.org> spamassassin-2.63.ebuild:
+  Modify the File-Spec and MakeMaker deps to be fulfillable by >=perl-5.8.2-r1
+  itself
 
 *spamassassin-2.63 (03 Jun 2004)
 
diff --git a/mail-filter/spamassassin/Manifest b/mail-filter/spamassassin/Manifest
index 3b309eb65521..7fe2f11e2f41 100644
--- a/mail-filter/spamassassin/Manifest
+++ b/mail-filter/spamassassin/Manifest
@@ -1,6 +1,13 @@
-MD5 c9b6d634917143374b4e67b20c672cfd spamassassin-2.63.ebuild 2247
-MD5 ae29227b0948f91a381fa20f06b53cec ChangeLog 7871
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 1ed9c6ddcb224ed5d2ad37aab7c0cce9 files/spamd.conf 265
-MD5 609fc206db4c8a3bee6f93075443f359 files/spamd.init 654
-MD5 2bc962fe7cbd5fc24b6ca7703a498e83 files/digest-spamassassin-2.63 75
+MD5 6495e28833bca5a9d686c47bdeed3e07 spamassassin-3.0.4.ebuild 6554
+MD5 aa1fdb1af8a67dd3597ada33d43afeb0 spamassassin-3.1.0-r1.ebuild 6284
+MD5 0620e11042e6d5f946af1a5104c91d53 spamassassin-3.1.0.ebuild 6312
+MD5 9e6de695f9d175d255f92150c95c0bff ChangeLog 21622
+MD5 6eab480d5d7178685422567dcef9d9ef files/3.0.0-spamd.conf 1427
+MD5 13c538208e1f991a44a30a8bce130fa8 files/3.0.0-spamd.init 738
+MD5 4783482f6c574067f3c8fa48e3202fae files/digest-spamassassin-3.0.4 76
+MD5 d3b6df49d772fdf4425d4c2376bc7173 files/secrets.cf 664
+MD5 66f6531ea3b0a382b4d97bd1234c43a1 files/spamd.conf 604
+MD5 9ab5a9bd40752148b4cb0982dd1a5581 files/spamd.init 617
+MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0 77
+MD5 9d87182bab72ef8b6ae97fe0ab22f5d1 files/digest-spamassassin-3.1.0-r1 77
diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.conf b/mail-filter/spamassassin/files/3.0.0-spamd.conf
index 8cb93f8ed036..8c346a5afcd3 100644
--- a/mail-filter/spamassassin/files/3.0.0-spamd.conf
+++ b/mail-filter/spamassassin/files/3.0.0-spamd.conf
@@ -1,5 +1,13 @@
 # Config file for /etc/init.d/spamd
 
+
+# ***WARNING***
+# spamd was not designed to listed to an untrusted network. spamd
+# is vulnerable to DoS attacks (and eternal doom) if used to listen
+# to an untrusted network.
+#
+
+
 # Some options:
 #
 # -c          to create a per user configuration file
@@ -10,8 +18,24 @@
 #             must be used in combination with -A to actually allow
 #             connections from anybody but localhost
 # -m limit    to set the number of children, default 5
+# -u user     the user to run spamd as
 # -L          if you want to run no net tests
 #
 # for more help look in man spamd
+#
+# Note: if you plan on using the -u flag to spamd you will need to
+# make sure the location of the PID file is writable by that user.
+# This can be done by making the directory /var/run/spamd and
+# changing the owner to the UID that runs spamd.  You will then
+# need to edit $pidfile in /etc/init.d/spamd. This should fix the
+# problem with stop/restart in the init scripts.
+#
+# See http://bugs.gentoo.org/show_bug.cgi?id=70124 for a full
+# explanation.
+
+SPAMD_OPTS="-m 5 -c -H"
+
+# spamd stores its pid in this file. If you use the -u option to
+# run spamd under another user, you might need to adjust it.
 
-SPAMD_OPTS="-i -m 5 -c -H"
+PIDFILE="/var/run/spamd.pid"
diff --git a/mail-filter/spamassassin/files/3.0.0-spamd.init b/mail-filter/spamassassin/files/3.0.0-spamd.init
index b4c7be807bd4..11f94c235c78 100644
--- a/mail-filter/spamassassin/files/3.0.0-spamd.init
+++ b/mail-filter/spamassassin/files/3.0.0-spamd.init
@@ -1,29 +1,29 @@
 #!/sbin/runscript
-# 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/mail-filter/spamassassin/files/3.0.0-spamd.init,v 1.1 2004/09/22 12:46:01 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/3.0.0-spamd.init,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 # NB: Config is in /etc/conf.d/spamd
 
+# Provide a default location if they haven't in /etc/conf.d/spamd
+PIDFILE=${PIDFILE:-/var/run/spamd.pid}
+
 depend() {
 	need net
 	before mta
+	use logger
 }
 
-exefile=/usr/sbin/spamd
-pidfile=/var/run/spamd.pid
-
 start() {
 	ebegin "Starting spamd"
 	start-stop-daemon --start --quiet \
-		--exec ${exefile} -- -d -r ${pidfile} \
+		--exec /usr/sbin/spamd -- -d -r ${PIDFILE} \
 			${SPAMD_OPTS}
 	eend $? "Failed to start spamd"
 }
 
 stop() {
 	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 	eend $? "Failed to stop spamd"
 }
-
diff --git a/mail-filter/spamassassin/files/spamd.conf b/mail-filter/spamassassin/files/spamd.conf
index c953bcb64d3b..f2f0ee6084ed 100644
--- a/mail-filter/spamassassin/files/spamd.conf
+++ b/mail-filter/spamassassin/files/spamd.conf
@@ -1,5 +1,13 @@
 # Config file for /etc/init.d/spamd
 
+
+# ***WARNING***
+# spamd was not designed to listed to an untrusted network. spamd
+# is vulnerable to DoS attacks (and eternal doom) if used to listen
+# to an untrusted network.
+#
+
+
 # Some options:
 #
 # -a for auto-white-list
@@ -10,3 +18,8 @@
 # for more help look in man spamd
 
 SPAMD_OPTS="-a -c"
+
+# spamd stores its pid in this file. If you use the -u option to
+# run spamd under another user, you might need to adjust it.
+
+PIDFILE="/var/run/spamd.pid"
diff --git a/mail-filter/spamassassin/files/spamd.init b/mail-filter/spamassassin/files/spamd.init
index f67e215ad9d1..66d7cba52d57 100644
--- a/mail-filter/spamassassin/files/spamd.init
+++ b/mail-filter/spamassassin/files/spamd.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/mail-filter/spamassassin/files/spamd.init,v 1.1 2004/06/04 04:26:45 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/files/spamd.init,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 # NB: Config is in /etc/conf.d/spamd.conf
 
@@ -10,18 +10,16 @@ depend() {
 	before mta
 }
 
-pidfile=/var/run/spamd.pid
-
 start() {
 	ebegin "Starting spamd"
 	start-stop-daemon --start --quiet \
-		--exec /usr/bin/spamd -- -d -r ${pidfile} \
+		--exec /usr/bin/spamd -- -d -r ${PIDFILE} \
 			${SPAMD_OPTS}
 	eend $? "Failed to start spamd"
 }
 
 stop() {
 	ebegin "Stopping spamd"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
 	eend $? "Failed to stop spamd"
 }
diff --git a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild b/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
index 4e31284b2065..650dd84bbb94 100644
--- a/mail-filter/spamassassin/spamassassin-3.0.4.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.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/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.1 2005/06/08 12:18:17 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.0.4.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 inherit perl-module
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 mips"
 IUSE="berkdb qmail ssl doc"
 
 # To consider (not all may be in tree at this time - mcummings):
@@ -82,23 +82,24 @@ src_compile() {
 	# Some more files to be installed (README* and Changes are already
 	# included per default)
 	mydoc="NOTICE
-		TRADEMARK
-		LICENSE
-		CREDITS
-		INSTALL
-		UPGRADE
-		BUGS
-		USAGE
-		README.spamd
-		README.sql
-		README.ldap
-		procmailrc.example
-		sample-nonspam.txt
-		sample-spam.txt
-		STATISTICS.set0
-		STATISTICS.set1
-		STATISTICS.set2
-		STATISTICS.set3"
+	TRADEMARK
+	LICENSE
+	CREDITS
+	INSTALL
+	UPGRADE
+	BUGS
+	USAGE
+	README.spamd
+	README.sql
+	README.ldap
+	procmailrc.example
+	sample-nonspam.txt
+	sample-spam.txt
+	STATISTICS.set0
+	STATISTICS.set1
+	STATISTICS.set2
+	STATISTICS.set3"
+
 
 	use qmail && mydoc="${mydoc} README.qmail"
 
@@ -163,9 +164,18 @@ src_install () {
 	newconfd "${FILESDIR}"/3.0.0-spamd.conf spamd
 
 	if use doc; then
+		dodoc ${mydoc}
 		dodoc spamd/PROTOCOL
 		dohtml doc/*.html
 	fi
+
+	cp ${FILESDIR}/secrets.cf ${D}/etc/mail/spamassassin/secrets.cf
+	fperms 0400 ${D}/etc/mail/spamassassin/secrets.cf
+	echo " ">> ${D}/etc/mail/spamassassin/local.cf
+	echo "# Sensitive data, such as database connection info, should">> ${D}/etc/mail/spamassassin/local.cf
+	echo "# be stored in /etc/mail/spamassassin/secrets.cf with">> ${D}/etc/mail/spamassassin/local.cf
+	echo "# appropriate permissions">> ${D}/etc/mail/spamassassin/local.cf
+
 }
 
 pkg_postinst() {
@@ -187,18 +197,22 @@ pkg_postinst() {
 		fi
 	fi
 
-	einfo
-	einfo "Please read the file"
-	einfo "  /usr/share/doc/${PF}/INSTALL.gz"
-	einfo "to find out which optional modules you need to install to enable"
-	einfo "additional features which depend on them."
-	einfo
-	einfo "If upgraded from 2.x, please read the file"
-	einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
-	einfo
+	if use doc; then
+		einfo
+		einfo "Please read the file"
+		einfo "  /usr/share/doc/${PF}/INSTALL.gz"
+		einfo "to find out which optional modules you need to install to enable"
+		einfo "additional features which depend on them."
+		einfo
+		einfo "If upgraded from 2.x, please read the file"
+		einfo "  /usr/share/doc/${PF}/UPGRADE.gz"
+		einfo
+	fi
 	ewarn
 	ewarn "spamd is not designed to listen to an untrusted network"
 	ewarn "and is vulnerable to DoS attacks (and eternal doom) if"
 	ewarn "configured to do so"
 	ewarn
+	ewarn "If you plan on using the -u flag to spamd, please read the notes"
+	ewarn "in /etc/conf.d/spamd regarding the location of the pid file."
 }
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
index 2c8656e3f765..a721f8e0b608 100644
--- a/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.1.0-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/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild,v 1.1 2005/11/11 21:31:18 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 inherit perl-module
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 LICENSE="Apache-2.0"
 SLOT="0"
 #KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~ppc ~ppc64 ~sparc ~x86"
 IUSE="berkdb qmail ssl doc mysql postgres sqlite spf tools"
 
 # To consider (not all may be in tree at this time - mcummings):
@@ -30,7 +30,7 @@ DEPEND=">=dev-lang/perl-5.8.2-r1
 	>=dev-perl/Net-DNS-0.34
 	dev-perl/Digest-SHA1
 	dev-perl/libwww-perl
-	dev-perl/Archive-Tar
+	>=dev-perl/Archive-Tar-1.26
 	dev-perl/IO-Zlib
 	ssl? (
 		dev-perl/IO-Socket-SSL
diff --git a/mail-filter/spamassassin/spamassassin-3.1.0.ebuild b/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
index 6f86cff270f9..bbdd23361753 100644
--- a/mail-filter/spamassassin/spamassassin-3.1.0.ebuild
+++ b/mail-filter/spamassassin/spamassassin-3.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/mail-filter/spamassassin/spamassassin-3.1.0.ebuild,v 1.1 2005/11/11 21:05:34 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamassassin/spamassassin-3.1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:01 chriswhite Exp $
 
 inherit perl-module
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://apache/spamassassin/source/${MY_P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~mips"
+KEYWORDS="alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="berkdb qmail ssl doc mysql postgres sqlite spf tools"
 
 # To consider (not all may be in tree at this time - mcummings):
@@ -51,7 +51,7 @@ DEPEND=">=dev-lang/perl-5.8.2-r1
 	>=dev-perl/Net-DNS-0.34
 	dev-perl/Digest-SHA1
 	dev-perl/libwww-perl
-	dev-perl/Archive-Tar
+	>=dev-perl/Archive-Tar-1.26
 	dev-perl/IO-Zlib
 	ssl? (
 		dev-perl/IO-Socket-SSL
diff --git a/mail-filter/spambayes/ChangeLog b/mail-filter/spambayes/ChangeLog
index f64ccb6fc20d..187bc02021c4 100644
--- a/mail-filter/spambayes/ChangeLog
+++ b/mail-filter/spambayes/ChangeLog
@@ -1,6 +1,32 @@
-# ChangeLog for net-mail/spambayes
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.1 2004/06/03 07:31:37 seemant Exp $
+# ChangeLog for mail-filter/spambayes
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/ChangeLog,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
+
+*spambayes-1.0.4 (03 Nov 2005)
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org>
+  -spambayes-1.0_alpha9.ebuild, -spambayes-1.0_beta1.ebuild,
+  +spambayes-1.0.4.ebuild:
+  cleanup and version bump to 1.0.4. uncompressed examples and utilities.
+  (#79917)
+
+  24 Feb 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  spambayes-1.0_rc1.ebuild:
+  Added to ~amd64, bug #74673
+
+  08 Jun 2004; David Holm <dholm@gentoo.org> spambayes-1.0_rc1.ebuild:
+  Added to ~ppc.
+
+*spambayes-1.0_rc1 (07 Jun 2004)
+
+  07 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
+  +files/bayescustomize.ini, +files/spambayespop3proxy.rc,
+  +spambayes-1.0_rc1.ebuild:
+  new version, fixes bug# 51522 (thanks to j. <merkaba@quantumfish.com>)
+  adds init script for pop3 proxy and config file
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> spambayes-1.0_beta1.ebuild:
+  Added to ~ppc.
 
 *spambayes-1.0_beta1 (03 Jun 2004)
 
diff --git a/mail-filter/spambayes/Manifest b/mail-filter/spambayes/Manifest
index af33c90814b1..41ec72ae72f1 100644
--- a/mail-filter/spambayes/Manifest
+++ b/mail-filter/spambayes/Manifest
@@ -1,6 +1,8 @@
-MD5 4e4aecd7de40b112ed2e28271c61e090 spambayes-1.0_beta1.ebuild 1258
-MD5 8c9525ba4494fb72ea69e05947775580 spambayes-1.0_alpha9.ebuild 587
-MD5 061e09dbedd30e65a3b0ce7eb44b4e35 ChangeLog 629
+MD5 01a3b624374daf39e6843fded70ee2aa spambayes-1.0.4.ebuild 918
 MD5 19df39ef54fc4a8677998f19bb6046ac metadata.xml 218
-MD5 3c91b3be373a22e3af5205120586c3ac files/digest-spambayes-1.0_beta1 69
-MD5 bb0d1706a516be043cf42592fab906bb files/digest-spambayes-1.0_alpha9 67
+MD5 c2926d6cf30f0f29f68a8a22d2487491 spambayes-1.0_rc1.ebuild 1427
+MD5 06d2e541d0478a3a8f2a24e552b69582 ChangeLog 1701
+MD5 e493796b04c4c8ab5e2a0e50bbd4f3fd files/bayescustomize.ini 3968
+MD5 ba6377ec98f33913c8794cedbbf34454 files/spambayespop3proxy.rc 705
+MD5 52c534163bb7d37f2b179098aa65339c files/digest-spambayes-1.0_rc1 68
+MD5 c9a8c1e5a7f1edd822990d9525fb2cc2 files/digest-spambayes-1.0.4 67
diff --git a/mail-filter/spambayes/files/spambayespop3proxy.rc b/mail-filter/spambayes/files/spambayespop3proxy.rc
index c9a012ee6ff6..4fe9f0bcc7d2 100644
--- a/mail-filter/spambayes/files/spambayespop3proxy.rc
+++ b/mail-filter/spambayes/files/spambayespop3proxy.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/mail-filter/spambayes/files/spambayespop3proxy.rc,v 1.1 2004/06/07 15:23:54 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/files/spambayespop3proxy.rc,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 customize_ini=/etc/bayescustomize.ini
 
diff --git a/mail-filter/spambayes/spambayes-1.0.4.ebuild b/mail-filter/spambayes/spambayes-1.0.4.ebuild
index 5aebba7cb4da..1e1139823c23 100644
--- a/mail-filter/spambayes/spambayes-1.0.4.ebuild
+++ b/mail-filter/spambayes/spambayes-1.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/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.1 2005/11/03 20:24:18 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 inherit distutils
 
@@ -19,7 +19,7 @@ DEPEND=">=dev-lang/python-2.2.2"
 
 src_install() {
 	distutils_src_install
-	dodoc *.txt 
+	dodoc *.txt
 	insinto /usr/share/doc/${PF}/contrib
 	doins contrib/*
 	insinto /usr/share/doc/${PF}/utilities
diff --git a/mail-filter/spambayes/spambayes-1.0_rc1.ebuild b/mail-filter/spambayes/spambayes-1.0_rc1.ebuild
index bb86e1fda053..3c0d83c3b93d 100644
--- a/mail-filter/spambayes/spambayes-1.0_rc1.ebuild
+++ b/mail-filter/spambayes/spambayes-1.0_rc1.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/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.1 2004/06/07 15:23:54 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spambayes/spambayes-1.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:11:54 chriswhite Exp $
 
 inherit distutils
 
@@ -16,7 +16,7 @@ RESTRICT="nomirror"
 
 LICENSE="PSF-2.2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.2.2"
diff --git a/mail-filter/spampd/ChangeLog b/mail-filter/spampd/ChangeLog
index 74a6f20c64f3..f46f0466f6aa 100644
--- a/mail-filter/spampd/ChangeLog
+++ b/mail-filter/spampd/ChangeLog
@@ -1,6 +1,20 @@
-# ChangeLog for net-mail/spampd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spampd/ChangeLog,v 1.1 2004/06/03 07:33:38 seemant Exp $
+# ChangeLog for mail-filter/spampd
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spampd/ChangeLog,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org> spampd-2.11-r1.ebuild,
+  spampd-2.11.ebuild:
+  Stable on x86.
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org> +metadata.xml:
+  Added metadata.xml to package.
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> spampd-2.11-r1.ebuild:
+  Added to ~ppc.
+
+  03 Jun 2004; Seemant Kulleen <seemant@gentoo.org> spampd-2.11-r1.ebuild,
+  spampd-2.11.ebuild:
+  Change dev-perl/Mail-SpamAssassin to mail-filter/spamassassin in DEPEND strings
 
 *spampd-2.11 (03 Jun 2004)
 
diff --git a/mail-filter/spampd/Manifest b/mail-filter/spampd/Manifest
index 8122d2db113b..6de1e3268aa2 100644
--- a/mail-filter/spampd/Manifest
+++ b/mail-filter/spampd/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d92e9063954ddd208c3c8967a3baab59 spampd-2.11.ebuild 818
+MD5 a9d72e6381c3c674c8b6036f5a2f72eb ChangeLog 1352
+MD5 0a0d68c252f9a4474dfafcd0924957f5 spampd-2.11-r1.ebuild 826
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 8dc3caf9e82a80473c41b5d1e64bbbd5 files/conf 665
-MD5 76116382e8e5f304fcfd822edd50f47c files/init 636
 MD5 17b3ddc9a6650576cdaddbc62052fe0b files/digest-spampd-2.11 62
+MD5 317746bcb3bec06d91831725b77ab0c9 files/init 632
 MD5 17b3ddc9a6650576cdaddbc62052fe0b files/digest-spampd-2.11-r1 62
-MD5 61191fbd9f98827c648e959713a07cc0 ChangeLog 677
-MD5 f51ba7c62bab5c9933b36ae93e69dd5a spampd-2.11-r1.ebuild 851
-MD5 85acfd3367763a76469c25030654dd48 spampd-2.11.ebuild 848
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBVb7T10xuJSrg3/sRApYxAJ4thQIAXkUxf+gOaUUW7xucCVtUJACfZB1+
+r5bQhJ3Rh6jlHI11b0Hg1Mc=
+=WmJI
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spampd/files/init b/mail-filter/spampd/files/init
index b073854e8ced..208e762138bb 100644
--- a/mail-filter/spampd/files/init
+++ b/mail-filter/spampd/files/init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/mail-filter/spampd/files/init,v 1.1 2004/06/03 07:33:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spampd/files/init,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 # Note: spampd configuration file is /etc/conf.d/spampd
 
diff --git a/mail-filter/spampd/spampd-2.11-r1.ebuild b/mail-filter/spampd/spampd-2.11-r1.ebuild
index 1533c7f1e042..00b09d393c59 100644
--- a/mail-filter/spampd/spampd-2.11-r1.ebuild
+++ b/mail-filter/spampd/spampd-2.11-r1.ebuild
@@ -1,21 +1,19 @@
-# 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/mail-filter/spampd/spampd-2.11-r1.ebuild,v 1.1 2004/06/03 07:33:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spampd/spampd-2.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 DESCRIPTION="spampd is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail content."
 HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
 	dev-perl/net-server
-	dev-perl/Mail-SpamAssassin"
-
-S=${WORKDIR}/${P}
+	mail-filter/spamassassin"
 
 src_install() {
 	dosbin spampd
diff --git a/mail-filter/spampd/spampd-2.11.ebuild b/mail-filter/spampd/spampd-2.11.ebuild
index a2958eb6986e..5e783f12f795 100644
--- a/mail-filter/spampd/spampd-2.11.ebuild
+++ b/mail-filter/spampd/spampd-2.11.ebuild
@@ -1,21 +1,19 @@
-# 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/mail-filter/spampd/spampd-2.11.ebuild,v 1.1 2004/06/03 07:33:38 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spampd/spampd-2.11.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 DESCRIPTION="spampd is a program used within an e-mail delivery system to scan messages for possible Unsolicited Commercial E-mail content."
 HOMEPAGE="http://www.worlddesign.com/index.cfm/rd/mta/spampd.htm"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND="dev-lang/perl
 	dev-perl/net-server
-	dev-perl/Mail-SpamAssassin"
-
-S=${WORKDIR}/${P}
+	mail-filter/spamassassin"
 
 src_install() {
 	dosbin spampd
diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index 952eaa8ce9b1..1a39743cae19 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for mail-filter/spamprobe
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.1 2004/09/14 14:19:27 ticho Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
+
+  24 Aug 2005; Andrej Kacian <ticho@gentoo.org> spamprobe-1.2.ebuild,
+  spamprobe-1.2a.ebuild:
+  Stable on x86. Reordered KEYWORDS.
+
+*spamprobe-1.2a (23 Jun 2005)
+
+  23 Jun 2005; Andrej Kacian <ticho@gentoo.org> +spamprobe-1.2a.ebuild:
+  Version bump.
+
+*spamprobe-1.2 (22 Jun 2005)
+
+  22 Jun 2005; Andrej Kacian <ticho@gentoo.org> +spamprobe-1.2.ebuild:
+  Version bump.
+
+  24 Feb 2005; Andrej Kacian <ticho@gentoo.org> -spamprobe-0.9h.ebuild,
+  -spamprobe-1.0.ebuild:
+  Removed ebuilds for deprecated versions.
+
+  14 Jan 2005; Andrej Kacian <ticho@gentoo.org> spamprobe-1.0a.ebuild:
+  Stable on x86.
+
+  06 Dec 2004; Andrej Kacian <ticho@gentoo.org> spamprobe-1.0.ebuild:
+  Stable on x86.
+
+*spamprobe-1.0a (23 Nov 2004)
+
+  23 Nov 2004; Andrej Kacian <ticho@gentoo.org> +spamprobe-1.0a.ebuild:
+  Version bump.
+
+  01 Nov 2004; Andrej Kacian <ticho@gentoo.org> spamprobe-0.9h.ebuild:
+  Stable on x86
+
+*spamprobe-1.0 (23 Oct 2004)
+
+  23 Oct 2004; Andrej Kacian <ticho@gentoo.org> metadata.xml,
+  spamprobe-0.9h.ebuild, +spamprobe-1.0.ebuild:
+  Version bump. Closes #68579, reported by Alexander Schneider
+  <A.Schneider@magicspace.de>. Tidy up the ebuild a bit. Install contrib/
+  stuff from package into /usr/share/spamprobe.
+
+  18 Oct 2004; Andrej Kacian <ticho@gentoo.org> spamprobe-0.9h.ebuild:
+  Changed SRC_URI of the db4 patch to mirror://gentoo/.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> spamprobe-0.9h.ebuild:
+  Added to ~ppc.
 
 *spamprobe-0.9h (14 Sep 2004)
 
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index b9bb9f7ac048..d6c2805e1251 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,2 +1,18 @@
-MD5 ae6afb4e71fff7c1e7138eb929d490cf spamprobe-0.9h.ebuild 853
-MD5 22dc99486764b555295bf2a75914f81b files/digest-spamprobe-0.9h 136
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e06b0edbed6cdb6cdbb478439520adea spamprobe-1.0a.ebuild 802
+MD5 79fd66fa0880b9447302f42c1680ba63 spamprobe-1.2a.ebuild 802
+MD5 ef987e8562edcb2776c981b3d49fee49 ChangeLog 1888
+MD5 7a63986c893466830ff3fb3aad7f89fa metadata.xml 251
+MD5 f1d945e7232a3569f5d0282729633354 spamprobe-1.2.ebuild 801
+MD5 21f983f3dc3db1a9bff6cb7e29b01585 files/digest-spamprobe-1.2 65
+MD5 3e2a7aa9ae39974be42efa119ee86ca2 files/digest-spamprobe-1.0a 66
+MD5 076bb63b83991bf542674b5fae5123c8 files/digest-spamprobe-1.2a 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDDF2DQlM6RnzZP+IRAjRhAJ0ZASAJd/tnnbD9sgqXxk90q7+AagCWOBjA
+UHEfpwEDkUIQwI3juBZpeg==
+=mHg+
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/metadata.xml b/mail-filter/spamprobe/metadata.xml
index 93df6b622623..3a9a0002fd14 100644
--- a/mail-filter/spamprobe/metadata.xml
+++ b/mail-filter/spamprobe/metadata.xml
@@ -4,5 +4,6 @@
 <herd>net-mail</herd>
 <maintainer>
   <email>ticho@gentoo.org</email>
+  <name>Andrej Kacian</name>
 </maintainer>
 </pkgmetadata>
diff --git a/mail-filter/spamprobe/spamprobe-1.0a.ebuild b/mail-filter/spamprobe/spamprobe-1.0a.ebuild
index 096330fa8d18..c5a0869a0181 100644
--- a/mail-filter/spamprobe/spamprobe-1.0a.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.0a.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/mail-filter/spamprobe/spamprobe-1.0a.ebuild,v 1.1 2004/11/23 17:46:44 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.0a.ebuild,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 DESCRIPTION="Fast, intelligent, automatic spam detector using Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
 HOMEPAGE="http://spamprobe.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 IUSE="berkdb"
 DEPEND="berkdb? ( >=sys-libs/db-3.2 )
diff --git a/mail-filter/spamprobe/spamprobe-1.2.ebuild b/mail-filter/spamprobe/spamprobe-1.2.ebuild
index 1146cadf699b..b3f824376e83 100644
--- a/mail-filter/spamprobe/spamprobe-1.2.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.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/mail-filter/spamprobe/spamprobe-1.2.ebuild,v 1.1 2005/06/22 14:27:00 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 DESCRIPTION="Fast, intelligent, automatic spam detector using Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
 HOMEPAGE="http://spamprobe.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 IUSE="berkdb"
 DEPEND="berkdb? ( >=sys-libs/db-3.2 )
diff --git a/mail-filter/spamprobe/spamprobe-1.2a.ebuild b/mail-filter/spamprobe/spamprobe-1.2a.ebuild
index 204e85a9500e..feb5345a9c80 100644
--- a/mail-filter/spamprobe/spamprobe-1.2a.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.2a.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/mail-filter/spamprobe/spamprobe-1.2a.ebuild,v 1.1 2005/06/23 19:35:43 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.2a.ebuild,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 DESCRIPTION="Fast, intelligent, automatic spam detector using Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
 HOMEPAGE="http://spamprobe.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="QPL"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc x86"
 
 IUSE="berkdb"
 DEPEND="berkdb? ( >=sys-libs/db-3.2 )
diff --git a/mail-filter/tmda/ChangeLog b/mail-filter/tmda/ChangeLog
index f2819d03f5ac..bec8a8663ccd 100644
--- a/mail-filter/tmda/ChangeLog
+++ b/mail-filter/tmda/ChangeLog
@@ -1,6 +1,60 @@
-# ChangeLog for net-mail/tmda
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.1 2004/06/03 07:34:23 seemant Exp $
+# ChangeLog for mail-filter/tmda
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/ChangeLog,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
+
+  05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tmda-1.0.3-r3.ebuild:
+  Stable on ppc.
+
+  14 Dec 2004; Andrej Kacian <ticho@gentoo.org> -tmda-1.0.3-r1.ebuild,
+  -tmda-1.0.3-r2.ebuild, tmda-1.0.3-r3.ebuild, -tmda-1.0.3.ebuild:
+  Stable on x86. Removed previous 1.0.3 revisions.
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org> tmda-1.0.3-r3.ebuild:
+  added ~amd64
+
+*tmda-1.0.3-r3 (14 Oct 2004)
+
+  14 Oct 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/tmda-1.0-non-interactive-tty.patch, +tmda-1.0.3-r3.ebuild:
+  Revision bump, apply patch to prevent opening /dev/tty when running in batch
+  mode. See bug #67150, reported by Jesse D. Guardiani <jesse@wingnet.net>.
+
+*tmda-1.0.3-r2 (29 Sep 2004)
+
+  29 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  files/tmda-1.0-multipart-handling.patch, +tmda-1.0.3-r2.ebuild:
+  Revision bump. Fix multipart-handling patch indentation, so it applies
+  cleanly. Thanks to Jesse D. Guardiani <jesse@wingnet.net> for fixing this.
+  Closes 65753.
+
+  25 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  +files/tmda-1.0-multipart-handling.patch,
+  -files/tmda-1.0.3-multipart-handling.patch, tmda-1.0.3-r1.ebuild,
+  tmda-1.0.3.ebuild, tmda-1.0.ebuild, +tmda-1.0-r1.ebuild:
+  Apply multipart-handling patch to 1.0 as well (1.0-r1). Do not install
+  contrib/getuserinfo-vpopmail.sh, as it doesn't exist. Renamed
+  multipart-handling patch filename and modified it, so it doesn't change
+  files in live system (nasty one, sorry).
+
+  22 Sep 2004; Andrej Kacian <ticho@gentoo.org> tmda-0.92.ebuild,
+  tmda-1.0.3-r1.ebuild, tmda-1.0.3.ebuild, tmda-1.0.ebuild:
+  Fixed SRC_URI
+
+*tmda-1.0.3-r1 (22 Sep 2004)
+
+  22 Sep 2004; Andrej Kacian <ticho@gentoo.org> +tmda-1.0.3-r1.ebuild:
+  Apply patch to fix multipart message handling. Closes #60367, reported by Chet
+  McNeill <chet@somedec.com>, who also submitted a patch.
+
+*tmda-1.0.3 (03 Sep 2004)
+
+  03 Sep 2004; Andrej Kacian <ticho@gentoo.org> +tmda-1.0.3.ebuild:
+  Version bump to 1.0.3. Closes #45547, reported by Blu3
+  <david+gentoo.org@blue-labs.org>. Added die message in src_compile(). Removed
+  maintainer agenkin (retired) from metadata.xml
+
+  05 Jun 2004; David Holm <dholm@gentoo.org> tmda-1.0.ebuild:
+  Added to ~ppc.
 
 *tmda-1.0 (03 Jun 2004)
 
diff --git a/mail-filter/tmda/Manifest b/mail-filter/tmda/Manifest
index 99c1177bd282..b9ffe76905a1 100644
--- a/mail-filter/tmda/Manifest
+++ b/mail-filter/tmda/Manifest
@@ -1,6 +1,12 @@
-MD5 9912340d5e64666804d1af88ba6379bb ChangeLog 6048
-MD5 4ba4a6d08c451e52eeb86ac25ac0cb6d metadata.xml 253
-MD5 f00d7d03735bf1b107c97d6ab20773bb tmda-0.92.ebuild 1579
-MD5 e99f13c84e202076897dda3f136e88e1 tmda-1.0.ebuild 1578
+MD5 0067fa6df94b5c5f0dc272e72ff7d0d0 tmda-0.92.ebuild 1529
+MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 952f4c398368b5d103950debd8a1f2d9 ChangeLog 8430
+MD5 952475b22dac3406d5d71fdd44c6cde2 tmda-1.0-r1.ebuild 1634
+MD5 427a0665420e32bc6408c1f67db8f374 tmda-1.0.ebuild 1503
+MD5 bf00e8ee3d8780850bac8b2906897cd5 tmda-1.0.3-r3.ebuild 1788
 MD5 7bb9e7641e04129bd8f857fb7feb59e3 files/digest-tmda-0.92 58
+MD5 c7e7e04f751268e6e20f08b217c81e47 files/digest-tmda-1.0.3-r3 59
 MD5 5953212bfef29b28dc63d4602b7fb9fc files/digest-tmda-1.0 57
+MD5 19cf6a631b8348843ef86773c916d835 files/tmda-1.0-multipart-handling.patch 919
+MD5 5953212bfef29b28dc63d4602b7fb9fc files/digest-tmda-1.0-r1 57
+MD5 228675d39b4c19f76460c3fd129f56b0 files/tmda-1.0-non-interactive-tty.patch 976
diff --git a/mail-filter/tmda/files/tmda-1.0-multipart-handling.patch b/mail-filter/tmda/files/tmda-1.0-multipart-handling.patch
index cfd6362e222a..8651385bf072 100644
--- a/mail-filter/tmda/files/tmda-1.0-multipart-handling.patch
+++ b/mail-filter/tmda/files/tmda-1.0-multipart-handling.patch
@@ -11,7 +11,7 @@
 +                   if type(payload) == type([]) and msg.is_multipart():
 +                       return self._handle_multipart(msg)
 +                   else:
-+                raise TypeError, 'string payload expected: %s' % type(payload)
++                	raise TypeError, 'string payload expected: %s' % type(payload)
 +                   # AGW end
          if self._mangle_from_:
              payload = fcre.sub('>From ', payload)
diff --git a/mail-filter/tmda/metadata.xml b/mail-filter/tmda/metadata.xml
index 6885156ce399..51f94e3fbe0e 100644
--- a/mail-filter/tmda/metadata.xml
+++ b/mail-filter/tmda/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-mail</herd>
-<maintainer>
-  <email>agenkin@gentoo.org</email>
-  <name>Arcady Genkin</name>
-</maintainer>
 </pkgmetadata>
diff --git a/mail-filter/tmda/tmda-0.92.ebuild b/mail-filter/tmda/tmda-0.92.ebuild
index 186b2a0af3bc..9693638b3e1b 100644
--- a/mail-filter/tmda/tmda-0.92.ebuild
+++ b/mail-filter/tmda/tmda-0.92.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/mail-filter/tmda/tmda-0.92.ebuild,v 1.1 2004/06/03 07:34:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-0.92.ebuild,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -9,13 +9,11 @@ LICENSE="GPL-2"
 DEPEND=">=dev-lang/python-2.2
 	virtual/mta"
 
-SRC_URI="http://tmda.sf.net/releases/${P}.tgz
-	http://tmda.sf.net/releases/old/${P}.tgz"
+SRC_URI="http://www.tmda.net/releases/old/1.0-pre/${P}.tgz"
 
 SLOT="0"
 KEYWORDS="x86 ~sparc"
-
-S="${WORKDIR}/${P}"
+IUSE=""
 
 src_compile () {
 	./compileall || die
diff --git a/mail-filter/tmda/tmda-1.0-r1.ebuild b/mail-filter/tmda/tmda-1.0-r1.ebuild
index aa48aaeea862..9f09be14725e 100644
--- a/mail-filter/tmda/tmda-1.0-r1.ebuild
+++ b/mail-filter/tmda/tmda-1.0-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/mail-filter/tmda/tmda-1.0-r1.ebuild,v 1.1 2004/09/25 19:25:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:59 chriswhite Exp $
 
 inherit eutils
 
diff --git a/mail-filter/tmda/tmda-1.0.3-r3.ebuild b/mail-filter/tmda/tmda-1.0.3-r3.ebuild
index 5cc0638c2ea7..208ee7f40a03 100644
--- a/mail-filter/tmda/tmda-1.0.3-r3.ebuild
+++ b/mail-filter/tmda/tmda-1.0.3-r3.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/mail-filter/tmda/tmda-1.0.3-r3.ebuild,v 1.1 2004/10/14 21:56:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.3-r3.ebuild,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ DEPEND=">=dev-lang/python-2.2
 
 SRC_URI="http://www.tmda.net/releases/stable/${P}.tgz"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 
 src_compile () {
diff --git a/mail-filter/tmda/tmda-1.0.ebuild b/mail-filter/tmda/tmda-1.0.ebuild
index 2915f25fe4f8..a5278e7625f4 100644
--- a/mail-filter/tmda/tmda-1.0.ebuild
+++ b/mail-filter/tmda/tmda-1.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/mail-filter/tmda/tmda-1.0.ebuild,v 1.1 2004/06/03 07:34:23 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/tmda/tmda-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:00 chriswhite Exp $
 
 DESCRIPTION="Python-based SPAM reduction system"
 HOMEPAGE="http://www.tmda.net/"
@@ -9,13 +9,10 @@ LICENSE="GPL-2"
 DEPEND=">=dev-lang/python-2.2
 	virtual/mta"
 
-SRC_URI="http://tmda.sf.net/releases/${P}.tgz
-	http://tmda.sf.net/releases/old/${P}.tgz"
-
+SRC_URI="http://www.tmda.net/releases/stable/${P}.tgz"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
-
-S="${WORKDIR}/${P}"
+KEYWORDS="~x86 ~sparc ~ppc"
+IUSE=""
 
 src_compile () {
 	./compileall || die
@@ -48,7 +45,7 @@ src_install () {
 	cd ${S}/contrib
 
 	exeinto /usr/lib/tmda/contrib
-	doexe collectaddys def2html getuserinfo-vpopmail.sh printcdb printdbm \
+	doexe collectaddys def2html printcdb printdbm \
 	      sendit.sh smtp-check-sender update-internaldomains vadduser-tmda \
 	      vmailmgr-vdir.sh vpopmail-vdir.sh wrapfd3.sh
 
diff --git a/net-analyzer/FlowScan/ChangeLog b/net-analyzer/FlowScan/ChangeLog
index 7efbf92c5543..32c7413cbc3e 100644
--- a/net-analyzer/FlowScan/ChangeLog
+++ b/net-analyzer/FlowScan/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-analyzer/FlowScan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/ChangeLog,v 1.1 2005/06/22 14:56:17 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/ChangeLog,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
+
+  12 Aug 2005; David Holm <dholm@gentoo.org> FlowScan-1.006-r2.ebuild:
+  Added to ~ppc.
+
+*FlowScan-1.006-r2 (11 Aug 2005)
+
+  11 Aug 2005; Benjamin Smee <strerror@gentoo.org>
+  +FlowScan-1.006-r2.ebuild:
+  Changed RDEPEND and DEPEND to fix bug #101862
+
+  22 Jun 2005; Benjamin Smee <strerror@gentoo.org> FlowScan-1.006-r1.ebuild:
+  Changed DEPEND
+
+*FlowScan-1.006-r1 (22 Jun 2005)
+
+  22 Jun 2005; Benjamin Smee <strerror@gentoo.org>
+  +FlowScan-1.006-r1.ebuild:
+  Fixed RDEPEND and DEPEND
 
 *FlowScan-1.006 (22 Jun 2005)
 
diff --git a/net-analyzer/FlowScan/FlowScan-1.006-r1.ebuild b/net-analyzer/FlowScan/FlowScan-1.006-r1.ebuild
index e92201e8ae4a..cd3dc0340ab5 100644
--- a/net-analyzer/FlowScan/FlowScan-1.006-r1.ebuild
+++ b/net-analyzer/FlowScan/FlowScan-1.006-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/FlowScan-1.006-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 inherit eutils
 
@@ -22,11 +22,11 @@ RDEPEND="|| ( app-shells/pdksh app-shells/ksh )
 	dev-perl/Net-Patricia
 	dev-perl/Cflow"
 
-DEPEND=""
+DEPEND="|| ( app-shells/pdksh app-shells/ksh )"
 
 pkg_setup() {
 	enewgroup flows
-	enewuser flows -1 /bin/false /var/lib/flows flows
+	enewuser flows -1 -1 /var/lib/flows flows
 }
 
 src_compile() {
diff --git a/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild b/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild
index 92612038de94..25ccb1f1b02d 100644
--- a/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild
+++ b/net-analyzer/FlowScan/FlowScan-1.006-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/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild,v 1.1 2005/08/11 13:47:10 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/FlowScan-1.006-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://net.doit.wisc.edu/~plonka/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 RDEPEND="|| ( app-shells/pdksh app-shells/ksh )
@@ -27,7 +27,7 @@ DEPEND="|| ( app-shells/pdksh app-shells/ksh )
 
 pkg_setup() {
 	enewgroup flows
-	enewuser flows -1 /bin/false /var/lib/flows flows
+	enewuser flows -1 -1 /var/lib/flows flows
 }
 
 src_compile() {
diff --git a/net-analyzer/FlowScan/FlowScan-1.006.ebuild b/net-analyzer/FlowScan/FlowScan-1.006.ebuild
index 41e8369dbd3b..dca58212bc27 100644
--- a/net-analyzer/FlowScan/FlowScan-1.006.ebuild
+++ b/net-analyzer/FlowScan/FlowScan-1.006.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/FlowScan/FlowScan-1.006.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ RDEPEND=""
 
 pkg_setup() {
 	enewgroup flows
-	enewuser flows -1 /bin/false /var/lib/flows flows
+	enewuser flows -1 -1 /var/lib/flows flows
 }
 
 src_compile() {
diff --git a/net-analyzer/FlowScan/Manifest b/net-analyzer/FlowScan/Manifest
index 6bcf441754ff..bfb375c28ef2 100644
--- a/net-analyzer/FlowScan/Manifest
+++ b/net-analyzer/FlowScan/Manifest
@@ -1,4 +1,20 @@
-MD5 2bc235c35abc43ebf90858dcaaf9882d FlowScan-1.006.ebuild 1695
-MD5 aae73bd9ba06b4ce266f50b27f8e82e2 files/flowscan.init 458
-MD5 e27c8456eecc5b3c12ab43aaacff9c37 files/FlowScan.pm 8695
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6bdbb2693f5c3ca520d14119a37833c0 ChangeLog 887
+MD5 6201381399707d99de023d25e06cb795 FlowScan-1.006-r1.ebuild 1839
+MD5 15b915872b252237630beb8441175eb3 FlowScan-1.006.ebuild 1798
+MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
+MD5 a0a1cfab1eee687826ba60285ac4a24d FlowScan-1.006-r2.ebuild 1870
+MD5 18bb7b00290cbd79007468e897d000d9 files/FlowScan.pm 8696
 MD5 962655f4603e49185eef6293d27a8314 files/digest-FlowScan-1.006 66
+MD5 962655f4603e49185eef6293d27a8314 files/digest-FlowScan-1.006-r1 66
+MD5 aae73bd9ba06b4ce266f50b27f8e82e2 files/flowscan.init 458
+MD5 962655f4603e49185eef6293d27a8314 files/digest-FlowScan-1.006-r2 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC5simdTrptrqvGERAjLxAJ4qLM83pBYEjcHgdPXOq6kGFtSjHgCfYo5q
+gFfuV1gSKG61tNVriavtXas=
+=S1Mt
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/FlowScan/files/FlowScan.pm b/net-analyzer/FlowScan/files/FlowScan.pm
index d2e02be4a5cf..b4a69d9e37bb 100644
--- a/net-analyzer/FlowScan/files/FlowScan.pm
+++ b/net-analyzer/FlowScan/files/FlowScan.pm
@@ -15,7 +15,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-# $Id: FlowScan.pm,v 1.1 2005/06/22 14:56:17 strerror Exp $
+# $Id: FlowScan.pm,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 # Dave Plonka <plonka@doit.wisc.edu>
 
 use strict;
@@ -29,7 +29,7 @@ require Exporter;
 @FlowScan::ISA=qw(Exporter);
 @FlowScan::EXPORT_OK=qw(ip2name);
 # convert the RCS revision to a reasonable Exporter VERSION:
-'$Revision: 1.1 $' =~ m/(\d+)\.(\d+)/ && (( $FlowScan::VERSION ) = sprintf("%d.%03d", $1, $2));
+'$Revision: 1.1.1.1 $' =~ m/(\d+)\.(\d+)/ && (( $FlowScan::VERSION ) = sprintf("%d.%03d", $1, $2));
 
 =head1 NAME
 
@@ -190,7 +190,7 @@ the Free Software Foundation; either version 2 of the License, or
 
 =head1 VERSION
 
-The version number is the module file RCS revision number (B<$Revision: 1.1 $>)
+The version number is the module file RCS revision number (B<$Revision: 1.1.1.1 $>)
 with the minor number printed right justified with leading zeroes to 3
 decimal places.  For instance, RCS revision 1.1 would yield a package version
 number of 1.001.
diff --git a/net-analyzer/acid/ChangeLog b/net-analyzer/acid/ChangeLog
index 412e908b642b..840d4f11cd35 100644
--- a/net-analyzer/acid/ChangeLog
+++ b/net-analyzer/acid/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for net-analyzer/acid
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.1 2004/07/24 13:20:24 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/ChangeLog,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  08 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  acid-0.9.6_beta23.ebuild:
+  Update dependency on virtual/http-php, see bug 102825. Thanks to Jakub Moc
+  <jakub@gentoo.org> for his kind patch. TODO: test with php-5.
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> acid-0.9.6_beta23.ebuild:
+  added ~amd64 to KEYWORDS, fixes #73861
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> acid-0.9.6_beta23.ebuild:
+  Changed dependancy to php4 only as per bug #79609. Thanks Nicolas-Loïc 
+  Fortin <nicolasloic.fortin@gmail.com> and Marco Morales <soulse@gmail.com>
+
+  18 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> acid-0.9.6_beta23.ebuild:
+  Removed snort dep since its possible to run snort on a different box (bug
+  82359); also cleaned up the ebuild: use built_with_use() instead of the
+  homegrown check_useflag(); moved sed's to src_unpack() where they belong.
+
+  04 Nov 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
+  PHP 5 Compatability fixes. Thanks to Christian Malerbakken
+  <christian@malerbakken.com>. Closes #60489.
+
+  25 Oct 2004; Michael Hanselmann <hansmi@gentoo.org>
+  acid-0.9.6_beta23.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
+  Fixed pkg_setup.
+
+  12 Oct 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
+  Added deps media-libs/gd and dev-php/mod_php. Added a check to see if mod_php
+  was emerged with USE=gd, and bail if not. Closes bug #63441. Thanks to
+  Benjamin Smee (strerror) <ben@disciplina.net>. Fixed typo in sedding. Closes
+  #64164. Thanks to Jakub Moc <jakub.moc@seznam.cz>.
+
+  31 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  acid-0.9.6_beta23.ebuild:
+  don't use deprecated ? : syntax
+
+  25 Jul 2004; Eldad Zack <eldad@gentoo.org> acid-0.9.6_beta23.ebuild:
+  Updated DBlib_path in acid_conf. Closes #58206.
 
 *acid-0.9.6_beta23 (24 Jul 2004)
 
diff --git a/net-analyzer/acid/Manifest b/net-analyzer/acid/Manifest
index ad70057af4e1..dedfef96b754 100644
--- a/net-analyzer/acid/Manifest
+++ b/net-analyzer/acid/Manifest
@@ -1,2 +1,14 @@
-MD5 165c69cb7afc3b9b08f082db53fce361 acid-0.9.6_beta23.ebuild 1016
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 64338a3c3cab1840e71f43d4fdf62cd4 acid-0.9.6_beta23.ebuild 1440
+MD5 d5e9bd932b7a02f7fbaa05865d864854 metadata.xml 248
+MD5 6f576058dbe67c913e5998075e58504f ChangeLog 2398
 MD5 26f34d01017d5c8acb2d58fd139cef67 files/digest-acid-0.9.6_beta23 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1EJLLFUmVNQ7rkRAmWzAKDBZmD9xWYWrwRFg2zyuTKWdstSrgCdHS7Q
+kJ2bSULtUnzUHRWk4f7E0Dw=
+=Gr3/
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/acid/acid-0.9.6_beta23.ebuild b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
index 1e1be5d1dba9..d041d1149a77 100644
--- a/net-analyzer/acid/acid-0.9.6_beta23.ebuild
+++ b/net-analyzer/acid/acid-0.9.6_beta23.ebuild
@@ -1,25 +1,44 @@
-# 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/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.1 2004/07/24 13:20:24 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/acid/acid-0.9.6_beta23.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
-inherit webapp
+inherit webapp versionator eutils depend.php
 
 MY_P=${P/_beta/b}
+S=${WORKDIR}/${PN}
 DESCRIPTION="Snort ACID - Analysis Console for Intrusion Databases"
 HOMEPAGE="http://acidlab.sourceforge.net"
 SRC_URI="http://acidlab.sourceforge.net/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
-
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="apache2"
-S=${WORKDIR}/${PN}
 
-# Note: jpgraph is an unstable package
-DEPEND="apache2? ( >=net-www/apache-2 ) : ( =net-www/apache-1.* )
-		>=dev-php/adodb-4.0.5
-		>=dev-php/jpgraph-1.12.2
-		net-analyzer/snort"
+# TODO: check for php-5 support
+RDEPEND="apache2? ( >=net-www/apache-2 )
+	!apache2? ( =net-www/apache-1* )
+	>=dev-php/adodb-4.0.5
+	>=dev-php/jpgraph-1.12.2
+	media-libs/gd
+	=virtual/httpd-php-4*"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	need_php4
+	require_php_with_use gd session
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i '12s:^$DBlib_path =.*:$DBlib_path = "/usr/lib/php/adodb";:' \
+		acid_conf.php || die "sed acid_conf.php failed"
+	sed -i '67s/($version\[0\] >= 4)/($version[0] >= 5) || &/' \
+		acid_db_common.php || die "sed acid_db_common.php failed"
+}
 
 src_install () {
 	webapp_src_preinst
@@ -30,17 +49,10 @@ src_install () {
 	webapp_src_install
 }
 
-src_compile () {
-	einfo "Nothing to compile."
-}
-
 pkg_postinst() {
 	webapp_pkg_postinst
 
-	echo ""
 	einfo "Note: ACID is installed as a webapp."
 	einfo "The ACID database is an extension of the SNORT database."
-	einfo "To setup ACID database look in the README"
-	echo ""
+	einfo "To setup the ACID database look in the README"
 }
-
diff --git a/net-analyzer/aimsniff/ChangeLog b/net-analyzer/aimsniff/ChangeLog
index 7429e991bb65..1fa635af684f 100644
--- a/net-analyzer/aimsniff/ChangeLog
+++ b/net-analyzer/aimsniff/ChangeLog
@@ -1,8 +1,68 @@
 # ChangeLog for net-analyzer/aimsniff
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.1 2003/07/27 18:44:45 aliz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/ChangeLog,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
+
+  31 Oct 2005; <soulse@gentoo.org> aimsniff-0.9-r1.ebuild:
+  Fixed ebuild as per bug #109482
+
+  18 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> aimsniff-0.9-r1.ebuild:
+  aimsniff requires that perl be built with USE=gdbm, bug 85678.
+
+  15 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  aimsniff-0.9-r1.ebuild:
+  Added to ~amd64.
+
+  24 Feb 2005; <port001@gentoo.org> aimsniff-0.9-r1.ebuild:
+  Fixed DEPEND issues, #62666
+
+  23 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  aimsniff-0.9-r1.ebuild:
+  x86 stable
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> aimsniff-0.8.ebuild,
+  aimsniff-0.9-r1.ebuild, -aimsniff-0.9.ebuild:
+  marked x86 stable
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> -aimsniff-0.9.ebuild:
+  Purged 0.9
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> aimsniff-0.8.ebuild,
+  aimsniff-0.9-r1.ebuild:
+  fix use invocation, sync IUSE
+
+  28 Jun 2004; David Holm <dholm@gentoo.org> aimsniff-0.9-r1.ebuild:
+  Added to ~ppc.
+
+*aimsniff-0.9-r1 (27 Jun 2004)
+
+  27 Jun 2004; Ian Leitch <port001@gentoo.org> metadata.xml,
+  +aimsniff-0.9-r1.ebuild:
+  Revission bumped for security hole described in #53399. Converted to use the
+  new webapp eclass, plus minor clean-ups. Added myself as new maintainer...
+  dammit.
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> aimsniff-0.9.ebuild:
+  Added to ~ppc.
+
+  14 Jun 2004; John Davis <zhen@gentoo.org> metadata.xml:
+  removing myself as maintainer, I have no time
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> aimsniff-0.8.ebuild,
+  aimsniff-0.9.ebuild:
+  Fix use invocation
+
+*aimsniff-0.9 (08 Dec 2003)
+
+  08 Dec 2003; zhen <zhen@gentoo.org> aimsniff-0.9.ebuild, metadata.xml:
+  version bump, fixed deps, added a very functional mysql config under pkg_config
+
+  24 Nov 2003; Martin Holzer <mholzer@gentoo.org> aimsniff-0.8.ebuild:
+  adding RESTRICT="nomirror"
 
 *aimsniff-0.8 (25 Jul 2003)
 
+  05 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Cleanup, repoman, and add apache-webapp.eclass support.
+
   25 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild contributed by Rigo Ketelings <rigo@home.nl> in #21008.
diff --git a/net-analyzer/aimsniff/Manifest b/net-analyzer/aimsniff/Manifest
index ad273e783f42..5df4b828b28b 100644
--- a/net-analyzer/aimsniff/Manifest
+++ b/net-analyzer/aimsniff/Manifest
@@ -1,2 +1,4 @@
-MD5 52cdfa3022d87fa123f2657c510717ba aimsniff-0.8.ebuild 2422
-MD5 f62848279163f070089d6c81eb98260a files/digest-aimsniff-0.8 124
+MD5 ea009ec98eaf46d4aab46c08dd485d20 ChangeLog 2326
+MD5 f37636368dc12670e9b1460ca3db61e7 aimsniff-0.9-r1.ebuild 3247
+MD5 eedbaff735e1d64aea7755d6d5c566a7 metadata.xml 372
+MD5 31171666587c48bf647abbddda0f9c91 files/digest-aimsniff-0.9-r1 125
diff --git a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
index 23ab164d9946..61ed4cd305b2 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild
@@ -1,10 +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/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.1 2004/06/27 16:48:40 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/aimsniff/aimsniff-0.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
-inherit webapp
+inherit webapp eutils
 
-IUSE="samba mysql apache2"
+IUSE="samba mysql apache2 http"
 
 MY_P="${P}d"
 WAS_VER="0.1.2b"
@@ -12,12 +12,12 @@ WAS_VER="0.1.2b"
 DESCRIPTION="Utility for monitoring and archiving AOL Instant Messenger messages across a network"
 HOMEPAGE="http://www.aimsniff.com/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
-	apache2? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
+	http? ( mirror://sourceforge/${PN}/was-${WAS_VER}.tar.gz )"
 
 RESTRICT="nomirror"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 x86 ~ppc"
 
 S=${WORKDIR}/${MY_P}
 
@@ -32,17 +32,21 @@ DEPEND=">=dev-lang/perl-5.8.4
 	dev-perl/DBI
 	dev-perl/Unix-Syslog
 	mysql? ( dev-db/mysql dev-perl/DBD-mysql )
-	samba? ( net-fs/samba )"
+	samba? ( net-fs/samba )
+	http? ( apache2? ( =net-www/apache-2* ) !apache2? ( =net-www/apache-1* ) )"
 
 pkg_setup() {
-	if [ `use apache2` ]
+	if use http
 	then
 		webapp_pkg_setup
 	fi
+
+	built_with_use dev-lang/perl gdbm || \
+		die "${PN} requires that dev-lang/perl be built with USE=gdbm."
 }
 
 src_install() {
-	if [ `use apache2` ]
+	if use http
 	then
 		webapp_src_preinst
 	fi
@@ -54,7 +58,7 @@ src_install() {
 	doins table.struct
 	dodoc README ChangeLog
 
-	if [ `use apache2` ]
+	if use http
 	then
 		cp ../was-${WAS_VER}/docs/README README.WAS
 		dodoc README.WAS
@@ -78,21 +82,21 @@ src_install() {
 
 pkg_postinst() {
 
-	if [ `use mysql` ]
+	if use mysql
 	then
 		echo
 		einfo "To create and enable the mysql database, please run: "
-		einfo "ebuild /var/db/pkg/net-analyzer/${P}/${P}.ebuild config"
+		einfo "emerge --config =${PF}"
 
-		if [ `use apache2` ]
+		if use http
 		then
 			echo "To create and enable the mysql database, please run:
-			ebuild /var/db/pkg/net-analyzer/${P}/${P}.ebuild config" > apache-postinst
+			emerge --config =${PF}" > apache-postinst
 			webapp_postinst_txt en apache-postinst
 		fi
 	fi
 
-	if [ `use apache2` ]
+	if use http
 	then
 		echo
 		einfo "Go to http://${HOSTNAME}/was/admin.php to configure WAS."
diff --git a/net-analyzer/aimsniff/metadata.xml b/net-analyzer/aimsniff/metadata.xml
index 62c7a070e11b..a722c0e8cff2 100644
--- a/net-analyzer/aimsniff/metadata.xml
+++ b/net-analyzer/aimsniff/metadata.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
 <maintainer>
-  <email>zhen@gentoo.org</email>
-  <name>John Davis</name>
-  <description>Full time maintainer, please post all bugs to me.</description>
+    <email>port001@gentoo.org</email>
+    <name>Ian Leitch</name>
 </maintainer>
 <longdescription>aimsniff is a utility used for retrieving and storing AIM messages across a network.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/amap/ChangeLog b/net-analyzer/amap/ChangeLog
index 9969a0d7e9ab..acfbece6c562 100644
--- a/net-analyzer/amap/ChangeLog
+++ b/net-analyzer/amap/ChangeLog
@@ -1,6 +1,127 @@
 # ChangeLog for net-analyzer/amap
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.1 2003/08/03 22:01:50 iggy Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/ChangeLog,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> amap-4.8-r1.ebuild:
+  stable on ia64
+
+  01 Aug 2005; Simon Stelling <blubb@gentoo.org> amap-4.8-r1.ebuild:
+  stable on amd64
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> amap-4.8-r1.ebuild:
+  Stable on ppc64
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> amap-4.8-r1.ebuild:
+  Stable on ppc.
+
+  10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> amap-4.8-r1.ebuild:
+  Stable on sparc
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/4.6-system-pcre.patch, -amap-4.6.ebuild, amap-4.8-r1.ebuild,
+  -amap-4.8.ebuild:
+  Removing old ebuilds, marking 4.8-r1 x86 stable.
+
+  05 May 2005; Daniel Black <dragonheart@gentoo.org> amap-5.0.ebuild:
+  now compiles with FEATURES=userpriv
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> amap-5.0.ebuild:
+  Adding sed line to fix bug 88228 (reopened). Thanks to Michael Boman
+  <michael.boman@gmail.com> for reporting, Marco Morales <soulse@gmail.com> for
+  the fix.
+
+*amap-5.0 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +files/amap-5.0-gcc4.patch,
+  +amap-5.0.ebuild:
+  Version bump for bug 90550; updated gcc4 patch and fixed all those ugly
+  'differ in signedness' warnings.
+
+*amap-4.8-r1 (10 Apr 2005)
+
+  10 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/amap-4.8-gcc4.patch, +amap-4.8-r1.ebuild:
+  Revision bump. Push fix from bug 88228, adding slightly modified gcc-4 patch
+  from Debian.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> amap-4.7.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> amap-4.7.ebuild:
+  Stable on ppc.
+
+  07 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> amap-4.8.ebuild:
+  Fix bug 88228. Thanks to Michael Boman <michael.boman@gmail.com> and Marco
+  Morales <soulse@gmail.com>.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> amap-4.7.ebuild:
+  stable on amd64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> amap-4.7.ebuild:
+  stable on ia64
+
+  24 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> amap-4.7.ebuild:
+  Stable on sparc
+
+*amap-4.8 (22 Feb 2005)
+
+  22 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/4.8-system-pcre.patch, +files/amap-4.8-fix-icky-lvalue-casts.diff,
+  amap-4.7.ebuild, +amap-4.8.ebuild:
+  Version bump for bug 82876; updated pcre patch and added a patch to fix
+  amap's icky lvalue casts which cause numerous warnings w/gcc-3.4. Updated
+  HOMEPAGE and SRC_URI. Marked 4.7 stable on x86.
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> amap-4.6.ebuild,
+  amap-4.7.ebuild:
+  Added dev-libs/libpcre dep for bug 79403.
+
+*amap-4.7 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/4.7-system-pcre.patch, +amap-4.7.ebuild:
+  Version bump as per bug #71433. Thanks to Robert Rodgers <rrodgers@gmail.com>
+  and Vanquirius <marcelogoes@gmail.com>.
+
+*amap-4.6 (25 Sep 2004)
+
+  25 Sep 2004; Mike Frysinger <vapier@gentoo.org> +amap-4.6.ebuild:
+  Version bump #64453 by Daniel Webert.
+
+  22 Aug 2004; Jason Wever <weeve@gentoo.org> amap-4.5.ebuild:
+  Stable on sparc.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> amap-4.5.ebuild:
+  x86 stable
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> amap-4.5.ebuild:
+  stable on ppc64, bug #57452
+
+*amap-4.5 (01 Jul 2004)
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> amap-2.7.ebuild,
+  amap-4.3.ebuild, amap-4.5.ebuild:
+  change virtual/glibc to virtual/libc, fix header in 4.5 ebuild
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> amap-4.3.ebuild:
+  Stable on sparc.
+
+  20 May 2004; Jon Hood <squinky86@gentoo.org> amap-4.3.ebuild:
+  version bump, fixing #39391 and #40115; thanks to Diego Garcia
+  <diego@envigo.net> and Sascha Silbe <sascha-gentoo-bugzilla@silbe.org>
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> amap-2.7.ebuild,
+  amap-4.3.ebuild:
+  QA: Unnecessary definition of S and RDEPEND removed. Changed 'sed' to
+  'sed -i'.
+
+  26 Nov 2003; Brian Jackson <iggy@gentoo.org> amap-4.3.ebuild:
+  bump to stable
+
+*amap-4.3 (04 Oct 2003)
+
+  04 Oct 2003; <iggy@gentoo.org> amap-2.7.ebuild, amap-4.3.ebuild:
+  version bump, added a few kewords for testing
 
 *amap-2.7 (03 Aug 2003)
 
diff --git a/net-analyzer/amap/Manifest b/net-analyzer/amap/Manifest
index 40d2bd836ea6..ab5efb40505b 100644
--- a/net-analyzer/amap/Manifest
+++ b/net-analyzer/amap/Manifest
@@ -1,3 +1,15 @@
-MD5 a29e59be6fee9ad3aeaea85f33d8e198 amap-2.7.ebuild 997
-MD5 b373e02c23d40f3f13a57f15b4fba233 metadata.xml 438
-MD5 6ab433a807edba43512f283f9c6c9bbc files/digest-amap-2.7 59
+MD5 a7ef9e440df41ddc5e145e15c5c970dd amap-4.8-r1.ebuild 1469
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 bf0cd3ae53ef3b3f2ef5bab3e309c44b amap-5.1.ebuild 1545
+MD5 96e68368c08bcb4ac7a513695e34c615 ChangeLog 4520
+MD5 701ffa0a03c07892f770bf5419333da4 amap-4.7.ebuild 1393
+MD5 b0265c3d76a497de4fe39103e10973ca amap-5.0.ebuild 1543
+MD5 a11774428cb7e97a81107a22682d1798 files/4.8-system-pcre.patch 1232
+MD5 b078c53b085eba48231c7df7123766b5 files/amap-5.0-gcc4.patch 15883
+MD5 6a77a9ce3b2272dff2d409eccdf38833 files/digest-amap-4.8-r1 60
+MD5 cc27dde4b08677a49290c397dc162be8 files/amap-4.8-gcc4.patch 2460
+MD5 8af326d838e7d5807c2891ddf8d3817e files/digest-amap-5.1 60
+MD5 36fabda09cbfbb3c4c9eab818e99a501 files/amap-4.8-fix-icky-lvalue-casts.diff 7058
+MD5 0650e1a8429fc7f1febbffe8435ed1c4 files/digest-amap-4.7 60
+MD5 e557979284a669fda0ca792fc9fc7ad5 files/digest-amap-5.0 60
+MD5 c1c1d543f5427e6ccf71fe8648a6b322 files/4.7-system-pcre.patch 1155
diff --git a/net-analyzer/amap/amap-4.7.ebuild b/net-analyzer/amap/amap-4.7.ebuild
index 692e7a2aa940..152e30e8439a 100644
--- a/net-analyzer/amap/amap-4.7.ebuild
+++ b/net-analyzer/amap/amap-4.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/net-analyzer/amap/amap-4.7.ebuild,v 1.1 2005/01/09 05:16:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.7.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
 
 inherit eutils
 
@@ -10,10 +10,11 @@ SRC_URI="http://packetstormsecurity.nl/groups/thc/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
 DEPEND="virtual/libc
+	dev-libs/libpcre
 	ssl? ( >=dev-libs/openssl-0.9.6j )"
 
 src_unpack() {
@@ -22,15 +23,15 @@ src_unpack() {
 	sed -i \
 		-e 's:/usr/local:/usr:' \
 		-e '/AMAP_APPDEF_PATH/s:/bin:/share/amap:' \
-		amap.h || die
+		amap.h || die "sed amap.h failed"
 
 	rm -rf pcre-3.9
-	epatch ${FILESDIR}/${PV}-system-pcre.patch || die "patch failed"
+	epatch ${FILESDIR}/${PV}-system-pcre.patch
 }
 
 src_compile() {
 	# has it's own stupid custom configure script
-	./configure || die "configure"
+	./configure || die "configure failed"
 	sed -i \
 		-e '/^XDEFINES=/s:=.*:=:' \
 		-e '/^XLIBS=/s:=.*:=:' \
@@ -43,13 +44,13 @@ src_compile() {
 			-e '/^XLIBS=/s:=:=-lcrypto -lssl:' \
 			Makefile || die "adding ssl"
 	fi
-	emake OPT="${CFLAGS}" || die "make"
+	emake OPT="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin amap amapcrap || die "dobin"
+	dobin amap amapcrap || die "dobin failed"
 	insinto /usr/share/amap
-	doins appdefs.* || die "doins"
+	doins appdefs.* || die "doins failed"
 
 	doman ${PN}.1
 	dodoc README TODO CHANGES
diff --git a/net-analyzer/amap/amap-4.8-r1.ebuild b/net-analyzer/amap/amap-4.8-r1.ebuild
index 524e6aef7666..1d62bb549441 100644
--- a/net-analyzer/amap/amap-4.8-r1.ebuild
+++ b/net-analyzer/amap/amap-4.8-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/net-analyzer/amap/amap-4.8-r1.ebuild,v 1.1 2005/04/10 17:37:02 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-4.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
 IUSE="ssl"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/amap/amap-5.0.ebuild b/net-analyzer/amap/amap-5.0.ebuild
index eec08defb04d..f494f3669bb5 100644
--- a/net-analyzer/amap/amap-5.0.ebuild
+++ b/net-analyzer/amap/amap-5.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/net-analyzer/amap/amap-5.0.ebuild,v 1.1 2005/04/27 12:19:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit eutils
 
@@ -20,6 +20,9 @@ DEPEND="virtual/libc
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	chmod 755 .
+	sed -i -e "s:etc/:share/amap/:g" \
+		amap-lib.c || die "sed amap-lib.c failed"
 	sed -i 's:/usr/local:/usr:' amap.h || die "sed amap.h failed"
 	sed -i '/DATADIR/s:/etc:/share/amap:' \
 		Makefile.am || die "sed Makefile.am failed"
diff --git a/net-analyzer/amap/amap-5.1.ebuild b/net-analyzer/amap/amap-5.1.ebuild
index a39221ec62f1..cc5e45f4fa98 100644
--- a/net-analyzer/amap/amap-5.1.ebuild
+++ b/net-analyzer/amap/amap-5.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/net-analyzer/amap/amap-5.1.ebuild,v 1.1 2005/06/14 14:15:33 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/amap/amap-5.1.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/amap/metadata.xml b/net-analyzer/amap/metadata.xml
index 94a02d256bad..03aa50bab7e3 100644
--- a/net-analyzer/amap/metadata.xml
+++ b/net-analyzer/amap/metadata.xml
@@ -1,14 +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>iggy@gentoo.org</email>
-    <name>Brian Jackson</name>
-    <description>Actively maintained</description>
-  </maintainer>
-  <longdescription>
-    Network analyzer, allows detection of services running even on non-standard ports
-  </longdescription>
+<herd>netmon</herd>
 </pkgmetadata>
diff --git a/net-analyzer/angst/ChangeLog b/net-analyzer/angst/ChangeLog
index 174510389405..ccae44c20873 100644
--- a/net-analyzer/angst/ChangeLog
+++ b/net-analyzer/angst/ChangeLog
@@ -1,8 +1,30 @@
 # ChangeLog for net-analyzer/angst
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/angst/ChangeLog,v 1.1 2003/02/12 10:45:18 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/angst/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> angst-0.4b-r1.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> angst-0.4b-r1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> angst-0.4b-r1.ebuild,
+  angst-0.4b.ebuild:
+  added metadata
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> angst-0.4b-r1.ebuild,
+  angst-0.4b.ebuild:
+  Cleanup IUSE, S, RDEPEND.
+
+*angst-0.4b-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *angst-0.4b (12 Feb 2003)
 
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> angst-0.4b.ebuild :
+  Fixed Depend to libnet-1.0.*. Closes #17017. 
+
   12 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild submitted by Daniel Seyffer <gentoo-bugs@seyffer.de> in #8866.
diff --git a/net-analyzer/angst/Manifest b/net-analyzer/angst/Manifest
index e69de29bb2d1..58ad5b0ea42a 100644
--- a/net-analyzer/angst/Manifest
+++ b/net-analyzer/angst/Manifest
@@ -0,0 +1,5 @@
+MD5 c2ccc8f7e54974997adb51da21807027 ChangeLog 1067
+MD5 0384ee43778cb60b11c3a6affbef625d angst-0.4b-r1.ebuild 790
+MD5 627c0901fa5d3e5cc4aab74635d35f3f metadata.xml 274
+MD5 5e2378564ab6bc44916bc53b430dc1d2 files/0.4b-libnet-1.0.patch 518
+MD5 2e59247b348d1067a433e5787b585f20 files/digest-angst-0.4b-r1 61
diff --git a/net-analyzer/angst/angst-0.4b-r1.ebuild b/net-analyzer/angst/angst-0.4b-r1.ebuild
index 9ec15719f05e..e7d66caba0bc 100644
--- a/net-analyzer/angst/angst-0.4b-r1.ebuild
+++ b/net-analyzer/angst/angst-0.4b-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/net-analyzer/angst/angst-0.4b-r1.ebuild,v 1.1 2003/08/21 04:19:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/angst/angst-0.4b-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit eutils
 
@@ -10,11 +10,12 @@ SRC_URI="http://angst.sourceforge.net/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
+IUSE=""
 
-DEPEND=">=net-libs/libpcap-0.7.1
-	>=net-libs/libnet-1.0.2a-r3
-	<net-libs/libnet-1.1*"
+DEPEND="virtual/libpcap
+	<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/argus/ChangeLog b/net-analyzer/argus/ChangeLog
index fab0626514e8..a74dde80f388 100644
--- a/net-analyzer/argus/ChangeLog
+++ b/net-analyzer/argus/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for net-analyzer/argus
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.1 2003/01/03 19:13:42 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  29 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> argus-2.0.5.ebuild:
+  Do not dodoc COPYING/INSTALL, misc fixes.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> argus-2.0.5.ebuild:
+  Added to ~ppc.
+
+  10 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> argus-2.0.5.ebuild:
+  File collision- man/man1/tcpdump.1. Not installed anymore.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> argus-2.0.5.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  26 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> argus-2.0.5.ebuild:
+  Changed newsbin for macos to argus_bpf.  Stable macos.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> argus-2.0.5.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> argus-2.0.5.ebuild:
+  Add inherit eutils
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> argus-2.0.5.ebuild:
+  Fix compilation aginst the new libpcap include files.
 
 *argus-2.0.5 (17 Dec 2002)
 
diff --git a/net-analyzer/argus/Manifest b/net-analyzer/argus/Manifest
index e69de29bb2d1..a95d2e4b09f0 100644
--- a/net-analyzer/argus/Manifest
+++ b/net-analyzer/argus/Manifest
@@ -0,0 +1,6 @@
+MD5 45909d1f4710055896c74111e5bdb5cf argus-2.0.5.ebuild 1110
+MD5 715b876f243e4be5a6f743aa6ce3a627 ChangeLog 1371
+MD5 92ed350cb8e0f66ff78e9ba7fe4e1cb4 metadata.xml 249
+MD5 890a4c236df08f0041db409a40d6d0b4 files/digest-argus-2.0.5 63
+MD5 81bbcde3055b93cdef5639b6ee166772 files/argus-2.0.5-libpcap-include.patch 669
+MD5 e7d773b85b71bca96d20df40a11d6e00 files/argus-2.0.5-gentoo.diff 317
diff --git a/net-analyzer/argus/argus-2.0.5.ebuild b/net-analyzer/argus/argus-2.0.5.ebuild
index 3ce7723a7857..ea9ba1259010 100644
--- a/net-analyzer/argus/argus-2.0.5.ebuild
+++ b/net-analyzer/argus/argus-2.0.5.ebuild
@@ -1,6 +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/net-analyzer/argus/argus-2.0.5.ebuild,v 1.1 2002/12/17 20:00:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/argus/argus-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="network Audit Record Generation and Utilization System"
 HOMEPAGE="http://www.qosient.com/argus/"
@@ -8,33 +10,34 @@ HOMEPAGE="http://www.qosient.com/argus/"
 SRC_URI="ftp://ftp.qosient.com/pub/argus/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~ppc-macos x86"
 IUSE=""
-RDEPEND="virtual/glibc
-	>=net-libs/libpcap-0.6.2"
+RDEPEND="virtual/libc
+	virtual/libpcap"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.28
 	>=sys-devel/flex-2.4.6"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack ${A} ; cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libpcap-include.patch
 
 	# Fix hardcoded config file
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff || die
+	epatch "${FILESDIR}"/${PF}-gentoo.diff
 }
 
 src_install () {
-	dodoc COPYING CREDITS INSTALL README
-	dodoc doc/FAQ doc/HOW-TO doc/CHANGES
+	dodoc CREDITS README doc/{FAQ,HOW-TO,CHANGES}
 
-	doman man/man1/* man/man5/* man/man8/*
+	#do not install man/man1/tcpdump.1, file collision
+	doman man/man1/ra* man/man5/* man/man8/*
 
 	dolib lib/argus_common.a lib/argus_parse.a
 
 	dobin bin/ra*
 
-	newsbin bin/argus_linux argus
+	use ppc-macos && newsbin bin/argus_bpf argus || newsbin bin/argus_linux argus
 
 	insinto /etc/argus
 	doins support/Config/argus.conf
diff --git a/net-analyzer/arp-sk/ChangeLog b/net-analyzer/arp-sk/ChangeLog
index b030cf350bd1..f0e5ffd8c26e 100644
--- a/net-analyzer/arp-sk/ChangeLog
+++ b/net-analyzer/arp-sk/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-analyzer/arp-sk
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arp-sk/ChangeLog,v 1.1 2004/07/01 17:13:08 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arp-sk/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -arp-sk-0.0.15.ebuild:
+  Removing old ebuild.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> arp-sk-0.0.16.ebuild:
+  Marked stable on x86.
+
+*arp-sk-0.0.16 (21 Jan 2005)
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> arp-sk-0.0.15.ebuild,
+  +arp-sk-0.0.16.ebuild:
+  Version bump; closes bug 74894.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> arp-sk-0.0.15.ebuild:
+  x86 stable
+
+  03 Jul 2004; David Holm <dholm@gentoo.org> arp-sk-0.0.15.ebuild:
+  Added to ~ppc.
 
 *arp-sk-0.0.15 (01 Jul 2004)
 
diff --git a/net-analyzer/arp-sk/Manifest b/net-analyzer/arp-sk/Manifest
index 2c1b02e52426..e5737ad77367 100644
--- a/net-analyzer/arp-sk/Manifest
+++ b/net-analyzer/arp-sk/Manifest
@@ -1,2 +1,4 @@
-MD5 d69ac864a2d56c93d3cb045caadd130c arp-sk-0.0.15.ebuild 703
-MD5 2d852875fb5ea2225be214220aeaa83a files/digest-arp-sk-0.0.15 62
+MD5 46558dea9c0da1e7b56fd14d7bc819de arp-sk-0.0.16.ebuild 714
+MD5 1f295ab8238b9ca804ea5223b4dea35e ChangeLog 912
+MD5 26ae62794a9b834a8ec78fcdbedca88f metadata.xml 221
+MD5 e2694840772561f489bc2c3b0b48b4ad files/digest-arp-sk-0.0.16 62
diff --git a/net-analyzer/arp-sk/arp-sk-0.0.16.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16.ebuild
index eefba5474cf4..bf11e07aa761 100644
--- a/net-analyzer/arp-sk/arp-sk-0.0.16.ebuild
+++ b/net-analyzer/arp-sk/arp-sk-0.0.16.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/net-analyzer/arp-sk/arp-sk-0.0.16.ebuild,v 1.1 2005/01/22 00:28:43 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arp-sk/arp-sk-0.0.16.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 DESCRIPTION="A swiss knife tool for ARP"
 HOMEPAGE="http://www.arp-sk.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.arp-sk.org/files/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND=">=net-libs/libnet-1.1"
 
diff --git a/net-analyzer/arping/ChangeLog b/net-analyzer/arping/ChangeLog
index e14e3a0d052e..c57e91792a2a 100644
--- a/net-analyzer/arping/ChangeLog
+++ b/net-analyzer/arping/ChangeLog
@@ -1,8 +1,103 @@
 # ChangeLog for net-analyzer/arping
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/ChangeLog,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
-*arping-1.04 (28 Jun 2002)
+  05 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -arping-2.04.ebuild:
+  Removing old ebuild.
+
+  09 May 2005; Lars Weiler <pylon@gentoo.org> arping-2.05.ebuild:
+  Stable on ppc.
+
+  25 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> arping-2.05.ebuild:
+  Stable on sparc
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -arping-2.01.ebuild,
+  arping-2.05.ebuild:
+  Stable on x86.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> arping-2.04.ebuild:
+  Stable on ppc.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> arping-2.04.ebuild:
+  stable on amd64
+
+  14 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> arping-2.04.ebuild:
+  Stable on sparc
+
+*arping-2.05 (12 Feb 2005)
+
+  12 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> arping-2.04.ebuild,
+  +arping-2.05.ebuild:
+  Version bump for bug 81809. 2.04 stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> arping-1.06-r1.ebuild,
+  arping-2.01.ebuild, arping-2.04.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*arping-2.04 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> +arping-2.04.ebuild:
+  version bump as per bug #74894 thanks to Vanquirius <marcelogoes@gmail.com>
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> arping-2.01.ebuild:
+  marked x86 stable.
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> arping-1.06-r1.ebuild:
+  Added missing IUSE.
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> arping-2.01.ebuild:
+  Stable on sparc.
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> arping-2.01.ebuild:
+  mark stable amd64
+
+*arping-2.01 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  libnet-1.1.x version of arping.  SLOT to 2 and make binary 'arping2' #27023.
+  This way we dont kill iputils arping.
+
+*arping-1.06-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
+  Also set SLOT to 1 and make binary 'arping1' #27023.
+  This way we dont kill iputils arping.
+
+*arping-1.06 (07 Mar 2003)
+
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> arping-1.06.ebuild
+  files/digest-arping-1.06 ChangeLog :
+  Version bumped
+
+*arping-1.05 (09 Jan 2003)
+
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> arping-1.05.ebuild :
+  Fixed Depend to libnet-1.0.*. Closes #17017.
+
+  04 Feb 2003; Jon Nall <nall@gentoo.org> arping-1.05.ebuild :
+  added ~ppc
+
+  09 Jan 2003; Martin Holzer <mholzer@gentoo.org> arping-1.05.ebuild
+  files/digest-arping-1.05 ChangeLog :
+  Version bumped. Closes #13551
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*arping-1.04 (18 Jun 2002)
+
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> arping-1.04.ebuild :
+  Fixed Depend to libnet-1.0.*. Closes #17017.
+  
+  09 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  arping-1.04.ebuild, ChangeLog :
+
+  Arping depends on libnet-1.0.2a-r1, not libnet-1.1.x. Lintoo
+  cleanup.
+
+  18 Jul 2002; Kyle Manna <nitro@gentoo.org> :
+
+  Added KEYWORDS.
 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
   moved to net-analyzer - added SLOT=0 - updated HOMEPAGE and SRC_URI
diff --git a/net-analyzer/arping/Manifest b/net-analyzer/arping/Manifest
index e69de29bb2d1..f9b6847b2be8 100644
--- a/net-analyzer/arping/Manifest
+++ b/net-analyzer/arping/Manifest
@@ -0,0 +1,7 @@
+MD5 5a2d064f4ae831b8059c119f3d9e9e98 arping-2.05.ebuild 1125
+MD5 4ea1a0d6f859a70dc9fbd1f6b46067db arping-1.06-r1.ebuild 866
+MD5 d69050a1ef0f226df4c1c50eef995295 ChangeLog 3886
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 2ae67bdfca97cbebbb801c9251aa2594 files/1.06-libnet-1.0.patch 610
+MD5 421b6e3a7a8e95eb5eee75e8b3b6d924 files/digest-arping-2.05 62
+MD5 ef2e255f55dcd347896703a82f7af33f files/digest-arping-1.06-r1 62
diff --git a/net-analyzer/arping/arping-1.06-r1.ebuild b/net-analyzer/arping/arping-1.06-r1.ebuild
index d1b51e920f56..116013bea22d 100644
--- a/net-analyzer/arping/arping-1.06-r1.ebuild
+++ b/net-analyzer/arping/arping-1.06-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/net-analyzer/arping/arping-1.06-r1.ebuild,v 1.1 2003/08/21 04:36:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-1.06-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 inherit eutils
 
@@ -10,11 +10,12 @@ SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="1"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
-DEPEND="net-libs/libpcap 
-	>=net-libs/libnet-1.0.2a-r3
-	<net-libs/libnet-1.1"
+DEPEND="virtual/libpcap
+	<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/arping/arping-2.05.ebuild b/net-analyzer/arping/arping-2.05.ebuild
index 128aafe230f9..a084bc9007da 100644
--- a/net-analyzer/arping/arping-2.05.ebuild
+++ b/net-analyzer/arping/arping-2.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/net-analyzer/arping/arping-2.05.ebuild,v 1.1 2005/02/13 01:16:52 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arping/arping-2.05.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.habets.pp.se/pub/synscan/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~arm ~amd64"
+KEYWORDS="amd64 arm ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/libpcap
diff --git a/net-analyzer/arpoison/ChangeLog b/net-analyzer/arpoison/ChangeLog
index b6b6412c4b90..e638bc08fb90 100644
--- a/net-analyzer/arpoison/ChangeLog
+++ b/net-analyzer/arpoison/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/arpoison
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/ChangeLog,v 1.1 2005/01/31 10:35:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> arpoison-0.6.ebuild:
+  Added to ~ppc.
+
+  03 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> arpoison-0.6.ebuild:
+  Update src_unpack now that upstream fixed their tarball.
 
 *arpoison-0.6 (31 Jan 2005)
 
diff --git a/net-analyzer/arpoison/Manifest b/net-analyzer/arpoison/Manifest
index 2d1f5db53226..97a40c0307cd 100644
--- a/net-analyzer/arpoison/Manifest
+++ b/net-analyzer/arpoison/Manifest
@@ -1,4 +1,4 @@
-MD5 7316071309e4b1a6ad4c3b83c7b68ba2 arpoison-0.6.ebuild 741
-MD5 80b5fdd5bb46b007f7053bd08aa9f07c ChangeLog 272
+MD5 bf66f078d5dbe3870e91c8e8ead76874 ChangeLog 578
+MD5 7e64ae6a6243151e7adf6d1a2685f67c arpoison-0.6.ebuild 761
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
 MD5 b683b9242e8e001c86df11bfffbe6bf3 files/digest-arpoison-0.6 62
diff --git a/net-analyzer/arpoison/arpoison-0.6.ebuild b/net-analyzer/arpoison/arpoison-0.6.ebuild
index 5457828aebc6..6a3e7664603d 100644
--- a/net-analyzer/arpoison/arpoison-0.6.ebuild
+++ b/net-analyzer/arpoison/arpoison-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/net-analyzer/arpoison/arpoison-0.6.ebuild,v 1.1 2005/01/31 10:35:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpoison/arpoison-0.6.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
@@ -20,8 +20,7 @@ RDEPEND="virtual/libc
 S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	# upstream names the tarball .tar.gz, but its not a gzip archive...
-	tar xf ${DISTDIR}/${P}.tar.gz
+	unpack ${A}
 	cd ${S}
 	sed -i \
 		-e "s|\(-Wall\)|\1 ${CFLAGS}|" \
diff --git a/net-analyzer/arpwatch/ChangeLog b/net-analyzer/arpwatch/ChangeLog
index 53c2e940e6cb..29838d5d252d 100644
--- a/net-analyzer/arpwatch/ChangeLog
+++ b/net-analyzer/arpwatch/ChangeLog
@@ -1,10 +1,42 @@
-# ChangeLog for net-analyzer/nmap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.1 2003/01/08 12:45:50 mholzer Exp $
+# ChangeLog for net-analyzer/arpwatch
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/ChangeLog,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  arpwatch-2.1.11-r1.ebuild:
+  Stable on ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  arpwatch-2.1.11-r1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  26 Jan 2005; petre rodan <kaiowas@gentoo.org> arpwatch-2.1.11-r1.ebuild:
+  added selinux RDEPEND
+
+  12 Jan 2005; Jason Wever <weeve@gentoo.org> arpwatch-2.1.11-r1.ebuild:
+  Stable on sparc.
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> arpwatch-2.1.11-r1.ebuild:
+  Added missing IUSE
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> arpwatch-2.1.11-r1.ebuild:
+  Added ~sparc keyword.
+
+*arpwatch-2.1.11-r1 (14 Nov 2003)
+
+  14 Nov 2003; Brad House <brad_mssw@gentoo.org> arpwatch-2.1.11-r1.ebuild:
+  mark stable amd64
+
+  06 Aug 2003; lanius <lanius@gentoo.org> files/arpwatch.confd,
+  files/arpwatch.init:
+  addded debian/redhat patches, added config file
 
 *arpwatch-2.1.11 (08 Jan 2003)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> arpwatch-2.1.11.ebuild :
+  set ~ppc in keywords
+
   08 Jan 2003; Martin Holzer <mholzer@gentoo.org> arpwatch-2.1.11.ebuild files/arpwatch-2.1.11-gentoo.diff files/arpwatch.init files/digest-arpwatch-2.1.11 ChangeLog :
 
-  Added initial version. Submitted by asen@warlock.ru in #13484. 
+  Added initial version. Submitted by asen@warlock.ru in #13483. 
 
diff --git a/net-analyzer/arpwatch/Manifest b/net-analyzer/arpwatch/Manifest
index f6ee2e61bd4c..54e132ebf9d5 100644
--- a/net-analyzer/arpwatch/Manifest
+++ b/net-analyzer/arpwatch/Manifest
@@ -1,5 +1,17 @@
-MD5 e0a7417ace86e269ef5df7fa8a67a72e ChangeLog 585
-MD5 08440447363e07f3fd9e2b7013aa1b38 arpwatch-2.1.11.ebuild 1121
-MD5 95d581954861b72001405262db996469 files/arpwatch-2.1.11-gentoo.diff 4607
-MD5 d9ff62baf4f0849ee4776b830a55b88f files/arpwatch.init 468
-MD5 6d77d35ffc64dc4cba17ef3e2093d067 files/digest-arpwatch-2.1.11 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a672212325a4762b94f27af7937a0cca ChangeLog 1470
+MD5 3c9c459c2feac485d0974d0af61ba60e arpwatch-2.1.11-r1.ebuild 1553
+MD5 4bbdab8340cc812da6fc2fd5f0b22e0d files/arpwatch-2.1.11-r1.diff.gz 7550
+MD5 e2b8fb77ed42d85c3c9f5576964c7e74 files/arpwatch.confd 124
+MD5 04d7740490d1e3461332d7dddb3e516f files/arpwatch.init 654
+MD5 6d77d35ffc64dc4cba17ef3e2093d067 files/digest-arpwatch-2.1.11-r1 67
+MD5 26e100db2774909ccef9b75ede330dbe metadata.xml 252
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0BfmI1lqEGTUzyQRAob+AJ9d+hZxf6SneTMceug4rpU+U0m7HwCfZtyB
+4nXkI2YXO8XTtI4DzXyyzhs=
+=yziH
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild
index f3171163c98b..d1c96448bd5b 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild
@@ -1,25 +1,29 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild,v 1.1 2003/08/06 14:15:35 lanius Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/arpwatch/arpwatch-2.1.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 MY_P=arpwatch-2.1a11
 S=${WORKDIR}/$MY_P
 DESCRIPTION="An ethernet monitor program that keeps track of ethernet/ip address pairings"
-SRC_URI="ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz"
 HOMEPAGE="http://www-nrg.ee.lbl.gov/"
+SRC_URI="ftp://ftp.ee.lbl.gov/${MY_P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="amd64 hppa ppc sparc x86"
+IUSE="selinux"
 
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	sys-libs/ncurses"
 
+RDEPEND="selinux? ( sec-policy/selinux-arpwatch )"
 
 src_unpack() {
-	unpack $A
+	unpack ${A}
 	cd ${S}
+
 	einfo "Patching arpwatch with debian and redhat patches"
-	patch -s < ${FILESDIR}/${P}-gentoo.diff
+	gzip -dc ${FILESDIR}/${P}-r1.diff.gz | patch -s
 }
 
 src_compile() {
@@ -42,21 +46,21 @@ src_install () {
 
 	exeinto /var/arpwatch
 	doexe arp2ethers arpfetch bihourly massagevendor massagevendor-old
-	
+
 	insinto /var/arpwatch
 	doins d.awk duplicates.awk e.awk euppertolower.awk p.awk
 
 	insinto /usr/share/arpwatch
 	doins ethercodes.dat
-	
+
 	dodoc README CHANGES
-    exeinto /etc/init.d ; newexe ${FILESDIR}/arpwatch.init arpwatch
+	exeinto /etc/init.d ; newexe ${FILESDIR}/arpwatch.init arpwatch
 
 	insinto /etc/conf.d
 	newins ${FILESDIR}/arpwatch.confd arpwatch
-	
+
 }
 pkg_postinst() {
 	ewarn "NOTE: if you want to run arpwatch on boot then execute"
-	ewarn "      rc-update add arpwatch default                  "
+	ewarn "      rc-update add arpwatch default"
 }
diff --git a/net-analyzer/arpwatch/files/arpwatch.init b/net-analyzer/arpwatch/files/arpwatch.init
index 22ff5b4c4eb3..466f780a8721 100644
--- a/net-analyzer/arpwatch/files/arpwatch.init
+++ b/net-analyzer/arpwatch/files/arpwatch.init
@@ -1,6 +1,7 @@
 #!/sbin/runscript
-# 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/net-analyzer/arpwatch/files/arpwatch.init,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 depend() {
 	need net
@@ -8,13 +9,17 @@ depend() {
 }
 
 start() {
-	ebegin "Starting arpwatch"
-	if [ ! -e /var/arpwatch/arp.dat ]; then
-		touch /var/arpwatch/arp.dat 
-	fi
-	/usr/sbin/arpwatch -i eth0 -f /var/arpwatch/arp.dat
-	result=$?
-	eend $result
+	for IFACE in ${IFACES}
+	do
+		ebegin "Starting arpwatch on ${IFACE}"
+		DATAFILE=/var/arpwatch/${IFACE}.dat
+		if [ ! -f ${DATAFILE} ]; then
+			touch ${DATAFILE}
+		fi
+		/usr/sbin/arpwatch -i $IFACE -f /var/arpwatch/$IFACE.dat ${OPTIONS}
+		result=$?
+		eend $result
+	done
 }
 
 stop() {
diff --git a/net-analyzer/arpwatch/metadata.xml b/net-analyzer/arpwatch/metadata.xml
index c3504b40c506..98786c793993 100644
--- a/net-analyzer/arpwatch/metadata.xml
+++ b/net-analyzer/arpwatch/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>netmon</herd>
 <maintainer>
   <email>lanius@gentoo.org</email>
   <name>Heinrich Wendel</name>
diff --git a/net-analyzer/authforce/ChangeLog b/net-analyzer/authforce/ChangeLog
index e10006d5daa6..406c9c7e1b99 100644
--- a/net-analyzer/authforce/ChangeLog
+++ b/net-analyzer/authforce/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/authforce
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/ChangeLog,v 1.1 2004/04/23 10:51:42 stuart Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/ChangeLog,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
+  Fixed herd name
+
+  15 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> authforce-0.9.6.ebuild:
+  fix this incredibly broken package.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> authforce-0.9.6.ebuild:
+  marked x86 stable
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> authforce-0.9.6.ebuild:
+  Added to ~ppc.
 
 *authforce-0.9.6 (23 Apr 2004)
 
diff --git a/net-analyzer/authforce/Manifest b/net-analyzer/authforce/Manifest
index 91c959b2820c..a59243debb7e 100644
--- a/net-analyzer/authforce/Manifest
+++ b/net-analyzer/authforce/Manifest
@@ -1,2 +1,4 @@
-MD5 e5d43769bcc1c4bc63857be5440d59d7 authforce-0.9.6.ebuild 760
+MD5 84cf60fa633ff832beeb703d7ebd8157 authforce-0.9.6.ebuild 865
+MD5 02f4f5127e4fb526e2eb32486f485872 ChangeLog 780
+MD5 4defd726d2b03decc5b7ff21b0aac1a3 metadata.xml 225
 MD5 701ee097ba45e155bc5b652c96d102e8 files/digest-authforce-0.9.6 67
diff --git a/net-analyzer/authforce/authforce-0.9.6.ebuild b/net-analyzer/authforce/authforce-0.9.6.ebuild
index 2d3ab99036c6..d76e7b93f533 100644
--- a/net-analyzer/authforce/authforce-0.9.6.ebuild
+++ b/net-analyzer/authforce/authforce-0.9.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/net-analyzer/authforce/authforce-0.9.6.ebuild,v 1.1 2004/04/23 10:51:42 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/authforce/authforce-0.9.6.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 DESCRIPTION="An HTTP authentication brute forcer"
 HOMEPAGE="http://kapheine.hypa.net/authforce/"
@@ -8,10 +8,10 @@ SRC_URI="http://kapheine.hypa.net/authforce/authforce-0.9.6.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE="curl nls"
 DEPEND="sys-libs/readline
-	curl? ( net-ftp/curl )"
+	curl? ( net-misc/curl )"
 
 src_compile() {
 	myconf="`use_with curl`"
diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml
index 0d59c319c3eb..bee101f41174 100644
--- a/net-analyzer/authforce/metadata.xml
+++ b/net-analyzer/authforce/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>webapps</herd>
+<herd>web-apps</herd>
 <maintainer>
   <email>web-apps@gentoo.org</email>
 </maintainer>
diff --git a/net-analyzer/barnyard/ChangeLog b/net-analyzer/barnyard/ChangeLog
index deaed1bf5c70..5c08575f4426 100644
--- a/net-analyzer/barnyard/ChangeLog
+++ b/net-analyzer/barnyard/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for net-analyzer/barnyard
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.1 2003/08/10 01:23:54 solar Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/ChangeLog,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
+
+*barnyard-0.2.0-r1 (08 Oct 2005)
+
+  08 Oct 2005; Benjamin Smee <strerror@gentoo.org>
+  +barnyard-0.2.0-r1.ebuild:
+  New version for sguil integration. Includes init.d and conf.d files
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> barnyard-0.1.0.ebuild,
+  barnyard-0.2.0.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  22 Jan 2005; Jason Wever <weeve@gentoo.org> barnyard-0.1.0.ebuild,
+  barnyard-0.2.0.ebuild:
+  Masked on sparc as snort is now masked on sparc.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> barnyard-0.1.0.ebuild,
+  barnyard-0.2.0.ebuild, -barnyard-0.2.0_rc1.ebuild:
+  Purged 0.2.0_rc1, 0.2.0 marked x86 stable
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> barnyard-0.1.0.ebuild:
+  Tidy up, fixed mysql issue (#47026). Thanks to Ryu
+  <jasmine.chua@internationalsos.com> and Devon <gentoo@noved.org>
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> barnyard-0.1.0.ebuild,
+  barnyard-0.2.0.ebuild, barnyard-0.2.0_rc1.ebuild:
+  change virtual/glibc to virtual/libc
+
+*barnyard-0.2.0 (19 May 2004)
+
+  19 May 2004; Michael Boman <mboman@gentoo.org> +barnyard-0.2.0.ebuild:
+  New upstream version
+
+*barnyard-0.2.0_rc1 (29 Mar 2004)
+
+  29 Mar 2004; Michael Boman <mboman@gentoo.org> barnyard-0.2.0_rc1.ebuild,
+  files/barnyard.confd:
+  New upstream version. Put more variables (less hardcoding) in barnyard.confd.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> barnyard-0.1.0.ebuild:
+  QA: Unnecessary definition of S removed.
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> barnyard-0.1.0.ebuild:
+  Marked 0.1.0 stable on x86
 
 *barnyard-0.1.0 (09 Aug 2003)
 
diff --git a/net-analyzer/barnyard/Manifest b/net-analyzer/barnyard/Manifest
index c4d5db290f59..61fe8a659726 100644
--- a/net-analyzer/barnyard/Manifest
+++ b/net-analyzer/barnyard/Manifest
@@ -1,4 +1,10 @@
-MD5 46afd02f0e82d1761138c9625698ac78 barnyard-0.1.0.ebuild 1340
-MD5 f2180306ab489100fe8729115dc23942 files/barnyard.confd 435
-MD5 dcf5edf27aaa1611f02554af03f6e08a files/barnyard.rc6 773
+MD5 76615f3cb9b609a11d3abf6d6abe1ec4 barnyard-0.2.0.ebuild 1228
+MD5 04900935e60d6ab34493ca1160bc3e2e barnyard-0.2.0-r1.ebuild 1950
+MD5 319801a4a4735aa68ceddb8d1c80e340 ChangeLog 1969
+MD5 17784ab6e148b4abf7f6aa2390ce1bce metadata.xml 223
+MD5 20781d966c89d732a0a2b0a8d7deadad barnyard-0.1.0.ebuild 1332
+MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0-r1 66
+MD5 d513768e805f1e68bce21b6cffcf846a files/barnyard.rc6 762
+MD5 3e857c89ec58ac318ebd669e7f427908 files/barnyard.confd 556
 MD5 e1650eb517daf81cb0abb45eee02a727 files/digest-barnyard-0.1.0 66
+MD5 7393a1ed7bc62178acd52f2da6f01185 files/digest-barnyard-0.2.0 66
diff --git a/net-analyzer/barnyard/barnyard-0.1.0.ebuild b/net-analyzer/barnyard/barnyard-0.1.0.ebuild
index dea61cb6de4d..bc93437fc2eb 100644
--- a/net-analyzer/barnyard/barnyard-0.1.0.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.1.0.ebuild
@@ -1,20 +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/net-analyzer/barnyard/barnyard-0.1.0.ebuild,v 1.1 2003/08/10 01:23:54 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 IUSE="mysql"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Fast output system for Snort"
 SRC_URI="http://www.snort.org/dl/barnyard/barnyard-${PV}.tar.gz"
 HOMEPAGE="http://www.snort.org"
 
 SLOT="0"
 LICENSE="QPL"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 -sparc"
 
-DEPEND="virtual/glibc
-	net-libs/libpcap
+DEPEND="virtual/libc
+	virtual/libpcap
 	mysql? ( >=dev-db/mysql-3.23.26 )"
 
 RDEPEND="${DEPEND}
@@ -22,18 +21,14 @@ RDEPEND="${DEPEND}
 
 src_compile() {
 	local myconf
+	myconf="${myconf} $(use_enable mysql)"
 
-	use mysql && myconf="${myconf} --enable-mysql" \
-		|| myconf="${myconf} --disable-mysql"
+	if use mysql; then
+		sed -i '/AC_CHECK_LIB(mysqlclient, mysql_connect, FOUND=yes, FOUND=no)/s/mysql_connect/mysql_real_connect/' \
+		configure.in
+	fi
 
-#	./configure \
-#		--prefix=/usr \
-#		--sysconfdir=/etc/snort \    	
-#		--localstatedir=/var \
-#		--mandir=/usr/share/man \
-#		--host=${CHOST} ${myconf} || die "bad ./configure"
-
-	econf --sysconfdir=/etc/snort ${myconf} || die "bad ./configure"
+	econf --sysconfdir=/etc/snort ${myconf} || die "econf failed"
 	emake || die "compile problem"
 }
 
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild
index 39c3b398e452..83d744069d32 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-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/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild,v 1.1 2005/10/08 13:48:01 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 DESCRIPTION="Fast output system for Snort"
 SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz"
diff --git a/net-analyzer/barnyard/barnyard-0.2.0.ebuild b/net-analyzer/barnyard/barnyard-0.2.0.ebuild
index 7a1b80b29e99..b3f945cc8b9a 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0.ebuild
@@ -1,19 +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/net-analyzer/barnyard/barnyard-0.2.0.ebuild,v 1.1 2004/05/19 13:14:49 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/barnyard-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 IUSE="mysql postgres"
 
 DESCRIPTION="Fast output system for Snort"
 SRC_URI="mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz"
-HOMEPAGE="http://www.snort.org"
+HOMEPAGE="http://www.snort.org/dl/barnyard/"
 
 SLOT="0"
 LICENSE="QPL"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 -sparc"
 
-DEPEND="virtual/glibc
-	net-libs/libpcap
+DEPEND="virtual/libc
+	virtual/libpcap
 	postgres? ( >=dev-db/postgresql-7.2 )
 	mysql? ( >=dev-db/mysql-3.23.26 )"
 
diff --git a/net-analyzer/barnyard/files/barnyard.confd b/net-analyzer/barnyard/files/barnyard.confd
index 81c28ed75fea..f3cfa330b227 100644
--- a/net-analyzer/barnyard/files/barnyard.confd
+++ b/net-analyzer/barnyard/files/barnyard.confd
@@ -1,13 +1,17 @@
 # Config file for /etc/init.d/barnyard
 
 PIDFILE="/var/run/barnyard.pid"
+LOG_FILE="snort_unified.log"
 
 # You probably don't want to change this, but in case you do
 LOGDIR="/var/log/snort"
 ARCHIVEDIR="$LOGDIR/archive"
+GENMSG_FILE="/etc/snort/gen-msg.map"
+SIDMSG_FILE="/etc/snort/sid-msg.map"
+WALDO_FILE="$LOGDIR/barnyard.waldo"
 
 # Probably not this either
 CONF=/etc/snort/barnyard.conf
 
 # This pulls in the options above
-BARNYARD_OPTS="-c $CONF -d $LOGDIR -g /etc/snort/gen-msg.map -s /etc/snort/sid-msg.map -w $LOGDIR/barnyard.waldo -L $LOGDIR -a $ARCHIVEDIR -f snort.alert"
+BARNYARD_OPTS="-D -c $CONF -d $LOGDIR -g $GENMSG_FILE -s $SIDMSG_FILE -w $WALDO_FILE -L $LOGDIR -a $ARCHIVEDIR -f $LOG_FILE -X $PIDFILE"
diff --git a/net-analyzer/barnyard/files/barnyard.rc6 b/net-analyzer/barnyard/files/barnyard.rc6
index 81e1e88e8289..8eae3b038b1f 100644
--- a/net-analyzer/barnyard/files/barnyard.rc6
+++ b/net-analyzer/barnyard/files/barnyard.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/files/barnyard.rc6,v 1.1 2003/08/10 01:23:54 solar Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/barnyard/files/barnyard.rc6,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/barnyard/metadata.xml b/net-analyzer/barnyard/metadata.xml
index bb361c7c32ae..0c6631479adc 100644
--- a/net-analyzer/barnyard/metadata.xml
+++ b/net-analyzer/barnyard/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription>Unified alert/log spool reader and output handler for Snort! This program decouples output overhead from the Snort network intrusion detection system and allows Snort to run at full speed.</longdescription>
+<herd>netmon</herd>
+<longdescription>Fast output system for Snort</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/bigeye/ChangeLog b/net-analyzer/bigeye/ChangeLog
index 77eacbcc97c2..50ceb6176e8c 100644
--- a/net-analyzer/bigeye/ChangeLog
+++ b/net-analyzer/bigeye/ChangeLog
@@ -1,9 +1,32 @@
 # ChangeLog for net-analyzer/bigeye
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/ChangeLog,v 1.1 2002/08/19 03:49:31 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/ChangeLog,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
+
+*bigeye-0.3-r1 (08 Sep 2005)
+
+  08 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +bigeye-0.3-r1.ebuild:
+  Use my new patch to fix compilation warnings in gcc-3.4.
+
+  29 Aug 2005; <dang@gentoo.org> bigeye-0.3.ebuild:
+  Marked ~amd64
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> bigeye-0.3.ebuild:
+  Added to ~ppc.
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> bigeye-0.3.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bigeye-0.3.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bigeye-0.3.ebuild:
+  change virtual/glibc to virtual/libc
 
 *bigeye-0.3 (18 Aug 2002)
 
+  21 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc3 patch by Sven Wegener #41692.
+
   18 Aug 2002; Bruce A. Locke <blocke@shivan.org> bigeye-0.3.ebuild:
   Initial import.
 
diff --git a/net-analyzer/bigeye/Manifest b/net-analyzer/bigeye/Manifest
index e69de29bb2d1..64bc9d729717 100644
--- a/net-analyzer/bigeye/Manifest
+++ b/net-analyzer/bigeye/Manifest
@@ -0,0 +1,7 @@
+MD5 8ef98b2cb770190cd10cdb71595ccf30 bigeye-0.3.ebuild 957
+MD5 fa5c66f3e0b78b26db67aea78f715355 bigeye-0.3-r1.ebuild 1018
+MD5 6a7d64eed9c79e56f27c47d627b00036 ChangeLog 1102
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 8ef1b063fc9655f3f06781a2eeaa785d files/0.3-gcc3.patch 525
+MD5 18b8ab6d586876dda6d6ff539a6c96a0 files/digest-bigeye-0.3-r1 126
+MD5 dcc42b28916e9e2c9b9d9aff3b156684 files/digest-bigeye-0.3 58
diff --git a/net-analyzer/bigeye/bigeye-0.3-r1.ebuild b/net-analyzer/bigeye/bigeye-0.3-r1.ebuild
index 3913b068e229..b93d5d7370ec 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r1.ebuild
+++ b/net-analyzer/bigeye/bigeye-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/net-analyzer/bigeye/bigeye-0.3-r1.ebuild,v 1.1 2005/09/08 18:49:53 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
diff --git a/net-analyzer/bigeye/bigeye-0.3.ebuild b/net-analyzer/bigeye/bigeye-0.3.ebuild
index 3ea53bdb9678..c67e9dae6f96 100644
--- a/net-analyzer/bigeye/bigeye-0.3.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3.ebuild
@@ -1,44 +1,41 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3.ebuild,v 1.1 2002/08/19 03:49:31 blocke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
+
+inherit toolchain-funcs eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Bigeye is a network utility dump and simple honeypot utility"
 HOMEPAGE="http://violating.us/projects/bigeye/"
 SRC_URI="http://violating.us/projects/bigeye/download/${P}.tgz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
 
-DEPEND="virtual/glibc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
 
-src_compile() {
+DEPEND="virtual/libc"
 
-	cd ${S}/src
-	gcc ${CFLAGS} bigeye.c emulate.c -o bigeye -W
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+}
 
+src_compile() {
+	cd src
+	$(tc-getCC) ${CFLAGS} bigeye.c emulate.c -o bigeye || die
 }
 
 src_install() {
+	dobin src/bigeye || die
 
-	dobin src/bigeye
-
-	dodir /usr/share/bigeye/messages
 	insinto /usr/share/bigeye
 	doins sig.file
-
-	cp -r messages/* ${D}/usr/share/bigeye/messages
-
+	cp -r messages ${D}/usr/share/bigeye/
 	dodoc README
-
 }
 
 pkg_postinst() {
-
-	einfo
-	einfo The service emulation files mentioned in the README are located in
-	einfo /usr/share/bigeye/messages.
-	einfo
-
+	einfo "The service emulation files mentioned in the README"
+	einfo "are located in /usr/share/bigeye/messages"
 }
-
diff --git a/net-analyzer/bing/ChangeLog b/net-analyzer/bing/ChangeLog
index ba094707960f..c3afbb424cf5 100644
--- a/net-analyzer/bing/ChangeLog
+++ b/net-analyzer/bing/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-analyzer/bing
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bing/ChangeLog,v 1.1 2003/09/06 23:33:49 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bing/ChangeLog,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
+
+  18 Jun 2005; Torsten Veller <tove@gentoo.org> bing-1.1.3.ebuild:
+  Fixed HOMEPAGE. Thanks to Marco Morales in #87202.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> bing-1.1.3.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> bing-1.1.3.ebuild:
+  stable on ia64
+
+  19 Aug 2004; David Holm <dholm@gentoo.org> bing-1.1.3.ebuild:
+  Added to ~ppc.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> bing-1.1.3.ebuild:
+  Changed SRC_URI to use debian mirrors, marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> bing-1.1.3.ebuild:
+  change virtual/glibc to virtual/libc
+
+  05 Oct 2003; Chuck Short <zul@gentoo.org> bing-1.1.3.ebuild:
+  Added ~ia64 to keywords.
+
+  07 Sep 2003; Michael Sterrett <msterret@gentoo.org> bing-1.1.3.ebuild:
+  use sed -i; sed in unpack; error message for emake; Readme.txt, not Readme
 
 *bing-1.1.3 (06 Sep 2003)
 
diff --git a/net-analyzer/bing/Manifest b/net-analyzer/bing/Manifest
index 982737d1901c..b70c734c7786 100644
--- a/net-analyzer/bing/Manifest
+++ b/net-analyzer/bing/Manifest
@@ -1,2 +1,14 @@
-MD5 5c329c23803a6646644e8d781e309698 bing-1.1.3.ebuild 674
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7facfbdd8c2cb74bbacaaf89936658ac bing-1.1.3.ebuild 820
+MD5 9e8b1fd816fc23dbf1d1633a9e6c3612 ChangeLog 1183
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
 MD5 bf66c0ba5f0a560b8714360b378c26b6 files/digest-bing-1.1.3 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCtI4NV3J2n04EauwRAg9PAJ4lszTZXdVD+qrOEL3VPlu4lzHdaQCg1op4
+oFnxKcR4fKowmsua1MmXRqA=
+=HQ5e
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/bing/bing-1.1.3.ebuild b/net-analyzer/bing/bing-1.1.3.ebuild
index cbbba55bdcc3..4c84bd177dde 100644
--- a/net-analyzer/bing/bing-1.1.3.ebuild
+++ b/net-analyzer/bing/bing-1.1.3.ebuild
@@ -1,30 +1,36 @@
-# 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/net-analyzer/bing/bing-1.1.3.ebuild,v 1.1 2003/09/06 23:33:49 zul Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bing/bing-1.1.3.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 DESCRIPTION="A point-to-point bandwidth measurement tool."
-SRC_URI="http://distro.ibiblio.org/pub/Linux/distributions/debian/pool/main/b/bing/${PN}_1.1.3.orig.tar.gz"
-HOMEPAGE="http://www.cnam.fr/reseau/bing.html"
+SRC_URI="mirror://debian/pool/main/b/bing/${PN}_${PV}.orig.tar.gz"
+HOMEPAGE="http://fgouget.free.fr/bing/index-en.shtml"
+RESTRICT="nomirror"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ia64 ~amd64 ppc"
 SLOT="0"
 LICENSE="as-is"
 IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND=""
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-S="${WORKDIR}/${P}"
+	sed -i \
+		-e "s:#COPTIM = -g: COPTIM = ${CFLAGS}:" Makefile || \
+			die "sed Makefile failed"
+}
 
 src_compile() {
-	cp Makefile Makefile.orig
-	sed -e "s:#COPTIM = -g: COPTIM = ${CLFAGS}:" Makefile.orig > Makefile
-	emake || die 
+	emake || die "emake failed"
 }
 
 src_install() {
 	dobin bing
 	doman unix/bing.8
-	dodoc ChangeLog Readme.1st Readme
+	dodoc ChangeLog Readme.{1st,txt}
 }
diff --git a/net-analyzer/bmon/ChangeLog b/net-analyzer/bmon/ChangeLog
index f63db6e71756..74463673e0c4 100644
--- a/net-analyzer/bmon/ChangeLog
+++ b/net-analyzer/bmon/ChangeLog
@@ -1,8 +1,105 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.1 2003/06/18 18:51:35 lordvan Exp $
+# ChangeLog for net-analyzer/bmon
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+  05 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> bmon-2.1.0-r2.ebuild:
+  2.1.0-r2 x86 stable.
+
+  08 Oct 2005; Simon Stelling <blubb@gentoo.org> bmon-2.1.0-r2.ebuild:
+  added ~amd64 keyword
+
+  18 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  bmon-2.1.0-r2.ebuild:
+  Added ~ppc Keyword
+
+*bmon-2.1.0-r2 (10 Sep 2005)
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -bmon-2.1.0-r1.ebuild,
+  +bmon-2.1.0-r2.ebuild:
+  Revision bump since installed contents have changed. Also, sed line is no
+  longer necessary.
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/libnl-0.5.0-include.diff, bmon-2.1.0-r1.ebuild:
+  Broke off libnl from bmon, it is now provided by dev-libs/libnl. Dropped all
+  keywords except x86 because of this, opening a new bug to get things
+  keyworded properly again.
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> bmon-2.1.0-r1.ebuild:
+  Add dbi USE flag, which DEPENDs on dev-db/libdbi and activates support for
+  it and rrdtool USE flag, which DEPENDs on net-analyzer/rrdtool and actives
+  librrd support. Forced to drop hppa and sparc because of libdbi dependency.
+
+  09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/bmon-2.1.0-gcc4.diff, bmon-2.1.0-r1.ebuild:
+  Add gcc4 patch for bug 105343. Thanks to Anatoly Kamchatnov <rev@male.ru>
+  for reporting.
+
+*bmon-2.1.0-r1 (09 Sep 2005)
+
+  09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/libnl-0.5.0-include.diff, -bmon-2.0.1.ebuild,
+  +bmon-2.1.0-r1.ebuild:
+  Remove old version, add patch to include missing tc_ratespec declaration in
+  tc.h.
+
+  08 Sep 2005; Luis Medinas <metalgod@gentoo.org> bmon-2.1.0.ebuild:
+  Marked Stable on AMD64.
+
+  05 Sep 2005; Jason Wever <weeve@gentoo.org> bmon-2.1.0.ebuild:
+  Stable on SPARC.
+
+  05 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> bmon-2.1.0.ebuild:
+  x86 stable.
+
+*bmon-2.1.0 (02 Aug 2005)
+
+  02 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> +bmon-2.1.0.ebuild:
+  Version bump for bug 101039. Thanks to spam <spam at tnonline dot net>.
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> bmon-2.0.1.ebuild:
+  amd64 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -bmon-1.2.1.ebuild:
+  Removing old version. Note that there is a 2.1.0 version available, but I am
+  not bumping it since I could not get it to compile.
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> bmon-2.0.1.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> bmon-2.0.1.ebuild:
+  Marked stable on x86.
+
+*bmon-2.0.1 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> bmon-1.2.1.ebuild,
+  +bmon-2.0.1.ebuild:
+  Version bump with added library. Version bump in bug #74954 by 
+  Vanquirius <marcelogoes@gmail.com>
+
+  13 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> bmon-1.2.1.ebuild:
+  Added amd64 keyword, closing #56849.
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> bmon-1.2.0.ebuild,
+  bmon-1.2.1.ebuild:
+  Added missing IUSE
+
+  06 Feb 2004; Markus Nigbur <pyrania@gentoo.org> bmon-1.2.0.ebuild,
+  bmon-1.2.1.ebuild:
+  Stable on x86, sparc; Fixed bug #40596; DESCRIPTION cleanup.
+
+*bmon-1.2.1 (08 Jan 2004)
+
+  08 Jan 2004; Brandon Low <lostlogic@gentoo.org> bmon-1.2.1.ebuild:
+  Mark stable for x86
+
+*bmon-1.2.1 (20 Oct 2003)
+
+  20 Oct 2003; Brandon Low <lostlogic@gentoo.org> bmon-1.2.1.ebuild:
+  Minor bugfix
 
 *bmon-1.2.0 (18 Jun 2003)
 
-  18 Jun 2003; Thomas Raschbacher <lordvan@gentoo.org> bmon-1.2.0,ChangeLog:
-  initial import
\ No newline at end of file
+  18 Jun 2003; Thomas Raschbacher <lordvan@gentoo.org>
+  bmon-1.2.0.ebuild:
+  initial import
diff --git a/net-analyzer/bmon/Manifest b/net-analyzer/bmon/Manifest
index 11e725850031..64f9b923950b 100644
--- a/net-analyzer/bmon/Manifest
+++ b/net-analyzer/bmon/Manifest
@@ -1,5 +1,7 @@
-MD5 125ee013081b112d56a1d15507d72ef2 ChangeLog~ 3674
-MD5 8d0b08793176687a15aaae96f188691b ChangeLog 254
-MD5 1cc495d138c51a15b48e6e445e1c1b79 bmon-1.2.0.ebuild 414
-MD5 b249e408c219768bb47d2f57243ccbf8 bmon-1.2.0.ebuild~ 5822
-MD5 29d1aa21d794773519e0d177988ca6c2 files/digest-bmon-1.2.0 62
+MD5 eba8d7ec10a24a1358babcef07c3848d bmon-2.1.0-r2.ebuild 937
+MD5 ff6ae62ffc745b5597d36133b06b6a46 bmon-2.1.0.ebuild 1071
+MD5 430f9301d383bc2e6f393c063f2c37e8 ChangeLog 3641
+MD5 5fbd67ef2e49ca1d630675f7c46fae5c metadata.xml 233
+MD5 6b5f014b7739049db269b0d04eddcb63 files/bmon-2.1.0-gcc4.diff 732
+MD5 d039d24abde362c72d7e7e5232fa5ec4 files/digest-bmon-2.1.0-r2 62
+MD5 66dfb9b26097d1b2c2e2fe8c9a5ea4c2 files/digest-bmon-2.1.0 125
diff --git a/net-analyzer/bmon/bmon-2.1.0-r2.ebuild b/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
index f01fbbedb219..f7ef41129e71 100644
--- a/net-analyzer/bmon/bmon-2.1.0-r2.ebuild
+++ b/net-analyzer/bmon/bmon-2.1.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/net-analyzer/bmon/bmon-2.1.0-r2.ebuild,v 1.1 2005/09/10 20:19:56 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://people.suug.ch/~tgr/bmon/"
 SRC_URI="http://people.suug.ch/~tgr/bmon/files/${P}.tar.gz"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="dbi rrdtool"
 
 DEPEND=">=sys-libs/ncurses-5.3-r2
diff --git a/net-analyzer/bmon/bmon-2.1.0.ebuild b/net-analyzer/bmon/bmon-2.1.0.ebuild
index 2e71a71fbdb3..b478a125fbaf 100644
--- a/net-analyzer/bmon/bmon-2.1.0.ebuild
+++ b/net-analyzer/bmon/bmon-2.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/net-analyzer/bmon/bmon-2.1.0.ebuild,v 1.1 2005/08/02 00:21:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bmon/bmon-2.1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ SRC_URI="http://people.suug.ch/~tgr/bmon/files/${P}.tar.gz
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.3-r2"
diff --git a/net-analyzer/braa/ChangeLog b/net-analyzer/braa/ChangeLog
index 525e1dfb68ec..505a3c7a91d0 100644
--- a/net-analyzer/braa/ChangeLog
+++ b/net-analyzer/braa/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-analyzer/braa
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/braa/ChangeLog,v 1.1 2004/06/08 15:45:28 squinky86 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/braa/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+  05 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> braa-0.8-r1.ebuild:
+  0.8-r1 x86 stable.
+
+*braa-0.8-r1 (09 Sep 2005)
+
+  09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/braa-0.8-gentoo.diff, +braa-0.8-r1.ebuild:
+  Add patch to deal with hardcoded CFLAGS, LDFLAGS and cc in the Makefile and
+  change port from u_int16_t to u_int32_t so that comparison in
+  bapp_rangesplit_query() is not always false in queries.c.
+
+  12 Apr 2005; Jason Wever <weeve@gentoo.org> braa-0.8.ebuild:
+  Added ~sparc keyword.
+
+  05 Oct 2004; Malcolm Lashley <malc@gentoo.org> braa-0.8.ebuild:
+  ~amd64 bug #66090
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> braa-0.8.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> braa-0.8.ebuild:
+  change virtual/glibc to virtual/libc
+
+  09 Jun 2004; David Holm <dholm@gentoo.org> braa-0.8.ebuild:
+  Added to ~ppc.
 
 *braa-0.8 (08 Jun 2004)
 
diff --git a/net-analyzer/braa/Manifest b/net-analyzer/braa/Manifest
index 5e28ed75fb12..141056bbc958 100644
--- a/net-analyzer/braa/Manifest
+++ b/net-analyzer/braa/Manifest
@@ -1,3 +1,7 @@
-MD5 dd67b9d1ea667680829c5566bab1cbf2 braa-0.8.ebuild 437
-MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 05dc1a0968d57c16aae6152b1745e114 braa-0.8-r1.ebuild 664
+MD5 6c0b02ebd5da12249bf3053de93782b2 braa-0.8.ebuild 563
+MD5 5095bb6b4454ee0c615a0fa8db417306 ChangeLog 1331
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 3dceca0c74ebee97a9cf56e902c9ccdd files/braa-0.8-gentoo.diff 1015
 MD5 ef175c4afbfced9ee759a46a35c6a1db files/digest-braa-0.8 59
+MD5 ef175c4afbfced9ee759a46a35c6a1db files/digest-braa-0.8-r1 59
diff --git a/net-analyzer/braa/braa-0.8-r1.ebuild b/net-analyzer/braa/braa-0.8-r1.ebuild
index 0d96a1f3d466..3a9bcef8765e 100644
--- a/net-analyzer/braa/braa-0.8-r1.ebuild
+++ b/net-analyzer/braa/braa-0.8-r1.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/braa/braa-0.8-r1.ebuild,v 1.1 2005/09/09 02:31:27 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/braa/braa-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 inherit toolchain-funcs eutils
 
 DESCRIPTION="Quick and dirty mass SNMP scanner"
 HOMEPAGE="http://s-tech.elsat.net.pl/braa/"
-SRC_URI="${HOMEPAGE}/${P}.tar.gz"
+SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
+KEYWORDS="x86 ~amd64 ~ppc ~sparc"
 IUSE=""
 
 DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${P}-gentoo.diff
 }
 
 src_compile() {
diff --git a/net-analyzer/braa/braa-0.8.ebuild b/net-analyzer/braa/braa-0.8.ebuild
index fa8e6593c4c8..bc08810d71f1 100644
--- a/net-analyzer/braa/braa-0.8.ebuild
+++ b/net-analyzer/braa/braa-0.8.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/net-analyzer/braa/braa-0.8.ebuild,v 1.1 2004/06/08 15:45:28 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/braa/braa-0.8.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 DESCRIPTION="Quick and dirty mass SNMP scanner"
 
@@ -9,10 +9,10 @@ SRC_URI="http://s-tech.elsat.net.pl/braa/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	emake || die "emake failed"
diff --git a/net-analyzer/braa/metadata.xml b/net-analyzer/braa/metadata.xml
index 9eb186981c76..78692635ad22 100644
--- a/net-analyzer/braa/metadata.xml
+++ b/net-analyzer/braa/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
-	<maintainer>
-		<email>squinky86@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/bwm-ng/ChangeLog b/net-analyzer/bwm-ng/ChangeLog
index 541ca5e67db8..e63f9f6aff86 100644
--- a/net-analyzer/bwm-ng/ChangeLog
+++ b/net-analyzer/bwm-ng/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/bwm-ng
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwm-ng/ChangeLog,v 1.1 2005/01/22 20:14:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwm-ng/ChangeLog,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> bwm-ng-0.5.ebuild:
+  Added to ~ppc.
+
+*bwm-ng-0.5 (23 Feb 2005)
+
+  23 Feb 2005; Benedikt Boehm <hollow@gentoo.org> +bwm-ng-0.5.ebuild:
+  Version bump
 
 *bwm-ng-0.4 (22 Jan 2005)
 
diff --git a/net-analyzer/bwm-ng/Manifest b/net-analyzer/bwm-ng/Manifest
index 43aa9d8c6593..0b8fbeceff43 100644
--- a/net-analyzer/bwm-ng/Manifest
+++ b/net-analyzer/bwm-ng/Manifest
@@ -1,4 +1,6 @@
-MD5 d47090a490f66d73d254c8223650bfe4 bwm-ng-0.4.ebuild 602
+MD5 cde094c62e87d294615627ead0c34184 ChangeLog 582
+MD5 e4865e89eff93a4083c1cf30c80cbc3f bwm-ng-0.4.ebuild 590
 MD5 3d4dfb4356f56ee83e0f426163e3b6cf metadata.xml 231
-MD5 7ccea03d8c5add5ee4b0ca075937d3ac ChangeLog 297
+MD5 af54bfc15b061a0b8800e679be7033c5 bwm-ng-0.5.ebuild 783
 MD5 2da56395dd76e61e1f673c5ee57f071f files/digest-bwm-ng-0.4 61
+MD5 235b736d7fc5e72871a9a4c6b98ce828 files/digest-bwm-ng-0.5 61
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild
index 499241ffcaf6..ae50b0572d22 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-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/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild,v 1.1 2005/01/22 20:14:00 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwm-ng/bwm-ng-0.4.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor for Linux, BSD, and Mac OS X"
 SRC_URI="http://gropp.org/${PN}-${PV}.tar.gz"
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.5.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.5.ebuild
index a5d96cc8f710..64f09ffdbf79 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.5.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.5.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/net-analyzer/bwm-ng/bwm-ng-0.5.ebuild,v 1.1 2005/02/23 15:17:29 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwm-ng/bwm-ng-0.5.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 DESCRIPTION="Bandwidth Monitor NG is a small and simple console-based bandwidth monitor for Linux, BSD, and Mac OS X"
 SRC_URI="http://www.gropp.org/bwm-ng/${P}.tar.gz"
 HOMEPAGE="http://www.gropp.org/"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="html csv ncurses"
diff --git a/net-analyzer/bwmon/ChangeLog b/net-analyzer/bwmon/ChangeLog
index 31d2311079c4..b8676ecb28ef 100644
--- a/net-analyzer/bwmon/ChangeLog
+++ b/net-analyzer/bwmon/ChangeLog
@@ -1,7 +1,27 @@
 # ChangeLog for net-analyzer/bwmon
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.1 2002/06/15 07:32:46 lostlogic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
+  19 Jul 2005; David Holm <dholm@gentoo.org> bwmon-1.3.ebuild:
+  Added to ~ppc.
+
+  26 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> bwmon-1.3.ebuild:
+  amd64 stable.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> bwmon-1.3.ebuild:
+  Marked ~amd64 wrt bug #91331.
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> bwmon-1.3.ebuild:
+  added metadata
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> bwmon-1.3.ebuild:
+  Tidy
+
+  25 Nov 2003; Martin Holzer <mholzer@gentoo.org> bwmon-1.3.ebuild:
+  adding RESTRICT="nomirror"
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *bwmon-1.3 (15 Jun 2002)
 
   15 Jun 2002; Brandon Low <lostlogic@gentoo.org> bwmon-1.3.ebuild: 
diff --git a/net-analyzer/bwmon/Manifest b/net-analyzer/bwmon/Manifest
index e69de29bb2d1..c9b07425654c 100644
--- a/net-analyzer/bwmon/Manifest
+++ b/net-analyzer/bwmon/Manifest
@@ -0,0 +1,4 @@
+MD5 d940539170b94da0bc90281139af93bb ChangeLog 1032
+MD5 af960760b227f536ef7983894008d8ce bwmon-1.3.ebuild 813
+MD5 77c8b03a338439080559f1aed8e76835 metadata.xml 227
+MD5 270ff1875fead6fcabdd180f8b24aa82 files/digest-bwmon-1.3 59
diff --git a/net-analyzer/bwmon/bwmon-1.3.ebuild b/net-analyzer/bwmon/bwmon-1.3.ebuild
index 8b8383c2ba74..76ebdbd2f350 100644
--- a/net-analyzer/bwmon/bwmon-1.3.ebuild
+++ b/net-analyzer/bwmon/bwmon-1.3.ebuild
@@ -1,40 +1,34 @@
-# 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/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.1 2002/06/15 07:32:46 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bwmon/bwmon-1.3.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 DESCRIPTION="Simple ncurses bandwidth monitor"
 HOMEPAGE="http://bwmon.sourceforge.net/"
-LICENSE="GPL"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
+
 DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-SLOT="0"
 
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-S=${WORKDIR}/${P}
+SLOT="0"
+LICENSE="GPL-2 public-domain"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
 
 src_unpack() {
-
 	unpack ${A}
 	cd ${S}
-	sed -e "s:/usr/local/bin:\$\{DESTDIR\}usr/bin:" \
-	    Makefile > Makefile.hacked
-	mv Makefile.hacked Makefile
-	sed -e "s:CFLAGS =:CFLAGS = ${CFLAGS}:" \
+	sed -i -e "s:/usr/local/bin:\$\{DESTDIR\}usr/bin:" \
+	    Makefile
+	sed -i -e "s:CFLAGS =:CFLAGS = ${CFLAGS}:" \
 	    -e "s:LDFLAGS =:LDFLAGS = -L/lib:" \
-	    src/Makefile > src/Makefile.hacked
-	mv src/Makefile.hacked src/Makefile
-	
+	    src/Makefile
 }
 
-
 src_compile() {
-
 	emake || die
-
 }
 
 src_install () {
-
 	dodir /usr/bin
 	make DESTDIR=${D} install || die
 	dodoc README
diff --git a/net-analyzer/cacti-cactid/ChangeLog b/net-analyzer/cacti-cactid/ChangeLog
index 32de8a3102df..28a42dd2fe6f 100644
--- a/net-analyzer/cacti-cactid/ChangeLog
+++ b/net-analyzer/cacti-cactid/ChangeLog
@@ -1,6 +1,72 @@
 # ChangeLog for net-analyzer/cacti-cactid
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.1 2005/04/10 00:18:29 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/ChangeLog,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
+
+  18 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  -cacti-cactid-0.8.6d-r1.ebuild, cacti-cactid-0.8.6e.ebuild,
+  cacti-cactid-0.8.6f_p1.ebuild:
+  * Removed old ebuild
+  * Added >=dev-db/mysql-5 block (bug #112010)
+  * Fixed RDEPEND
+
+*cacti-cactid-0.8.6f_p1 (23 Oct 2005)
+
+  23 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-cactid-0.8.6f_p1.ebuild:
+  * Version bump
+
+  24 Aug 2005; Lance Albertson <ramereth@gentoo.org>
+  -cacti-cactid-0.8.6c.ebuild, cacti-cactid-0.8.6e.ebuild:
+  * Stable on x86
+  * Ebuild cleanup
+
+*cacti-cactid-0.8.6e (10 Jul 2005)
+
+  10 Jul 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-cactid-0.8.6e.ebuild:
+  Version bump
+
+  03 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  -cacti-cactid-0.9_pre20050528.ebuild:
+  Removing cvs snapshot per request of upstream. Basically, the main branch
+  doesn't work with any of the current stable releases. Instead of trying to
+  maintain both a cactid and cacti cvs snapshot ebuild, just going to axe this
+  one.
+
+*cacti-cactid-0.9_pre20050528 (28 May 2005)
+
+  28 May 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-cactid-0.9_pre20050528.ebuild:
+  New cvs snapshot ebuild
+
+  28 May 2005; Lance Albertson <ramereth@gentoo.org>
+  cacti-cactid-0.8.6c.ebuild, cacti-cactid-0.8.6d-r1.ebuild:
+  fix the autoconf preference so it will actually work
+
+  15 May 2005; Joseph Jezak <josejx@gentoo.org>
+  cacti-cactid-0.8.6d-r1.ebuild:
+  Marked ~ppc for bug #92412.
+
+  10 May 2005; Lance Albertson <ramereth@gentoo.org>
+  cacti-cactid-0.8.6c.ebuild, -cacti-cactid-0.8.6d.ebuild,
+  cacti-cactid-0.8.6d-r1.ebuild:
+  marked stable for x86
+  updated 0.8.6c to reflect changed made in 0.8.6d-r1
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> cacti-cactid-0.8.6d-r1.ebuild:
+  Added ~sparc keyword.
+
+*cacti-cactid-0.8.6d-r1 (01 May 2005)
+
+  01 May 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-cactid-0.8.6d-r1.ebuild:
+  conf file fix from #90662
+
+*cacti-cactid-0.8.6d (10 Apr 2005)
+
+  10 Apr 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-cactid-0.8.6d.ebuild:
+  New version
 
 *cacti-cactid-0.8.6c (10 Apr 2005)
 
diff --git a/net-analyzer/cacti-cactid/Manifest b/net-analyzer/cacti-cactid/Manifest
index 7dada0b17030..ef738244fbe4 100644
--- a/net-analyzer/cacti-cactid/Manifest
+++ b/net-analyzer/cacti-cactid/Manifest
@@ -1,3 +1,6 @@
-MD5 4dbc648f1776f968b897fe4d4c2c187c cacti-cactid-0.8.6c.ebuild 1123
 MD5 528bed3e0527d5e490f39fdd9c98daa6 metadata.xml 682
-MD5 ffd8c4a7927d055eacd63bdbdb0d2308 files/digest-cacti-cactid-0.8.6c 71
+MD5 b631470dd1da05fb41baf832957bacf9 ChangeLog 2493
+MD5 302b1aa298be2fb64bcae605e741efe8 cacti-cactid-0.8.6e.ebuild 1435
+MD5 4c6fecf2f6bedf5f029af39300f40a5f cacti-cactid-0.8.6f_p1.ebuild 1538
+MD5 58c86d50c9315285ddaf0c5f24269e2d files/digest-cacti-cactid-0.8.6e 71
+MD5 c0e5c0f4c74e06f2c99e6e086be7dfd7 files/digest-cacti-cactid-0.8.6f_p1 73
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
index f8ea2115772a..ec60e4b70349 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.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/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild,v 1.1 2005/07/10 21:13:12 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6e.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
 DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
 as possible"
@@ -9,11 +9,12 @@ SRC_URI="http://www.cacti.net/downloads/cactid/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
 		net-analyzer/rrdtool
+		!>=dev-db/mysql-5
 		dev-db/mysql
 		>=sys-devel/autoconf-2.53"
 RDEPEND="net-analyzer/cacti"
diff --git a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
index 2f02ef428fb8..1225697571df 100644
--- a/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild
+++ b/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.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/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild,v 1.1 2005/10/23 22:23:15 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti-cactid/cacti-cactid-0.8.6f_p1.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
 MY_PV=${PV/_p/-}
 DESCRIPTION="Cactid is a poller for Cacti that primarily strives to be as fast
@@ -14,9 +14,13 @@ KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="net-analyzer/net-snmp
+		!>=dev-db/mysql-5
 		dev-db/mysql
 		>=sys-devel/autoconf-2.59"
-RDEPEND="net-analyzer/cacti"
+RDEPEND="net-analyzer/cacti
+		net-analyzer/net-snmp
+		!>=dev-db/mysql-5
+		dev-db/mysql"
 
 src_unpack() {
 	unpack ${A} ; mv ${WORKDIR}/${PN}-${MY_PV} ${S} ; cd ${S}
diff --git a/net-analyzer/cacti/ChangeLog b/net-analyzer/cacti/ChangeLog
index 89ba85005cc3..07f7eecb212a 100644
--- a/net-analyzer/cacti/ChangeLog
+++ b/net-analyzer/cacti/ChangeLog
@@ -1,8 +1,252 @@
 # ChangeLog for net-analyzer/cacti
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.1 2002/10/23 14:48:37 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/ChangeLog,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+  18 Nov 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6f.ebuild,
+  cacti-0.8.6f-r1.ebuild, cacti-0.8.6g.ebuild,
+  cacti-0.8.6g_p20051023.ebuild:
+  * Removed old ebuild
+  * Added >=dev-db/mysql-5 blocker (bug #112010)
+  * Adjusted httpd dep (now have a choice between apache1, apache2, or
+    lighttpd (only on 0.8.6g_p20051023)) bug #107512
+
+  24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> cacti-0.8.6g.ebuild:
+  Stable on sparc
+
+*cacti-0.8.6g_p20051023 (23 Oct 2005)
+
+  23 Oct 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6g.ebuild,
+  +cacti-0.8.6g_p20051023.ebuild:
+  * Stable on x86
+  * Added new patched version for fixes
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> cacti-0.8.6f-r1.ebuild:
+  Mark 0.8.6f-r1 stable on alpha
+
+*cacti-0.8.6g (10 Sep 2005)
+
+  10 Sep 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6e.ebuild,
+  +cacti-0.8.6g.ebuild:
+  * New version release bump
+  * Remove old version
+
+*cacti-0.8.6f-r2 (09 Sep 2005)
+
+  09 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  +cacti-0.8.6f-r2.ebuild:
+  * Fixed php DEPEND to use virtuals per bug #102827
+
+  03 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  cacti-0.8.6f-r1.ebuild:
+  Stable on sparc
+
+*cacti-0.8.6f-r1 (03 Aug 2005)
+
+  03 Aug 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +cacti-0.8.6f-r1.ebuild:
+  Revision bump with upstream patches.
+
+  03 Jul 2005; Lance Albertson <ramereth@gentoo.org> cacti-0.8.6f.ebuild:
+  * stable on x86 (bug #97475)
+
+  02 Jul 2005; Jason Wever <weeve@gentoo.org> cacti-0.8.6f.ebuild:
+  Stable on SPARC wrt bug #97475.
+
+*cacti-0.8.6f (02 Jul 2005)
+
+  02 Jul 2005; Lance Albertson <ramereth@gentoo.org> -cacti-0.8.6b.ebuild,
+  -cacti-0.8.6c.ebuild, -cacti-0.8.6d.ebuild, +cacti-0.8.6f.ebuild:
+  * Added 0.8.6f for a security bump (bug #97475)
+  * Cleaned out old ebuilds
+
+  30 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  files/digest-cacti-0.8.6e, Manifest:
+  fixed digest and uploaded correct tarball for 0.8.6e
+
+  21 Jun 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  cacti-0.8.6e.ebuild:
+  Security Bump per bug #96243
+  (SQL injection / global php var security issues)
+  * x86 & sparc marked stable
+  * alpha, amd64, ppc marked testing
+  * Updated metadata
+
+  17 Jun 2005; Lance Albertson <ramereth@gentoo.org>
+  files/digest-cacti-0.8.6e, Manifest:
+  Updated digest for new tarball from author
+
+*cacti-0.8.6e (15 Jun 2005)
+
+  15 Jun 2005; <solar@gentoo.org> +cacti-0.8.6e.ebuild:
+  - added cacti-0.8.6e masked by request.
+
+  02 May 2005; Eldad Zack <eldad@gentoo.org> files/postinstall-en.txt,
+  cacti-0.8.6b.ebuild, cacti-0.8.6c.ebuild, cacti-0.8.6d.ebuild:
+  Fixed to use the webapp_configfile function for include/config.php. Updated
+  postinstall accordingly. Closes bug #90908. Thanks to Andy Blyler
+  <ajb@blyler.cc>.
+
+*cacti-0.8.6d (29 Apr 2005)
+
+  29 Apr 2005; Martin Holzer <mholzer@gentoo.org> +cacti-0.8.6d.ebuild:
+  Version bumped.
+
+  15 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt:
+  More updates to postinst-en.txt for bug 83673. Thanks to Jakub Moc for
+  helping me get the upgrade instructions up-to-date (and correct).
+
+  09 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> files/postinstall-en.txt,
+  cacti-0.8.6b.ebuild, cacti-0.8.6c.ebuild:
+  Update postinst-en.txt for bug 83673; updated both ebuilds to use
+  built_with_use instead of the homegrown check_with_use() function. Also
+  fixed the dodir ${D}... tidbit which caused obvious unwanted side effects.
+
+  04 Mar 2005; Jason Wever <weeve@gentoo.org> cacti-0.8.6c.ebuild:
+  Stable on sparc.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> cacti-0.8.6c.ebuild:
+  Marked stable on x86.
+
+*cacti-0.8.6c (02 Jan 2005)
+
+  02 Jan 2005; Martin Holzer <mholzer@gentoo.org> files/postinstall-en.txt,
+  +cacti-0.8.6c.ebuild:
+  Version bumped.
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.6b.ebuild:
+  Stable on sparc.
+
+  06 Nov 2004; Eldad Zack <eldad@gentoo.org> -cacti-0.8.5a-r1.ebuild,
+  cacti-0.8.6b.ebuild:
+  x86 stable
+
+  25 Oct 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.5a-r2.ebuild:
+  Stable on sparc.
+
+  24 Oct 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r2.ebuild:
+  Marked x86 stable
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> +files/postinstall-en.txt,
+  cacti-0.8.6b.ebuild:
+  Better postinst instructions: using webapp.eclass postinst support
+
+*cacti-0.8.6b (14 Oct 2004)
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> +cacti-0.8.6b.ebuild:
+  Version bump. Updated deps (cron, php). Check useflags of php/mod_php. Got rid
+  of version detection, and corrrected a few postinst instructions.
+
+*cacti-0.8.5a-r2 (23 Aug 2004)
+
+  23 Aug 2004; Eldad Zack <eldad@gentoo.org> +cacti-0.8.5a-r2.ebuild:
+  Migrated ebuild from webapp-apache.eclass to use the webapp.eclass.
+  Closes bug #52596.
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a-r1.ebuild:
+  Moved include/config.php to include/config-sample.php, so we won't overwrite
+  old config.
+
+*cacti-0.8.5a-r1 (17 Aug 2004)
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  +files/cacti-0.8.5a-sql-injection.patch, +cacti-0.8.5a-r1.ebuild:
+  Security patch (SQL Injection): bumping to -r1 with x86 stable.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> cacti-0.8.5a.ebuild:
+  Typo in DESCRIPTION: frondend -> frontend. Bug 59717.
+
+  07 Jul 2004; Jason Wever <weeve@gentoo.org> cacti-0.8.5a.ebuild:
+  Stable on sparc.
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> cacti-0.8.5a.ebuild:
+  Added additional install instructions (crontab). Closes #53709. Thanks to
+  Lorinc Czegledi <lorinc.czegledi@mail.cpst.hu>. Also fixed previous version
+  detection.
+
+  08 May 2004; Danny van Dyk <kugelfang@gentoo.org> cacti-0.8.5a.ebuild:
+  Marked ~amd64.
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5a.ebuild:
+  x86 stable.
+
+*cacti-0.8.5a (10 Apr 2004)
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5a.ebuild:
+  Version bumped.
+
+*cacti-0.8.5 (29 Feb 2004)
+
+  29 Feb 2004; Martin Holzer <mholzer@gentoo.org> cacti-0.8.5.ebuild:
+  Version bumped. Closes 43137.
+
+  15 Dec 2003; Stuart Herbert <stuart@gentoo.org> cacti-0.8.3a.ebuild,
+  cacti-0.8.4.ebuild:
+  Fix for bug #32636
+
+  05 Dec 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.4.ebuild:
+  x86 stable.
+
+  05 Dec 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild,
+  cacti-0.8.3a.ebuild, cacti-0.8.4.ebuild:
+  changing chown. closes #35127.
+
+*cacti-0.8.4 (17 Nov 2003)
+
+  17 Nov 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild,
+  cacti-0.8.4.ebuild:
+  Version bumped.
+
+  17 Nov 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild:
+  adding webapps-apache.eclass
+
+  23 Sep 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild,
+  cacti-0.8.3.ebuild, cacti-0.8.3a.ebuild:
+  Changed mysql depend to useflag. Closes #29429.
+
+*cacti-0.8.3a (01 Sep 2003)
+
+  01 Sep 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3a.ebuild:
+  Version bumpe.d
+
+*cacti-0.8.3 (31 Aug 2003)
+
+  31 Aug 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.3.ebuild:
+  Version bumped.
+
+*cacti-0.8.2a (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.2a.ebuild:
+  Version bumped.
+
+*cacti-0.8.1-r1 (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.8.1-r1.ebuild:
+  Source is no more installed. Closes #23393.
+
+*cacti-0.8.1 (12 Jun 2003)
+
+  12 Jun 2003; Troy Dack <tad@gentoo.org> cacti-0.8.1.ebuild:
+  Version Bump. Now works with net-snmp (default for virtual/snmp) and ucd-snmp.
+  Updated postinst einfo message.
+
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Permissions fix, variable fix, dos format fix (#20686)
 
 *cacti-0.6.8a (23 Oct 2002)
 
+  13 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  Permissions fix, variable fix, dos format fix (#20686)
+
+  13 May 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild:
+  Added net-analyzer/rrdtool to RDEPEND. Closes #20953
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  05 Apr 2003; Martin Holzer <mholzer@gentoo.org> cacti-0.6.8a.ebuild:
+  Digest fix, marked as stable
+
+  14 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
+  Replaced hardcoding of /home/httpd/htdocs with a grep of /etc/apache/conf/apache.conf
+
   23 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
   Initial import. Ebuild submitted by me.
diff --git a/net-analyzer/cacti/Manifest b/net-analyzer/cacti/Manifest
index 791c47039890..41f52fc45c38 100644
--- a/net-analyzer/cacti/Manifest
+++ b/net-analyzer/cacti/Manifest
@@ -1,3 +1,11 @@
-MD5 00d96bd5bc9c43e2928dec60c49946ea ChangeLog 794
-MD5 aebb74483b7d4860577c9e07d66f1ff0 cacti-0.6.8a.ebuild 1465
-MD5 36cff775a40a01ca080d9b290109a795 files/digest-cacti-0.6.8a 64
+MD5 801af6dc824e125f1315090b95b317ec ChangeLog 8501
+MD5 191d624f14b534af99878690f9b5a083 metadata.xml 743
+MD5 c8c05fffd3c21c0297b9ad7cc47144fd cacti-0.8.6f-r1.ebuild 1997
+MD5 9f7924c1cca1e3e091dc4bcdef67ac63 cacti-0.8.6f-r2.ebuild 1990
+MD5 ad190d6043af74faf5f8093ccb73dc9b cacti-0.8.6g_p20051023.ebuild 1847
+MD5 781e313eeb8e4c96144b5c980a7b57bf cacti-0.8.6g.ebuild 1713
+MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r1 874
+MD5 cf35c7601be5a748b851ae64487871f2 files/postinstall-en.txt 2062
+MD5 b9b37ff105d9d50fb2c9a7b0b2a60429 files/digest-cacti-0.8.6g 65
+MD5 98acfee8c4fd81a85e6848e114b2e2eb files/digest-cacti-0.8.6f-r2 874
+MD5 80642855127d3174cad394f11f138243 files/digest-cacti-0.8.6g_p20051023 346
diff --git a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild b/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
index 45fa697b842e..6dae8fc82531 100644
--- a/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6f-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/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild,v 1.1 2005/08/03 00:42:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6f-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -14,7 +14,7 @@ for i in $UPSTREAM_PATCHES ; do
 done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
+KEYWORDS="alpha ~amd64 ~ppc sparc x86"
 IUSE="snmp"
 
 DEPEND=""
@@ -24,6 +24,7 @@ DEPEND=""
 RDEPEND="net-www/apache
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
+	!>=dev-db/mysql-5
 	dev-db/mysql
 	virtual/cron
 	dev-php/php
diff --git a/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild b/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild
index 50c923b5890a..e2d219b3757b 100644
--- a/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6f-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/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild,v 1.1 2005/09/09 21:32:35 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6f-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 inherit eutils webapp
 
diff --git a/net-analyzer/cacti/cacti-0.8.6g.ebuild b/net-analyzer/cacti/cacti-0.8.6g.ebuild
index 47b3a8d190a6..649b0639569f 100644
--- a/net-analyzer/cacti/cacti-0.8.6g.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6g.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/net-analyzer/cacti/cacti-0.8.6g.ebuild,v 1.1 2005/09/10 19:56:27 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.cacti.net/downloads/${P}.tar.gz"
 #done
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
 IUSE="snmp"
 
 DEPEND=""
@@ -24,6 +24,7 @@ DEPEND=""
 RDEPEND="net-www/apache
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
+	!>=dev-db/mysql-5
 	dev-db/mysql
 	virtual/cron
 	virtual/php
diff --git a/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild b/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
index 0d0200d0faef..da46b5605f7f 100644
--- a/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.6g_p20051023.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/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild,v 1.1 2005/10/23 22:22:32 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cacti/cacti-0.8.6g_p20051023.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
-inherit eutils webapp
+inherit eutils webapp depend.apache
 
 MY_P=${P/_p*/}
 
@@ -22,11 +22,13 @@ IUSE="snmp"
 
 DEPEND=""
 
-# TODO: RDEPEND Not just apache... but there's no virtual/webserver (yet)
+want_apache
 
-RDEPEND="net-www/apache
+# alpha doesn't have lighttpd keyworded yet
+RDEPEND="!alpha? ( !apache? ( !apache2? ( www-servers/lighttpd ) ) )
 	snmp? ( net-analyzer/net-snmp )
 	net-analyzer/rrdtool
+	!>=dev-db/mysql-5
 	dev-db/mysql
 	virtual/cron
 	virtual/php
diff --git a/net-analyzer/cacti/files/postinstall-en.txt b/net-analyzer/cacti/files/postinstall-en.txt
index c66b8a786695..ec5b7b7f4dd2 100644
--- a/net-analyzer/cacti/files/postinstall-en.txt
+++ b/net-analyzer/cacti/files/postinstall-en.txt
@@ -2,69 +2,57 @@
 New Install
 
 1. Create the new cacti database
-  shell> mysqladmin --user=root create cacti
+   shell> mysqladmin -p --user=root create cacti
 2. Import the default cacti database:
-  shell> mysql cacti < ${MY_INSTALLDIR}/cacti.sql
-3. Optional: Create a MySQL username and password for cacti.
-  shell> mysql --user=root mysql
-  mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
-  mysql> flush privileges;
-4. Copy ${MY_INSTALLDIR}/include/config-sample.php to config.php.
- + Modify the MySQL user, password and database for your
-   cacti configuration.
+   shell> mysql -p cacti < ${MY_INSTALLDIR}/cacti.sql
+3. Create a MySQL username and password for cacti.
+   shell> mysql -p --user=root mysql
+   mysql> GRANT ALL ON cacti.* TO cactiuser@localhost IDENTIFIED BY 'somepassword';
+   mysql> flush privileges;
+4. Edit ${MY_INSTALLDIR}/include/config.php and modify the MySQL user,
+   password and database for your cacti configuration.
+
+   Example:
 	\$database_default = "cacti";
 	\$database_hostname = "localhost";
 	\$database_username = "cactiuser";
 	\$database_password = "cacti";
-6. Point your web browser to:  http://your-server/cacti/
- Make sure to fill in all of the path variables carefully and
- correctly on the following screen.
 
+5. Point your web browser to:  http://your-server/cacti/
+   Make sure to fill in all of the path variables carefully and
+    correctly on the following screen.
 
 Upgrading
 
-Before cacti works you must upgrade the cacti database:
-1. Backup the old cacti database:
-  shell> mysqlhotcopy --suffix=_old cacti
-2. Drop the old cacti database:
-  shell> mysqladmin -p drop cacti
-3. Create the new cacti database
-  shell> mysqladmin --user=root create cacti
-4. Import the default cacti database:
-  shell> mysql cacti < ${MY_INSTALLDIR}/cacti.sql
-5. Edit ${MY_INSTALLDIR}/include/config.php.
- + Modify the MySQL user, password and database for your
-   cacti configuration.
-	\$database_default = "cacti";
-	\$database_hostname = "localhost";
-	\$database_username = "cactiuser";
-	\$database_password = "cacti";
-6. Point your web browser to:  http://your-server/cacti/
- Select "Upgrade".
- Make sure to fill in all of the path variables carefully and
- correctly on the following screen.
-7. Test your upgraded installation. When all is fine you can
-drop the cacti_old database like so:
-  shell> mysqladmin -p drop cacti_old
-
+1. Backup DB in the case that something goes wrong.
+   shell> mysqldump -l --add-drop-table cacti > mysql.cacti
+2. Backup your rra/ directory and any custom scripts in your scripts/
+   directory.
+3. Edit ${MY_INSTALLDIR}/include/config.php, and confirm that the MySQL user,
+   password and database is correct for your cacti configuration.
+   
+   Example:
+        \$database_default = "cacti";
+        \$database_hostname = "localhost";
+        \$database_username = "cactiuser";
+        \$database_password = "cacti";
+4. Point your web browser to: http://your-server/cacti/
+   Select "Upgrade:.
+   Make sure to fill in all of the path variables carefully and
+   correctly on the following screen.
 
 Cronjob
 
 Either new or upgrading, make sure you have a cron job - Add this line to 
 your /etc/crontab file:
 
-   */5 * * * * ${VHOST_SERVER_GID} php ${MY_INSTALLDIR}/poller.php > /dev/null 2>&1
+   */5 * * * * ${VHOST_SERVER_GID} /usr/bin/php ${MY_INSTALLDIR}/poller.php > /dev/null 2>&1
 
 Note that you should use poller.php as the cronjob instead of cmd.php (as it was with 
 earlier versions) to enable you to switch between cmd.php and cactid.
 
-
-PHP
-
-FINALLY, you must have these settings in your php.ini:
-
-	register_globals = On
-	register_argc_argv = On
-
+Also make sure that the user poller.php runs as ( ${VHOST_SERVER_GID} ) has
+permission to create new files in Cacti's 'rra/' directory which is
+${MY_INSTALLDIR}/rrd
 
 
diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index 1c54eb31a1ba..5079e8cf393e 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<maintainer>
-  <email>netmon@gentoo.org</email>
-</maintainer>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Cacti is a complete network graphing solution designed to harness the
+		power of RRDTool's data storage and graphing functionality. Cacti
+		provides a fast poller, advanced graph templating, multiple data
+		acquisition methods, and user management features out of the box. All of
+		this is wrapped in an intuitive, easy to use interface that makes sense
+		for LAN-sized installations up to complex networks with hundreds of
+		devices.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/calamaris/ChangeLog b/net-analyzer/calamaris/ChangeLog
index c17cd96e65d8..5ae327aec7dd 100644
--- a/net-analyzer/calamaris/ChangeLog
+++ b/net-analyzer/calamaris/ChangeLog
@@ -1,8 +1,35 @@
 # ChangeLog for net-analyzer/calamaris
-# Copyright 2001-2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/ChangeLog,v 1.1 2002/08/07 08:31:09 cybersystem Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
-* calamaris-2.51 (07 August 2002)
+  05 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -calamaris-2.57.ebuild:
+  Remove old ebuild.
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -calamaris-2.51.ebuild:
+  Removing old version, no need to have three stable packages in my opinion.
+
+*calamaris-2.59 (06 Nov 2004)
+
+  06 Nov 2004; Eldad Zack <eldad@gentoo.org> calamaris-2.59.ebuild:
+  x86 stable
+
+  15 Jul 2004; Eldad Zack <eldad@gentoo.org> :
+  Version bump, Closes #57064
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  calamaris-2.51.ebuild, calamaris-2.57.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> calamaris-2.51.ebuild,
+  calamaris-2.57.ebuild:
+  Tidy up, added missing IUSE
+
+*calamaris-2.57 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*calamaris-2.51 (07 August 2002)
       
   07 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, calamaris-2.51.ebuild, files/digest-calamaris-2.51 :
 
diff --git a/net-analyzer/calamaris/Manifest b/net-analyzer/calamaris/Manifest
index e69de29bb2d1..0f146fadad70 100644
--- a/net-analyzer/calamaris/Manifest
+++ b/net-analyzer/calamaris/Manifest
@@ -0,0 +1,4 @@
+MD5 7c858d1522b0a8e65a68e3d4ff61f476 calamaris-2.59.ebuild 584
+MD5 649454cacac6e6a35aa8e27bded15f7f ChangeLog 1274
+MD5 e0407ed1cf5f670e1cb0b92ff677ab87 metadata.xml 285
+MD5 560ba0df8a31604d365899566009c309 files/digest-calamaris-2.59 65
diff --git a/net-analyzer/calamaris/calamaris-2.59.ebuild b/net-analyzer/calamaris/calamaris-2.59.ebuild
index 0925ed53f165..efcb2cd9263c 100644
--- a/net-analyzer/calamaris/calamaris-2.59.ebuild
+++ b/net-analyzer/calamaris/calamaris-2.59.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/net-analyzer/calamaris/calamaris-2.59.ebuild,v 1.1 2004/07/15 06:16:37 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/calamaris/calamaris-2.59.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 DESCRIPTION="Calamaris parses the logfiles of a wide variety of Web proxy servers and generates reports"
 HOMEPAGE="http://calamaris.cord.de/"
@@ -8,7 +8,7 @@ SRC_URI="http://calamaris.cord.de/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc x86"
 
 DEPEND="dev-lang/perl"
 IUSE=""
diff --git a/net-analyzer/chaosreader/ChangeLog b/net-analyzer/chaosreader/ChangeLog
index 847ceac5e437..b00f21969a6f 100644
--- a/net-analyzer/chaosreader/ChangeLog
+++ b/net-analyzer/chaosreader/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-analyzer/chaosreader
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.1 2004/02/01 18:03:17 spock Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
+
+  12 Aug 2005; Olivier Crête <tester@gentoo.org> chaosreader-0.94.ebuild:
+  Marked ~amd64, closes bug #102108, thanks to Mike Cvet for testing
+
+  17 Jun 2004; Michal Januszewski <spock@gentoo.org> chaosreader-0.93.ebuild,
+  chaosreader-0.94.ebuild:
+  Stable on x86.
+
+*chaosreader-0.94 (08 May 2004)
+
+  08 May 2004; Michal Januszewski <spock@gentoo.org> +chaosreader-0.94.ebuild:
+  Version bump.
+
+  18 Apr 2004; David Holm <dholm@gentoo.org> chaosreader-0.93.ebuild:
+  Added to ~ppc.
+
+*chaosreader-0.93 (17 Apr 2004)
+
+  17 Apr 2004; Michal Januszewski <spock@gentoo.org> +chaosreader-0.93.ebuild:
+  Version bump.
+
+  27 Mar 2004; Michal Januszewski <spock@gentoo.org> chaosreader-0.92.ebuild:
+  Bump to stable (x86).
 
 *chaosreader-0.92 (01 Feb 2004)
 
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 5dea95dc5675..3bcec002f181 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -1,4 +1,18 @@
-MD5 f00602825dc43260f4772b72c9fea59f chaosreader-0.92.ebuild 623
-MD5 3cb68707ac3370c0bf591dfdba25a8ac ChangeLog 417
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+MD5 70d159c3a6e9ce89a726add6c1c97fd1 chaosreader-0.92.ebuild 605
+MD5 a0ecb146c43529a33c5a50ba8ff596a0 ChangeLog 1126
+MD5 1d7c8b90aa430a6b307c140e663953ad chaosreader-0.94.ebuild 615
+MD5 ed4766dfbf5a1c8d8dce935116cba8a9 chaosreader-0.93.ebuild 610
+MD5 43b51bdb1777364d5237aaebe95995a0 files/digest-chaosreader-0.94 64
 MD5 2b9b223c5673dc0cde3af73f5cae47c3 files/digest-chaosreader-0.92 64
+MD5 9a6fc091a0e89a040692fb7f55d9238e files/digest-chaosreader-0.93 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC++kZmOfEJZHYOKcRAhhNAKCL4UHkefRPKvPLBzsu+sFTsfvLswCePjYX
+awR+/kr+U7Xjan2sQV7//U8=
+=A8/1
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/chaosreader/chaosreader-0.92.ebuild b/net-analyzer/chaosreader/chaosreader-0.92.ebuild
index ae5e8c1cb673..c9ea428fee5b 100644
--- a/net-analyzer/chaosreader/chaosreader-0.92.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.92.ebuild
@@ -1,13 +1,12 @@
-# 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/net-analyzer/chaosreader/chaosreader-0.92.ebuild,v 1.1 2004/02/01 18:03:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.92.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs."
 HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
 SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
-LICENSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 LICENSE="GPL-2"
 IUSE=""
 DEPEND=">=dev-lang/perl-5.8.0"
diff --git a/net-analyzer/chaosreader/chaosreader-0.93.ebuild b/net-analyzer/chaosreader/chaosreader-0.93.ebuild
index 64816d9d2f8b..309c1f8179aa 100644
--- a/net-analyzer/chaosreader/chaosreader-0.93.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.93.ebuild
@@ -1,12 +1,12 @@
-# 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/net-analyzer/chaosreader/chaosreader-0.93.ebuild,v 1.1 2004/04/17 18:59:24 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.93.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs."
 HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
 SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 IUSE=""
 DEPEND=">=dev-lang/perl-5.8.0"
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
index 4316e25a999e..1f7f1f492472 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
@@ -1,12 +1,12 @@
-# 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/net-analyzer/chaosreader/chaosreader-0.94.ebuild,v 1.1 2004/05/08 21:07:45 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/chaosreader-0.94.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 DESCRIPTION="A tool to trace TCP/UDP/... sessions and fetch application data from snoop or tcpdump logs."
 HOMEPAGE="http://users.tpg.com.au/bdgcvb/chaosreader.html"
 SRC_URI="http://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 LICENSE="GPL-2"
 IUSE=""
 DEPEND=">=dev-lang/perl-5.8.0"
diff --git a/net-analyzer/cheops-ng/ChangeLog b/net-analyzer/cheops-ng/ChangeLog
index 0b45acfe1950..2b3f17481737 100644
--- a/net-analyzer/cheops-ng/ChangeLog
+++ b/net-analyzer/cheops-ng/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for net-analyzer/cheops-ng
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cheops-ng/ChangeLog,v 1.1 2005/03/31 21:52:56 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cheops-ng/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+*cheops-ng-0.2.3 (05 Nov 2005)
+
+  05 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> cheops-ng-0.2.2.ebuild,
+  +cheops-ng-0.2.3.ebuild:
+  0.2.2 x86 stable and 0.2.3 version bump.
+
+  15 Oct 2005; Joseph Jezak <josejx@gentoo.org> cheops-ng-0.2.0.ebuild,
+  cheops-ng-0.2.2.ebuild:
+  Marked ~ppc for bug #109108.
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> cheops-ng-0.2.0.ebuild,
+  cheops-ng-0.2.2.ebuild:
+  Do not install COPYING.
+
+*cheops-ng-0.2.2 (02 Sep 2005)
+
+  02 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +cheops-ng-0.2.2.ebuild:
+  Version bump. Should fix bug 95554. Thanks to george <george@drtm.ro> for
+  reporting.
+
+  26 May 2005; Marcelo Goes <vanquirius@gentoo.org> -files/adns-gcc34.patch,
+  -files/cheops-ng-0.1.13-printf.diff, -cheops-ng-0.1.13-r1.ebuild:
+  Remove old stuff.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> cheops-ng-0.2.0.ebuild:
+  Marked x86 stable.
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  cheops-ng-0.1.13-r1.ebuild:
+  Marked x86 stable.
+
+*cheops-ng-0.2.0 (15 Apr 2005)
+
+  15 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -cheops-ng-0.1.13.ebuild,
+  +cheops-ng-0.2.0.ebuild:
+  Version bump, fixes bug 88816. Thanks to Michael Zanetta <grimmlin@pentoo.ch>.
+  Keeping things tidy, too.
+
+*cheops-ng-0.1.13-r1 (02 Apr 2005)
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/cheops-ng-0.1.13-printf.diff, +cheops-ng-0.1.13-r1.ebuild:
+  Nicer fix to allow gcc-3.4 to work without discarding debug messages. Thanks
+  to dragonheart for pointing out this issue and how to solve it.
+
+  31 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +metadata.xml,
+  cheops-ng-0.1.13.ebuild:
+  Adding metadata.xml.
+  Adding debug USE flag. Thanks again to Michael Zanetta <grimmlin@pentoo.ch>.
 
 *cheops-ng-0.1.13 (31 Mar 2005)
 
diff --git a/net-analyzer/cheops-ng/Manifest b/net-analyzer/cheops-ng/Manifest
index 047996ca083b..b5f55f33964f 100644
--- a/net-analyzer/cheops-ng/Manifest
+++ b/net-analyzer/cheops-ng/Manifest
@@ -1,3 +1,8 @@
-MD5 330edc80d1aa739eaea27ebcf35a1b4d cheops-ng-0.1.13.ebuild 1292
-MD5 76b3ed702ddc4890c7035d83a27aa42b files/adns-gcc34.patch 433
-MD5 777b8b1d7bdb5928dd24e00509312c01 files/digest-cheops-ng-0.1.13 65
+MD5 109c4eab0d72918303ed11606c66ee30 cheops-ng-0.2.3.ebuild 1326
+MD5 8f96848d632ffad6b8c3bd5aa30a4a1a cheops-ng-0.2.0.ebuild 1337
+MD5 5cf4c5ff76dbc53d2f8e8e904127d13d cheops-ng-0.2.2.ebuild 1325
+MD5 625f33c3b81d9563a9485e445ea18bbb ChangeLog 2631
+MD5 5731c4fdc13f68a2dccaacfbc4fbc611 metadata.xml 257
+MD5 33b404ed127738fbd865480756961af4 files/digest-cheops-ng-0.2.0 64
+MD5 ed8d54dd35c44fdc8a5add323278edd2 files/digest-cheops-ng-0.2.2 64
+MD5 7de4a708d658deb49cbbea79d925a354 files/digest-cheops-ng-0.2.3 64
diff --git a/net-analyzer/cheops-ng/cheops-ng-0.2.0.ebuild b/net-analyzer/cheops-ng/cheops-ng-0.2.0.ebuild
index db3979185baf..003a6364c5e9 100644
--- a/net-analyzer/cheops-ng/cheops-ng-0.2.0.ebuild
+++ b/net-analyzer/cheops-ng/cheops-ng-0.2.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/net-analyzer/cheops-ng/cheops-ng-0.2.0.ebuild,v 1.1 2005/04/16 00:00:40 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cheops-ng/cheops-ng-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://cheops-ng.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cheops-ng/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE="debug"
 DEPEND=">=net-analyzer/nmap-3.27-r1
 	=x11-libs/gtk+-1.2*
@@ -42,5 +42,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING README NEWS ReleaseNotes doc/*.txt
+	dodoc AUTHORS README NEWS ReleaseNotes doc/*.txt
 }
diff --git a/net-analyzer/cheops-ng/cheops-ng-0.2.2.ebuild b/net-analyzer/cheops-ng/cheops-ng-0.2.2.ebuild
index 062689fb21c6..23c0369c42c4 100644
--- a/net-analyzer/cheops-ng/cheops-ng-0.2.2.ebuild
+++ b/net-analyzer/cheops-ng/cheops-ng-0.2.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cheops-ng/cheops-ng-0.2.2.ebuild,v 1.1 2005/09/02 23:08:31 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cheops-ng/cheops-ng-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 DESCRIPTION="Cheops-ng is a Network management tool for mapping and monitoring your network"
 HOMEPAGE="http://cheops-ng.sourceforge.net/"
 SRC_URI="mirror://sourceforge/cheops-ng/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE="debug"
 DEPEND=">=net-analyzer/nmap-3.27-r1
 	=x11-libs/gtk+-1.2*
@@ -40,5 +40,5 @@ src_compile() {
 
 src_install() {
 	einstall || die
-	dodoc AUTHORS COPYING README NEWS ReleaseNotes doc/*.txt
+	dodoc AUTHORS README NEWS ReleaseNotes doc/*.txt
 }
diff --git a/net-analyzer/cheops-ng/cheops-ng-0.2.3.ebuild b/net-analyzer/cheops-ng/cheops-ng-0.2.3.ebuild
index 3acfb869bbb0..9b4192c90aaf 100644
--- a/net-analyzer/cheops-ng/cheops-ng-0.2.3.ebuild
+++ b/net-analyzer/cheops-ng/cheops-ng-0.2.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/net-analyzer/cheops-ng/cheops-ng-0.2.3.ebuild,v 1.1 2005/11/05 21:38:56 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cheops-ng/cheops-ng-0.2.3.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 DESCRIPTION="Cheops-ng is a Network management tool for mapping and monitoring your network"
 HOMEPAGE="http://cheops-ng.sourceforge.net/"
diff --git a/net-analyzer/cnet/ChangeLog b/net-analyzer/cnet/ChangeLog
index ea3e0cb15e43..1fd77b7bf4a8 100644
--- a/net-analyzer/cnet/ChangeLog
+++ b/net-analyzer/cnet/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-analyzer/cnet
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.1 2003/08/01 19:48:23 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/ChangeLog,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> cnet-2.0.9.ebuild:
+  Marked stable on x86.
+
+*cnet-2.0.9 (21 Nov 2004)
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> +files/cnet-2.0.9-gentoo.patch,
+  +cnet-2.0.9.ebuild:
+  Version bump. Thanks to Surakshan Mendis <bugtracker@surasoft.com>. Closes
+  #66275.
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> cnet-2.0.5.ebuild:
+  This package has a hard dependency on libelf and will break against elfutils.
+  closes #67375.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml, cnet-2.0.5.ebuild:
+  Updated metadata, marked x86 stable.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> cnet-2.0.5.ebuild:
+  Add inherit eutils
+
+  12 Feb 2004; Don Seiler <rizzo@gentoo.org>; cnet-2.0.5.ebuild:
+  Adding OR DEPEND on elfutils/libelf, fixed Bug #37152
+
+  08 Dec 2003; Don Seiler <rizzo@gentoo.org>; cnet-2.0.5.ebuild:
+  Fix for Bug 35160: hardwired CFLAGS.  Thanks to Eldad Zack
+
+  08 Dec 2003; Don Seiler <rizzo@gentoo.org>; cnet-2.0.5.ebuild:
+  Fix for Bug 35109: Install docs.  Thanks to viktor(at)neotek(dot)hu
 
 *cnet-2.0.5 (01 Aug 2003)
 
diff --git a/net-analyzer/cnet/Manifest b/net-analyzer/cnet/Manifest
index b8ad63ababf0..721174932476 100644
--- a/net-analyzer/cnet/Manifest
+++ b/net-analyzer/cnet/Manifest
@@ -1,5 +1,18 @@
-MD5 29c77060a53c162f0c3f686e2f06b00c cnet-2.0.5.ebuild 771
-MD5 b60b4175fd4e77423fc915ed58159e38 ChangeLog 346
-MD5 169e364920f553ebb1b1cdd3f2778f45 metadata.xml 527
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d5e52cc47230e288ad40e44b0ffddbf0 cnet-2.0.5.ebuild 1159
+MD5 5242584442a72f5ffd3bba06deccb200 cnet-2.0.9.ebuild 1155
+MD5 f98943e0818d26b862556b4f23cecfc1 ChangeLog 1491
+MD5 b4e1d959ab12c9bb69e0db9f1d66205f metadata.xml 218
 MD5 5fa730e3f767e911187654f6f809257f files/digest-cnet-2.0.5 60
+MD5 1f8197488ef6fbb97976d664d345d1d0 files/digest-cnet-2.0.9 60
+MD5 86dbc35b31d6c43d3ecdfbef24ba7da7 files/cnet-2.0.9-gentoo.patch 1531
 MD5 652fb332fa98e02524b07ee1561c6182 files/cnet-2.0.5-gentoo.patch 1363
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB/jjbEZCkKN40op4RAvjjAKDBwqbOM2wqc8ak5vwvL/S4zjGBZwCgskE8
+SdZTDmRfoWMHlx1a25mV/zc=
+=97Bw
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cnet/cnet-2.0.5.ebuild b/net-analyzer/cnet/cnet-2.0.5.ebuild
index 6f8d43c29d65..d014ea5cf117 100644
--- a/net-analyzer/cnet/cnet-2.0.5.ebuild
+++ b/net-analyzer/cnet/cnet-2.0.5.ebuild
@@ -1,18 +1,23 @@
-# 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/net-analyzer/cnet/cnet-2.0.5.ebuild,v 1.1 2003/08/01 19:48:23 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network simulation tool"
 SRC_URI="http://www.csse.uwa.edu.au/cnet/${P}.tgz"
 HOMEPAGE="http://www.csse.uwa.edu.au/cnet"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
+
+# cnet will NOT work against elfutils (but it will compile!) Bug #67375. (21 Nov 2004 eldad)
+DEPEND=">=dev-lang/tk-8.3.4
+	dev-libs/libelf"
 
-DEPEND=">=dev-lang/tk-8.3.4"
-RDEPEND=""
+#RDEPEND=""
 
 # unpacking the source
 src_unpack() {
@@ -20,6 +25,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch ${FILESDIR}/cnet-2.0.5-gentoo.patch
+	sed -i.orig -e "s/^CFLAGS.*/CFLAGS=${CFLAGS}/" ${S}/src/Makefile.linux
 }
 
 src_install() {
@@ -29,5 +35,10 @@ src_install() {
 	mkdir -p ${D}/usr/{bin,lib,share}
 	mkdir -p ${D}/usr/share/man/man1
 	# install with make now
-	make PREFIX=${D}/usr install
+	emake PREFIX=${D}/usr install || die
+
+	#install examples
+	DOCDESTTREE=EXAMPLES
+	dodir /usr/share/doc/${PF}/${DOCDESTTREE}
+	dodoc EXAMPLES/*
 }
diff --git a/net-analyzer/cnet/cnet-2.0.9.ebuild b/net-analyzer/cnet/cnet-2.0.9.ebuild
index 690144aade73..08f82482bae7 100644
--- a/net-analyzer/cnet/cnet-2.0.9.ebuild
+++ b/net-analyzer/cnet/cnet-2.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/net-analyzer/cnet/cnet-2.0.9.ebuild,v 1.1 2004/11/21 11:50:22 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cnet/cnet-2.0.9.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.csse.uwa.edu.au/cnet"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 # cnet will NOT work against elfutils (but it will compile!) Bug #67375. (21 Nov 2004 eldad)
diff --git a/net-analyzer/cnet/metadata.xml b/net-analyzer/cnet/metadata.xml
index 6d8b5114619c..3f0b2860d70f 100644
--- a/net-analyzer/cnet/metadata.xml
+++ b/net-analyzer/cnet/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-</maintainer>
-<longdescription>The cnet network simulator enables experimentation with various data-link layer, network layer, routing and transport layer networking protocols in networks consisting of any combination of point-to-point links and IEEE 802.3 Ethernet segments.</longdescription>
+<herd>netmon</herd>
+<longdescription>Network simulation tool</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/cryptcat/ChangeLog b/net-analyzer/cryptcat/ChangeLog
index dc46878c5673..9753e3a5bbbb 100644
--- a/net-analyzer/cryptcat/ChangeLog
+++ b/net-analyzer/cryptcat/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-analyzer/cryptcat
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cryptcat/ChangeLog,v 1.1 2004/02/14 04:59:31 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cryptcat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:21 chriswhite Exp $
+
+  09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  cryptcat-20031202.ebuild:
+  ChangeLog is actually Changelog. Fixed so that it gets installed properly.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> cryptcat-20031202.ebuild:
+  Added to ~ppc.
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> cryptcat-20031202.ebuild:
+  Stable on sparc.
+
+  13 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> cryptcat-20031202.ebuild:
+  Marked ~amd64.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  cryptcat-20031202.ebuild:
+  Updated SRC_URI to use debian mirrors, marked x86 stable.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> cryptcat-20031202.ebuild
+  +metadata.xml:
+  change virtual/glibc to virtual/libc, add IUSE, add metadata
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> cryptcat-20031202.ebuild:
+  Added ~sparc keyword.
 
 *cryptcat-20031202 (13 Feb 2004)
 
diff --git a/net-analyzer/cryptcat/Manifest b/net-analyzer/cryptcat/Manifest
index 2657b07bb5ff..d8cebe9e70e8 100644
--- a/net-analyzer/cryptcat/Manifest
+++ b/net-analyzer/cryptcat/Manifest
@@ -1,3 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c6f4a36d942a12b8f05812ca3e0b2c67 ChangeLog 1200
+MD5 3904f52bf3634f096a66c216fcd0991d cryptcat-20031202.ebuild 1201
 MD5 0ad589bc1c0df2e43583dc80540b22a3 files/digest-cryptcat-20031202 138
-MD5 e47d697f8b68d6d391792f795b310edb cryptcat-20031202.ebuild 1215
-MD5 70723c3ae5b46dbd23baa2c31ebe2f70 ChangeLog 372
+MD5 2997d779a1f7ab59cb6038bbf041427c metadata.xml 220
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTwuFgIKl8Uu19MoRApI0AJ9bfBynfTeC0V3es5pTzwSXuXL6sQCfWADq
+gCO3ZYlpxePhqGkLZSv0mxM=
+=OQyS
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/cryptcat/cryptcat-20031202.ebuild b/net-analyzer/cryptcat/cryptcat-20031202.ebuild
index 699dab031007..e1487ec7ae66 100644
--- a/net-analyzer/cryptcat/cryptcat-20031202.ebuild
+++ b/net-analyzer/cryptcat/cryptcat-20031202.ebuild
@@ -1,22 +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/net-analyzer/cryptcat/cryptcat-20031202.ebuild,v 1.1 2004/02/14 04:59:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cryptcat/cryptcat-20031202.ebuild,v 1.1.1.1 2005/11/30 10:12:21 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DEB_PVER=2
 MY_P=${PN}_${PV}
-DESCRIPTION="TCP/IP swiss army knife extended with twofish encryption"
+DESCRIPTION="netcat clone extended with twofish encryption"
 HOMEPAGE="http://farm9.org/Cryptcat/"
 SRC_URI="http://farm9.org/Cryptcat/${MY_P}.tar.gz
-	http://ftp.debian.org/debian/pool/main/c/cryptcat/${MY_P}-${DEB_PVER}.diff.gz"
+	mirror://debian/pool/main/c/cryptcat/${MY_P}-${DEB_PVER}.diff.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc
-	>=sys-apps/sed-4"
+DEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
@@ -33,11 +33,11 @@ src_unpack() {
 src_compile() {
 	export XFLAGS="-DLINUX"
 	export XLIBS="-lstdc++"
-	CC="gcc ${CFLAGS}" make -e cryptcat || die
+	CC="$(tc-getCC) ${CFLAGS}" make -e cryptcat || die
 }
 
 src_install() {
 	dobin cryptcat || die
-	dodoc ChangeLog README README.cryptcat
+	dodoc Changelog README README.cryptcat
 	doman ${P}/debian/cryptcat.1
 }
diff --git a/net-analyzer/cryptcat/metadata.xml b/net-analyzer/cryptcat/metadata.xml
index 03aa50bab7e3..8afb3af30036 100644
--- a/net-analyzer/cryptcat/metadata.xml
+++ b/net-analyzer/cryptcat/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/cutter/ChangeLog b/net-analyzer/cutter/ChangeLog
index 4fad3c55773c..59319c891c88 100644
--- a/net-analyzer/cutter/ChangeLog
+++ b/net-analyzer/cutter/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-analyzer/cutter
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/ChangeLog,v 1.1 2003/07/02 07:30:48 aliz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> cutter-1.03.ebuild:
+  Added to ~ppc.
+
+*cutter-1.03 (14 May 2005)
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> +cutter-1.03.ebuild:
+  Version bump.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  cutter-1.02.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> cutter-1.02.ebuild:
+  Tidy up. Marked x86 stable.
 
 *cutter-1.02 (02 Jul 2003)
 
diff --git a/net-analyzer/cutter/Manifest b/net-analyzer/cutter/Manifest
index 3e7e9e530468..222830d81995 100644
--- a/net-analyzer/cutter/Manifest
+++ b/net-analyzer/cutter/Manifest
@@ -1,2 +1,6 @@
-MD5 458cfd6fb751c7adb39def25b7da5b5b cutter-1.02.ebuild 596
+MD5 8fe15f0a39dc00d651336994216aa6f6 ChangeLog 798
+MD5 fc86c34b2ef84893c43cadb5424f1478 cutter-1.02.ebuild 607
+MD5 faf06edddf89e01071a000b1a0631474 metadata.xml 251
+MD5 a9f6ed7adb9638391bbd24c712b379cb cutter-1.03.ebuild 617
 MD5 318db347b1b5864bee64f652f0ac780f files/digest-cutter-1.02 59
+MD5 a47385a6deea9d04bb8771b8cf6461dd files/digest-cutter-1.03 59
diff --git a/net-analyzer/cutter/cutter-1.02.ebuild b/net-analyzer/cutter/cutter-1.02.ebuild
index b5f09226e80d..22a6091b646c 100644
--- a/net-analyzer/cutter/cutter-1.02.ebuild
+++ b/net-analyzer/cutter/cutter-1.02.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/cutter-1.02.ebuild,v 1.1 2003/07/02 07:30:48 aliz Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/cutter-1.02.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
 SRC_URI="http://www.lowth.com/cutter/${P}.tgz"
 HOMEPAGE="http://www.lowth.com/cutter"
@@ -10,7 +9,7 @@ LICENSE="GPL-2"
 DEPEND=""
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 src_compile() {
 	make || die
diff --git a/net-analyzer/cutter/cutter-1.03.ebuild b/net-analyzer/cutter/cutter-1.03.ebuild
index c3feb97b621d..d5336891b6c8 100644
--- a/net-analyzer/cutter/cutter-1.03.ebuild
+++ b/net-analyzer/cutter/cutter-1.03.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/net-analyzer/cutter/cutter-1.03.ebuild,v 1.1 2005/05/15 00:53:33 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/cutter/cutter-1.03.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 DESCRIPTION="TCP/IP Connection cutting on Linux Firewalls and Routers"
 SRC_URI="http://www.lowth.com/cutter/software/${P}.tgz"
@@ -9,7 +9,7 @@ LICENSE="GPL-2"
 DEPEND=""
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 src_compile() {
 	make || die
diff --git a/net-analyzer/darkstat/ChangeLog b/net-analyzer/darkstat/ChangeLog
index 82ec35a35100..c982411b9249 100644
--- a/net-analyzer/darkstat/ChangeLog
+++ b/net-analyzer/darkstat/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for net-analyzer/darkstat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.1 2003/10/18 16:59:12 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+  10 May 2005; Herbie Hopkins <herbs@gentoo.org> darkstat-2.6-r1.ebuild:
+  Marked ~amd64 wrt bug #92148.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> darkstat-2.6-r1.ebuild,
+  darkstat-2.6.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  23 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  darkstat-2.6-r1.ebuild:
+  x86 stable
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/darkstat-init:
+  Fixed CVS Header.
+
+  22 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> darkstat-2.6-r1.ebuild:
+  Added to macos. This closes bug #57817
+
+*darkstat-2.6-r1 (21 Jul 2004)
+
+  21 Jul 2004; Marius Mauch <genone@gentoo.org> +files/ipcheck.patch,
+  +darkstat-2.6-r1.ebuild:
+  Addeing a patch to make it more reliable when the host has a dynamic IP.
+
+  13 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> darkstat-2.6.ebuild:
+  Added to ~ppc.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> darkstat-2.5.ebuild,
+  darkstat-2.6.ebuild:
+  Tidy up. Marked x86 stable.
+
+*darkstat-2.6 (02 Jan 2004)
+
+  02 Jan 2004; Chuck Short <zul@gentoo.org> darkstat-2.6.ebuild:
+  New version, closes #37059.
+  Updated homepage and src_uri
+  added nls support.
+
+  02 Jan 2004; Chuck Short <zul@gentoo.org> darkstat-2.5.ebuild:
+  Marked stable.
 
 *darkstat-2.5 (18 Oct 2003)
 
diff --git a/net-analyzer/darkstat/Manifest b/net-analyzer/darkstat/Manifest
index 339ec428d3b3..874b93625e99 100644
--- a/net-analyzer/darkstat/Manifest
+++ b/net-analyzer/darkstat/Manifest
@@ -1,2 +1,19 @@
-MD5 3d97023124c78fc06c8ecd9478523476 darkstat-2.5.ebuild 901
-MD5 11a0d835bd33988a1e21544896d0374e files/digest-darkstat-2.5 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d3c0749eaaaa6f061a602863a6275870 darkstat-2.6-r1.ebuild 1077
+MD5 098a7a9831abba744b14b28f72e6e010 darkstat-2.6.ebuild 1011
+MD5 74ee18725ab2765e76114ab89a968847 ChangeLog 1664
+MD5 e9cd01f31fc31ef1849ad5b87358345a metadata.xml 218
+MD5 65647b954a76c7c35eef2f47dfdb5355 files/digest-darkstat-2.6 64
+MD5 65647b954a76c7c35eef2f47dfdb5355 files/digest-darkstat-2.6-r1 64
+MD5 44483f0b13561a54b68949145198339f files/darkstat-confd 214
+MD5 4f9e9fe82455fe072de4dda411802936 files/darkstat-init 568
+MD5 178efb20612f2c23ec93b9f9a3ddb69c files/ipcheck.patch 3003
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCgSiK2G5bA0cA/ScRAiuhAJ9L1MH6N9sXwaijKAQfSfnkbdb82ACfTglQ
+KbO7scVVv5ujkdcVHLbneps=
+=tHlJ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/darkstat/darkstat-2.6-r1.ebuild b/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
index 527c3160e8bb..a26a2360e3e2 100644
--- a/net-analyzer/darkstat/darkstat-2.6-r1.ebuild
+++ b/net-analyzer/darkstat/darkstat-2.6-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/net-analyzer/darkstat/darkstat-2.6-r1.ebuild,v 1.1 2004/07/21 17:28:38 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 inherit eutils
 
@@ -8,12 +8,12 @@ DESCRIPTION="darkstat is a network traffic analyzer"
 HOMEPAGE="http://dmr.ath.cx/net/darkstat/"
 SRC_URI="http://dmr.ath.cx/net/darkstat/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ppc-macos ~amd64"
 IUSE="nls"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=net-libs/libpcap-0.7.1
+DEPEND="virtual/libpcap
 		nls? ( sys-devel/gettext ) "
 RDEPEND=""
 
diff --git a/net-analyzer/darkstat/darkstat-2.6.ebuild b/net-analyzer/darkstat/darkstat-2.6.ebuild
index cf0eb4073173..2c7e59aee910 100644
--- a/net-analyzer/darkstat/darkstat-2.6.ebuild
+++ b/net-analyzer/darkstat/darkstat-2.6.ebuild
@@ -1,22 +1,20 @@
-# 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/net-analyzer/darkstat/darkstat-2.6.ebuild,v 1.1 2004/01/03 02:47:26 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/darkstat-2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 DESCRIPTION="darkstat is a network traffic analyzer"
 HOMEPAGE="http://dmr.ath.cx/net/darkstat/"
 SRC_URI="http://dmr.ath.cx/net/darkstat/${P}.tar.gz"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE="nls"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND=">=net-libs/libpcap-0.7.1
+DEPEND="virtual/libpcap
 		nls? ( sys-devel/gettext ) "
 RDEPEND=""
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	use nls && myconf="`use_with nls`"
 	./configure \
diff --git a/net-analyzer/darkstat/files/darkstat-confd b/net-analyzer/darkstat/files/darkstat-confd
index 017822ee122a..8fca931a2bf3 100644
--- a/net-analyzer/darkstat/files/darkstat-confd
+++ b/net-analyzer/darkstat/files/darkstat-confd
@@ -1,4 +1,4 @@
 # Config file for /etc/init.d/darkstat
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/files/darkstat-confd,v 1.1 2003/10/18 16:59:12 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/files/darkstat-confd,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 # Set preferred options here
 DARKSTAT_OPTS="-i ppp0"
diff --git a/net-analyzer/darkstat/files/darkstat-init b/net-analyzer/darkstat/files/darkstat-init
index f708a6a5bb51..0d6071ff564b 100644
--- a/net-analyzer/darkstat/files/darkstat-init
+++ b/net-analyzer/darkstat/files/darkstat-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2 
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/darkstat/files/darkstat-init,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 depend() {
         need net
diff --git a/net-analyzer/darkstat/metadata.xml b/net-analyzer/darkstat/metadata.xml
index d66bb0cd26df..29c4321defbc 100644
--- a/net-analyzer/darkstat/metadata.xml
+++ b/net-analyzer/darkstat/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>netmon</herd>
 <maintainer>
   <email>zul@gentoo.org</email>
 </maintainer>
diff --git a/net-analyzer/dnstracer/ChangeLog b/net-analyzer/dnstracer/ChangeLog
index 8f6613de4ae0..c82ebf55bca5 100644
--- a/net-analyzer/dnstracer/ChangeLog
+++ b/net-analyzer/dnstracer/ChangeLog
@@ -1,8 +1,62 @@
 # ChangeLog for net-analyzer/dnstracer
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dnstracer/ChangeLog,v 1.1 2002/12/17 20:00:22 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dnstracer/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> dnstracer-1.8.ebuild:
+  amd64 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -dnstracer-1.7.ebuild:
+  Removing old ebuild.
+
+  05 Mar 2005; Markus Rothe <corsair@gentoo.org> dnstracer-1.8.ebuild:
+  Stable on ppc64
+
+  02 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> dnstracer-1.8.ebuild:
+  Stable ppc-macos
+
+  01 Jan 2005; Markus Rothe <corsair@gentoo.org> dnstracer-1.8.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  01 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> dnstracer-1.8.ebuild:
+  Added to ~ppc-macos, bug #58249
+
+  21 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org> dnstracer-1.8.ebuild:
+  Added to ~amd64, bug #71962
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> dnstracer-1.8.ebuild:
+  Stable on sparc.
+
+*dnstracer-1.8 (09 Jul 2004)
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +dnstracer-1.8.ebuild:
+  Version bump. Closes #56475. Thanks to Daniel Webert <daniel_webert@web.de>.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> dnstracer-1.6.ebuild,
+  dnstracer-1.7.ebuild:
+  Tidy up, added missing ipv6 to IUSE
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> dnstracer-1.7.ebuild:
+  Added IUSE ipv6, Closes #54192. Thanks to Jonathan Stewart <reaper@fudo.org>
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> dnstracer-1.6.ebuild,
+  dnstracer-1.7.ebuild:
+  change virtual/glibc to virtual/libc, add metadata.xml
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> dnstracer-1.7.ebuild:
+  adding s390 keywords
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> dnstracer-1.7.ebuild:
+  Added ~sparc keyword.
+
+*dnstracer-1.7 (09 Mar 2003)
+
+  09 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
 *dnstracer-1.6 (17 Dec 2002)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> dnstracer-1.6.ebuild :
+  set ~ppc in keywords
+
   17 Dec 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild contributed by Thomas Preissler <tomjohn@gmx.de> in #11785.
diff --git a/net-analyzer/dnstracer/Manifest b/net-analyzer/dnstracer/Manifest
index e69de29bb2d1..779a993d0dfc 100644
--- a/net-analyzer/dnstracer/Manifest
+++ b/net-analyzer/dnstracer/Manifest
@@ -0,0 +1,4 @@
+MD5 4e73c9a6f6f17d6a4b52bc7ea5b1ddc5 dnstracer-1.8.ebuild 757
+MD5 6483e5ddf7ab76d881b1217122c55348 ChangeLog 2142
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 f670baae28c6927de7c4a92d12bf3369 files/digest-dnstracer-1.8 65
diff --git a/net-analyzer/dnstracer/dnstracer-1.8.ebuild b/net-analyzer/dnstracer/dnstracer-1.8.ebuild
index eaed2703bef1..4072083976ba 100644
--- a/net-analyzer/dnstracer/dnstracer-1.8.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.8.ebuild
@@ -1,25 +1,30 @@
-# 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/net-analyzer/dnstracer/dnstracer-1.8.ebuild,v 1.1 2004/07/08 23:36:10 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dnstracer/dnstracer-1.8.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Determines where a given nameserver gets its information from"
-SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
 HOMEPAGE="http://www.mavetju.org/unix/general.php"
+SRC_URI="http://www.mavetju.org/download/${P}.tar.gz"
 
-IUSE="ipv6"
-KEYWORDS="~x86 ~ppc ~sparc ~s390"
 LICENSE="as-is"
 SLOT="0"
-DEPEND="virtual/libc"
-RDEPEND=""
+KEYWORDS="amd64 arm hppa ia64 ~ppc ppc64 ppc-macos s390 sparc x86"
+IUSE="ipv6"
+
+DEPEND=""
 
-src_compile () {
-	econf `use_enable ipv6` || die
+src_compile() {
+	if use ppc-macos; then
+		append-flags "-DBIND_8_COMPAT=1"
+	fi
+
+	econf $(use_enable ipv6) || die
 	emake || die
 }
 
-src_install () {
-	make DESTDIR=${D} install || die
+src_install() {
+	make DESTDIR="${D}" install || die
 	dodoc README CHANGES
 }
-
diff --git a/net-analyzer/driftnet/ChangeLog b/net-analyzer/driftnet/ChangeLog
index 796b85d1df5e..a05abecf92a5 100644
--- a/net-analyzer/driftnet/ChangeLog
+++ b/net-analyzer/driftnet/ChangeLog
@@ -1,7 +1,47 @@
 # ChangeLog for net-analyzer/driftnet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.1 2002/07/19 04:23:43 spider Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/ChangeLog,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
-*driftnet-0.16 (19 Jul 2002)
+  03 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> driftnet-0.1.6.ebuild:
+  Adding x11 dependency because of makedepend. Fixes bug 94904. Thanks to
+  Henti Smith <henti@geekware.co.za>.
+
+  18 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/driftnet-0.1.6-nogtk.patch,
+  +files/driftnet-0.1.6-tmpnam-is-bad.diff, driftnet-0.1.6.ebuild:
+  Use giflib rather than libungif for bug 85720. Also removed unnecessary
+  nogtk patch since it can easily be done with a sed. Added a patch to fix a
+  few warnings, most importantly the use of tmpnam().
+
+  06 Mar 2005; Joseph Jezak <josejx@gentoo.org> driftnet-0.1.6.ebuild:
+  Marked ppc stable for bug #84140.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> driftnet-0.1.6.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> driftnet-0.1.6.ebuild:
+  Added to ~ppc.
+
+  31 Jul 2004; <malc@gentoo.org> driftnet-0.1.6.ebuild:
+  ~amd64 - closes bug #57959
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> driftnet-0.1.6.ebuild:
+  Fix use invocation
+
+  23 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org> driftnet-0.1.6.ebuild:
+  bug #42676 - change to virtual/mpg123
+
+  26 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> driftnet-0.1.6.ebuild:
+  use epatch; more error checking/messages; tidy
+
+  05 Dec 2003; Chuck Short <zul@gentoo.org> driftnet-0.1.6.ebuild:
+  Chown fixes.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*driftnet-0.1.6 (19 Jul 2002)
   19 Jul 2002; Spider <spider@gentoo.org> driftnet-0.16.ebuild :
   New package  
diff --git a/net-analyzer/driftnet/Manifest b/net-analyzer/driftnet/Manifest
index e69de29bb2d1..58c921a70197 100644
--- a/net-analyzer/driftnet/Manifest
+++ b/net-analyzer/driftnet/Manifest
@@ -0,0 +1,5 @@
+MD5 e547a65d47aad9d412d417cb59ffffd4 driftnet-0.1.6.ebuild 1718
+MD5 f7d8339cb00bfc599ba81c4a854a89a6 ChangeLog 1871
+MD5 fe5d2611299b3a390d7681e92ff4d5c5 metadata.xml 287
+MD5 197d8c21e7593ec2c40a08c80e5b9808 files/driftnet-0.1.6-tmpnam-is-bad.diff 2096
+MD5 c0c08c9836402b53a0eb51c3b6c6201a files/digest-driftnet-0.1.6 65
diff --git a/net-analyzer/driftnet/driftnet-0.1.6.ebuild b/net-analyzer/driftnet/driftnet-0.1.6.ebuild
index 2506c662ba07..29e76be241b5 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6.ebuild
@@ -1,46 +1,66 @@
-# 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/net-analyzer/driftnet/driftnet-0.1.6.ebuild,v 1.1 2002/07/19 04:23:43 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/driftnet/driftnet-0.1.6.ebuild,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
-DESCRIPTION="Driftnet is a program which listens to network traffic and picks out images from TCP streams it observes."
+inherit eutils flag-o-matic
+
+DESCRIPTION="A program which listens to network traffic and picks out images from TCP streams it observes"
 HOMEPAGE="http://www.ex-parrot.com/~chris/driftnet/"
+SRC_URI="http://www.ex-parrot.com/~chris/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
+KEYWORDS="x86 sparc ~amd64 ppc"
 SLOT="0"
-KEYWORDS="x86"
-
+IUSE="gtk"
 
 DEPEND="media-libs/jpeg
-		media-libs/libungif
-		net-libs/libpcap
-		gtk? ( <x11-libs/gtk+-1.3.0 )"
+	media-libs/giflib
+	virtual/libpcap
+	gtk? ( <x11-libs/gtk+-1.3.0 )
+	virtual/x11"
 
-		
-RDEPEND="media-sound/mpg123"
-SRC_URI="http://www.ex-parrot.com/~chris/${PN}/${P}.tar.gz"
+# Note: x11 is necessary because of makedepend
+
+RDEPEND="${DEPEND}
+	virtual/mpg123"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
-S=${WORKDIR}/${P}
+	# use giflib - bug 85720
+	sed -i 's/-lungif/-lgif/' Makefile || die "sed giflib failed"
+	# don't use gtk+ by default
+	sed -i 's:^\(.*gtk-config.*\)$:#\1:g' Makefile || die "sed disable gtk failed"
+
+	epatch ${FILESDIR}/${P}-tmpnam-is-bad.diff
+}
 
 src_compile() {
-	if [ `use gtk` ] 
-	then
+	append-ldflags -Wl,-z,now
+
+	if use gtk; then
+		sed -i 's:^#\(.*gtk-config.*\)$:\1:g' Makefile || die "sed enable gtk failed"
 		emake || die "gtk+ build failed"
 		mv driftnet driftnet-gtk
-		make clean
+		make clean || die
+	else
+		append-flags -DNO_DISPLAY_WINDOW
 	fi
-	patch -p1 <${FILESDIR}/${P}-nogtk.patch
-	emake || die
+
+	emake || die "emake failed"
 }
 
 src_install () {
-	dobin driftnet
-	doman driftnet.1
-	use gtk && dobin driftnet-gtk
-	dodoc CHANGES COPYING CREDITS README TODO
+	dobin driftnet || die "dobin failed"
+	doman driftnet.1 || die "doman failed"
+
+	use gtk && { dobin driftnet-gtk || die "dobin failed (gtk)" ; }
+
+	dodoc CHANGES CREDITS README TODO || die "dodoc failed"
 
 	einfo "marking the no-display driftnet as setuid root."
-	chown root.wheel ${D}/usr/bin/driftnet
-	chmod 750 ${D}/usr/bin/driftnet
-	chmod u+s ${D}/usr/bin/driftnet
-	
+	chown root:wheel "${D}/usr/bin/driftnet"
+	chmod 750 "${D}/usr/bin/driftnet"
+	chmod u+s "${D}/usr/bin/driftnet"
 }
-
diff --git a/net-analyzer/dsniff/ChangeLog b/net-analyzer/dsniff/ChangeLog
index 3ac447957ee6..5fe326c9782c 100644
--- a/net-analyzer/dsniff/ChangeLog
+++ b/net-analyzer/dsniff/ChangeLog
@@ -1,8 +1,78 @@
 # ChangeLog for net-analyzer/dsniff
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.1 2002/11/14 08:39:16 jhhudso Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/ChangeLog,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
+
+*dsniff-2.3-r7 (15 Oct 2005)
+
+  15 Oct 2005; <mkay@gentoo.org> +dsniff-2.3-r7.ebuild:
+  Fixing local ip inversion (see bug #108144)
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> dsniff-2.3-r4.ebuild:
+  Mark 2.3-r4 stable on alpha
+
+*dsniff-2.3-r6 (09 Sep 2005)
+
+  09 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +dsniff-2.3-r6.ebuild:
+  Made ebuild DEPEND on ~sys-libs/db-3.2.9 instead of building its own copy.
+
+*dsniff-2.3-r5 (27 Jun 2005)
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +dsniff-2.3-r5.ebuild:
+  Adding append-ldflags -lresolv to allow amd64 compilation, ~amd64 keyword.
+  Fixes bug 94184, thanks to Steven Tasker <bool@hush.com>.
+
+  17 May 2005; Michael Hanselmann <hansmi@gentoo.org> dsniff-2.3-r4.ebuild:
+  Stable on ppc.
+
+*dsniff-2.3-r4 (29 Mar 2005)
+
+  29 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> -dsniff-2.3-r3.ebuild,
+  +dsniff-2.3-r4.ebuild:
+  Doing a revision bump to push bug fix.
+
+  29 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> dsniff-2.3-r3.ebuild:
+  Fix bug 87166. Thanks to Brandyn A. White <e133tc1pher@gmail.com> for
+  reporting and solving the problem.
+
+*dsniff-2.3-r3 (07 Mar 2005)
+
+  07 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> -dsniff-2.3-r2.ebuild,
+  +dsniff-2.3-r3.ebuild:
+  Revision bump; install /etc files correctly for bug 84284. Keeping stable on
+  x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> dsniff-2.3-r2.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> dsniff-2.3-r2.ebuild:
+  change virtual/glibc to virtual/libc, add missing IUSE
+
+  03 May 2004; David Holm <dholm@gentoo.org> dsniff-2.3-r2.ebuild:
+  Added to ~ppc.
+
+*dsniff-2.3-r2 (02 May 2004)
+
+  02 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Make sure a few files make it to /etc/dsniff instead of /usr.
+
+*dsniff-2.3-r1 (21 Aug 2003)
+
+  08 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Cleanup patch so that dsniff will use a newer version of nids #43370 by Magnus Maatta.
+
+  26 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to fix linking order #27267.
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *dsniff-2.3 (14 Nov 2002)
 
+  23 Jul 2003; Tavis Ormandy <taviso@gentoo.org> dsniff-2.3.ebuild:
+  ~alpha
+
+  02 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> dsniff-2.3.ebuild :
+  Closes #14689.
+
   14 Nov 2002; Jared Hudson <jhhudso@gentoo.org> : Initial import. Ebuild
   submitted by foser <foser@gentoo.org>. Bug #6906
diff --git a/net-analyzer/dsniff/Manifest b/net-analyzer/dsniff/Manifest
index e69de29bb2d1..4cc7dcaa4c5e 100644
--- a/net-analyzer/dsniff/Manifest
+++ b/net-analyzer/dsniff/Manifest
@@ -0,0 +1,12 @@
+MD5 cb56a3fa4deb49ae06b55899cc345c3e ChangeLog 2714
+MD5 a800c8f521b81572f53a3527f1a91d4d dsniff-2.3-r4.ebuild 2228
+MD5 33429f33cb307d7a7ff109b9dd5424d4 dsniff-2.3-r5.ebuild 2306
+MD5 0e532c62fdcfa0d6e65b1b377d430cf1 dsniff-2.3-r6.ebuild 1408
+MD5 bb880c49bdffe94226562c9f6b06e0e7 metadata.xml 719
+MD5 0e2decc80865461a7b3d011911ea97c9 dsniff-2.3-r7.ebuild 1562
+MD5 9206faea6a9be25f7d1aa0ac0a2ff6e3 files/2.3-libnet-1.0.patch 6110
+MD5 f41ad0aeacc05042ec27551b257845d3 files/2.3-makefile.patch 1531
+MD5 5c5bea8cc4846925ba48ba5c9ea83341 files/digest-dsniff-2.3-r4 123
+MD5 5c5bea8cc4846925ba48ba5c9ea83341 files/digest-dsniff-2.3-r5 123
+MD5 0e5d8e4adda8f4876e972a02bed13cc3 files/digest-dsniff-2.3-r6 62
+MD5 0e5d8e4adda8f4876e972a02bed13cc3 files/digest-dsniff-2.3-r7 62
diff --git a/net-analyzer/dsniff/dsniff-2.3-r4.ebuild b/net-analyzer/dsniff/dsniff-2.3-r4.ebuild
index 7a9cf6a3ad61..9b405598015c 100644
--- a/net-analyzer/dsniff/dsniff-2.3-r4.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.3-r4.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/net-analyzer/dsniff/dsniff-2.3-r4.ebuild,v 1.1 2005/03/29 22:55:10 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r4.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 inherit eutils
 
@@ -19,7 +19,7 @@ SRC_URI="http://www.sleepycat.com/update/snapshot/db-${DB_VER}.tar.gz
 # dsniff has it's own small license which is in the docs section
 LICENSE="DSNIFF"
 SLOT="0"
-KEYWORDS="x86 ~alpha ~ppc"
+KEYWORDS="alpha ppc x86"
 IUSE=""
 
 RDEPEND="virtual/libpcap
diff --git a/net-analyzer/dsniff/dsniff-2.3-r5.ebuild b/net-analyzer/dsniff/dsniff-2.3-r5.ebuild
index d9c02a730f2f..903edb516289 100644
--- a/net-analyzer/dsniff/dsniff-2.3-r5.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.3-r5.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/net-analyzer/dsniff/dsniff-2.3-r5.ebuild,v 1.1 2005/06/27 19:20:26 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r5.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-analyzer/dsniff/dsniff-2.3-r6.ebuild b/net-analyzer/dsniff/dsniff-2.3-r6.ebuild
index b0d4059a6d03..abe001a34f52 100644
--- a/net-analyzer/dsniff/dsniff-2.3-r6.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.3-r6.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/net-analyzer/dsniff/dsniff-2.3-r6.ebuild,v 1.1 2005/09/09 03:24:38 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r6.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-analyzer/dsniff/dsniff-2.3-r7.ebuild b/net-analyzer/dsniff/dsniff-2.3-r7.ebuild
index e76248b149c3..bd18b947e664 100644
--- a/net-analyzer/dsniff/dsniff-2.3-r7.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.3-r7.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/net-analyzer/dsniff/dsniff-2.3-r7.ebuild,v 1.1 2005/10/15 09:34:08 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/dsniff/dsniff-2.3-r7.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-analyzer/dsniff/files/2.3-libnet-1.0.patch b/net-analyzer/dsniff/files/2.3-libnet-1.0.patch
index dd1692a8a0cf..0e036f86874e 100644
--- a/net-analyzer/dsniff/files/2.3-libnet-1.0.patch
+++ b/net-analyzer/dsniff/files/2.3-libnet-1.0.patch
@@ -42,41 +42,12 @@ diff -U 0 -r dsniff-2.3.orig/configure dsniff-2.3/configure
 +  elif test -f /usr/include/libnet-1.0.h; then
 +     CFLAGS="$CFLAGS `libnet-1.0-config --defines`"
 +     LNETLIB="-lnet-1.0"
-@@ -3115 +3115 @@
--     if test -f $withval/src/nids.h -a -f $withval/src/libnids.a; then
-+     if test -f $withval/src/nids-1.0.h -a -f $withval/src/libnids-1.0.a; then
-@@ -3119,2 +3119,2 @@
--	NIDSLIB="-L$withval/src -lnids"
--     elif test -f $withval/include/nids.h -a -f $withval/lib/libnids.a; then
-+	NIDSLIB="-L$withval/src -lnids-1.0"
-+     elif test -f $withval/include/nids-1.0.h -a -f $withval/lib/libnids-1.0.a; then
-@@ -3124 +3124 @@
--	NIDSLIB="-L$withval/lib -lnids"
-+	NIDSLIB="-L$withval/lib -lnids-1.0"
-@@ -3126 +3126 @@
--        { echo "configure: error: nids.h or libnids.a not found in $withval" 1>&2; exit 1; }
-+        { echo "configure: error: nids-1.0.h or libnids-1.0.a not found in $withval" 1>&2; exit 1; }
-@@ -3131 +3131 @@
--   if test -f ${prefix}/include/nids.h; then
-+   if test -f ${prefix}/include/nids-1.0.h; then
-@@ -3133,3 +3133,3 @@
--     NIDSLIB="-L${prefix}/lib -lnids"
--  elif test -f /usr/include/nids.h; then
--     NIDSLIB="-lnids"
-+     NIDSLIB="-L${prefix}/lib -lnids-1.0"
-+  elif test -f /usr/include/nids-1.0.h; then
-+     NIDSLIB="-lnids-1.0"
-@@ -3151 +3151 @@
--#include <nids.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/decode_portmap.c dsniff-2.3/decode_portmap.c
 --- dsniff-2.3.orig/decode_portmap.c	2000-12-15 15:13:29.000000000 -0500
 +++ dsniff-2.3/decode_portmap.c	2003-08-19 14:51:56.350596720 -0400
-@@ -18,2 +18,2 @@
+@@ -18,1 +18,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/dnsspoof.c dsniff-2.3/dnsspoof.c
 --- dsniff-2.3.orig/dnsspoof.c	2000-11-19 14:39:40.000000000 -0500
 +++ dsniff-2.3/dnsspoof.c	2003-08-19 14:51:56.183622104 -0400
@@ -86,19 +57,15 @@ diff -U 0 -r dsniff-2.3.orig/dnsspoof.c dsniff-2.3/dnsspoof.c
 diff -U 0 -r dsniff-2.3.orig/dsniff.c dsniff-2.3/dsniff.c
 --- dsniff-2.3.orig/dsniff.c	2000-12-01 16:27:15.000000000 -0500
 +++ dsniff-2.3/dsniff.c	2003-08-19 14:51:56.352596416 -0400
-@@ -21,2 +21,2 @@
+@@ -21,1 +21,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/filesnarf.c dsniff-2.3/filesnarf.c
 --- dsniff-2.3.orig/filesnarf.c	2000-12-15 15:16:58.000000000 -0500
 +++ dsniff-2.3/filesnarf.c	2003-08-19 14:51:56.357595656 -0400
-@@ -22,2 +22,2 @@
+@@ -22,1 +22,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/macof.c dsniff-2.3/macof.c
 --- dsniff-2.3.orig/macof.c	2000-11-14 10:50:55.000000000 -0500
 +++ dsniff-2.3/macof.c	2003-08-19 14:51:56.192620736 -0400
@@ -108,19 +75,15 @@ diff -U 0 -r dsniff-2.3.orig/macof.c dsniff-2.3/macof.c
 diff -U 0 -r dsniff-2.3.orig/mailsnarf.c dsniff-2.3/mailsnarf.c
 --- dsniff-2.3.orig/mailsnarf.c	2000-11-19 14:39:41.000000000 -0500
 +++ dsniff-2.3/mailsnarf.c	2003-08-19 14:51:56.361595048 -0400
-@@ -21,2 +21,2 @@
+@@ -21,1 +21,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/msgsnarf.c dsniff-2.3/msgsnarf.c
 --- dsniff-2.3.orig/msgsnarf.c	2000-12-15 15:12:19.000000000 -0500
 +++ dsniff-2.3/msgsnarf.c	2003-08-19 14:51:56.369593832 -0400
-@@ -20,2 +20,2 @@
+@@ -20,1 +20,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/record.c dsniff-2.3/record.c
 --- dsniff-2.3.orig/record.c	2000-11-14 10:51:02.000000000 -0500
 +++ dsniff-2.3/record.c	2003-08-19 14:51:56.206618608 -0400
@@ -154,19 +117,15 @@ diff -U 0 -r dsniff-2.3.orig/tcpnice.c dsniff-2.3/tcpnice.c
 diff -U 0 -r dsniff-2.3.orig/trigger.c dsniff-2.3/trigger.c
 --- dsniff-2.3.orig/trigger.c	2000-11-19 16:44:29.000000000 -0500
 +++ dsniff-2.3/trigger.c	2003-08-19 14:51:56.376592768 -0400
-@@ -15,2 +15,2 @@
+@@ -15,1 +15,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/urlsnarf.c dsniff-2.3/urlsnarf.c
 --- dsniff-2.3.orig/urlsnarf.c	2000-12-18 21:53:36.000000000 -0500
 +++ dsniff-2.3/urlsnarf.c	2003-08-19 14:51:56.378592464 -0400
-@@ -24,2 +24,2 @@
+@@ -24,1 +24,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
 diff -U 0 -r dsniff-2.3.orig/webmitm.c dsniff-2.3/webmitm.c
 --- dsniff-2.3.orig/webmitm.c	2000-12-03 00:13:28.000000000 -0500
 +++ dsniff-2.3/webmitm.c	2003-08-19 14:51:56.229615112 -0400
@@ -176,8 +135,6 @@ diff -U 0 -r dsniff-2.3.orig/webmitm.c dsniff-2.3/webmitm.c
 diff -U 0 -r dsniff-2.3.orig/webspy.c dsniff-2.3/webspy.c
 --- dsniff-2.3.orig/webspy.c	2000-11-14 10:51:04.000000000 -0500
 +++ dsniff-2.3/webspy.c	2003-08-19 14:51:56.381592008 -0400
-@@ -24,2 +24,2 @@
+@@ -24,1 +24,1 @@
 -#include <libnet.h>
--#include <nids.h>
 +#include <libnet-1.0.h>
-+#include <nids-1.0.h>
diff --git a/net-analyzer/echoping/ChangeLog b/net-analyzer/echoping/ChangeLog
index 08497101b881..0b15f98db542 100644
--- a/net-analyzer/echoping/ChangeLog
+++ b/net-analyzer/echoping/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/echoping
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.1 2005/01/25 15:15:35 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/ChangeLog,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
+
+  27 May 2005; Otavio Piske <angusyoung@gentoo.org> echoping-5.2.0.ebuild:
+  Marked as x86.
+
+  05 Apr 2005; Otavio R. Piske <angusyoung@gentoo.org> echoping-5.2.0.ebuild:
+  Removed 1 of the 2 use_enable icp in src_compile
+
+  25 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> echoping-5.2.0.ebuild:
+  Removed einstall in favour of emake install
 
 *echoping-5.2.0 (25 Jan 2005)
 
diff --git a/net-analyzer/echoping/Manifest b/net-analyzer/echoping/Manifest
index fadded409f86..625b101a28fd 100644
--- a/net-analyzer/echoping/Manifest
+++ b/net-analyzer/echoping/Manifest
@@ -1,3 +1,5 @@
-MD5 7049d1f62e7f86c771ff8393c740edd3 echoping-5.2.0.ebuild 891
-MD5 79b796b1e50040a7252760c11a8b7e35 .echoping-5.2.0.ebuild.swp 12288
+MD5 988ae4284dfc87329acc495af85663ce echoping-5.2.0.ebuild 1319
+MD5 3d1b485ea7f3743394e8448e86464f3d ChangeLog 807
+MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
 MD5 4783578f5986c067408a04d82e5ed589 files/digest-echoping-5.2.0 66
+MD5 031f7ebff5b4da097049a014ad9b4890 files/maxtoread-5.2.0.patch 298
diff --git a/net-analyzer/echoping/echoping-5.2.0.ebuild b/net-analyzer/echoping/echoping-5.2.0.ebuild
index 41a0a3d24fa5..a0220eac7842 100644
--- a/net-analyzer/echoping/echoping-5.2.0.ebuild
+++ b/net-analyzer/echoping/echoping-5.2.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/net-analyzer/echoping/echoping-5.2.0.ebuild,v 1.1 2005/01/25 15:15:35 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/echoping/echoping-5.2.0.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/echoping/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="gnutls http icp idn priority smtp ssl tos"
 
 # Add suport to libidn 
@@ -36,7 +36,6 @@ src_compile() {
 		`use_enable http`  \
 		`use_enable icp` \
 		`use_with idn libidn` \
-		`use_enable icp` \
 		`use_enable smtp` \
 		`use_enable tos` \
 		`use_enable priority` \
@@ -46,8 +45,8 @@ src_compile() {
 }
 
 src_install() {
-	einstall || die
+	emake install DESTDIR=${D} || die
 
-	# They are not installed by einstall
+	# They are not installed by emake install
 	dodoc README AUTHORS ChangeLog COPYING DETAILS NEWS TODO
 }
diff --git a/net-analyzer/egressor/ChangeLog b/net-analyzer/egressor/ChangeLog
index d971fb2e0570..c2afd4a10d40 100644
--- a/net-analyzer/egressor/ChangeLog
+++ b/net-analyzer/egressor/ChangeLog
@@ -1,8 +1,31 @@
 # ChangeLog for net-analyzer/egressor
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/ChangeLog,v 1.1 2003/02/26 03:24:44 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  egressor-1.0-r1.ebuild:
+  Stable on ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> egressor-1.0-r1.ebuild,
+  egressor-1.0.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  03 Sep 2004; David Holm <dholm@gentoo.org> egressor-1.0-r1.ebuild:
+  Added to ~ppc.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  egressor-1.0-r1.ebuild:
+  marked x86 stable.
+
+*egressor-1.0-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *egressor-1.0 (25 Feb 2003)
 
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> egressor-1.0.ebuild :
+  Fixed Depend to libnet-1.0*. Closes #17017.
+  
   25 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me for #11784.
diff --git a/net-analyzer/egressor/Manifest b/net-analyzer/egressor/Manifest
index e69de29bb2d1..f1f76630c97e 100644
--- a/net-analyzer/egressor/Manifest
+++ b/net-analyzer/egressor/Manifest
@@ -0,0 +1,7 @@
+MD5 4a571af4bb546953409fa6e3c77a1065 egressor-1.0.ebuild 767
+MD5 c75a90f831c2bbf877d41b987645c097 metadata.xml 233
+MD5 f88ce570f96806e149701b27e90fb208 ChangeLog 1058
+MD5 eee473268292a79c40cb336b0dac44c1 egressor-1.0-r1.ebuild 887
+MD5 6ef1810e065d4ab8c789a28901381fb2 files/1.0-libnet-1.0.patch 396
+MD5 a2561d000de00f86c31180af32ab084e files/digest-egressor-1.0 70
+MD5 a2561d000de00f86c31180af32ab084e files/digest-egressor-1.0-r1 70
diff --git a/net-analyzer/egressor/egressor-1.0-r1.ebuild b/net-analyzer/egressor/egressor-1.0-r1.ebuild
index 7854984d8ed3..1ca80c20c338 100644
--- a/net-analyzer/egressor/egressor-1.0-r1.ebuild
+++ b/net-analyzer/egressor/egressor-1.0-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/net-analyzer/egressor/egressor-1.0-r1.ebuild,v 1.1 2003/08/21 04:28:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/egressor-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit eutils
 
@@ -10,11 +10,12 @@ SRC_URI="http://www.packetfactory.net/projects/${PN}/${PN}_release${PV}.tar.gz"
 
 LICENSE="egressor"
 SLOT="0"
-KEYWORDS="~x86"
+IUSE=""
+KEYWORDS="x86 ppc"
 
-DEPEND=">=net-libs/libnet-1.0.2a-r3
-	<net-libs/libnet-1.1"
-RDEPEND="net-libs/libpcap
+DEPEND="<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3"
+RDEPEND="virtual/libpcap
 	dev-perl/Net-RawIP
 	dev-lang/perl"
 
diff --git a/net-analyzer/egressor/egressor-1.0.ebuild b/net-analyzer/egressor/egressor-1.0.ebuild
index 2cd994090af7..e260be684097 100644
--- a/net-analyzer/egressor/egressor-1.0.ebuild
+++ b/net-analyzer/egressor/egressor-1.0.ebuild
@@ -1,19 +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/net-analyzer/egressor/egressor-1.0.ebuild,v 1.1 2003/02/26 03:24:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/egressor/egressor-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 DESCRIPTION="tool for checking router configuration"
 HOMEPAGE="http://www.packetfactory.net/projects/egressor/"
-SRC_URI="http://www.packetfactory.net/projects/egressor/egressor_release${PV}.tar.gz"
+SRC_URI="http://www.packetfactory.net/projects/${PN}/${PN}_release${PV}.tar.gz"
 
 LICENSE="egressor"
 SLOT="0"
-KEYWORDS="~x86"
+IUSE=""
+KEYWORDS="x86"
 
-DEPEND="net-libs/libnet"
-RDEPEND="net-libs/libpcap
+DEPEND="=net-libs/libnet-1.0*"
+RDEPEND="virtual/libpcap
 	dev-perl/Net-RawIP
-	sys-devel/perl"
+	dev-lang/perl"
 
 S=${WORKDIR}
 
diff --git a/net-analyzer/etherape/ChangeLog b/net-analyzer/etherape/ChangeLog
index cf80d8fd4dcf..d7109f78bfdb 100644
--- a/net-analyzer/etherape/ChangeLog
+++ b/net-analyzer/etherape/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for net-analyzer/etherape
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> etherape-0.9.3.ebuild:
+  Stable on ppc.
+
+  30 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> etherape-0.9.3.ebuild:
+  Stable on sparc
+
+  29 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> etherape-0.9.0.ebuild,
+  etherape-0.9.3.ebuild:
+  Do not dodoc COPYING/INSTALL, misc fixes, 0.9.3 x86 stable.
+
+*etherape-0.9.3 (19 Aug 2005)
+
+  19 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/etherape-0.9.3-res_mkquery.patch, -etherape-0.9.1.ebuild,
+  +etherape-0.9.3.ebuild:
+  Version bump. Ported res_mkquery.patch to 0.9.3. Compiles and runs with gcc4
+  without patching.
+
+  16 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/etherape-0.9.1-gcc4.diff, etherape-0.9.1.ebuild:
+  Added patch so etherape will build w/gcc-4.
+
+  10 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> etherape-0.9.1.ebuild:
+  Stable on sparc
+
+  09 May 2005; Lars Weiler <pylon@gentoo.org> etherape-0.9.1.ebuild:
+  Stable on ppc.
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/etherape-0.8.2-gcc3-gentoo.patch, -etherape-0.8.2-r1.ebuild,
+  etherape-0.9.1.ebuild:
+  Removing old ebuild, marking 0.9.1 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> etherape-0.9.0.ebuild:
+  Use make install instead of emake install.
+
+  10 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/etherape-0.9.1-fix-mkinstalldirs.diff, etherape-0.9.1.ebuild:
+  Added patch to fix mkinstalldirs path for bug 83310.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> etherape-0.9.1.ebuild:
+  Revert keywords pending actual solution to 79385.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> etherape-0.9.1.ebuild:
+  Marked stable on x86.
+
+  07 Feb 2005; Eldad Zack <eldad@gentoo.org> etherape-0.9.1.ebuild:
+  Reapplied res_mkquery patch. Closes #79385.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> etherape-0.8.2-r1.ebuild,
+  etherape-0.9.0.ebuild, etherape-0.9.1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*etherape-0.9.1 (08 Jan 2005)
+
+  08 Jan 2005; Daniel Black <dragonheart@gentoo.org> etherape-0.9.0.ebuild,
+  +etherape-0.9.1.ebuild:
+  0.9.0 - einstall changed to make DESTDIR=${D} install - fixes bug #71777.
+  Version bump to0.9.1 - no longer needs patches. Thanks to Hein
+  <heinuae@yahoo.com>
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> etherape-0.8.2-r1.ebuild:
+  Updated to use epatch.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> etherape-0.9.0.ebuild:
+  Add inherit eutils
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org>
+  files/etherape-0.9.0-libpcap-include.patch:
+  Fix backward compatiblity, remove check for net/bpf.h
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> etherape-0.9.0.ebuild:
+  Fix libpcap include and other things, amd64 keyword. Closing #37443.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> etherape-0.9.0.ebuild:
+  Marked stable on sparc.
+
+*etherape-0.9.0 (11 May 2003)
+
+  11 May 2003; Alastair Tse <liquidx@gentoo.org> etherape-0.9.0.ebuild:
+  version bump to gtk2 ver
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  04 Nov 2002; Hannes Mehnert <hannes@gentoo.org> etherape-0.8.2-r1.ebuild:
+  fixed dependency for libglade (closes bug #6931)
+
+*etherape-0.8.2-r1 (14 Jul 2002)
+
+  14 Jul 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
+  etherape-0.8.2-r1.ebuild, files/etherape-0.8.2-gcc3-gentoo.patch,
+  files/digest-etherape-0.8.2-r1 :
+
+  Fix for gcc3.1.
 
 *etherape-0.8.2 (1 Feb 2002)
 
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index 08f1351fb349..289adf3cdf4b 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,6 +1,12 @@
-MD5 f9817a0cee5317bf93c9a433e179a0a1 ChangeLog 1116
-MD5 4ea3822eb6bfa36af2e6e65d88d1a9b2 etherape-0.8.2-r1.ebuild 1187
-MD5 4ea3822eb6bfa36af2e6e65d88d1a9b2 etherape-0.9.0.ebuild 1187
-MD5 fa35a411bca4af227afb869da4781b0c files/digest-etherape-0.8.2-r1 66
-MD5 efc64f22a1d8e39060fd684f5b105078 files/etherape-0.8.2-gcc3-gentoo.patch 518
+MD5 1a92fdd553981eb21d883556b1b3d5d4 ChangeLog 4096
+MD5 055fd4a254cc6d675c0d168ebd8a1461 etherape-0.9.0.ebuild 1241
+MD5 71ae541d4558f880b2783e4c4a885ac3 etherape-0.9.3.ebuild 1321
 MD5 4ec4396b2bd551ad7dc1ddc3ca92a8e1 files/digest-etherape-0.9.0 66
+MD5 76397dabeac22c60a8fc7400eab6a8e1 files/digest-etherape-0.9.3 66
+MD5 0015559610bab6a40691241598863f72 files/etherape-0.9.0-libpcap-include.patch 399
+MD5 878e13dfd52ac79ec511a2ff1d259b73 files/etherape-0.9.0-res_mkquery.patch 466
+MD5 e0c5c68b74ad90834cbdea3b792a19a4 files/etherape-0.9.1-fix-mkinstalldirs.diff 563
+MD5 4c9a26055b22c23b639f1807cb0710f0 files/etherape-0.9.1-gcc4.diff 8075
+MD5 878e13dfd52ac79ec511a2ff1d259b73 files/etherape-0.9.1-res_mkquery.patch 466
+MD5 5ce49da683534b84b59d34525deb611b files/etherape-0.9.3-res_mkquery.patch 620
+MD5 d8307d213e01909e87c072d2b3e9450c metadata.xml 254
diff --git a/net-analyzer/etherape/etherape-0.9.0.ebuild b/net-analyzer/etherape/etherape-0.9.0.ebuild
index e4ec56af50f6..273d10de11c1 100644
--- a/net-analyzer/etherape/etherape-0.9.0.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.0.ebuild
@@ -1,6 +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/net-analyzer/etherape/etherape-0.9.0.ebuild,v 1.1 2003/05/11 00:22:36 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
@@ -9,15 +11,31 @@ HOMEPAGE="http://etherape.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc ~amd64"
 
 DEPEND=">=gnome-base/libglade-2.0
 	>=gnome-base/libgnomeui-2.0
-	>=net-libs/libpcap-0.6.1
-	sys-devel/gettext"
+	virtual/libpcap
+	sys-devel/gettext
+	sys-devel/autoconf"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-libpcap-include.patch
+	epatch ${FILESDIR}/${P}-res_mkquery.patch
+}
+
+src_compile() {
+	aclocal
+	autoconf
+
+	econf || die
+	emake || die
+}
 
 src_install() {
-	einstall
+	make DESTDIR=${D} install || die "install failed"
 
 	# move shortcut to gnome2 compliant location
 	dodir /usr/share/applications
@@ -26,7 +44,7 @@ src_install() {
 	echo "Categories=GNOME;Application;Network;" >> ${D}/usr/share/applications/etherape.desktop
 	rm -rf ${D}/usr/share/gnome
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW
+	dodoc ABOUT-NLS AUTHORS ChangeLog FAQ NEWS OVERVIEW
 	dodoc README* TODO
 }
 
diff --git a/net-analyzer/etherape/etherape-0.9.3.ebuild b/net-analyzer/etherape/etherape-0.9.3.ebuild
index 0547179928e5..ff8c8b85c03c 100644
--- a/net-analyzer/etherape/etherape-0.9.3.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.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/net-analyzer/etherape/etherape-0.9.3.ebuild,v 1.1 2005/08/19 23:15:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.3.ebuild,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://etherape.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND=">=gnome-base/libglade-2.0
@@ -19,10 +19,9 @@ DEPEND=">=gnome-base/libglade-2.0
 	sys-devel/gettext"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-res_mkquery.patch
-	epatch ${FILESDIR}/${PN}-0.9.1-fix-mkinstalldirs.diff
+	unpack ${A}; cd "${S}"
+	epatch "${FILESDIR}"/${P}-res_mkquery.patch
+	epatch "${FILESDIR}"/${PN}-0.9.1-fix-mkinstalldirs.diff
 }
 
 src_compile() {
@@ -34,15 +33,15 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 
 	# move shortcut to gnome2 compliant location
 	dodir /usr/share/applications
-	mv ${D}/usr/share/gnome/apps/Applications/etherape.desktop \
-		${D}/usr/share/applications
-	echo "Categories=GNOME;Application;Network;" >> ${D}/usr/share/applications/etherape.desktop
-	rm -rf ${D}/usr/share/gnome
+	mv "${D}"/usr/share/gnome/apps/Applications/etherape.desktop \
+		"${D}"/usr/share/applications
+	echo "Categories=GNOME;Application;Network;" >> "${D}"/usr/share/applications/etherape.desktop
+	rm -rf "${D}"/usr/share/gnome
 
-	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog FAQ INSTALL NEWS OVERVIEW
+	dodoc ABOUT-NLS AUTHORS ChangeLog FAQ NEWS OVERVIEW
 	dodoc README* TODO
 }
diff --git a/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch b/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch
index fded788d66cf..63998df3e705 100644
--- a/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch
+++ b/net-analyzer/etherape/files/etherape-0.9.0-libpcap-include.patch
@@ -1,13 +1,11 @@
 --- acinclude.m4	2001-04-19 16:56:23.000000000 +0000
-+++ acinclude.m4	2004-02-06 12:04:04.119738872 +0000
-@@ -131,8 +131,8 @@
++++ acinclude.m4	2004-02-06 13:13:55.497552592 +0000
+@@ -131,8 +131,6 @@
  	fi
  
  	# Pcap header checks
 -	AC_CHECK_HEADER(net/bpf.h,,
 -	    AC_MSG_ERROR([[Header file net/bpf.h not found; if you installed libpcap from source, did you also do \"make install-incl\"?]]))
-+	AC_CHECK_HEADER(pcap-bpf.h,,
-+	    AC_MSG_ERROR([[Header file pcap-bpf.h not found; if you installed libpcap from source, did you also do \"make install-incl\"?]]))
  	AC_CHECK_HEADER(pcap.h,, AC_MSG_ERROR(Header file pcap.h not found.))
  
  	#
diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index df9e7009a478..f731a879c2bf 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,13 +1,369 @@
 # ChangeLog for net-analyzer/ethereal
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
-
-*ethereal-0.9.0 (1 Feb 2002)
-
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
+
+  29 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ethereal-0.10.13-r1.ebuild:
+  Stable on ppc. See bug #109348.
+
+  29 Oct 2005; Mark Loeser <halcy0n@gentoo.org> ethereal-0.10.13-r1.ebuild:
+  Stable on x86; bug #109348
+
+  28 Oct 2005; Simon Stelling <blubb@gentoo.org> ethereal-0.10.13-r1.ebuild:
+  stable on amd64 wrt bug 109348
+
+  27 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  ethereal-0.10.13-r1.ebuild:
+  Stable on alpha wrt #109348
+
+  27 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ethereal-0.10.13-r1.ebuild:
+  Stable on sparc wrt #109348
+
+  27 Oct 2005; Brent Baude <ranger@gentoo.org> ethereal-0.10.13-r1.ebuild:
+  Marking  ethereal-0.10.13-r1 ppc64 stable per bug 109348
+
+*ethereal-0.10.13-r1 (27 Oct 2005)
+
+  27 Oct 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff,
+  +ethereal-0.10.13-r1.ebuild:
+  Revision bump; added patch from bug #109348 that fixes a DoS (CVE-2005-3313).
+
+  24 Oct 2005; Jose Luis Rivero <yoswink@gentoo.org>
+  ethereal-0.10.13.ebuild:
+  Stable on alpha wrt security bug #109348
+
+  24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ethereal-0.10.13.ebuild:
+  Stable on sparc wrt #109348
+
+  24 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ethereal-0.10.13.ebuild:
+  Stable on ppc.
+
+  24 Oct 2005; Brent Baude <ranger@gentoo.org> ethereal-0.10.13.ebuild:
+  Marking ethereal-0.10.13 ppc64 stable for bug 109348
+
+  20 Oct 2005; Andrej Kacian <ticho@gentoo.org> ethereal-0.10.13.ebuild:
+  Stable on x86, security bug #109348.
+
+*ethereal-0.10.13 (19 Oct 2005)
+
+  19 Oct 2005; Daniel Black <dragonheart@gentoo.org> -files/fifo.patch,
+  +ethereal-0.10.13.ebuild:
+  version bump - bug #109348
+
+  21 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> ethereal-0.10.12.ebuild:
+  Fix ebuild so that it works without building X. Passing --disable-ethereal
+  _does_ have an influence now. Fixes bug 106772. Thanks to Chris
+  Paulson-Ellis <chris at edesix dot com>.
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -ethereal-0.10.11.ebuild, -ethereal-0.10.11-r1.ebuild,
+  ethereal-0.10.12.ebuild:
+  Kill gtk2 USE flag for bug 106560.
+
+  29 Jul 2005; Benjamin Smee <strerror@gentoo.org> ethereal-0.10.12.ebuild:
+  Fixed spelling as per bug 100725
+
+  28 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/ethereal-0.10.12-fix-encrypted-conflict.diff,
+  ethereal-0.10.12.ebuild:
+  Add patch from upstream to fix encrypt conflicts, bug 100488.
+
+  27 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ethereal-0.10.12.ebuild:
+  Stable on alpha + ia64, bug 100316.
+
+  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ethereal-0.10.12.ebuild:
+  Stable on sparc wrt #100316
+
+  27 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  ethereal-0.10.12.ebuild:
+  ppc stable, bug #100316
+
+  27 Jul 2005; Simon Stelling <blubb@gentoo.org> ethereal-0.10.12.ebuild:
+  marked stable wrt bug #100316
+
+  27 Jul 2005; Markus Rothe <corsair@gentoo.org> ethereal-0.10.12.ebuild:
+  Stable on ppc64 (bug #100316)
+
+*ethereal-0.10.12 (27 Jul 2005)
+
+  27 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +ethereal-0.10.12.ebuild:
+  Version bump wrt bug 100316.
+
+*ethereal-0.10.11-r1 (19 Jul 2005)
+
+  19 Jul 2005; petre rodan <kaiowas@gentoo.org> +files/fifo.patch,
+  +ethereal-0.10.11-r1.ebuild:
+  fix for #83429. fifo.patch should be part of the next upstream version
+
+  13 Jun 2005; Simon Stelling <blubb@gentoo.org> ethereal-0.10.11.ebuild:
+  replacing -Os with -O too, fixes bug 91660
+
+  07 May 2005; Daniel Black <dragonheart@gentoo.org>
+  ethereal-0.10.11.ebuild:
+  Fixed spelling mistake. Thanks to Mikael Magnusson <mikachu@gmail.com> in
+  bug #91772.
+
+  06 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  -files/ethereal-0.10.9-mate.h-gcc2.patch, -files/0.10.4-gcc34.patch,
+  -ethereal-0.10.5.ebuild, -ethereal-0.10.5-r1.ebuild,
+  -ethereal-0.10.6.ebuild, -ethereal-0.10.8.ebuild, -ethereal-0.10.9.ebuild,
+  -ethereal-0.10.10.ebuild, -ethereal-0.10.9-r1.ebuild,
+  ethereal-0.10.11.ebuild:
+  Stable on alpha + ia64, bug 90539. Cleaned out all ebuild + patches.
+
+  06 May 2005; Daniel Black <dragonheart@gentoo.org>
+  ethereal-0.10.11.ebuild:
+  Added postinstall warning about the possibility of more security flaws
+
+  05 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ethereal-0.10.11.ebuild:
+  Stable on sparc wrt #90539
+
+  05 May 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
+  ethereal-0.10.11.ebuild:
+  stable on ppc64 wrt #90539
+
+  05 May 2005; Jan Brinkmann <luckyduck@gentoo.org> ethereal-0.10.11.ebuild:
+  stable on amd64 wrt #90539
+
+  05 May 2005; Daniel Black <dragonheart@gentoo.org>
+  ethereal-0.10.11.ebuild:
+  ppc stable and unmasked (was own machine problem)
+
+*ethereal-0.10.11 (05 May 2005)
+
+  05 May 2005; Daniel Black <dragonheart@gentoo.org>
+  +ethereal-0.10.11.ebuild:
+  Security version bump as per bug #90539. Still masked due to relocation issues.
+
+  17 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> ethereal-0.10.10.ebuild:
+  Fix deps for bug 85575.
+
+  12 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> ethereal-0.10.10.ebuild:
+  Stable on sparc wrt #84547
+
+  12 Mar 2005; Markus Rothe <corsair@gentoo.org> ethereal-0.10.10.ebuild:
+  Stable on ppc64
+
+  12 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
+  ethereal-0.10.10.ebuild:
+  Stable on ppc.
+
+  12 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  ethereal-0.10.10.ebuild:
+  Stable on alpha, bug 84547.
+
+  11 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> ethereal-0.10.10.ebuild:
+  stable on amd64 wrt to #84547
+
+*ethereal-0.10.10 (11 Mar 2005)
+
+  11 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +ethereal-0.10.10.ebuild:
+  Version bump for security bug 84547.
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  ethereal-0.10.9-r1.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ethereal-0.10.9-r1.ebuild:
+  Marked stable on x86.
+
+  21 Feb 2005; Aron Griffis <agriffis@gentoo.org> ethereal-0.10.9.ebuild:
+  stable on ia64 #78559
+
+  15 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ethereal-0.10.9-r1.ebuild:
+  Install icons in the correct place and provide a desktop entry for bug
+  81055. Thanks to Diego Pettenò.
+
+  25 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/ethereal-0.10.9-mate.h-gcc2.patch, ethereal-0.10.9-r1.ebuild,
+  ethereal-0.10.9.ebuild:
+  gcc-2.95 patch as per bug #79032. Thanks to Matt Taylor <liverbugg@juno.com>
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> ethereal-0.10.9-r1.ebuild:
+  Fix access violation caused by libnetsnmp when USE=snmp, bug 79068.
+
+  21 Jan 2005; Markus Rothe <corsair@gentoo.org> ethereal-0.10.9.ebuild:
+  Stable on ppc64; bug #78559
+
+*ethereal-0.10.9-r1 (22 Jan 2005)
+
+  22 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +ethereal-0.10.9-r1.ebuild:
+  Added kerberos support and cleaned a few other things up.
+
+  21 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> ethereal-0.10.9.ebuild:
+  Stable on alpha, bug 78559.
+
+  21 Jan 2005; Luca Barbato <lu_zero@gentoo.org> ethereal-0.10.9.ebuild:
+  Marked ppc
+
+  20 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ethereal-0.10.9.ebuild:
+  Stable sparc, amd64 for GLSA.
+
+  20 Jan 2005; <solar@gentoo.org> ethereal-0.10.9.ebuild:
+  - stable on x86
+
+*ethereal-0.10.9 (20 Jan 2005)
+
+  20 Jan 2005; <solar@gentoo.org> +ethereal-0.10.9.ebuild:
+  - security bump for bug #78559
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  21 Dec 2004; Akinori Hattori <hattya@gentoo.org> ethereal-0.10.8.ebuild:
+  stable on ia64, #bug #74443.
+
+  18 Dec 2004; Markus Rothe <corsair@gentoo.org> ethereal-0.10.8.ebuild:
+  Stable on ppc64
+
+  18 Dec 2004; Simon Stelling <blubb@gentoo.org> ethereal-0.10.8.ebuild:
+  stable on amd64; bug #74443
+
+  16 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> ethereal-0.10.8.ebuild:
+  Stable on alpha, bug 74443.
+
+  16 Dec 2004; <SeJo@gentoo.org> ethereal-0.10.8.ebuild:
+  stable on ppc bug: 74443
+
+  15 Dec 2004; Jason Wever <weeve@gentoo.org> ethereal-0.10.8.ebuild:
+  Stable on sparc wrt security bug #74443.
+
+  16 Dec 2004; Eldad Zack <eldad@gentoo.org> -ethereal-0.10.7.ebuild:
+  security purge
+
+*ethereal-0.10.8 (16 Dec 2004)
+
+  16 Dec 2004; Eldad Zack <eldad@gentoo.org> +ethereal-0.10.8.ebuild:
+  Security bump. marking x86 stable. bug #74443.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> ethereal-0.10.6.ebuild:
+  Stable on alpha.
+
+  25 Oct 2004; Jason Wever <weeve@gentoo.org> ethereal-0.10.6.ebuild:
+  Stable on sparc.
+
+*ethereal-0.10.7 (25 Oct 2004)
+
+  25 Oct 2004; Eldad Zack <eldad@gentoo.org> +ethereal-0.10.7.ebuild:
+  Version bump
+
+  24 Oct 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.5-r1.ebuild,
+  ethereal-0.10.6.ebuild:
+  x86 marked stable
+
+  14 Oct 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.6.ebuild:
+  Fixed myconf overwriting. Closes bug #66747.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -files/0.10.3-gcc34.patch,
+  -files/0.10.6-gcc34.patch, ethereal-0.10.6.ebuild:
+  Got rid of the patch in favor of flag-o-matic.
+
+  15 Aug 2004; Tony Vroon <chainsaw@gentoo.org> +files/0.10.6-gcc34.patch,
+  ethereal-0.10.6.ebuild:
+  Rediffed the GCC 3.4 compatability patch
+
+*ethereal-0.10.6 (15 Aug 2004)
+
+  15 Aug 2004; Eldad Zack <eldad@gentoo.org> +ethereal-0.10.6.ebuild:
+  Version bump
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.5.ebuild:
+  Changed dep on virtual/snmp to net-analyzer/net-snmp-5.1.1. Closes #56542.
+
+  14 Jul 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.5-r1.ebuild,
+  ethereal-0.10.5.ebuild:
+  Fixed -gtk +gtk2 dependency issue. Closes #57022.
+
+  09 Jul 2004; Lars Weiler <pylon@gentoo.org> ethereal-0.10.5-r1.ebuild:
+  Stable on ppc.
+
+  09 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> ethereal-0.10.5.ebuild:
+  Stable on alpha, bug 56423.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.5-r1.ebuild:
+  updated snmp dependency (bug #56542)
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> -ethereal-0.10.2.ebuild,
+  -ethereal-0.10.3.ebuild, -ethereal-0.10.4.ebuild, -ethereal-0.9.14.ebuild,
+  -ethereal-0.9.16.ebuild:
+  Purged bad karma ebuilds (GLSA 200407-08).
+
+*ethereal-0.10.5-r1 (09 Jul 2004)
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +ethereal-0.10.5-r1.ebuild:
+  Removed unneeded elibtoolize. closes #46030.
+
+  08 Jul 2004; Jason Wever <weeve@gentoo.org> ethereal-0.10.5.ebuild:
+  Stable on sparc wrt bug #56423.
+
+  08 Jul 2004; Lars Weiler <pylon@gentoo.org> ethereal-0.10.5.ebuild:
+  Stable on ppc.
+
+  08 Jul 2004; Travis Tilley <lv@gentoo.org> ethereal-0.10.5.ebuild:
+  fixed epatch line for the gcc 3.4 patch
+
+  08 Jul 2004; Travis Tilley <lv@gentoo.org> ethereal-0.10.5.ebuild:
+  stable on amd64
+
+*ethereal-0.10.5 (08 Jul 2004)
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> ethereal-0.10.4.ebuild,
+  +ethereal-0.10.5.ebuild:
+  Version bump due to security issue (#56423). Marking x86 stable.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ethereal-0.10.2.ebuild,
+  ethereal-0.10.3.ebuild, ethereal-0.9.14.ebuild, ethereal-0.9.16-r1.ebuild,
+  ethereal-0.9.16.ebuild:
+  Fix use invocation
+
+  03 Jun 2004; Luca Barbato <lu_zero@gentoo.org> ethereal-0.10.4.ebuild:
+  Marked ppc
+
+  01 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> ethereal-0.10.4.ebuild:
+  Stable on alpha, see bug 51022.
+
+  31 May 2004; Jason Wever <weeve@gentoo.org> ethereal-0.10.4.ebuild:
+  Marked stable on sparc wrt bug #51022.
+
+  31 May 2004; Danny van Dyk <kugelfang@gentoo.org> ethereal-0.10.4.ebuild:
+  Marked stable on amd64.
+
+*ethereal-0.10.4 (31 May 2004)
+
+  31 May 2004; <plasmaroo@gentoo.org> +ethereal-0.10.4.ebuild:
+  Version bump for the Ethereal vulnerabilities; please see bug #51022.
+
+  28 Apr 2004; Mike Frysinger <vapier@gentoo.org>:
+  Add gcc-3.4 patch #49238 by Robert Moss.
+
+  31 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ethereal-0.10.2.ebuild:
+  inherit flag-o-matic for replace-flags; move replace-flags into function
+
+  29 Mar 2004; Aron Griffis <agriffis@gentoo.org> ethereal-0.9.16-r1.ebuild:
+  Stable on alpha and ia64
+
+  28 Mar 2004; Kurt Lieber <klieber@gentoo.org> ethereal-0.10.3.ebuild:
+  Marking stable on x86 to fix bug #45543.
+
+  28 Mar 2004; Luca Barbato <lu_zero@gentoo.org> ethereal-0.10.3.ebuild:
+  Marked ppc to solve a security issue, see bug #45543
+
+  27 Mar 2004; Jason Wever <weeve@gentoo.org> ethereal-0.10.3.ebuild:
+  Marked stable on sparc wrt bug #45543.
+
+*ethereal-0.10.3 (27 Mar 2004)
+
+  27 Mar 2004; <solar@gentoo.org> ethereal-0.10.3.ebuild:
+  Multiple (13) Ethereal remote overflows discovered by Stefan Esser. Bugzilla
+  Bug #45543
+
diff --git a/net-analyzer/ethereal/Manifest b/net-analyzer/ethereal/Manifest
index 4c28bdb7a271..40b1b07cffc4 100644
--- a/net-analyzer/ethereal/Manifest
+++ b/net-analyzer/ethereal/Manifest
@@ -1,11 +1,10 @@
-MD5 136f313c8528f362e7ffe806da893e03 ethereal-0.9.9.ebuild 1963
-MD5 68c7f21c633c3a5eee268bb5e30bf362 ethereal-0.9.10.ebuild 1963
-MD5 01745544dcf1ee3534ebc85e2f4407b3 ethereal-0.9.8-r1.ebuild 1968
-MD5 f8a6f8a09144d42f95576806cea00e68 ethereal-0.9.12.ebuild 1950
-MD5 41671adb3867166118e39caa9390ed65 ChangeLog 4234
-MD5 f8a6f8a09144d42f95576806cea00e68 ethereal-0.9.11.ebuild 1950
-MD5 8b9d978e964fa8a3a3a27bbb23e2e0c9 files/digest-ethereal-0.9.8-r1 68
-MD5 3501b880e32bb8a3b9bb7fa681b9c090 files/digest-ethereal-0.9.10 69
-MD5 c5a4585c3e296d610a886c3695568d64 files/digest-ethereal-0.9.11 69
-MD5 a59519f57adc6a2da471b064e3bf87a7 files/digest-ethereal-0.9.12 69
-MD5 1c8620b2429b33c2c94c1416217f7238 files/digest-ethereal-0.9.9 68
+MD5 0035c79663914579ee16c434086c7c5d ChangeLog 12700
+MD5 f8df469837b3a964d556a54c89c4dd7e ethereal-0.10.12.ebuild 3472
+MD5 6ee5fb732244bda61cfbe9763e8275e2 ethereal-0.10.13-r1.ebuild 3463
+MD5 826c74670c9b90a8c55077f5199bcac0 ethereal-0.10.13.ebuild 3361
+MD5 34bd8a0285aea402be479f40304aa947 files/digest-ethereal-0.10.12 70
+MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13 70
+MD5 ce9e77144029b2f1104aa92c1927f4e9 files/digest-ethereal-0.10.13-r1 70
+MD5 e37a324c1e08bfd08a70fd5958dadeb4 files/ethereal-0.10.12-fix-encrypted-conflict.diff 2838
+MD5 e58b082ef143490cd14bbd423d5e7f4d files/ethereal-0.10.13-fix-irc-loop-DoS-CVE-2005-3313.diff 612
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
diff --git a/net-analyzer/ethereal/ethereal-0.10.12.ebuild b/net-analyzer/ethereal/ethereal-0.10.12.ebuild
index 66125e63030b..b212eb370868 100644
--- a/net-analyzer/ethereal/ethereal-0.10.12.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.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/net-analyzer/ethereal/ethereal-0.10.12.ebuild,v 1.1 2005/07/27 03:58:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.12.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -11,18 +11,14 @@ SRC_URI="http://www.ethereal.com/distribution/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~amd64 ~ia64 ~ppc64"
-IUSE="adns gtk ipv6 snmp ssl gtk2 kerberos"
-
-# if --disable-gtk2 is not passed to configure it will try to build with glib-2.0.
-# --disable-ethereal do not have an influence.
-
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="adns gtk ipv6 snmp ssl kerberos"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	snmp? ( >=net-analyzer/net-snmp-5.1.1 )
 	>=dev-util/pkgconfig-0.15.0
-	gtk? (  gtk2? ( >=dev-libs/glib-2.0.4 =x11-libs/gtk+-2* )
-		!gtk2? ( =x11-libs/gtk+-1.2* )
+	gtk? ( >=dev-libs/glib-2.0.4
+		=x11-libs/gtk+-2*
 		x11-libs/pango
 		dev-libs/atk )
 	!gtk? ( =dev-libs/glib-1.2* )
@@ -38,6 +34,12 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-apps/sed"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-fix-encrypted-conflict.diff"
+}
+
 src_compile() {
 
 	replace-flags -O? -O
@@ -48,10 +50,10 @@ src_compile() {
 	local myconf
 
 	if use gtk; then
-		myconf="${myconf} $(use_enable gtk2)"
+		einfo "Building with gtk support"
 	else
-		myconf="${myconf} --disable-gtk2"
-
+		einfo "Building without gtk support"
+		myconf="${myconf} --disable-ethereal"
 		# the asn1 plugin needs gtk
 		sed -i -e '/plugins.asn1/d' Makefile.in || die "sed failed"
 		sed -i -e '/^SUBDIRS/s/asn1//' plugins/Makefile.in || die "sed failed"
@@ -63,6 +65,7 @@ src_compile() {
 		$(use_with adns) \
 		$(use_with kerberos krb5) \
 		$(use_with snmp net-snmp) \
+		$(use_enable gtk gtk2) \
 		--without-ucd-snmp \
 		--enable-dftest \
 		--enable-randpkt \
@@ -82,16 +85,16 @@ src_compile() {
 
 src_install() {
 	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 
 	dodoc AUTHORS ChangeLog INSTALL.* NEWS README*
 
 	insinto /usr/share/icons/hicolor/16x16/apps
-	newins ${S}/image/hi16-app-ethereal.png ethereal.png
+	newins "${S}"/image/hi16-app-ethereal.png ethereal.png
 	insinto /usr/share/icons/hicolor/32x32/apps
-	newins ${S}/image/hi32-app-ethereal.png ethereal.png
+	newins "${S}"/image/hi32-app-ethereal.png ethereal.png
 	insinto /usr/share/icons/hicolor/48x48/apps
-	newins ${S}/image/hi48-app-ethereal.png ethereal.png
+	newins "${S}"/image/hi48-app-ethereal.png ethereal.png
 	make_desktop_entry ethereal "Ethereal" ethereal
 }
 
@@ -104,6 +107,6 @@ pkg_postinst() {
 	ewarn "use a hardened operating system;"
 	ewarn "do not listen to addition interfaces;"
 	ewarn "if possible, run behind a firewall;"
-	ewarn "take a capture with tcpdump and analyze the contents offline running ethereal as a the least priviledged user; and"
-	ewarn "subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
+	ewarn "take a capture with tcpdump and analyze the contents offline running ethereal as a the least privileged user;"
+	ewarn "and subscribe to ethereal's announce list to be notified of newly discovered vulnerabilities."
 }
diff --git a/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild b/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild
index af6d76e9921c..a0d2866a76e0 100644
--- a/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.13-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/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild,v 1.1 2005/10/27 12:34:09 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="adns gtk ipv6 snmp ssl kerberos"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/net-analyzer/ethereal/ethereal-0.10.13.ebuild b/net-analyzer/ethereal/ethereal-0.10.13.ebuild
index 3b7d752ff7b0..2de2748016a9 100644
--- a/net-analyzer/ethereal/ethereal-0.10.13.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.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/net-analyzer/ethereal/ethereal-0.10.13.ebuild,v 1.1 2005/10/19 22:19:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.13.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
 inherit libtool flag-o-matic eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~ia64 ppc ppc64 sparc x86"
 IUSE="adns gtk ipv6 snmp ssl kerberos"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
diff --git a/net-analyzer/ethloop/ChangeLog b/net-analyzer/ethloop/ChangeLog
index a066ef8a654f..eecb696a447e 100644
--- a/net-analyzer/ethloop/ChangeLog
+++ b/net-analyzer/ethloop/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/ethloop
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ChangeLog,v 1.1 2004/07/11 11:15:54 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+*ethloop-10-r1 (10 Sep 2005)
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/ethloop-10-gcc4.diff, +ethloop-10-r1.ebuild:
+  Fix hardcoded CC and CFLAGS, include string.h in ethloop.c to avoid warnings
+  and dosbin instead of dobin since this needs root priviledges anyway.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> ethloop-10.ebuild:
+  x86 stable
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> ethloop-10.ebuild:
+  Added to ~ppc.
 
 *ethloop-10 (11 Jul 2004)
 
diff --git a/net-analyzer/ethloop/Manifest b/net-analyzer/ethloop/Manifest
index 5ae1db0632a0..215e7458fe52 100644
--- a/net-analyzer/ethloop/Manifest
+++ b/net-analyzer/ethloop/Manifest
@@ -1,2 +1,7 @@
-MD5 b1855c9e5937ce68cd186481b78a18e7 ethloop-10.ebuild 453
+MD5 760ea0f1910be57fa62e8485a9498a0a ethloop-10-r1.ebuild 686
+MD5 ed5f1c74527a881b5fec25002d8c734f ethloop-10.ebuild 564
+MD5 a796789f265abbaa4e97756ea53bb2a0 ChangeLog 853
+MD5 3c5ff5e66702ce3fbb010eea8fb1da10 metadata.xml 244
 MD5 70d7e3ea63f12f27c86a0ae488756544 files/digest-ethloop-10 56
+MD5 70d7e3ea63f12f27c86a0ae488756544 files/digest-ethloop-10-r1 56
+MD5 31736f988b4e3a18957fe0e808f53841 files/ethloop-10-gcc4.diff 566
diff --git a/net-analyzer/ethloop/ethloop-10-r1.ebuild b/net-analyzer/ethloop/ethloop-10-r1.ebuild
index ec972751ce8f..c71686157014 100644
--- a/net-analyzer/ethloop/ethloop-10-r1.ebuild
+++ b/net-analyzer/ethloop/ethloop-10-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/net-analyzer/ethloop/ethloop-10-r1.ebuild,v 1.1 2005/09/10 03:01:52 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ethloop-10-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/net-analyzer/ethloop/ethloop-10.ebuild b/net-analyzer/ethloop/ethloop-10.ebuild
index 04778482a7f8..5e1df0d9a0f9 100644
--- a/net-analyzer/ethloop/ethloop-10.ebuild
+++ b/net-analyzer/ethloop/ethloop-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/net-analyzer/ethloop/ethloop-10.ebuild,v 1.1 2004/07/11 11:15:54 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethloop/ethloop-10.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 DESCRIPTION="Local simulator for testing Linux QoS disciplines"
 HOMEPAGE="http://luxik.cdi.cz/~devik/qos/ethloop/"
 SRC_URI="http://luxik.cdi.cz/~devik/qos/ethloop/ethloop10.tgz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND=""
 
diff --git a/net-analyzer/ethstatus/ChangeLog b/net-analyzer/ethstatus/ChangeLog
index a139da0afd16..ccf3ccc005fd 100644
--- a/net-analyzer/ethstatus/ChangeLog
+++ b/net-analyzer/ethstatus/ChangeLog
@@ -1,6 +1,19 @@
-# ChangeLog for x11-plugins/wmpower
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethstatus/ChangeLog,v 1.1 2004/12/06 19:45:11 s4t4n Exp $
+# ChangeLog for net-analyzer/ethstatus
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethstatus/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ethstatus-0.4.2-r2.ebuild:
+  Added to ~ppc.
+
+  26 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  ethstatus-0.4.2-r2.ebuild:
+  amd64 stable.
+
+  19 Dec 2004; Jon Portnoy <avenj@gentoo.org> ethstatus-0.4.2-r2.ebuild :
+  AMD64 keywords.
+
+  13 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> ethstatus-0.4.2-r2.ebuild:
+  Stable for x86.
 
 *ethstatus-0.4.2-r2 (06 Dec 2004)
 
diff --git a/net-analyzer/ethstatus/Manifest b/net-analyzer/ethstatus/Manifest
index e67c58ce20cc..f327c7ff0475 100644
--- a/net-analyzer/ethstatus/Manifest
+++ b/net-analyzer/ethstatus/Manifest
@@ -1,4 +1,4 @@
-MD5 16b96f784ddc45aa8f801d20b2a35509 ethstatus-0.4.2-r2.ebuild 563
-MD5 23423c156310066d310cfcbd652e2348 ChangeLog 302
+MD5 5bc6fe5336cc9a8aef3fe98194704725 ChangeLog 777
+MD5 2ab0c9d667d065a748126a025a3ee5a1 ethstatus-0.4.2-r2.ebuild 682
 MD5 3627d7378552f7fce06d331ddeae2926 metadata.xml 219
 MD5 43b28edd9eb20ab82774f4c17f2554c4 files/digest-ethstatus-0.4.2-r2 71
diff --git a/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild b/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild
index 39fca3d935b4..4d194ba298d7 100644
--- a/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild
+++ b/net-analyzer/ethstatus/ethstatus-0.4.2-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/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild,v 1.1 2004/12/06 19:45:11 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethstatus/ethstatus-0.4.2-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="ncurses based utility to display real time statistics about network traffic."
 HOMEPAGE="http://ethstatus.calle69.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://debian/pool/main/e/ethstatus/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.4-r1"
diff --git a/net-analyzer/ettercap/ChangeLog b/net-analyzer/ettercap/ChangeLog
index ccf232c3b41d..44bdbdb2221c 100644
--- a/net-analyzer/ettercap/ChangeLog
+++ b/net-analyzer/ettercap/ChangeLog
@@ -1,13 +1,185 @@
 # ChangeLog for net-analyzer/ettercap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ChangeLog,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
-*ettercap-0.6.3 (1 Feb 2002)
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> ettercap-0.7.3.ebuild:
+  Cosmetic fixes.
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  11 Jun 2005; Daniel Black <dragonheart@gentoo.org> ettercap-0.7.3.ebuild
+  -ettercap-0.7.0.ebuild, -ettercap-0.7.1.ebuild, -ettercap-0.7.2.ebuild:
+  x86 stable. libnet dependancy bumped to libnet-1.1.2.1-r1 due to pic issues
+  with 1.1.2.1
+  old version cleanout
+
+  10 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> ettercap-0.7.3.ebuild:
+  Stable on hppa. bug #94474
+
+  10 Jun 2005; Aron Griffis <agriffis@gentoo.org> ettercap-0.7.3.ebuild:
+  stable on alpha #94474
+
+  10 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org> ettercap-0.7.3.ebuild:
+  Stable on sparc wrt #94474
+
+  10 Jun 2005; Luca Barbato <lu_zero@gentoo.org> ettercap-0.7.3.ebuild:
+  Marked ppc
+
+*ettercap-0.7.3 (07 Jun 2005)
+
+  07 Jun 2005; Daniel Black <dragonheart@gentoo.org> +ettercap-0.7.3.ebuild:
+  Version bump for security bug #94474. Needs hardened verification
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> ettercap-0.7.0.ebuild,
+  ettercap-0.7.1.ebuild, ettercap-0.7.2.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*ettercap-0.7.2 (08 Jan 2005)
+
+  08 Jan 2005; Daniel Black <dragonheart@gentoo.org> -ettercap-0.6.11.ebuild,
+  +ettercap-0.7.2.ebuild:
+  version bump as per bug #75741
+
+  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> ettercap-0.7.0.ebuild:
+  Stable on alpha.
+
+*ettercap-0.7.1 (21 Nov 2004)
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> +ettercap-0.7.1.ebuild:
+  Version bump. Added ~amd64 after testing on amd64.g.o. Closes #64797.
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> ettercap-0.7.0.ebuild:
+  ~alpha keyword.
+
+  04 Nov 2004; Eldad Zack <eldad@gentoo.org> ettercap-0.7.0.ebuild:
+  Problem compiling with heavy optimizations: using strip-flags. Closes #63030.
+
+  09 Oct 2004; Guy Martin <gmsoft@gentoo.org> ettercap-0.7.0.ebuild:
+  Marked stable on hppa.
+
+  12 Sep 2004; Jason Wever <weeve@gentoo.org> ettercap-0.7.0.ebuild:
+  Stable on sparc.
+
+  15 Aug 2004; Jason Wever <weeve@gentoo.org> ettercap-0.7.0.ebuild:
+  Bringin' back the ~sparc keyword.  Aww yeah.
+
+  13 Aug 2004; Eldad Zack <eldad@gentoo.org> ettercap-0.7.0.ebuild:
+  Re-fix -ssl issue
+
+  05 Aug 2004; Jon Hood <squinky86@gentoo.org> ettercap-0.7.0.ebuild:
+  Stable on x86. Include fix from Alberto <alor@antifork.org>, #59003.
+
+  06 Jul 2004; Eldad Zack <eldad@gentoo.org> ettercap-0.7.0.ebuild:
+  Fixed typo: changed use_enable gtk2 -> gtk.
+
+*ettercap-0.7.0 (06 Jul 2004)
+
+  06 Jul 2004; Eldad Zack <eldad@gentoo.org> +ettercap-0.7.0.ebuild:
+  Version bump.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ettercap-0.6.11.ebuild,
+  ettercap-0.7.0_pre1.ebuild, ettercap-0.7.0_pre2.ebuild,
+  ettercap-0.7.0_rc1.ebuild:
+  change virtual/glibc to virtual/libc
+
+*ettercap-0.7.0_rc1 (29 Jun 2004)
+
+  29 Jun 2004; Eldad Zack <eldad@gentoo.org> +ettercap-0.7.0_rc1.ebuild:
+  Version bump. Closes #54021
+
+*ettercap-0.7.0_pre2 (22 May 2004)
+
+  22 May 2004; Jon Hood <squinky86@gentoo.org> +ettercap-0.7.0_pre2.ebuild:
+  version bump, closes #51305
+
+  29 Apr 2004; Jason Wever <weeve@gentoo.org> ettercap-0.6.11.ebuild:
+  Stable on sparc.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> ettercap-0.6.10-r1.ebuild:
+  Add die following econf for bug 48950
+
+*ettercap-0.7.0_pre1 (26 Apr 2004)
+
+  26 Apr 2004; Jon Hood <squinky86@gentoo.org> ettercap-0.7.0_pre1.ebuild,
+  files/digest-ettercap-0.7.0_pre1, metadata.xml:
+  version bump thanks to Alberto Ornaghi (#47963)
+  added missing metadata.xml file
+  0.6.11 stable on x86
+  debug option (#48149)
+
+  25 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> ettercap-0.6.11.ebuild:
+  Adding amd64 keyword. Closing #42798.
+
+  05 Jan 2004; Jason Wever <weeve@gentoo.org> ettercap-0.6.10-r1.ebuild:
+  Marked stable on sparc.
+
+  13 Dec 2003; Lars Weiler <pylon@gentoo.org> ettercap-0.6.11.ebuild:
+  Masked stable on ppc
+
+*ettercap-0.6.11 (23 Jul 2003)
+
+  11 Jan 2003; Guy Martin <gmsoft@gentoo.org> ettercap-0.6.11.ebuild :
+  Marked stable on hppa.
+
+  23 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump.
+
+*ettercap-0.6.10-r1 (12 Jun 2003)
+
+  12 Jun 2003; Alastair Tse <liquidx@gentoo.org> ettercap-0.6.10-r1.ebuild:
+  disabled gtk check (#22642) and fixed ettercap DATADIR to point to /etc
+  (#22649)
+
+  08 Jun 2003; Alastair Tse <liquidx@gentoo.org> ettercap-0.6.10.ebuild:
+  added warning about needing to regenerate your SSL certificate
+
+*ettercap-0.6.10 (08 Jun 2003)
+
+  08 Jun 2003; Alastair Tse <liquidx@gentoo.org> ettercap-0.6.10.ebuild:
+  version bump. gtk interface is purposely not enabled.
+
+*ettercap-0.6.9 (28 Feb 2003)
+
+  28 FEb 2003; Martin Holzer <mholzer@gentoo.org> ettercap-0.6.9.ebuild
+  files/digest-ettercap-0.6.9 ChangeLog :
+  Version bump. Submitted in #16269.
   
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ettercap-0.6.7 (23 Jul 2002)
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> ettercap-0.6.7.ebuild :
+  set ~ppc in keywords
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> ettercap-0.6.7.ebuild :
+  Add alpha to KEYWORDS
+
+  23 Jul 2002; Seemant Kulleen <seemant@gentoo.org> ettercap-0.6.7.ebuild
+  files/digest-ettercap-0.6.7 :
+
+  Version bump, thanks to: kevin@aptbasilicata.it (maurizio) in bug #5383.
+
+*ettercap-0.6.6.6-r1 (24 Jun 2002)
+
+  24 Jun 2002; Phil Bordelon <sunflare@gentoo.org> ettercap-0.6.6.6-r1.ebuild :
+
+  Added a SLOT and the LICENSE.
+
+*ettercap-0.6.6.6 (20 Jun 2002)
+
+  20 Jun 2002; Phil Bordelon <sunflare@gentoo.org> ettercap-0.6.6.6.ebuild :
+
+  Version bump.
+
+*ettercap-0.6.5 (27 Apr 2002)
+
+  27 Apr 2002; Bruce A. Locke <blocke@shivan.org> ettercap-0.6.5.ebuild :
+
+  Bump up to 0.6.5
+
+*ettercap-0.6.4 (14 Feb 2002)
+
+  13 Feb 2002; F.Meyndert <m0rpheus@gentoo.org> ettercap-0.6.4.ebuild :
+
+  Added new version for ettercap and removed all older versions. The new
+  version 0.6.4 fix a remote root compromise in version 0.6.3 and earlier.
+
+
diff --git a/net-analyzer/ettercap/Manifest b/net-analyzer/ettercap/Manifest
index e69de29bb2d1..715c57a5b62b 100644
--- a/net-analyzer/ettercap/Manifest
+++ b/net-analyzer/ettercap/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 124dc024bdb4d6b217ab813c99171d15 ChangeLog 6090
+MD5 cfff86dde8aa34305d53d007a999538d ettercap-0.7.3.ebuild 1549
+MD5 fb19d64e65aa26fde0e7fe78ef8147c5 files/digest-ettercap-0.7.3 70
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDa/bQgIKl8Uu19MoRArYKAJ4ioJ4YXxc6eQKTCvOWMQNylY40jACePRl6
+7ezY3JvRw+xwyBIswQHM5KA=
+=lzWh
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ettercap/ettercap-0.7.3.ebuild b/net-analyzer/ettercap/ettercap-0.7.3.ebuild
index 2d08d669e84c..a34a8c329bd4 100644
--- a/net-analyzer/ettercap/ettercap-0.7.3.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.7.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/net-analyzer/ettercap/ettercap-0.7.3.ebuild,v 1.1 2005/06/07 11:44:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ettercap/ettercap-0.7.3.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
 # the actual version is "NG-0.7.0" but I suppose portage people will not be
 # happy with it (as for the 0.6.b version), so let's set it to "0.7.0".
@@ -9,8 +9,8 @@
 
 inherit flag-o-matic
 
-MY_P=${PN}-NG-${PV}
-S=${WORKDIR}/${MY_P}
+MY_P="${PN}-NG-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A suite for man in the middle attacks and network mapping"
 HOMEPAGE="http://ettercap.sourceforge.net/"
@@ -18,14 +18,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~hppa ~alpha ~amd64"
+KEYWORDS="alpha ~amd64 arm hppa ppc sparc x86"
 IUSE="ssl ncurses gtk debug"
 
 # libtool is needed because it provides libltdl (needed for plugins)
 RDEPEND="virtual/libc
 		 sys-libs/zlib
 		 >=sys-devel/libtool-1.4.3
-		 >=net-libs/libnet-1.1.2.1
+		 >=net-libs/libnet-1.1.2.1-r1
 		 virtual/libpcap
 		 ncurses? ( sys-libs/ncurses )
 		 ssl? ( dev-libs/openssl )
@@ -46,14 +46,14 @@ src_compile() {
 	fi
 
 	econf ${myconf} \
-		`use_enable gtk gtk` \
-		`use_enable debug debug` \
-		`use_with ncurses ncurses` \
+		$(use_enable gtk) \
+		$(use_enable debug) \
+		$(use_with ncurses) \
 		|| die "econf failed"
 
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
+	make DESTDIR="${D}" install || die "make install failed"
 }
diff --git a/net-analyzer/ettercap/metadata.xml b/net-analyzer/ettercap/metadata.xml
index 5716453670e6..03aa50bab7e3 100644
--- a/net-analyzer/ettercap/metadata.xml
+++ b/net-analyzer/ettercap/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/ffp/ChangeLog b/net-analyzer/ffp/ChangeLog
index 5ba3fb50e4c5..bd793a974bac 100644
--- a/net-analyzer/ffp/ChangeLog
+++ b/net-analyzer/ffp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ffp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ffp/ChangeLog,v 1.1 2005/03/30 06:14:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ffp/ChangeLog,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ffp-0.0.8.ebuild:
+  Added to ~ppc.
 
 *ffp-0.0.8 (30 Mar 2005)
 
diff --git a/net-analyzer/ffp/Manifest b/net-analyzer/ffp/Manifest
index 220aced32302..392c68ee58c9 100644
--- a/net-analyzer/ffp/Manifest
+++ b/net-analyzer/ffp/Manifest
@@ -1,2 +1,4 @@
-MD5 c033d5955dc10626dcd1208e9329f93a ffp-0.0.8.ebuild 439
+MD5 d87345a2a327c69573bcbc81a204d9ae ChangeLog 406
+MD5 3991ac3745bedf2cb0719348e505dab1 ffp-0.0.8.ebuild 578
+MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
 MD5 2535caab05adf718a9ec722a159e0e13 files/digest-ffp-0.0.8 61
diff --git a/net-analyzer/ffp/ffp-0.0.8.ebuild b/net-analyzer/ffp/ffp-0.0.8.ebuild
index a6d331a069dd..08a39090f173 100644
--- a/net-analyzer/ffp/ffp-0.0.8.ebuild
+++ b/net-analyzer/ffp/ffp-0.0.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/net-analyzer/ffp/ffp-0.0.8.ebuild,v 1.1 2005/03/30 06:14:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ffp/ffp-0.0.8.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 DESCRIPTION="a tool to do fuzzy fingerprinting for man-in-the-middle attacks"
 HOMEPAGE="http://www.thc.org/thc-ffp/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.thc.org/releases/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/openssl"
diff --git a/net-analyzer/firewalk/ChangeLog b/net-analyzer/firewalk/ChangeLog
index 04e011cb6a08..4f166755ac2d 100644
--- a/net-analyzer/firewalk/ChangeLog
+++ b/net-analyzer/firewalk/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-analyzer/firewalk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/ChangeLog,v 1.1 2005/01/25 11:29:05 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/ChangeLog,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> firewalk-5.0.ebuild:
+  Added to ~ppc.
+
+  27 May 2005; Otavio Piske <angusyoung@gentoo.org> firewalk-5.0.ebuild:
+  Marked as stable on x86.
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/firewalk-5.0-gcc3.4.diff, firewalk-5.0.ebuild:
+  Fix gcc-3.4 compilation issue for bug 83728.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> firewalk-5.0.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  27 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> firewalk-5.0.ebuild:
+  Fixed emake install error message
+
+  25 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> firewalk-5.0.ebuild:
+  Replaced eisnstall with emake install
+
+  25 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> firewalk-5.0.ebuild:
+  Removed inheritance of eutils class
 
 *firewalk-5.0 (25 Jan 2005)
 
diff --git a/net-analyzer/firewalk/Manifest b/net-analyzer/firewalk/Manifest
index b8dd14e33f47..1b1ad8208e48 100644
--- a/net-analyzer/firewalk/Manifest
+++ b/net-analyzer/firewalk/Manifest
@@ -1,2 +1,5 @@
-MD5 c0b6a18feb530e644f13d3aea7a17b81 firewalk-5.0.ebuild 762
+MD5 835818133b39408a7ccb0d386846964e ChangeLog 1233
+MD5 80fa6d9f9e357eab2c4175fe7dff5583 firewalk-5.0.ebuild 758
+MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
 MD5 c4a3bbb4496f45c9f93b13ec8504ea42 files/digest-firewalk-5.0 60
+MD5 c3e22ea80840de86d03304169830ef9b files/firewalk-5.0-gcc3.4.diff 427
diff --git a/net-analyzer/firewalk/firewalk-5.0.ebuild b/net-analyzer/firewalk/firewalk-5.0.ebuild
index 3e113b94925b..a93b409118e0 100644
--- a/net-analyzer/firewalk/firewalk-5.0.ebuild
+++ b/net-analyzer/firewalk/firewalk-5.0.ebuild
@@ -1,32 +1,32 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.1 2005/01/25 11:29:05 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="A tool for determining a firewall's rule set"
-SRC_URI="http://www.packetfactory.net/firewalk/dist/${P}.tgz"
 HOMEPAGE="http://www.packetfactory.net/firewalk/"
-IUSE=""
-
-S=${WORKDIR}/Firewalk
+SRC_URI="http://www.packetfactory.net/firewalk/dist/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
+IUSE=""
 
-DEPEND=">=net-libs/libpcap-0.6.1
+DEPEND="virtual/libpcap
 	>=net-libs/libnet-1.1.1
 	>=dev-libs/libdnet-1.7"
 
-src_compile() {
+S="${WORKDIR}/Firewalk"
+
+src_unpack() {
+	unpack ${A}
 	cd ${S}
-	econf || die "econf failed"
-	emake || die "emake failed"
+	epatch ${FILESDIR}/${P}-gcc3.4.diff
 }
 
 src_install() {
-	einstall || "einstall failed"
+	make DESTDIR="${D}" install || "make install failed"
 	doman man/firewalk.8
 	dodoc README TODO BUGS
 }
diff --git a/net-analyzer/flow-tools/ChangeLog b/net-analyzer/flow-tools/ChangeLog
index 18706fec002d..fa7689a038da 100644
--- a/net-analyzer/flow-tools/ChangeLog
+++ b/net-analyzer/flow-tools/ChangeLog
@@ -1,6 +1,74 @@
-# ChangeLog for net-analyzer/mtr
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.1 2003/05/18 20:02:51 mholzer Exp $
+# ChangeLog for net-analyzer/flow-tools
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/ChangeLog,v 1.1.1.1 2005/11/30 10:12:37 chriswhite Exp $
+
+  16 Sep 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/flow-tools-0.67-fix-a-zillion-warnings.diff,
+  files/flow-tools-0.68-fix-a-zillion-warnings.diff:
+  Update gcc4 warnings patch as it was causing bug #106063.
+
+  23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> flow-tools-0.67.ebuild,
+  flow-tools-0.68.ebuild, flow-tools-0.68-r1.ebuild:
+  Use -1 instead of /bin/false, bug #103421.
+
+  23 Jun 2005; David Holm <dholm@gentoo.org> flow-tools-0.68-r1.ebuild:
+  Added to ~ppc.
+
+*flow-tools-0.68-r1 (22 Jun 2005)
+
+  22 Jun 2005; Benjamin Smee <strerror@gentoo.org> +files/flowcapture.confd,
+  +files/flowcapture.initd, +files/linkme, +flow-tools-0.68-r1.ebuild:
+  Added some init scripts and config files. Also added directory structure.
+  Changed created user.
+
+*flow-tools-0.68 (14 May 2005)
+
+  14 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/flow-tools-0.68-fix-a-zillion-warnings.diff,
+  +files/flow-tools-0.68-fix-configure.diff, +flow-tools-0.68.ebuild:
+  Version bump for bug 92368.
+
+  25 Mar 2005; <blubb@gentoo.org> +files/flow-tools-0.67-debug.patch,
+  flow-tools-0.67.ebuild:
+  added Jeremy Hanmer's patch to make it working with USE=debug and added ~amd64
+  keyword, see bug #85416
+
+  19 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> flow-tools-0.66.ebuild,
+  flow-tools-0.67.ebuild:
+  Reverted to ~x86 due to issues mentioned in bug 79652 (c#4). Added gcc-3.4
+  patch to 0.66 ebuild.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> flow-tools-0.67.ebuild:
+  Marked stable on x86.
+
+  27 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/flow-tools-0.67-fix-a-zillion-warnings.diff,
+  +files/flow-tools-0.67-fix-configure.diff,
+  +files/flow-tools-0.67-gcc34.diff, files/flow-tools-0.67-memleak.patch,
+  files/flow-tools-0.67-nodebug.patch, flow-tools-0.67.ebuild:
+  Added a sleu of patches: gcc-3.4 fixes, fixes of 99% of the *many* compiler
+  warnings, and configure.in fixes so that --with-XXX and --without-XXX work
+  properly - bug 79652. Also updated nodebug and memleak patches so that they
+  can be applied from ${S}.
+
+*flow-tools-0.67 (26 Jan 2005)
+
+  26 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org>
+  +files/flow-tools-0.67-memleak.patch, +files/flow-tools-0.67-nodebug.patch,
+  +flow-tools-0.67.ebuild:
+  Version bump. Thanks to Molchanov Alexander <xorader@mail.ru> and Vanquirius
+  <marcelogoes@gmail.com> for submitting the ebuild. This ebuild closes bug
+  #50926
+
+  26 Oct 2004; Eldad Zack <eldad@gentoo.org> flow-tools-0.66.ebuild:
+  Fixed ebuild to use tc-getCC from toolchain-funcs.eclass, as suggested by
+  vapier@g.o. Closes #69016.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> flow-tools-0.66.ebuild:
+  ebuild cleanups, virtual/glibc -> virtual/libc
 
 *flow-tools-0.66 (18 May 2003)
 
diff --git a/net-analyzer/flow-tools/Manifest b/net-analyzer/flow-tools/Manifest
index 49361dd65712..eaf7ab701611 100644
--- a/net-analyzer/flow-tools/Manifest
+++ b/net-analyzer/flow-tools/Manifest
@@ -1,2 +1,31 @@
-MD5 e7409be694a998303d37c90fae39135e flow-tools-0.66.ebuild 584
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4137cf5d98a0dc381479c22e6f56bb8 flow-tools-0.67.ebuild 2102
+MD5 8f9c6d7e1e7e86ef04599a7774c85b16 flow-tools-0.66.ebuild 1001
+MD5 a5eba5008729fa7c037c6b4d59277eb6 flow-tools-0.68-r1.ebuild 2466
+MD5 fecd6516b359b067be27796d980a2152 flow-tools-0.68.ebuild 2166
+MD5 7228ba768fbbffe8357362e19a395b2c ChangeLog 3200
+MD5 657939d746987d289ffa06516ae69d46 metadata.xml 261
 MD5 4274d0fb58b88876a5767ab9d1c6204c files/digest-flow-tools-0.66 67
+MD5 1101576a17a0a70941408d279474aa97 files/digest-flow-tools-0.67 67
+MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68 67
+MD5 cfccfe9cd55f47b95bf235bf7fa7d304 files/flow-tools-0.67-gcc34.diff 1403
+MD5 98dc78d5d311ce19b972580774781796 files/flow-tools-0.68-fix-a-zillion-warnings.diff 19710
+MD5 c6c737d5afc1661a098632c246dec51e files/flow-tools-0.67-debug.patch 313
+MD5 3164389b3ab0f7170727e6ea6b419256 files/flow-tools-0.67-fix-configure.diff 3510
+MD5 a3079e6e4ce9d077caa0939f51e806f2 files/flowcapture.confd 1590
+MD5 e093ab64e5496e26be23026c3436ddde files/flowcapture.initd 430
+MD5 09baff60cf1fc75fdf326c0d70f0b250 files/flow-tools-0.68-fix-configure.diff 4311
+MD5 a4c028b5f1d22a56d9020a2ef90ca253 files/flow-tools-0.67-fix-a-zillion-warnings.diff 18222
+MD5 94581c1ca18b1891395fe1f3daeb04ca files/linkme 283
+MD5 f16f4ba51648f2b7f0e3830bc7670f6e files/flow-tools-0.67-nodebug.patch 933
+MD5 4550f09b9ca0a0f2e3e83beadfa3f964 files/digest-flow-tools-0.68-r1 67
+MD5 eddbfc9694d3f0b00a46f84a0e58a651 files/flow-tools-0.67-memleak.patch 465
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKqi6EZCkKN40op4RAitWAJ0Xn0USdKErtFMlR2p0CbdkZIEXnwCbBxJK
+UxDAZY1BuMdZaJW5po6BUWQ=
+=zB5A
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff b/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff
index 2014d864f403..bfbef9a19e04 100644
--- a/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff
+++ b/net-analyzer/flow-tools/files/flow-tools-0.67-fix-a-zillion-warnings.diff
@@ -1,18 +1,3 @@
-diff -urN flow-tools-0.67.orig/lib/ftchash.c flow-tools-0.67/lib/ftchash.c
---- flow-tools-0.67.orig/lib/ftchash.c	2005-01-27 02:45:08.860520536 -0500
-+++ flow-tools-0.67/lib/ftchash.c	2005-01-27 02:45:23.927230048 -0500
-@@ -324,9 +324,10 @@
-     /* more entries in this chunk *? */ 
-     if  ((char*)ftch->traverse_rec <
-       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
-+      char *p = (char *)ftch->traverse_rec;
- 
-       ret = ftch->traverse_rec;
--      (char*)ftch->traverse_rec += ftch->d_size;
-+      p += ftch->d_size;
-       return ret;
- 
-     } else {
 diff -urN flow-tools-0.67.orig/lib/ftfil.c flow-tools-0.67/lib/ftfil.c
 --- flow-tools-0.67.orig/lib/ftfil.c	2005-01-27 02:45:08.870519016 -0500
 +++ flow-tools-0.67/lib/ftfil.c	2005-01-27 02:45:23.933229136 -0500
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch b/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch
index 6f1a0c482b7a..58cb7b05fa43 100644
--- a/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch
+++ b/net-analyzer/flow-tools/files/flow-tools-0.67-memleak.patch
@@ -1,15 +1,12 @@
---- flow-export.c~	2004-05-20 10:12:36.000000000 +0400
-+++ flow-export.c	2004-05-20 10:49:45.000000000 +0400
-@@ -948,10 +948,12 @@ int format5(struct ftio *ftio, struct op
- 
-       res = PQexec(conn, query);
+diff -urN flow-tools-0.67.orig/src/flow-export.c flow-tools-0.67/src/flow-export.c
+--- flow-tools-0.67.orig/src/flow-export.c	2005-01-27 01:07:05.203972288 -0500
++++ flow-tools-0.67/src/flow-export.c	2005-01-27 01:08:26.509611952 -0500
+@@ -937,6 +937,8 @@
        if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
          PQclear(res);
          fterr_errx(1,"PQexec(): %s\n", PQerrorMessage(conn));
 +      } else if (res) {
-+      	PQclear(res);
++	  PQclear(res);
        }
  
      }
- 
-     ++opt->records;
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch b/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch
index e3c2b9255481..f377c3710ba4 100644
--- a/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch
+++ b/net-analyzer/flow-tools/files/flow-tools-0.67-nodebug.patch
@@ -1,8 +1,7 @@
---- flow-export.c.orig	2003-12-04 08:55:31.000000000 +0300
-+++ flow-export.c	2004-05-13 13:00:09.000000000 +0400
-@@ -756,13 +756,14 @@ int format3(struct ftio *ftio, struct op
-       strcat (query, fields);
-       strcat (query, ") VALUES (");
+diff -urN flow-tools-0.67.orig/src/flow-export.c flow-tools-0.67/src/flow-export.c
+--- flow-tools-0.67.orig/src/flow-export.c	2005-01-25 22:46:00.000000000 -0500
++++ flow-tools-0.67/src/flow-export.c	2005-01-27 01:05:01.705746872 -0500
+@@ -758,10 +758,10 @@
        strcat (query, values);
        strcat (query, ")");
  
@@ -10,15 +9,12 @@
 +/*      if (debug)
          fprintf(stderr, "field=%s\n val=%s\n query=%s\n", fields, values,
            query);
+-
 +*/
- 
        if (mysql_real_query(&mysql, query, strlen(query)) != 0) 
          fterr_warnx("mysql_real_query(): %s", mysql_error(&mysql));
  
-     }
-@@ -927,13 +928,14 @@ int format5(struct ftio *ftio, struct op
-       strcat (query, fields);
-       strcat (query, ") VALUES (");
+@@ -929,10 +929,10 @@
        strcat (query, values);
        strcat (query, ")");
  
@@ -26,9 +22,8 @@
 +/*      if (debug)
          fprintf(stderr, "field=%s\n val=%s\n query=%s\n", fields, values,
            query);
+-
 +*/
- 
        res = PQexec(conn, query);
        if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) {
          PQclear(res);
-         fterr_errx(1,"PQexec(): %s\n", PQerrorMessage(conn));
diff --git a/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff b/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff
index abfbe4df3c10..6a9beb3daa77 100644
--- a/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff
+++ b/net-analyzer/flow-tools/files/flow-tools-0.68-fix-a-zillion-warnings.diff
@@ -1,18 +1,3 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN flow-tools-0.68.orig/lib/ftchash.c flow-tools-0.68/lib/ftchash.c
---- flow-tools-0.68.orig/lib/ftchash.c	2003-08-12 14:04:25.000000000 -0400
-+++ flow-tools-0.68/lib/ftchash.c	2005-05-14 00:07:59.000000000 -0400
-@@ -324,9 +324,10 @@
-     /* more entries in this chunk *? */ 
-     if  ((char*)ftch->traverse_rec <
-       (char*)ftch->traverse_chunk->base+ftch->traverse_chunk->next) {
-+      char *p = (char *)ftch->traverse_rec;
- 
-       ret = ftch->traverse_rec;
--      (char*)ftch->traverse_rec += ftch->d_size;
-+      p += ftch->d_size;
-       return ret;
- 
-     } else {
 diff --exclude='*~' --exclude='.*' -I '$Id:' -urN flow-tools-0.68.orig/lib/ftfil.c flow-tools-0.68/lib/ftfil.c
 --- flow-tools-0.68.orig/lib/ftfil.c	2004-01-05 12:55:23.000000000 -0500
 +++ flow-tools-0.68/lib/ftfil.c	2005-05-14 00:08:44.000000000 -0400
diff --git a/net-analyzer/flow-tools/flow-tools-0.66.ebuild b/net-analyzer/flow-tools/flow-tools-0.66.ebuild
index cf3bb4dd82cf..808d47ce9a62 100644
--- a/net-analyzer/flow-tools/flow-tools-0.66.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.66.ebuild
@@ -1,6 +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/net-analyzer/flow-tools/flow-tools-0.66.ebuild,v 1.1 2003/05/18 20:02:51 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.66.ebuild,v 1.1.1.1 2005/11/30 10:12:37 chriswhite Exp $
+
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Flow-tools is a package for collecting and processing NetFlow data"
 HOMEPAGE="http://www.splintered.net/sw/flow-tools/"
@@ -8,13 +10,19 @@ SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 IUSE=""
 
-DEPEND="virtual/glibc sys-apps/tcp-wrappers sys-libs/zlib"
+DEPEND="virtual/libc
+	sys-apps/tcp-wrappers
+	sys-libs/zlib"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.67-gcc34.diff
+}
 
 src_compile() {
 	aclocal
@@ -22,11 +30,11 @@ src_compile() {
 	econf \
 		--without-mysql \
 		--localstatedir=/etc/flow-tools \
-		CC="$CC" CFLAGS="$CFLAGS" || die
-	emake CC="$CC" CFLAGS="$CFLAGS" || die
+		CC="$(tc-getCC)" CFLAGS="$CFLAGS" || die
+	emake CC="$(tc-getCC)" CFLAGS="$CFLAGS" || die
 }
 
 src_install() {
-	einstall localstatedir=$D/etc/flow-tools CC="$CC" CFLAGS="$CFLAGS"
+	einstall localstatedir=$D/etc/flow-tools CC="$(tc-getCC)" CFLAGS="$CFLAGS"
 	dodoc AUTHORS COPYING NEWS ChangeLog README INSTALL SECURITY TODO
 }
diff --git a/net-analyzer/flow-tools/flow-tools-0.67.ebuild b/net-analyzer/flow-tools/flow-tools-0.67.ebuild
index 823d78013f9c..f1b83fae03d3 100644
--- a/net-analyzer/flow-tools/flow-tools-0.67.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.67.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation.
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.67.ebuild,v 1.1 2005/01/26 19:51:06 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.67.ebuild,v 1.1.1.1 2005/11/30 10:12:37 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Flow-tools is a package for collecting and processing NetFlow data"
 HOMEPAGE="http://www.splintered.net/sw/flow-tools/"
@@ -10,34 +10,63 @@ SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="mysql"
+KEYWORDS="~x86 ~amd64"
+IUSE="mysql postgres debug"
 
-DEPEND="virtual/libc
+RDEPEND="virtual/libc
 	sys-apps/tcp-wrappers
-	sys-libs/zlib"
+	sys-libs/zlib
+	sys-devel/flex
+	!postgres? ( mysql? ( dev-db/mysql ) )
+	!mysql? ( postgres? ( dev-db/postgresql ) )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison"
 
 pkg_setup() {
+	if use mysql && use postgres ; then
+		echo
+		eerror "The mysql and postgres USE flags are mutually exclusive."
+		eerror "Please choose either USE=mysql or USE=postgres, but not both."
+		die
+	fi
+
 	enewgroup flowtools
-	enewuser flowtools -1 /bin/false /var/lib/flow-tools flowtools
+	enewuser flowtools -1 -1 /var/lib/flow-tools flowtools
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/src
-	epatch ${FILESDIR}/${P}-nodebug.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-configure.diff
+	epatch ${FILESDIR}/${P}-gcc34.diff
+	epatch ${FILESDIR}/${P}-fix-a-zillion-warnings.diff
+	use debug || epatch ${FILESDIR}/${P}-nodebug.patch
 	epatch ${FILESDIR}/${P}-memleak.patch
+	epatch ${FILESDIR}/${P}-debug.patch
+
+	sed -i "s|\(^.*CFLAGS=\).*$|\1-Wall|" \
+		configure.in src/Makefile.am lib/Makefile.am || die "sed CFLAGS failed"
 }
 
 src_compile() {
+	einfo "Running autoreconf"
+	autoreconf -f -i || die "autoreconf failed"
+
+	use mysql && append-flags "-L/usr/lib/mysql -I/usr/include/mysql"
+	use postgres && append-flags "-L/usr/lib/postgres -I/usr/include/postgres"
+
 	econf \
-		`use_with mysql` || die "econf failed"
+		--localstatedir=/etc/flow-tools \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		|| die "econf failed"
 
 	emake CFLAGS="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	emake install DESTDIR=${D} || die "emake install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 	dodoc COPYING ChangeLog README INSTALL SECURITY TODO
 
 	keepdir /var/lib/flow-tools
diff --git a/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild b/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild
index 02089b6cadfd..6b07927f2893 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.eng.oar.net/pub/flow-tools/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="mysql postgres debug ssl"
 
 RDEPEND="sys-apps/tcp-wrappers
@@ -32,7 +32,7 @@ pkg_setup() {
 	fi
 
 	enewgroup flows
-	enewuser flows -1 /bin/false /var/lib/flows flows
+	enewuser flows -1 -1 /var/lib/flows flows
 }
 
 src_unpack() {
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.ebuild
index 5fd8ee115897..90843ec36b14 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.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/net-analyzer/flow-tools/flow-tools-0.68.ebuild,v 1.1 2005/05/14 12:09:42 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/flow-tools/flow-tools-0.68.ebuild,v 1.1.1.1 2005/11/30 10:12:37 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -33,7 +33,7 @@ pkg_setup() {
 	fi
 
 	enewgroup flowtools
-	enewuser flowtools -1 /bin/false /var/lib/flow-tools flowtools
+	enewuser flowtools -1 -1 /var/lib/flow-tools flowtools
 }
 
 src_unpack() {
diff --git a/net-analyzer/fping/ChangeLog b/net-analyzer/fping/ChangeLog
index 1dc85f75fae2..2cb51544c6a3 100644
--- a/net-analyzer/fping/ChangeLog
+++ b/net-analyzer/fping/ChangeLog
@@ -1,16 +1,41 @@
-# ChangeLog for net-anaylzer/fping
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# ChangeLog for net-analyzer/fping
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+  05 Aug 2004; Alexander Plank <alexander@gentoo.org> fping-2.4_beta2.ebuild:
+  add macos keyword
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> fping-2.4_beta2-r1.ebuild:
+  stable on ppc64, bug #57454
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> fping-2.4_beta2-r1.ebuild:
+  added missing IUSE
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> fping-2.4_beta2-r1.ebuild:
+  stable on alpha and ia64
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*fping-2.4_beta2-r1 (23 Jul 2002)
+
+  15 Jan 2004; Guy Martin <gmsoft@gentoo.org> fping-2.4_beta2-r1.ebuild :
+  Marked stable on hppa.
+
+  Added ppc to KEYWORDS.
 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
   moved to net-analyzer
 
+  
+  23 Jul 2002; phoen][x <phoenix@gentoo.org> :
+  Version bump - the ipv6 fping didnt work.
+  Closes bug #5347.
+
 *fping-2.4_beta2 (2 Jun 2002)
 
   2 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-
   Version bump; move to /usr/sbin.
 
+
 *fping-2.2_beta1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index e69de29bb2d1..e8b6c8131e69 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -0,0 +1,6 @@
+MD5 26868ea0bea6357ad1de18c0a90e198a ChangeLog 1629
+MD5 2871df8560dadc988c14ed22ca340c8a fping-2.4_beta2-r1.ebuild 621
+MD5 9dc3dadd6f728a1be1a29fee4bba36b4 fping-2.4_beta2.ebuild 610
+MD5 0be575eba4818f82a8818c8e9e32390a metadata.xml 235
+MD5 3fc4637fca91307d9fe148cb1924a508 files/digest-fping-2.4_beta2 70
+MD5 d6a3fe0582b016b9ce82c2ef6b07ba55 files/digest-fping-2.4_beta2-r1 65
diff --git a/net-analyzer/fping/fping-2.4_beta2-r1.ebuild b/net-analyzer/fping/fping-2.4_beta2-r1.ebuild
index 93e6e145dbe0..b1d385815a92 100644
--- a/net-analyzer/fping/fping-2.4_beta2-r1.ebuild
+++ b/net-analyzer/fping/fping-2.4_beta2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2-r1.ebuild,v 1.1 2002/07/23 19:11:28 phoenix Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 S=${WORKDIR}/fping-2.4b2_to
 DESCRIPTION="A utility to ping multiple hosts at once"
@@ -9,7 +9,8 @@ HOMEPAGE="http://www.fping.com/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc sparc amd64 hppa alpha ia64 ppc64"
+IUSE=""
 
 src_compile() {
 
diff --git a/net-analyzer/fping/fping-2.4_beta2.ebuild b/net-analyzer/fping/fping-2.4_beta2.ebuild
index dc6f19544f54..5a6dee855a77 100644
--- a/net-analyzer/fping/fping-2.4_beta2.ebuild
+++ b/net-analyzer/fping/fping-2.4_beta2.ebuild
@@ -1,18 +1,20 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2.ebuild,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-2.4_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 S=${WORKDIR}/fping-2.4b2_to-ipv6
 DESCRIPTION="A utility to ping multiple hosts at once"
 SRC_URI="http://www.fping.com/download/fping-2.4b2_to-ipv6.tar.gz"
 HOMEPAGE="http://www.fping.com/"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ppc-macos"
+IUSE=""
 
 src_compile() {
 
-	./configure --prefix=/usr \
-		--host=${CHOST} || die
-		
+	econf || die
 	make || die
 }
 
@@ -22,4 +24,3 @@ src_install () {
 	doman fping.8
 	dodoc COPYING ChangeLog README
 }
-
diff --git a/net-analyzer/fprobe/ChangeLog b/net-analyzer/fprobe/ChangeLog
index f1330f38fde9..8d43cbf8ed9c 100644
--- a/net-analyzer/fprobe/ChangeLog
+++ b/net-analyzer/fprobe/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for net-analyzer/fprobe
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/ChangeLog,v 1.1 2004/08/04 21:24:16 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+  29 Aug 2005; <dang@gentoo.org> fprobe-1.1.ebuild:
+  Marked ~amd64
+
+*fprobe-1.1 (03 Feb 2005)
+
+  03 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> -fprobe-1.0.6.ebuild,
+  +fprobe-1.1.ebuild:
+  Version bump for sec bug 80269; keeping keywords. removed vulnerable version.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> fprobe-1.0.6.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*fprobe-1.0.6 (27 Sep 2004)
+
+  27 Sep 2004; Jon Hood <squinky86@gentoo.org> -fprobe-1.0.4.ebuild,
+  -fprobe-1.0.5.ebuild, +fprobe-1.0.6.ebuild:
+  Version bump, #65544, thanks lewk.
+
+  15 Sep 2004; Jon Hood <squinky86@gentoo.org> fprobe-1.0.5.ebuild:
+  Stable on x86.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> fprobe-1.0.4.ebuild:
+  Stable on x86.
+
+  29 Aug 2004; David Holm <dholm@gentoo.org> fprobe-1.0.5.ebuild:
+  Added to ~ppc.
+
+*fprobe-1.0.5 (16 Aug 2004)
+
+  16 Aug 2004; Jon Hood <squinky86@gentoo.org> +fprobe-1.0.5.ebuild:
+  Version bump.
 
 *fprobe-1.0.4 (04 Aug 2004)
 
diff --git a/net-analyzer/fprobe/Manifest b/net-analyzer/fprobe/Manifest
index 6ff56b3822fb..957f0d2383ce 100644
--- a/net-analyzer/fprobe/Manifest
+++ b/net-analyzer/fprobe/Manifest
@@ -1,2 +1,14 @@
-MD5 4543741e43d73c8b32ac3417f0f1b174 fprobe-1.0.4.ebuild 726
-MD5 b0ff0b030ad07fae5ed5c1e563e941e5 files/digest-fprobe-1.0.4 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d39e0219db99a828d41f6463fcf456a4 fprobe-1.1.ebuild 825
+MD5 49cbf5bf25e06217a3872500b57f9b95 ChangeLog 1350
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 f77937e9d06f1c910fad6b35dc359ece files/digest-fprobe-1.1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIMwKV3J2n04EauwRAgI0AJ9s2Z2Rkfm1Ly5wQSHkPuZ81KtgBgCfT4dK
+RBLauPQ3J84o+5H+Fec7GPc=
+=YI+N
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/fprobe/fprobe-1.1.ebuild b/net-analyzer/fprobe/fprobe-1.1.ebuild
index 6c8715ca89e4..73a2f96e1782 100644
--- a/net-analyzer/fprobe/fprobe-1.1.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.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/net-analyzer/fprobe/fprobe-1.1.ebuild,v 1.1 2005/02/03 11:48:55 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fprobe/fprobe-1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
 HOMEPAGE="http://fprobe.sourceforge.net"
@@ -8,7 +8,7 @@ LICENSE="GPL-2"
 
 SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
 SLOT="0"
-KEYWORDS="x86 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="debug messages"
 
diff --git a/net-analyzer/fprobe/metadata.xml b/net-analyzer/fprobe/metadata.xml
index 9eb186981c76..78692635ad22 100644
--- a/net-analyzer/fprobe/metadata.xml
+++ b/net-analyzer/fprobe/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
-	<maintainer>
-		<email>squinky86@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/fragroute/ChangeLog b/net-analyzer/fragroute/ChangeLog
index 1595fe67cb31..d27cac16a293 100644
--- a/net-analyzer/fragroute/ChangeLog
+++ b/net-analyzer/fragroute/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-analyzer/fragroute
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fragroute/ChangeLog,v 1.1 2003/08/29 01:54:38 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fragroute/ChangeLog,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
+
+  12 Aug 2005; Olivier Crête <tester@gentoo.org> fragroute-1.2.ebuild:
+  Marked ~amd64, closes bug #102110, thanks to Mike Cvet for testing
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> fragroute-1.2.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> fragroute-1.2.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  24 Aug 2004; Eldad Zack <eldad@gentoo.org> fragroute-1.2.ebuild:
+  Removed ~macos (bad deps)
+
+  05 Aug 2004; Alexander Plank <alexander@gentoo.org> fragroute-1.2.ebuild:
+  add ~macos keyword (ranlib must be run, i need to also commit the libraries which work
+    
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> fragroute-1.2.ebuild:
+  Tidy up.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> fragroute-1.2.ebuild:
+  change virtual/glibc to virtual/libc
+
+*fragroute-1.2 (04 Sep 2003)
+
+  04 Sep 2003; Michael Sterrett <msterret@gentoo.org> fragroute-1.2.ebuild:
+  fix DEPEND (dev-libs/libpcap -> net-libs/libpcap)
 
   28 Aug 2003; Chuck Short <zul@gentoo.org> :
   Initial version. Ebuild contributed by Daniel Seyffer <gentoo-bugs@seyffer.de>.
diff --git a/net-analyzer/fragroute/Manifest b/net-analyzer/fragroute/Manifest
index 909d25fee9e8..4a003c24da44 100644
--- a/net-analyzer/fragroute/Manifest
+++ b/net-analyzer/fragroute/Manifest
@@ -1,3 +1,14 @@
-MD5 54960968e50acd95a21ad037ff400f40 fragroute-1.2.ebuild 734
-MD5 9f2663f1d4975cc2cc57dac20e229c68 ChangeLog 260
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7e285f080272b311b0eb8b0028928e07 metadata.xml 219
+MD5 3f0b7ec812345a339bc3560178ce7f5b fragroute-1.2.ebuild 804
+MD5 09aa1474d7a63ec31f900f411930ffa9 ChangeLog 1315
 MD5 36fafeafa71dc2dfd15c10be5f698314 files/digest-fragroute-1.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC++lTmOfEJZHYOKcRAlXjAJ977li8/blft4yfW/WRQgfOYFtu8ACfc60P
+CE0/GCs+xyhdhsFCRXAYPZY=
+=jskm
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/fragroute/fragroute-1.2.ebuild b/net-analyzer/fragroute/fragroute-1.2.ebuild
index 7c3d498efc84..81592ab672f3 100644
--- a/net-analyzer/fragroute/fragroute-1.2.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.ebuild
@@ -1,20 +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/net-analyzer/fragroute/fragroute-1.2.ebuild,v 1.1 2003/08/29 01:54:38 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fragroute/fragroute-1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
 DESCRIPTION="fragroute was written to aid in the testing of network intrusion detection systems, firewalls and basic TCP/IP stack behaviour."
 HOMEPAGE="http://www.monkey.org/~dugsong/fragroute/"
 SRC_URI="http://www.monkey.org/~dugsong/fragroute/${P}.tar.gz"
 LICENSE="DSNIFF"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 		>=dev-libs/libevent-0.6
-		>=dev-libs/libpcap-0.7.2
+		virtual/libpcap
 		>=dev-libs/libdnet-1.4"
-RDEPEND=""
-S=${WORKDIR}/${P}
 
 src_compile() {
 	econf --with-libevent=/usr --with-libdnet=/usr || die "Econf failed"
diff --git a/net-analyzer/ftester/ChangeLog b/net-analyzer/ftester/ChangeLog
index 433f0c4232b9..ca5c98a02fe5 100644
--- a/net-analyzer/ftester/ChangeLog
+++ b/net-analyzer/ftester/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-analyzer/ftester
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ftester/ChangeLog,v 1.1 2003/01/30 21:10:27 jhhudso Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ftester/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ftester-0.9.ebuild:
+  Added to ~ppc.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -ftester-0.8.ebuild:
+  Removing old ebuild.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> ftester-0.8.ebuild,
+  ftester-0.9.ebuild:
+  Added missing IUSE. Marked x86 stable. Added metadata.
+
+*ftester-0.9 (30 Sep 2003)
+
+  30 Sep 2003; Chuck Short <zul@gentoo.org> ftester-0.9.ebuild:
+  Version bump
 
 *ftester-0.8 (30 Jan 2003)
 
diff --git a/net-analyzer/ftester/Manifest b/net-analyzer/ftester/Manifest
index e69de29bb2d1..20dddebc8cd3 100644
--- a/net-analyzer/ftester/Manifest
+++ b/net-analyzer/ftester/Manifest
@@ -0,0 +1,4 @@
+MD5 a709a285ba01f911cc1f414ec71490ee ChangeLog 804
+MD5 bbb758a82f1c325a191e6f7e7736379a ftester-0.9.ebuild 705
+MD5 f34f84fa79c8d028b0ba9615a23fe7dd metadata.xml 257
+MD5 7de86b1b20a4105a56fcabaffbfe81ae files/digest-ftester-0.9 62
diff --git a/net-analyzer/ftester/ftester-0.9.ebuild b/net-analyzer/ftester/ftester-0.9.ebuild
index 6cf41761e896..ba686963d043 100644
--- a/net-analyzer/ftester/ftester-0.9.ebuild
+++ b/net-analyzer/ftester/ftester-0.9.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/net-analyzer/ftester/ftester-0.9.ebuild,v 1.1 2003/09/30 21:28:14 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ftester/ftester-0.9.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="Ftester - Firewall and Intrusion Detection System testing tool"
 HOMEPAGE="http://ftester.sourceforge.net
@@ -9,7 +9,8 @@ SRC_URI="http://ftester.sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
+IUSE=""
 
 DEPEND="dev-perl/Net-RawIP
 	dev-perl/NetPacket
diff --git a/net-analyzer/fwlogwatch/ChangeLog b/net-analyzer/fwlogwatch/ChangeLog
index c3c6c4c75954..aa97974b84e9 100644
--- a/net-analyzer/fwlogwatch/ChangeLog
+++ b/net-analyzer/fwlogwatch/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-analyzer/fwlogwatch
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.1 2003/06/12 03:06:09 brad Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> fwlogwatch-1.0.ebuild:
+  added ~amd64 keyword
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -fwlogwatch-0.9.2.ebuild:
+  Removing old version.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> fwlogwatch-1.0.ebuild:
+  x86 stable
+
+  16 Jul 2004; David Holm <dholm@gentoo.org> fwlogwatch-1.0.ebuild:
+  Added to ~ppc.
+
+*fwlogwatch-1.0 (11 Jul 2004)
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  +fwlogwatch-1.0.ebuild:
+  Version bump. Closes #56320. Thanks to Dinini <dinini@ljones.com>
+
+  21 Aug 2003; Michael Sterrett <msterret@gentoo.org> fwlogwatch-0.9.3.ebuild:
+  sed in src_unpack; add error messages
+
+  06 Jul 2003; Stewart Honsberger <blkdeath@gentoo.org>
+  fwlogwatch-0.9.3.ebuild:
+  Marked stable on x86
+
+*fwlogwatch-0.9.3 (23 Jun 2003)
+
+  23 Jun 2003; Brad Laue <brad@gentoo.org> fwlogwatch-0.9.3.ebuild:
+  Update fwlogwatch to 0.9.3 - submitted by Stewart <bugsubmit@snerk.org>
+
+*fwlogwatch-0.9.2 (23 Jun 2003)
+
+  23 Jun 2003; Brad Laue <brad@gentoo.org> fwlogwatch-0.9.2.ebuild:
+  Marking stable on x86
 
 *fwlogwatch-0.92 (11 Jun 2003)
 
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index 427a0f8c5fdd..37c0e39ece79 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,2 +1,6 @@
-MD5 8adbb76b1db440b7437894066f1708f2 fwlogwatch-0.92.ebuild 832
-MD5 514cb90a87fcdbe523292b401251faa4 files/digest-fwlogwatch-0.92 65
+MD5 5207cd3e962a512b7010f52bbfe3e4cc ChangeLog 1575
+MD5 ba656ddb7a2a209d7641980798b435f6 fwlogwatch-0.9.3.ebuild 1105
+MD5 c9b1d2c8076a013e89544d1d9826a953 fwlogwatch-1.0.ebuild 1089
+MD5 2576985377d59cb57f807964ac756ecf metadata.xml 236
+MD5 d6bcf04d65c71ea5420636851372769a files/digest-fwlogwatch-0.9.3 67
+MD5 4504bcd063b5859ce62a570512bfa357 files/digest-fwlogwatch-1.0 66
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-0.9.3.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-0.9.3.ebuild
index 18e94cfa98c8..bb1f36a563a9 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-0.9.3.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-0.9.3.ebuild
@@ -1,19 +1,30 @@
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-0.9.3.ebuild,v 1.1 2003/06/23 22:39:17 brad Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-0.9.3.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://cert.uni-stuttgart.de/projects/fwlogwatch/"
 SRC_URI="http://www.kyb.uni-stuttgart.de/boris/sw/${P}.tar.gz"
+
+KEYWORDS="x86 ~sparc"
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
 IUSE=""
-DEPEND=""
+
+DEPEND=">=sys-apps/sed-4"
 RDEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "s/^CFLAGS = /CFLAGS = ${CFLAGS} /g" Makefile || \
+			die "sed Makefile failed"
+}
+
 src_compile() {
-	sed -e "s/^CFLAGS = /CFLAGS = ${CFLAGS} /g" Makefile > ${T}/Makefile.fwlogwatch
-	mv -f ${T}/Makefile.fwlogwatch Makefile
-	emake || die 
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -27,7 +38,7 @@ src_install() {
 	doins contrib/fwlogwatch.php
 	doins contrib
 	insinto /etc
-	doins fwlogwatch.config fwlogwatch.template 
+	doins fwlogwatch.config fwlogwatch.template
 	dodoc AUTHORS ChangeLog CREDITS COPYING README
 	doman fwlogwatch.8
 }
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.0.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.0.ebuild
index 0d23dfde3d0c..e30fab53d70b 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.0.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.0.ebuild
@@ -1,12 +1,12 @@
-# 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/net-analyzer/fwlogwatch/fwlogwatch-1.0.ebuild,v 1.1 2004/07/11 11:56:17 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fwlogwatch/fwlogwatch-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 DESCRIPTION="A packet filter and firewall log analyzer"
 HOMEPAGE="http://fwlogwatch.inside-security.de/"
 SRC_URI="http://www.kybs.de/boris/sw/${P}.tar.bz2"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~ppc ~amd64"
 LICENSE="GPL-1"
 SLOT="0"
 IUSE=""
diff --git a/net-analyzer/gensink/ChangeLog b/net-analyzer/gensink/ChangeLog
index d71234dc508e..4ef9965ce1fe 100644
--- a/net-analyzer/gensink/ChangeLog
+++ b/net-analyzer/gensink/ChangeLog
@@ -1,6 +1,13 @@
-# ChangeLog for <net-analyzer>/<gensink>
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gensink/ChangeLog,v 1.1 2003/02/21 18:59:26 alron Exp $
+# ChangeLog for net-analyzer/gensink
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gensink/ChangeLog,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gensink-4.1.ebuild:
+  Mark 4.1 stable on alpha
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  gensink-4.1.ebuild:
+  Tidy
 
 *gensink-4.1	(21 Feb 2003)
 
diff --git a/net-analyzer/gensink/Manifest b/net-analyzer/gensink/Manifest
index e69de29bb2d1..74969cf156c2 100644
--- a/net-analyzer/gensink/Manifest
+++ b/net-analyzer/gensink/Manifest
@@ -0,0 +1,4 @@
+MD5 2524c0cc21e1368eb6698a55aa8631ec metadata.xml 239
+MD5 0a77060ce94bde895bbd12d66d5773f6 ChangeLog 560
+MD5 ffce2acd876cf233738c0846f7fe2612 gensink-4.1.ebuild 573
+MD5 aefe3c991df48c2833ad62b5b837a28a files/digest-gensink-4.1 62
diff --git a/net-analyzer/gensink/gensink-4.1.ebuild b/net-analyzer/gensink/gensink-4.1.ebuild
index 15701bc233aa..809d6af0fa4b 100644
--- a/net-analyzer/gensink/gensink-4.1.ebuild
+++ b/net-analyzer/gensink/gensink-4.1.ebuild
@@ -1,16 +1,16 @@
-# 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/net-analyzer/gensink/gensink-4.1.ebuild,v 1.1 2003/02/21 18:59:26 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gensink/gensink-4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 DESCRIPTION="Gensink ${PV}, a simple TCP benchmark suite."
 HOMEPAGE="http://jes.home.cern.ch/jes/gensink/"
 SRC_URI="http://jes.home.cern.ch/jes/gensink/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~alpha"
+KEYWORDS="alpha ~ppc ~sparc x86"
 IUSE=""
 DEPEND=""
-S=${WORKDIR}/${P}
+
 
 src_compile() {
 	make || die
diff --git a/net-analyzer/gnome-netstatus/ChangeLog b/net-analyzer/gnome-netstatus/ChangeLog
index bcb7a1f72265..a96bb672816c 100644
--- a/net-analyzer/gnome-netstatus/ChangeLog
+++ b/net-analyzer/gnome-netstatus/ChangeLog
@@ -1,6 +1,211 @@
 # ChangeLog for net-analyzer/gnome-netstatus
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/ChangeLog,v 1.1 2004/03/21 17:36:26 foser Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/ChangeLog,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
+
+  10 Oct 2005; Hardave Riar <hardave@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on mips.
+
+*gnome-netstatus-2.10.0-r2 (20 Sep 2005)
+
+  20 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gnome-netstatus-2.10.0-fbsd.patch,
+  +gnome-netstatus-2.10.0-r2.ebuild:
+  Apply patch for Gentoo/FreeBSD compatibility. Bug #103572.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Mark 2.10.0-r1 stable on alpha
+
+  11 Sep 2005; Guy Martin <gmsoft@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on hppa.
+
+*gnome-netstatus-2.12.0 (10 Sep 2005)
+
+  10 Sep 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -gnome-netstatus-2.11.92.ebuild, +gnome-netstatus-2.12.0.ebuild:
+  2.12 release vbump
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on ppc.
+
+*gnome-netstatus-2.11.92 (28 Aug 2005)
+
+  28 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -gnome-netstatus-2.11.90.ebuild, +gnome-netstatus-2.11.92.ebuild:
+  new version, add dep on gnome-doc-utils, add G2CONF --disable-scrollkeeper.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  stable on ia64
+
+  22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on sparc
+
+*gnome-netstatus-2.11.90 (22 Aug 2005)
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +gnome-netstatus-2.11.90.ebuild:
+  New version.
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on x86.
+
+  19 Jul 2005; Olivier Crête <tester@gentoo.org>
+  gnome-netstatus-2.10.0-r1.ebuild:
+  Stable on amd64
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  gnome-netstatus-2.10.0.ebuild:
+  stable on mips
+
+  26 Jun 2005; Guy Martin <gmsoft@gentoo.org> gnome-netstatus-2.10.0.ebuild:
+  Stable on hppa.
+
+  13 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  gnome-netstatus-2.10.0.ebuild:
+  Stable on ppc64
+
+*gnome-netstatus-2.10.0-r1 (12 Jun 2005)
+
+  12 Jun 2005; Olivier Crête <tester@gentoo.org>
+  +files/gnome-netstatus-2.10.0-amd64.patch,
+  +gnome-netstatus-2.10.0-r1.ebuild:
+  Added patch to make it work properly on amd64
+
+  12 Jun 2005; Olivier Crête <tester@gentoo.org>
+  gnome-netstatus-2.10.0.ebuild:
+  Stable on amd64
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-netstatus-2.10.0.ebuild:
+  Stable on alpha.
+
+  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  gnome-netstatus-2.10.0.ebuild:
+  Stable on ppc.
+
+  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-netstatus-2.10.0.ebuild:
+  Stable on sparc
+
+  02 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
+  gnome-netstatus-2.8.0.ebuild:
+  stable on mips
+
+*gnome-netstatus-2.10.0 (09 Mar 2005)
+
+  09 Mar 2005; Joe McCann <joem@gentoo.org> +gnome-netstatus-2.10.0.ebuild:
+  gnome-2.10 release
+
+  08 Jan 2005; Tom Martin <slarti@gentoo.org> gnome-netstatus-2.8.0.ebuild:
+  Stable on amd64.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  23 Dec 2004; Guy Martin <gmsoft@gentoo.org> gnome-netstatus-2.8.0.ebuild:
+  Stable on hppa.
+
+  11 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-netstatus-2.8.0.ebuild:
+  Stable on alpha.
+
+  12 Nov 2004; Mike Gardiner <obz@gentoo.org> gnome-netstatus-2.8.0.ebuild:
+  Keyworded ppc for GNOME 2.8
+
+  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-netstatus-2.8.0.ebuild:
+  Stable on sparc
+
+  01 Oct 2004; Stephen P. Becker <geoman@gentoo.org>
+  gnome-netstatus-2.6.2.ebuild:
+  stable on mips
+
+*gnome-netstatus-2.8.0 (16 Sep 2004)
+
+  16 Sep 2004; foser <foser@gentoo.org> gnome-netstatus-2.8.0.ebuild :
+  Gnome 2.8 release
+
+*gnome-netstatus-2.6.2.1 (14 Sep 2004)
+
+  14 Sep 2004; Mike Gardiner <obz@gentoo.org> +gnome-netstatus-2.6.2.1.ebuild:
+  New version, looking forward to a final GNOME 2.6 release
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-netstatus-2.6.2.ebuild:
+  Stable on alpha.
+
+  20 Aug 2004; Tom Gall <tgall@gentoo.org> gnome-netstatus-2.6.2.ebuild:
+  stable on ppc64 #57658
+
+  07 Aug 2004; Travis Tilley <lv@gentoo.org> gnome-netstatus-2.6.2.ebuild:
+  stable on amd64
+
+  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-netstatus-2.6.2.ebuild:
+  Stable on sparc
+
+  05 Aug 2004; Guy Martin <gmsoft@gentoo.org> gnome-netstatus-2.6.2.ebuild:
+  Stable on hppa.
+
+  31 Jul 2004; <spider@gentoo.org> gnome-netstatus-2.6.2.ebuild:
+  stable on x86 for gnome 2.6.2
+
+*gnome-netstatus-2.6.2 (11 Jul 2004)
+
+  11 Jul 2004; <spider@gentoo.org> +gnome-netstatus-2.6.2.ebuild:
+  Versionbump
+
+  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  gnome-netstatus-2.6.0.1.ebuild:
+  Stable on alpha.
+
+  04 Jun 2004; Stephen P. Becker <geoman@gentoo.org>
+  gnome-netstatus-2.6.0.1.ebuild:
+  Stable on mips.
+
+  25 May 2004; Guy Martin <gmsoft@gentoo.org> gnome-netstatus-2.6.0.1.ebuild,
+  gnome-netstatus-2.6.1.ebuild:
+  Marked stable on hppa.
+
+  16 May 2004; Stephen P. Becker <geoman@gentoo.org>
+  gnome-netstatus-2.6.0.1.ebuild, gnome-netstatus-2.6.1.ebuild:
+  Added ~mips keyword.
+
+*gnome-netstatus-2.6.1 (04 May 2004)
+
+  04 May 2004; foser <foser@gentoo.org> gnome-netstatus-2.6.1.ebuild :
+  New release
+
+  29 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  gnome-netstatus-2.6.0.1.ebuild:
+  Add ~alpha and ~ia64
+
+*gnome-netstatus-2.6.0.1 (01 Apr 2004)
+
+  01 Apr 2004; foser <foser@gentoo.org> gnome-netstatus-2.6.0.1.ebuild :
+  Gnome 2.6 final final
+
+*gnome-netstatus-2.6.0 (30 Mar 2004)
+
+  30 Mar 2004; Travis Tilley <lv@gentoo.org> gnome-netstatus-2.6.0.ebuild:
+  added ~amd64 keyword
+
+  23 Mar 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Marked ~ppc
+
+  23 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-netstatus-2.5.92.ebuild:
+  ~sparc for upcoming gnome
 
 *gnome-netstatus-2.5.92 (21 Mar 2004)
 
diff --git a/net-analyzer/gnome-netstatus/Manifest b/net-analyzer/gnome-netstatus/Manifest
index 53b9ea10c986..c85c54e43db8 100644
--- a/net-analyzer/gnome-netstatus/Manifest
+++ b/net-analyzer/gnome-netstatus/Manifest
@@ -1,4 +1,12 @@
-MD5 357b9eea89fef2c3e7e9173e75c15366 gnome-netstatus-2.5.92.ebuild 522
-MD5 9022f87c3077dc7ebe1b02d8324b4536 ChangeLog 3674
+MD5 86345c1eb4aeea53334b8c136d7a53ad ChangeLog 6348
+MD5 0eaf93c583e1105a974af27e522f4368 gnome-netstatus-2.10.0-r1.ebuild 788
+MD5 97f8a858994fc26019a6d6edb1511d18 gnome-netstatus-2.10.0.ebuild 699
+MD5 c3d4b4004802c004f702ad9f0c953c4f gnome-netstatus-2.12.0.ebuild 900
+MD5 5c018d92383163aa4e36b638afd3b60c gnome-netstatus-2.10.0-r2.ebuild 835
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 9ed81f9dde1fd4e6ce00882d0917d6ef files/digest-gnome-netstatus-2.5.92 75
+MD5 1be6bc7c3c71d0d777fbef0592e7218b files/digest-gnome-netstatus-2.10.0 75
+MD5 1be6bc7c3c71d0d777fbef0592e7218b files/digest-gnome-netstatus-2.10.0-r1 75
+MD5 aef863196af3a3d138148892c004c19d files/digest-gnome-netstatus-2.12.0 75
+MD5 1be6bc7c3c71d0d777fbef0592e7218b files/digest-gnome-netstatus-2.10.0-r2 75
+MD5 88d1f80ce7cb33d57313ac602cf40ae6 files/gnome-netstatus-2.10.0-fbsd.patch 7116
+MD5 20268c12e6447722fccaf6d5178ab2b8 files/gnome-netstatus-2.10.0-amd64.patch 410
diff --git a/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r1.ebuild b/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r1.ebuild
index c4c2f63d8336..2c054dddf466 100644
--- a/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r1.ebuild
+++ b/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-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/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r1.ebuild,v 1.1 2005/06/12 20:58:31 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 inherit gnome2 eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.3.1
diff --git a/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r2.ebuild b/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r2.ebuild
index fa17506efb0d..5557228a685d 100644
--- a/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r2.ebuild
+++ b/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.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/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r2.ebuild,v 1.1 2005/09/20 18:39:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0.ebuild b/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0.ebuild
index 2cc9a649a744..040e469da82d 100644
--- a/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0.ebuild
+++ b/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.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/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0.ebuild,v 1.1 2005/03/09 08:06:35 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/gnome-netstatus-2.10.0.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~ia64 ~mips ~hppa ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2.3.1
diff --git a/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild b/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild
index a2a46ca132ab..66809f55ea98 100644
--- a/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild
+++ b/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.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/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild,v 1.1 2005/09/10 02:22:42 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-netstatus/gnome-netstatus-2.12.0.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 inherit eutils gnome2
 
diff --git a/net-analyzer/gnome-nettool/ChangeLog b/net-analyzer/gnome-nettool/ChangeLog
index 60ecfbf4cde8..083b37e1d022 100644
--- a/net-analyzer/gnome-nettool/ChangeLog
+++ b/net-analyzer/gnome-nettool/ChangeLog
@@ -1,6 +1,69 @@
 # ChangeLog for net-analyzer/gnome-nettool
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.1 2004/09/18 17:07:46 foser Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+*gnome-nettool-1.4.1 (09 Oct 2005)
+
+  09 Oct 2005; Joe McCann <joem@gentoo.org> -gnome-nettool-1.4.0.ebuild,
+  +gnome-nettool-1.4.1.ebuild:
+  New version
+
+*gnome-nettool-1.4.0 (10 Sep 2005)
+
+  10 Sep 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -gnome-nettool-1.3.92.ebuild, +gnome-nettool-1.4.0.ebuild:
+  2.12 release vbump
+
+*gnome-nettool-1.3.92 (28 Aug 2005)
+
+  28 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+  -gnome-nettool-1.3.91.ebuild, +gnome-nettool-1.3.92.ebuild:
+  new version
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org>
+  gnome-nettool-1.0.0.ebuild:
+  stable on ia64
+
+*gnome-nettool-1.3.91 (22 Aug 2005)
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  +gnome-nettool-1.3.91.ebuild:
+  New version. Updated dependencies.
+
+  22 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  gnome-nettool-1.0.0.ebuild:
+  Stable on x86.
+
+*gnome-nettool-1.0.0 (17 Feb 2005)
+
+  17 Feb 2005; Joe McCann <joem@gentoo.org> +gnome-nettool-1.0.0.ebuild:
+  New release, bug 80940
+
+*gnome-nettool-0.99.3-r1 (05 Dec 2004)
+
+  05 Dec 2004; Mike Gardiner <obz@gentoo.org>
+  +gnome-nettool-0.99.3-r1.ebuild:
+  Added runtime dependencies for the required tools
+
+  27 Oct 2004; Aron Griffis <agriffis@gentoo.org> gnome-nettool-0.99.3.ebuild:
+  add ~ia64
+
+  04 Oct 2004; Guy Martin <gmsoft@gentoo.org> gnome-nettool-0.99.3.ebuild:
+  Added ~hppa to KEYWORDS.
+
+  30 Sep 2004; Stephen P. Becker <geoman@gentoo.org>
+  gnome-nettool-0.99.3.ebuild:
+  added ~mips keyword
+
+  28 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnome-nettool-0.99.3.ebuild:
+  Keyworded ~sparc wrt #64135
+
+  19 Sep 2004; Travis Tilley <lv@gentoo.org> gnome-nettool-0.99.3.ebuild:
+  added ~amd64 keyword
+
+  19 Sep 2004; Luca Barbato <lu_zero@gentoo.org> :
+  Marked ppc
 
 *gnome-nettool-0.99.3 (18 Sep 2004)
 
diff --git a/net-analyzer/gnome-nettool/Manifest b/net-analyzer/gnome-nettool/Manifest
index 1efbc86c997a..7b0df25107a5 100644
--- a/net-analyzer/gnome-nettool/Manifest
+++ b/net-analyzer/gnome-nettool/Manifest
@@ -1,2 +1,6 @@
-MD5 382e4c905623cae6e88af5ea6368a8b2 gnome-nettool-0.99.3.ebuild 734
-MD5 5c4bf9a377c5e884c7e44a6793503654 files/digest-gnome-nettool-0.99.3 73
+MD5 193a43eb19f5804ace4846213abe9eb7 ChangeLog 2202
+MD5 8a3cad474092e73d80bd3426ad3e8a31 files/digest-gnome-nettool-1.0.0 72
+MD5 75ddd43ba908edfb4002c00d5fd5ed89 files/digest-gnome-nettool-1.4.1 72
+MD5 47b976e3c40b3a9ee995a580592712c5 gnome-nettool-1.0.0.ebuild 1105
+MD5 24f1358089ec416c73124cd1ba885fda gnome-nettool-1.4.1.ebuild 850
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-1.0.0.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-1.0.0.ebuild
index c86065dc848e..04ac83cb7b0b 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-1.0.0.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-1.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/net-analyzer/gnome-nettool/gnome-nettool-1.0.0.ebuild,v 1.1 2005/02/17 09:02:17 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/projects/gnome-network/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ia64 ~mips ~ppc ~sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2
diff --git a/net-analyzer/gnome-nettool/gnome-nettool-1.4.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-1.4.1.ebuild
index 3536678a27c5..ed8b096d5eea 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-1.4.1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-1.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/net-analyzer/gnome-nettool/gnome-nettool-1.4.1.ebuild,v 1.1 2005/10/09 06:46:46 joem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnome-nettool/gnome-nettool-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-analyzer/gnu-netcat/ChangeLog b/net-analyzer/gnu-netcat/ChangeLog
index 8cf6e2b39d65..4e6ac6917b5e 100644
--- a/net-analyzer/gnu-netcat/ChangeLog
+++ b/net-analyzer/gnu-netcat/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-analyzer/gnu-netcat
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.1 2004/06/19 06:05:44 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gnu-netcat-0.7.1.ebuild:
+  Mark 0.7.1 stable on alpha
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> gnu-netcat-0.7.1.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> gnu-netcat-0.7.1.ebuild:
+  Stable on sparc.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  gnu-netcat-0.7.1.ebuild:
+  x86 stable
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  24 Jul 2004; Lina Pezzella <burgundy@gentoo.org> :
+  gnu-netcat-0.7.1:
+  Stable macos.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> gnu-netcat-0.7.1.ebuild:
+  change virtual/glibc to virtual/libc
 
 *gnu-netcat-0.7.1 (19 Jun 2004)
 
diff --git a/net-analyzer/gnu-netcat/Manifest b/net-analyzer/gnu-netcat/Manifest
index e76a971d9eb4..a56da81a291b 100644
--- a/net-analyzer/gnu-netcat/Manifest
+++ b/net-analyzer/gnu-netcat/Manifest
@@ -1,2 +1,4 @@
-MD5 b269716096f97d2b5dcd27e6d0661e51 netcat-0.7.1.ebuild 560
-MD5 18c72f77c7d5016cb4425084707f36ff files/digest-netcat-0.7.1 65
+MD5 41fd70e4bb6db4ef064f15731b5aa78a metadata.xml 227
+MD5 926be0e3517128cb7742f1b52591c2b9 ChangeLog 1077
+MD5 fadd7eb959340f30891ed6fbe44d9ab4 gnu-netcat-0.7.1.ebuild 797
+MD5 18c72f77c7d5016cb4425084707f36ff files/digest-gnu-netcat-0.7.1 65
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1.ebuild
index 142de451b378..41271bd7b93b 100644
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1.ebuild
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1.ebuild
@@ -1,8 +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/net-analyzer/gnu-netcat/gnu-netcat-0.7.1.ebuild,v 1.1 2004/06/19 06:05:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gnu-netcat/gnu-netcat-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
-inherit eutils gcc flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 DESCRIPTION="the GNU network swiss army knife"
 HOMEPAGE="http://netcat.sourceforge.net/"
@@ -10,10 +10,10 @@ SRC_URI="mirror://sourceforge/netcat/netcat-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ppc ppc-macos sparc x86"
 IUSE="nls debug"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 S=${WORKDIR}/netcat-${PV}
 
diff --git a/net-analyzer/gnu-netcat/metadata.xml b/net-analyzer/gnu-netcat/metadata.xml
index 03aa50bab7e3..5e20863aeab7 100644
--- a/net-analyzer/gnu-netcat/metadata.xml
+++ b/net-analyzer/gnu-netcat/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<longdescription>the GNU network swiss army knife</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/gspoof/ChangeLog b/net-analyzer/gspoof/ChangeLog
index b59a282ada3a..16c69056fae0 100644
--- a/net-analyzer/gspoof/ChangeLog
+++ b/net-analyzer/gspoof/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/gspoof
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/ChangeLog,v 1.1 2004/02/12 13:08:17 spock Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  29 Aug 2005; <dang@gentoo.org> gspoof-3.2.ebuild:
+  Marked ~amd64
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> gspoof-3.2.ebuild:
+  Added to ~ppc.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> gspoof-3.2.ebuild:
+  Tidy up.
+
+  27 Mar 2004; Michal Januszewski <spock@gentoo.org> gspoof-3.2.ebuild:
+  Bump to stable (x86).
 
 *gspoof-3.2 (12 Feb 2004)
 
diff --git a/net-analyzer/gspoof/Manifest b/net-analyzer/gspoof/Manifest
index 165039a2247c..377f1e76d0ce 100644
--- a/net-analyzer/gspoof/Manifest
+++ b/net-analyzer/gspoof/Manifest
@@ -1,4 +1,14 @@
-MD5 bda6158b431b879d51f487e63ca223e6 gspoof-3.2.ebuild 729
-MD5 83944a3ed6d4b50d189bb173cd7a421c ChangeLog 421
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ef3fcbf0e93cceb66a6eaffa945174ff gspoof-3.2.ebuild 710
+MD5 a78080087a45e819e50bc24304385cc7 ChangeLog 735
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 MD5 aade8603f952110013d657323d4aca4e files/digest-gspoof-3.2 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDE2ttomPajV0RnrERAqD/AJ9w+ZWg22KThMgG0VnPUflSrLVgUACdFs8F
+vaTkxl6Jw1ROleide6C6sPk=
+=CAo2
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/gspoof/gspoof-3.2.ebuild b/net-analyzer/gspoof/gspoof-3.2.ebuild
index 7d1c6fff700e..e970e5682306 100644
--- a/net-analyzer/gspoof/gspoof-3.2.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2.ebuild
@@ -1,20 +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/net-analyzer/gspoof/gspoof-3.2.ebuild,v 1.1 2004/02/12 13:08:17 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/gspoof/gspoof-3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 DESCRIPTION="A simple GTK/command line TCP/IP packet generator"
 HOMEPAGE="http://gspoof.sourceforge.net/"
 SRC_URI="http://gspoof.sourceforge.net/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 
 DEPEND="=x11-libs/gtk+-2*
 	=dev-libs/glib-2*
 	>=net-libs/libnet-1.1.1"
-RDEPEND="${DEPEND}"
 
 src_compile() {
 	emake || die
diff --git a/net-analyzer/honeyd/ChangeLog b/net-analyzer/honeyd/ChangeLog
index ca3a13837d2e..65dde9c55980 100644
--- a/net-analyzer/honeyd/ChangeLog
+++ b/net-analyzer/honeyd/ChangeLog
@@ -1,8 +1,90 @@
 # ChangeLog for net-analyzer/honeyd
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/ChangeLog,v 1.1 2003/02/12 10:45:18 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/ChangeLog,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+  06 Sep 2005; Simon Stelling <blubb@gentoo.org> honeyd-1.0-r1.ebuild:
+  added ~amd64 keyword
+
+*honeyd-1.0-r1 (30 Jun 2005)
+
+  30 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> files/honeyd.initd,
+  +honeyd-1.0-r1.ebuild:
+  Revision bump; fixed init script so that the webserver will start, bug 89348.
+
+  29 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/honeyd-1.0-gcc4.diff, honeyd-1.0.ebuild:
+  Added patch so honeyd will build with gcc-4.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> honeyd-1.0.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> honeyd-0.8.ebuild,
+  honeyd-1.0.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*honeyd-1.0 (21 Jan 2005)
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/honeyd.confd,
+  +files/honeyd.initd, honeyd-0.8.ebuild, +honeyd-1.0.ebuild:
+  Version bump; added init.d/conf.d scripts based on the ones written by
+  Thomas Preissler in bug 30223.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> honeyd-0.8.ebuild:
+  Added to ~ppc.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> honeyd-0.6a.ebuild,
+  honeyd-0.7a.ebuild, honeyd-0.8.ebuild:
+  marked x86 stable
+
+  25 Mar 2004; Jason Wever <weeve@gentoo.org> honeyd-0.8.ebuild:
+  Added ~sparc keyword.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> honeyd-0.4a.ebuild,
+  honeyd-0.5.ebuild:
+  QA: Adding categories to dependencies. See bug 45110 for details.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> honeyd-0.4a.ebuild,
+  honeyd-0.5.ebuild, honeyd-0.6a.ebuild, honeyd-0.7a.ebuild,
+  honeyd-0.8.ebuild:
+  QA: Unnecessary definition of S removed.
+
+  13 Mar 2004; Michael Boman <mboman@gentoo.org> honeyd-0.4a.ebuild,
+  honeyd-0.5.ebuild, honeyd-0.6a.ebuild, honeyd-0.7a.ebuild,
+  honeyd-0.8.ebuild:
+  Fixed Gentoo ebuild policy violation. Closes bug #44516.
+
+*honeyd-0.8 (22 Jan 2004)
+
+  22 Jan 2004; Michael Boman <mboman@gentoo.org> honeyd-0.8.ebuild:
+  New upstream version. Fixes bug #38934 (Security bug).
+  Honeyd is now released under GPL-2.
+
+*honeyd-0.7a (06 Jan 2004)
+
+  06 Jan 2004; Michael Boman <mboman@gentoo.org> honeyd-0.7a.ebuild:
+  - New upstream version
+  - Included the script and example config collection by Lance Spitzner
+
+  24 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> honeyd-0.6a.ebuild:
+  Fix so it actually compiles. Closing #29233.
+
+*honeyd-0.6a (25 Aug 2003)
+
+  25 Aug 2003; Daniel Ahlberg <aliz@gentoo.org> honeyd-0.6a.ebuild:
+  Version bump. Found by "dead-eye" <dead-eye@gmx.ch>.
+
+*honeyd-0.5 (10 Mar 2003)
+
+  10 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild contributed by Daniel Mannarino <thesnark@operamail.com> in #16601.
 
 *honeyd-0.4b (12 Feb 2003)
 
   12 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild submitted by Daniel Mannarino <thesnark@operamail.com> in #10889.
+
+*honeyd-0.4a (12 Feb 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
diff --git a/net-analyzer/honeyd/Manifest b/net-analyzer/honeyd/Manifest
index e69de29bb2d1..4d379ecaf02c 100644
--- a/net-analyzer/honeyd/Manifest
+++ b/net-analyzer/honeyd/Manifest
@@ -0,0 +1,11 @@
+MD5 821adaddcd71c21725b4305456476abd ChangeLog 3133
+MD5 f14a4d480a0e027ac820f59f90c529a0 honeyd-0.8.ebuild 1954
+MD5 f4c1d13cc545b81ee8e06842eaa46500 honeyd-1.0.ebuild 1871
+MD5 fef2fd2afe9a195bdc62e5628a5fd501 metadata.xml 259
+MD5 78de359801d7de8c0425f97096e0a3f4 honeyd-1.0-r1.ebuild 1879
+MD5 96be4ce17e233507825dbc39127ee9f3 files/digest-honeyd-0.8 129
+MD5 857b8d8953a80aae5035664b1bc984a7 files/digest-honeyd-1.0 129
+MD5 05aa030ef5d390514cee9da3fa910690 files/honeyd.confd 429
+MD5 136db19ad000802545ff0250f4ce7ee4 files/honeyd.initd 1464
+MD5 0f51773734c0ac0e902fc0eea15f9647 files/honeyd-1.0-gcc4.diff 674
+MD5 857b8d8953a80aae5035664b1bc984a7 files/digest-honeyd-1.0-r1 129
diff --git a/net-analyzer/honeyd/files/honeyd.initd b/net-analyzer/honeyd/files/honeyd.initd
index a0b1fa573711..f5ec19f64313 100644
--- a/net-analyzer/honeyd/files/honeyd.initd
+++ b/net-analyzer/honeyd/files/honeyd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/files/honeyd.initd,v 1.1 2005/01/21 22:13:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/files/honeyd.initd,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 depend() {
 	need net
@@ -30,17 +30,18 @@ start() {
 	fi
 
 	# supports webserver feature?
-	if [[ "$(/usr/sbin/honeyd --help 2>1 | grep webserver)" != "" ]] ; then
+	if [[ "$(/usr/sbin/honeyd --help 2>&1 | grep webserver)" != "" ]] ; then
 		# run webserver?
-		if [[ ${HONEY_HTTPD} -eq 1 ]] ; then
-			options="${options} --webserver-port ${HONEY_HTTPD_PORT} \
-				--webserver-root ${HONEY_HTTPD_ROOT} --fix-webserver-permissions"
+		if [[ ${HONEYD_HTTPD} -eq 1 ]] ; then
+			options="${options} --webserver-port ${HONEYD_HTTPD_PORT} \
+				--webserver-root ${HONEYD_HTTPD_ROOT} --fix-webserver-permissions"
 		else
 			options="${options} --disable-webserver"
 		fi
 	fi
 
 	options="${options} -i ${HONEYD_IF:-lo} ${HONEYD_OPTS}"
+
     start-stop-daemon --start --quiet --exec /usr/sbin/honeyd \
 		-- ${options} ${HONEYD_NET} >/dev/null 2>&1
     eend $?
diff --git a/net-analyzer/honeyd/honeyd-0.8.ebuild b/net-analyzer/honeyd/honeyd-0.8.ebuild
index f0cb5755d6fe..1e3f75ab0e9e 100644
--- a/net-analyzer/honeyd/honeyd-0.8.ebuild
+++ b/net-analyzer/honeyd/honeyd-0.8.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/net-analyzer/honeyd/honeyd-0.8.ebuild,v 1.1 2004/01/21 18:21:43 mboman Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/honeyd-0.8.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 DESCRIPTION="Honeyd is a small daemon that creates virtual hosts on a network"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
@@ -11,32 +9,29 @@ SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-
+KEYWORDS="x86 ~sparc ~ppc"
 IUSE="doc"
+
 DEPEND=">=dev-libs/libdnet-1.7
 	>=dev-libs/libevent-0.6
-	>=net-libs/libpcap-0.7.1"
-RDEPEND=${DEPEND}
-
-S="${WORKDIR}/${P}"
+	virtual/libpcap"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in
+	unpack ${A}
+	cd ${S}
+	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in || die "sed failed"
 }
 
 src_compile() {
 	econf --with-libdnet=/usr || die "econf failed"
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	dodoc README
 	dosbin honeyd
 
-	einstall
+	einstall || die "make install failed"
 
 	rm ${D}/usr/bin/honeyd
 	rm ${D}/usr/share/honeyd/README
@@ -45,14 +40,17 @@ src_install() {
 	exeinto /usr/share/honeyd/scripts
 	doexe scripts/web.sh scripts/router-telnet.pl scripts/test.sh
 
+	insinto /etc
+	newins config.sample honeyd.conf || die "failed to install honeyd.conf"
+
+	newinitd ${FILESDIR}/${PN}.initd ${PN}
+	newconfd ${FILESDIR}/${PN}.confd ${PN}
+
 	# This adds all the services and example configurations collected
 	# by Lance Spitzer
 
 	# Install the white-papers if 'doc' USE flags are specified
-	use doc && (
-		cd ${WORKDIR}/honeyd-0.7a-beta2/contrib
-		dodoc *
-	)
+	use doc && dodoc ${WORKDIR}/honeyd-0.7a-beta2/contrib/*
 
 	# Install the example configurations
 	cd ${WORKDIR}/honeyd-0.7a-beta2
@@ -60,16 +58,10 @@ src_install() {
 	dodoc honeyd.conf.simple honeyd.conf.bloat nmap.prints.new
 	dodoc xprobe2.conf.new honeyd.conf.networks
 
-	# Install example start/stop scripts.. Those should _really_
-	# be re-written to gentoo instead..
-	dodoc start-arpd.sh start-honeyd.sh
-
 	# Install all the example scripts
 	cd ${WORKDIR}/honeyd-0.7a-beta2/scripts
 	cp -R * ${D}/usr/share/honeyd/scripts/
 	cd ${D}/usr/share/honeyd/scripts/
 	find -type f -name "*.sh" -o -name "*.pl" | xargs chmod +x
-
-
 }
 
diff --git a/net-analyzer/honeyd/honeyd-1.0-r1.ebuild b/net-analyzer/honeyd/honeyd-1.0-r1.ebuild
index b330d64bd3eb..072ba6ea8386 100644
--- a/net-analyzer/honeyd/honeyd-1.0-r1.ebuild
+++ b/net-analyzer/honeyd/honeyd-1.0-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/net-analyzer/honeyd/honeyd-1.0-r1.ebuild,v 1.1 2005/06/30 14:45:51 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/honeyd-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="doc"
 
 DEPEND=">=dev-libs/libdnet-1.7
diff --git a/net-analyzer/honeyd/honeyd-1.0.ebuild b/net-analyzer/honeyd/honeyd-1.0.ebuild
index fcccadf61186..08324eace1f0 100644
--- a/net-analyzer/honeyd/honeyd-1.0.ebuild
+++ b/net-analyzer/honeyd/honeyd-1.0.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/net-analyzer/honeyd/honeyd-1.0.ebuild,v 1.1 2005/01/21 22:13:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/honeyd/honeyd-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Honeyd is a small daemon that creates virtual hosts on a network"
 HOMEPAGE="http://www.citi.umich.edu/u/provos/honeyd/"
@@ -9,17 +11,18 @@ SRC_URI="http://www.citi.umich.edu/u/provos/honeyd/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 IUSE="doc"
 
 DEPEND=">=dev-libs/libdnet-1.7
 	>=dev-libs/libevent-1.0
-	>=net-libs/libpcap-0.7.1"
+	virtual/libpcap"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	sed -i "s:^CFLAGS = -O2:CFLAGS = ${CFLAGS}:g" Makefile.in || die "sed failed"
+	epatch ${FILESDIR}/${P}-gcc4.diff
 }
 
 src_compile() {
@@ -29,7 +32,7 @@ src_compile() {
 
 src_install() {
 	dodoc README TODO
-	dosbin honeyd
+	dosbin honeyd || die "dosbin failed"
 
 	einstall || die "make install failed"
 
@@ -39,8 +42,8 @@ src_install() {
 	insinto /etc
 	newins config.sample honeyd.conf || die "failed to install honeyd.conf"
 
-	newinitd ${FILESDIR}/${PN}.initd ${PN}
-	newconfd ${FILESDIR}/${PN}.confd ${PN}
+	newinitd ${FILESDIR}/${PN}.initd ${PN} || die
+	newconfd ${FILESDIR}/${PN}.confd ${PN} || die
 
 	# This adds all the services and example configurations collected
 	# by Lance Spitzer
@@ -57,6 +60,6 @@ src_install() {
 	# Install all the example scripts
 	cp -R scripts ${D}/usr/share/honeyd/
 	find ${D}/usr/share/honeyd/scripts \
-		-type f -name "*.sh" -o -name "*.pl" | xargs chmod +x
+		-type f -name '*.sh' -o -name '*.pl' -exec chmod +x {} \;
 }
 
diff --git a/net-analyzer/honeyd/metadata.xml b/net-analyzer/honeyd/metadata.xml
index a138bfa46aa6..cd092f88a270 100644
--- a/net-analyzer/honeyd/metadata.xml
+++ b/net-analyzer/honeyd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>Honeyd is a small daemon that creates virtual hosts on a network.</longdescription>
+<herd>netmon</herd>
+<longdescription>Honeyd is a small daemon that creates virtual hosts on a network</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index 235ed536c0c7..01e5bd79c1aa 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,16 +1,136 @@
 # ChangeLog for net-analyzer/hping
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> files/bytesex.h.patch,
+  hping-2.0.0_rc3-r1.ebuild:
+  update bytesex patch and stable on ia64
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> hping-2.0.0_rc3-r1.ebuild:
+  stable on amd64
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org>
+  hping-2.0.0_rc3-r1.ebuild:
+  Stable on ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  hping-2.0.0_rc2-r1.ebuild, hping-2.0.0_rc3-r1.ebuild,
+  hping-2.0.0_rc3.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Nov 2004; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc3-r1.ebuild:
+  Stable on hppa.
+
+  11 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  hping-2.0.0_rc3-r1.ebuild:
+  Stable on alpha.
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc3-r1.ebuild:
+  Stable on sparc.
+
+  06 Nov 2004; Eldad Zack <eldad@gentoo.org> -hping-2.0.0_rc1.ebuild,
+  -hping-2.0.0_rc2.ebuild, hping-2.0.0_rc3-r1.ebuild:
+  x86 stable.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> hping-2.0.0_rc2.ebuild,
+  hping-2.0.0_rc3.ebuild:
+  Stable on amd64.
+
+*hping-2.0.0_rc3-r1 (20 Aug 2004)
+
+  20 Aug 2004; Eldad Zack <eldad@gentoo.org> +files/hping-bridge.patch,
+  +hping-2.0.0_rc3-r1.ebuild:
+  Ethernet bridge interface fix: patch contributed by Nathan
+  <nathan.stocks@gmail.com>. Closes #59534.
+
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> hping-2.0.0_rc3.ebuild:
+  Stable on alpha.
+
+  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> -files/amd64-header-fix.patch,
+  +files/bytesex.h.patch, hping-2.0.0_rc3.ebuild:
+  Added byte ordering fix for amd64 and hppa in bytesex.h.patch. Stable on hppa.
+
+  22 Jul 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc3.ebuild:
+  Stable on sparc.
+
+  27 Jul 2004; <malc@gentoo.org> hping-2.0.0_rc3.ebuild:
+  Teach bytesex.h to know __x86_64__ fixes bug #57834
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> hping-2.0.0_rc3.ebuild:
+  marked x86 stable
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> hping-2.0.0_rc2-r1.ebuild,
+  hping-2.0.0_rc2.ebuild, hping-2.0.0_rc3.ebuild:
+  added debug to IUSE
+
+  07 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> hping-2.0.0_rc3.ebuild:
+  fix use invocation (again); IUSE; tidy
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> hping-2.0.0_rc3.ebuild:
+  Added extra docs. Closes #52234. Thanks to Devon <gentoo@noved.org>.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc1.ebuild,
+  hping-2.0.0_rc2-r1.ebuild, hping-2.0.0_rc2.ebuild, hping-2.0.0_rc3.ebuild:
+  Fix use invocation
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> hping-2.0.0_rc2-r1.ebuild:
+  Stable on alpha.
+
+*hping-2.0.0_rc3 (14 May 2004)
+
+  14 May 2004; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc3.ebuild :
+  Version bump. Ebuild from Daniel Fullmer (lsmod@hotmail.com) in bug
+  #50140.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc2-r1.ebuild:
+  Add inherit eutils
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc2-r1.ebuild:
+  Marked stable on sparc.
+
+  19 Dec 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2-r1.ebuild :
+  Fix for a fix. Bug 33495.
+
+  18 Dec 2003; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc2-r1.ebuild:
+  Marked stable on hppa.
+
+*hping-2.0.0_rc2-r1 (03 Dec 2003)
+
+  03 Dec 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2-r1.ebuild,
+		files/wlan-header-fix.patch :
+  Patch from GMsoft to fix a WLAN bug. Bug #34481.
+
+  20 Nov 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild :
+  Build fixes from trauma@web.de, bug #33495.
+
+  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc2.ebuild:
+  Add ~alpha
+
+*hping-2.0.0_rc2 (03 March 2003)
+
+  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc2.ebuild :
+  Added hppa to KEYWORDS.
+
+  03 March 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
   moved to net-analyzer - added SLOT
 
 *hping-2.0.0_rc1 (1 Feb 2002)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> hping-2.0.0_rc1.ebuild :
+  set ppc in keywords
+
   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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+	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
+	writing correct changelogs are explained in the skel.ChangeLog file which you
+	can find in the root directory of the portage repository.
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index e69de29bb2d1..ab55f6de9ec7 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -0,0 +1,11 @@
+MD5 e98a2574347d615b6bd079663da6e1a0 hping-2.0.0_rc3.ebuild 989
+MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 1a345455395ee5c51ffd0f98a620de32 ChangeLog 4842
+MD5 2d736da685331f71693762834684e34e hping-2.0.0_rc3-r1.ebuild 1067
+MD5 f7f4ea96071d42b8f6d83360d2c3edb8 hping-2.0.0_rc2-r1.ebuild 912
+MD5 8af8e336819df1447b0c1b879a704be9 files/bytesex.h.patch 648
+MD5 f72fc3b23f30d84ba7210390cf3b4b57 files/digest-hping-2.0.0_rc3 66
+MD5 cca06082ed7613b5803b6c7ff62a31bf files/wlan-header-fix.patch 848
+MD5 eef05cbe61a0adf5b65aced19f629085 files/digest-hping-2.0.0_rc2-r1 66
+MD5 f72fc3b23f30d84ba7210390cf3b4b57 files/digest-hping-2.0.0_rc3-r1 66
+MD5 b14544690b9c931e61b28dd0f6544f48 files/hping-bridge.patch 359
diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch
index 65e88896d3d1..26ee54ee1266 100644
--- a/net-analyzer/hping/files/bytesex.h.patch
+++ b/net-analyzer/hping/files/bytesex.h.patch
@@ -1,11 +1,12 @@
 diff -uNr hping2-rc3.orig/bytesex.h hping2-rc3/bytesex.h
 --- hping2-rc3.orig/bytesex.h	2004-07-29 15:46:47.572596272 +0000
 +++ hping2-rc3/bytesex.h	2004-07-29 15:48:14.557372576 +0000
-@@ -9,11 +9,13 @@
+@@ -9,11 +9,14 @@
  
  #if 	defined(__i386__) \
  	|| defined(__alpha__) \
 +	|| defined(__x86_64__) \
++	|| defined(__ia64__) \
  	|| (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
  #define BYTE_ORDER_LITTLE_ENDIAN
  #elif 	defined(__mc68000__) \
diff --git a/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild b/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild
index 0f9f1ede275a..700335ba2394 100644
--- a/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild
+++ b/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild
@@ -1,6 +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/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild,v 1.1 2003/12/03 21:30:28 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
+
+inherit eutils
 
 S=${WORKDIR}/hping2-rc2
 DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer."
@@ -9,20 +11,21 @@ HOMEPAGE="http://www.hping.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~ia64 ~amd64 ~alpha"
+KEYWORDS="x86 sparc hppa ia64 amd64 alpha ppc"
 
-DEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
+IUSE="debug"
 
 src_compile() {
 	epatch ${FILESDIR}/wlan-header-fix.patch
 
 	./configure || die
 
-	if [ `use debug` ]
+	if use debug
 	then
 		make CCOPT="${CFLAGS}" || die
 	else
-		make CCOPT="${CFLAGS}" || die
+		make CCOPT="${CFLAGS}" DEBUG="" || die
 	fi
 }
 
diff --git a/net-analyzer/hping/hping-2.0.0_rc3-r1.ebuild b/net-analyzer/hping/hping-2.0.0_rc3-r1.ebuild
index c5932bcd9ec3..95ec1495d54a 100644
--- a/net-analyzer/hping/hping-2.0.0_rc3-r1.ebuild
+++ b/net-analyzer/hping/hping-2.0.0_rc3-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/net-analyzer/hping/hping-2.0.0_rc3-r1.ebuild,v 1.1 2004/08/20 13:51:44 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 inherit eutils
 
@@ -11,17 +11,22 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~hppa ~ia64 ~amd64 ~alpha"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE="debug"
 
-DEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
 
 S="${WORKDIR}/${MY_P//\.[0-9]}"
 
-src_compile() {
-	./configure || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 	epatch ${FILESDIR}/bytesex.h.patch
 	epatch ${FILESDIR}/hping-bridge.patch
+}
+
+src_compile() {
+	./configure || die
 
 	if use debug
 	then
diff --git a/net-analyzer/hping/hping-2.0.0_rc3.ebuild b/net-analyzer/hping/hping-2.0.0_rc3.ebuild
index d99270d7f9aa..11e982fb6d2b 100644
--- a/net-analyzer/hping/hping-2.0.0_rc3.ebuild
+++ b/net-analyzer/hping/hping-2.0.0_rc3.ebuild
@@ -1,25 +1,28 @@
-# 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/net-analyzer/hping/hping-2.0.0_rc3.ebuild,v 1.1 2004/05/14 19:18:59 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc3.ebuild,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 inherit eutils
 
 MY_P="${PN}${PV//_/-}"
-S="${WORKDIR}/${MY_P//\.[0-9]}"
-DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer."
-SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
+DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer"
 HOMEPAGE="http://www.hping.org"
+SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~ia64 ~amd64 ~alpha"
+SLOT="0"
+KEYWORDS="x86 sparc hppa ~ia64 amd64 alpha ppc"
+IUSE="debug"
+
+DEPEND="virtual/libpcap"
 
-DEPEND="net-libs/libpcap"
+S="${WORKDIR}/${MY_P//\.[0-9]}"
 
 src_compile() {
 	./configure || die
+	epatch ${FILESDIR}/bytesex.h.patch
 
-	if [ `use debug` ]
+	if use debug
 	then
 		make CCOPT="${CFLAGS}" || die
 	else
@@ -33,5 +36,5 @@ src_install () {
 	dosym /usr/sbin/hping2 /usr/sbin/hping
 
 	doman docs/hping2.8
-	dodoc INSTALL KNOWN-BUGS NEWS README TODO AUTHORS BUGS CHANGES COPYING
+	dodoc INSTALL KNOWN-BUGS NEWS README TODO AUTHORS BUGS CHANGES COPYING docs/AS-BACKDOOR docs/HPING2-IS-OPEN docs/MORE-FUN-WITH-IPID docs/*.txt
 }
diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml
index 4e98f418b45c..d05f9ba0821d 100644
--- a/net-analyzer/hping/metadata.xml
+++ b/net-analyzer/hping/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-<name>Jon Portnoy</name>
 <email>avenj@gentoo.org</email>
+<name>Jon Portnoy</name>
 </maintainer>
 </pkgmetadata>
 
diff --git a/net-analyzer/httping/ChangeLog b/net-analyzer/httping/ChangeLog
index be90266480f1..6c757d461bcd 100644
--- a/net-analyzer/httping/ChangeLog
+++ b/net-analyzer/httping/ChangeLog
@@ -1,6 +1,67 @@
 # ChangeLog for net-analyzer/httping
-# Copyright 1999-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.1 2004/04/12 02:42:48 squinky86 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+*httping-1.0.7 (12 Nov 2005)
+
+  12 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -httping-0.0.94-r1.ebuild, -httping-1.0.1.ebuild, +httping-1.0.7.ebuild:
+  Clean old ebuilds, 1.0.7 version bump. Inheritting toolchain-funcs to get CC.
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> httping-0.0.95.ebuild:
+  amd64 stable.
+
+  08 Jun 2005; Stuart Longland <redhatter@gentoo.org> httping-1.0.4.ebuild:
+  Added ~mips keyword as per bug #89294.
+
+*httping-1.0.4 (07 May 2005)
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org> +httping-1.0.4.ebuild:
+  Version bump.
+
+*httping-1.0.1 (05 Apr 2005)
+
+  05 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +httping-1.0.1.ebuild:
+  Version bump for bug 86810.
+
+  30 Nov 2004; Jon Hood <squinky86@gentoo.org> httping-0.0.95.ebuild:
+  Mark ~hppa and ~amd64.
+
+  18 Oct 2004; Jon Hood <squinky86@gentoo.org> httping-0.0.95.ebuild:
+  Stable on x86.
+
+*httping-0.0.95 (15 Sep 2004)
+
+  15 Sep 2004; Jon Hood <squinky86@gentoo.org> -httping-0.0.93.ebuild,
+  httping-0.0.94-r1.ebuild, -httping-0.0.94.ebuild, +httping-0.0.95.ebuild:
+  Version bump, mark -r1 stable on x86, cleanup old ebuilds.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> -httping-0.0.8.ebuild,
+  httping-0.0.94.ebuild:
+  Stable on x86, ebuild cleanups.
+
+*httping-0.0.94-r1 (30 Aug 2004)
+
+  30 Aug 2004; Jon Hood <squinky86@gentoo.org> +httping-0.0.94-r1.ebuild:
+  Now testing ability to build without ssl support.
+
+  28 Aug 2004; Tom Gall <tgall@gentoo.org> httping-0.0.94.ebuild:
+  stable on ppc64, bug #59647
+
+*httping-0.0.94 (05 Aug 2004)
+
+  05 Aug 2004; Jon Hood <squinky86@gentoo.org> httping-0.0.93.ebuild,
+  +httping-0.0.94.ebuild:
+  Stable x86 and testing version bumps.
+
+*httping-0.0.93 (15 Jun 2004)
+
+  15 Jun 2004; Jon Hood <squinky86@gentoo.org> httping-0.0.8.ebuild,
+  +httping-0.0.93.ebuild:
+  version bump, stable on x86
+
+  12 Apr 2004; David Holm <dholm@gentoo.org> httping-0.0.8.ebuild:
+  Added to ~ppc.
 
 *httping-0.0.8 (11 Apr 2004)
 
diff --git a/net-analyzer/httping/Manifest b/net-analyzer/httping/Manifest
index 21c25060f76c..548286222381 100644
--- a/net-analyzer/httping/Manifest
+++ b/net-analyzer/httping/Manifest
@@ -1,4 +1,8 @@
-MD5 251c9f250b25880983a330ab1840a42c httping-0.0.8.ebuild 556
-MD5 0d34ec9cbd2570036bb583b251f35a2f ChangeLog 272
-MD5 61da3c68a3ae57136cdc2a17fbaedfaf metadata.xml 223
-MD5 42c1e01e84428ea94fdf2c8842a68d2a files/digest-httping-0.0.8 60
+MD5 6ba8fa725d2feb83b1577ad7d94b3c80 ChangeLog 2286
+MD5 ae2b0648bc9a639b7129d5297c8ad680 files/digest-httping-0.0.95 61
+MD5 41294b5dc0391f0afde3ceb72f595a2e files/digest-httping-1.0.4 60
+MD5 f378aa4539af72c42f3b324667c520d6 files/digest-httping-1.0.7 60
+MD5 bcc36cdddbbe2d80abeb6e1413f81602 httping-0.0.95.ebuild 750
+MD5 cd0cd619350d3bff96b5bdc1dc27e594 httping-1.0.4.ebuild 807
+MD5 33874562f2abd76d002ad33a1934ecd7 httping-1.0.7.ebuild 858
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
diff --git a/net-analyzer/httping/httping-0.0.95.ebuild b/net-analyzer/httping/httping-0.0.95.ebuild
index e96c2ba62bdf..b9d43cc09eeb 100644
--- a/net-analyzer/httping/httping-0.0.95.ebuild
+++ b/net-analyzer/httping/httping-0.0.95.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/net-analyzer/httping/httping-0.0.95.ebuild,v 1.1 2004/09/15 18:37:29 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-0.0.95.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="http protocol ping-like program"
 HOMEPAGE="http://www.vanheusden.com/httping/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ppc64"
+KEYWORDS="x86 ~ppc ppc64 ~hppa amd64"
 IUSE="ssl"
 
 DEPEND=">=sys-libs/ncurses-5"
diff --git a/net-analyzer/httping/httping-1.0.4.ebuild b/net-analyzer/httping/httping-1.0.4.ebuild
index 8f8d51b86baa..5a15d43afd26 100644
--- a/net-analyzer/httping/httping-1.0.4.ebuild
+++ b/net-analyzer/httping/httping-1.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/net-analyzer/httping/httping-1.0.4.ebuild,v 1.1 2005/05/07 21:28:09 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="http protocol ping-like program"
 HOMEPAGE="http://www.vanheusden.com/httping/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.vanheusden.com/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc64 ~hppa ~amd64"
+KEYWORDS="~x86 ~ppc ~ppc64 ~hppa ~amd64 ~mips"
 IUSE="ssl"
 
 DEPEND=">=sys-libs/ncurses-5"
diff --git a/net-analyzer/httping/httping-1.0.7.ebuild b/net-analyzer/httping/httping-1.0.7.ebuild
index f9d661c4f655..2d437012bd27 100644
--- a/net-analyzer/httping/httping-1.0.7.ebuild
+++ b/net-analyzer/httping/httping-1.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/net-analyzer/httping/httping-1.0.7.ebuild,v 1.1 2005/11/12 15:07:37 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/httping/httping-1.0.7.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
index 5716453670e6..03aa50bab7e3 100644
--- a/net-analyzer/httping/metadata.xml
+++ b/net-analyzer/httping/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
- <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/hunt/ChangeLog b/net-analyzer/hunt/ChangeLog
index 36a762138210..e89ab5e83796 100644
--- a/net-analyzer/hunt/ChangeLog
+++ b/net-analyzer/hunt/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-analyzer/hunt
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/ChangeLog,v 1.1 2004/02/03 02:13:49 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> hunt-1.5.ebuild:
+  Added to ~ppc.
+
+  15 May 2005; Konstantin Arkhipov <voxus@gentoo.org> hunt-1.5.ebuild:
+  Added ~amd64 keyword wrt bug #92521. Header fixed.
+
+  08 Nov 2004; Eldad Zack <eldad@gentoo.org> hunt-1.5.ebuild:
+  Homepage update, thanks to Jason Cavett <jason.cavett@gmail.com>, Closes
+  #70426.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> hunt-1.5.ebuild,
+  +metadata.xml:
+  change virtual/glibc to virtual/libc, add metadata.xml, add IUSE
 
 *hunt-1.5 (02 Feb 2004)
 
diff --git a/net-analyzer/hunt/Manifest b/net-analyzer/hunt/Manifest
index 29963ea15a8a..8b46fbe9f2fb 100644
--- a/net-analyzer/hunt/Manifest
+++ b/net-analyzer/hunt/Manifest
@@ -1,3 +1,4 @@
+MD5 4ad6abe694a2b93fdebf63a70f19e042 ChangeLog 845
+MD5 fbc47f3c8762365a5980ce3b2266c53d hunt-1.5.ebuild 688
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 MD5 141835f2eeceb96546563db9aaf8d291 files/digest-hunt-1.5 56
-MD5 f4e5a9d2c79b70a9f051b5a102e73a0e hunt-1.5.ebuild 673
-MD5 db845b0fcccffdd39ac780035d10731b ChangeLog 353
diff --git a/net-analyzer/hunt/hunt-1.5.ebuild b/net-analyzer/hunt/hunt-1.5.ebuild
index 32e97dfc12b1..be6bc0590b66 100644
--- a/net-analyzer/hunt/hunt-1.5.ebuild
+++ b/net-analyzer/hunt/hunt-1.5.ebuild
@@ -1,16 +1,17 @@
-# 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/net-analyzer/hunt/hunt-1.5.ebuild,v 1.1 2004/02/03 02:13:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hunt/hunt-1.5.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 DESCRIPTION="tool for checking well known weaknesses in the TCP/IP protocol"
-HOMEPAGE="http://www.gncz.cz/kra/index.html"
+HOMEPAGE="http://lin.fsid.cvut.cz/~kra/index.html"
 SRC_URI="http://lin.fsid.cvut.cz/~kra/hunt/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/hydra/ChangeLog b/net-analyzer/hydra/ChangeLog
index ec673a73a496..0caa8f60ccd7 100644
--- a/net-analyzer/hydra/ChangeLog
+++ b/net-analyzer/hydra/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for net-analyzer/hydra
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.1 2004/02/14 04:47:39 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/ChangeLog,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
+
+  11 Aug 2005; Carlos Silva <r3pek@gentoo.org> hydra-4.7.ebuild:
+  marked ~amd64. closes bug #102030
+
+*hydra-4.7 (14 Jun 2005)
+
+  14 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +hydra-4.7.ebuild:
+  Version bump for bug 95955; updated libssh dep to 0.11 as this new release
+  requires it.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> hydra-4.4.ebuild:
+  Stable on ppc.
+
+  05 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> hydra-4.3.ebuild,
+  hydra-4.4.ebuild, hydra-4.6.ebuild:
+  Won't build with libssh-0.11 so depend on 0.1 until we get this fixed.
+
+*hydra-4.6 (22 Feb 2005)
+
+  22 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +hydra-4.6.ebuild:
+  Version bump for bug 82879.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> hydra-4.4.ebuild:
+  Marked stable on x86.
+
+*hydra-4.4 (18 Dec 2004)
+
+  18 Dec 2004; Eldad Zack <eldad@gentoo.org> +hydra-4.4.ebuild:
+  Version bump.
+
+*hydra-4.3 (25 Sep 2004)
+
+  25 Sep 2004; Mike Frysinger <vapier@gentoo.org> +hydra-4.3.ebuild:
+  Version bump #64451 by Daniel Webert.
+
+*hydra-4.2 (17 Aug 2004)
+
+  17 Aug 2004; Jon Hood <squinky86@gentoo.org> +files/make_xhydra.sh,
+  +hydra-4.2.ebuild:
+  Version bump, closes #60646.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> hydra-4.1.ebuild:
+  Added to ~ppc.
+
+*hydra-4.1 (21 Jun 2004)
+
+  21 Jun 2004; Mike Frysinger <vapier@gentoo.org> -hydra-3.0.ebuild,
+  -hydra-3.1.ebuild, +hydra-4.1.ebuild:
+  Version bump #53319 by Daniel Webert.
+
+*hydra-4.0 (17 May 2004)
+
+  17 May 2004; Mike Frysinger <vapier@gentoo.org> +hydra-4.0.ebuild:
+  Version bump #49769 by Daniel Webert.
+
+*hydra-3.1 (12 Mar 2004)
+
+  12 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #43751 by Daniel Fullmer.
 
 *hydra-3.0 (13 Feb 2004)
 
diff --git a/net-analyzer/hydra/Manifest b/net-analyzer/hydra/Manifest
index 985419762788..ec32a0515b8c 100644
--- a/net-analyzer/hydra/Manifest
+++ b/net-analyzer/hydra/Manifest
@@ -1,3 +1,10 @@
-MD5 0e95402502006d082e18fe3a50a2512f files/digest-hydra-3.0 60
-MD5 9ef9e4ae42f14aabdb92f06a179b8b95 ChangeLog 358
-MD5 de2bfe48b5a4808dd40b9fdf23aea79f hydra-3.0.ebuild 877
+MD5 6f96fb21113bb90cb53ddecd0fcf2301 ChangeLog 2107
+MD5 bdfc31a37a68986dbe9ba554a4c3d49d hydra-4.3.ebuild 1395
+MD5 0853272892387e7f639a5985d000f7a7 hydra-4.4.ebuild 1394
+MD5 8c43a030f5496913d946ba6139c39205 hydra-4.6.ebuild 1389
+MD5 12042acceeca7f7892a2e9ca66c9ba2d hydra-4.7.ebuild 1395
+MD5 9aa8f98344bb5026af633d7a5d3923cd metadata.xml 227
+MD5 58c771c7306f6836af960f9bd61bc562 files/digest-hydra-4.3 65
+MD5 c03f67e03151a05247574982a5ee590c files/digest-hydra-4.4 65
+MD5 90bd01ab81a3f2ec1e36d85b026511b3 files/digest-hydra-4.6 65
+MD5 9830e2e995d05b91254be642e7c983c5 files/digest-hydra-4.7 65
diff --git a/net-analyzer/hydra/hydra-4.3.ebuild b/net-analyzer/hydra/hydra-4.3.ebuild
index 14c98689ca56..335582cdfe7d 100644
--- a/net-analyzer/hydra/hydra-4.3.ebuild
+++ b/net-analyzer/hydra/hydra-4.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/net-analyzer/hydra/hydra-4.3.ebuild,v 1.1 2004/09/25 04:22:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 DESCRIPTION="Advanced parallized login hacker"
 HOMEPAGE="http://www.thc.org/"
@@ -14,7 +14,7 @@ IUSE="gtk ssl"
 DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
 	ssl? (
 		dev-libs/openssl
-		net-libs/libssh
+		=net-libs/libssh-0.1
 	)"
 
 S=${WORKDIR}/${P}-src
diff --git a/net-analyzer/hydra/hydra-4.4.ebuild b/net-analyzer/hydra/hydra-4.4.ebuild
index beb9dd7ba1ad..5b11ab8f4abb 100644
--- a/net-analyzer/hydra/hydra-4.4.ebuild
+++ b/net-analyzer/hydra/hydra-4.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/net-analyzer/hydra/hydra-4.4.ebuild,v 1.1 2004/12/18 13:34:14 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.4.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 DESCRIPTION="Advanced parallized login hacker"
 HOMEPAGE="http://www.thc.org/"
@@ -8,13 +8,13 @@ SRC_URI="http://www.thc.org/releases/${P}-src.tar.gz"
 
 LICENSE="HYDRA GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="ppc x86"
 IUSE="gtk ssl"
 
 DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
 	ssl? (
 		dev-libs/openssl
-		net-libs/libssh
+		=net-libs/libssh-0.1
 	)"
 
 S=${WORKDIR}/${P}-src
diff --git a/net-analyzer/hydra/hydra-4.6.ebuild b/net-analyzer/hydra/hydra-4.6.ebuild
index 06c0c6efd68b..8aef84f849dc 100644
--- a/net-analyzer/hydra/hydra-4.6.ebuild
+++ b/net-analyzer/hydra/hydra-4.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/net-analyzer/hydra/hydra-4.6.ebuild,v 1.1 2005/02/22 10:58:20 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.6.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 DESCRIPTION="Advanced parallized login hacker"
 HOMEPAGE="http://www.thc.org/thc-hydra/"
@@ -14,7 +14,7 @@ IUSE="gtk ssl"
 DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
 	ssl? (
 		dev-libs/openssl
-		net-libs/libssh
+		=net-libs/libssh-0.1
 	)"
 
 S=${WORKDIR}/${P}-src
diff --git a/net-analyzer/hydra/hydra-4.7.ebuild b/net-analyzer/hydra/hydra-4.7.ebuild
index 62a999cb15ba..0f7b53d6b36d 100644
--- a/net-analyzer/hydra/hydra-4.7.ebuild
+++ b/net-analyzer/hydra/hydra-4.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/net-analyzer/hydra/hydra-4.7.ebuild,v 1.1 2005/06/14 14:12:32 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hydra/hydra-4.7.ebuild,v 1.1.1.1 2005/11/30 10:12:47 chriswhite Exp $
 
 DESCRIPTION="Advanced parallized login hacker"
 HOMEPAGE="http://www.thc.org/thc-hydra/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.thc.org/releases/${P}-src.tar.gz"
 
 LICENSE="HYDRA GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk ssl"
 
 DEPEND="gtk? ( >=x11-libs/gtk+-1.2 )
diff --git a/net-analyzer/hyperic-hq-agent/ChangeLog b/net-analyzer/hyperic-hq-agent/ChangeLog
index 09d537f8869a..2d6219725ed4 100644
--- a/net-analyzer/hyperic-hq-agent/ChangeLog
+++ b/net-analyzer/hyperic-hq-agent/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for net-analyzer/hyperic-hq-agent
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hyperic-hq-agent/ChangeLog,v 1.1 2005/01/12 22:00:19 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hyperic-hq-agent/ChangeLog,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
+
+  01 Nov 2005; Matthew Marlowe <mattm@gentoo.org>
+  -files/hyperic-hq-agent.init-2.0.31, -files/hyperic-hq-agent.init-2.0.53,
+  -hyperic-hq-agent-2.0.31.ebuild, -hyperic-hq-agent-2.0.53.ebuild,
+  hyperic-hq-agent-2.1.30.ebuild:
+  mark 2.1.30 stable, remove obsolete releases (2.0.x).
+
+  15 Sep 2005; Matthew Marlowe <mattm@gentoo.org>
+  hyperic-hq-agent-2.1.30.ebuild:
+  Fixed mistaken download url provided by upstream.
+
+*hyperic-hq-agent-2.1.30 (09 Sep 2005)
+
+  09 Sep 2005; Matthew Marlowe <mattm@gentoo.org>
+  +files/hyperic-hq-agent.init-2.1.30, +hyperic-hq-agent-2.1.30.ebuild:
+  New upstream version.  Adds support for cisco router
+  monitoring and fixes various bugs.
+
+  30 Jun 2005; Matthew Marlowe <mattm@gentoo.org>
+  hyperic-hq-agent-2.1.20.ebuild:
+  Make 2.1.20 the new stable branch for x86 and amd64.
+
+*hyperic-hq-agent-2.1.20 (20 Jun 2005)
+
+  20 Jun 2005; Matthew Marlowe <mattm@gentoo.org>
+  +files/hyperic-hq-agent.init-2.1.20, +hyperic-hq-agent-2.1.20.ebuild:
+  Major new upstream version of server.
+  Old agents are no longer compatible.
+
+  18 May 2005; Matthew Marlowe <mattm@gentoo.org>
+  files/hyperic-hq-agent.init-2.0.53:
+  slight fix to init script to fix agent stop bug
+
+*hyperic-hq-agent-2.0.53 (18 May 2005)
+
+  18 May 2005; Matthew Marlowe <mattm@gentoo.org>
+  +files/hyperic-hq-agent.init-2.0.53, +hyperic-hq-agent-2.0.53.ebuild:
+  upstream version bump,updated init file to properly switch users,added amd64
+  arch
+
+*hyperic-hq-agent-2.0.31 (14 Feb 2005)
+
+  14 Feb 2005; Matthew Marlowe <mattm@gentoo.org>
+  +files/hyperic-hq-agent.init-2.0.31, +hyperic-hq-agent-2.0.31.ebuild:
+  new upstream version fixes several bugs
 
   12 Jan 2005; Matthew Marlowe <mattm@gentoo.org> :
   Initial commit of hyperic-hq-agent using latest upstream version.
diff --git a/net-analyzer/hyperic-hq-agent/Manifest b/net-analyzer/hyperic-hq-agent/Manifest
index 51fbb1bef7cf..79bf9a147a12 100644
--- a/net-analyzer/hyperic-hq-agent/Manifest
+++ b/net-analyzer/hyperic-hq-agent/Manifest
@@ -1,5 +1,8 @@
-MD5 d2bd4fd1d638b3070658aed16b49f8b6 hyperic-hq-agent-2.0.22.ebuild 1350
+MD5 1ba80b3c131294cf37a6411920d5f4d7 ChangeLog 2003
+MD5 0c2dbe9d74fdfa74a42d2c96ef530d69 hyperic-hq-agent-2.1.20.ebuild 1433
 MD5 eddcfeabec90c590787504b96256b98a metadata.xml 475
-MD5 953728447911a5eda65f1965b6af0c87 ChangeLog 251
-MD5 88d8935e0b43d887b7f974d1acae0fcb files/hyperic-hq-agent.init-2.0.22 267
-MD5 b46aa04c4986f8d6c67c8eaab3771796 files/digest-hyperic-hq-agent-2.0.22 74
+MD5 7030b9ebbe756e02468ee370eefc5f8a hyperic-hq-agent-2.1.30.ebuild 1390
+MD5 a4787c9f8776138e109b4a4c59449f1f files/digest-hyperic-hq-agent-2.1.20 170
+MD5 ba765bbf467ce7c13508be7c15e56e15 files/hyperic-hq-agent.init-2.1.20 348
+MD5 91c27a181eb4abb096e19ab78d2e317f files/hyperic-hq-agent.init-2.1.30 348
+MD5 ce71d392ac9834394255eea0c2249d4f files/digest-hyperic-hq-agent-2.1.30 170
diff --git a/net-analyzer/hyperic-hq-agent/files/digest-hyperic-hq-agent-2.1.30 b/net-analyzer/hyperic-hq-agent/files/digest-hyperic-hq-agent-2.1.30
index d7caa98c29ca..441a83464c94 100644
--- a/net-analyzer/hyperic-hq-agent/files/digest-hyperic-hq-agent-2.1.30
+++ b/net-analyzer/hyperic-hq-agent/files/digest-hyperic-hq-agent-2.1.30
@@ -1,2 +1,2 @@
-MD5 8c9ec92e93df879d21277f0176b7f11b hyperic-hq-installer-2.1.30-x86-linux.tgz 98061885
-MD5 39061606bf30f6026245e4fc2bdf0def hyperic-hq-installer-2.1.30-amd64-linux.tgz 98210006
+MD5 90f20d807124b8b99bc426da617f0a8b hyperic-hq-agent-2.1.30-x86-linux.tgz 46424602
+MD5 93613bdef88b8513d0b34e5e8f874a6c hyperic-hq-agent-2.1.30-amd64-linux.tgz 50062613
diff --git a/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.20.ebuild b/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.20.ebuild
index 7af65e0161f3..5f0d4b66682c 100644
--- a/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.20.ebuild
+++ b/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.20.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/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.20.ebuild,v 1.1 2005/06/20 21:43:15 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.20.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="x86? ( http://download.hyperic.net/downloads/ebuilds/hyperic-hq-agent-$
 
 LICENSE="hyperic"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 AGENT_HOME=/opt/hyperic-hq-agent-${PV}
@@ -34,7 +34,7 @@ pkg_postinst() {
 	chown -R hyperic:hyperic ${AGENT_HOME}
 
 	einfo "You should perform the following before attempting to start the agent:"
-	einfo ""
+	einfo
 	einfo "1) read and agree to the _commercial license_ at /usr/portage/licenses/hyperic"
 	einfo "2) ensure that your server has a license key permitting an additional agent install."
 	einfo "3) have your server ip, admin username, and admin password available"
diff --git a/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.30.ebuild b/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.30.ebuild
index fa2f2071c072..81e97723f0bd 100644
--- a/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.30.ebuild
+++ b/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.30.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.30.ebuild,v 1.1 2005/09/09 09:11:35 mattm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hyperic-hq-agent/hyperic-hq-agent-2.1.30.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Agent for HQ Monitoring Software by Hyperic LLC"
 HOMEPAGE="http://www.hyperic.com/"
 SRC_URI="x86? (
-http://dl.hyperic.net/2.1/hyperic-hq-installer-${PV}-x86-linux.tgz ) amd64? (
-http://dl.hyperic.net/2.1/hyperic-hq-installer-${PV}-amd64-linux.tgz )"
+http://dl.hyperic.net/2.1/hyperic-hq-agent-${PV}-x86-linux.tgz ) amd64? (
+http://dl.hyperic.net/2.1/hyperic-hq-agent-${PV}-amd64-linux.tgz )"
 
 LICENSE="hyperic"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 amd64"
 IUSE=""
 
 AGENT_HOME=/opt/hyperic-hq-agent-${PV}
diff --git a/net-analyzer/ibmonitor/ChangeLog b/net-analyzer/ibmonitor/ChangeLog
index b5697303ae95..a52ceeec8c9a 100644
--- a/net-analyzer/ibmonitor/ChangeLog
+++ b/net-analyzer/ibmonitor/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-analyzer/ibmonitor
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ibmonitor/ChangeLog,v 1.1 2004/06/30 23:32:52 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ibmonitor/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -ibmonitor-1.2.ebuild:
+  Remove old ebuild.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ibmonitor-1.3.ebuild:
+  Marked stable on x86.
+
+*ibmonitor-1.3 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> +ibmonitor-1.3.ebuild:
+  Version bump as per bug #75189 by Vanquirius <marcelogoes@gmail.com>
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> ibmonitor-1.2.ebuild:
+  x86 stable
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> ibmonitor-1.2.ebuild:
+  Typo in DESCRIPTION: bandiwidth -> bandwidth. Bug 59717.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> ibmonitor-1.2.ebuild:
+  tidy
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> ibmonitor-1.2.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> ibmonitor-1.2.ebuild:
+  Cleanup, added a dummy src_compile.
 
 *ibmonitor-1.2 (01 Jul 2004)
 
diff --git a/net-analyzer/ibmonitor/Manifest b/net-analyzer/ibmonitor/Manifest
index 267f378cd20e..7ecc0a364711 100644
--- a/net-analyzer/ibmonitor/Manifest
+++ b/net-analyzer/ibmonitor/Manifest
@@ -1,2 +1,4 @@
-MD5 a2f2ba193b70bfcc27f7ebd435ab601a ibmonitor-1.2.ebuild 582
-MD5 fb3fa1c176facc0f3e4043934da01e35 files/digest-ibmonitor-1.2 64
+MD5 4f264aaa506baf7b4618cf1ec5b7ce97 ibmonitor-1.3.ebuild 623
+MD5 bddbce7faff18d43a4f52e932c4c0045 ChangeLog 1255
+MD5 6a7e4840daad04c507882a3eb886a299 metadata.xml 225
+MD5 ab14a077f2dacfaf58b0fb03a0472d0e files/digest-ibmonitor-1.3 64
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild
index 2152c139833a..7e30793ba93a 100644
--- a/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild
+++ b/net-analyzer/ibmonitor/ibmonitor-1.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/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild,v 1.1 2005/01/09 06:46:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ibmonitor/ibmonitor-1.3.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 DESCRIPTION="Interactive bandwidth monitor"
 HOMEPAGE="http://ibmonitor.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 LICENSE="GPL-2"
diff --git a/net-analyzer/ifmetric/ChangeLog b/net-analyzer/ifmetric/ChangeLog
index f60d5dd74c8a..d8e5e2fbb590 100644
--- a/net-analyzer/ifmetric/ChangeLog
+++ b/net-analyzer/ifmetric/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/ifmetric
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifmetric/ChangeLog,v 1.1 2005/04/27 12:06:14 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifmetric/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  11 Sep 2005; Luis Medinas <metalgod@gentoo.org> ifmetric-0.3.ebuild:
+  Added ~amd64 keyword.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ifmetric-0.3.ebuild:
+  Added to ~ppc.
+
+  09 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> ifmetric-0.3.ebuild:
+  Stable on x86.
 
 *ifmetric-0.3 (27 Apr 2005)
 
diff --git a/net-analyzer/ifmetric/Manifest b/net-analyzer/ifmetric/Manifest
index 78ca74ab7eb1..39ea19955474 100644
--- a/net-analyzer/ifmetric/Manifest
+++ b/net-analyzer/ifmetric/Manifest
@@ -1,4 +1,14 @@
-MD5 556ce78a0e93a5c5ebf473ea712718be ChangeLog 272
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6b2219a5257346cb70c64057f0cdc8cc ChangeLog 635
+MD5 e70b76e9f62653d4007597b1a2957d75 ifmetric-0.3.ebuild 917
 MD5 b12305fb89f104c432d327c2ed02eae0 metadata.xml 253
-MD5 8ec31a961863f5febe088e52fa3f5283 ifmetric-0.3.ebuild 801
 MD5 7dcb64bff9131b23f743136cf12017b0 files/digest-ifmetric-0.3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDJMODwUpWvClEHQoRAq7rAJ9DxV+Xv3tTnvY/Uv3F5U3MRpgX1gCfQrji
+jnPHqVc5z8ZeKt9hQdj1d1Y=
+=TwMx
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ifmetric/ifmetric-0.3.ebuild b/net-analyzer/ifmetric/ifmetric-0.3.ebuild
index f3e1f931cf3f..1f11400e7c5c 100644
--- a/net-analyzer/ifmetric/ifmetric-0.3.ebuild
+++ b/net-analyzer/ifmetric/ifmetric-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/net-analyzer/ifmetric/ifmetric-0.3.ebuild,v 1.1 2005/04/27 12:06:14 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifmetric/ifmetric-0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 DESCRIPTION="A Linux tool for setting the metrics of all IPv4 routes attached to a given network interface at once."
 HOMEPAGE="http://0pointer.de/lennart/projects/ifmetric/"
@@ -8,7 +8,7 @@ SRC_URI="http://0pointer.de/lennart/projects/ifmetric/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 # NOTE: this app is linux-only, virtual/os-headers therefore is incorrect
diff --git a/net-analyzer/ifstat/ChangeLog b/net-analyzer/ifstat/ChangeLog
index 80f983056055..d4c1162bf3d0 100644
--- a/net-analyzer/ifstat/ChangeLog
+++ b/net-analyzer/ifstat/ChangeLog
@@ -1,10 +1,54 @@
 # ChangeLog for net-analyzer/ifstat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ChangeLog,v 1.1 2003/10/10 18:02:32 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+  29 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> -ifstat-1.0.ebuild,
+  ifstat-1.1.ebuild:
+  Cleanup and ppc stable
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> ifstat-1.1.ebuild:
+  Keyworded ~ppc
+
+  16 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> ifstat-1.1.ebuild:
+  Stable on amd64 and ppc64
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> ifstat-1.1.ebuild:
+  Marked stable on hppa.
+
+  31 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> ifstat-1.1.ebuild:
+  Keyworded ~amd64 & ~ppc64
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> ifstat-1.1.ebuild:
+  Sparc stable
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> ifstat-1.1.ebuild:
+  x86 stable
+
+  30 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> ifstat-1.1.ebuild:
+  Keyworded ~x86
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ifstat-1.0.ebuild,
+  ifstat-1.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+*ifstat-1.1 (22 Jun 2004)
+
+  22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> +ifstat-1.1.ebuild:
+  Revision bump
+
+  22 Jun 2004; Gustavo Zacarias <gustavoz@gentoo.org> metadata.xml,
+  ifstat-1.0.ebuild:
+  metadata herd fix, keyworded ~ppc and ~amd64
+
+  19 Jan 2004; <gustavoz@gentoo.org> ifstat-1.0.ebuild:
+  marked stable on x86 and sparc, added metadata
 
 *ifstat-1.0 (11 Oct 2003)
 
+  11 Nov 2003; Guy Martin <gmsoft@gentoo.org> ifstat-1.0.ebuild :
+  Marked stable on hppa.
+
   11 Oct 2003; Martin Holzer <mholzer@gentoo.org> ifstat-1.0.ebuild:
-  Inital ebuild. Submitted byGustavo Zacarias <gustavo@zacarias.com.ar> in
+  Inital ebuild. Submitted by Gustavo Zacarias <gustavo@zacarias.com.ar> in
   #26070.
 
diff --git a/net-analyzer/ifstat/Manifest b/net-analyzer/ifstat/Manifest
index 5b24e40bdc19..dfe64769b937 100644
--- a/net-analyzer/ifstat/Manifest
+++ b/net-analyzer/ifstat/Manifest
@@ -1,2 +1,14 @@
-MD5 f30f7efeb67ab8f0700c91686c109174 ifstat-1.0.ebuild 555
-MD5 e017f0ba646dda4a948483bbb0ab56eb files/digest-ifstat-1.0 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b0e57b342683aaf5892ae1adf6785ff ChangeLog 1742
+MD5 f0a9c192b67f67de43a0632a3b4ffe44 metadata.xml 431
+MD5 593133764fb6028cfc3355a2e8eeb77a ifstat-1.1.ebuild 688
+MD5 920405b5079fac9a9d124de3a4aa3a06 files/digest-ifstat-1.1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCcsM/KRy60XGEcJIRAsUnAJ9T0s67S2/3upoN3aY0vwRiPbZUmgCeLsPK
+Ib8LVl9hNxpdYLXcp6N3OYw=
+=DAO1
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ifstat/ifstat-1.1.ebuild b/net-analyzer/ifstat/ifstat-1.1.ebuild
index ba581bcca96e..05ef04c9e801 100644
--- a/net-analyzer/ifstat/ifstat-1.1.ebuild
+++ b/net-analyzer/ifstat/ifstat-1.1.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/net-analyzer/ifstat/ifstat-1.1.ebuild,v 1.1 2004/06/23 02:41:06 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ifstat/ifstat-1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
 
 IUSE="snmp"
 
@@ -10,9 +10,9 @@ HOMEPAGE="http://gael.roualland.free.fr/ifstat/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~sparc"
+KEYWORDS="sparc x86 amd64 ppc64 hppa ppc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	snmp? ( >=net-analyzer/net-snmp-5.0 )"
 
 src_compile() {
diff --git a/net-analyzer/ifstat/metadata.xml b/net-analyzer/ifstat/metadata.xml
index 1efa3b479a9a..fa8dd6f98678 100644
--- a/net-analyzer/ifstat/metadata.xml
+++ b/net-analyzer/ifstat/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>netmon</herd>
 <maintainer>
   <email>gustavoz@gentoo.org</email>
   <name>Gustavo Zacarias</name>
diff --git a/net-analyzer/iftop/ChangeLog b/net-analyzer/iftop/ChangeLog
index c25c79cbebb0..a28d6ce7bd8a 100644
--- a/net-analyzer/iftop/ChangeLog
+++ b/net-analyzer/iftop/ChangeLog
@@ -1,6 +1,96 @@
 # ChangeLog for net-analyzer/iftop
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.1 2002/11/04 13:32:45 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/ChangeLog,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> iftop-0.16.ebuild:
+  Mark 0.16 stable on alpha
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> iftop-0.16.ebuild:
+  stable on ia64
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> iftop-0.16.ebuild:
+  Added to ~ppc.
+
+  09 Jul 2005; Tom Martin <slarti@gentoo.org> iftop-0.16.ebuild:
+  Marked ~ia64.
+
+  24 May 2005; Fernando J. Pereda <ferdy@gentoo.org> iftop-0.16.ebuild:
+  marked ~alpha wrt #93741
+
+  28 Feb 2005; Konstantin Arkhipov <voxus@gentoo.org> iftop-0.16.ebuild:
+  Stable on amd64.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> iftop-0.16.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> iftop-0.16.ebuild:
+  Stable on sparc.
+
+  16 Oct 2004; Eldad Zack <eldad@gentoo.org> iftop-0.16.ebuild:
+  fixed configure to recognise i386-pc-linux-uclibc in a uclibc env, as
+  suggested by koon@gentoo.org (closes #67660)
+
+  10 Sep 2004; <blubb@gentoo.org> iftop-0.16.ebuild:
+  added ~amd64 keyword
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> iftop-0.15.ebuild,
+  iftop-0.16.ebuild:
+  marked x86 stable
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> iftop-0.16.ebuild:
+  Added ~sparc keyword.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> iftop-0.11.ebuild,
+  iftop-0.12.ebuild, iftop-0.13.ebuild, iftop-0.14.ebuild:
+  QA: Unnecessary definition of S removed.
+
+*iftop-0.16 (09 Mar 2004)
+
+  09 Mar 2004; Michael Boman <mboman@gentoo.org> iftop-0.16.ebuild,
+  metadata.xml:
+  New upstream version, closing bug 43288. I also assigned it to the netmon herd
+  for the time being.
+
+*iftop-0.15 (13 Nov 2003)
+
+  13 Nov 2003; Chuck Short <zul@gentoo.org> iftop-0.14.ebuild,
+  iftop-0.15.ebuild, files/iftoprc:
+  New version, marked 0.14 stable. 
+  Ebuild contributed by Torben Janssen <torben@teejot.net>.
+
+*iftop-0.14 (24 Sep 2003)
+
+  24 Sep 2003; Chuck Short <zul@gentoo.org> :
+  Version bump, closes bug #28057.
+
+*iftop-0.13 (03 Sep 2003)
+
+  03 Sep 2003; Chuck Short <zul@gentoo.org> iftop-0.13.ebuild:
+  Version bump, thanks to Torben Janssen <torben@teejot.net>.
+  Closes bug #27684.
+
+*iftop-0.12 (22 May 2003)
+
+  22 May 2003; Martin Holzer <mholzer@gentoo.org> iftop-0.12.ebuild:
+  Version bumped. Ebuild submitted by Torben Janssen <torben@teejot.net> in
+  #21497
+
+*iftop-0.11 (13 Feb 2003)
+
+  22 May 2003; Martin Holzer <mholzer@gentoo.org> iftop-0.11.ebuild:
+  Marked as stable.
+
+  13 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> iftop-0.11.ebuild :
+  Version bump. Found by Torben Janssen <torben@teejot.net> in #13514.
+  Deleted 0.11.2 ebuild since it was a pre version but wasn't named that way.
+
+*iftop-0.11.2 (04 Jan 2003)
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> iftop-0.11.2.ebuild :
+  Version bump. Found by Torben Janssen <torben@teejot.net> in #11808.
+  
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> iftop-0.10.ebuild :
+  Unmasked
 
 *iftop-0.10 (04 Nov 2002)
 
diff --git a/net-analyzer/iftop/Manifest b/net-analyzer/iftop/Manifest
index 217ddc9ce077..5de875e7eeac 100644
--- a/net-analyzer/iftop/Manifest
+++ b/net-analyzer/iftop/Manifest
@@ -1,7 +1,5 @@
-MD5 23994dc5966dd2daad1337e5378e606b ChangeLog 876
-MD5 7a77cbf6e09cc0d500f3f79be8d77913 iftop-0.10.ebuild 757
-MD5 f1fc8a7bb51f9516e042cf7c9c0fb61d iftop-0.11.ebuild 637
-MD5 27b05b31aefa27df717869bb2cf6c306 iftop-0.12.ebuild 682
-MD5 e8aac029782f05c2d63a41d0f2d7f165 files/digest-iftop-0.10 61
-MD5 2eeabc736f57ec2c18f114ae2d96127a files/digest-iftop-0.11 61
-MD5 c760d86756f23c96fdc594ee4b27ccfb files/digest-iftop-0.12 62
+MD5 e9cd01f31fc31ef1849ad5b87358345a metadata.xml 218
+MD5 76cb1fae21592cbfe7c430c2907c4909 ChangeLog 3245
+MD5 d51fcbaff757ab3ebeb598242a21b404 iftop-0.16.ebuild 639
+MD5 c9d0a2ec49378a93c55b607f8bb88f91 files/iftoprc 1391
+MD5 a36766a23959cee0651fcf16d2eecb8c files/digest-iftop-0.16 62
diff --git a/net-analyzer/iftop/iftop-0.16.ebuild b/net-analyzer/iftop/iftop-0.16.ebuild
index 9521a4e37378..5b76f9ff43e8 100644
--- a/net-analyzer/iftop/iftop-0.16.ebuild
+++ b/net-analyzer/iftop/iftop-0.16.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/net-analyzer/iftop/iftop-0.16.ebuild,v 1.1 2004/03/09 06:07:15 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iftop/iftop-0.16.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 IUSE=""
 
@@ -10,26 +10,17 @@ HOMEPAGE="http://www.ex-parrot.com/~pdw/iftop/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="alpha amd64 ia64 ~ppc sparc x86"
 
 DEPEND="sys-libs/ncurses
-		net-libs/libpcap"
-
-
-src_compile() {
-	local myconf
-	myconf="--prefix=/usr"
-	econf ${myconf} || die
-	emake
-}
+		virtual/libpcap"
 
 src_install() {
 	dosbin iftop
 	doman iftop.8
 
 	insinto /etc
-	doins ${FILESDIR}/iftoprc
+	doins "${FILESDIR}"/iftoprc
 
 	dodoc COPYING ChangeLog README
 }
-
diff --git a/net-analyzer/iftop/metadata.xml b/net-analyzer/iftop/metadata.xml
index d66bb0cd26df..29c4321defbc 100644
--- a/net-analyzer/iftop/metadata.xml
+++ b/net-analyzer/iftop/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>netmon</herd>
 <maintainer>
   <email>zul@gentoo.org</email>
 </maintainer>
diff --git a/net-analyzer/ike-scan/ChangeLog b/net-analyzer/ike-scan/ChangeLog
index c542556a7249..c8dc2bc2e487 100644
--- a/net-analyzer/ike-scan/ChangeLog
+++ b/net-analyzer/ike-scan/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/ike-scan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ike-scan/ChangeLog,v 1.1 2005/06/24 08:28:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ike-scan/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  25 Jun 2005; David Holm <dholm@gentoo.org> ike-scan-1.7.ebuild:
+  Added to ~ppc.
 
 *ike-scan-1.7 (24 Jun 2005)
 
diff --git a/net-analyzer/ike-scan/Manifest b/net-analyzer/ike-scan/Manifest
index 4a555035fe88..953c83ee64ea 100644
--- a/net-analyzer/ike-scan/Manifest
+++ b/net-analyzer/ike-scan/Manifest
@@ -1,2 +1,14 @@
-MD5 2cbe210d67e57f8a83f052e151a75f30 ike-scan-1.7.ebuild 626
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 88db285ca97cdce683586547e79a2ce9 ChangeLog 477
 MD5 d0369ba8fcfae20c7c0a14f95dbeeb7d files/digest-ike-scan-1.7 65
+MD5 31c89eeb079083b1f1ef80f8038eeec5 ike-scan-1.7.ebuild 740
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCvV0UI1lqEGTUzyQRAkP3AJsH9A7WBd0DgjatqgF3iWaEziQkTQCgwor/
+mqV9TZK+mfUol9XatrJeMnk=
+=+cby
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ike-scan/ike-scan-1.7.ebuild b/net-analyzer/ike-scan/ike-scan-1.7.ebuild
index 514d416e95e7..d1653e74d778 100644
--- a/net-analyzer/ike-scan/ike-scan-1.7.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.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/net-analyzer/ike-scan/ike-scan-1.7.ebuild,v 1.1 2005/06/24 08:28:16 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ike-scan/ike-scan-1.7.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 DESCRIPTION="A utility for finding, fingerprinting and testing IKE VPN servers"
 HOMEPAGE="http://www.nta-monitor.com/ike-scan/"
@@ -8,11 +8,11 @@ SRC_URI="http://www.nta-monitor.com/ike-scan/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="ssl"
 
 DEPEND="virtual/libc
-	ssl? dev-libs/openssl"
+	ssl? ( dev-libs/openssl )"
 
 src_compile() {
 	econf $(use_with ssl openssl) || die
diff --git a/net-analyzer/ipac-ng/ChangeLog b/net-analyzer/ipac-ng/ChangeLog
index 554bfbbec8c2..54e1389b414f 100644
--- a/net-analyzer/ipac-ng/ChangeLog
+++ b/net-analyzer/ipac-ng/ChangeLog
@@ -1,6 +1,86 @@
-# ChangeLog for net-analyzers/ipac-ng
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.1 2003/09/29 02:16:00 vapier Exp $
+# ChangeLog for net-analyzer/ipac-ng
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ChangeLog,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
+
+  01 Oct 2005; Simon Stelling <blubb@gentoo.org> ipac-ng-1.31-r1.ebuild:
+  added ~amd64 keyword
+
+  07 Sep 2005; Benjamin Smee <strerror@gentoo.org> ipac-ng-1.31-r1.ebuild:
+  Fixed typo relating to cron
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org> ipac-ng-1.31.ebuild:
+  removed die from epatch || die.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ipac-ng-1.31-r1.ebuild:
+  Added to ~ppc.
+
+*ipac-ng-1.31-r1 (11 Mar 2005)
+
+  11 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +ipac-ng-1.31-r1.ebuild:
+  Revision bump; added postgres support via USE=postgres for bug 84797. Thanks
+  to Wolfgang Frisch for the updated ebuild.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ipac-ng-1.31.ebuild:
+  Marked stable on x86.
+
+*ipac-ng-1.31 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> -files/ipac-ng.cron,
+  -files/ipac-ng.cron.1.27_p1-r2, -files/ipac-ng.rc,
+  -files/ipac-ng.rc.1.27_p1-r2, -files/ipac.conf, -files/ipac.conf.1.27_p1-r2,
+  -files/rules.conf, -files/rules.conf.1.27_p1-r2, -ipac-ng-1.27_p1-r1.ebuild,
+  -ipac-ng-1.27_p1-r2.ebuild, +ipac-ng-1.31.ebuild, +
+  /files/ipac-ng-1.31-iptables.patch:
+  Old version cleanout and version bump as per bug #75190. Thanks to Vanquirius
+  <marcelogoes@gmail.com> for the bug report.
+
+  12 Oct 2004; Eldad Zack <eldad@gentoo.org> files/rules.conf.1.30,
+  ipac-ng-1.30.ebuild:
+  Provided config files fix. Closes #67065. Thanks to Oliver Noekel
+  <gentoobugzilla@noekel.com>.
+
+  24 Aug 2004; Eldad Zack <eldad@gentoo.org> ipac-ng-1.30.ebuild:
+  x86 stable
+
+  05 Aug 2004; Anders Rune Jensen <arj@gentoo.org> ipac-ng-1.30.ebuild:
+  Depend on version 2 of sqlite.
+	
+  27 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/ipac-ng.cron.1.30,
+  files/ipac-ng.rc.1.27_p1-r2, +files/ipac-ng.rc.1.30, +files/ipac.conf.1.30,
+  +files/rules.conf.1.30, ipac-ng-1.30.ebuild:
+  Fixed missing files in install. Closes #58437.
+
+*ipac-ng-1.30 (25 Jul 2004)
+
+  25 Jul 2004; Eldad Zack <eldad@gentoo.org> +ipac-ng-1.30.ebuild:
+  Version bump. Added sqlite support. Closes #54069.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> ipac-ng-1.27_p1-r2.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ipac-ng-1.27_p1-r1.ebuild,
+  ipac-ng-1.27_p1-r2.ebuild:
+  change virtual/glibc to virtual/libc
+
+*ipac-ng-1.27_p1-r2 (26 Jan 2004)
+
+  28 Feb 2004; Michael Boman <mboman@gentoo.org> ipac-ng-1.27_p1-r2.ebuild,
+  files/ipac-ng.cron.1.27_p1-r2, files/ipac-ng.rc.1.27_p1-r2,
+  files/ipac.conf.1.27_p1-r2, files/rules.conf.1.27_p1-r2:
+  Commited updated ebuild submitted by Philipp Lopaur
+  <fips@fips.at>. Closes 43006.
+
+  26 Jan 2004; Philipp Lopaur <fips@fips.at> :
+  Noticed that the default config files are not working with
+  ipac-ng-1.27_p1. Made new ipac.conf and rules.conf.
+  Updated /etc/init.d/ipac-ng for new iptables table names.
+  Updated the ebuild. Tested with vanilla 2.6.3 kernel.
+
+*ipac-ng-1.27_p1-r1 (03 Nov 2003)
+
+  03 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Install default ipac.conf and rules.conf to fix segfaults for people
+  who didnt setup their config files #30937.
 
 *ipac-ng-1.27_p1 (28 Sep 2002)
 
diff --git a/net-analyzer/ipac-ng/Manifest b/net-analyzer/ipac-ng/Manifest
index e4fdc9293102..f54ff31e1cc1 100644
--- a/net-analyzer/ipac-ng/Manifest
+++ b/net-analyzer/ipac-ng/Manifest
@@ -1,6 +1,13 @@
-MD5 3259a90e9dce51c57924e5ed590d0527 files/ipac-ng.cron 213
-MD5 53a3011eb11b8ed3051a47561c2d2c37 files/ipac.conf 1801
-MD5 28ecb5c2155adbb6ddb44411c46556c7 files/ipac-ng.rc 843
-MD5 ac210e9fd37f1a10dc14dd5e32df8170 files/digest-ipac-ng-1.27_p1 68
-MD5 c2de4f81b19f5479a357cab32a957c2c ipac-ng-1.27_p1.ebuild 1855
-MD5 e9cab6a10b677b17ccefb91ef163445d ChangeLog 378
+MD5 a66a3b7b0398ab8748473d8526b14416 ChangeLog 3439
+MD5 0440d5d1752a968fc89ee147931e6823 ipac-ng-1.30.ebuild 2443
+MD5 daf7b00d8959920e213edca1042396d3 ipac-ng-1.31-r1.ebuild 2682
+MD5 e5d20765be7eafab113f6e916faad3c3 ipac-ng-1.31.ebuild 2573
+MD5 d21717f5748c9774708f37fd538eca26 metadata.xml 286
+MD5 c6fde5842858e98a063e78223644e191 files/digest-ipac-ng-1.30 65
+MD5 39c34f5fc4e8f1edc81459ec0895f59d files/digest-ipac-ng-1.31 65
+MD5 39c34f5fc4e8f1edc81459ec0895f59d files/digest-ipac-ng-1.31-r1 65
+MD5 b2016c3272e9dd9c2b48238bb07efa3a files/ipac-ng-1.31-iptables.patch 389
+MD5 72162ed7957cc82168b4870d26cf66fe files/ipac-ng.cron.1.30 216
+MD5 983ee78164ba492b7bc558418adb0739 files/ipac-ng.rc.1.30 897
+MD5 aff4fe032f6693f676350c45e7e78261 files/ipac.conf.1.30 1820
+MD5 dba879e7b8ccdcae27d64ceb4ba54f9b files/rules.conf.1.30 1046
diff --git a/net-analyzer/ipac-ng/files/ipac-ng.cron.1.30 b/net-analyzer/ipac-ng/files/ipac-ng.cron.1.30
index da94fbd3782b..ec5cdaa271b5 100644
--- a/net-analyzer/ipac-ng/files/ipac-ng.cron.1.30
+++ b/net-analyzer/ipac-ng/files/ipac-ng.cron.1.30
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.cron.1.30,v 1.1 2004/07/27 08:50:13 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.cron.1.30,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 FI=/usr/sbin/fetchipac
 
diff --git a/net-analyzer/ipac-ng/files/ipac-ng.rc.1.30 b/net-analyzer/ipac-ng/files/ipac-ng.rc.1.30
index 47fdb598304f..3644523fbc07 100644
--- a/net-analyzer/ipac-ng/files/ipac-ng.rc.1.30
+++ b/net-analyzer/ipac-ng/files/ipac-ng.rc.1.30
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.rc.1.30,v 1.1 2004/07/27 08:50:13 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/files/ipac-ng.rc.1.30,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 depend() {
 	need net logger
diff --git a/net-analyzer/ipac-ng/files/ipac.conf.1.30 b/net-analyzer/ipac-ng/files/ipac.conf.1.30
index e7d7c591a7a0..c2bd47e091f8 100644
--- a/net-analyzer/ipac-ng/files/ipac.conf.1.30
+++ b/net-analyzer/ipac-ng/files/ipac.conf.1.30
@@ -1,3 +1,5 @@
+# $Id: ipac.conf.1.30,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
+
 # This is the main ipac-ng configuration file.  It contains the
 # configuration directives that give the ipac-ng its instructions.
 
@@ -5,37 +7,35 @@
 ## please note: you *should* specify YES, unless you are kaiser13 :)
 ## note2: you are trying to use 'ugly flawed experimental dangerous mode' 
 ##                             if you are using 'no', don't set it to no.
-classic mode = yes
 
-## specify access agent. supported are: files, postgre. files works with classic mode only
-# did you specify 'no' above? ok, here should be 'files' for you.
+## specify access agent
+# supported are: 'files', 'postgre'. 'files' works only with classic mode
+# did you specify 'yes' above? Then you should set this here to 'files'.
 access agent = files
 
-## accouting agent. iptables and ipchains available now. 
+## accouting agent
+# supported are: 'iptables', 'ipchains'
 #   (ipchains is not supported in nonclassic mode). does anybody still uses them?
 account agent = iptables
 
-## storage. gdbm, postgre and files supported. (files is not recommended)
+## storage
+# supported are: 'gdbm', 'postgre', 'files' (files is not recommended)
 # postgre is the best & fastest method now.
 storage = gdbm
 
-
 # set the hostname, used to store\fetch\another work with database
 # get from hostname() if not specified here
 hostname = sibinet
 
-
 ## rules file for classic mode
 rules file = /etc/ipac-ng/rules.conf
 
-## login all users at startup (specific only for nonclassic mode) (only those who has enough cash)
-# note: forget about this.
+## login all users at startup (only those who have enough cash)
+# specify *only* in nonclassic mode, otherwise forget about this
 #login at start = no
 
-## support for traffic passing to\from auth host (specific only for nonclassic mode)
-## name or ip of the auth host
-## disable support if not specified,
-# forget about this, too
+## support for traffic passing to\from auth host 
+# specify *only* in nonclassic mode, otherwise forget about this
 #auth host = sibinet.com
 
 # dont store lines contains only zeroes to speedup processing and to save space
diff --git a/net-analyzer/ipac-ng/files/rules.conf.1.30 b/net-analyzer/ipac-ng/files/rules.conf.1.30
index 7c4da7de00ac..6c45c558bd9b 100644
--- a/net-analyzer/ipac-ng/files/rules.conf.1.30
+++ b/net-analyzer/ipac-ng/files/rules.conf.1.30
@@ -2,7 +2,7 @@
 # Install as /etc/ipac-ng/rules.conf.iptables
 #
 # Format:
-# Name of rule|direction|interface|protocol|source|destination
+# Name of rule|direction|interface|protocol|source|destination|extension|
 # WARNING!!!! spaces are not allowed before and after '|'.
 #
 # where
@@ -19,177 +19,14 @@
 # source		\
 # destination		both as described in ipfwadm(8), or empty
 #
-# incoming:
 
-
-###
-###    W A R N I N G ! ! !
-###
-### Don't use symbols other than '0-9A-z[space]' in rules names. You may encounter 
-### some strange troubles.
-
-# lets demonstrate this by following rules.
-# Example 1:
-# there are some hosts in our net 192.168.0.0/24
-# our ipac-ng host has two interfaces - eth0 connected to local net
-#				    and eth1 to internet
-
-
-# lets count all traffic incoming to our net
-
-# forwarded from inet (0/0) to localnet (192.168.0.0/24)
-#incoming all to my net|ipac~fi||all||192.168.0.0/24
-
-# incoming to localnet from ipac-ng host (specify ipac-ng ip's here, to avoid
-#					doubling forwarded traffic when using NAT)
-#incoming all to my net|ipac~i||all|192.168.0.1|192.168.0.0/24
-
-
-# same for outgoing:
-#outgoing all from my net|ipac~fo||all|192.168.0.0/24|
-#outgoing all from my net|ipac~o||all|192.168.0.0/24|192.168.0.1
-
-
-
-# and now we want to know, how much there is traffic to our ipac host from inet
-#incoming inet to ipac host|ipac~o|eth1|all||
-
-# same for outgoing for this host
-#outgoing inet from ipac host|ipac~i|eth1|all||
-
-# please note, that chains 'ipac~i' and 'ipac~o' are reversed for the host with ipac
-
-# wanna count traffic to squid that resides on the host with ipac-ng? here you are :)
-#incoming to squid|ipac~o|eth1|all|0/0 80 81 82 83 8080|
-# sure, this rule is only valid in the case when you don't eat traffic from these ports
-# by hopping on the web from ipac-ng host (maybe you like to use links :)
-
-# our net is using squid heavily, let's count them all together:
-#outgoing from squid to mynet|ipac~i||all|192.168.0.1 squid|192.168.0.0/24
-
-
-# now lets count traffic for hosts mary (192.168.0.12) and fred (192.168.0.13)
-
-# incoming:
-#incoming all to mary|ipac~fi||all||192.168.0.12
-#incoming all to mary|ipac~i||all|192.168.0.1|192.168.0.12
-
-# and outgoing:
-#outgoing all from mary|ipac~fo||all|192.168.0.12|
-#outgoing all from mary|ipac~o||all|192.168.0.12|192.168.0.1
-
-
-# same for fred
-# incoming:
-#incoming all to mary|ipac~fi||all||192.168.0.13
-#incoming all to mary|ipac~i||all|192.168.0.1|192.168.0.13
-
-# and outgoing:
-#outgoing all from fred|ipac~fo||all|192.168.0.13|
-#outgoing all from fred|ipac~o||all|192.168.0.13|192.168.0.1
-
-
-# we also wants http and ssh traffic statistics
-
-# http incoming
-#incoming http to my net|ipac~fi||all|0/0 http squid 8080|192.168.0.0/24
-#incoming http to my net|ipac~i||all|192.168.0.1 http squid|192.168.0.0/24
-# please note, that the last rule includes rule 'outgoing from squid to mynet'
-
-
-# outgoing:
-#outgoing http from my net|ipac~fo||all|192.168.0.0/24|0/0 http squid 8080
-#outgoing http from my net|ipac~o||all|192.168.0.0/24|192.168.0.1 http squid
-
-
-# ssh incoming
-#incoming ssh to my net|ipac~fi||all|0/0 ssh|192.168.0.0/24
-#incoming ssh to my net|ipac~i||all|192.168.0.1 ssh|192.168.0.0/24
-
-# outgoing:
-#outgoing ssh from my net|ipac~fo||all|192.168.0.0/24|0/0 ssh
-#outgoing ssh from my net|ipac~o||all|192.168.0.0/24|192.168.0.1 ssh
-
-
-# there is somenet of our friend. we wanna know how much traffic it generates
-# note: that net cidrs is contained in CONFIGDIR (/etc/ipac-ng by default) 
-#						'friendnet' file
-
-#incoming from somenet to mynet|ipac~fi||all||@/friendnet@in_some_to_my~fi
-# first field here ('incoming from somenet to mynet') contains rule name.
-# you'll see all statistics under this name 
-# other fields are same as above but now we are interested in the last one -
-#						@/frendnet@in_some_to_my~fi
-# 'friendnet' represents file with cidr's of that net, one in a line
-# 'in_some_to_my' represents chains name that will be created. there is no sense
-#	for ipac-ng of that name. but it may be usefull for you to give 
-#					"speaking" name to that chain
-
-# same for outgoing
-#outgoing to somenet from mynet|ipac~fo||all|@/friendnet@out_some_to_my~fo|
-
-# denote absense of rules targetted to 'ipac~i' and 'ipac~o'
-# we just don't want to count traffic from\to our ipac-ng host to\from friendnet
-
-# and now we want to count traffic to our other net 192.168.1.0/24 for every host
-# lets separate /24 subnet to some smaller ones to lower latence. /26 for e.g.
-#%chain% incoming to othernet0~fi|ipac~fi||all||192.168.1.0/26
-#%chain% incoming to othernet1~fi|ipac~fi||all||192.168.1.64/26
-#%chain% incoming to othernet2~fi|ipac~fi||all||192.168.1.128/26
-#%chain% incoming to othernet3~fi|ipac~fi||all||192.168.1.192/26
-
-#%chain% outgoing from othernet0~fo|ipac~fo||all|192.168.1.0/26|
-#%chain% outgoing from othernet1~fo|ipac~fo||all|192.168.1.64/26|
-#%chain% outgoing from othernet2~fo|ipac~fo||all|192.168.1.128/26|
-#%chain% outgoing from othernet3~fo|ipac~fo||all|192.168.1.192/26|
-
-# and every single host follows
-#incoming to 192.168.1.2|incoming to othernet0~fi||all||192.168.1.2
-#incoming to 192.168.1.3|incoming to othernet0~fi||all||192.168.1.3
-#incoming to 192.168.1.4|incoming to othernet0~fi||all||192.168.1.4
 #
-# and so on :)
-#incoming to 192.168.1.63|incoming to othernet0~fi||all||192.168.1.63
-
-# same for outgoing 
-#outgoing from 192.168.1.2|outgoing from othernet0~fo||all|192.168.1.2|
-#outgoing from 192.168.1.3|outgoing from othernet0~fo||all|192.168.1.3|
-#outgoing from 192.168.1.4|outgoing from othernet0~fo||all|192.168.1.4|
-
-# and the last
-#outgoing from 192.168.1.63|outgoing from othernet0~fo||all|192.168.1.63|
-
-# repeat for other chains and hosts
-
-#incoming to 192.168.1.64|incoming to othernet1~fi||all||192.168.1.64
-#incoming to 192.168.1.65|incoming to othernet1~fi||all||192.168.1.65
-#incoming to 192.168.1.66|incoming to othernet1~fi||all||192.168.1.66
-
-# and so on :)
-#incoming to 192.168.1.127|incoming to othernet1~fi||all||192.168.1.127
-
-# same for outgoing 
-#outgoing from 192.168.1.64|outgoing from othernet1~fo||all|192.168.1.64|
-#outgoing from 192.168.1.65|outgoing from othernet1~fo||all|192.168.1.65|
-#outgoing from 192.168.1.66|outgoing from othernet1~fo||all|192.168.1.66|
-
-# and the last
-#outgoing from 192.168.1.127|outgoing from othernet1~fo||all|192.168.1.127|
-
-# and so on :)
-
-# please note that chain names must ends with one of: '~i', '~o', '~fi' or '~fo'
-# which one is necessary is defined by the parent chain.
-
-
-##############################
-#just a simple example
-#note that outgoing from this host is ipac~i
-#and incoming is ipac~o
-
-outgoing eth0|ipac~i|eth0|all||
-incoming eth0|ipac~o|eth0|all||
-traffic eth0|ipac~i|eth0|all||
-traffic eth0|ipac~o|eth0|all||
-
+#    W A R N I N G ! ! !
+#
+# Don't use symbols other than '0-9A-z[space]' in rules names. You may encounter
+# some strange troubles.
 
+Incoming Total System|ipac~o|eth0|all||||
+Incoming Total System|ipac~fi|eth0|all||||
+Outgoing Total System|ipac~i|eth0|all||||
+Outgoing Total System|ipac~fo|eth0|all||||
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
index 1b8833d614a0..6c94a7b65fa3 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.30.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/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild,v 1.1 2004/07/25 15:00:52 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.30.ebuild,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 DESCRIPTION="ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg"
 HOMEPAGE="http://sourceforge.net/projects/ipac-ng/"
@@ -8,14 +8,14 @@ SRC_URI="mirror://sourceforge/ipac-ng/${P/_p/pl}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="gd sqlite"
 
 DEPEND="sys-devel/bison
 	sys-devel/flex
 	dev-lang/perl
 	gd? ( dev-perl/GD )
-	sqlite? ( dev-db/sqlite )
+	sqlite? ( =dev-db/sqlite-2* )
 	!sqlite? ( sys-libs/gdbm )
 	sys-devel/flex
 	virtual/libc"
@@ -23,7 +23,7 @@ RDEPEND="net-firewall/iptables
 	virtual/cron
 	dev-lang/perl
 	gd? ( dev-perl/GD )
-	sqlite? ( dev-db/sqlite )
+	sqlite? ( =dev-db/sqlite-2* )
 	!sqlite? ( sys-libs/gdbm )
 	virtual/libc"
 
@@ -60,17 +60,17 @@ src_install() {
 	exeinto /etc/cron.hourly
 	newexe ${FILESDIR}/ipac-ng.cron.${PVR} ipac-ng
 
-	dodoc  COPYING README* TODO UPDATE* CHANGES
+	dodoc README TODO doc/* CHANGELOG
 }
 
 pkg_postinst() {
-	ewarn ""
+	ewarn
 	ewarn "                         W A R N I N G !"
 	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
 	ewarn "this WILL save ipac rules and can cause problems!"
 	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
 	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
-	ewarn ""
+	ewarn
 	einfo "the accounting database is at /var/lib/ipac"
 	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
 	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild
index f56f7dcebaab..2b15adebcefd 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.31-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/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild,v 1.1 2005/03/11 10:41:27 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ipac-ng/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gd sqlite postgres"
 
 RDEPEND="virtual/libc
@@ -76,17 +76,17 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn ""
+	ewarn
 	ewarn "                         W A R N I N G !"
 	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
 	ewarn "this WILL save ipac rules and can cause problems!"
 	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
 	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
-	ewarn ""
+	ewarn
 	einfo "the accounting database is at /var/lib/ipac"
 	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
 	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
-	einfo "fetchipac is run by cron every hour by /etc/cron.daily/ipac-ng"
+	einfo "fetchipac is run by cron every hour by /etc/cron.hourly/ipac-ng"
 	einfo "after you changed rules.conf you have to run \"fetchipac -S\" or"
 	einfo "stop/start the service so your iptables gets updated"
 	einfo "if ipac is not working with the default configuration make"
diff --git a/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild b/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild
index e949ab69cc5a..5438fd094433 100644
--- a/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild
+++ b/net-analyzer/ipac-ng/ipac-ng-1.31.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/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild,v 1.1 2005/01/09 07:24:00 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipac-ng/ipac-ng-1.31.ebuild,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/ipac-ng/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="gd sqlite"
 
 DEPEND="sys-devel/bison
@@ -32,7 +32,7 @@ RDEPEND="net-firewall/iptables
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-iptables.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-iptables.patch
 }
 
 src_compile() {
@@ -76,13 +76,13 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn ""
+	ewarn
 	ewarn "                         W A R N I N G !"
 	ewarn "do not use \"/etc/init.d/iptables save\" when ipac-ng is running!"
 	ewarn "this WILL save ipac rules and can cause problems!"
 	ewarn "ipac-ng should be started AFTER iptables and shut down BEFORE iptables"
 	ewarn "use /etc/init.d/iptables save only when ipac rules are removed!"
-	ewarn ""
+	ewarn
 	einfo "the accounting database is at /var/lib/ipac"
 	einfo "use /usr/sbin/ipacsum to get your ip acounting data"
 	einfo "use /usr/sbin/fetchipac to update the accounting at any time"
diff --git a/net-analyzer/ipac-ng/metadata.xml b/net-analyzer/ipac-ng/metadata.xml
index 0529f8a3c7f8..f6c770bde4d8 100644
--- a/net-analyzer/ipac-ng/metadata.xml
+++ b/net-analyzer/ipac-ng/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>IP accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like MRTG.</longdescription>
+<longdescription>ip accounting suite for 2.4 and 2.6 series kernels with text and PNG image output like mrtg</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ipaudit/ChangeLog b/net-analyzer/ipaudit/ChangeLog
index 13881bc9b844..0bee65145adb 100644
--- a/net-analyzer/ipaudit/ChangeLog
+++ b/net-analyzer/ipaudit/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/ipaudit
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ChangeLog,v 1.1 2004/11/23 22:07:44 robbat2 Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ipaudit-1.0_beta2.ebuild:
+  Added to ~ppc.
+
+*ipaudit-1.0_beta2 (29 Apr 2005)
+
+  29 Apr 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +ipaudit-1.0_beta2.ebuild:
+  Bug #86189, version bump.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> ipaudit-1.0_beta1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
 
 *ipaudit-1.0_beta1 (23 Nov 2004)
 
diff --git a/net-analyzer/ipaudit/Manifest b/net-analyzer/ipaudit/Manifest
index b9453c9a05bc..3084fcfe1053 100644
--- a/net-analyzer/ipaudit/Manifest
+++ b/net-analyzer/ipaudit/Manifest
@@ -1,2 +1,6 @@
-MD5 77c37bc910af703925f447f08d4ac36f ipaudit-1.0_beta1.ebuild 645
+MD5 db8e3187a5905571e62c742228834327 ChangeLog 761
+MD5 3544139cbbd0671b76a9a7c53eb0f10f ipaudit-1.0_beta1.ebuild 756
+MD5 b0d485ea1a51fb83c70daedef2599272 metadata.xml 279
+MD5 283fd5cb9190fbb509a8d605d529cc71 ipaudit-1.0_beta2.ebuild 755
 MD5 276e07ebd117b9c60ef6fa7d5316b0b9 files/digest-ipaudit-1.0_beta1 68
+MD5 6eed87f7d8b9d9c78d2bef5c8a830d67 files/digest-ipaudit-1.0_beta2 68
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild
index 5413e369e82d..c898b5600280 100644
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta1.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/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild,v 1.1 2004/11/23 22:07:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ipaudit-1.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
 
 inherit eutils
 DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port."
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="mysql"
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 		mysql? ( dev-db/mysql )"
 #RDEPEND=""
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
index eb1d7a760317..64a20859a684 100644
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2.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/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild,v 1.1 2005/04/29 23:12:03 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
 
 inherit eutils
 DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port."
@@ -9,7 +9,7 @@ MY_P="${PN}-${PV/_beta/BETA}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE="mysql"
 DEPEND="virtual/libpcap
 		mysql? ( dev-db/mysql )"
diff --git a/net-analyzer/ipcad/ChangeLog b/net-analyzer/ipcad/ChangeLog
index ca8c6a41d627..138f6e6936b7 100644
--- a/net-analyzer/ipcad/ChangeLog
+++ b/net-analyzer/ipcad/ChangeLog
@@ -1,6 +1,57 @@
 # ChangeLog for net-analyzer/ipcad
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.1 2004/07/25 15:25:25 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ChangeLog,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
+
+  09 Oct 2005; <mkay@gentoo.org> ipcad-3.6.5.ebuild, ipcad-3.6.6.ebuild:
+  Fixing dependencies. This fixes bug #108105
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> ipcad-3.6.6.ebuild:
+  Stable on ppc.
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org> ipcad-3.6.6.ebuild:
+  Marked x86 stable.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> ipcad-3.6.5.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -ipcad-3.6.4.ebuild,
+  ipcad-3.6.5.ebuild:
+  Removing old version, marking 3.6.5 x86 stable.
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -ipcad-3.6.2.ebuild:
+  Removing old version.
+
+*ipcad-3.6.6 (01 Apr 2005)
+
+  01 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> +ipcad-3.6.6.ebuild:
+  Version bump. Fixes bug 87492. Thanks to Marco Morales <soulse@gmail.com> for
+  reporting.
+
+*ipcad-3.6.5 (21 Mar 2005)
+
+  21 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +ipcad-3.6.5.ebuild:
+  Version bump, fixes bug 60032. Thanks to 
+  Shernakov Artem <artemsh@permonline.ru> for the bug report.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> ipcad-3.6.4.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> ipcad-3.6.2.ebuild,
+  ipcad-3.6.4.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> ipcad-3.6.4.ebuild:
+  Added to ~ppc.
+
+*ipcad-3.6.4 (11 Sep 2004)
+
+  11 Sep 2004; Jon Hood <squinky86@gentoo.org> ipcad-3.6.2.ebuild,
+  +ipcad-3.6.4.ebuild:
+  Version bump, fix dependencies, thanks to Shernakov Artem
+  <artemsh@permonline.ru> in #62342.
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> ipcad-3.6.2.ebuild:
+  x86 stable
 
 *ipcad-3.6.2 (25 Jul 2004)
 
diff --git a/net-analyzer/ipcad/Manifest b/net-analyzer/ipcad/Manifest
index bbbb02bea72a..0cb40b6fda93 100644
--- a/net-analyzer/ipcad/Manifest
+++ b/net-analyzer/ipcad/Manifest
@@ -1,4 +1,8 @@
-MD5 345b9ef201990c9c1f514d5c9d48613d ipcad-3.6.2.ebuild 992
-MD5 148698890032310e527de90805367134 files/ipcad.init 514
-MD5 3cffc04840194f2a426970366bce31c6 files/digest-ipcad-3.6.2 63
+MD5 5574e57e88b54df229f454c2d62e6b55 ChangeLog 2113
+MD5 69310fb1e2f75eab261be65b642a5643 ipcad-3.6.5.ebuild 1220
+MD5 b2dea780726928bba7535152a3944e38 ipcad-3.6.6.ebuild 1220
+MD5 1194f6f46d7b10dcd54903168f1ac522 metadata.xml 221
+MD5 562522a458f9cc2f5c9eeadad6f2448a files/digest-ipcad-3.6.5 63
+MD5 c2811ab3f104f8d16e4d9f3159c8bd7b files/digest-ipcad-3.6.6 63
 MD5 ccd08900a3bd7420d99b2c4acff3b457 files/ipcad.conf.d 135
+MD5 148698890032310e527de90805367134 files/ipcad.init 514
diff --git a/net-analyzer/ipcad/ipcad-3.6.5.ebuild b/net-analyzer/ipcad/ipcad-3.6.5.ebuild
index 1c398a6059bf..60e2336f0aa1 100644
--- a/net-analyzer/ipcad/ipcad-3.6.5.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.6.5.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.6.5.ebuild,v 1.1 2005/03/21 23:16:46 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.6.5.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 DESCRIPTION="IP Cisco Accounting Daemon"
 HOMEPAGE="http://ipcad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4
+	virtual/libpcap"
 
-RDEPEND="virtual/libc
-	virtual/libpcap
+RDEPEND="virtual/libpcap
 	net-firewall/iptables"
 
 src_compile() {
diff --git a/net-analyzer/ipcad/ipcad-3.6.6.ebuild b/net-analyzer/ipcad/ipcad-3.6.6.ebuild
index 4ea2708eec88..ee163d70dd7d 100644
--- a/net-analyzer/ipcad/ipcad-3.6.6.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.6.6.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.6.6.ebuild,v 1.1 2005/04/01 14:28:00 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ipcad/ipcad-3.6.6.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 DESCRIPTION="IP Cisco Accounting Daemon"
 HOMEPAGE="http://ipcad.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ipcad/${P}.tar.gz"
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 
-DEPEND=">=sys-apps/sed-4"
+DEPEND=">=sys-apps/sed-4
+	virtual/libpcap"
 
-RDEPEND="virtual/libc
-	virtual/libpcap
+RDEPEND="virtual/libpcap
 	net-firewall/iptables"
 
 src_compile() {
diff --git a/net-analyzer/iplog/ChangeLog b/net-analyzer/iplog/ChangeLog
index ced5f16cadbd..eeb7fde0803f 100644
--- a/net-analyzer/iplog/ChangeLog
+++ b/net-analyzer/iplog/ChangeLog
@@ -1,9 +1,52 @@
 # ChangeLog for net-analyzer/iplog
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/ChangeLog,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> iplog-2.2.3-r2.ebuild:
+  Mark 2.2.3-r2 stable on alpha
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -iplog-2.2.3-r1.ebuild,
+  -iplog-2.2.3.ebuild:
+  Removing old ebuilds.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> iplog-2.2.3-r1.ebuild,
+  iplog-2.2.3-r2.ebuild, iplog-2.2.3.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  08 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> iplog-2.2.3-r1.ebuild,
+  iplog-2.2.3-r2.ebuild, iplog-2.2.3.ebuild:
+  ~alpha keyword, fix license syntax.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> iplog-2.2.3-r1.ebuild,
+  iplog-2.2.3-r2.ebuild, iplog-2.2.3.ebuild:
+  QA: IUSE variable was missing, unnecessary definition of S removed.
+
+  10 Mar 2004; Jason Wever <weeve@gentoo.org> iplog-2.2.3-r2.ebuild:
+  Stable on sparc.
+
+  27 Feb 2004; Michael Boman <mboman@gentoo.org> iplog-2.2.3-r2.ebuild,
+  files/iplog.rc6:
+  - Marked stable on x86. Closes 42998.
+  - re-indented the init.d script.
+  - Changed some internal stuff in the ebuild so it's a bit cleaner.
+
+*iplog-2.2.3-r2 (26 Oct 2003)
+
+  26 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> iplog-2.2.3-r2.ebuild,
+  files/iplog.rc6:
+  add my own startup script for iplog
+
+*iplog-2.2.3-r1 (18 Oct 2003)
+
+  18 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add dlt patch to support more interface types #27928.
 
 *iplog-2.2.3 (1 Feb 2002)
 
+  21 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Tested and Added PPC to KEYWORDS.
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-analyzer/iplog/Manifest b/net-analyzer/iplog/Manifest
index e69de29bb2d1..d4a8e2ad1751 100644
--- a/net-analyzer/iplog/Manifest
+++ b/net-analyzer/iplog/Manifest
@@ -0,0 +1,6 @@
+MD5 8fc559ff5d9e3b70a355489f442eab25 metadata.xml 227
+MD5 339d72fbfee184afd4d55b7a1259844e ChangeLog 2141
+MD5 47017450aaec0bf856aa4fa7739aa462 iplog-2.2.3-r2.ebuild 863
+MD5 2189edd34b8ddf9bba2d97ba127b18c7 files/iplog.rc6 886
+MD5 9b2831dc3b6c9860cc6857ec5d8ed088 files/digest-iplog-2.2.3-r2 63
+MD5 48e8dfa989139e578e0ce8c35a090e39 files/2.2.3-DLT_LINUX_SSL.patch 7611
diff --git a/net-analyzer/iplog/files/iplog.rc6 b/net-analyzer/iplog/files/iplog.rc6
index e8b816237815..72336d217955 100644
--- a/net-analyzer/iplog/files/iplog.rc6
+++ b/net-analyzer/iplog/files/iplog.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/files/iplog.rc6,v 1.1 2003/10/27 05:50:50 robbat2 Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/files/iplog.rc6,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 depend() {
 	need net
@@ -11,27 +11,27 @@ pidfile=/var/run/iplog.pid
 
 start() {
 	ebegin "Starting iplog"
-    checkconfig 
-    rc=$?
-    if [ $rc -eq 0 ]; then
-        start-stop-daemon --start --quiet --startas /usr/sbin/iplog \
-            --pidfile=${pidfile} --name=iplog
-        rc=$?
-        eend $rc "Failed to start iplog $rc"
-    else
-        eend $rc "/etc/iplog.conf does not exist!"
-    fi
+	checkconfig 
+	rc=$?
+	if [ $rc -eq 0 ]; then
+		start-stop-daemon --start --quiet --startas /usr/sbin/iplog \
+		--pidfile=${pidfile} --name=iplog
+		rc=$?
+		eend $rc "Failed to start iplog $rc"
+	else
+		eend $rc "/etc/iplog.conf does not exist!"
+	fi
 }
 
 stop() {
 	ebegin "Stopping iplog"
 	start-stop-daemon --stop --retry=5 --quiet --pidfile=${pidfile} --name=iplog
-    # due to a bug in the program, it doesn't properly remove it's pidfile sometimes
-    rm -f ${pidfile}
+	# due to a bug in the program, it doesn't properly remove it's pidfile sometimes
+	rm -f ${pidfile}
 	eend $? "Failed to stop iplog!"
 }
 
 checkconfig() {
-    [ -f /etc/iplog.conf ] || return 1
-    return 0
+	[ -f /etc/iplog.conf ] || return 1
+	return 0
 }
diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
index 0925008d8ed2..c5da68c0d28f 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-r2.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/net-analyzer/iplog/iplog-2.2.3-r2.ebuild,v 1.1 2003/10/27 05:50:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iplog/iplog-2.2.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 inherit eutils
 
@@ -8,11 +8,12 @@ DESCRIPTION="iplog is a TCP/IP traffic logger"
 HOMEPAGE="http://ojnk.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
-LICENSE="GPL-2 | FDL-1.1"
+LICENSE="|| ( GPL-2 FDL-1.1 )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="alpha ppc sparc x86"
+IUSE=""
 
-DEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
 
 src_unpack() {
 	unpack ${A}
@@ -31,8 +32,7 @@ src_install() {
 		mandir=${D}/usr/share/man \
 		install || die
 	dodoc AUTHORS COPYING.* NEWS README TODO example-iplog.conf
-	into /
-	insinto /etc/init.d
-	newins ${FILESDIR}/iplog.rc6 iplog
-	chmod +x ${D}/etc/init.d/iplog
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/iplog.rc6 iplog
 }
diff --git a/net-analyzer/iplog/metadata.xml b/net-analyzer/iplog/metadata.xml
index 577c9834431a..9fe62327fd13 100644
--- a/net-analyzer/iplog/metadata.xml
+++ b/net-analyzer/iplog/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>iplog is a TCP/IP traffic logger.</longdescription>
+<longdescription>iplog is a TCP/IP traffic logger</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ippl/ChangeLog b/net-analyzer/ippl/ChangeLog
index b2677d4253ed..4db38d3ceb26 100644
--- a/net-analyzer/ippl/ChangeLog
+++ b/net-analyzer/ippl/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for net-analyzer/ippl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ChangeLog,v 1.1 2002/11/04 13:01:39 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ChangeLog,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ippl-1.4.14.ebuild:
+  Added to ~ppc.
+
+  02 Apr 2005; Martin Holzer <mholzer@gentoo.org> ippl-1.4.14.ebuild:
+  adding keyword
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> ippl-1.4.14.ebuild:
+  Added missing IUSE. Added metadata
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ippl-1.4.14.ebuild:
+  fix depend (bug #45110); tidy
 
 *ippl-1.4.14 (04 Nov 2002)
 
+  17 Mar 2003; Martin Holzer <mholzer@gentoo.org> ippl-1.4.14.ebuild:
+  Marked as stable.
+
   04 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild contributed by Mike Lundy <novas007@gmx.net> in #8015.
diff --git a/net-analyzer/ippl/Manifest b/net-analyzer/ippl/Manifest
index d57487ee7e8c..77b5ebc254a2 100644
--- a/net-analyzer/ippl/Manifest
+++ b/net-analyzer/ippl/Manifest
@@ -1,4 +1,5 @@
-MD5 d250a014b9f4b4b94736c04da493a4c1 ChangeLog 466
-MD5 7022664239f3c1dfe0466bee4ed42c78 ippl-1.4.14.ebuild 731
+MD5 ec321bb638625ba5e78033b6130fc452 ChangeLog 837
+MD5 57ad99058b7a1cd557edc0bac4a42d98 ippl-1.4.14.ebuild 739
+MD5 51c8d69cd44f06df58c0f62c9bb30791 metadata.xml 235
 MD5 3f4674252fd897f578066eb544d67455 files/digest-ippl-1.4.14 62
-MD5 b093725890450448af1bdcff9b20b39b files/ippl.rc 799
+MD5 b4764047cb33e61bb98382ed1dbc6f73 files/ippl.rc 779
diff --git a/net-analyzer/ippl/files/ippl.rc b/net-analyzer/ippl/files/ippl.rc
index 6c848f86aa6b..7aed0cb790dc 100644
--- a/net-analyzer/ippl/files/ippl.rc
+++ b/net-analyzer/ippl/files/ippl.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v 1.1 2002/11/04 13:01:39 aliz Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/files/ippl.rc,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 depend() {
 	need net
@@ -35,5 +35,3 @@ stop() {
 		rm -f /var/run/ippl.pid
 	fi
 }
-
-
diff --git a/net-analyzer/ippl/ippl-1.4.14.ebuild b/net-analyzer/ippl/ippl-1.4.14.ebuild
index 5b47a2858003..825a39d559f7 100644
--- a/net-analyzer/ippl/ippl-1.4.14.ebuild
+++ b/net-analyzer/ippl/ippl-1.4.14.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/net-analyzer/ippl/ippl-1.4.14.ebuild,v 1.1 2002/11/04 13:01:39 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ippl/ippl-1.4.14.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 DESCRIPTION="A daemon which logs TCP/UDP/ICMP packets"
 HOMEPAGE="http://pltplp.net/ippl/"
@@ -8,25 +8,24 @@ SRC_URI="http://pltplp.net/ippl/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
 
-DEPEND=">=yacc-1.9.1-r1 >=flex-2.5.4a-r4"
+DEPEND=">=dev-util/yacc-1.9.1-r1
+	>=sys-devel/flex-2.5.4a-r4"
 RDEPEND=""
 
-S=${WORKDIR}/${P}
-
 src_install() {
 	dosbin Source/ippl
-	
+
 	insinto "/etc"
 	doins ippl.conf
 
 	doman Docs/ippl.8 Docs/ippl.conf.5
 
-	dodoc BUGS CREDITS HISTORY README TODO 
+	dodoc BUGS CREDITS HISTORY README TODO
 	newdoc ippl.conf ippl.conf-sample
 
 	exeinto "/etc/init.d"
 	newexe ${FILESDIR}/ippl.rc ippl
 }
-
diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 8069ec1cae05..24e186d63a45 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,106 @@
 # ChangeLog for net-analyzer/iptraf
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
+
+*iptraf-3.0.0 (01 Nov 2005)
+
+  01 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iptraf-3.0.0-atheros.patch, +files/iptraf-3.0.0-build.patch,
+  +files/iptraf-3.0.0-linux-headers.patch, +iptraf-3.0.0.ebuild:
+  Version bump #106775 by tonich/Tudor Alexandru Dragos.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  18 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
+  Update ipv6 patch revision, which can now be applied unconditionally. This
+  fixes the USE=ipv6 compile failure that resulted from the bug 89458 fix.
+  Both patches can now live in harmony.
+
+  17 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
+  Add patch from Aurelien Minet in bug 89458 that fixes compile issues when
+  running a 2.6 kernel.
+
+  25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -iptraf-2.7.0.ebuild,
+  iptraf-2.7.0-r1.ebuild:
+  Remove old ebuild, add -j1 to emake.
+
+  10 Apr 2005; Andrej Kacian <ticho@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Stable on amd64.
+
+  07 Mar 2005; Markus Rothe <corsair@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Stable on ppc64
+
+  26 Feb 2005; <solar@gentoo.org> +files/iptraf-2.7.0-atheros.patch,
+  iptraf-2.7.0-r1.ebuild:
+  - Add atheros interface support
+
+  25 Jan 2005; Markus Rothe <corsair@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Added ~ppc64 to KEYWORDS; bug #79367
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Fixed URL location of ipv6 patch. Closes #58021.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> iptraf-2.7.0-r1.ebuild,
+  iptraf-2.7.0.ebuild:
+  Tidy. Added missing IUSE
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Fix use invocation
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Stable on alpha.
+
+  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Move to mips stable (~mips -> mips)
+
+  02 Nov 2003; Christian Birchinger <joker@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  Added sparc stable keyword
+
+  05 Oct 2003; Brad House <brad_mssw@gentoo.org> iptraf-2.7.0-r1.ebuild:
+  add ~amd64 flag
+
+*iptraf-2.7.0-r1 (03 Aug 2003)
+
+  27 Oct 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0-r1.ebuild :
+  Marked stable on x86 and hppa.
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0-r1.ebuild :
+  Updated ipv6 patch to alpha11.
+
+  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0-r1.ebuild :
+  Added ipv6 support. Fixed a small bug with path. Marked unstable.
+
+*iptraf-2.7.0 (30 Aug 2002)
+
+  01 Aug 2003; Jan Seidel <tuxus@gentoo.org> iptraf-2.7.0.ebuild :
+  Added mips to keywords.
+
+  04 Mar 2003; Martin Holzer <mholzer@gentoo.org> iptraf-2.7.0.ebuild :
+  Changed dodir to keepdir. Closes #16776.
+
+  18 Feb 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0.ebuild :
+  Added hppa to keywords.
+
+  02 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> iptraf-2.7.0.ebuild :
+  Closes #14654.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  25 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Added alpha to KEYWORDS.
+
+  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> iptraf-2.7.0.ebuild:
+  Added ppc to KEYWORDS.
+
+  18 Aug 2002; Daniel Ahlberg <aliz@telia.com> iptraf-2.7.0.ebuild:
+  Moved bins from /usr/bin to /usr/sbin as suggested in #6517.
+
+  20 Jun 2002; J.Alberto Suárez L. iptraf-2.7.0.ebuild :
+
+  Version bumped.
 
 *iptraf-2.4.0-r1 (1 Feb 2002)
 
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index e69de29bb2d1..99625b0b8a38 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -0,0 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0778f39c2d1240985f0e8c1ba4f16dc6 ChangeLog 4156
+MD5 301043df68f5969e9455c53d409a8c3e files/digest-iptraf-2.7.0-r1 138
+MD5 ddf09316d6ccb3f72355dbf82d9fd1e2 files/digest-iptraf-3.0.0 64
+MD5 98fb7659373bc05930f0f3837135c811 files/iptraf-2.7.0-2.6.patch 1711
+MD5 1bf72405b3017f7732841188b6914160 files/iptraf-2.7.0-atheros.patch 1644
+MD5 a713b7ba056a4b78e177e3a801246152 files/iptraf-3.0.0-atheros.patch 1508
+MD5 20c0e87723c58d6ce51de7fc3af1781a files/iptraf-3.0.0-build.patch 949
+MD5 59493b3c2f0bb06541a55aeffd9f097c files/iptraf-3.0.0-linux-headers.patch 963
+MD5 ff7fbdbad9ee9726c93c7ae00b072900 iptraf-2.7.0-r1.ebuild 1455
+MD5 fbad68fe2caf5b78a9ee437bcd634377 iptraf-3.0.0.ebuild 1188
+MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZwDFgIKl8Uu19MoRAndQAJ9WfkgeHdIvmouTQt7qpswmZIOLRQCaAzYl
+m8yM+XfJ9fO/m+Old40/Ib4=
+=Vhjt
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1 b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1
index d67c3eabb587..b97ad87a0470 100644
--- a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1
+++ b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r1
@@ -1,2 +1,2 @@
 MD5 7ff0bc933a0a57a4ca9e2b0443307539 iptraf-2.7.0.tar.gz 363496
-MD5 b42690cef651e1a6b4e3f2b641c2e530 iptraf-2.7.0-ipv6-alpha10.diff 46452
+MD5 34081a07879af189cca6865bc3b28c29 iptraf-2.7.0-ipv6-alpha12.diff 57251
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
index e4468273816c..35808f591acc 100644
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
+++ b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
@@ -1,52 +1,56 @@
-diff -ur iptraf-2.7.0/src/packet.c iptraf-2.7.0-2.6.11-r2/src/packet.c
---- iptraf-2.7.0/src/packet.c   2005-07-17 05:45:44.000000000 +0200
-+++ iptraf-2.7.0-2.6.11-r2/src/packet.c 2005-07-17 05:43:50.000000000 +0200
-@@ -32,6 +32,9 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/othptab.c iptraf-2.7.0/src/othptab.c
+--- iptraf-2.7.0.orig/src/othptab.c	2005-07-18 18:55:28.000000000 -0400
++++ iptraf-2.7.0/src/othptab.c	2005-07-18 18:57:39.000000000 -0400
+@@ -17,9 +17,6 @@
+ ***/
+ 
+ #include <asm/types.h>
+-#include <linux/if_ether.h>
+-#include <linux/if_tr.h>
+-#include <linux/if_fddi.h>
+ 
+ #ifdef USE_IPV6
+ # include <netinet/ip6.h>
+@@ -27,9 +24,9 @@
+ #endif
+ 
+ #include <winops.h>
++#include "tcptable.h"
+ #include "arphdr.h"
+ #include "options.h"
+-#include "tcptable.h"
+ #include "othptab.h"
+ #include "deskman.h"
+ #include "attrs.h"
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/packet.c iptraf-2.7.0/src/packet.c
+--- iptraf-2.7.0.orig/src/packet.c	2005-07-18 18:55:28.000000000 -0400
++++ iptraf-2.7.0/src/packet.c	2005-07-18 18:56:13.000000000 -0400
+@@ -35,6 +35,9 @@
  #include <sys/time.h>
  #include <net/if_arp.h>
  #include <net/if.h>
 +#ifdef _NET_IF_H
-+#define  _LINUX_IF_H
++#define _LINUX_IF_H
 +#endif
  #include <sys/ioctl.h>
  #include <linux/if_packet.h>
  #include <linux/if_ether.h>
-diff -ur iptraf-2.7.0/src/tcptable.h iptraf-2.7.0-2.6.11-r2/src/tcptable.h
---- iptraf-2.7.0/src/tcptable.h 2001-12-28 03:16:39.000000000 +0100
-+++ iptraf-2.7.0-2.6.11-r2/src/tcptable.h       2005-07-17 05:44:02.000000000 +0200
-@@ -20,11 +20,15 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/tcptable.h iptraf-2.7.0/src/tcptable.h
+--- iptraf-2.7.0.orig/src/tcptable.h	2005-07-18 18:55:28.000000000 -0400
++++ iptraf-2.7.0/src/tcptable.h	2005-07-18 18:57:01.000000000 -0400
+@@ -20,11 +20,14 @@
  #include <arpa/inet.h>
  #include <net/if_arp.h>
  #include <asm/types.h>
 +#include <net/if.h>
 +#ifdef _NET_IF_H
-+#define  _LINUX_IF_H
++#define _LINUX_IF_H
 +#endif
  #include <linux/if_packet.h>
  #include <linux/if_ether.h>
  #include <linux/if_fddi.h>
  #include <linux/if_tr.h>
 -#include <net/if.h>
-+//#include <net/if.h>
  #include <netinet/ip.h>
  #include <netinet/udp.h>
  #include "servname.h"
-diff -ur iptraf-2.7.0/src/othptab.c iptraf-2.7.0-2.6.11-r2/src/othptab.c
---- iptraf-2.7.0/src/othptab.c  2001-12-28 03:23:59.000000000 +0100
-+++ iptraf-2.7.0-2.6.11-r2/src/othptab.c        2005-07-17 14:24:00.000000000 +0200
-@@ -17,13 +17,10 @@
- ***/
-
- #include <asm/types.h>
--#include <linux/if_ether.h>
--#include <linux/if_tr.h>
--#include <linux/if_fddi.h>
- #include <winops.h>
-+#include "tcptable.h"
- #include "arphdr.h"
- #include "options.h"
--#include "tcptable.h"
- #include "othptab.h"
- #include "deskman.h"
- #include "attrs.h"
-
diff --git a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
index afe04d400591..8ee755531876 100644
--- a/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
+++ b/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild
@@ -1,24 +1,33 @@
-# 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/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.1 2003/08/03 21:56:31 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-V6PATCH_LEVEL=alpha10
+inherit eutils flag-o-matic
+
+V6PATCH_LEVEL=alpha12
 DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
-SRC_URI="ftp://ftp.cebu.mozcom.com/pub/linux/net/${P}.tar.gz http://dev.gentoo.org/~gmsoft/${P}-ipv6-${V6PATCH_LEVEL}.diff"
-HOMEPAGE="http://cebu.mozcom.com/riker/iptraf/"
-IUSE="ipv6"
+HOMEPAGE="http://iptraf.seul.org/"
+SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
+	http://dev.gentoo.org/~gmsoft/patches/${P}-ipv6-${V6PATCH_LEVEL}.diff"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sparc x86"
+IUSE="ipv6"
 
 DEPEND=">=sys-libs/ncurses-5.2-r1"
 
 src_unpack() {
 	unpack ${P}.tar.gz
-	cd ${S}
-	[ -n "`use ipv6`" ] && patch -p 0 < ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-atheros.patch
+	epatch "${DISTDIR}"/${P}-ipv6-${V6PATCH_LEVEL}.diff
+#    use ipv6 && epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
+
+	# bug 89458
+	has_version '>=sys-kernel/linux-headers-2.6.11-r2' && \
+		epatch "${FILESDIR}"/${P}-2.6.patch
+
 	cd src
 	cp dirs.h dirs.h.orig
 	sed -e s:/var/local/iptraf:/var/lib/iptraf: -e s:/usr/local/bin:/usr/sbin: dirs.h.orig > dirs.h
@@ -26,12 +35,14 @@ src_unpack() {
 
 src_compile() {
 	cd src
-	emake CFLAGS="$CFLAGS" DEBUG="" TARGET="/usr/sbin" WORKDIR="/var/lib/iptraf" \
+	use ipv6 && append-flags -DUSE_IPV6
+	emake -j1 CFLAGS="$CFLAGS" DEBUG="" TARGET="/usr/sbin" WORKDIR="/var/lib/iptraf" \
 	clean all || die "emake failed"
 }
+
 src_install() {
-	dosbin src/{iptraf,cfconv,rvnamed}
-	dodoc  FAQ README* CHANGES RELEASE-NOTES LICENSE INSTALL
+	dosbin src/{iptraf,cfconv,rvnamed} || die
+	dodoc  FAQ README* CHANGES RELEASE-NOTES INSTALL
 	doman Documentation/*.8
 	dohtml Documentation/*.html
 	keepdir /var/{lib,run,log}/iptraf
diff --git a/net-analyzer/iptraf/iptraf-3.0.0.ebuild b/net-analyzer/iptraf/iptraf-3.0.0.ebuild
index b1f062787bb9..d04ce5816bbd 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0.ebuild
+++ b/net-analyzer/iptraf/iptraf-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/net-analyzer/iptraf/iptraf-3.0.0.ebuild,v 1.1 2005/11/01 05:44:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/iptstate/ChangeLog b/net-analyzer/iptstate/ChangeLog
index 62c582962148..2dcc4d057252 100644
--- a/net-analyzer/iptstate/ChangeLog
+++ b/net-analyzer/iptstate/ChangeLog
@@ -1,6 +1,48 @@
 # ChangeLog for net-analyzer/iptstate
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/ChangeLog,v 1.1 2002/03/02 06:05:20 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/ChangeLog,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> iptstate-1.4.ebuild:
+  Added to ~ppc.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> iptstate-1.3.ebuild,
+  iptstate-1.4.ebuild:
+  Adding die to make and make install.
+
+*iptstate-1.4 (17 Apr 2005)
+
+  17 Apr 2005; Eldad Zack <eldad@gentoo.org> -iptstate-1.2.1.ebuild,
+  iptstate-1.3.ebuild, +iptstate-1.4.ebuild:
+  Updated homepage location. Version bump.
+
+  09 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> iptstate-1.3.ebuild:
+  Marked ~amd64.
+
+  12 Jul 2004; Jason Wever <weeve@gentoo.org> iptstate-1.3.ebuild:
+  Stable on sparc.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  iptstate-1.2.1.ebuild, iptstate-1.3.ebuild:
+  tidy, x86 stable
+
+*iptstate-1.3 (13 Oct 2003)
+
+  13 Oct 2003; Heinrich Wendel <lanius@gentoo.org> iptstate-1.3.0.ebuild:
+  version bump
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*iptstate-1.2.1 (01 Jul 2002)
+
+  01 Jul 2002; Bruce A. Locke <blocke@shivan.org> iptstate-1.2.1.ebuild :
+
+  Update to 1.2.1
+
+*iptstate-1.2.0 (22 Apr 2002)
+
+  22 Apr 2002; Bruce A. Locke <blocke@shivan.org> iptstate-1.2.0.ebuild :
+
+  Update to 1.2.0
 
 *iptstate-1.0.1 (2 Mar 2002)
 
diff --git a/net-analyzer/iptstate/Manifest b/net-analyzer/iptstate/Manifest
index e69de29bb2d1..5ea4f9e57d1d 100644
--- a/net-analyzer/iptstate/Manifest
+++ b/net-analyzer/iptstate/Manifest
@@ -0,0 +1,6 @@
+MD5 09c4ce9bb4603fc8f83fd1a0f9609a1b ChangeLog 1494
+MD5 4ec3ac90092d3472de9cb8fc4965aa7f iptstate-1.3.ebuild 684
+MD5 0078da5477b6243403ca4a01592d8266 metadata.xml 270
+MD5 e2b96134d155c3b450da0917c0fe4cdb iptstate-1.4.ebuild 686
+MD5 77dad1200a91c12958bc01f9870ec63c files/digest-iptstate-1.3 63
+MD5 72fdbf15ab86485724c1d3b46d7e30c2 files/digest-iptstate-1.4 64
diff --git a/net-analyzer/iptstate/iptstate-1.3.ebuild b/net-analyzer/iptstate/iptstate-1.3.ebuild
index 41d218d726ff..4c40e6e0e4c4 100644
--- a/net-analyzer/iptstate/iptstate-1.3.ebuild
+++ b/net-analyzer/iptstate/iptstate-1.3.ebuild
@@ -1,23 +1,24 @@
-# 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/net-analyzer/iptstate/iptstate-1.3.ebuild,v 1.1 2003/10/13 12:50:31 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/iptstate-1.3.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
+
 
-S=${WORKDIR}/${P}
 DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
-SRC_URI="http://iptstate.phildev.net/${P}.tar.gz"
-HOMEPAGE="http://iptstate.phildev.net"
+SRC_URI="http://www.phildev.net/iptstate/${P}.tar.gz"
+HOMEPAGE="http://www.phildev.net/iptstate/"
 
 DEPEND="sys-libs/ncurses"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ~amd64"
+IUSE=""
 
 src_compile() {
-	make CXXFLAGS="${CXXFLAGS} -g -Wall" all
+	make CXXFLAGS="${CXXFLAGS} -g -Wall" all || die
 }
 
 src_install() {
-	make PREFIX=${D}/usr install
+	make PREFIX=${D}/usr install || die
 	dodoc README Changelog BUGS CONTRIB LICENSE WISHLIST
 }
diff --git a/net-analyzer/iptstate/iptstate-1.4.ebuild b/net-analyzer/iptstate/iptstate-1.4.ebuild
index 0fd90c5439bc..51456612fbf7 100644
--- a/net-analyzer/iptstate/iptstate-1.4.ebuild
+++ b/net-analyzer/iptstate/iptstate-1.4.ebuild
@@ -1,7 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/iptstate-1.4.ebuild,v 1.1 2005/04/17 08:41:10 eldad Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptstate/iptstate-1.4.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
 DESCRIPTION="IP Tables State displays states being kept by iptables in a top-like format"
 SRC_URI="http://www.phildev.net/iptstate/${P}.tar.bz2"
@@ -11,14 +10,14 @@ DEPEND="sys-libs/ncurses"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 src_compile() {
-	make CXXFLAGS="${CXXFLAGS} -g -Wall" all
+	make CXXFLAGS="${CXXFLAGS} -g -Wall" all || die
 }
 
 src_install() {
-	make PREFIX=${D}/usr install
+	make PREFIX=${D}/usr install || die
 	dodoc README Changelog BUGS CONTRIB LICENSE WISHLIST
 }
diff --git a/net-analyzer/isic/ChangeLog b/net-analyzer/isic/ChangeLog
index 36d54b777114..970163e84168 100644
--- a/net-analyzer/isic/ChangeLog
+++ b/net-analyzer/isic/ChangeLog
@@ -1,8 +1,45 @@
 # ChangeLog for net-analyzer/isic
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/isic/ChangeLog,v 1.1 2003/02/26 03:34:35 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/isic/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  16 Aug 2005; Simon Stelling <blubb@gentoo.org> isic-0.06.ebuild:
+  added ~amd64 keyword
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org> isic-0.06.ebuild:
+  removed die from epatch || die.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> isic-0.06.ebuild:
+  Added to ~ppc.
+
+  10 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/isic-0.06-gcc4.patch, isic-0.06.ebuild:
+  Adding gcc-4 patch from Debian.
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  -files/0.05-libnet-1.0.patch, -isic-0.05-r1.ebuild, -isic-0.05.ebuild,
+  isic-0.06.ebuild:
+  Removed old version as per bug #75193. Old versions had dependancy errors.
+  Vanquirius <marcelogoes@gmail.com> confirmed the new version is working.
+
+*isic-0.06 (08 Jan 2005)
+
+  08 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/isic-0.06-makefile.patch, +isic-0.06.ebuild:
+  version bump as per bug #75193. Thanks to Vanquirius <marcelogoes@gmail.com>
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  isic-0.05-r1.ebuild, isic-0.05.ebuild:
+  Tidy
+
+*isic-0.05-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *isic-0.05 (25 Feb 2003)
 
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> isic-0.05.ebuild :
+  Fixed Depend to libnet-1.0*. Closes #17017.
+
   25 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me for #11785.
diff --git a/net-analyzer/isic/Manifest b/net-analyzer/isic/Manifest
index e69de29bb2d1..ef21f735c13e 100644
--- a/net-analyzer/isic/Manifest
+++ b/net-analyzer/isic/Manifest
@@ -0,0 +1,6 @@
+MD5 925b88162c68044ab83c087c914dad69 ChangeLog 1642
+MD5 ac7ce73fce53f6881d1f170fbf7458b0 isic-0.06.ebuild 758
+MD5 f00333dfc594456606fe48bf50a9c392 metadata.xml 320
+MD5 7d4f90aea0221994b56ea15b508e8b92 files/digest-isic-0.06 57
+MD5 7ba4a54861b9cc413402b7c4b09c4bbd files/isic-0.06-gcc4.patch 1824
+MD5 761301ac69be4d5a63cf74dd9a933115 files/isic-0.06-makefile.patch 1495
diff --git a/net-analyzer/isic/isic-0.06.ebuild b/net-analyzer/isic/isic-0.06.ebuild
index 4a5ce2787146..aba8fddcccd8 100644
--- a/net-analyzer/isic/isic-0.06.ebuild
+++ b/net-analyzer/isic/isic-0.06.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/net-analyzer/isic/isic-0.06.ebuild,v 1.1 2005/01/08 10:02:57 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/isic/isic-0.06.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.packetfactory.net/projects/ISIC/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=">=net-libs/libnet-1.1"
@@ -18,7 +18,8 @@ DEPEND=">=net-libs/libnet-1.1"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch || die "patch failed"
+	epatch ${FILESDIR}/${P}-makefile.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
 }
 
 src_compile() {
diff --git a/net-analyzer/isic/metadata.xml b/net-analyzer/isic/metadata.xml
index 4dc9674766ea..e2f1bd3676d3 100644
--- a/net-analyzer/isic/metadata.xml
+++ b/net-analyzer/isic/metadata.xml
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<maintainer>
+	<email>netmon@gentoo.org</email>
+	<name>Network Monitoring Herd</name>
+</maintainer>
 <longdescription>IP Stack Integrity Checker</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/jnettop/ChangeLog b/net-analyzer/jnettop/ChangeLog
index 23e96754a715..d9b8629b0e0e 100644
--- a/net-analyzer/jnettop/ChangeLog
+++ b/net-analyzer/jnettop/ChangeLog
@@ -1,6 +1,47 @@
-# ChangeLog for net-analyzer/jnettop 
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/ChangeLog,v 1.1 2003/10/10 17:44:43 mholzer Exp $
+# ChangeLog for net-analyzer/jnettop
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/ChangeLog,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+  27 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> jnettop-0.11.0.ebuild:
+  0.11.0 x86 stable for bug 107425. Thanks to Daniel Webert <rockoo at gmail
+  dot com>.
+
+*jnettop-0.11.0 (01 Jul 2005)
+
+  01 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +jnettop-0.11.0.ebuild:
+  Version bump.
+
+  08 May 2005; Herbie Hopkins <herbs@gentoo.org> jnettop-0.10.1.ebuild:
+  Marked ~amd64 wrt bug #91891.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> jnettop-0.10.1.ebuild,
+  -jnettop-0.9.ebuild:
+  Use make install instead of emake install. Removing old ebuild.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> jnettop-0.10.1.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> jnettop-0.10.1.ebuild,
+  jnettop-0.9.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*jnettop-0.10.1 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> +jnettop-0.10.1.ebuild:
+  Version bump as per bug #75190. Thanks Vanquirius <marcelogoes@gmail.com>
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> jnettop-0.9.ebuild:
+  Added ~sparc keyword.
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> jnettop-0.9.ebuild:
+  Added to ~ppc.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  jnettop-0.9.ebuild:
+  tidy
 
 *jnettop-0.9 (11 Oct 2003)
 
diff --git a/net-analyzer/jnettop/Manifest b/net-analyzer/jnettop/Manifest
index 81c19428b23d..e0d49f9551d1 100644
--- a/net-analyzer/jnettop/Manifest
+++ b/net-analyzer/jnettop/Manifest
@@ -1,2 +1,6 @@
-MD5 56e82bcd4a90432c98d3f3f712485473 jnettop-0.9.ebuild 471
-MD5 ab0d6b08508797f75e80bb5d0b82dcf1 files/digest-jnettop-0.9 63
+MD5 b94b0db0c9e3a8f5a7979c80131609d3 jnettop-0.11.0.ebuild 587
+MD5 44d5022ec080a145e4c901a547dce721 jnettop-0.10.1.ebuild 588
+MD5 91d5d67522b7be72cbabe819f0e73d51 ChangeLog 1725
+MD5 2930c32f90fae83ab0a2afb6ffd0c934 metadata.xml 240
+MD5 6ffb841d0ecd0c29a7b3097a6b2762bd files/digest-jnettop-0.10.1 66
+MD5 818479a5c52ad2a5efb2667ddb76d4ab files/digest-jnettop-0.11.0 66
diff --git a/net-analyzer/jnettop/jnettop-0.10.1.ebuild b/net-analyzer/jnettop/jnettop-0.10.1.ebuild
index 446093e52426..630ce0f7c8f4 100644
--- a/net-analyzer/jnettop/jnettop-0.10.1.ebuild
+++ b/net-analyzer/jnettop/jnettop-0.10.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/net-analyzer/jnettop/jnettop-0.10.1.ebuild,v 1.1 2005/01/09 07:34:40 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/jnettop-0.10.1.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 DESCRIPTION="A top like console network traffic visualiser"
 HOMEPAGE="http://jnettop.kubs.info/"
@@ -8,13 +8,13 @@ SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	>=dev-libs/glib-2.0.1"
 
 src_install() {
-	emake DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die
 	dodoc AUTHORS ChangeLog INSTALL NEWS README
 }
diff --git a/net-analyzer/jnettop/jnettop-0.11.0.ebuild b/net-analyzer/jnettop/jnettop-0.11.0.ebuild
index 9674c28df3e7..989f322da03f 100644
--- a/net-analyzer/jnettop/jnettop-0.11.0.ebuild
+++ b/net-analyzer/jnettop/jnettop-0.11.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/net-analyzer/jnettop/jnettop-0.11.0.ebuild,v 1.1 2005/07/01 15:46:12 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/jnettop/jnettop-0.11.0.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 DESCRIPTION="A top like console network traffic visualiser"
 HOMEPAGE="http://jnettop.kubs.info/"
@@ -8,13 +8,13 @@ SRC_URI="http://jnettop.kubs.info/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/libpcap
 	>=dev-libs/glib-2.0.1"
 
 src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README
 }
diff --git a/net-analyzer/knetscan/ChangeLog b/net-analyzer/knetscan/ChangeLog
index 19a84b8b8d0c..34787cdaf6d0 100644
--- a/net-analyzer/knetscan/ChangeLog
+++ b/net-analyzer/knetscan/ChangeLog
@@ -1,9 +1,42 @@
 # ChangeLog for net-analyzer/knetscan
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knetscan/ChangeLog,v 1.1 2002/10/24 18:11:32 hannes Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knetscan/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  04 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/knetscan-1.0-desktop.diff, knetscan-1.0.ebuild:
+  Patching up so that knetscan shows in the Internet menu and not in lost and
+  found. Fixes bug 104835. Thanks to <pinihadad@optonline.net>.
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> knetscan-1.0.ebuild:
+  Stable on ppc.
+
+  31 Dec 2004; Jason Wever <weeve@gentoo.org> knetscan-1.0.ebuild:
+  Added ~sparc keyword.
+
+  31 Jul 2004; <malc@gentoo.org> :
+  ~amd64 - closes bug #57958
+
+  27 Jul 2004; <malc@gentoo.org> knetscan-1.0.ebuild:
+  Add ~amd64, closes bug #57711
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  knetscan-1.0.ebuild:
+  Tidy
+
+  06 Jul 2004; Carsten Lohrke <carlo@gentoo.org> knetscan-1.0.ebuild:
+  QA: newdepend -> R/DEPEND, need-kde
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> knetscan-1.0.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  02 Nov 2002; Hannes Mehnert <hannes@gentoo.org> knetscan-1.0.ebuild:
+  marked stable for x86
 
 *knetscan-1.0 (24 Oct 2002)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> knetscan-1.0.ebuild :
+  set ~ppc in keywords
+
   24 Oct 2002; Hannes Mehnert <hannes@gentoo.org> knetscan-1.0.ebuild,
   ChangeLog: Initial ebuild. Thanks to jnagel@fim-ag.de (Juergen Nagel)
   for submission (bug #7254)
diff --git a/net-analyzer/knetscan/Manifest b/net-analyzer/knetscan/Manifest
index e69de29bb2d1..89a11f3a3f3f 100644
--- a/net-analyzer/knetscan/Manifest
+++ b/net-analyzer/knetscan/Manifest
@@ -0,0 +1,5 @@
+MD5 305022978ae66c9a8c08d9009f93df1f ChangeLog 1520
+MD5 1468646e270fe07d74031d286e9e2ac1 metadata.xml 244
+MD5 136ede80a7d1473864f0f910afb04248 knetscan-1.0.ebuild 702
+MD5 a0309807aa6545f25781e61c5f1264ff files/digest-knetscan-1.0 64
+MD5 c2c2a65f81c4b94c47932ae9cfab0dcc files/knetscan-1.0-desktop.diff 360
diff --git a/net-analyzer/knetscan/knetscan-1.0.ebuild b/net-analyzer/knetscan/knetscan-1.0.ebuild
index 3631794cfe17..eb8533816ed3 100644
--- a/net-analyzer/knetscan/knetscan-1.0.ebuild
+++ b/net-analyzer/knetscan/knetscan-1.0.ebuild
@@ -1,18 +1,26 @@
-# 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/net-analyzer/knetscan/knetscan-1.0.ebuild,v 1.1 2002/10/24 18:11:32 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knetscan/knetscan-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
-inherit kde-base
-need-kde 3
+inherit kde eutils
 
-IUSE=""
-LICENSE="GPL-2"
 DESCRIPTION="KDE frontend for nmap, ping, whois and traceroute"
-SRC_URI="mirror://sourceforge/knetscan/${P}.tar.gz"
 HOMEPAGE="http://sourceforge.net/projects/knetscan"
-KEYWORDS="~x86"
+SRC_URI="mirror://sourceforge/knetscan/${P}.tar.gz"
 
-newdepend ">=net-analyzer/nmap-2.54_beta36
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ppc ~sparc x86"
+IUSE=""
+
+DEPEND=">=net-analyzer/nmap-2.54_beta36
 	>=net-analyzer/traceroute-1.4_p12
 	>=net-misc/whois-4.5.28-r1
 	>=sys-apps/netkit-base-0.17-r5"
+
+need-kde 3
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-desktop.diff
+}
diff --git a/net-analyzer/knocker/ChangeLog b/net-analyzer/knocker/ChangeLog
index 58f2b82263d7..64834602c824 100644
--- a/net-analyzer/knocker/ChangeLog
+++ b/net-analyzer/knocker/ChangeLog
@@ -1,13 +1,32 @@
 # ChangeLog for net-analyzer/knocker
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knocker/ChangeLog,v 1.1 2002/05/30 00:42:41 spider Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knocker/ChangeLog,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> knocker-0.7.1.ebuild:
+  Stable on ppc.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> knocker-0.7.1.ebuild:
+  Tidy
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  knocker-0.7.1.ebuild:
+  change virtual/glibc to virtual/libc, add metadata.xml, add IUSE
+
+  15 Apr 2004; David Holm <dholm@gentoo.org> knocker-0.7.1.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*knocker-0.7.1 (04 Jul 2002)
+  04 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> knocker-0.7.1.ebuild :    
+  New version.
 
 *knocker-0.7.0 (19 May 2002)
-  19 May 2002; Gabriele Giorgetti <g.gabriele79@genie.it> knocker-0.7.0.ebuild :
+  19 May 2002; Gabriele Giorgetti <stroke@gentoo.org> knocker-0.7.0.ebuild :
   Updated version.
 
 *knocker-0.6.6 (13 May 2002)
-  13 May 2002; Gabriele Giorgetti <g.gabriele79@genie.it> ChangeLog :
+  13 May 2002; Gabriele Giorgetti <stroke@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
diff --git a/net-analyzer/knocker/Manifest b/net-analyzer/knocker/Manifest
index e69de29bb2d1..658c29acada3 100644
--- a/net-analyzer/knocker/Manifest
+++ b/net-analyzer/knocker/Manifest
@@ -0,0 +1,4 @@
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 460f3698615889e892331d9e8d8dce6c ChangeLog 1428
+MD5 6499f036d7f914f0e37d8514bd71e039 knocker-0.7.1.ebuild 762
+MD5 e4f468d1656b781e38a2a8fa6d9090ca files/digest-knocker-0.7.1 64
diff --git a/net-analyzer/knocker/knocker-0.7.1.ebuild b/net-analyzer/knocker/knocker-0.7.1.ebuild
index 3a4c8192b52d..e62f8b9a5627 100644
--- a/net-analyzer/knocker/knocker-0.7.1.ebuild
+++ b/net-analyzer/knocker/knocker-0.7.1.ebuild
@@ -1,17 +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/net-analyzer/knocker/knocker-0.7.1.ebuild,v 1.1 2002/07/04 14:38:15 stroke Exp $
-
-S=${WORKDIR}/${P}
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/knocker/knocker-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
 
 DESCRIPTION="Knocker is an easy to use security port scanner written in C"
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/knocker/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/knocker/${P}.tar.gz"
 HOMEPAGE="http://knocker.sourceforge.net"
-LICENSE="GPL-2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ppc"
+IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="${DEPEND}"
+DEPEND="virtual/libc"
 
 src_compile() {
 	./configure \
diff --git a/net-analyzer/labrea/ChangeLog b/net-analyzer/labrea/ChangeLog
index 8d42b01cd215..d80f8c2942ac 100644
--- a/net-analyzer/labrea/ChangeLog
+++ b/net-analyzer/labrea/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/labrea
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/labrea/ChangeLog,v 1.1 2004/07/04 22:20:03 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/labrea/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> labrea-2.5.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> labrea-2.5.ebuild:
+  x86 stable
+
+  05 Jul 2004; David Holm <dholm@gentoo.org> labrea-2.5.ebuild:
+  Added to ~ppc.
 
 *labrea-2.5 (05 Jul 2004)
 
diff --git a/net-analyzer/labrea/Manifest b/net-analyzer/labrea/Manifest
index d2d98dbe4680..8a3113a3db70 100644
--- a/net-analyzer/labrea/Manifest
+++ b/net-analyzer/labrea/Manifest
@@ -1,2 +1,14 @@
-MD5 406c552e83b316d87e265ce0b6f0170a labrea-2.5.ebuild 862
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 22d887096677261134ab7abd1d47fad8 ChangeLog 644
+MD5 e2fb9aa4f6e7b6edd0ebf630d54a5f64 labrea-2.5.ebuild 862
+MD5 50bd000ac8d7a56d6ba14c18a174d261 metadata.xml 220
 MD5 4653152ea460bf93b94635cb7f867e2a files/digest-labrea-2.5 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB+xtamdTrptrqvGERAjfVAJ9YcV3H7+OEPFrXfqh26Z+c+LvpYgCgnI5b
+kSGODkztROXg7FjcKVCR8ic=
+=XUGR
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/labrea/labrea-2.5.ebuild b/net-analyzer/labrea/labrea-2.5.ebuild
index e0c5cd79c147..e0b601bfcd16 100644
--- a/net-analyzer/labrea/labrea-2.5.ebuild
+++ b/net-analyzer/labrea/labrea-2.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/net-analyzer/labrea/labrea-2.5.ebuild,v 1.1 2004/07/04 22:20:03 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/labrea/labrea-2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="'Sticky' Honeypot and IDS"
 HOMEPAGE="http://labrea.sourceforge.net/"
@@ -9,9 +9,9 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	>=dev-libs/libdnet-1.7"
 
 MY_P="${P}-stable-1"
diff --git a/net-analyzer/lft/ChangeLog b/net-analyzer/lft/ChangeLog
index 124d3402110d..a5325600295e 100644
--- a/net-analyzer/lft/ChangeLog
+++ b/net-analyzer/lft/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for net-analyzer/lft
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/lft/ChangeLog,v 1.1 2003/10/13 16:08:54 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/lft/ChangeLog,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+*lft-2.5 (03 Sep 2005)
+
+  03 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/lft-2.5-installpath.patch, +lft-2.5.ebuild:
+  version bump
+
+  02 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> lft-2.31.ebuild:
+  amd64 stable. Closes bug 100959. Thanks to Andrew D Kirch
+  <trelane@trelane.net>.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> lft-2.31.ebuild:
+  Added to ~ppc.
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -lft-2.2.ebuild,
+  lft-2.31.ebuild:
+  Remove old version, avoid suid related security issues.
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org> lft-2.31.ebuild:
+  Marked x86 stable.
+
+*lft-2.31 (02 Apr 2005)
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> +lft-2.31.ebuild:
+  Version bump. Changed LICENSE to VOSTROM, using mirror://gentoo for SRC_URI.
+
+  21 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> lft-2.2.ebuild:
+  Updated homepage.
+
+  06 Feb 2005; Kito <kito@gentoo.org> lft-2.2.ebuild:
+  keyword ~ppc-macos closes bug 68499
+
+  30 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> lft-2.2.ebuild:
+  added ~amd64 to KEYWORDS. fixes #79783
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> lft-2.2.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, lft-2.2.ebuild:
+  Added missing IUSE, marked x86 stable
 
 *lft-2.2 (13 Oct 2003)
 
diff --git a/net-analyzer/lft/Manifest b/net-analyzer/lft/Manifest
index ef00938b443d..1eab3479a53d 100644
--- a/net-analyzer/lft/Manifest
+++ b/net-analyzer/lft/Manifest
@@ -1,3 +1,17 @@
-MD5 a5e4182f300d1f41e8957bfb184842d9 files/digest-lft-2.2 59
-MD5 c9163ca94ebbb41fad168452f5673961 lft-2.2.ebuild 524
-MD5 d58f1a1fdfa6828b98b71b954d45d90e ChangeLog 368
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 22f97f48e8550073c2df1f3df03cf4ed ChangeLog 1690
+MD5 d84c5882864fa4e6f61ed6963033cb0a lft-2.5.ebuild 794
+MD5 bb22173a418c973dd61905d5cbf16cf6 metadata.xml 255
+MD5 741339e85af30ac9b050478681cbaae5 lft-2.31.ebuild 686
+MD5 ad9ef8974fea56e649458d5addeb4818 files/digest-lft-2.5 59
+MD5 ceb29e8400bccbb7770137909245459d files/digest-lft-2.31 60
+MD5 45204b9b9a76818b582828b910b9831f files/lft-2.5-installpath.patch 1262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGVI7mdTrptrqvGERAsrYAJ9Qd35DzALEIEUUREt7QEFflGNGXwCeI6ln
+D2Kyh8XUp9oLX5yVm8adgyo=
+=wvi/
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/lft/lft-2.31.ebuild b/net-analyzer/lft/lft-2.31.ebuild
index cd305c094c7e..2f2e30c1bc40 100644
--- a/net-analyzer/lft/lft-2.31.ebuild
+++ b/net-analyzer/lft/lft-2.31.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/net-analyzer/lft/lft-2.31.ebuild,v 1.1 2005/04/03 02:47:29 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/lft/lft-2.31.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Layer Four Traceroute: an advanced traceroute implementation"
 HOMEPAGE="http://oppleman.com/lft/"
@@ -8,11 +10,19 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="VOSTROM"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc-macos"
+KEYWORDS="amd64 ~ppc ~ppc-macos x86"
 IUSE=""
 
 DEPEND="virtual/libpcap"
 
+src_compile() {
+	# avoid suid related security issues.
+	append-ldflags -Wl,-z,now
+
+	econf || die
+	emake || die
+}
+
 src_install() {
 	einstall || die "einstall failed"
 	dodoc CHANGELOG README TODO
diff --git a/net-analyzer/lft/lft-2.5.ebuild b/net-analyzer/lft/lft-2.5.ebuild
index b4e69c59e1af..350b106ab013 100644
--- a/net-analyzer/lft/lft-2.5.ebuild
+++ b/net-analyzer/lft/lft-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/net-analyzer/lft/lft-2.5.ebuild,v 1.1 2005/09/03 07:35:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/lft/lft-2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit flag-o-matic eutils
 
diff --git a/net-analyzer/libnasl/ChangeLog b/net-analyzer/libnasl/ChangeLog
index fb74a184dd29..3c61995f5686 100644
--- a/net-analyzer/libnasl/ChangeLog
+++ b/net-analyzer/libnasl/ChangeLog
@@ -1,12 +1,272 @@
 # ChangeLog for net-analyzer/libnasl
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.1 2002/07/26 19:55:10 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
+
+*libnasl-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> libnasl-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> libnasl-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> libnasl-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  04 Aug 2005; Fabian Groffen <grobian@gentoo.org> libnasl-2.2.4.ebuild:
+  Marking ~ppc-macos
+
+*libnasl-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -libnasl-2.0.12.ebuild,
+  -libnasl-2.2.0.ebuild, -libnasl-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org> libnasl-2.2.4.ebuild:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> libnasl-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.2.4.ebuild:
+  Stable on alpha.
+
+*libnasl-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org> +libnasl-2.3.1.ebuild:
+  Version bump for bug 78497
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> libnasl-2.2.4.ebuild:
+  Stable on SPARC.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -libnasl-2.2.2a.ebuild,
+  -libnasl-2.2.3.ebuild, libnasl-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.2a.ebuild,
+  libnasl-2.2.3.ebuild, libnasl-2.2.4.ebuild, libnasl-2.3.0.ebuild:
+  Use make install instead of emake install.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> libnasl-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> libnasl-2.2.0.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> libnasl-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> libnasl-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*libnasl-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +libnasl-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+*libnasl-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> +libnasl-2.2.3.ebuild,
+  libnasl-2.3.0.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Feb 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.0.12.ebuild,
+  libnasl-2.2.0.ebuild:
+  Fixed broken install routines as per bug #82364. Thanks to mrgoby
+  <mrgoby@gmail.com>
+
+  15 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> libnasl-2.3.0.ebuild:
+  Use virtual/tetex rather than app-text/tetex for bug 82072.
+
+  14 Feb 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.0.12.ebuild,
+  libnasl-2.3.0.ebuild:
+  Compile fault and doc flag added as per bug #81962 and bug #81975. Thanks to
+  Nguyen Thai Ngoc Duy <pclouds@gentoo.org>
+
+*libnasl-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.2.0.ebuild,
+  +libnasl-2.2.2a.ebuild, libnasl-2.3.0.ebuild:
+  Add latest stable version (bug #78789). 2.3.0 uses correct CC now. Added
+  missing ppc64 keywords
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> libnasl-2.3.0.ebuild:
+  Parallel make disabled as per bug #77685
+
+*libnasl-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org> +libnasl-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*libnasl-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -libnasl-2.1.1.ebuild,
+  +libnasl-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> libnasl-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> libnasl-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> libnasl-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  -files/libnasl-2.0.7-gentoo.patch, -files/libnasl-2.0.8a-gentoo.patch,
+  -files/libnasl.patch, -libnasl-2.0.11.ebuild, -libnasl-2.0.7.ebuild,
+  -libnasl-2.0.8a.ebuild, -libnasl-2.0.9.ebuild, -libnasl-2.1.0.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> libnasl-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> libnasl-2.0.11.ebuild:
+  stable on ppc64, bug #57454
+
+*libnasl-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.1.1.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> libnasl-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*libnasl-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*libnasl-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.0.11.ebuild:
+  Version bump.
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> libnasl-2.0.10a.ebuild:
+  Stable on sparc.
+
+*libnasl-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +libnasl-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> libnasl-2.0.10a.ebuild:
+  marked x86 stable
+
+*libnasl-2.0.8a (10 Jul 2004)
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  libnasl-2.0.10a.ebuild, libnasl-2.0.7.ebuild, libnasl-2.0.8a.ebuild,
+  libnasl-2.0.9.ebuild:
+  Added metadata, missing IUSEs
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> libnasl-2.0.10a.ebuild:
+  Stable on alpha.
+
+*libnasl-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.10a.ebuild:
+  Version bump. Patch no longer needed.
+
+*libnasl-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.6a.ebuild,
+  libnasl-2.0.9.ebuild, files/libnasl-2.0.4-gentoo.patch,
+  files/libnasl-2.0.6a-gentoo.patch, files/libnasl.patch:
+  Version bump and cleanup.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> libnasl-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+*libnasl-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.7.ebuild,
+  files/libnasl-2.0.7-gentoo.patch:
+  Version bump
+
+*libnasl-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.6a.ebuild,
+  files/libnasl-2.0.6a-gentoo.patch:
+  Version bump, should fix bug 21529
+
+*libnasl-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org> libnasl-2.0.5.ebuild,
+  files/libnasl-2.0.5-gentoo.patch:
+  Version bump, bug #20901.
+
+*libnasl-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*libnasl-2.0.0 (25 Feb 2003)
+
+  05 Mar 2003; Alastair Tse <liquidx@gentoo.org> libnasl-2.0.0.ebuild :
+  using make instead of emake. resolves #16471.
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*libnasl-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> libnasl-1.2.7.ebuild :
+  Fixed doc location.  Changed to epatch.  Changed to DEBUGBUILD.
+  Marked stable for x86.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*libnasl-1.2.6 (05 Nov 2002)
+
+  12 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> libnasl-1.2.6.ebuild :
+  Fixed #10521.
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*libnasl-1.2.4 (22 Aug 2002)
+
+  12 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> libnasl-1.2.4.ebuild :
+  Fixed #10521.
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  libnasl-1.2.4.ebuild, files/digest-libnasl-1.2.4 :
+  Version bump.
 
 *libnasl-1.2.3 (26 Jul 2002)
 
   26 Jul 2002; Nick Hadaway <raker@gentoo.org>
   libnasl-1.2.3.ebuild, files/digest-libnasl-1.2.3, files/nasl.diff :
-
   Split out the "nessus" ebuild to the individual nessues components
   to allow pieces to build and install properly.  "nessus" is still
   an installable ebuild, it just pulls in the individual components.
diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
index 4bf46481d134..a302430ae13c 100644
--- a/net-analyzer/libnasl/Manifest
+++ b/net-analyzer/libnasl/Manifest
@@ -1,17 +1,10 @@
-MD5 65817f88d8f6b9d9f55d5c5a4319a823 libnasl-2.0.4.ebuild 1223
-MD5 d5b168f187e3202ae96cba9b6efa5204 libnasl-1.2.7.ebuild 1159
-MD5 5e4a6cdb4c44d4ca837ecd236c78e583 libnasl-1.2.4.ebuild 1051
-MD5 e2237b9c1c0e1d25afd011db56e90683 libnasl-1.2.6.ebuild 1165
-MD5 8bc6508d80695d868a22ecc50c9caa58 libnasl-2.0.5.ebuild 1227
-MD5 bdb7c95623eb9625babd2426ddd8e656 libnasl-2.0.0.ebuild 1226
-MD5 2186ec9f414c3cf45a4a0be136775455 ChangeLog 1990
-MD5 ffa8b1ea4e7564853e83e2a9b1b97d1a files/digest-libnasl-1.2.4 65
-MD5 2d642948f2d341e47ca4f8fb334a811c files/digest-libnasl-1.2.6 65
-MD5 90a151137ea58f2508d1610285909547 files/digest-libnasl-1.2.7 65
-MD5 daf0506c765e019400e881fd3b30f13e files/digest-libnasl-2.0.0 65
-MD5 d79b51c680dfc5d0ac7412eaac9f9f04 files/digest-libnasl-2.0.4 65
-MD5 06d0832cf902cb1762204226c5af3274 files/digest-libnasl-2.0.5 65
-MD5 66f66f3e28aba3711a59ab98581aafce files/libnasl-2.0.5-gentoo.patch 534
-MD5 66f66f3e28aba3711a59ab98581aafce files/libnasl-2.0.4-gentoo.patch 534
-MD5 66f66f3e28aba3711a59ab98581aafce files/libnasl-2.0.0-gentoo.patch 534
-MD5 f705034330b6547b71f7fc8a212072e4 files/nasl.diff 463
+MD5 0993cc6c074cc4f775d1fa382a9411e6 libnasl-2.3.1.ebuild 841
+MD5 350a6897a18d8b08fa899afd8e2d317d libnasl-2.2.5.ebuild 814
+MD5 c7167556ba435e22e7ad934a5cf7b271 libnasl-2.2.4.ebuild 831
+MD5 2c738297ccec7acf8c0312a895032b9d libnasl-2.2.6.ebuild 820
+MD5 19d407f2b017a2e86baacb1541775564 ChangeLog 9271
+MD5 2b49e0e28b017e3ed6989df41c1b1d74 metadata.xml 240
+MD5 cd59b89e1b227dfb0c4513ef884c3dc0 files/digest-libnasl-2.2.4 65
+MD5 c5d63434e19f4b35536ea9c8012d5eaf files/digest-libnasl-2.2.5 65
+MD5 b7af1b93dd20ded0134dacd7f9163c74 files/digest-libnasl-2.2.6 65
+MD5 fdd93c01e425153f03232fd573c77604 files/digest-libnasl-2.3.1 65
diff --git a/net-analyzer/libnasl/libnasl-2.2.4.ebuild b/net-analyzer/libnasl/libnasl-2.2.4.ebuild
index d0f9d892a8bc..997219f960f7 100644
--- a/net-analyzer/libnasl/libnasl-2.2.4.ebuild
+++ b/net-analyzer/libnasl/libnasl-2.2.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/net-analyzer/libnasl/libnasl-2.2.4.ebuild,v 1.1 2005/03/24 00:16:47 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 DEPEND="=net-analyzer/nessus-libraries-${PV}"
@@ -26,6 +26,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "Install failed libnasl"
+	make DESTDIR=${D} install || die "Install failed libnasl"
 	dodoc COPYING
 }
diff --git a/net-analyzer/libnasl/libnasl-2.2.5.ebuild b/net-analyzer/libnasl/libnasl-2.2.5.ebuild
index c7f0bcbbc176..0fb1ee2993e1 100644
--- a/net-analyzer/libnasl/libnasl-2.2.5.ebuild
+++ b/net-analyzer/libnasl/libnasl-2.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/net-analyzer/libnasl/libnasl-2.2.5.ebuild,v 1.1 2005/07/24 03:31:15 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -10,15 +10,15 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="=net-analyzer/nessus-libraries-${PV}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf || die "configuration failed"
 	# emake fails for >= -j2. bug #16471.
 	emake -C nasl cflags
@@ -26,6 +26,5 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "Install failed libnasl"
-	dodoc COPYING
+	make DESTDIR="${D}" install || die "Install failed libnasl"
 }
diff --git a/net-analyzer/libnasl/libnasl-2.2.6.ebuild b/net-analyzer/libnasl/libnasl-2.2.6.ebuild
index 7278fac51353..60df4c93b6e4 100644
--- a/net-analyzer/libnasl/libnasl-2.2.6.ebuild
+++ b/net-analyzer/libnasl/libnasl-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/net-analyzer/libnasl/libnasl-2.2.6.ebuild,v 1.1 2005/11/09 19:52:17 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/libnasl/libnasl-2.3.1.ebuild b/net-analyzer/libnasl/libnasl-2.3.1.ebuild
index 4ce64d04eeed..25097080f6f4 100644
--- a/net-analyzer/libnasl/libnasl-2.3.1.ebuild
+++ b/net-analyzer/libnasl/libnasl-2.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/net-analyzer/libnasl/libnasl-2.3.1.ebuild,v 1.1 2005/05/15 13:25:51 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/linkchecker/ChangeLog b/net-analyzer/linkchecker/ChangeLog
index b428f5fcec0c..fda35b3022e3 100644
--- a/net-analyzer/linkchecker/ChangeLog
+++ b/net-analyzer/linkchecker/ChangeLog
@@ -1,6 +1,96 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.1 2004/04/23 12:08:02 stuart Exp $
+# ChangeLog for net-analyzer/linkchecker
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+*linkchecker-3.3 (14 Oct 2005)
+
+  14 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> -linkchecker-3.1.ebuild,
+  +linkchecker-3.3.ebuild:
+  Version bump.
+
+*linkchecker-3.2 (05 Aug 2005)
+
+  05 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> +linkchecker-3.2.ebuild:
+  Version bump.
+
+*linkchecker-3.1 (22 Jul 2005)
+
+  22 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -linkchecker-2.9.ebuild,
+  -linkchecker-3.0.1.ebuild, +linkchecker-3.1.ebuild:
+  Version bump; tidy old ebuilds.
+
+*linkchecker-3.0.1 (11 Jul 2005)
+
+  11 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +linkchecker-3.0.1.ebuild:
+  Version bump.
+
+  09 May 2005; David Holm <dholm@gentoo.org> linkchecker-1.12.1.ebuild:
+  Stable on ppc.
+
+*linkchecker-2.9 (23 Apr 2005)
+
+  23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> -linkchecker-2.7.ebuild,
+  -linkchecker-2.8.ebuild, +linkchecker-2.9.ebuild:
+  Version bump.
+
+*linkchecker-2.8 (09 Apr 2005)
+
+  09 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> -linkchecker-2.6.ebuild,
+  +linkchecker-2.8.ebuild:
+  Version bump.
+
+*linkchecker-2.7 (31 Mar 2005)
+
+  31 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> -linkchecker-2.4.ebuild,
+  -linkchecker-2.5.ebuild, +linkchecker-2.7.ebuild:
+  Version bump; tidy old ebuilds.
+
+*linkchecker-2.6 (16 Mar 2005)
+
+  16 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> linkchecker-2.4.ebuild,
+  +linkchecker-2.6.ebuild:
+  Version bump.
+
+  10 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> linkchecker-2.4.ebuild,
+  linkchecker-2.5.ebuild:
+  Fixed deps; >=2.4 depends on >=python-2.4 - bug 84596.
+
+*linkchecker-2.5 (04 Mar 2005)
+
+  04 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> linkchecker-2.4.ebuild,
+  +linkchecker-2.5.ebuild:
+  Version bump; 2.4 stable on x86.
+
+*linkchecker-2.4 (09 Feb 2005)
+
+  09 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  -linkchecker-1.12.0.ebuild, linkchecker-1.12.1.ebuild,
+  +linkchecker-2.4.ebuild:
+  Version bump; also fixed man page perms for bug 62647.
+
+  23 Nov 2004; Mike Doty <kingtaco@gentoo.org> linkchecker-1.12.1.ebuild:
+  ~amd64 keyword added
+
+  08 Sep 2004; Renat Lumpau <rl03@gentoo.org> metadata.xml:
+  Fixed herd name
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> linkchecker-1.12.0.ebuild,
+  linkchecker-1.12.1.ebuild:
+  marked x86 stable
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> linkchecker-1.12.1.ebuild:
+  Added to ~ppc.
+
+*linkchecker-1.12.1 (23 Apr 2004)
+
+  23 Apr 2004; Stuart Herbert <stuart@gentoo.org> linkchecker-1.12.0.ebuild,
+  linkchecker-1.12.1.ebuild:
+  Added missing SLOT
+
+*linkchecker-1.12.1 (23 Apr 2004)
+
+  23 Apr 2004; Stuart Herbert <stuart@gentoo.org> linkchecker-1.12.1.ebuild:
+  Version bump
 
 *linkchecker-1.12.0 (23 Apr 2004)
 
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index c6b9facf2701..f0a82b0eb44b 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,2 +1,18 @@
-MD5 2756c217ee750b1b2e8fd68c9884e673 linkchecker-1.12.0.ebuild 407
-MD5 ada0cf8670c69e83f3dc8d4a210573cd files/digest-linkchecker-1.12.0 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ecddbd7f9885932340fb1a3caf188afd ChangeLog 3016
+MD5 fe51c9bc36ce4ce1967c3abf0898dfe3 files/digest-linkchecker-1.12.1 70
+MD5 b44364482dda1723e4b067d7fb64f888 files/digest-linkchecker-3.2 67
+MD5 dfd6e0c885be8d7dc96a674c28821d39 files/digest-linkchecker-3.3 67
+MD5 cba6642890d7458662f063ff839b9858 linkchecker-1.12.1.ebuild 657
+MD5 e601da3d8a0e9b022d2b4a95ff3a227e linkchecker-3.2.ebuild 509
+MD5 fcb81310bbdbbe22f0ad069718067c1c linkchecker-3.3.ebuild 509
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDUB2SEZCkKN40op4RAtu+AKDBaa1Vv0XrOn6KeTpRmeL101SbjgCgkZVB
+yNljPG4K71MbxE80TFxWJnc=
+=M2qC
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/linkchecker/linkchecker-1.12.1.ebuild b/net-analyzer/linkchecker/linkchecker-1.12.1.ebuild
index a3ce730761fe..8934586c6900 100644
--- a/net-analyzer/linkchecker/linkchecker-1.12.1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-1.12.1.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/net-analyzer/linkchecker/linkchecker-1.12.1.ebuild,v 1.1 2004/04/23 18:48:29 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-1.12.1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 IUSE=""
 
@@ -10,8 +10,14 @@ LICENSE="GPL-2"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://linkchecker.sourceforge.net/"
 DESCRIPTION="LinkChecker can check HTML documents for broken links."
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc ~amd64"
 RESTRICT="nomirror"
 SLOT=0
 
 DEPEND=">=dev-lang/python-2.3.3"
+
+src_install() {
+	distutils_src_install
+	# setup.py installs with 0600 perms
+	chmod 0644 ${D}/usr/share/man/man1/linkchecker.1
+}
diff --git a/net-analyzer/linkchecker/linkchecker-3.2.ebuild b/net-analyzer/linkchecker/linkchecker-3.2.ebuild
index 51aebdf07da7..63e0594501b6 100644
--- a/net-analyzer/linkchecker/linkchecker-3.2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-3.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/net-analyzer/linkchecker/linkchecker-3.2.ebuild,v 1.1 2005/08/05 06:14:17 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-analyzer/linkchecker/linkchecker-3.3.ebuild b/net-analyzer/linkchecker/linkchecker-3.3.ebuild
index feab522f9475..3d2d33b1acbe 100644
--- a/net-analyzer/linkchecker/linkchecker-3.3.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-3.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/net-analyzer/linkchecker/linkchecker-3.3.ebuild,v 1.1 2005/10/14 21:05:10 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-3.3.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 0d59c319c3eb..d31152aca840 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>webapps</herd>
-<maintainer>
-  <email>web-apps@gentoo.org</email>
-</maintainer>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>ka0ttic@gentoo.org</email>
+		<name>Aaron Walker</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/macchanger/ChangeLog b/net-analyzer/macchanger/ChangeLog
index 0355557c3c1d..0af9bb1035c6 100644
--- a/net-analyzer/macchanger/ChangeLog
+++ b/net-analyzer/macchanger/ChangeLog
@@ -1,6 +1,52 @@
-# ChangeLog for net-analyzer/mtr
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/ChangeLog,v 1.1 2003/05/18 19:28:30 mholzer Exp $
+# ChangeLog for net-analyzer/macchanger
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/ChangeLog,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
+
+  20 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -macchanger-1.3.0-r1.ebuild, macchanger-1.5.0.ebuild:
+  Use mirror://gnu, do not install COPYING or INSTALL.
+
+  02 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -macchanger-1.3.0.ebuild:
+  Removing old version.
+
+  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> macchanger-1.5.0.ebuild:
+  Stable on sparc
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> macchanger-1.5.0.ebuild:
+  x86 stable
+
+  31 Jul 2004; Malcolm Lashley <malc@gentoo.org> macchanger-1.5.0.ebuild:
+  ~amd64 - closes bug #58056
+
+*macchanger-1.5.0 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> macchanger-1.3.0-r1.ebuild,
+  +macchanger-1.5.0.ebuild:
+  Moved datadir to /lib. Closes #57046. Version bump to 1.5.0.
+
+  19 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  macchanger-1.3.0-r1.ebuild, macchanger-1.3.0.ebuild:
+  change virtual/glibc to virtual/libc, add metadata.xml
+
+  19 Jun 2004; Jason Wever <weeve@gentoo.org> macchanger-1.3.0-r1.ebuild:
+  Stable on sparc.
+
+  14 Dec 2003; Lars Weiler <pylon@gentoo.org> macchanger-1.3.0-r1.ebuild:
+  Make stable on ppc
+  Thanks to Florian Daniel for the testing
+
+  24 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  macchanger-1.3.0-r1.ebuild:
+  provide symlinks at old locations
+
+*macchanger-1.3.0-r1 (24 Sep 2003)
+
+  24 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
+  macchanger-1.3.0-r1.ebuild:
+  move binary to /sbin and data to /share, for use when /usr is nfs mounted
 
 *macchanger-1.3.0 (18 May 2003)
 
diff --git a/net-analyzer/macchanger/Manifest b/net-analyzer/macchanger/Manifest
index 7c8deddebf91..6ff357db4399 100644
--- a/net-analyzer/macchanger/Manifest
+++ b/net-analyzer/macchanger/Manifest
@@ -1,4 +1,4 @@
-MD5 d67a73ced3880d9ec9499a62097e50db macchanger-1.2.0.ebuild 416
-MD5 d67a73ced3880d9ec9499a62097e50db macchanger-1.3.0.ebuild 416
-MD5 6da79778add9b134af7319eb5a4cba79 files/digest-macchanger-1.2.0 68
-MD5 6309aed1d9992064d5d7e69be7b2071e files/digest-macchanger-1.3.0 68
+MD5 92144070037403c2554fd4286fa86dfc ChangeLog 1986
+MD5 faa2b39ec5f78f1c2c462647ffe9ec65 metadata.xml 252
+MD5 a4d91551256847b6544c08780f7ba866 macchanger-1.5.0.ebuild 892
+MD5 a79ffd45bd22632d34d05e7ccaafe65b files/digest-macchanger-1.5.0 68
diff --git a/net-analyzer/macchanger/macchanger-1.5.0.ebuild b/net-analyzer/macchanger/macchanger-1.5.0.ebuild
index e4280799e54e..7fe6b1814505 100644
--- a/net-analyzer/macchanger/macchanger-1.5.0.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.5.0.ebuild
@@ -1,13 +1,12 @@
-# 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/net-analyzer/macchanger/macchanger-1.5.0.ebuild,v 1.1 2004/07/24 13:58:11 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/macchanger/macchanger-1.5.0.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 DESCRIPTION="Utility for viewing/manipulating the MAC address of network interfaces"
 HOMEPAGE="http://www.alobbs.com/macchanger"
+SRC_URI="mirror://gnu/macchanger/${P}.tar.gz"
 LICENSE="GPL-2"
-
-SRC_URI="ftp://ftp.gnu.org/gnu/macchanger/${P}.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc ~amd64"
 IUSE=""
 SLOT="0"
 
@@ -24,9 +23,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "install failed"
+	make DESTDIR="${D}" install || die "install failed"
 
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 
 	dodir /usr/bin
 	dosym /sbin/macchanger /usr/bin/macchanger
diff --git a/net-analyzer/macchanger/metadata.xml b/net-analyzer/macchanger/metadata.xml
index 03aa50bab7e3..1ae80f6e6f6f 100644
--- a/net-analyzer/macchanger/metadata.xml
+++ b/net-analyzer/macchanger/metadata.xml
@@ -2,4 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+<maintainer>
+	<email>robbat2@gentoo.org</email>
+	<name>Robin H. Johnson</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/mbrowse/ChangeLog b/net-analyzer/mbrowse/ChangeLog
index 599dbc049fc1..09128e76756f 100644
--- a/net-analyzer/mbrowse/ChangeLog
+++ b/net-analyzer/mbrowse/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-analyzer/mbrowse
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mbrowse/ChangeLog,v 1.1 2004/02/10 18:54:23 anti Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mbrowse/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+  09 Oct 2005; <mkay@gentoo.org> mbrowse-0.3.1.ebuild:
+  Fixing gtk dependency (bug #108103)
+
+  08 Jul 2005; David Holm <dholm@gentoo.org> mbrowse-0.3.1.ebuild:
+  Added to ~ppc.
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> mbrowse-0.3.1.ebuild:
+  Stable on sparc.
+
+  30 Oct 2004; Malcolm Lashley <malc@gentoo.org> mbrowse-0.3.1.ebuild:
+  ~amd64 - Bug #66986
+
+  01 Oct 2004; Jason Wever <weeve@gentoo.org> mbrowse-0.3.1.ebuild:
+  Added ~sparc keyword.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> +files/0.3.1-gentoo.patch,
+  mbrowse-0.3.1.ebuild:
+  Applying fixes from Ron Flory <ron.flory@adtran.com> and kevin brown
+  <kevin.brown@air2web.com> irt #62751 and mbrowse mailing list archives. Apply
+  gcc-3.4 patch from myself.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> mbrowse-0.3.1.ebuild:
+  Tidy, x86 stable
 
 *mbrowse-0.3.1 (10 Feb 2004)
 
diff --git a/net-analyzer/mbrowse/Manifest b/net-analyzer/mbrowse/Manifest
index 5906c22ef94f..9a5b83c81fb5 100644
--- a/net-analyzer/mbrowse/Manifest
+++ b/net-analyzer/mbrowse/Manifest
@@ -1,3 +1,5 @@
-MD5 0f6f2e23a1201630f31d1447658590be mbrowse-0.3.1.ebuild 654
-MD5 bf8525766c31795d22d7731b274ca1d2 ChangeLog 332
+MD5 4a68d9752b33276b8924de193115d5f5 ChangeLog 1234
+MD5 71bb690b92e1871e52e07e4d30947fc0 mbrowse-0.3.1.ebuild 848
+MD5 e25c84fd1a2a0c0e81cacb709f6cbbbe metadata.xml 260
+MD5 1cd92450e64f554108329905ae42f71e files/0.3.1-gentoo.patch 805
 MD5 722ff9cd5c441cea1bea3c91714df7b7 files/digest-mbrowse-0.3.1 64
diff --git a/net-analyzer/mbrowse/mbrowse-0.3.1.ebuild b/net-analyzer/mbrowse/mbrowse-0.3.1.ebuild
index 6c29a237824c..e2bd0c0f7478 100644
--- a/net-analyzer/mbrowse/mbrowse-0.3.1.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.3.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/net-analyzer/mbrowse/mbrowse-0.3.1.ebuild,v 1.1 2004/02/10 18:54:23 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mbrowse/mbrowse-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="MBrowse is a graphical MIB browser"
 HOMEPAGE="http://www.kill-9.org/mbrowse/index.html"
@@ -8,13 +10,17 @@ SRC_URI="http://www.kill-9.org/mbrowse/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/snmp
-	>=x11-libs/gtk+-1.2.10"
+DEPEND="net-analyzer/net-snmp
+	=x11-libs/gtk+-1.2*"
 
-S=${WORKDIR}/${P}
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/0.3.1-gentoo.patch
+}
 
 src_compile() {
 	./configure \
diff --git a/net-analyzer/metadata.xml b/net-analyzer/metadata.xml
index 9e0d1def4743..c98d8b4823a2 100644
--- a/net-analyzer/metadata.xml
+++ b/net-analyzer/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The net-analyzer category contains network analysis software.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-analyzer enthält Software zur Netzwerkanalyse.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-analyzer contiene programas de análisis de redes.
+	</longdescription>
+	<longdescription lang="ja">
+		net-analyzerカテゴリーにはネットワーク・アナリシスのソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-analyzer categorie bevat applicaties voor netwerk-analyse.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-analyzer chứa các phần mềm phân tích mạng.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-analyzer contiene programmi per l'analisi della rete.
+	</longdescription>
 </catmetadata>
 
diff --git a/net-analyzer/metasploit/ChangeLog b/net-analyzer/metasploit/ChangeLog
index bc16e5ead5fb..ac499ec83d5e 100644
--- a/net-analyzer/metasploit/ChangeLog
+++ b/net-analyzer/metasploit/ChangeLog
@@ -1,9 +1,57 @@
 # ChangeLog for net-analyzer/metasploit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.1 2005/02/13 13:59:49 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+*metasploit-2.5 (24 Oct 2005)
+
+  24 Oct 2005; Benjamin Smee <strerror@gentoo.org> +metasploit-2.5.ebuild:
+  version bump. bug #110303
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  metasploit-2.4-r1.ebuild:
+  FreeBSD fixes: cp -a -> cp -pPR; root:root -> root:0.
+
+  12 Aug 2005; Olivier Crête <tester@gentoo.org> metasploit-2.4-r1.ebuild:
+  Marked ~amd64, closes bug #102111, thanks to Mike Cvet for testing
+
+  04 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  metasploit-2.4-r1.ebuild:
+  Use normal file instead of snapshot, wrt bug 95048.
+
+*metasploit-2.4-r1 (04 Jun 2005)
+
+  04 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -metasploit-2.4.ebuild,
+  +metasploit-2.4-r1.ebuild:
+  Revision bump. CA certificate changed, preventing use of msfupdate -u. Fixes
+  bug 95048. Thanks to H D Moore <gentoospam@digitaloffense.net>.
+
+*metasploit-2.4 (11 May 2005)
+
+  11 May 2005; Aaron Walker <ka0ttic@gentoo.org> +metasploit-2.4.ebuild:
+  Version bump.
+
+*metasploit-2.3-r2 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +files/msfweb.confd,
+  files/msfweb.initd, -metasploit-2.3.ebuild, -metasploit-2.3-r1.ebuild,
+  +metasploit-2.3-r2.ebuild:
+  Revision bump; add conf.d file and init.d enhancements. Thanks once again to
+  soulse in bug 90543. Tidy old ebuilds.
+
+  13 Mar 2005; Luca Barbato <lu_zero@gentoo.org> :
+  Fixed ChangeLog as requersted by reporter in bug #75532
+
+*metasploit-2.3-r1 (25 Feb 2005)
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +files/msfweb.initd,
+  +metasploit-2.3-r1.ebuild:
+  Revision bump; added msfweb init.d script thanks to soulse in bug 83123.
+
+  15 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> metasploit-2.3.ebuild:
+  Added missing dev-perl/TermReadKey dep for bug 81936.
 
 *metasploit-2.3 (13 Feb 2005)
 
   13 Feb 2005; Daniel Black <dragonheart@gentoo.org> +metasploit-2.3.ebuild:
-  Initial ebuild as per bug #81826 thanks to Marco Morales <soulse@gmail.com>
+  Initial ebuild as per bug #75532 thanks to Stefano <raistlin@s0ftpj.org>
 
diff --git a/net-analyzer/metasploit/Manifest b/net-analyzer/metasploit/Manifest
index b12c41722ef5..32472048ea75 100644
--- a/net-analyzer/metasploit/Manifest
+++ b/net-analyzer/metasploit/Manifest
@@ -1,3 +1,10 @@
-MD5 f7749730de048e43886bdce08644286b metasploit-2.3.ebuild 1100
-MD5 d92153bd1fe2451ba296d70226937178 metadata.xml 907
-MD5 38b31ffed97d630a113365424ecd9655 files/digest-metasploit-2.3 66
+MD5 8c7cc1c4d52b7544fa7ad5d7f5dd80cb metasploit-2.5.ebuild 1242
+MD5 0bd259ecdcb31386b685f2a489c8db2a metasploit-2.3-r2.ebuild 1238
+MD5 6c0dd265cfb2404d35f6dfe4cf3d420d metasploit-2.4-r1.ebuild 1246
+MD5 7f3f7033b220a8be6b88e5a966b67ee6 ChangeLog 2141
+MD5 5c7feb9f12264fd99f3f435216e82f26 metadata.xml 926
+MD5 1d0db6087ff1f30ade92102cea049779 files/digest-metasploit-2.5 66
+MD5 38b31ffed97d630a113365424ecd9655 files/digest-metasploit-2.3-r2 66
+MD5 0891d99b6de5481d3afce5f336d446de files/digest-metasploit-2.4-r1 66
+MD5 60ed26ce3c2cba88b12d53ffe7b7d4c8 files/msfweb.confd 273
+MD5 ee718583da001cce2972ed8f9c51c72e files/msfweb.initd 528
diff --git a/net-analyzer/metasploit/files/digest-metasploit-2.4-r1 b/net-analyzer/metasploit/files/digest-metasploit-2.4-r1
index 2dc21a095f99..a273cd3d51da 100644
--- a/net-analyzer/metasploit/files/digest-metasploit-2.4-r1
+++ b/net-analyzer/metasploit/files/digest-metasploit-2.4-r1
@@ -1 +1 @@
-MD5 3ac5cd0f0884139adc63a9ad9f762f09 framework-2.4-snapshot.tar.gz 2624110
+MD5 cb3319b92399c7fab68c742dc750589e framework-2.4.tar.gz 2607730
diff --git a/net-analyzer/metasploit/files/msfweb.initd b/net-analyzer/metasploit/files/msfweb.initd
index 66e6cc633b1b..9bb123141d52 100644
--- a/net-analyzer/metasploit/files/msfweb.initd
+++ b/net-analyzer/metasploit/files/msfweb.initd
@@ -1,18 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb.initd,v 1.1 2005/02/25 11:09:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/files/msfweb.initd,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 start() {
 	ebegin "Starting msfweb"
-	start-stop-daemon --start --quiet --exec /usr/bin/msfweb >/dev/null 2>&1 &
-	echo $! > /var/run/msfweb.pid
+	start-stop-daemon --start --quiet --exec /usr/bin/msfweb \
+		-- ${MSF_OPTS} >/dev/null 2>&1 &
+	echo $! > ${PIDFILE}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping msfweb"
-	start-stop-daemon --stop --quiet --pidfile /var/run/msfweb.pid
-	rm -f /var/run/msfweb.pid
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	rm -f ${PIDFILE}
 	eend $?
 }
diff --git a/net-analyzer/metasploit/metasploit-2.3-r2.ebuild b/net-analyzer/metasploit/metasploit-2.3-r2.ebuild
index 16f28dae7f17..db8bc8f3f644 100644
--- a/net-analyzer/metasploit/metasploit-2.3-r2.ebuild
+++ b/net-analyzer/metasploit/metasploit-2.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/net-analyzer/metasploit/metasploit-2.3-r2.ebuild,v 1.1 2005/04/27 12:01:41 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 MY_P="${P/metasploit/framework}"
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/metasploit/metasploit-2.4-r1.ebuild b/net-analyzer/metasploit/metasploit-2.4-r1.ebuild
index 8cad2376dd5d..fc42b8e4e09a 100644
--- a/net-analyzer/metasploit/metasploit-2.4-r1.ebuild
+++ b/net-analyzer/metasploit/metasploit-2.4-r1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.4-r1.ebuild,v 1.1 2005/06/04 23:09:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 MY_P="${P/metasploit/framework}"
 S="${WORKDIR}/${MY_P}"
 DESCRIPTION="The Metasploit Framework is an advanced open-source platform for developing, testing, and using vulnerability exploit code."
 HOMEPAGE="http://www.metasploit.org/"
-SRC_URI="http://metasploit.com/tools/${MY_P}-snapshot.tar.gz"
-# Note: the suffix snapshot might not exist in the next release
+SRC_URI="http://metasploit.com/tools/${MY_P}.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
@@ -24,12 +23,12 @@ src_install() {
 	dodir /usr/bin/
 
 	# should be as simple as copying everything into the target...
-	cp -a ${S} ${D}usr/lib/metasploit || die
+	cp -pPR ${S} ${D}usr/lib/metasploit || die
 
 	# and creating symlinks in the /usr/bin dir
 	cd ${D}/usr/bin
 	ln -s ../lib/metasploit/msf* ./ || die
-	chown -R root:root ${D}
+	chown -R root:0 ${D}
 
 	newinitd ${FILESDIR}/msfweb.initd msfweb || die "newinitd failed"
 	newconfd ${FILESDIR}/msfweb.confd msfweb || die "newconfd failed"
diff --git a/net-analyzer/metasploit/metasploit-2.5.ebuild b/net-analyzer/metasploit/metasploit-2.5.ebuild
index c6439e5b7e13..1c4888f754c6 100644
--- a/net-analyzer/metasploit/metasploit-2.5.ebuild
+++ b/net-analyzer/metasploit/metasploit-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/net-analyzer/metasploit/metasploit-2.5.ebuild,v 1.1 2005/10/24 10:18:06 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/metasploit/metasploit-2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 MY_P="${P/metasploit/framework}"
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/midas-nms/ChangeLog b/net-analyzer/midas-nms/ChangeLog
index 29ec26690f76..2a1274b836e2 100644
--- a/net-analyzer/midas-nms/ChangeLog
+++ b/net-analyzer/midas-nms/ChangeLog
@@ -1,9 +1,28 @@
 # ChangeLog for net-analyzer/midas-nms
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/ChangeLog,v 1.1 2004/10/20 14:17:46 bass Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/ChangeLog,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
+
+  20 Nov 2005; Stuart Herbert <stuart@gentoo.org> midas-nms-2.2f.ebuild:
+  Fixed broken DEPEND
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> midas-nms-2.2f.ebuild:
+  Added to ~ppc.
+
+  12 Apr 2005; Jason Wever <weeve@gentoo.org> :
+  Added ~sparc keyword.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> midas-nms-2.2f.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
 
 *midas-nms-2.2f (20 Oct 2004)
 
-  20 Oct 2004; ,,, <bass@gentoo.org> +midas-nms-2.2f.ebuild:
-  New ebuild
+  20 Oct 2004; Jose Alberto Suarez Lopez <bass@gentoo.org> midas-nms-2.2f.ebuild:
+  Fixed ebuild command.
+
+  20 Oct 2004; Jose Alberto Suarez Lopez <bass@gentoo.org> +files/midas-nms.conf,
+  +files/midas-nms.init, midas-nms-2.2f.ebuild:
+  Added init scripts.
 
+  20 Oct 2004; Jose Alberto Suarez Lopez <bass@gentoo.org> +midas-nms-2.2f.ebuild:
+  New ebuild.
+  
diff --git a/net-analyzer/midas-nms/Manifest b/net-analyzer/midas-nms/Manifest
index 4f9a7613729c..2fca35282d48 100644
--- a/net-analyzer/midas-nms/Manifest
+++ b/net-analyzer/midas-nms/Manifest
@@ -1,3 +1,7 @@
-MD5 6b3d23037601a0724dd887d05875ff62 midas-nms-2.2f.ebuild 1601
-MD5 e7a862adf3ca3c2e272a105a9d0f8508 files/install.php 19473
+MD5 12fc990619484e9c97a8f6d93723f80d ChangeLog 992
+MD5 2325a593d0fbd031c1c826c09c608094 metadata.xml 497
+MD5 cb790b86f16cf6b76030906ffcf372ae midas-nms-2.2f.ebuild 2197
 MD5 e695413f3cb4faaa8d209e436ca8e97c files/digest-midas-nms-2.2f 63
+MD5 e7a862adf3ca3c2e272a105a9d0f8508 files/install.php 19473
+MD5 a70fe843f9039c0cca758f502fde28a4 files/midas-nms.conf 115
+MD5 3bb9e896658871464ed4aac5231c843d files/midas-nms.init 1971
diff --git a/net-analyzer/midas-nms/files/midas-nms.init b/net-analyzer/midas-nms/files/midas-nms.init
index 880a4895891a..fd350682e6e0 100644
--- a/net-analyzer/midas-nms/files/midas-nms.init
+++ b/net-analyzer/midas-nms/files/midas-nms.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/files/midas-nms.init,v 1.1 2004/10/20 15:17:45 bass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/files/midas-nms.init,v 1.1.1.1 2005/11/30 10:12:21 chriswhite Exp $
 
 depend() {
     if [ "$MIDASs" ] ; then
diff --git a/net-analyzer/midas-nms/midas-nms-2.2f.ebuild b/net-analyzer/midas-nms/midas-nms-2.2f.ebuild
index 030b678e924b..017d8ce41500 100644
--- a/net-analyzer/midas-nms/midas-nms-2.2f.ebuild
+++ b/net-analyzer/midas-nms/midas-nms-2.2f.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/net-analyzer/midas-nms/midas-nms-2.2f.ebuild,v 1.1 2004/10/20 14:17:46 bass Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/midas-nms/midas-nms-2.2f.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 inherit webapp
 
@@ -10,11 +10,10 @@ SRC_URI="mirror://sourceforge/midas-nms/MIDAS-${PV}.tar.gz"
 HOMEPAGE="http://midas-nms.sf.net"
 LICENSE="MIT"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND="dev-db/mysql
-	net-libs/libpcap
-	net-www/webapp-config
+	virtual/libpcap
 	media-libs/gd"
 RDEPEND="net-www/apache
 	dev-php/mod_php"
@@ -31,7 +30,23 @@ src_compile() {
 src_install () {
 	webapp_src_preinst
 
-	make DESTDIR=${D} install || die
+#	make DESTDIR=${D} install || die
+
+	dodir /usr/etc
+	dodir /usr/bin
+
+	cp MIDASa/MIDASa.cf.dist ${D}/usr/etc
+	cp MIDASb/MIDASb.cf.dist ${D}/usr/etc
+	cp MIDASc/MIDASc.cf.dist ${D}/usr/etc
+	cp MIDASd/MIDASd.cf.dist ${D}/usr/etc
+	cp MIDASs/MIDASs.cf.dist ${D}/usr/etc
+	cp MIDASn/MIDASn.cf.dist ${D}/usr/etc
+	cp MIDASa/MIDASa ${D}/usr/bin
+	cp MIDASb/MIDASb ${D}/usr/bin
+	cp MIDASc/MIDASc ${D}/usr/bin
+	cp MIDASd/MIDASd ${D}/usr/bin
+	cp MIDASs/MIDASs ${D}/usr/bin
+	cp MIDASn/MIDASn ${D}/usr/bin
 
 	dodir /usr/share/midas-nms
 	dodir /usr/share/midas-nms/sql
@@ -47,6 +62,10 @@ src_install () {
 	dodoc COPYING
 	dodoc docs/CHANGELOG
 	dodoc docs/INSTALL.txt
+
+	# Init files
+	newconfd ${FILESDIR}/midas-nms.conf midas-nms
+	newinitd ${FILESDIR}/midas-nms.init midas-nms
 }
 
 pkg_postinst() {
@@ -62,4 +81,6 @@ pkg_postinst() {
 	einfo "The conf files are located in /usr/etc/MIDAS*.cf.dist"
 	einfo "Please read INSTALL.txt for more info."
 	einfo
+	einfo "To use the sniffer and IDS you need install snort too."
+	einfo
 }
diff --git a/net-analyzer/mirmon/ChangeLog b/net-analyzer/mirmon/ChangeLog
index 194724606cb4..405bdd65dd3f 100644
--- a/net-analyzer/mirmon/ChangeLog
+++ b/net-analyzer/mirmon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/mirmon
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mirmon/ChangeLog,v 1.1 2005/02/02 16:07:07 jforman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mirmon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> mirmon-1.36.ebuild:
+  Added to ~ppc.
 
   02 Feb 2005; Jeffrey Forman <jforman@gentoo.org> :
   Initial version of mirmon ebuild, version 1.36. To monitor mirrors update
diff --git a/net-analyzer/mirmon/Manifest b/net-analyzer/mirmon/Manifest
index 239cbaf40e10..374d66c2ff96 100644
--- a/net-analyzer/mirmon/Manifest
+++ b/net-analyzer/mirmon/Manifest
@@ -1,4 +1,4 @@
-MD5 24e55393e4e98eeeecd4f927af6ec202 mirmon-1.36.ebuild 533
+MD5 f980d1376efb6c25497816e5863e1564 ChangeLog 432
 MD5 a31bec9431c9dc3d1388d93bbe82d08b metadata.xml 387
-MD5 be61267a0756e4a578dce6fc930098f7 ChangeLog 259
+MD5 114ecf6beea5a6b8e97bb35bfc9b7f5e mirmon-1.36.ebuild 637
 MD5 fb630bcadab41f33ff4972ceae393f45 files/digest-mirmon-1.36 62
diff --git a/net-analyzer/mirmon/mirmon-1.36.ebuild b/net-analyzer/mirmon/mirmon-1.36.ebuild
index 180dd61b8a78..9597973820ee 100644
--- a/net-analyzer/mirmon/mirmon-1.36.ebuild
+++ b/net-analyzer/mirmon/mirmon-1.36.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/net-analyzer/mirmon/mirmon-1.36.ebuild,v 1.1 2005/02/02 16:07:07 jforman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mirmon/mirmon-1.36.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 inherit webapp
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.cs.uu.nl/people/henkp/$PN/src/$P.tar.gz"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 
 DEPEND=">=dev-lang/perl-5.8.5-r2"
 
diff --git a/net-analyzer/mping/ChangeLog b/net-analyzer/mping/ChangeLog
index efe71464fc10..8eef81cde9a7 100644
--- a/net-analyzer/mping/ChangeLog
+++ b/net-analyzer/mping/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/mping
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/ChangeLog,v 1.1 2004/02/21 05:40:43 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/ChangeLog,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
+
+  29 Aug 2005; <dang@gentoo.org> mping-2.0_rc1.ebuild:
+  Marked ~amd64
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> mping-2.0_rc1.ebuild:
+  Added to ~ppc.
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> mping-2.0_rc1.ebuild:
+  added ~ppc64, bug #64106
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> mping-2.0_rc1.ebuild:
+  Added ~sparc keyword.
 
 *mping-2.0_rc1 (21 Feb 2004)
 
diff --git a/net-analyzer/mping/Manifest b/net-analyzer/mping/Manifest
index c1e7f0b7b5c5..39a2037ee795 100644
--- a/net-analyzer/mping/Manifest
+++ b/net-analyzer/mping/Manifest
@@ -1,4 +1,14 @@
-MD5 c4cb24ed5c26ed05c8d4a164d5e9fe6b files/digest-mping-2.0_rc1 65
-MD5 9db5c67d6b9a56cbb342993cb9256335 mping-2.0_rc1.ebuild 499
-MD5 a9fe6b19fdea993874d7ecf78da998ff ChangeLog 352
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 08b936dbaa85df3884e731f0d86bc0b8 mping-2.0_rc1.ebuild 520
+MD5 d8d956d5578d9181f57e208bad0476a4 ChangeLog 684
 MD5 4a552cfffe105cd4631ce00ed0bb4e61 metadata.xml 597
+MD5 c4cb24ed5c26ed05c8d4a164d5e9fe6b files/digest-mping-2.0_rc1 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDE263omPajV0RnrERAv8/AJ9meQykfNGG/xLD1xr5jiWIDCypEgCfQENh
+2dQ1PVflxASGaaNQ9x2eld8=
+=D2pu
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/mping/mping-2.0_rc1.ebuild b/net-analyzer/mping/mping-2.0_rc1.ebuild
index e487c5da5675..bea50682817e 100644
--- a/net-analyzer/mping/mping-2.0_rc1.ebuild
+++ b/net-analyzer/mping/mping-2.0_rc1.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/net-analyzer/mping/mping-2.0_rc1.ebuild,v 1.1 2004/02/21 05:40:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mping/mping-2.0_rc1.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
 DESCRIPTION="IPv4/6 round-robin multiping client"
 HOMEPAGE="http://mping.uninett.no"
@@ -8,7 +8,8 @@ SRC_URI="http://mping.uninett.no/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
+IUSE=""
 
 src_install() {
 	make install DESTDIR=${D} || die
diff --git a/net-analyzer/mrtg/ChangeLog b/net-analyzer/mrtg/ChangeLog
index 6b14725ad62f..3d9c8f5e378e 100644
--- a/net-analyzer/mrtg/ChangeLog
+++ b/net-analyzer/mrtg/ChangeLog
@@ -1,6 +1,166 @@
 # ChangeLog for net-analyzer/mrtg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/ChangeLog,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> mrtg-2.12.2.ebuild:
+  FreeBSD fixes: cp -a -> cp -pPR.
+
+*mrtg-2.12.2 (19 Jun 2005)
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> files/mrtg.rc,
+  -mrtg-2.9.22.ebuild, -mrtg-2.10.14.ebuild, -mrtg-2.10.15.ebuild,
+  -mrtg-2.11.0.ebuild, mrtg-2.11.1.ebuild, mrtg-2.12.1.ebuild,
+  +mrtg-2.12.2.ebuild:
+  Remove old ebuilds, version bump, add configuration message in pkg_postinst
+  and fix utf-8 locales. The last fix was provided by Lars T. Mikkelsen
+  <ltm@mulm.dk> in bug 96535.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on ppc.
+
+*mrtg-2.12.1 (29 May 2005)
+
+  29 May 2005; Aaron Walker <ka0ttic@gentoo.org> +mrtg-2.12.1.ebuild:
+  Version bump.
+
+  14 May 2005; Jan Brinkmann <luckyduck@gentoo.org> mrtg-2.11.1.ebuild:
+  stable on amd64
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on ppc64
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on alpha.
+
+  28 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> mrtg-2.11.1.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> mrtg-2.11.1.ebuild:
+  Marked stable on x86.
+
+  26 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/mrtg.confd,
+  files/mrtg.rc, mrtg-2.10.14.ebuild, mrtg-2.10.15.ebuild,
+  mrtg-2.11.0.ebuild, mrtg-2.11.1.ebuild:
+  New and improved init script with conf.d config.
+
+*mrtg-2.11.1 (05 Jan 2005)
+
+  05 Jan 2005; Scott W Taylor <swtaylor@gentoo.org> +mrtg-2.11.1.ebuild:
+  bump
+
+*mrtg-2.11.0 (08 Dec 2004)
+
+  08 Dec 2004; Scott W Taylor <swtaylor@gentoo.org> +mrtg-2.11.0.ebuild:
+  bump
+
+  06 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> mrtg-2.10.15.ebuild:
+  Stable on alpha.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> mrtg-2.10.15.ebuild:
+  ~alpha keyword.
+
+  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> mrtg-2.10.15.ebuild:
+  Stable on sparc
+
+  05 Sep 2004; <blubb@gentoo.org> mrtg-2.10.15.ebuild:
+  added ~amd64 keyword
+
+  21 Aug 2004; Jason Wever <weeve@gentoo.org> mrtg-2.10.14.ebuild:
+  Stable on sparc.
+
+*mrtg-2.10.15 (08 Aug 2004)
+
+  08 Aug 2004; Martin Holzer <mholzer@gentoo.org> +mrtg-2.10.15.ebuild:
+  Version bumped.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> mrtg-2.10.14.ebuild:
+  stable on ppc64, bug #55550
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> mrtg-2.10.12.ebuild,
+  mrtg-2.10.13.ebuild, mrtg-2.10.14.ebuild:
+  marked x86 stable
+
+  02 Jul 2004; Jon Hood <squinky86@gentoo.org> +files/mrtg.rc,
+  mrtg-2.10.14.ebuild:
+  add init script from Matthew Smith <matthewsmith@iinet.net.au> closing #13839
+
+*mrtg-2.10.14 (08 Jun 2004)
+
+  08 Jun 2004; Scott W Taylor <swtaylor@gentoo.org> +mrtg-2.10.14.ebuild:
+  version bump
+
+*mrtg-2.10.13 (19 Jan 2004)
+
+  19 Jan 2004; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.13.ebuild:
+  Version bumped.
+
+*mrtg-2.10.12 (05 Jan 2004)
+
+  05 Jan 2004; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.12.ebuild:
+  Version bumped. Closes 37278
+
+*mrtg-2.10.11 (29 Dec 2003)
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.11.ebuild:
+  Version bumped.
+
+*mrtg-2.10.6 (02 Dec 2003)
+
+  02 Dec 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.6.ebuild:
+  Version bumped.
+
+  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> mrtg-2.9.22.ebuild:
+  Stable on alpha
+
+*mrtg-2.10.5 (08 Oct 2003)
+
+  08 Oct 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.10.5.ebuild:
+  Version bumped.
+
+  22 May 2003; Christian Birchinger <joker@gentoo.org> mrtg-2.9.29.ebuild:
+  Added sparc stable keyword
+
+*mrtg-2.9.29 (15 Apr 2003)
+
+  12 May 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.9.29.ebuild:
+  Marked x86 stable. 
+
+  15 Apr 2003; Martin Holzer <mholzer@gentoo.org> mrtg-2.9.29.ebuild:
+  Version bumped. Closes #18309.
+
+*mrtg-2.9.22 (27 Dec 2002)
+
+  09 Jan 2003; Christian Birchinger <joker@gentoo.org> :
+
+  Changed sparc keyword from "~sparc" to "sparc" because Perl 5.8 is now
+  default on sparc and mrtg-2.9.21 has problems with this version.
+
+  27 Dec 2002; Michael Cummings <mcummings@gentoo.org>: mrtg-2.9.22.ebuild:
+
+  Version bump; this one works with perl 5.8, bug 12539
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*mrtg-2.9.21 (10 Jul 2002)
+
+  07 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  10 Jul 2002; Kyle Manna <nitro@gentoo.org> mrtg-2.9.17.ebuild mrtg-2.9.21.ebuild:
+
+  Update to latest release. Added slot, keywords, license.
+
+*mrtg-2.9.17 (14 Apr 2002)
+
+  14 Apr 2002; Donny Davies <woodchip@gentoo.org> :
+
+  Update to latest release + fix html docs + add the contrib section to the docs.
+
+*mrtg-2.9.7-r1 (11 Apr 2002)
+
+  11 Apr 2002; Spider <spider@gentoo.org> :
+
+  Update libpng dependancy.
 
 *mrtg-2.9.7 (1 Feb 2002)
 
diff --git a/net-analyzer/mrtg/Manifest b/net-analyzer/mrtg/Manifest
index 851859b6a55c..33dfe20e56d9 100644
--- a/net-analyzer/mrtg/Manifest
+++ b/net-analyzer/mrtg/Manifest
@@ -1,7 +1,20 @@
-MD5 3f696a8e965b5d8c115894d22a6385c5 ChangeLog 1763
-MD5 f604e15e72d6e776f985d80dd7731664 mrtg-2.9.21.ebuild 1019
-MD5 01f0415ba2a3a2441e8003458e090461 mrtg-2.9.22.ebuild 1019
-MD5 0565f184e3adb56e7b5283bede482d0b mrtg-2.9.29.ebuild 992
-MD5 a891490462eeed790f01ca34ca861ca0 files/digest-mrtg-2.9.21 64
-MD5 b984863c1e7c00e4a0829e901c6cc492 files/digest-mrtg-2.9.22 64
-MD5 0f087b04562f24a41ddb5c5a190f7b33 files/digest-mrtg-2.9.29 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02b8d6c90ee1d15d2e5d5157cbb8574a ChangeLog 5370
+MD5 68c9f31189efe33ed1abae27bad06d29 mrtg-2.11.1.ebuild 1188
+MD5 17c12067590b47925e3c86bf37a4f62b mrtg-2.12.1.ebuild 1194
+MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 aa896196fcc226b0733d421c29d4e5eb mrtg-2.12.2.ebuild 1195
+MD5 3504978d284268fb850a17a8e72ea037 files/digest-mrtg-2.12.1 64
+MD5 a8d246d324b90fd1e37cc912d4651372 files/mrtg.confd 512
+MD5 aff06f9e2832b17c9c558a58472a3091 files/mrtg.rc 1284
+MD5 892b30d2bab4ab965453b5bef89cfecb files/digest-mrtg-2.11.1 64
+MD5 26ac2190042c1cb4fec97a5370c0803d files/digest-mrtg-2.12.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDDIIzj5H05b2HAEkRAk7EAJ4uEilLWUGdiYVOQ2yeM0/ridC9UACfR3vF
+x9u9Jk7TchNzwhydIDWT0+w=
+=wN/4
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/mrtg/files/mrtg.confd b/net-analyzer/mrtg/files/mrtg.confd
index f3be157baf08..9b25a0c04822 100644
--- a/net-analyzer/mrtg/files/mrtg.confd
+++ b/net-analyzer/mrtg/files/mrtg.confd
@@ -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/net-analyzer/mrtg/files/mrtg.confd,v 1.1 2005/01/26 10:35:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.confd,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 MRTG_CONF="/etc/mrtg.conf"
 MRTG_PID="/var/run/mrtg.pid"
diff --git a/net-analyzer/mrtg/files/mrtg.rc b/net-analyzer/mrtg/files/mrtg.rc
index c04ef8741d9f..b282c73974cb 100644
--- a/net-analyzer/mrtg/files/mrtg.rc
+++ b/net-analyzer/mrtg/files/mrtg.rc
@@ -1,20 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.1 2004/07/03 03:29:25 squinky86 Exp $
-
-# This runscript is for those who want to use the RunAsDaemon:Yes 
-# option for MRTG instead of launching it from a cron job.
-
-
-# Set the following variables for your setup
-
-MRTGPREFIX=/usr/bin
-MRTGCONF=/etc/mrtg.conf
-# pid file defaults to same dir as config file (edit $MRTGPREFIX/mrtg)
-# if you don't like it.
-MRTGPID=/etc/mrtg.pid
- 
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/files/mrtg.rc,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 depend() {
     need net
@@ -24,24 +11,42 @@ depend() {
 }
  
 checkconfig() {
-    if [ ! -f $MRTGCONF ] ; then
-	eerror "Please create $MRTGCONF (try man cfgmaker)"
-	eerror "Make sure you use RunAsDaemon:Yes"
-	return 1
-    fi
-    return 0
+    if [[ ! -f ${MRTG_CONF} ]] ; then
+		eerror "Please create ${MRTG_CONF} (try man cfgmaker)"
+		return 1
+	fi
+
+	mrtg --check ${MRTG_CONF}
+	return $?
 }
 
 start() {
-    checkconfig || return $?
-    ebegin "Starting mrtg"
-    start-stop-daemon --start --quiet --pidfile $MRTGPID \
-                --startas $MRTGPREFIX/mrtg $MRTGCONF
-    eend $? "Failed to start mrtg"
+	# mrtg will not run if LANG=*utf8
+	[[ "${LANG}" == *[uU][tT][fF]?8 ]] && LANG='C'
+
+	checkconfig || return $?
+
+	# enable logging?
+	[[ -n "${MRTG_LOG}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --logging ${MRTG_LOG}"
+	
+	# run as a different user?
+	[[ -n "${MRTG_USER}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --user ${MRTG_USER}"
+
+	# run as a different group?
+	[[ -n "${MRTG_GROUP}" ]] && \
+		MRTG_OPTS="${MRTG_OPTS} --group ${MRTG_GROUP}"
+
+	ebegin "Starting mrtg"
+	start-stop-daemon --start --quiet --pidfile ${MRTG_PID} \
+		--exec /usr/bin/mrtg -- --daemon --pid-file=${MRTG_PID} \
+		${MRTG_OPTS} ${MRTG_CONF} >/dev/null
+	eend $? "Failed to start mrtg"
 }
- 
+
 stop() {
-    ebegin "Stopping mrtg"
-    start-stop-daemon --stop --quiet --pidfile $MRTGPID
-    eend $? "Failed to stop mrtg"
+	ebegin "Stopping mrtg"
+	start-stop-daemon --stop --quiet --pidfile ${MRTG_PID}
+	eend $? "Failed to stop mrtg"
 }
diff --git a/net-analyzer/mrtg/mrtg-2.11.1.ebuild b/net-analyzer/mrtg/mrtg-2.11.1.ebuild
index 0ad2e8ba28e0..70985cf2b54e 100644
--- a/net-analyzer/mrtg/mrtg-2.11.1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.11.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/net-analyzer/mrtg/mrtg-2.11.1.ebuild,v 1.1 2005/01/05 23:25:01 swtaylor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.11.1.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -8,27 +8,34 @@ SRC_URI="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~ppc64 ~amd64 ~alpha"
-IUSE=""
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="doc"
 
 DEPEND="virtual/libc
 	dev-lang/perl
 	>=media-libs/gd-1.8.4"
 
-src_compile() {
-	./configure --prefix=/usr --host=${CHOST} || die
-	emake || die
-}
-
 src_install () {
-	make prefix=${D}/usr install || die
-	dodir /usr/share/man
-	mv ${D}/usr/man/man1 ${D}/usr/share/man
-	rm -rf ${D}/usr/{man,doc}
+	keepdir /var/lib/mrtg
+
+	make DESTDIR="${D}" install || die "make install failed"
+	rm -fr ${D}/usr/share/doc/mrtg2
+
+	newinitd ${FILESDIR}/mrtg.rc ${PN}
+	newconfd ${FILESDIR}/mrtg.confd ${PN}
+
 	dodoc ANNOUNCE COPYING CHANGES COPYRIGHT MANIFEST README THANKS
-	docinto txt ; dodoc doc/*.txt
-	cp -a contrib ${D}/usr/share/doc/${PF}/contrib
-	prepalldocs
-	docinto html ; dohtml -r doc/*.html images/*
-	exeinto /etc/init.d ; newexe ${FILESDIR}/mrtg.rc mrtg
+
+	if use doc ; then
+		docinto txt ; dodoc doc/*.txt
+		cp -a contrib ${D}/usr/share/doc/${PF}/contrib
+		prepalldocs
+		dohtml -r doc/*.html images/*
+	fi
+}
+
+pkg_postinst(){
+	einfo "You must configure mrtg before being able to run it. Try cfgmaker."
+	einfo "The following thread may be useful:"
+	einfo "http://forums.gentoo.org/viewtopic-t-105862.html"
 }
diff --git a/net-analyzer/mrtg/mrtg-2.12.1.ebuild b/net-analyzer/mrtg/mrtg-2.12.1.ebuild
index f3779a83faf6..ff5ff8192570 100644
--- a/net-analyzer/mrtg/mrtg-2.12.1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.12.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/net-analyzer/mrtg/mrtg-2.12.1.ebuild,v 1.1 2005/05/29 00:15:43 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.1.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -33,3 +33,9 @@ src_install () {
 		dohtml -r doc/*.html images/*
 	fi
 }
+
+pkg_postinst(){
+	einfo "You must configure mrtg before being able to run it. Try cfgmaker."
+	einfo "The following thread may be useful:"
+	einfo "http://forums.gentoo.org/viewtopic-t-105862.html"
+}
diff --git a/net-analyzer/mrtg/mrtg-2.12.2.ebuild b/net-analyzer/mrtg/mrtg-2.12.2.ebuild
index 715fa3102366..3c3dbdeafc25 100644
--- a/net-analyzer/mrtg/mrtg-2.12.2.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.12.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/net-analyzer/mrtg/mrtg-2.12.2.ebuild,v 1.1 2005/06/19 18:24:49 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mrtg/mrtg-2.12.2.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A tool to monitor the traffic load on network-links"
 HOMEPAGE="http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/"
@@ -28,7 +28,7 @@ src_install () {
 
 	if use doc ; then
 		docinto txt ; dodoc doc/*.txt
-		cp -a contrib ${D}/usr/share/doc/${PF}/contrib
+		cp -pPR contrib ${D}/usr/share/doc/${PF}/contrib
 		prepalldocs
 		dohtml -r doc/*.html images/*
 	fi
diff --git a/net-analyzer/mtr/ChangeLog b/net-analyzer/mtr/ChangeLog
index 9ab02e330511..93e55b3cd96f 100644
--- a/net-analyzer/mtr/ChangeLog
+++ b/net-analyzer/mtr/ChangeLog
@@ -1,19 +1,185 @@
 # ChangeLog for net-analyzer/mtr
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/ChangeLog,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
+
+  09 Oct 2005; <mkay@gentoo.org> mtr-0.69.ebuild, mtr-0.69-r1.ebuild:
+  Fixing dependencies (bug #108100)
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -mtr-0.67.ebuild,
+  mtr-0.69.ebuild, mtr-0.69-r1.ebuild:
+  Kill gtk2 USE flag for bug 106560.
+
+*mtr-0.69-r1 (03 Sep 2005)
+
+  03 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/mtr-0.69-debian.patch, +mtr-0.69-r1.ebuild:
+  Use patch from Debian to fix failed to bind to interface problem when using
+  --address. Fixes bug 104718. Thanks to Claudiu Gafton <gafty@alvatec.ro>.
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> mtr-0.69.ebuild:
+  stable on ia64
+
+  08 Aug 2005; Fabian Groffen <grobian@gentoo.org> mtr-0.69.ebuild:
+  Implementing a patch by Marcin Gabrowski <gaber at gentoo (dot) pl> to compile
+  successfully on ppc-macos.  Marking ~ppc-macos
+
+  26 Jul 2005; Simon Stelling <blubb@gentoo.org> mtr-0.69.ebuild:
+  stable on amd64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> mtr-0.69.ebuild:
+  Stable on ppc.
+
+  17 May 2005; Guy Martin <gmsoft@gentoo.org> mtr-0.69.ebuild:
+  Stable on hppa.
+
+  16 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> mtr-0.69.ebuild:
+  Stable on sparc
+
+  15 May 2005; Fernando J. Pereda <ferdy@gentoo.org> mtr-0.69.ebuild:
+  alpha stable
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> -mtr-0.54-r2.ebuild,
+  -mtr-0.64.ebuild, mtr-0.69.ebuild:
+  Marked 0.69 x86 stable, removed old versions.
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> mtr-0.67.ebuild:
+  Stable on amd64 wrt bug #91332.
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> mtr-0.67.ebuild:
+  Stable on ppc.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> mtr-0.67.ebuild:
+  stable on ia64
+
+  21 Mar 2005; Guy Martin <gmsoft@gentoo.org> mtr-0.67.ebuild:
+  Stable on hppa.
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> mtr-0.67.ebuild:
+  Stable on alpha.
+
+*mtr-0.69 (02 Feb 2005)
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> mtr-0.67.ebuild,
+  +mtr-0.69.ebuild:
+  Version bump for bug 80383. Moved epatch statement to src_unpack where it
+  belongs and fixed deps. Added ipv6 support via USE=ipv6.
+
+  31 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> mtr-0.67.ebuild:
+  Stable on sparc
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> mtr-0.67.ebuild:
+  Marked stable on x86.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> mtr-0.64.ebuild:
+  Stable on alpha.
+
+*mtr-0.67 (18 Dec 2004)
+
+  18 Dec 2004; Eldad Zack <eldad@gentoo.org> mtr-0.54-r2.ebuild,
+  mtr-0.64.ebuild, +mtr-0.67.ebuild:
+  Version bump. Fixed lazy-binding suid issue.
+
+  30 Nov 2004; Guy Martin <gmsoft@gentoo.org> mtr-0.64.ebuild:
+  Stable on hppa.
+
+  23 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> mtr-0.64.ebuild:
+  Stable on sparc
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> mtr-0.64.ebuild:
+  x86 stable
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> mtr-0.54-r2.ebuild:
+  Marked stable on hppa.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> mtr-0.54-r2.ebuild:
+  Stable on alpha.
+
+*mtr-0.64 (22 Aug 2004)
+
+  22 Aug 2004; Eldad Zack <eldad@gentoo.org> +files/mtr-ac-res_mkquery.patch,
+  +mtr-0.64.ebuild:
+  Version bump. Dropped ipv6 in 0.64. Fixes amd64 issue with resolver lib.
+  marking ~amd64. Closes #54024.
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> mtr-0.54-r2.ebuild:
+  Stable on sparc
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> mtr-0.54-r2.ebuild:
+  x86 stable
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> -mtr-0.54-r1.ebuild:
+  Purged old unstable
+
+  08 Jul 2004; Eldad Zack <eldad@gentoo.org> mtr-0.49-r1.ebuild,
+  mtr-0.54-r1.ebuild, mtr-0.54-r2.ebuild, mtr-0.54.ebuild:
+  Tidy
+
+*mtr-0.54-r2 (01 Jul 2004)
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  +mtr-0.54-r2.ebuild:
+  suid: fixed permissions to 4710, group is set to root:wheel,
+  closes #47210, Thanks to Philipp Kern <phil@lordaeron.in-berlin.de>.
+  added metadata.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> mtr-0.54-r1.ebuild:
+  Stable on alpha.
+
+*mtr-0.54-r1 (04 Aug 2003)
+
+  30 Sep 2003; Joshua Kinard <kumba@gentoo.org> mtr-0.54-r1.ebuild:
+  Added ~mips to KEYWORDS
+
+  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> mtr-0.54-r1.ebuild :
+  Added support for ipv6.
+
+  30 Jul 2003; Tavis Ormandy <taviso@gentoo.org> mtr-0.54.ebuild:
+  marking ~alpha
+
+  10 Jun 2003; Christian Birchinger <joker@gentoo.org> mtr-0.54.ebuild:
+  Added sparc stable keyword
+
+  05 Jun 2003; Martin Holzer <mholzer@gentoo.org> mtr-0.54.ebuild:
+  Marked stable on x86.
+  Now installs into right location. closes #21495.
+
+*mtr-0.54 (17 May 2003)
+
+  17 Jun 2003; Guy Martin <gmsoft@gentoo.org> mtr-0.54.ebuild :
+  Added hppa to KEYWORDS.
+
+  17 May 2003; Martin Holzer <mholzer@gentoo.org> mtr-0.54.ebuild:
+  Version bumped. Closes #21135.
+
+  13 Feb 2003; Guy Martin <gmsoft@gentoo.org> :
+  Added hppa to keywords.
+
+*mtr-0.52 (02 Jan 2002)
+
+  02 Jan 2002; Martin Holzer <mholzer@gentoo.org> mtr-0.52.ebuild files/digest-mtr-0.52 ChangeLog :
+  Version bump. Closes #12598.
+ 
+*mtr-0.51 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
   moved to net-analyzer
 
 *mtr-0.49-r1 (3 May 2002)
-  
+
+  26 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> mtr-0.49-r1 :
+  Moves binary from /usr/sbin to /usr/bin. Closes #6521. 
+  Submitted by Hannes Mehnert <hannes@mehnert.org>.
+   
   3 May 2002; Donny Davies <woodchip@gentoo.org> :
-  
   Added LICENSE, SLOT.
 
 *mtr-0.49 (15 Mar 2002)
 
   15 Mar 2002; Bruce A. Locke <blocke@shivan.org> mtr-0.49.ebuild :
-
   New version of mtr.  Removed older versions with security issues.
-
diff --git a/net-analyzer/mtr/Manifest b/net-analyzer/mtr/Manifest
index 384e605d231e..e460871dc94c 100644
--- a/net-analyzer/mtr/Manifest
+++ b/net-analyzer/mtr/Manifest
@@ -1,9 +1,8 @@
-MD5 f13a867b79a118cffd96192ecb9504fe ChangeLog 1060
-MD5 89ad5e4dc0ca9bf79beb8fe28add08e8 mtr-0.49-r1.ebuild 983
-MD5 6cd7a1b3ef0484aa858a8aed7e4dbeb3 mtr-0.51.ebuild 983
-MD5 2f626d41cd64dbfcfcba9e70f4bb90c6 mtr-0.52.ebuild 983
-MD5 0cb05da5fe4d9778579c0d958e799eed mtr-0.54.ebuild 820
-MD5 9ad35f50576c4ede55776cf455d747a9 files/digest-mtr-0.49-r1 59
-MD5 2652f3e0b29f33b4a88708f613a19a7b files/digest-mtr-0.51 59
-MD5 4f186866ae7394d48030b520d17845df files/digest-mtr-0.52 60
-MD5 7a626d479aec5d6bfba540b6f3935a9e files/digest-mtr-0.54 59
+MD5 462e674d624d34dbb1c13ec266144e4c ChangeLog 5885
+MD5 720bffd73acf542e859034ca9d443c19 metadata.xml 244
+MD5 ef4bf166ee11fdeceedc271dcdb7b23c mtr-0.69-r1.ebuild 1406
+MD5 59a554945b84eb7036b372325acdffae mtr-0.69.ebuild 1343
+MD5 ce43e9fae32e2db595e780b4a4b2fcd8 files/digest-mtr-0.69 60
+MD5 ce43e9fae32e2db595e780b4a4b2fcd8 files/digest-mtr-0.69-r1 60
+MD5 1b2fafeb55048e9993c48c330ca7a4bf files/mtr-0.69-debian.patch 2558
+MD5 0bbdffc84e47f22daaf46c76e941a02a files/mtr-ac-res_mkquery.patch 510
diff --git a/net-analyzer/mtr/mtr-0.69-r1.ebuild b/net-analyzer/mtr/mtr-0.69-r1.ebuild
index 49ab8afb82a2..b2b8246316ce 100644
--- a/net-analyzer/mtr/mtr-0.69-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.69-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/net-analyzer/mtr/mtr-0.69-r1.ebuild,v 1.1 2005/09/03 16:25:48 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,21 +11,18 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sparc ~x86"
-IUSE="gtk gtk2 ipv6"
+IUSE="gtk ipv6"
 
-DEPEND="dev-util/pkgconfig"
-RDEPEND=">=sys-libs/ncurses-5.2
-	gtk? (
-			!gtk2? ( =x11-libs/gtk+-1.2* )
-			gtk2? ( >=x11-libs/gtk+-2 )
-		)"
+DEPEND="dev-util/pkgconfig
+	>=sys-libs/ncurses-5.2
+	gtk? ( >=x11-libs/gtk+-2 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-ac-res_mkquery.patch"
 	# bug 104718
-	epatch ${FILESDIR}/${P}-debian.patch
+	epatch "${FILESDIR}/${P}-debian.patch"
 }
 
 src_compile() {
@@ -42,7 +39,7 @@ src_compile() {
 	fi
 
 	econf ${myconf} \
-		$(use_enable gtk2) \
+		$(use_enable gtk gtk2) \
 		$(use_enable ipv6) \
 		|| die "econf failed"
 
@@ -51,12 +48,12 @@ src_compile() {
 
 src_install() {
 	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
+	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
 
 	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
 
 	fowners root:wheel /usr/bin/mtr
 	fperms 4710 /usr/bin/mtr
 
-	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
+	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
 }
diff --git a/net-analyzer/mtr/mtr-0.69.ebuild b/net-analyzer/mtr/mtr-0.69.ebuild
index 840cd51eef5c..fdaf49638413 100644
--- a/net-analyzer/mtr/mtr-0.69.ebuild
+++ b/net-analyzer/mtr/mtr-0.69.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/net-analyzer/mtr/mtr-0.69.ebuild,v 1.1 2005/02/02 11:18:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mtr/mtr-0.69.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,20 +10,17 @@ SRC_URI="ftp://ftp.bitwizard.nl/mtr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-IUSE="gtk gtk2 ipv6"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ~ppc-macos ~s390 sparc x86"
+IUSE="gtk ipv6"
 
-DEPEND="dev-util/pkgconfig"
-RDEPEND=">=sys-libs/ncurses-5.2
-	gtk? (
-			!gtk2? ( =x11-libs/gtk+-1.2* )
-			gtk2? ( >=x11-libs/gtk+-2 )
-		)"
+DEPEND="dev-util/pkgconfig
+	>=sys-libs/ncurses-5.2
+	gtk? ( >=x11-libs/gtk+-2 )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-ac-res_mkquery.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-ac-res_mkquery.patch"
 }
 
 src_compile() {
@@ -32,10 +29,15 @@ src_compile() {
 	local myconf
 	use gtk || myconf="${myconf} --without-gtk"
 
-	append-ldflags -Wl,-z,now
+	if use ppc-macos;
+	then
+		append-flags "-DBIND_8_COMPAT"
+	else
+		append-ldflags -Wl,-z,now
+	fi
 
 	econf ${myconf} \
-		$(use_enable gtk2) \
+		$(use_enable gtk gtk2) \
 		$(use_enable ipv6) \
 		|| die "econf failed"
 
@@ -44,12 +46,12 @@ src_compile() {
 
 src_install() {
 	# this binary is universal. ie: it does both console and gtk.
-	make DESTDIR=${D} sbindir=/usr/bin install || die "make install failed"
+	make DESTDIR="${D}" sbindir=/usr/bin install || die "make install failed"
 
 	insinto /usr/share/${PN} ; doins img/mtr_icon.xpm
 
 	fowners root:wheel /usr/bin/mtr
 	fperms 4710 /usr/bin/mtr
 
-	dodoc AUTHORS COPYING ChangeLog FORMATS NEWS README SECURITY TODO
+	dodoc AUTHORS ChangeLog FORMATS NEWS README SECURITY TODO
 }
diff --git a/net-analyzer/mwcollect/ChangeLog b/net-analyzer/mwcollect/ChangeLog
index 8beeb8b12fe4..19907210a054 100644
--- a/net-analyzer/mwcollect/ChangeLog
+++ b/net-analyzer/mwcollect/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-analyzer/mwcollect
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.1 2005/06/17 02:48:52 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+*mwcollect-2.1.2 (23 Sep 2005)
+
+  23 Sep 2005; Chris White <chriswhite@gentoo.org> +mwcollect-2.1.2.ebuild:
+  Version bump.  Thanks to upstream for the heads up.
+
+*mwcollect-2.1.1 (09 Jul 2005)
+
+  09 Jul 2005; Chris White <chriswhite@gentoo.org> files/confd, files/initd,
+  -mwcollect-2.1.0.ebuild, +mwcollect-2.1.1.ebuild:
+  Updated as per upstream request. Changed the conf.d and init.d files to
+  better cordinate with the pid file creation.
+
+  17 Jun 2005; David Holm <dholm@gentoo.org> mwcollect-2.1.0.ebuild:
+  Added to ~ppc.
+
+  17 Jun 2005; Chris White <chriswhite@gentoo.org> files/confd:
+  Fixed manifest signing issue and removed redundant error for issue upstream
+  has addressed in confd file.
 
 *mwcollect-2.1.0 (17 Jun 2005)
 
diff --git a/net-analyzer/mwcollect/Manifest b/net-analyzer/mwcollect/Manifest
index 83a803b85b85..c47d5446419a 100644
--- a/net-analyzer/mwcollect/Manifest
+++ b/net-analyzer/mwcollect/Manifest
@@ -1,5 +1,12 @@
-MD5 314372ad9b42706d30bbc21d5ea535fb mwcollect-2.1.0.ebuild 1138
-MD5 8fc79d7bb0d8a75830b8aa40bdbe9a2a .mwcollect-2.1.0.ebuild.swp 12288
-MD5 4ed65c3d34968a58036df1fd8f729808 files/confd 1164
-MD5 74e0b4bdc8a808fc003c6012de634c5d files/initd 873
-MD5 55d7fce54ad5e7342a076f413f5527a0 files/digest-mwcollect-2.1.0 66
+MD5 64e83d1d37bf8dda9a131fe6eb2cfc3a .mwcollect-3.0.0.ebuild.swp 12288
+MD5 2f914ba64220a4bd1b5850649c50924b ChangeLog 1191
+MD5 dd4aab16ffc56b3eecd0fa6e3ea536b3 files/confd 560
+MD5 ee61af624456e7fc0ea870d40435fd70 files/digest-mwcollect-2.1.1 66
+MD5 e25a6bca07df41cad22a6901a200651a files/digest-mwcollect-2.1.2 66
+MD5 e5858653fce66aec74497f826c24257b files/digest-mwcollect-3.0.0 67
+MD5 1db05efae9034e8595129e4bf2dd285c files/initd 782
+MD5 5d6b56a56d282b0e9919fd25dd1bc421 files/mwcollect-3.0.0-capacity.patch 676
+MD5 d6686b70beeb04333a23a1bcf7cedffd metadata.xml 434
+MD5 ff8c0112b4a425afa749446d3af74091 mwcollect-2.1.1.ebuild 1254
+MD5 4057526152e96a533f54cdd4b2d8fc11 mwcollect-2.1.2.ebuild 1254
+MD5 870cae8376c4266f65c2ef8a45f360d3 mwcollect-3.0.0.ebuild 1566
diff --git a/net-analyzer/mwcollect/files/confd b/net-analyzer/mwcollect/files/confd
index 4159b6ad924a..463621a095ab 100644
--- a/net-analyzer/mwcollect/files/confd
+++ b/net-analyzer/mwcollect/files/confd
@@ -6,21 +6,11 @@
 #
 # Usage: /usr/sbin/mwcollectd [options]
 # Where options can be one of the following:
-#         -c <config-file>        specify config file (defaults to /etc/mwcollectd.conf)
-#         -l <log-file>           add log file
-#         -C                      add console logger
-#         -L <log-level>  specify log level, inital is 3
-#         -D                      detach from console
-#         -h                      display this info
-# 
-# Example:
-#         /usr/sbin/mwcollectd -L critical -C -L info -l /var/log/mwcollectd.log -c /etc/mwcollectd.conf
-
-OPTIONS="-D -p /var/run/mwcollectd.pid -c /etc/mwcollect/mwcollectd.conf"
+#
+# --console-log [=tagpattern] - set console logging level
+# --chroot=/opt/mwcollect/chroot - setup a chroot
 
-# NOTE: DO NOT specify "-D", because mwcollectd does not create its pid file
-# This way, start-stop-daemon makes it background and is able to create the
-# pid file under /var/run
+OPTIONS=""
 
 # example: add log file
 # OPTIONS="$OPTIONS -l /var/log/mwcollect.log -L 3"
diff --git a/net-analyzer/mwcollect/files/initd b/net-analyzer/mwcollect/files/initd
index 03e2598ffb40..3a56848936f4 100644
--- a/net-analyzer/mwcollect/files/initd
+++ b/net-analyzer/mwcollect/files/initd
@@ -9,28 +9,28 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e /etc/mwcollect/mwcollectd.conf ] ; then
-		eerror "You need to create /etc/mwcollect/mwcollectd.conf first."
-		eerror "An example can be found in /etc/mwcollect/mwcollectd.conf.dist"
+	if [ ! -e /etc/mwcollect/mwcollect.conf ] ; then
+		eerror "/etc/mwcollect/mwcollect.conf not found!"
 		return 1
 	fi
 }
 
 start() {
 	ebegin "Starting mwcollectd"
-	# HACK: making mwcollectd background with --background
-	# mwcollectd should have created its pid file
+
 	checkconfig && \
 	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/mwcollectd -- ${OPTIONS}
+		--exec /usr/sbin/mwcollectd -- --pid-file=/var/run/mwcollect.pid \
+		--daemon --user=nobody --config=/etc/mwcollect/mwcollect.conf \
+		${OPTIONS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping mwcollectd"
 	start-stop-daemon --stop --quiet \
-		--pidfile /var/run/mwcollectd.pid \
-		--exec /usr/sbin/mwcollectd && rm /var/run/mwcollectd.pid
+		--pidfile /var/run/mwcollect.pid \
+		--exec /usr/sbin/mwcollectd && rm /var/run/mwcollect.pid
 	eend $?
 }
 
diff --git a/net-analyzer/mwcollect/metadata.xml b/net-analyzer/mwcollect/metadata.xml
index 77d91661fee0..34d53401175f 100644
--- a/net-analyzer/mwcollect/metadata.xml
+++ b/net-analyzer/mwcollect/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>chriswhite</herd>
+<herd>no-herd</herd>
 <maintainer>
 <email>chriswhite@gentoo.org</email>
 <name>Chris White</name>
diff --git a/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild b/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
index 1383f0d94f28..e07938838e65 100644
--- a/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-2.1.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/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild,v 1.1 2005/07/09 09:09:13 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 DESCRIPTION="mwcollect collects worms and other autonomous spreading malware"
 HOMEPAGE="http://www.mwcollect.org/"
diff --git a/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild b/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild
index 6ffa02cf3dfe..af7eb6f56d19 100644
--- a/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild
+++ b/net-analyzer/mwcollect/mwcollect-2.1.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/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild,v 1.1 2005/09/23 03:35:07 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/mwcollect/mwcollect-2.1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 DESCRIPTION="mwcollect collects worms and other autonomous spreading malware"
 HOMEPAGE="http://www.mwcollect.org/"
diff --git a/net-analyzer/nagios-core/ChangeLog b/net-analyzer/nagios-core/ChangeLog
index b9389724f9d4..e5dc6b179b0d 100644
--- a/net-analyzer/nagios-core/ChangeLog
+++ b/net-analyzer/nagios-core/ChangeLog
@@ -1,7 +1,294 @@
 # ChangeLog for net-analyzer/nagios-core
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.1 2002/11/02 05:55:41 alron Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/ChangeLog,v 1.1.1.1 2005/11/30 10:12:18 chriswhite Exp $
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/digest-nagios-core-2.0b_p1, -files/digest-nagios-core-2.0b_p2:
+  * Fix missing digests, silly me
+
+*nagios-core-2.0b_p5 (19 Nov 2005)
+*nagios-core-1.3 (19 Nov 2005)
+
+  19 Nov 2005; Lance Albertson <ramereth@gentoo.org> files/nagios,
+  +nagios-core-1.3.ebuild, -nagios-core-2.0b_p1.ebuild,
+  -nagios-core-2.0b_p2.ebuild, +nagios-core-2.0b_p5.ebuild:
+  * Fixed bug #77814 for 1.3
+  * Fixed bug #97669 by adding a 'after mysql postgresql' in the init script
+  * Version bump for 1.3 and 2.0b5
+  * Changed how we delt with contrib files
+    - Compile all contrib files
+    - Install them in the correct place
+    - Move misc contrib files to default share/docs location
+  * Added a chmod of /etc/nagios for security reasons
+  * Removed older 2.x ebuilds
+
+  15 Oct 2005; <soulse@gentoo.org> +files/nagios-2.0b.cfg-sample.gz,
+  nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,
+  nagios-core-2.0b_p4.ebuild:
+  Fixed ebuilds as per bug #103945 thanks to David Sparks <daves@activestate.com>
+
+  15 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild:
+  Fixed ebuild as per bug #99128 thanks to k_berbach@gmx.de and
+  richardc@bifco.com
+
+  10 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r4.ebuild,
+  nagios-core-2.0b_p1.ebuild, nagios-core-2.0b_p2.ebuild,
+  nagios-core-2.0b_p4.ebuild:
+  Apache DEPEND problem fixed.
+
+  08 Oct 2005; <soulse@gentoo.org> -nagios-core-1.2-r2.ebuild,
+  -nagios-core-1.2-r3.ebuild:
+  Obsolete ebuilds removed
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nagios-core-1.2-r4.ebuild:
+  Stable on sparc wrt #103060
+
+  01 Oct 2005; <soulse@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild, nagios-core-1.2-r4.ebuild:
+  Chown before user:group creation problem fixed
+
+*nagios-core-2.0b_p4 (28 Sep 2005)
+
+  28 Sep 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  +nagios-core-2.0b_p4.ebuild:
+  * revbump for 2.0b_p4
+  * updated metadata.xml
+
+  26 Sep 2005; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r3.ebuild,
+  nagios-core-1.2-r4.ebuild:
+  x86 stable
+
+  19 Sep 2005; <soulse@gentoo.org> nagios-core-2.0b_p1.ebuild,
+  nagios-core-2.0b_p2.ebuild:
+  Nagios /var/nagios/rw/nagios.cmd false right fixed. As per bug #89160 thanks
+  to Romang <zataz@zataz.net>.
+
+  25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nagios-core-2.0b_p2.ebuild:
+  Fix bug 88859. Thanks to John Lange <john.lange@open-it.ca> and Marco
+  Morales <soulse@gmail.com>.
+
+  01 Mar 2005; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r4.ebuild:
+  Changed /var/nagios/rw permissions as per suggested in nagios manual to 2770.
+  Thanks to Urs Joss <tschenturs@gmx.ch>. Closes #76011.
+
+*nagios-core-2.0b_p2 (24 Feb 2005)
+
+  24 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/2.0b_p1-submit_check_result_via_nsca.patch,
+  +files/2.x-series-nsca.patch, nagios-core-2.0b_p1.ebuild,
+  +nagios-core-2.0b_p2.ebuild:
+  Version bump as per bug #83116. Thanks to Allen Parker <allenp@efn.org>
+
+*nagios-core-2.0b_p1 (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/2.0b_p1-submit_check_result_via_nsca.patch,
+  +nagios-core-2.0b_p1.ebuild:
+  Version bump as per bug #74481. Still masked due to apache bug #76457
+
+*nagios-core-1.2-r4 (25 Jan 2005)
+
+  25 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nagios-core-1.2-r4.ebuild:
+  uses depend.apache.eclass now. Bug #77781 refers
+
+  28 Nov 2004; Eldad Zack <eldad@gentoo.org> files/nagios:
+  Removed -o option from start-stop-daemon, as it was causing errors to start or
+  stop slip by unnoticed.
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r3.ebuild:
+  Fixed nagios.cmd permission problem, as suggested by Shawn Kovalchick
+  <bamapookie@speakeasy.net>. Closes #61485.
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild:
+  Added an einfo about sample-configs. Closes #69415.
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-core-1.2-r2.ebuild:
+  Stable on sparc.
+
+  20 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild:
+  Fixed several binary package problems. Closes bug #63502.
+
+  20 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild,
+  nagios-core-1.2-r3.ebuild:
+  Moved apache module installations from pkg_postinst to src_install where it
+  belongs. Closes #67000.
+
+  20 Oct 2004; Eldad Zack <eldad@gentoo.org> files/nagios:
+  Added reload function to init.d script, based on a suggestion by Jason Frank
+  <jfrank@kc.rr.com>. Fixed init.d script to check the configuration before
+  start/restart/reload. Closes bug #67955.
+
+*nagios-core-1.2-r3 (20 Aug 2004)
+
+  20 Aug 2004; Eldad Zack <eldad@gentoo.org> metadata.xml, +files/conf.d,
+  +files/submit_check_result_via_nsca.patch, +nagios-core-1.2-r3.ebuild:
+  Distributed monitoring friendly - Thanks to Marcel Pommer <marsellus@gmx.net>
+  for pointing out the issues involved. Closes bug #60642.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild:
+  x86 stable
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r6.ebuild, nagios-core-1.2-r1.ebuild,
+  nagios-core-1.2-r2.ebuild:
+  Changed DEPEND on mail-client/mailx to virtual/mailx. Closes #56393.
+
+  04 Aug 2004; Jon Hood <squinky86@gentoo.org> -files/nagios.cfg-sample,
+  +files/nagios.cfg-sample.gz, nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r6.ebuild, nagios-core-1.2-r1.ebuild,
+  nagios-core-1.2-r2.ebuild:
+  QA updates, move enewuser, remove oversized files in FILESDIR, #58526.
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r2.ebuild:
+  Removed redundant configure directive used for db support. Bug #57429.
+
+*nagios-core-1.2-r2 (10 Jul 2004)
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +nagios-core-1.2-r2.ebuild:
+  Fixed external command file permissions. Closes #56490.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild:
+  added missing noweb to IUSE
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r6.ebuild,
+  nagios-core-1.2-r1.ebuild:
+  x86 marked stable.
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r6.ebuild,
+  nagios-core-1.2-r1.ebuild:
+  Added missing make || die. Added include path for postgresql, closes #45614.
+
+  04 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
+  nagios-core-1.2-r1.ebuild:
+  Fix chown of /var/nagios/rw for when there is no apache group. Closes #51939.
+  Thanks to katerina <kllba@operamail.com>.
+
+  03 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
+  nagios-core-1.2-r1.ebuild, nagios-core-1.2.ebuild:
+  Added a check in pkg_setup to test whether gd was compiled with jpeg. closes
+  #12483.
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-core-1.2-r1.ebuild:
+  Prioritized mysql over postgresql, in case both USE flags are enabled. Closes
+  #53439.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r5.ebuild, nagios-core-1.1-r6.ebuild,
+  nagios-core-1.2-r1.ebuild, nagios-core-1.2.ebuild:
+  Fix use invocation
+
+  30 May 2004; Robin H. Johnson <robbat2@gentoo.org>
+  nagios-core-1.1-r4.ebuild, nagios-core-1.1-r5.ebuild,
+  nagios-core-1.1-r6.ebuild, nagios-core-1.2-r1.ebuild,
+  nagios-core-1.2.ebuild:
+  mailx move
+
+*nagios-core-1.2-r1 (17 Apr 2004)
+
+  17 Apr 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.2-r1.ebuild:
+  Fixed installation instructions at the end of the installation. Closes #46519.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.1-r4.ebuild:
+  Adding categories to dependencies. See bug 45110 for details.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> nagios-core-1.1-r4.ebuild,
+  nagios-core-1.1-r5.ebuild:
+  QA: IUSE variable was incorrect, set propper USE flags tests.
+
+*nagios-core-1.2 (27 Feb 2004)
+
+  27 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  nagios-core-1.2.ebuild:
+  New upstream version. Closes bug #43022
+
+  17 Feb 2004; rob holland <tigger@gentoo.org> nagios-core-1.1-r6.ebuild:
+  Corrected apache2 handling and shell error.
+
+*nagios-core-1.1-r6 (15 Feb 2004)
+
+  15 Feb 2004; rob holland <tigger@gentoo.org> nagios-core-1.1-r6.ebuild:
+  Corrected buggy noweb use flag stuff
+
+  11 Feb 2004; rob holland <tigger@gentoo.org> :
+  new nagios ebuild by mbowman@gentoo.org with slight adjustment by me. Closes
+  #39926
+
+  30 Jan 2004; Martin Holzer <mholzer@gentoo.org> nagios-core-1.1-r4.ebuild:
+  Changing touch keep to keepdir. closes 39812
+
+*nagios-core-1.1-r5 (27 Jan 2004)
+
+  27 Jan 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  nagios-core-1.1-r5.ebuild:
+  More or less re-wrote the ebuild. Introducing new USE flag: "noweb". "noweb"
+  disables the installation of web interface. Very useful for distributed monitoring.
+  It also closes bug #20617 and #23669.
+
+  Because of the new "noweb" USE flag I removed the "gd" flag.
+
+  These ebuilds are unmaintained so i'm making myself the maintainer for now.
+
+  27 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-core-1.1-r4.ebuild:
+  marking x86 stable
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-core-1.1-r3.ebuild,
+  nagios-core-1.1-r4.ebuild:
+  adding RESTRICT="nomirror"
+
+*nagios-core-1.1-r4 (20 Jul 2003)
+  20 Jul 2003; <klieber@gentoo.org> nagios-core-1.1-r4 :
+  added /contrib/ directory closing #24865
+
+*nagios-core-1.1-r3 (19 Jul 2003)
+  19 Jul 2003; <klieber@gentoo.org> nagios-core-1.1-r3 :
+  added extra optional dependency information per #23669
+
+*nagios-core-1.1-r2	(20 Jun 2003)
+  20 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1-r2 :
+  Fix for broken init script.
+
+*nagios-core-1.1-r1	(17 Jun 2003)
+  17 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1-r1 :
+  Another small fix for install time user/group addition. Fix for bug
+  #16175
+  
+*nagios-core-1.1	(10 Jun 2003)
+  10 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.1 :
+  Version bump with small patches added in. Apache2 useflag support
+  also added in.
+
+*nagios-core-1.0-r1	(11 Feb 2003)
+  11 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.0-r1 :
+  Added an annotated nagios.cfg-sample file, so people don't break
+  their nagios install by changing paths that shouldnt be changed.
+  This addresses bug #14731
+
+  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.0 :
+  Changed ~x86 to x86 and added sparc and ppc keywords
+
+*nagios-core-1.0	(13 Jan 2003)
+  13 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-core-1.0 :
+  Updated to new version.
+
+*nagios-core-1.0_beta6	(19 Nov 2002)
+  19 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-core-1.0_beta6 :
+  Opps, didnt fix that ebuild fully properly last time... Lets try that
+  again.
+
+*nagios-core-1.0_beta6	(7 Nov 2002)
+  7 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-core-1.0_beta6 :
+  Minor ebuild fixes. Not enough to warrent revision number.
 
 *nagios-core-1.0_beta6	(1 Nov 2002)
   1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-core-1.0_beta6 :
   Initial import. Ebuild submitted by Dean Bailey <alron@gentoo.org>.
+  Christian - Manny Calavera - Neumair <christian-neumair@web.de> also
+  had submitted a bug report about nagios.
+
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index e69de29bb2d1..0154b5764992 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -0,0 +1,19 @@
+MD5 d966e219d70d5cbf544c27816b58421a ChangeLog 11483
+MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
+MD5 4eb11e1fa400659baf1cdae2c72bfcf3 nagios-core-1.3.ebuild 7484
+MD5 92fb214ff93f5f66c997ea1b00fab6c5 nagios-core-1.2-r4.ebuild 7183
+MD5 9b7730eb90dcc98a0cdbf0d24cfd5982 nagios-core-2.0b_p5.ebuild 5972
+MD5 af171cb84450787a92481d9d3b7e132b nagios-core-2.0b_p4.ebuild 5866
+MD5 673bda0ac6ab9230d23331e7f3846b7b files/99_nagios.conf 350
+MD5 565ce2a690d50aeb542e7afe44b8c733 files/Makefile-distclean.diff.bz2 1133
+MD5 f83fb59efe215d8191866a95685b4b39 files/nagios 1416
+MD5 446906907cccdbf195442373c6f17f77 files/2.x-series-nsca.patch 767
+MD5 cd183719838dc2a8b9cafa8a639f4ad2 files/digest-nagios-core-1.2-r4 63
+MD5 dad3fb46e8f73ac54d9239a542bc82e0 files/nagios.conf 362
+MD5 f2947dec6b9a839da79606bcc394036b files/conf.d 409
+MD5 6b679390ce57974a0f69145e0918372f files/nagios-2.0b.cfg-sample.gz 8990
+MD5 faad55511f21831997f9150547aa4e7d files/nagios.cfg-sample.gz 7224
+MD5 cee7d66cc61be3558af44ab177d99e1f files/submit_check_result_via_nsca.patch 585
+MD5 7a96e80dbe17f26441d3266662b58a51 files/digest-nagios-core-2.0b_p4 65
+MD5 484d128eff6e79cfcb09e37a92e1926f files/digest-nagios-core-1.3 63
+MD5 c6cc963b6a3cc45558ebbc5890908bb0 files/digest-nagios-core-2.0b_p5 65
diff --git a/net-analyzer/nagios-core/files/99_nagios.conf b/net-analyzer/nagios-core/files/99_nagios.conf
index 95112117055b..b41cdeed9385 100644
--- a/net-analyzer/nagios-core/files/99_nagios.conf
+++ b/net-analyzer/nagios-core/files/99_nagios.conf
@@ -6,7 +6,7 @@
 		Order allow,deny
 		Allow from all
 	</Directory>
-	Alias /nagios/ /usr/nagios/share/
+	Alias /nagios /usr/nagios/share/
 	<Directory "/usr/nagios/share">
 		AllowOverride AuthConfig
 		Order allow,deny
diff --git a/net-analyzer/nagios-core/files/conf.d b/net-analyzer/nagios-core/files/conf.d
index 338311a8d1d0..7c77fa9e9626 100644
--- a/net-analyzer/nagios-core/files/conf.d
+++ b/net-analyzer/nagios-core/files/conf.d
@@ -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/net-analyzer/nagios-core/files/conf.d,v 1.1 2004/08/20 13:38:13 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/files/conf.d,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
 # Distributed monitoring users will want to configure here the ip/hostname of the central server.
 # It will be used by submit_check_result_via_nsca.
diff --git a/net-analyzer/nagios-core/files/nagios b/net-analyzer/nagios-core/files/nagios
index b8c5318ffe8b..012db9c5164c 100644
--- a/net-analyzer/nagios-core/files/nagios
+++ b/net-analyzer/nagios-core/files/nagios
@@ -1,31 +1,56 @@
 #!/sbin/runscript
-# 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/net-analyzer/nagios-core/files/nagios,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
+
+opts="${opts} reload checkconfig"
 
 depend() {
 	need net
 	use dns logger
+	after mysql postgresql
+}
+
+reload()
+{
+	checkconfig || return 1
+	ebegin "Reloading configuration"
+	killall -HUP nagios &>/dev/null
+	eend $?
+}
+
+checkconfig() {
+	# Silent Check
+	/usr/nagios/bin/nagios -v /etc/nagios/nagios.cfg &>/dev/null && return 0
+
+	# Now we know there's problem - run again and display errors
+	/usr/nagios/bin/nagios -v /etc/nagios/nagios.cfg
+	eend $? "Configuration Error. Please fix your configfile"
 }
 
 start() {
+	checkconfig || return 1
 	ebegin "Starting nagios"
-	su - nagios -c "touch /var/nagios/nagios.log /var/nagios/status.sav"
+	touch /var/nagios/nagios.log /var/nagios/status.sav
+	chown nagios:nagios /var/nagios/nagios.log /var/nagios/status.sav
 	rm -f /var/nagios/rw/nagios.cmd
-	start-stop-daemon -o --quiet --start --startas /usr/nagios/bin/nagios \
+	start-stop-daemon --quiet --start --startas /usr/nagios/bin/nagios \
 		--pidfile /var/nagios/nagios.lock -- -d /etc/nagios/nagios.cfg
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping nagios"
-	start-stop-daemon -o --quiet --stop --pidfile /var/nagios/nagios.lock
+	start-stop-daemon --quiet --stop --pidfile /var/nagios/nagios.lock
 	rm -f /var/nagios/status.log /var/nagios/nagios.tmp /var/nagios/nagios.lock /var/nagios/rw/nagios.cmd
 	eend $?
 }
 
 svc_restart() {
+	checkconfig || return 1
 	ebegin "Restarting nagios"
 	svc_stop
 	svc_start
 	eend $?
 }
+
diff --git a/net-analyzer/nagios-core/files/nagios.conf b/net-analyzer/nagios-core/files/nagios.conf
index e26cffda3737..76abed125c24 100644
--- a/net-analyzer/nagios-core/files/nagios.conf
+++ b/net-analyzer/nagios-core/files/nagios.conf
@@ -9,7 +9,7 @@ ScriptAlias /nagios/cgi-bin/ /usr/nagios/sbin/
 </Directory>
 
 
-Alias /nagios/ /usr/nagios/share/
+Alias /nagios /usr/nagios/share/
 <Directory "/usr/nagios/share">
     AllowOverride AuthConfig
     Order allow,deny
diff --git a/net-analyzer/nagios-core/metadata.xml b/net-analyzer/nagios-core/metadata.xml
index fe1bb30c5923..2228f02f1849 100644
--- a/net-analyzer/nagios-core/metadata.xml
+++ b/net-analyzer/nagios-core/metadata.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>Nagios is a host and service monitor designed to inform you of network problems before your clients, end-users or managers do. It has been designed to run under the Linux operating system, but works fine under most *NIX variants as well. The monitoring daemon runs intermittent checks on hosts and services you specify using external "plugins" which return status information to Nagios. When problems are encountered, the daemon can send notifications out to administrative contacts in a variety of different ways (email, instant message, SMS, etc.). Current status information, historical logs, and reports can all be accessed via a web browser.</longdescription>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>eldad@gentoo.org</email>
+		<name>Eldad Zack</name>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription>Nagios is a host and service monitor designed to inform you
+		of network problems before your clients, end-users or managers do. It
+		has been designed to run under the Linux operating system, but works
+		fine under most *NIX variants as well. The monitoring daemon runs
+		intermittent checks on hosts and services you specify using external
+		"plugins" which return status information to Nagios. When problems are
+		encountered, the daemon can send notifications out to administrative
+		contacts in a variety of different ways (email, instant message, SMS,
+		etc.). Current status information, historical logs, and reports can all
+		be accessed via a web browser.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild b/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
index 39f1f0de7e59..2ed2e655a5b2 100644
--- a/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.2-r4.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/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.1 2005/01/25 10:04:18 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.2-r4.ebuild,v 1.1.1.1 2005/11/30 10:12:18 chriswhite Exp $
 
-inherit eutils depend.apache toolchain-funcs
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${P/-core}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -12,19 +12,16 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 IUSE="noweb mysql postgres perl debug apache2"
 
-# place inside !noweb beside the other apache depend
-#		apache2? ( ${APACHE2_DEPEND} )
 DEPEND="virtual/mailx
 	!noweb? (
 		>=media-libs/jpeg-6b-r3
 		>=media-libs/libpng-1.2.5-r4
 		>=media-libs/gd-1.8.3-r5
-		!apache2? ( ${APACHE1_DEPEND} )
+		${NEED_APACHE_DEPEND}
 	)
-
 	perl? ( >=dev-lang/perl-5.6.1-r7 )
 	mysql? ( >=dev-db/mysql-3.23.56 )
 	postgres? ( !mysql? ( >=dev-db/postgresql-7.3.2 ) )"
@@ -42,6 +39,15 @@ pkg_setup() {
 			die "pkg_setup failed"
 		fi
 	fi
+
+	enewgroup nagios
+
+	if use noweb; then
+		enewuser nagios -1 /bin/bash /dev/null nagios
+	else
+		enewuser nagios -1 /bin/bash /dev/null apache
+		usermod -G apache nagios
+	fi
 }
 
 src_unpack() {
@@ -51,6 +57,11 @@ src_unpack() {
 	epatch ${FILESDIR}/submit_check_result_via_nsca.patch
 
 	epatch ${FILESDIR}/Makefile-distclean.diff.bz2
+
+	# libpq-fe.h isnt in psgql/ 
+	cd xdata/
+	sed -i -e "s:pgsql/::" *.c
+
 	cp ${FILESDIR}/nagios.cfg-sample.gz ./
 	gunzip nagios.cfg-sample.gz
 }
@@ -64,9 +75,9 @@ src_compile() {
 
 		has_version ">=sys-apps/portage-2.0.50" && (
 			einfo "You can add -"
-			echo ""
+			echo
 			einfo "net-analyzer/nagios-core [use flags]"
-			echo ""
+			echo
 			einfo "to /etc/portage/package.use to permanently set this package's USE flags"
 			einfo "More info on package.use is available on:"
 			einfo "     man 5 portage"
@@ -74,7 +85,7 @@ src_compile() {
 	elif use postgres ; then
 		myconf="${myconf} --with-pgsql-xdata"
 
-		if [ -r /usr/include/postgresql/pgsql/libpq-fe.h ] ; then
+		if [ -r /usr/include/postgresql/libpq-fe.h ] ; then
 			myconf="${myconf} --with-pgsql-inc=/usr/include/postgresql"
 		fi
 	fi
@@ -186,23 +197,18 @@ pkg_preinst() {
 	keepdir /usr/nagios/share/ssi
 	keepdir /var/nagios/rw
 
-	enewgroup nagios
-
 	if use noweb; then
-		enewuser nagios -1 /bin/bash /dev/null nagios
 		chown nagios:nagios ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	else
-		enewuser nagios -1 /bin/bash /dev/null apache
-		usermod -G apache nagios
 		chown nagios:apache ${D}/var/nagios/rw || die "Failed Chown of ${D}/var/nagios/rw"
 	fi
 
-	chmod ug+s ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
+	chmod 2750 ${D}/var/nagios/rw || die "Failed Chmod of ${D}/var/nagios/rw"
 }
 
 pkg_postinst() {
 	einfo
-	einfo "The example config files are located at /usr/share/doc/${P}/sample-configs/."
+	einfo "The example config files are located at /usr/share/doc/${PF}/sample-configs/."
 	einfo
 	einfo "Also, if you want nagios to start at boot time"
 	einfo "remember to execute:"
@@ -219,7 +225,6 @@ pkg_postinst() {
 			einfo " Edit /etc/conf.d/apache2 and add \"-D NAGIOS\""
 		else
 			einfo " Edit /etc/conf.d/apache and add \"-D NAGIOS\""
-			einfo " Edit ${APACHE1_CONFDIR}/apache.conf and add \"Include modules.d/nagios.conf\""
 		fi
 
 		einfo
diff --git a/net-analyzer/nagios-core/nagios-core-1.3.ebuild b/net-analyzer/nagios-core/nagios-core-1.3.ebuild
index 2ca1b69774e2..c9f9b0bb144d 100644
--- a/net-analyzer/nagios-core/nagios-core-1.3.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-1.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/net-analyzer/nagios-core/nagios-core-1.3.ebuild,v 1.1 2005/11/19 23:07:46 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-1.3.ebuild,v 1.1.1.1 2005/11/30 10:12:18 chriswhite Exp $
 
 inherit eutils apache-module toolchain-funcs
 
diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
index 6d188529e9d6..a1c655d199e9 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p4.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/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild,v 1.1 2005/09/28 18:22:32 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p4.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
-inherit eutils depend.apache toolchain-funcs
+inherit eutils apache-module toolchain-funcs
 
 MY_P=${PN/-core}-${PV/_p}
 DESCRIPTION="Nagios Core - Check daemon, CGIs, docs"
@@ -19,7 +19,7 @@ DEPEND="virtual/mailx
 		>=media-libs/jpeg-6b-r3
 		>=media-libs/libpng-1.2.5-r4
 		>=media-libs/gd-1.8.3-r5
-		${APACHE_DEPEND}
+		${NEED_APACHE_DEPEND}
 		perl? ( net-analyzer/traceroute )
 	)
 	perl? ( >=dev-lang/perl-5.6.1-r7 )"
@@ -52,7 +52,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/2.x-series-nsca.patch
-	gunzip -c ${FILESDIR}/nagios.cfg-sample.gz > ./nagios.cfg-sample
+	gunzip -c ${FILESDIR}/nagios-2.0b.cfg-sample.gz > ./nagios.cfg-sample
 }
 
 src_compile() {
diff --git a/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild b/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild
index a55cc06a9130..536f4704bb5a 100644
--- a/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-2.0b_p5.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/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild,v 1.1 2005/11/19 23:07:46 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-core/nagios-core-2.0b_p5.ebuild,v 1.1.1.1 2005/11/30 10:12:18 chriswhite Exp $
 
 inherit eutils apache-module toolchain-funcs
 
diff --git a/net-analyzer/nagios-imagepack/ChangeLog b/net-analyzer/nagios-imagepack/ChangeLog
index e7cf07336c73..a6ed14234503 100644
--- a/net-analyzer/nagios-imagepack/ChangeLog
+++ b/net-analyzer/nagios-imagepack/ChangeLog
@@ -1,7 +1,23 @@
 # ChangeLog for net-analyzer/nagios-imagepack
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/ChangeLog,v 1.1 2002/11/02 05:55:41 alron Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/ChangeLog,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
+
+  10 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  nagios-imagepack-1.0.ebuild:
+  Don't install base/nagios.gd2 since it's installed by nagios-core.
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-imagepack-1.0.ebuild:
+  Stable on sparc.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-imagepack-1.0.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-imagepack-1.0.ebuild:
+  Tidy up.
+
+  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-imagepack-1.0 :
+  Changed ~x86 to x86 and added sparc and ppc keywords
 
 *nagios-imagepack-1.0	(1 Nov 2002)
-  1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-imagepack1.0 :
+  1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-imagepack-1.0 :
   Initial import. Ebuild submitted by Dean Bailey <alron@gentoo.org>.
diff --git a/net-analyzer/nagios-imagepack/Manifest b/net-analyzer/nagios-imagepack/Manifest
index e69de29bb2d1..eb10147e5380 100644
--- a/net-analyzer/nagios-imagepack/Manifest
+++ b/net-analyzer/nagios-imagepack/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ce905325e20a846c9cde07644b7f7b74 nagios-imagepack-1.0.ebuild 1021
+MD5 622b3c6f9ee2f848a17062c997e09db7 ChangeLog 953
+MD5 5fca464505216a223336866fea11a426 metadata.xml 244
+MD5 2cdc23c6aeec1949bbd70ffb1defa4a6 files/digest-nagios-imagepack-1.0 470
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCMCSSEZCkKN40op4RAmAAAJ9HyIVfm7uFm9bCvu97FwTsF1jR+ACgjzPi
+Pm4YEWd8hT6hf23iOzI8pJE=
+=NdIZ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild b/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
index a299e50e0a94..fb3a1c05c96e 100644
--- a/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
+++ b/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild
@@ -1,11 +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/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild,v 1.1 2002/11/02 05:55:41 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-imagepack/nagios-imagepack-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Nagios imagepacks - Icons and pictures for Nagios"
 HOMEPAGE="http://www.nagios.org"
-IMAGE_URI="http://telia.dl.sourceforge.net/sourceforge/nagios/"
+IMAGE_URI="mirror://sourceforge/nagios/"
 SRC_URI="
 	${IMAGE_URI}/imagepak-andrade.tar.gz
 	${IMAGE_URI}/imagepak-base.tar.gz
@@ -13,31 +12,27 @@ SRC_URI="
 	${IMAGE_URI}/imagepak-didier.tar.gz
 	${IMAGE_URI}/imagepak-remus.tar.gz
 	${IMAGE_URI}/imagepak-satrapa.tar.gz
- 	${IMAGE_URI}/imagepak-werschler.tar.gz
+	${IMAGE_URI}/imagepak-werschler.tar.gz
 "
 
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 
 RDEPEND="net-analyzer/nagios-core"
 
-src_unpack() {
-	local bn
-	mkdir ${S}
-	cd ${S}
-	for i in ${SRC_URI} ; do
-		bn=`basename $i`
-			unpack ${bn}
-	done
-}
+IUSE=""
 
-src_compile() {
-	einfo "No compilation necessary."
+src_unpack() {
+	mkdir ${S} && cd ${S}
+	unpack ${A}
 }
 
 src_install () {
+	# nagios-core installs nagios.gd2
+	rm base/nagios.gd2
+
 	insinto /usr/nagios/share/images/logos
 	doins base/* didier/* imagepak-andrade/* imagepak-bernhard/* remus/* satrapa/* werschler/*
 }
diff --git a/net-analyzer/nagios-nrpe/ChangeLog b/net-analyzer/nagios-nrpe/ChangeLog
index 952b920f9e55..b07e27be022e 100644
--- a/net-analyzer/nagios-nrpe/ChangeLog
+++ b/net-analyzer/nagios-nrpe/ChangeLog
@@ -1,6 +1,79 @@
 # ChangeLog for net-analyzer/nagios-nrpe
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.1 2002/11/02 05:55:41 alron Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/ChangeLog,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  nagios-nrpe-2.0-r1.ebuild:
+  * Clean up how the binaries are installed in the ebuild
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nagios-nrpe-2.0-r1.ebuild:
+  Stable on sparc
+
+  09 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  nagios-nrpe-2.0-r1.ebuild:
+  * Marked stable on x86
+
+*nagios-nrpe-2.0-r1 (10 Jul 2005)
+
+  10 Jul 2005; Lance Albertson <ramereth@gentoo.org>
+  +nagios-nrpe-2.0-r1.ebuild:
+  * Added configure option for command-args
+  * Added nrpe_check_control from contrib
+
+  03 May 2005; Eldad Zack <eldad@gentoo.org> nagios-nrpe-1.8-r1.ebuild,
+  nagios-nrpe-2.0.ebuild:
+  Changed perms for check_nrpe and nrpe to 0750.
+
+  13 Apr 2005; Eldad Zack <eldad@gentoo.org> nagios-nrpe-1.8-r1.ebuild,
+  nagios-nrpe-2.0.ebuild:
+  tighter perms for /etc/nagios/nrpe.cfg. Thanks to Romang <zataz@zataz.net>.
+  Bug #88937.
+
+  20 Mar 2005; Eldad Zack <eldad@gentoo.org> nagios-nrpe-2.0.ebuild:
+  Generate the dh.h header file for better security.
+
+  11 Dec 2004; Benjamin Schindler <config@gentoo.org>
+  nagios-nrpe-2.0.ebuild:
+  Stable on amd64
+
+  30 Nov 2004; Sven Wegener <swegener@gentoo.org> nagios-nrpe-2.0.ebuild:
+  Fixed invalid atoms in *DEPEND.
+
+  25 Oct 2004; Eldad Zack <eldad@gentoo.org> nagios-nrpe-2.0.ebuild:
+  Now featuring SSL useflag, as suggested by Christian Theune <ct@gocept.com>.
+  Closes #68704.
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-nrpe-2.0.ebuild:
+  Stable on sparc.
+
+  18 Mar 2004; Philip Walls <malverian@gentoo.org> nagios-nrpe-2.0.ebuild
+  Stable on x86 and amd64
+
+*nagios-nrpe-2.0 (10 Mar 2004)
+  10 Mar 2004; Philip Walls <malverian@gentoo.org> nagios-nrpe-2.0.ebuild
+  Version bump. Removed old nrpe init script and nrpe.cfg. Added metadata
+
+*nagios-nrpe-1.8-r1	(17 Jun 2003)
+  06 Dec 2003; Heinrich Wendel <lanius@gentoo.org> nagios-nrpe-1.8-r1.ebuild:
+  bug 34355
+
+  17 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-nrpe-1.8-r1 :
+  Fix for bugs #17885 and #19539, updated sample conf also.
+
+  28 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-nrpe-1.8 :
+  Moved to x86 stable
+
+*nagios-nrpe-1.8
+  09 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-nrpe-1.8 :
+  Version bump
+
+  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-nrpe-1.7 :
+  Changed ~x86 to x86 and added ~sparc and ~ppc keywords
+
+*nagios-nrpe-1.7	(13 Jan 2003)
+  13 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-nrpe-1.7 :
+  Updated to version 1.7.
 
 *nagios-nrpe-1.5	(1 Nov 2002)
   1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-nrpe-1.5 :
diff --git a/net-analyzer/nagios-nrpe/Manifest b/net-analyzer/nagios-nrpe/Manifest
index e69de29bb2d1..5bf7c0da6a7b 100644
--- a/net-analyzer/nagios-nrpe/Manifest
+++ b/net-analyzer/nagios-nrpe/Manifest
@@ -0,0 +1,12 @@
+MD5 2933063bc4ba11e477d981bd88cc4e85 ChangeLog 2831
+MD5 9836adb15300bf890cba617db33c00ed nagios-nrpe-1.8-r1.ebuild 1552
+MD5 6a5890137b6cd35bb0b647ff45f69667 metadata.xml 395
+MD5 7243ba975262e63eef5718abe802befe nagios-nrpe-2.0.ebuild 1880
+MD5 f3378f892584a33cbd2e1fc8a74aa7b2 nagios-nrpe-2.0-r1.ebuild 2362
+MD5 a9506069b34b36a580c78efa20b05cc9 files/digest-nagios-nrpe-1.8-r1 59
+MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-1.8 462
+MD5 3c91382446609ec78fa98d94509539dd files/nrpe-1.8.cfg 3501
+MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0 59
+MD5 1ea034ce9ade9210fa8c4ade4d51d132 files/nrpe-2.0 462
+MD5 3c91382446609ec78fa98d94509539dd files/nrpe-2.0.cfg 3501
+MD5 f1fc0bb370291c6d0304900e25a62dc6 files/digest-nagios-nrpe-2.0-r1 59
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild
index 2ebe431e6b53..559f9e78e194 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild
@@ -1,16 +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/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild,v 1.1 2003/06/18 00:01:38 alron Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-1.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+inherit eutils
+
 DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/nrpe-1.8.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc ~amd64"
 IUSE=""
 DEPEND=">=net-analyzer/nagios-plugins-1.3.0"
 S="${WORKDIR}/nrpe-1.8"
 
+pkg_setup() {
+	enewgroup nagios
+	enewuser nagios -1 /bin/bash /dev/null nagios
+}
+
 src_compile() {
 	./configure \
 		--host=${CHOST} \
@@ -26,8 +33,12 @@ src_compile() {
 
 src_install() {
 	dodoc LEGAL Changelog README
+
 	insinto /etc/nagios
 	newins ${FILESDIR}/nrpe-1.8.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
 	exeinto /usr/nagios/bin
 	doexe src/nrpe
 	fowners nagios:nagios /usr/nagios/bin/nrpe
@@ -36,9 +47,11 @@ src_install() {
 	fowners nagios:nagios /usr/nagios/libexec/check_nrpe
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/nrpe-1.8 nrpe
+
+	fperms 0750 /usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
 }
 pkg_postinst() {
-	einfo 
+	einfo
 	einfo "If you are using the nrpe daemon, remember to edit"
 	einfo "the config file /etc/nagios/nrpe.cfg"
 	einfo
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild
index 1d1ac0ecb9f0..98ebed8f1a1e 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-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/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild,v 1.1 2005/07/10 04:41:17 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -12,7 +12,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc sparc x86"
 
 IUSE="ssl command-args"
 DEPEND=">=net-analyzer/nagios-plugins-1.3.0
@@ -59,15 +59,14 @@ src_install() {
 	fowners root:nagios /etc/nagios/nrpe.cfg
 	fperms 0640 /etc/nagios/nrpe.cfg
 
+	exeopts -m0750 -o nagios -g nagios
 	exeinto /usr/nagios/bin
 	doexe src/nrpe
 
+	exeopts -m0750 -o nagios -g nagios
 	exeinto /usr/nagios/libexec
 	doexe src/check_nrpe contrib/nrpe_check_control
 
-	fowners nagios:nagios /usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
-	fperms 0750	/usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
-
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/nrpe-${PV} nrpe
 }
diff --git a/net-analyzer/nagios-nrpe/nagios-nrpe-2.0.ebuild b/net-analyzer/nagios-nrpe/nagios-nrpe-2.0.ebuild
index c09d18caf18c..3b1a223d9e57 100644
--- a/net-analyzer/nagios-nrpe/nagios-nrpe-2.0.ebuild
+++ b/net-analyzer/nagios-nrpe/nagios-nrpe-2.0.ebuild
@@ -1,16 +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/net-analyzer/nagios-nrpe/nagios-nrpe-2.0.ebuild,v 1.1 2004/03/10 14:20:21 malverian Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nrpe/nagios-nrpe-2.0.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
 inherit eutils
 
 DESCRIPTION="Nagios $PV NRPE - Nagios Remote Plugin Executor"
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/nrpe-${PV}.tar.gz"
+
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
-IUSE=""
-DEPEND=">=net-analyzer/nagios-plugins-1.3.0"
+
+KEYWORDS="x86 ~ppc sparc amd64"
+
+IUSE="ssl"
+DEPEND=">=net-analyzer/nagios-plugins-1.3.0
+	ssl? ( dev-libs/openssl )"
 S="${WORKDIR}/nrpe-${PV}"
 
 pkg_setup() {
@@ -19,7 +25,16 @@ pkg_setup() {
 }
 
 src_compile() {
-	./configure \
+	local myconf
+
+	myconf="${myconf} `use_enable ssl`"
+
+	# Generate the dh.h header file for better security (2005 Mar 20 eldad)
+	if useq ssl ; then
+		openssl dhparam -C 512 | sed -n '1,/BEGIN DH PARAMETERS/p' | grep -v "BEGIN DH PARAMETERS" > ${S}/src/dh.h
+	fi
+
+	./configure ${myconf} \
 		--host=${CHOST} \
 		--prefix=/usr/nagios \
 		--localstatedir=/var/nagios \
@@ -32,15 +47,22 @@ src_compile() {
 }
 
 src_install() {
-	dodoc LEGAL Changelog README
+	dodoc LEGAL Changelog README SECURITY README.SSL
+
 	insinto /etc/nagios
 	newins ${FILESDIR}/nrpe-${PV}.cfg nrpe.cfg
+	fowners root:nagios /etc/nagios/nrpe.cfg
+	fperms 0640 /etc/nagios/nrpe.cfg
+
 	exeinto /usr/nagios/bin
 	doexe src/nrpe
-	fowners nagios:nagios /usr/nagios/bin/nrpe
+
 	exeinto /usr/nagios/libexec
 	doexe src/check_nrpe
-	fowners nagios:nagios /usr/nagios/libexec/check_nrpe
+
+	fowners nagios:nagios	/usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
+	fperms 0750		/usr/nagios/libexec/check_nrpe /usr/nagios/bin/nrpe
+
 	exeinto /etc/init.d
 	newexe ${FILESDIR}/nrpe-${PV} nrpe
 }
diff --git a/net-analyzer/nagios-nsca/ChangeLog b/net-analyzer/nagios-nsca/ChangeLog
index 18cf5c28912f..d05e1ac58147 100644
--- a/net-analyzer/nagios-nsca/ChangeLog
+++ b/net-analyzer/nagios-nsca/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for net-analyzer/nagios-nsca
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.1 2002/11/02 05:55:41 alron Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-nsca-2.4.ebuild:
+  Stable on sparc.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nagios-nsca-2.4.ebuild:
+  Added metadata
+
+  19 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> nagios-nsca-2.4.ebuild:
+  fix depend (bug #45110); tidy
+
+  15 Dec 2003; Martin Holzer <mholzer@gentoo.org> nagios-nsca-2.4.ebuild:
+  x86 stable.
+
+*nagios-nsca-2.4 (26 Nov 2003)
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-nsca-2.4.ebuild:
+  Version bumped.
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-nsca-2.3-r1.ebuild:
+  Added RESTRICT="nomirror"
+
+*nagios-nsca-2.3-r1
+  17 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-nsca-2.3-r1 :
+  Bug fix for bug #22498
+
+  28 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-nsca-2.3 :
+  Moved to x86 stable.
+
+*nagios-nsca-2.3	(09 Feb 2003)
+  09 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-nsca-2.3 :
+  Version bump
+
+  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-nsca-2.2 :
+  Changed ~x86 to x86 and added sparc and ppc keywords
+
+*nagios-nsca-2.2	(13 Jan 2003)
+  13 Jan 2002; Dean Bailey <alron@gentoo.org> nagios-nsca-2.2 :
+  Updated to version 2.2
 
 *nagios-nsca-2.1	(1 Nov 2002)
   1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-nsca-2.1 :
diff --git a/net-analyzer/nagios-nsca/Manifest b/net-analyzer/nagios-nsca/Manifest
index e69de29bb2d1..b8251e3ae4e5 100644
--- a/net-analyzer/nagios-nsca/Manifest
+++ b/net-analyzer/nagios-nsca/Manifest
@@ -0,0 +1,8 @@
+MD5 0197d6f0df668cf9c76dc595b0f00d09 ChangeLog 1563
+MD5 37ff0d357a18eb2b08987c2f1b7deef9 nagios-nsca-2.4.ebuild 1382
+MD5 1b415a14a43aaa028e38fe8bb261c37f metadata.xml 239
+MD5 437542031246a33fb8628c0e4200d44b files/digest-nagios-nsca-2.4 59
+MD5 218223213e92b553a8b48303099e8074 files/nsca 449
+MD5 529c269b478256730d697c47a66c084e files/nsca-2.3 462
+MD5 8b86cb8a22eb4b17001fbabccdcb815b files/nsca.cfg 4960
+MD5 76939517175739a4759384705421d632 files/send_nsca.cfg 1628
diff --git a/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild b/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild
index 801721743492..95a5dea908a8 100644
--- a/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild
+++ b/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild
@@ -1,17 +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/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild,v 1.1 2003/11/26 18:34:52 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-nsca/nagios-nsca-2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
-DESCRIPTION="Nagios $PV NSCA  - Nagios Service Check Acceptor"
+DESCRIPTION="Nagios NSCA  - Nagios Service Check Acceptor"
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagios/nsca-${PV}.tar.gz"
-RESTRICT="nomirror"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 IUSE=""
-DEPEND=">=net-analyzer/nagios-plugins-1.3.0
-	>=libmcrypt-2.5.1-r4"
+
+DEPEND=">=net-analyzer/nagios-plugins-1.3.1
+	>=dev-libs/libmcrypt-2.5.1-r4"
 S="${WORKDIR}/nsca-${PV}"
 
 src_compile() {
@@ -24,7 +25,7 @@ src_compile() {
 		--with-nsca-grp=nagios \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man || die "./configure failed"
-	emake all || die
+	emake all || die "emake failed"
 }
 
 src_install() {
diff --git a/net-analyzer/nagios-plugins/ChangeLog b/net-analyzer/nagios-plugins/ChangeLog
index 4d1cba9871db..00d7a512a7b3 100644
--- a/net-analyzer/nagios-plugins/ChangeLog
+++ b/net-analyzer/nagios-plugins/ChangeLog
@@ -1,7 +1,188 @@
 # ChangeLog for net-analyzer/nagios-plugins
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.1 2002/11/02 05:55:41 alron Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
+
+*nagios-plugins-1.4.2-r1 (20 Nov 2005)
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  nagios-plugins-1.4.1.ebuild, nagios-plugins-1.4.2.ebuild,
+  +nagios-plugins-1.4.2-r1.ebuild:
+  * Stable on x86
+  * Fixed RDEPEND for mysql, bug #98153
+    - Added dev-perl/DBI and dev-perl/DBD-mysql
+
+*nagios-plugins-1.4.2 (24 Oct 2005)
+
+  24 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/nagios-plugins-1.4.1-noradius.patch,
+  +files/nagios-plugins-1.4-noradius.patch, nagios-plugins-1.4.1.ebuild,
+  +nagios-plugins-1.4.2.ebuild:
+  * Version bump
+  * Fixed die on chmod
+  * Updated noradius patch
+
+  07 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nagios-plugins-1.4.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Lance Albertson <ramereth@gentoo.org>
+  nagios-plugins-1.4.1.ebuild:
+  * Removed arch blocks on radiusclient, resolves #105512
+
+  10 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  +files/nagios-plugins-1.4.1-noradius.patch, nagios-plugins-1.4.1.ebuild:
+  * Fix noradius patch to actually patch configure.in instead of the configure
+  script (makes it more portable) This should fix bug #105459
+
+  10 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  nagios-plugins-1.4.1.ebuild:
+  Changed epatch line to match renamed patch. Sorry if I am stepping on
+  anyone's toes but this one keeps biting me and I don't have easy access to a
+  web browser at the moment.
+
+*nagios-plugins-1.4.1 (09 Sep 2005)
+
+  09 Sep 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  nagios-plugins-1.4.ebuild, +nagios-plugins-1.4.1.ebuild:
+  * Version bump (also added radius IUSE)
+  * Marked 1.4 stable on x86
+  * Updated metadata.xml
+
+  04 May 2005; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild,
+  nagios-plugins-1.4.ebuild:
+  Fixed dir permissions.
+
+  17 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> nagios-plugins-1.4.ebuild:
+  Fix sed in src_install for bug 85607.
+
+  10 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> nagios-plugins-1.4.ebuild:
+  It's called use_with not 'use with'.. also, it's postgres not postgress.
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  nagios-plugins-1.4.ebuild:
+  Fix for ps synax as per bug #82591. Thanks to marcelogoes@gmail.com
+
+*nagios-plugins-1.4 (15 Feb 2005)
+
+  15 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nagios-plugins-1.4.ebuild:
+  Version bump thanks to the extreme persistance of Marco Morales
+  <soulse@gmail.com> in bug #81826
+
+  11 Dec 2004; Benjamin Schindler <config@gentoo.org>
+  nagios-plugins-1.3.1-r1.ebuild:
+  Stable on amd64
+
+  22 Nov 2004; Jason Wever <weeve@gentoo.org>
+  nagios-plugins-1.3.1-r1.ebuild:
+  Re-marking stable on sparc as someone moved it back to testing and broke
+  dependencies.
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> +files/check_swap.c.patch,
+  nagios-plugins-1.3.1-r1.ebuild:
+  check_swap fix for kernel 2.6, thanks to Evgeny Stambulchik
+  <fnevgeny@weizmann.ac.il> for providing the patch. Closes #61386.
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild:
+  contribs nitpicks: chmod all .pl script +x, fixed interpreter,
+  check_file_age.pl: fixed use clause. Thanks to Matt Van Wormer
+  <matt@broadleafservices.com>. Closes #68292.
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org>
+  nagios-plugins-1.3.1-r1.ebuild:
+  Stable on sparc.
+
+  20 Aug 2004; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild:
+  Fixed ebuild for binary install. Closes bug #58928.
+
+  20 Aug 2004; Eldad Zack <eldad@gentoo.org>
+  +files/nagios-plugins-noradius.patch, nagios-plugins-1.3.1-r1.ebuild:
+  Disabled building of check_radius. See bug #45139.
+
+  04 Aug 2004; Jon Hood <squinky86@gentoo.org> nagios-plugins-1.3.1-r1.ebuild,
+  nagios-plugins-1.3.1.ebuild:
+  Move enewuser syntax to pkg_preinst() irt #58526.
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild:
+  Added contrib plugins to install. As a special case, insert check_nagios_db.pl
+  directly into libexec when emerge with db support. Closes #57429.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild:
+  marked x86 stable
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nagios-plugins-1.3.1-r1.ebuild, nagios-plugins-1.3.1.ebuild:
+  Added metadata
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-plugins-1.3.1-r1.ebuild,
+  nagios-plugins-1.3.1.ebuild:
+  Tidy up, fixed use flag typo
+
+*nagios-plugins-1.3.1-r1 (12 Feb 2004)
+
+  12 Feb 2004; rob holland <tigger@gentoo.org> nagios-plugins-1.3.1-r1.ebuild:
+  new nagios-plugins ebuild with hopefully more sensible useflags/dependancies
+
+  15 Dec 2003; Martin Holzer <mholzer@gentoo.org> nagios-plugins-1.3.1.ebuild:
+  x86 stable.
+
+*nagios-plugins-1.3.1 (26 Nov 2003)
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org> nagios-plugins-1.3.1.ebuild:
+  Version bumped.
+
+*nagios-plugins-1.3.0-r2 (26 Nov 2003)
+
+  26 Nov 2003; Martin Holzer <mholzer@gentoo.org>
+  nagios-plugins-1.3.0-r2.ebuild:
+  adding RESTRICT="nomirror"
+
+  10 Sep 2003; Michael Sterrett <msterret@gentoo.org>
+  nagios-plugins-1.3.0-r1.ebuild, nagios-plugins-1.3.0.ebuild,
+  nagios-plugins-1.3.0_beta2-r1.ebuild, nagios-plugins-1.3.0_beta3-r1.ebuild,
+  nagios-plugins-1.3.0_beta3.ebuild:
+  qstat moved to games-util/qstat
+
+  19 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0-r1.ebuild :
+  Small fixes in dependancies.
+
+*nagios-plugins-1.3.0-r1	(17 Jun 2003)
+  17 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0-r1.ebuild :
+  Fix for bugs #17771, #21198, #20616, #16628, #22955
+
+*nagios-plugins-1.3.0
+  12 May 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0 :
+  Version bump to 1.3.0 final.
+
+*nagios-plugins-1.3.0_beta3-r1
+  16 Mar 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0_beta3-r1 :
+  Fixed a problem where nagios-plugins was being installed before
+  nagios-core. This should fix bugs 16090 and 17127.
+
+*nagios-plugins-1.3.0_beta3
+  28 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0_beta3 :
+  Version bump to beta3. Moved to stable.
+
+*nagios-plugins-1.3.0_beta2-r1
+  30 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0_beta2-r1 :
+  Changed a few deps, this is still ~x86 untill it can be fully tested. 
+  The dep changes were suggested via a bugs.gentoo.org submission by
+  someone who I cant remember at this point in time. He will be listed here
+  once I log on and dig again.
+
+  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0_beta2 :
+  Changed ~x86 to x86 and added sparc and ppc keywords
+
+*nagios-plugins-1.3.0_beta2	(13 Jan 2003)
+  13 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3.0_beta2:
+  Updated to new version.
+
+*nagios-plugins-1.3_beta1	(7 Nov 2002)
+  7 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3_beta1 :
+  Minor ebuild fixes. Nothing warrenting new revision.
 
 *nagios-plugins-1.3_beta1	(1 Nov 2002)
   1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-plugins-1.3_beta1 :
   Initial import. Ebuild submitted by Dean Bailey <alron@gentoo.org>.
+  Christian - Manny Calavera - Neumair <christian-neumair@web.de> also
+  had submitted a bug report about nagios.
diff --git a/net-analyzer/nagios-plugins/Manifest b/net-analyzer/nagios-plugins/Manifest
index e69de29bb2d1..9fcba00a4ccf 100644
--- a/net-analyzer/nagios-plugins/Manifest
+++ b/net-analyzer/nagios-plugins/Manifest
@@ -0,0 +1,16 @@
+MD5 4a29ab72e87df5c6c5ebc0d7db421d4e ChangeLog 7318
+MD5 8f37db1a5330acf9b68c8642375acd17 nagios-plugins-1.3.1-r1.ebuild 2947
+MD5 5db356dad10986a73f73a0335265ad92 metadata.xml 371
+MD5 65f2a5c5e0084a5be8c0301705c0a67c nagios-plugins-1.4.ebuild 3278
+MD5 ca29b1e63e311f0a2072dc4f96d18506 nagios-plugins-1.4.1.ebuild 3469
+MD5 506a2b42fbb8a23f34862f6c43483a2d nagios-plugins-1.4.2.ebuild 3467
+MD5 e1f196dea131a17874eb1c421f77210c nagios-plugins-1.4.2-r1.ebuild 3520
+MD5 39af7074b023625d9a75730bd6932437 files/digest-nagios-plugins-1.3.1-r1 72
+MD5 acb0b2b914b27b67b9a33807b1e6838e files/install-opts-fix.diff 3168
+MD5 ee71da291efd7427bd9786591a98df34 files/nagios-plugins-noradius.patch 2661
+MD5 c8c25561d4871462ea03dc0490ced91b files/check_swap.c.patch 2212
+MD5 639ea6f5791cdf3ad540489c66d1f356 files/digest-nagios-plugins-1.4 70
+MD5 da07ad1aeef96a19b0a44da14dac23ca files/digest-nagios-plugins-1.4.1 72
+MD5 64ead1ebbfd3bdb60ac19dc617dd96bf files/digest-nagios-plugins-1.4.2 72
+MD5 73ee36e67ff5948e0db8c99963a9e89f files/nagios-plugins-1.4-noradius.patch 666
+MD5 64ead1ebbfd3bdb60ac19dc617dd96bf files/digest-nagios-plugins-1.4.2-r1 72
diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 895581eaff5c..49f4c77e89e4 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>Nagios plugins - Pack of plugins to make Nagios work properly</longdescription>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription lang="en">
+		Nagios plugins - Pack of plugins to make Nagios work properly
+	</longdescription>
 </pkgmetadata>
+
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
index 56d9b45c3fe5..12ba682e1759 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild
@@ -1,16 +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/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.1 2004/02/12 13:26:29 tigger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.3.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 inherit eutils
 
 DESCRIPTION="Nagios $PV plugins - Pack of plugins to make Nagios work properly"
 HOMEPAGE="http://www.nagios.org/"
 SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
-RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 sparc ~ppc amd64"
 IUSE="ldap mysql postgres ssl samba snmp nagios-dns nagios-ntp nagios-ping nagios-ssh"
 
 DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
@@ -29,8 +28,6 @@ RDEPEND=">=dev-lang/perl-5.6.1-r7
 	nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 )
 	nagios-ssh? ( >=net-misc/openssh-3.5_p1 )"
 
-S="${WORKDIR}/${P}"
-
 pkg_setup() {
 	enewgroup nagios
 	enewuser nagios -1 /bin/bash /dev/null nagios
@@ -42,6 +39,9 @@ src_compile() {
 	use postgres && myconf="${myconf} --with-pgsql" || myconf="${myconf} --without-pgsql"
 	use ssl && myconf="${myconf} --with-openssl" || myconf="${myconf} --without-openssl"
 
+	epatch ${FILESDIR}/nagios-plugins-noradius.patch
+	epatch ${FILESDIR}/check_swap.c.patch
+
 	./configure ${myconf} \
 		--host=${CHOST} \
 		--prefix=/usr/nagios \
@@ -53,16 +53,34 @@ src_compile() {
 }
 
 src_install() {
+	# bring contribs into shape... (21 Nov 2004 eldad)
+	mv ${S}/contrib/check_compaq_insight.pl ${S}/contrib/check_compaq_insight.pl.msg
+	chmod +x ${S}/contrib/*.pl
+
+	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' ${S}/contrib/*.pl
+	sed -i -e '30s/use lib utils.pm;/use utils;/' ${S}/contrib/check_file_age.pl
+
 	dodoc AUTHORS CODING COPYING ChangeLog FAQ INSTALL LEGALNEWS README REQUIREMENTS ROADMAP Requirements
 	make DESTDIR=${D} install || die
-}
 
-pkg_preinst() {
+	if use mysql || use postgres; then
+		dodir /usr/nagios/libexec
+		exeinto /usr/nagios/libexec
+		doexe ${S}/contrib/check_nagios_db.pl
+	fi
+
+	dodir /usr/nagios/libexec/
+	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
+
 	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
+
+	chmod -R o-rwx ${D}/usr/nagios/libexec "Failed Chmod of ${D}/usr/nagios/libexec"
 }
 
 pkg_postinst() {
 	einfo "This ebuild has a number of USE flags which determines what nagios is able to monitor."
 	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
 	einfo "flags need to be set for nagios to function correctly."
+	echo
+	einfo "contrib plugins are installed into /usr/nagios/libexec/contrib"
 }
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
index b18c8771204f..804f83f81ed0 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.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/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild,v 1.1 2005/09/09 05:12:16 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
 nagios-ssh nagios-game ups ipv6 radius"
 
@@ -18,10 +18,7 @@ DEPEND="ldap? ( >=net-nds/openldap-2.0.25 )
 	mysql? ( >=dev-db/mysql-3.23.52-r1 )
 	postgres? ( >=dev-db/postgresql-7.2 )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
-	!amd64? ( !sparc? ( !ppc? ( radius? ( >=net-dialup/radiusclient-0.3.2 ))))"
-
-	# Remove the arch blocks for radius once they get marked ~arch for those
-	# archs
+	radius? ( >=net-dialup/radiusclient-0.3.2 )"
 
 # test broken anyway	test? ( >=dev-perl/Cache-Cache-1.03 )"
 
@@ -44,12 +41,24 @@ pkg_setup() {
 	enewuser nagios -1 /bin/bash /dev/null nagios
 }
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
+	if ! use radius; then
+		EPATCH_OPTS="-p0 -d ${S}" epatch ${FILESDIR}/nagios-plugins-1.4-noradius.patch
+	fi
 	if ! use radius; then
-		epatch ${FILESDIR}/nagios-plugins-noradius-1.4.patch
+		export WANT_AUTOCONF=2.58
+		export WANT_AUTMAKE=1.8
+		cd ${S}
+		aclocal -I m4 || die "Failed to run aclocal"
+		autoconf || die "Failed to run autoconf"
+		automake || die "Failed to run automake"
 	fi
+}
+
+src_compile() {
 
-	./configure \
+	econf \
 		$(use_with mysql) \
 		$(use_with postgres) \
 		$(use_with ssl openssl) \
@@ -59,12 +68,12 @@ src_compile() {
 		--with-nagios-user=nagios \
 		--sysconfdir=/etc/nagios \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--mandir=/usr/share/man || die "econf failed"
 
 	# fix problem with additional -
 	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
 
-	make || die "make failed"
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -91,7 +100,7 @@ src_install() {
 
 	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
 
-	chmod -R o-rwx ${D}/usr/nagios/libexec "Failed Chmod of ${D}/usr/nagios/libexec"
+	chmod -R o-rwx ${D}/usr/nagios/libexec || "Failed Chmod of ${D}/usr/nagios/libexec"
 }
 
 pkg_postinst() {
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
index 5962bdf9e53f..6fb990edd372 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.4.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/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild,v 1.1 2005/11/20 02:37:54 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
index e68d1bc8523c..bf90e65209da 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.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/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild,v 1.1 2005/10/24 03:48:26 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping
 nagios-ssh nagios-game ups ipv6 radius"
 
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
index 7027b3a0e402..fdd5fc38c58e 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-1.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/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild,v 1.1 2005/02/15 12:03:12 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios-plugins/nagios-plugins-1.4.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/nagiosplug/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="~amd64 ~ppc sparc x86"
 IUSE="ssl samba mysql postgres ldap snmp nagios-dns nagios-ntp nagios-ping nagios-ssh nagios-game ups ipv6"
 
 # radius - awaiting keywods
@@ -50,29 +50,35 @@ src_compile() {
 	#fi
 
 	./configure \
-		`use_with mysql` \
-		`use_with postgress` \
-		`use with ssl openssl` \
-		`use with ipv6` \
+		$(use_with mysql) \
+		$(use_with postgres) \
+		$(use_with ssl openssl) \
+		$(use_with ipv6) \
 		--host=${CHOST} \
 		--prefix=/usr/nagios \
 		--with-nagios-user=nagios \
 		--sysconfdir=/etc/nagios \
 		--infodir=/usr/share/info \
 		--mandir=/usr/share/man || die "./configure failed"
-	make || die
+
+	#fix problem with additional -
+	sed -i -e 's:/bin/ps -axwo:/bin/ps axwo:g' config.h || die "sed failed"
+
+	make || die "make failed"
 }
 
 src_install() {
 	mv ${S}/contrib/check_compaq_insight.pl ${S}/contrib/check_compaq_insight.pl.msg
 	chmod +x ${S}/contrib/*.pl
 
-	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' ${S}/contrib/*.pl
-	sed -i -e '30s/use lib utils.pm;/use utils;/' ${S}/contrib/check_file_age.pl
+	sed -i -e '1s;#!.*;#!/usr/bin/perl -w;' ${S}/contrib/*.pl || die "sed failed"
+	sed -i -e '30s/use lib utils.pm;/use utils;/' \
+		${S}/plugins-scripts/check_file_age.pl || die "sed failed"
 
-	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING
-	Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
-	make DESTDIR=${D} install || die
+	dodoc ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS BUGS CHANGES CODING COPYING \
+		Changelog FAQ INSTALL LEGAL NEWS README REQUIREMENTS SUPPORT
+
+	make DESTDIR="${D}" install || die "make install failed"
 
 	if use mysql || use postgres; then
 		dodir /usr/nagios/libexec
@@ -84,13 +90,15 @@ src_install() {
 	mv ${S}/contrib ${D}/usr/nagios/libexec/contrib
 
 	chown -R nagios:nagios ${D}/usr/nagios/libexec || die "Failed Chown of ${D}/usr/nagios/libexec"
+
+	chmod -R o-rwx ${D}/usr/nagios/libexec "Failed Chmod of ${D}/usr/nagios/libexec"
 }
 
 pkg_postinst() {
 	einfo "This ebuild has a number of USE flags which determines what nagios isable to monitor."
 	einfo "Depending on what you want to monitor with nagios, some or all of these USE"
 	einfo "flags need to be set for nagios to function correctly."
-	echo ""
+	echo
 	einfo "contrib plugins are installed into /usr/nagios/libexec/contrib"
 }
 
diff --git a/net-analyzer/nagios/ChangeLog b/net-analyzer/nagios/ChangeLog
index 623ed1fce986..c581eb53405c 100644
--- a/net-analyzer/nagios/ChangeLog
+++ b/net-analyzer/nagios/ChangeLog
@@ -1,7 +1,106 @@
 # ChangeLog for net-analyzer/nagios
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.1 2002/11/02 05:55:41 alron Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/ChangeLog,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
+
+  20 Nov 2005; Lance Albertson <ramereth@gentoo.org>
+  -files/digest-nagios-2.0b_p1, -files/digest-nagios-2.0b_p2:
+  * Fix missing digests
+
+*nagios-2.0b_p5 (19 Nov 2005)
+*nagios-1.3 (19 Nov 2005)
+
+  19 Nov 2005; Lance Albertson <ramereth@gentoo.org> +nagios-1.3.ebuild,
+  -nagios-2.0b_p1.ebuild, -nagios-2.0b_p2.ebuild, +nagios-2.0b_p5.ebuild:
+  * Version bumps
+  * Remove old ebuilds
+
+*nagios-2.0b_p4 (28 Sep 2005)
+
+  28 Sep 2005; Lance Albertson <ramereth@gentoo.org> metadata.xml,
+  +nagios-2.0b_p4.ebuild:
+  * revbump for 2.0b_p4
+  * updated metadata.xml
+
+  06 Aug 2005; Chris White <chriswhite@gentoo.org> nagios-2.0b_p1.ebuild,
+  nagios-2.0b_p2.ebuild:
+  Got rid of strange tmp directory, adjusted the 2.0* ebuild's descriptions to
+  match 1.2's with permission of dragonheart. Fixes bug #101517. Fixed header
+  issues for 1.2.
+
+  24 Feb 2005; Daniel Black <dragonheart@gentoo.org> nagios-2.0b_p1.ebuild,
+  +nagios-2.0b_p2.ebuild:
+  Version bump as per bug #83116. Thanks to Allen Parker <allenp@efn.org>
+
+*nagios-2.0b_p1 (15 Feb 2005)
+
+  15 Feb 2005; Daniel Black <dragonheart@gentoo.org> +nagios-2.0b_p1.ebuild:
+  Version bump ebuild as per bug #81826 thanks to Marco Morales 
+  <soulse@gmail.com>
+
+  24 Oct 2004; Jason Wever <weeve@gentoo.org> nagios-1.2.ebuild:
+  Stable on sparc.
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-1.2.ebuild:
+  Added meta ebuild notice in pkg_postrm. Closes #30469.
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> nagios-1.2.ebuild:
+  x86 marked stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> nagios-1.1.ebuild,
+  nagios-1.2.ebuild:
+  added missing IUSE
+
+*nagios-1.2 (21 Mar 2004)
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> :
+  Version-bumped the Nagios meta package.
+
+  18 Feb 2004; Martin Holzer <mholzer@gentoo.org> nagios-1.1.ebuild:
+  removing einfo since this is done in nagios-core
+
+  02 Feb 2004; Martin Holzer <mholzer@gentoo.org> nagios-1.1.ebuild:
+  correcting einfo package.
+
+  14 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> :
+  You forgot to close bug 23564 :-)
+
+  12 Jul 2003; Robin H. Johnson <robbat2@gentoo.org> files/digest-nagios-1.0
+  files/digest-nagios-1.0-r1 files/digest-nagios-1.0_beta6
+  files/digest-nagios-1.1:
+  Add long forgotten digests. Portage needs them, even tho they are empty.
+
+  14 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> :
+  Generated digest files, even if there's nothing to digest...
+
+*nagios-1.1 (10 Jun 2003)
+  10 Jun 2003; Dean Bailey <alron@gentoo.org> nagios-1.1 :
+  Version bump to force updates to nagios-1.1.
+
+*nagios-1.0-r1		(11 Feb 2003)
+  11 Feb 2003; Dean Bailey <alron@gentoo.org> nagios-1.0-r1 :
+  Made changes to have the ebuild pull the latest installable
+  version of the nagios suite. Did this because of a small 
+  nagios-core update which addresses bug #14731
+  
+  15 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-1.0 :
+  Changed ~x86 to x86 and added sparc and ppc keywords
+
+*nagios-1.0		(13 Jan 2003)
+  13 Jan 2003; Dean Bailey <alron@gentoo.org> nagios-1.0 :
+  Updated to latest version.
+
+*nagios-1.0_beta6	(19 Nov 2002)
+  19 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-1.0_beta6 :
+  Whoops, I guess I didnt fix it properly last time. 
+  Lets try this again.
+
+*nagios-1.0_beta6	(16 Nov 2002)
+  16 Nov 2002; Dean Bailey <alron@getnoo.org> nagios-1.0_beta6 :
+  Small ebuild fix, not warrenting a revision change. The msg the ebuild 
+  gave after emerge had a small error in it. Fixed.
 
 *nagios-1.0_beta6	(1 Nov 2002)
   1 Nov 2002; Dean Bailey <alron@gentoo.org> nagios-1.0_beta6 :
   Initial import. Ebuild submitted by Dean Bailey <alron@gentoo.org>.
+  Christian - Manny Calavera - Neumair <christian-neumair@web.de> also
+  had submitted a bug report about nagios.
diff --git a/net-analyzer/nagios/Manifest b/net-analyzer/nagios/Manifest
index b9006fbc0a8c..74b4cfba3581 100644
--- a/net-analyzer/nagios/Manifest
+++ b/net-analyzer/nagios/Manifest
@@ -1,6 +1,10 @@
-MD5 c4060f8ecb0df63f579b231e8c582556 ChangeLog 1394
-MD5 3f79b3eb37e503e67cacded1c99e0652 nagios-1.0-r1.ebuild 1453
-MD5 65c2334645522089181c663385269f26 nagios-1.0.ebuild 1350
-MD5 8f87a38dc9a1fd338b1fcdafe94c20f8 nagios-1.0_beta6.ebuild 1349
-MD5 3111175fdd025962683f50596b6c1189 nagios-1.1.ebuild 1454
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.1 0
+MD5 4bc9ff5aaa1648101b2bdc2215bc8fe5 ChangeLog 3919
+MD5 bb0bc884a0383e5be0a4bae6cba836dc metadata.xml 1049
+MD5 9cc5bbb8531bdad0ca97cbdd7fb3764e nagios-1.2.ebuild 855
+MD5 2087732313042452caa428329982cbac nagios-2.0b_p4.ebuild 855
+MD5 af422d124ed9da226220c3d6291f99c5 nagios-1.3.ebuild 855
+MD5 19d2d836b881c85ea52d1f2b1955f38a nagios-2.0b_p5.ebuild 855
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.2 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0b_p5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-2.0b_p4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nagios-1.3 0
diff --git a/net-analyzer/nagios/metadata.xml b/net-analyzer/nagios/metadata.xml
index 2d3d8a2c9243..2228f02f1849 100644
--- a/net-analyzer/nagios/metadata.xml
+++ b/net-analyzer/nagios/metadata.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
-<longdescription>The Nagios metapackage - merge this to pull install all of the nagios packages.</longdescription>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>eldad@gentoo.org</email>
+		<name>Eldad Zack</name>
+	</maintainer>
+	<maintainer>
+		<email>ramereth@gentoo.org</email>
+		<name>Lance Albertson</name>
+	</maintainer>
+	<longdescription>Nagios is a host and service monitor designed to inform you
+		of network problems before your clients, end-users or managers do. It
+		has been designed to run under the Linux operating system, but works
+		fine under most *NIX variants as well. The monitoring daemon runs
+		intermittent checks on hosts and services you specify using external
+		"plugins" which return status information to Nagios. When problems are
+		encountered, the daemon can send notifications out to administrative
+		contacts in a variety of different ways (email, instant message, SMS,
+		etc.). Current status information, historical logs, and reports can all
+		be accessed via a web browser.
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nagios/nagios-1.2.ebuild b/net-analyzer/nagios/nagios-1.2.ebuild
index 5e79a9e5530a..7a5ef54ebdc1 100644
--- a/net-analyzer/nagios/nagios-1.2.ebuild
+++ b/net-analyzer/nagios/nagios-1.2.ebuild
@@ -1,13 +1,14 @@
-# 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/net-analyzer/nagios/nagios-1.2.ebuild,v 1.1 2004/03/21 15:45:06 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the nagios packages"
 HOMEPAGE="http://www.nagios.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+KEYWORDS="x86 sparc ~ppc ~amd64"
+IUSE=""
 
 RDEPEND=">=net-analyzer/nagios-core-1.2
 	>=net-analyzer/nagios-plugins-1.3.1
@@ -15,3 +16,15 @@ RDEPEND=">=net-analyzer/nagios-core-1.2
 	>=net-analyzer/nagios-nsca-2.3
 	>=net-analyzer/nagios-imagepack-1.0"
 
+pkg_postrm() {
+
+	einfo "Note: this is a META ebuild for ${P}."
+	einfo "to remove it completely or before re-emerging"
+	einfo "either use 'depclean', or remove/re-emerge these packages:"
+	echo
+	for dep in ${RDEPEND}; do
+		einfo "     ${dep}"
+	done
+	echo
+
+}
diff --git a/net-analyzer/nagios/nagios-1.3.ebuild b/net-analyzer/nagios/nagios-1.3.ebuild
index c89d2ce661e5..492f3a77bcf1 100644
--- a/net-analyzer/nagios/nagios-1.3.ebuild
+++ b/net-analyzer/nagios/nagios-1.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/net-analyzer/nagios/nagios-1.3.ebuild,v 1.1 2005/11/19 23:11:41 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-1.3.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the nagios packages"
 HOMEPAGE="http://www.nagios.org/"
diff --git a/net-analyzer/nagios/nagios-2.0b_p4.ebuild b/net-analyzer/nagios/nagios-2.0b_p4.ebuild
index 3d7ab067ec07..16b035bf74b1 100644
--- a/net-analyzer/nagios/nagios-2.0b_p4.ebuild
+++ b/net-analyzer/nagios/nagios-2.0b_p4.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/net-analyzer/nagios/nagios-2.0b_p4.ebuild,v 1.1 2005/09/28 18:22:52 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.0b_p4.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the
 nagios packages"
diff --git a/net-analyzer/nagios/nagios-2.0b_p5.ebuild b/net-analyzer/nagios/nagios-2.0b_p5.ebuild
index 9168d007c668..8920ecdf4676 100644
--- a/net-analyzer/nagios/nagios-2.0b_p5.ebuild
+++ b/net-analyzer/nagios/nagios-2.0b_p5.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/net-analyzer/nagios/nagios-2.0b_p5.ebuild,v 1.1 2005/11/19 23:11:41 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nagios/nagios-2.0b_p5.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 DESCRIPTION="The Nagios metapackage - merge this to pull install all of the
 nagios packages"
diff --git a/net-analyzer/nam/ChangeLog b/net-analyzer/nam/ChangeLog
index f0945bd91cbc..07a3536a2326 100644
--- a/net-analyzer/nam/ChangeLog
+++ b/net-analyzer/nam/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-analyzer/nam
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.1 2004/01/22 08:40:16 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/ChangeLog,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
+
+  28 Aug 2005; Luis Medinas <metalgod@gentoo.org> nam-1.11.ebuild:
+  Added ~amd64 keywords. Closes bug #100863.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nam-1.11.ebuild:
+  Added to ~ppc.
+
+*nam-1.11 (26 Feb 2005)
+
+  26 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> +nam-1.11.ebuild:
+  Bug #82771, version bump.
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  Add myself to metadata.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, nam-1.10.ebuild:
+  Tidy up, added debug to IUSE
+
+  11 Jun 2004; Ferris McCormick <fmccor@gentoo.org> nam-1.10.ebuild:
+  Add ~sparc keyword.
 
 *nam-1.10 (22 Jan 2004)
 
diff --git a/net-analyzer/nam/Manifest b/net-analyzer/nam/Manifest
index fffb82064d37..0349a0af5758 100644
--- a/net-analyzer/nam/Manifest
+++ b/net-analyzer/nam/Manifest
@@ -1,6 +1,6 @@
-MD5 12a6ac7dcfc7f68bda3cc94a3032a4ae nam-1.9.ebuild 1840
-MD5 12be363e42e9d4ebe433fb568a8f7446 nam-1.10.ebuild 1845
+MD5 3bb510d0147c625941a210747e01209e ChangeLog 1111
+MD5 6b109ed0e1e524d761857815053fd679 metadata.xml 288
+MD5 648521ac4b84b0fd9a44dd738e2bd111 nam-1.10.ebuild 1644
+MD5 2b04c4565b5ac9b31d987d2a276d613d nam-1.11.ebuild 1851
 MD5 343bf4790e73307088d986e95861bb34 files/digest-nam-1.10 65
-MD5 5756ecdae1a470c0ff4fefe3c2674a7c files/nam-1.9-fixcasts.patch 2651
-MD5 b0681b775f16e7e859c5492458f4abff files/digest-nam-1.9 64
-MD5 cb78dcf6a801f3bb282167c1ef73ed79 files/nam-1.9-correct_ettk.patch 304
+MD5 09314cf87cf7fd7ce49916451d280c8c files/digest-nam-1.11 121
diff --git a/net-analyzer/nam/metadata.xml b/net-analyzer/nam/metadata.xml
index 07e65f12248d..19339b7f3689 100644
--- a/net-analyzer/nam/metadata.xml
+++ b/net-analyzer/nam/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
 <longdescription>Network Simulator GUI for NS</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/nam/nam-1.10.ebuild b/net-analyzer/nam/nam-1.10.ebuild
index 719e06ccc25b..299877e6fe6c 100644
--- a/net-analyzer/nam/nam-1.10.ebuild
+++ b/net-analyzer/nam/nam-1.10.ebuild
@@ -1,14 +1,14 @@
-# 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/net-analyzer/nam/nam-1.10.ebuild,v 1.1 2004/01/22 08:40:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.10.ebuild,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
 DESCRIPTION="Network Simulator GUI for NS"
 HOMEPAGE="http://www.isi.edu/nsnam/${PN}/"
 SRC_URI="http://www.isi.edu/nsnam/dist/${PN}-src-${PV}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
+KEYWORDS="~x86 ~sparc"
+IUSE="debug"
 need_tclver="8.4.4"
 valid_tclver="${need_tclver}"
 mytclver=""
@@ -21,7 +21,7 @@ DEPEND="virtual/x11
 RDEPEND=">=net-analyzer/ns-2.27
 		 ${DEPEND}"
 
-S=${WORKDIR}/${P}
+
 
 findtclver() {
 	# input should always be in INCREASING order
diff --git a/net-analyzer/nam/nam-1.11.ebuild b/net-analyzer/nam/nam-1.11.ebuild
index efc86e9f72ad..ee66ab6ace6e 100644
--- a/net-analyzer/nam/nam-1.11.ebuild
+++ b/net-analyzer/nam/nam-1.11.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/net-analyzer/nam/nam-1.11.ebuild,v 1.1 2005/02/27 05:12:09 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nam/nam-1.11.ebuild,v 1.1.1.1 2005/11/30 10:12:10 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="${SRC_URI_BASE}/${MY_P}.tar.gz
 		${SRC_URI_BASE}/${P}.patch"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="debug"
 need_tclver="8.4.4"
 valid_tclver="${need_tclver}"
diff --git a/net-analyzer/nast/ChangeLog b/net-analyzer/nast/ChangeLog
index 308d63248c7f..e6786932ff9c 100644
--- a/net-analyzer/nast/ChangeLog
+++ b/net-analyzer/nast/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/nast
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nast/ChangeLog,v 1.1 2004/05/18 17:19:04 squinky86 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nast/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+  07 Sep 2005; Luis Medinas <metalgod@gentoo.org> nast-0.2.0.ebuild:
+  Added ~amd64 keyword.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nast-0.2.0.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> nast-0.2.0.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> nast-0.2.0.ebuild:
+  marked x86 stable
 
 *nast-0.2.0 (18 May 2004)
 
diff --git a/net-analyzer/nast/Manifest b/net-analyzer/nast/Manifest
index d365910c18be..5ade2e93e353 100644
--- a/net-analyzer/nast/Manifest
+++ b/net-analyzer/nast/Manifest
@@ -1,2 +1,14 @@
-MD5 a328ac993a4696c3e37b642fbabd657a nast-0.2.0.ebuild 731
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 df38be8ec5de3eb09320d9e7942ff4a3 ChangeLog 808
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 2f8c63e12d59fab0dde9b66990ffcc18 nast-0.2.0.ebuild 725
 MD5 3caeb124c059b304993c9f79e9192344 files/digest-nast-0.2.0 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDHmvqwUpWvClEHQoRAnzuAJ9qx4f2BzlnWFj3lrQtySK5taLc9gCfS0qa
+ii56L4iPUho6C/DjNuxSSGM=
+=own0
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nast/nast-0.2.0.ebuild b/net-analyzer/nast/nast-0.2.0.ebuild
index f892a7365319..135feba20230 100644
--- a/net-analyzer/nast/nast-0.2.0.ebuild
+++ b/net-analyzer/nast/nast-0.2.0.ebuild
@@ -1,17 +1,17 @@
-# 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/net-analyzer/nast/nast-0.2.0.ebuild,v 1.1 2004/05/18 17:19:04 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nast/nast-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 DESCRIPTION="NAST - Network Analyzer Sniffer Tool"
 HOMEPAGE="http://nast.berlios.de/"
 SRC_URI="http://nast.berlios.de/src/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="ncurses"
 
 DEPEND=">=net-libs/libnet-1.1.1
-	>=net-libs/libpcap-0.8.1
+	virtual/libpcap
 	ncurses? ( >=sys-libs/ncurses-5.4 )"
 
 src_compile() {
diff --git a/net-analyzer/nb/ChangeLog b/net-analyzer/nb/ChangeLog
index f31659a0d333..015aea4f2522 100644
--- a/net-analyzer/nb/ChangeLog
+++ b/net-analyzer/nb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-analyzer/nb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.1 2005/03/14 13:38:19 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/ChangeLog,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
+
+*nb-0.6.2 (30 Jul 2005)
+
+  30 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +nb-0.6.2.ebuild:
+  Version bump.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nb-0.6.1.ebuild:
+  Added to ~ppc.
 
 *nb-0.6.1 (14 Mar 2005)
 
diff --git a/net-analyzer/nb/Manifest b/net-analyzer/nb/Manifest
index ee78adbf732b..1b52916a2ac2 100644
--- a/net-analyzer/nb/Manifest
+++ b/net-analyzer/nb/Manifest
@@ -1,2 +1,6 @@
-MD5 9b464bf25bb943793da0070828996a42 nb-0.6.1.ebuild 560
+MD5 db0e377e5860b3756a1b1b1a5596b220 nb-0.6.2.ebuild 659
+MD5 1bc2b900b117c27e422d6879919d0ce8 nb-0.6.1.ebuild 654
+MD5 b21d8eb0545b5b29c7484692bee08667 ChangeLog 602
+MD5 090f3acbc5287dc8a7887b6a9398aa86 metadata.xml 251
 MD5 3169a9c3837808f0ccebe7e02fbb4584 files/digest-nb-0.6.1 67
+MD5 27f4b6931715afec862f2b52bd3f4659 files/digest-nb-0.6.2 67
diff --git a/net-analyzer/nb/nb-0.6.1.ebuild b/net-analyzer/nb/nb-0.6.1.ebuild
index e98a8d942440..95b7aef488a1 100644
--- a/net-analyzer/nb/nb-0.6.1.ebuild
+++ b/net-analyzer/nb/nb-0.6.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/net-analyzer/nb/nb-0.6.1.ebuild,v 1.1 2005/03/14 13:38:19 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
 HOMEPAGE="http://www.nodebrain.org/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/nodebrain/${P}-source.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-analyzer/nb/nb-0.6.2.ebuild b/net-analyzer/nb/nb-0.6.2.ebuild
index 431aa83e027c..cb4c7ec5c6c2 100644
--- a/net-analyzer/nb/nb-0.6.2.ebuild
+++ b/net-analyzer/nb/nb-0.6.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/net-analyzer/nb/nb-0.6.2.ebuild,v 1.1 2005/07/30 03:19:48 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nb/nb-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 DESCRIPTION="Nodebrain is a tool to monitor and do event correlation."
 HOMEPAGE="http://www.nodebrain.org/"
diff --git a/net-analyzer/nbaudit/ChangeLog b/net-analyzer/nbaudit/ChangeLog
index efdf3c110b77..f92604012be6 100644
--- a/net-analyzer/nbaudit/ChangeLog
+++ b/net-analyzer/nbaudit/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for net-analyzer/nbaudit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
+
+*nbaudit-1.0-r1 (09 Oct 2005)
+
+  09 Oct 2005; <mkay@gentoo.org> +nbaudit-1.0-r1.ebuild:
+  Removing -lshadow from Makeile
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nbaudit-1.0.ebuild:
+  Added to ~ppc.
+
+  08 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nbaudit-1.0-gentoo.diff, nbaudit-1.0.ebuild:
+  Cleaned up ebuild; Added a patch with some gcc-3.4 fixes as well replacing
+  all occurrences of 'nat' with 'nbaudit' in the manual page.
+
+  24 Aug 2004; Eldad Zack <eldad@gentoo.org> nbaudit-1.0.ebuild:
+  Fixed -lshadow linking problem. Thanks to wernfried haas
+  <w.haas@xover.htu.tuwien.ac.at> for pointing it out. Closes bug #61437.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nbaudit-1.0.ebuild:
+  Added missing IUSE
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nbaudit-1.0 (14 Feb 2002)
+
+  14 Feb 2002; Bruce A. Locke <blocke@shivan.org> ChangeLog:
+
+  Now does something besides segfaulting...
+
+  NOTE: I left out CFLAGS for a reason... ;)
 
 *nbaudit-1.0 (1 Feb 2002)
 
diff --git a/net-analyzer/nbaudit/Manifest b/net-analyzer/nbaudit/Manifest
index e69de29bb2d1..bec4921fc06f 100644
--- a/net-analyzer/nbaudit/Manifest
+++ b/net-analyzer/nbaudit/Manifest
@@ -0,0 +1,7 @@
+MD5 17a45199cd0510fa5b0bc0b29a3df935 ChangeLog 1684
+MD5 3d43677d80da81ea017059e47706b615 metadata.xml 240
+MD5 c4841c33091271d0b9fa535771020629 nbaudit-1.0.ebuild 983
+MD5 bb7e3ea5aff2cbb349c967dc0dd00842 nbaudit-1.0-r1.ebuild 993
+MD5 ad726c93a81f56b634d898446e1a803b files/digest-nbaudit-1.0 54
+MD5 3db83317eead74eb910f332814c82988 files/nbaudit-1.0-gentoo.diff 2517
+MD5 ad726c93a81f56b634d898446e1a803b files/digest-nbaudit-1.0-r1 54
diff --git a/net-analyzer/nbaudit/files/digest-nbaudit-1.0 b/net-analyzer/nbaudit/files/digest-nbaudit-1.0
index 015acf744677..5a235e67a1ce 100644
--- a/net-analyzer/nbaudit/files/digest-nbaudit-1.0
+++ b/net-analyzer/nbaudit/files/digest-nbaudit-1.0
@@ -1 +1 @@
-MD5 b8e020ac21e35caa35a8bbd99e41b5e4 nat10.tgz
+MD5 b8e020ac21e35caa35a8bbd99e41b5e4 nat10.tgz 111835
diff --git a/net-analyzer/nbaudit/nbaudit-1.0-r1.ebuild b/net-analyzer/nbaudit/nbaudit-1.0-r1.ebuild
index 425c85dc5410..efa1b3c2720a 100644
--- a/net-analyzer/nbaudit/nbaudit-1.0-r1.ebuild
+++ b/net-analyzer/nbaudit/nbaudit-1.0-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/net-analyzer/nbaudit/nbaudit-1.0-r1.ebuild,v 1.1 2005/10/09 13:55:26 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/nbaudit-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/nbaudit/nbaudit-1.0.ebuild b/net-analyzer/nbaudit/nbaudit-1.0.ebuild
index d5a9e2158783..c88c44f48190 100644
--- a/net-analyzer/nbaudit/nbaudit-1.0.ebuild
+++ b/net-analyzer/nbaudit/nbaudit-1.0.ebuild
@@ -1,40 +1,39 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbaudit/nbaudit-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
-# Its officially called nat10 but the name conflicts with other projects
+inherit eutils
+
+# It is officially called nat10 but the name conflicts with other projects
 # so I'm following the *BSDs suggestion of calling it nbaudit
 
-A=nat10.tgz
-P=nat10
-S=${WORKDIR}/${P}
+MY_P=nat10
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="NetBIOS file sharing services scanner (nat10)"
-SRC_URI="http://www.tux.org/pub/security/secnet/tools/nat10/${A}"
-HOMEPAGE="http://www.tux.org/pub/security/secnet/tools/nat10"
-
-DEPEND=""
-
-src_compile() {
-
-   cd ${S}
+SRC_URI="http://www.tux.org/pub/security/secnet/tools/nat10/${MY_P}.tgz"
+HOMEPAGE="http://www.tux.org/pub/security/secnet/tools/nat10/"
 
-   mv Makefile Makefile.old
-   sed -e "s/# FLAGSM = -DLINUX -DSHADOW_PWD/FLAGSM = -DLINUX -DSHADOW_PWD -DNO_ASMSIGNALH/" -e "s/# LIBSM = -lshadow/LIBSM = -lshadow/" Makefile.old > Makefile
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc sparc x86"
+IUSE=""
 
-   # sed seems to hang if I do all three at once... oh well
-   mv Makefile Makefile.old
-   sed -e "s/CFLAGS = /CFLAGS = ${CFLAGS} /" Makefile.old > Makefile
+DEPEND=">=sys-apps/sed-4"
+RDEPEND="virtual/libc"
 
-   try make all
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
 
+src_compile() {
+	# NOTE: DO NOT SET CFLAGS OR THE PROGRAM WILL SEGFAULT
+	make all || die "make failed"
 }
 
 src_install () {
-    cd ${S}
-
-    into /usr
-
-    dobin nat
-    doman nat.1
-    dodoc README COPYING
+	newbin nat nbaudit
+	newman nat.1 nbaudit.1
+	dodoc README COPYING
 }
diff --git a/net-analyzer/nbtscan/ChangeLog b/net-analyzer/nbtscan/ChangeLog
index 91ad900f64aa..e7b232f047a7 100644
--- a/net-analyzer/nbtscan/ChangeLog
+++ b/net-analyzer/nbtscan/ChangeLog
@@ -1,6 +1,56 @@
 # ChangeLog for net-analyzer/nbtscan
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/ChangeLog,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nbtscan-1.5.1-r1.ebuild:
+  Added to ~ppc.
+
+*nbtscan-1.5.1-r1 (05 Mar 2005)
+
+  05 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nbtscan-1.5.1-script-whitespace.patch, +nbtscan-1.5.1-r1.ebuild:
+  Revision bump; add patch that fixes -s output (bug 84139). Thanks to Josh
+  Nichols <nichoj@rpi.edu> for the patch.
+
+  18 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> nbtscan-1.5.1.ebuild:
+  Stable ppc-macos.
+
+  09 Oct 2004; David Holm <dholm@gentoo.org> nbtscan-1.5.1.ebuild:
+  Added to ~ppc.
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> nbtscan-1.5.1.ebuild:
+  Unstable on macos.
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nbtscan-1.5.1.ebuild:
+  Stable on sparc.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> nbtscan-1.0.3.ebuild,
+  nbtscan-1.5.1.ebuild:
+  Tidy, x86 stable
+
+  03 Jul 2004; Tom Martin <slarti@gentoo.org> nbtscan-1.5.1.ebuild:
+  Keyworded ~amd64.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  nbtscan-1.0.3.ebuild, nbtscan-1.5.1.ebuild:
+  change virtual/glibc to virtual/libc, add metadata.xml, add IUSE
+
+  29 Mar 2004; Michael Boman <mboman@gentoo.org> nbtscan-1.5.1.ebuild:
+  Oops. New packages should be ~arch masked first.
+
+*nbtscan-1.5.1 (29 Mar 2004)
+
+  29 Mar 2004; Michael Boman <mboman@gentoo.org> nbtscan-1.5.1.ebuild:
+  New upstream version. Closes #45372
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nbtscan-1.0.3 (12 Feb 2002)
+
+  12 Feb 2002; Bruce A. Locke <blocke@shivan.org> ChangeLog:
+
+  Update to 1.0.3
+
 
 *nbtscan-1.0.2 (1 Feb 2002)
 
diff --git a/net-analyzer/nbtscan/Manifest b/net-analyzer/nbtscan/Manifest
index e69de29bb2d1..020ce66a9fd4 100644
--- a/net-analyzer/nbtscan/Manifest
+++ b/net-analyzer/nbtscan/Manifest
@@ -0,0 +1,9 @@
+MD5 2edb842a1b531e48846997918ddd28dd ChangeLog 2227
+MD5 7438d043252eb213c0ffc92d035d6438 nbtscan-1.0.3.ebuild 676
+MD5 9553ea981aa9b1495ce341ac8112dd72 nbtscan-1.5.1.ebuild 708
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 65ce1fccfeef35934cf3b6506bbefc8a nbtscan-1.5.1-r1.ebuild 822
+MD5 cf7eaedc7093ec3f2c0aca3848d73798 files/digest-nbtscan-1.0.3 64
+MD5 8e3778c37bb9f7f1e27633860cd1b2f2 files/digest-nbtscan-1.5.1 64
+MD5 8e3778c37bb9f7f1e27633860cd1b2f2 files/digest-nbtscan-1.5.1-r1 64
+MD5 8554973b956e4dc879eee3520b4be142 files/nbtscan-1.5.1-script-whitespace.patch 4023
diff --git a/net-analyzer/nbtscan/nbtscan-1.0.3.ebuild b/net-analyzer/nbtscan/nbtscan-1.0.3.ebuild
index c6b530eb4d1c..1821a21b6c9e 100644
--- a/net-analyzer/nbtscan/nbtscan-1.0.3.ebuild
+++ b/net-analyzer/nbtscan/nbtscan-1.0.3.ebuild
@@ -1,14 +1,17 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.0.3.ebuild,v 1.1 2002/02/13 02:57:51 blocke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
 SRC_URI="http://www.inetcat.org/software/${P}.tar.gz"
 HOMEPAGE="http://www.inetcat.org/software/nbtscan.html"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc"
+IUSE=""
 
 src_compile() {
 
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r1.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r1.ebuild
index d47b8b739629..b4298148891f 100644
--- a/net-analyzer/nbtscan/nbtscan-1.5.1-r1.ebuild
+++ b/net-analyzer/nbtscan/nbtscan-1.5.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/net-analyzer/nbtscan/nbtscan-1.5.1-r1.ebuild,v 1.1 2005/03/05 07:59:38 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.5.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE=""
 
 src_unpack() {
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild
index 4355560ce806..32462b7724a1 100644
--- a/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild
+++ b/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild
@@ -1,17 +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/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild,v 1.1 2004/03/29 13:46:38 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nbtscan/nbtscan-1.5.1.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 S=${WORKDIR}/${P}a
 DESCRIPTION="NBTscan is a program for scanning IP networks for NetBIOS name information"
 SRC_URI="http://www.inetcat.org/software/${P}.tar.gz"
 HOMEPAGE="http://www.inetcat.org/software/nbtscan.html"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc ~amd64 ppc-macos"
+IUSE=""
 
 src_compile() {
 	./configure --host=${CHOST} --prefix=/usr  || die
diff --git a/net-analyzer/nepenthes/ChangeLog b/net-analyzer/nepenthes/ChangeLog
index ae8b4a7d989d..8b32a4f2e68e 100644
--- a/net-analyzer/nepenthes/ChangeLog
+++ b/net-analyzer/nepenthes/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/nepenthes
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.1 2005/09/09 20:27:25 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  14 Sep 2005; petre rodan <kaiowas@gentoo.org> +nepenthes-0.1.2.ebuild:
+  version bump
 
 *nepenthes-0.1.1 (09 Sep 2005)
 
diff --git a/net-analyzer/nepenthes/Manifest b/net-analyzer/nepenthes/Manifest
index f4acf27a6c56..405385004690 100644
--- a/net-analyzer/nepenthes/Manifest
+++ b/net-analyzer/nepenthes/Manifest
@@ -1,7 +1,19 @@
-MD5 bc2476e992e7c4210c018ecd2f3603f2 metadata.xml 381
-MD5 2486e67f8b274713d80a75e9e971bd5e ChangeLog 129
-MD5 cdd5a0800410586c6c56672198cae30c nepenthes-0.1.1.ebuild 1858
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 121e52302b508d741d68a51265135609 metadata.xml 387
+MD5 23d1c961a078cc0b2be409b957490a3a ChangeLog 517
+MD5 5c937dbc7f597effd30fdba0983e668d nepenthes-0.1.1.ebuild 1947
+MD5 c40f13ca3d1b386950410d60c26d8363 nepenthes-0.1.2.ebuild 1801
 MD5 1f59aae5e0641b494e1ce286b9f2a341 files/digest-nepenthes-0.1.1 68
-MD5 7528b1f815d57436c46b943419e9f8c2 files/nepenthes.confd 128
-MD5 8c0cad24f0b519104d0aad0d95b2a485 files/nepenthes.initd 431
+MD5 9f779f5117afae2b26f1e4fbff55ff4b files/nepenthes.confd 123
+MD5 1c20696c1b6d548688b9a9db60ad74c8 files/nepenthes.initd 538
 MD5 a8d80c4c2501a34c72e31e2a5315c014 files/magic.patch 694
+MD5 efe8deb0307daa08f8956fe1f29a61bd files/digest-nepenthes-0.1.2 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFDKFGyGSBEIeh4AEYRAqSoAJ4nIYVRK7S0Dw7y4+jhkbALJRyiOwCgjdxS
+4eAEZBzYs7Ga27iinjBg0Eo=
+=vXPP
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nepenthes/files/nepenthes.initd b/net-analyzer/nepenthes/files/nepenthes.initd
index 6bb418fb419d..c3c224a936cc 100644
--- a/net-analyzer/nepenthes/files/nepenthes.initd
+++ b/net-analyzer/nepenthes/files/nepenthes.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/files/nepenthes.initd,v 1.1 2005/09/09 20:27:25 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/files/nepenthes.initd,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/nepenthes/metadata.xml b/net-analyzer/nepenthes/metadata.xml
index 9cebce1ffdaa..3060951ee9f4 100644
--- a/net-analyzer/nepenthes/metadata.xml
+++ b/net-analyzer/nepenthes/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></herd>
+<herd>no-herd</herd>
 <maintainer>
 <email>kaiowas@gentoo.org</email>
 <name>Petre Rodan</name>
@@ -9,4 +9,3 @@
 <longdescription lang="en">Nepenthes is a low interaction honeypot that captures worms by emulating known vulnerabilities
 </longdescription>
 </pkgmetadata>
-
diff --git a/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild b/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild
index 065f7f019f49..8a17baa9415a 100644
--- a/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.1.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/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild,v 1.1 2005/09/09 20:27:25 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/nepenthes/nepenthes-0.1.2.ebuild b/net-analyzer/nepenthes/nepenthes-0.1.2.ebuild
index 3d660177adc5..c11be676e932 100644
--- a/net-analyzer/nepenthes/nepenthes-0.1.2.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.1.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/net-analyzer/nepenthes/nepenthes-0.1.2.ebuild,v 1.1 2005/09/14 10:53:16 kaiowas Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nepenthes/nepenthes-0.1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit eutils
 
@@ -30,7 +30,6 @@ src_unpack() {
 	unpack ${P}.tar.bz2
 
 	sed -i 's|var/log/nepenthes.log|/var/log/nepenthes/nepenthes.log|' "${S}/nepenthes-core/src/Nepenthes.cpp"
-	sed -i 's|var/log/hexdumps/|/var/lib/nepenthes/hexdumps/|' "${S}/nepenthes-core/src/Utilities.cpp"
 }
 
 src_compile() {
@@ -45,7 +44,7 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	for i in ${D}/etc/nepenthes/*; do
-		sed -i 's|"var/binaries|"/var/lib/nepenthes/binaries|;s|"var/log|"/var/log/nepenthes|;s|"lib/nepenthes|"/usr/lib/nepenthes|;s|"etc|"/etc|' $i
+		sed -i 's|"var/binaries|"/var/lib/nepenthes/binaries|;s|"var/hexdumps|"/var/lib/nepenthes/hexdumps|;s|"var/log|"/var/log/nepenthes|;s|"lib/nepenthes|"/usr/lib/nepenthes|;s|"etc|"/etc|' $i
 	done
 
 	rm ${D}/usr/bin/nepenthes
diff --git a/net-analyzer/nessus-core/ChangeLog b/net-analyzer/nessus-core/ChangeLog
index 06ffd375b543..e07678462684 100644
--- a/net-analyzer/nessus-core/ChangeLog
+++ b/net-analyzer/nessus-core/ChangeLog
@@ -1,6 +1,390 @@
 # ChangeLog for net-analyzer/nessus-core
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.1 2002/07/26 19:58:05 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/ChangeLog,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
+
+*nessus-core-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-core-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-core-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> nessus-core-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.2.4.ebuild, nessus-core-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild,
+  nessus-core-2.2.5.ebuild, nessus-core-2.3.1.ebuild:
+  Kill gtk2 USE flag for bug 106560.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Stable on ppc.
+
+  28 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild,
+  nessus-core-2.3.1.ebuild:
+  Propagate -j1 through other ebuilds for bug 100193. Thanks to Jakub Moc
+  <jakub@gentoo.org> for pointing it out.
+
+  25 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.5.ebuild:
+  Add -j1 to emake since parallel compilation fails. Fixes bug 100193. Thanks
+  to Triffid Hunter <triffid_hunter@funkmunch.net>.
+
+*nessus-core-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-core-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Stable on alpha.
+
+  21 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Stable on ppc64
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-core-2.2.4.ebuild, nessus-core-2.2.4-r1.ebuild:
+  Fix file conflict with includes from nessus-libraries.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.0.12.ebuild, -nessus-core-2.2.0.ebuild,
+  nessus-core-2.2.4-r1.ebuild, -nessus-core-2.3.0.ebuild:
+  Remove old ebuilds, mark 2.2.4-r1 x86 stable.
+
+  10 Jun 2005; Jason Wever <weeve@gentoo.org> nessus-core-2.2.4-r1.ebuild:
+  Marked stable on SPARC wrt bug #94827.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org>
+  nessus-core-2.2.4-r1.ebuild:
+  Marking stable on amd64
+
+  07 Jun 2005; <omkhar@gentoo.org> -files/nessus-core-conf.patch,
+  nessus-core-2.2.4-r1.ebuild:
+  Got rid of the big ugly conf patch and used the eclass
+
+*nessus-core-2.2.4-r1 (02 Jun 2005)
+
+  02 Jun 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
+  +files/nessus-core-conf.patch, +nessus-core-2.2.4-r1.ebuild:
+  updated some configs to allow clean compile on ppc64. Added ~ARCH to 
+  ensure no breakage on other archs.
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> nessus-core-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-core-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/nessus-core-2.3.1-gcc4.diff, +nessus-core-2.3.1.ebuild:
+  Version bump.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-core-2.2.4.ebuild:
+  Stable on SPARC.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-core-2.2.2a.ebuild, -nessus-core-2.2.3.ebuild,
+  nessus-core-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-core-2.2.2a.ebuild,
+  nessus-core-2.2.3.ebuild, nessus-core-2.2.4.ebuild:
+  Use make install instead of emake install.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> nessus-core-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-core-2.2.0.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> files/nessusd-r6:
+  Init script fix, bug 86664. Thanks to Eric Brown <bigwhitecow@hotmail.com> and
+  Marco Morales <soulse@gmail.com>.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-core-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-core-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*nessus-core-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-core-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+  21 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> nessus-core-2.3.0.ebuild:
+  Fix X/gtk USE flag stuff for bug 84885; also, don't install
+  /usr/include/nessus/includes.h since it is provided by nessus-libraries.
+
+*nessus-core-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-core-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  20 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  nessus-core-2.0.12.ebuild, nessus-core-2.2.0.ebuild:
+  Fixed broken install as per bug #82573. Thanks to Daniel Herzog
+  <expose@luftgetrock.net>
+
+*nessus-core-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> nessus-core-2.2.0.ebuild,
+  +nessus-core-2.2.2a.ebuild, nessus-core-2.3.0.ebuild:
+  Add latest stable version (bug #78789). 2.3.0 uses correct CC now. Added
+  dropped ~ppc64 keywords
+
+  26 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> +files/nessusd-r7,
+  nessus-core-2.3.0.ebuild:
+  Added a new init script for nessus that should solve bug #77735 by checking
+  whether the process is running before finishing the shutdown.
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> nessus-core-2.3.0.ebuild:
+  Prelude patch disabled as per bug #77710. Thanks to Tuan Van
+  <langthang@gentoo.org>
+
+*nessus-core-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-core-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.2.0.ebuild:
+  Parallel build problem, fixed to emake -j1. Closes #69386.
+
+*nessus-core-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-core-2.1.1.ebuild,
+  +nessus-core-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-core-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  01 Sep 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.0.12.ebuild,
+  nessus-core-2.1.1.ebuild:
+  nessus-core depends on nessus-libraries. Closes #62462. Thanks to Nathan
+  Sullivan <nathan@nightsys.net>
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> nessus-core-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-core-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-core-2.0.11.ebuild,
+  nessus-core-2.0.12.ebuild, -nessus-core-2.0.7-r1.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-core-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> nessus-core-2.0.11.ebuild:
+  stable on ppc64, bug #57456
+
+*nessus-core-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.1.1.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-core-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-core-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-core-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-core-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-core-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-core-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-core-2.0.10a.ebuild:
+  marked x86 stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> nessus-core-2.0.10a.ebuild,
+  nessus-core-2.0.7-r1.ebuild, nessus-core-2.0.7.ebuild,
+  nessus-core-2.0.8a.ebuild, nessus-core-2.0.9.ebuild:
+  Fix use invocation and don't run epatch in a subshell because then it can't die
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-core-2.0.10a.ebuild:
+  Stable on alpha.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nessus-core-2.0.10a.ebuild,
+  nessus-core-2.0.7-r1.ebuild, nessus-core-2.0.7.ebuild,
+  nessus-core-2.0.8a.ebuild, nessus-core-2.0.9.ebuild:
+  Add inherit eutils
+
+*nessus-core-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.10a.ebuild:
+  Version bump.
+
+  09 Dec 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.8a.ebuild:
+  Backporting new dependencies from 2.0.9
+
+  01 Dec 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.9.ebuild:
+  Making USE="+-X" work again, the last comment is wrong.
+
+  24 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.9.ebuild:
+  While fixing a gtk/gtk2 problem I noticed that the GUI is not optional.
+
+*nessus-core-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a-r1.ebuild, nessus-core-2.0.9.ebuild,
+  files/nessus-core-2.0.6a.patch, files/nessus-core-2.0.8a.patch:
+  Version bump, cleanup
+
+  22 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.8a.ebuild:
+  Fixing bug 31670, tcpd was not disabled correctly when not in USE
+
+*nessus-core-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.8a.ebuild, files/nessus-core-2.0.8a.patch:
+  Version bump. The prelude patches seem to apply cleanly with this version.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-core-2.0.7-r1.ebuild:
+  Added ~sparc keyword.
+
+*nessus-core-2.0.7-r1 (26 Aug 2003)
+
+  26 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.7-r1.ebuild, files/patch_1.nessus-core.2.0.7:
+  Included prelude patch from bug 19673 with minor changes.
+
+*nessus-core-2.0.6a-r1 (17 Jul 2003)
+
+  17 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a-r1.ebuild:
+  Fixing bug 23106
+
+  17 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a.ebuild:
+  Did always --enable-tcpwrappers, fixed that. Closes bug #23667.
+
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org> nessus-core-1.2.7.ebuild,
+  nessus-core-2.0.0.ebuild, nessus-core-2.0.4.ebuild,
+  nessus-core-2.0.5.ebuild, nessus-core-2.0.6a.ebuild:
+  Fixing typo. Closes #24161
+
+*nessus-core-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.7.ebuild,
+  files/nessus-core-2.0.7.patch:
+  Version bump. Changed tcpd use flag handling (see bug 24055) and added a fix
+  for http://bugs.nessus.org/show_bug.cgi?id=464 - should be able to remove the
+  patch in the next release.
+
+*nessus-core-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-core-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-core-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-core-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-core-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-core-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-core-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-core-1.2.7.ebuild :
+  Added support for tcpd and gtk2 use variables.  gtk takes precedence
+  over gtk2 has the latter is unstable.  Properly disables the gtk
+  portion if neither gtk nor gtk2 is specified in use.  Marked stable
+  for x86.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-core-1.2.6 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-core-1.2.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-core-1.2.4 (22 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-core-1.2.4.ebuild :
+  Add alpha to KEYWORDS
+
+  23 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+  Set dependencies to require libraries of version 1.2.4
+
+  26 Aug 2002; Nick Hadaway <raker@gentoo.org> nessus-core-1.2.4.ebuild :
+  fixed SRC_URI path to nessus-${PV} for future upgrade ease.
+
+  24 Aug 2002; Bruce A. Locke <blocke@shivan.org> nessus-core-1.2.4.ebuild:
+  Nessus needs /var/lib/nessus/users and /var/lib/nessus/logs
+  
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> nessus-core-1.2.4.ebuild, files/digest-nessus-core-1.2.4 :
+  Version bump.
 
 *nessus-core-1.2.3 (26 Jul 2002)
 
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
index dbcc4f7cd5a3..e98e558d4847 100644
--- a/net-analyzer/nessus-core/Manifest
+++ b/net-analyzer/nessus-core/Manifest
@@ -1,14 +1,15 @@
-MD5 d4ffd29ba4f952b6ebc273239a4a2a9c nessus-core-1.2.4.ebuild 1208
-MD5 51f0ee1e1272ca206ed9282699af28a7 nessus-core-1.2.6.ebuild 1210
-MD5 21ee8185ff6648b91c752106ab0bd88b nessus-core-2.0.5.ebuild 1591
-MD5 52799c72d0e15e82e8b033fc487e50d5 nessus-core-2.0.0.ebuild 1587
-MD5 1be3c4d53b1d020784022bd81d28f447 nessus-core-2.0.4.ebuild 1587
-MD5 fa9d7311762ee13782df5cc1880478b4 nessus-core-1.2.7.ebuild 1588
-MD5 5cc9cbcf43cf2b8d7aebfd2a60576e6b ChangeLog 2415
-MD5 50b68c31acb7ca53c3aeea87032b6d75 files/digest-nessus-core-1.2.4 69
-MD5 2fa50f820afb50f0fff80eb8c9f26e3b files/digest-nessus-core-1.2.6 69
-MD5 7568bf966454140c018488a66d91a2c8 files/digest-nessus-core-1.2.7 69
-MD5 21a77212a4543a627ba70b9c860ec3b0 files/digest-nessus-core-2.0.0 69
-MD5 dfe551c457d7e1bf6f2fc5f8c81d99dd files/digest-nessus-core-2.0.4 69
-MD5 2526e11822b7e94d89d471d7044b1141 files/digest-nessus-core-2.0.5 69
-MD5 eab18a3061dfda277ba0d7e213ca6511 files/nessusd-r6 532
+MD5 711b6d0a58cfde1f01110bca0248fdda nessus-core-2.2.6.ebuild 1434
+MD5 c8efde27089bc3649bc5667547a9d78d nessus-core-2.3.1.ebuild 1395
+MD5 c6718095a80f06cf45d537de56da4b01 nessus-core-2.2.5.ebuild 1428
+MD5 94146206e4f6489e2287682b8dc54158 nessus-core-2.2.4-r1.ebuild 1387
+MD5 5bb741d83a4a127f069ffc14e0d4b0c7 ChangeLog 14095
+MD5 883d45d6092c114bdf3d35a3ce45161a metadata.xml 244
+MD5 775fc61d9c8d625c61c79319138b5432 files/digest-nessus-core-2.2.4-r1 69
+MD5 5bb019dc7ddb86a68f016c19c614ab1e files/digest-nessus-core-2.2.5 69
+MD5 c676655f1548f65007e417cfa8b920c7 files/digest-nessus-core-2.2.6 69
+MD5 744bc3edda6ddfce4a2f0bbc7e5d0076 files/digest-nessus-core-2.3.1 70
+MD5 61f74be9ca310ac7e5fe540db2c61beb files/nessusd-r6 644
+MD5 4a061378d54a0fa50ce43ca0975ac62b files/nessusd-r7 647
+MD5 02fce1d620b03f7d03f3ae84fdeea4d6 files/patch_1.nessus-core.2.0.7 787
+MD5 13b7d55481f8360bcc13bb529e79c6cf files/nessus-core-2.3.1-gcc4.diff 325
+MD5 5c3b75512d095ff2ff65bbe535fe63b3 files/nessus-core-2.0.7.patch 448
diff --git a/net-analyzer/nessus-core/files/nessusd-r6 b/net-analyzer/nessus-core/files/nessusd-r6
index a204761d3e95..05d7a8353e3d 100644
--- a/net-analyzer/nessus-core/files/nessusd-r6
+++ b/net-analyzer/nessus-core/files/nessusd-r6
@@ -1,26 +1,29 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r6,v 1.1 2002/07/26 20:01:42 raker Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r6,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	if ! `grep -q "cert_file=[^ ]" /etc/nessus/nessusd.conf`
+	then
+		eerror "No certificate found."
+		return 1
+	fi
+}
 
 start() {
-
-		ebegin "Starting nessusd..."
-     		start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
-		eend $? 
+	checkconfig || return 1
+	ebegin "Starting nessusd"
+	start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
+	eend $? 
 }
 
 stop() {
-
-		ebegin "Stop nessusd..."
-     		start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
-		eend $? 
+	ebegin "Stop nessusd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
+	eend $?
 }
-
-
-
diff --git a/net-analyzer/nessus-core/files/nessusd-r7 b/net-analyzer/nessus-core/files/nessusd-r7
index 057a6d6a9e04..708c267d3c43 100644
--- a/net-analyzer/nessus-core/files/nessusd-r7
+++ b/net-analyzer/nessus-core/files/nessusd-r7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r7,v 1.1 2005/01/26 11:06:56 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/files/nessusd-r7,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
index e374c6884b7e..20a2380ba9ec 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.1 2005/06/02 15:44:55 omkhar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
-inherit toolchain-funcs
-inherit eutils
+inherit toolchain-funcs eutils gnuconfig
 
 DESCRIPTION="A remote security scanner for Linux (nessus-core)"
 HOMEPAGE="http://www.nessus.org/"
@@ -11,45 +10,45 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X tcpd gtk2 debug"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+IUSE="X tcpd debug prelude"
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	X? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-conf.patch
+	gnuconfig_update
 }
 
 src_compile() {
 
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf `use_enable tcpd tcpwrappers` \
 		`use_enable debug` \
 		`use_enable X gtk` \
 		|| die "configure failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 }
 
 src_install() {
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		install || die "Install failed nessus-core"
-	cd ${S}
+	cd "${S}"
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 	insinto /etc/init.d
 	insopts -m 755
-	newins ${FILESDIR}/nessusd-r7 nessusd
+	newins "${FILESDIR}"/nessusd-r7 nessusd
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
+	# newer version is provided by nessus-libraries
+	rm "${D}"/usr/include/nessus/includes.h
 }
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild
index 055f06fdb464..399241ef659a 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.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/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild,v 1.1 2005/07/24 03:31:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 inherit toolchain-funcs eutils gnuconfig
 
@@ -10,18 +10,17 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="X tcpd gtk2 debug prelude"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+IUSE="X tcpd debug prelude"
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	X? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	X? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
@@ -30,27 +29,27 @@ src_unpack() {
 
 src_compile() {
 
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf `use_enable tcpd tcpwrappers` \
 		`use_enable debug` \
 		`use_enable X gtk` \
 		|| die "configure failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 }
 
 src_install() {
-	make DESTDIR=${D} \
+	make DESTDIR="${D}" \
 		install || die "Install failed nessus-core"
-	cd ${S}
+	cd "${S}"
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 	insinto /etc/init.d
 	insopts -m 755
-	newins ${FILESDIR}/nessusd-r7 nessusd
+	newins "${FILESDIR}"/nessusd-r7 nessusd
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 	# newer version is provided by nessus-libraries
 	# should be fixed upstream in version 2.2.6
-	rm ${D}/usr/include/nessus/includes.h
+	rm "${D}"/usr/include/nessus/includes.h
 }
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.6.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.6.ebuild
index f8a85ffde882..27ab4d553d94 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.6.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-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/net-analyzer/nessus-core/nessus-core-2.2.6.ebuild,v 1.1 2005/11/09 19:52:15 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 inherit toolchain-funcs eutils gnuconfig
 
diff --git a/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild b/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
index efac39691872..ba3498d2cb6a 100644
--- a/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.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/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild,v 1.1 2005/05/15 13:51:24 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-core/nessus-core-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,14 +11,13 @@ SRC_URI="ftp://ftp.nessus.org/pub/nessus/experimental/nessus-${PV}/src/${P}.tar.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
-IUSE="tcpd gtk gtk2 debug"
+IUSE="tcpd gtk debug prelude"
 
 DEPEND="=net-analyzer/nessus-libraries-${PV}
 	=net-analyzer/libnasl-${PV}
 	tcpd? ( sys-apps/tcp-wrappers )
-	gtk? ( virtual/x11
-		!gtk2? ( =x11-libs/gtk+-1.2* )
-		gtk2? ( =x11-libs/gtk+-2* )
+	gtk? (	virtual/x11
+		=x11-libs/gtk+-2*
 	)
 	prelude? ( dev-libs/libprelude )"
 
@@ -26,17 +25,17 @@ S="${WORKDIR}/${PN}"
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gcc4.diff
+	epatch "${FILESDIR}/${P}-gcc4.diff"
 }
 
 src_compile() {
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf \
 		$(use_enable tcpd tcpwrappers) \
 		$(use_enable debug) \
 		$(use_enable gtk) \
 		|| die "configure failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 }
 
@@ -44,12 +43,12 @@ src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	# net-analyzer/nessus-libraries provides includes.h
-	rm ${D}/usr/include/nessus/includes.h
+	rm "${D}"/usr/include/nessus/includes.h
 
 	dodoc README* UPGRADE_README CHANGES
 	dodoc doc/*.txt doc/ntp/*
 
-	newinitd ${FILESDIR}/nessusd-r7 nessusd || die "newinitd failed"
+	newinitd "${FILESDIR}"/nessusd-r7 nessusd || die "newinitd failed"
 	keepdir /var/lib/nessus/logs
 	keepdir /var/lib/nessus/users
 }
diff --git a/net-analyzer/nessus-libraries/ChangeLog b/net-analyzer/nessus-libraries/ChangeLog
index 1a9596f60f62..c784e453cbeb 100644
--- a/net-analyzer/nessus-libraries/ChangeLog
+++ b/net-analyzer/nessus-libraries/ChangeLog
@@ -1,6 +1,296 @@
-# ChangeLog for net-misc/nessus-libraries
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.1 2002/07/26 19:52:00 raker Exp $
+# ChangeLog for net-analyzer/nessus-libraries
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/ChangeLog,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
+
+*nessus-libraries-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Mark 2.2.5 stable on alpha
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Stable on sparc
+
+  04 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  03 Aug 2005; Fabian Groffen <grobian@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Markin ~ppc-macos
+
+*nessus-libraries-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-libraries-2.0.12.ebuild, -nessus-libraries-2.2.0.ebuild,
+  -nessus-libraries-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-libraries-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +nessus-libraries-2.3.1.ebuild:
+  Version bump for bug 78497
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-libraries-2.2.4.ebuild:
+  Stable on SPARC.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-libraries-2.2.2a.ebuild, -nessus-libraries-2.2.3.ebuild,
+  nessus-libraries-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.2a.ebuild, nessus-libraries-2.2.3.ebuild,
+  nessus-libraries-2.2.4.ebuild, nessus-libraries-2.3.0.ebuild:
+  Use make install instead of emake install.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-libraries-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-libraries-2.2.0.ebuild:
+  Stable on ppc.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-libraries-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-libraries-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*nessus-libraries-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-libraries-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+*nessus-libraries-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-libraries-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+*nessus-libraries-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  nessus-libraries-2.2.0.ebuild, +nessus-libraries-2.2.2a.ebuild,
+  nessus-libraries-2.3.0.ebuild:
+  Add latest stable version (bug #78789). 2.3.0 uses correct CC now. Added
+  dropped ~ppc64 keywords
+
+  26 Jan 2005; Daniel Black <dragonheart@gentoo.org> +files/linux26.patch,
+  nessus-libraries-2.3.0.ebuild:
+  Added patch for conflict with linux-headers - bug #71657 with patch by Torsten
+  Kaiser <Storklerk@ariolc.dyndns.org>
+
+*nessus-libraries-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-libraries-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*nessus-libraries-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-libraries-2.1.1.ebuild,
+  +nessus-libraries-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-libraries-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-libraries-2.0.12.ebuild,
+  nessus-libraries-2.1.1.ebuild:
+  Changed optional ssl support to mandatory, since without it libnasl will not
+  compile.
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-libraries-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-libraries-2.0.11.ebuild,
+  nessus-libraries-2.0.12.ebuild, -nessus-libraries-2.0.7.ebuild,
+  -nessus-libraries-2.0.8a.ebuild, -nessus-libraries-2.0.9.ebuild,
+  -nessus-libraries-2.1.0.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  Reverted to testing on amd64 - security@gentoo.org had a change of mind.
+	
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  Stable on amd64 for bug 58014.
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> nessus-libraries-2.0.11.ebuild:
+  stable on ppc64, bug #57456
+
+*nessus-libraries-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.1.1.ebuild:
+  Version bump.
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-libraries-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-libraries-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-libraries-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-libraries-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-libraries-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-libraries-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-libraries-2.0.10a.ebuild:
+  marked x86 stable
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-libraries-2.0.10a.ebuild:
+  Stable on alpha.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  nessus-libraries-2.0.10a.ebuild, nessus-libraries-2.0.7.ebuild,
+  nessus-libraries-2.0.8a.ebuild, nessus-libraries-2.0.9.ebuild:
+  Add die following econf for bug 48950
+
+*nessus-libraries-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.10a.ebuild:
+  Version bump
+
+*nessus-libraries-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-1.2.4.ebuild, nessus-libraries-1.2.7.ebuild,
+  nessus-libraries-2.0.6a.ebuild, nessus-libraries-2.0.9.ebuild:
+  Version bump + cleanup
+
+*nessus-libraries-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.8a.ebuild:
+  Version bump.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-libraries-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+*nessus-libraries-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.7.ebuild:
+  Version bump.
+
+*nessus-libraries-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-libraries-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-libraries-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-libraries-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-libraries-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-libraries-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-libraries-1.2.7.ebuild :
+  Marked stable for x86
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-libraries-1.2.6 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-libraries-1.2.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-libraries-1.2.4 (22 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-libraries-1.2.4.ebuild :
+  Add alpha to KEYWORDS
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-libraries-1.2.4.ebuild, files/digest-nessus-libraries-1.2.4 :
+  Version bump.
 
 *nessus-libraries-1.2.3 (26 Jul 2002)
 
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
index 7916b12ae585..9ee9f3eeefba 100644
--- a/net-analyzer/nessus-libraries/Manifest
+++ b/net-analyzer/nessus-libraries/Manifest
@@ -1,13 +1,11 @@
-MD5 f282fe7dc4e926f3760e5a563a01a03e nessus-libraries-1.2.6.ebuild 787
-MD5 fa5a0b37056c210364f4a46287a5574b nessus-libraries-2.0.5.ebuild 759
-MD5 47c104b375d3f07f9ff0c63357a266be nessus-libraries-2.0.0.ebuild 755
-MD5 d405961a341b297dbbb83b1b5d962c65 nessus-libraries-2.0.4.ebuild 755
-MD5 df42845a832a09ed3c35ade0310c4030 nessus-libraries-1.2.7.ebuild 756
-MD5 3dc2484bccbac3d225275f8f2f45b7b4 ChangeLog 1925
-MD5 15ab3a48d0e778fcbc9faf03be914b2e nessus-libraries-1.2.4.ebuild 784
-MD5 f43890739571c8bb301362e8c51fd360 files/digest-nessus-libraries-1.2.4 74
-MD5 fad4b6599dc583b1b4d2b17f7972224f files/digest-nessus-libraries-1.2.6 74
-MD5 72bb6279c32a9e8b5636d8c8da6d3015 files/digest-nessus-libraries-1.2.7 74
-MD5 dea5e8f4584a664160d362b164ca30ab files/digest-nessus-libraries-2.0.0 74
-MD5 32d6a55a4c2d58b2718e740fe0c7fe07 files/digest-nessus-libraries-2.0.4 74
-MD5 050429b99657d8981ce6f235327b1f34 files/digest-nessus-libraries-2.0.5 74
+MD5 f90f9c4294566f2815c399997a65c407 nessus-libraries-2.2.4.ebuild 880
+MD5 e61cca339a68ecf71eec6f2115fe4d09 nessus-libraries-2.2.6.ebuild 877
+MD5 e14d8546c72fcd6ea0537ec338a02f96 nessus-libraries-2.3.1.ebuild 881
+MD5 e5573674ca133095b9c76ca98ab1aaed nessus-libraries-2.2.5.ebuild 870
+MD5 6d2fd9c83a731b1b3d95589524512552 ChangeLog 10037
+MD5 fda214dc78c8ac3a9e8d50f5f0cee8aa metadata.xml 249
+MD5 e22c2523e01e56b212ed4e320e1baf64 files/digest-nessus-libraries-2.2.4 74
+MD5 24851c03ee200757835af5aa02a91308 files/digest-nessus-libraries-2.2.5 74
+MD5 93ab65741d48212d255f35e7cbd54270 files/digest-nessus-libraries-2.2.6 74
+MD5 91aa63c59feb2d3adb4838a5808c1865 files/digest-nessus-libraries-2.3.1 74
+MD5 33d8a49602ab3e7f0c037188ed7d4cb7 files/linux26.patch 1278
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.4.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.4.ebuild
index 03763fd9fe41..9d7bce04d606 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.4.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.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/net-analyzer/nessus-libraries/nessus-libraries-2.2.4.ebuild,v 1.1 2005/03/24 00:16:08 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.nessus.org/"
 SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 ppc ~ppc-macos ppc64 sparc x86"
 IUSE=""
 
 # Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
@@ -23,6 +23,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "failed to install"
+	make DESTDIR=${D} install || die "failed to install"
 	dodoc README*
 }
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.5.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.5.ebuild
index f3fb9f891d1b..1f8fe87fd929 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.5.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.2.5.ebuild
@@ -1,28 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.5.ebuild,v 1.1 2005/07/24 03:31:11 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
 HOMEPAGE="http://www.nessus.org/"
 SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
 # Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
 DEPEND=">=dev-libs/openssl-0.9.6d"
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_compile() {
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf --with-ssl=/usr/lib || die "econf failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "failed to install"
+	make DESTDIR="${D}" install || die "failed to install"
 	dodoc README*
 }
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.6.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.6.ebuild
index 7c16bb61d680..17fb85d26797 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.6.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-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/net-analyzer/nessus-libraries/nessus-libraries-2.2.6.ebuild,v 1.1 2005/11/09 19:52:21 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild
index a31fb3346025..3bf4c87ce72d 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.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/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild,v 1.1 2005/05/15 13:11:57 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-libraries/nessus-libraries-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/nessus-plugins/ChangeLog b/net-analyzer/nessus-plugins/ChangeLog
index b56ffe31f145..163339a144f7 100644
--- a/net-analyzer/nessus-plugins/ChangeLog
+++ b/net-analyzer/nessus-plugins/ChangeLog
@@ -1,6 +1,266 @@
 # ChangeLog for net-analyzer/nessus-plugins
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/ChangeLog,v 1.1 2002/07/26 19:58:58 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/ChangeLog,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
+
+*nessus-plugins-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-plugins-2.2.5.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+*nessus-plugins-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-plugins-2.0.12.ebuild, -nessus-plugins-2.2.0.ebuild,
+  -nessus-plugins-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org>
+  nessus-plugins-2.2.4.ebuild:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> nessus-plugins-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-plugins-2.3.1 (15 May 2005)
+
+  15 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +nessus-plugins-2.3.1.ebuild:
+  Version bump.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-plugins-2.2.4.ebuild:
+  Stable on SPARC.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org>
+  nessus-plugins-2.2.4.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  nessus-plugins-2.2.0.ebuild:
+  Stable on ppc.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -nessus-plugins-2.2.2a.ebuild, -nessus-plugins-2.2.3.ebuild,
+  nessus-plugins-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-plugins-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  nessus-plugins-2.0.12.ebuild, nessus-plugins-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable, cleaning up unnecessary src_compile.
+
+*nessus-plugins-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +nessus-plugins-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+*nessus-plugins-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-plugins-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com> and
+  Omkhar Arasaratnam <omkhar@rogers.com>.
+
+*nessus-plugins-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  nessus-plugins-2.2.0.ebuild, +nessus-plugins-2.2.2a.ebuild,
+  nessus-plugins-2.3.0.ebuild:
+  Add latest stable version. 2.3.0 uses correct CC now. Added missing ppc64
+  keywords
+
+*nessus-plugins-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +nessus-plugins-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*nessus-plugins-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-plugins-2.1.1.ebuild,
+  +nessus-plugins-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-plugins-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-plugins-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-plugins-2.0.10a.ebuild:
+  GLSA 200408-11: masking 2.0.10a for all archs besides alpha until 2.0.12 will
+  be stable on alpha
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-plugins-2.0.11.ebuild,
+  nessus-plugins-2.0.12.ebuild, -nessus-plugins-2.0.7.ebuild,
+  -nessus-plugins-2.0.8a.ebuild, -nessus-plugins-2.0.9.ebuild,
+  -nessus-plugins-2.1.0.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging. ppc64 -> ~ppc64, and moved to
+  2.0.12. wrt bug #57456.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-plugins-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> nessus-plugins-2.0.11.ebuild:
+  stable on ppc64,bug #57456
+
+*nessus-plugins-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.1.1.ebuild:
+  Version bump
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-plugins-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-plugins-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-plugins-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-plugins-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-plugins-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-plugins-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-plugins-2.0.10a.ebuild:
+  marked x86 stable
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  nessus-plugins-2.0.10a.ebuild:
+  Stable on alpha.
+
+*nessus-plugins-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.10a.ebuild:
+  Version bump
+
+*nessus-plugins-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.6a.ebuild, nessus-plugins-2.0.9.ebuild:
+  Version bump
+
+*nessus-plugins-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.8a.ebuild:
+  Version bump
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-plugins-2.0.7.ebuild:
+  Added ~sparc keyword.
+
+  02 Sep 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.7.ebuild:
+  Changing DEPEND from = to >= because of bug 27544
+
+  05 Aug 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.6a.ebuild:
+  Corrected dependency (bug 25874)
+
+*nessus-plugins-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.7.ebuild:
+  Version bump
+
+*nessus-plugins-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-plugins-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org>
+  nessus-plugins-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-plugins-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-plugins-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-plugins-1.2.7 (04 Jan 2003)
+
+  12 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-plugins-1.2.7.ebuild :
+  doc install fix.  Marked stable for x86.
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-plugins-1.2.6 (05 Nov 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-plugins-1.2.6.ebuild :
+  Add ~alpha to KEYWORDS
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-plugins-1.2.4 (22 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nessus-plugins-1.2.4.ebuild :
+  Add alpha to KEYWORDS
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-plugins-1.2.4.ebuild, files/digest-nessus-plugins-1.2.4 :
+  Version bump.
 
 *nessus-plugins-1.2.3 (26 Jul 2002)
 
diff --git a/net-analyzer/nessus-plugins/Manifest b/net-analyzer/nessus-plugins/Manifest
index 231f1f4aa88f..1a61933558db 100644
--- a/net-analyzer/nessus-plugins/Manifest
+++ b/net-analyzer/nessus-plugins/Manifest
@@ -1,13 +1,10 @@
-MD5 acadec9886d76b90e440d8016227b216 nessus-plugins-2.0.4.ebuild 826
-MD5 275902521b39fe40a6a36c561aa06421 nessus-plugins-1.2.7.ebuild 826
-MD5 09d608b8a6aa60a089e7b99d02df7c43 nessus-plugins-1.2.4.ebuild 855
-MD5 0a39334937273ba8e4b4f6a929192c0c ChangeLog 1909
-MD5 3c7c267251f565ddf68ab4791c836885 nessus-plugins-1.2.6.ebuild 858
-MD5 282ef3ef5152a1a1134c0c3eac64cb7f nessus-plugins-2.0.5.ebuild 830
-MD5 3707a860b3d9bebdee903da6c560929d nessus-plugins-2.0.0.ebuild 826
-MD5 c9a967bc9e932d24d5c2df264a6c67e0 files/digest-nessus-plugins-1.2.4 72
-MD5 7e08a6c4262c99c794aafd7a19766245 files/digest-nessus-plugins-1.2.6 72
-MD5 8954bb50851150a4fb1cdd4c6c019f3a files/digest-nessus-plugins-1.2.7 72
-MD5 15da47f4c3e4b4cc4514ce33d64f590a files/digest-nessus-plugins-2.0.0 73
-MD5 1e23ed2a2d8a9324acbd2ae0b8d3b71a files/digest-nessus-plugins-2.0.4 73
-MD5 be501a2753e458e4a420c46bd5b731fa files/digest-nessus-plugins-2.0.5 73
+MD5 263af4aa24bdcb7fc9b838405bcec574 nessus-plugins-2.2.6.ebuild 811
+MD5 379ba28922e9352f7315353b86d30acf nessus-plugins-2.3.1.ebuild 780
+MD5 c6082b4666ef20aff3af1c65b342f17a nessus-plugins-2.2.5.ebuild 805
+MD5 d41fb42e0c0cce37e92874c358778280 nessus-plugins-2.2.4.ebuild 795
+MD5 d75432495e992d9e7493276cc020b164 ChangeLog 8663
+MD5 91a6d4586282cb7b4d7873b87e434b40 metadata.xml 247
+MD5 d008c0cc0b700c90824fa12ecae890c7 files/digest-nessus-plugins-2.2.4 77
+MD5 0955f6146f02c06fc8b7ccf86a52d2f5 files/digest-nessus-plugins-2.2.5 77
+MD5 a5e256c62041e483e5cfac4092f97e3c files/digest-nessus-plugins-2.2.6 77
+MD5 96bb233f92abfa7db7fa8b46a663dbc0 files/digest-nessus-plugins-2.3.1 77
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.4.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.4.ebuild
index 3603678f615f..fdd1284dc23f 100644
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.4.ebuild
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.2.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/net-analyzer/nessus-plugins/nessus-plugins-2.2.4.ebuild,v 1.1 2005/03/24 00:22:36 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ DEPEND=">=net-analyzer/nessus-core-${PV}"
 SLOT="0"
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 
 src_compile() {
 	export CC=$(tc-getCC)
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.5.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.5.ebuild
index 3cc200856541..87f583aabd31 100644
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.5.ebuild
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.2.5.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/net-analyzer/nessus-plugins/nessus-plugins-2.2.5.ebuild,v 1.1 2005/07/24 03:31:20 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 inherit toolchain-funcs
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
 HOMEPAGE="http://www.nessus.org/"
 SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-GPL-${PV}.tar.gz"
@@ -12,17 +12,17 @@ DEPEND=">=net-analyzer/nessus-core-${PV}"
 SLOT="0"
 IUSE=""
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 
 src_compile() {
-	export CC=$(tc-getCC)
+	export CC="$(tc-getCC)"
 	econf || die
 	emake || die
 }
 
 src_install() {
 	emake \
-		DESTDIR=${D} \
+		DESTDIR="${D}" \
 		install || die "make install failed"
 	dodoc docs/*.txt plugins/accounts/accounts.txt
 }
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.6.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.6.ebuild
index 48c6da5d4be7..8dd0efb18498 100644
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.6.ebuild
+++ b/net-analyzer/nessus-plugins/nessus-plugins-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/net-analyzer/nessus-plugins/nessus-plugins-2.2.6.ebuild,v 1.1 2005/11/09 19:52:19 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.3.1.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.3.1.ebuild
index 12b9a26e964a..8da692eb53df 100644
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.3.1.ebuild
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.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/net-analyzer/nessus-plugins/nessus-plugins-2.3.1.ebuild,v 1.1 2005/05/15 14:23:48 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus-plugins/nessus-plugins-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/nessus/ChangeLog b/net-analyzer/nessus/ChangeLog
index 7c5fed5ddfc0..89d201803630 100644
--- a/net-analyzer/nessus/ChangeLog
+++ b/net-analyzer/nessus/ChangeLog
@@ -1,6 +1,290 @@
 # ChangeLog for net-analyzer/nessus
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/ChangeLog,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
+
+*nessus-2.2.6 (09 Nov 2005)
+
+  09 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.6.ebuild:
+  2.2.6 version bump. Fixes bug 111973. Thanks to ChazeFroy <chazefroy at
+  gmail dot com>.
+
+  05 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> nessus-2.2.5.ebuild:
+  Stable on sparc
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> nessus-2.2.5.ebuild:
+  Stable on ppc.
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> nessus-2.2.5.ebuild:
+  Marked Stable on amd64.
+
+  26 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-2.2.5.ebuild,
+  nessus-2.3.1.ebuild:
+  nessus 2.2.5 series x86 stable.
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+*nessus-2.2.5 (24 Jul 2005)
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.5.ebuild:
+  Version bump for bug 100024. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -nessus-2.0.12.ebuild,
+  -nessus-2.2.0.ebuild, -nessus-2.3.0.ebuild:
+  Remove old ebuilds.
+
+  09 Jun 2005; Olivier Crête <tester@gentoo.org> ChangeLog:
+  Marking stable on amd64
+
+  02 Jun 2005; Joseph Jezak <josejx@gentoo.org> nessus-2.2.4.ebuild:
+  Marked ppc stable.
+
+  22 May 2005; Bryan Østergaard <kloeri@gentoo.org> nessus-2.2.4.ebuild:
+  Stable on alpha.
+
+*nessus-2.3.1 (18 May 2005)
+
+  18 May 2005; Aaron Walker <ka0ttic@gentoo.org> +nessus-2.3.1.ebuild:
+  Version bump.
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> nessus-2.2.4.ebuild:
+  Stable on SPARC.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> nessus-2.2.4.ebuild:
+  Stable on ppc64
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -nessus-2.2.2a.ebuild,
+  -nessus-2.2.3.ebuild, nessus-2.2.4.ebuild:
+  Removing ebuild clutter, marking 2.2.4 x86 stable.
+
+  31 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> nessus-2.2.0.ebuild:
+  Stable on alpha.
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> nessus-2.2.0.ebuild:
+  Stable on SPARC.
+
+  24 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> nessus-2.2.0.ebuild:
+  Marking 2.2.0 x86 stable
+
+*nessus-2.2.4 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +nessus-2.2.4.ebuild:
+  Version bump, bug 86392. Thanks to Omkhar Arasaratnam <omkhar@rogers.com> for
+  reporting.
+
+  28 Feb 2005; Daniel Black <dragonheart@gentoo.org> nessus-2.0.12.ebuild,
+  nessus-2.2.0.ebuild, nessus-2.2.2a.ebuild, nessus-2.2.3.ebuild,
+  nessus-2.3.0.ebuild:
+  Added remove message as this is a META ebuild. Dependancies should of been ~
+  instead of >=. Thanks to bug #83513 by Darren Spruell <lists@sancho2k.net>
+
+*nessus-2.2.3 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> +nessus-2.2.3.ebuild:
+  Version bump as per bug #81580. Thanks to ChazeFroy <chazefroy@gmail.com>.
+
+*nessus-2.2.2a (28 Jan 2005)
+
+  28 Jan 2005; Daniel Black <dragonheart@gentoo.org> nessus-2.2.0.ebuild,
+  +nessus-2.2.2a.ebuild, nessus-2.3.0.ebuild:
+  Add latest stable version (bug #78789). Added dropped ~ppc64 keywords. Thanks
+  to Alexey Portnov <mail@trado.nnov.ru>
+
+*nessus-2.3.0 (12 Jan 2005)
+
+  12 Jan 2005; Daniel Black <dragonheart@gentoo.org> +nessus-2.3.0.ebuild:
+  Version bump as per bug #73780. Thanks to Holger Hoffstätte <holger@wizards.de>
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*nessus-2.2.0 (28 Oct 2004)
+
+  28 Oct 2004; Eldad Zack <eldad@gentoo.org> -nessus-2.1.1.ebuild,
+  +nessus-2.2.0.ebuild:
+  Version bump: new stable series. Removed 2.1.x development series.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> nessus-2.0.12.ebuild:
+  stable on ppc64, bug #58014
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-2.1.1.ebuild:
+  x86 stable
+
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> nessus-2.0.12.ebuild:
+  Stable on alpha, bug 58014.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> -nessus-2.0.11.ebuild,
+  nessus-2.0.12.ebuild, -nessus-2.1.0.ebuild:
+  ppc64 -> ~ppc64, and moved to 2.0.12. wrt bug #57456.
+
+  12 Aug 2004; Eldad Zack <eldad@gentoo.org> nessus-2.0.10a.ebuild,
+  nessus-2.0.11.ebuild, -nessus-2.0.7-r1.ebuild, -nessus-2.0.7.ebuild,
+  -nessus-2.0.8a.ebuild, -nessus-2.0.9.ebuild:
+  GLSA 200408-11 (Bug #58014) ebuild purging.
+
+  12 Aug 2004; <SeJo@gentoo.org> nessus-2.0.12.ebuild:
+  stable masking ppc for bug 58014
+
+  01 Aug 2004; Tom Gall <tgall@gentoo.org> nessus-2.0.11.ebuild:
+  stable on ppc64, bug #57456
+
+*nessus-2.1.1 (24 Jul 2004)
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.1.1.ebuild:
+  Version bump
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> nessus-2.0.12.ebuild,
+  nessus-2.1.0.ebuild:
+  Fixed RDEPEND. Closes #58113
+
+  23 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-2.0.12.ebuild:
+  Stable on sparc wrt security bug #58014.
+
+*nessus-2.0.12 (23 Jul 2004)
+
+  23 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.0.12.ebuild:
+  Version bump - Security update (x86 stable). Bug 58014.
+
+*nessus-2.0.11 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.0.11.ebuild:
+  Version bump
+
+  19 Jul 2004; Jason Wever <weeve@gentoo.org> nessus-2.0.10a.ebuild:
+  Stable on sparc.
+
+*nessus-2.1.0 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +nessus-2.1.0.ebuild:
+  Added development series 2.1.0 (hard-masked). Closes #56436
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> nessus-2.0.10a.ebuild:
+  marked x86 stable
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nessus-2.0.10a.ebuild, nessus-2.0.7-r1.ebuild, nessus-2.0.7.ebuild,
+  nessus-2.0.8a.ebuild, nessus-2.0.9.ebuild:
+  Added metadata, added missing IUSE
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> nessus-2.0.10a.ebuild:
+  Stable on alpha.
+
+*nessus-2.0.10a (09 Feb 2004)
+
+  09 Feb 2004; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.10a.ebuild:
+  Version bump
+
+*nessus-2.0.9 (19 Nov 2003)
+
+  19 Nov 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.6a-r1.ebuild,
+  nessus-2.0.9.ebuild, files/nessusd, files/nessusd-r6:
+  Version bump.
+
+*nessus-2.0.8a (13 Oct 2003)
+
+  13 Oct 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.8a.ebuild:
+  Version bump.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> nessus-2.0.7-r1.ebuild:
+  Added ~sparc keyword.
+
+*nessus-2.0.7-r1 (01 Sep 2003)
+
+  01 Sep 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.7-r1.ebuild:
+  nessus-core 2.0.7-r1 includes patches for prelude.
+
+*nessus-2.0.6a-r1 (17 Jul 2003)
+
+  17 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.6a-r1.ebuild:
+  Fixing bug 23106
+
+*nessus-2.0.7 (10 Jul 2003)
+
+  10 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.7.ebuild:
+  Version bump
+
+*nessus-2.0.6a (23 May 2003)
+
+  23 May 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.6a.ebuild:
+  Version bump, should fix bug 21529
+
+*nessus-2.0.5 (13 May 2003)
+
+  13 May 2003; Patrick Kursawe <phosphan@gentoo.org> nessus-2.0.5.ebuild:
+  Version bump, bug #20901.
+
+*nessus-2.0.4 (23 Apr 2003)
+
+  23 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found in #18978.
+
+*nessus-2.0.0 (25 Feb 2003)
+
+  25 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Ebuild submitted by Blu3 <david+gentoo.org@blue-labs.org> in #16310.
+
+*nessus-1.2.7 (04 Jan 2003)
+
+  16 Jan 2003; Nick Hadaway <raker@gentoo.org> nessus-1.2.7.ebuild :
+  Marked stable for x86
+
+  04 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Raskasi <raskasi@gmx.net>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nessus-1.2.6 (05 Nov 2002)
+
+  05 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+*nessus-1.2.4 (22 Aug 2002)
+
+  22 Aug 2002; Nick Hadaway <raker@gentoo.org> nessus-1.2.3.ebuild, nessus-1.2.4.ebuild :
+  Version bump.
+  (important notes from upstream ChangeLog)
+  Reverted back to autoconf 2.13. 
+  Bug fix in nessus-core/nessusd/pluginlaunch.c
+   - under some circumstances, data might be lost in the reports 
+  Fixed a bug in several plugins for web checks 
+   -under some circumstances, a plugin would do N x N checks against 
+   the remote web servers (where N equals to the number of web servers 
+   running on the remote host) 
+
+*nessus-1.2.3 (26 Jul 2002)
+
+  26 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  nessus-1.2.3.ebuild, files/digest-nessus-1.2.3.ebuild :
+
+  Split out the package to allow a clean installation of all components.
+  Kept the "nessus" package for easy install of all components.
+
+*nessus-1.2.2-r1 (17 Jul 2002)
+
+  17 Jul 2002; Nicholas Jones <carpaski@gentoo.org> nessus-1.2.2-r1.ebuild:
+
+  SLOT and KEYWORDS additions.
+	Removed duplicated 'make install' calls.
+	Added die comments. (Added notice about possible breaking with nessus-1.0.*)
+
+*nessus-1.2.2 (02 Jul 2002)
+
+  02 Jul 2002; Bruce A. Locke <blocke@shivan.org> nessus-1.2.2.ebuild:
+
+  Version bump.
+
+*nessus-1.2.0 (25 Apr 2002)
+
+  25 Apr 2002; Grant Goodyear <g2boojum@gentoo.org> nessus-1.2.0.ebuild
+
+  New version.
+
+*nessus-1.0.10 (5 Apr 2002)
+
+  5 Apr 2002; Seemant Kulleen <seemant@gentoo.org> nessus-1.0.10.ebuild
+  files/digest-nessus-1.0.10
+
+  Version bump submitted by lotia@umich.edu (ali asad lotia)
 
 *nessus-1.0.9 (1 Feb 2002)
 
diff --git a/net-analyzer/nessus/Manifest b/net-analyzer/nessus/Manifest
index 49f99b87893d..2893851d12d1 100644
--- a/net-analyzer/nessus/Manifest
+++ b/net-analyzer/nessus/Manifest
@@ -1,15 +1,10 @@
-MD5 6930ce08d89edcefd01482af9291829c nessus-1.2.6.ebuild 546
-MD5 f3d62987ce211a86686ff80ef25937b6 nessus-2.0.5.ebuild 544
-MD5 53ecb0410574cc27e5f94c409de4ea0c nessus-2.0.0.ebuild 541
-MD5 332b69cbf682211ceb812d61a218b7f6 nessus-2.0.4.ebuild 540
-MD5 a742433da0a4b0cc5f0cc2bf134481fd nessus-1.2.7.ebuild 542
-MD5 9861a767a20de40504b8482fde4bc6bf nessus-1.2.4.ebuild 544
-MD5 21ba0e7f6cfefeb36066489725e198a8 ChangeLog 3011
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-1.2.4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-1.2.6 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-1.2.7 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.0.0 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.0.4 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.0.5 0
-MD5 fc6fccdccb92274ea7eb03203d56d4ee files/nessusd 530
-MD5 55d50a78237ae8b2b9c28789830afe08 files/nessusd-r6 527
+MD5 9060f9f45504ba8a78992ce52d7a2416 nessus-2.2.6.ebuild 924
+MD5 18c47452056d6a82fc1ad5a3d8c598fc nessus-2.3.1.ebuild 792
+MD5 2b5ddd2454ae4ddcb413a64bb7969848 nessus-2.2.5.ebuild 918
+MD5 2e973c9b4804c9400e14af3a171f682a ChangeLog 9737
+MD5 34584a1d914e5d8b669b988fbf594ece metadata.xml 230
+MD5 2f99cfd33c24d46be39df50dc0179db6 nessus-2.2.4.ebuild 803
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.2.4 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.2.5 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.2.6 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-nessus-2.3.1 0
diff --git a/net-analyzer/nessus/nessus-2.2.4.ebuild b/net-analyzer/nessus/nessus-2.2.4.ebuild
index 3b4c7877821d..28e1d9da3562 100644
--- a/net-analyzer/nessus/nessus-2.2.4.ebuild
+++ b/net-analyzer/nessus/nessus-2.2.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/net-analyzer/nessus/nessus-2.2.4.ebuild,v 1.1 2005/03/24 00:27:37 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="A remote security scanner for Linux"
@@ -11,17 +11,17 @@ DEPEND="~net-analyzer/nessus-libraries-${PV}
 	~net-analyzer/nessus-plugins-${PV}"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ppc64"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 pkg_postrm() {
 	einfo "Note: this is a META ebuild for ${P}."
 	einfo "to remove it completely or before re-emerging"
 	einfo "either use 'depclean', or remove/re-emerge these packages:"
-	echo ""
+	echo
 	for dep in ${RDEPEND}; do
 		einfo "     ${dep}"
 	done
-	echo ""
+	echo
 }
 
diff --git a/net-analyzer/nessus/nessus-2.2.5.ebuild b/net-analyzer/nessus/nessus-2.2.5.ebuild
index d26eecfd4190..b8e5c99c436b 100644
--- a/net-analyzer/nessus/nessus-2.2.5.ebuild
+++ b/net-analyzer/nessus/nessus-2.2.5.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.2.5.ebuild,v 1.1 2005/07/24 03:31:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A remote security scanner for Linux"
 HOMEPAGE="http://www.nessus.org/"
 DEPEND="~net-analyzer/nessus-libraries-${PV}
@@ -11,9 +10,14 @@ DEPEND="~net-analyzer/nessus-libraries-${PV}
 	~net-analyzer/nessus-plugins-${PV}"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
 IUSE=""
 
+pkg_postinst() {
+	einfo "The following article may be useful to get started:"
+	einfo "http://www.securityfocus.com/infocus/1741"
+}
+
 pkg_postrm() {
 	einfo "Note: this is a META ebuild for ${P}."
 	einfo "to remove it completely or before re-emerging"
diff --git a/net-analyzer/nessus/nessus-2.2.6.ebuild b/net-analyzer/nessus/nessus-2.2.6.ebuild
index dbc42baee790..c71f9a6a9031 100644
--- a/net-analyzer/nessus/nessus-2.2.6.ebuild
+++ b/net-analyzer/nessus/nessus-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/net-analyzer/nessus/nessus-2.2.6.ebuild,v 1.1 2005/11/09 19:52:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 DESCRIPTION="A remote security scanner for Linux"
 HOMEPAGE="http://www.nessus.org/"
diff --git a/net-analyzer/nessus/nessus-2.3.1.ebuild b/net-analyzer/nessus/nessus-2.3.1.ebuild
index 621c333e2f67..b8a2117a81be 100644
--- a/net-analyzer/nessus/nessus-2.3.1.ebuild
+++ b/net-analyzer/nessus/nessus-2.3.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.3.1.ebuild,v 1.1 2005/05/18 13:49:40 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nessus/nessus-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="A remote security scanner for Linux"
 HOMEPAGE="http://www.nessus.org/"
 DEPEND="~net-analyzer/nessus-libraries-${PV}
@@ -18,10 +17,10 @@ pkg_postrm() {
 	einfo "Note: this is a META ebuild for ${P}."
 	einfo "to remove it completely or before re-emerging"
 	einfo "either use 'depclean', or remove/re-emerge these packages:"
-	echo ""
+	echo
 	for dep in ${RDEPEND}; do
 		einfo "     ${dep}"
 	done
-	echo ""
+	echo
 }
 
diff --git a/net-analyzer/net-snmp/ChangeLog b/net-analyzer/net-snmp/ChangeLog
index 516dc8778394..d9ef7e4c3d4c 100644
--- a/net-analyzer/net-snmp/ChangeLog
+++ b/net-analyzer/net-snmp/ChangeLog
@@ -1,15 +1,509 @@
 # ChangeLog for net-analyzer/net-snmp
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.1 2002/06/29 20:42:47 blocke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/ChangeLog,v 1.1.1.1 2005/11/30 10:12:45 chriswhite Exp $
+
+*net-snmp-5.2.1.2-r1 (04 Sep 2005)
+
+  04 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.2.1.2.ebuild,
+  +net-snmp-5.2.1.2-r1.ebuild:
+  Revision bump for the previous change.
+
+  02 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.1.1-r1.ebuild,
+  net-snmp-5.1.3.1.ebuild, -net-snmp-5.2.1-r1.ebuild,
+  net-snmp-5.2.1.2.ebuild, net-snmp-5.3.20050624.ebuild:
+  Add sedfu to fix insecure runpath issues, bug 103776; tidy old ebuilds.
+
+*net-snmp-5.1.3.1 (05 Aug 2005)
+
+  05 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.1.3.ebuild,
+  +net-snmp-5.1.3.1.ebuild:
+  New 5.1.x release.
+
+  24 Jul 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.1.2.ebuild:
+  Stable on mips, bug #99680.
+
+  23 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  net-snmp-5.2.1.2.ebuild:
+  Stable on alpha + ia64, bug 99680.
+
+  22 Jul 2005; Herbie Hopkins <herbs@gentoo.org> net-snmp-5.2.1.2.ebuild:
+  Stable on amd64 wrt bug #99680.
+
+  22 Jul 2005; Joseph Jezak <josejx@gentoo.org> net-snmp-5.2.1.2.ebuild:
+  Marked ppc stable for bug #99680.
+
+  21 Jul 2005; Markus Rothe <corsair@gentoo.org> net-snmp-5.2.1.2.ebuild:
+  Stable on ppc64 (bug #99680)
+
+  21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  net-snmp-5.2.1.2.ebuild:
+  Stable on hppa. bug #99680
+
+  21 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.2.ebuild:
+  Stable on sparc wrt sec bug 99680.
+
+*net-snmp-5.2.1.2 (20 Jul 2005)
+
+  20 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  +net-snmp-5.2.1.2.ebuild:
+  version bump for security bug #99680
+
+*net-snmp-5.1.3 (04 Jul 2005)
+
+  04 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -files/net-snmp-proc.patch,
+  -files/snmpd.conf, -files/snmpd.rc6, -net-snmp-5.1.1.ebuild,
+  net-snmp-5.1.1-r1.ebuild, -net-snmp-5.1.3_pre1.ebuild,
+  +net-snmp-5.1.3.ebuild, -net-snmp-5.2.ebuild, -net-snmp-5.2-r3.ebuild,
+  -net-snmp-5.2.1.ebuild, net-snmp-5.2.1-r1.ebuild,
+  net-snmp-5.3.20050624.ebuild:
+  Version bump (5.1.3 final); tidy old ebuilds/patches/cruft. Also added BSD
+  to LICENSE.
+
+  03 Jul 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.1-r1.ebuild:
+  Stable on mips bug #91792.
+
+*net-snmp-5.3.20050624 (25 Jun 2005)
+
+  25 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +net-snmp-5.3.20050624.ebuild:
+  Added 5.3 cvs snapshot for interested folks to play with. Is currently (and
+  will remain) package.mask'd.
+
+*net-snmp-5.1.3_pre1 (21 Jun 2005)
+
+  21 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +net-snmp-5.1.3_pre1.ebuild:
+  Version bump (5.1.x line) for first 5.1.3 pre-release.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> net-snmp-5.2.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> net-snmp-5.1.1.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  net-snmp-5.1.1-r1.ebuild:
+  dev-perl/ExtUtils-MakeMaker => perl-core/ExtUtils-MakeMaker migration
+
+  20 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  net-snmp-5.2.1-r1.ebuild:
+  Stable on alpha + ia64, bug 91792.
+
+  18 May 2005; Jason Wever <weeve@gentoo.org> net-snmp-5.2.1-r1.ebuild:
+  Stable on SPARC wrt security bug #91792.
+
+  18 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  net-snmp-5.2.1-r1.ebuild:
+  Stable on hppa; bug #91792
+
+  18 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  net-snmp-5.2.1-r1.ebuild:
+  stable on amd64 wrt #91792
+
+  18 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  net-snmp-5.2.1-r1.ebuild:
+  Stable on ppc.
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> net-snmp-5.2.1-r1.ebuild:
+  Stable on ppc64; bug #91792
+
+*net-snmp-5.2.1-r1 (18 May 2005)
+
+  18 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/net-snmp-5.2.1-fix-insecure-fixproc.diff,
+  +net-snmp-5.2.1-r1.ebuild:
+  Revision bump; added patch to fix fixproc insecure tmpfile handling, sec bug
+  91792.
+
+  17 May 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  net-snmp-5.2.1.ebuild:
+  Add missing lm_sensors conditional for mibs, bug 92513.
+
+  28 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
+  Only dep on TermReadKey if perl and !minimal. Thanks to solar for pointing
+  this out.
+
+  24 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
+  Removed || die after make test as there are legitimate reasons it might fail
+  (user doesnt already have a working config or an improperly configured/down
+  ethernet interface). Instead, display a message to the user explaining why 1
+  or 2 failed tests is ok.
+
+  20 Apr 2005; Simon Stelling <blubb@gentoo.org> net-snmp-5.2.1.ebuild:
+  stable on amd64
+
+  20 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> net-snmp-5.2.1.ebuild:
+  Stable on sparc
+
+  19 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
+  Marked stable on x86.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> net-snmp-5.2.1.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> net-snmp-5.2.ebuild:
+  Stable on ppc.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> net-snmp-5.2.ebuild:
+  stable on amd64
+
+  22 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2.1.ebuild:
+  Fix src_test access violation for bug 82342. Many thanks to soulse for
+  tracking this down.
+
+  15 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2-r3.ebuild,
+  net-snmp-5.2.1.ebuild:
+  Updated to use new fixlocalpod function from perl-module.eclass instead of
+  the nasty perl-module_src_install hack - see bug 83622.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org>
+  net-snmp-5.1.1-r1.ebuild, net-snmp-5.2-r3.ebuild, net-snmp-5.2.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  27 Feb 2005; Henrik Brix Andersen <brix@gentoo.org> net-snmp-5.2.1.ebuild:
+  Dependency update: sys-apps/lm-sensors -> sys-apps/lm_sensors.
+
+  21 Feb 2005; Daniel Black <dragonheart@gentoo.org> net-snmp-5.1.1-r1.ebuild,
+  net-snmp-5.1.1.ebuild, net-snmp-5.2-r3.ebuild, net-snmp-5.2.1.ebuild,
+  net-snmp-5.2.ebuild:
+  removed PROVIDE virtual/snmp
+
+  20 Feb 2005; Hardave Riar <hardave@gentoo.org> net-snmp-5.2.ebuild:
+  Stable on mips
+
+  18 Feb 2005; Daniel Black <dragonheart@gentoo.org> net-snmp-5.2.1.ebuild:
+  Giving full USE flag options to ppc64 as per bug #82341.
+
+  17 Feb 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch, net-snmp-5.2.1.ebuild:
+  Dependancy fixed as per bug #69775. Thanks Carsten Lohrke <carlo@gentoo.org>
+
+  12 Feb 2005; Jason Wever <weeve@gentoo.org> net-snmp-5.2.ebuild:
+  Stable on sparc.
+
+*net-snmp-5.2.1 (09 Feb 2005)
+
+  09 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +net-snmp-5.2.1.ebuild:
+  New upstream bugfix release.
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.1.1-r1.ebuild,
+  net-snmp-5.1.1.ebuild, net-snmp-5.2-r3.ebuild, net-snmp-5.2.ebuild:
+  Added dev-perl/TermReadKey as a dep for bug 78023.
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2-r3.ebuild:
+  Use perl-module.eclass and let it handle perllocal.pod to prevent a file
+  collision - bug 80041.
+
+*net-snmp-5.2-r3 (30 Jan 2005)
+
+  30 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -net-snmp-5.2-r2.ebuild,
+  +net-snmp-5.2-r3.ebuild:
+  Yet another revision bump; install html docs if USE=doc for bug 79934.
+
+  28 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> net-snmp-5.2-r2.ebuild:
+  Fixed perms on snmptrapd init script. Thanks to Weeve for letting me know.
+
+*net-snmp-5.2-r2 (28 Jan 2005)
+
+  28 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/snmptrapd.conf,
+  net-snmp-5.1.1-r1.ebuild, net-snmp-5.1.1.ebuild, -net-snmp-5.1.2.ebuild,
+  -net-snmp-5.2-r1.ebuild, +net-snmp-5.2-r2.ebuild, net-snmp-5.2.ebuild:
+  Revision bump; added conf script (w/ a few sed's we can reuse snmpd's init)
+  for snmptrapd (bug 61705). Also added selinux support (via
+  sec-policy/selinux-snmpd) for bug 79749. Marked 5.2 stable on x86 and tidy'd
+  old ebuilds.
+
+*net-snmp-5.2-r1 (26 Jan 2005)
+
+  26 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +net-snmp-5.2-r1.ebuild:
+  Revision bump; added local USE flag smux for bug 77871. Also, use ht_fix_all
+  from fixheadtails.eclass rather than the nasty sed ... * call.
+
+  08 Jan 2005; Daniel Black <dragonheart@gentoo.org> net-snmp-5.2.ebuild:
+  tail -1 problem fixed from bug #69775
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
+  net-snmp-5.1.1-r1.ebuild:
+  Stable on alpha.
+
+  17 Dec 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.2.ebuild:
+  autoconf re-fix (perl), changed sedding to be line-number independant for
+  future releases. Closes #59605.
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  Stable on amd64.
+
+*net-snmp-5.2 (27 Nov 2004)
+
+  27 Nov 2004; Martin Holzer <mholzer@gentoo.org> +net-snmp-5.2.ebuild:
+  VErsion bumped.
+
+  23 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  net-snmp-5.1.1-r1.ebuild:
+  Stable on sparc
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> -net-snmp-5.0.9-r1.ebuild,
+  -net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1-r1.ebuild, -net-snmp-5.1.ebuild:
+  5.1.1-r1 x86 stable. pruned 5.0.9 and 5.1.
+
+*net-snmp-5.1.2 (16 Nov 2004)
+
+  16 Nov 2004; Martin Holzer <mholzer@gentoo.org> +net-snmp-5.1.2.ebuild:
+  Version bumped. Closes 68467
+
+  03 Nov 2004; Bret Curtis <psi29a@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  marked ~mips for testing
+
+  01 Nov 2004; Lars Weiler <pylon@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  Stable on ppc for PHP5, Bug #60442.
+
+  27 Oct 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  Fixed sed typo. Closes #69069.
+
+  26 Oct 2004; Eldad Zack <eldad@gentoo.org> files/net-snmp-lm_sensors.patch:
+  Fixed lm_sensors patch to dlopen libsensors.so instead of libsensors.so.2.
+  Thanks to Chris Boot <bootc@bootc.net>. Closes #68856
+
+  25 Oct 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.1.1-r1.ebuild,
+  net-snmp-5.1.1.ebuild:
+  Fixed net-snmp-config to include tcp-wrappers libs (if used), wrt Bug #68254.
+
+  16 Oct 2004; <solar@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  removed erroneous RDEPEND on sed4
+
+  26 Aug 2004; <solar@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  minimal USE flag added to net-snmp to yield a smaller net-snmp package. bug
+  #61401
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/snmpd.conf:
+  Trimmed trailing whitespace.
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.1.1-r1.ebuild,
+  net-snmp-5.1.1.ebuild:
+  autoconf fix: configure didn't respect --disable-embedded-perl. Closes #59605.
+
+  08 Aug 2004; Guy Martin <gmsoft@gentoo.org> net-snmp-5.1.1-r1.ebuild:
+  Stable on hppa.
+
+  08 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> net-snmp-5.1.1.ebuild:
+  Stable on alpha.
+
+  26 Jul 2004; Tom Gall <tgall@gentoo.org> net-snmp-5.1.1.ebuild:
+  stable on ppc64
+
+*net-snmp-5.1.1-r1 (21 Jul 2004)
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/net-snmp-lm_sensors.patch,
+  +net-snmp-5.1.1-r1.ebuild:
+  Added lm_sensor support (only for amd64 and x86). Thanks to Joshua Gerrish
+  <jgerrish@itsdarkhere.com> for the patch. Closes #57450.
+
+  21 Jul 2004; Travis Tilley <lv@gentoo.org> net-snmp-5.1.1.ebuild:
+  stable on amd64
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> net-snmp-5.1.1.ebuild:
+  added ~ppc64, bug #55548
+
+  12 Jul 2004; Eldad Zack <eldad@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
+  Fixed 'use_enable -ssl' to be 'use_enable !ssl'
+
+  09 Jul 2004; Lars Weiler <pylon@gentoo.org> net-snmp-5.1.1.ebuild:
+  Stable on ppc.
+
+  08 Jul 2004; Jason Wever <weeve@gentoo.org> net-snmp-5.1.1.ebuild:
+  Stable on sparc.
+
+  04 Jul 2004; Robin H. Johnson <robbat2@gentoo.org> net-snmp-5.1.1.ebuild:
+  mark stable for x86, as requested by solar.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
+  change virtual/glibc to virtual/libc
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
+  Fix use invocation
+
+  11 May 2004; Michael McCabe <randy@gentoo.org> net-snmp-5.1.1.ebuild:
+  Added s390 keywords
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  net-snmp-5.0.9-r3.ebuild, net-snmp-5.1.1.ebuild, net-snmp-5.1.ebuild:
+  Add die following econf for bug 48950
+
+*net-snmp-5.1.1 (10 Apr 2004)
+
+  10 Apr 2004; Martin Holzer <mholzer@gentoo.org> metadata.xml,
+  net-snmp-5.1.1.ebuild, files/snmpd-5.1.conf, files/snmpd-5.1.rc6,
+  files/snmpd.conf, files/snmpd.rc6:
+  Version bumped.
+
+  20 Jan 2004; Max Kalika <max@gentoo.org> net-snmp-5.1.ebuild,
+  files/snmpd-5.1.conf:
+  Fix logging command-line parameters for version 5.1.
+
+  16 Jan 2004; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r3.ebuild,
+  net-snmp-5.1.ebuild, files/snmpd-5.1.rc6, files/snmpdnew.rc6:
+  Fix head/tail syntax. Submitted by Tony Vroon on bug #33851. Rename new rc6
+  file for future flexibility.
+
+  10 Jan 2004; <agriffis@gentoo.org> net-snmp-5.1.ebuild:
+  stable on alpha and ia64
+
+*net-snmp-5.1 (17 Dec 2003)
+
+  17 Dec 2003; Martin Holzer <mholzer@gentoo.org> net-snmp-5.1.ebuild,
+  files/snmpdnew.rc6:
+  Version bumped.
+
+  24 Nov 2003; Martin Holzer <mholzer@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  net-snmp-5.0.9-r3.ebuild:
+  adding RESTRICT="nomirror"
+
+  20 Nov 2003; Tavis Ormandy <taviso@gentoo.org> net-snmp-5.0.9-r1.ebuild:
+  stable on alpha
+
+*net-snmp-5.0.9-r3 (12 Nov 2003)
+
+  12 Nov 2003; <max@gentoo.org> net-snmp-5.0.9-r3.ebuild,
+  files/net-snmp-proc.patch:
+  Add /proc patch from net-snmp CVS. Bump to version 5.0.9-r3. Fixes bug 33249.
+
+  30 Oct 2003; Max Kalika <max@gentoo.org> files/snmpd.conf, files/snmpd.rc6:
+  Add connection logging example and do away with config file settings -- snmpd
+  already looks in /etc/snmp/snmpd.conf by itself.
+
+  30 Oct 2003; Max Kalika <max@gentoo.org> files/snmpd.rc6:
+  Use pidfile.
+
+  20 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
+  Add DEPEND on ExtUtils-MakeMaker-6.11-r1 to fix sandbox problems.
+
+  20 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
+  Make the perl-tk stuff depend on the X USE flag as well. Remove some things
+  that don't work anyway when USE=-perl.
+
+  20 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
+  Add perl? ( dev-perl/perl-tk ) to RDEPEND.
+
+*net-snmp-5.0.9-r2 (19 Oct 2003)
+
+  19 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r2.ebuild:
+  Add experimental perl support. Fixes bugs 29603 and 30439.
+
+  19 Oct 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r1.ebuild:
+  Add ucd-snmp/dlmod MIB support. Fixes bug 31217.
+
+  01 Oct 2003; Max Kalika <max@gentoo.org> files/snmpd.rc6:
+  Remove -C from startup script.
+
+  23 Sep 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.1.ebuild,
+  net-snmp-5.0.2a-r1.ebuild, net-snmp-5.0.2a.ebuild, net-snmp-5.0.6-r1.ebuild,
+  net-snmp-5.0.6.ebuild, net-snmp-5.0.8.ebuild, net-snmp-5.0.9-r1.ebuild,
+  net-snmp-5.0.9.ebuild, files/net-snmp-5.0.6-gentoo.diff,
+  files/net-snmpd.rc6, files/snmpd.conf, files/snmpd.rc6:
+  Purge all the no-longer download-able versions and tweak some minor tidbits.
+
+*net-snmp-5.0.9-r1 (19 Sep 2003)
+
+  01 Nov 2003; Guy Martin <gmsoft@gentoo.org> net-snmp-5.0.9-r1.ebuild:
+  Marked stable on hppa.
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> net-snmp-5.0.9-r1.ebuild,
+  files/snmpd.conf, files/snmpd.rc6:
+  Major cleanup/rewrite: quote variables where possible; whitespace consistancy;
+  use more ebuild semantics (use_with, use_enable); put config in /etc/snmp
+  instead of /usr/share; add smux support; and new rc6 and corresponding conf
+  file for extra flexibility. Drop unneccessary die() calls. Start with an empty
+  set of SNMPD_FLAGS in snmpd.conf. Add "use logger" to depend() of snmpd.rc6.
+  Drop unneeded --with-cflags, --host, and --enable-shared parameters to econf.
+  Clean up ssl flags. Enable ucd-snmp compatibility and block virtual/snmp.
+  Fixes bugs 5882, 15536, 27177, 27308, and probably 14288.
+
+*net-snmp-5.0.9 (19 Sep 2003)
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> metadata.xml,
+  net-snmp-5.0.9.ebuild:
+  Bump to version 5.0.9.
+
+  31 Jul 2003; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.6-r1.ebuild,
+  net-snmp-5.0.8.ebuild:
+  Mark 5.0.6-r1 stable on alpha, and 5.0.8 testing on ~alpha
+
+  01 Jul 2003; Martin Holzer <mholzer@gentoo.org> net-snmp-5.0.6-r1.ebuild,
+  net-snmp-5.0.8.ebuild:
+  Fixing typo. Closes #23811
+
+  07 Jun 2003; <rac@gentoo.org> net-snmp-5.0.6-r1.ebuild,
+  net-snmp-5.0.6.ebuild, net-snmp-5.0.8.ebuild:
+  Add sed-4 dependency for ebuilds that use sed -i
+
+  05 Jun 2003; <rac@gentoo.org> net-snmp-5.0.6-r1.ebuild,
+  net-snmp-5.0.8.ebuild:
+  Disable the 5.0.6 patch in 5.0.8, as it doesn't exist, and builds without it.
+  Change ${PF} to ${P} so that 5.0.6-r1 finds the patch.
+
+*net-snmp-5.0.8 (26 May 2003)
+
+  26 May 2003; Daniel Ahlberg <aliz@gentoo.org> net-snmp-5.0.8.ebuild :
+  Version bump.
+
+*net-snmp-5.0.6-r1 (26 May 2003)
+
+  14 Jun 2003; Guy Martin <gmsoft@gentoo.org> net-snmp-5.0.6-r1.ebuild :
+  Added hppa to KEYWORDS.
+
+  26 May 2003; Daniel Ahlberg <aliz@gentoo.org> net-snmp-5.0.6-r1.ebuild :
+  Added virtual/snmp.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*net-snmp-5.0.6 (14 Oct 2002)
+
+  29 Mar 2003; Aron Griffis <agriffis@gentoo.org> net-snmp-5.0.6.ebuild:
+  Add ~alpha to KEYWORDS
+
+  07 May 2003; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.6.ebuild:
+  Commented out kerberos support, generates compile errors.
+
+  02 May 2003; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.6.ebuild:
+  Removed double quotes.  Closes #5882.  Now using sed for kerberos.
+
+  21 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  net-snmp-5.0.6.ebuild, files/net-snmpd.rc6:
+  Fixing type in doc info. Closes #15535.
+
+  06 Apr 2003; Zach Welch <zwelch@gentoo.org> net-snmp-5.0.6.ebuild:
+  add arm keyword
+
+  14 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Added patch to fix compilation with libwrap.
+
+*net-snmp-5.0.2a-r1 (4 Aug 2002)
+
+  28 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  4 Aug 2002; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.2a-r1.ebuild:
+  
+  Closed bug #5882, manually recreate the symlink.
+
+*net-snmp-5.0.2a (23 Jul 2002)
+
+  23 Jul 2002; Kyle Manna <nitro@gentoo.org> net-snmp-5.0.2a.ebuild:
+  Version bump, dropped emake in favor of make, add the host MIB module, and
+  commented out ipv6 transports.
 
 *net-snmp-5.0.1 (29 Jun 2002)
 
   29 Jun 2002; Bruce A. Locke <blocke@shivan.org> net-snmp-5.0.1.ebuild:
-
   ucd-snmp has been renamed to net-snmp and this release appears to be 
   source incompatible with ucd-snmp
 
   Known Issue:  The new optional perl module support is disabled (due to
   configure/make issues) until someone who is familiar with the functionality 
   can contribute a patch.
-
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index bd8a254e51a0..49369bebd1ed 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,11 +1,24 @@
-MD5 76d2bb02c11ddb736f4d7342f30a488b ChangeLog 1383
-MD5 07372e3fc940abfd2601968e11d0fbb6 net-snmp-5.0.1.ebuild 1802
-MD5 22ec646d0af5a104570eeda88dc397c6 net-snmp-5.0.2a-r1.ebuild 2033
-MD5 479216f8ee9cad9c07a8d2e87b761078 net-snmp-5.0.2a.ebuild 1934
-MD5 939754957b64137c9a9513f6d3bc51a2 net-snmp-5.0.6.ebuild 2190
-MD5 d127de412720bd3804be2526d4ac7dea files/digest-net-snmp-5.0.1 67
-MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a 68
-MD5 45a6f4951a27519e45e78c615eaa51d9 files/digest-net-snmp-5.0.2a-r1 68
-MD5 c5a8f12d262061bf64af49b18adb2f48 files/digest-net-snmp-5.0.6 67
-MD5 d967ea531257d3b6328dffa4637b27ff files/net-snmp-5.0.6-gentoo.diff 885
-MD5 e4cdaee445407dfc5bfa044dbb9209b8 files/net-snmpd.rc6 735
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b60f198a7739db89cfc5db54fda22d03 net-snmp-5.3.20050624.ebuild 5086
+MD5 f9c21a4768653f0035408ae5136fdafe net-snmp-5.1.3.1.ebuild 4933
+MD5 9b7f462b1de1fa21b0f3e9f79c5b72d3 net-snmp-5.2.1.2-r1.ebuild 5055
+MD5 44c74b980adad72f6cdd27fc3317d0eb ChangeLog 19078
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 a63107c1d81a8aeb10e84be0658e2794 files/net-snmp-5.2.1-fix-insecure-fixproc.diff 1639
+MD5 791cd8d81154f2c1d01e3f87b86faa44 files/snmptrapd.conf 635
+MD5 cfce6770c86e3e3bc76800c6bd6ee8c6 files/digest-net-snmp-5.2.1.2-r1 69
+MD5 82d14deda5805e21a60de03e0a69659c files/net-snmp-5.2.1-conf-elf-rpm-bz2.patch 4734
+MD5 9791bf52496848c5613de87a95a3b761 files/digest-net-snmp-5.1.3.1 69
+MD5 ed2e953a9a923caec45eeca95bec2efc files/snmpd-5.1.conf 606
+MD5 25d92c9a7adcbb80240a914a8f6bbfe5 files/net-snmp-lm_sensors.patch 13686
+MD5 0dbde7b1bdd9c9dc988039e676800337 files/snmpd-5.1.rc6 714
+MD5 cf7d3f5d505c262b2477f1759b908bad files/digest-net-snmp-5.3.20050624 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGlPqEZCkKN40op4RAjJQAKCsoZEtGwhpQ8OjikhCvFEjJFDWqwCfTDnE
+I841b2F/KazOnRk9nP9Asik=
+=N310
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/net-snmp/files/net-snmp-lm_sensors.patch b/net-analyzer/net-snmp/files/net-snmp-lm_sensors.patch
index 55a3274d0de4..29ba1ea8e01b 100644
--- a/net-analyzer/net-snmp/files/net-snmp-lm_sensors.patch
+++ b/net-analyzer/net-snmp/files/net-snmp-lm_sensors.patch
@@ -182,7 +182,7 @@ diff -Naur net-snmp-5.1.1.old/agent/mibgroup/host/hr_sensor.c net-snmp-5.1.1/age
 +  void *sensors_library;
 +  
 +  /* This could probably due with a bit more error reporting. */
-+  sensors_library=dlopen("libsensors.so.2",RTLD_LAZY);
++  sensors_library=dlopen("libsensors.so",RTLD_LAZY);
 +  if(sensors_library==NULL)
 +    return; // return before anything is registered
 +
diff --git a/net-analyzer/net-snmp/files/snmpd-5.1.conf b/net-analyzer/net-snmp/files/snmpd-5.1.conf
index 3d0e10a46b5d..4bad5040ffef 100644
--- a/net-analyzer/net-snmp/files/snmpd-5.1.conf
+++ b/net-analyzer/net-snmp/files/snmpd-5.1.conf
@@ -1,3 +1,7 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd-5.1.conf,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
+
 # Initial (empty) options.
 SNMPD_FLAGS=""
 
diff --git a/net-analyzer/net-snmp/files/snmpd-5.1.rc6 b/net-analyzer/net-snmp/files/snmpd-5.1.rc6
index ab69067b51f8..15c2676494bf 100644
--- a/net-analyzer/net-snmp/files/snmpd-5.1.rc6
+++ b/net-analyzer/net-snmp/files/snmpd-5.1.rc6
@@ -1,4 +1,7 @@
 #!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmpd-5.1.rc6,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 depend() {
 	use logger
diff --git a/net-analyzer/net-snmp/files/snmptrapd.conf b/net-analyzer/net-snmp/files/snmptrapd.conf
index b6259fcf1080..15d8104f02f5 100644
--- a/net-analyzer/net-snmp/files/snmptrapd.conf
+++ b/net-analyzer/net-snmp/files/snmptrapd.conf
@@ -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/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1 2005/01/28 11:19:25 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/files/snmptrapd.conf,v 1.1.1.1 2005/11/30 10:12:46 chriswhite Exp $
 
 # extra flags to pass to snmptrapd
 SNMPTRAPD_FLAGS=""
diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index 05e6d2289c71..78692635ad22 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -1,6 +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>max@gentoo.org</email></maintainer>
+	<herd>netmon</herd>
 </pkgmetadata>
diff --git a/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild b/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
index 83027de24ffb..d1fa52e31899 100644
--- a/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.1.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/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild,v 1.1 2005/08/05 17:59:29 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:45 chriswhite Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -54,11 +54,14 @@ src_unpack() {
 		net-snmp-config.in || die "sed net-snmp-config.in"
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
 		|| die "sed configure.in failed"
+	# Insecure run-path - bug 103776
+	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
+		Makefile.in || die "sed Makefile.in failed"
 	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
+	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
 		die "sed eval_tools.sh failed"
 	# fix path in fixproc
-	sed -i 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
+	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
 		die "sed fixproc failed"
 
 	ht_fix_all
diff --git a/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild b/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
index 86e9ddb7afb7..48e378adceb7 100644
--- a/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.2.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/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild,v 1.1 2005/09/04 01:54:00 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.2.1.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:45 chriswhite Exp $
 
 inherit eutils fixheadtails perl-module
 
diff --git a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild b/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
index 4408e27df4d2..f51bf7f986c6 100644
--- a/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.3.20050624.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/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild,v 1.1 2005/06/25 12:44:26 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/net-snmp/net-snmp-5.3.20050624.ebuild,v 1.1.1.1 2005/11/30 10:12:45 chriswhite Exp $
 
 inherit eutils fixheadtails perl-module
 
@@ -8,7 +8,7 @@ DESCRIPTION="Software for generating and retrieving SNMP data"
 HOMEPAGE="http://net-snmp.sourceforge.net/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="as-is"
+LICENSE="as-is BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl ipv6 ssl tcpd X lm_sensors minimal smux selinux doc rpm elf"
@@ -59,11 +59,14 @@ src_unpack() {
 		net-snmp-config.in || die "sed net-snmp-config.in"
 	sed -i -e 's;embed_perl="yes",;embed_perl=$enableval,;' configure.in \
 		|| die "sed configure.in failed"
+	# Insecure run-path - bug 103776
+	sed -i -e 's/\(@(cd perl ; $(MAKE)\)\() ; \\\)/\1 LD_RUN_PATH=\2/g' \
+		Makefile.in || die "sed Makefile.in failed"
 	# fix access violation in make check
-	sed -i 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
+	sed -i -e 's/\(snmpd.*\)-Lf/\1-l/' testing/eval_tools.sh || \
 		die "sed eval_tools.sh failed"
 	# fix path in fixproc
-	sed -i 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
+	sed -i -e 's|\(database_file =.*\)/local\(.*\)$|\1\2|' local/fixproc || \
 		die "sed fixproc failed"
 
 	ht_fix_all
diff --git a/net-analyzer/netcat/ChangeLog b/net-analyzer/netcat/ChangeLog
index 4c1a558fcf46..03c1a56b481d 100644
--- a/net-analyzer/netcat/ChangeLog
+++ b/net-analyzer/netcat/ChangeLog
@@ -1,11 +1,126 @@
 # ChangeLog for net-analyzer/netcat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> netcat-110-r8.ebuild:
+  Mark 110-r8 stable on alpha
+
+  09 Sep 2005; Tom gall <tgall@gentoo.org> netcat-110-r8.ebuild, 
+  netcat-110-r7.ebuild:
+  stable on ppc64 (r8)
+  fix copyright date on header (r7)
+
+  08 Sep 2005; Aaron Walker <ka0ttic@gentoo.org> netcat-110-r8.ebuild:
+  Stable on mips.
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> netcat-110-r8.ebuild:
+  Stable on ppc.
+
+  29 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> netcat-110-r8.ebuild:
+  Stable on sparc
+
+*netcat-110-r8 (06 May 2005)
+
+  06 May 2005; Mike Frysinger <vapier@gentoo.org> +netcat-110-r8.ebuild:
+  Move to standard patch tarball style and sync against latest Debian patchset.
+
+  14 Apr 2005; Tom Gall <tgall@gentoo.org> netcat-110-r7.ebuild:
+  added ~ppc64 bug#89110
+
+*netcat-110-r7 (27 Dec 2004)
+
+  27 Dec 2004; Mike Frysinger <vapier@gentoo.org> +netcat-110-r7.ebuild:
+  Add a patch from debian to handle /etc/services better.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> netcat-110-r5.ebuild,
+  netcat-110-r6.ebuild:
+  change virtual/glibc to virtual/libc
+
+*netcat-110-r6 (05 May 2004)
+
+  05 May 2004; Mike Frysinger <vapier@gentoo.org> :
+  Merge AES crypt support from http://mixter.void.ru/.
+
+*netcat-110-r5 (10 Apr 2004)
+
+  10 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add -DTELNET to compile flags to have netcat compile w/telnet (-t)
+  support #47301 by Michael Leuchtenburg.
+
+*netcat-110-r4 (21 Aug 2003)
+
+  21 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add local use flag to control GAPING_SECURITY_HOLE #41843 by Mitchell.
+
+  05 Oct 2003; Brad House <brad_mssw@gentoo.org> netcat-110-r4.ebuild:
+  add ~amd64 flag
+
+  19 Sep 2003; Seemant Kulleen <seemant@gentoo.org> netcat-110-r3.ebuild,
+  netcat-110-r4.ebuild:
+  SRC_URI update, thanks to: Scott Alfter <gentoo@salfter.dyndns.org> in bug
+  #29154
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Grab debian patches to add support for broadcasting and -q #24236.
+  Had to redo a few deb patches since we also use ipv6 patch ... thats
+  why we've got a custom debian tarball of patches :)
+
+*netcat-110-r3 (08 Apr 2003)
+
+  18 Aug 2003; Martin Holzer <mholzer@gentoo.org> netcat-110-r1.ebuild,
+  netcat-110-r2.ebuild, netcat-110-r3.ebuild:
+  Upated SRC_URI and HP.
+
+  28 Jul 2003; Guy Martin <gmsoft@gentoo.org> netcat-110-r3.ebuild :
+  Marked stable on hppa.
+
+  08 Apr 2003; Guy Martin <gmsoft@gentoo.org> netcat-110-r3.ebuild, files/digest-netcat-110-r3 :
+  Added ipv6 support. Added support for the static use flag. Added ~hppa to KEYWORDS.
+  Added the IUSE variable.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*netcat-110-r2 (22 Oct 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> netcat-110-r2.ebuild :
+  Add alpha to KEYWORDS
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> netcat-110-r2.ebuild
+  files/digest-netcat-110-r2 :
+
+  Undid the previous change.  Closes bug #9522 by tester@videotron.ca
+  (Olivier Crete)
+
+*netcat-110-r1 (22 Oct 2002)
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> netcat-110-r1.ebuild:
+  Change supersed dependencies
+
+  22 Oct 2002; Seemant Kulleen <seemant@gentoo.org> netcat-110-r1.ebuild
+  files/digest-netcat-110-r1 :
+
+  Updated the SRC_URI to reflect the new homepage. Thanks to:
+  alan@jasomi.com (Alan Hawrylyshen) in bug #9500.
+
+  Changed the order of the sed statements as the nc->netcat change in the
+  Makefile screwed people's CFLAGS.  Thanks to: Bulletz_1900@hotmail.com
+  (Dries Harnie) in bug #9479 by shadow@ines.ro
+
+  The executable is now installed as /usr/bin/netcat instead of /usr/bin/nc
+  which conflicted with /usr/bin/nc from app-editors/nedit.  Closes bug
+  #6370 by Klaus.Kusche@inode.at (Klaus Kusche)
+
+*netcat-110 (1 Feb 2002)
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> netcat-110.ebuild :
+
+  dodoc fixes by: twanger@bluetwanger.de (Markus Bertheau) in bug #7269
 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
   moved to net-analyzer - added SLOT
 
-*netcat-110 (1 Feb 2002)
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
diff --git a/net-analyzer/netcat/Manifest b/net-analyzer/netcat/Manifest
index bdc360f4530e..6f23e3db8b16 100644
--- a/net-analyzer/netcat/Manifest
+++ b/net-analyzer/netcat/Manifest
@@ -1,7 +1,8 @@
-MD5 aadd372f15e6811fd2cacd8fb1e0d0ed netcat-110-r3.ebuild 1126
-MD5 31d9e18a29cd6ade7a8ae76852964ff0 netcat-110-r2.ebuild 918
-MD5 b9c13fc34b61ff3531c006ab9b026647 netcat-110-r1.ebuild 1069
-MD5 517383484d0078400a8594deaa13acfb ChangeLog 2386
-MD5 225f91a7ab156551f82fe1e2a3bfef47 files/digest-netcat-110-r1 53
-MD5 225f91a7ab156551f82fe1e2a3bfef47 files/digest-netcat-110-r2 53
-MD5 c728a3fa30ba842c5fe258dd8d6b0e8a files/digest-netcat-110-r3 119
+MD5 c260f5cd9a68c0965120f9244b5df4ef metadata.xml 284
+MD5 ae54eb51f34b25c88be111f68299a2d0 netcat-110-r7.ebuild 1541
+MD5 2a96bedd379fcf81f55fe6f57e0a2332 ChangeLog 4727
+MD5 e7bc2d5a93ab1696d4c26ed10b590385 netcat-110-r6.ebuild 1562
+MD5 1746360256f9fbdf3745d4fca3dc8398 netcat-110-r8.ebuild 1503
+MD5 65549a89bfefa86a357427408e4ac6d7 files/digest-netcat-110-r6 200
+MD5 54e299b9981948166ccf70c7b9f814b9 files/digest-netcat-110-r7 200
+MD5 294dd14213cc2412a86cbff94710bd6e files/digest-netcat-110-r8 193
diff --git a/net-analyzer/netcat/metadata.xml b/net-analyzer/netcat/metadata.xml
index 04cfecd9dc9b..dbbf4a490e09 100644
--- a/net-analyzer/netcat/metadata.xml
+++ b/net-analyzer/netcat/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
 <maintainer>
- <email>vapier@gentoo.org</email>
+	<email>vapier@gentoo.org</email>
 </maintainer>
+<longdescription>the network swiss army knife</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/netcat/netcat-110-r6.ebuild b/net-analyzer/netcat/netcat-110-r6.ebuild
index ca17007828ec..444b48c9eefc 100644
--- a/net-analyzer/netcat/netcat-110-r6.ebuild
+++ b/net-analyzer/netcat/netcat-110-r6.ebuild
@@ -1,22 +1,22 @@
-# 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/net-analyzer/netcat/netcat-110-r6.ebuild,v 1.1 2004/05/05 21:49:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/netcat-110-r6.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
-inherit eutils gcc flag-o-matic
+inherit eutils toolchain-funcs flag-o-matic
 
 MY_P=nc${PV}
-DESCRIPTION="A network piping program"
-HOMEPAGE="http://www.atstake.com/research/tools/network_utilities/"
+DESCRIPTION="the network swiss army knife"
+HOMEPAGE="http://www.securityfocus.com/tools/137"
 SRC_URI="http://www.atstake.com/research/tools/network_utilities/${MY_P}.tgz
 	ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz
 	mirror://gentoo/${PF}-gentoo-deb-patches.tbz2"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64"
+KEYWORDS="alpha arm amd64 hppa ia64 mips ppc sparc x86"
 IUSE="ipv6 static crypt GAPING_SECURITY_HOLE"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	crypt? ( dev-libs/libmix )"
 
 src_unpack() {
@@ -37,7 +37,7 @@ src_compile() {
 	use static && export STATIC="-static"
 	use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
 	use GAPING_SECURITY_HOLE && XFLAGS="${XFLAGS} -DGAPING_SECURITY_HOLE"
-	CC="$(gcc-getCC) ${CFLAGS}" make -e nc || die
+	CC="$(tc-getCC) ${CFLAGS}" make -e nc || die
 }
 
 src_install() {
diff --git a/net-analyzer/netcat/netcat-110-r7.ebuild b/net-analyzer/netcat/netcat-110-r7.ebuild
index f663a2b4c81e..22a560ec2efb 100644
--- a/net-analyzer/netcat/netcat-110-r7.ebuild
+++ b/net-analyzer/netcat/netcat-110-r7.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/net-analyzer/netcat/netcat-110-r7.ebuild,v 1.1 2004/12/27 23:13:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/netcat-110-r7.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.atstake.com/research/tools/network_utilities/${MY_P}.tgz
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
 IUSE="ipv6 static crypt GAPING_SECURITY_HOLE"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/netcat/netcat-110-r8.ebuild b/net-analyzer/netcat/netcat-110-r8.ebuild
index cad33ce7d0bb..dd427e5c3c31 100644
--- a/net-analyzer/netcat/netcat-110-r8.ebuild
+++ b/net-analyzer/netcat/netcat-110-r8.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/net-analyzer/netcat/netcat-110-r8.ebuild,v 1.1 2005/05/06 22:26:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat/netcat-110-r8.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.atstake.com/research/tools/network_utilities/${MY_P}.tgz
 
 LICENSE="as-is"
 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="ipv6 static crypt GAPING_SECURITY_HOLE"
 
 DEPEND="crypt? ( dev-libs/libmix )"
diff --git a/net-analyzer/netcat6/ChangeLog b/net-analyzer/netcat6/ChangeLog
index 440c11a42997..cad5edbb0a88 100644
--- a/net-analyzer/netcat6/ChangeLog
+++ b/net-analyzer/netcat6/ChangeLog
@@ -1,6 +1,12 @@
-# ChangeLog for net-misc/netcat6
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.1 2005/10/14 00:50:05 vapier Exp $
+# ChangeLog for net-analyzer/netcat6
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> netcat6-0.5.ebuild:
+  Mark 0.5 stable on alpha
+
+  17 Oct 2005; Aron Griffis <agriffis@gentoo.org> netcat6-0.5.ebuild:
+  Mark 0.5 stable on ia64
 
 *netcat6-0.5 (02 Jun 2003)
 
diff --git a/net-analyzer/netcat6/Manifest b/net-analyzer/netcat6/Manifest
index cb2ac1829b86..0d881a2cb8a0 100644
--- a/net-analyzer/netcat6/Manifest
+++ b/net-analyzer/netcat6/Manifest
@@ -1,4 +1,14 @@
-MD5 1cbc930fe798e4442cceeda4cd2c0147 ChangeLog 348
-MD5 7adc0354fee006677ce16c7003b35762 files/digest-nc6-0.5 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7f925f06df79aac09c9a624d8bc05616 netcat6-0.5.ebuild 767
+MD5 2997d779a1f7ab59cb6038bbf041427c metadata.xml 220
+MD5 047ea4a6c6b168cbb95a333d63ba0d8f ChangeLog 567
 MD5 7adc0354fee006677ce16c7003b35762 files/digest-netcat6-0.5 60
-MD5 1536bd4a8f9689ab2fde3be725946d73 netcat6-0.5.ebuild 607
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVFfOJrHF4yAQTrARAnYGAJ9sUlRxQ6zGqyWXwh/uKdMQ/eTXfACfd83L
+74A0po2fegVe4j/M/M7v4o4=
+=0g6D
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netcat6/netcat6-0.5.ebuild b/net-analyzer/netcat6/netcat6-0.5.ebuild
index 1d87507f6da0..5fc67ed54cf3 100644
--- a/net-analyzer/netcat6/netcat6-0.5.ebuild
+++ b/net-analyzer/netcat6/netcat6-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/net-analyzer/netcat6/netcat6-0.5.ebuild,v 1.1 2005/10/14 00:50:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netcat6/netcat6-0.5.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 DESCRIPTION="netcat clone with better IPv6 support, improved code, etc..."
 HOMEPAGE="http://netcat6.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://ftp.deepspace6.net/pub/sources/nc6/nc6-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~m68k ~ppc ~s390 ~sh ~sparc x86"
 IUSE="ipv6 nls"
 
 DEPEND=""
diff --git a/net-analyzer/netdiscover/ChangeLog b/net-analyzer/netdiscover/ChangeLog
index 5814cead08f9..3e3edfa0950a 100644
--- a/net-analyzer/netdiscover/ChangeLog
+++ b/net-analyzer/netdiscover/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for net-analyzer/netidscover
+# ChangeLog for net-analyzer/netdiscover
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.1 2005/09/01 12:39:12 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 *netdiscover-0.3_beta5 (01 Sep 2005)
 
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index 10d43c8d418d..ad06151ed28e 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,4 +1,4 @@
-MD5 d8cf1ce58e50fb80c34f7407b2fc38e4 netdiscover-0.3_beta5.ebuild 567
-MD5 26c16d3f32e631bd901c3beca5374d14 ChangeLog 264
-MD5 73c109f7a2717f5e5b02bf645b86f855 metadata.xml 253
+MD5 888cb39dd6e828978f66f8c63cb07277 ChangeLog 362
 MD5 0488e2e0c060cb9b70f76f831ae9fccd files/digest-netdiscover-0.3_beta5 73
+MD5 73c109f7a2717f5e5b02bf645b86f855 metadata.xml 253
+MD5 6f2a38de146a63f8a36a4faf628868ef netdiscover-0.3_beta5.ebuild 681
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild
index 6772c5f94996..5217dfac3193 100644
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.3_beta5.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/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild,v 1.1 2005/09/01 12:39:12 s4t4n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta5.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
diff --git a/net-analyzer/nethogs/ChangeLog b/net-analyzer/nethogs/ChangeLog
index c17f0347f8a0..4ee303e6622e 100644
--- a/net-analyzer/nethogs/ChangeLog
+++ b/net-analyzer/nethogs/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-analyzer/nethogs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.1 2005/04/03 17:20:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/ChangeLog,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> nethogs-0.6.0.ebuild:
+  Fix hardcoded CFLAGS and gcc.
+
+  16 Aug 2005; Simon Stelling <blubb@gentoo.org> nethogs-0.6.0.ebuild:
+  added ~amd64 keyword
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nethogs-0.6.0.ebuild:
+  Added to ~ppc.
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org> nethogs-0.6.0.ebuild:
+  Marking x86 stable.
 
 *nethogs-0.6.0 (04 Apr 2005)
 
diff --git a/net-analyzer/nethogs/Manifest b/net-analyzer/nethogs/Manifest
index 7ca923392748..d1cb7dcecff7 100644
--- a/net-analyzer/nethogs/Manifest
+++ b/net-analyzer/nethogs/Manifest
@@ -1,2 +1,5 @@
-MD5 aabef15a75db44c3c4c4ce0179de0846 nethogs-0.6.0.ebuild 662
+MD5 32781c8773f855aa3110ec67c1c2b4f9 nethogs-0.6.0.ebuild 988
+MD5 19e68a6b745eb6931ddfab962e9db914 ChangeLog 1062
+MD5 1385d77b0c1cbc2ad11db1d3abea9721 metadata.xml 735
+MD5 ee1f4e4bcff506362fd7463b85016f54 files/nethogs-0.6.0-gcc34.diff 397
 MD5 91d6d413a6fddc0318223e2c73caa452 files/digest-nethogs-0.6.0 64
diff --git a/net-analyzer/nethogs/nethogs-0.6.0.ebuild b/net-analyzer/nethogs/nethogs-0.6.0.ebuild
index 5a0768ee07d5..4c4df4455529 100644
--- a/net-analyzer/nethogs/nethogs-0.6.0.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.6.0.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/net-analyzer/nethogs/nethogs-0.6.0.ebuild,v 1.1 2005/04/03 17:20:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nethogs/nethogs-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 HOMEPAGE="http://nethogs.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -10,22 +10,22 @@ DESCRIPTION="A small 'net top' tool, grouping bandwidth by process"
 
 LICENSE="GPL-1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 DEPEND="virtual/libpcap"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gcc34.diff
+	unpack ${A}; cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc34.diff"
+	# fix hardcoded CFLAGS and CC
+	sed -i -e "s:-O2:${CFLAGS}:g" Makefile || die
+	sed -i -e "s:g++:$(tc-getCXX):g" Makefile || die
+	sed -i -e "s:gcc:$(tc-getCC):g" Makefile || die
 }
 
 src_compile() {
-	# There is currently no configure script within the nethogs package:
-	# econf || die
-
 	emake || die "emake failed"
 }
 
diff --git a/net-analyzer/neti/ChangeLog b/net-analyzer/neti/ChangeLog
index 7215dc6e6fc5..2ef758a571e5 100644
--- a/net-analyzer/neti/ChangeLog
+++ b/net-analyzer/neti/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-analyzer/neti
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.1 2004/06/21 09:43:59 dragonheart Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+*neti-1.01-r1 (29 Apr 2005)
+
+  29 Apr 2005; Daniel Black <dragonheart@gentoo.org> files/neti-init,
+  -neti-1.01.ebuild, +neti-1.01-r1.ebuild:
+  Corrected init scripts as per bug #90415. Thanks to Marco Morales
+  <soulN0SPAMse@gmail.com>
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> neti-1.01.ebuild:
+  Change to virtual/libpcap dependancy
+
+  28 Jul 2004; Daniel Black <dragonheart@gentoo.org> neti-1.01.ebuild:
+  Marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> neti-1.01.ebuild:
+  change virtual/glibc to virtual/libc
+
+  23 Jun 2004; David Holm <dholm@gentoo.org> neti-1.01.ebuild:
+  Added to ~ppc.
+
+  23 Jun 2004; Daniel Black <dragonheart@gentoo.org> neti-1.01.ebuild:
+  ~x86 keyword
 
 *neti-1.01 (21 Jun 2004)
 
diff --git a/net-analyzer/neti/Manifest b/net-analyzer/neti/Manifest
index 14ea1b8dd66a..680159b7a7de 100644
--- a/net-analyzer/neti/Manifest
+++ b/net-analyzer/neti/Manifest
@@ -1,3 +1,15 @@
-MD5 be7f290f50fc5b041312164eb2163781 neti-1.01.ebuild 772
-MD5 8eb9608d83d2d180bb9731b4b811b5e2 files/neti-init 212
-MD5 68d7769784d731fd49d9283179d49dc6 files/digest-neti-1.01 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 597db2f997ec28843dcef5fc12051d31 ChangeLog 1181
+MD5 6f1d1b84d8007bfcd31835e878326ce8 metadata.xml 383
+MD5 bc0bbe75211eb9c7fc603e417c1e85e1 neti-1.01-r1.ebuild 1481
+MD5 16c503bc7ef0a2822757698c3676db1b files/neti-init 503
+MD5 68d7769784d731fd49d9283179d49dc6 files/digest-neti-1.01-r1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD4DBQFCcrmEmdTrptrqvGERAr5bAJ9LxisdtfH9RS0LLC61V1SbhV3RKACYnK4q
+6lxNIKWK4EgVraAYtSUgLQ==
+=I7bB
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/neti/files/neti-init b/net-analyzer/neti/files/neti-init
index 7b2bf56e3be6..81e985eb0473 100644
--- a/net-analyzer/neti/files/neti-init
+++ b/net-analyzer/neti/files/neti-init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-analyzer/neti/files/neti-init,v 1.1 2004/06/21 09:43:59 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/files/neti-init,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 depend() {
     need net
@@ -9,8 +9,7 @@ depend() {
 
 start() {
 	ebegin "Starting netiathome"
-	start-stop-daemon --start --quiet --exec \
-		/usr/bin/tethereal -iany -l -p -tad -V -R"udp||tcp||icmp||igmp" | neti
+	start-stop-daemon --start --background --quiet --exec /usr/sbin/NETIStart
 	eend $?
 }
 
diff --git a/net-analyzer/neti/metadata.xml b/net-analyzer/neti/metadata.xml
index b9fc2b9c6f11..e1dc22300ef8 100644
--- a/net-analyzer/neti/metadata.xml
+++ b/net-analyzer/neti/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>netmon</herd>
+<maintainer>
+  <email>netmon@gentoo.org</email>
+    <name>Netmon herd</name>
+</maintainer>
 <maintainer>
   <email>dragonheart@gentoo.org</email>
     <name>Daniel Black</name>
-    <description>A user ebuild that I felt obliged to include. Please take over if you want 
-it</description>
 </maintainer>
 <longdescription></longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/neti/neti-1.01-r1.ebuild b/net-analyzer/neti/neti-1.01-r1.ebuild
index a0362e0d017f..756f7e1b48bc 100644
--- a/net-analyzer/neti/neti-1.01-r1.ebuild
+++ b/net-analyzer/neti/neti-1.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/net-analyzer/neti/neti-1.01-r1.ebuild,v 1.1 2005/04/29 22:47:24 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/neti/neti-1.01-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 DESCRIPTION="NETI@Home research project from GATech"
 HOMEPAGE="http://www.neti.gatech.edu"
diff --git a/net-analyzer/netio/ChangeLog b/net-analyzer/netio/ChangeLog
index 6992a1a17198..e5663b68d082 100644
--- a/net-analyzer/netio/ChangeLog
+++ b/net-analyzer/netio/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-analyzer/netio
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netio/ChangeLog,v 1.1 2003/10/19 09:15:04 tantive Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netio/ChangeLog,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
+
+  28 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> netio-1.23.ebuild:
+  Minor ebuild cleansing; respect CFLAGS. Also added pkg_postinst for messages
+  regarding the license.
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> netio-1.23.ebuild:
+  Stable on sparc.
+
+  29 Jul 2004; Hasan Khalil <gongloo@gentoo.org> netio-1.23.ebuild:
+  Added macos keyword, resolves bug #57820.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  netio-1.23.ebuild:
+  change virtual/glibc to virtual/libc, add metadata.xml
+
+  28 Feb 2004; Jason Wever <weeve@gentoo.org> netio-1.23.ebuild:
+  Added ~sparc keyword, resolves bug #43209.
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org> netio-1.23.ebuild:
+  adding unzip. Closes #32485
+
+  24 Oct 2003; Michael Imhof <tantive@gentoo.org> netio-1.23.ebuild:
+  Marked stable for x86 and ppc.
 
 *netio-1.23 (19 Oct 2003)
 
diff --git a/net-analyzer/netio/Manifest b/net-analyzer/netio/Manifest
index 405c3a072f2f..510bf1858980 100644
--- a/net-analyzer/netio/Manifest
+++ b/net-analyzer/netio/Manifest
@@ -1,3 +1,14 @@
-MD5 2f25e753e126ec120197c56d809def49 netio-1.23.ebuild 956
-MD5 8e3cb78ea4c2d038ad619e695fc02ce7 ChangeLog 3136
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d937f9db3863634a79e88e29e0af66d0 netio-1.23.ebuild 1480
+MD5 faac2f7f818517292d07e09ddd4dc0db ChangeLog 4062
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
 MD5 e2011a67f325086737a95017b12456d1 files/digest-netio-1.23 57
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB+haAEZCkKN40op4RAsgOAJoDhLhL2engnobaWQyMom+wE2LpVACgiPtY
+1J3lgz2nZhCMSrB2xRiVOK8=
+=cptX
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netio/netio-1.23.ebuild b/net-analyzer/netio/netio-1.23.ebuild
index 177f2e7fa9df..95c0f5e3e43e 100644
--- a/net-analyzer/netio/netio-1.23.ebuild
+++ b/net-analyzer/netio/netio-1.23.ebuild
@@ -1,32 +1,55 @@
-# 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/net-analyzer/netio/netio-1.23.ebuild,v 1.1 2003/10/19 09:15:04 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netio/netio-1.23.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="a network benchmark for DOS, OS/2, Windows NT and Unix that measures net througput with NetBIOS and TCP/IP protocols."
 HOMEPAGE="http://freshmeat.net/projects/netio/"
 SRC_URI="http://ftp.leo.org/pub/comp/os/os2/leo/systools/netio123.zip"
+
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc ppc-macos"
 IUSE=""
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
-S=${WORKDIR}/
+
+DEPEND="virtual/libc
+	app-arch/unzip
+	>=sys-apps/sed-4"
+RDEPEND="virtual/libc"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	sed -i -e 's|\(CFLAGS\)=|\1?=|g' \
+		-e 's|\(CC\)=|\1?=|g' Makefile || die "sed Makefile failed"
+}
 
 src_compile() {
-	emake linux || die
+	emake linux	\
+		CC="$(tc-getCC)" \
+		CFLAGS="-DUNIX ${CFLAGS}" \
+		|| die "emake failed"
 }
 
 src_install() {
-	into /usr
-	dobin netio
+	dobin netio || die "dobin failed"
 
 	# to be sure to comply with the license statement in netio.doc,
 	# just install everything included in the package to doc
-	dodoc netio.doc FILE_ID.DIZ getopt.h netb_1_c.h netbios.h netio.c\
- getopt.o netb_2_c.h netbios.o netio.doc getopt.c Makefile netbios.c\
- netio netio.o
+	dodoc netio.doc FILE_ID.DIZ getopt.h netb_1_c.h netbios.h netio.c \
+		netb_2_c.h netio.doc getopt.c Makefile netbios.c
+
+	# also install binaries
+	dodoc bin/os2-i386.exe bin/win32-i386.exe bin/linux-i386
+}
 
-	# also install binaries for other platforms than linux 
-	dodoc bin/os2-i386.exe bin/win32-i386.exe
+pkg_postinst() {
+	echo
+	einfo "NOTE: all files included in the upstream zip file have"
+	einfo "been installed to /usr/share/doc/${PF}, as required by"
+	einfo "the license."
+	echo
 }
diff --git a/net-analyzer/netleds_applet/ChangeLog b/net-analyzer/netleds_applet/ChangeLog
index e8a39725be90..61316ba4dffd 100644
--- a/net-analyzer/netleds_applet/ChangeLog
+++ b/net-analyzer/netleds_applet/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-analyzer/netleds_applet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netleds_applet/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netleds_applet/ChangeLog,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+  05 Oct 2005; <dang@gentoo.org> netleds_applet-0.9.1-r3.ebuild:
+  Change gtop dep to be 1.x only.  bug #108149
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  netleds_applet-0.9.1-r3.ebuild:
+  Tidy, added metadata
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*netleds_applet-0.9.1-r3 (16 Jun 2002)
+
+  16 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  netleds_applet-0.9.1-r3.ebuild files/digest-netleds_applet-0.9.1-r3 :
+
+  sandbox fix, cont'd
+
+*netleds_applet-0.9.1-r2 (24 Apr 2002)
+
+  24 Apr 2002; Seemant Kulleen <seemant@gentoo.org> netleds_applet-0.9.1-r2.ebuild files/digest-netleds_applet-0.9.1-r2 :
+
+  fixed sandbox violation error for a config file going into /etc/CORBA/servers.
 
 *netleds_applet-0.9.1-r1 (1 Feb 2002)
 
diff --git a/net-analyzer/netleds_applet/Manifest b/net-analyzer/netleds_applet/Manifest
index e69de29bb2d1..0fc19dc10202 100644
--- a/net-analyzer/netleds_applet/Manifest
+++ b/net-analyzer/netleds_applet/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5c9f705e04f61ff987e188d4247f67f9 netleds_applet-0.9.1-r3.ebuild 651
+MD5 ae5bd10c8ee1d4bf77bb381f73d5be9f ChangeLog 1441
+MD5 3cfc13a7a9985c6ba9c6503165923627 metadata.xml 244
+MD5 6a0a0e53bb0cd7a92ed1652efd834cad files/digest-netleds_applet-0.9.1-r3 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRB5comPajV0RnrERAi4jAJ0cXXbGL0uxrGfQjhEJP2F/A2CiKQCfZ3zx
+mFrqxYdjsv5MtWhH5DNBCnQ=
+=OW/1
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netleds_applet/netleds_applet-0.9.1-r3.ebuild b/net-analyzer/netleds_applet/netleds_applet-0.9.1-r3.ebuild
index dea747a0a690..5738f1ddb6e2 100644
--- a/net-analyzer/netleds_applet/netleds_applet-0.9.1-r3.ebuild
+++ b/net-analyzer/netleds_applet/netleds_applet-0.9.1-r3.ebuild
@@ -1,28 +1,30 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netleds_applet/netleds_applet-0.9.1-r3.ebuild,v 1.1 2002/06/17 06:19:42 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netleds_applet/netleds_applet-0.9.1-r3.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
 
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Gnome applet that displays leds from network load"
 SRC_URI="http://netleds.port5.com/${P}.tar.gz"
 HOMEPAGE="http://netleds.port5.com/"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86 sparc "
+IUSE=""
 
 DEPEND=">=gnome-base/gnome-core-1.4.0.4-r1
-	>=gnome-base/libgtop-1.0.12-r1"
+	=gnome-base/libgtop-1*"
 
 src_compile() {
-	
+
 	econf || die
 	emake || die
 }
 
 src_install() {
-	
+
 	einstall || die
-	
+
 	dodoc AUTHORS COPYING ChangeLog NEWS README TODO
 }
diff --git a/net-analyzer/netperf/ChangeLog b/net-analyzer/netperf/ChangeLog
index 857009ae47ce..aa5675be8aca 100644
--- a/net-analyzer/netperf/ChangeLog
+++ b/net-analyzer/netperf/ChangeLog
@@ -1,7 +1,92 @@
 # ChangeLog for net-analyzer/netperf
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/ChangeLog,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
+*netperf-2.4.0 (30 May 2005)
+
+  30 May 2005; Benjamin Smee <strerror@gentoo.org> +netperf-2.4.0.ebuild:
+  Version bump for bug 94517
+
+  19 Apr 2005; Aron Griffis <agriffis@gentoo.org> netperf-2.4.0_rc2.ebuild,
+  netperf-2.4.0_rc3.ebuild:
+  Remove bogus sed dep and non-functional use_enable ipv6. The 2.4.x stream
+  does ipv6 detection and doesn't supply an option to explicitly
+  enable/disable it
+
+*netperf-2.4.0_rc3 (19 Apr 2005)
+
+  19 Apr 2005; Aron Griffis <agriffis@gentoo.org> +netperf-2.4.0_rc3.ebuild:
+  Update to 2.4.0_rc3
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> netperf-2.3.ebuild:
+  Stable on ppc64
+
+*netperf-2.4.0_rc2 (05 Apr 2005)
+
+  05 Apr 2005; Aron Griffis <agriffis@gentoo.org> netperf-2.3.ebuild,
+  +netperf-2.4.0_rc2.ebuild:
+  Version bump, plus mark 2.3 stable on amd64
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> netperf-2.3.ebuild:
+  stable on ia64
+
+  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> netperf-2.3.ebuild:
+  Stable on alpha.
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> netperf-2.3.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> netperf-2.3.ebuild:
+  Marked stable on x86.
+
+*netperf-2.3 (03 Jan 2005)
+
+  03 Jan 2005; Martin Holzer <mholzer@gentoo.org> +netperf-2.3.ebuild:
+  Version bumped. Closes 75198
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> netperf-2.2.4.ebuild:
+  Added to ~ppc.
+
+  26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> netperf-2.2.4.ebuild:
+  fix use invocation
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
+  Fixed Manifest.
+
+  23 Jul 2004; Hasan Khalil <gongloo@gentoo.org> netperf-2.2.4.ebuild:
+  Stable on macos.
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> netperf-2.2.4.ebuild:
+  stable on ppc64, bug #55547
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  netperf-2.2.4.ebuild, netperf-2.2.ebuild:
+  change virtual/glibc to virtual/libc, add metadata.xml
+
+  21 Apr 2004; Aron Griffis <agriffis@gentoo.org> netperf-2.2.4.ebuild:
+  Stable on amd64
+
+  11 Mar 2004; Jason Wever <weeve@gentoo.org> netperf-2.2.4.ebuild:
+  Marked stable on sparc.
+
+  10 Mar 2004; Aron Griffis <agriffis@gentoo.org> netperf-2.2.4.ebuild:
+  stable on alpha, ia64 and x86
+
+  04 Feb 2004; Aron Griffis <agriffis@gentoo.org> netperf-2.2.4.ebuild:
+  Fix NETHOME in the example scripts to point to /usr/bin
+
+*netperf-2.2.4 (28 Jan 2004)
+
+  28 Jan 2004; <agriffis@gentoo.org> netperf-2.2.4.ebuild,
+  files/netperf-2.2-conf, files/netperf-2.2-init:
+  update to netperf-2.2pl4 for bug 19463. Thanks to Jyrki Muukkonen for some
+  good ideas in this ebuild
+
+  27 Jan 2004; <agriffis@gentoo.org> netperf-2.2.ebuild:
+  stable on alpha and ia64
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *netperf-2.2 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-analyzer/netperf/Manifest b/net-analyzer/netperf/Manifest
index e69de29bb2d1..92ace1fd3862 100644
--- a/net-analyzer/netperf/Manifest
+++ b/net-analyzer/netperf/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53719c1581da93658fec00eabf8b0427 ChangeLog 3412
+MD5 787949efbc227966fa6a5609799cbf97 files/digest-netperf-2.2.4 66
+MD5 201084fb8da044398f8a0459f1e7c4b5 files/digest-netperf-2.3 63
+MD5 1ee55df152ab363e932c73e6155604b1 files/digest-netperf-2.4.0 66
+MD5 5b8fcf5721bc37329f6af346c347f2ba files/digest-netperf-2.4.0_rc2 70
+MD5 9c2b856854f3542c3e0a3595d4fb59ca files/digest-netperf-2.4.0_rc3 70
+MD5 f7a086a9cdee9e3d6ed0e8976b678dbf files/netperf-2.2-conf 103
+MD5 35791611e593b4e8cefdfd56031e759d files/netperf-2.2-init 434
+MD5 5b39a4d1bbad0a785afc512f8a35e87d files/netperf-2.2alpha.diff 686
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 8cff92ac02087bc24cdebec08eb62a3a netperf-2.2.4.ebuild 1353
+MD5 6d14aac9d803bf952c9a70094e39495c netperf-2.3.ebuild 1351
+MD5 906e80bd9cf0afb06622cd91dd59d9f8 netperf-2.4.0.ebuild 1246
+MD5 ab7b8d7bbb3c51fce8949fe3cfb2d6a4 netperf-2.4.0_rc2.ebuild 1273
+MD5 4ef631e53d11899c995f7a35094d956f netperf-2.4.0_rc3.ebuild 1273
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC2WNAI1lqEGTUzyQRAjT2AJ0cmggXHqQt8aUZZC53i4uK9h7Z+wCgmKcC
+s7Mh5gnb00p97XC6jE2fwkM=
+=vXaC
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netperf/netperf-2.2.4.ebuild b/net-analyzer/netperf/netperf-2.2.4.ebuild
index c4b49eab7247..ed2fc2e1a32c 100644
--- a/net-analyzer/netperf/netperf-2.2.4.ebuild
+++ b/net-analyzer/netperf/netperf-2.2.4.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/net-analyzer/netperf/netperf-2.2.4.ebuild,v 1.1 2004/01/29 01:37:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -16,16 +16,17 @@ SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ia64 ~alpha"
+KEYWORDS="x86 sparc ia64 alpha amd64 ppc64 ~ppc ppc-macos"
 
 IUSE="ipv6"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc >=sys-apps/sed-4"
 
 src_compile() {
-	append-flags -DDO_UNIX
+	use ppc-macos || append-flags -DDO_UNIX
 	use ipv6 && append-flags -DDO_IPV6
 	emake CFLAGS="${CFLAGS}" || die
+	sed -i 's:^\(NETHOME=\).*:\1/usr/bin:' *_script
 }
 
 src_install () {
@@ -34,8 +35,8 @@ src_install () {
 	dobin netperf
 
 	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+	newinitd ${FILESDIR}/${PN}-2.2-init netperf
+	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
 
 	# man pages
 	newman netserver.man netserver.1
@@ -43,6 +44,6 @@ src_install () {
 
 	# documentation and example scripts
 	dodoc ACKNWLDGMNTS COPYRIGHT README Release_Notes netperf.ps
-	mkdir ${D}/usr/share/doc/${PF}/examples
+	dodir /usr/share/doc/${PF}/examples
 	cp *_script ${D}/usr/share/doc/${PF}/examples
 }
diff --git a/net-analyzer/netperf/netperf-2.3.ebuild b/net-analyzer/netperf/netperf-2.3.ebuild
index c8243df7b12a..f2d48b73e829 100644
--- a/net-analyzer/netperf/netperf-2.3.ebuild
+++ b/net-analyzer/netperf/netperf-2.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/net-analyzer/netperf/netperf-2.3.ebuild,v 1.1 2005/01/03 10:35:50 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.3.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -16,14 +16,14 @@ SRC_URI="ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/${MY_P}.tar.gz"
 HOMEPAGE="http://www.netperf.org/"
 LICENSE="netperf"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
+KEYWORDS="x86 sparc ia64 alpha amd64 ppc64 ~ppc ~ppc-macos"
 
 IUSE="ipv6"
 
 DEPEND="virtual/libc >=sys-apps/sed-4"
 
 src_compile() {
-	( use macos || use ppc-macos ) || append-flags -DDO_UNIX
+	use ppc-macos || append-flags -DDO_UNIX
 	use ipv6 && append-flags -DDO_IPV6
 	emake CFLAGS="${CFLAGS}" || die
 	sed -i 's:^\(NETHOME=\).*:\1/usr/bin:' *_script
@@ -35,8 +35,8 @@ src_install () {
 	dobin netperf
 
 	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+	newinitd ${FILESDIR}/${PN}-2.2-init netperf
+	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
 
 	# man pages
 	newman netserver.man netserver.1
@@ -44,6 +44,6 @@ src_install () {
 
 	# documentation and example scripts
 	dodoc ACKNWLDGMNTS COPYRIGHT README Release_Notes netperf.ps
-	mkdir ${D}/usr/share/doc/${PF}/examples
+	dodir /usr/share/doc/${PF}/examples
 	cp *_script ${D}/usr/share/doc/${PF}/examples
 }
diff --git a/net-analyzer/netperf/netperf-2.4.0.ebuild b/net-analyzer/netperf/netperf-2.4.0.ebuild
index b0d6894e1bfb..7c972dfc3539 100644
--- a/net-analyzer/netperf/netperf-2.4.0.ebuild
+++ b/net-analyzer/netperf/netperf-2.4.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/net-analyzer/netperf/netperf-2.4.0.ebuild,v 1.1 2005/05/30 17:02:54 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -20,11 +20,6 @@ KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
 
 IUSE=""
 
-src_compile() {
-	econf || die
-	emake || die
-}
-
 src_install () {
 	einstall || die
 
@@ -34,11 +29,11 @@ src_install () {
 	mv ${D}/usr/{bin,sbin}/netserver || die
 
 	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+	newinitd ${FILESDIR}/${PN}-2.2-init netperf
+	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
 
 	# documentation and example scripts
 	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	mkdir ${D}/usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}//usr/share/doc/${PF}/examples
+	dodir /usr/share/doc/${PF}/examples
+	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
 }
diff --git a/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild b/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild
index f7fce8cf15d3..9c05588cc471 100644
--- a/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild
+++ b/net-analyzer/netperf/netperf-2.4.0_rc2.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/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild,v 1.1 2005/04/05 20:19:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0_rc2.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -18,14 +18,9 @@ LICENSE="netperf"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
 
-IUSE="ipv6"
+IUSE=""
 
-DEPEND="virtual/libc >=sys-apps/sed-4"
-
-src_compile() {
-	econf $(use_enable ipv6) || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install () {
 	einstall || die
@@ -36,11 +31,11 @@ src_install () {
 	mv ${D}/usr/{bin,sbin}/netserver || die
 
 	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+	newinitd ${FILESDIR}/${PN}-2.2-init netperf
+	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
 
 	# documentation and example scripts
 	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	mkdir ${D}/usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}//usr/share/doc/${PF}/examples
+	dodir /usr/share/doc/${PF}/examples
+	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
 }
diff --git a/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild b/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild
index bc722af3f65e..f3de9fdbc51a 100644
--- a/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild
+++ b/net-analyzer/netperf/netperf-2.4.0_rc3.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/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild,v 1.1 2005/04/19 21:24:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netperf/netperf-2.4.0_rc3.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -18,14 +18,9 @@ LICENSE="netperf"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ia64 ~alpha ~amd64 ~ppc64 ~ppc ~ppc-macos"
 
-IUSE="ipv6"
+IUSE=""
 
-DEPEND="virtual/libc >=sys-apps/sed-4"
-
-src_compile() {
-	econf $(use_enable ipv6) || die
-	emake || die
-}
+DEPEND="virtual/libc"
 
 src_install () {
 	einstall || die
@@ -36,11 +31,11 @@ src_install () {
 	mv ${D}/usr/{bin,sbin}/netserver || die
 
 	# init.d / conf.d
-	exeinto /etc/init.d ; newexe ${FILESDIR}/${PN}-2.2-init netperf
-	insinto /etc/conf.d ; newins ${FILESDIR}/${PN}-2.2-conf netperf
+	newinitd ${FILESDIR}/${PN}-2.2-init netperf
+	newconfd ${FILESDIR}/${PN}-2.2-conf netperf
 
 	# documentation and example scripts
 	dodoc AUTHORS ChangeLog COPYING NEWS README Release_Notes doc/netperf.pdf
-	mkdir ${D}/usr/share/doc/${PF}/examples
-	mv ${D}/usr/bin/*_script ${D}//usr/share/doc/${PF}/examples
+	dodir /usr/share/doc/${PF}/examples
+	mv ${D}/usr/bin/*_script ${D}/usr/share/doc/${PF}/examples
 }
diff --git a/net-analyzer/netselect/ChangeLog b/net-analyzer/netselect/ChangeLog
index 352557c91725..f19a1b4e1e84 100644
--- a/net-analyzer/netselect/ChangeLog
+++ b/net-analyzer/netselect/ChangeLog
@@ -1,9 +1,78 @@
 # ChangeLog for net-analyzer/netselect
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.1 2002/07/11 16:33:32 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+  09 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> netselect-0.3-r1.ebuild:
+  Stable on mips.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> netselect-0.3-r1.ebuild:
+  Stable on ppc64
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
+  netselect-0.3-r1.ebuild:
+  Stable on ppc.
+
+  09 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> netselect-0.3-r1.ebuild:
+  Unstable ppc-macos
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> netselect-0.3-r1.ebuild:
+  Fix to use bind-now for suid binaries. Using dobin instead of make install.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> netselect-0.3-r1.ebuild:
+  Stable on amd64.
+
+  13 Sep 2004; Guy Martin <gmsoft@gentoo.org> netselect-0.3-r1.ebuild:
+  Stable on hppa.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> netselect-0.3-r1.ebuild:
+  Stable on alpha.
+
+  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> netselect-0.3-r1.ebuild:
+  Stable on sparc
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> netselect-0.3-r1.ebuild:
+  x86 stable
+
+  01 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  netselect-0.3-r1.ebuild:
+  IUSE; sed in src_unpack (bug #55755); use emake; error check; tidy
+
+*netselect-0.3-r1 (01 Jul 2004)
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  +netselect-0.3-r1.ebuild:
+  suid: fixed permissions to 4710, group is set to root:wheel,
+  closes #47209, Thanks to Philipp Kern <phil@lordaeron.in-berlin.de>.
+  sed cleanup, added metadata.
+
+  13 May 2004; Michael McCabe <randy@gentoo.org> netselect-0.3.ebuild:
+  Added s390 keywords
+
+  25 Mar 2004; Joshua Kinard <kumba@gentoo.org> netselect-0.3.ebuild:
+  Marked stable on mips.
+
+  07 Mar 2004; Tom Gall <tgall@gentoo.org> netselect-0.3.ebuild:
+  stable on ppc64
+
+  01 Mar 2004; <agriffis@gentoo.org> netselect-0.3.ebuild:
+  stable on ia64
 
 *netselect-0.3 (11 Jul 2002)
 
+  13 May 2003; Joshua Kinard <kumba@gentoo.org> netselect-0.3.ebuild:
+  Added ~mips to KEYWORDS; Corrected ChangeLog errors a wee little.
+
+  02 Mar 2003; Guy Martin <gmsoft@gentoo.org> netselect-0.3.ebuild :
+  Added hppa to KEYWORDS.
+
+  27 Feb 2003; Will Woods <wwoods@gentoo.org> netselect-0.3.ebuild:
+  Added alpha to KEYWORDS
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
   11 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> netselect-0.3.ebuild :
 
   New package.
diff --git a/net-analyzer/netselect/Manifest b/net-analyzer/netselect/Manifest
index 82de71f86a1c..66724bfec5bd 100644
--- a/net-analyzer/netselect/Manifest
+++ b/net-analyzer/netselect/Manifest
@@ -1,3 +1,16 @@
-MD5 356e80aba920a7226b0e960cc5ce7b87 ChangeLog 822
-MD5 2503153d4521fd62a81a89bbf3671425 netselect-0.3.ebuild 803
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4a519c8440c3016ab875b1e47ad33e2 metadata.xml 227
+MD5 22d39b73d1eb81e4e9d2092b639368e0 netselect-0.3-r1.ebuild 1169
+MD5 b54367da063056de6caffbe71b10926c ChangeLog 2706
+MD5 ed9af38651ff81fcae36bbdd710f83de netselect-0.3.ebuild 772
 MD5 7396c62cc3e5735019287ae62229dd48 files/digest-netselect-0.3 64
+MD5 7396c62cc3e5735019287ae62229dd48 files/digest-netselect-0.3-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGfpTgIKl8Uu19MoRAqlNAJ9j60t1FHZEdiYHyysJEelaUG/PHwCbB0mb
+CIgiOWVGkZ7oJ+XU6mo9qWw=
+=4xzW
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netselect/netselect-0.3-r1.ebuild b/net-analyzer/netselect/netselect-0.3-r1.ebuild
index d4bd28e22eda..e73d9577e9cb 100644
--- a/net-analyzer/netselect/netselect-0.3-r1.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-r1.ebuild
@@ -1,31 +1,41 @@
-# 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/net-analyzer/netselect/netselect-0.3-r1.ebuild,v 1.1 2004/06/30 23:12:31 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+inherit flag-o-matic
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Ultrafast implementation of ping."
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/netselect/"
 SRC_URI="http://www.worldvisions.ca/~apenwarr/netselect/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64 ~s390"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ~ppc-macos ppc64 s390 sh sparc x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
 
 src_compile() {
-	mv Makefile Makefile.orig
-	sed -e "s:PREFIX =.*:PREFIX = ${D}usr:" \
+	use ppc-macos || append-ldflags "-Wl,-z,now"
+
+	sed -i \
+		-e "s:PREFIX =.*:PREFIX = ${D}usr:" \
 		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. -g ${CFLAGS}:" \
+		-e "s:LDFLAGS =.*:LDFLAGS = -g ${LDFLAGS}:" \
 		-e '23,27d' \
 		-e '34d' \
-		-i Makefile
+		Makefile \
+		|| die "sed Makefile failed"
+	if use ppc-macos; then
+		sed -i -e "s:<endian.h>:<machine/endian.h>:" netselect.c || die "sed Makefile failed"
+	fi
 
-	make || die
+	emake || die "emake failed"
 }
 
 src_install () {
-	make install || die
+	dobin netselect || die "dobin failed"
 	fowners root:wheel /usr/bin/netselect
 	fperms 4710 /usr/bin/netselect
-
 	dodoc ChangeLog HISTORY README*
 }
diff --git a/net-analyzer/netselect/netselect-0.3.ebuild b/net-analyzer/netselect/netselect-0.3.ebuild
index 906c3351e4b4..201029097ff0 100644
--- a/net-analyzer/netselect/netselect-0.3.ebuild
+++ b/net-analyzer/netselect/netselect-0.3.ebuild
@@ -1,32 +1,29 @@
-# 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/net-analyzer/netselect/netselect-0.3.ebuild,v 1.1 2002/07/11 16:32:05 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netselect/netselect-0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 DESCRIPTION="Ultrafast implementation of ping."
 HOMEPAGE="http://www.worldvisions.ca/~apenwarr/netselect/"
 SRC_URI="http://www.worldvisions.ca/~apenwarr/netselect/${P}.tar.gz"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86"
-
-newdepend /c
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+IUSE=""
 
 S=${WORKDIR}/${PN}
 
 src_compile() {
-	mv Makefile Makefile.orig
-	sed -e "s:PREFIX =.*:PREFIX = ${D}usr:" \
+	sed -i \
+		-e "s:PREFIX =.*:PREFIX = ${D}usr:" \
 		-e "s:CFLAGS =.*:CFLAGS = -Wall -I. -g ${CFLAGS}:" \
 		-e '23,27d' \
 		-e '34d' \
-		Makefile.orig > Makefile
-	rm Makefile.orig
-
+		Makefile
 	make || die
 }
 
-src_install () {
+src_install() {
 	make install || die
-	
 	dodoc ChangeLog HISTORY README*
 }
diff --git a/net-analyzer/netspeed_applet/ChangeLog b/net-analyzer/netspeed_applet/ChangeLog
index 02b4d606bb2d..6c9ffe75216b 100644
--- a/net-analyzer/netspeed_applet/ChangeLog
+++ b/net-analyzer/netspeed_applet/ChangeLog
@@ -1,6 +1,94 @@
 # ChangeLog for net-analyzer/netspeed_applet
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/ChangeLog,v 1.1 2002/07/13 16:12:21 stroke Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  netspeed_applet-0.12.1.ebuild:
+  Stable on ppc.
+
+  01 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  netspeed_applet-0.12.1.ebuild:
+  Stable on sparc
+
+*netspeed_applet-0.13 (01 Aug 2005)
+
+  01 Aug 2005; Marinus Schraal <foser@gentoo.org> :
+  New release
+
+*netspeed_applet-0.12.1 (02 May 2005)
+
+  02 May 2005; John N. Laliberte <allanonjl@gentoo.org> metadata.xml,
+  +netspeed_applet-0.12.1.ebuild:
+  version bump, fixes bug #91087
+
+*netspeed_applet-0.11 (11 Mar 2005)
+
+  11 Mar 2005; foser <foser@gentoo.org> netspeed_applet-0.11.ebuild :
+  New release (#82146)
+  USEify gtop dep 
+
+  25 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  netspeed_applet-0.10.ebuild:
+  Stable on sparc
+
+*netspeed_applet-0.10 (10 Aug 2004)
+
+  10 Aug 2004; foser <foser@gentoo.org> netspeed_applet-0.10.ebuild :
+  New release, by request in #59630
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  netspeed_applet-0.9.2.ebuild:
+  Stable on sparc
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> netspeed_applet-0.8.ebuild:
+  Tidy
+
+  05 Jul 2004; Chris Gianelloni <wolf31o2@gentoo.org>
+  netspeed_applet-0.9.2.ebuild:
+  Added amd64 KEYWORD.
+
+  21 May 2004; foser <foser@gentoo.org> netspeed_applet-0.{8,9.2}.ebuild :
+  Fix libgtop deps for the new release (#50427)
+
+*netspeed_applet-0.9.2 (06 Apr 2004)
+
+  06 Apr 2004; foser <foser@gentoo.org> netspeed_applet-0.9.2.ebuild :
+  Dep fix
+
+  06 Apr 2004; Brad Laue <brad@gentoo.org> netspeed_applet-0.9.2.ebuild:
+  Version bump, fixing SRC_URI and ensuring compatibility with GNOME 2.6.
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> netspeed_applet-0.8.ebuild:
+  Marked stable on sparc.
+
+*netspeed_applet-0.9 (29 Jun 2003)
+
+  29 Jun 2003; foser <foser@gentoo.org> netspeed_applet-0.9.ebuild :
+  Make use of gnome2 eclass, fix (R)DEPEND
+
+*netspeed_applet-0.8 (30 Jan 2003)
+
+  30 Jan 2003; foser <foser@gentoo.org> netspeed_applet-0.8.ebuild :
+  New version
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*netspeed_applet-0.7 (28 Nov 2002)
+
+  28 Nov 2002; foser <foser@gentoo.org> netspeed_applet-0.7.ebuild :
+  New version
+
+*netspeed_applet-0.5 (24 Oct 2002)
+
+  24 Oct 2002; foser <foser@gentoo.org> netspeed_applet-0.5.ebuild :
+
+  New version. Fixed deps
+
+*netspeed_applet-0.3 (28 Jul 2002)
+
+  28 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> netspeed_applet-0.3.ebuild:
+
+  New version
 
 *netspeed_applet-0.2 (13 Jul 2002)
 
diff --git a/net-analyzer/netspeed_applet/Manifest b/net-analyzer/netspeed_applet/Manifest
index e69de29bb2d1..37694cd49eed 100644
--- a/net-analyzer/netspeed_applet/Manifest
+++ b/net-analyzer/netspeed_applet/Manifest
@@ -0,0 +1,12 @@
+MD5 a36f21bdc65865f0fd99cd9d43c16986 netspeed_applet-0.11.ebuild 775
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+MD5 ccba446a373d3d97cfc92e6842c35e4a ChangeLog 2789
+MD5 2ce736b2ea31988da4bcecef9f7d39d9 netspeed_applet-0.9.2.ebuild 714
+MD5 b61a6b86c62455e32cb91bf8019a830c netspeed_applet-0.13.ebuild 715
+MD5 9f192d53ba8f3c18aa3e8f86b9e0c03f netspeed_applet-0.10.ebuild 709
+MD5 421728f7db7016bc12b5fae1d77dac5f netspeed_applet-0.12.1.ebuild 775
+MD5 2d171fd40348069e9311d40876e07526 files/digest-netspeed_applet-0.11 72
+MD5 bd43d6190e39ca45432c83350cea73e7 files/digest-netspeed_applet-0.10 72
+MD5 dd886cb9c0213665d512d519348dd1b6 files/digest-netspeed_applet-0.12.1 74
+MD5 ccc684c018f6a25d8d36acbf938dad6c files/digest-netspeed_applet-0.13 72
+MD5 2019d20d5416ebfdfd84388672c10f6a files/digest-netspeed_applet-0.9.2 73
diff --git a/net-analyzer/netspeed_applet/metadata.xml b/net-analyzer/netspeed_applet/metadata.xml
index da6fd63d0085..6ffa481fda37 100644
--- a/net-analyzer/netspeed_applet/metadata.xml
+++ b/net-analyzer/netspeed_applet/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<maintainer>
+	<email>allanonjl@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/netspeed_applet/netspeed_applet-0.10.ebuild b/net-analyzer/netspeed_applet/netspeed_applet-0.10.ebuild
index 059250b77376..63794dd56489 100644
--- a/net-analyzer/netspeed_applet/netspeed_applet-0.10.ebuild
+++ b/net-analyzer/netspeed_applet/netspeed_applet-0.10.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/net-analyzer/netspeed_applet/netspeed_applet-0.10.ebuild,v 1.1 2004/08/10 10:35:16 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/netspeed_applet-0.10.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc ~amd64"
 
 RDEPEND=">=gnome-base/libgnomeui-2
 	>=gnome-base/libgtop-2.5
diff --git a/net-analyzer/netspeed_applet/netspeed_applet-0.11.ebuild b/net-analyzer/netspeed_applet/netspeed_applet-0.11.ebuild
index dcba2cb0949c..7fbd703ad352 100644
--- a/net-analyzer/netspeed_applet/netspeed_applet-0.11.ebuild
+++ b/net-analyzer/netspeed_applet/netspeed_applet-0.11.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/net-analyzer/netspeed_applet/netspeed_applet-0.11.ebuild,v 1.1 2005/03/10 23:59:34 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/netspeed_applet-0.11.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-analyzer/netspeed_applet/netspeed_applet-0.12.1.ebuild b/net-analyzer/netspeed_applet/netspeed_applet-0.12.1.ebuild
index 0b1d79dffe6f..a973da4fdb9c 100644
--- a/net-analyzer/netspeed_applet/netspeed_applet-0.12.1.ebuild
+++ b/net-analyzer/netspeed_applet/netspeed_applet-0.12.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/net-analyzer/netspeed_applet/netspeed_applet-0.12.1.ebuild,v 1.1 2005/05/02 00:55:52 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/netspeed_applet-0.12.1.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/${P}.tar.gz"
 SLOT="0"
 IUSE="gnome"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ppc sparc x86"
 
 RDEPEND=">=gnome-base/libgnomeui-2
 	>=gnome-base/gnome-panel-2
diff --git a/net-analyzer/netspeed_applet/netspeed_applet-0.13.ebuild b/net-analyzer/netspeed_applet/netspeed_applet-0.13.ebuild
index 31a63be556ad..f3b63c0a666d 100644
--- a/net-analyzer/netspeed_applet/netspeed_applet-0.13.ebuild
+++ b/net-analyzer/netspeed_applet/netspeed_applet-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/net-analyzer/netspeed_applet/netspeed_applet-0.13.ebuild,v 1.1 2005/08/01 12:03:41 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/netspeed_applet-0.13.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit gnome2
 
diff --git a/net-analyzer/netspeed_applet/netspeed_applet-0.9.2.ebuild b/net-analyzer/netspeed_applet/netspeed_applet-0.9.2.ebuild
index 6b1f493f2d95..71fe2a769459 100644
--- a/net-analyzer/netspeed_applet/netspeed_applet-0.9.2.ebuild
+++ b/net-analyzer/netspeed_applet/netspeed_applet-0.9.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/net-analyzer/netspeed_applet/netspeed_applet-0.9.2.ebuild,v 1.1 2004/04/06 07:38:22 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netspeed_applet/netspeed_applet-0.9.2.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 inherit gnome2
 
@@ -11,13 +11,14 @@ SRC_URI="http://www.wh-hms.uni-ulm.de/~mfcn/shared/netspeed/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc sparc ~amd64"
 
 RDEPEND=">=gnome-base/libgnomeui-2
-	>=gnome-base/libgtop-2
+	>=gnome-base/libgtop-2.5
 	>=gnome-base/gnome-panel-2"
 
 DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.21"
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.29"
 
 DOCS="README NEWS ChangeLog COPYING AUTHORS INSTALL"
diff --git a/net-analyzer/nettop/ChangeLog b/net-analyzer/nettop/ChangeLog
index cb3bdfe78ad1..546a39242f88 100644
--- a/net-analyzer/nettop/ChangeLog
+++ b/net-analyzer/nettop/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for net-analyzer/nettop
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.1 2003/09/14 17:58:16 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/ChangeLog,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+  10 May 2005; Andrej Kacian <ticho@gentoo.org> nettop-0.2.3.ebuild:
+  Added ~amd64 keyword. Closes #92114, reported by Chris Chance
+  <cchance@gmail.com>.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> nettop-0.2.3.ebuild:
+  Stable on ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> nettop-0.2.3.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> +files/nettop.c.patch,
+  nettop-0.2.3.ebuild:
+  Added patch to fix 'label at end of compound statement' compile error. Thanks
+  to Peter Gantner <peter.gantner@stud.uni-graz.at>. Closes #72066.
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> nettop-0.2.3.ebuild:
+  die if emake fails.
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> nettop-0.2.3.ebuild:
+  Stable on sparc.
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> nettop-0.2.3.ebuild:
+  Added to ~ppc.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  nettop-0.2.3.ebuild:
+  Tidy
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> nettop-0.2.3.ebuild:
+  Added ~sparc keyword.
 
 *nettop-0.2.3 (14 Sep 2003)
 
diff --git a/net-analyzer/nettop/Manifest b/net-analyzer/nettop/Manifest
index 2067d17affad..898dc02c5ef2 100644
--- a/net-analyzer/nettop/Manifest
+++ b/net-analyzer/nettop/Manifest
@@ -1,2 +1,15 @@
-MD5 13e5fe2e267e661acdbeced659a6ef0a nettop-0.2.3.ebuild 641
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 730ea3d08b04cd7a9f8c411b10d599cf nettop-0.2.3.ebuild 702
+MD5 f1ed7a9dcc0b0ca2407cebd73457b6d7 ChangeLog 1443
+MD5 59fafa99faf187e744c602a625052f65 metadata.xml 232
+MD5 523f340b61566f16b1a8fcb9343e0f6e files/nettop.c.patch 182
 MD5 d1dfb4623376711f1542dc52dcb85a7c files/digest-nettop-0.2.3 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCgNvBQlM6RnzZP+IRAioGAJ41VmWJss8gZhEu01+ZNi4zeXKE6wCfUd2z
+qtP384B6o8d7lZ7qk8L7u1k=
+=NYaJ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nettop/nettop-0.2.3.ebuild b/net-analyzer/nettop/nettop-0.2.3.ebuild
index 4b0e110562c5..faa1b7ebed5c 100644
--- a/net-analyzer/nettop/nettop-0.2.3.ebuild
+++ b/net-analyzer/nettop/nettop-0.2.3.ebuild
@@ -1,30 +1,33 @@
-# 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/net-analyzer/nettop/nettop-0.2.3.ebuild,v 1.1 2003/09/14 17:58:16 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nettop/nettop-0.2.3.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+inherit eutils
 
 IUSE=""
 
-S=${WORKDIR}/${P}
 DESCRIPTION="top like program for network activity"
 SRC_URI="http://srparish.net/scripts/${P}.tar.gz"
 HOMEPAGE="http://srparish.net/software/"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="x86"
+KEYWORDS="x86 sparc ppc ~amd64"
 
 DEPEND="sys-libs/slang
-	    net-libs/libpcap"
+	    virtual/libpcap"
 
 
 src_compile() {
+	epatch ${FILESDIR}/nettop.c.patch
+
 	local myconf
 	myconf="--prefix=/usr"
 	./configure ${myconf} || die
-	emake
+	emake || die
 }
 
 src_install() {
-	dosbin nettop
+	dosbin nettop || die
 	dodoc ChangeLog README THANKS
 }
diff --git a/net-analyzer/netwag/ChangeLog b/net-analyzer/netwag/ChangeLog
index 596e9a4d39a8..ba4f045dbe2c 100644
--- a/net-analyzer/netwag/ChangeLog
+++ b/net-analyzer/netwag/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-analyzer/netwag
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwag/ChangeLog,v 1.1 2005/01/13 06:16:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwag/ChangeLog,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> -netwag-5.29.0.ebuild,
+  -netwag-5.30.0.ebuild, +netwag-5.31.0.ebuild:
+  version bump - old version removal
+
+*netwag-5.31.0 (15 Oct 2005)
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> -netwag-5.29.0.ebuild,
+  -netwag-5.30.0.ebuild, +netwag-5.31.0.ebuild:
+  version bump and old version cleanout
+
+  09 Oct 2005; <mkay@gentoo.org> netwag-5.28.0.ebuild, netwag-5.29.0.ebuild,
+  netwag-5.30.0.ebuild:
+  dev-lang/tk moved from RDEPEND to DEPEND and dev-lang/tcl reomoved from
+  dependencies (tk depends on it anyway). closing bug #108114
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> netwag-5.30.0.ebuild:
+  Added to ~ppc.
+
+*netwag-5.30.0 (17 Jun 2005)
+
+  17 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +netwag-5.30.0.ebuild:
+  Version bump.
+
+  01 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> netwag-5.29.0.ebuild:
+  Added NOTE in ebuild header about netwib, netwox and netwag.
+
+*netwag-5.29.0 (30 Mar 2005)
+
+  30 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +netwag-5.29.0.ebuild:
+  Version bump for bug 87208.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> netwag-5.28.0.ebuild:
+  Marked stable on x86.
+
+  13 Jan 2005; Sven Wegener <swegener@gentoo.org> :
+  Added missing digest entries.
 
 *netwag-5.28.0 (13 Jan 2005)
 
diff --git a/net-analyzer/netwag/Manifest b/net-analyzer/netwag/Manifest
index d21b565f6d07..05acb7a0370a 100644
--- a/net-analyzer/netwag/Manifest
+++ b/net-analyzer/netwag/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 99e96a03974561a78ac097b008b1fcbe ChangeLog 1611
+MD5 fdee7b0ef5b8e0680cad1e4cf8422931 files/digest-netwag-5.28.0 65
+MD5 b204ff9facfd28dee8e9ece0ef751dc2 files/digest-netwag-5.31.0 135
 MD5 595b8dd3c2b25d617085a633221eecf1 metadata.xml 257
-MD5 ec6b4c3a0815a7de64f2201455752f1b netwag-5.28.0.ebuild 1004
-MD5 f867ca067888b6b737b9effda24ecd65 ChangeLog 261
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-netwag-5.28.0 0
+MD5 efd614677cf66096944b965670ecf278 netwag-5.28.0.ebuild 940
+MD5 5fcd6d4c69de865817be8ae1078ee594 netwag-5.31.0.ebuild 1286
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDUI4gmdTrptrqvGERAsmCAJ92BqkEDhLVb7uOOpd8o66Q/evqLACfZfl6
+LMNsXHs2AoKGldHTIo8x6p4=
+=6VVm
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netwag/files/digest-netwag-5.28.0 b/net-analyzer/netwag/files/digest-netwag-5.28.0
index e69de29bb2d1..93e2216f88f1 100644
--- a/net-analyzer/netwag/files/digest-netwag-5.28.0
+++ b/net-analyzer/netwag/files/digest-netwag-5.28.0
@@ -0,0 +1 @@
+MD5 fe5bf3b6ef6f8c47f72a748c37588f5e netwag-5.28.0-src.tgz 73865
diff --git a/net-analyzer/netwag/netwag-5.28.0.ebuild b/net-analyzer/netwag/netwag-5.28.0.ebuild
index fd9a441a5800..0bc6e48badfd 100644
--- a/net-analyzer/netwag/netwag-5.28.0.ebuild
+++ b/net-analyzer/netwag/netwag-5.28.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/net-analyzer/netwag/netwag-5.28.0.ebuild,v 1.1 2005/01/13 06:16:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwag/netwag-5.28.0.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 DESCRIPTION="Tcl/tk interface to netwox (Toolbox of 212 utilities for testing Ethernet/IP networks)"
 HOMEPAGE="http://www.laurentconstantin.com/en/netw/netwag/"
@@ -8,14 +8,11 @@ SRC_URI="http://www.laurentconstantin.com/common/netw/${PN}/download/v${PV/.*}/$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND="~net-analyzer/netwox-${PV}"
-
-RDEPEND="~net-analyzer/netwox-${PV}
-	>=dev-lang/tk-8
-	>=dev-lang/tcl-8"
+DEPEND="~net-analyzer/netwox-${PV}
+	>=dev-lang/tk-8"
 
 S=${WORKDIR}/${P}-src
 
diff --git a/net-analyzer/netwag/netwag-5.31.0.ebuild b/net-analyzer/netwag/netwag-5.31.0.ebuild
index c2ba0fe3de57..6787b36ef1cb 100644
--- a/net-analyzer/netwag/netwag-5.31.0.ebuild
+++ b/net-analyzer/netwag/netwag-5.31.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/net-analyzer/netwag/netwag-5.31.0.ebuild,v 1.1 2005/10/15 05:05:17 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwag/netwag-5.31.0.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 # NOTE: netwib, netwox and netwag go together, bump all or bump none
 
diff --git a/net-analyzer/netwatch/ChangeLog b/net-analyzer/netwatch/ChangeLog
index 5fd199af6747..020dc5640e82 100644
--- a/net-analyzer/netwatch/ChangeLog
+++ b/net-analyzer/netwatch/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-analyzer/netwatch
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/ChangeLog,v 1.1 2003/09/29 15:09:19 genone Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+*netwatch-1.0b_pre4 (03 Aug 2005)
+
+  03 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +netwatch-1.0b_pre4.ebuild:
+  Version bump.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> netwatch-1.0a.ebuild:
+  Added to ~ppc.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml:
+  Updated metadata: netmon herd
+
+  15 Apr 2004; Marius Mauch <genone@gentoo.org> netwatch-1.0b_pre3.ebuild:
+  Emergency removal, breaks stable portage versions (see bug 47847).
+
+*netwatch-1.0b_pre3 (14 Apr 2004)
+
+  14 Apr 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  netwatch-1.0b_pre3.ebuild:
+  Version bump.  Added -sparc as it causes a bus error at the first network traffic.
 
 *netwatch-1.0a (29 Sep 2003)
 
diff --git a/net-analyzer/netwatch/Manifest b/net-analyzer/netwatch/Manifest
index 7d2967ac79da..ead647615424 100644
--- a/net-analyzer/netwatch/Manifest
+++ b/net-analyzer/netwatch/Manifest
@@ -1,2 +1,16 @@
-MD5 0ebd89e3ec6967aca69de6ce902d1699 netwatch-1.0a.ebuild 724
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d73db67db681ead6bf80b5a7b91c846b ChangeLog 1153
+MD5 2eb9c018ae33afd2ca0783e3ccac4bd0 metadata.xml 237
+MD5 ba996ff361908e32377f065bc297769b netwatch-1.0a.ebuild 789
+MD5 7bbc8c13d6b6d2e4111acfac6560664e netwatch-1.0b_pre4.ebuild 830
 MD5 a238317b1c64ec35112135fe14a60e58 files/digest-netwatch-1.0a 66
+MD5 67a832b08ff6ca5c32e51797ff0f1657 files/digest-netwatch-1.0b_pre4 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8JhVArHZZzCEUG0RAi6eAJ9mOQh4uEjer/YFp5ZVzVAGMU9e/ACfQxN6
+ktu//1Y7IgPryhcpSojOBmg=
+=VJQR
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index 7024f15ca4b0..4124206091d7 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>genone@gentoo.org</email>
-</maintainer>
+<herd>netmon</herd>
+<longdescription>a ncurses based network monitoring program</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/netwatch/netwatch-1.0a.ebuild b/net-analyzer/netwatch/netwatch-1.0a.ebuild
index d8fe30575f97..adbc475ed384 100644
--- a/net-analyzer/netwatch/netwatch-1.0a.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.0a.ebuild
@@ -1,13 +1,13 @@
-# 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/net-analyzer/netwatch/netwatch-1.0a.ebuild,v 1.1 2003/09/29 15:09:19 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/netwatch-1.0a.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 SRC_URI="http://www.slctech.org/~mackay/${P}.src.tgz"
 DESCRIPTION="a ncurses based network monitoring program"
 HOMEPAGE="http://www.slctech.org/~mackay/netwatch.html"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 SLOT="0"
 
@@ -17,7 +17,6 @@ DEPEND="sys-libs/ncurses
 src_unpack() {
 	unpack ${A}
 	sed -i "s:<sys/time.h>:<sys/time.h>\n#include <time.h>:" "${S}/netwatch.c"
-	#sed -i "s:/usr/man:${D}/usr/man:" "${S}/Makefile.in"
 }
 
 src_compile() {
diff --git a/net-analyzer/netwatch/netwatch-1.0b_pre4.ebuild b/net-analyzer/netwatch/netwatch-1.0b_pre4.ebuild
index ae179f9413be..4004ed819675 100644
--- a/net-analyzer/netwatch/netwatch-1.0b_pre4.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.0b_pre4.ebuild
@@ -1,6 +1,6 @@
-# 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/net-analyzer/netwatch/netwatch-1.0b_pre4.ebuild,v 1.1 2005/08/03 10:10:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwatch/netwatch-1.0b_pre4.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 MY_P=${P/_pre4/play}
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/netwox/ChangeLog b/net-analyzer/netwox/ChangeLog
index e063477e7b99..cb4357fb2ce3 100644
--- a/net-analyzer/netwox/ChangeLog
+++ b/net-analyzer/netwox/ChangeLog
@@ -1,6 +1,69 @@
 # ChangeLog for net-analyzer/netwox
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwox/ChangeLog,v 1.1 2003/12/26 02:04:06 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwox/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+*netwox-5.31.0 (15 Oct 2005)
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org> -netwox-5.29.0.ebuild,
+  -netwox-5.30.0.ebuild, +netwox-5.31.0.ebuild:
+  version bump - old version removal
+
+  17 Jun 2005; David Holm <dholm@gentoo.org> netwox-5.30.0.ebuild:
+  Added to ~ppc.
+
+*netwox-5.30.0 (17 Jun 2005)
+
+  17 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -netwox-5.6.0.ebuild,
+  -netwox-5.9.0.ebuild, +netwox-5.30.0.ebuild:
+  Version bump and remove old versions.
+
+  01 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> netwox-5.29.0.ebuild:
+  Added NOTE in ebuild header about netwib, netwox and netwag.
+
+*netwox-5.29.0 (30 Mar 2005)
+
+  30 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +netwox-5.29.0.ebuild:
+  Version bump for bug 87207.
+
+  26 Mar 2005; Jason Wever <weeve@gentoo.org> netwox-5.28.0.ebuild:
+  Stable on SPARC.
+
+  05 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> netwox-5.28.0.ebuild:
+  Keyworded ~sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> netwox-5.28.0.ebuild:
+  Marked stable on x86.
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> netwox-5.28.0.ebuild:
+  QA fix - man file in wrong dir. Corrected number of tools included to 212 as
+  per web page
+
+*netwox-5.28.0 (13 Jan 2005)
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> +netwox-5.28.0.ebuild:
+  Version bump as per bug #75621 by Ovidiu Ghinet <oghinet@yahoo.com>
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> netwox-5.9.0.ebuild:
+  Stable on sparc.
+
+  12 Jul 2004; Eldad Zack <eldad@gentoo.org> netwox-5.6.0.ebuild,
+  netwox-5.9.0.ebuild:
+  marked x86 stable
+
+  21 May 2004; Jason Wever <weeve@gentoo.org> netwox-5.9.0.ebuild:
+  Added ~sparc keyword.
+
+*netwox-5.9.0 (28 Feb 2004)
+
+  28 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  netwox-5.9.0.ebuild:
+  New upstream version, closes 42960.
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> :
+  add missing manifest
+
+  26 Dec 2003; Jason Wever <weeve@gentoo.org> netwox-5.6.0.ebuild:
+  Masked on sparc as net-libs/netwib dependency doesn't build.
 
 *netwox-5.6.0 (25 Dec 2003)
 
diff --git a/net-analyzer/netwox/Manifest b/net-analyzer/netwox/Manifest
index 74b861e6b2e1..a99e52ab2bf3 100644
--- a/net-analyzer/netwox/Manifest
+++ b/net-analyzer/netwox/Manifest
@@ -1,3 +1,16 @@
-MD5 b918d259dd1758f8f00f921814c58f47 netwox-5.6.0.ebuild 890
-MD5 6712c20c8b20828e8e1e5718f4c96eeb ChangeLog 463
-MD5 0bb1f25dabdb18874328e880eef930a3 files/digest-netwox-5.6.0 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3f2d6b33b2d9e3b5aea1aeea6e067e3 ChangeLog 2351
+MD5 a035a340ad76b6fcae68f450b4c80076 files/digest-netwox-5.28.0 66
+MD5 0d63153f187413a39f046ea4acaa43ff files/digest-netwox-5.31.0 137
+MD5 595b8dd3c2b25d617085a633221eecf1 metadata.xml 257
+MD5 0cd91d1df2d474f3824d2b90f6b6f35c netwox-5.28.0.ebuild 1007
+MD5 fa0ae5e4a4ac1b9227df860fcd91455e netwox-5.31.0.ebuild 1497
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDUIxMmdTrptrqvGERAkQ3AKCCXgQLiyeciuwUZUNfVFMqlN4WywCfZFaW
+HZhqgtyWjl5sn6Jtzjat/bc=
+=vJB1
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/netwox/metadata.xml b/net-analyzer/netwox/metadata.xml
index bc8add436336..ee899a6c83fe 100644
--- a/net-analyzer/netwox/metadata.xml
+++ b/net-analyzer/netwox/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
 <longdescription>Toolbox of over 400 utilities for testing Ethernet/IP networks</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/netwox/netwox-5.28.0.ebuild b/net-analyzer/netwox/netwox-5.28.0.ebuild
index 213786134952..4ce443a2dceb 100644
--- a/net-analyzer/netwox/netwox-5.28.0.ebuild
+++ b/net-analyzer/netwox/netwox-5.28.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwox/netwox-5.28.0.ebuild,v 1.1 2005/01/13 05:51:50 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwox/netwox-5.28.0.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 inherit toolchain-funcs
 
-DESCRIPTION="Toolbox of over 400 utilities for testing Ethernet/IP networks"
+DESCRIPTION="Toolbox of 212 utilities for testing Ethernet/IP networks"
 HOMEPAGE="http://www.laurentconstantin.com/en/netw/netwox/"
 SRC_URI="http://www.laurentconstantin.com/common/netw/${PN}/download/v${PV/.*}/${P}-src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 sparc"
 IUSE=""
 
 DEPEND="~net-libs/netwib-${PV}"
@@ -36,5 +36,5 @@ src_compile() {
 src_install() {
 	dodoc README.TXT doc/*.txt
 	cd src
-	make install CC=$(tc-getCC) DESTDIR=${D} || die
+	make install CC=$(tc-getCC) INSTMAN1=${D}/usr/share/man/man1  DESTDIR=${D} || die
 }
diff --git a/net-analyzer/netwox/netwox-5.31.0.ebuild b/net-analyzer/netwox/netwox-5.31.0.ebuild
index 186ce063e448..30585d3e3515 100644
--- a/net-analyzer/netwox/netwox-5.31.0.ebuild
+++ b/net-analyzer/netwox/netwox-5.31.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/net-analyzer/netwox/netwox-5.31.0.ebuild,v 1.1 2005/10/15 04:57:30 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netwox/netwox-5.31.0.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 # NOTE: netwib, netwox and netwag go together, bump all or bump none
 
diff --git a/net-analyzer/ngrep/ChangeLog b/net-analyzer/ngrep/ChangeLog
index 532fbf40ab07..6bce052e4665 100644
--- a/net-analyzer/ngrep/ChangeLog
+++ b/net-analyzer/ngrep/ChangeLog
@@ -1,9 +1,106 @@
 # ChangeLog for net-analyzer/ngrep
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
+*ngrep-1.44 (05 Jul 2005)
+
+  05 Jul 2005; Daniel Black <dragonheart@gentoo.org> +ngrep-1.44.ebuild:
+  version bump
+
+*ngrep-1.43 (26 Feb 2005)
+
+  26 Feb 2005; Daniel Black <dragonheart@gentoo.org> metadata.xml,
+  -files/ngrep-1.41-fix-HAVE_DUMB_UDPHDR-test.patch,
+  -files/ngrep-1.41-libpcap-include.patch, -ngrep-1.40.ebuild,
+  -ngrep-1.41.ebuild, +ngrep-1.43.ebuild:
+  Version bump as per bug #67671 thanks to author Jordan Ritter and reporter
+  gentoo@ma3s.de. Old version cleanout
+
+  20 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ngrep-1.42.ebuild:
+  Fix docs that are installed; Thanks to vanquirius in bug 82719.
+
+  31 Jan 2005; Daniel Black <dragonheart@gentoo.org> ngrep-1.40.ebuild,
+  ngrep-1.41.ebuild, ngrep-1.42.ebuild:
+  virtual/libpcap transition
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  27 Oct 2004; Eldad Zack <eldad@gentoo.org> -files/ngrep-1.38-r2-gentoo.diff,
+  ngrep-1.42.ebuild:
+  Tidy.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ngrep-1.42.ebuild:
+  Stable on amd64.
+
+  26 Aug 2004; Tom Gall <tgall@gentoo.org> ngrep-1.42.ebuild:
+  stable on ppc64, bug #58532
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> ngrep-1.42.ebuild:
+  Stable on alpha.
+
+  19 Aug 2004; Jason Wever <weeve@gentoo.org> ngrep-1.42.ebuild:
+  Stable on sparc.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> ngrep-1.42.ebuild:
+  x86 stable
+
+  26 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> ngrep-1.42.ebuild:
+  Stable macos.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> ngrep-1.41.ebuild:
+  Tidy up.
+
+*ngrep-1.42 (05 Jul 2004)
+
+  05 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  +files/ngrep-1.42-libpcap-include.patch, +ngrep-1.42.ebuild:
+  Version bump. Patch to autoconf contributed by lo0ol@eyou.com. Closes #52000.
+  added metadata.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ngrep-1.41.ebuild:
+  Stable amd64.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ngrep-1.40.ebuild,
+  ngrep-1.41.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ngrep-1.41.ebuild:
+  Add inherit eutils
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> ngrep-1.41.ebuild,
+  files/ngrep-1.41-fix-HAVE_DUMB_UDPHDR-test.patch,
+  files/ngrep-1.41-libpcap-include.patch:
+  Fix compilation aginst the new libpcap include files.
+
+*ngrep-1.41 (01 Feb 2004)
+
+  01 Feb 2004; Martin Schlemmer <azarah@gentoo.org> ngrep-1.41.ebuild:
+  Mark stable, bug #32535.
+
+  24 Nov 2003; Martin Holzer <mholzer@gentoo.org> ngrep-1.40.ebuild,
+  ngrep-1.41.ebuild:
+  adding RESTRICT="nomirror"
+
+  03 Nov 2003; Martin Schlemmer <azarah@gentoo.org> ngrep-1.41.ebuild,
+  files/ngrep-1.41-fix-HAVE_DUMB_UDPHDR-test.patch:
+  Fix test for HAVE_DUMB_UDPHDR to be in proper C format, closing bug #32535.
+
+*ngrep-1.41 (10 Aug 2003)
+
+  10 Aug 2003; Jon Portnoy <avenj@gentoo.org> ngrep-1.41.ebuild :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *ngrep-1.40 (1 Feb 2002)
 
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> ngrep-1.40.ebuild :
+  Added ~alpha to KEYWORDS
+
+  30 Nov 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> ngrep-1.40:
+  Added ppc keyword
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-analyzer/ngrep/Manifest b/net-analyzer/ngrep/Manifest
index e69de29bb2d1..f5414bc8c056 100644
--- a/net-analyzer/ngrep/Manifest
+++ b/net-analyzer/ngrep/Manifest
@@ -0,0 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 39b982463e877eb3253d82fbe53c5a6f ChangeLog 3866
+MD5 676123827c1f9954a5d26962aaf2a17d metadata.xml 501
+MD5 0d4e9791c342f0b86bfd7cc6a4f9bccb ngrep-1.44.ebuild 757
+MD5 e5c7ecfccc9b582a58336106bc08a669 ngrep-1.42.ebuild 866
+MD5 15e54d1970930271a7c4a7c27e7be82c ngrep-1.43.ebuild 622
+MD5 39d0cea1c55cbf48d2e5268ce04c3720 files/digest-ngrep-1.44 63
+MD5 85a227510da15e6a2af304931c2ec1e7 files/digest-ngrep-1.42 63
+MD5 a7fdfbde749237f8813aefb8a2a93d7e files/ngrep-1.42-libpcap-include.patch 6398
+MD5 cd845e373218beedc9eb6856e28d29b1 files/digest-ngrep-1.43 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCyox9mdTrptrqvGERAjaPAJ0S2gWweUL+LE2Zuod7B/Nua86X1gCgktqG
+/TJjl6jlAKHvGzwqYOwrWC0=
+=0xiJ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ngrep/metadata.xml b/net-analyzer/ngrep/metadata.xml
index 08cca393b1b2..e1bf4e492144 100644
--- a/net-analyzer/ngrep/metadata.xml
+++ b/net-analyzer/ngrep/metadata.xml
@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>A grep for network layers</longdescription>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>netmon@gentoo.org</email>
+		<name>netmon herd</name>
+	</maintainer>
+	<maintainer>
+		<email>jpr5+gentoo@darkridge.com</email>
+		<name>Jordan Ritter</name>
+		<description>Program author who would like to be notified of bugs</description>
+	</maintainer>
+	<longdescription>
+		A grep for network layers
+	</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ngrep/ngrep-1.42.ebuild b/net-analyzer/ngrep/ngrep-1.42.ebuild
index 662d78f36834..bf8bd30f2be2 100644
--- a/net-analyzer/ngrep/ngrep-1.42.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.42.ebuild
@@ -1,42 +1,37 @@
-# 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/net-analyzer/ngrep/ngrep-1.42.ebuild,v 1.1 2004/07/05 10:03:38 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.42.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 inherit eutils
 
-IUSE=""
 DESCRIPTION="A grep for network layers"
+HOMEPAGE="http://ngrep.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ngrep/${P}.tar.bz2"
-RESTRICT="nomirror"
-HOMEPAGE="http://ngrep.sourceforge.net"
-
-DEPEND="virtual/libc
-	>=net-libs/libpcap-0.5.2
-	sys-devel/autoconf"
 
-RDEPEND="virtual/libc"
-
-SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ppc-macos s390 sparc x86"
+IUSE=""
+
+RDEPEND="virtual/libc
+	virtual/libpcap"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-
 	epatch ${FILESDIR}/${P}-libpcap-include.patch
 }
 
 src_compile() {
-	WANT_AUTOCONF=2.5 autoconf
+	WANT_AUTOCONF=2.5 autoconf || die "autoconf failed"
 
-	econf || die
-	make || die
+	econf || die "econf failed"
+	make || die "make failed"
 }
 
 src_install() {
-	into /usr
 	dobin ngrep
 	doman ngrep.8
-	dodoc BUGS CHANGES COPYRIGHT CREDITS README TODO USAGE
+	dodoc BUGS CHANGES CREDITS INSTALL LICENSE README README.pcre TODO
 }
diff --git a/net-analyzer/ngrep/ngrep-1.43.ebuild b/net-analyzer/ngrep/ngrep-1.43.ebuild
index c4357983ab94..9403e5c2c80d 100644
--- a/net-analyzer/ngrep/ngrep-1.43.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.43.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/net-analyzer/ngrep/ngrep-1.43.ebuild,v 1.1 2005/02/26 05:28:38 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.43.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="A grep for network layers"
 HOMEPAGE="http://ngrep.sourceforge.net/"
diff --git a/net-analyzer/ngrep/ngrep-1.44.ebuild b/net-analyzer/ngrep/ngrep-1.44.ebuild
index dbe607d81b9e..96d7c9021dfc 100644
--- a/net-analyzer/ngrep/ngrep-1.44.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.44.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/net-analyzer/ngrep/ngrep-1.44.ebuild,v 1.1 2005/07/05 13:34:29 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ngrep/ngrep-1.44.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="A grep for network layers"
 HOMEPAGE="http://ngrep.sourceforge.net/"
diff --git a/net-analyzer/nikto/ChangeLog b/net-analyzer/nikto/ChangeLog
index 61c0ea821341..c11cdb4c6efa 100644
--- a/net-analyzer/nikto/ChangeLog
+++ b/net-analyzer/nikto/ChangeLog
@@ -1,6 +1,64 @@
 # ChangeLog for net-analyzer/nikto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.1 2003/10/06 12:06:56 mcummings Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+  13 Aug 2005; Luis Medinas <metalgod@gentoo.org> nikto-1.35.ebuild:
+  Added ~amd64 Keywords. Closes bug #102302.
+
+*nikto-1.35 (30 May 2005)
+
+  30 May 2005; Michael Cummings <mcummings@gentoo.org> +nikto-1.35.ebuild:
+  Version bump to 1.35
+
+*nikto-1.34-r2 (14 May 2005)
+
+  14 May 2005; Michael Cummings <mcummings@gentoo.org>
+  +nikto-1.34-r2.ebuild:
+  Forgot to get the digest of the man added. Also bumped since the man page is
+  a functional addition.
+
+  14 May 2005; Michael Cummings <mcummings@gentoo.org> nikto-1.34-r1.ebuild:
+  bug 84048, thanks to Michael Boman <michael.boman@gmail.com> for the
+  updates. Adds man page for nikto.
+
+*nikto-1.34-r1 (13 Mar 2005)
+
+  13 Mar 2005; Michael Cummings <mcummings@gentoo.org>
+  +nikto-1.34-r1.ebuild:
+  Bug 70465: Andreas Kobara <abusch@gmx.net> points out that nikto no longer
+  as an external dependancy on libwhisker, and in fact provides its own
+  variation now. -r1 ebuild drops this dependancy. Thanks Andreas!
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> nikto-1.32.ebuild:
+  Stable on sparc.
+
+*nikto-1.34 (29 Oct 2004)
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> nikto-1.32.ebuild,
+  +nikto-1.34.ebuild:
+  Version bump. SRC_URI fixes. Closes #66340.
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> nikto-1.32.ebuild:
+  fix depend syntax 58347
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> nikto-1.31.ebuild,
+  nikto-1.32.ebuild:
+  Added missing ssl to IUSE
+
+*nikto-1.32 (29 Mar 2004)
+
+  29 Mar 2004; Michael Cummings <mcummings@gentoo.org> nikto-1.32.ebuild:
+  version bump
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> nikto-1.31.ebuild:
+  QA: Unnecessary definition of S removed. Adding categories to dependencies.
+  See bug 45110 for details.
+
+  14 Mar 2004; Michael Cummings <mcummings@gentoo.org> nikto-1.31.ebuild:
+  swapping depend and rdepend, closing bug 44515
+
+  27 Feb 2004; Michael Cummings <mcummings@gentoo.org> nikto-1.31.ebuild:
+  unmasking after 144 days masked
 
 *nikto-1.31 (06 Oct 2003)
 
diff --git a/net-analyzer/nikto/Manifest b/net-analyzer/nikto/Manifest
index 5a70d7347ee8..cb5533d37cba 100644
--- a/net-analyzer/nikto/Manifest
+++ b/net-analyzer/nikto/Manifest
@@ -1,3 +1,14 @@
-MD5 630e1f9cd1b3cc98d1cff25e105c8e59 Changelog 230
-MD5 cbcd2c15599e68b2305a09258aae1c41 nikto-1.31.ebuild 1412
+MD5 2b4937477bd030fb07f7b9e2815e9a4b ChangeLog 2421
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 88f79961161186c592762a09abc9c6a6 nikto-1.31.ebuild 1401
+MD5 9ea27fe96303ad70dc9bd8d3b95032d8 nikto-1.32.ebuild 1406
+MD5 6ddd6e4c0c7e2219194b261d95f295f3 nikto-1.34-r1.ebuild 1416
+MD5 c4605db3369dd491dd949abfa6ff3212 nikto-1.34-r2.ebuild 1416
+MD5 0ba7666616307886e40a4241602dd6c1 nikto-1.34.ebuild 1334
+MD5 833219e3d0b858cbdac8c9e1790d814e nikto-1.35.ebuild 1389
 MD5 4fd028ff30a713c4de5e0e295c8e09c8 files/digest-nikto-1.31 62
+MD5 deb58270f313a92987268abc8f75c12c files/digest-nikto-1.32 62
+MD5 d2887f890953869a678a1d24203255cf files/digest-nikto-1.34 62
+MD5 aa2d47ef5e1a6ddb3798a6f6e362adf3 files/digest-nikto-1.34-r1 120
+MD5 aa2d47ef5e1a6ddb3798a6f6e362adf3 files/digest-nikto-1.34-r2 120
+MD5 e54a0b6eeba4b6c3bce790ecdb7cd1a4 files/digest-nikto-1.35 62
diff --git a/net-analyzer/nikto/files/digest-nikto-1.32 b/net-analyzer/nikto/files/digest-nikto-1.32
index 635d752e84ff..443abe0a9ebc 100644
--- a/net-analyzer/nikto/files/digest-nikto-1.32
+++ b/net-analyzer/nikto/files/digest-nikto-1.32
@@ -1 +1 @@
-MD5 3dec9a442669c917c8e45a1c80527c79 nikto-current.tar.gz 345290
+MD5 3dec9a442669c917c8e45a1c80527c79 nikto-1.32.tar.gz 345290
diff --git a/net-analyzer/nikto/files/digest-nikto-1.34-r1 b/net-analyzer/nikto/files/digest-nikto-1.34-r1
index 0feea3c696cd..fa31d84bbe98 100644
--- a/net-analyzer/nikto/files/digest-nikto-1.34-r1
+++ b/net-analyzer/nikto/files/digest-nikto-1.34-r1
@@ -1 +1,2 @@
 MD5 7b4398ddd422d8bea972a6f79670087b nikto-1.34.tar.gz 184320
+MD5 fa0f1d4173cace344ba4498caa146ba4 nikto-1.34.man 17950
diff --git a/net-analyzer/nikto/nikto-1.31.ebuild b/net-analyzer/nikto/nikto-1.31.ebuild
index ff56231be410..a0b28a40385a 100644
--- a/net-analyzer/nikto/nikto-1.31.ebuild
+++ b/net-analyzer/nikto/nikto-1.31.ebuild
@@ -1,25 +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/net-analyzer/nikto/nikto-1.31.ebuild,v 1.1 2003/10/06 12:06:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.31.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
 SRC_URI="http://www.cirt.net/source/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
-DEPEND=">=perl-5.6.1
-		>=libwhisker-1.5
-		>=nmap-3.00
-		ssl? ( dev-libs/openssl ) "
+KEYWORDS="x86 ~ppc ~sparc"
 RDEPEND=${DEPEND}
-IUSE=""
-
-S="${WORKDIR}/${P}"
+RDEPEND=">=dev-lang/perl-5.6.1
+		>=net-libs/libwhisker-1.5
+		>=net-analyzer/nmap-3.00
+		ssl? ( dev-libs/openssl ) "
+IUSE="ssl"
 
 src_unpack() {
 	unpack ${A}
-	einfo ${WORKDIR}
+	#einfo ${WORKDIR}
 	cd  ${S}
 	sed	-i -e 's:config.txt:nikto.conf:' \
 		-i -e 's:\$CFG{configfile}="nikto.conf":\$CFG{configfile}="/etc/nikto/nikto.conf":' \
diff --git a/net-analyzer/nikto/nikto-1.32.ebuild b/net-analyzer/nikto/nikto-1.32.ebuild
index 9944a3c17fad..49025534ad63 100644
--- a/net-analyzer/nikto/nikto-1.32.ebuild
+++ b/net-analyzer/nikto/nikto-1.32.ebuild
@@ -1,20 +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/net-analyzer/nikto/nikto-1.32.ebuild,v 1.1 2004/03/29 15:51:20 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.32.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
-MY_P=nikto-current
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/nikto/${MY_P}.tar.gz"
+SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc sparc"
 RDEPEND=${DEPEND}
-RDEPEND=">=dev-lang/perl
+RDEPEND="dev-lang/perl
 		>=net-libs/libwhisker-1.5
 		>=net-analyzer/nmap-3.00
 		ssl? ( dev-libs/openssl ) "
-IUSE=""
+IUSE="ssl"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/nikto/nikto-1.34-r1.ebuild b/net-analyzer/nikto/nikto-1.34-r1.ebuild
index 8dbb5ecfebcb..1357ab663231 100644
--- a/net-analyzer/nikto/nikto-1.34-r1.ebuild
+++ b/net-analyzer/nikto/nikto-1.34-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/net-analyzer/nikto/nikto-1.34-r1.ebuild,v 1.1 2005/03/13 20:51:10 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.34-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
-SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
+SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz
+		http://www.cirt.net/nikto/${P}.man"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,6 +29,8 @@ src_compile() {
 		-i -e 's:^PROXYPASS:#PROXYPASS:' \
 		-i -e 's:# PLUGINDIR=/usr/local/nikto/plugins:PLUGINDIR=/usr/share/nikto/plugins:' \
 		 nikto.conf
+
+		 cp ${DISTDIR}/${P}.man ${WORKDIR}/${P}.1
 }
 
 src_install() {
@@ -45,4 +48,5 @@ src_install() {
 	cd docs
 	dodoc CHANGES.txt LICENSE.txt README_plugins.txt nikto_usage.txt
 	dohtml nikto_usage.html
+	doman ${WORKDIR}/${P}.1
 }
diff --git a/net-analyzer/nikto/nikto-1.34-r2.ebuild b/net-analyzer/nikto/nikto-1.34-r2.ebuild
index d74cd7007265..cd72b783a0e3 100644
--- a/net-analyzer/nikto/nikto-1.34-r2.ebuild
+++ b/net-analyzer/nikto/nikto-1.34-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/net-analyzer/nikto/nikto-1.34-r2.ebuild,v 1.1 2005/05/14 13:44:22 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.34-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
diff --git a/net-analyzer/nikto/nikto-1.34.ebuild b/net-analyzer/nikto/nikto-1.34.ebuild
index 6005e70f6b67..58a86e6cc0c8 100644
--- a/net-analyzer/nikto/nikto-1.34.ebuild
+++ b/net-analyzer/nikto/nikto-1.34.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/net-analyzer/nikto/nikto-1.34.ebuild,v 1.1 2004/10/29 11:53:57 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.34.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
diff --git a/net-analyzer/nikto/nikto-1.35.ebuild b/net-analyzer/nikto/nikto-1.35.ebuild
index 9bbe4b69bfe9..f50957829e5a 100644
--- a/net-analyzer/nikto/nikto-1.35.ebuild
+++ b/net-analyzer/nikto/nikto-1.35.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/net-analyzer/nikto/nikto-1.35.ebuild,v 1.1 2005/05/30 14:24:07 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nikto/nikto-1.35.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 DESCRIPTION="Web Server vulnerability scanner."
 HOMEPAGE="http://www.cirt.net/code/nikto.shtml"
@@ -8,7 +8,7 @@ SRC_URI="http://www.cirt.net/source/nikto/ARCHIVE/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 RDEPEND="dev-lang/perl
 		>=net-analyzer/nmap-3.00
 		ssl? ( dev-libs/openssl )"
diff --git a/net-analyzer/nload/ChangeLog b/net-analyzer/nload/ChangeLog
index 2bbed3cdc67b..2947185960b2 100644
--- a/net-analyzer/nload/ChangeLog
+++ b/net-analyzer/nload/ChangeLog
@@ -1,12 +1,68 @@
 # ChangeLog for net-analyzer/nload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
-  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-  moved to net-analyzer - added SLOT
+  31 May 2005; Marcus D. Hanwell <marcus@gentoo.org> nload-0.6.0.ebuild:
+  Stable on amd64.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/nload-0.5.0-gcc3-gentoo.patch, nload-0.6.0.ebuild:
+  Drop unneeded patch, remove unneeded src_compile.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -nload-0.4.0.ebuild,
+  -nload-0.5.0.ebuild:
+  Removing old ebuilds.
+
+  20 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> nload-0.6.0.ebuild:
+  Marked ~amd64.
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> nload-0.6.0.ebuild:
+  Stable on sparc
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> nload-0.6.0.ebuild:
+  Marked x86 stable
+
+  03 Apr 2004; Lars Weiler <pylon@gentoo.org> nload-0.6.0.ebuild:
+  stable on ppc
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> nload-0.4.0.ebuild,
+  nload-0.5.0.ebuild, nload-0.6.0.ebuild:
+  QA: IUSE variable was missing, unnecessary definition of S removed, inherit
+  eutils where needed.
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> nload-0.5.0.ebuild:
+  Updated ebuild to use epatch instead of patch.
+
+*nload-0.6.0 (25 Feb 2004)
+
+  25 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  nload-0.6.0.ebuild:
+  New upstream version. Closes #42767.
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> nload-0.5.0.ebuild:
+  Added to ~ppc.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nload-0.5.0 (3 Sep 2002)
+
+  3 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  nload-0.5.0.ebuild, files/digest-nload-0.5.0,
+  files/nload-0.5.0-gcc-gentoo.patch :
+
+  Resolves bug #7399. Version bump to 0.5.0 and add patch to correct
+  C++ compile problems on gcc3.2. Added minor fix to get a happy
+  repoman.
 
 *nload-0.4.0 (14 Jun 2002)
 
+  18 Jul 2002; Kyle Manna <nitro@gentoo.org> nload-0.4.0.ebuild :
+
+  Added KEYWORDS and ncurses dependency.
+
+  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
+  moved to net-analyzer - added SLOT
+
   14 Jun 2002; Kyle Manna <nitro@gentoo.org> nload-0.4.0.ebuild :
   
   Verion bump, ebuild update.
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index e69de29bb2d1..f3cf2d0ac95c 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3ad4869b2ae472e48f9e875b36db8841 nload-0.6.0.ebuild 626
+MD5 7a806729fbf89a71dacaedd455d66838 ChangeLog 2689
+MD5 973561a9f8af7319f312cc6cc86873fb metadata.xml 342
+MD5 87062647c5d50c2924833ed2e4cff7a4 files/digest-nload-0.6.0 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCnPGHntT9W3vfTuoRAjMJAKC2Bwi242rkBklF4ZXzcirGzs3GFwCeNW/H
+4N7S/gaITOzlcYiE0YoZIHQ=
+=lwfr
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nload/nload-0.6.0.ebuild b/net-analyzer/nload/nload-0.6.0.ebuild
index 05a85360efef..25a27e02482c 100644
--- a/net-analyzer/nload/nload-0.6.0.ebuild
+++ b/net-analyzer/nload/nload-0.6.0.ebuild
@@ -1,29 +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/net-analyzer/nload/nload-0.6.0.ebuild,v 1.1 2004/02/25 07:58:27 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/nload-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="console application which monitors network traffic and bandwidth usage in real time"
 SRC_URI="mirror://sourceforge/nload/${P}.tar.gz"
 HOMEPAGE="http://roland-riegel.de/nload/index_en.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
-src_compile() {
-	#./configure \
-	#	--prefix=/usr \
-	#	--infodir=/usr/share/info \
-	#	--mandir=/usr/share/man \
-	#	--host=${CHOST} || die "./configure failed"
-
-	econf || die "./configure failed"
-	emake || die "compile failed"
-}
-
 src_install () {
 	#make DESTDIR=${D} install
 	einstall || die
diff --git a/net-analyzer/nmap/ChangeLog b/net-analyzer/nmap/ChangeLog
index dc1086ca0dba..bdc3db4b8916 100644
--- a/net-analyzer/nmap/ChangeLog
+++ b/net-analyzer/nmap/ChangeLog
@@ -1,11 +1,397 @@
 # ChangeLog for net-analyzer/nmap
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/ChangeLog,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
+
+  02 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> nmap-3.83.ebuild:
+  Alpha stable.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> nmap-3.83.ebuild:
+  Stable on ppc64
+
+  19 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> nmap-3.83.ebuild:
+  Stable on sparc
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> nmap-3.83.ebuild:
+  Stable on ppc.
+
+  17 Sep 2005; <dang@gentoo.org> nmap-3.83.ebuild:
+  Marked stable on amd64
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> nmap-3.83.ebuild:
+  Mark 3.83 stable on ia64
+
+*nmap-3.93 (16 Sep 2005)
+
+  16 Sep 2005; Michał Januszewski <spock@gentoo.org> +nmap-3.93.ebuild:
+  Version bump (closes bug #105740).
+
+  16 Sep 2005; Michał Januszewski <spock@gentoo.org> nmap-3.83.ebuild:
+  Marked 3.83 stable on x86.
+
+*nmap-3.90 (09 Sep 2005)
+
+  09 Sep 2005; Michał Januszewski <spock@gentoo.org> -nmap-3.75.ebuild,
+  -nmap-3.80.ebuild, +nmap-3.90.ebuild:
+  Version bump (bug #105294). Removed old ebuilds.
+
+*nmap-3.83 (09 Aug 2005)
+
+  09 Aug 2005; Michał Januszewski <spock@gentoo.org> +nmap-3.83.ebuild:
+  Version bump (closes bug #100859).
+
+  26 Jun 2005; Lina Pezzella <j4rg0n@gentoo.org> nmap-3.75.ebuild,
+  nmap-3.80.ebuild, nmap-3.81.ebuild:
+  Fixed odd bug with CXXFLAGS.
+
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org> nmap-3.81.ebuild:
+  Stable on ppc.
+
+  20 May 2005; Fernando J. Pereda <ferdy@gentoo.org> nmap-3.81.ebuild:
+  alpha stable
+
+  19 May 2005; Olivier Crête <tester@gentoo.org> nmap-3.81.ebuild:
+  Stable on amd64
+
+  18 May 2005; Rene Nussbaumer <killerfox@gentoo.org> nmap-3.80.ebuild,
+  nmap-3.81.ebuild:
+  3.80 and 3.81 stable on hppa
+
+  17 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> nmap-3.81.ebuild:
+  Stable on sparc
+
+  17 May 2005; Michał Januszewski <spock@gentoo.org> -nmap-3.50-r1.ebuild,
+  -nmap-3.55.ebuild, nmap-3.80.ebuild, nmap-3.81.ebuild:
+  Removed old ebuilds. Marked 3.80 and 3.81 stable on x86.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> nmap-3.81.ebuild:
+  Stable on ppc64
+
+  20 Feb 2005; Michał Januszewski <spock@gentoo.org> nmap-3.81.ebuild:
+  Cleaned the ebuild up a little - included fixes from bug #81881.
+
+  18 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> nmap-3.75.ebuild:
+  Stable ppc-macos
+
+*nmap-3.81 (08 Feb 2005)
+
+  08 Feb 2005; Michał Januszewski <spock@gentoo.org> -nmap-3.70.ebuild,
+  +nmap-3.81.ebuild:
+  Version bump. Removed old ebuilds.
+
+*nmap-3.80 (06 Feb 2005)
+
+  06 Feb 2005; Michał Januszewski <spock@gentoo.org> -nmap-3.48.ebuild,
+  -nmap-3.50.ebuild, +nmap-3.80.ebuild:
+  Version bump. Removed old ebuilds.
+
+  06 Feb 2005; Simon Stelling <blubb@gentoo.org> nmap-3.75.ebuild:
+  stable on amd64
+
+  05 Feb 2005; Michael Hanselmann <hansmi@gentoo.org> nmap-3.75.ebuild:
+  Stable on ppc.
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> nmap-3.75.ebuild:
+  Stable on alpha.
+
+  18 Jan 2005; Lina Pezzella <j4rg0n@gentoo.org> nmap-3.55.ebuild, nmap-3.75.ebuild:
+  Keyworded for ppc-macos.
+
+  13 Jan 2005; Guy Martin <gmsoft@gentoo.org> nmap-3.75.ebuild:
+  Stable on hppa.
+
+  13 Jan 2005; Michal Januszewski <spock@gentoo.org> nmap-3.75.ebuild:
+  Fixed an installation problem on systems with -j3 (bug #77800).
+
+  12 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> nmap-3.75.ebuild:
+  Stable on sparc
+
+  12 Jan 2005; Michal Januszewski <spock@gentoo.org> nmap-3.70.ebuild,
+  nmap-3.75.ebuild:
+  Marked stable on x86.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  30 Nov 2004; <j4rg0n@gentoo.org> nmap-3.55.ebuild:
+  Keyworded ~ppc-macos.
+
+  28 Oct 2004; <pyrania@gentoo.org> nmap-3.75.ebuild:
+  Added ~s390 keyword.
+
+*nmap-3.75 (19 Oct 2004)
+
+  19 Oct 2004; Michal Januszewski <spock@gentoo.org> +nmap-3.75.ebuild:
+  Version bump.
+
+  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> nmap-3.50.ebuild,
+  nmap-3.55.ebuild:
+  stable on amd64.
+
+  17 Sep 2004; Jon Hood <squinky86@gentoo.org> nmap-3.70.ebuild:
+  Add ipv6 thanks to Francisco Javier <ffelix@sshinf.com>, #64374.
+
+  06 Sep 2004; Lars Weiler <pylon@gentoo.org> nmap-3.55.ebuild:
+  Stable on ppc.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> nmap-3.55.ebuild:
+  Stable on hppa.
+
+  03 Sep 2004; Michal Januszewski <spock@gentoo.org> nmap-3.70.ebuild:
+  Added a fix for the .desktop file for nmapfe. Closes bug #62531.
+
+*nmap-3.70 (01 Sep 2004)
+
+  01 Sep 2004; Michal Januszewski <spock@gentoo.org> +nmap-3.70.ebuild:
+  Version bump. Dropped the statistics patch as it does not apply to 3.70 and
+  doesn't seem to be maintained upstream.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> nmap-3.55.ebuild:
+  Stable on alpha.
+
+  18 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> nmap-3.55.ebuild:
+  Stable on sparc
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -nmap-3.30.ebuild,
+  -nmap-3.45.ebuild, nmap-3.55.ebuild:
+  x86 stable
+
+  31 Jul 2004; Tom Gall <tgall@gentoo.org> nmap-3.55.ebuild:
+  stable on ppc64, bug #57451
+
+*nmap-3.55 (07 Jul 2004)
+
+  07 Jul 2004; Michal Januszewski <spock@gentoo.org> +nmap-3.55.ebuild:
+  Version bump.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> nmap-3.30.ebuild,
+  nmap-3.45.ebuild, nmap-3.48.ebuild, nmap-3.50-r1.ebuild, nmap-3.50.ebuild:
+  change virtual/glibc to virtual/libc
+
+  22 Jun 2004; <malc@gentoo.org> nmap-3.50-r1.ebuild:
+  Mark stable on amd64
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> -nmap-3.00.ebuild,
+  nmap-3.30.ebuild, nmap-3.45.ebuild, nmap-3.48.ebuild, nmap-3.50-r1.ebuild,
+  nmap-3.50.ebuild:
+  Clean up and trim old ebuild
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> nmap-3.50-r1.ebuild:
+  Stable on alpha.
+
+  14 Feb 2004; Michal Januszewski <spock@gentoo.org> nmap-3.50-r1.ebuild:
+  Added a hard-coded -j1 to MAKEOPTS - closes #41360.
+
+*nmap-3.50-r1 (08 Feb 2004)
+
+  08 Feb 2004; <spider@gentoo.org> nmap-3.50-r1.ebuild:
+  Add the missing dependency :  libpcre
+
+  07 Feb 2004; Lars Weiler <pylon@gentoo.org> nmap-3.48.ebuild:
+  stable on ppc
+
+  03 Feb 2004; Guy Martin <gmsoft@gentoo.org> nmap-3.50.ebuild :
+  Marked stable on hppa.
+
+  02 Feb 2004; Michal Januszewski <spock@gentoo.org> nmap-3.50.ebuild:
+  Stable on x86.
+
+  21 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org> nmap-3.48.ebuild:
+  Bumped 3.48 to stable on x86.
+
+*nmap-3.50 (20 Jan 2004)
+
+  20 Jan 2004; Michal 'Spock' Januszewski <spock@gentoo.org> metadata.xml,
+  nmap-3.00.ebuild, nmap-3.30.ebuild, nmap-3.45.ebuild, nmap-3.48.ebuild,
+  nmap-3.50.ebuild:
+  Bumped to 3.50, added metadata.xml, fixed dates in headers of nmap ebuilds,
+  removed ~mips from KEYWORDS from ebuilds for nmap 3.50 and 3.48 as the
+  dependency on x11-libs/gtk+-1.2* cannot be satisfied on mips.
+
+  24 Dec 2003; Sven Blumenstein <bazik@gentoo.org> nmap-3.48.ebuild:
+  Bumped to stable on sparc.
+
+  14 Dec 2003; Guy Martin <gmsoft@gentoo.org> nmap-3.45.ebuild:
+  Marked stable on hppa.
+
+*nmap-3.48 (20 Oct 2003)
+
+  22 Jan 2004; Guy Martin <gmsoft@gentoo.org> nmap-3.48.ebuild :
+  Marked stable on hppa.
+
+  20 Oct 2003; Joshua Kinard <kumba@gentoo.org> nmap-3.48.ebuild:
+  Added ~mips to KEYWORDS
+
+  20 Oct 2003; Christian Birchinger <joker@gentoo.org> nmap-3.45.ebuild:
+  Added sparc stable keyword
+
+*nmap-3.47 (06 Oct 2003)
+
+  06 Oct 2003; Heinrich Wendel <lanius@gentoo.org> nmap-3.47.ebuild:
+  version bump
+
+  16 Sep 2003; Tavis Ormandy <taviso@gentoo.org> nmap-3.30.ebuild:
+  stable on alpha
+
+*nmap-3.45 (16 Sep 2003)
+
+  16 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #28855.
+
+*nmap-3.30 (30 Jun 2003)
+
+  28 Aug 2003; Christian Birchinger <joker@gentoo.org> nmap-3.30.ebuild:
+  Added sparc stable keyword
+
+  04 Aug 2003; Martin Holzer <mholzer@gentoo.org> nmap-3.30.ebuild:
+  Marked x86 stable.
+
+  05 Aug 2003; Guy Martin <gmsoft@gentoo.org> nmap-3.30.ebuild :
+  Marked stable on hppa.
+ 
+  30 Jun 2003; Martin Holzer <mholzer@gentoo.org> nmap-3.30.ebuild:
+  Version bumped. Closes #23760
+
+*nmap-3.28 (16 Jun 2003)
+
+  16 Jun 2003; Brandon Low <lostlogic@gentoo.org> nmap-3.28.ebuild:
+  Bump, belatedly cuz I'm too dumb to commit things
+
+*nmap-3.27-r1 (12 Jun 2003)
+
+  02 Jul 2003; Guy Martin <gmsoft@gentoo.org> nmap-3.27-r1.ebuild :
+  Marked stable on hppa.
+
+  12 Jun 2003; Martin Holzer <mholzer@gentoo.org> nmap-3.27-r1.ebuild,
+  nmap-3.20-r1.ebuild:
+  Added statistics patch. Closes #20250.
+
+  04 Jun 2003; Christian Birchinger <joker@gentoo.org> nmap-3.27.ebuild:
+  Added sparc stable keyword
+
+*nmap-3.27 (04 June 2003)
+
+  04 June 2003; Brad Laue <brad@gentoo.org> nmap-3.27.ebuild,
+  Mark stable for x86 and ppc.
+
+*nmap-3.27 (28 Apr 2003)
+
+  28 Apr 2003; Brandon Low <lostlogic@gentoo.org> nmap-3.26.ebuild,
+  nmap-3.26.ebuild, nmap-3.27.ebuild:
+  Bump, this is a VERY minor upstream bump that has ABSOLUTELY no effect on any
+  of OUR users, but we'll do it any way
+
+*nmap-3.26 (25 Apr 2003)
+
+  25 Apr 2003; Brandon Low <lostlogic@gentoo.org> nmap-3.25.ebuild,
+  nmap-3.26.ebuild:
+  Bugfix release from upstream
+
+*nmap-3.25 (21 Apr 2003)
+
+  21 Apr 2003; Daniel Robbins <drobbins@gentoo.org> nmap-3.25.ebuild:
+  new upstream version.
+
+*nmap-3.20-r1 (12 Jun 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*nmap-3.20 (19 Mar 2003)
+
+  02 Apr 2003; Guy Martin <gmsoft@gentoo.org> nmap-3.20.ebuild :
+  Marked stable on hppa.
+
+  31 Mar 2003; Christian Birchinger <joker@gentoo.org> nmap-3.20.ebuild:
+  Added sparc keyword
+
+  29 Mar 2003; Martin Holzer <mholzer@gentoo.org> nmap-3.20.ebuild:
+  Marked as stable and added docs.
+
+  19 Mar 2003; Hannes Mehnert <hannes@gentoo.org> nmap-3.20.ebuild:
+  version bump
+
+*nmap-3.15_beta3 (17 Mar 2003)
+
+  17 Mar 2003; Martin Holzer <mholzer@gentoo.org> nmap-3.15_beta3.ebuild:
+  Version bumped. closes #17658.
+
+*nmap-3.15_beta2 (27 Feb 2003)
+
+  10 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> nmap-3.15_beta2 files/digest-nmap-3.15_beta2 :
+  Changed distfile to .tgz one becuse of md5sum confusion of .tar.bz2 file. Closes #16795.
+
+  27 Feb 2003; Martin Holzer <mholzer@gentoo.org nmap-3.15_beta2.ebuild
+  digest-nmap-3.15_beta2 ChangeLog :
+  Version bump submitted in #16427.
+
+*nmap-3.15_beta1 (21 Feb 2003)
+
+  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> nmap-3.15_beta1.ebuild :
+  Added ~hppa to keywords.
+
+  21 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump + cleanups #16061.
+
+*nmap-3.10_alpha9 (07 Feb 2003)
+
+  25 Feb 2003; Guy Martin <gmsoft@gentoo.org> nmap-3.10_alpha9.ebuild :
+  Added hppa to keywords.
+
+  07 Feb 2003; Nick Hadaway <raker@gentoo.org> nmap-3.10_alpha9.ebuild,
+  files/digest-nmap-3.10_alpha9 :
+  Version bump.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nmap-3.10_alpha4 (02 Dec 2002)
+
+  02 Dec 2002; Hannes Mehnert <hannes@gentoo.org> nmap-3.10_alpha4.ebuild :
+  Version bump with ~ in KEYWORDS
+
+*nmap-3.10_alpha3 (23 Oct 2002)
+
+  23 Oct 2002; Mike Frysinger <vapier@gentoo.org> nmap-3.10_alpha3.ebuild :
+  Version bump with ~ in KEYWORDS, and general ebuild cleanup
+
+*nmap-3.00 (02 Aug 2002)
+
+  15 Dec 2002; Bjoern Brauel <bjb@gentoo.org> nmap-3.00.ebuild :
+  Add alpha to KEYWORDS
+
+  02 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> nmap-3.00.ebuild:
+  Final is out. Ebuild contributed by Hannes Mehnert <hannes@mehnert.org>.
+
+*nmap-2.99_rc1 (28 Jul 2002)
+
+  28 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> nmap-2.99_rc1.ebuild :
+  Version bump. Ebuild contributed by SpanKY <vapier@netzero.com>.
+
+*nmap-2.54_beta37 (19 Jul 2002)
+
+  19 Jul 2002; Seemant Kulleen <seemant@gentoo.org> nmap-2.54_beta37.ebuild
+  files/digest-nmap-2.54_beta37 :
+  Version bump.
+
+*nmap-2.54_beta36 (17 Jun 2002)
+
+  17 Jun 2002; Seemant Kulleen <seemant@gentoo.org> nmap-2.54_beta36.ebuild
+  files/digest-nmap-2.54_beta36 :
+  Version bump thanks to: kikov@fco-gimeno.com (Francisco Gimeno) in bug
+  #3833
+
+*nmap-2.54_beta33 (27 Apr 2002)
+
+  27 Apr 2002; Seemant Kulleen <seemant@gentoo.org> nmap-2.54_beta33.ebuild :
+  Version bump.
+
+*nmap-2.54_beta31 (21 Mar 2002)
+
+  21 Mar 2002; Seemant Kulleen <seemant@gentoo.org> nmap-2.54_beta31 :
+  Version bump.  Copied old ebuild over, and updated to reflect new syntax style
 
 *nmap-2.54_beta30 (1 Feb 2002)
 
   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/net-analyzer/nmap/Manifest b/net-analyzer/nmap/Manifest
index 556868746abd..c49ce59cb340 100644
--- a/net-analyzer/nmap/Manifest
+++ b/net-analyzer/nmap/Manifest
@@ -1,15 +1,20 @@
-MD5 a71ff79b0868e30258eb862a9c7f09d2 nmap-3.10_alpha9.ebuild 1209
-MD5 089165d11b6eec19dbe84f92f18e7632 nmap-3.15_beta1.ebuild 1035
-MD5 31cd8a6d5f8ffc6e3d933dc912647b61 nmap-3.15_beta3.ebuild 1040
-MD5 3cde9656f604318552895f65e4e5ab15 nmap-3.00.ebuild 1031
-MD5 1c902a9b3b374aae29d0065acf5eb15b nmap-3.25.ebuild 981
-MD5 dd0c1e5855906f5a8a0150cd770075c4 nmap-3.20.ebuild 1003
-MD5 0331ae61d0e68f911d83a798040f89e5 nmap-3.15_beta2.ebuild 1033
-MD5 01cb6a8c8a1ebb9ed8e83f428d51e2d2 ChangeLog 3580
-MD5 b974965bf7f0a11a9bbd7829b3f81e42 files/digest-nmap-3.00 58
-MD5 a708f7f4c522d8a8115977eccfb6c9ef files/digest-nmap-3.20 62
-MD5 10ff8cec4ba78095282aae8fed56dddf files/digest-nmap-3.25 62
-MD5 c11a1492ad4a54b10a95ee5eeee22687 files/digest-nmap-3.15_beta1 64
-MD5 223ba1b7c70ebed51a9a7d00716ea66a files/digest-nmap-3.15_beta2 64
-MD5 fae93dfb09342de6e30a263bc530483a files/digest-nmap-3.15_beta3 67
-MD5 1f0a662a3a18d03cb613f893bcdfd09c files/digest-nmap-3.10_alpha9 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cfe1b5f88cc51ac6ffc42809178d2a06 metadata.xml 221
+MD5 02b22b2857aba87133e2c756f634d8d2 nmap-3.81.ebuild 943
+MD5 1d04a4500eed78d744d670e7fa310820 nmap-3.83.ebuild 1028
+MD5 b0916d4858fdc6819d8b4fd3733f986a nmap-3.90.ebuild 959
+MD5 2acb253b4611180a085712da0ac581a2 nmap-3.93.ebuild 959
+MD5 c2cd7864e634a6b49764c8be26544384 ChangeLog 12649
+MD5 a9321c7613a34f902b2bcf53af008bc3 files/digest-nmap-3.81 63
+MD5 90ee137382c6272e7524f0c4648c45f4 files/digest-nmap-3.83 68
+MD5 5dcee02c4729204bc26ce3c1652b977f files/digest-nmap-3.90 63
+MD5 5a7f498a284c3404568251a4e4d6ecfa files/digest-nmap-3.93 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDP0ZiKf2g/qXtneoRAoVDAJ0aABvbqEZFSTdG0px/BLTRHK7hMwCgie8X
+bTfltLQGfs4UsvpVYH7vhAY=
+=UCoJ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmap/metadata.xml b/net-analyzer/nmap/metadata.xml
index 4b742be0dcff..28b373129e37 100644
--- a/net-analyzer/nmap/metadata.xml
+++ b/net-analyzer/nmap/metadata.xml
@@ -4,10 +4,5 @@
 <herd>no-herd</herd>
 <maintainer>
   <email>spock@gentoo.org</email>
-  <name>Michal 'Spock' Januszewski</name>
-  <description>
-There was no metadata.xml file for nmap, and from what I saw in the Changelog - no single
-person was maintaining it, so I thought I could take care about it.
-  </description>
 </maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/nmap/nmap-3.81.ebuild b/net-analyzer/nmap/nmap-3.81.ebuild
index a2c27a848e87..5dc66cbdd115 100644
--- a/net-analyzer/nmap/nmap-3.81.ebuild
+++ b/net-analyzer/nmap/nmap-3.81.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/net-analyzer/nmap/nmap-3.81.ebuild,v 1.1 2005/02/08 17:08:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.81.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="A utility for network exploration or security auditing"
 HOMEPAGE="http://www.insecure.org/nmap/"
@@ -10,23 +10,24 @@ SRC_URI="http://www.insecure.org/nmap/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ppc64 ~s390 ~ia64 ~ppc-macos"
-IUSE="gtk gnome ipv6"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc-macos ppc64 s390 sh sparc x86"
+IUSE="gtk ssl"
 
 DEPEND="virtual/libc
 	dev-libs/libpcre
-	gtk? ( =x11-libs/gtk+-1.2* )"
+	gtk? ( =x11-libs/gtk+-1.2* )
+	ssl? ( dev-libs/openssl )"
 
 src_compile() {
-	econf `use_with gtk nmapfe` \
-		`use_enable ipv6` || die
+	use ppc-macos && filter-flags -fstrict-aliasing -O2
+	econf \
+		$(use_with gtk nmapfe) \
+		$(use_with ssl openssl) || die
 	emake -j1 || die
 }
 
 src_install() {
 	einstall -j1 nmapdatadir=${D}/usr/share/nmap install || die
-	use gnome || rm -rf ${D}/usr/share/gnome/
-
 	dodoc CHANGELOG HACKING INSTALL docs/README docs/*.txt
 	dohtml docs/*.html
 }
diff --git a/net-analyzer/nmap/nmap-3.83.ebuild b/net-analyzer/nmap/nmap-3.83.ebuild
index ae47aa5ac734..ab8c41a48b0f 100644
--- a/net-analyzer/nmap/nmap-3.83.ebuild
+++ b/net-analyzer/nmap/nmap-3.83.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/net-analyzer/nmap/nmap-3.83.ebuild,v 1.1 2005/08/09 22:21:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.83.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.insecure.org/presentations/Defcon13/NmapRelease/${P}.DC13.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc-macos ppc64 s390 sh sparc x86"
 IUSE="gtk ssl"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/nmap/nmap-3.90.ebuild b/net-analyzer/nmap/nmap-3.90.ebuild
index 940883410e17..adaf14ed3a7e 100644
--- a/net-analyzer/nmap/nmap-3.90.ebuild
+++ b/net-analyzer/nmap/nmap-3.90.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/net-analyzer/nmap/nmap-3.90.ebuild,v 1.1 2005/09/09 11:14:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.90.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.insecure.org/nmap/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="gtk ssl"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/nmap/nmap-3.93.ebuild b/net-analyzer/nmap/nmap-3.93.ebuild
index 06130e04e7d7..59f9d43ce4aa 100644
--- a/net-analyzer/nmap/nmap-3.93.ebuild
+++ b/net-analyzer/nmap/nmap-3.93.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/net-analyzer/nmap/nmap-3.93.ebuild,v 1.1 2005/09/16 19:13:11 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmap/nmap-3.93.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.insecure.org/nmap/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="gtk ssl"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/nmbscan/ChangeLog b/net-analyzer/nmbscan/ChangeLog
index e1e9c069e7ec..586f0f6b4ddf 100644
--- a/net-analyzer/nmbscan/ChangeLog
+++ b/net-analyzer/nmbscan/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/nmbscan
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/ChangeLog,v 1.1 2005/02/05 22:08:14 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/ChangeLog,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
+
+  18 Oct 2005; Aron Griffis <agriffis@gentoo.org> nmbscan-1.2.4.ebuild:
+  Mark 1.2.4 stable on alpha
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> nmbscan-1.2.4.ebuild:
+  Mark 1.2.4 stable on ia64
+
+  21 Sep 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/nmbscan-1.2.4-head.diff, nmbscan-1.2.4.ebuild:
+  add 'head' parameter fix
+
+  21 Sep 2005; Wolfram Schlich <wschlich@gentoo.org> nmbscan-1.2.4.ebuild:
+  mark stable on x86
 
 *nmbscan-1.2.4 (05 Feb 2005)
 
diff --git a/net-analyzer/nmbscan/Manifest b/net-analyzer/nmbscan/Manifest
index 5d85f5d8f781..a42e6dea64fe 100644
--- a/net-analyzer/nmbscan/Manifest
+++ b/net-analyzer/nmbscan/Manifest
@@ -1,4 +1,15 @@
-MD5 7cfba32c588b0705824487d78aa958cb nmbscan-1.2.4.ebuild 662
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 0052e903feec599fb14e64f75a45fe26 metadata.xml 817
-MD5 fed9cfba87820ddfd204366eb1fca55b ChangeLog 262
+MD5 3aa156bf5e6331ff3341360ce1482735 ChangeLog 793
+MD5 62f3dd2930fb1a527a455d5f2b944cde nmbscan-1.2.4.ebuild 801
+MD5 f68b926ad4d4bd973e446645aa2662dd files/nmbscan-1.2.4-head.diff 862
 MD5 578cfd7c8c46c97cbbf1d2dec1dd81ca files/digest-nmbscan-1.2.4 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDVF0JJrHF4yAQTrARArdPAKCZuDHmDFWx8145+yEsmCw2zk+rVACdHiYu
+5s7P3SZd8gpyW5cWAyICW2g=
+=D20o
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild
index 96e0e0f3add6..662858a4f335 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.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/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild,v 1.1 2005/02/05 22:08:14 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nmbscan/nmbscan-1.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:38 chriswhite Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gbarbier.free.fr/prj/dev/#nmbscan"
 SRC_URI="http://gbarbier.free.fr/prj/dev/down/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE=""
 DEPEND=""
 RDEPEND="app-shells/bash
@@ -25,6 +25,7 @@ RDEPEND="app-shells/bash
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	epatch "${FILESDIR}/${P}-head.diff"
 }
 
 src_compile() {
diff --git a/net-analyzer/nomad/ChangeLog b/net-analyzer/nomad/ChangeLog
index 3661f6e5d924..32e93ee79ae7 100644
--- a/net-analyzer/nomad/ChangeLog
+++ b/net-analyzer/nomad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/nomad
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nomad/ChangeLog,v 1.1 2005/03/11 17:04:02 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nomad/ChangeLog,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> nomad-0.3.2.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  14 Mar 2005; Otavio R. Piske <angusyoung@gentoo.org> nomad-0.3.2.ebuild:
+  Corrected post install messages
 
 *nomad-0.3.2 (11 Mar 2005)
 
diff --git a/net-analyzer/nomad/Manifest b/net-analyzer/nomad/Manifest
index 2bc6f56d19e0..44edbecbaf42 100644
--- a/net-analyzer/nomad/Manifest
+++ b/net-analyzer/nomad/Manifest
@@ -1,3 +1,14 @@
-MD5 a78f1d871de7c87038e7f1bca90e3cfd nomad-0.3.2.ebuild 1092
-MD5 5c7e0f0df43a2f4f87c56e270fccc351 ChangeLog 327
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 41aac16eea00d1aa5e1f2ec181d2dfdb nomad-0.3.2.ebuild 1193
+MD5 318b496549ca0b9732e94d22c9f91e97 ChangeLog 655
+MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
 MD5 6cf900aa2cd63d74d519415bf71561a3 files/digest-nomad-0.3.2 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCe4OoI1lqEGTUzyQRAu60AKDDfTp2Iee8JYwQ+PvM5zsIPTC1rgCgmGsc
+Jy6A9zspG06ChX/3mOOAQkk=
+=YUYs
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nomad/nomad-0.3.2.ebuild b/net-analyzer/nomad/nomad-0.3.2.ebuild
index c83c12193312..511f7a928dd1 100644
--- a/net-analyzer/nomad/nomad-0.3.2.ebuild
+++ b/net-analyzer/nomad/nomad-0.3.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/net-analyzer/nomad/nomad-0.3.2.ebuild,v 1.1 2005/03/11 17:04:02 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nomad/nomad-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
 DESCRIPTION="Nomad is a network mapping program that uses SNMP to automatically discover a local network"
 HOMEPAGE="http://netmon.ncl.ac.uk/"
@@ -16,8 +16,8 @@ DEPEND="=gnome-base/gconf-1*
 	=x11-libs/gtk+-1.2*
 	>=dev-libs/libxml-1.8.14
 	=gnome-base/libglade-0*
-	>=gnome-base/gnome-libs-1*
-	>=net-analyzer/net-snmp-5*
+	>=gnome-base/gnome-libs-1
+	>=net-analyzer/net-snmp-5
 	net-analyzer/fping"
 
 src_compile() {
@@ -35,7 +35,7 @@ pkg_postinst() {
 	nomad-config-tool > /dev/null
 	einfo "In order to run this software as a non-root user you'll"
 	einfo "have to:"
-	einfo "1) have fping in your $PATH"
+	einfo "1) have fping in your \$PATH"
 	einfo "2) configure fping as a suid executable by doing the"
-	einfo "following command: chmod +x /usr/sbin/fping"
+	einfo "following command: chmod u+s /usr/sbin/fping"
 }
diff --git a/net-analyzer/ns/ChangeLog b/net-analyzer/ns/ChangeLog
index 8f0566e8281d..7b65846d0ffe 100644
--- a/net-analyzer/ns/ChangeLog
+++ b/net-analyzer/ns/ChangeLog
@@ -1,6 +1,64 @@
-# ChangeLog for net-misc/ns
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.1 2004/01/11 12:51:39 robbat2 Exp $
+# ChangeLog for net-analyzer/ns
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+  29 Aug 2005; Luis Medinas <metalgod@gentoo.org> ns-2.27-r1.ebuild:
+  Added ~amd64 keywords to fix nam-1.11 dependency.
+
+  09 Aug 2005; Luis Medinas <metalgod@gentoo.org> ns-2.28.ebuild:
+  Added ~amd64 Keywords. Closes bug #100863 .
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ns-2.28.ebuild:
+  Added to ~ppc.
+
+*ns-2.28 (21 Feb 2005)
+
+  21 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/ns-2.28-gentoo.diff, +ns-2.28.ebuild:
+  Bug #82770, version bump.
+
+  13 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  Add myself to metadata.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> ns-2.27-r1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  23 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +files/ns-2.27-gentoo.diff,
+  ns-2.27-r1.ebuild:
+  Fix compilation failure with gcc-3.4 for bug 70154.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  11 Jun 2004; Ferris McCormick <fmccor@gentoo.org> ns-2.27-r1.ebuild:
+  Add ~sparc keyword.
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> ns-2.27-r1.ebuild:
+  remove unnecessary variables and function; tidy
+
+  07 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> ns-2.26-r1.ebuild,
+  ns-2.26.ebuild, ns-2.27.ebuild:
+  clean older ebuilds
+
+  18 May 2004; Mamoru KOMACHI <usata@gentoo.org> ns-2.26-r1.ebuild,
+  ns-2.26.ebuild, ns-2.27-r1.ebuild, ns-2.27.ebuild:
+  Changed app-text/tetex to virtual/tetex, see bug #50865
+
+*ns-2.27-r1 (27 Jan 2004)
+
+  27 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> ns-2.27-r1.ebuild,
+  ns-2.27.ebuild:
+  fix #39423, revision bump.
+
+*ns-2.27 (22 Jan 2004)
+
+  22 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> ns-2.27.ebuild:
+  add in latest release, which now works
+
+*ns-2.26-r1 (20 Jan 2004)
+
+  20 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> ns-2.26-r1.ebuild:
+  make it install the tutorials and all tcl files
 
 *ns-2.26 (11 Jan 2004)
 
diff --git a/net-analyzer/ns/Manifest b/net-analyzer/ns/Manifest
index 8495e94550be..41825c86eb85 100644
--- a/net-analyzer/ns/Manifest
+++ b/net-analyzer/ns/Manifest
@@ -1,2 +1,18 @@
-MD5 70bac822158530cacc0fb2c695be271e ns-2.26.ebuild 1665
-MD5 e50216b9efeff43a6e4ccadbc249ab44 files/digest-ns-2.26 65
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a58acc17b274495ce6790ff103e79d3b ns-2.27-r1.ebuild 2531
+MD5 1af2acd87d5baaba6ddd051ade155719 ChangeLog 2312
+MD5 289416ac6a7266e340817717927762a8 metadata.xml 279
+MD5 6edf5069b72db40a1e91a4f627bbbe43 ns-2.28.ebuild 2641
+MD5 f7b94c91182a6e9cf19719c8abd4dfda files/ns-2.27-gentoo.diff 11242
+MD5 a836c68ff4e3e7d53adf2ba91f47d626 files/ns-2.28-gentoo.diff 2199
+MD5 cbd46edc227114c8538b564b0bdf1ae6 files/digest-ns-2.27-r1 65
+MD5 5ac49b26502a59b51f8df54099af4e25 files/digest-ns-2.28 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDJXbx8zY1VwezZiERAnqSAJ9pl9SK8Uwx1HreJL5qqVO/g37eRwCgntEp
+79J1BHL5Shliq/futA1jhuE=
+=uNMu
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/ns/metadata.xml b/net-analyzer/ns/metadata.xml
index e9ed99dd3d53..a3c828efc2ae 100644
--- a/net-analyzer/ns/metadata.xml
+++ b/net-analyzer/ns/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>netmon</herd>
-<longdescription>Network Simulator</longdescription>
+	<herd>netmon</herd>
+	<maintainer>
+		<email>robbat2@gentoo.org</email>
+	</maintainer>
+	<longdescription>Network Simulator</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ns/ns-2.27-r1.ebuild b/net-analyzer/ns/ns-2.27-r1.ebuild
index 764f0684061c..7c490f72ff1e 100644
--- a/net-analyzer/ns/ns-2.27-r1.ebuild
+++ b/net-analyzer/ns/ns-2.27-r1.ebuild
@@ -1,48 +1,43 @@
-# 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/net-analyzer/ns/ns-2.27-r1.ebuild,v 1.1 2004/01/28 04:04:33 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.27-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Network Simulator"
 HOMEPAGE="http://www.isi.edu/nsnam/ns/"
 SRC_URI="http://www.isi.edu/nsnam/dist/${PN}-src-${PV}.tar.gz"
+
 LICENSE="BSD as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="doc debug"
-need_tclver="8.4.4"
-valid_tclver="${need_tclver}"
-mytclver=""
-DEPEND_COMMON=">=dev-lang/tcl-${need_tclver}
-		>=dev-lang/tk-${need_tclver}
+
+DEPEND_COMMON=">=dev-lang/tcl-8.4.4
+		>=dev-lang/tk-8.4.4
 		>=dev-tcltk/otcl-1.0.8a
 		>=dev-tcltk/tclcl-1.0.13b
-		net-libs/libpcap
+		virtual/libpcap
 		debug? ( =dev-lang/perl-5* >=media-gfx/xgraph-12.1 >=dev-libs/dmalloc-4.8.2 >=dev-tcltk/tcl-debug-2.0 )"
-DEPEND="doc? ( app-text/tetex virtual/ghostscript dev-tex/latex2html ) ${DEPEND_COMMON}"
+DEPEND="doc? ( virtual/tetex virtual/ghostscript dev-tex/latex2html ) ${DEPEND_COMMON}"
 RDEPEND="${DEPEND_COMMON}"
-S=${WORKDIR}/${P}
 
-findtclver() {
-	# input should always be in INCREASING order
-	local ACCEPTVER="8.3 8.4"
-	[ -n "$*" ] && ACCEPTVER="$*"
-	for i in ${ACCEPTVER}; do
-		use debug && einfo "Testing TCL ${i}"
-		# we support being more specific
-		[ "$(#i)" = "3" ] && i="${i}*"
-		has_version ">=dev-lang/tcl-${i}" && mytclver=${i}
-	done
-	use debug && einfo "Using TCL ${mytclver}"
-	if [ -z "${mytclver}" ]; then
-		die "Unable to find a suitable version of TCL"
-	fi
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
 }
 
 src_compile() {
 	local myconf
-	use debug && myconf="${myconf} --with-tcldebug=/usr/lib/tcldbg2.0" || myconf="${myconf} --with-tcldebug=no"
-	myconf="${myconf} `use_with debug dmalloc`"
 	local mytclver=""
+	local i
+
+	use debug \
+		&& myconf="${myconf} --with-tcldebug=/usr/lib/tcldbg2.0" \
+		|| myconf="${myconf} --with-tcldebug=no"
+	myconf="${myconf} $(use_with debug dmalloc)"
+
 	for i in 8.4 8.3; do
 		einfo "Testing TCL ${i}"
 		has_version "=dev-lang/tcl-${i}*" && mytclver=${i}
@@ -52,10 +47,10 @@ src_compile() {
 	myconf="${myconf} --with-tcl-ver=${mytclver} --with-tk-ver=${mytclver}"
 
 	econf \
-	${myconf} \
-	--mandir=/usr/share/man \
-	--enable-stl \
-	--enable-release || die "./configure failed"
+		${myconf} \
+		--mandir=/usr/share/man \
+		--enable-stl \
+		--enable-release || die "./configure failed"
 	emake CCOPT="${CFLAGS}" || die
 
 	cd ${S}/indep-utils/dosdbell
@@ -67,27 +62,27 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/bin
-	dodir /usr/share/man/man1
-	make DESTDIR=${D} MANDEST=/usr/share/man install || die
+	dodir /usr/bin /usr/share/man/man1
+	make DESTDIR="${D}" MANDEST=/usr/share/man install \
+		|| die "make install failed"
 	dobin nse
 
 	dodoc BASE-VERSION COPYRIGHTS FILES HOWTO-CONTRIBUTE README VERSION
 	dohtml CHANGES.html TODO.html
 
-	cp -ra ${S}/ns-tutorial ${D}/usr/share/doc/${PF}
-	cp -ra ${S}/tcl ${D}/usr/share/ns
+	cp -ra "${S}/ns-tutorial" "${D}/usr/share/doc/${PF}"
+	cp -ra "${S}/tcl" "${D}/usr/share/ns"
 
-	cd ${S}/indep-utils/dosdbell
+	cd "${S}/indep-utils/dosdbell"
 	dobin dosdbell dosdbellasim
 	newdoc README README.dosdbell
-	cd ${S}/indep-utils/dosreduce
+	cd "${S}/indep-utils/dosreduce"
 	dobin dosreduce
 	newdoc README README.dosreduce
-	cd ${S}/indep-utils/cmu-scen-gen
+	cd "${S}/indep-utils/cmu-scen-gen"
 	dobin cbrgen.tcl
 	newdoc README README.cbrgen
-	cd ${S}/indep-utils/propagation
+	cd "${S}/indep-utils/propagation"
 	dobin threshold
 
 	if use doc; then
diff --git a/net-analyzer/ns/ns-2.28.ebuild b/net-analyzer/ns/ns-2.28.ebuild
index 84c778ba27f8..440ee8936e04 100644
--- a/net-analyzer/ns/ns-2.28.ebuild
+++ b/net-analyzer/ns/ns-2.28.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/net-analyzer/ns/ns-2.28.ebuild,v 1.1 2005/02/22 02:11:18 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ns/ns-2.28.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.isi.edu/nsnam/dist/${PN}-src-${PV}.tar.gz"
 
 LICENSE="BSD as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~ppc ~sparc ~x86 ~amd64"
 IUSE="doc debug"
 
 RDEPEND=">=dev-lang/tcl-8.4.4
diff --git a/net-analyzer/nsat/ChangeLog b/net-analyzer/nsat/ChangeLog
index 6c9164eba49c..9ca0c76df2f4 100644
--- a/net-analyzer/nsat/ChangeLog
+++ b/net-analyzer/nsat/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-analyzer/nsat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.1 2002/12/17 20:00:22 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nsat-1.5.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> nsat-1.5.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> nsat-1.5.ebuild:
+  Add inherit eutils
+
+  28 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> nsat-1.5.ebuild :
+  DEPEND fixes, sed fixes and sparc keyword from #31244.
+  Remove 1.43 ebuild so that 1.5 is latest.
+  Fix CFLAGS.
+
+*nsat-1.5 (07 Jan 2003)
+
+  07 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> nsat-1.5.ebuild :
+  Version bump. Found by Kemal Akman <ka@leogic.com> in #13327.
 
 *nsat-1.43 (17 Dec 2002)
 
diff --git a/net-analyzer/nsat/Manifest b/net-analyzer/nsat/Manifest
index e69de29bb2d1..f0e9e95bf576 100644
--- a/net-analyzer/nsat/Manifest
+++ b/net-analyzer/nsat/Manifest
@@ -0,0 +1,5 @@
+MD5 8abf40c82fb8e14327de8810200ce88d ChangeLog 1069
+MD5 829d599f4ab2f859509a4c6503b0c0a3 nsat-1.5.ebuild 1334
+MD5 e5a78f2f9a0dd2c74696935d8b9347c9 metadata.xml 272
+MD5 99fbec45790d1b3bcdc76807e592f1bf files/digest-nsat-1.5 57
+MD5 dd2688ef10995aad69fac0669f7413eb files/nsat-1.5-configure.patch 566
diff --git a/net-analyzer/nsat/nsat-1.5.ebuild b/net-analyzer/nsat/nsat-1.5.ebuild
index e478135200c9..8e3408e8199d 100644
--- a/net-analyzer/nsat/nsat-1.5.ebuild
+++ b/net-analyzer/nsat/nsat-1.5.ebuild
@@ -1,35 +1,47 @@
-# 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/net-analyzer/nsat/nsat-1.5.ebuild,v 1.1 2003/01/07 16:05:34 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nsat/nsat-1.5.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
-IUSE="pcap X"
+inherit eutils
 
-S=${WORKDIR}/${PN}
 DESCRIPTION="Network Security Analysis Tool, an application-level network security scanner"
-SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
 HOMEPAGE="http://nsat.sourceforge.net/"
+SRC_URI="mirror://sourceforge/nsat/${P}.tgz"
 
-DEPEND="pcap? ( >=net-libs/libpcap-0.7.1-r1 )
-	X? ( virtual/x11 )"
-RDEPEND=${DEPEND}
-
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+SLOT="0"
+KEYWORDS="~ppc ~sparc x86"
+IUSE="X"
+
+RDEPEND="X? ( virtual/x11 dev-lang/tk )
+	virtual/libpcap"
+
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.58"
+
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	mv nsat.conf nsat.conf.orig
-	sed "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:" \
-		nsat.conf.orig > nsat.conf
+
+	epatch ${FILESDIR}/${P}-configure.patch
+
+	sed -i "s:^#CGIFile /usr/local/share/nsat/nsat.cgi$:#CGIFile /usr/share/nsat/nsat.cgi:g" \
+		nsat.conf
+	sed -i "s:/usr/local:/usr:g" Makefile.in
+	sed -i "s:/usr/local:/usr:g" tools/xnsat
+	sed -i -e "s:/usr/local/share/nsat/nsat.conf:/etc/nsat/nsat.conf:g" \
+		-e "s:/usr/local/share/nsat/nsat.cgi:/usr/share/nsat/nsat.cgi:g" \
+		src/lang.h
 }
 
 src_compile() {
-	econf || die
+	WANT_AUTOCONF=2.5
+	autoconf
+
+	econf $( use_with X x ) || die
 
-	# Parallel make doesn't work.
-	make || die "compile problem"
+	make|| die "compile problem"
 }
 
 src_install () {
diff --git a/net-analyzer/nstats/ChangeLog b/net-analyzer/nstats/ChangeLog
index 9f89b83d9bee..562cedc9e092 100644
--- a/net-analyzer/nstats/ChangeLog
+++ b/net-analyzer/nstats/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for net-analyzer/nstats
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.1 2002/04/14 06:44:48 woodchip Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/ChangeLog,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+  10 Aug 2005; <dang@gentoo.org> nstats-0.4.ebuild:
+  Keyword ~amd64
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nstats-0.4.ebuild:
+  Added to ~ppc.
+
+  17 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/nstats-0.3.2-r2-gentoo.diff:
+  Removing old patch.
+
+  17 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/nstats-0.4-makefile.patch, nstats-0.4.ebuild:
+  Patching makefile to install bmon as bmon.nstats. This prevents a file
+  collision with net-analyzer/bmon.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> nstats-0.4.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, nstats-0.4.ebuild:
+  Tidy, x86 stable
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*nstats-0.4 (09 Jul 2002)
+
+  09 Jul 2002; Seemant Kulleen <seemant@gentoo.org> nstats-0.4.ebuild
+  files/digest-nstats-0.4 :
+
+  Version bump, thanks to: lb-gentoo@projectdream.org (Lukas Beeler) in bug
+  #2662
 
 *nstats-0.3.2-r2 (14 Apr 2002)
 
diff --git a/net-analyzer/nstats/Manifest b/net-analyzer/nstats/Manifest
index e69de29bb2d1..2417138e6b8e 100644
--- a/net-analyzer/nstats/Manifest
+++ b/net-analyzer/nstats/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1a84fe6c8d702ae864c2bd947d667ed6 nstats-0.4.ebuild 758
+MD5 db276098478371ceca59d191e518ed51 ChangeLog 1372
+MD5 471824686805ceb0bc7fbffbfe341a4b metadata.xml 266
+MD5 9f496f20339069acfc493469277a05bb files/nstats-0.4-makefile.patch 478
+MD5 436fb40a1859860df36dbcf6ba534dcc files/digest-nstats-0.4 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFC+kifomPajV0RnrERAj0rAJ4z/T1oJi3tQw+q6ybpLJGeJIHqgwCcDZRD
+NTMnWXkG1Q7R8HVU3yjdaVk=
+=kasE
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/nstats/nstats-0.4.ebuild b/net-analyzer/nstats/nstats-0.4.ebuild
index 6d256fd779ca..cec5b3c54282 100644
--- a/net-analyzer/nstats/nstats-0.4.ebuild
+++ b/net-analyzer/nstats/nstats-0.4.ebuild
@@ -1,21 +1,24 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4.ebuild,v 1.1 2002/07/09 09:13:03 seemant Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nstats/nstats-0.4.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Displays statistics about ethernet traffic including protocol breakdown"
 SRC_URI="http://trash.net/~reeler/nstats/files/${P}.tar.gz"
-HOMEPAGE="http://reeler.org/nstats/"
+HOMEPAGE="http://trash.net/~reeler/nstats/"
 
 SLOT="0"
-LICENSE="GPL"
-KEYWORDS="x86"
+LICENSE="Artistic"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE=""
 
-DEPEND=">=net-libs/libpcap-0.7.1"
+DEPEND="virtual/libpcap"
 
-src_compile() {
-	econf || die "./configure failed"
-	make || die "make failed"
+src_unpack(){
+	unpack ${A}
+	#rename bmon to bmon.nstats to avoid conflict with net-analyzer/bmon
+	epatch ${FILESDIR}/${P}-makefile.patch
 }
 
 src_install () {
diff --git a/net-analyzer/ntop/ChangeLog b/net-analyzer/ntop/ChangeLog
index b96b763ff511..7c94c60f909c 100644
--- a/net-analyzer/ntop/ChangeLog
+++ b/net-analyzer/ntop/ChangeLog
@@ -1,13 +1,145 @@
 # ChangeLog for net-analyzer/ntop
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
-
-*ntop-2.0 (1 Feb 2002)
-
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ChangeLog,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
+
+  15 Sep 2005; Carlos Silva <r3pek@gentoo.org> ntop-3.0.ebuild:
+  Marking ntop-3.0 ~x86 since it have some memory leak problems
+
+  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> ntop-3.1.ebuild:
+  FreeBSD fix: root:root -> root:0.
+
+  23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> ntop-3.1.ebuild:
+  Use -1 instead of /bin/false, bug #103421.
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org> ntop-3.1.ebuild:
+  removed die from epatch || die.
+
+  09 May 2005; Eldad Zack <eldad@gentoo.org> ntop-3.1.ebuild:
+  Fixed ACCESS VIOLATION that occurs if there is no /var/lib/ntop.
+
+  19 Feb 2005; Daniel Black <dragonheart@gentoo.org> ntop-3.1.ebuild:
+  Quoted NTOP_OPTS in /etc/conf.d/ntop to fix bug #80663. Thanks to\ Alan McNeil
+  <alanmcneil@mac.com>
+
+  10 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> ntop-3.1.ebuild:
+  Install internal html files to the correct place for bug 81449.
+
+  31 Jan 2005; Daniel Black <dragonheart@gentoo.org> ntop-3.0.ebuild,
+  ntop-3.1.ebuild:
+  virtual/libpcap transition
+
+*ntop-3.1 (16 Jan 2005)
+
+  16 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/gd-1.8.3-fpic.patch, -files/gdchart0.94c-fpic.patch,
+  +files/globals-core.c.diff, -files/libpng-1.2.4-fpic.patch,
+  -files/tcpwrap.patch, -files/zlib-1.1.4-build-fPIC.patch,
+  -files/zlib-1.1.4-build-static-with-fpic.patch,
+  -files/zlib-1.1.4-glibc.patch, -files/zlib-1.1.4-gzprintf.patch,
+  -files/zlib-1.1.4-mapfile.patch, -ntop-2.2c.ebuild, +ntop-3.1.ebuild:
+  Cleanout and Version bump as per bug #75812
+
+  27 Oct 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
+  Removed dep on ncurses since intop was removed at 3.0.
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> ntop-3.0.ebuild:
+  added ~ppc64, bug #64101
+
+  14 Sep 2004; Guy Martin <gmsoft@gentoo.org> ntop-3.0.ebuild:
+  Stable on hppa.
+
+  19 Aug 2004; Jason Wever <weeve@gentoo.org> ntop-3.0.ebuild:
+  Stable on sparc.
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
+  x86 stable
+
+  25 Jul 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
+  Fixed sandbox violation. Thanks to Dennis Freise <cat@final-frontier.ath.cx>.
+  Closes #58271.
+
+  24 Jul 2004; Eldad Zack <eldad@gentoo.org> ntop-3.0.ebuild:
+  chown /var/lib/ntop to ntop's running user (nobody). Closes #46969.
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ntop-2.0.99_rc2-r2.ebuild,
+  ntop-2.2.ebuild, ntop-2.2c.ebuild, ntop-3.0.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ntop-2.2c.ebuild:
+  Add inherit eutils
+
+*ntop-3.0 (31 Mar 2004)
+
+  14 Apr 2004; Jon Hood <squinky86@gentoo.org> ntop-3.0.ebuild:
+  added libgd and libpng to dependencies, closes bug 46469.
+
+  31 Mar 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  ntop-3.0.ebuild:
+  New upstream version. Closes bug 45372.
+
+  10 Mar 2004; Jason Wever <weeve@gentoo.org> ntop-2.2c.ebuild:
+  Stable on sparc.
+
+  05 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> ntop-2.2c.ebuild:
+  Added fpic patches to make it compile on amd64. Also compile everything with our preferred cflags.
+
+  11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> ntop-2.0.99_rc2-r2.ebuild:
+  sed -i
+
+  11 Jan 2004; Seemant Kulleen <seemant@gentoo.org> ntop-2.2.ebuild,
+  ntop-2.2c.ebuild:
+  Changed dodir to keepdir, otherwise a subsequent install removes
+  /var/lib/ntop. Closes bug #37914 by Carlo <current@myrealbox.com>
+
+  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> ntop-2.2.ebuild,
+  ntop-2.2c.ebuild:
+  Added more docs and marked x86 stable.
+
+  02 Aug 2003; Todd Sunderlin <todd@gentoo.org> ntop-2.2.ebuild:
+  Marked stable on sparc
+
+*ntop-2.2c (12 Jul 2003)
+
+  09 Jan 2004; Guy Martin <gmsoft@gentoo.org> ntop-2.2c.ebuild :
+  Added -fPIC for zlib and libpng on hppa. Marked stable on hppa.
+
+  12 Jul 2003; Martin Holzer <mholzer@gentoo.org> ntop-2.2c.ebuild:
+  Version bumped.
+
+  29 Jun 2003; Martin Holzer <mholzer@gentoo.org> ntop-2.2.ebuild:
+  Marked stable on x86.
+
+*ntop-2.2 (04 May 2003)
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> ntop-2.2.ebuild :
+  Version bump. Contributions by Rigo Ketelings <rigo@home.nl> and 
+  Ross Dougherty <theklone@optusnet.com.au> in #19354.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*ntop-2.0.99_rc2-r2 (11 Jul 2002)
+
+  11 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  Applied tcp-wrappers patch from Markus Krainer
+  <markus-krainer@chello.at>, closes bugs #4774, #4772
+  and #4832.
+
+*ntop-2.0.99_rc2-r1 (09 Jul 2002)
+
+  09 Jul 2002; Maik Schreiber <blizzy@gentoo.org> :
+
+  Quick fix for bug #4678.
+
+*ntop-2.0.99_rc2 (14 Jun 2002)
+
+  14 Jun 2002; Ryan Phillips <rphillips@gentoo.org> :
+
+  updated revision
+
+*ntop-2.0-r1 (25 Apr 2002)
+
+  25 Apr 2002; Pete Michaleas <tutor@gentoo.org> ntop-2.0-r1.ebuild :
+
+  Included patch to fix vulnerability with syslog() call, found in
+  util.c.
diff --git a/net-analyzer/ntop/Manifest b/net-analyzer/ntop/Manifest
index e69de29bb2d1..a93e49f8d4a5 100644
--- a/net-analyzer/ntop/Manifest
+++ b/net-analyzer/ntop/Manifest
@@ -0,0 +1,9 @@
+MD5 4ab5248f4a98565130768d8ba364e49f ntop-3.1.ebuild 2398
+MD5 4b12b27ca78a348c26a2633be176bb19 ntop-3.0.ebuild 1599
+MD5 5706dc8aefb8838cf76c6ce0055d449c ChangeLog 4999
+MD5 846e7479e3e9df4363f2721b7fb47320 metadata.xml 233
+MD5 35c576fac5bd8cbf0da850ccc00dd924 files/digest-ntop-3.0 58
+MD5 bb970d07a76d2b939ec08c2796519021 files/digest-ntop-3.1 58
+MD5 a9cad5851ac81cbd8589f60287f3e497 files/ntop-confd 131
+MD5 d1e896708a98eaca02f55c44ae517768 files/globals-core.c.diff 536
+MD5 9e6b1e20779d7fb6699c956adf6b8b05 files/ntop-init 294
diff --git a/net-analyzer/ntop/metadata.xml b/net-analyzer/ntop/metadata.xml
index 053268dcc646..957191d63d3b 100644
--- a/net-analyzer/ntop/metadata.xml
+++ b/net-analyzer/ntop/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-	<longdescription>ntop is a unix tool that shows network usage like top</longdescription>
+<herd>netmon</herd>
+<longdescription>tool that shows network usage like top</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ntop/ntop-3.0.ebuild b/net-analyzer/ntop/ntop-3.0.ebuild
index badc83a5d48d..f9f4ef856882 100644
--- a/net-analyzer/ntop/ntop-3.0.ebuild
+++ b/net-analyzer/ntop/ntop-3.0.ebuild
@@ -1,37 +1,44 @@
-# 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/net-analyzer/ntop/ntop-3.0.ebuild,v 1.1 2004/03/31 09:34:38 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.0.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
-IUSE="ssl readline tcpd ncurses"
+inherit gnuconfig
 
-DESCRIPTION="ntop is a unix tool that shows network usage like top"
-SRC_URI="mirror://sourceforge/ntop/${P}.tgz"
+DESCRIPTION="tool that shows network usage like top"
 HOMEPAGE="http://www.ntop.org/ntop.html"
+SRC_URI="mirror://sourceforge/ntop/${P}.tgz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc hppa ~amd64"
+SLOT="0"
+KEYWORDS="~x86 ppc sparc hppa ~amd64 ~ppc64"
+IUSE="ssl readline tcpd"
 
 DEPEND=">=sys-libs/gdbm-1.8.0
-	>=net-libs/libpcap-0.5.2
+	virtual/libpcap
+	>=media-libs/gd-2.0.22
+	>=media-libs/libpng-1.2.5
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	readline? ( >=sys-libs/readline-4.1 )
-	ncurses? ( sys-libs/ncurses )"
+	readline? ( >=sys-libs/readline-4.1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
+}
 
 src_compile() {
 	local myconf
 
-	use readline	|| myconf="${myconf} --without-readline"
-	use tcpd	|| myconf="${myconf} --with-tcpwrap"
-	use ssl		|| myconf="${myconf} --without-ssl"
-	use ncurses	|| myconf="${myconf} --without-curses"
+	use readline || myconf="${myconf} --without-readline"
+	use tcpd || myconf="${myconf} --with-tcpwrap"
+	use ssl || myconf="${myconf} --without-ssl"
 
 	econf ${myconf} || die "configure problem"
 	make || die "compile problem"
 }
 
-src_install () {
+src_install() {
 	make DESTDIR=${D} install || die "install problem"
 
 	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
@@ -39,13 +46,21 @@ src_install () {
 
 	doman ntop.8
 
-	dodoc AUTHORS CONTENTS COPYING ChangeLog MANIFESTO NEWS
+	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
 	dodoc PORTING README SUPPORT_NTOP.txt THANKS docs/*
 
 	dohtml ntop.html
 
 	keepdir /var/lib/ntop
+	chown -R nobody:nobody ${D}/var/lib/ntop
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/ntop-init ntop
 	insinto /etc/conf.d ; newins ${FILESDIR}/ntop-confd ntop
 }
+
+pkg_postinst() {
+
+	einfo "Notice that intop was removed upstream as of 3.0."
+
+}
+
diff --git a/net-analyzer/ntop/ntop-3.1.ebuild b/net-analyzer/ntop/ntop-3.1.ebuild
index e4a058db1d82..5b4875b0c61c 100644
--- a/net-analyzer/ntop/ntop-3.1.ebuild
+++ b/net-analyzer/ntop/ntop-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/net-analyzer/ntop/ntop-3.1.ebuild,v 1.1 2005/01/16 04:23:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ntop/ntop-3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 inherit gnuconfig eutils
 
@@ -17,7 +17,7 @@ DEPEND="virtual/libc
 	sys-apps/gawk
 	>=sys-devel/libtool-1.4
 	>=sys-libs/gdbm-1.8.0
-	>=net-libs/libpcap-0.5.2
+	virtual/libpcap
 	>=media-libs/gd-2.0.22
 	>=media-libs/libpng-1.2.5
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r4 )
@@ -30,7 +30,7 @@ DEPEND="virtual/libc
 
 pkg_setup() {
 	enewgroup ntop
-	enewuser ntop -1 /bin/false /var/lib/ntop ntop
+	enewuser ntop -1 -1 /var/lib/ntop ntop
 }
 
 src_unpack() {
@@ -38,7 +38,7 @@ src_unpack() {
 	mv ${WORKDIR}/ntop ${WORKDIR}/ntop-3.1
 	cd ${S}
 	gnuconfig_update
-	epatch ${FILESDIR}/globals-core.c.diff || die "patch failed"
+	epatch ${FILESDIR}/globals-core.c.diff
 }
 
 src_compile() {
@@ -63,6 +63,7 @@ src_compile() {
 }
 
 src_install() {
+	sed -i Makefile -e 's;mkdir -p $(CFG_DBFILE_DIR);mkdir -p $(DESTDIR)$(CFG_DBFILE_DIR);'
 	make DESTDIR=${D} install || die "install problem"
 
 	# fixme: bad handling of plugins (in /usr/lib with unsuggestive names)
@@ -73,9 +74,7 @@ src_install() {
 	dodoc AUTHORS CONTENTS ChangeLog MANIFESTO NEWS
 	dodoc PORTING README SUPPORT_NTOP.txt THANKS docs/*
 
-	mv ${D}/usr/share/ntop/html ${D}/usr/share/doc/${PF}
-	rmdir ${D}/usr/share/ntop
-	chown -R root:root ${D}/etc/ntop ${D}/usr/share/doc/${PF}/html \
+	chown -R root:0 ${D}/etc/ntop ${D}/usr/share/${PN}/html \
 		${D}/usr/lib/ntop
 
 	dohtml ntop.html
@@ -87,6 +86,6 @@ src_install() {
 	exeinto /etc/init.d ; newexe ${FILESDIR}/ntop-init ntop
 	insinto /etc/conf.d ; newins ${FILESDIR}/ntop-confd ntop
 
-	echo NTOP_OPTS="-u ntop -P /var/lib/ntop" >> ${D}/etc/conf.d/ntop
+	echo 'NTOP_OPTS="-u ntop -P /var/lib/ntop"' >> ${D}/etc/conf.d/ntop
 }
 
diff --git a/net-analyzer/nttcp/ChangeLog b/net-analyzer/nttcp/ChangeLog
index d807194764df..489c5b9b56b8 100644
--- a/net-analyzer/nttcp/ChangeLog
+++ b/net-analyzer/nttcp/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-analyzer/nttcp
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/ChangeLog,v 1.1 2004/03/04 23:18:30 agriffis Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+  16 Oct 2005; Malcolm Lashley <malc@gentoo.org> nttcp-1.47.ebuild:
+  Stable on amd64 - bug #109462
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> nttcp-1.47.ebuild:
+  Mark 1.47 stable on alpha
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> nttcp-1.47.ebuild:
+  Added to ~ppc.
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> nttcp-1.47.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> nttcp-1.47.ebuild:
+  stable on ia64
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, nttcp-1.47.ebuild:
+  Marked x86 stable.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> nttcp-1.47.ebuild:
+  change virtual/glibc to virtual/libc
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> nttcp-1.47.ebuild:
+  added ~amd64 keyword
 
 *nttcp-1.47 (04 Mar 2004)
 
diff --git a/net-analyzer/nttcp/Manifest b/net-analyzer/nttcp/Manifest
index 1dd35c29a791..2fd94298b105 100644
--- a/net-analyzer/nttcp/Manifest
+++ b/net-analyzer/nttcp/Manifest
@@ -1,2 +1,4 @@
-MD5 d9e51c569700084f8f502f8fedd12bd5 nttcp-1.47.ebuild 641
+MD5 bce579863e21bbfc5ec6bda71ae91411 ChangeLog 1129
+MD5 1b7c64bc5ede38c72fc90ddc581643f4 nttcp-1.47.ebuild 634
+MD5 1d1adf3544b5c7ab2a9eae3664626fa6 metadata.xml 230
 MD5 6c2697ebc2bd546421ac2cf4b06cff96 files/digest-nttcp-1.47 61
diff --git a/net-analyzer/nttcp/nttcp-1.47.ebuild b/net-analyzer/nttcp/nttcp-1.47.ebuild
index 0e4fec67aebf..d21347e64110 100644
--- a/net-analyzer/nttcp/nttcp-1.47.ebuild
+++ b/net-analyzer/nttcp/nttcp-1.47.ebuild
@@ -1,24 +1,25 @@
-# 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/net-analyzer/nttcp/nttcp-1.47.ebuild,v 1.1 2004/03/04 23:18:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nttcp/nttcp-1.47.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs
 
-DESCRIPTION="New version of ttcp -- Tool to test TCP and UDP throughput"
+DESCRIPTION="tool to test TCP and UDP throughput"
 HOMEPAGE="http://www.leo.org/~elmar/nttcp/"
 SRC_URI="http://www.leo.org/~elmar/nttcp/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ia64"
+KEYWORDS="alpha amd64 ia64 ~ppc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
-	emake ARCH= CC="${CC}" OPT="${CFLAGS}" || die "build failed"
+	emake ARCH= CC="$(tc-getCC)" OPT="${CFLAGS}" || die "build failed"
 }
 
 src_install() {
-	dobin nttcp
+	dobin nttcp || die
 	doman nttcp.1
 }
diff --git a/net-analyzer/oinkmaster/ChangeLog b/net-analyzer/oinkmaster/ChangeLog
index a01d2ca4b56e..352afbd1eacb 100644
--- a/net-analyzer/oinkmaster/ChangeLog
+++ b/net-analyzer/oinkmaster/ChangeLog
@@ -1,6 +1,43 @@
 # ChangeLog for net-analyzer/oinkmaster
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/ChangeLog,v 1.1 2004/02/17 06:28:05 mboman Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/ChangeLog,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/0.9-oinkmaster.conf.patch, -oinkmaster-0.9.ebuild,
+  -oinkmaster-1.0.ebuild, oinkmaster-1.1.ebuild, oinkmaster-1.2.ebuild:
+  url fix - bug #91953 thanks to Jonathan Halcrow. old versions removed.
+  stopped installing LICENSE and INSTALL files
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> oinkmaster-1.2.ebuild:
+  Added to ~ppc.
+
+*oinkmaster-1.2 (20 Apr 2005)
+
+  20 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +oinkmaster-1.2.ebuild:
+  Version bump for bug 89505.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> oinkmaster-1.1.ebuild:
+  Marked stable on x86.
+
+  14 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> oinkmaster-1.1.ebuild:
+  added ~amd64 to KEYWORDS. fixes bug #73862.
+
+*oinkmaster-1.1 (13 Jan 2005)
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> +oinkmaster-1.1.ebuild:
+  Version bump as per bug 73009. Thanks to Benjamin Smee <ben@disciplina.net>
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  oinkmaster-0.9.ebuild, oinkmaster-1.0.ebuild:
+  Updated metadata, x86 stable, tidy
+
+*oinkmaster-1.0 (24 May 2004)
+
+  24 May 2004; Michael Boman <mboman@gentoo.org> +oinkmaster-1.0.ebuild:
+  New upstream version. Closes bug #51567.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> oinkmaster-0.9.ebuild:
+  Add inherit eutils
 
 *oinkmaster-0.9 (17 Feb 2004)
 
diff --git a/net-analyzer/oinkmaster/Manifest b/net-analyzer/oinkmaster/Manifest
index da5fbc6acc37..eb4e52ec2e3b 100644
--- a/net-analyzer/oinkmaster/Manifest
+++ b/net-analyzer/oinkmaster/Manifest
@@ -1,3 +1,16 @@
-MD5 f6534df55e123084b46c4ba24af405a3 oinkmaster-0.9.ebuild 658
-MD5 98cb0dba8ab5abbc004c2b6cc9a15a5d files/digest-oinkmaster-0.9 65
-MD5 a4b04f10efda198d683de4863a8d3f4a files/0.9-oinkmaster.conf.patch 1068
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b807b01f2e4bbab81ecbe6b01657d13b metadata.xml 220
+MD5 a8a65581e34ee916b05579ecb8d2e821 ChangeLog 1788
+MD5 9bfb7a103040285d749b4f2fc68f5c10 oinkmaster-1.1.ebuild 973
+MD5 0e23bcefb74fdb588b4a876c7750c75d oinkmaster-1.2.ebuild 848
+MD5 d39a6dd3af176592dc47aff3885ca667 files/digest-oinkmaster-1.1 65
+MD5 cc825c2a99a50e5fdc0dd0a10ddd5a36 files/digest-oinkmaster-1.2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGmiSmdTrptrqvGERAt0vAKCcHknyZ1Laao490z629GaCx+GgZgCdFZac
+eEg0tHIvhUrXCLvcBPBNZQk=
+=r6dx
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/oinkmaster/metadata.xml b/net-analyzer/oinkmaster/metadata.xml
index 7e16a6f68c53..3759ac4de74c 100644
--- a/net-analyzer/oinkmaster/metadata.xml
+++ b/net-analyzer/oinkmaster/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Maintainer</description>
-</maintainer>
-<longdescription>A set of perl scripts to manage your snort signatures.</longdescription>
+<herd>netmon</herd>
+<longdescription>Rule management for SNORT</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild b/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild
index 5e78e9af864a..e99a58f2344a 100644
--- a/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild
+++ b/net-analyzer/oinkmaster/oinkmaster-1.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/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild,v 1.1 2005/01/13 10:08:13 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit eutils
 
@@ -19,13 +19,14 @@ RDEPEND=">=dev-lang/perl-5.6.1
 SLOT="0"
 LICENSE="BSD"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 src_install() {
 	dobin oinkmaster.pl contrib/create-sidmap.pl contrib/addsid.pl contrib/makesidex.pl contrib/addmsg.pl
 	use X && dobin contrib/oinkgui.pl
-	dodoc FAQ UPGRADING README README.win32 README.gui LICENSE INSTALL contrib/README.contrib
+	dodoc FAQ UPGRADING README README.win32 README.gui contrib/README.contrib
 	doman oinkmaster.1
 	insinto /etc
-	doins oinkmaster.conf
+	sed -e 's|^url.*|url = http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz|' \
+		oinkmaster.conf > ${D}/etc/oinkmaster.conf
 }
diff --git a/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild b/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild
index f2afa4602bd7..6539a1594a3d 100644
--- a/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild
+++ b/net-analyzer/oinkmaster/oinkmaster-1.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/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild,v 1.1 2005/04/20 12:28:07 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/oinkmaster/oinkmaster-1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://oinkmaster.sf.net/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
 
 DEPEND=""
@@ -25,8 +25,7 @@ src_install() {
 		contrib/makesidex.pl contrib/addmsg.pl
 	use X && dobin contrib/oinkgui.pl
 
-	dodoc FAQ UPGRADING README README.win32 README.gui LICENSE INSTALL \
-		contrib/README.contrib
+	dodoc FAQ UPGRADING README README.win32 README.gui contrib/README.contrib
 	doman oinkmaster.1
 
 	insinto /etc
diff --git a/net-analyzer/p0f/ChangeLog b/net-analyzer/p0f/ChangeLog
index 020c2718d2c4..477452f9f879 100644
--- a/net-analyzer/p0f/ChangeLog
+++ b/net-analyzer/p0f/ChangeLog
@@ -1,6 +1,83 @@
-# ChangeLog for net-analyzer/geotrace
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# ChangeLog for net-analyzer/p0f
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/ChangeLog,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
+  30 Aug 2005; Luis Medinas <metalgod@gentoo.org> p0f-2.0.5.ebuild:
+  Marked Stable on AMD64.
+
+  19 Jun 2005; David Holm <dholm@gentoo.org> p0f-2.0.5-r1.ebuild:
+  Added to ~ppc.
+
+*p0f-2.0.5-r1 (19 Jun 2005)
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +files/p0f.initd2,
+  +files/p0f.confd, +p0f-2.0.5-r1.ebuild:
+  Adding p0f.confd and modified init script to use it. Fixes bug 91873. Thanks
+  to Lorinc Czegledi <lorinc.czegledi@mail.cpst.hu>.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/p0f-1.8.2-makefile.patch, -files/p0f-1.8.2.rc:
+  Removing old files.
+
+  19 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> p0f-2.0.5.ebuild:
+  Stable on sparc
+
+  19 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> p0f-2.0.5.ebuild:
+  Marked stable on x86.
+
+*p0f-2.0.5 (11 Mar 2005)
+
+  11 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +files/p0f.initd,
+  p0f-2.0.3.ebuild, +p0f-2.0.5.ebuild:
+  Version bump for bug 56640; cleaned up ebuilds, respect CFLAGS, respect
+  FEATURES=nostrip. Also added static support via USE=static for 2.0.5.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> p0f-2.0.3.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  15 Oct 2004; Eldad Zack <eldad@gentoo.org> p0f-1.8.2.ebuild,
+  p0f-2.0.2.ebuild, p0f-2.0.3.ebuild:
+  Removed uncalled for #include <net/bpf.h> in 1.8.2 and 2.0.2. Removed patch in
+  2.0.3 in favor of sed. Closes #50094.
+
+  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> p0f-2.0.3.ebuild:
+  Stable on sparc
+
+  25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org> p0f-2.0.3.ebuild:
+  Stable macos.
+
+  15 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org> p0f-2.0.3.ebuild:
+  Keyworded ~sparc
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, p0f-1.8.2.ebuild,
+  p0f-2.0.2.ebuild, p0f-2.0.3.ebuild:
+  Updated to use epatch. marked x86 stable.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> p0f-2.0.3.ebuild:
+  Add inherit eutils
+
+*p0f-2.0.3 (06 Feb 2004)
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> p0f-2.0.3.ebuild,
+  files/p0f-2.0.3-libpcap-include.patch:
+  Version bump and fix for libpcap include files.
+
+  14 Dec 2003; Alexander Gabert <pappy@gentoo.org> :
+  added digest and tested
+
+  10 Dec 2003; Alexander Gabert <pappy@gentoo.org> p0f-2.0.2.ebuild:
+  bugfix 35476 by gustavoz, changing SRC_URI for updated versions of p0f
+
+*p0f-2.0.2 (04 Oct 2003)
+
+  04 Oct 2003; Alexander Gabert <pappy@gentoo.org> p0f-2.0.2.ebuild:
+  removed sandbox violations from absolute paths in mk/Linux Makefile
+
+  04 Oct 2003; Alexander Gabert <pappy@gentoo.org> :
+  added current version 2.0.2 from lcamtuf homepage
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *p0f-1.8.2 (21 Feb 2002)
 
 	21 Feb 2002; F.Meyndert <m0rpheus@gentoo.org> p0f-1.8.2.ebuild
diff --git a/net-analyzer/p0f/Manifest b/net-analyzer/p0f/Manifest
index 35366cc1504e..007270d34988 100644
--- a/net-analyzer/p0f/Manifest
+++ b/net-analyzer/p0f/Manifest
@@ -1,5 +1,21 @@
-MD5 aa8a5812386df328697327a0e7107427 ChangeLog 468
-MD5 994925b7f99fb96fafe52a0c4de0eadf p0f-1.8.2.ebuild 824
-MD5 f6ee2143700cca09dfededeef39ed216 files/digest-p0f-1.8.2 57
-MD5 f184953061e4a88dad985e15eb2b4f22 files/p0f-1.8.2-makefile.patch 377
-MD5 4300ad8d7b84f6ecbde6eae906925700 files/p0f-1.8.2.rc 1292
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 96d5bba7d9820536e271754ecd470720 ChangeLog 3053
+MD5 a6504b2ab3f5f778d46643a087162f71 metadata.xml 250
+MD5 6f6efeb6086e235a1e2d90154257404b p0f-2.0.3.ebuild 923
+MD5 6e436e74ea29aff070f41f575e03f05d p0f-2.0.5-r1.ebuild 1362
+MD5 c9e7e918a45db4e991e2402ce109de68 p0f-2.0.5.ebuild 1141
+MD5 d68117a6108bcd2769ac8128cec37896 files/digest-p0f-2.0.3 58
+MD5 393eeebe57dc144d2d5c60ccb33f96e6 files/digest-p0f-2.0.5 58
+MD5 393eeebe57dc144d2d5c60ccb33f96e6 files/digest-p0f-2.0.5-r1 58
+MD5 366dc57024aeed06f2707e568a629dce files/p0f.confd 68
+MD5 0c97d34501b34ec11763fde7fc38dac9 files/p0f.initd 1270
+MD5 a326fd4ccb89a5551f5c7f81c427fdb7 files/p0f.initd2 1327
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDFHwVwUpWvClEHQoRArtUAJ9unXUFo5vZ8fv5/m8R714zM3/s5wCfd5cp
+R43ms301S4tQVCpI0TUkSNI=
+=V3HZ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/p0f/files/p0f.initd b/net-analyzer/p0f/files/p0f.initd
index 09d1ce333b3d..31d76894b598 100755
--- a/net-analyzer/p0f/files/p0f.initd
+++ b/net-analyzer/p0f/files/p0f.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd,v 1.1 2005/03/11 10:46:08 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 start() {
 	ebegin "Starting p0f"
diff --git a/net-analyzer/p0f/files/p0f.initd2 b/net-analyzer/p0f/files/p0f.initd2
index f32f11ca82c0..918abfdb006d 100755
--- a/net-analyzer/p0f/files/p0f.initd2
+++ b/net-analyzer/p0f/files/p0f.initd2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd2,v 1.1 2005/06/19 01:54:40 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/files/p0f.initd2,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 start() {
 	ebegin "Starting p0f"
diff --git a/net-analyzer/p0f/p0f-2.0.3.ebuild b/net-analyzer/p0f/p0f-2.0.3.ebuild
index 6c1daf797892..c830b8534524 100644
--- a/net-analyzer/p0f/p0f-2.0.3.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.3.ebuild
@@ -1,38 +1,36 @@
-# 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/net-analyzer/p0f/p0f-2.0.3.ebuild,v 1.1 2004/02/06 14:56:04 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="p0f performs passive OS detection based on SYN packets."
-# the p0f.tgz always resembles the latest version, trashing the digest md5sum then, discovered and fixed by gustavoz
-SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
 HOMEPAGE="http://lcamtuf.coredump.cx/p0f.shtml"
-SLOT="0"
+SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
+
 LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~amd64"
+SLOT="0"
+KEYWORDS="x86 ~amd64 sparc ppc-macos"
 IUSE=""
-S=${WORKDIR}/${PN}
 
+DEPEND="virtual/libpcap"
 
-DEPEND="net-libs/libpcap"
+S="${WORKDIR}/${PN}"
 
 src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-libpcap-include.patch
-}
-
-src_compile() {
-	make || die
+	unpack ${A} && cd ${S}
+	sed -i 's;#include <net/bpf.h>;;' p0f.c || die "sed p0f.c failed"
+	sed -i -e 's|^\(all: $(FILE)\).*$|\1|' \
+		-e "s|^\(CFLAGS.*=\).*$|\1${CFLAGS}|" mk/* || die "sed makefiles failed"
 }
 
 src_install () {
-	dosbin p0f p0frep
+	dosbin p0f p0frep || die
 
 	insinto /etc/p0f
 	doins p0f.fp p0fa.fp p0fr.fp
 
-	doman p0f.1
-
-	dodoc README
+	doman p0f.1 || die
+	cd doc
+	dodoc ChangeLog CREDITS KNOWN_BUGS README TODO
 }
-
diff --git a/net-analyzer/p0f/p0f-2.0.5-r1.ebuild b/net-analyzer/p0f/p0f-2.0.5-r1.ebuild
index 2c3429486311..199494e93e85 100644
--- a/net-analyzer/p0f/p0f-2.0.5-r1.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.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/net-analyzer/p0f/p0f-2.0.5-r1.ebuild,v 1.1 2005/06/19 01:54:40 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc-macos"
+KEYWORDS="~amd64 ~ppc ~ppc-macos ~sparc ~x86"
 IUSE="static"
 
 DEPEND="virtual/libpcap"
diff --git a/net-analyzer/p0f/p0f-2.0.5.ebuild b/net-analyzer/p0f/p0f-2.0.5.ebuild
index e74db3285f0b..65f273c1266b 100644
--- a/net-analyzer/p0f/p0f-2.0.5.ebuild
+++ b/net-analyzer/p0f/p0f-2.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/net-analyzer/p0f/p0f-2.0.5.ebuild,v 1.1 2005/03/11 10:46:08 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/p0f/p0f-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://lcamtuf.coredump.cx/p0f/${P}.tgz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc-macos"
+KEYWORDS="amd64 ~ppc-macos sparc x86"
 IUSE="static"
 
 DEPEND="virtual/libpcap"
diff --git a/net-analyzer/packit/ChangeLog b/net-analyzer/packit/ChangeLog
index 6c7460a44fc5..8989b3bd117c 100644
--- a/net-analyzer/packit/ChangeLog
+++ b/net-analyzer/packit/ChangeLog
@@ -1,6 +1,65 @@
 # ChangeLog for net-analyzer/packit
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/ChangeLog,v 1.1 2003/08/18 03:32:41 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+  09 Oct 2005; <mkay@gentoo.org> packit-1.0.ebuild:
+  Adding libpcap to dependencies. Closing bug #108117
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> packit-1.0.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  17 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> packit-1.0.ebuild:
+  Fix a header problem with libpcap. Thanks to soulse for testing the fix.
+
+  09 Mar 2005; Michael Sterrett <mr_bones_@gentoo.org> -packit-0.7.ebuild:
+  clean old broken ebuild
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> packit-0.7.ebuild,
+  packit-1.0.ebuild:
+  moved to virtual/libpcap dependancy
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> -packit-0.6.0c-r1.ebuild,
+  packit-1.0.ebuild:
+  x86 stable
+
+  27 Jul 2004; Alexander Plank <alexander@gentoo.org> packit-1.0.ebuild:
+  Added to ~macos (~ because fink libnet conflicts with it). Builds, but doesn't 
+seem to get added to the path.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> packit-1.0.ebuild:
+  Added to ~ppc.
+
+*packit-1.0 (12 Jul 2004)
+
+  12 Jul 2004; Eldad Zack <eldad@gentoo.org> +packit-1.0.ebuild:
+  Version bump.
+
+  12 Jul 2004; Eldad Zack <eldad@gentoo.org> packit-0.7.ebuild:
+  Fixed deps - can only compile with libnet-1.1.1. Closes #56694.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  packit-0.6.0c-r1.ebuild, packit-0.7.ebuild:
+  Marked x86 stable
+
+*packit-0.7 (20 Oct 2003)
+
+  11 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+  Sed the right files when fixing libpcap (patch from John Copenhaver).
+
+  25 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Update to use latest libpcap #39389 by Sven Wegener.
+
+  20 Oct 2003; Heinrich Wendel <lanius@gentoo.org> packit-0.7.ebuild:
+  bump
+
+  08 Oct 2003; Joel Hill <hillster@gentoo.org> packit-0.6.0c-r1.ebuild,
+  packit-0.6.0c.ebuild:
+  marking stable. cleanup
+
+*packit-0.6.0c-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *packit-0.6.0c (17 Aug 2003)
 
diff --git a/net-analyzer/packit/Manifest b/net-analyzer/packit/Manifest
index ecf9507d72e4..626963cf6841 100644
--- a/net-analyzer/packit/Manifest
+++ b/net-analyzer/packit/Manifest
@@ -1,6 +1,4 @@
-MD5 5556efb595e0306b7d1397a160aef4ff files/digest-packit-0.6.0c 62
-MD5 5de90cc0a881c69a8ede650ae09cf7c4 files/packit-0.6.0c-gentoo.patch 1519
-MD5 5556efb595e0306b7d1397a160aef4ff files/digest-packit-0.6.0c-r1 62
-MD5 705479e9f3f67159f006dd6fb7abf980 ChangeLog 522
-MD5 ae32de89439bae73e55276430e8facf7 packit-0.6.0c.ebuild 913
-MD5 85f381387c0ba71a85ab09d9971ef88e packit-0.6.0c-r1.ebuild 694
+MD5 0485b0eca49f2f766aa86d2d61d7c5af ChangeLog 2328
+MD5 828add64d896c29b87566ae8c0842d9d metadata.xml 291
+MD5 613e2fcaad8a2153c6501da100641f4a packit-1.0.ebuild 787
+MD5 7eb74f02f5f953dd695526486d7ceed6 files/digest-packit-1.0 59
diff --git a/net-analyzer/packit/packit-1.0.ebuild b/net-analyzer/packit/packit-1.0.ebuild
index ee88e885154b..dfb9b9bec81a 100644
--- a/net-analyzer/packit/packit-1.0.ebuild
+++ b/net-analyzer/packit/packit-1.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/net-analyzer/packit/packit-1.0.ebuild,v 1.1 2004/07/12 11:14:53 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/packit/packit-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit eutils
 
@@ -10,20 +10,18 @@ SRC_URI="http://www.packetfactory.net/projects/packit/downloads/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~ppc-macos"
 IUSE=""
 
-DEPEND=">=net-libs/libnet-1.1.2*"
+DEPEND=">=net-libs/libnet-1.1.2
+		net-libs/libpcap"
 
-src_unpack() {
+src_unpack(){
 	unpack ${A}
-	cd ${S}
-	has_version '>=net-libs/libpcap-0.8.1' \
-		&& sed -i 's!^#include <net/bpf.h>$!#include <pcap-bpf.h>!' \
-		src/{globals,main}.h
+	sed -i 's:net/bpf.h:pcap-bpf.h:g' ${S}/src/{globals.h,main.h} || die
 }
 
 src_install() {
-	make install DESTDIR=${D} || die
+	emake install DESTDIR=${D} || die
 	dodoc INSTALL LICENSE VERSION docs/*
 }
diff --git a/net-analyzer/paketto/ChangeLog b/net-analyzer/paketto/ChangeLog
index 50126dd361e7..2e4df7a96f38 100644
--- a/net-analyzer/paketto/ChangeLog
+++ b/net-analyzer/paketto/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-analyzer/paketto
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/ChangeLog,v 1.1 2002/11/23 20:18:35 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/ChangeLog,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> paketto-1.10-r1.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> paketto-1.10-r1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> paketto-1.10-r1.ebuild:
+  QA: IUSE variable was missing.
+
+*paketto-1.10-r1 (20 Mar 2003)
+
+  27 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add patch to use system libnet instead of built in one #43012.
+
+  18 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Add gcc3 patch #28894 and protect local libnet from system version #28982.
+
+  20 Mar 2003; Aron Griffis <agriffis@gentoo.org> paketto-1.0.ebuild,
+  paketto-1.10-r1.ebuild, paketto-1.10.ebuild:
+  Remove pic USE-flag and bump rev
+
+*paketto-1.10 (27 Jan 2003)
+
+  27 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #13587.
 
 *paketto-1.0 (23 Nov 2002)
 
diff --git a/net-analyzer/paketto/Manifest b/net-analyzer/paketto/Manifest
index e69de29bb2d1..e637599a6b5f 100644
--- a/net-analyzer/paketto/Manifest
+++ b/net-analyzer/paketto/Manifest
@@ -0,0 +1,6 @@
+MD5 7d879a48977b4d8cf130ce4d16b80d35 ChangeLog 1231
+MD5 95051bf20b7a347505eff3b097fa2bb8 metadata.xml 812
+MD5 71cdd57828dda72bb897e005d715ee96 paketto-1.10-r1.ebuild 948
+MD5 2f623e420e838cda4b64f6f1d48e2f04 files/1.10-gcc3.patch 785
+MD5 c41694742a0abb115eec2c9acfc2c127 files/1.10-libnet-1.0.patch 1944
+MD5 c516fafec2f15be22b14097832e91054 files/digest-paketto-1.10-r1 64
diff --git a/net-analyzer/paketto/files/digest-paketto-1.10-r1 b/net-analyzer/paketto/files/digest-paketto-1.10-r1
index 52e2b75dc258..935a21aaff24 100644
--- a/net-analyzer/paketto/files/digest-paketto-1.10-r1
+++ b/net-analyzer/paketto/files/digest-paketto-1.10-r1
@@ -1 +1 @@
-MD5 7fd82af09a6493f24c8681f7bbf03898 paketto-1.10.tar.gz 90010
+MD5 7fd82af09a6493f24c8681f7bbf03898 paketto-1.10.tar.gz 900104
diff --git a/net-analyzer/paketto/paketto-1.10-r1.ebuild b/net-analyzer/paketto/paketto-1.10-r1.ebuild
index 5823342fe501..02435970fdae 100644
--- a/net-analyzer/paketto/paketto-1.10-r1.ebuild
+++ b/net-analyzer/paketto/paketto-1.10-r1.ebuild
@@ -1,25 +1,29 @@
-# 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/net-analyzer/paketto/paketto-1.10-r1.ebuild,v 1.1 2003/03/20 14:37:48 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/paketto/paketto-1.10-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Paketto Keiretsu - experimental TCP/IP tools - scanrand, minewt, lc, phentropy, paratrace"
-HOMEPAGE="http://www.doxpara.com/"
+HOMEPAGE="http://www.doxpara.com/paketto/"
 SRC_URI="http://www.doxpara.com/paketto/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 #paketto comes with local copies of these ...
-#DEPEND="net-libs/libpcap
-#	net-libs/libnet
+DEPEND="<net-libs/libnet-1.1
+	>=net-libs/libnet-1.0.2a-r3"
+#	virtual/libpcap
 #	dev-libs/libtomcrypt"
 
-src_compile() {
-	# --with-libnet-bin=/usr --with-pcap-lib=/usr --with-pcap-inc=/usr --with-tm-inc=/usr"
-	econf --with-gnu-ld || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
 }
 
 src_install() {
diff --git a/net-analyzer/pinger/ChangeLog b/net-analyzer/pinger/ChangeLog
index 2602f3c7f982..987aed89350d 100644
--- a/net-analyzer/pinger/ChangeLog
+++ b/net-analyzer/pinger/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/pinger
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.1 2005/06/03 18:13:05 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/ChangeLog,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
+
+  20 Sep 2005; <otavio@gentoo.org> pinger-0.30.ebuild:
+  Corrected a typo in HOMEPAGE and marked as x86
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> pinger-0.30.ebuild:
+  Added to ~ppc.
 
 *pinger-0.30 (03 Jun 2005)
 
diff --git a/net-analyzer/pinger/Manifest b/net-analyzer/pinger/Manifest
index 7296eb8ea5fc..cfd799e88c08 100644
--- a/net-analyzer/pinger/Manifest
+++ b/net-analyzer/pinger/Manifest
@@ -1,2 +1,4 @@
-MD5 979a19ceda4eace16d3af6cfb3242968 pinger-0.30.ebuild 581
+MD5 a73ebba49a966c7695f02731d22408f3 ChangeLog 622
+MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
+MD5 f749ca93b6d3496ac1480d348968919d pinger-0.30.ebuild 675
 MD5 06000a9a0011d51d5d3a1d831cda4cf5 files/digest-pinger-0.30 63
diff --git a/net-analyzer/pinger/pinger-0.30.ebuild b/net-analyzer/pinger/pinger-0.30.ebuild
index 826b7c30c1b2..67d39581f2ee 100644
--- a/net-analyzer/pinger/pinger-0.30.ebuild
+++ b/net-analyzer/pinger/pinger-0.30.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.30.ebuild,v 1.1 2005/06/03 18:13:05 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pinger/pinger-0.30.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 DESCRIPTION="Cyclic multi ping utility for selected adresses using GTK/ncurses."
-HOMEPAGE="http://http://aa.vslib.cz/silk/projekty/pinger/index.php"
+HOMEPAGE="http://aa.vslib.cz/silk/projekty/pinger/index.php"
 SRC_URI="http://aa.vslib.cz/silk/projekty/pinger/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 
 DEPEND="
diff --git a/net-analyzer/pktstat/ChangeLog b/net-analyzer/pktstat/ChangeLog
index b4a3504b54b1..0b7164e258b6 100644
--- a/net-analyzer/pktstat/ChangeLog
+++ b/net-analyzer/pktstat/ChangeLog
@@ -1,9 +1,30 @@
 # ChangeLog for net-analyzer/pktstat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/ChangeLog,v 1.1 2003/10/10 17:57:59 mholzer Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
-*pktstat-1.7.2q (11 Oct 2003)
+  11 Aug 2005; Luis Medinas <metalgod@gentoo.org> pktstat-1.7.5.ebuild:
+  Added ~amd64 keywords.
 
-  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> pktstat-1.7.2q.ebuild:
-  Initial Version. Submitted by Jeff Shirley <shirjs0@wfu.edu> in #25807.
+  19 Jul 2005; David Holm <dholm@gentoo.org> pktstat-1.7.5.ebuild:
+  Added to ~ppc.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> pktstat-1.7.5.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> pktstat-1.7.2q.ebuild,
+  pktstat-1.7.5.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*pktstat-1.7.5 (06 Nov 2004)
 
+  06 Nov 2004; Eldad Zack <eldad@gentoo.org> +pktstat-1.7.5.ebuild:
+  Version bump.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  pktstat-1.7.2q.ebuild:
+  Tidy. x86 stable
+
+*pktstat-1.7.2q (10 Jul 2004)
+
+  11 Oct 2003; Martin Holzer <mholzer@gentoo.org> pktstat-1.7.2q.ebuild:
+  Initial Version. Submitted by Jeff Shirley <shirjs0@wfu.edu> in #25807.
\ No newline at end of file
diff --git a/net-analyzer/pktstat/Manifest b/net-analyzer/pktstat/Manifest
index 57e9670f56cd..4aeb5f43d64d 100644
--- a/net-analyzer/pktstat/Manifest
+++ b/net-analyzer/pktstat/Manifest
@@ -1,2 +1,6 @@
-MD5 694b893c3465f8be29562a39bb240c27 pktstat-1.7.2q.ebuild 594
+MD5 2addc5da592e68c5a0cdb4ffa0210b22 ChangeLog 1044
+MD5 08099c4eee1a2c2b635e71bf692896d2 metadata.xml 245
+MD5 efdee889ccdccb473556f5711b98e200 pktstat-1.7.2q.ebuild 722
+MD5 1a636805243331f4d1a73dd046a66576 pktstat-1.7.5.ebuild 695
 MD5 16e793e1046d368c20529662fcb19020 files/digest-pktstat-1.7.2q 65
+MD5 34b11a79f6f80f332a738732e86be6af files/digest-pktstat-1.7.5 64
diff --git a/net-analyzer/pktstat/pktstat-1.7.2q.ebuild b/net-analyzer/pktstat/pktstat-1.7.2q.ebuild
index 999103f5f6a5..c5a86d6ad196 100644
--- a/net-analyzer/pktstat/pktstat-1.7.2q.ebuild
+++ b/net-analyzer/pktstat/pktstat-1.7.2q.ebuild
@@ -1,16 +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/net-analyzer/pktstat/pktstat-1.7.2q.ebuild,v 1.1 2003/10/10 17:57:59 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/pktstat-1.7.2q.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A network monitoring tool, with bandwidth tracking"
 #SRC_URI="http://www.itee.uq.edu.au/~leonard/personal/software/${P}.tar.gz"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 HOMEPAGE="http://www.itee.uq.edu.au/~leonard/personal/software/#pktstat"
+
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
-DEPEND=">=net-libs/libpcap-0.7.2
+DEPEND="virtual/libpcap
 	>=sys-libs/ncurses-5.3-r1"
 
 src_compile() {
diff --git a/net-analyzer/pktstat/pktstat-1.7.5.ebuild b/net-analyzer/pktstat/pktstat-1.7.5.ebuild
index 8192ec440554..e1f8eb85bade 100644
--- a/net-analyzer/pktstat/pktstat-1.7.5.ebuild
+++ b/net-analyzer/pktstat/pktstat-1.7.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/net-analyzer/pktstat/pktstat-1.7.5.ebuild,v 1.1 2004/11/06 13:12:33 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pktstat/pktstat-1.7.5.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 DESCRIPTION="A network monitoring tool, with bandwidth tracking"
 SRC_URI="http://www.adaptive-enterprises.com.au/~d/software/pktstat/${P}.tar.gz"
@@ -8,10 +8,10 @@ HOMEPAGE="http://www.adaptive-enterprises.com.au/~d/software/pktstat/"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND=">=net-libs/libpcap-0.7.2
+DEPEND="virtual/libpcap
 	>=sys-libs/ncurses-5.3-r1"
 
 src_compile() {
diff --git a/net-analyzer/pmacct/ChangeLog b/net-analyzer/pmacct/ChangeLog
index 37023c12383f..f6b856b0c79f 100644
--- a/net-analyzer/pmacct/ChangeLog
+++ b/net-analyzer/pmacct/ChangeLog
@@ -1,6 +1,144 @@
 # ChangeLog for net-analyzer/pmacct
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.1 2004/07/09 14:11:02 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/ChangeLog,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
+
+*pmacct-0.9.4_p1 (15 Nov 2005)
+
+  15 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.9.3.ebuild,
+  +pmacct-0.9.4_p1.ebuild:
+  0.9.4_p1 version bump.
+
+*pmacct-0.9.4 (08 Nov 2005)
+
+  08 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.9.2.ebuild,
+  +pmacct-0.9.4.ebuild:
+  0.9.4 version bump.
+
+*pmacct-0.9.3 (11 Oct 2005)
+
+  11 Oct 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.9.1.ebuild,
+  +pmacct-0.9.3.ebuild:
+  0.9.3 version bump.
+
+*pmacct-0.9.2 (15 Sep 2005)
+
+  15 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.8.5.ebuild,
+  -pmacct-0.8.6.ebuild, -pmacct-0.8.8.ebuild, -pmacct-0.9.0.ebuild,
+  +pmacct-0.9.2.ebuild:
+  Version bump, removing old versions. Added debug and 64bit USE flags to 0.9.2.
+
+*pmacct-0.9.1 (16 Aug 2005)
+
+  16 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> +pmacct-0.9.1.ebuild:
+  Version bump.
+
+  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> pmacct-0.8.7.ebuild:
+  Stable on ppc.
+
+*pmacct-0.9.0 (25 Jul 2005)
+
+  25 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> pmacct-0.8.7.ebuild,
+  +pmacct-0.9.0.ebuild:
+  0.8.7 x86 stable, 0.9.0 version bump.
+
+*pmacct-0.8.8 (27 Jun 2005)
+
+  27 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.8.3.ebuild,
+  -pmacct-0.8.4.ebuild, pmacct-0.8.6.ebuild, +pmacct-0.8.8.ebuild:
+  Version bump, marking 0.8.6 x86 stable.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> pmacct-0.8.5.ebuild:
+  Stable on ppc.
+
+*pmacct-0.8.7 (16 Jun 2005)
+
+  16 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +pmacct-0.8.7.ebuild:
+  According to Paolo Lucente, libpcap from CVS is not a *requirement*, so here
+  is the version bump.
+
+  14 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> pmacct-0.8.5.ebuild:
+  Marked 0.8.5 x86 stable. Note that version 0.8.7 is out, but I am not adding
+  it yet because it possibly requires libpcap from cvs.
+
+*pmacct-0.8.6 (24 May 2005)
+
+  24 May 2005; Marcelo Goes <vanquirius@gentoo.org> +pmacct-0.8.6.ebuild:
+  Version bump.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> pmacct-0.8.4.ebuild:
+  Marked x86 stable.
+
+*pmacct-0.8.5 (04 May 2005)
+
+  04 May 2005; Marcelo Goes <vanquirius@gentoo.org> +pmacct-0.8.5.ebuild:
+  Version bump.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> pmacct-0.8.3.ebuild:
+  Stable on ppc.
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.8.2.ebuild,
+  pmacct-0.8.3.ebuild:
+  Marked 0.8.3 x86 stable, removing old ebuild.
+
+  14 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> pmacct-0.8.4.ebuild:
+  added ~amd64 to KEYWORDS, fixes #89082
+
+*pmacct-0.8.4 (14 Apr 2005)
+
+  14 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.8.1.ebuild,
+  -pmacct-0.8.1_p1.ebuild, pmacct-0.8.2.ebuild, +pmacct-0.8.4.ebuild:
+  Removing old versions, marking 0.8.2 x86 stable and adding 0.8.4. The last
+  version now works with gcc-4.
+
+*pmacct-0.8.3 (29 Mar 2005)
+
+  29 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> -pmacct-0.8.0.ebuild,
+  +pmacct-0.8.3.ebuild:
+  Version bump, removing old version.
+
+*pmacct-0.8.2 (08 Mar 2005)
+
+  08 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> -pmacct-0.7.1.ebuild,
+  -pmacct-0.7.9.ebuild, +pmacct-0.8.2.ebuild:
+  Version bump for bug 84505; tidy old ebuilds.
+
+*pmacct-0.8.1_p1 (23 Feb 2005)
+
+  23 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> pmacct-0.8.1.ebuild,
+  +pmacct-0.8.1_p1.ebuild:
+  Version bump for bug 82996; marked 0.8.1 stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> pmacct-0.7.1.ebuild,
+  pmacct-0.7.9.ebuild, pmacct-0.8.0.ebuild, pmacct-0.8.1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*pmacct-0.8.1 (25 Jan 2005)
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -pmacct-0.7.0.ebuild,
+  +pmacct-0.8.1.ebuild:
+  Version bump for bug 79466.
+
+*pmacct-0.8.0 (13 Jan 2005)
+
+  13 Jan 2005; Daniel Black <dragonheart@gentoo.org> +pmacct-0.8.0.ebuild:
+  Version bump as per bug #77696. Thanks to Vanquirius <marcelogoes@gmail.com>
+
+*pmacct-0.7.9 (09 Jan 2005)
+
+  09 Jan 2005; Daniel Black <dragonheart@gentoo.org> +pmacct-0.7.9.ebuild:
+  Version bump as per bug #75194. Thanks to Vanquirius <marcelogoes@gmail.com>
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> pmacct-0.7.1.ebuild:
+  x86 stable
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> pmacct-0.7.1.ebuild:
+  Added to ~ppc.
+
+*pmacct-0.7.1 (16 Jul 2004)
+
+  16 Jul 2004; Eldad Zack <eldad@gentoo.org> +pmacct-0.7.1.ebuild:
+  Version bump. Added mmap useflag. dodoc fixes. Thanks to Bjarke Freund-Hansen
+  <gentoo-bugzilla@rocekiller.dk>. Closes #57173
 
   09 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/pmacctd-conf.d,
   +files/pmacctd-init.d:
diff --git a/net-analyzer/pmacct/Manifest b/net-analyzer/pmacct/Manifest
index e5adf42634ca..d0cc9c4df01a 100644
--- a/net-analyzer/pmacct/Manifest
+++ b/net-analyzer/pmacct/Manifest
@@ -1,2 +1,10 @@
-MD5 e40216220aedf3ae1d80b2b39f1e7881 pmacct-0.7.0.ebuild 1150
-MD5 9c8f7c9b62771e795e0d0477b09d6242 files/digest-pmacct-0.7.0 64
+MD5 36bb0a82b996e17f882f903ebc9ad1f5 ChangeLog 4872
+MD5 c0caf197a66283cd3f7141151216ee48 files/digest-pmacct-0.8.7 64
+MD5 1a97937af42a49e1212f5e5a4da40950 files/digest-pmacct-0.9.4 64
+MD5 84762e58c0b2e52fcdc27f4a7345908c files/digest-pmacct-0.9.4_p1 66
+MD5 50333f1c79a80df31266ce7235cbf36c files/pmacctd-conf.d 313
+MD5 2afa8e97312b03f3e119c0befed9e7d3 files/pmacctd-init.d 869
+MD5 808a9a788ae7955af0a3c442cafee866 metadata.xml 243
+MD5 5362e613b8752f0fa5765efdd1de0061 pmacct-0.8.7.ebuild 1500
+MD5 f2449c412c92b4f7f7b52d074bd078a1 pmacct-0.9.4.ebuild 1566
+MD5 3cdf078e7d3c9b7576b74c1aa641f8b6 pmacct-0.9.4_p1.ebuild 1569
diff --git a/net-analyzer/pmacct/files/pmacctd-conf.d b/net-analyzer/pmacct/files/pmacctd-conf.d
index 80354bd3cdcb..70815f5fcfae 100644
--- a/net-analyzer/pmacct/files/pmacctd-conf.d
+++ b/net-analyzer/pmacct/files/pmacctd-conf.d
@@ -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/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.1 2004/07/09 14:11:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-conf.d,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 # Interface to listen on
 INTERFACE="eth0"
diff --git a/net-analyzer/pmacct/files/pmacctd-init.d b/net-analyzer/pmacct/files/pmacctd-init.d
index 42f3224dd363..a809a3631c92 100644
--- a/net-analyzer/pmacct/files/pmacctd-init.d
+++ b/net-analyzer/pmacct/files/pmacctd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-analyzer/pmacct/files/pmacctd-init.d,v 1.1 2004/07/09 14:11:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/files/pmacctd-init.d,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/pmacct/pmacct-0.8.7.ebuild b/net-analyzer/pmacct/pmacct-0.8.7.ebuild
index b7e9ada8c507..94508b2a10fb 100644
--- a/net-analyzer/pmacct/pmacct-0.8.7.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.8.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/net-analyzer/pmacct/pmacct-0.8.7.ebuild,v 1.1 2005/06/16 18:15:18 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.8.7.ebuild,v 1.1.1.1 2005/11/30 10:12:43 chriswhite Exp $
 
 MY_P="${P%_*}"
 S="${WORKDIR}/${MY_P}"
@@ -10,7 +10,7 @@ SRC_URI="http://www.ba.cnr.it/~paolo/pmacct/${P/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="~amd64 ppc x86"
 IUSE="ipv6 mmap mysql postgres"
 
 RDEPEND="virtual/libpcap
diff --git a/net-analyzer/pmacct/pmacct-0.9.4.ebuild b/net-analyzer/pmacct/pmacct-0.9.4.ebuild
index ad4dc2956076..c81b0218b4f6 100644
--- a/net-analyzer/pmacct/pmacct-0.9.4.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.9.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/net-analyzer/pmacct/pmacct-0.9.4.ebuild,v 1.1 2005/11/08 13:49:55 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.9.4.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 MY_P="${P%_*}"
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/pmacct/pmacct-0.9.4_p1.ebuild b/net-analyzer/pmacct/pmacct-0.9.4_p1.ebuild
index 1e34a167dd88..c4c66866cb1c 100644
--- a/net-analyzer/pmacct/pmacct-0.9.4_p1.ebuild
+++ b/net-analyzer/pmacct/pmacct-0.9.4_p1.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/net-analyzer/pmacct/pmacct-0.9.4_p1.ebuild,v 1.1 2005/11/15 15:04:42 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-0.9.4_p1.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 MY_P="${P%_*}"
 S="${WORKDIR}/${MY_P}"
diff --git a/net-analyzer/poink/ChangeLog b/net-analyzer/poink/ChangeLog
index 189e011ce41a..1fbdd1964f4d 100644
--- a/net-analyzer/poink/ChangeLog
+++ b/net-analyzer/poink/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/poink
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/poink/ChangeLog,v 1.1 2005/05/17 21:06:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/poink/ChangeLog,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
+
+  29 Aug 2005; <dang@gentoo.org> poink-2.03.ebuild:
+  Marked ~amd64
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> poink-2.03.ebuild:
+  Added to ~ppc.
 
 *poink-2.03 (17 May 2005)
 
diff --git a/net-analyzer/poink/Manifest b/net-analyzer/poink/Manifest
index 127fb73c0274..948f9cda4a94 100644
--- a/net-analyzer/poink/Manifest
+++ b/net-analyzer/poink/Manifest
@@ -1,2 +1,14 @@
-MD5 a7355326c45d9dd308efcb3909674540 poink-2.03.ebuild 460
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 cacdb4b00886c764bdfe6a70065ec204 poink-2.03.ebuild 668
+MD5 a7438d7da7e549ed937c4ef179406bbc ChangeLog 555
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
 MD5 0f64adc3e6d4d1bf7973db67124e5b99 files/digest-poink-2.03 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDE2xYomPajV0RnrERAugPAJ43XmO945XAATJSexLSl5qbHdoXRACfQzlk
+MdVg2dZXl2kTGUpT2wzZX8A=
+=NC+d
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/poink/poink-2.03.ebuild b/net-analyzer/poink/poink-2.03.ebuild
index d6a2d0b35f03..2f83f78f5868 100644
--- a/net-analyzer/poink/poink-2.03.ebuild
+++ b/net-analyzer/poink/poink-2.03.ebuild
@@ -1,13 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/poink/poink-2.03.ebuild,v 1.1 2005/05/17 21:06:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/poink/poink-2.03.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
 inherit eutils toolchain-funcs
+
+DESCRIPTION="TCP/IP-based ping implementation"
 HOMEPAGE="http://directory.fsf.org/security/system/poink.html"
 SRC_URI="http://ep09.pld-linux.org/~mmazur/poink/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 DEPEND="virtual/libc"
 
diff --git a/net-analyzer/portmon/ChangeLog b/net-analyzer/portmon/ChangeLog
index 78933c40f0ac..973ab6847306 100644
--- a/net-analyzer/portmon/ChangeLog
+++ b/net-analyzer/portmon/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-analyzer/portmon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/ChangeLog,v 1.1 2003/07/29 01:36:45 gregf Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> portmon-1.9.ebuild,
+  portmon-2.0.ebuild:
+  Typo in DESCRIPTION: netwok -> network. Bug 59717.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> portmon-1.9.ebuild,
+  portmon-2.0.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> portmon-1.9.ebuild,
+  portmon-2.0.ebuild:
+  change virtual/glibc to virtual/libc
+
+  28 Apr 2004; David Holm <dholm@gentoo.org> portmon-2.0.ebuild:
+  Added to ~ppc.
+
+*portmon-2.0 (27 Apr 2004)
+
+  27 Apr 2004; Martin Holzer <mholzer@gentoo.org> portmon-2.0.ebuild:
+  Version bumped.
+
+  22 Mar 2004; Michael Boman <mboman@gentoo.org> portmon-1.9.ebuild:
+  Changed RDEPEND to fix bug 45343.
 
 *portmon-1.9 (28 Jul 2003)
 
diff --git a/net-analyzer/portmon/Manifest b/net-analyzer/portmon/Manifest
index dbf00b2aad73..343c6987b7e4 100644
--- a/net-analyzer/portmon/Manifest
+++ b/net-analyzer/portmon/Manifest
@@ -1,4 +1,17 @@
-MD5 181f5111f329189984931c89573e7b02 portmon-1.9.ebuild 734
-MD5 d0c16937058c732535c6d12e32329c15 ChangeLog 338
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 34eaa82507d90af069d07853218059c0 portmon-2.0.ebuild 804
+MD5 b79827f29769fbc983b0240146478db1 portmon-1.9.ebuild 799
+MD5 a96bf2e14332b5aa68677f2061ebef77 ChangeLog 1107
+MD5 28a74772b3ddec6197c687a12f0ef9a8 metadata.xml 242
 MD5 52e3317349da2a915781b132dba91d9f files/digest-portmon-1.9 63
-MD5 53879e94df6060abe23c7bab8ef63a05 files/portmon.init 699
+MD5 3148050ea7db3913004266dbb22ef788 files/digest-portmon-2.0 63
+MD5 e8382aff2db06f680459a2d858b90879 files/portmon.init 748
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBKhHLT+MN7JbqCpMRAk2gAJsEXpPmBqmFnX1U2C3O2AEXJwpCnQCfXI03
+ztn498vFftPhbzbX9JWk/ME=
+=jR6J
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/portmon/files/portmon.init b/net-analyzer/portmon/files/portmon.init
index 0cedcfc67536..f14af2738f89 100644
--- a/net-analyzer/portmon/files/portmon.init
+++ b/net-analyzer/portmon/files/portmon.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/files/portmon.init,v 1.1 2003/07/29 01:36:45 gregf Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/files/portmon.init,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 # configuration is done in /etc/pormon.sh
 
@@ -10,21 +10,21 @@ depend() {
 }
 
 checkconfig() {
-    if [ ! -e /etc/portmon/portmon.hosts ]; then
-         error " You need /etc/portmon/portmaon.hosts to run portmon."
-	 return 1
-    fi
+	if [ ! -e /etc/portmon/portmon.hosts ]; then
+		error " You need /etc/portmon/portmaon.hosts to run portmon."
+		return 1
+	fi
 }
 
 start() {
-    checkconfig || return 1
-    ebegin "Starting portmon"
-    start-stop-daemon --start --quiet --exec /usr/sbin/portmon -- -d -c /etc/portmon/portmon.hosts
-    eend $?
+	checkconfig || return 1
+	ebegin "Starting portmon"
+	start-stop-daemon --start --quiet --exec /usr/sbin/portmon -- -d -c /etc/portmon/portmon.hosts
+	eend $?
 }
 
 stop() {
-     checkconfig || return 1
-     ebegin "Staring portmon"
-     start-stop-daemon --stopt --quiet --exec /usr/sbin/portmon 
+	checkconfig || return 1
+	ebegin "Staring portmon"
+	start-stop-daemon --stopt --quiet --exec /usr/sbin/portmon 
 }
diff --git a/net-analyzer/portmon/metadata.xml b/net-analyzer/portmon/metadata.xml
index 8125a76971ee..55b1e0c4efaf 100644
--- a/net-analyzer/portmon/metadata.xml
+++ b/net-analyzer/portmon/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>Portmon is a netwok service monitoring daemon.</longdescription>
+<herd>netmon</herd>
+<longdescription>Portmon is a network service monitoring daemon.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/portmon/portmon-1.9.ebuild b/net-analyzer/portmon/portmon-1.9.ebuild
index bb9347083ae0..5953732489e5 100644
--- a/net-analyzer/portmon/portmon-1.9.ebuild
+++ b/net-analyzer/portmon/portmon-1.9.ebuild
@@ -1,30 +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/net-analyzer/portmon/portmon-1.9.ebuild,v 1.1 2003/07/29 01:36:45 gregf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/portmon-1.9.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
-DESCRIPTION="Portmon is a netwok service monitoring daemon."
+DESCRIPTION="Portmon is a network service monitoring daemon."
 SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
 HOMEPAGE="http://aboleo.net/software/portmon/"
 
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="virtual/glibc"
-RDEPEND="${RDEPEND}"
+DEPEND="virtual/libc"
 
 src_compile() {
-	econf --sysconfdir=/etc/portmon || die "Configure failed" 
+	econf --sysconfdir=/etc/portmon || die "Configure failed"
 	emake || die "emake failed"
 }
 
 src_install() {
-    into /usr
+	into /usr
 	dosbin src/portmon
 	doman extras/portmon.8
 
-	
 	insinto /etc/portmon
 	doins extras/portmon.hosts.sample
 	dodoc AUTHORS BUGS README
diff --git a/net-analyzer/portmon/portmon-2.0.ebuild b/net-analyzer/portmon/portmon-2.0.ebuild
index 3f36e6118706..4a25dde014c2 100644
--- a/net-analyzer/portmon/portmon-2.0.ebuild
+++ b/net-analyzer/portmon/portmon-2.0.ebuild
@@ -1,17 +1,17 @@
-# 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/net-analyzer/portmon/portmon-2.0.ebuild,v 1.1 2004/04/27 15:02:05 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portmon/portmon-2.0.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
-DESCRIPTION="Portmon is a netwok service monitoring daemon."
+DESCRIPTION="Portmon is a network service monitoring daemon."
 SRC_URI="http://aboleo.net/software/portmon/downloads/${P}.tar.gz"
 HOMEPAGE="http://aboleo.net/software/portmon/"
 
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf --sysconfdir=/etc/portmon || die "Configure failed"
diff --git a/net-analyzer/portsentry/ChangeLog b/net-analyzer/portsentry/ChangeLog
index 8d87e373997b..873b2dd39f83 100644
--- a/net-analyzer/portsentry/ChangeLog
+++ b/net-analyzer/portsentry/ChangeLog
@@ -1,14 +1,66 @@
 # ChangeLog for net-analyzer/portsentry
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/ChangeLog,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
-  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-  moved to net-analyzer - added SLOT - added LICENSE
+  21 Aug 2004; Jason Wever <weeve@gentoo.org> portsentry-1.2.ebuild:
+  Stable on sparc.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> portsentry-1.2.ebuild:
+  marked x86 stable
+
+  07 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  +files/portsentry.8, +files/portsentry.conf.5, files/portsentry.confd,
+  portsentry-1.2.ebuild:
+  Changed config file to make it clear that you can only have one tcp and udp
+  mode at a time. Added manpages for portsentry and portsentry.conf. Closes
+  #56041. Thanks to John Price <jp_gentoo_bugzilla@gcfl.net>. Added metadata.
+  Added missing IUSE.
+
+  06 Jul 2004; <malc@gentoo.org> portsentry-1.2.ebuild:
+  Add ~amd64 keyword, fixes bug #56038
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> portsentry-1.2.ebuild:
+  Add inherit eutils
+
+  16 Sep 2003; Martin Holzer <mholzer@gentoo.org> portsentry-1.2.ebuild:
+  Added gcc patch. Closes #28663.
+
+*portsentry-1.2 (08 Jul 2003)
+
+  08 Jul 2003; Martin Holzer <mholzer@gentoo.org> portsentry-1.1-r7.ebuild,
+  portsentry-1.2.ebuild:
+  Version bumped. Closes #24124
+
+  09 Jun 2003; <msterret@gentoo.org> portsentry-1.1-r7.ebuild:
+  check return of sed; fix HOMEPAGE and SRC_URI breakage by CISCO
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*portsentry-1.1-r7 (27 Sept 2002)
+
+  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> portsentry-1.1-r7.ebuild:
+  Change supersed dependencies
+
+  27 Sept. 2002; Grant Goodyear <g2boojum@gentoo.org> portsentry-1.1-r7.ebuild :
+
+  Fixed sed -i in first line to read ssed -i (and added -e).
 
 *portsentry-1.1-r6 (1 Feb 2002)
 
+  09 Aug 2002; Seemant Kulleen <seemant@gentoo.org> portsentry-1.1-r6.ebuild :
+
+  Switched the sed statements to sed -i (from supersed) and added supersed
+  as a build-time dependency.
+
+  21 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+
+  Added PPC to KEYWORDS and fixed typo in files/portsentry.confd
+
+  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
+  moved to net-analyzer - added SLOT - added LICENSE
+
   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/net-analyzer/portsentry/Manifest b/net-analyzer/portsentry/Manifest
index bc1418e52bed..3743e8821113 100644
--- a/net-analyzer/portsentry/Manifest
+++ b/net-analyzer/portsentry/Manifest
@@ -1,5 +1,11 @@
-MD5 043c8c32e80fdbdfc6ca8d84108fa4f7 portsentry-1.1-r7.ebuild 1602
-MD5 5736f386f7453a66d4329461bc0b2963 ChangeLog 1475
-MD5 cb697669e22866aafbfa76e941c21e37 files/portsentry.confd 90
-MD5 8bc2e5465021071443fbd1be780cb91d files/portsentry.rc6 980
+MD5 389d570597db8fe9ccbf358442222f19 ChangeLog 2643
+MD5 820fffc34c138058aa87c6961441319f metadata.xml 241
+MD5 2905d917133919be9eca1360e9565ed8 portsentry-1.1-r7.ebuild 1732
+MD5 77a3c4711758eb06d5831807871898f2 portsentry-1.2.ebuild 1872
 MD5 78771791b063cd2784d6b60d5ad9f89f files/digest-portsentry-1.1-r7 65
+MD5 0b2f598dd7ce683db92192999d740b82 files/digest-portsentry-1.2 65
+MD5 fa0bf7d77b9fbea4d067bc4045ef0658 files/gcc.patch 647
+MD5 9691bf3afd1961580f9a18046bdd5fac files/portsentry.8 4227
+MD5 1f257fa8874e73f2cf5f9eeea009755a files/portsentry.conf.5 8385
+MD5 3a37d2e787a817dda71341ee0cfd08b8 files/portsentry.confd 361
+MD5 ceab2160031affd70cfc8f05726a238f files/portsentry.rc6 962
diff --git a/net-analyzer/portsentry/files/portsentry.confd b/net-analyzer/portsentry/files/portsentry.confd
index 38f8969166d0..49729516ef7c 100644
--- a/net-analyzer/portsentry/files/portsentry.confd
+++ b/net-analyzer/portsentry/files/portsentry.confd
@@ -1,3 +1,12 @@
 # Config file for /etc/init.d/portsentry
+#
+# This file is read by /etc/init.d/portsentry. See the portsentry.8
+# manpage for details.
+#
+# The options in this file refer to commandline arguments (all in lowercase)
+# of portsentry. Use only one tcp and udp mode at a time.
+#
 
-#PORTSENTRY_MODES="udp tcp stcp atcp sudp audp
+#PORTSENTRY_MODES="udp tcp"
+#PORTSENTRY_MODES="stcp sudp"
+#PORTSENTRY_MODES="atcp audp"
\ No newline at end of file
diff --git a/net-analyzer/portsentry/files/portsentry.rc6 b/net-analyzer/portsentry/files/portsentry.rc6
index ccf2fccdbd67..9fd209b3e255 100644
--- a/net-analyzer/portsentry/files/portsentry.rc6
+++ b/net-analyzer/portsentry/files/portsentry.rc6
@@ -1,11 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/files/portsentry.rc6,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/files/portsentry.rc6,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 # NB: Config is in /etc/conf.d/portsentry
 
-
 depend() {
 	need net
 }
diff --git a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild b/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
index 6ffd3a017fd8..a402d6ba3b41 100644
--- a/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
+++ b/net-analyzer/portsentry/portsentry-1.1-r7.ebuild
@@ -1,34 +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/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.1 2002/09/27 17:53:16 g2boojum Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.1-r7.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Automated port scan detector and response tool"
-HOMEPAGE="http://www.psionic.com/abacus/portsentry/"
-SRC_URI="http://www.psionic.com/tools/${P}.tar.gz"
+# Seems like CISCO took the site down?
+HOMEPAGE="http://sourceforge.net/projects/sentrytools/"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc sparc64"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
-DEPEND="sys-apps/supersed"
+DEPEND=">=sys-apps/sed-4"
 
 src_unpack() {
 
 	unpack ${A} ; cd ${S}
 
 	# Setting the portsentry.conf file location
-	ssed -i -e 's:/usr/local/psionic/portsentry/portsentry.conf:/etc/portsentry/portsentry.conf:' \
-		portsentry_config.h
+	sed -i \
+		-e 's:/usr/local/psionic/portsentry/portsentry.conf:/etc/portsentry/portsentry.conf:' \
+		portsentry_config.h || die "sed portsentry_config.h failed"
 
 	# presetting the other file locations in portsentry.conf
-	ssed -i -e 's:\(^IGNORE_FILE\).*:\1="/etc/portsentry/portsentry.ignore":g' \
+	sed -i \
+		-e 's:\(^IGNORE_FILE\).*:\1="/etc/portsentry/portsentry.ignore":g' \
 	    -e 's:^\(HISTORY_FILE\).*:\1="/etc/portsentry/portsentry.history":g' \
 	    -e 's:^\(BLOCKED_FILE\).*:\1="/etc/portsentry/portsentry.blocked":g' \
-		portsentry.conf
+		portsentry.conf || die "sed portsentry.conf failed"
 
-	ssed -i "s:^set SENTRYDIR.*:set SENTRYDIR=/etc/portsentry:g" \
-		ignore.csh
+	sed -i \
+		-e "s:^set SENTRYDIR.*:set SENTRYDIR=/etc/portsentry:g" \
+		ignore.csh || die "sed ignore.csh failed"
 }
 
 src_compile() {
@@ -36,7 +40,7 @@ src_compile() {
 	make CFLAGS="${CFLAGS}" linux || die
 }
 
-src_install () {
+src_install() {
 
 	dobin portsentry ignore.csh
 	dodoc README* CHANGES LICENSE CREDITS
diff --git a/net-analyzer/portsentry/portsentry-1.2.ebuild b/net-analyzer/portsentry/portsentry-1.2.ebuild
index 91b2348dfe2d..b2f83ff7106a 100644
--- a/net-analyzer/portsentry/portsentry-1.2.ebuild
+++ b/net-analyzer/portsentry/portsentry-1.2.ebuild
@@ -1,6 +1,8 @@
-# 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/net-analyzer/portsentry/portsentry-1.2.ebuild,v 1.1 2003/07/08 20:58:54 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/portsentry/portsentry-1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Automated port scan detector and response tool"
 # Seems like CISCO took the site down?
@@ -9,13 +11,13 @@ SRC_URI="mirror://sourceforge/sentrytools/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc ~amd64"
+IUSE=""
 
 DEPEND=">=sys-apps/sed-4"
 S=${WORKDIR}/${PN}_beta
 
 src_unpack() {
-
 	unpack ${A} ; cd ${S}
 
 	# Setting the portsentry.conf file location
@@ -33,14 +35,15 @@ src_unpack() {
 	sed -i \
 		-e "s:^set SENTRYDIR.*:set SENTRYDIR=/etc/portsentry:g" \
 		ignore.csh || die "sed ignore.csh failed"
+	epatch ${FILESDIR}/gcc.patch
 }
 
 src_compile() {
-
 	make CFLAGS="${CFLAGS}" linux || die
 }
 
 src_install() {
+	doman ${FILESDIR}/{portsentry.8,portsentry.conf.5}
 
 	dobin portsentry ignore.csh
 	dodoc README* CHANGES LICENSE CREDITS
diff --git a/net-analyzer/postal/ChangeLog b/net-analyzer/postal/ChangeLog
index 55a8c1ef5d6f..b39c235554b9 100644
--- a/net-analyzer/postal/ChangeLog
+++ b/net-analyzer/postal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/postal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/ChangeLog,v 1.1 2005/01/08 00:35:45 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/ChangeLog,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
+
+  17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> postal-0.62.ebuild:
+  Added to ~hppa, stable on ppc.
+
+  08 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> postal-0.62.ebuild:
+  Fixed not working use_enable because of a broken configure script.
+
+  08 Jan 2005; Sven Wegener <swegener@gentoo.org> postal-0.62.ebuild:
+  Fixed invalid atoms in *DEPEND.
 
 *postal-0.62 (08 Jan 2005)
 
diff --git a/net-analyzer/postal/Manifest b/net-analyzer/postal/Manifest
index d55c29d80522..a3022cebadac 100644
--- a/net-analyzer/postal/Manifest
+++ b/net-analyzer/postal/Manifest
@@ -1,3 +1,4 @@
-MD5 b8f1a7c574cb5e6e9051efe37683ba5a postal-0.62.ebuild 584
+MD5 5428bb2d2cb90c8d088528b85019c0bf postal-0.62.ebuild 811
 MD5 2169405288c432c981b23bc7965d15c9 metadata.xml 162
+MD5 579f933aa680c2edbb44b4626f13f8b1 ChangeLog 743
 MD5 a58939d8e822b8c41dbd21436b29552f files/digest-postal-0.62 59
diff --git a/net-analyzer/postal/postal-0.62.ebuild b/net-analyzer/postal/postal-0.62.ebuild
index 83c127864cef..49104e329246 100644
--- a/net-analyzer/postal/postal-0.62.ebuild
+++ b/net-analyzer/postal/postal-0.62.ebuild
@@ -1,18 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/postal-0.62.ebuild,v 1.1 2005/01/08 00:35:45 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/postal-0.62.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 DESCRIPTION="SMTP and POP mailserver benchmark - the mad postman. Supports SSL, randomized user accounts and more."
 HOMEPAGE="http://www.coker.com.au/postal/"
 SRC_URI="http://www.coker.com.au/postal/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ppc ~hppa"
 IUSE="ssl"
-DEPEND="ssl? ( >=openssl-0.9.6b )"
+DEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )"
 
 src_compile() {
-	econf `use_enable ssl`
+	myconf=
+
+	if use !ssl; then
+		# broken configure, use_enable doesn't work right
+		myconf="${myconf} --disable-ssl"
+	fi
+
+	econf ${myconf} || die
 	emake || die
 }
 
diff --git a/net-analyzer/prelude-nagios/ChangeLog b/net-analyzer/prelude-nagios/ChangeLog
index c6fbe999e5ec..afb0b31afbfe 100644
--- a/net-analyzer/prelude-nagios/ChangeLog
+++ b/net-analyzer/prelude-nagios/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-analyzer/prelude-nagios
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nagios/ChangeLog,v 1.1 2003/07/05 16:03:27 solar Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nagios/ChangeLog,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> prelude-nagios-0.0.2.ebuild,
+  prelude-nagios-0.0.3.ebuild:
+  Tidy up. marked x86 stable
+
+  20 Mar 2004; Michael Boman <mboman@gentoo.org> prelude-nagios-0.0.2.ebuild,
+  prelude-nagios-0.0.3.ebuild:
+  Changed DEPEND and RDEPEND to fix bug 45110.
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> prelude-nagios-0.0.2.ebuild:
+  Marked 0.0.2 stable on x86
+
+*prelude-nagios-0.0.3 (16 Mar 2004)
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> prelude-nagios-0.0.3.ebuild:
+  New upstream version.
+
+  29 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml:
+  Moving the package to 'netmon' herd.
+
+  08 Jul 2003; <solar@gentoo.org> metadata.xml:
+  Added metadata.xml
 
 *prelude-nagios-0.0.2 (05 Jul 2003)
 
diff --git a/net-analyzer/prelude-nagios/Manifest b/net-analyzer/prelude-nagios/Manifest
index c0d437ff4952..5f4854b29636 100644
--- a/net-analyzer/prelude-nagios/Manifest
+++ b/net-analyzer/prelude-nagios/Manifest
@@ -1,3 +1,17 @@
-MD5 5c6f479b1a631c5e2ca18165a29ca128 prelude-nagios-0.0.2.ebuild 1159
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95be7ae4e4f346f523056ab9b8b6e973 prelude-nagios-0.0.2.ebuild 1292
+MD5 096547a34b90248f57a0f6d8375abebb ChangeLog 1159
+MD5 67513bad83a9eb8513e1e26507e72934 metadata.xml 233
+MD5 7d4d3e867a4aede8c1a70f2c0c6fea01 prelude-nagios-0.0.3.ebuild 847
 MD5 38deb4c75b8cafde875b533ab5ae7b78 files/digest-prelude-nagios-0.0.2 72
+MD5 a7b75c6dbfa1a45c9fab30ff31791aef files/digest-prelude-nagios-0.0.3 72
 MD5 fdc08ad12de3e7b0a010a302b70c9271 files/prelude-nagios-0.0.2-001.patch 1988
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.4 (GNU/Linux)
+
+iD8DBQFBKhHNT+MN7JbqCpMRAis0AJ4sYjwRsXv9qwG1DwJ/4467Z+ChFgCfRL00
+9KZvk2S30oZzyjlbQM9Iu9I=
+=62Ob
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/prelude-nagios/metadata.xml b/net-analyzer/prelude-nagios/metadata.xml
index d4660f7462e3..618dd0f6f59a 100644
--- a/net-analyzer/prelude-nagios/metadata.xml
+++ b/net-analyzer/prelude-nagios/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>solar@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+<herd>netmon</herd>
+<longdescription>Plugin for Nagios to talk with Prelude</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/prelude-nagios/prelude-nagios-0.0.2.ebuild b/net-analyzer/prelude-nagios/prelude-nagios-0.0.2.ebuild
index e71aba46880a..c9f6a10f829d 100644
--- a/net-analyzer/prelude-nagios/prelude-nagios-0.0.2.ebuild
+++ b/net-analyzer/prelude-nagios/prelude-nagios-0.0.2.ebuild
@@ -1,30 +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/net-analyzer/prelude-nagios/prelude-nagios-0.0.2.ebuild,v 1.1 2003/07/05 16:03:27 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nagios/prelude-nagios-0.0.2.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Plugin for Nagios to talk with Prelude"
 HOMEPAGE="http://www.exaprobe.com/labs/downloads/index.php3?DIR=/downloads/Nagios_Plugin"
 SRC_URI="http://www.exaprobe.com/labs/downloads/Nagios_Plugin/prelude-nagios-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="
-	|| ( libprelude libprelude-cvs )
-	nagios-core"
-
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
+	|| ( dev-libs/libprelude dev-libs/libprelude-cvs )"
+RDEPEND="${DEPEND}
+	net-analyzer/nagios-core"
 
 src_unpack() {
 	# prelude-nagios-0.0.2.tar.gz is a POSIX tar archive from exaprobe
-	# In the future I think we should to try to avoid calling 
+	# In the future I think we should to try to avoid calling
 	# tar directly from ebuilds.
 
 	# Our possible solutions.
 	# 1) email exaprobe and inform them that the .tar.gz is only a .tar
 	# 2) Repackage the tarball as a .bz2 and put it on a gentoo mirror
-	
+
 	tar xvf ${DISTDIR}/${A} -C ${WORKDIR}
 	#unpack ${A}
 	epatch ${FILESDIR}/prelude-nagios-${PV}-001.patch
diff --git a/net-analyzer/prelude-nagios/prelude-nagios-0.0.3.ebuild b/net-analyzer/prelude-nagios/prelude-nagios-0.0.3.ebuild
index f156ef29b837..fa28cdeb2bc4 100644
--- a/net-analyzer/prelude-nagios/prelude-nagios-0.0.3.ebuild
+++ b/net-analyzer/prelude-nagios/prelude-nagios-0.0.3.ebuild
@@ -1,20 +1,20 @@
-# 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/net-analyzer/prelude-nagios/prelude-nagios-0.0.3.ebuild,v 1.1 2004/03/15 22:56:28 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nagios/prelude-nagios-0.0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Plugin for Nagios to talk with Prelude"
 HOMEPAGE="http://www.exaprobe.com/labs/downloads/index.php3?DIR=/downloads/Nagios_Plugin"
 SRC_URI="http://www.exaprobe.com/labs/downloads/Nagios_Plugin/prelude-nagios-${PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND="
-	|| ( libprelude libprelude-cvs )
-	nagios-core"
-
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
+	|| ( dev-libs/libprelude dev-libs/libprelude-cvs )"
+RDEPEND="${DEPEND}
+	net-analyzer/nagios-core"
 
 src_compile() {
 	econf || die "econf failed"
diff --git a/net-analyzer/prelude-nessus/ChangeLog b/net-analyzer/prelude-nessus/ChangeLog
index 76a33ec63568..af58146e5aca 100644
--- a/net-analyzer/prelude-nessus/ChangeLog
+++ b/net-analyzer/prelude-nessus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-analyzer/prelude-nessus
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nessus/ChangeLog,v 1.1 2003/08/13 12:57:13 phosphan Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nessus/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> prelude-nessus-20021107.ebuild:
+  Added to ~ppc.
 
 *prelude-nessus-20021107 (13 Aug 2003)
 
diff --git a/net-analyzer/prelude-nessus/Manifest b/net-analyzer/prelude-nessus/Manifest
index 4efb7a8b1955..e4f7896552d5 100644
--- a/net-analyzer/prelude-nessus/Manifest
+++ b/net-analyzer/prelude-nessus/Manifest
@@ -1,2 +1,4 @@
-MD5 a9727140e12026b979a2561689cfd0b1 prelude-nessus-20021107.ebuild 505
+MD5 8c4daa85bac4ca7a7b834af973a7cd03 ChangeLog 490
+MD5 8025ee9985004b8c2719dcce04957c49 metadata.xml 312
+MD5 176d8742ec63df1238d6ee7c7306857d prelude-nessus-20021107.ebuild 620
 MD5 91552e08c95b6735c31a8f7cfe6d1969 files/digest-prelude-nessus-20021107 79
diff --git a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild b/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
index f91b5b428118..f250f5f08e70 100644
--- a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
+++ b/net-analyzer/prelude-nessus/prelude-nessus-20021107.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/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild,v 1.1 2003/08/13 12:57:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 DESCRIPTION="Nessus Correlation support for Prelude-IDS"
 HOMEPAGE="http://www.rstack.org/oudot/prelude/correlation/"
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/net-analyzer/prelude-nids/ChangeLog b/net-analyzer/prelude-nids/ChangeLog
index 8b57d739465c..0be12bea15ad 100644
--- a/net-analyzer/prelude-nids/ChangeLog
+++ b/net-analyzer/prelude-nids/ChangeLog
@@ -1,6 +1,75 @@
 # ChangeLog for net-analyzer/prelude-nids
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/ChangeLog,v 1.1 2003/06/21 17:16:05 solar Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/ChangeLog,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
+
+  20 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  prelude-nids-0.8.6.ebuild:
+  Add deprecated message for bug 96580.
+
+  17 May 2005; Marcelo Goes <vanquirius@gentoo.org> prelude-nids-0.8.6.ebuild:
+  Changed DEPEND to avoid problems with 0.9 series of libprelude.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  prelude-nids-0.8.6.ebuild:
+  Stable on ppc.
+
+  30 Aug 2004; David Holm <dholm@gentoo.org> prelude-nids-0.8.6.ebuild:
+  Added to ~ppc.
+
+  14 Jul 2004; Eldad Zack <eldad@gentoo.org> -prelude-nids-0.8.1-r1.ebuild,
+  -prelude-nids-0.8.1.ebuild, -prelude-nids-0.8.4.ebuild,
+  -prelude-nids-0.8.5.ebuild, prelude-nids-0.8.6.ebuild:
+  Replaced MAKEOPTS override with emake -j1, Purged old unstable ebuilds
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> prelude-nids-0.8.4.ebuild,
+  prelude-nids-0.8.5.ebuild, prelude-nids-0.8.6.ebuild:
+  change virtual/glibc to virtual/libc
+
+  17 Apr 2004; Jason Wever <weeve@gentoo.org> prelude-nids-0.8.6.ebuild:
+  Stable on sparc.
+
+  21 Mar 2004; Michael Boman <mboman@gentoo.org> prelude-nids-0.8.1-r1.ebuild,
+  prelude-nids-0.8.1.ebuild, prelude-nids-0.8.4.ebuild,
+  prelude-nids-0.8.5.ebuild:
+  QA: Unnecessary definition of S and RDEPEND removed.
+
+  29 Feb 2004; Michael Boman <mboman@gentoo.org> metadata.xml:
+  Moving the package to 'netmon' herd.
+
+  17 Jan 2004; Michael Boman <mboman@gentoo.org> files/gentoo.init:
+  Made init script less verbose
+
+*prelude-nids-0.8.6 (17 Dec 2003)
+
+  17 Dec 2003; Michael Boman <mboman@gentoo.org> prelude-nids-0.8.6.ebuild:
+  New upstream version.
+
+*prelude-nids-0.8.5 (17 Nov 2003)
+
+  17 Nov 2003; Michael Boman <mboman@gentoo.org> prelude-nids-0.8.5.ebuild:
+  New upstream version.
+  Added "debug" USE flag to faciliate debugging.
+
+*prelude-nids-0.8.4 (14 Oct 2003)
+
+  14 Oct 2003; <solar@gentoo.org> prelude-nids-0.8.4.ebuild:
+  prelude updates. contribution made by anonymous user
+
+  31 Jul 2003; <solar@gentoo.org> prelude-nids-0.8.1-r1.ebuild:
+  added sparc to keywords
+
+  08 Jul 2003; <solar@gentoo.org> metadata.xml:
+  Added metadata.xml
+
+  30 Jun 2003; <solar@gentoo.org> prelude-nids-0.8.1-r1.ebuild:
+  small fix for -doc option when used. No revision bump needed
+
+*prelude-nids-0.8.1-r1 (28 Jun 2003)
+
+  28 Jun 2003; Ned Ludd <solar@gentoo.org> prelude-nids-0.8.1-r1.ebuild:
+  convert_ruleset added, ruleset moved to /usr/share/prelude/nids/ with symlink
+  /etc/prelude-nids/ruleset pointing to it (so we don't need to re-write the
+  default config) suggested by Michael Boman Closes Bug#: 23487
 
 *prelude-nids-0.8.1 (21 Jun 2003)
 
diff --git a/net-analyzer/prelude-nids/Manifest b/net-analyzer/prelude-nids/Manifest
index f15cd59f7ff8..fe3e95072cd4 100644
--- a/net-analyzer/prelude-nids/Manifest
+++ b/net-analyzer/prelude-nids/Manifest
@@ -1,4 +1,6 @@
-MD5 ba223c2f1d7b4ec351a0366fcc0823c8 prelude-nids-0.8.1.ebuild 1484
-MD5 148aa74c67e42ad5c9f8a68f022b7d39 files/gentoo.conf 195
-MD5 c53c41b222a73001dd4a2b2638997a5d files/gentoo.init 483
-MD5 bf55921bc902a6516c4c5844aeb60e87 files/digest-prelude-nids-0.8.1 70
+MD5 0867ac1b179a36ce77bc2252a2e793cb prelude-nids-0.8.6.ebuild 1670
+MD5 4bc1bbf338f078508c5a50e8f3d9df5d ChangeLog 2956
+MD5 8944767a7438e201f6ba152ae0c04c43 metadata.xml 211
+MD5 09832a59e6a2adbcac19f18df270f272 files/digest-prelude-nids-0.8.6 70
+MD5 c6c8e68d92bc77b15d39a2e9bd24365e files/gentoo.conf 178
+MD5 ee8c5fd94ed1dd297b3ddaa3b7a15206 files/gentoo.init 593
diff --git a/net-analyzer/prelude-nids/files/gentoo.conf b/net-analyzer/prelude-nids/files/gentoo.conf
index febe0ee4c4b4..d4d8a455aab0 100644
--- a/net-analyzer/prelude-nids/files/gentoo.conf
+++ b/net-analyzer/prelude-nids/files/gentoo.conf
@@ -1,4 +1,4 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Additional Configuration Options for prelude-nids
diff --git a/net-analyzer/prelude-nids/files/gentoo.init b/net-analyzer/prelude-nids/files/gentoo.init
index df59bd077de3..61a305b06d59 100644
--- a/net-analyzer/prelude-nids/files/gentoo.init
+++ b/net-analyzer/prelude-nids/files/gentoo.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/files/gentoo.init,v 1.1 2003/06/21 17:16:05 solar Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/files/gentoo.init,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
 
 PROGNAME=`basename $1`
 
@@ -12,12 +12,12 @@ depend() {
 
 start() {
 	ebegin "Starting ${PROGNAME}..."
-	start-stop-daemon --start --quiet --exec /usr/bin/${PROGNAME} -- ${OPTIONS} -d
+	start-stop-daemon --start --quiet --exec /usr/bin/${PROGNAME} -- ${OPTIONS} -d &> /dev/null
 	eend $? 
 }
 
 stop() {
 	ebegin "Stop ${PROGNAME}..."
-     	start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME}
+	start-stop-daemon --stop --quiet --exec /usr/bin/${PROGNAME} &> /dev/null
 	eend $? 
 }
diff --git a/net-analyzer/prelude-nids/metadata.xml b/net-analyzer/prelude-nids/metadata.xml
index d4660f7462e3..3a7135b72b64 100644
--- a/net-analyzer/prelude-nids/metadata.xml
+++ b/net-analyzer/prelude-nids/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>solar@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
-	<longdescription></longdescription>
+<herd>netmon</herd>
+<longdescription>Prelude-IDS NIDS</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild b/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild
index 8e4714492738..697bd24f4ea4 100644
--- a/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild
+++ b/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild
@@ -1,32 +1,32 @@
-# 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/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild,v 1.1 2003/12/17 07:30:35 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prelude-nids/prelude-nids-0.8.6.ebuild,v 1.1.1.1 2005/11/30 10:12:36 chriswhite Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Prelude-IDS NIDS"
-HOMEPAGE="http://www.prelude-ids.org"
+HOMEPAGE="http://www.prelude-ids.org/"
 SRC_URI="http://www.prelude-ids.org/download/releases/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ppc"
 IUSE="doc debug"
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	!dev-libs/libprelude-cvs
 	!net-analyzer/prelude-nids-cvs
-	dev-libs/libprelude
+	<dev-libs/libprelude-0.9.0_rc1
 	doc? ( dev-util/gtk-doc )"
 
-RDEPEND="${DEPEND}"
-S=${WORKDIR}/${P}
-
 src_compile() {
 	local myconf
-	export MAKEOPTS=""	# Doesn't compile if you using make -j
 
 	use doc && myconf="${myconf} --enable-gtk-doc" || myconf="${myconf} --enable-gtk-doc=no"
-	use debug && CFLAGS="$CFLAGS -O0 -ggdb"
+	use debug && append-flags -O -ggdb
 
 	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
@@ -44,3 +44,11 @@ src_install() {
 	mv ${D}/etc/prelude-nids/ruleset ${D}/usr/share/prelude/ruleset/nids
 	dosym /usr/share/prelude/ruleset/nids /etc/prelude-nids/ruleset
 }
+
+pkg_postinst(){
+	ewarn "Please note that net-analyzer/prelude-nids is no longer"
+	ewarn "maintained as net-analyzer/snort replaces it in the developing"
+	ewarn "branch. If you want to use unstable prelude, please unmerge"
+	ewarn "net-analyzer/prelude-nids to avoid undesired downgrades of"
+	ewarn "dev-libs/libprelude."
+}
diff --git a/net-analyzer/prewikka/ChangeLog b/net-analyzer/prewikka/ChangeLog
index 3fd24c4ff6b7..a7dbb829bc71 100644
--- a/net-analyzer/prewikka/ChangeLog
+++ b/net-analyzer/prewikka/ChangeLog
@@ -1,6 +1,62 @@
 # ChangeLog for net-analyzer/prewikka
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/ChangeLog,v 1.1 2005/05/26 10:40:45 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+*prewikka-0.9.0 (25 Sep 2005)
+
+  25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -prewikka-0.9.0_rc10.ebuild, -prewikka-0.9.0_rc11.ebuild,
+  -prewikka-0.9.0_rc12.ebuild, +prewikka-0.9.0.ebuild:
+  Version bump.
+
+*prewikka-0.9.0_rc12 (10 Sep 2005)
+
+  10 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -prewikka-0.9.0_rc8.ebuild, -prewikka-0.9.0_rc9.ebuild,
+  +prewikka-0.9.0_rc12.ebuild:
+  Version bump.
+
+*prewikka-0.9.0_rc11 (26 Aug 2005)
+
+  26 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/prewikka-0.9.0_rc5-pathfix.patch, -prewikka-0.9.0_rc5.ebuild,
+  -prewikka-0.9.0_rc7.ebuild, +prewikka-0.9.0_rc11.ebuild:
+  Version bump.
+
+*prewikka-0.9.0_rc10 (19 Aug 2005)
+
+  19 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +prewikka-0.9.0_rc10.ebuild:
+  Version bump.
+
+  07 Aug 2005; Jason Wever <weeve@gentoo.org> prewikka-0.9.0_rc9.ebuild:
+  Added ~sparc keyword.
+
+*prewikka-0.9.0_rc9 (03 Aug 2005)
+
+  03 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +prewikka-0.9.0_rc9.ebuild:
+  Version bump.
+
+*prewikka-0.9.0_rc8 (19 Jul 2005)
+
+  19 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  prewikka-0.9.0_rc5.ebuild, prewikka-0.9.0_rc7.ebuild,
+  +prewikka-0.9.0_rc8.ebuild:
+  version bump. Dependancies added as per bug #99494.
+
+  02 Jul 2005; David Holm <dholm@gentoo.org> prewikka-0.9.0_rc7.ebuild:
+  Added to ~ppc.
+
+*prewikka-0.9.0_rc7 (01 Jul 2005)
+
+  01 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  +prewikka-0.9.0_rc7.ebuild:
+  Version bump.
+
+  29 May 2005; Daniel Black <dragonheart@gentoo.org>
+  prewikka-0.9.0_rc5.ebuild:
+  x86 stable
 
 *prewikka-0.9.0_rc5 (26 May 2005)
 
diff --git a/net-analyzer/prewikka/Manifest b/net-analyzer/prewikka/Manifest
index ceae7a244695..6153b2bb6c34 100644
--- a/net-analyzer/prewikka/Manifest
+++ b/net-analyzer/prewikka/Manifest
@@ -1,5 +1,4 @@
-MD5 37eb0ddd38fd6c13e25e483e02f340b8 prewikka-0.9.0_rc5.ebuild 806
-MD5 1f20164b91a69e77f00b809a5f7fa04b metadata.xml 218
-MD5 ff0b0275a4e11ea8fb096bb18193b707 ChangeLog 385
-MD5 a415c070bfb6371991d3847aa9b7853a files/digest-prewikka-0.9.0_rc5 70
-MD5 3dbc2b447f2bf163cb2ba075405411f2 files/prewikka-0.9.0_rc5-pathfix.patch 1249
+MD5 b318f92fd7eced4335edb67b94db5f08 prewikka-0.9.0.ebuild 954
+MD5 885a17ffedc36743ecc5d5a7975151e0 ChangeLog 2055
+MD5 4fbb6885cc73a96f82855db5b77a7fd6 metadata.xml 216
+MD5 959d55b1342b0186f7ad5dbd8f61b4d4 files/digest-prewikka-0.9.0 66
diff --git a/net-analyzer/prewikka/metadata.xml b/net-analyzer/prewikka/metadata.xml
index 74a50db9349d..11a7b93ada5a 100644
--- a/net-analyzer/prewikka/metadata.xml
+++ b/net-analyzer/prewikka/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>A frount end to prelude</longdescription>
+<longdescription>A frontend to prelude</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/prewikka/prewikka-0.9.0.ebuild b/net-analyzer/prewikka/prewikka-0.9.0.ebuild
index 6eeb5b3d70bb..9fb742c1d49c 100644
--- a/net-analyzer/prewikka/prewikka-0.9.0.ebuild
+++ b/net-analyzer/prewikka/prewikka-0.9.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/net-analyzer/prewikka/prewikka-0.9.0.ebuild,v 1.1 2005/09/25 02:10:58 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/prewikka/prewikka-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 inherit versionator distutils
 
diff --git a/net-analyzer/quidscor/ChangeLog b/net-analyzer/quidscor/ChangeLog
index 968f8a13c95a..da84def458b1 100644
--- a/net-analyzer/quidscor/ChangeLog
+++ b/net-analyzer/quidscor/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/quidscor
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/ChangeLog,v 1.1 2003/12/01 07:03:48 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/ChangeLog,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> quidscor-1.2.48.ebuild:
+  Added to ~ppc.
+
+  17 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> quidscor-1.2.48.ebuild:
+  Fix broken sed line, add fix for lacking TRUE and FALSE definitions. Thanks to
+  soulse for testing.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  quidscor-1.2.48.ebuild:
+  Tidy. x86 stable
 
 *quidscor-1.2.48 (01 Dec 2003)
 
diff --git a/net-analyzer/quidscor/Manifest b/net-analyzer/quidscor/Manifest
index 788b6213f8a7..eafbf5ee565a 100644
--- a/net-analyzer/quidscor/Manifest
+++ b/net-analyzer/quidscor/Manifest
@@ -1,3 +1,4 @@
+MD5 dd8523f871361d1c0923748896965d08 ChangeLog 756
+MD5 aa67be965849bf2e39a8e2dd00bcbba8 quidscor-1.2.48.ebuild 949
+MD5 2146518fc3400951414b44a3e54b83b3 metadata.xml 220
 MD5 38ebaecd2721233b80b3680fcf5a6b67 files/digest-quidscor-1.2.48 70
-MD5 086ecc8e4f1c6aada353f2b0738d1f42 quidscor-1.2.48.ebuild 795
-MD5 39de05c5d3509a55f2caa6340a57521e ChangeLog 393
diff --git a/net-analyzer/quidscor/quidscor-1.2.48.ebuild b/net-analyzer/quidscor/quidscor-1.2.48.ebuild
index 53b7abc42956..7f6ded7dd8e9 100644
--- a/net-analyzer/quidscor/quidscor-1.2.48.ebuild
+++ b/net-analyzer/quidscor/quidscor-1.2.48.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/net-analyzer/quidscor/quidscor-1.2.48.ebuild,v 1.1 2003/12/01 07:03:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/quidscor/quidscor-1.2.48.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 DESCRIPTION="IDS/VA Correlation engine"
 HOMEPAGE="http://quidscor.sourceforge.net/"
@@ -8,15 +8,19 @@ SRC_URI="mirror://sourceforge/quidscor/${P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
+IUSE=""
 
 DEPEND=">=dev-libs/libxml2-2.4
-	>=net-ftp/curl-7.10
+	>=net-misc/curl-7.10
 	>=net-analyzer/snort-2.0"
 
 src_unpack() {
 	unpack ${A}
-	sed -i '/^CFLAGS=/s: -g : :' Makefile
+	sed -i '/^CFLAGS=/s: -g : :' ${S}/Makefile || die
+	#yes, the fix below is as pathetic as it seems
+	echo "#define FALSE 0" >> ${S}/libqg/libqg.h
+	echo "#define TRUE 1" >> ${S}/libqg/libqg.h
 }
 
 src_compile() {
diff --git a/net-analyzer/rain/ChangeLog b/net-analyzer/rain/ChangeLog
index 1ce0244fadb4..00199bdde2a5 100644
--- a/net-analyzer/rain/ChangeLog
+++ b/net-analyzer/rain/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/rain
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rain/ChangeLog,v 1.1 2003/09/22 17:05:06 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rain/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> rain-1.2.8_p2.ebuild:
+  Added to ~ppc.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  rain-1.2.8_p2.ebuild:
+  Tidy, x86 stable
 
 *rain-1.2.8_p2 (22 Sep 2003)
 
diff --git a/net-analyzer/rain/Manifest b/net-analyzer/rain/Manifest
index 454f7069f94b..df1df124f847 100644
--- a/net-analyzer/rain/Manifest
+++ b/net-analyzer/rain/Manifest
@@ -1,3 +1,4 @@
+MD5 cc17e3c017fd6768fe386b7201d54c40 ChangeLog 573
+MD5 54c84f88a703d646182d6c66eb60a057 rain-1.2.8_p2.ebuild 752
+MD5 aea2977b44d0b1a08f6570f62f5a9e66 metadata.xml 278
 MD5 b9f5d057684567be0978510c53bc6ea9 files/digest-rain-1.2.8_p2 64
-MD5 aeb87d39b599d98d5157a047a7d73975 rain-1.2.8_p2.ebuild 749
-MD5 f94d31d4e31a4baba21de6efeb989294 ChangeLog 394
diff --git a/net-analyzer/rain/rain-1.2.8_p2.ebuild b/net-analyzer/rain/rain-1.2.8_p2.ebuild
index fe0af56607e0..1ed94fbe5418 100644
--- a/net-analyzer/rain/rain-1.2.8_p2.ebuild
+++ b/net-analyzer/rain/rain-1.2.8_p2.ebuild
@@ -1,19 +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/net-analyzer/rain/rain-1.2.8_p2.ebuild,v 1.1 2003/09/22 17:05:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rain/rain-1.2.8_p2.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 MY_P=${P/_p/r}
-S=${WORKDIR}/${MY_P}
 DESCRIPTION="powerful tool for testing stability of hardware and software utilizing IP protocols"
 HOMEPAGE="http://www.mirrors.wiretapped.net/security/packet-construction/rain/"
 SRC_URI="http://www.mirrors.wiretapped.net/security/packet-construction/rain/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
+IUSE=""
 
 DEPEND=""
 
+S=${WORKDIR}/${MY_P}
+
 src_unpack() {
 	unpack ${A}
 	sed -i 's:-g:@CFLAGS@:' ${S}/Makefile.in
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 7cdf900d62ed..1905ad59c0fe 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,7 +1,367 @@
 # ChangeLog for net-analyzer/rrdtool
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
+  10 Nov 2005; Brent Baude <ranger@gentoo.org> rrdtool-1.2.11-r2.ebuild:
+  Marking rrdtool-1.2.11-r2 ~ppc64 for bug 111849
+
+*rrdtool-1.2.11-r2 (22 Sep 2005)
+
+  22 Sep 2005; Lance Albertson <ramereth@gentoo.org>
+  +rrdtool-1.2.11-r2.ebuild:
+  * removed unneeded RDEPEND on media-libs/gd for 1.2.x (See bug #106682 for
+  details)
+
+*rrdtool-1.2.11-r1 (06 Sep 2005)
+
+  06 Sep 2005; Benjamin Smee <strerror@gentoo.org>
+  +rrdtool-1.2.11-r1.ebuild:
+  Made changes as per bug 104956 for multilib
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> rrdtool-1.2.6-r1.ebuild:
+  stable on ia64 #93063
+
+  23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> rrdtool-1.2.6-r1.ebuild,
+  rrdtool-1.2.11.ebuild:
+  Added ~mips.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  rrdtool-1.2.6-r1.ebuild:
+  Stable on ppc.
+
+  06 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.11.ebuild:
+  Fix RDEPEND for bug 101513. Thanks to Natanael Copa <mlists@tanael.org>.
+
+*rrdtool-1.2.11 (26 Jul 2005)
+
+  26 Jul 2005; Benjamin Smee <strerror@gentoo.org> +rrdtool-1.2.11.ebuild:
+  Version bump.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  rrdtool-1.2.6-r1.ebuild:
+  Stable on alpha.
+
+  25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.6.ebuild,
+  rrdtool-1.2.6-r1.ebuild:
+  Fix tcl issues. Thanks to Kugelfang on irc.
+
+  25 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  rrdtool-1.2.6-r1.ebuild:
+  Stable on hppa.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  rrdtool-1.2.6-r1.ebuild:
+  Stable on sparc
+
+*rrdtool-1.2.10 (19 Jun 2005)
+
+  19 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +rrdtool-1.2.10.ebuild:
+  Version bump for bug 96369. Thanks to Frederic Mangeant
+  <frederic.mangeant@gmail.com>.
+
+  18 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.6-r1.ebuild,
+  -rrdtool-1.2.8.ebuild:
+  Marking 1.2.6-r1 stable to push doc USE flag fix. Also, taking 1.2.8 out for
+  bug 94411.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> rrdtool-1.2.6.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> rrdtool-1.2.6.ebuild:
+  Stable on alpha.
+
+  12 Jun 2005; Jason Wever <weeve@gentoo.org> rrdtool-1.2.6.ebuild:
+  Stable on SPARC.
+
+*rrdtool-1.2.6-r1 (10 Jun 2005)
+
+  10 Jun 2005; Benjamin Smee <strerror@gentoo.org> +rrdtool-1.2.6-r1.ebuild:
+  Fixed inappropriate doc placemente as per bug 95665.
+
+  05 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org> rrdtool-1.2.6.ebuild:
+  Stable on hppa.
+
+  04 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -rrdtool-1.0.45-r2.ebuild, -rrdtool-1.0.47.ebuild, rrdtool-1.2.6.ebuild:
+  Marked 1.2.6 x86 stable and removing old versions. Fixes bug 94962. Thanks
+  to Daniel Webert <rockoo@gmail.com>.
+
+*rrdtool-1.2.9 (30 May 2005)
+
+  30 May 2005; Benjamin Smee <strerror@gentoo.org> +rrdtool-1.2.9.ebuild:
+  Version bump for bug 94465
+
+  26 May 2005; Rene Nussbaumer <killerfox@gentoo.org> rrdtool-1.0.49.ebuild:
+  Stable on hppa
+
+  18 May 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.6.ebuild,
+  rrdtool-1.2.8.ebuild:
+  Changing sed line to fix problem with tcl bindings. Fixes bug 93062. Thanks to
+  Brandon Hale <tseng@gentoo.org>.
+
+*rrdtool-1.2.8 (18 May 2005)
+
+  18 May 2005; Aaron Walker <ka0ttic@gentoo.org> +rrdtool-1.2.8.ebuild:
+  Version bump for bug 92866; added python and doc USE flags.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> -rrdtool-1.2.0.ebuild,
+  -rrdtool-1.2.1.ebuild, -rrdtool-1.2.2.ebuild:
+  Removing older 1.2.x releases. There were different issues with them, so it is
+  better to get them out of the way.
+
+*rrdtool-1.2.6 (10 May 2005)
+
+  10 May 2005; Marcelo Goes <vanquirius@gentoo.org> +rrdtool-1.2.6.ebuild:
+  Version bump for bug 91978. Thanks to Frederic Mangeant
+  <frederic.mangeant@gmail.com>.
+
+*rrdtool-1.2.2 (09 May 2005)
+
+  09 May 2005; Martin Holzer <mholzer@gentoo.org> +rrdtool-1.2.2.ebuild:
+  Version bumped.
+
+  07 May 2005; Aaron Walker <ka0ttic@gentoo.org> rrdtool-1.2.0.ebuild,
+  rrdtool-1.2.1.ebuild:
+  Add --disable-perl if USE=-perl; closes bug 91638.
+
+*rrdtool-1.2.1 (03 May 2005)
+
+  03 May 2005; Marcelo Goes <vanquirius@gentoo.org> rrdtool-1.2.0.ebuild,
+  +rrdtool-1.2.1.ebuild:
+  Version bump, fix compilation problem with 1.2.0. Fixes bug 91287. Thanks to
+  Andy Blyler <ajb@blyler.cc>, Marco Morales <soulse@gmail.com> and Frederic
+  Mangeant <frederic.mangeant@gmail.com>.
+
+*rrdtool-1.2.0 (27 Apr 2005)
+*rrdtool-1.0.50 (27 Apr 2005)
+
+  27 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +rrdtool-1.0.50.ebuild,
+  +rrdtool-1.2.0.ebuild:
+  Dual version bumps for bugs 90491 and 88698.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> rrdtool-1.0.49.ebuild:
+  stable on ia64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  16 Dec 2004; Dylan Carlson <absinthe@gentoo.org> rrdtool-1.0.49.ebuild:
+  Stable on amd64.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> rrdtool-1.0.49.ebuild:
+  Stable on alpha.
+
+  27 Oct 2004; Jason Wever <weeve@gentoo.org> rrdtool-1.0.49.ebuild:
+  Stable on sparc.
+
+  25 Oct 2004; Jason Wever <weeve@gentoo.org> :
+  Stable on sparc.
+
+  24 Oct 2004; Eldad Zack <eldad@gentoo.org> -rrdtool-1.0.40-r1.ebuild,
+  rrdtool-1.0.47.ebuild, rrdtool-1.0.48.ebuild, rrdtool-1.0.49.ebuild:
+  Got rid of -fPIC patch in favor of sed (1.0.47-1.0.49). x86 marked stable
+  (1.0.48, 1.0.49)
+
+  27 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> rrdtool-1.0.47.ebuild:
+  Marked stable on amd64.
+
+  14 Sep 2004; Guy Martin <gmsoft@gentoo.org> rrdtool-1.0.47.ebuild:
+  Stable on hppa.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> rrdtool-1.0.47.ebuild:
+  Stable on alpha.
+
+  20 Aug 2004; Jason Wever <weeve@gentoo.org> rrdtool-1.0.47.ebuild:
+  Stable on sparc.
+
+*rrdtool-1.0.49 (09 Aug 2004)
+
+  09 Aug 2004; Jon Hood <squinky86@gentoo.org>
+  -files/rrdtool-1.0.46-fPIC.patch, -files/rrdtool-1.0.46-tcl.patch,
+  +files/rrdtool-1.0.49-fPIC.patch, -rrdtool-1.0.45.ebuild,
+  -rrdtool-1.0.46.ebuild, +rrdtool-1.0.49.ebuild:
+  Version bump, closes #59851, thanks Haroon Rafique
+  <corporate_gadfly@hotmail.com>; ebuild cleanups.
+
+*rrdtool-1.0.48 (05 Aug 2004)
+
+  05 Aug 2004; Jon Hood <squinky86@gentoo.org>
+  +files/rrdtool-1.0.48-fPIC.patch, -rrdtool-1.0.42-r1.ebuild,
+  -rrdtool-1.0.45-r1.ebuild, +rrdtool-1.0.48.ebuild:
+  Version bump, closes #59543, ebuild cleanups, thanks solar@g.o!
+
+  22 Jul 2004; Eldad Zack <eldad@gentoo.org> rrdtool-1.0.47.ebuild:
+  Tidy up. Fixed issue with 64-bit archs, when perl is in USE. Fixed duplicate
+  installation on /usr/lib/perl. Closes #57651.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> rrdtool-1.0.46.ebuild,
+  rrdtool-1.0.47.ebuild:
+  marked x86 stable
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> rrdtool-1.0.40-r1.ebuild,
+  rrdtool-1.0.42-r1.ebuild, rrdtool-1.0.45-r1.ebuild,
+  rrdtool-1.0.45-r2.ebuild, rrdtool-1.0.45.ebuild, rrdtool-1.0.46.ebuild,
+  rrdtool-1.0.47.ebuild:
+  Fix use invocation
+
+  08 May 2004; Danny van Dyk <kugelfang@gentoo.org> :
+  Marked ~amd64.
+
+*rrdtool-1.0.47 (07 Apr 2004)
+
+  07 Apr 2004; Martin Holzer <mholzer@gentoo.org> rrdtool-1.0.47.ebuild,
+  files/rrdtool-1.0.47-fPIC.patch:
+  Version bumped.
+
+  18 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> rrdtool-1.0.46.ebuild,
+  files/rrdtool-1.0.46-fPIC.patch:
+  Must compile private lib with -fPIC on amd64.
+
+*rrdtool-1.0.46 (09 Mar 2004)
+
+  09 Mar 2004; Michael Boman <mboman@gentoo.org> rrdtool-1.0.46.ebuild,
+  files/rrdtool-1.0.46-tcl.patch:
+  New upstream version. Closes bug 43997.
+
+  17 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  rrdtool-1.0.45-r2.ebuild:
+  stable on hppa
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> rrdtool-1.0.45-r2.ebuild:
+  stable on alpha and ia64
+
+  29 Jan 2004; <gustavoz@gentoo.org> rrdtool-1.0.45-r2.ebuild:
+  marked stable on sparc
+
+*rrdtool-1.0.45-r2 (31 Dec 2003)
+
+  31 Dec 2003; Michael Cummings,,, <mcummings@gentoo.org>
+  rrdtool-1.0.45-r2.ebuild:
+  Corrections for the inclusion and operation of the perl portion. There were
+  sandbox violations for the perl man pages becasue of makemaker versions. The
+  new version will cleanly install all parts in all the right places. Bug was
+  reported on IRC by Geert Hauwaerts <geert@irssi.org>
+
+*rrdtool-1.0.45-r1 (22 Dec 2003)
+
+  22 Dec 2003; <rac@gentoo.org> rrdtool-1.0.45-r1.ebuild:
+  Make perl stuff install into vendordir, address bug 30617
+
+  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> rrdtool-1.0.45.ebuild:
+  Add ~alpha
+
+  20 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> rrdtool-1.0.45.ebuild :
+  Make it build on amd64.
+
+  01 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> rrdtool-1.0.42-r2.ebuild, rrdtool-1.0.40-r1.ebuild,
+						rrdtool-1.0.45.ebuild :
+  If neither perl or tcltk are enabled pkg_setup will fail becuse the last use check returns 1.
+
+*rrdtool-1.0.45 (30 Jul 2003)
+
+  30 Jul 2003; Martin Holzer <mholzer@gentoo.org> rrdtool-1.0.45.ebuild:
+  Version bumped.
+
+  22 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> rrdtool-0.41.ebuild,
+  rrdtool-0.41-r1.ebuild, rrdtool-0.42.ebuild, rrdtool-0.42-r1.ebuild :
+  Changed flags alteration.
+
+*rrdtool-1.0.41-r1 (01 Jun 2003)
+
+  01 Jun 2003; Michael Cummings <mcummings@gentoo.org>
+  rrdtool-1.0.40-r1.ebuild, rrdtool-1.0.41-r1.ebuild,
+  rrdtool-1.0.42-r1.ebuild:
+  Version bump because eclasses changed
+
+  30 May 2003; Seemant Kulleen <seemant@gentoo.org> rrdtool-1.0.42.ebuild:
+  change perl-post to perl-module for inheritance
+
+*rrdtool-1.0.42-r1 (02 Jun 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*rrdtool-1.0.42 (16 Apr 2003)
+
+  24 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  rrdtool-1.0.40.ebuild, rrdtool-1.0.41.ebuild, rrdtool-1.0.42.ebuild:
+  Updated Homepage. Marked as stable
+
+  16 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  rrdtool-1.0.42.ebuild:
+  Version bumped.
+
+*rrdtool-1.0.41 (13 Mar 2003)
+
+  04 Apr 2003; Dylan Carlson <absinthe@gentoo.org> rrdtool-1.0.41.ebuild:
+  Added "-ffast-math" to filter-flags.
+
+  03 Apr 2003; Dylan Carlson <absinthe@gentoo.org> rrdtool-1.0.35-r3.ebuild,
+  rrdtool-1.0.35-r3.ebuild, rrdtool-1.0.39.ebuild, rrdtool-1.0.39.ebuild,
+  rrdtool-1.0.41.ebuild:
+  Filtering out -mfpmath=sse to close bug # 18705 (thanks to Zoltan Patay). x86
+  moved to stable.
+
+  13 Mar 2003; Dylan Carlson <absinthe@gentoo.org> rrdtool-1.0.41.ebuild
+  files/digest-rrdtool-1.0.41 ChangeLog :
+
+  Version bump.
+
+*rrdtool-1.0.40-r1 (02 Jun 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*rrdtool-1.0.40 (18 Jan 2003)
+
+  18 Jan 2003; Martin Holzer <mholzer@gentoo.org> rrdtool-1.0.40.ebuild
+  files/digest-rrdtool-1.0.40 ChangeLog : 
+  Version bumped. Closes #10703.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*rrdtool-1.0.39 (05 Aug 2002)
+
+  16 Sep 2002; <mcummings@gentoo.org> : add  PREFIX=${D}/usr to perl line.
+  
+  05 Aug 2002; Seemant Kulleen <seemant@gentoo.org> rrdtool-1.0.39.ebuild
+  files/digest-rrdtool-1.0.39 :
+
+  Version bump.  Thanks to: tlund@springboardhosting.com (Tyler Lund) in bug
+  #5795.
+
+*rrdtool-1.0.35-r3 (10 Jun 2002)
+
+  16 Sep 2002; <mcummings@gentoo.org> : add  PREFIX=${D}/usr to perl line.
+
+  10 Jun 2002; Seemant Kulleen <seemant@gentoo.org> rrdtool-1.0.35-r3.ebuild
+  files/digest-rrdtool-1.0.35-r3 :
+
+  Made fixes so it installs the binaries into /usr/bin and there are also
+  some perl specific things that need to be done (perl was made an optional
+  dep) which are done through the perl-module eclass now.
+
+*rrdtool-1.0.35-r2 (2 Jun 2002)
+	2 Jun 2002; Ben Lutgens <lamer@gentoo.org> rrdtool-1.0.35-r1
+	
+	Changed the install location from /opt/rrdtool to /usr/share/rrdtool
+	and installed the manpages in /usr/share/man/man1
+
+*rrdtool-1.0.35-r1 (15 Apr 2002)
+
+  15 Apr 2002; Seemant Kulleen <seemant@gentoo.org> rrdtool-1.0.35-r1.ebuild
+  files/digest-rrdtool-1.0.35-r1 :
+
+  Replaced the tcl USE flag with tcltk instead, since the latter encapsulates
+  the former, and this is the only ebuild that uses the former.
+
+*rrdtool-1.0.35 (21 Mar 2002)
+
+  21 Feb 2002; Ferry Meyndert <m0rpheus@gentoo.org> rrdtool-1.0.35.ebuild : 
+
+  Added new version of rddtool 1.0.35 and removed the old once that had
+  the zlib bug
+  
 *rrdtool-1.0.33 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 7ea76a8a4c51..32cd5f0798e6 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,7 +1,20 @@
-MD5 316e21a74d176af7a8c0fe205f749900 ChangeLog 2944
-MD5 9f39b45d65367ec65a2b71519a7ddcaa rrdtool-1.0.40.ebuild 2183
-MD5 99741c976cc2441991bca47f05e7e061 rrdtool-1.0.41.ebuild 2225
-MD5 2973ebd9622da28278da2c768079f559 rrdtool-1.0.42.ebuild 2226
-MD5 97610425876ad7e680316d1a3e808c4b files/digest-rrdtool-1.0.40 67
-MD5 6e61ce85825b075dfa4829b7d7f58ab3 files/digest-rrdtool-1.0.41 132
-MD5 e2341044ceaf46443ec4c577647d9cae files/digest-rrdtool-1.0.42 67
+MD5 987a31898876bb7a6afd3b748a09eadf ChangeLog 12837
+MD5 1a739170238a1fae241a8a0df21462e9 metadata.xml 241
+MD5 7245abe6326ff3cc840e5092c1b60890 rrdtool-1.0.49.ebuild 2729
+MD5 177f6939c1ba72adbbd42b99ea93121f rrdtool-1.0.50.ebuild 2753
+MD5 fef8045c2bacc8cea9464b5814d2c1b3 rrdtool-1.2.10.ebuild 2736
+MD5 77bed9d6fbeca3617e3b98cb2b53f8c2 rrdtool-1.2.11-r1.ebuild 3009
+MD5 151d47950f93918c3acc3bccbc6c18d6 rrdtool-1.2.11-r2.ebuild 2991
+MD5 8a03c26212eb502a4d400bf4fd8b625e rrdtool-1.2.11.ebuild 2752
+MD5 19c7cf9496d4c88a2f2badad0034669f rrdtool-1.2.6-r1.ebuild 2757
+MD5 108d7118044d58ce07544af00277028b rrdtool-1.2.6.ebuild 2815
+MD5 5237327ba17008615f4ee3498d1e12aa rrdtool-1.2.9.ebuild 2734
+MD5 5027f79618fbf229b145b204b1e595ce files/digest-rrdtool-1.0.49 67
+MD5 0f97ed6174056bc1f72fbd7eb964f3f6 files/digest-rrdtool-1.0.50 67
+MD5 f16d0d8d5db1ed4ece7a3221c9fb8266 files/digest-rrdtool-1.2.10 67
+MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11 67
+MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11-r1 67
+MD5 1b866549cddb9e5a73a64be509395166 files/digest-rrdtool-1.2.11-r2 67
+MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6 65
+MD5 7ee6d2e6d1bc0c21aaea586600840694 files/digest-rrdtool-1.2.6-r1 65
+MD5 ddcbf31c065a424ce3ad6595d1b5ea8d files/digest-rrdtool-1.2.9 65
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index 0c0bf794ff1f..2f8d88528124 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-<longdescription>RRD is the Acronym for Round Robin Database. RRD is a system to store and display time-series data (i.e. network bandwidth, machine-room temperature, server load average). It stores the data in a very compact way that will not expand over time, and it presents useful graphs by processing the data to enforce a certain data density. It can be used either via simple wrapper scripts (from shell or Perl) or via frontends that poll network devices and put a friendly user interface on it.</longdescription>
+<herd>netmon</herd>
+<longdescription>A system to store and display time-series data</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
index 478b1ce9dd0e..c499015727a1 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.0.49.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/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild,v 1.1 2004/08/10 02:05:02 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.49.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.ee.ethz.ch/%7Eoetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64 ia64"
 IUSE="perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
@@ -29,7 +29,11 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-fPIC.patch
+	sed -e 's/^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC)/& -prefer-pic/' -i src/Makefile.in
+
+	if [[ ! $(grep '^LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) -prefer-pic' src/Makefile.in) ]]; then
+		die "Makefile.in sed failed"
+	fi
 }
 
 src_compile() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild b/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
index 82ce1607c917..ca8275466a74 100644
--- a/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.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/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild,v 1.1 2005/04/27 12:30:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.0.50.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.10.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.10.ebuild
index fd76e3d9fae1..fe34caaef2e3 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.10.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.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/net-analyzer/rrdtool/rrdtool-1.2.10.ebuild,v 1.1 2005/06/19 00:38:09 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.10.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild
index d35c678e4d50..9126f34c949c 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.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/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild,v 1.1 2005/09/06 12:28:17 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.11-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils multilib
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild
index 0731d8c61c4e..620a4c49e1db 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.11-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/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild,v 1.1 2005/09/22 01:17:52 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.11-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils multilib
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc perl python tcltk"
 
 RDEPEND="tcltk? ( dev-lang/tcl )
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.11.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.11.ebuild
index e5711ad63029..4d830f54596f 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.11.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.11.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/net-analyzer/rrdtool/rrdtool-1.2.11.ebuild,v 1.1 2005/07/26 10:28:09 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.11.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,19 +10,21 @@ SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
 IUSE="doc perl python tcltk"
 
-DEPEND="perl? ( dev-lang/perl )
-	python? ( dev-lang/python )
-	sys-apps/gawk
+RDEPEND="tcltk? ( dev-lang/tcl )
 	>=sys-libs/zlib-1.2.1
 	>=media-libs/freetype-2.1.5
 	>=media-libs/libart_lgpl-2.3.16
 	>=media-libs/libpng-1.2.5
-	>=media-libs/gd-1.8.3
+	>=media-libs/gd-1.8.3"
+
+DEPEND="${RDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-lang/python )
+	sys-apps/gawk
 	>=dev-libs/cgilib-0.5"
-RDEPEND="tcltk? ( dev-lang/tcl )"
 
 TCLVER=""
 
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild
index 501e16780f76..2d87498df70d 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.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/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild,v 1.1 2005/06/10 13:44:28 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.6-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc sparc x86"
 IUSE="doc perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
@@ -32,6 +32,8 @@ src_unpack() {
 		bindings/tcl/tclrrd.c || die "sed failed"
 	sed -i -e 's:-lrrd_private:-ltcl -lrrd:' \
 		bindings/tcl/Makefile.* || die "sed failed"
+	sed -i -e 's:^\(LIBDIRS\s*= .*-L\)\.\./src/.libs:\1../../src/.libs/:' \
+		bindings/tcl/Makefile.in || die "sed failed"
 }
 
 pkg_setup() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild
index 3fcc0e20ba8d..7c837766eee9 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.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/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild,v 1.1 2005/05/10 13:39:40 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.6.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://people.ee.ethz.ch/~oetiker/webtools/${PN}/pub/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc"
+KEYWORDS="alpha ~amd64 hppa ~ia64 ppc sparc x86"
 IUSE="perl tcltk"
 
 DEPEND="perl? ( dev-lang/perl )
@@ -30,8 +30,10 @@ src_unpack() {
 	cd ${S}
 	sed -i -e 's:<rrd_\(.*\)>:"../../src/rrd_\1":g' \
 		bindings/tcl/tclrrd.c || die "sed failed"
-	sed -i -e 's:-lrrd_private::' \
+	sed -i -e 's:-lrrd_private:-ltcl -lrrd:' \
 		bindings/tcl/Makefile.* || die "sed failed"
+	sed -i -e 's:^\(LIBDIRS\s*= .*-L\)\.\./src/.libs:\1../../src/.libs/:' \
+		bindings/tcl/Makefile.in || die "sed failed"
 }
 
 pkg_setup() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.2.9.ebuild b/net-analyzer/rrdtool/rrdtool-1.2.9.ebuild
index 0cf24d51b9da..acc657be4390 100644
--- a/net-analyzer/rrdtool/rrdtool-1.2.9.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.2.9.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 inherit perl-module flag-o-matic gnuconfig eutils
 
diff --git a/net-analyzer/rtg/ChangeLog b/net-analyzer/rtg/ChangeLog
index 5d5ba181671f..b25da6b594b9 100644
--- a/net-analyzer/rtg/ChangeLog
+++ b/net-analyzer/rtg/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-analyzer/rtg
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rtg/ChangeLog,v 1.1 2004/02/08 19:26:36 anti Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rtg/ChangeLog,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> rtg-0.7.4-r1.ebuild,
+  rtg-0.7.4.ebuild:
+  marked x86 stable
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> rtg-0.7.4.ebuild:
+  added missing IUSE
+
+  04 Jun 2004; David Holm <dholm@gentoo.org> rtg-0.7.4-r1.ebuild:
+  Added to ~ppc.
+
+*rtg-0.7.4-r1 (29 May 2004)
+
+  29 May 2004; Ray Russell Reese III <anti@gentoo.org> rtg-0.7.4-r1.ebuild,
+  files/rtgpoll.confd, files/rtgpoll.initd:
+  Added new init.d script for rtgpoll.
+
+  08 May 2004; Danny van Dyk <kugelfang@gentoo.org> rtg-0.7.4.ebuild:
+  Marked ~amd64.
 
 *rtg-0.7.4 (08 Feb 2004)
 
diff --git a/net-analyzer/rtg/Manifest b/net-analyzer/rtg/Manifest
index a25761e64c70..b1cd8aad7739 100644
--- a/net-analyzer/rtg/Manifest
+++ b/net-analyzer/rtg/Manifest
@@ -1,5 +1,19 @@
-MD5 71f4f7b1124310624cfc683ab4a6df70 rtg-0.7.4.ebuild 966
-MD5 e25c84fd1a2a0c0e81cacb709f6cbbbe metadata.xml 260
-MD5 b8a8f10cad216b0f3eaa8c86954ee42d ChangeLog 242
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 74e2823d5d9ee33441c3d6546c319e51 ChangeLog 874
 MD5 6692acdf355eb282398b0e09eee80d02 files/digest-rtg-0.7.4 61
+MD5 6692acdf355eb282398b0e09eee80d02 files/digest-rtg-0.7.4-r1 61
 MD5 95d2926c7d784e64b502842c3d3597b5 files/rtg-0.7.4-pathfix.patch 4074
+MD5 a5df7a7397ca4a83811ff6c0e2d50a3f files/rtgpoll.confd 355
+MD5 004f47ae719ca8079ce11b5a14593274 files/rtgpoll.initd 1258
+MD5 e25c84fd1a2a0c0e81cacb709f6cbbbe metadata.xml 260
+MD5 b138e43722a99c793eefaac3019389e7 rtg-0.7.4-r1.ebuild 1145
+MD5 9461712353c5f2b5174c41ac74a4892c rtg-0.7.4.ebuild 1003
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0BrKI1lqEGTUzyQRAh5SAKDUkoLJHEwE+9po8b4c2uR0mcjRJgCfX+V9
+Aanvdlhk3NfGymp2io24ofQ=
+=oZ+f
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/rtg/files/rtgpoll.confd b/net-analyzer/rtg/files/rtgpoll.confd
index 0ef172060796..450ad3cc229f 100644
--- a/net-analyzer/rtg/files/rtgpoll.confd
+++ b/net-analyzer/rtg/files/rtgpoll.confd
@@ -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/net-analyzer/rtg/files/rtgpoll.confd,v 1.1 2004/05/30 00:05:17 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rtg/files/rtgpoll.confd,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 # RTGPOLL_TARGETS defines the targets file to run the poller on. The default
 # should be fine.
diff --git a/net-analyzer/rtg/files/rtgpoll.initd b/net-analyzer/rtg/files/rtgpoll.initd
index 8f76af1653f6..996a701ba24f 100644
--- a/net-analyzer/rtg/files/rtgpoll.initd
+++ b/net-analyzer/rtg/files/rtgpoll.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-analyzer/rtg/files/rtgpoll.initd,v 1.1 2004/05/30 00:05:17 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rtg/files/rtgpoll.initd,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 [ -z "${RTGPOLL_TARGETS}" ] && RTGPOLL_TARGETS=/etc/rtg/targets.cfg
 
diff --git a/net-analyzer/rtg/rtg-0.7.4-r1.ebuild b/net-analyzer/rtg/rtg-0.7.4-r1.ebuild
index 2797461a74a6..84da9164db40 100644
--- a/net-analyzer/rtg/rtg-0.7.4-r1.ebuild
+++ b/net-analyzer/rtg/rtg-0.7.4-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/net-analyzer/rtg/rtg-0.7.4-r1.ebuild,v 1.1 2004/05/30 00:05:17 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rtg/rtg-0.7.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/rtg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 DEPEND=">=dev-db/mysql-3.23.52-r1
@@ -43,9 +43,9 @@ src_install() {
 
 pkg_postinst() {
 	einfo "RTG has been installed."
-	einfo ""
+	einfo
 	einfo "The default configuration file location is now /etc/rtg"
-	einfo ""
+	einfo
 	einfo "Sample reports have been installed into /usr/share/rtg"
-	einfo ""
+	einfo
 }
diff --git a/net-analyzer/rtg/rtg-0.7.4.ebuild b/net-analyzer/rtg/rtg-0.7.4.ebuild
index 39fad8466101..95bd685c2953 100644
--- a/net-analyzer/rtg/rtg-0.7.4.ebuild
+++ b/net-analyzer/rtg/rtg-0.7.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/net-analyzer/rtg/rtg-0.7.4.ebuild,v 1.1 2004/02/08 19:26:36 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rtg/rtg-0.7.4.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,8 @@ SRC_URI="mirror://sourceforge/rtg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
+IUSE=""
 
 DEPEND=">=dev-db/mysql-3.23.52-r1
 	>=net-analyzer/net-snmp-5.0.9-r1"
@@ -37,8 +38,8 @@ src_install() {
 
 pkg_postinst() {
 	einfo "RTG has been installed."
-	einfo ""
+	einfo
 	einfo "The default configuration file location is now /etc/rtg"
-	einfo ""
+	einfo
 	einfo "Sample reports have been installed into /usr/share/rtg"
-}
\ No newline at end of file
+}
diff --git a/net-analyzer/sancp/ChangeLog b/net-analyzer/sancp/ChangeLog
index 74d2feb4378d..069209a00663 100644
--- a/net-analyzer/sancp/ChangeLog
+++ b/net-analyzer/sancp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-analyzer/sancp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.1 2005/10/08 13:52:29 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org> files/sancp.rc1:
+  fix for sancp.rc1
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org> files/sancp.rc1:
+  fixed typo in sancp.rc1
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org> +files/sguil_sancp.conf:
+  Added sguil_sancp.conf
 
 *sancp-1.6.1 (08 Oct 2005)
 
diff --git a/net-analyzer/sancp/Manifest b/net-analyzer/sancp/Manifest
index 2771c4d8ebe5..33a42d4c9094 100644
--- a/net-analyzer/sancp/Manifest
+++ b/net-analyzer/sancp/Manifest
@@ -1,2 +1,7 @@
-MD5 2414dcbaf41c7240aa50660e3f75d441 sancp-1.6.1.ebuild 1306
+MD5 dcbac3909ccb1f3db2270023669e8e4c sancp-1.6.1.ebuild 1406
+MD5 6b979be3905d9fdc35276bed0c160856 ChangeLog 704
+MD5 277c9d1d9522b7e2519bd07c003dc700 metadata.xml 238
+MD5 74992205ea566bb9d00fac0a01c9c684 files/sancp.rc1 969
+MD5 d58263b185630aa4738adbd4d79e0cbb files/sancp.confd 275
+MD5 3b34df10774a182a4cc3b848c35ccc94 files/sguil_sancp.conf 2133
 MD5 5a29e0856415b398e93b6aa72172fa50 files/digest-sancp-1.6.1 62
diff --git a/net-analyzer/sancp/files/sancp.rc1 b/net-analyzer/sancp/files/sancp.rc1
index d5f8ea17c89f..ddc14c616f38 100644
--- a/net-analyzer/sancp/files/sancp.rc1
+++ b/net-analyzer/sancp/files/sancp.rc1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/files/sancp.rc1,v 1.1 2005/10/08 13:52:29 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/files/sancp.rc1,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 today=$(date '+%Y-%m-%d')
 
@@ -30,7 +30,7 @@ start() {
 	fi
 	
 	ebegin "Starting sancp"
-	start-stop-daemon --start --quiet --pidfiles /var/run/sancp.pid \
+	start-stop-daemon --start --quiet -m --pidfile /var/run/sancp.pid \
 		--exec /usr/bin/sancp \
 		-- ${SANCP_OPTS} > /var/log/sancp.log 2>&1 &
 	eend $?
diff --git a/net-analyzer/sancp/files/sguil_sancp.conf b/net-analyzer/sancp/files/sguil_sancp.conf
index 298a7b1a9043..2668d7755a6e 100644
--- a/net-analyzer/sancp/files/sguil_sancp.conf
+++ b/net-analyzer/sancp/files/sguil_sancp.conf
@@ -1,4 +1,4 @@
-# $Id: sguil_sancp.conf,v 1.1 2005/10/10 00:16:45 strerror Exp $ #
+# $Id: sguil_sancp.conf,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $ #
 #
 # This sancp.conf is distributed as part of sguil (http://sguil.sf.net).
 # It's purpose is to define a default output that is compatible with table
diff --git a/net-analyzer/sancp/sancp-1.6.1.ebuild b/net-analyzer/sancp/sancp-1.6.1.ebuild
index 18d337f76534..8e3047180a31 100644
--- a/net-analyzer/sancp/sancp-1.6.1.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.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/net-analyzer/sancp/sancp-1.6.1.ebuild,v 1.1 2005/10/08 13:52:29 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sancp/sancp-1.6.1.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/sara/ChangeLog b/net-analyzer/sara/ChangeLog
index d78f6827a41d..74e1c65431b6 100644
--- a/net-analyzer/sara/ChangeLog
+++ b/net-analyzer/sara/ChangeLog
@@ -1,6 +1,61 @@
 # ChangeLog for net-analyzer/sara
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/ChangeLog,v 1.1 2004/06/15 16:28:13 squinky86 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  12 Oct 2005; Luis Medinas <metalgod@gentoo.org> sara-6.0.6.ebuild:
+  Added ~amd64 keyword. Bug #108327.
+
+*sara-6.0.6 (05 Sep 2005)
+
+  05 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +sara-6.0.6.ebuild:
+  Version bump.
+
+  25 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> -sara-5.1.1a.ebuild,
+  -sara-5.2.0a.ebuild, -sara-6.0.1.ebuild, sara-6.0.4.ebuild:
+  Marked 6.0.4 x86 stable, removed previous versions. It should fix bug 69638.
+  Thanks to Michael Forbes <miforbes-gentoo-org@mbhs.edu>, Kyle England
+  <kengland@gentoo.org> and others.
+
+*sara-6.0.4 (22 Jun 2005)
+
+  22 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> sara-6.0.1.ebuild,
+  +sara-6.0.4.ebuild:
+  Add -j1 to emake as it does not like to build in parallel. Version bump.
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> -sara-5.0.5b.ebuild,
+  sara-5.1.1a.ebuild, sara-5.2.0a.ebuild, sara-6.0.1.ebuild:
+  Removed unnecessary src_compile from ebuilds, old ebuild.
+
+*sara-6.0.1 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +sara-6.0.1.ebuild:
+  Version bump
+
+*sara-5.2.0a (09 Dec 2004)
+
+  09 Dec 2004; Jon Hood <squinky86@gentoo.org> +files/sara,
+  +sara-5.2.0a.ebuild:
+  Version bump.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> sara-5.1.1a.ebuild:
+  Stable on x86.
+
+  07 Aug 2004; Jon Hood <squinky86@gentoo.org> sara-5.0.5b.ebuild,
+  sara-5.1.1a.ebuild:
+  Ebuild cleanups thanks to Antonio <netbix@tiscali.it>, #59612.
+  DEPEND on net-misc/netkit-fingerd.
+
+*sara-5.1.1a (05 Aug 2004)
+
+  05 Aug 2004; Jon Hood <squinky86@gentoo.org> sara-5.0.5b.ebuild,
+  +sara-5.1.1a.ebuild:
+  Stable x86 and testing version bumps.
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> sara-5.0.5b.ebuild:
+  Added to ~ppc.
+
+  15 Jun 2004; Jon Hood <squinky86@gentoo.org> sara-5.0.5b.ebuild:
+  RESTRICT=nomirror because of license
 
 *sara-5.0.5b (15 Jun 2004)
 
diff --git a/net-analyzer/sara/Manifest b/net-analyzer/sara/Manifest
index 78f15ef38d51..1e9d65d23dcd 100644
--- a/net-analyzer/sara/Manifest
+++ b/net-analyzer/sara/Manifest
@@ -1,2 +1,17 @@
-MD5 21cb7dfa7dc6fca8e3083fab9d7f677f sara-5.0.5b.ebuild 3418
-MD5 aed7b12c3de035d00503376c2482954f files/digest-sara-5.0.5b 61
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e06204e3f405aaa2c5574dcd4913263b ChangeLog 2206
+MD5 5c10df628bd8e993b404759fef5d70dc files/digest-sara-6.0.4 60
+MD5 d4632f62f7f9cccf064279990f214618 files/digest-sara-6.0.6 60
+MD5 291ce83a97555c503a53904467cae289 files/sara 246
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 4d94863ed1540fcca8ba78e2bfb7875c sara-6.0.4.ebuild 3559
+MD5 73d004462caef7b9d472dab1d31ac95c sara-6.0.6.ebuild 3565
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDTVIqwUpWvClEHQoRAuObAJ0fy+hd0J0iYebITFxzGq0iq9E5YACffG6p
++OKBRWyoFFnO0T/y7TvxXlg=
+=OwXH
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sara/files/sara b/net-analyzer/sara/files/sara
index 3341efb9a198..2c3e582e62f5 100644
--- a/net-analyzer/sara/files/sara
+++ b/net-analyzer/sara/files/sara
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/files/sara,v 1.1 2004/12/09 20:31:06 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/files/sara,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 cd /opt/sara
 ./sara
diff --git a/net-analyzer/sara/metadata.xml b/net-analyzer/sara/metadata.xml
index 267b8f4a10fd..03aa50bab7e3 100644
--- a/net-analyzer/sara/metadata.xml
+++ b/net-analyzer/sara/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>squinky86@gentoo.org</email>
-</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/sara/sara-6.0.4.ebuild b/net-analyzer/sara/sara-6.0.4.ebuild
index 49a488f6dfac..74e092ea2fd4 100644
--- a/net-analyzer/sara/sara-6.0.4.ebuild
+++ b/net-analyzer/sara/sara-6.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/net-analyzer/sara/sara-6.0.4.ebuild,v 1.1 2005/06/22 17:08:22 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.4.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 DESCRIPTION="SARA Security Auditor's Research Assistant is a derived work of Security Administrator Tool for Analyzing Networks SATAN"
 SRC_URI="http://www-arc.com/sara/downloads/${P}.tgz"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www-arc.com/sara/"
 
 SLOT="0"
 LICENSE="satan"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE="X"
 
 DEPEND=">=dev-lang/perl-5.8 \
diff --git a/net-analyzer/sara/sara-6.0.6.ebuild b/net-analyzer/sara/sara-6.0.6.ebuild
index 5546df6bca06..429c5c97c8d8 100644
--- a/net-analyzer/sara/sara-6.0.6.ebuild
+++ b/net-analyzer/sara/sara-6.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/net-analyzer/sara/sara-6.0.6.ebuild,v 1.1 2005/09/05 01:50:41 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sara/sara-6.0.6.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 DESCRIPTION="SARA Security Auditor's Research Assistant is a derived work of Security Administrator Tool for Analyzing Networks SATAN"
 SRC_URI="http://www-arc.com/sara/downloads/${P}.tgz"
@@ -9,7 +9,7 @@ HOMEPAGE="http://www-arc.com/sara/"
 
 SLOT="0"
 LICENSE="satan"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="X"
 
 DEPEND=">=dev-lang/perl-5.8 \
diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 89b956538880..9501d3cdd832 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,68 @@
 # ChangeLog for net-analyzer/sarg
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
+  06 Nov 2005; <soulse@gentoo.org> metadata.xml:
+  Added to netmon herd.
+
+  06 Nov 2005; <soulse@gentoo.org> sarg-2.0.8.ebuild:
+  Stable on x86 wrt bug#111157.
+
+  08 Aug 2005; Simon Stelling <blubb@gentoo.org> sarg-2.0.8.ebuild:
+  stable on amd64
+
+  23 Jun 2005; David Holm <dholm@gentoo.org> sarg-2.0.8.ebuild:
+  Added to ~ppc.
+
+  22 Jun 2005; Jonathan Smith <smithj@gentoo.org> sarg-2.0.8.ebuild:
+  fixed whitespace in 2.0.8 ebuild
+
+*sarg-2.0.8 (22 Jun 2005)
+
+  22 Jun 2005; Jonathan Smith <smithj@gentoo.org> +sarg-2.0.8.ebuild:
+  version bump for #71656, which also fixes #43132, #64743, and probably
+  #77285; thanks to Volkov Peter <torre_cremata@mail.ru> (a dev-in-training
+  :-) for the ebuild; fixed homepage and description while i was at it
+
+  02 May 2005; Eldad Zack <eldad@gentoo.org> sarg-1.4.1-r2.ebuild:
+  Homepage, SRC_URI updates. Closes #57527. Thanks to Daniel Webert
+  <rockoo@gmail.com>.
+
+  18 Dec 2004; Jared Hudson <jhhudso@gentoo.org> sarg-1.4.1-r2.ebuild :
+  Added amd64 keyword.
+	
+  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; sarg-1.2.2.ebuild,
+  sarg-1.4.1-r2.ebuild, sarg-1.4.1.ebuild:
+  Changing net-www/squid to www-proxy/squid in depends
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> sarg-1.2.2.ebuild,
+  -sarg-1.4.1-r1.ebuild, sarg-1.4.1-r2.ebuild, sarg-1.4.1.ebuild:
+  Tidy, x86 stable
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> sarg-1.4.1-r1.ebuild,
+  sarg-1.4.1-r2.ebuild:
+  Add inherit eutils
+
+*sarg-1.4.1-r2 (24 Feb 2004)
+
+  24 Feb 2004; Jared Hudson <jhhudso@gentoo.org> : Added patch to fix segfault
+  under 2.6.x kernels. Credit goes to Ghislain Bourgeois
+  <ghislain48@hotmail.com> under bug #41834 for this fix.
+	
+*sarg-1.4.1-r1 (04 Jan 2004)
+
+  04 Jan 2004; Jared Hudson <jhhudso@gentoo.org> : Added patch as requested
+  by Markus Lidel <Markus.Lidel@shadowconnect.com> under bug #36410.
+	
+  12 Jun 2003; <msterret@gentoo.org> sarg-1.4.1.ebuild:
+  add Header
+
+*sarg-1.4.1 (24 May 2003)
+
+  24 May 2003; Jared Hudson <jhhudso@gentoo.org> : Updated to latest version
+  and added man page to ebuild. Credit goes to Marcel Meyer <meyerm@fs.tum.de>
+  In response to bug #21161
+	
 *sarg-1.2.2 (14 Nov 2002)
 
   14 Nov 2002; Jared Hudson <jhhudso@gentoo.org> : Initial Import. Ebuild
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 973e308ceff5..87c0debc6213 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,5 +1,7 @@
-MD5 bc422e75bc5754b1da6c6b42cc8adc03 ChangeLog 270
-MD5 9ceeee12a4c2f9d93d025f87446d189d sarg-1.2.2.ebuild 826
-MD5 165db035d699a3b60d302ce5ff91cfbe sarg-1.4.1.ebuild 792
-MD5 b60741cb2874bce6ba11ed9ab30de7ac files/digest-sarg-1.2.2 62
-MD5 d0d0e64d8851d613b34982597a1d1cee files/digest-sarg-1.4.1 62
+MD5 528e0eed261d36a9fd72c9f3d5ddd7ee ChangeLog 2495
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 2969a97b43e7764f8030ffe20db97c9c sarg-1.4.1-r2.ebuild 1116
+MD5 52c283ca52daf4ccd3e180c874c51033 sarg-2.0.8.ebuild 2098
+MD5 c1d5675a58b98064b57ce771a2ecd4b8 files/digest-sarg-1.4.1-r2 132
+MD5 51dfe863ba88a60c8c3ae74fb81729c1 files/digest-sarg-2.0.8 62
+MD5 4ce75e6dba68e51c94d8fb4b47a5ed9f files/sarg-1.4.1-2.6.fix.patch 1556
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index c5d67a611520..03aa50bab7e3 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/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>jhhudso@gentoo.org</email>
-</maintainer>
+<herd>netmon</herd>
 </pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-1.4.1-r2.ebuild b/net-analyzer/sarg/sarg-1.4.1-r2.ebuild
index f0d0876c7cb3..5b7ac7bca6ed 100644
--- a/net-analyzer/sarg/sarg-1.4.1-r2.ebuild
+++ b/net-analyzer/sarg/sarg-1.4.1-r2.ebuild
@@ -1,17 +1,20 @@
-# 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/net-analyzer/sarg/sarg-1.4.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Sarg (Squid Analysis Report Generator) is a tool that allows you to view where your users are going to on the Internet."
-HOMEPAGE="http://web.onda.com.br/orso/sarg.html"
-SRC_URI="http://web.onda.com.br/orso/${P}.tar.gz http://web.onda.com.br/orso/patches/sarg-1.4.1-index.sort.patch"
+HOMEPAGE="http://sarg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz http://dev.gentoo.org/~eldad/distfiles/sarg-1.4.1-index.sort.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 amd64"
+IUSE=""
 
 DEPEND=""
-RDEPEND=">=net-www/squid-2.5.1"
+RDEPEND=">=net-proxy/squid-2.5.1"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/sarg/sarg-2.0.8.ebuild b/net-analyzer/sarg/sarg-2.0.8.ebuild
index 127e3b00a390..ce95724f44e7 100644
--- a/net-analyzer/sarg/sarg-2.0.8.ebuild
+++ b/net-analyzer/sarg/sarg-2.0.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/net-analyzer/sarg/sarg-2.0.8.ebuild,v 1.1 2005/06/22 14:35:10 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:12:16 chriswhite Exp $
 
 inherit eutils
 
@@ -9,21 +9,21 @@ HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc x86"
 SLOT="0"
 IUSE=""
 
 DEPEND="virtual/libc
-		media-libs/freetype
-		media-libs/libpng
-		sys-libs/zlib
-		media-libs/gd"
+	media-libs/freetype
+	media-libs/libpng
+	sys-libs/zlib
+	media-libs/gd"
 
 RDEPEND=">=net-proxy/squid-2.5.1"
 
 pkg_setup() {
 	built_with_use -a media-libs/gd png truetype || die \
-	"Please recompile media-libs/gd with USE=\"+png +truetype\""
+	"Please recompile media-libs/gd with USE=\"png truetype\""
 }
 
 src_unpack() {
diff --git a/net-analyzer/sbd/ChangeLog b/net-analyzer/sbd/ChangeLog
index 74892d94527c..9309f4ab6c1b 100644
--- a/net-analyzer/sbd/ChangeLog
+++ b/net-analyzer/sbd/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for net-misc/sbd
+# ChangeLog for net-analyzer/sbd
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sbd/ChangeLog,v 1.1 2005/10/14 00:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sbd/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 *sbd-1.37 (25 Aug 2005)
 
diff --git a/net-analyzer/sbd/Manifest b/net-analyzer/sbd/Manifest
index 4489a623d32e..8d5e405bf95a 100644
--- a/net-analyzer/sbd/Manifest
+++ b/net-analyzer/sbd/Manifest
@@ -1,6 +1,16 @@
-MD5 a17a172a4b78c3537dba9a78ad831a6b ChangeLog 1131
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c06c597d366858f6298b6893637dd168 ChangeLog 1139
 MD5 61a25c14e6cee2d76427ae525f40d806 files/digest-sbd-1.36 59
 MD5 8394c842ab4f5673a2aff22691184332 files/digest-sbd-1.37 59
-MD5 33b2710f9c33614f214b4eb5cfd5fdf6 metadata.xml 600
-MD5 4728e1c9c9c2ee7158e0b6a5c2eb3c1b sbd-1.36.ebuild 706
-MD5 130f4b90d645c10e108f61bd4905be26 sbd-1.37.ebuild 707
+MD5 6f854fc79df85642d4662ef96ca8460a metadata.xml 599
+MD5 cae2d2c66e4667b5de525ffaf0d09f09 sbd-1.36.ebuild 708
+MD5 00f94df622a6b485c79073ce12d15dc3 sbd-1.37.ebuild 717
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDT6GWI1lqEGTUzyQRAhBVAJ4wvoX6uQuQSOgNAQ5LyBOQOa+ilACg2SHF
+/kqfKsx0otnGKcuZwJXoqv0=
+=sL+1
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sbd/sbd-1.36.ebuild b/net-analyzer/sbd/sbd-1.36.ebuild
index 9a35fb8478a8..88d1d686f326 100644
--- a/net-analyzer/sbd/sbd-1.36.ebuild
+++ b/net-analyzer/sbd/sbd-1.36.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/net-analyzer/sbd/sbd-1.36.ebuild,v 1.1 2005/10/14 00:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sbd/sbd-1.36.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/sbd/sbd-1.37.ebuild b/net-analyzer/sbd/sbd-1.37.ebuild
index a9f4356af529..226c54381e94 100644
--- a/net-analyzer/sbd/sbd-1.37.ebuild
+++ b/net-analyzer/sbd/sbd-1.37.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/net-analyzer/sbd/sbd-1.37.ebuild,v 1.1 2005/10/14 00:53:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sbd/sbd-1.37.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
 inherit toolchain-funcs
 
diff --git a/net-analyzer/scanlogd/ChangeLog b/net-analyzer/scanlogd/ChangeLog
index 687602eae963..ba325ff8f461 100644
--- a/net-analyzer/scanlogd/ChangeLog
+++ b/net-analyzer/scanlogd/ChangeLog
@@ -1,7 +1,32 @@
-# ChangeLog for net-misc/scanlogd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/skel.ChangeLog,v 1.2 2002/02/05 00:57:47 gbevin Exp
+# ChangeLog for net-analyzer/scanlogd
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
+  23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> scanlogd-2.2.5.ebuild:
+  Use -1 instead of /bin/false, bug #103421.
+
+  16 Jul 2005; Christian Parpart <trapni@gentoo.org> scanlogd-2.2.5.ebuild:
+  added to ~amd64
+
+  24 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> scanlogd-2.2.ebuild:
+  Stable on ppc.
+
+*scanlogd-2.2.5 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +scanlogd-2.2.5.ebuild:
+  Version bump, use enewuser from eutils.
+
+  04 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> scanlogd-2.2.ebuild:
+  Added to ~ppc.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> scanlogd-2.2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *scanlogd-2.2 (27 Feb 2002)
 
   27  Feb 2002; F.Meyndert <m0rpheus@gentoo.org> scanlogd-2.2.ebuild
diff --git a/net-analyzer/scanlogd/Manifest b/net-analyzer/scanlogd/Manifest
index b590323d84f1..927dde28cc24 100644
--- a/net-analyzer/scanlogd/Manifest
+++ b/net-analyzer/scanlogd/Manifest
@@ -1,4 +1,17 @@
-MD5 976c99ac0cf759bf38ec67e4a95e055e ChangeLog 534
-MD5 7ab1790758df16d967b67fdbc2216a83 scanlogd-2.2.ebuild 937
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3a60e1a0203aada57629a256558d7faf scanlogd-2.2.5.ebuild 863
+MD5 394a78abf8870808be867ff6fa40700b scanlogd-2.2.ebuild 910
+MD5 0cf3330d4e21972b8d7d18c163dbe786 ChangeLog 1272
+MD5 ec2d6d79ae70a3531cc4c1349fbaec41 metadata.xml 237
+MD5 6a8c9bce33e75966ebc0d4695c1d6f8c files/scanlogd.rc 497
 MD5 f3b5d3f3b476cf7d249d5063d9965cd4 files/digest-scanlogd-2.2 62
-MD5 dab7437a539e6f3215d0cec8af87085f files/scanlogd.rc 514
+MD5 4be54a9e63a2d22f46e9c511151231e6 files/digest-scanlogd-2.2.5 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDCyjCEZCkKN40op4RAnrQAJ93CJYxnXErKrAno1kcvhAttuyk/wCfblhj
+Lpl/0vh+2xL2knMUzHxGnb8=
+=nDMI
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/scanlogd/files/scanlogd.rc b/net-analyzer/scanlogd/files/scanlogd.rc
index be05b4af952b..9d1da6455098 100644
--- a/net-analyzer/scanlogd/files/scanlogd.rc
+++ b/net-analyzer/scanlogd/files/scanlogd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-misc/scanlogd/files/scanlogd.rc,v1.1 2002/02/12  azarah Exp
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/files/scanlogd.rc,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.5.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.5.ebuild
index 6a82a7e345d0..025946071b12 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.5.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.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/net-analyzer/scanlogd/scanlogd-2.2.5.ebuild,v 1.1 2005/03/22 23:11:48 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/scanlogd-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 inherit eutils
 
@@ -11,13 +11,13 @@ HOMEPAGE="http://www.openwall.com/scanlogd/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 DEPEND="virtual/libc"
 
 pkg_setup() {
 	enewgroup scanlogd
-	enewuser scanlogd -1 /bin/false /dev/null scanlogd
+	enewuser scanlogd -1 -1 /dev/null scanlogd
 }
 
 src_compile() {
diff --git a/net-analyzer/scanlogd/scanlogd-2.2.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.ebuild
index 54690b3df286..682f185f884f 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.2.ebuild
@@ -1,31 +1,33 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: mike polniak <mikpolniak@adelphia.net>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/scanlogd-2.2.ebuild,v 1.1 2002/02/27 20:49:06 m0rpheus Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanlogd/scanlogd-2.2.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
-S=${WORKDIR}/${P}
-DESCRIPTION="Scanlogd- detects and logs TCP port scans"
+IUSE=""
+DESCRIPTION="Scanlogd - detects and logs TCP port scans"
 SRC_URI="http://www.openwall.com/scanlogd/${P}.tar.gz"
-HOMEPAGE="http://www.openwall.com/scanlogd"
+HOMEPAGE="http://www.openwall.com/scanlogd/"
 
-DEPEND="virtual/glibc"
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 sparc ppc"
+
+DEPEND="virtual/libc"
 
 src_compile() {
 	make linux || die
 }
- 
-src_install()  {
-	mkdir -p ${D}usr/sbin  
-	cp scanlogd ${D}usr/sbin || die
-	
+
+src_install() {
+	dosbin scanlogd
 	doman scanlogd.8
 
 	exeinto /etc/init.d ; newexe ${FILESDIR}/scanlogd.rc scanlogd
-}  
+}
 
-pkg_postinst () {
-	einfo "Before you can run scanlogd you need too make the user scanlog by running the following command"                                                               
-        einfo "adduser -s /bin/false scanlogd"
-	einfo "You can start the scanlogd monitoring program on boot time by running"
-        einfo "rc-update add scanlogd default"                                       
-}                                                                               
+pkg_postinst() {
+	einfo "Before you can run scanlogd you need to create the user "
+	einfo "scanlog by running the following command"
+	einfo "adduser -s /bin/false scanlogd"
+	einfo "You can start the scanlogd monitoring program at boot by running"
+	einfo "rc-update add scanlogd default"
+}
diff --git a/net-analyzer/scanssh/ChangeLog b/net-analyzer/scanssh/ChangeLog
index ff07df694e89..8e9088abb6bc 100644
--- a/net-analyzer/scanssh/ChangeLog
+++ b/net-analyzer/scanssh/ChangeLog
@@ -1,9 +1,58 @@
 # ChangeLog for net-analyzer/scanssh
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/ChangeLog,v 1.1 2002/12/02 14:04:36 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/ChangeLog,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
+
+  04 Aug 2005; Daniel Black <dragonheart@gentoo.org> -scanssh-1.6b.ebuild,
+  -scanssh-2.0.ebuild, scanssh-2.1.ebuild:
+  fixes bug #99384. Thanks to Thomas Heinz for the solution. old version cleanout
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> scanssh-2.1.ebuild:
+  Stable on ppc.
+
+  20 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org> scanssh-2.1.ebuild:
+  Stable on sparc
+
+  19 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> scanssh-2.1.ebuild:
+  Marked stable on x86.
+
+*scanssh-2.1 (09 Mar 2005)
+
+  09 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/scanssh-2.0-fix-warnings.diff, scanssh-2.0.ebuild,
+  +scanssh-2.1.ebuild:
+  Version bump for bug 84536; added patch for both 2.0 and 2.1 to fix some
+  compiler warnings. Also fixed deps.
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> scanssh-2.0.ebuild:
+  Stable on sparc
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> scanssh-2.0.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> scanssh-1.6b.ebuild,
+  scanssh-2.0.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  19 Nov 2004; Jason Wever <weeve@gentoo.org> scanssh-1.6b.ebuild:
+  Stable on sparc.
+
+*scanssh-2.0 (16 Jul 2004)
+
+  16 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> scanssh-2.0.ebuild:
+  Version bump, ebuild contributed by Justin Guyett <justin@soze.net>.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  scanssh-1.6b.ebuild:
+  Added metadata
 
 *scanssh-1.6b (1 Dec 2002)
 
+  17 Mar 2003; Jason Wever <weeve@gentoo.org> scanssh-1.6b.ebuild:
+  Added ~sparc to keywords.
+
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> scanssh-1.6b.ebuild :
+  set ~ppc in keywords
+
   1 Dec 2002; Thilo Bangert <bangert@gentoo.org> :
   initial import
 
diff --git a/net-analyzer/scanssh/Manifest b/net-analyzer/scanssh/Manifest
index e69de29bb2d1..9cc7eb9e25fd 100644
--- a/net-analyzer/scanssh/Manifest
+++ b/net-analyzer/scanssh/Manifest
@@ -0,0 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c3bdee987aa83cc3fa81c85e9e468a37 ChangeLog 1950
+MD5 5ef1334dd837ff015a4d3765d65d2f15 metadata.xml 319
+MD5 6545951e51cef91d6a8b9121e6108f85 scanssh-2.1.ebuild 712
+MD5 82a68194d8671c58066260fd56901294 files/digest-scanssh-2.1 63
+MD5 b1cc68d1f6c015808670555fff3da70f files/scanssh-2.0-fix-warnings.diff 1928
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC8d3cmdTrptrqvGERAjgdAKCa+m+SwbxcAqhCDXKZCzBNtO+cxwCgnJ/k
+Q4TQYrKTQDj02CUxPOdyNqs=
+=4NF7
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild
index ea80b260e929..6ee74918e49b 100644
--- a/net-analyzer/scanssh/scanssh-2.1.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.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/net-analyzer/scanssh/scanssh-2.1.ebuild,v 1.1 2005/03/09 12:12:15 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scanssh/scanssh-2.1.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://monkey.org/~provos/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc sparc x86"
 IUSE=""
 
 DEPEND="virtual/libpcap
@@ -21,6 +21,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-2.0-fix-warnings.diff
+	touch configure
 }
 
 src_install() {
diff --git a/net-analyzer/scli/ChangeLog b/net-analyzer/scli/ChangeLog
index 8a89067cd927..a5c7e11e8aed 100644
--- a/net-analyzer/scli/ChangeLog
+++ b/net-analyzer/scli/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-analyzer/scli
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/ChangeLog,v 1.1 2005/01/28 11:49:51 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+  09 Oct 2005; <mkay@gentoo.org> scli-0.2.12.ebuild:
+  Fixing dependencies (bug #108118). Also - changing autoreconf to autoconf,
+  which is enought for our patches
+
+  19 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> scli-0.2.12.ebuild:
+  Marked stable on x86.
+
+  12 Apr 2005; Jason Wever <weeve@gentoo.org> scli-0.2.12.ebuild:
+  Added ~sparc keyword.
+
+  28 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/scli-0.2.12-fix-configure.diff:
+  Removed acconfig.h patch-out from fix-configure patch; seems to be causing
+  some funky weirdness.
 
 *scli-0.2.12 (28 Jan 2005)
 
diff --git a/net-analyzer/scli/Manifest b/net-analyzer/scli/Manifest
index 38b714c1c2ac..ec5bd8834aba 100644
--- a/net-analyzer/scli/Manifest
+++ b/net-analyzer/scli/Manifest
@@ -1,6 +1,6 @@
-MD5 b93b0ed1bc8a717c2f649ee0973a5cc4 scli-0.2.12.ebuild 1077
-MD5 749ec4834852c112e8d50bc28aca1059 ChangeLog 401
+MD5 6c5234700553083c6f1a74903231f6c3 ChangeLog 1030
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 1a2ef19f6967bfc1a09dea79dfdc28a5 scli-0.2.12.ebuild 1115
 MD5 cee1db33c3c86f0256eb7666ad160781 files/digest-scli-0.2.12 63
-MD5 ddeee904b35fc43fb415107b1bb848b0 files/scli-0.2.12-gentoo.diff 2492
-MD5 938b5279a893ecc81dcfefff1466baa9 files/scli-0.2.12-fix-configure.diff 2430
+MD5 231d44387fe2820b278e6b93943a4a82 files/scli-0.2.12-fix-configure.diff 1200
+MD5 ee225bed0ca758593aa508947a98599c files/scli-0.2.12-gentoo.diff 2503
diff --git a/net-analyzer/scli/files/scli-0.2.12-fix-configure.diff b/net-analyzer/scli/files/scli-0.2.12-fix-configure.diff
index 4c2c04fd9d16..7b7a9b215c02 100644
--- a/net-analyzer/scli/files/scli-0.2.12-fix-configure.diff
+++ b/net-analyzer/scli/files/scli-0.2.12-fix-configure.diff
@@ -1,37 +1,6 @@
-diff -urN scli-0.2.12.orig/acconfig.h scli-0.2.12/acconfig.h
---- scli-0.2.12.orig/acconfig.h	2005-01-28 01:19:14.000000000 -0500
-+++ scli-0.2.12/acconfig.h	1969-12-31 19:00:00.000000000 -0500
-@@ -1,27 +0,0 @@
--/*
-- * acconfig.h --
-- *
-- *	autoheader configuration macros
-- *
-- * Copyright (C) 2001 Juergen Schoenwaelder
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2, or (at your option)
-- * any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, write to the Free Software Foundation,
-- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-- * 
-- * @(#) $Id: scli-0.2.12-fix-configure.diff,v 1.1 2005/01/28 11:49:51 ka0ttic Exp $
-- */
--
--/* The full pathname of the directory containing scli plugins. */
--#define SCLI_PLUGIN_PATH "/usr/local/lib/scli"
--
 diff -urN scli-0.2.12.orig/configure.in scli-0.2.12/configure.in
---- scli-0.2.12.orig/configure.in	2005-01-28 01:19:14.000000000 -0500
-+++ scli-0.2.12/configure.in	2005-01-28 01:47:53.743741424 -0500
+--- scli-0.2.12.orig/configure.in	2005-01-28 08:56:45.739067213 -0500
++++ scli-0.2.12/configure.in	2005-01-28 08:59:11.769984430 -0500
 @@ -21,7 +21,7 @@
  AC_CHECK_PROG(SMIDUMP, smidump, smidump)
  AC_SUBST(SMIDUMP)
diff --git a/net-analyzer/scli/files/scli-0.2.12-gentoo.diff b/net-analyzer/scli/files/scli-0.2.12-gentoo.diff
index da5beb9c88f3..59c34732f14f 100644
--- a/net-analyzer/scli/files/scli-0.2.12-gentoo.diff
+++ b/net-analyzer/scli/files/scli-0.2.12-gentoo.diff
@@ -45,7 +45,7 @@ diff -urN scli-0.2.12.orig/snmp/g_session.c scli-0.2.12/snmp/g_session.c
 --- scli-0.2.12.orig/snmp/g_session.c	2005-01-28 01:19:14.000000000 -0500
 +++ scli-0.2.12/snmp/g_session.c	2005-01-28 02:43:13.875004752 -0500
 @@ -21,13 +21,12 @@
-  * $Id: scli-0.2.12-gentoo.diff,v 1.1 2005/01/28 11:49:51 ka0ttic Exp $
+  * $Id: scli-0.2.12-gentoo.diff,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
   */
  
 -#include "g_snmp.h"
diff --git a/net-analyzer/scli/scli-0.2.12.ebuild b/net-analyzer/scli/scli-0.2.12.ebuild
index 1485d8543eee..7c35a76f3914 100644
--- a/net-analyzer/scli/scli-0.2.12.ebuild
+++ b/net-analyzer/scli/scli-0.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/net-analyzer/scli/scli-0.2.12.ebuild,v 1.1 2005/01/28 11:49:51 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scli/scli-0.2.12.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,11 +10,11 @@ SRC_URI="ftp://ftp.ibr.cs.tu-bs.de/pub/local/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc"
 IUSE="debug"
 
 RDEPEND="virtual/libc
-	>=dev-libs/glib-1.2
+	=dev-libs/glib-1.2*
 	>=sys-libs/ncurses-5
 	>=sys-libs/readline-4
 	dev-libs/libxml2
@@ -30,8 +30,7 @@ src_unpack() {
 }
 
 src_compile() {
-	einfo "Updating autoconf/automake files"
-	WANT_AUTOCONF=2.13 WANT_AUTOMAKE=1.4 autoreconf || die "autoreconf failed"
+	WANT_AUTOCONF=2.59 autoconf || die "autoconf failed"
 
 	append-flags -I/usr/include/libxml2
 
diff --git a/net-analyzer/sec/ChangeLog b/net-analyzer/sec/ChangeLog
index c68448554309..533bc3be6da7 100644
--- a/net-analyzer/sec/ChangeLog
+++ b/net-analyzer/sec/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-analyzer/sec
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/ChangeLog,v 1.1 2004/07/24 14:20:25 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
+
+  17 Nov 2005; Homer Parker <hparker@gentoo.org> sec-2.3.1.ebuild:
+  Marked ~amd64 fixing bug 109712
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> sec-2.3.1.ebuild:
+  Added to ~ppc.
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> sec-2.3.1.ebuild:
+  Marked x86 stable.
+
+*sec-2.3.1 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +sec-2.3.1.ebuild:
+  Version bump
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> sec-2.2.5.ebuild:
+  x86 stable
 
 *sec-2.2.5 (24 Jul 2004)
 
diff --git a/net-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index ae0c0a50388d..f182f3d8c643 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -1,2 +1,6 @@
-MD5 634bf222042f4ea499678daf17029d9e sec-2.2.5.ebuild 535
+MD5 7d92970a1ff3f8100bb959445b94488b ChangeLog 810
+MD5 71ee222dece91aa5705c45172523801e metadata.xml 218
+MD5 14cd8d8f8da26ad7b361a953148c9c1b sec-2.2.5.ebuild 638
+MD5 5bf30a3bd2bfc44271e4c1f35205294e sec-2.3.1.ebuild 647
 MD5 7fe4b7a622862823d386a66b923b22a8 files/digest-sec-2.2.5 60
+MD5 29e4182e97332a4d3d564a7c097fcf8b files/digest-sec-2.3.1 60
diff --git a/net-analyzer/sec/sec-2.2.5.ebuild b/net-analyzer/sec/sec-2.2.5.ebuild
index 93ad377169f0..a2b07b00acb9 100644
--- a/net-analyzer/sec/sec-2.2.5.ebuild
+++ b/net-analyzer/sec/sec-2.2.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/net-analyzer/sec/sec-2.2.5.ebuild,v 1.1 2004/07/24 14:20:25 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/sec-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="Simple Event Correlator"
 HOMEPAGE="http://simple-evcorr.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-analyzer/sec/sec-2.3.1.ebuild b/net-analyzer/sec/sec-2.3.1.ebuild
index 615c54d496c2..d275d2b06cf0 100644
--- a/net-analyzer/sec/sec-2.3.1.ebuild
+++ b/net-analyzer/sec/sec-2.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/net-analyzer/sec/sec-2.3.1.ebuild,v 1.1 2005/03/22 22:27:53 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sec/sec-2.3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 DESCRIPTION="Simple Event Correlator"
 HOMEPAGE="http://simple-evcorr.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/simple-evcorr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.6.0"
diff --git a/net-analyzer/sflowtool/ChangeLog b/net-analyzer/sflowtool/ChangeLog
index 21ec979954b9..67819bad581b 100644
--- a/net-analyzer/sflowtool/ChangeLog
+++ b/net-analyzer/sflowtool/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/sflowtool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/ChangeLog,v 1.1 2005/05/22 16:23:49 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/ChangeLog,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
+
+*sflowtool-3.8-r1 (07 Sep 2005)
+
+  07 Sep 2005; Benjamin Smee <strerror@gentoo.org> +sflowtool-3.8-r1.ebuild:
+  Changed some append flags as per bug 105156
+
+*sflowtool-3.8 (05 Sep 2005)
+
+  05 Sep 2005; Benjamin Smee <strerror@gentoo.org> +sflowtool-3.8.ebuild:
+  Version bump
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> sflowtool-3.7.ebuild:
+  Added to ~ppc.
 
 *sflowtool-3.7 (22 May 2005)
 
diff --git a/net-analyzer/sflowtool/Manifest b/net-analyzer/sflowtool/Manifest
index 8af3f7b5ec32..155681df3413 100644
--- a/net-analyzer/sflowtool/Manifest
+++ b/net-analyzer/sflowtool/Manifest
@@ -1,4 +1,8 @@
-MD5 69ae1b2baadb8ff1ef59e7aec8c57bea sflowtool-3.7.ebuild 487
-MD5 8b4eca16b812185050695dcccf8c923f ChangeLog 262
+MD5 f642e1a5f715b40500d467b2f60a8b7a sflowtool-3.8-r1.ebuild 702
+MD5 c14fa92fe368878084877c8f3bd42210 sflowtool-3.8.ebuild 602
+MD5 cc503c8594f2b86096bb7bc5461b4951 sflowtool-3.7.ebuild 599
+MD5 f029187c9681b8d77a121f16293d39b5 ChangeLog 720
 MD5 b3adfaba0a37452fbd16e0c0c916982f metadata.xml 255
+MD5 ac44eb6d841ec2e4f7f3056727815772 files/digest-sflowtool-3.8-r1 65
 MD5 29931b9548ad756fde3b9cad0a2b1cfb files/digest-sflowtool-3.7 65
+MD5 ac44eb6d841ec2e4f7f3056727815772 files/digest-sflowtool-3.8 65
diff --git a/net-analyzer/sflowtool/sflowtool-3.7.ebuild b/net-analyzer/sflowtool/sflowtool-3.7.ebuild
index b219024d3f14..6a395f366429 100644
--- a/net-analyzer/sflowtool/sflowtool-3.7.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/sflowtool-3.7.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
 HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
@@ -8,7 +8,7 @@ SRC_URI="http://www.inmon.com/bin/${P}.tar.gz"
 
 LICENSE="inmon-sflow"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 src_install() {
diff --git a/net-analyzer/sflowtool/sflowtool-3.8-r1.ebuild b/net-analyzer/sflowtool/sflowtool-3.8-r1.ebuild
index aad3de10862a..90f9f1c1d78e 100644
--- a/net-analyzer/sflowtool/sflowtool-3.8-r1.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.8-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/net-analyzer/sflowtool/sflowtool-3.8-r1.ebuild,v 1.1 2005/09/07 16:01:58 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/sflowtool-3.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit flag-o-matic
 
diff --git a/net-analyzer/sflowtool/sflowtool-3.8.ebuild b/net-analyzer/sflowtool/sflowtool-3.8.ebuild
index bf60b24d1d84..e3b981220580 100644
--- a/net-analyzer/sflowtool/sflowtool-3.8.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.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/net-analyzer/sflowtool/sflowtool-3.8.ebuild,v 1.1 2005/09/05 09:18:38 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sflowtool/sflowtool-3.8.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 DESCRIPTION="sflowtool is a utility for collecting and processing sFlow data"
 HOMEPAGE="http://www.inmon.com/technology/sflowTools.php"
diff --git a/net-analyzer/sguil-client/ChangeLog b/net-analyzer/sguil-client/ChangeLog
index f108a2f5aec8..3863d51196c2 100644
--- a/net-analyzer/sguil-client/ChangeLog
+++ b/net-analyzer/sguil-client/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-analyzer/sguil-client
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/ChangeLog,v 1.1 2005/10/08 13:58:13 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/ChangeLog,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 *sguil-client-0.5.3 (08 Oct 2005)
 
diff --git a/net-analyzer/sguil-client/Manifest b/net-analyzer/sguil-client/Manifest
index 9e06f8fa329e..2561cc842d87 100644
--- a/net-analyzer/sguil-client/Manifest
+++ b/net-analyzer/sguil-client/Manifest
@@ -1,2 +1,4 @@
-MD5 d81c6295c82d0f0df80f3ecdab43edec sguil-client-0.5.3.ebuild 1450
+MD5 b896d22c5a15f2f8240a6468f521080b ChangeLog 374
 MD5 a06fcb621b02784f5cffe366572f7f7b files/digest-sguil-client-0.5.3 69
+MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
+MD5 e3e1d8934e616cb60f9cfb1eabcc103e sguil-client-0.5.3.ebuild 1567
diff --git a/net-analyzer/sguil-client/sguil-client-0.5.3.ebuild b/net-analyzer/sguil-client/sguil-client-0.5.3.ebuild
index aa419e567e85..f8a01e3f8464 100644
--- a/net-analyzer/sguil-client/sguil-client-0.5.3.ebuild
+++ b/net-analyzer/sguil-client/sguil-client-0.5.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/net-analyzer/sguil-client/sguil-client-0.5.3.ebuild,v 1.1 2005/10/08 13:58:13 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-client/sguil-client-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:12:17 chriswhite Exp $
 
 inherit eutils
 
@@ -18,9 +18,9 @@ RDEPEND="
 	>=dev-lang/tk-8.3
 	>=dev-tcltk/itcl-3.2
 	>=dev-tcltk/tclx-8.3
-	>=dev-tcltk/iwidgets
+	dev-tcltk/iwidgets
 	dev-tcltk/tcllib
-	ssl? >=dev-tcltk/tls-1.4.1
+	ssl? ( >=dev-tcltk/tls-1.4.1 )
 	net-analyzer/ethereal"
 
 S=${WORKDIR}/sguil-${PV}
diff --git a/net-analyzer/sguil-sensor/ChangeLog b/net-analyzer/sguil-sensor/ChangeLog
index c7fbef3b990c..6571abc21898 100644
--- a/net-analyzer/sguil-sensor/ChangeLog
+++ b/net-analyzer/sguil-sensor/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-analyzer/sguil-sensor
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/ChangeLog,v 1.1 2005/10/08 14:04:11 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org>
+  -files/digest-sguil-sensor-0.5.3:
+  removed old ebuilds
+
+*sguil-sensor-0.5.3-r2 (10 Oct 2005)
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org> files/sensor_agent.initd,
+  +sguil-sensor-0.5.3-r2.ebuild:
+  patch in ebuild and fix sensor_agent.initd
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org> files/sensor_agent.initd:
+  fix to sensor_agent.initd for pid creation
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org>
+  sguil-sensor-0.5.3-r1.ebuild:
+  extra depend
+
+  10 Oct 2005; Benjamin Smee <strerror@gentoo.org> files/log_packets.initd:
+  added fix for log_packets.initd
+
+*sguil-sensor-0.5.3-r1 (09 Oct 2005)
+
+  09 Oct 2005; Benjamin Smee <strerror@gentoo.org> +files/log_packets.confd,
+  files/log_packets.initd, +sguil-sensor-0.5.3-r1.ebuild:
+  New log_packets initd and confd. Changed einfo
 
 *sguil-sensor-0.5.3 (08 Oct 2005)
 
diff --git a/net-analyzer/sguil-sensor/Manifest b/net-analyzer/sguil-sensor/Manifest
index a9f122ba1196..b595c87bb53b 100644
--- a/net-analyzer/sguil-sensor/Manifest
+++ b/net-analyzer/sguil-sensor/Manifest
@@ -1,4 +1,19 @@
-MD5 78e14d710be336f53152c5f9c06da4b7 sguil-sensor-0.5.3.ebuild 2341
-MD5 7dea1d8d6ed9dadaa3768e6ba138fe76 files/digest-sguil-sensor-0.5.3 69
-MD5 5c55306dbda0309d4c2602d9d85d544b files/log_packets.initd 2102
-MD5 eafeeec66dc5b155a58067d03baccc8b files/sensor_agent.initd 794
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 19db0449d3971c277eb608f321cebb81 ChangeLog 1287
+MD5 7dea1d8d6ed9dadaa3768e6ba138fe76 files/digest-sguil-sensor-0.5.3-r1 69
+MD5 7dea1d8d6ed9dadaa3768e6ba138fe76 files/digest-sguil-sensor-0.5.3-r2 69
+MD5 b00be8c2354effc6b8d51da0ca0a02da files/log_packets.confd 553
+MD5 0982853c1c4d9ed283f9faac1a1f89a5 files/log_packets.initd 2255
+MD5 87465a7b8792682b4dae8e2e46eed0bb files/sensor_agent.initd 757
+MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
+MD5 f788b3998ae8bb39f840efa32e4cbb29 sguil-sensor-0.5.3-r1.ebuild 2612
+MD5 2e2cd8bb5e2d134cfafb10559453d43f sguil-sensor-0.5.3-r2.ebuild 2721
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD4DBQFDTns5I1lqEGTUzyQRAgZiAKCVVrmG5CzGA6VafN8gjDxs5+tk+gCWNGcT
+WzoMD2QkZdonqSd+3XkwIA==
+=RI3b
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sguil-sensor/files/log_packets.initd b/net-analyzer/sguil-sensor/files/log_packets.initd
index 470d34a5c306..71b8e5b07654 100644
--- a/net-analyzer/sguil-sensor/files/log_packets.initd
+++ b/net-analyzer/sguil-sensor/files/log_packets.initd
@@ -1,21 +1,22 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/files/log_packets.initd,v 1.1 2005/10/08 14:04:11 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/files/log_packets.initd,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 opts="start stop cleandisk"
 
-[ -d "${LOG_DIR}" ] && LOGDIR="/var/log/sguild"
-
 
 start() {
-	ebegin "Starting Sensor Agent"
+	ebegin "Starting Log_packest"
 	if [ ! -x /usr/bin/snort ]
 	then
 		eerror "No snort - cannot start"
 		eend 1
 		return 1
 	fi
+
+	LOG_DIR="${LOGDIR}/${HOSTNAME}/dailylogs"
+
 	if [ ! -d ${LOG_DIR} ]
 	then
 		mkdir -p ${LOG_DIR}
@@ -28,10 +29,11 @@ start() {
 	then
 		mkdir "${LOG_DIR}/${today}"
 		chmod 770 "${LOG_DIR}/${today}"
+		chown root:sguil "${LOG_DIR}/${today}"
 	fi
-	start-stop-daemon --start -c sguil --pidfile /var/run/sguil/logpackets.pid \
+	start-stop-daemon --start --quiet -b -m --pidfile /var/run/sguil/logpackets.pid \
 		--exec /usr/bin/snort \
-		-- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${INTERFACE}" "${FILTER}"
+		-- ${OPTIONS} -l "${LOG_DIR}/${today}" -b -i "${IFACE}" "${FILTER}"
 	real_cleandisk
 	eend $?
 }
@@ -53,10 +55,10 @@ cleandisk() {
 real_cleandisk() {
 	einfo "Checking disk space (limited to ${MAX_DISK_USE}%)..."
 	# grep, awk, tr...woohoo!
-	CUR_USE=$(df ${LOG_DIR} | grep -v -i filesystem | awk '{print $5}' | tr -d %)
+	CUR_USE=$(df -P ${LOG_DIR} | grep -v -i filesystem | awk '{print $5}' | tr -d %)
 	einfo "  Current Disk Use: ${CUR_USE}%"
 	
-	if [ ${CUR_USE} -gt ${MAX_DISK_USE }]
+	if [ ${CUR_USE} -gt ${MAX_DISK_USE} ]
 	then
 		# If we are here then we passed our disk limit
 		# First find the oldest DIR
diff --git a/net-analyzer/sguil-sensor/files/sensor_agent.initd b/net-analyzer/sguil-sensor/files/sensor_agent.initd
index 22f8ad372fc2..04f5d2b5a0e7 100644
--- a/net-analyzer/sguil-sensor/files/sensor_agent.initd
+++ b/net-analyzer/sguil-sensor/files/sensor_agent.initd
@@ -17,8 +17,8 @@ checkconfig() {
 start() {
         checkconfig || return 1
         ebegin "Starting Sensor Agent"
-        start-stop-daemon --start -c sguil --pidfile /var/run/sguil/sensor.pid \
-			--quiet --exec /usr/bin/sensor_agent.tcl -- -D -c "/etc/sguil/sensor_agent.conf">/dev/null 2>&1
+        start-stop-daemon --start -c sguil --quiet --exec /usr/bin/sensor_agent.tcl \
+		-- -D -c "/etc/sguil/sensor_agent.conf">/dev/null 2>&1
         eend $?
 }
 
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r1.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r1.ebuild
index fdc789da2d92..5c2ef992fedb 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r1.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-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/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r1.ebuild,v 1.1 2005/10/09 13:54:39 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 inherit eutils
 
@@ -15,6 +15,7 @@ IUSE=""
 
 DEPEND=">=dev-lang/tcl-8.3"
 RDEPEND="${DEPEND}
+	>=dev-tcltk/tclx-8.3
 	>=net-analyzer/snort-2.4.1-r1
 	>=net-analyzer/barnyard-0.2.0-r1
 	net-analyzer/sancp
@@ -23,7 +24,7 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/sguil-${PV}
 
 pkg_setup() {
-	if built_with_use tcl threads ; then
+	if built_with_use dev-lang/tcl threads ; then
 		eerror
 		eerror "Sguil does not run when tcl was built with threading enabled."
 		eerror "Please rebuild tcl without threads and reemerge this ebuild."
@@ -31,7 +32,7 @@ pkg_setup() {
 		die
 	fi
 
-	if ! built_with_use snort sguil ; then
+	if ! built_with_use net-analyzer/snort sguil ; then
 		eerror
 		eerror "You need to emerge snort with 'sguil' USE flag to get"
 		eerror "the full sguil functionality"
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild
index a5c99cd74bcc..f9d8e622a869 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-0.5.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/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild,v 1.1 2005/10/10 23:23:05 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-sensor/sguil-sensor-0.5.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/sguil-${PV}
 
 pkg_setup() {
-	if built_with_use tcl threads ; then
+	if built_with_use dev-lang/tcl threads ; then
 		eerror
 		eerror "Sguil does not run when tcl was built with threading enabled."
 		eerror "Please rebuild tcl without threads and reemerge this ebuild."
@@ -32,7 +32,7 @@ pkg_setup() {
 		die
 	fi
 
-	if ! built_with_use snort sguil ; then
+	if ! built_with_use net-analyzer/snort sguil ; then
 		eerror
 		eerror "You need to emerge snort with 'sguil' USE flag to get"
 		eerror "the full sguil functionality"
diff --git a/net-analyzer/sguil-server/ChangeLog b/net-analyzer/sguil-server/ChangeLog
index bbf9d030b030..bb2711875929 100644
--- a/net-analyzer/sguil-server/ChangeLog
+++ b/net-analyzer/sguil-server/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-analyzer/sguil-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/ChangeLog,v 1.1 2005/10/08 14:01:29 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 *sguil-server-0.5.3 (08 Oct 2005)
 
diff --git a/net-analyzer/sguil-server/Manifest b/net-analyzer/sguil-server/Manifest
index d8bbfe0f21d3..0a8fb7857056 100644
--- a/net-analyzer/sguil-server/Manifest
+++ b/net-analyzer/sguil-server/Manifest
@@ -1,4 +1,16 @@
-MD5 a404aa4a6f1740974826b26331d542dc sguil-server-0.5.3.ebuild 2738
-MD5 0be733a9afedd03d8a6769142ec3a389 files/sguild.confd 616
-MD5 fff5ca1be3a8e56fdd55ad9c95d75bc9 files/sguild.initd 1234
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b034117cb3d3b420f9f45f4268c3cb7 ChangeLog 416
 MD5 9f4730ccda90d1234e864f039ed296e1 files/digest-sguil-server-0.5.3 69
+MD5 0be733a9afedd03d8a6769142ec3a389 files/sguild.confd 616
+MD5 b11d3d2b0472af4628e9b1caaa17e919 files/sguild.initd 1342
+MD5 5355b4f79a0130d075711f0a54840239 metadata.xml 223
+MD5 50beb04e878bd2e84eea0145a5cad66d sguil-server-0.5.3.ebuild 2866
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTnu9I1lqEGTUzyQRAmYBAJ9tx5huU4/+otvgXDgVFvrFO65eswCguxLp
+vDIxcjSiYcTZwjuINdeh7WU=
+=afP6
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sguil-server/files/sguild.initd b/net-analyzer/sguil-server/files/sguild.initd
index 321cc56a1af4..74c803f3d748 100755
--- a/net-analyzer/sguil-server/files/sguild.initd
+++ b/net-analyzer/sguil-server/files/sguild.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/files/sguild.initd,v 1.1 2005/10/08 14:01:29 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/files/sguild.initd,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 
 
diff --git a/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild b/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild
index a794b3ae4d13..a2cb27a2ff5c 100644
--- a/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild
+++ b/net-analyzer/sguil-server/sguil-server-0.5.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/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild,v 1.1 2005/10/08 14:01:29 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sguil-server/sguil-server-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 inherit eutils ssl-cert
 
@@ -16,7 +16,7 @@ DEPEND=">=dev-lang/tcl-8.3
 	>=dev-tcltk/tclx-8.3
 	dev-tcltk/tcllib
 	dev-tcltk/mysqltcl
-	ssl? >=dev-tcltk/tls-1.4.1"
+	ssl? ( >=dev-tcltk/tls-1.4.1 )"
 RDEPEND="${DEPEND}
 	net-analyzer/p0f
 	net-analyzer/tcpflow
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
 S=${WORKDIR}/sguil-${PV}
 
 pkg_setup() {
-	if built_with_use tcl threads ; then
+	if built_with_use dev-lang/tcl threads ; then
 		eerror
 		eerror "Sguil does not run when tcl was built with threading enabled."
 		eerror "Please rebuild tcl without threads and reemerge this ebuild."
diff --git a/net-analyzer/siphon/ChangeLog b/net-analyzer/siphon/ChangeLog
index 83996dd83199..7672a7035e0b 100644
--- a/net-analyzer/siphon/ChangeLog
+++ b/net-analyzer/siphon/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for net-analyzer/siphon
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.1 2003/10/20 18:40:10 port001 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
+
+  11 Aug 2005; Carlos Silva <r3pek@gentoo.org> siphon-666.ebuild:
+  marked ~amd64. closes bug #102047
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> siphon-666.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> siphon-666.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> siphon-666.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> siphon-666.ebuild:
+  change virtual/glibc to virtual/libc
+
+  22 Mar 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  siphon-666.ebuild:
+  QA: Propperly assigned DEPEND/RDEPEND, put virtual/glibc as a dependency.
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> siphon-666.ebuild:
+  Added ~sparc keyword.
+
+*siphon-666 (30 Oct 2003)
+
+  30 Oct 2003; Ian Leitch <port001@gentoo.org> siphon-666.ebuild:
+  Use our own CFLAGS
 
   20 Oct 2003; Ian Leitch <port001@gentoo.org> :
   New package, thanks  Cory McWilliams <mcwilc@rpi.edu> #22181
diff --git a/net-analyzer/siphon/Manifest b/net-analyzer/siphon/Manifest
index ae3fd8ea6bc8..1081e7678f35 100644
--- a/net-analyzer/siphon/Manifest
+++ b/net-analyzer/siphon/Manifest
@@ -1,2 +1,4 @@
-MD5 c25e4ed74ea9cf671d6faf4cd76ce933 siphon-666.ebuild 637
+MD5 f995d36a81819dda001dbb530b0feb03 ChangeLog 1191
+MD5 2b8321d62a71d97cae0220a04507ff84 metadata.xml 235
+MD5 ea04e3e974f2a8797d8d7a388c595697 siphon-666.ebuild 812
 MD5 330e3afc0b46d6b4c991352efa731333 files/digest-siphon-666 62
diff --git a/net-analyzer/siphon/metadata.xml b/net-analyzer/siphon/metadata.xml
index 849b36e70aeb..7b7dc6840d0c 100644
--- a/net-analyzer/siphon/metadata.xml
+++ b/net-analyzer/siphon/metadata.xml
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>noherd</herd>
-<maintainer>
-    <email>port001@gentoo.org</email>
-    <name>Ian Leitch</name>
-</maintainer>
-<longdescription>
-The Siphon Project is a portable passive network mapping suite.
-In the latest public version, Siphon passively maps TCP ports
-and performs passive operating system detection.
-Through the magic of RFC ambiguity and programmer uniqueness, different
-machines exhibit telltale characteristics that enable Siphon to make a fairly
-accurate guess at what operating system is running on machines sending packets
-out over the wire. The beauty of this method is that our tool does not need
-to send out a slew of non-RFC compliant packets that trip intrusion detection
-systems. In fact, we send out no packets at all. Whereas nmap crashes some
-machines and network hardware when performing its active OS detection tests,
-Siphon would never crash remote machines. This tool could be used on active
-production networks to detect that a Linux machine suddenly appeared in your
-all Sun shop. As a side note, if used in conjunction with firewalling arp on
-the machine you run Siphon from, it will be difficult to detect.
-Siphon is available for UNIX and Win32. 
-</longdescription>
+<herd>netmon</herd>
+<longdescription>A portable passive network mapping suite</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/siphon/siphon-666.ebuild b/net-analyzer/siphon/siphon-666.ebuild
index a346abaf25ec..4aa65d123702 100644
--- a/net-analyzer/siphon/siphon-666.ebuild
+++ b/net-analyzer/siphon/siphon-666.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/net-analyzer/siphon/siphon-666.ebuild,v 1.1 2003/10/20 18:40:10 port001 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/siphon/siphon-666.ebuild,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 IUSE=""
 MY_P=${PN}-v.${PV}
@@ -11,10 +11,10 @@ HOMEPAGE="http://siphon.datanerds.net/"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
-RDEPEND="net-libs/libpcap"
-DEPEND="${RDEPEND}"
+DEPEND="virtual/libc
+	virtual/libpcap"
 
 S=${WORKDIR}/${MY_P}
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${MY_P}
 	sed -i "s:osprints\.conf:/etc/osprints.conf:" log.c
+	sed -i "s:^CFLAGS = .*$:CFLAGS = ${CFLAGS} -pthread -ggdb -I.:" Makefile
 }
 
 src_compile() {
diff --git a/net-analyzer/slurm/ChangeLog b/net-analyzer/slurm/ChangeLog
index 97ee78e4ef3f..50511a4b12ca 100644
--- a/net-analyzer/slurm/ChangeLog
+++ b/net-analyzer/slurm/ChangeLog
@@ -1,13 +1,59 @@
 # ChangeLog for net-analyzer/slurm
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.1 2003/04/30 11:25:02 killian Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> slurm-0.3.3.ebuild:
+  Added to ~ppc.
+
+  26 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> slurm-0.3.3.ebuild:
+  ~amd64 keyword.
+
+  07 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/slurm-0.2.2-altcolors-gentoo.patch,
+  -files/slurm-0.2.2-fix-gentoo.patch, -files/slurm-0.2.3-theme.patch,
+  -slurm-0.2.3.ebuild, slurm-0.3.3.ebuild:
+  Removing old ebuild, marking 0.3.3 x86 stable.
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -slurm-0.2.2.ebuild,
+  slurm-0.3.2.ebuild:
+  Removing old ebuild, marking 0.3.2 x86 stable.
+
+*slurm-0.3.3 (30 Mar 2005)
+
+  30 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +slurm-0.3.3.ebuild:
+  Version bump for bug 87212; updated SRC_URI.
+
+*slurm-0.3.2 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +slurm-0.3.2.ebuild:
+  Version bump, themes now supported in upstream. Fixes my own bug 86200.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  slurm-0.2.3.ebuild:
+  Marked x86 stable
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> slurm-0.2.2.ebuild,
+  slurm-0.2.3.ebuild:
+  Add inherit eutils
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> slurm-0.2.3.ebuild:
+  Added ~sparc keyword.
+
+*slurm-0.2.3 (25 Sep 2003)
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> slurm-0.2.3.ebuild,
+  files/slurm-0.2.3-theme.patch:
+  Version bumped. Submitted by Jyrki Muukkonen <jyrki@kruu.org> in #21715.
+
+  10 Jun 2003; <msterret@gentoo.org> slurm-0.2.2.ebuild:
+  added src_unpack() so we can compile again and again.
 
 *slurm-0.2.2 (30 Apr 2003)
 
   30 Apr 2003;Chuck Brewer <killian@gentoo.org> slurm-0.2.2.ebuild,digest
   and files/*:
-  Credit goes to Jyrki Muukkonen <jyrki@kruu.org>. Initial import. His 
-  description follows (trimmed somewhat)- 
+  Credit goes to Jyrki Muukkonen <jyrki@kruu.org>. Initial import. His
+  description follows (trimmed somewhat)-
   Includes two patches. One for some typos and color usage bugs and another
   for alternative color set (red and white, instead of the rather ugly default
   colors). It can be used with USE="altcolors". Note that I made this patch
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index e69de29bb2d1..fee2378688c2 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -0,0 +1,6 @@
+MD5 e1f7a17daa6deed927121e37a6c3b0fa ChangeLog 2342
+MD5 a96a9c0d4be659091bc997c67c36d781 metadata.xml 258
+MD5 daf022e8a7a5ab2bf86b824fd9ae6848 slurm-0.3.2.ebuild 761
+MD5 b4eea663b96816a20dac48602152955d slurm-0.3.3.ebuild 773
+MD5 962d85efe2f7632aeb0ab2485d9ceed4 files/digest-slurm-0.3.2 63
+MD5 8a743905ff4f988e739f163cfed42e89 files/digest-slurm-0.3.3 63
diff --git a/net-analyzer/slurm/slurm-0.3.2.ebuild b/net-analyzer/slurm/slurm-0.3.2.ebuild
index f8e0ef64aff6..796c98a467c9 100644
--- a/net-analyzer/slurm/slurm-0.3.2.ebuild
+++ b/net-analyzer/slurm/slurm-0.3.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/net-analyzer/slurm/slurm-0.3.2.ebuild,v 1.1 2005/03/22 14:59:41 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.raisdorf.net/files/code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/net-analyzer/slurm/slurm-0.3.3.ebuild b/net-analyzer/slurm/slurm-0.3.3.ebuild
index f510a4fb707c..ec11b835424c 100644
--- a/net-analyzer/slurm/slurm-0.3.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.3.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/net-analyzer/slurm/slurm-0.3.3.ebuild,v 1.1 2005/03/30 12:45:13 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3.ebuild,v 1.1.1.1 2005/11/30 10:12:28 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.raisdorf.net/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses"
diff --git a/net-analyzer/sniffit/ChangeLog b/net-analyzer/sniffit/ChangeLog
index 990f182e6953..2ee579ba335b 100644
--- a/net-analyzer/sniffit/ChangeLog
+++ b/net-analyzer/sniffit/ChangeLog
@@ -1,9 +1,32 @@
 # ChangeLog for net-analyzer/sniffit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/ChangeLog,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
+  13 Jun 2005; Andrej Kacian <ticho@gentoo.org> sniffit-0.3.7-r1.ebuild:
+  Added ~amd64 keyword.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> sniffit-0.3.7-r1.ebuild,
+  sniffit-0.3.7.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  sniffit-0.3.7-r1.ebuild, sniffit-0.3.7.ebuild:
+  Tidy up. added IUSE.
+
+*sniffit-0.3.7-r1 (28 Jul 2003)
+
+  28 Jul 2003; Martin Schlemmer <azarah@gentoo.org> sniffit-0.3.7-r1.ebuild,
+  files/sniffit-0.3.7-gcc33.patch:
+  Fix gcc-3.3 related issues (bug #25328), thanks to Chandler Carruth
+  <carrbc1@wfu.edu>.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
 *sniffit-0.3.7 (1 Feb 2002)
 
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-analyzer/sniffit/Manifest b/net-analyzer/sniffit/Manifest
index e69de29bb2d1..a4c9e9d816a4 100644
--- a/net-analyzer/sniffit/Manifest
+++ b/net-analyzer/sniffit/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 96546e0d05ffd9a9bf56a0a74ea67e33 sniffit-0.3.7.ebuild 954
+MD5 15837d4a726192e2901e2b62408ba9b5 ChangeLog 1460
+MD5 40b0266de29ac4ef5e575bd2050de1b5 metadata.xml 221
+MD5 4784c3168a0879aa31e1beab7c8856a2 sniffit-0.3.7-r1.ebuild 1058
+MD5 ebb45c9f97d37af79ffeea797b411aca files/sniffit-0.3.7-gcc33.patch 496
+MD5 fd2c46d1c2224db83c42a34b03bdad44 files/digest-sniffit-0.3.7-r1 140
+MD5 fd2c46d1c2224db83c42a34b03bdad44 files/digest-sniffit-0.3.7 140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCrhXdQlM6RnzZP+IRAlIkAJ4qKgsrdOPLVGlAKnb+4Ml7uOUYKQCfY046
+0ukMBy9qMNSJhfk1CoQbG98=
+=qehm
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sniffit/files/digest-sniffit-0.3.7 b/net-analyzer/sniffit/files/digest-sniffit-0.3.7
index 34fef70df2f3..fd1782b310f3 100644
--- a/net-analyzer/sniffit/files/digest-sniffit-0.3.7
+++ b/net-analyzer/sniffit/files/digest-sniffit-0.3.7
@@ -1,2 +1,2 @@
-MD5 2697cc18878480199fe6db1e61134d5a sniffit.0.3.7.beta.tar.gz 212992
-MD5 4b2efe8ce32222f8ce8e9ddb476ac89c sniffit_0.3.7.beta-10.diff 98304
+MD5 2697cc18878480199fe6db1e61134d5a sniffit.0.3.7.beta.tar.gz 212419
+MD5 4b2efe8ce32222f8ce8e9ddb476ac89c sniffit_0.3.7.beta-10.diff 95457
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
index de5211e24d6a..50603aa1da6d 100644
--- a/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild
@@ -1,8 +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/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild,v 1.1 2003/07/28 15:43:51 azarah Exp $
-
-IUSE=
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
 inherit eutils
 
@@ -13,16 +11,17 @@ SRC_URI="http://reptile.rug.ac.be/~coder/sniffit/files/${MY_P}.tar.gz
 	 http://www.clan-tva.com/m0rpheus/sniffit_0.3.7.beta-10.diff"
 HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
 
-DEPEND=">=net-libs/libpcap-0.6.2
+DEPEND="virtual/libpcap
 	>=sys-libs/ncurses-5.2"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc "
+KEYWORDS="x86 ppc sparc ~amd64"
+IUSE=""
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
-	
+
 	cd ${S}
 	epatch ${DISTDIR}/sniffit_0.3.7.beta-10.diff
 
@@ -39,7 +38,7 @@ src_compile() {
 
 src_install () {
 	dobin sniffit
-	
+
 	doman sniffit.5 sniffit.8
 	dodoc README* PLUGIN-HOWTO BETA* HISTORY LICENSE changelog
 }
diff --git a/net-analyzer/sniffit/sniffit-0.3.7.ebuild b/net-analyzer/sniffit/sniffit-0.3.7.ebuild
index 64369d28f9e9..59a21ac319fc 100644
--- a/net-analyzer/sniffit/sniffit-0.3.7.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.3.7.ebuild
@@ -1,32 +1,36 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Ben Lutgens <lamer@gentoo.org>, Ferry Meyndert <m0rpheus@poseidon.mine.nu>, Bruce A. Locke <blocke@shivan.org>
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7.ebuild,v 1.1 2002/01/29 05:04:30 blocke Exp $
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sniffit/sniffit-0.3.7.ebuild,v 1.1.1.1 2005/11/30 10:12:39 chriswhite Exp $
 
-P=sniffit.0.3.7.beta
-S=${WORKDIR}/${P}
+MY_P=${P/-/.}.beta
+S=${WORKDIR}/${MY_P}
 DESCRIPTION="Interactive Packet Sniffer"
-SRC_URI="http://reptile.rug.ac.be/~coder/sniffit/files/${P}.tar.gz
+SRC_URI="http://reptile.rug.ac.be/~coder/sniffit/files/${MY_P}.tar.gz
 	 http://www.clan-tva.com/m0rpheus/sniffit_0.3.7.beta-10.diff"
 HOMEPAGE="http://reptile.rug.ac.be/~coder/sniffit/sniffit.html"
 
-DEPEND=">=net-libs/libpcap-0.6.2 >=sys-libs/ncurses-5.2"
+DEPEND="virtual/libpcap
+	>=sys-libs/ncurses-5.2"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="x86 ppc sparc "
+IUSE=""
 
 src_unpack() {
-	unpack ${P}.tar.gz
+	unpack ${MY_P}.tar.gz
 	cd ${S}
 	patch < ${DISTDIR}/sniffit_0.3.7.beta-10.diff || die
 }
 
 src_compile() {
-	./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die
+	econf || die
 
 	emake OBJ_FLAG="-w -c ${CFLAGS}" EXE_FLAG="-w ${CFLAGS} -o sniffit" || die
 }
 
 src_install () {
-	 dobin sniffit
-	 doman sniffit.5 sniffit.8
-	 dodoc README.FIRST PLUGIN-HOWTO
+	dobin sniffit
+	doman sniffit.5 sniffit.8
+	dodoc README* PLUGIN-HOWTO BETA* HISTORY LICENSE changelog
 }
-
diff --git a/net-analyzer/snmpmon/ChangeLog b/net-analyzer/snmpmon/ChangeLog
index 04121e3a2310..f69f7135acc4 100644
--- a/net-analyzer/snmpmon/ChangeLog
+++ b/net-analyzer/snmpmon/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-analyzer/snmpmon
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/ChangeLog,v 1.1 2004/07/24 12:33:06 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  17 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> snmpmon-0.5.ebuild:
+  Port to qt3.eclass. Fixes bug #92550.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> snmpmon-0.5.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2005; Caleb Tennis <caleb@gentoo.org> snmpmon-0.5.ebuild:
+  Fix qmake dir per bug #97535
+
+  28 Sep 2004; Jason Wever <weeve@gentoo.org> snmpmon-0.5.ebuild:
+  Added ~sparc keyword, resolves bug #65746.
+
+  28 Aug 2004; Eldad Zack <eldad@gentoo.org> snmpmon-0.5.ebuild:
+  x86 stable
 
 *snmpmon-0.5 (24 Jul 2004)
 
diff --git a/net-analyzer/snmpmon/Manifest b/net-analyzer/snmpmon/Manifest
index 896cc87bbbd3..139437b2a1a7 100644
--- a/net-analyzer/snmpmon/Manifest
+++ b/net-analyzer/snmpmon/Manifest
@@ -1,2 +1,4 @@
-MD5 cc3bd53fda13da4ab6869c6d9f8ac359 snmpmon-0.5.ebuild 1014
+MD5 bfbc854701bf44b695955f18ceef3ca8 metadata.xml 343
+MD5 da4fa630dba41b6376425e62a98364f8 ChangeLog 890
+MD5 9cae0949dd150bffa6a1a5b76a39d7b5 snmpmon-0.5.ebuild 1084
 MD5 3a339c38bf11a7eac9bd3962a4d54108 files/digest-snmpmon-0.5 63
diff --git a/net-analyzer/snmpmon/snmpmon-0.5.ebuild b/net-analyzer/snmpmon/snmpmon-0.5.ebuild
index 96defee273fd..dc8998196d43 100644
--- a/net-analyzer/snmpmon/snmpmon-0.5.ebuild
+++ b/net-analyzer/snmpmon/snmpmon-0.5.ebuild
@@ -1,29 +1,25 @@
-# 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/net-analyzer/snmpmon/snmpmon-0.5.ebuild,v 1.1 2004/07/24 12:33:06 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmpmon/snmpmon-0.5.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
-IUSE=""
-
-inherit kde-functions
-
-need-qt 3.2
+inherit qt3
 
 DESCRIPTION="SNMPMonitor is a tool to monitor SNMP devices"
 HOMEPAGE="http://snmpmon.sourceforge.net/"
 SRC_URI="mirror://sourceforge/snmpmon/${P}.tar.bz2"
-RESTRICT="nomirror"
-SLOT="0"
-
 LICENSE="GPL-2"
-KEYWORDS="~x86"
 
-DEPEND=">=net-analyzer/net-snmp-5.0.9-r1"
+SLOT="0"
+KEYWORDS="~ppc ~sparc x86"
+IUSE=""
+
+DEPEND="$(qt_min_version 3.2)
+	>=net-analyzer/net-snmp-5.0.9-r1"
 
 src_compile() {
-	qmake -o Makefile snmpmon.pro
+	${QTDIR}/bin/qmake -o Makefile snmpmon.pro
 	sed -i -e "s/CFLAGS   = -pipe -w -O2/CFLAGS   = ${CFLAGS} -w/" Makefile
 	sed -i -e "s/CXXFLAGS = -pipe -w -O2/CXXFLAGS = ${CXXFLAGS} -w/" Makefile
-	addpredict ${QTDIR}/etc/settings
 	emake || die "make failed"
 }
 
diff --git a/net-analyzer/snmptt/ChangeLog b/net-analyzer/snmptt/ChangeLog
index 6e3426ee00dc..df5e68c6b313 100644
--- a/net-analyzer/snmptt/ChangeLog
+++ b/net-analyzer/snmptt/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-analyzer/snmptt
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmptt/ChangeLog,v 1.1 2004/07/09 13:34:03 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmptt/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  12 Feb 2005; Jason Wever <weeve@gentoo.org> snmptt-1.0.ebuild:
+  Stable on sparc.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> snmptt-1.0.ebuild:
+  Marked stable on x86.
+
+  12 Jan 2005; Jason Wever <weeve@gentoo.org> snmptt-0.9-r1.ebuild:
+  Stable on sparc.
+
+*snmptt-0.9-r1 (25 Oct 2004)
+
+  25 Oct 2004; Eldad Zack <eldad@gentoo.org> +snmptt-1.0.ebuild,
+  snmptt-0.9-r1.ebuild:
+  Version bump (Closes #68765). Marked 0.9 x86 stable.
+
+  17 Sep 2004; Jason Wever <weeve@gentoo.org> snmptt-0.9-r1.ebuild:
+  Added ~sparc keyword.
+
+*snmptt-0.9-r1 (15 Sep 2004)
+
+  15 Sep 2004; Jon Hood <squinky86@gentoo.org> +snmptt-0.9-r1.ebuild:
+  Version bump to fix #64130; correctly install documentation and binaries,
+  thanks to Jason Wever <weeve@gentoo.org>.
+
+  11 Sep 2004; Jon Hood <squinky86@gentoo.org> snmptt-0.9.ebuild:
+  Fix dependencies irt #63498. Thanks Lazar Obradovic <laza@yu.net>.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> snmptt-0.9.ebuild:
+  x86 stable
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> snmptt-0.9.ebuild:
+  Added to ~ppc.
 
 *snmptt-0.9 (09 Jul 2004)
 
diff --git a/net-analyzer/snmptt/Manifest b/net-analyzer/snmptt/Manifest
index fb50e87ef78a..b580adc01918 100644
--- a/net-analyzer/snmptt/Manifest
+++ b/net-analyzer/snmptt/Manifest
@@ -1,4 +1,6 @@
-MD5 2390c4268bf605ad9260a9720fffe052 snmptt-0.9.ebuild 786
-MD5 d4823f5cd32cd9cfc9faf10b5b1a29f4 ChangeLog 309
+MD5 90c58212a6fdffc7e18f21628350b323 ChangeLog 1451
 MD5 193ab07812b3cd299e6fd2dd3d40d15c metadata.xml 215
-MD5 1563776a631f989d7d781026125a53d0 files/digest-snmptt-0.9 59
+MD5 500f4c9beba0332135f255256ff5857d snmptt-0.9-r1.ebuild 1267
+MD5 8ec6d58ef25157861c1f7595857dea01 snmptt-1.0.ebuild 1264
+MD5 1563776a631f989d7d781026125a53d0 files/digest-snmptt-0.9-r1 59
+MD5 b6787c534ab58fab31a50732394c5027 files/digest-snmptt-1.0 59
diff --git a/net-analyzer/snmptt/snmptt-0.9-r1.ebuild b/net-analyzer/snmptt/snmptt-0.9-r1.ebuild
index bf9b7d246f49..c78b8dd3c1be 100644
--- a/net-analyzer/snmptt/snmptt-0.9-r1.ebuild
+++ b/net-analyzer/snmptt/snmptt-0.9-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/net-analyzer/snmptt/snmptt-0.9-r1.ebuild,v 1.1 2004/09/15 17:49:48 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmptt/snmptt-0.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 MY_P=${P/-/_}
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.snmptt.org/"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc sparc"
 SLOT="0"
 IUSE="mysql postgres"
 
diff --git a/net-analyzer/snmptt/snmptt-1.0.ebuild b/net-analyzer/snmptt/snmptt-1.0.ebuild
index e01968bde8f4..c8ff18aa06f6 100644
--- a/net-analyzer/snmptt/snmptt-1.0.ebuild
+++ b/net-analyzer/snmptt/snmptt-1.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/net-analyzer/snmptt/snmptt-1.0.ebuild,v 1.1 2004/10/25 13:16:49 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snmptt/snmptt-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 MY_P=${P/-/_}
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.snmptt.org/"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc sparc"
 SLOT="0"
 IUSE="mysql postgres"
 
diff --git a/net-analyzer/snort/ChangeLog b/net-analyzer/snort/ChangeLog
index 24ae75d699e8..090abf11891e 100644
--- a/net-analyzer/snort/ChangeLog
+++ b/net-analyzer/snort/ChangeLog
@@ -1,12 +1,421 @@
 # ChangeLog for net-analyzer/snort
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/ChangeLog,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
-  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-  moved to net-analyzer - added SLOT - added LICENSE
+*snort-2.4.3 (19 Oct 2005)
+
+  19 Oct 2005; Benjamin Smee <strerror@gentoo.org> +snort-2.4.3.ebuild:
+  revbump for bug #109730
+
+*snort-2.4.1-r1 (08 Oct 2005)
+
+  08 Oct 2005; Benjamin Smee <strerror@gentoo.org> +snort-2.4.1-r1.ebuild:
+  New conf.d and init.d files as well as sguil integration
+
+  25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -snort-2.3.0-r1.ebuild,
+  -snort-2.3.2.ebuild, snort-2.3.3-r1.ebuild, snort-2.4.1.ebuild:
+  Remove old ebuilds, depend on >=dev-libs/libprelude-0.9.0.
+
+  21 Sep 2005; Mark Loeser <halcy0n@gentoo.org> snort-2.3.3.ebuild:
+  Stable on x86
+
+  17 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> snort-2.3.3.ebuild:
+  Stable on ppc.
+
+*snort-2.4.1 (17 Sep 2005)
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/snort-2.3.3-log.c.diff, snort-2.3.3.ebuild, snort-2.3.3-r1.ebuild,
+  -snort-2.4.0.ebuild, +snort-2.4.1.ebuild:
+  Add patch and 2.4.1 version bump for bug 105852.
+
+  03 Sep 2005; <soulse@gentoo.org> snort-2.4.0.ebuild:
+  Fixed ebuild as per bug #103482 thanks to yoann@prelude-ids.org
+
+  23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> snort-2.3.0-r1.ebuild,
+  snort-2.3.2.ebuild, snort-2.3.3.ebuild, snort-2.3.3-r1.ebuild,
+  snort-2.4.0.ebuild:
+  Use -1 instead of /bin/false, bug #103421.
+
+  03 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.4.0.ebuild:
+  Install community rules.
+
+  01 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.4.0.ebuild:
+  In Soviet Russia, prelude enables you. Using use_enable instead of use_with
+  for prelude. Thanks to BaSS and dragonheart for pointing this out.
+
+  29 Jul 2005; Daniel Black <dragonheart@gentoo.org> snort-2.3.0-r1.ebuild,
+  snort-2.3.2.ebuild, snort-2.3.3.ebuild, snort-2.3.3-r1.ebuild,
+  snort-2.4.0.ebuild:
+  removed die from epatch || die.
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.4.0.ebuild:
+  Use Gentoo mirrors for patches instead of my dev space.
+
+*snort-2.4.0 (29 Jul 2005)
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/2.0.6-libnet-1.0.patch, -files/2.1.2-libnet-1.0.patch,
+  -files/snort-2.0.6-gcc3.patch, -files/snort-2.1.2-gcc3.patch,
+  -files/snort-2.1.3-gcc3.patch, -files/snort-drop-calculation.diff,
+  -snort-2.0.6.ebuild, -snort-2.1.3.ebuild, -snort-2.2.0.ebuild,
+  -snort-2.3.0_rc2.ebuild, -snort-2.3.0.ebuild, +snort-2.4.0.ebuild,
+  -snort-2.4.20050508.ebuild:
+  Removing ebuilds prior to 2.3.0 and 2.4.0 version bump.
+
+  25 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.3.3-r1.ebuild:
+  Move snort user code from pkg_preinst to pkg_setup, changed it a bit. Fixes
+  bug 94161. Thanks to kakou <kakou@kakou.org> and Marco Morales
+  <soulse@gmail.com>.
+
+  24 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.3.3-r1.ebuild:
+  Fix RULEPATH in example config. Fixes bug 99397. Thanks to Marco Morales
+  <soulse@gmail.com>.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> snort-2.3.3-r1.ebuild,
+  snort-2.4.20050508.ebuild:
+  Added ~ppc64
+
+  25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> snort-2.3.3-r1.ebuild:
+  Install rules in /etc/snort/rules for cleaner layout. Fixes bug 95368.
+  Thanks to Greg Watson <bugs@linuxlogin.com>.
+
+  26 May 2005; Marcelo Goes <vanquirius@gentoo.org> :
+  Took snort-2.3.3-r1 out of package.mask.
+
+*snort-2.3.3-r1 (08 May 2005)
+
+  08 May 2005; Marcelo Goes <vanquirius@gentoo.org> +snort-2.3.3-r1.ebuild,
+  +snort-2.4.20050508.ebuild:
+  Prelude patching fun. Making snort-2.3.3-r1 depend on >=libprelude-0.9.0_rc1
+  and using patch from their mailing list, as pointed out by Yoann
+  Vandoorselaere <yoann@prelude-ids.org>. Also, I made a cvs snapshot of
+  snort-2.4, which does not require patching anymore, since prelude patches were
+  accepted in snort. Of course, both new ebuilds are in package.mask for testing
+  - I expect unexpected borks. This hopefully fixes bug 91820. Thanks to dago
+  <dago158@bluewin.ch> for reporting.
+
+*snort-2.3.3 (07 May 2005)
+
+  07 May 2005; Aaron Walker <ka0ttic@gentoo.org> +snort-2.3.3.ebuild:
+  Version bump for bug 91673.
+
+  19 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> snort-2.3.2.ebuild:
+  Marked stable on x86.
+
+  22 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> snort-2.3.2.ebuild:
+  Fix missing patch for bug 86219.
+
+*snort-2.3.2 (19 Mar 2005)
+
+  19 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> snort-2.3.0-r1.ebuild,
+  +snort-2.3.2.ebuild:
+  Version bump; marked 2.3.0-r1 stable on x86.
+
+  09 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> snort-2.3.0-r1.ebuild,
+  snort-2.3.0.ebuild, snort-2.3.0_rc2.ebuild:
+  Fix typo in pkg_postinst for bug 81415.
+
+  07 Feb 2005; Daniel Black <dragonheart@gentoo.org> snort-2.3.0-r1.ebuild:
+  ppc stable
+
+*snort-2.3.0-r1 (06 Feb 2005)
+
+  06 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +snort-2.3.0-r1.ebuild,
+  snort-2.3.0.ebuild:
+  Revision bump for bug 80831; added sguil support. Marked 2.3.0 stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> snort-2.0.6.ebuild,
+  snort-2.1.3.ebuild, snort-2.2.0.ebuild, snort-2.3.0.ebuild,
+  snort-2.3.0_rc2.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*snort-2.3.0 (27 Jan 2005)
+
+  27 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/2.3.0-libnet-1.0.patch, -files/2.3.0_rc2-libnet-1.0.patch,
+  +snort-2.3.0.ebuild, snort-2.3.0_rc2.ebuild:
+  2.3.0 final; added support for snort-inline via USE=inline. Updated
+  libnet-1.0 patch to also patch inline.c. Closes bugs 79708 and 79664.
+
+  25 Jan 2005; Daniel Black <dragonheart@gentoo.org> snort-2.0.6.ebuild,
+  snort-2.1.3.ebuild, snort-2.2.0.ebuild, snort-2.3.0_rc2.ebuild:
+  change shell of snort user to /bin/false as per bug #79216. Thanks to Sascha
+  Nitsch <gentoobugs@linuxhowtos.org>
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> snort-2.3.0_rc2.ebuild:
+  Run autoreconf since it looks like autogen.sh is no longer provided; fixes
+  bug 79389.
+
+  11 Jan 2005; Jason Wever <weeve@gentoo.org> snort-2.0.6.ebuild,
+  snort-2.1.3.ebuild, snort-2.2.0.ebuild, snort-2.3.0_rc2.ebuild:
+  Masked on sparc wrt bugs #29661 and #75395.
+
+  11 Jan 2005; Daniel Black <dragonheart@gentoo.org> snort-2.3.0_rc2.ebuild:
+  unmasked and x86, ppc stable
+
+*snort-2.3.0_rc2 (11 Jan 2005)
+
+  11 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/2.3.0_rc2-libnet-1.0.patch, +snort-2.3.0_rc2.ebuild:
+  Version bump as per security bug #75395. Still masked pending
+  further testing
+
+  28 Nov 2004; Eldad Zack <eldad@gentoo.org> snort-2.1.3.ebuild,
+  snort-2.2.0.ebuild:
+  Small post install info error. Thanks to John Barton
+  <jbarton@technicalworks.net> for reporting. Closes #72570.
+
+  30 Oct 2004; Eldad Zack <eldad@gentoo.org> -snort-2.1.2.ebuild,
+  snort-2.2.0.ebuild:
+  x86 stable.
+
+  29 Oct 2004; Eldad Zack <eldad@gentoo.org> snort-2.1.3.ebuild,
+  snort-2.2.0.ebuild:
+  Added einfo for MySQL/PostgreSQL usage. Closes #68922.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> snort-2.1.3.ebuild,
+  snort-2.2.0.ebuild:
+  x86 stable. added ~ppc which was omitted between 2.1.2 and 2.1.3.
+
+*snort-2.2.0 (15 Aug 2004)
+
+  15 Aug 2004; Eldad Zack <eldad@gentoo.org> -snort-2.1.0-r1.ebuild,
+  -snort-2.1.0.ebuild, +snort-2.2.0.ebuild:
+  Version bump
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> snort-2.0.6.ebuild,
+  snort-2.1.0-r1.ebuild, snort-2.1.0.ebuild, snort-2.1.1.ebuild,
+  snort-2.1.2.ebuild, snort-2.1.3.ebuild:
+  change virtual/glibc to virtual/libc
+
+*snort-2.1.3 (01 Jul 2004)
+
+  01 Jul 2004; Eldad Zack <eldad@gentoo.org> +files/snort-2.1.3-gcc3.patch,
+  +snort-2.1.3.ebuild:
+  Version bump, added snortsam support.
+
+  19 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> snort-2.0.6.ebuild:
+  Marked snort 2.0.6 as ~ppc
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> snort-2.1.2.ebuild:
+  Added to ~ppc.
+
+  19 May 2004; Michael Boman <mboman@gentoo.org> snort-1.9.1-r3.ebuild,
+  snort-2.0.0.ebuild, snort-2.0.1-r1.ebuild, snort-2.0.2.ebuild,
+  snort-2.0.5-r1.ebuild, snort-2.0.5-r2.ebuild, snort-2.0.5.ebuild,
+  files/1.9.1-libnet-1.0.patch, files/2.0.0-libnet-1.0.patch,
+  files/2.0.1-libnet-1.0.patch, files/2.0.2-libnet-1.0.patch,
+  files/2.0.5-libnet-1.0.patch, files/snort-1.9.0-gentoo.diff,
+  files/snort-1.9.1-alpha-core_vuln.diff, files/snort-1.9.1-alpha.patch,
+  files/snort-1.9.1-configure.patch, files/snort-2.0.2-gcc3.patch,
+  files/snort-2.0.5-gcc3.patch:
+  Cleaning out old ebuilds
+
+  17 May 2004; Michael Boman <mboman@gentoo.org> snort-2.1.2.ebuild:
+  Mark 2.1.2 stable on x86
+
+  14 Apr 2004; Jon Hood <squinky86@gentoo.org> files/2.1.2-libnet-1.0.patch:
+  added patch, fixes #47229
+
+  06 Apr 2004; Joshua Brindle <method@gentoo.org> snort-2.1.1.ebuild,
+  snort-2.1.2.ebuild:
+  added selinux policy to rdepend
+
+  01 Apr 2004; Michael Boman <mboman@gentoo.org> snort-2.1.1.ebuild:
+  Marked stable on x86
+
+*snort-2.1.2 (01 Apr 2004)
+
+  01 Apr 2004; Michael Boman <mboman@gentoo.org> snort-2.1.2.ebuild,
+  files/snort-2.1.2-gcc3.patch:
+  New upstream version.
+
+  16 Mar 2004; Michael Boman <mboman@gentoo.org> snort-2.0.0.ebuild,
+  snort-2.0.1-r1.ebuild, snort-2.0.2.ebuild, snort-2.0.5-r1.ebuild,
+  snort-2.0.5.ebuild, snort-2.1.0.ebuild, snort-2.1.1.ebuild:
+  Changed ebuilds to use 'sed -i ...' instead of 'sed ... < file > file.new'
+  syntax.
+
+*snort-2.1.1 (09 Mar 2004)
+
+  09 Mar 2004; Michael Boman <mboman@gentoo.org> snort-2.1.1.ebuild,
+  files/2.1.1-libnet-1.0.patch, files/snort-2.1.1-gcc3.patch,
+  files/snort-2.1.1-pgsql.patch:
+  New upstream version. Closes #44067.
+
+  08 Mar 2004; Michael Boman <mboman@gentoo.org> files/2.0.6-libnet-1.0.patch:
+  Added missing file. Closing bug #43990.
+
+  04 Mar 2004; Jason Wever <weeve@gentoo.org> snort-2.0.6.ebuild:
+  Marked stable on sparc. If you have any problems on sparc, check gentoo bug
+  #29661.
+
+*snort-2.1.0-r1 (08 Jan 2004)
+
+  08 Jan 2004; Michael Boman <mboman@gentoo.org> snort-2.1.0-r1.ebuild,
+  files/snort-2.1.0-pgsql.patch:
+  Made use of 'doc' USE flag to install signature documentation. Patched
+  configure.in to solve bug #37436.
+
+  07 Jan 2004; Michael Boman <mboman@gentoo.org> snort-2.1.0.ebuild:
+  Forgot to include the threshold.conf file in the installation process.
+
+*snort-2.1.0 (06 Jan 2004)
+
+  06 Jan 2004; Michael Boman <mboman@gentoo.org> snort-2.1.0.ebuild,
+  files/2.1.0-libnet-1.0.patch, files/snort-2.1.0-gcc3.patch:
+  New upstream version. Breaks prelude support, samba support is now
+  obsoleted by upstream. Ebuild with prelude support will follow once
+  a updated patch is made availble.
+
+*snort-2.0.6 (21 Dec 2003)
+
+  21 Dec 2003; Michael Boman <mboman@gentoo.org> snort-2.0.6.ebuild:
+  New upstream version
+
+  20 Dec 2003; Michael Boman <mboman@gentoo.org> snort-2.0.5-r2.ebuild:
+  Bump to stable on x86
+  Added ~amd64 to KEYWORDS (fixes bug #36098)
+
+  16 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Port the libnet-1.0 patch to snort-2.0.0 to help out the sparc peeps.
+
+*snort-2.0.5-r2 (09 Dec 2003)
+
+  09 Dec 2003; Michael Boman <mboman@gentoo.org> snort-2.0.5-r2.ebuild:
+  Forgot to add etc/prelude-classification.config to the files that should be in
+  /etc/snort if you are using prelude
+
+  09 Dec 2003; Michael Boman <mboman@gentoo.org> snort-2.0.5-r2.ebuild:
+  Added patch to fix drop packet calculations
+
+*snort-2.0.5-r1 (28 Nov 2003)
+
+  28 Nov 2003; Michael Boman <mboman@gentoo.org> snort-2.0.5-r1.ebuild:
+  - Made flexresp optional (controlled by "flexresp" local USE flag), closes #34150.
+  - Made smbalert optional (controlled by "samba" USE flag).
+  - Threading support was never officially supported in Snort, and has
+    been removed from ebuild now as the code is, if not already has been,
+    cleaned from the source tree.
+  - Updated prelude patch.
+  - Assigned myself as the primary maintainer of this ebuild, with the
+    hardened as the herd.
+
+*snort-2.0.5 (24 Nov 2003)
+
+  24 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> snort-2.0.5.ebuild :
+  Version bump. Closing #29609 and #32950.
+
+  28 Oct 2003; Martin Holzer <mholzer@gentoo.org> snort-2.0.2.ebuild:
+  adding gcc3 patch. Closes #30540.
+
+  08 Oct 2003; Jason Wever <weeve@gentoo.org> snort-2.0.2.ebuild:
+  masked on sparc until bug #30540 is fixed.
+
+*snort-2.0.2 (06 Oct 2003)
+
+  06 Oct 2003; Daniel Ahlberg <aliz@gentoo.org> snort-2.0.2.ebuild:
+  Version bump
+
+*snort-2.0.1-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
+  Also fix user adding to enewuser/enewgroup and switch use
+  flags over to `use_enable`.
+
+*snort-1.9.1-r3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
+  Also fix user adding to enewuser/enewgroup and switch use
+  flags over to `use_enable`.
+
+*snort-2.0.1 (09 Aug 2003)
+
+  11 Aug 2003; <solar@gentoo.org> snort-2.0.1.ebuild,
+  files/snort-2.0.1+prelude.patch:
+  Snort 2.0.x does not support snmp bug #26310, Moved large prelude patch to
+  mirror://
+
+  09 Aug 2003; <mboman@gentoo.org> snort-2.0.1.ebuild,
+  files/snort-2.0.1+prelude.patch:
+  Added libprelude support to snort. Closes bug 19672.
+  Upgraded to new upstream version (2.0.1)
+
+*snort-1.9.1-r2 (22 Apr 2003)
+
+  22 Apr 2003; Tavis Ormandy <taviso@gentoo.org> snort-1.9.1-r2.ebuild,
+  snort-2.0.0.ebuild, files/snort-1.9.1-alpha-core_vuln.diff:
+  snort 2.0.0 is broken on Alpha, backporting the integer overflow fix to snort
+  1.9.1 while its being fixed, and bumping version
+
+  22 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> snort-2.0.0.ebuild files/snort.confd :
+  Closing #11643. Unmasking becuse of GLSA.
+
+*snort-2.0.0 (16 Apr 2003)
+
+  16 Apr 2003; Joshua Brindle <method@gentoo.org> Manifest,
+  snort-2.0.0.ebuild:
+  2.0.0 released, yay
+
+*snort-1.9.1-r1 (29 Mar 2003)
+
+  29 Mar 2003; Aron Griffis <agriffis@gentoo.org> snort-1.9.1-r1.ebuild,
+  files/snort-1.9.1-alpha.patch:
+  Add patch and bump revision for alpha. Thanks to Tavis Ormandy for providing
+  this in bug #18258
+
+*snort-1.9.1 (04 Mar 2003)
+
+  04 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*snort-1.9.0 (24 Oct 2002)
+
+  24 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump. Found by Torgeir Hansen <torgeir@trenger.ro> in #8925.
+  Added support for specifying listening interface. Closes #6822.
+  Addes support for snmp, closes #7299.
+  Locked down dependency on libnet some more.
+
+*snort-1.8.7 (23 Jul 2002)
+
+  24 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> files/snort.confd :
+  Added support for specifying listening interface. Closes #6822.
+  Locked down dependency on libnet some more.
+
+  30 Aug 2002; Seemant Kulleen <seemant@gentoo.org> snort-1.8.7.ebuild :
+
+  /var/log/snort now has a .keep in it. Closes bug #7271 by
+  mcummings@gentoo.org (Michael Cummings)
+
+  26 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> snort-1.8.7.ebuild snort-1.8.6.ebuild :
+
+  Fix for bug #5592. 
+
+  23 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> snort-1.8.7.ebuild :
+  
+  New version.
+
+*snort-1.8.6 (11 Mar 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
 
 *snort-1.8.5 (6 Apr 2002)
 
+  18 Jul 2002; Kyle Manna <nitro@gentoo.org> snort-1.8.6.ebuild :
+  
+  Added KEYWORDS.
+
+  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
+
+  moved to net-analyzer - added SLOT - added LICENSE
+
   6 Apr 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
   snort-1.8.5.ebuild, files/digest-snort-1.8.5:
 
diff --git a/net-analyzer/snort/Manifest b/net-analyzer/snort/Manifest
index c379c482552c..74fed14fa7c1 100644
--- a/net-analyzer/snort/Manifest
+++ b/net-analyzer/snort/Manifest
@@ -1,18 +1,16 @@
-MD5 710488a1702ad6555b6266400feca61c snort-1.8.6.ebuild 2539
-MD5 b3815c56fdef8172caa0830e23810739 snort-1.9.1-r1.ebuild 2833
-MD5 b7a9320806fdb6c56b298980ec223d1d snort-1.9.1.ebuild 2727
-MD5 31d00cdc74a863475fe67fd4d4d95af4 snort-2.0.0.ebuild 2838
-MD5 4b805689503782e047d03cd3cceaee93 snort-1.8.7.ebuild 2565
-MD5 cf4a92f35bdb8786f2e58741e3c08603 snort-1.9.0.ebuild 2720
-MD5 8df310533d2b3158af0af07fd092fd8e ChangeLog 2738
-MD5 9a53009d3e2fabbb1cc15710a91b684d files/snort.rc6 781
-MD5 121c260ad08b288811994e7b3d78d098 files/snort-1.9.1-alpha.patch 1614
-MD5 f709dea91ede4986f0bcd0ec4b8f35b5 files/digest-snort-1.8.6 64
-MD5 02a31a68fbda2df18d79240c1d37775e files/digest-snort-1.8.7 64
-MD5 a4581a4ad1e2bdc3571aaf4694c44899 files/digest-snort-1.9.0 64
-MD5 61005ab20ed58d5a874f91b5832c7f60 files/digest-snort-1.9.1 64
-MD5 c57b7870750dc2c7d6e78af937fefc4b files/digest-snort-2.0.0 64
-MD5 4a957dd6316ffe54d0a8c3f5780aac10 files/digest-snort-1.9.1-r1 63
-MD5 891c0d6b2028a15a44c40ba3f131192d files/snort-1.9.0-gentoo.diff 384
-MD5 c9c8c46d1a7e6847025090e76d9a9f64 files/snort-1.9.1-configure.patch 375
-MD5 3fb0dc26626c24ec66d1ad8560630970 files/snort.confd 428
+MD5 b360cb079bb12675a615301852e71a7f snort-2.3.3.ebuild 3975
+MD5 4a7bd3135da2aeeeede46de0677bd157 snort-2.4.1-r1.ebuild 4322
+MD5 cdb1487b04506276a6b465ba18e11fcc snort-2.4.1.ebuild 4080
+MD5 fb1657b65226b6ff73c2d0f89081eb04 snort-2.4.3.ebuild 4319
+MD5 54a7ae3abfcd21c637f064420083251f snort-2.3.3-r1.ebuild 4041
+MD5 8514cc2e6b65c1a52b5f6ccd844817fc ChangeLog 16346
+MD5 53edc4328d9adeaf087c65ea94b1594b metadata.xml 246
+MD5 04f9ed946469f7954b6bd27f8f1aca39 files/digest-snort-2.3.3-r1 284
+MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1-r1 271
+MD5 919058894f4983c35900bc8bb98a96d4 files/snort.rc6 764
+MD5 564bfdf90fe29f5924c68885ccfcddb8 files/2.3.0-libnet-1.0.patch 5424
+MD5 24851ef65be2d80a70ba4bebe3e8c0ff files/digest-snort-2.3.3 287
+MD5 3ff2d04cb5adac55b4f35c28326f0fb0 files/digest-snort-2.4.1 271
+MD5 6ac0e71e30f79ee3c5d01349111b58fe files/digest-snort-2.4.3 271
+MD5 446f8d2b3435b8a6be738da978670605 files/snort.confd 423
+MD5 d212aff92317ccfae4c2228de5f9e5cb files/snort-2.3.3-log.c.diff 4781
diff --git a/net-analyzer/snort/files/snort.confd b/net-analyzer/snort/files/snort.confd
index 0d213b3eb842..d4d240ac966b 100644
--- a/net-analyzer/snort/files/snort.confd
+++ b/net-analyzer/snort/files/snort.confd
@@ -1,21 +1,10 @@
 # Config file for /etc/init.d/snort
 
-# Make sure this matches your IFACE
-PIDFILE=/var/run/snort_eth0.pid
-
-# fast -   fast alert mode, write the alert in a simple format with a
-#                timestamp, alert message, source and destination IPs/ports
-#
-# full -   this is also the default alert mode, so if you specify nothing
-#                this will automatically be used
-#
-# unsock - send alerts to a UNIX socket that another program can listen on
-#
-# none -   turn off alerting
-MODE="full"
+# This tell snort which interface to listen on (any for every interface)
+IFACE=eth0
 
-# Set this to the appropriate network you box lives on
-NETWORK="192.168.1.0/24"
+# Make sure this matches your IFACE
+PIDFILE=/var/run/snort_$IFACE.pid
 
 # You probably don't want to change this, but in case you do
 LOGDIR="/var/log/snort"
@@ -24,4 +13,4 @@ LOGDIR="/var/log/snort"
 CONF=/etc/snort/snort.conf
 
 # This pulls in the options above
-SNORT_OPTS="-D -s -u nobody -dev -l $LOGDIR -h $NETWORK -c $CONF"
+SNORT_OPTS="-D -u snort -i $IFACE -l $LOGDIR -c $CONF"
diff --git a/net-analyzer/snort/files/snort.rc6 b/net-analyzer/snort/files/snort.rc6
index 4cd0f7c580eb..4c09ae325d4f 100644
--- a/net-analyzer/snort/files/snort.rc6
+++ b/net-analyzer/snort/files/snort.rc6
@@ -1,13 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.rc6,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/files/snort.rc6,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 depend() {
 	need net
 }
 
+checkconfig() {
+	if [ ! -e /etc/snort/snort.conf ] ; then
+		eerror "You need an /etc/snort/snort.conf to run snort"
+		eerror "There is an example config in /etc/snort/snort.conf.distrib"
+		return 1
+	fi
+}
+
 start() {
+	checkconfig || return 1
 	ebegin "Starting snort"
 	start-stop-daemon --start --quiet --exec /usr/bin/snort \
 		-- ${SNORT_OPTS} >/dev/null 2>&1
diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 5443a900bcfc..259c0281470b 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email></email>
-		<description></description>
-	</maintainer>
-<longdescription>Snort is a lightweight network intrusion detection system, capable of performing real-time traffic analysis and packet logging on IP networks. It can perform protocol analysis, content searching/matching and can be used to detect a variety of attacks and probes, such as buffer overflows, stealth port scans, CGI attacks, SMB probes, OS fingerprinting attempts, and much more. Snort uses a flexible rule based language to describe traffic that it should collect or pass, and a modular detection engine. Snort has a real-time alerting capability, with alert mechanisms for syslog, a user specified file, a UNIX socket, or WinPopup messages to Windows clients using Samba's smbclient.</longdescription>
+<herd>netmon</herd>
+<longdescription>Libpcap-based packet sniffer/logger/lightweight IDS</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/snort/snort-2.3.3-r1.ebuild b/net-analyzer/snort/snort-2.3.3-r1.ebuild
index ede778d05d9c..79c05692fe7f 100644
--- a/net-analyzer/snort/snort-2.3.3-r1.ebuild
+++ b/net-analyzer/snort/snort-2.3.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/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.1 2005/05/08 17:43:03 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -sparc -alpha ~amd64 ~ppc"
+KEYWORDS="-alpha ~amd64 ~ppc ~ppc64 -sparc ~x86"
 IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
 
 DEPEND="virtual/libc
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 	postgres? ( >=dev-db/postgresql-7.2 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
-	prelude? ( >=dev-libs/libprelude-0.9.0_rc1 )
+	prelude? ( >=dev-libs/libprelude-0.9.0 )
 	odbc? ( dev-db/unixODBC )
 	inline? (
 				~net-libs/libnet-1.0.2a
@@ -35,38 +35,46 @@ RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-snort )
 	snortsam? ( net-analyzer/snortsam )"
 
+pkg_setup() {
+	enewgroup snort
+	enewuser snort -1 -1 /dev/null snort
+}
+
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	gnuconfig_update
 
 	if use flexresp || use inline ; then
-		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+		epatch "${FILESDIR}/2.3.0-libnet-1.0.patch"
 	fi
 
-	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
+	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort/rules:" \
 		etc/snort.conf || die "sed snort.conf failed"
 
 	if use prelude ; then
-		epatch ${DISTDIR}/${P}-prelude-0.9.0_rc1.diff.bz2
+		epatch "${WORKDIR}/${P}-prelude-0.9.0_rc1.diff"
 		sed -i -e "s:AC_PROG_RANLIB:AC_PROG_LIBTOOL:" configure.in \
 			|| die "sed configure.in failed"
 	fi
 
 	if use sguil ; then
-		cd ${S}/src/preprocessors
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch || die
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch || die
-		cd ${S}
+		cd "${S}/src/preprocessors"
+		epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch"
+		epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch"
+		cd "${S}"
 	fi
 
 	if use snortsam ; then
 		cd ..
 		einfo "Applying snortsam patch"
-		./patchsnort.sh ${S} || die "snortsam patch failed"
-		cd ${S}
+		./patchsnort.sh "${S}" || die "snortsam patch failed"
+		cd "${S}"
 	fi
 
+	# bug 105852
+	epatch "${FILESDIR}/${P}-log.c.diff"
+
 	einfo "Regenerating autoconf/automake files"
 	autoreconf -f -i || die "autoreconf failed"
 }
@@ -93,35 +101,28 @@ src_compile() {
 	emake || die "compile problem"
 }
 
-pkg_preinst() {
-	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
-}
-
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
 
 	keepdir /var/log/snort/
 
-	dodoc COPYING LICENSE doc/*
+	dodoc LICENSE doc/*
 	docinto schemas ; dodoc schemas/*
 
 	insinto /etc/snort
-	doins etc/reference.config etc/classification.config rules/*.rules \
+	doins etc/reference.config etc/classification.config \
 		etc/*.map etc/threshold.conf
 	newins etc/snort.conf snort.conf.distrib
+	insinto /etc/snort/rules
+	doins rules/*.rules
 
 	use prelude && doins etc/prelude-classification.config
 
-	newinitd ${FILESDIR}/snort.rc6 snort
-	newconfd ${FILESDIR}/snort.confd snort
+	newinitd "${FILESDIR}/snort.rc6" snort
+	newconfd "${FILESDIR}/snort.confd" snort
 
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
+	chown snort:snort "${D}/var/log/snort"
+	chmod 0770 "${D}/var/log/snort"
 }
 
 pkg_postinst() {
@@ -129,14 +130,15 @@ pkg_postinst() {
 		einfo "To use a database as a backend for snort you will have to"
 		einfo "import the correct tables to the database."
 		einfo "You will have to setup a database called snort first."
-		einfo ""
+		einfo
 		use mysql && \
 			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
 		use postgres && \
 			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
 		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo ""
+		einfo
 		einfo "Also, read the following Gentoo forums article:"
 		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
+		ewarn "Rules are now installed in /etc/snort/rules"
 	fi
 }
diff --git a/net-analyzer/snort/snort-2.3.3.ebuild b/net-analyzer/snort/snort-2.3.3.ebuild
index 6ecc974123fa..89b9666c2a5a 100644
--- a/net-analyzer/snort/snort-2.3.3.ebuild
+++ b/net-analyzer/snort/snort-2.3.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/net-analyzer/snort/snort-2.3.3.ebuild,v 1.1 2005/05/07 12:21:36 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.3.3.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -sparc -alpha ~amd64 ~ppc"
+KEYWORDS="-alpha ~amd64 ppc -sparc x86"
 IUSE="ssl postgres mysql flexresp selinux snortsam odbc prelude inline sguil"
 
 DEPEND="virtual/libc
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 	postgres? ( >=dev-db/postgresql-7.2 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
-	prelude? ( >=dev-libs/libprelude-0.8 )
+	prelude? ( <dev-libs/libprelude-0.9.0_rc1 )
 	odbc? ( dev-db/unixODBC )
 	inline? (
 				~net-libs/libnet-1.0.2a
@@ -37,11 +37,11 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	gnuconfig_update
 
 	if use flexresp || use inline ; then
-		epatch ${FILESDIR}/2.3.0-libnet-1.0.patch
+		epatch "${FILESDIR}/2.3.0-libnet-1.0.patch"
 	fi
 
 	sed -i "s:var RULE_PATH ../rules:var RULE_PATH /etc/snort:" \
@@ -54,19 +54,22 @@ src_unpack() {
 	fi
 
 	if use sguil ; then
-		cd ${S}/src/preprocessors
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch || die
-		epatch ${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch || die
-		cd ${S}
+		cd "${S}/src/preprocessors"
+		epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_portscan_sguil.patch"
+		epatch "${WORKDIR}/sguil-0.5.3/sensor/snort_mods/2_1/spp_stream4_sguil.patch"
+		cd "${S}"
 	fi
 
 	if use snortsam ; then
 		cd ..
 		einfo "Applying snortsam patch"
-		./patchsnort.sh ${S} || die "snortsam patch failed"
-		cd ${S}
+		./patchsnort.sh "${S}" || die "snortsam patch failed"
+		cd "${S}"
 	fi
 
+	# bug 105852
+	epatch "${FILESDIR}/${P}-log.c.diff"
+
 	einfo "Regenerating autoconf/automake files"
 	autoreconf -f -i || die "autoreconf failed"
 }
@@ -95,11 +98,7 @@ src_compile() {
 
 pkg_preinst() {
 	enewgroup snort
-	enewuser snort -1 /bin/false /var/log/snort snort
-	usermod -d "/var/log/snort" snort || die "usermod problem"
-	usermod -g "snort" snort || die "usermod problem"
-	usermod -s "/bin/false" snort || die "usermod problem"
-	echo "ignore any message about CREATE_HOME above..."
+	enewuser snort -1 -1 /var/log/snort snort
 }
 
 src_install() {
@@ -107,7 +106,7 @@ src_install() {
 
 	keepdir /var/log/snort/
 
-	dodoc COPYING LICENSE doc/*
+	dodoc LICENSE doc/*
 	docinto schemas ; dodoc schemas/*
 
 	insinto /etc/snort
@@ -117,11 +116,11 @@ src_install() {
 
 	use prelude && doins etc/prelude-classification.config
 
-	newinitd ${FILESDIR}/snort.rc6 snort
-	newconfd ${FILESDIR}/snort.confd snort
+	newinitd "${FILESDIR}/snort.rc6" snort
+	newconfd "${FILESDIR}/snort.confd" snort
 
-	chown snort:snort ${D}/var/log/snort
-	chmod 0770 ${D}/var/log/snort
+	chown snort:snort "${D}/var/log/snort"
+	chmod 0770 "${D}/var/log/snort"
 }
 
 pkg_postinst() {
@@ -129,13 +128,13 @@ pkg_postinst() {
 		einfo "To use a database as a backend for snort you will have to"
 		einfo "import the correct tables to the database."
 		einfo "You will have to setup a database called snort first."
-		einfo ""
+		einfo
 		use mysql && \
 			einfo "  MySQL: zcat /usr/share/doc/${PF}/schemas/create_mysql.gz | mysql -p snort"
 		use postgres && \
 			einfo "  PostgreSQL: import /usr/share/doc/${PF}/schemas/create_postgresql.gz"
 		use odbc && einfo "SQL tables need to be created - look at /usr/share/doc/${PF}/schemas/"
-		einfo ""
+		einfo
 		einfo "Also, read the following Gentoo forums article:"
 		einfo '   http://forums.gentoo.org/viewtopic.php?t=78718'
 	fi
diff --git a/net-analyzer/snort/snort-2.4.1-r1.ebuild b/net-analyzer/snort/snort-2.4.1-r1.ebuild
index 3a891715ebb3..563d7c4ef9e8 100644
--- a/net-analyzer/snort/snort-2.4.1-r1.ebuild
+++ b/net-analyzer/snort/snort-2.4.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/net-analyzer/snort/snort-2.4.1-r1.ebuild,v 1.1 2005/10/08 13:55:12 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:24 chriswhite Exp $
 
 inherit eutils flag-o-matic autotools
 
diff --git a/net-analyzer/snort/snort-2.4.1.ebuild b/net-analyzer/snort/snort-2.4.1.ebuild
index 666e651a883f..2db850923cfb 100644
--- a/net-analyzer/snort/snort-2.4.1.ebuild
+++ b/net-analyzer/snort/snort-2.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/net-analyzer/snort/snort-2.4.1.ebuild,v 1.1 2005/09/17 04:11:28 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.1.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 inherit eutils gnuconfig flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="Libpcap-based packet sniffer/logger/lightweight IDS"
 HOMEPAGE="http://www.snort.org/"
 SRC_URI="http://www.snort.org/dl/current/${P}.tar.gz
 	mirror://gentoo/snort-2.4.0-genpatches.tar.bz2
-	${HOMEPAGE}/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
+	http://www.snort.org/pub-bin/downloads.cgi/Download/comm_rules/Community-Rules.tar.gz
 	snortsam? ( mirror://gentoo/snortsam-20050110.tar.gz )"
 
 LICENSE="GPL-2"
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 	postgres? ( >=dev-db/postgresql-7.2 )
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
-	prelude? ( >=dev-libs/libprelude-0.9.0_rc1 )
+	prelude? ( >=dev-libs/libprelude-0.9.0 )
 	odbc? ( dev-db/unixODBC )
 	inline? (
 		~net-libs/libnet-1.0.2a
@@ -80,7 +80,7 @@ src_unpack() {
 src_compile() {
 	local myconf
 
-	# There is no --diable-flexresp, cannot use use_enable
+	# There is no --disable-flexresp, cannot use use_enable
 	use flexresp && myconf="${myconf} --enable-flexresp"
 
 	use inline && append-flags -I/usr/include/libipq
@@ -112,8 +112,7 @@ src_install() {
 		etc/*.map etc/threshold.conf
 	newins etc/snort.conf snort.conf.distrib
 
-	# use prelude && doins etc/prelude-classification.config
-
+	# init script is known to be broken in 2.4.x; bug 101157
 	newinitd "${FILESDIR}/snort.rc6" snort
 	newconfd "${FILESDIR}/snort.confd" snort
 
diff --git a/net-analyzer/snort/snort-2.4.3.ebuild b/net-analyzer/snort/snort-2.4.3.ebuild
index f3794ed562c3..824ae27cf02b 100644
--- a/net-analyzer/snort/snort-2.4.3.ebuild
+++ b/net-analyzer/snort/snort-2.4.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/net-analyzer/snort/snort-2.4.3.ebuild,v 1.1 2005/10/19 09:19:49 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snort/snort-2.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:23 chriswhite Exp $
 
 inherit eutils flag-o-matic autotools
 
diff --git a/net-analyzer/snortalog/ChangeLog b/net-analyzer/snortalog/ChangeLog
index 5cbe57956606..f2b443e2b998 100644
--- a/net-analyzer/snortalog/ChangeLog
+++ b/net-analyzer/snortalog/ChangeLog
@@ -1,6 +1,84 @@
 # ChangeLog for net-analyzer/snortalog
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.1 2004/07/01 00:46:54 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/ChangeLog,v 1.1.1.1 2005/11/30 10:12:21 chriswhite Exp $
+
+  01 Nov 2005; <soulse@gentoo.org> snortalog-2.4.0.ebuild:
+  Fixed ebuild as per bug #110225, thanks to Toralf <toralf.foerster@gmx.de>
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  25 Jun 2005; Andrej Kacian <ticho@gentoo.org> snortalog-2.4.0.ebuild:
+  Added ~amd64 keyword.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> snortalog-2.4.0.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  snortalog-2.3.0-r1.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> snortalog-2.2.1.ebuild:
+  dev-perl/Getopt-Long => perl-core/Getopt-Long migration
+
+  24 May 2005; Michael Cummings <mcummings@gentoo.org> snortalog-2.2.1.ebuild,
+  snortalog-2.3.0-r1.ebuild, snortalog-2.4.0.ebuild:
+  dev-perl/DB_File => perl-core/DB_File
+
+  20 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> snortalog-2.4.0.ebuild:
+  Problem with fetching patch, fixes bug 89828. Thanks to Donald R. Gray Jr
+  <donaldgray@dslextreme.com> for reporting.
+
+*snortalog-2.4.0 (14 Apr 2005)
+
+  14 Apr 2005; Aaron Walker <ka0ttic@gentoo.org>
+  -files/snortalog-2.3.0-fix-gui.diff,
+  +files/snortalog-2.4.0-limit-args.diff,
+  +files/snortalog-2.4.0-notcltk.diff, snortalog-2.3.0-r1.ebuild,
+  +snortalog-2.4.0.ebuild:
+  Version bump; Moved >20k patches to the mirrors.
+
+  20 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/snortalog-2.3.0-limit-args.diff, snortalog-2.3.0-r1.ebuild:
+  Fix bug 84745; Thanks to Toralf Förster <toralf.foerster@gmx.de>
+  and Marco Morales <soulse@gmail.com>.
+
+*snortalog-2.3.0-r1 (08 Mar 2005)
+
+  08 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/snortalog-2.3.0-fix-gui.diff, +snortalog-2.3.0-r1.ebuild,
+  -snortalog-2.3.0.ebuild:
+  Revision bump for bug 84390; fixed gui module.
+
+*snortalog-2.3.0 (07 Mar 2005)
+
+  07 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/snortalog-notcltk.diff, snortalog-2.2.1.ebuild,
+  +snortalog-2.3.0.ebuild:
+  Version bump; also added patch that makes Tcl/tk support optional (via
+  USE=tcltk). Thanks to Marco Morales for the ebuild and patch in bug 83987.
+
+  28 Nov 2004; Eldad Zack <eldad@gentoo.org> snortalog-2.2.1.ebuild:
+  Completed dependencies. Closes Bug 72090.
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> snortalog-2.2.1.ebuild:
+  Updated dependencies. (Bug 72090)
+
+  21 Nov 2004; <solar@gentoo.org> snortalog-2.2.1.ebuild:
+  qa fix. was fatal if snortalog.pl is missing - use mv vs. cp - src_install
+  phase may be called more than one time.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> snortalog-2.2.1.ebuild:
+  x86 stable
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> snortalog-2.2.1.ebuild:
+  Typo in DESCRIPTION: powerfull -> powerful. Bug 59717.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> snortalog-2.2.1.ebuild:
+  added missing IUSE
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> snortalog-2.2.1.ebuild:
+  Added to ~ppc.
 
 *snortalog-2.2.1 (01 Jul 2004)
 
diff --git a/net-analyzer/snortalog/Manifest b/net-analyzer/snortalog/Manifest
index a23c8cb20c31..7ffe9a1365f6 100644
--- a/net-analyzer/snortalog/Manifest
+++ b/net-analyzer/snortalog/Manifest
@@ -1,2 +1,12 @@
-MD5 c5eace7d51423b83393fbfe17b2cd0dc snortalog-2.2.1.ebuild 703
+MD5 1cd0cc436ac9ba3996721df5b5af8db3 ChangeLog 3427
+MD5 fc4e25d7343dc6d2b44602bd3972903a metadata.xml 245
+MD5 b2a3986aaf4a083a053a4dec199cd4f7 snortalog-2.2.1.ebuild 775
+MD5 fc7f56764f1bd1da3641e9692d0f9eb1 snortalog-2.3.0-r1.ebuild 1626
+MD5 1d741ea1a9e7430e472b1d30d8e648df snortalog-2.4.0.ebuild 1766
 MD5 424d2f24724379f96c1c10b866081de4 files/digest-snortalog-2.2.1 65
+MD5 9ffebf50ecd9113ef41a27a476b5bbe5 files/digest-snortalog-2.3.0-r1 65
+MD5 0002bd36bbeffb19c302cd61da9dd587 files/digest-snortalog-2.4.0 139
+MD5 af01fbfd326839abf6cf3bb9f0bc5226 files/snortalog-2.3.0-limit-args.diff 484
+MD5 a5a0841e5bd64eaa526550646dfa3f5c files/snortalog-2.4.0-limit-args.diff 495
+MD5 0b9975fa825cb3029556ddb3a722cfb3 files/snortalog-2.4.0-notcltk.diff 908
+MD5 2f2b2b3bb86008d2d74474f2523d1420 files/snortalog-notcltk.diff 813
diff --git a/net-analyzer/snortalog/files/digest-snortalog-2.4.0 b/net-analyzer/snortalog/files/digest-snortalog-2.4.0
index a8f7f9839d4a..593644498857 100644
--- a/net-analyzer/snortalog/files/digest-snortalog-2.4.0
+++ b/net-analyzer/snortalog/files/digest-snortalog-2.4.0
@@ -1 +1,2 @@
 MD5 f7ff35957ea9870f630973f33f2f2cff snortalog_v2.4.0.tgz 215079
+MD5 59f8f3776911602036fea765ce95288a snortalog-2.4.0-fix-gui.diff.gz 3296
diff --git a/net-analyzer/snortalog/snortalog-2.2.1.ebuild b/net-analyzer/snortalog/snortalog-2.2.1.ebuild
index 8e91d5ef05dc..92bd38f8216b 100644
--- a/net-analyzer/snortalog/snortalog-2.2.1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.2.1.ebuild
@@ -1,27 +1,28 @@
-# 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/net-analyzer/snortalog/snortalog-2.2.1.ebuild,v 1.1 2004/07/01 00:46:54 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.2.1.ebuild,v 1.1.1.1 2005/11/30 10:12:21 chriswhite Exp $
 
-DESCRIPTION="a powerfull perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
+DESCRIPTION="a powerful perl script that summarizes snort logs"
 HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
 
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
-S=${WORKDIR}/${PN}_v${PV%.?}
-
-RDEPEND="dev-lang/perl"
+S="${WORKDIR}/${PN}_v${PV%.?}"
 
-src_compile() {
-	einfo "Nothing to compile."
-}
+RDEPEND="dev-lang/perl
+	dev-perl/GDGraph
+	perl-core/Getopt-Long
+	perl-core/DB_File
+	dev-perl/HTML-HTMLDoc
+	dev-perl/perl-tk"
 
 src_install () {
-
-	dodir /usr/bin
-	mv ${S}/snortalog.pl ${D}/usr/bin
-
-	dodoc CHANGES README domains hw rules snortalog_v2.2.0.pdf
+	dobin snortalog.pl || die "dobin failed"
+	insinto /etc/${PN}
+	doins domains hw rules
+	dodoc CHANGES README snortalog_v2.2.0.pdf
 }
diff --git a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
index 52b39aadfe1b..19e0c4249e4c 100644
--- a/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild
@@ -1,37 +1,44 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild,v 1.1 2005/03/08 14:06:01 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.3.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 inherit eutils
 
+MY_P="${PN}_v${PV}"
+
 DESCRIPTION="a powerful perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${PN}_v${PV}.tgz"
-HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${MY_P}.tgz"
+HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/
+	tcltk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
 
 KEYWORDS="~x86 ~ppc"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="tcltk"
 
-S="${WORKDIR}/${PN}_v${PV%.?}"
+S="${WORKDIR}/${MY_P%.?}"
 
 RDEPEND="dev-lang/perl
-	dev-perl/Getopt-Long
-	dev-perl/DB_File
+	perl-core/Getopt-Long
+	perl-core/DB_File
 	dev-perl/HTML-HTMLDoc
 	tcltk? ( dev-perl/perl-tk
 			 dev-perl/GDGraph )"
 
 src_unpack() {
-	unpack ${A} && cd ${S}
+	unpack ${MY_P}.tgz && cd ${S}
+	# one file created at a time ( pdf or html )
+	epatch ${FILESDIR}/${P}-limit-args.diff
+
 	use tcltk || epatch ${FILESDIR}/${PN}-notcltk.diff
-	use tcltk && epatch ${FILESDIR}/${P}-fix-gui.diff
-	# fix paths
+	use tcltk && epatch ${DISTDIR}/${P}-fix-gui.diff.gz
+	# fix paths, erroneous can access message
 	sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
 		-e 's:\($domains_file = "\)\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($rules_file = "\)\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($hw_file = "\)\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($lang_file = "\)\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:Can access:Can not access:' \
 		snortalog.pl || die "sed snortalog.pl failed"
 }
 
diff --git a/net-analyzer/snortalog/snortalog-2.4.0.ebuild b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
index b10a2560ce37..62fd1222e6c4 100644
--- a/net-analyzer/snortalog/snortalog-2.4.0.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.0.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.4.0.ebuild,v 1.1 2005/04/14 12:51:04 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortalog/snortalog-2.4.0.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
 
 inherit eutils
 
 MY_P="${PN}_v${PV}"
 
 DESCRIPTION="a powerful perl script that summarizes snort logs"
-SRC_URI="http://jeremy.chartier.free.fr/${PN}/${MY_P}.tgz"
-HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/
+SRC_URI="http://jeremy.chartier.free.fr/${PN}/${MY_P}.tgz
 	tcltk? ( mirror://gentoo/${P}-fix-gui.diff.gz )"
+HOMEPAGE="http://jeremy.chartier.free.fr/snortalog/"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="tcltk"
@@ -19,8 +19,8 @@ IUSE="tcltk"
 S="${WORKDIR}/${MY_P%.?}"
 
 RDEPEND="dev-lang/perl
-	dev-perl/Getopt-Long
-	dev-perl/DB_File
+	perl-core/Getopt-Long
+	perl-core/DB_File
 	dev-perl/HTML-HTMLDoc
 	tcltk? ( dev-perl/perl-tk
 			 dev-perl/GDGraph )"
@@ -40,6 +40,7 @@ src_unpack() {
 	sed -i -e "s:\(modules/\):/usr/lib/snortalog/${PV}/\1:g" \
 		-e 's:\($domains_file = "\)conf/\(domains\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($rules_file = "\)conf/\(rules\)\(".*\):\1/etc/snortalog/\2\3:' \
+		-e 's:\($picts_dir ="\)picts\(".*\):\1/etc/snortalog/picts\2:' \
 		-e 's:\($hw_file = "\)conf/\(hw\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:\($lang_file ="\)conf/\(lang\)\(".*\):\1/etc/snortalog/\2\3:' \
 		-e 's:Can access:Cannot access:' \
@@ -52,6 +53,9 @@ src_install () {
 	insinto /etc/${PN}
 	doins conf/{domains,hw,lang,rules}
 
+	insinto /etc/${PN}/picts
+	doins picts/*
+
 	insinto /usr/lib/${PN}/${PV}/modules
 	doins -r modules/*
 
diff --git a/net-analyzer/snortsam/ChangeLog b/net-analyzer/snortsam/ChangeLog
index 9c35af5c24f6..fdcfe969b36f 100644
--- a/net-analyzer/snortsam/ChangeLog
+++ b/net-analyzer/snortsam/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for net-analyzer/snortsam
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.1 2004/06/30 23:58:02 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/ChangeLog,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
+
+*snortsam-2.36 (29 Jul 2005)
+
+  29 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> +snortsam-2.36.ebuild:
+  Version bump for bug 100675. Thanks to Patrizio Bassi
+  <hetfield666@virgilio.it>.
+
+  27 Jun 2005; Markus Rothe <corsair@gentoo.org> snortsam-2.31.ebuild:
+  Stable on ppc64
+
+  15 May 2005; Markus Rothe <corsair@gentoo.org> snortsam-2.31.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  08 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> snortsam-2.30.ebuild:
+  Stable on ppc.
+
+*snortsam-2.31 (18 Mar 2005)
+
+  18 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +snortsam-2.31.ebuild:
+  Version bump for bug 85686.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> snortsam-2.30.ebuild:
+  Marked stable on x86.
+
+*snortsam-2.30 (26 Jan 2005)
+
+  26 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +snortsam-2.30.ebuild:
+  Version bump.
+
+*snortsam-2.29 (25 Jan 2005)
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/snortsam-2.29-no-ugly----lines.diff, +snortsam-2.29.ebuild:
+  Version bump for bug 78252.
+
+  11 Jan 2005; Daniel Black <dragonheart@gentoo.org> snortsam-2.24.ebuild:
+  ppc stable. (needed for snort-2.3.0_rc2 stablity as a result of bug #70758)
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> snortsam-2.24.ebuild:
+  x86 stable
+
+  01 Jul 2004; David Holm <dholm@gentoo.org> snortsam-2.24.ebuild:
+  Added to ~ppc.
 
 *snortsam-2.24 (01 Jul 2004)
 
diff --git a/net-analyzer/snortsam/Manifest b/net-analyzer/snortsam/Manifest
index 20298df68156..9746f6810a55 100644
--- a/net-analyzer/snortsam/Manifest
+++ b/net-analyzer/snortsam/Manifest
@@ -1,2 +1,13 @@
-MD5 2087ea8b00f966b80cfdf0c8e56c3760 snortsam-2.24.ebuild 1023
+MD5 563816515ae29db4307c0c08572c9255 snortsam-2.29.ebuild 1150
+MD5 0aab34643b6648fc5d83078a4a239cd8 snortsam-2.24.ebuild 1017
+MD5 c0adb61a69f1dda5813380d265af5d05 snortsam-2.30.ebuild 1202
+MD5 4a135baf980137ea883061f790646434 ChangeLog 1747
+MD5 a4c5d35c3cd8f3d1b4e98c5714739e8e snortsam-2.36.ebuild 1215
+MD5 5b4a8eb28c662d274a2a6fd3ca87c3c1 metadata.xml 275
+MD5 21a4d32d50fdc886a60dfb3e6a4257eb snortsam-2.31.ebuild 1211
+MD5 0be28257a995a317341b1d367535cb38 files/snortsam-2.29-no-ugly----lines.diff 1665
 MD5 ba3cfd3145dc1ff7957a323d413e45ab files/digest-snortsam-2.24 69
+MD5 0fba63de6dcbb1d580551ccdd18e3cd1 files/digest-snortsam-2.29 70
+MD5 ab344229fa16837941fb8097d305dc2d files/digest-snortsam-2.30 70
+MD5 60effdf575c3dff7ee6ea78698eb827b files/digest-snortsam-2.31 70
+MD5 a49362a2ae2aae66e50cf737ca7b5c48 files/digest-snortsam-2.36 70
diff --git a/net-analyzer/snortsam/snortsam-2.24.ebuild b/net-analyzer/snortsam/snortsam-2.24.ebuild
index 0a745de6c02c..582b58f0450e 100644
--- a/net-analyzer/snortsam/snortsam-2.24.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.24.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/net-analyzer/snortsam/snortsam-2.24.ebuild,v 1.1 2004/06/30 23:58:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.24.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 DESCRIPTION="Snort plugin that allows automated blocking of IP addresses on several firewalls"
 HOMEPAGE="http://www.snortsam.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.snortsam.net/files/snortsam-v2_multi-threaded/${PN}-src-${PV
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 ~sparc ~amd64 ppc"
 IUSE=""
 
 S=${WORKDIR}/${PN}
@@ -26,7 +26,7 @@ src_install() {
 pkg_postinst() {
 	einfo "To use snortsam with snort, you'll have to compile snort with"
 	einfo "the snortsam patch - remerge snort with the snortsam useflag."
-	einfo ""
+	einfo
 	einfo "Read the INSTALL file to configure snort for snortsam, and"
 	einfo "configure snortsam for your particular firewall."
 }
diff --git a/net-analyzer/snortsam/snortsam-2.29.ebuild b/net-analyzer/snortsam/snortsam-2.29.ebuild
index 74a9c6628ed9..9f0cab4cc779 100644
--- a/net-analyzer/snortsam/snortsam-2.29.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.29.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/net-analyzer/snortsam/snortsam-2.29.ebuild,v 1.1 2005/01/25 12:58:58 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.29.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/snortsam/snortsam-2.30.ebuild b/net-analyzer/snortsam/snortsam-2.30.ebuild
index 5b6a8db4a4d8..e588a202b48d 100644
--- a/net-analyzer/snortsam/snortsam-2.30.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.30.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/net-analyzer/snortsam/snortsam-2.30.ebuild,v 1.1 2005/01/26 10:28:12 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.30.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.snortsam.net/files/snortsam-v2_multi-threaded/${PN}-src-${PV
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="x86 ~sparc ~amd64 ppc"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/net-analyzer/snortsam/snortsam-2.31.ebuild b/net-analyzer/snortsam/snortsam-2.31.ebuild
index 343a5db8ddb1..24173aa94a53 100644
--- a/net-analyzer/snortsam/snortsam-2.31.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.31.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/net-analyzer/snortsam/snortsam-2.31.ebuild,v 1.1 2005/03/18 10:49:36 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.31.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.snortsam.net/files/snortsam-v2_multi-threaded/${PN}-src-${PV
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/net-analyzer/snortsam/snortsam-2.36.ebuild b/net-analyzer/snortsam/snortsam-2.36.ebuild
index 1411ed59438a..805b10f89635 100644
--- a/net-analyzer/snortsam/snortsam-2.36.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.36.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/net-analyzer/snortsam/snortsam-2.36.ebuild,v 1.1 2005/07/29 16:39:42 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/snortsam/snortsam-2.36.ebuild,v 1.1.1.1 2005/11/30 10:12:42 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/sonar/ChangeLog b/net-analyzer/sonar/ChangeLog
index 167a654bb7de..8b58efaad1c0 100644
--- a/net-analyzer/sonar/ChangeLog
+++ b/net-analyzer/sonar/ChangeLog
@@ -1,8 +1,55 @@
 # ChangeLog for net-analyzer/sonar
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/ChangeLog,v 1.1 2003/09/29 03:18:22 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> sonar-1.2.1.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org> sonar-1.2.2-r1.ebuild:
+  Added ~sparc keyword as it was dropped in the version bump :(
+
+  17 Jul 2004; Eldad Zack <eldad@gentoo.org> sonar-1.2.2-r1.ebuild:
+  app-text/tetex -> virtual/tetex (#57175)
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> sonar-1.2.2-r1.ebuild,
+  -sonar-1.2.2.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> sonar-1.2.1.ebuild,
+  sonar-1.2.2-r1.ebuild, sonar-1.2.2.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+*sonar-1.2.2-r1 (08 Jun 2004)
+
+  08 Jun 2004; Jon Hood <squinky86@gentoo.org> +sonar-1.2.2-r1.ebuild:
+  version bump; thanks to red0x <red0x@users.sourceforge.net> and Eldad Zack
+  <eldad@stoneshaft.ath.cx> for the ebuild; closes #51535
+
+  12 May 2004; David Holm <dholm@gentoo.org> sonar-1.2.2.ebuild:
+  Added to ~ppc.
+
+*sonar-1.2.2 (11 May 2004)
+
+  11 May 2004; Jon Hood <squinky86@gentoo.org> +sonar-1.2.2.ebuild:
+  version bump, closes #50282
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> sonar-1.2.1.ebuild:
+  Added ~sparc keyword.
+
+*sonar-1.2.1 (11 Dec 2003)
+
+  11 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage #35224.
+
+*sonar-1.2.0 (31 Oct 2003)
+
+  31 Oct 2003; Martin Holzer <mholzer@gentoo.org> sonar-1.2.0.ebuild:
+  Adding depend. Closes #32365.
 
 *sonar-1.20 (28 Sep 2003)
 
+  02 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added patch so that people can compile w/out doc support #29941.
+
   28 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by red0x <red0x@users.sourceforge.net> #19422.
diff --git a/net-analyzer/sonar/Manifest b/net-analyzer/sonar/Manifest
index 776f2439554a..51c303945134 100644
--- a/net-analyzer/sonar/Manifest
+++ b/net-analyzer/sonar/Manifest
@@ -1,3 +1,7 @@
-MD5 23a8ceb7bf84979da407bc2823368f6d files/digest-sonar-1.2.0 64
-MD5 68c40821b58ce635796842bb0a79a9a8 sonar-1.2.0.ebuild 600
-MD5 fb19e69cf48609d3e9db0ff5152c3a67 ChangeLog 380
+MD5 66a1cb2ca4c2766c6551ab7e67fe24d1 sonar-1.2.1.ebuild 768
+MD5 af1e2177d6157a8265400d85c48460d9 ChangeLog 1933
+MD5 b989ef4d4f852287f1421c3b2f7a21cd sonar-1.2.2-r1.ebuild 768
+MD5 17a9be2cf8cb9f24e7e5b398392483b4 metadata.xml 224
+MD5 02ce498d95c40abebb98f70e9fe12181 files/digest-sonar-1.2.1 64
+MD5 189953c096922833ac4d284bdef9aabe files/1.2.1-libtool.patch 1491
+MD5 251b9638fa8ba8ffa0fc50d7540ae082 files/digest-sonar-1.2.2-r1 67
diff --git a/net-analyzer/sonar/sonar-1.2.1.ebuild b/net-analyzer/sonar/sonar-1.2.1.ebuild
index 1cf63369513c..a80bddfa58ec 100644
--- a/net-analyzer/sonar/sonar-1.2.1.ebuild
+++ b/net-analyzer/sonar/sonar-1.2.1.ebuild
@@ -1,9 +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/net-analyzer/sonar/sonar-1.2.1.ebuild,v 1.1 2003/12/12 00:31:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
-inherit gcc eutils
+inherit toolchain-funcs eutils
 
+IUSE=""
 DESCRIPTION="network reconnaissance utility"
 HOMEPAGE="http://autosec.sourceforge.net/"
 SRC_URI="mirror://sourceforge/autosec/${P}.tar.bz2"
@@ -11,9 +12,9 @@ RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~sparc"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	>=dev-libs/popt-1.7-r1
 	>=app-doc/doxygen-1.3"
 
diff --git a/net-analyzer/sonar/sonar-1.2.2-r1.ebuild b/net-analyzer/sonar/sonar-1.2.2-r1.ebuild
index fa96aa4751ed..fde3e19ad395 100644
--- a/net-analyzer/sonar/sonar-1.2.2-r1.ebuild
+++ b/net-analyzer/sonar/sonar-1.2.2-r1.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/net-analyzer/sonar/sonar-1.2.2-r1.ebuild,v 1.1 2004/06/08 15:26:29 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 DESCRIPTION="network reconnaissance utility"
 HOMEPAGE="http://autosec.sourceforge.net/"
@@ -10,11 +10,12 @@ RESTRICT="nomirror"
 IUSE="doc"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~sparc"
 S=${WORKDIR}/${PF}
-DEPEND="virtual/glibc
+
+DEPEND="virtual/libc
 	>=dev-libs/popt-1.7-r1
-	app-text/tetex
+	virtual/tetex
 	doc? ( >=app-doc/doxygen-1.3 )"
 
 src_compile() {
diff --git a/net-analyzer/squid-graph/ChangeLog b/net-analyzer/squid-graph/ChangeLog
index 5ae28fbe0747..bd229976934e 100644
--- a/net-analyzer/squid-graph/ChangeLog
+++ b/net-analyzer/squid-graph/ChangeLog
@@ -1,8 +1,48 @@
 # ChangeLog for net-analyzer/squid-graph
-# Copyright 2001-2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/ChangeLog,v 1.1 2002/08/12 08:55:39 cybersystem Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/ChangeLog,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
-* squid-graph-3.0 (12 August 2002)
+*squid-graph-3.1-r1 (17 May 2005)
+
+  17 May 2005; Aaron Walker <ka0ttic@gentoo.org> +squid-graph-3.1-r1.ebuild:
+  Revision bump; install logo.png in a static location, bug 92668.
+
+  22 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  -squid-graph-3.0.ebuild:
+  digest fix; clean older version
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  squid-graph-3.0.ebuild, squid-graph-3.1.ebuild:
+  Tidy
+
+  01 May 2004; Ian Leitch <port001@gentoo.org> squid-graph-3.0.ebuild,
+  squid-graph-3.1.ebuild:
+  Non trivial HOMEPAGE and SRC_URI fixes
+
+  05 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> squid-graph-3.1.ebuild:
+  stable on sparc, thanks weeve
+
+  12 Jun 2003; <msterret@gentoo.org> squid-graph-3.1.ebuild:
+  add Header
+
+*squid-graph-3.1 (07 April 2003) 
+  07 April 2003; Robin Hugh Johnson <robbat2@gentoo.org>
+  squid-graph-3.1.ebuild, ChangeLog, files/digest-squid-graph-3.1:
+  Added ebuild for new version. 
+  In unstable due to package upgrade freeze.
+  Changes in ebuild: 
+  1. 'prepalldocs' to compress html pages
+  2. SRCURI has .gz added
+  Ebuild contributed by Russell Cloran <russell@rucus.ru.ac.za>
+ 
+*squid-graph-3.0 (12 August 2002)
+  
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  18 Oct 2002; Seemant Kulleen <seemant@gentoo.org> squid-graph-3.0.ebuild :
+
+  Updated DEPEND to dev-perl/GD. Thanks to: gaarde@yahoo.com (Paul Belt) in
+  bug #9327.
 
   12 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, squid-graph-3.0.ebuild, files/digest-squid-graph-3.0 :
  
diff --git a/net-analyzer/squid-graph/Manifest b/net-analyzer/squid-graph/Manifest
index e69de29bb2d1..068fe295c7cc 100644
--- a/net-analyzer/squid-graph/Manifest
+++ b/net-analyzer/squid-graph/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 49a5bcc88118606c30f90564941c81fb squid-graph-3.1.ebuild 748
+MD5 315318480b92b770638cea91b4c68ede squid-graph-3.1-r1.ebuild 878
+MD5 0f192ba6c941ca8d305dd30bb80fe7af ChangeLog 1859
+MD5 af4cf8cdef23fd8936b05ade8d37d3b1 metadata.xml 237
+MD5 d3c1af9799d03a6f154df591708a33dd files/digest-squid-graph-3.1 67
+MD5 d3c1af9799d03a6f154df591708a33dd files/digest-squid-graph-3.1-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCieLoEZCkKN40op4RAoZzAJ95pxXoZoDwgPDjedjrsw+8laxQjwCfSa/t
+JiW/TCOYBbEC+H/Z/RGajx8=
+=8Dix
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/squid-graph/files/digest-squid-graph-3.1 b/net-analyzer/squid-graph/files/digest-squid-graph-3.1
index c8dc0f61bc22..5d18deb24abd 100644
--- a/net-analyzer/squid-graph/files/digest-squid-graph-3.1
+++ b/net-analyzer/squid-graph/files/digest-squid-graph-3.1
@@ -1,2 +1 @@
-MD5 a51b66a2d2646ae5fae04cdf41200644 /squid-graph-3.1.ebuild 638
 MD5 e9565daabc23599094ed2d0e9a984d5e squid-graph-3.1.tar.gz 349135
diff --git a/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild
index 807d2e720db3..b0cdba66114e 100644
--- a/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild
+++ b/net-analyzer/squid-graph/squid-graph-3.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/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild,v 1.1 2005/05/17 12:24:50 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squid-graph/squid-graph-3.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 DESCRIPTION="Squid logfile analyzer and traffic grapher"
 HOMEPAGE="http://squid-graph.securlogic.com/"
diff --git a/net-analyzer/squid-graph/squid-graph-3.1.ebuild b/net-analyzer/squid-graph/squid-graph-3.1.ebuild
index 12988160ab46..f97c81ebcb76 100644
--- a/net-analyzer/squid-graph/squid-graph-3.1.ebuild
+++ b/net-analyzer/squid-graph/squid-graph-3.1.ebuild
@@ -1,14 +1,15 @@
-# 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/net-analyzer/squid-graph/squid-graph-3.1.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Squid logfile analyzer and traffic grapher"
-HOMEPAGE="http://www.squid-graph.dhs.org"
-SRC_URI="http://www.squid-graph.dhs.org/files/stable/${P}.tar.gz"
+HOMEPAGE="http://squid-graph.securlogic.com/"
+SRC_URI="http://squid-graph.securlogic.com/files/stable/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~ppc ~x86 ~sparc"
+KEYWORDS="ppc x86 sparc"
+IUSE=""
 
 DEPEND="dev-perl/GD"
 
diff --git a/net-analyzer/squidsites/ChangeLog b/net-analyzer/squidsites/ChangeLog
index 8abb24b47c23..0ebea75ab815 100644
--- a/net-analyzer/squidsites/ChangeLog
+++ b/net-analyzer/squidsites/ChangeLog
@@ -1,8 +1,22 @@
 # ChangeLog for net-analyzer/squidsites
-# Copyright 2001-2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/ChangeLog,v 1.1 2002/08/04 09:23:07 cybersystem Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/ChangeLog,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
-* squidsites-1.01 (4 August 2002)
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> squidsites-1.01.ebuild:
+  change sys-libs/glibc to virtual/libc, add IUSE
+
+*squidsites-1.01 (4 August 2002)
+
+  4 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog :
+ 
+  Initial ebuild by Todd Heim <theim@umd.umich.edu>..
+  
+  4 August 2002; phoen][x <phoenix@gentoo.org> ChangeLog :
+  
+  Chmod'ed ChangeLog to 644.
 
   4 August 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, squidsites-1.01.ebuild, files/digest-squidsites-1.01 :
 
diff --git a/net-analyzer/squidsites/Manifest b/net-analyzer/squidsites/Manifest
index e69de29bb2d1..e84634722722 100644
--- a/net-analyzer/squidsites/Manifest
+++ b/net-analyzer/squidsites/Manifest
@@ -0,0 +1,4 @@
+MD5 8ba34373be1d29c7d043b56861f21ed7 squidsites-1.01.ebuild 732
+MD5 88e496c1332e017dbb898b1380f57c63 ChangeLog 840
+MD5 68654e619d31e58a17a87e9e0ab3b1bf metadata.xml 299
+MD5 918dbabf0ac8597ff154e5b816cdf1da files/digest-squidsites-1.01 66
diff --git a/net-analyzer/squidsites/squidsites-1.01.ebuild b/net-analyzer/squidsites/squidsites-1.01.ebuild
index 73f557745bd5..1e6a9156baf5 100644
--- a/net-analyzer/squidsites/squidsites-1.01.ebuild
+++ b/net-analyzer/squidsites/squidsites-1.01.ebuild
@@ -1,15 +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/net-analyzer/squidsites/squidsites-1.01.ebuild,v 1.1 2002/08/04 09:23:07 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/squidsites/squidsites-1.01.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
+IUSE=""
 DESCRIPTION="Squidsites is a tool that parses Squid access log file and generates a report of the most visited sites."
 HOMEPAGE="http://www.stefanopassiglia.com/downloads.htm"
 SRC_URI="http://www.stefanopassiglia.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="ppc x86"
-DEPEND="sys-libs/glibc"
-RDEPEND="sys-libs/glibc"
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
 S=${WORKDIR}/src
 
 src_compile() {
@@ -18,6 +19,6 @@ src_compile() {
 
 src_install () {
 	cd ${WORKDIR}
-	dobin src/squidsites 
+	dobin src/squidsites
 	dodoc Authors Bugs ChangeLog GNU-Manifesto.html README
 }
diff --git a/net-analyzer/ssldump/ChangeLog b/net-analyzer/ssldump/ChangeLog
index c0bd23847837..23b3cac3cde2 100644
--- a/net-analyzer/ssldump/ChangeLog
+++ b/net-analyzer/ssldump/ChangeLog
@@ -1,6 +1,31 @@
-# ChangeLog for net-analyzer/mtr
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.1 2003/05/19 21:36:26 mholzer Exp $
+# ChangeLog for net-analyzer/ssldump
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ssldump-0.9.ebuild:
+  Added to ~ppc.
+
+  21 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> ssldump-0.9.ebuild:
+  stable on amd64. fixes #82740
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> ssldump-0.9.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org> ssldump-0.9.ebuild:
+  Stable on sparc.
+
+  19 Aug 2004; Jason Wever <weeve@gentoo.org> ssldump-0.9.ebuild:
+  Added ~sparc keyword.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ssldump-0.9.ebuild:
+  Add inherit eutils
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> ssldump-0.9.ebuild,
+  files/ssldump-0.9-libpcap-header.patch:
+  Added patch for new libpcap headers.
 
 *ssldump-0.9 (19 May 2003)
 
diff --git a/net-analyzer/ssldump/Manifest b/net-analyzer/ssldump/Manifest
index d7b1437b86f1..1694aa3bbcc6 100644
--- a/net-analyzer/ssldump/Manifest
+++ b/net-analyzer/ssldump/Manifest
@@ -1,3 +1,5 @@
-MD5 c89f259cd5b7ad0108511862704c6208 attachment.cgi?id=11902 1063
-MD5 2772d50c733d6a7a35591e5983fdd517 ssldump-0.9.ebuild 743
+MD5 e9e4329b71af249358c87cf9cbfdd447 ChangeLog 1200
+MD5 3c1070d475b19655cf696ce9a2dd12f5 ssldump-0.9.ebuild 878
+MD5 38fc0f377891f16feb5aee3de500e7d0 metadata.xml 245
 MD5 e48ef1ebd171e60a677b90bbe65a8a6f files/digest-ssldump-0.9 65
+MD5 fb8f0f38b6d7247b85572b321c691ccd files/ssldump-0.9-libpcap-header.patch 246
diff --git a/net-analyzer/ssldump/ssldump-0.9.ebuild b/net-analyzer/ssldump/ssldump-0.9.ebuild
index d4c060cc9c39..d6f3d71746c3 100644
--- a/net-analyzer/ssldump/ssldump-0.9.ebuild
+++ b/net-analyzer/ssldump/ssldump-0.9.ebuild
@@ -1,6 +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/net-analyzer/ssldump/ssldump-0.9.ebuild,v 1.1 2003/05/19 21:36:26 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ssldump/ssldump-0.9.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+inherit gnuconfig eutils
 
 IUSE="ssl"
 
@@ -11,22 +13,26 @@ SRC_URI="http://www.rtfm.com/ssldump/${MY_P}.tar.gz"
 HOMEPAGE="http://www.rtfm.com/ssldump/"
 
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-2"
 
-DEPEND=">=net-libs/libpcap-0.6.1
+DEPEND="virtual/libpcap
 	ssl? ( >=dev-libs/openssl-0.6.9 )"
 
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-libpcap-header.patch
+}
 
 src_compile() {
-	local myconf
+	gnuconfig_update
 
-	use ssl || myconf="--without-crypto"
-	econf ${myconf} || die
+	econf `use_with ssl crypto` || die
 	emake || die
 }
 
-src_install() {															 
+src_install() {
 	into /usr
 	dosbin ssldump
 	doman ssldump.1
diff --git a/net-analyzer/sussen/ChangeLog b/net-analyzer/sussen/ChangeLog
index 726f4a3d190e..dbcbc12cfe8b 100644
--- a/net-analyzer/sussen/ChangeLog
+++ b/net-analyzer/sussen/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for net-analyzer/sussen
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.1 2003/08/20 12:42:51 obz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/ChangeLog,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
+
+  19 Jun 2005; David Holm <dholm@gentoo.org> sussen-0.10.ebuild,
+  sussen-0.12.ebuild:
+  Added to ~ppc.
+
+*sussen-0.12 (18 Jun 2005)
+
+  18 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +sussen-0.12.ebuild:
+  Version bump. In package.mask for testing.
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> sussen-0.10.ebuild:
+  RDEPEND fix, bug 86328.
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> sussen-0.10.ebuild:
+  mono moved from dev-dotnet -> dev-lang
+
+  25 Jan 2005; Jason Wever <weeve@gentoo.org> sussen-0.10.ebuild:
+  Masked on sparc wrt bug #79303.
+
+*sussen-0.10 (21 Jan 2005)
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
+  +sussen-0.10.ebuild:
+  Version bump for bug 38614.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> sussen-0.5.3.ebuild:
+  marked x86 stable
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> sussen-0.5.3.ebuild:
+  Added ~sparc keyword.
 
 *sussen-0.5.3 (20 Aug 2003)
 
diff --git a/net-analyzer/sussen/Manifest b/net-analyzer/sussen/Manifest
index 1257260f7673..6bcad3940024 100644
--- a/net-analyzer/sussen/Manifest
+++ b/net-analyzer/sussen/Manifest
@@ -1,2 +1,18 @@
-MD5 a1be9d53aba36ceb617a13c900343c8c sussen-0.5.3.ebuild 1032
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7609cd81d666c771e6f6d3654fd9446f ChangeLog 1261
+MD5 913a9112332add1b07f8e13567ef78c6 files/digest-sussen-0.10 63
+MD5 6bbd8221dae260aa294014e79587f74d files/digest-sussen-0.12 63
 MD5 5dd20ca6159958efc7303bd449ea592e files/digest-sussen-0.5.3 64
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 284a33f91290e58dc976067ff9438ae5 sussen-0.10.ebuild 745
+MD5 eb4b0f734206dfbff9990d9a1edb216f sussen-0.12.ebuild 745
+MD5 606a391d68a2efbd6f306c20cd73fdbe sussen-0.5.3.ebuild 1118
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0Be4I1lqEGTUzyQRAqraAJ9k03Ejhi8lWCqaHkXbVtussBzMnwCgmQ1h
+7jzRCCb2LqL+P8DUSqG9ysg=
+=jcWS
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/sussen/metadata.xml b/net-analyzer/sussen/metadata.xml
index baf2e6c43aee..78692635ad22 100644
--- a/net-analyzer/sussen/metadata.xml
+++ b/net-analyzer/sussen/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>gnome</herd>
-<maintainer>
-  <email>gnome@gentoo.org</email>
-</maintainer>
-<longdescription>Sussen is a GTK+2 and GNOME 2.2 client for the Nessus security scanning system. It includes support for database backends (via the libgnomedb library), session support, and a policy manager to select the types of security checks a user would like to perform.</longdescription>
+	<herd>netmon</herd>
 </pkgmetadata>
diff --git a/net-analyzer/sussen/sussen-0.10.ebuild b/net-analyzer/sussen/sussen-0.10.ebuild
index 11675490cd9b..5dd65bf5ee34 100644
--- a/net-analyzer/sussen/sussen-0.10.ebuild
+++ b/net-analyzer/sussen/sussen-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/net-analyzer/sussen/sussen-0.10.ebuild,v 1.1 2005/01/21 23:21:34 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.10.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit gnome2 mono
 
@@ -10,12 +10,12 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc -sparc ~x86"
 
-RDEPEND=">=dev-dotnet/mono-1.0
-	>=dev-dotnet/gtk-sharp-1.0
-	>=dev-dotnet/glade-sharp-1.0
-	>=dev-dotnet/gnome-sharp-1.0"
+RDEPEND=">=dev-lang/mono-1.0
+	=dev-dotnet/gtk-sharp-1.0*
+	=dev-dotnet/glade-sharp-1.0*
+	=dev-dotnet/gnome-sharp-1.0*"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/net-analyzer/sussen/sussen-0.12.ebuild b/net-analyzer/sussen/sussen-0.12.ebuild
index 3f55ac99b15f..ef72b369ddb9 100644
--- a/net-analyzer/sussen/sussen-0.12.ebuild
+++ b/net-analyzer/sussen/sussen-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/net-analyzer/sussen/sussen-0.12.ebuild,v 1.1 2005/06/18 22:22:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.12.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit gnome2 mono
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 IUSE=""
 SLOT="0"
-KEYWORDS="~x86 -sparc"
+KEYWORDS="~ppc -sparc ~x86"
 
 RDEPEND=">=dev-lang/mono-1.1
 	=dev-dotnet/gtk-sharp-1.0*
diff --git a/net-analyzer/sussen/sussen-0.5.3.ebuild b/net-analyzer/sussen/sussen-0.5.3.ebuild
index bb69474bdc3d..b6f1b0c2300c 100644
--- a/net-analyzer/sussen/sussen-0.5.3.ebuild
+++ b/net-analyzer/sussen/sussen-0.5.3.ebuild
@@ -1,16 +1,16 @@
-# 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/net-analyzer/sussen/sussen-0.5.3.ebuild,v 1.1 2003/08/20 12:42:51 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sussen/sussen-0.5.3.ebuild,v 1.1.1.1 2005/11/30 10:12:12 chriswhite Exp $
 
 inherit gnome2 debug
 
-DESCRIPTION="Sussen is a GNOME 2.2 client for the Nessus Security Scanner"
+DESCRIPTION="Sussen is a GNOME client for the Nessus Security Scanner"
 HOMEPAGE="http://sussen.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~sparc"
 IUSE="nls"
 
 RDEPEND=">=gnome-extra/libgnomedb-0.90.0
@@ -33,12 +33,12 @@ pkg_postinst( ) {
 
 	gnome2_pkg_postinst
 
-	echo ""
-	einfo "Please ensure the nessus server has ssl support disabled " 
+	echo
+	einfo "Please ensure the nessus server has ssl support disabled"
 	einfo "before using sussen, as ssl support is currently non-functional"
 	einfo "in sussen. More information is available by issuing:"
-	einfo ""
+	einfo
 	einfo "less /usr/share/doc/${PV}/README.gz"
-	echo ""
+	echo
 
 }
diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index 05a436b81701..8354e3879242 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,7 +1,210 @@
 # ChangeLog for net-analyzer/tcpdump
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
+  09 Oct 2005; <mkay@gentoo.org> tcpdump-3.9.3.ebuild:
+  Forcing at least -O optymalization. This close bug #108391
+
+*tcpdump-3.9.3 (20 Sep 2005)
+
+  20 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> +tcpdump-3.9.3.ebuild:
+  Version bump.
+
+  20 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -tcpdump-3.8.3-r1.ebuild, tcpdump-3.8.3-r4.ebuild:
+  inherit eutils.
+
+  02 Jul 2005; Hardave Riar <hardave@gentoo.org> tcpdump-3.8.3-r4.ebuild:
+  Stable on mips, bug #95349
+
+*tcpdump-3.8.3-r4 (30 Jun 2005)
+
+  30 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> -tcpdump-3.8.3-r2.ebuild,
+  -tcpdump-3.8.3-r3.ebuild, +tcpdump-3.8.3-r4.ebuild:
+  Revision bump; previous ebuilds do not enable SSL with USE=ssl, bug 97471.
+  Tidy old ebuilds.
+
+  11 Jun 2005; Yuta SATOH <nigoro@gentoo.org> tcpdump-3.8.3-r3.ebuild:
+  Stable on ppc64, bug #95349
+
+  10 Jun 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  tcpdump-3.8.3-r3.ebuild:
+  Stable on hppa.
+
+  10 Jun 2005; Aron Griffis <agriffis@gentoo.org> tcpdump-3.8.3-r3.ebuild:
+  stable on alpha ia64 #95349
+
+  10 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tcpdump-3.8.3-r3.ebuild:
+  Stable on ppc.
+
+  10 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> tcpdump-3.8.3-r3.ebuild:
+  Stable on amd64 wrt #95349.
+
+  10 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  tcpdump-3.8.3-r3.ebuild:
+  Stable on sparc wrt #95349
+
+*tcpdump-3.8.3-r3 (09 Jun 2005)
+
+  09 Jun 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/tcpdump-3.8.3-bgp-infinite-loop2.patch, +tcpdump-3.8.3-r3.ebuild:
+  Adding patch for security bug 95349.
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  14 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  files/tcpdump-3.8.3-gcc4.patch, tcpdump-3.8.3-r2.ebuild:
+  Update gcc4 patch with the proper AC_TRY_LINK fix. Thanks to halcy0n for the
+  help.
+
+  14 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/tcpdump-3.8.3-gcc4.patch, tcpdump-3.8.3-r2.ebuild:
+  Added patch to make gcc-4 a happy camper; also updated to use
+  toolchain-funcs.eclass rather than gcc.eclass.
+
+  07 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  tcpdump-3.8.3-r2.ebuild:
+  Stable on alpha + ia64, bug 90541.
+
+  07 May 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
+  tcpdump-3.8.3-r2.ebuild:
+  Stable on ppc64 wrt #90541
+
+  07 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  tcpdump-3.8.3-r2.ebuild:
+  Stable on hppa.
+
+  07 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  tcpdump-3.8.3-r2.ebuild:
+  Stable on sparc wrt #90541
+
+  06 May 2005; Andrej Kacian <ticho@gentoo.org> tcpdump-3.8.3-r2.ebuild:
+  Stable on amd64, bug #90541.
+
+  06 May 2005; Daniel Black <dragonheart@gentoo.org>
+  tcpdump-3.8.3-r2.ebuild:
+  ppc stable as per bug #90541
+
+*tcpdump-3.8.3-r2 (06 May 2005)
+
+  06 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/tcpdump-3.8.3-gentoo.patch, +tcpdump-3.8.3-r2.ebuild:
+  Adding security patch derived from debian to solve bug #90541
+
+  31 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  virtual/libpcap transition
+
+  30 Oct 2004; Eldad Zack <eldad@gentoo.org>
+  -files/tcpdump-3.6.2-afsprinting.patch, -files/tcpdump-3.7.2-sctp.patch,
+  -tcpdump-3.6.2-r1.ebuild, -tcpdump-3.7.1.ebuild, -tcpdump-3.7.2.ebuild,
+  -tcpdump-3.8.1.ebuild, -tcpdump-3.8.3.ebuild:
+  Cleanup
+
+  17 Jul 2004; Tom Gall <tgall@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  stable on ppc64, bug #56913
+
+  14 Jul 2004; Travis Tilley <lv@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  fix gcc 3.4 fix so that it works with gcc 3.4.1 too
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tcpdump-3.7.2.ebuild:
+  Add inherit eutils
+
+  04 Apr 2004; Aron Griffis <agriffis@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  Mark stable on alpha and ia64 for bug 46258
+
+  04 Apr 2004; Jon Portnoy <avenj@gentoo.org> tcpdump-3.8.3-r1.ebuild :
+  Stable on AMD64
+
+  03 Apr 2004; Jason Wever <weeve@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  Stable on sparc wrt bug #46258.
+
+  03 Apr 2004; <solar@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  stable on x86. Bug #37184,#46258
+
+  03 Apr 2004; Lars Weiler <pylon@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+  stable on ppc as requested in bug #46258
+
+*tcpdump-3.8.3-r1 (31 Mar 2004)
+
+  31 Mar 2004; <solar@gentoo.org> metadata.xml, tcpdump-3.8.3-r1.ebuild:
+  updated DEPEND's
+
+  30 Mar 2004; Jason Wever <weeve@gentoo.org> tcpdump-3.8.3.ebuild:
+  Stable on sparc.
+
+*tcpdump-3.8.3 (30 Mar 2004)
+
+  30 Mar 2004; <solar@gentoo.org> tcpdump-3.6.2-r1.ebuild,
+  tcpdump-3.7.1.ebuild, tcpdump-3.7.2.ebuild, tcpdump-3.8.3.ebuild:
+  ISAKMP payload handling denial-of-service vulnerabilities. Bugzilla Bug 46258
+
+  30 Mar 2004; Aron Griffis <agriffis@gentoo.org> tcpdump-3.8.1.ebuild:
+  Stable on alpha and ia64 for bug 38206
+
+  15 Jan 2004; <gustavoz@gentoo.org> tcpdump-3.8.1.ebuild:
+  marked hppa and sparc, fixes #38206
+
+  05 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> tcpdump-3.8.1.ebuild:
+  Change optimization levels. Patch by Gustavo Zacarias <gustavoz@gentoo.org> in
+  #37184.
+
+*tcpdump-3.8.1 (03 Jan 2004)
+
+  03 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> tcpdump-3.8.1.ebuild:
+  Version bump. Closing #37091
+
+  04 Nov 2003; Will Woods <wwoods@gentoo.org> tcpdump-3.7.2.ebuild:
+  Added files/tcpdump-3.7.2-sctp.patch, fixing bug #25544
+
+*tcpdump-3.7.2 (03 Mar 2003)
+
+  27 Apr 2003; Zach Welch <zwelch@gentoo.org> tcpdump-3.7.2.ebuild:
+  add arm keyword
+
+  25 Apr 2003; Guy Martin <gmsoft@gentoo.org> tcpdump-3.7.2.ebuild :
+  Added hppa to KEYWORDS.
+
+  03 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*tcpdump-3.7.1 (9 May 2002)
+
+  15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> tcpdump-3.6.2-r1.ebuild tcpdump-3.7.1.ebuild :
+  Added mips keyword to ebuilds.
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> tcpdump-3.7.1.ebuild :
+  Added ~alpha to KEYWORDS in tcpdump-3.7.1.ebuild.
+
+  17 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> tcpdump-3.7.1.ebuild :
+  Moved binary from /usr/bin to /usr/sbin as suggested in #6518.
+
+  21 Jul 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  18 Jul 2002; Kyle Manna <nitro@gentoo.org tcpdump-3.7.1.ebuild
+  tcpdump-3.6.2-r1.ebuild :
+  Added KEYWORDS, SLOT, and LICENSE.
+
+  9 May 2002; Spider <spider@gentoo.org> tcpdump-3.7.1.ebuild :
+  New version again :)  Not sure if this is BETA, devel, tested, working etc.
+  But it has the security patch already applied ;)
+
+*tcpdump-3.6.2-r1 (9 May 2002)
+
+  17 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> tcpdump-3.6.2-r1.ebuild :
+  Moved binary from /usr/bin to /usr/sbin as suggested in #6518.
+
+  9 May 2002; Spider <spider@gentoo.org> tcpdump-3.6.2-r1.ebuild :
+  Yet another security fix. from connectiva this time
+ 
+*tcpdump-3.6.2 (9 May 2002)
+  9 May 2002; Spider <spider@gentoo.org> tcpdump-3.6.2.ebuild :
+  Updated version on tcpdump.org, fixes security vulnerability.
+  
 *tcpdump-3.6.1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 3ed3dd8084c3..798a38656e3c 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -1,8 +1,9 @@
-MD5 aa174178c5891cabc2f12ff2cd8b3d17 ChangeLog 2327
-MD5 025dc72d12af35a2b4a4bab3047c64a0 tcpdump-3.6.2-r1.ebuild 1005
-MD5 3aa30d9067801d9569e33c68eb6d8d7f tcpdump-3.7.1.ebuild 872
-MD5 6a2f1a31625306e06e6f72ff71300315 tcpdump-3.7.2.ebuild 919
-MD5 f5295cc511894293cef91f09dd9d9d43 files/digest-tcpdump-3.6.2-r1 65
-MD5 ad3cc121211e6bbf52b9e6b882396856 files/digest-tcpdump-3.7.1 65
-MD5 4562ddac208fb1dc942a46986de4cc74 files/tcpdump-3.6.2-afsprinting.patch 1820
-MD5 e70e627b145b5d2aa274d4c955a2f8fe files/digest-tcpdump-3.7.2 65
+MD5 db2c2afd246668438eeee959996a2d06 ChangeLog 7598
+MD5 1465cdeb961745379a8ae1402b3e51ab metadata.xml 268
+MD5 7a2060950c186c05933e76d09893a89f tcpdump-3.8.3-r4.ebuild 1476
+MD5 cf2353e1efd18b1d25aeaeb1da182a11 tcpdump-3.9.3.ebuild 1456
+MD5 ede90d270bda1c6dcdf701ea18c6dbdc files/digest-tcpdump-3.9.3 65
+MD5 d285bb203f9e48fc23492e4c72d61a94 files/digest-tcpdump-3.8.3-r4 65
+MD5 f02e63da753d8b83de7f47d3de976e95 files/tcpdump-3.8.3-bgp-infinite-loop2.patch 556
+MD5 373e9bba235a67d1de8eb1356151f32c files/tcpdump-3.8.3-gcc4.patch 3162
+MD5 4d0df7aa1535098ccef25ba7e86e5e95 files/tcpdump-3.8.3-gentoo.patch 4002
diff --git a/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch b/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch
index 0414171222ee..5f20a5a45595 100644
--- a/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch
+++ b/net-analyzer/tcpdump/files/tcpdump-3.8.3-gcc4.patch
@@ -1,3 +1,42 @@
+--- tcpdump-3.8.3/configure.gcc34	2004-03-23 19:59:23.000000000 +0100
++++ tcpdump-3.8.3/configure	2004-03-30 14:56:21.469869618 +0200
+@@ -8917,18 +8917,10 @@
+ int
+ main ()
+ {
+-
+-int
+-return_pcap_debug(void)
+-{
+ 	extern int pcap_debug;
+ 
+ 	return pcap_debug;
+ }
+-
+-  ;
+-  return 0;
+-}
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+@@ -8976,17 +8968,9 @@
+ int
+ main ()
+ {
+-
+-	int
+-	return_yydebug(void)
+-	{
+ 		extern int yydebug;
+ 
+ 		return yydebug;
+-	}
+-
+-  ;
+-  return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
 diff --exclude='*~' --exclude='.*' -I '$Id:' -urN tcpdump-3.8.3.orig/print-fr.c tcpdump-3.8.3/print-fr.c
 --- tcpdump-3.8.3.orig/print-fr.c	2005-05-14 05:53:15.000000000 -0400
 +++ tcpdump-3.8.3/print-fr.c	2005-05-14 05:58:21.000000000 -0400
diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 127c4987f7a4..55b16fdfc6cd 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>bug-wranglers@gentoo.org</email>
-  <description>See ChangeLog</description>
-</maintainer>
-<longdescription>A pcap based tool for network protocol monitoring and data acquisition.</longdescription>
+	<herd>netmon</herd>
+	<longdescription>A pcap based tool for network protocol monitoring and data acquisition.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
index 74c404375792..6be2b4a11f9c 100644
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.8.3-r4.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/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild,v 1.1 2005/06/30 14:13:21 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r4.ebuild,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
 
-inherit flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs eutils
 
 DESCRIPTION="A Tool for network monitoring and data acquisition"
 HOMEPAGE="http://www.tcpdump.org/"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/tcpdump/${P}.tar.gz
 
 LICENSE="BSD"
 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="ssl ipv6"
 
 DEPEND="virtual/libpcap
@@ -20,12 +20,12 @@ DEPEND="virtual/libpcap
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}-gentoo.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
-	epatch ${FILESDIR}/${P}-bgp-infinite-loop2.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-bgp-infinite-loop2.patch"
 
 	if use ssl ; then
-		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' ${S}/configure || \
+		sed -i -e 's|des\(_cbc_encrypt\)|DES\1|' "${S}"/configure || \
 			die "sed configure failed"
 	fi
 }
diff --git a/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild b/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
index ca71971e873e..9233240874c4 100644
--- a/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.9.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/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild,v 1.1 2005/09/20 03:41:24 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.9.3.ebuild,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
 
 inherit flag-o-matic toolchain-funcs eutils
 
@@ -28,6 +28,9 @@ src_unpack() {
 }
 
 src_compile() {
+	# tcpdump needs some optymalization. see bug #108391
+	( ! is-flag -O? || is-flag -O0 ) && append-flags -O
+
 	replace-flags -O[3-9] -O2
 	filter-flags -finline-functions
 
diff --git a/net-analyzer/tcpflow/ChangeLog b/net-analyzer/tcpflow/ChangeLog
index 166a8f855933..244f2d717dc3 100644
--- a/net-analyzer/tcpflow/ChangeLog
+++ b/net-analyzer/tcpflow/ChangeLog
@@ -1,8 +1,34 @@
 # ChangeLog for net-analyzer/tcpflow
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/ChangeLog,v 1.1 2002/10/29 17:51:26 blizzy Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/ChangeLog,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
+
+  04 Oct 2005; Sven Wegener <swegener@gentoo.org> tcpflow-0.20.ebuild,
+  tcpflow-0.21.ebuild:
+  libpcap is needed for DEPEND and RDEPEND
+
+  11 Aug 2005; Carlos Silva <r3pek@gentoo.org> tcpflow-0.21.ebuild:
+  marked ~amd64. closes bug #102043
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> tcpflow-0.21.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcpflow-0.20.ebuild,
+  tcpflow-0.21.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*tcpflow-0.21 (26 Jan 2005)
+
+  26 Jan 2005; Daniel Black <dragonheart@gentoo.org> +tcpflow-0.21.ebuild:
+  version bump
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  tcpflow-0.20.ebuild:
+  Tidy
 
 *tcpflow-0.20 (29 Oct 2002)
 
+  15 Feb 2003; Mark Guertin <gerk@gentoo.org> tcpflow-0.20.ebuild :
+  set ~ppc in keywords
+
   29 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : Initial import. ebuild
   submitted by Maurizio Disimino <maurizio@iridium.aetheric.org>
diff --git a/net-analyzer/tcpflow/Manifest b/net-analyzer/tcpflow/Manifest
index e69de29bb2d1..e165f73e1c54 100644
--- a/net-analyzer/tcpflow/Manifest
+++ b/net-analyzer/tcpflow/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a5964d5b37b1baddbc10af65ee565ac9 ChangeLog 1176
+MD5 218d536750e8b2aa04e1f3443bd0960c files/digest-tcpflow-0.20 63
+MD5 fe3e473a09a64af6052d7ad014862c00 files/digest-tcpflow-0.21 63
+MD5 04e17c57c255d1c4e3b222e11b4658f4 metadata.xml 261
+MD5 e01ba7ce99d701187bd0e8db85bd90b1 tcpflow-0.20.ebuild 623
+MD5 119663c90715f620f01c8c89d629c667 tcpflow-0.21.ebuild 709
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQuIwI1lqEGTUzyQRAk6iAJ9//v4/WvUhMUxFVeWJIkdiPBiY4gCfY/Zo
+ysx22QRMb1Da01o6gbOCtaM=
+=tQDQ
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcpflow/tcpflow-0.20.ebuild b/net-analyzer/tcpflow/tcpflow-0.20.ebuild
index da9df0a406e0..899ae4e82bdf 100644
--- a/net-analyzer/tcpflow/tcpflow-0.20.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-0.20.ebuild
@@ -1,24 +1,21 @@
-# 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/net-analyzer/tcpflow/tcpflow-0.20.ebuild,v 1.1 2002/10/29 17:51:26 blizzy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/tcpflow-0.20.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 DESCRIPTION="A Tool for monitoring, capturing and storing TCP connections flows"
 HOMEPAGE="http://www.circlemud.org/~jelson/software/tcpflow/"
 SRC_URI="http://www.circlemud.org/pub/jelson/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
+IUSE=""
 
-RDEPEND="net-libs/libpcap"
-
-src_compile() {
-	econf || die "configure problem"
-	emake || die "compile problem"
-}
+DEPEND="virtual/libpcap"
+RDEPEND="${DEPEND}"
 
 src_install() {
 	einstall
 	doman tcpflow.1
 	dodoc AUTHORS COPYING ChangeLog NEWS README
 }
-
diff --git a/net-analyzer/tcpflow/tcpflow-0.21.ebuild b/net-analyzer/tcpflow/tcpflow-0.21.ebuild
index e02fc194e762..4c35ea0dfd86 100644
--- a/net-analyzer/tcpflow/tcpflow-0.21.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-0.21.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/net-analyzer/tcpflow/tcpflow-0.21.ebuild,v 1.1 2005/01/26 00:44:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpflow/tcpflow-0.21.ebuild,v 1.1.1.1 2005/11/30 10:12:30 chriswhite Exp $
 
 inherit toolchain-funcs
 
@@ -9,11 +9,12 @@ HOMEPAGE="http://www.circlemud.org/~jelson/software/tcpflow/"
 SRC_URI="http://www.circlemud.org/pub/jelson/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 IUSE=""
 
-RDEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	econf || die
@@ -24,4 +25,3 @@ src_install() {
 	make DESTDIR=${D} install
 	dodoc AUTHORS ChangeLog NEWS README
 }
-
diff --git a/net-analyzer/tcpick/ChangeLog b/net-analyzer/tcpick/ChangeLog
index 2c1d75ff9c7d..76c4c4998f11 100644
--- a/net-analyzer/tcpick/ChangeLog
+++ b/net-analyzer/tcpick/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-analyzer/tcpick
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpick/ChangeLog,v 1.1 2004/01/27 20:24:23 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpick/ChangeLog,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
+
+  27 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> tcpick-0.2.1.ebuild:
+  0.2.1 x86 stable for bug 107426. Thanks to Daniel Webert <rockoo at gmail
+  dot com>.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> tcpick-0.2.1.ebuild:
+  Added to ~ppc.
+
+*tcpick-0.2.1 (09 Feb 2005)
+
+  09 Feb 2005; Sven Wegener <swegener@gentoo.org> +tcpick-0.2.1.ebuild:
+  Version bump.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcpick-0.1.19.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  02 Aug 2004; Danny van Dyk <kugelfang@gentoo.org> tcpick-0.1.19.ebuild:
+  Marked ~amd64.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  tcpick-0.1.19.ebuild:
+  marked x86 stable. added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> tcpick-0.1.19.ebuild:
+  change virtual/glibc to virtual/libc
 
 *tcpick-0.1.19 (27 Jan 2004)
 
diff --git a/net-analyzer/tcpick/Manifest b/net-analyzer/tcpick/Manifest
index 6105b189b6f9..24ff15cb9609 100644
--- a/net-analyzer/tcpick/Manifest
+++ b/net-analyzer/tcpick/Manifest
@@ -1,2 +1,6 @@
-MD5 53076545e301335eb98a239e20de7bb7 tcpick-0.1.19.ebuild 692
+MD5 c07ef1e96a2aa366e2bb21555850e105 tcpick-0.1.19.ebuild 669
+MD5 96c34fa43844ce7fccbed60da4fc67ac tcpick-0.2.1.ebuild 638
+MD5 d0789f25ce79fa0de90b42028c479adf ChangeLog 1217
+MD5 b51e6a6a8564a717433a580aa375233e metadata.xml 236
+MD5 35920f531e0f3cd3ed69cca4fc1d3a14 files/digest-tcpick-0.2.1 64
 MD5 ada844ee771c41819be3072d7a01b6b3 files/digest-tcpick-0.1.19 64
diff --git a/net-analyzer/tcpick/tcpick-0.1.19.ebuild b/net-analyzer/tcpick/tcpick-0.1.19.ebuild
index 8a4411510097..a2739914e689 100644
--- a/net-analyzer/tcpick/tcpick-0.1.19.ebuild
+++ b/net-analyzer/tcpick/tcpick-0.1.19.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/net-analyzer/tcpick/tcpick-0.1.19.ebuild,v 1.1 2004/01/27 20:24:23 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpick/tcpick-0.1.19.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 DESCRIPTION="TCP Stream Sniffer and Connection Tracker"
 HOMEPAGE="http://tcpick.sourceforge.net/"
@@ -8,11 +8,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 
 IUSE=""
-DEPEND="virtual/glibc
-	>=net-libs/libpcap-0.7.2"
+DEPEND="virtual/libc
+	virtual/libpcap"
 
 src_install() {
 	make install DESTDIR=${D} || die "install failed"
diff --git a/net-analyzer/tcpick/tcpick-0.2.1.ebuild b/net-analyzer/tcpick/tcpick-0.2.1.ebuild
index e9b5be018afb..beef9de05e32 100644
--- a/net-analyzer/tcpick/tcpick-0.2.1.ebuild
+++ b/net-analyzer/tcpick/tcpick-0.2.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpick/tcpick-0.2.1.ebuild,v 1.1 2005/02/09 10:26:08 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpick/tcpick-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:12:27 chriswhite Exp $
 
 DESCRIPTION="TCP Stream Sniffer and Connection Tracker"
 HOMEPAGE="http://tcpick.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE=""
 DEPEND="virtual/libc
diff --git a/net-analyzer/tcpreen/ChangeLog b/net-analyzer/tcpreen/ChangeLog
index 8cdc4375cc86..af4342f81a24 100644
--- a/net-analyzer/tcpreen/ChangeLog
+++ b/net-analyzer/tcpreen/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-analyzer/tcpreen
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreen/ChangeLog,v 1.1 2003/12/01 07:13:20 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreen/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  26 Jun 2005; David Holm <dholm@gentoo.org> tcpreen-1.4.3.ebuild:
+  Added to ~ppc.
+
+*tcpreen-1.4.3 (25 Jun 2005)
+
+  25 Jun 2005; Daniel Black <dragonheart@gentoo.org> +tcpreen-1.4.3.ebuild:
+  Version bump thanks to meatoo
+
+*tcpreen-1.4.2 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +tcpreen-1.4.2.ebuild:
+  Version bump.
+
+  30 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> tcpreen-1.2.4.ebuild:
+  Marked ~amd64.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> tcpreen-1.2.4.ebuild:
+  marked x86 stable
 
 *tcpreen-1.2.4 (01 Dec 2003)
 
diff --git a/net-analyzer/tcpreen/Manifest b/net-analyzer/tcpreen/Manifest
index dcd4ff672587..99a9e5a5ad57 100644
--- a/net-analyzer/tcpreen/Manifest
+++ b/net-analyzer/tcpreen/Manifest
@@ -1,3 +1,8 @@
+MD5 e2c6af89ce0c867f6e6512615f23695b ChangeLog 904
+MD5 fceb02b196b4dec73068e426c64f420d tcpreen-1.2.4.ebuild 631
+MD5 13f274588a1f7f86fe7cf36314f661e5 metadata.xml 226
+MD5 e33556be37dd19305454240351809ead tcpreen-1.4.2.ebuild 632
+MD5 3a93f27c019772f806f2cc80efe8ffca tcpreen-1.4.3.ebuild 632
 MD5 1037df49d4629d1f7f364c41b8ad40cc files/digest-tcpreen-1.2.4 66
-MD5 aa2ed84ba3313ed7605325e4637a25df tcpreen-1.2.4.ebuild 630
-MD5 7e0e459236e8983bc43d699ee8d331cf ChangeLog 388
+MD5 c9610fc6d7976f275e1eae177519ffd6 files/digest-tcpreen-1.4.2 66
+MD5 443929ba6cd7ec125b2b38dcf5598d85 files/digest-tcpreen-1.4.3 66
diff --git a/net-analyzer/tcpreen/tcpreen-1.2.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.2.4.ebuild
index 237a6a332e1e..01ea90638840 100644
--- a/net-analyzer/tcpreen/tcpreen-1.2.4.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.2.4.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/net-analyzer/tcpreen/tcpreen-1.2.4.ebuild,v 1.1 2003/12/01 07:13:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreen/tcpreen-1.2.4.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="TCP network re-engineering tool"
 HOMEPAGE="http://www.simphalempin.com/dev/tcpreen/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/tcpreen/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/net-analyzer/tcpreen/tcpreen-1.4.2.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.2.ebuild
index 99676823bce0..a0597f8bb0cc 100644
--- a/net-analyzer/tcpreen/tcpreen-1.4.2.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.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/net-analyzer/tcpreen/tcpreen-1.4.2.ebuild,v 1.1 2005/03/23 00:27:12 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreen/tcpreen-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="TCP network re-engineering tool"
 HOMEPAGE="http://www.simphalempin.com/dev/tcpreen/"
diff --git a/net-analyzer/tcpreen/tcpreen-1.4.3.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.3.ebuild
index abfb143d2415..86ff6c5f45f0 100644
--- a/net-analyzer/tcpreen/tcpreen-1.4.3.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.4.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/net-analyzer/tcpreen/tcpreen-1.4.3.ebuild,v 1.1 2005/06/25 12:08:07 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreen/tcpreen-1.4.3.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="TCP network re-engineering tool"
 HOMEPAGE="http://www.simphalempin.com/dev/tcpreen/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/tcpreen/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/net-analyzer/tcpreplay/ChangeLog b/net-analyzer/tcpreplay/ChangeLog
index 6eeb8e03fb4c..eb3b6f34b422 100644
--- a/net-analyzer/tcpreplay/ChangeLog
+++ b/net-analyzer/tcpreplay/ChangeLog
@@ -1,6 +1,58 @@
 # ChangeLog for net-analyzer/tcpreplay
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.1 2003/09/22 14:53:59 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  24 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  tcpreplay-3.0_beta1.ebuild:
+  Use make install instead of emake install.
+
+  05 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> tcpreplay-3.0_beta1.ebuild:
+  Don't install their man2html, bug 88017.
+
+*tcpreplay-3.0_beta1 (04 Apr 2005)
+
+  04 Apr 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +tcpreplay-3.0_beta1.ebuild:
+  Version bump. Thanks Marco Morales <soulse@gmail.com>. Fixes bug 87868.
+
+*tcpreplay-2.3.3-r1 (16 Mar 2005)
+
+  16 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> +tcpreplay-2.3.3-r1.ebuild:
+  Revision bump; added new optional dep on libpcapnav. Thanks to soulse in bug
+  84895.
+
+*tcpreplay-2.3.3 (07 Mar 2005)
+
+  07 Mar 2005; Daniel Black <dragonheart@gentoo.org> +tcpreplay-2.3.3.ebuild:
+  Version bump as per bug #83992. Thanks to Dave Stahl <cybertech@cybertech.org>
+
+*tcpreplay-2.3.2 (30 Jan 2005)
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcpreplay-1.4.6.ebuild,
+  tcpreplay-2.2.2.ebuild, +tcpreplay-2.3.2.ebuild:
+  Version bump and transition to virtual/libpcap
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> tcpreplay-2.2.2.ebuild:
+  marked x86 stable
+
+  09 Aug 2004; Tom Martin <slarti@gentoo.org> tcpreplay-2.2.2.ebuild:
+  Marked ~amd64, resolves bug 58732.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> metadata.xml,
+  tcpreplay-1.4.6.ebuild:
+  metadata: changed bugwranglers to netmon. 1.4.6 marked x86 stable.
+
+*tcpreplay-2.2.2 (23 Jun 2004)
+
+  23 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml,
+  tcpreplay-1.4.6.ebuild, +tcpreplay-2.2.2.ebuild:
+  Version bump. Added support for the debug USE flag. Added metadata.xml and
+  IUSE="".
+
+*tcpreplay-1.4.6 (11 Dec 2003)
+
+  11 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump #35373.
 
 *tcpreplay-1.4.5 (22 Sep 2003)
 
diff --git a/net-analyzer/tcpreplay/Manifest b/net-analyzer/tcpreplay/Manifest
index fc8af876f25e..d29b5feaf81a 100644
--- a/net-analyzer/tcpreplay/Manifest
+++ b/net-analyzer/tcpreplay/Manifest
@@ -1,3 +1,14 @@
-MD5 eeacf82d14b22e56a063e754336ee1a3 files/digest-tcpreplay-1.4.5 67
-MD5 487345edba436dd2cc749e7b3e3254a9 tcpreplay-1.4.5.ebuild 660
-MD5 4885315c4c92a52339ab11bb13f791f6 ChangeLog 395
+MD5 611a4d1a9a0e4a832fdc3234f91434a5 tcpreplay-2.3.3.ebuild 1168
+MD5 94ac072464d33db5ccc07ea57e78267e tcpreplay-2.2.2.ebuild 842
+MD5 bab9e9b493dccbe89c009e787a922585 tcpreplay-3.0_beta1.ebuild 1215
+MD5 ec7bc993123faf48a1371d6785ddb60d tcpreplay-2.3.2.ebuild 1168
+MD5 d8f75cf7a4b5758c9d7c4498256b5806 tcpreplay-2.3.3-r1.ebuild 1204
+MD5 6dfe4e8560053aca3b386985e0fffb3f ChangeLog 2135
+MD5 1cd3590be14655cd8346c467d76e8484 metadata.xml 250
+MD5 afa76b28a7e31d137461093ff1fe7e43 tcpreplay-1.4.6.ebuild 741
+MD5 8daa7ddc53cfe4ef8cd88df8f312339e files/digest-tcpreplay-2.3.3-r1 67
+MD5 0b75692f271546f9eb50aa1af1887fdf files/digest-tcpreplay-1.4.6 67
+MD5 a2e378f507f02665aa74c92df8ea254b files/digest-tcpreplay-2.2.2 67
+MD5 bc5984507a3e4ebbee2b6d68de8d6eae files/digest-tcpreplay-2.3.2 67
+MD5 8daa7ddc53cfe4ef8cd88df8f312339e files/digest-tcpreplay-2.3.3 67
+MD5 7a5a48c32b202a4c9bf697c4c0f1ee31 files/digest-tcpreplay-3.0_beta1 71
diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index d8b96be3c5cd..c61b83d26848 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>bug-wranglers@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
+<herd>netmon</herd>
+<longdescription>replay saved tcpdump or snoop files at arbitrary speeds</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild b/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild
index 0ec03676804e..07c35727798f 100644
--- a/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-1.4.6.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/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild,v 1.1 2003/12/11 23:52:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-1.4.6.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
@@ -8,10 +8,11 @@ SRC_URI="mirror://sourceforge/tcpreplay/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 DEPEND=">=net-libs/libnet-1.1.1
-	net-libs/libpcap"
+	virtual/libpcap"
 
 src_compile() {
 	econf || die
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild
index 50af72beea45..30b9f0be1ffb 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-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/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild,v 1.1 2004/06/23 00:09:03 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.2.2.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
@@ -9,11 +9,11 @@ RESTRICT="nomirror"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE="debug"
 
 DEPEND=">=net-libs/libnet-1.1.1
-	net-libs/libpcap
+	virtual/libpcap
 	net-analyzer/tcpdump"
 
 src_compile() {
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild
index bc37fe2aa271..6c7aeadd3d7f 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.3.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/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild,v 1.1 2005/01/29 20:46:02 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.2.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
@@ -24,22 +24,15 @@ src_compile() {
 }
 
 src_test() {
-	# This would work if src_test was run as root when FEATURES didn't
-	# have user priv.
-
-	#if hasq userpriv "${FEATURES}"; then
+	whoami
+	if hasq userpriv "${FEATURES}"; then
 		ewarn "Some tested disabled due to FEATURES=userpriv"
 		ewarn "For a full test as root - make -C ${S}/test"
-		if ! make -C test tcpprep; then
-			cat test/test.log
-			die "self test failed"
-		fi
-	#else
-	#	if ! make test; then
-	#		cat test/test.log
-	#		die "self test failed"
-	#	fi
-	#fi
+		make -C test tcpprep || die "self test failed - see ${S}/test/test.log"
+	else
+		make test || \
+			die "self test failed - see ${S}/test/test.log"
+	fi
 
 }
 
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild
index 2270a6965a8d..35f02a5a7652 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.3.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/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild,v 1.1 2005/03/16 12:55:44 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
diff --git a/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild b/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild
index 0c80350a9306..28027e31041b 100644
--- a/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-2.3.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/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild,v 1.1 2005/03/07 08:46:26 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-2.3.3.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 DESCRIPTION="replay saved tcpdump or snoop files at arbitrary speeds"
 HOMEPAGE="http://tcpreplay.sourceforge.net/"
diff --git a/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild b/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild
index de96f9170b12..cd8d18566280 100644
--- a/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.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/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild,v 1.1 2005/04/04 21:38:58 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpreplay/tcpreplay-3.0_beta1.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 MY_P=${PN}-${PV/_beta1/.beta1}
 S=${WORKDIR}/${MY_P}
@@ -40,6 +40,7 @@ src_test() {
 }
 
 src_install() {
-	emake DESTDIR=${D} install || die "emake install failed"
+	make DESTDIR=${D} install || die "emake install failed"
+	rm ${D}/usr/bin/man2html
 	dodoc docs/*
 }
diff --git a/net-analyzer/tcpslice/ChangeLog b/net-analyzer/tcpslice/ChangeLog
index aa1d1adce9a1..e66a4ad63276 100644
--- a/net-analyzer/tcpslice/ChangeLog
+++ b/net-analyzer/tcpslice/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-analyzer/tcpslice
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpslice/ChangeLog,v 1.1 2003/12/17 09:57:52 mboman Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpslice/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> tcpslice-1.1_alpha3.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  tcpslice-1.1_alpha3.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  13 Sep 2004; Jon Hood <squinky86@gentoo.org> tcpslice-1.1_alpha3.ebuild:
+  Compile correctly with pcap, bug #63888.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> tcpslice-1.1_alpha3.ebuild:
+  Changed to mirror://debian
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> tcpslice-1.1_alpha3.ebuild:
+  Tidy up.
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> tcpslice-1.1_alpha3.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tcpslice-1.1_alpha3.ebuild:
+  Add inherit eutils
 
 *tcpslice-1.1_alpha3 (17 Dec 2003)
 
diff --git a/net-analyzer/tcpslice/Manifest b/net-analyzer/tcpslice/Manifest
index 9f490e39f181..c30d00f62d70 100644
--- a/net-analyzer/tcpslice/Manifest
+++ b/net-analyzer/tcpslice/Manifest
@@ -1,2 +1,4 @@
-MD5 7adc3ecaaf3cbef918ad60f88af80684 tcpslice-1.1_alpha3.ebuild 695
+MD5 81c061b7902914069519db676f9779c2 ChangeLog 1092
+MD5 50f280bced8e4dcee548ea16d5e11dc3 metadata.xml 351
+MD5 7f65d11616f4fc8b614992be5c0fa26e tcpslice-1.1_alpha3.ebuild 1211
 MD5 169f554c588ee6189a800e3355f66d24 files/digest-tcpslice-1.1_alpha3 140
diff --git a/net-analyzer/tcpslice/metadata.xml b/net-analyzer/tcpslice/metadata.xml
index 2935ea6358aa..fbd8ee1e200a 100644
--- a/net-analyzer/tcpslice/metadata.xml
+++ b/net-analyzer/tcpslice/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Primary Maintainer</description>
-	</maintainer>
+<herd>netmon</herd>
 <longdescription>Tcpslice is a program for extracting portions of packet-trace files generated using tcpdump's -w flag. It can also be used to glue together pcap dump files.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcpslice/tcpslice-1.1_alpha3.ebuild b/net-analyzer/tcpslice/tcpslice-1.1_alpha3.ebuild
index f6a776f930f1..f82f51f48b7e 100644
--- a/net-analyzer/tcpslice/tcpslice-1.1_alpha3.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.1_alpha3.ebuild
@@ -1,28 +1,37 @@
-# 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/net-analyzer/tcpslice/tcpslice-1.1_alpha3.ebuild,v 1.1 2003/12/17 09:57:52 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpslice/tcpslice-1.1_alpha3.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+inherit eutils
 
 # Note: this ebuild is not of the best quality as it is entirely
-# static. However I belive that I will get away with it as the software
+# static. However I believe that I will get away with it as the software
 # itself haven't been updated since 1996.
 
 DESCRIPTION="Tcpslice is a program for extracting portions of packet-trace files generated using tcpdump's -w flag. It can also be used to glue together pcap dump files."
 HOMEPAGE="http://www.tcpdump.org/"
-SRC_URI="ftp://ftp.debian.org/debian/pool/main/t/tcpslice/tcpslice_1.1a3.orig.tar.gz
-	ftp://ftp.debian.org/debian/pool/main/t/tcpslice/tcpslice_1.1a3-1.1.diff.gz"
+SRC_URI="mirror://debian/pool/main/t/tcpslice/tcpslice_1.1a3.orig.tar.gz
+	mirror://debian/pool/main/t/tcpslice/tcpslice_1.1a3-1.1.diff.gz"
+RESTRICT="nomirror"
+
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
-DEPEND="virtual/glibc
-	>=net-libs/libpcap-0.6.2-r1"
 
-RDEPEND="${DEPEND}"
+RDEPEND="virtual/libc
+	virtual/libpcap"
+
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
 S=${WORKDIR}/tcpslice-1.1a3
 
 src_unpack() {
 	unpack ${A}
 	epatch ${DISTDIR}/tcpslice_1.1a3-1.1.diff.gz
+	cd ${S}
+	sed -i -e 's:net/bpf.h:pcap-bpf.h:g' tcpslice.c || die
 }
 
 src_compile() {
diff --git a/net-analyzer/tcpstat/ChangeLog b/net-analyzer/tcpstat/ChangeLog
index 429d5f6c11d8..bb732ba74f50 100644
--- a/net-analyzer/tcpstat/ChangeLog
+++ b/net-analyzer/tcpstat/ChangeLog
@@ -1,6 +1,46 @@
 # ChangeLog for net-analyzer/tcpstat
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpstat/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpstat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> tcpstat-1.5.ebuild:
+  Added to ~ppc.
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -tcpstat-1.4.ebuild:
+  Remove old ebuild.
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> tcpstat-1.5.ebuild:
+  Stable on sparc
+
+  31 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcpstat-1.4.ebuild,
+  tcpstat-1.5.ebuild:
+  virtual/libpcap transition
+
+  25 Sep 2004; Tom Gall <tgall@gentoo.org> tcpstat-1.5.ebuild:
+  added ~ppc64, bug #64104
+
+  29 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> tcpstat-1.5.ebuild:
+  Marked ~amd64.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> tcpstat-1.4.ebuild,
+  tcpstat-1.5.ebuild:
+  marked x86 stable
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> tcpstat-1.4.ebuild:
+  Tidy up.
+
+*tcpstat-1.5 (14 May 2004)
+
+  14 May 2004; Jon Hood <squinky86@gentoo.org> +tcpstat-1.5.ebuild:
+  version bump, closes #51029
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*tcpstat-1.4 (27 Apr 2002)
+
+  27 Apr 2002; Seemant Kulleen <seemant@gentoo.org> tcpstat-1.4.ebuild
+  files/digest-tcpstat-1.4 :
+
+  Version bump.
 
 *tcpstat-1.3 (1 Feb 2002)
 
diff --git a/net-analyzer/tcpstat/Manifest b/net-analyzer/tcpstat/Manifest
index e69de29bb2d1..ad921f72eeaf 100644
--- a/net-analyzer/tcpstat/Manifest
+++ b/net-analyzer/tcpstat/Manifest
@@ -0,0 +1,4 @@
+MD5 948426f4445abe02abdfec34506afff9 ChangeLog 1788
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 6fc3fe15a93f8239c79dc402553a3ab8 tcpstat-1.5.ebuild 665
+MD5 efa37f1790c5016076a051b32e57b980 files/digest-tcpstat-1.5 62
diff --git a/net-analyzer/tcpstat/tcpstat-1.5.ebuild b/net-analyzer/tcpstat/tcpstat-1.5.ebuild
index deaadf770704..52c796d0e1c5 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5.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/net-analyzer/tcpstat/tcpstat-1.5.ebuild,v 1.1 2004/05/14 17:33:11 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpstat/tcpstat-1.5.ebuild,v 1.1.1.1 2005/11/30 10:12:41 chriswhite Exp $
 
 IUSE="berkdb"
 
@@ -8,12 +8,12 @@ DESCRIPTION="Reports network interface statistics"
 SRC_URI="http://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
 HOMEPAGE="http://www.frenchfries.net/paul/tcpstat/"
 
-DEPEND=">=net-libs/libpcap-0.5.2
+DEPEND="virtual/libpcap
 	berkdb? ( <sys-libs/db-2 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~ppc64 sparc x86"
 
 src_install () {
 
diff --git a/net-analyzer/tcptrace/ChangeLog b/net-analyzer/tcptrace/ChangeLog
index 2b4d78a08686..8d1d3e33d38a 100644
--- a/net-analyzer/tcptrace/ChangeLog
+++ b/net-analyzer/tcptrace/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for net-analyzer/tcptrace
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/ChangeLog,v 1.1 2003/05/04 19:40:45 aliz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/ChangeLog,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> tcptrace-6.6.1-r1.ebuild:
+  Stable on ppc64
+
+*tcptrace-6.6.7 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> tcptrace-6.6.1-r1.ebuild,
+  tcptrace-6.6.1.ebuild, +tcptrace-6.6.7.ebuild:
+  Version bump, remove unnecessary src_compile.
+
+  31 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcptrace-6.6.1-r1.ebuild,
+  tcptrace-6.6.1.ebuild:
+  virtual/libpcap transition
+
+  15 Sep 2004; Jon Hood <squinky86@gentoo.org> tcptrace-6.6.1-r1.ebuild:
+  Stable on x86.
+
+  28 Aug 2004; Tom Gall <tgall@gentoo.org> tcptrace-6.6.1-r1.ebuild,
+  tcptrace-6.6.1.ebuild:
+  stable on ppc64, and ~ppc64 (for -r1) bug #60143
+
+*tcptrace-6.6.1-r1 (15 Aug 2004)
+
+  15 Aug 2004; Eldad Zack <eldad@gentoo.org> +tcptrace-6.6.1-r1.ebuild:
+  Added xpl2gpl and info about xplot and conversion to gnuplot. Bug #60261.
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> tcptrace-6.6.1.ebuild:
+  stable on x86
+
+  31 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> tcptrace-6.6.1.ebuild:
+  Marked ~amd64.
+
+*tcptrace-6.6.1 (18 Jun 2004)
+
+  18 Jun 2004; Jon Hood <squinky86@gentoo.org> +tcptrace-6.6.1.ebuild:
+  version bump, closes #50198; thanks to Alberto Bertogli
+  <albertogli@telpin.com.ar> and Eldad Zack <eldad@stoneshaft.ath.cx>
+
+  29 Apr 2004; David Holm <dholm@gentoo.org> tcptrace-6.4.0.ebuild:
+  Added to ~ppc.
+
+  17 Mar 2004; Michael Boman <mboman@gentoo.org> metadata.xml,
+  tcptrace-6.4.0.ebuild:
+  Corrected SRC_URI. Closes #44901.
 
 *tcptrace-6.4.0 (04 May 2003)
 
diff --git a/net-analyzer/tcptrace/Manifest b/net-analyzer/tcptrace/Manifest
index 5be36067a9ef..80bb410ff758 100644
--- a/net-analyzer/tcptrace/Manifest
+++ b/net-analyzer/tcptrace/Manifest
@@ -1,3 +1,18 @@
-MD5 ee9ce5dfed9eb1fd5f27e493015f24a1 tcptrace-6.4.0.ebuild 659
-MD5 958cfc1a0c7a707b9f06c4a8224cdde4 ChangeLog 393
-MD5 a503b17aecb71530eae5a1df92370dea files/digest-tcptrace-6.4.0 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e3d9692987ca45c06a6499b9d9e0e639 ChangeLog 1863
+MD5 53131797321a63c406299ae4bf29455c files/digest-tcptrace-6.6.1 67
+MD5 53131797321a63c406299ae4bf29455c files/digest-tcptrace-6.6.1-r1 67
+MD5 07f92c57d824515e2d27a58b98991db1 files/digest-tcptrace-6.6.7 67
+MD5 1ca5a522a1c690bd58b9667fb3f3ebac metadata.xml 236
+MD5 beeca9676db9473d0178387c770a945e tcptrace-6.6.1-r1.ebuild 996
+MD5 8bd2252b42bcbfde68bac2d6d9ec1ff8 tcptrace-6.6.1.ebuild 733
+MD5 433c6d99601aa3f00cd93d17a1e37daa tcptrace-6.6.7.ebuild 988
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC0BoUI1lqEGTUzyQRAhGpAJ4z9IZyddzzJJB5XTeFpy5gUSKgBwCg2C7F
+nTBhSKj67DxQsgTMEaz8FIg=
+=vAXp
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcptrace/metadata.xml b/net-analyzer/tcptrace/metadata.xml
index 08819a22c2fa..d98f14a37840 100644
--- a/net-analyzer/tcptrace/metadata.xml
+++ b/net-analyzer/tcptrace/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>netmon</herd>
-	<maintainer>
-		<email>mboman@gentoo.org</email>
-		<description>Interim Maintainer</description>
-	</maintainer>
-	<longdescription>tcptrace is a tool written by  Shawn Ostermann at Ohio University, for analysis of TCP dump files. It can take as input the files produced by several popular packet-capture programs, including tcpdump, snoop, etherpeek, HP Net Metrix, and WinDump. tcptrace  can produce several different types of output containing information on each connection seen, such as elapsed time, bytes and segments sent and recieved, retransmissions, round trip times, window advertisements, throughput, and more. It can also produce a number of graphs for further analysis.</longdescription>
+<herd>netmon</herd>
+<longdescription>A Tool for analyzing network packet dumps</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.1-r1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.1-r1.ebuild
index 67530f0f9929..6f19b76a6f60 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.1-r1.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.1-r1.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/net-analyzer/tcptrace/tcptrace-6.6.1-r1.ebuild,v 1.1 2004/08/15 09:03:02 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/tcptrace-6.6.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+inherit gnuconfig
 
 IUSE=""
 
@@ -11,13 +13,14 @@ SRC_URI="http://www.tcptrace.org/download/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64 ppc64"
 
-DEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
 }
 
 src_install() {
@@ -29,10 +32,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Note: tcptrace outputs its graphs in the xpl (xplot)"
 	einfo "format. since xplot is unavailable, you will have to"
 	einfo "use the included xpl2gpl utility to convert it to"
 	einfo "the gnuplot format."
-	einfo ""
+	einfo
 }
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.1.ebuild
index 8eba5503ce83..eebb53720670 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.1.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.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/net-analyzer/tcptrace/tcptrace-6.6.1.ebuild,v 1.1 2004/06/19 04:28:15 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/tcptrace-6.6.1.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
+
+inherit gnuconfig
 
 IUSE=""
 
@@ -11,13 +13,14 @@ SRC_URI="http://www.tcptrace.org/download/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64 ppc64"
 
-DEPEND="net-libs/libpcap"
+DEPEND="virtual/libpcap"
 
-src_compile() {
-	econf || die
-	emake || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	gnuconfig_update
 }
 
 src_install() {
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7.ebuild
index 10c9255b5430..fc94cd364274 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.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/net-analyzer/tcptrace/tcptrace-6.6.7.ebuild,v 1.1 2005/03/23 00:48:25 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrace/tcptrace-6.6.7.ebuild,v 1.1.1.1 2005/11/30 10:12:40 chriswhite Exp $
 
 inherit gnuconfig
 
@@ -31,10 +31,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo ""
+	einfo
 	einfo "Note: tcptrace outputs its graphs in the xpl (xplot)"
 	einfo "format. Since xplot is unavailable, you will have to"
 	einfo "use the included xpl2gpl utility to convert it to"
 	einfo "the gnuplot format."
-	einfo ""
+	einfo
 }
diff --git a/net-analyzer/tcptraceroute/ChangeLog b/net-analyzer/tcptraceroute/ChangeLog
index 7f01ba93dfb9..0fc1be8cf416 100644
--- a/net-analyzer/tcptraceroute/ChangeLog
+++ b/net-analyzer/tcptraceroute/ChangeLog
@@ -1,22 +1,106 @@
 # ChangeLog for net-analyzer/tcptraceroute
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/ChangeLog,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
-  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-  moved to net-analyzer - added SLOT - added LICENSE
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org>
+  tcptraceroute-1.5_beta6.ebuild:
+  Stable on ppc64
 
-*tcptraceroute-1.2 (27 Mar 2002)
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org>
+  tcptraceroute-1.5_beta6.ebuild:
+  added ~ppc64
 
-  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> tcptraceroute-1.2.ebuild :
+  22 May 2005; Tobias Scherbaum <dertobi123@gentoo.org>
+  tcptraceroute-1.5_beta6.ebuild:
+  Stable on ppc.
 
-  Ungzipped HTML documentation.
+  12 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  tcptraceroute-1.5_beta6.ebuild:
+  Stable on amd64.
+
+  02 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  tcptraceroute-1.5_beta6.ebuild:
+  Stable on sparc
+
+  02 May 2005; Eldad Zack <eldad@gentoo.org> tcptraceroute-1.5_beta6.ebuild:
+  x86 stable
+
+  13 Apr 2005; Tom Gall <tgall@gentoo.org>
+  tcptraceroute-1.5_beta5.ebuild, +ppc64-1.5.patch:
+  add ppc64 support
+
+*tcptraceroute-1.5_beta6 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +tcptraceroute-1.5_beta6.ebuild:
+  Version bump.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  tcptraceroute-1.4-r3.ebuild, tcptraceroute-1.5_beta5.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Nov 2004; Eldad Zack <eldad@gentoo.org> tcptraceroute-1.4-r3.ebuild,
+  tcptraceroute-1.5_beta5.ebuild:
+  Fix to use bind-now for suid binaries.
+
+  30 Sep 2004; Travis Tilley <lv@gentoo.org> tcptraceroute-1.5_beta5.ebuild:
+  stable on amd64
+
+  19 Aug 2004; Jason Wever <weeve@gentoo.org> tcptraceroute-1.5_beta5.ebuild:
+  Stable on sparc.
+
+  16 Aug 2004; Eldad Zack <eldad@gentoo.org> tcptraceroute-1.5_beta5.ebuild:
+  x86 stable
+
+  31 Jul 2004; <malc@gentoo.org> tcptraceroute-1.5_beta5.ebuild:
+  ~amd64 - closes bug #57705
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> tcptraceroute-1.4-r3.ebuild,
+  tcptraceroute-1.5_beta5.ebuild:
+  added missing IUSE
+
+*tcptraceroute-1.5_beta5 (08 Jun 2004)
+
+  08 Jun 2004; Jon Hood <squinky86@gentoo.org>
+  +tcptraceroute-1.5_beta5.ebuild:
+  version bump, thanks to Eldad Zack <eldad@stoneshaft.ath.cx> for the ebuild in
+  #51862
+
+*tcptraceroute-1.4-r3 (29 Nov 2003)
+
+  29 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  Remove setuid on tcptraceroute #34477.
+
+*tcptraceroute-1.4-r2 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
+
+*tcptraceroute-1.4-r1 (25 Jun 2003)
+
+  25 Jun 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Security update. Moving from sbin to bin and making tcptraceroute setuid so that everyone can use it.
+
+*tcptraceroute-1.4 (18 Aug 2002)
+
+  28 Apr 2003; Zach Welch <zwelch@gentoo.org> tcptraceroute-1.4.ebuild:
+  add arm keyword
+
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> tcptraceroute-1.4.ebuild :
+  Fixed Depend to libnet-1.0*. Closes #17017.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  18 Aug 2002; Bruce A. Locke <blocke@shivan.org> tcptraceroute-1.4.ebuild:
+  Version Bump.
 
 *tcptraceroute-1.2 (1 Feb 2002)
 
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+  06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
+  Added ppc to keywords
+
+  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
+  moved to net-analyzer - added SLOT - added LICENSE
+
+  27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> tcptraceroute-1.2.ebuild :
+  Ungzipped HTML documentation.
diff --git a/net-analyzer/tcptraceroute/Manifest b/net-analyzer/tcptraceroute/Manifest
index 9b8643b7239b..3e91dae84644 100644
--- a/net-analyzer/tcptraceroute/Manifest
+++ b/net-analyzer/tcptraceroute/Manifest
@@ -1,3 +1,21 @@
-MD5 32ed8594fd0e40b8c207a170aba073db ChangeLog 985
-MD5 2d527f37781f6635d271d7eaa645866f tcptraceroute-1.4.ebuild 788
-MD5 c269183b39d0a5ece16f5f4b41cd8f62 files/digest-tcptraceroute-1.4 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67aa1dedec566f44b68f324f7f127396 tcptraceroute-1.5_beta6.ebuild 924
+MD5 b34e582c48c20f697720f0a18ff00feb tcptraceroute-1.4-r3.ebuild 1010
+MD5 58b046e7e2f751e3030e4e9af64aa034 tcptraceroute-1.5_beta5.ebuild 1012
+MD5 4dfeee160f5f30f7c45c9e89798d00c5 ChangeLog 3356
+MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
+MD5 2868a09f7c4911e6274c13519349cd51 files/tcptraceroute-1.4-gentoo.patch 1116
+MD5 08795adf41e7d24d33a369f072f3c0c3 files/digest-tcptraceroute-1.5_beta5 74
+MD5 291e5266f1fd92f4a0de340bb25d85bb files/digest-tcptraceroute-1.5_beta6 74
+MD5 c269183b39d0a5ece16f5f4b41cd8f62 files/digest-tcptraceroute-1.4-r3 68
+MD5 e2e5f7d3c6b35572d8e83f49c56e950e files/1.4-libnet-1.0.patch 730
+MD5 8446426408ca6cc65c8fec8fca05e178 files/ppc64-1.5.patch 1956
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDIM0aV3J2n04EauwRAm4AAJ0f04vjXCxbzkQ7nocRRnR71k1fRQCg3ks8
+h5YUn+FPJSzGv64KiIwffnI=
+=Uhr5
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
index 6ac2b305ab47..8c91bb0a8e43 100644
--- a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
+++ b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
@@ -16,19 +16,3 @@
 @@ -201 +201 @@
 -#include <libnet.h>
 +#include <libnet-1.0.h>
-@@ -394,4 +394,4 @@
--    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
--       [-l <packet length>] [-q <number of queries>] [-t <tos>]
--       [-m <max ttl>] [-pP] <source port>] [-s <source address>]
--       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
-+    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"\
-+"       [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"\
-+"       [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"\
-+"       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
-@@ -1185,3 +1185,3 @@
--	safe_snprintf(filter, TEXTSIZE, "
--		(tcp and src host %s and src port %d and dst host %s)
--		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
-+	safe_snprintf(filter, TEXTSIZE, \
-+"		(tcp and src host %s and src port %d and dst host %s)\n"\
-+"		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
diff --git a/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch b/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
index a665b0058225..95199c02bcd8 100644
--- a/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
+++ b/net-analyzer/tcptraceroute/files/tcptraceroute-1.4-gentoo.patch
@@ -1,5 +1,21 @@
 --- tcptraceroute-1.4.orig/tcptraceroute.c
 +++ tcptraceroute-1.4/tcptraceroute.c
+@@ -394,4 +394,4 @@
+-    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
+-       [-l <packet length>] [-q <number of queries>] [-t <tos>]
+-       [-m <max ttl>] [-pP] <source port>] [-s <source address>]
+-       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
++    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"\
++"       [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"\
++"       [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"\
++"       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
+@@ -1185,3 +1185,3 @@
+-	safe_snprintf(filter, TEXTSIZE, "
+-		(tcp and src host %s and src port %d and dst host %s)
+-		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
++	safe_snprintf(filter, TEXTSIZE, \
++"		(tcp and src host %s and src port %d and dst host %s)\n"\
++"		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
 @@ -2003,6 +2003,6 @@
 
  	defaults();
diff --git a/net-analyzer/tcptraceroute/metadata.xml b/net-analyzer/tcptraceroute/metadata.xml
index 9eb186981c76..78692635ad22 100644
--- a/net-analyzer/tcptraceroute/metadata.xml
+++ b/net-analyzer/tcptraceroute/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>
-	<maintainer>
-		<email>squinky86@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild
index 15dee08fad7d..92041c304d4c 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.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/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild,v 1.1 2003/11/29 23:32:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.4-r3.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="tcptraceroute is a traceroute implementation using TCP packets"
 HOMEPAGE="http://michael.toren.net/code/tcptraceroute/"
@@ -10,9 +10,10 @@ SRC_URI="http://michael.toren.net/code/tcptraceroute/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc arm"
+KEYWORDS="x86 ppc sparc"
+IUSE=""
 
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	<net-libs/libnet-1.1
 	>=net-libs/libnet-1.0.2a-r3"
 
@@ -24,11 +25,15 @@ src_unpack() {
 }
 
 src_compile() {
+	append-ldflags -Wl,-z,now
+
 	make CFLAGS="${CFLAGS}" || die
 }
 
 src_install() {
 	dosbin tcptraceroute
+	fperms 4710 /usr/sbin/tcptraceroute
+	fowners root:wheel /usr/sbin/tcptraceroute
 	doman tcptraceroute.8
 	dodoc examples.txt COPYING README changelog
 	dohtml -r ./
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta5.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta5.ebuild
index 685dab76b3ef..0ca4bb9564d9 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta5.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta5.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/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta5.ebuild,v 1.1 2004/06/08 16:07:26 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta5.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
+
+inherit flag-o-matic
 
 MY_P=${P/_beta/beta}
 MY_PV=${PV/_beta/beta}
@@ -12,12 +14,21 @@ SRC_URI="http://michael.toren.net/code/tcptraceroute/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc amd64 ppc64"
+IUSE=""
 
-DEPEND="net-libs/libpcap
+DEPEND="virtual/libpcap
 	net-libs/libnet"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use ppc64 && epatch ${FILESDIR}/ppc64-1.5.patch
+}
+
 src_compile() {
+	append-ldflags -Wl,-z,now
+
 	econf || die
 	emake || die
 }
@@ -27,6 +38,6 @@ src_install() {
 	fperms 4710 /usr/sbin/tcptraceroute
 	fowners root:wheel /usr/sbin/tcptraceroute
 	doman tcptraceroute.1
-	dodoc examples.txt COPYING README changelog
+	dodoc examples.txt COPYING README ChangeLog
 	dohtml -r ./
 }
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta6.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta6.ebuild
index 1b3c7db73107..8a0d25d33882 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta6.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta6.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/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta6.ebuild,v 1.1 2005/03/23 01:05:23 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta6.ebuild,v 1.1.1.1 2005/11/30 10:12:14 chriswhite Exp $
 
 inherit flag-o-matic
 
@@ -14,7 +14,7 @@ SRC_URI="http://michael.toren.net/code/tcptraceroute/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libpcap
diff --git a/net-analyzer/tcptrack/ChangeLog b/net-analyzer/tcptrack/ChangeLog
index 6ffe2ddf5964..bab37d190371 100644
--- a/net-analyzer/tcptrack/ChangeLog
+++ b/net-analyzer/tcptrack/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for net-analyzer/tcptrack
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/ChangeLog,v 1.1 2004/05/14 17:41:32 squinky86 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/ChangeLog,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -tcptrack-1.1.1.ebuild,
+  tcptrack-1.1.5.ebuild:
+  Remove old version, marked 1.1.5 x86 stable.
+
+*tcptrack-1.1.5 (22 Mar 2005)
+
+  22 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +tcptrack-1.1.5.ebuild:
+  Version bump.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> tcptrack-1.1.1.ebuild,
+  tcptrack-1.1.2.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  30 Jul 2004; Jon Hood <squinky86@gentoo.org> tcptrack-1.1.2.ebuild:
+  Stable on x86.
+
+  30 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> tcptrack-1.1.2.ebuild:
+  Marked ~amd64.
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> tcptrack-1.1.1.ebuild:
+  marked x86 stable
+
+  30 Jun 2004; David Holm <dholm@gentoo.org> tcptrack-1.1.2.ebuild:
+  Added to ~ppc.
+
+*tcptrack-1.1.2 (29 Jun 2004)
+
+  29 Jun 2004; Eldad Zack <eldad@gentoo.org> +tcptrack-1.1.2.ebuild:
+  Version bump. Closes #54023
 
 *tcptrack-1.1.1 (14 May 2004)
 
diff --git a/net-analyzer/tcptrack/Manifest b/net-analyzer/tcptrack/Manifest
index d928e763d096..44f9d4198d95 100644
--- a/net-analyzer/tcptrack/Manifest
+++ b/net-analyzer/tcptrack/Manifest
@@ -1,3 +1,6 @@
+MD5 bd653a479d242722672a267f932d1d8c tcptrack-1.1.5.ebuild 628
+MD5 156d488eb4a6dbc1d27b42c410b428bb tcptrack-1.1.2.ebuild 629
+MD5 c125b86d15545b4032a1094a21caaaf5 ChangeLog 1352
 MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
-MD5 95252076d473fb067e3353ea844df1ed tcptrack-1.1.1.ebuild 524
-MD5 e2e0333d5455a5c752c95705a99ee5bd files/digest-tcptrack-1.1.1 66
+MD5 394db036d00660835313071049108de3 files/digest-tcptrack-1.1.2 66
+MD5 47d7f3683a42c43d83384c9bb96e408a files/digest-tcptrack-1.1.5 66
diff --git a/net-analyzer/tcptrack/tcptrack-1.1.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.1.2.ebuild
index 86cc88d4a256..2802e17f4451 100644
--- a/net-analyzer/tcptrack/tcptrack-1.1.2.ebuild
+++ b/net-analyzer/tcptrack/tcptrack-1.1.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/net-analyzer/tcptrack/tcptrack-1.1.2.ebuild,v 1.1 2004/06/29 20:18:10 eldad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/tcptrack-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 IUSE=""
 
@@ -10,9 +10,9 @@ HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 
-newdepend ">=net-libs/libpcap-0.7.2
+newdepend "virtual/libpcap
 	   sys-libs/ncurses"
 
 src_install() {
diff --git a/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild b/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild
index e438c405df4a..472afe25d2f6 100644
--- a/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild
+++ b/net-analyzer/tcptrack/tcptrack-1.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/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild,v 1.1 2005/03/23 01:21:12 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptrack/tcptrack-1.1.5.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.rhythm.cx/~steve/devel/tcptrack/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 newdepend "virtual/libpcap
 	   sys-libs/ncurses"
diff --git a/net-analyzer/thcrut/ChangeLog b/net-analyzer/thcrut/ChangeLog
index a341d1be7669..98086cbc5ed3 100644
--- a/net-analyzer/thcrut/ChangeLog
+++ b/net-analyzer/thcrut/ChangeLog
@@ -1,6 +1,26 @@
-# ChangeLog for net-analyzer/thcrut-1.2.5
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/ChangeLog,v 1.1 2003/10/02 07:25:53 vapier Exp $
+# ChangeLog for net-analyzer/thcrut
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/ChangeLog,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
+
+  25 Oct 2005; <soulse@gentoo.org> thcrut-1.2.5.ebuild:
+  Bad header fixed
+
+  09 Oct 2005; <mkay@gentoo.org> thcrut-1.2.5.ebuild:
+  Removing >=net-libs/libnet-1.0.2a-r3 from DEPEND - we do not have older
+  libnet in the tree anyway. this fixes bug #108120
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> thcrut-1.2.5.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> thcrut-1.2.5.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  thcrut-1.2.5.ebuild:
+  Tidy, added missing IUSE, added metadata.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> thcrut-1.2.5.ebuild:
+  Add inherit eutils
 
 *thcrut-1.2.5 (02 Oct 2003)
 
diff --git a/net-analyzer/thcrut/Manifest b/net-analyzer/thcrut/Manifest
index f439cc415a77..6d53e74592c6 100644
--- a/net-analyzer/thcrut/Manifest
+++ b/net-analyzer/thcrut/Manifest
@@ -1,4 +1,5 @@
+MD5 3d864ee17be76e2b9ce4399487f259b4 ChangeLog 1057
+MD5 6664b0723808cc3aad5658e88d5a7ac7 metadata.xml 236
+MD5 1cae83faa9997331bb97c432af06a083 thcrut-1.2.5.ebuild 727
 MD5 7a44d04c4783a23f9ed07cc597b21a94 files/1.2.5-libnet.patch 9428
 MD5 c71ac3757388c2ad736d8f1b5134aaac files/digest-thcrut-1.2.5 64
-MD5 4dbb5a6ade73a10dd5bd2b5d361d9ade thcrut-1.2.5.ebuild 865
-MD5 dcb1caf98110f990cf14d4b9c04dea82 ChangeLog 383
diff --git a/net-analyzer/thcrut/thcrut-1.2.5.ebuild b/net-analyzer/thcrut/thcrut-1.2.5.ebuild
index 7506deb5a948..a2bbfa448416 100644
--- a/net-analyzer/thcrut/thcrut-1.2.5.ebuild
+++ b/net-analyzer/thcrut/thcrut-1.2.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc., Copyright 2003 The Hackers Choice - http://www.thc.org
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/thcrut-1.2.5.ebuild,v 1.1 2003/10/02 07:25:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thcrut/thcrut-1.2.5.ebuild,v 1.1.1.1 2005/11/30 10:12:22 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Network discovery and fingerprinting tool"
 HOMEPAGE="http://www.thc.org/thc-rut/"
@@ -8,25 +10,20 @@ SRC_URI="http://www.thc.org/thc-rut/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="amd64 ~ppc sparc x86"
+IUSE=""
 
-DEPEND="net-libs/libpcap
-	<net-libs/libnet-1.1
-	>=net-libs/libnet-1.0.2a-r3"
+DEPEND="virtual/libpcap
+	<net-libs/libnet-1.1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	rm -rf Libnet-1.0.2a
-	epatch ${FILESDIR}/${PV}-libnet.patch
-}
-
-src_compile() {
-	econf || die "./configure failed"
-	emake || die "emake failed"
+	epatch "${FILESDIR}"/${PV}-libnet.patch
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 	dodoc ChangeLog FAQ README TODO thcrutlogo.txt
 }
diff --git a/net-analyzer/thrulay/ChangeLog b/net-analyzer/thrulay/ChangeLog
index e0bd677e8379..f8267abe88be 100644
--- a/net-analyzer/thrulay/ChangeLog
+++ b/net-analyzer/thrulay/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/thrulay
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/ChangeLog,v 1.1 2005/06/04 19:28:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/ChangeLog,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org> thrulay-0.6.ebuild:
+  Stable on x86, 114 days in ~x86.
+
+  04 Jun 2005; Sven Wegener <swegener@gentoo.org> thrulay-0.6.ebuild:
+  Added cross-compile support and error checking.
 
 *thrulay-0.6 (04 Jun 2005)
 
diff --git a/net-analyzer/thrulay/Manifest b/net-analyzer/thrulay/Manifest
index 5021b0be6272..44ee6a2022c3 100644
--- a/net-analyzer/thrulay/Manifest
+++ b/net-analyzer/thrulay/Manifest
@@ -1,3 +1,6 @@
-MD5 ae49546683e01ddc61e38a6aaeac9492 thrulay-0.6.ebuild 497
+MD5 bf68fd2b6d35df44d3fbf5c88f0ea6f5 thrulay-0.6.ebuild 873
+MD5 3b6ffdcf2b2a98176bf8587dedd92631 ChangeLog 676
 MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 22c6b7ad0b49aeb367c0160abcb9d894 files/thrulayd-init.d 674
 MD5 0df0073ca802c6d7e563f1d6976c1b76 files/digest-thrulay-0.6 62
+MD5 e4de7b3550ee143566a9226eac80b630 files/thrulayd-conf.d 366
diff --git a/net-analyzer/thrulay/files/thrulayd-conf.d b/net-analyzer/thrulay/files/thrulayd-conf.d
index 1f99144b03ed..bc0d06401a97 100644
--- a/net-analyzer/thrulay/files/thrulayd-conf.d
+++ b/net-analyzer/thrulay/files/thrulayd-conf.d
@@ -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/net-analyzer/thrulay/files/thrulayd-conf.d,v 1.1 2005/06/04 19:28:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/files/thrulayd-conf.d,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 # The default window size is 4194304 bytes
 #THRULAYD_WINDOW="4194304"
diff --git a/net-analyzer/thrulay/files/thrulayd-init.d b/net-analyzer/thrulay/files/thrulayd-init.d
index 41beff7dbadb..ed4eec309088 100644
--- a/net-analyzer/thrulay/files/thrulayd-init.d
+++ b/net-analyzer/thrulay/files/thrulayd-init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/files/thrulayd-init.d,v 1.1 2005/06/04 19:28:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/files/thrulayd-init.d,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
 
 depend() {
 	use net
diff --git a/net-analyzer/thrulay/thrulay-0.6.ebuild b/net-analyzer/thrulay/thrulay-0.6.ebuild
index 71e8541cf995..c1e0b9e610e2 100644
--- a/net-analyzer/thrulay/thrulay-0.6.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.6.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/thrulay-0.6.ebuild,v 1.1 2005/06/04 19:28:50 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thrulay/thrulay-0.6.ebuild,v 1.1.1.1 2005/11/30 10:12:15 chriswhite Exp $
+
+inherit toolchain-funcs
 
 DESCRIPTION="Measure the capacity of a network by sending a bulk TCP stream over it."
 HOMEPAGE="http://www.internet2.edu/~shalunov/thrulay/"
 SRC_URI="${HOMEPAGE}${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=""
-#RDEPEND=""
 
 src_compile() {
-	emake OPT="${CFLAGS}"
+	emake CC="$(tc-getCC)" OPT="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {
-	dobin thrulay 
-	dosbin thrulayd
-	dodoc LICENSE README TODO thrulay-protocol.txt
-	newinitd ${FILESDIR}/thrulayd-init.d thrulayd
-	newconfd ${FILESDIR}/thrulayd-conf.d thrulayd
+	dobin thrulay || die "dobin failed"
+	dosbin thrulayd || die "dosbin failed"
+	dodoc LICENSE README TODO thrulay-protocol.txt || die "dodoc failed"
+	newinitd "${FILESDIR}"/thrulayd-init.d thrulayd || die "newinitd failed"
+	newconfd "${FILESDIR}"/thrulayd-conf.d thrulayd || die "newconfd failed"
 }
diff --git a/net-analyzer/tleds/ChangeLog b/net-analyzer/tleds/ChangeLog
index 0dc8ffc7acb0..0d767c1bfb5e 100644
--- a/net-analyzer/tleds/ChangeLog
+++ b/net-analyzer/tleds/ChangeLog
@@ -1,11 +1,58 @@
 # ChangeLog for net-analyzer/tleds
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/ChangeLog,v 1.1 2002/07/01 10:57:15 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/ChangeLog,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> tleds-1.04-r1.ebuild,
+  tleds-1.05_beta11.ebuild:
+  Added to ~ppc.
+
+  17 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> tleds-1.04-r1.ebuild,
+  tleds-1.05_beta11.ebuild:
+  updated HOMEPAGE.
+
+  17 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> tleds-1.05_beta11.ebuild:
+  added ~amd64 to KEYWORDS. fixes bug #75031. thanks to Eric Ball
+  <me@ericball.id.au>.
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> tleds-1.04-r1.ebuild,
+  tleds-1.05_beta11.ebuild:
+  Fix use invocation
+
+  22 Jan 2004; Michael Sterrett <mr_bones_@gentoo.org> tleds-1.04-r1.ebuild,
+  tleds-1.05_beta11.ebuild:
+  fix HOMEPAGE (bug 39086); tidy
+
+*tleds-1.05_beta11 (2 Jul 2002)
+
+  08 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Add init.d script #37423.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+  14 Oct 2002; Mike Frysinger <vapier@gentoo.org> :
+  Fix for #9104 ... ebuild was not properly respecting '-X' ...
+
+  02 Jul 2002; Seemant Kulleen <seemant@gentoo.org> tleds-1.05_beta11.ebuild
+  files/digest-tleds-1.05_beta11.ebuild files/tleds-1.05_beta11-gentoo.patch :
+  Version bump. Ebuild and patch submitted by Rachel Holmes
+
+*tleds-1.04-r2 (2 Jul 2002)
+
+  02 Jul 2002; Seemant Kulleen <seemant@gentoo.org> tleds-1.04-r1.ebuild
+  files/digest-tleds-1.04-r1 :
+  Corrections submitted by Rachel Holmes.
+
+*tleds-1.04-r1 (13 Feb 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
 
 *tleds-1.04 (1 Jul 2002)
   
   01 Jul 2002; Seemant Kulleen <seemant@gentoo.org> tleds-1.04.ebuild
   files/tleds-1.04-FuRy.patch files/digest-tleds-1.04 ChangeLog :
-
   New package, with a patch for recent kernels generously donated by Rachel
   Holmes.
diff --git a/net-analyzer/tleds/Manifest b/net-analyzer/tleds/Manifest
index e69de29bb2d1..a1b445fcc0f5 100644
--- a/net-analyzer/tleds/Manifest
+++ b/net-analyzer/tleds/Manifest
@@ -0,0 +1,9 @@
+MD5 5d8c7f478171e7b92c7cf34c07fdaf78 ChangeLog 2022
+MD5 a2b17b7cb9625f1d23af4e862d8c4d25 tleds-1.04-r1.ebuild 879
+MD5 995e59f54e3499df77a3c2c4a0e31096 tleds-1.05_beta11.ebuild 1159
+MD5 1c666943e2fd156b434ed7ca34a8691e metadata.xml 294
+MD5 04fa7127edb78543ecc90237a824883a files/digest-tleds-1.04-r1 127
+MD5 e9bf6ffef211a35d6b024bcd355e2cc3 files/digest-tleds-1.05_beta11 133
+MD5 1177e4e6d4091cef0df1228a62bdb21b files/tleds-1.05_beta11-gentoo.patch 920
+MD5 0b6ad0ff74307a277e6338d2978b661e files/tleds.conf.d 259
+MD5 f46a1c71c42561200bc03d4c622a341e files/tleds.init.d 454
diff --git a/net-analyzer/tleds/files/tleds.conf.d b/net-analyzer/tleds/files/tleds.conf.d
index 8f2b1c3a70f1..7fcd8894d822 100644
--- a/net-analyzer/tleds/files/tleds.conf.d
+++ b/net-analyzer/tleds/files/tleds.conf.d
@@ -1,6 +1,6 @@
-# Copyright 2003 Gentoo Technologies, Inc. 
+# Copyright 2003-2004 Gentoo Foundation 
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/files/tleds.conf.d,v 1.1 2004/01/08 05:29:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/files/tleds.conf.d,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 IFACE="eth0"
 DELAY=50
diff --git a/net-analyzer/tleds/files/tleds.init.d b/net-analyzer/tleds/files/tleds.init.d
index 686557ab4954..a24cc020fad5 100644
--- a/net-analyzer/tleds/files/tleds.init.d
+++ b/net-analyzer/tleds/files/tleds.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-analyzer/tleds/files/tleds.init.d,v 1.1 2004/01/08 05:29:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/files/tleds.init.d,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
 
 
 depend() {
diff --git a/net-analyzer/tleds/tleds-1.04-r1.ebuild b/net-analyzer/tleds/tleds-1.04-r1.ebuild
index e36aef7763ee..470a762e6391 100644
--- a/net-analyzer/tleds/tleds-1.04-r1.ebuild
+++ b/net-analyzer/tleds/tleds-1.04-r1.ebuild
@@ -1,20 +1,20 @@
-# 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/net-analyzer/tleds/tleds-1.04-r1.ebuild,v 1.1 2002/07/02 09:51:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/tleds-1.04-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+IUSE="X"
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Blinks keyboard LEDs (Light Emitting Diode) indicating outgoing
 and incoming network packets on selected network interface."
-
-HOMEPAGE="http://www.hut.fi/~jlohikos/tleds/"
+HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
 SRC_URI="http://www.hut.fi/~jlohikos/tleds/public/${P}.tgz
 	http://www.ibiblio.org/pub/Linux/distributions/gentoo/distfiles/${P}-FuRy.patch.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="~ppc sparc x86"
 
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )"
+DEPEND="X? ( virtual/x11 )"
 
 
 src_unpack() {
@@ -28,7 +28,7 @@ src_compile() {
 }
 
 src_install () {
-	
+
 	dobin tleds
 
 	use X && dobin xtleds
diff --git a/net-analyzer/tleds/tleds-1.05_beta11.ebuild b/net-analyzer/tleds/tleds-1.05_beta11.ebuild
index 987c359e393e..521578f964c3 100644
--- a/net-analyzer/tleds/tleds-1.05_beta11.ebuild
+++ b/net-analyzer/tleds/tleds-1.05_beta11.ebuild
@@ -1,41 +1,47 @@
-# 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/net-analyzer/tleds/tleds-1.05_beta11.ebuild,v 1.1 2002/07/02 09:51:21 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tleds/tleds-1.05_beta11.ebuild,v 1.1.1.1 2005/11/30 10:12:29 chriswhite Exp $
+
+inherit eutils
 
 MY_P=${P/_/}
 S=${WORKDIR}/${MY_P/eta11/}
-DESCRIPTION="Blinks keyboard LEDs (Light Emitting Diode) indicating outgoing
-and incoming network packets on selected network interface."
-
-HOMEPAGE="http://www.hut.fi/~jlohikos/tleds/"
+DESCRIPTION="Blinks keyboard LEDs indicating outgoing and incoming network packets on selected network interface"
+HOMEPAGE="http://www.hut.fi/~jlohikos/tleds_orig.html"
 SRC_URI="http://www.hut.fi/~jlohikos/tleds/public/${MY_P/11/10}.tgz
 	http://www.hut.fi/~jlohikos/tleds/public/${MY_P}.patch.bz2"
-	 
-SLOT="0"
-LICENSE="GPL-2"
 
-DEPEND="virtual/glibc
-	X? ( virtual/x11 )"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc sparc x86"
+IUSE="X"
 
+DEPEND="X? ( virtual/x11 )"
 
 src_unpack() {
 	unpack tleds-1.05beta10.tgz
 	cd ${S}
-	bzcat ${DISTDIR}/${MY_P}.patch.bz2 | patch  || die
-	patch < ${FILESDIR}/${P}-gentoo.patch || die
+	epatch ${DISTDIR}/${MY_P}.patch.bz2
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
-
-	emake all || die
+	if use X ; then
+		emake all || die "make failed :("
+	else
+		emake tleds || die "make tleds failed :("
+	fi
 }
 
-src_install () {
-	
-	dobin tleds
-
-	use X && dobin xtleds
+src_install() {
+	dosbin tleds
+	use X && dosbin xtleds
 
 	doman tleds.1
 	dodoc README COPYING Changes
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/tleds.init.d tleds
+	insinto /etc/conf.d
+	newins ${FILESDIR}/tleds.conf.d tleds
 }
diff --git a/net-analyzer/tptest/ChangeLog b/net-analyzer/tptest/ChangeLog
index bb28e221c588..7c372e250d57 100644
--- a/net-analyzer/tptest/ChangeLog
+++ b/net-analyzer/tptest/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-analyzer/tptest
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/ChangeLog,v 1.1 2003/07/02 08:21:05 aliz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/ChangeLog,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> tptest-3.1.2.ebuild:
+  Added to ~ppc.
+
+  21 Mar 2004; Jason Wever <weeve@gentoo.org> tptest-3.1.2.ebuild:
+  Added ~sparc keyword.
+
+*tptest-3.1.2 (17 Nov 2003)
+
+  17 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> tptest-3.1.2.ebuild :
+  Version bump.
 
 *tptest-3.1.0 (02 Jul 2003)
 
diff --git a/net-analyzer/tptest/Manifest b/net-analyzer/tptest/Manifest
index 07ca7f523dae..9eadcd456a7a 100644
--- a/net-analyzer/tptest/Manifest
+++ b/net-analyzer/tptest/Manifest
@@ -1,2 +1,6 @@
-MD5 65c7cb6200467141d6a50dd06e367580 tptest-3.1.0.ebuild 405
+MD5 65766bb33c26fbaad6104bb733edc66d ChangeLog 619
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 9e16ab8d172850606cf735d515a128b6 tptest-3.1.0.ebuild 774
+MD5 b3262d291111487619c55d9843e4470e tptest-3.1.2.ebuild 1002
 MD5 f268c8a87c38b2b211c6d304a4319535 files/digest-tptest-3.1.0 63
+MD5 8675b4967e182af2a1f99f9acc7ac895 files/digest-tptest-3.1.2 63
diff --git a/net-analyzer/tptest/tptest-3.1.0.ebuild b/net-analyzer/tptest/tptest-3.1.0.ebuild
index 8bd9d7f1904e..f34dc48776d0 100644
--- a/net-analyzer/tptest/tptest-3.1.0.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.0.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/net-analyzer/tptest/tptest-3.1.0.ebuild,v 1.1 2003/07/02 08:21:05 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/tptest-3.1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 MY_P=${PN}${PV}
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://tptest.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tptest/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=">=sys-apps/sed-4"
 #RDEPEND=""
diff --git a/net-analyzer/tptest/tptest-3.1.2.ebuild b/net-analyzer/tptest/tptest-3.1.2.ebuild
index 80af26eb469e..df0b06b058e9 100644
--- a/net-analyzer/tptest/tptest-3.1.2.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.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/net-analyzer/tptest/tptest-3.1.2.ebuild,v 1.1 2003/11/26 10:52:29 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tptest/tptest-3.1.2.ebuild,v 1.1.1.1 2005/11/30 10:12:07 chriswhite Exp $
 
 MY_P=${PN}${PV}
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://tptest.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tptest/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 DEPEND=">=sys-apps/sed-4"
 #RDEPEND=""
diff --git a/net-analyzer/traceproto/ChangeLog b/net-analyzer/traceproto/ChangeLog
index bab1bf3654bc..bf6b42fe8273 100644
--- a/net-analyzer/traceproto/ChangeLog
+++ b/net-analyzer/traceproto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/traceproto
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceproto/ChangeLog,v 1.1 2005/01/31 10:39:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceproto/ChangeLog,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
+
+  16 Aug 2005; Simon Stelling <blubb@gentoo.org> ChangeLog:
+  added ~amd64 keyword
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> traceproto-1.1.1.ebuild:
+  Added to ~ppc.
 
 *traceproto-1.1.1 (31 Jan 2005)
 
diff --git a/net-analyzer/traceproto/Manifest b/net-analyzer/traceproto/Manifest
index f651798db604..bcd4c2027d85 100644
--- a/net-analyzer/traceproto/Manifest
+++ b/net-analyzer/traceproto/Manifest
@@ -1,5 +1,5 @@
-MD5 52b7144ddb45973f156331a99b475fbf traceproto-1.1.1.ebuild 835
-MD5 63987834f417b83fa7a3279d93f6c1b4 ChangeLog 325
+MD5 640380bbe0c13e53eede83b9d41af78e ChangeLog 591
 MD5 637389da071d8ee0c0292695525bc29f metadata.xml 160
-MD5 1a3c5caf1acac2a8326789361bf81663 files/traceproto-1.1.1-fix-warnings.diff 2407
+MD5 31b6ee2adff386963b1adf10ebe09595 traceproto-1.1.1.ebuild 955
 MD5 e489db124aef70ee3c4067dcc0f15c2d files/digest-traceproto-1.1.1 68
+MD5 1a3c5caf1acac2a8326789361bf81663 files/traceproto-1.1.1-fix-warnings.diff 2407
diff --git a/net-analyzer/traceproto/traceproto-1.1.1.ebuild b/net-analyzer/traceproto/traceproto-1.1.1.ebuild
index e7b298b1a5cb..e2ef1bcc7f3b 100644
--- a/net-analyzer/traceproto/traceproto-1.1.1.ebuild
+++ b/net-analyzer/traceproto/traceproto-1.1.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/net-analyzer/traceproto/traceproto-1.1.1.ebuild,v 1.1 2005/01/31 10:39:56 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceproto/traceproto-1.1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:32 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug ncurses"
 
 RDEPEND=">=net-libs/libnet-1.1.0
diff --git a/net-analyzer/traceroute-nanog/ChangeLog b/net-analyzer/traceroute-nanog/ChangeLog
index 871efb634b59..e217aa7b3a1b 100644
--- a/net-analyzer/traceroute-nanog/ChangeLog
+++ b/net-analyzer/traceroute-nanog/ChangeLog
@@ -1,6 +1,49 @@
 # ChangeLog for net-analyzer/traceroute-nanog
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/ChangeLog,v 1.1 2004/07/04 17:49:41 eldad Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/ChangeLog,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
+
+  17 Nov 2005; Homer Parker <hparker@gentoo.org>
+  traceroute-nanog-6.3.10-r1.ebuild:
+  Marked ~amd64.
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  traceroute-nanog-6.3.10-r1.ebuild, -traceroute-nanog-6.3.10.ebuild,
+  -traceroute-nanog-6.3.9.ebuild:
+  Marked 6.3.10-r1 x86 stable and got rid of old ebuilds, since files seem to
+  have vanished from Debian mirrors - seems more reasonable than uploading old
+  patches to our own mirrors.
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  traceroute-nanog-6.3.10.ebuild, traceroute-nanog-6.3.9.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  02 Apr 2005; Lars Weiler <pylon@gentoo.org>
+  traceroute-nanog-6.3.10-r1.ebuild:
+  Added ~ppc.
+
+*traceroute-nanog-6.3.10-r1 (18 Feb 2005)
+
+  18 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +traceroute-nanog-6.3.10-r1.ebuild:
+  Revision bump; update debian patchlevel for bug 82321.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  traceroute-nanog-6.3.10.ebuild:
+  Marked stable on x86.
+
+*traceroute-nanog-6.3.10 (08 Nov 2004)
+
+  08 Nov 2004; Eldad Zack <eldad@gentoo.org> +traceroute-nanog-6.3.10.ebuild:
+  Version bump.
+
+  10 Aug 2004; Eldad Zack <eldad@gentoo.org> traceroute-nanog-6.3.9.ebuild:
+  stable on x86
+
+  14 Jul 2004; Eldad Zack <eldad@gentoo.org> traceroute-nanog-6.3.9.ebuild:
+  virtual/glibc -> virtual/libc
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> traceroute-nanog-6.3.9.ebuild:
+  Changed to mirror://debian
 
 *traceroute-nanog-6.3.9 (04 Jul 2004)
 
diff --git a/net-analyzer/traceroute-nanog/Manifest b/net-analyzer/traceroute-nanog/Manifest
index 0a6173c30445..9720097af450 100644
--- a/net-analyzer/traceroute-nanog/Manifest
+++ b/net-analyzer/traceroute-nanog/Manifest
@@ -1,2 +1,4 @@
-MD5 e510a6d57abca7e9f9d467a72a895ec2 traceroute-nanog-6.3.9.ebuild 984
-MD5 3d64910fb617c2be3b7e316b39daf553 files/digest-traceroute-nanog-6.3.9 154
+MD5 7b7dc495a60251e572e417a0a69e7fc3 ChangeLog 1922
+MD5 ac1e94ae6d3460cf9a5d5ae8ba5797e9 metadata.xml 267
+MD5 7fb89140f3b2a4aa3fc80b6c01b3f8ff traceroute-nanog-6.3.10-r1.ebuild 1063
+MD5 f5a8e999fcc86805c13e39fa86e8c276 files/digest-traceroute-nanog-6.3.10-r1 156
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.3.10-r1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.3.10-r1.ebuild
index 4ebfbae0c443..2aea168a9e55 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.3.10-r1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.3.10-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/net-analyzer/traceroute-nanog/traceroute-nanog-6.3.10-r1.ebuild,v 1.1 2005/02/18 10:53:19 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute-nanog/traceroute-nanog-6.3.10-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:34 chriswhite Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ RESTRICT="nomirror"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="virtual/libc"
diff --git a/net-analyzer/traceroute/ChangeLog b/net-analyzer/traceroute/ChangeLog
index 90b5a4aa87de..e62a30a60de7 100644
--- a/net-analyzer/traceroute/ChangeLog
+++ b/net-analyzer/traceroute/ChangeLog
@@ -1,12 +1,97 @@
 # ChangeLog for net-analyzer/traceroute
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/ChangeLog,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
 
-  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-  moved to net-analyzer - added SLOT - added LICENSE
+  16 Jun 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/traceroute-1.4-emptylabel.patch, traceroute-1.4_p12-r3.ebuild:
+  Added patch to fix FreeBSD compile failure, bug 96269.
+
+  22 May 2005; Aaron Walker <ka0ttic@gentoo.org>
+  traceroute-1.4_p12-r3.ebuild:
+  Add nasty hack so config.{sub,guess} is writable (and hence econf wont fail
+  to overwrite them) until bug 93363 is fixed.
+
+*traceroute-1.4_p12-r3 (03 May 2005)
+
+  03 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/traceroute-1.4a12-LDFLAGS.patch,
+  +files/traceroute-1.4a5-bigpacklen.patch,
+  +files/traceroute-1.4a5-droproot.patch,
+  +files/traceroute-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysilio
+  gogogoch.patch, +files/traceroute-1.4a5-lsrr.patch,
+  +files/traceroute-1.4a5-secfix.patch,
+  +files/traceroute-1.4a5-unaligned.patch, +traceroute-1.4_p12-r3.ebuild:
+  Add a bunch of misc patches from Redhat.
+
+  05 Dec 2004; Mike Gardiner <obz@gentoo.org> traceroute-1.4_p12-r2.ebuild:
+  Keyworded hppa and ia64, after SpankY's testing
+
+  04 Sep 2004; <solar@gentoo.org> traceroute-1.4_p12-r2.ebuild:
+  use non-lazy bindings for +s apps installed by this package
+
+  15 Jul 2004; Tom Gall <tgall@gentoo.org> traceroute-1.4_p12-r2.ebuild:
+  stable on ppc64, bug #55526
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> traceroute-1.4_p12-r2.ebuild:
+  change virtual/glibc to virtual/libc
+
+*traceroute-1.4_p12-r2 (29 Nov 2003)
+
+  29 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
+  No longer setuid by default #34477.
+
+  21 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> traceroute-1.4_p12-r1.ebuild :
+  Added patch to optionally resolve target ip. Patch submitted by Eldad Zack <eldad@stoneshaft.ath.cx> in #31805.
+
+  14 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> traceroute-1.4_p12-r1.ebuild :
+  Run gnuconfig_update for amd64 too.
+
+  02 Nov 2003; Christian Birchinger <joker@gentoo.org>
+  traceroute-1.4_p12-r1.ebuild:
+  Added sparc stable keyword
+
+*traceroute-1.4_p12-r1 (16 Aug 2003)
+
+  20 Oct 2003; Joshua Kinard <kumba@gentoo.org> traceroute-1.4_p12-r1.ebuild:
+  Added ~mips to KEYWORDS
+  Called eutils to invoke epatch in place of an old patch call
+
+  16 Aug 2003; Tavis Ormandy <taviso@gentoo.org> traceroute-1.4_p12-r1.ebuild:
+  assume linux routing table by default #26699, thanks to Peter Jones 
+  <pete <at> petesplace.id.au>.
+  
+  changed CHOST override to use gnuconfig on alpha.
+  
+  marking stable on alpha and x86.
+
+  19 May 2003; Tavis Ormandy <taviso@gentoo.org> traceroute-1.4_p12.ebuild:
+  Over riding CHOST on Alpha, configure doesnt like processor revision.
+  fixes bug #21122, reported by Paul Moore <pcmoore <at> engin.umich.edu>
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+  
 
 *traceroute-1.4_p12 (1 Feb 2002)
 
+  27 Apr 2003; Zach Welch <zwelch@gentoo.org> traceroute-1.4_p12.ebuild:
+  add arm keyword
+
+  26 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> traceroute-1.4_p12.ebuild:
+  Moved binary from /usr/sbin to /usr/bin. Closes #6526. Found by
+  Hannes Mehnert <hannes@mehnert.org>.
+
+  14 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> :
+  Added ppc keyword
+
+  18 Jul 2002; Kyle Manna <nitro@gentoo.org> traceroute-1.4_p12.ebuild :
+  Added KEYWORDS.
+ 
+  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
+  moved to net-analyzer - added SLOT - added LICENSE
+
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/net-analyzer/traceroute/Manifest b/net-analyzer/traceroute/Manifest
index 5080165ce77f..e5e656f0a24a 100644
--- a/net-analyzer/traceroute/Manifest
+++ b/net-analyzer/traceroute/Manifest
@@ -1,4 +1,26 @@
-MD5 89397cfc93fafd6c81c3d3ae84c7c585 ChangeLog 1330
-MD5 e4a6e882d716af4b51fbadc45fb59c37 traceroute-1.4_p12.ebuild 815
-MD5 fcda909e9a6d3cfd61a2ec945f439ef7 files/digest-traceroute-1.4_p12 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1731d7d9c4e9cf77dcbe935e512350bd traceroute-1.4_p12-r2.ebuild 1253
+MD5 2ac8c730ca99ba543962ae9b56b36f88 traceroute-1.4_p12-r3.ebuild 1547
+MD5 75669d13ac520379669ae0e549ed112b ChangeLog 4031
+MD5 7ed4ef8e3d3fd7d4c7e9682b2519d739 metadata.xml 235
+MD5 ec9afbce16d7136e1c4a785afacecec6 files/traceroute-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch 1346
+MD5 cd50b5830f5b207329b7884746927503 files/traceroute-1.4a5-bigpacklen.patch 530
+MD5 45878a065e3d7577e6177b55d175b7f1 files/traceroute-1.4a5-lsrr.patch 9287
+MD5 2cbc4c5f84cfb5e98982fdc14951faa0 files/traceroute-1.4a5-unaligned.patch 769
 MD5 0502b89228de25efeefd5a95fcc58aeb files/traceroute-1.4a12.patch 1097
+MD5 32d8c8e06ae121436c95a2992552ab84 files/traceroute-1.4-target-resolv.patch 539
+MD5 fcda909e9a6d3cfd61a2ec945f439ef7 files/digest-traceroute-1.4_p12-r2 68
+MD5 fcda909e9a6d3cfd61a2ec945f439ef7 files/digest-traceroute-1.4_p12-r3 68
+MD5 6c8a0f4cf4ebbc93362e3100325f3ffa files/traceroute-1.4-emptylabel.patch 366
+MD5 f5c863e684d2ab284f1ad126e2b71fce files/traceroute-1.4a5-droproot.patch 2778
+MD5 b5a0fddf1127ff8dff438c21559f1211 files/traceroute-1.4a5-secfix.patch 1151
+MD5 7b7dbb5ba09f5fa1eb77df4d1ebc17f6 files/traceroute-1.4a12-LDFLAGS.patch 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsX31EZCkKN40op4RApG1AJ9Bug6JFqgB955B25wQQiHVRW+kMgCfWUPg
+EhS6RRWAvH2kTmnwOVcWqew=
+=AAoS
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/traceroute/traceroute-1.4_p12-r2.ebuild b/net-analyzer/traceroute/traceroute-1.4_p12-r2.ebuild
index 1e3788ee818e..43187f3cc3b9 100644
--- a/net-analyzer/traceroute/traceroute-1.4_p12-r2.ebuild
+++ b/net-analyzer/traceroute/traceroute-1.4_p12-r2.ebuild
@@ -1,8 +1,8 @@
-# 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/net-analyzer/traceroute/traceroute-1.4_p12-r2.ebuild,v 1.1 2003/11/29 23:29:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-1.4_p12-r2.ebuild,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
 
-inherit eutils gnuconfig
+inherit eutils gnuconfig flag-o-matic
 
 MY_P=${PN}-1.4a12
 S=${WORKDIR}/${MY_P}
@@ -12,9 +12,10 @@ SRC_URI="ftp://ee.lbl.gov/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips amd64"
+KEYWORDS="x86 ppc sparc mips alpha arm amd64 ppc64 ia64 hppa"
+IUSE=""
 
-RDEPEND="virtual/glibc"
+RDEPEND="virtual/libc"
 DEPEND="${RDEPEND}
 	sys-devel/autoconf
 	>=sys-apps/sed-4"
@@ -29,8 +30,10 @@ src_unpack() {
 src_compile() {
 	# fixes bug #21122
 	# -taviso
-	use alpha && gnuconfig_update
-	use amd64 && gnuconfig_update
+	gnuconfig_update
+
+	# use non-lazy bindings for this suid app
+	append-ldflags -Wl,-z,now
 
 	# assume linux by default #26699
 	# -taviso
@@ -38,13 +41,14 @@ src_compile() {
 	autoreconf
 
 	econf || die
-	emake || die
+	emake LIBS="${LDFLAGS}" || die
 }
 
-src_install () {
+src_install() {
 	dodir /usr/sbin
 	make DESTDIR=${D} install || die
-	fperms 0755 /usr/sbin/traceroute
+	fowners root:wheel /usr/sbin/traceroute
+	fperms 4710 /usr/sbin/traceroute
 
 	doman traceroute.8
 	dodoc CHANGES INSTALL
diff --git a/net-analyzer/traceroute/traceroute-1.4_p12-r3.ebuild b/net-analyzer/traceroute/traceroute-1.4_p12-r3.ebuild
index 54a32de2b182..3181332e36f6 100644
--- a/net-analyzer/traceroute/traceroute-1.4_p12-r3.ebuild
+++ b/net-analyzer/traceroute/traceroute-1.4_p12-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/net-analyzer/traceroute/traceroute-1.4_p12-r3.ebuild,v 1.1 2005/05/03 01:22:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traceroute/traceroute-1.4_p12-r3.ebuild,v 1.1.1.1 2005/11/30 10:12:31 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -21,6 +21,10 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
+	# nasty hack until bug 93363 is fixed
+	chmod 644 config.{guess,sub}
+
 	epatch "${FILESDIR}"/traceroute-1.4-target-resolv.patch
 	epatch "${FILESDIR}"/traceroute-1.4a12-LDFLAGS.patch
 	epatch "${FILESDIR}"/traceroute-1.4a5-bigpacklen.patch
@@ -29,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/traceroute-1.4a5-llanfairpwllgwyngyllgogerychwyrndrobwllllantysiliogogogoch.patch
 	epatch "${FILESDIR}"/traceroute-1.4a5-secfix.patch
 	epatch "${FILESDIR}"/traceroute-1.4a5-unaligned.patch
+	epatch "${FILESDIR}"/traceroute-1.4-emptylabel.patch
 
 	# assume linux by default #26699
 	sed -i '/^t=/s:generic:linux:' configure
diff --git a/net-analyzer/trafd/ChangeLog b/net-analyzer/trafd/ChangeLog
index 4447c3a648fb..fe2464e382ee 100644
--- a/net-analyzer/trafd/ChangeLog
+++ b/net-analyzer/trafd/ChangeLog
@@ -1,8 +1,28 @@
 # ChangeLog for net-analyzer/trafd
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/ChangeLog,v 1.1 2002/11/08 13:07:26 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/ChangeLog,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> trafd-3.0.1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  trafd-3.0.1.ebuild:
+  Tidy up
+
+  15 Jun 2004; Jon Hood <squinky86@gentoo.org> trafd-3.0.1.ebuild:
+  applying fixes from Eldad Zack <eldad@stoneshaft.ath.cx>
+
+  18 May 2003; Martin Holzer <mholzer@gentoo.org> :
+  Fixing init script. Closes #21202.
 
 *trafd-3.0.1 (08 Nov 2002)
 
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> trafd-3.0.1.ebuild :
+
+  Moved the config, initscript and patch into a tarball onto the mirrors
+  and out of files/.  Also, changed the sed expression delimiters from / to
+  :, closing bug #15006 by Blu3 <david+gentoo.org@blue-labs.org>
+
+
   08 Nov 2002; Daniel Ahlberg <aliz@gentoo.org> :
   Initial import. Ebuild contributed by Asen Kurin <asen@warlock.ru> in #8446.
diff --git a/net-analyzer/trafd/Manifest b/net-analyzer/trafd/Manifest
index a3f6c20d7f15..49565d1c7752 100644
--- a/net-analyzer/trafd/Manifest
+++ b/net-analyzer/trafd/Manifest
@@ -1,8 +1,14 @@
-MD5 95f4222fd519da209da60eebb868f127 ChangeLog 665
-MD5 2fa46e559efbe4ab335c11fbc2fa432e trafd-3.0.1.ebuild 1355
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 645a545c12a457cf67f558d1b0879c56 ChangeLog 1097
+MD5 8b6fd3efb633936d445ec960e7c0f3a3 trafd-3.0.1.ebuild 1293
+MD5 a76a71fdeb3c4668250f466c21a19183 metadata.xml 220
 MD5 1572089bdb3922ea1a0ff41ba2abdc5d files/digest-trafd-3.0.1 199
-MD5 30c99eb98b1c4a63681facea93ac8a38 files/digest-trafd-3.0.2.1 135
-MD5 4b6f61f2b3fd985efc935d1ec1f52ce2 tmp/trafd-3.0.1-gentoo.tar.bz2 2618
-MD5 7ba19d123d7872563287b69027b6f91f tmp/trafd-3.0.1-gentoo/trafd-3.0.1-gentoo.diff 7006
-MD5 23f0f2567787e35f0e6da761cbb04a84 tmp/trafd-3.0.1-gentoo/trafd.conf 38
-MD5 55ad374200b16f7c824ef6802bf252cf tmp/trafd-3.0.1-gentoo/trafd.init 486
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB+xtbmdTrptrqvGERAr0rAJ47qVkMFJf42Tb0kWCwEuE3XjnsPACfcWmg
+JyZTUCXY5Iqq6GMiqFuMTN4=
+=eUbY
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/trafd/files/digest-trafd-3.0.1 b/net-analyzer/trafd/files/digest-trafd-3.0.1
index 4a9e62474d32..0a1757da8f03 100644
--- a/net-analyzer/trafd/files/digest-trafd-3.0.1
+++ b/net-analyzer/trafd/files/digest-trafd-3.0.1
@@ -1,2 +1,3 @@
 MD5 6a5abb246e95b68f0d53ebf789bda4fb trafd-3.0.1.tgz 35365
 MD5 c61d8f5b9824763bd5b93708048f4727 tcpdump-richard-1.7.tar.gz 198587
+MD5 4b6f61f2b3fd985efc935d1ec1f52ce2 trafd-3.0.1-gentoo.tar.bz2 2618
diff --git a/net-analyzer/trafd/trafd-3.0.1.ebuild b/net-analyzer/trafd/trafd-3.0.1.ebuild
index ce78e3c9a90e..bc940bedb0db 100644
--- a/net-analyzer/trafd/trafd-3.0.1.ebuild
+++ b/net-analyzer/trafd/trafd-3.0.1.ebuild
@@ -1,45 +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/net-analyzer/trafd/trafd-3.0.1.ebuild,v 1.1 2002/11/08 13:07:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/trafd-3.0.1.ebuild,v 1.1.1.1 2005/11/30 10:12:33 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="The BPF Traffic Collector"
-SRC_URI="ftp://ftp.riss-telecom.ru/pub/dev/trafd/${P}.tgz 
-	http://metalab.unc.edu/pub/Linux/system/network/management/tcpdump-richard-1.7.tar.gz"
+SRC_URI="ftp://ftp.riss-telecom.ru/pub/dev/trafd/${P}.tgz
+	http://metalab.unc.edu/pub/Linux/system/network/management/tcpdump-richard-1.7.tar.gz
+	mirror://gentoo/${P}-gentoo.tar.bz2"
 HOMEPAGE="ftp://ftp.riss-telecom.ru/pub/dev/trafd/"
-LICENSE="BSD"
+
 SLOT="0"
-KEYWORDS="~x86"
+LICENSE="BSD"
+KEYWORDS="x86"
+IUSE=""
 
-# -lbpft/*����*/ -lpcap -lcurses -ltermcap -lfl
-DEPEND="net-libs/libpcap
+# -lbpft -lpcap -lcurses -ltermcap -lfl
+DEPEND="virtual/libpcap
 	sys-libs/ncurses
 	sys-devel/flex"
 
-RDEPEND=$DEPEND
+PATCHDIR=${WORKDIR}/${P}-gentoo
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${PF}-gentoo.diff
-
-	mv Makefile Makefile.orig
-	sed "44s/-O2$/${CFLAGS}/" Makefile.orig >Makefile
-}
+	epatch ${PATCHDIR}/${PF}-gentoo.diff
 
-src_compile() {
-	emake || die 
+	sed -i "44s:-O2$:${CFLAGS}:; 52s:^INCLUDE.*:& -I../../tcpdump-richard-1.7/libpcap-0.0/bpf/:" Makefile
 }
 
 src_install () {
 	dodir /usr/bin /etc /usr/share/doc/trafd-3.0.1 /var/trafd
 	make install DESTDIR=${D} || die
-	exeinto /etc/init.d ; newexe ${FILESDIR}/trafd.init trafd
-	insinto /etc/conf.d ; newins ${FILESDIR}/trafd.conf trafd
+	exeinto /etc/init.d ; newexe ${PATCHDIR}/trafd.init trafd
+	insinto /etc/conf.d ; newins ${PATCHDIR}/trafd.conf trafd
 }
 
 pkg_postinst() {
-    ewarn "NOTE: if you want to run trafd on boot then execute"
-    ewarn "rc-update add trafd default"
-    ewarn "change interfaces in /etc/conf.d/trafd (default is eth0)"
+	ewarn "NOTE: if you want to run trafd on boot then execute"
+	ewarn "rc-update add trafd default"
+	ewarn "change interfaces in /etc/conf.d/trafd (default is eth0)"
 }
diff --git a/net-analyzer/traffic-vis/ChangeLog b/net-analyzer/traffic-vis/ChangeLog
index ccc5a0f9bc03..02c6949e253b 100644
--- a/net-analyzer/traffic-vis/ChangeLog
+++ b/net-analyzer/traffic-vis/ChangeLog
@@ -1,6 +1,35 @@
 # ChangeLog for net-analyzer/traffic-vis
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.1 2003/10/30 00:17:12 lisa Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/ChangeLog,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> traffic-vis-0.35.ebuild:
+  Added to ~ppc.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> traffic-vis-0.35.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  traffic-vis-0.35.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> traffic-vis-0.35.ebuild:
+  change virtual/glibc to virtual/libc
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> traffic-vis-0.35.ebuild:
+  fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> traffic-vis-0.35.ebuild:
+  Add inherit eutils
+
+  06 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> traffic-vis-0.35.ebuild,
+  files/traffic-vis-0.35-libpcap-header-fix.patch:
+  Added patch for new libpcap headers.
+
+  09 Dec 2003; Heinrich Wendel <lanius@gentoo.org> traffic-vis-0.35.ebuild:
+  changed app-text/ghostscript to virtual/ghostscript
+
+  06 Dec 2003; <spider@gentoo.org> traffic-vis-0.35.ebuild:
+  fixing bug #34576. Borked depends
 
 *traffic-vis-0.35 (29 Oct 2003)
 
diff --git a/net-analyzer/traffic-vis/Manifest b/net-analyzer/traffic-vis/Manifest
index 7ed959dd80aa..02088058107e 100644
--- a/net-analyzer/traffic-vis/Manifest
+++ b/net-analyzer/traffic-vis/Manifest
@@ -1,5 +1,8 @@
-MD5 da2d0e089b48fa23d8eaa8f057736863 traffic-vis-0.35.ebuild 1174
-MD5 4e1b8460642e4424a4db9e724c550f68 files/traffic-vis-0.35-gentoo.patch 3759
-MD5 1432d4d3ff103099cd611bc788c9681a files/traffic-vis.init.d 667
-MD5 c46353b84b1abd62df28e24e0321394c files/traffic-vis.conf.d 260
+MD5 3d94f7693591abc77df68c136602773d ChangeLog 1534
+MD5 ae8e03095061706c47ed9f424e840aa8 traffic-vis-0.35.ebuild 1336
+MD5 75e5dd9e5ff826e83948079bd120a0c9 metadata.xml 250
 MD5 8d9d8f0ea07c61e6e39221fd8a5715bb files/digest-traffic-vis-0.35 67
+MD5 4e1b8460642e4424a4db9e724c550f68 files/traffic-vis-0.35-gentoo.patch 3759
+MD5 f3f89a74aafd87072c83981d568ad1d2 files/traffic-vis-0.35-libpcap-header-fix.patch 280
+MD5 a7bbcd2076e8850fd4f6d359c9dada26 files/traffic-vis.conf.d 365
+MD5 d68a0880f31210ead13247ad3de0961d files/traffic-vis.init.d 744
diff --git a/net-analyzer/traffic-vis/files/traffic-vis.conf.d b/net-analyzer/traffic-vis/files/traffic-vis.conf.d
index 12307b7215fc..ea27abc99d28 100644
--- a/net-analyzer/traffic-vis/files/traffic-vis.conf.d
+++ b/net-analyzer/traffic-vis/files/traffic-vis.conf.d
@@ -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/net-analyzer/traffic-vis/files/traffic-vis.conf.d,v 1.1 2003/10/30 00:17:12 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis.conf.d,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 # Config file for /etc/init.d/traffic-vis
 
diff --git a/net-analyzer/traffic-vis/files/traffic-vis.init.d b/net-analyzer/traffic-vis/files/traffic-vis.init.d
index b855a33d7173..167723382a89 100644
--- a/net-analyzer/traffic-vis/files/traffic-vis.init.d
+++ b/net-analyzer/traffic-vis/files/traffic-vis.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis.init.d,v 1.1 2003/10/30 00:17:12 lisa Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/files/traffic-vis.init.d,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
 
 opts="depend start stop"
 
@@ -10,13 +10,13 @@ depend() {
 }
 
 start() {
-    ebegin "Starting traffic-vis"
-    start-stop-daemon --start --quiet --exec /usr/sbin/traffic-collector -- --pid-file /var/run/traffic-collector.pid --interface $TRAFFIC_VIS_INTERFACE --summary-file $TRAFFIC_VIS_FILE $TRAFFIC_VIS_OPTIONS
-    eend $? "Failed to start traffic-vis"
+	ebegin "Starting traffic-vis"
+	start-stop-daemon --start --quiet --exec /usr/sbin/traffic-collector -- --pid-file /var/run/traffic-collector.pid --interface $TRAFFIC_VIS_INTERFACE --summary-file $TRAFFIC_VIS_FILE $TRAFFIC_VIS_OPTIONS
+	eend $? "Failed to start traffic-vis"
 }
 
 stop() {
-    ebegin "Stopping traffic-vis"
-    start-stop-daemon --stop --quiet --pidfile /var/run/traffic-collector.pid
-    eend $? "Failed to stop traffic-vis"
+	ebegin "Stopping traffic-vis"
+	start-stop-daemon --stop --quiet --pidfile /var/run/traffic-collector.pid
+	eend $? "Failed to stop traffic-vis"
 }
diff --git a/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild b/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild
index a9435befdb6e..abb9f8242d38 100644
--- a/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild
+++ b/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild
@@ -1,6 +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/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild,v 1.1 2003/10/30 00:17:12 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/traffic-vis/traffic-vis-0.35.ebuild,v 1.1.1.1 2005/11/30 10:12:09 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Generate traffic stats in html, ps, text and gif format"
 HOMEPAGE="http://www.mindrot.org/traffic-vis.html"
@@ -8,21 +10,21 @@ SRC_URI="http://www.mindrot.org/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 IUSE="gif"
-DEPEND="virtual/glibc
-	>=net-libs/libpcap-0.4
+DEPEND="virtual/libc
+	virtual/libpcap
 	gif? ( media-libs/netpbm
-		app-text/ghostscript
+		virtual/ghostscript
 		dev-lang/perl )
-	>=dev-libs/glib-1.1.15"
+	=dev-libs/glib-1.2*"
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack ${A} ; cd ${S}
 
 	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-libpcap-header-fix.patch
 }
 
 src_compile() {
@@ -33,7 +35,7 @@ src_install() {
 	dosbin collector/traffic-collector
 	doman collector/traffic-collector.8
 
-	for mybin in 	`use gif >/dev/null && echo "frontends/traffic-togif"` \
+	for mybin in $(useq gif && echo frontends/traffic-togif) \
 			frontends/traffic-tohtml \
 			frontends/traffic-tops \
 			frontends/traffic-totext \
diff --git a/net-analyzer/trafshow/ChangeLog b/net-analyzer/trafshow/ChangeLog
index 633d26c09be0..b42a9d245531 100644
--- a/net-analyzer/trafshow/ChangeLog
+++ b/net-analyzer/trafshow/ChangeLog
@@ -1,8 +1,77 @@
 # ChangeLog for net-analyzer/trafshow
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.1 2002/02/20 03:04:21 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/ChangeLog,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
-*trafshow-3.1
+  16 Oct 2005; Jason Wever <weeve@gentoo.org> trafshow-5.2.1.ebuild:
+  Stable on SPARC.
+
+  25 Sep 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/trafshow-3.1-gentoo.patch, +files/trafshow-5.2.1-gcc4.diff,
+  trafshow-5.2.1.ebuild:
+  Add gcc4 patch for bug 107143. Thanks to Anatoly Kamchatnov <rev@male.ru>.
+
+  24 Sep 2005; Markus Rothe <corsair@gentoo.org> trafshow-5.2.1.ebuild:
+  Stable on ppc64
+
+  20 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -trafshow-3.1-r1.ebuild,
+  trafshow-5.2.1.ebuild:
+  x86 stable.
+
+*trafshow-5.2.1 (01 Aug 2005)
+
+  01 Aug 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/trafshow-5.2.1-gentoo.patch, +trafshow-5.2.1.ebuild:
+  Version bump for bug 100864. Thanks to Donald R. Gray Jr
+  <donaldgray@dslextreme.com>.
+
+  09 Apr 2005; Markus Rothe <corsair@gentoo.org> trafshow-4.0.ebuild:
+  Stable on ppc64
+
+  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> trafshow-4.0.ebuild:
+  Stable on sparc
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> trafshow-4.0.ebuild:
+  Remove unnecessary chown on ${S} that causes problems for users with
+  userpriv/usersandbox.
+
+  25 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> trafshow-4.0.ebuild:
+  Marked stable on x86.
+
+  13 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> trafshow-4.0.ebuild:
+  added ~amd64 to KEYWORDS. fixes #81563
+
+  31 Jan 2005; Daniel Black <dragonheart@gentoo.org> trafshow-3.1-r1.ebuild,
+  trafshow-4.0.ebuild:
+  virtual/libpcap transition
+
+*trafshow-4.0 (08 Jan 2005)
+
+  08 Jan 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/trafshow-4.0-gentoo.patch, +trafshow-4.0.ebuild:
+  version bump as per bug #58243. Thanks to Kalin KOZHUHAROV <kalin@thinrope.net>
+
+  16 Dec 2004; Markus Rothe <corsair@gentoo.org> trafshow-3.1-r1.ebuild:
+  Stable on ppc64
+
+  01 Nov 2004; Markus Rothe <corsair@gentoo.org> trafshow-3.1-r1.ebuild:
+  Marked ~ppc64; bug #67100
+
+  11 Oct 2004; David Holm <dholm@gentoo.org> trafshow-3.1-r1.ebuild:
+  Added to ~ppc.
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  trafshow-3.1-r1.ebuild:
+  Updated to use epatch, Tidy
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*trafshow-3.1-r1 (06 Jul 2002)
+
+	06 Jul 2002; Aron Griffis <agriffis@gentoo.org> trafshow-3.1-r1.ebuild:
+
+	Now honor setting of USE=slang to close bug #3411
+
+*trafshow-3.1 (19 Feb 2002)
 
 	19 Feb 2002; Aron Griffis <agriffis@gentoo.org> trafshow-3.1.ebuild, files/trafshow-3.1-gentoo.patch:
 
diff --git a/net-analyzer/trafshow/Manifest b/net-analyzer/trafshow/Manifest
index e69de29bb2d1..dd649a63d46a 100644
--- a/net-analyzer/trafshow/Manifest
+++ b/net-analyzer/trafshow/Manifest
@@ -0,0 +1,9 @@
+MD5 c7fe0a31aa3bef67e7e69ccf45b7757b ChangeLog 2733
+MD5 0eaa3123d4ab8173d4f7a1a4be4e1e0f files/digest-trafshow-4.0 60
+MD5 4425dfe640632b461cea181e62bbc704 files/digest-trafshow-5.2.1 63
+MD5 18731bc84348a4cbb851177332ba3596 files/trafshow-4.0-gentoo.patch 745
+MD5 2be46d4c1d01704fa3dd4ae5e7dc3796 files/trafshow-5.2.1-gcc4.diff 272
+MD5 77204def98fa54e7c755e708b1e8cc99 files/trafshow-5.2.1-gentoo.patch 827
+MD5 8e8b9393d38df263f07c394765553b01 metadata.xml 243
+MD5 50cd4a11d444f16779355ec1d25d778c trafshow-4.0.ebuild 997
+MD5 ff8191f84d3af09ea8284017448d88a7 trafshow-5.2.1.ebuild 1017
diff --git a/net-analyzer/trafshow/files/trafshow-4.0-gentoo.patch b/net-analyzer/trafshow/files/trafshow-4.0-gentoo.patch
index af8454c07618..b41083becb89 100644
--- a/net-analyzer/trafshow/files/trafshow-4.0-gentoo.patch
+++ b/net-analyzer/trafshow/files/trafshow-4.0-gentoo.patch
@@ -1,10 +1,14 @@
---- Makefile.in.old	2003-12-19 22:25:28.000000000 +0900
-+++ Makefile.in	2004-08-22 19:10:32.854396336 +0900
-@@ -70,7 +70,7 @@
+--- Makefile.in.orig	2005-01-08 20:10:16.535337512 +0930
++++ Makefile.in	2005-01-08 20:11:12.594815176 +0930
+@@ -68,9 +68,9 @@
+ 	@echo 'char libpcap[] = "@V_PCAPVER@";' >> $@
+ 
  install: force
- 	./install-sh -c -s -m 550 -o bin -g @V_GROUP@ $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
- 	./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
+-	./install-sh -c -s -m 550 -o bin -g @V_GROUP@ $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
+-	./install-sh -c -m 444 -o bin -g bin $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
 -	[ -f /etc/$(PROG) ] || ./install-sh -c -o root -m 644 .trafshow /etc/$(PROG)
++	./install-sh -c -s -m 550 -o root -g @V_GROUP@ $(PROG) $(DESTDIR)$(BINDEST)/$(PROG)
++	./install-sh -c -m 444 -o root -g bin $(PROG).1 $(DESTDIR)$(MANDEST)/man1/$(PROG).1
 +	[ -f $(DESTDIR)/etc/$(PROG) ] || ./install-sh -c -o root -m 644 .trafshow $(DESTDIR)/etc/$(PROG)
  
  clean:
diff --git a/net-analyzer/trafshow/trafshow-4.0.ebuild b/net-analyzer/trafshow/trafshow-4.0.ebuild
index 252ed46b1241..3afa710957df 100644
--- a/net-analyzer/trafshow/trafshow-4.0.ebuild
+++ b/net-analyzer/trafshow/trafshow-4.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/net-analyzer/trafshow/trafshow-4.0.ebuild,v 1.1 2005/01/08 10:37:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-4.0.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -13,9 +13,9 @@ HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
 
 SLOT="3"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+KEYWORDS="x86 sparc ~ppc ppc64 ~amd64"
 
-DEPEND=">=net-libs/libpcap-0.8.3
+DEPEND="virtual/libpcap
 	sys-libs/ncurses
 	slang? ( >=sys-libs/slang-1.4.2 )"
 
diff --git a/net-analyzer/trafshow/trafshow-5.2.1.ebuild b/net-analyzer/trafshow/trafshow-5.2.1.ebuild
index 6ddda9dd6305..eeee6ba7d322 100644
--- a/net-analyzer/trafshow/trafshow-5.2.1.ebuild
+++ b/net-analyzer/trafshow/trafshow-5.2.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/net-analyzer/trafshow/trafshow-5.2.1.ebuild,v 1.1 2005/08/01 18:23:56 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafshow/trafshow-5.2.1.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 inherit eutils gnuconfig
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://soft.risp.ru/trafshow/index_en.shtml"
 SRC_URI="ftp://ftp.nsk.su/pub/RinetSoftware/${P}.tgz"
 LICENSE="as-is"
 SLOT="3"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64 ~amd64"
+KEYWORDS="~amd64 ~ppc ppc64 sparc x86"
 IUSE="slang"
 
 DEPEND="virtual/libpcap
@@ -17,8 +17,9 @@ DEPEND="virtual/libpcap
 	slang? ( >=sys-libs/slang-1.4.2 )"
 
 src_unpack() {
-	unpack ${A}; cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	unpack ${A}; cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gcc4.diff"
 	use ppc64 && gnuconfig_update
 }
 
@@ -34,5 +35,5 @@ src_compile() {
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 }
diff --git a/net-analyzer/ttcp/ChangeLog b/net-analyzer/ttcp/ChangeLog
index 798774e561e1..b8432f6888fd 100644
--- a/net-analyzer/ttcp/ChangeLog
+++ b/net-analyzer/ttcp/ChangeLog
@@ -1,6 +1,37 @@
 # ChangeLog for net-analyzer/ttcp
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttcp/ChangeLog,v 1.1 2003/12/31 05:39:44 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttcp/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
+
+  12 Nov 2005; Joshua Kinard <kumba@gentoo.org> ttcp-1.12.ebuild:
+  Marked unstable on sparc.
+
+  16 Oct 2005; Joshua Kinard <kumba@gentoo.org> ttcp-1.12.ebuild:
+  Marked stable on mips.
+
+  15 May 2005; Marcelo Goes <vanquirius@gentoo.org> ttcp-1.12.ebuild:
+  Use toolchain-funcs.eclass instead of gcc.eclass. See bug 92745.
+
+  24 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> ttcp-1.12.ebuild:
+  Stable ppc-macos
+
+  23 Jan 2005; Lina Pezzzella <j4rg0n@gentoo.org> ttcp-1.12.ebuild:
+  Unstable ppc-macos. Bug #67036
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml:
+  Added metadata
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ttcp-1.12.ebuild:
+  change virtual/glibc to virtual/libc, add IUSE
+
+  26 May 2004; Travis Tilley <lv@gentoo.org> +files/ttcp-1.12-amd64.patch,
+  ttcp-1.12.ebuild:
+  add 64bit friendliness patch
+
+  09 May 2004; <SeJo@gentoo.org> ttcp-1.12.ebuild:
+  added ~ppc keyword
+
+  07 Apr 2004; Travis Tilley <lv@gentoo.org> ttcp-1.12.ebuild:
+  added ~amd64 keyword
 
 *ttcp-1.12 (31 Dec 2003)
 
diff --git a/net-analyzer/ttcp/Manifest b/net-analyzer/ttcp/Manifest
index 38b2fde2c143..94e93fcad9c6 100644
--- a/net-analyzer/ttcp/Manifest
+++ b/net-analyzer/ttcp/Manifest
@@ -1,3 +1,5 @@
-MD5 fdd9df209a19f18f4b3e58c41ba1b718 ttcp-1.12.ebuild 590
+MD5 caa6d68b2ec5161ee36e1bc7d864f423 ChangeLog 1357
 MD5 690842d44301d23c6ab6cc2536c16cfb files/digest-ttcp-1.12 60
-MD5 99bdf41efd723bd16751cf14dcf6bf7d ChangeLog 372
+MD5 8d82b8d7e98be982b36942093d19b005 files/ttcp-1.12-amd64.patch 5313
+MD5 2af8f982680fc91884e7ca08c1ccdabe metadata.xml 230
+MD5 1d3cf28900106a57b2a4a95153fb39f8 ttcp-1.12.ebuild 736
diff --git a/net-analyzer/ttcp/ttcp-1.12.ebuild b/net-analyzer/ttcp/ttcp-1.12.ebuild
index 11c71ef0e334..8a4b1d4ae861 100644
--- a/net-analyzer/ttcp/ttcp-1.12.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12.ebuild
@@ -1,21 +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/net-analyzer/ttcp/ttcp-1.12.ebuild,v 1.1 2003/12/31 05:39:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttcp/ttcp-1.12.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
-inherit gcc
+inherit toolchain-funcs eutils
 
+IUSE=""
 DESCRIPTION="Tool to test TCP and UDP throughput"
 HOMEPAGE="http://ftp.arl.mil/~mike/ttcp.html"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~amd64 ~ppc ppc-macos mips ~sparc"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+	use amd64 && epatch ${FILESDIR}/ttcp-1.12-amd64.patch
+}
 
 src_compile() {
-	$(gcc-getCC) ${CFLAGS} -o ttcp sgi-ttcp.c || die "compile failed"
+	$(tc-getCC) ${CFLAGS} -o ttcp sgi-ttcp.c || die "compile failed"
 }
 
 src_install() {
diff --git a/net-analyzer/ttt/ChangeLog b/net-analyzer/ttt/ChangeLog
index a1c185cf68a9..09dd449d5c94 100644
--- a/net-analyzer/ttt/ChangeLog
+++ b/net-analyzer/ttt/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-analyzer/ttt
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ChangeLog,v 1.1 2004/03/04 17:00:39 mboman Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ChangeLog,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> ttt-1.8.1.ebuild:
+  Added to ~ppc.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org> ttt-1.8.1.ebuild:
+  Marked x86 stable.
+
+*ttt-1.8.1 (12 Apr 2005)
+
+  12 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +files/ttt-gcc4.diff,
+  +ttt-1.8.1.ebuild:
+  Version bump for bug 87980; added gcc4 patch from debian which removes the
+  icky requirements on using -Wwrite-strings -fwritable-strings.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> ttt-1.8.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> ttt-1.8.ebuild:
+  marked x86 stable
+
+  01 Jul 2004; Jon Hood <squinky86@gentoo.org> ttt-1.8.ebuild:
+  change virtual/glibc to virtual/libc
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ttt-1.8.ebuild:
+  Add inherit eutils
 
 *ttt-1.8 (05 Mar 2004)
 
diff --git a/net-analyzer/ttt/Manifest b/net-analyzer/ttt/Manifest
index 79a3231aaff2..5cd143d2d669 100644
--- a/net-analyzer/ttt/Manifest
+++ b/net-analyzer/ttt/Manifest
@@ -1,3 +1,9 @@
-MD5 15a0c0b97b3101920327b91e3b74bfb6 ttt-1.8.ebuild 979
-MD5 731900a46e4de27b97ffefca6b161c37 files/ttt-1.8-pcap.patch 297
+MD5 de81fd8ae104d63bfc10ca6ef6214d25 ChangeLog 1256
+MD5 685a02ea9c7601ba2b8fb03fb5d1e1d4 metadata.xml 264
+MD5 46ca343fdd4095fb1001eb37d4f02d1b ttt-1.8.ebuild 1114
+MD5 4999ceb02eb08ff19c953db45af3fbdc ttt-1.8.1.ebuild 1286
 MD5 525b88bccd59588c935e7951ad328ffe files/digest-ttt-1.8 59
+MD5 31221ee949d56df92f0c8299be79fc64 files/ttt-1.8-linux-sll.patch 2203
+MD5 731900a46e4de27b97ffefca6b161c37 files/ttt-1.8-pcap.patch 297
+MD5 699a57dff753234cd7f51906bd1f3e31 files/digest-ttt-1.8.1 61
+MD5 ea183ebbe91882d8b994ad70cf0a0eca files/ttt-gcc4.diff 683
diff --git a/net-analyzer/ttt/metadata.xml b/net-analyzer/ttt/metadata.xml
index 8c8ed01b61b6..72e3648cc5f2 100644
--- a/net-analyzer/ttt/metadata.xml
+++ b/net-analyzer/ttt/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<maintainer>
-  <email>mboman@gentoo.org</email>
-  <name>Michael Boman</name>
-  <description>Interim Maintainer</description>
-</maintainer>
 <longdescription>Tele Traffic Taper (ttt) - Real-time Graphical Remote Traffic Monitor</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/ttt/ttt-1.8.1.ebuild b/net-analyzer/ttt/ttt-1.8.1.ebuild
index 1875e4c74f85..e43a3ceec1d9 100644
--- a/net-analyzer/ttt/ttt-1.8.1.ebuild
+++ b/net-analyzer/ttt/ttt-1.8.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/net-analyzer/ttt/ttt-1.8.1.ebuild,v 1.1 2005/04/12 11:50:18 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ttt-1.8.1.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.csl.sony.co.jp/person/kjc/kjc/software.html"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE="ipv6"
 
 DEPEND="virtual/libc
diff --git a/net-analyzer/ttt/ttt-1.8.ebuild b/net-analyzer/ttt/ttt-1.8.ebuild
index 76bf1bd95b6f..a5b147f0a36d 100644
--- a/net-analyzer/ttt/ttt-1.8.ebuild
+++ b/net-analyzer/ttt/ttt-1.8.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/net-analyzer/ttt/ttt-1.8.ebuild,v 1.1 2004/03/04 17:00:39 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ttt/ttt-1.8.ebuild,v 1.1.1.1 2005/11/30 10:12:20 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="Tele Traffic Taper (ttt) - Real-time Graphical Remote Traffic Monitor"
 SRC_URI="ftp://ftp.csl.sony.co.jp/pub/kjc/${P}.tar.gz"
@@ -8,15 +10,15 @@ HOMEPAGE="http://www.csl.sony.co.jp/person/kjc/kjc/software.html"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="ipv6"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	virtual/x11
 	dev-lang/tcl
 	dev-lang/tk
 	>=dev-tcltk/blt-2.4
-	>=net-libs/libpcap-0.7.1
+	virtual/libpcap
 	sys-apps/grep"
 
 src_unpack() {
diff --git a/net-analyzer/vnstat/ChangeLog b/net-analyzer/vnstat/ChangeLog
index 71bde4fd530b..99bea9179947 100644
--- a/net-analyzer/vnstat/ChangeLog
+++ b/net-analyzer/vnstat/ChangeLog
@@ -1,6 +1,39 @@
 # ChangeLog for net-analyzer/vnstat
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.1 2003/09/22 16:20:02 vapier Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/ChangeLog,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
+
+*vnstat-1.4-r1 (23 May 2005)
+
+  23 May 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/vnstat-1.4-long_iface_name.patch, +vnstat-1.4-r1.ebuild:
+  Add patch by Aleksey Fedoseev to support ifaces with long names.
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> vnstat-1.4.ebuild:
+  Fix pkg_postinst messages wrt to cron script name for bug 83825.
+
+  21 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> files/vnstat.cron,
+  vnstat-1.4.ebuild:
+  Install cron script in /etc/cron.hourly where it belongs, as /etc/cron.d 1)
+  is only supported by vixie, and 2) should contain system crontab entries,
+  not bash scripts. Fixes bug 60711.
+
+  28 Sep 2004; Tom Gall <tgall@gentoo.org> vnstat-1.4.ebuild:
+  added ~ppc64, bug #64107
+
+  13 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml, vnstat-1.1.ebuild:
+  Added missing IUSE, added metadata
+
+  10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> vnstat-1.4.ebuild:
+  Marked ~amd64.
+
+  14 Jun 2004; David Holm <dholm@gentoo.org> vnstat-1.4.ebuild:
+  Added to ~ppc.
+
+*vnstat-1.4 (13 Jun 2004)
+
+  13 Jun 2004; Mike Frysinger <vapier@gentoo.org> +files/vnstat.cron,
+  +vnstat-1.4.ebuild:
+  Version bump #44679.
 
 *vnstat-1.1 (22 Sep 2003)
 
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index 73f1ed7161c4..8bf08fe06496 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -1,3 +1,10 @@
+MD5 a1ba79aaef00cab01a47abc87249c4b0 ChangeLog 1497
+MD5 eb0a408331b471c0ce66781c2cf44ada vnstat-1.1.ebuild 645
+MD5 432c6dc3dfd22b4c6657ddcc6c37979e metadata.xml 271
+MD5 c9221af7fbb443f047e3160e37777593 vnstat-1.4-r1.ebuild 1859
+MD5 596e113e2623121b8b54f9398a7a9192 vnstat-1.4.ebuild 1741
+MD5 389e6b2723965358ef9876b4e78d3bfc files/vnstat.cron 220
 MD5 afdaa51d96e363c56fe7358b1c5814c5 files/digest-vnstat-1.1 61
-MD5 2b24ababffaae06e81381ba948ee8cc3 ChangeLog 353
-MD5 6fb4891e6295485bb06ec745bbf8a598 vnstat-1.1.ebuild 647
+MD5 9330b188606445c3e0a9a90731ced54d files/vnstat-1.4-long_iface_name.patch 1260
+MD5 94dd735fdba2070fefd9f85480b1a2b9 files/digest-vnstat-1.4-r1 61
+MD5 94dd735fdba2070fefd9f85480b1a2b9 files/digest-vnstat-1.4 61
diff --git a/net-analyzer/vnstat/files/vnstat.cron b/net-analyzer/vnstat/files/vnstat.cron
index 716405fe50c8..690681327688 100644
--- a/net-analyzer/vnstat/files/vnstat.cron
+++ b/net-analyzer/vnstat/files/vnstat.cron
@@ -1,8 +1,9 @@
 #!/bin/bash
 
-# uncomment this line to enable this cron script
-exit 0
+# run vnstat if installed and at least one database exists
 
-if [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then
-	exec /usr/bin/vnstat -u
-fi
+# Uncomment the following to enable
+
+#if [ -x /usr/bin/vnstat ] && [ `ls /var/lib/vnstat/ | wc -l` -ge 1 ] ; then
+#    exec /usr/bin/vnstat -u
+#fi
diff --git a/net-analyzer/vnstat/vnstat-1.1.ebuild b/net-analyzer/vnstat/vnstat-1.1.ebuild
index 3c0cdfc3d90d..7ff8cae0d01d 100644
--- a/net-analyzer/vnstat/vnstat-1.1.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.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/net-analyzer/vnstat/vnstat-1.1.ebuild,v 1.1 2003/09/22 16:20:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 DESCRIPTION="network traffic monitor that keeps statistics of daily network traffic"
 HOMEPAGE="http://torus.lnet.lut.fi/vnstat/"
@@ -9,6 +9,7 @@ SRC_URI="http://torus.lnet.lut.fi/vnstat/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 DEPEND=""
 
diff --git a/net-analyzer/vnstat/vnstat-1.4-r1.ebuild b/net-analyzer/vnstat/vnstat-1.4-r1.ebuild
index f5ae2a21ca58..d9eed0fe3b71 100644
--- a/net-analyzer/vnstat/vnstat-1.4-r1.ebuild
+++ b/net-analyzer/vnstat/vnstat-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/net-analyzer/vnstat/vnstat-1.4-r1.ebuild,v 1.1 2005/05/23 00:46:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/vnstat/vnstat-1.4.ebuild b/net-analyzer/vnstat/vnstat-1.4.ebuild
index c0e40a752f0a..d95cd15bc392 100644
--- a/net-analyzer/vnstat/vnstat-1.4.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.4.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/net-analyzer/vnstat/vnstat-1.4.ebuild,v 1.1 2004/06/14 00:02:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/vnstat/vnstat-1.4.ebuild,v 1.1.1.1 2005/11/30 10:12:44 chriswhite Exp $
 
 DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
 HOMEPAGE="http://humdi.net/vnstat/"
@@ -8,7 +8,7 @@ SRC_URI="http://humdi.net/vnstat/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="x86 ~ppc ~amd64 ~ppc64"
 IUSE=""
 
 RDEPEND="virtual/cron"
@@ -21,8 +21,8 @@ src_install() {
 	keepdir /var/lib/vnstat
 
 	dobin src/vnstat || die
-	insinto /etc/cron.hourly
-	newins ${FILESDIR}/vnstat.cron vnstat
+	exeinto /etc/cron.hourly
+	doexe ${FILESDIR}/vnstat.cron vnstat
 	doman man/vnstat.1
 
 	newdoc pppd/vnstat_ip-down ip-down.example
@@ -32,13 +32,26 @@ src_install() {
 
 pkg_postinst() {
 	# compatibility for 1.1 ebuild
-	if [ -d ${ROOT}/var/spool/vnstat ] ; then
-        mv -f ${ROOT}/var/spool/vnstat/* ${ROOT}/var/lib/vnstat \
+	if [[ -d ${ROOT}/var/spool/vnstat ]] ; then
+		mv -f ${ROOT}/var/spool/vnstat/* ${ROOT}/var/lib/vnstat \
 			&& rmdir ${ROOT}/var/spool/vnstat
-        einfo "vnStat db files moved from /var/spool/vnstat to /var/lib/vnstat"
+		einfo "vnStat db files moved from /var/spool/vnstat to /var/lib/vnstat"
 	fi
 
 	einfo "Repeat the following command for every interface you"
 	einfo "wish to monitor (replace eth0):"
 	einfo "   vnstat -u -i eth0"
+	einfo
+	einfo "Note: if an interface transfers more than ~4GB in"
+	einfo "the time between cron runs, you may miss traffic"
+	einfo
+
+	if [[ -e ${ROOT}/etc/cron.d/vnstat ]] ; then
+		einfo "vnstat\'s cron script is now installed as /etc/cron.hourly/vnstat."
+		einfo "Please remove /etc/cron.d/vnstat."
+	else
+		einfo "A cron script has been installed to /etc/cron.hourly/vnstat.cron."
+	fi
+	einfo "To update your interface database automatically with"
+	einfo "cron, uncomment the lines in /etc/cron.hourly/vnstat.cron."
 }
diff --git a/net-analyzer/xnetload/ChangeLog b/net-analyzer/xnetload/ChangeLog
index 6f87afa82894..a47c608c563e 100644
--- a/net-analyzer/xnetload/ChangeLog
+++ b/net-analyzer/xnetload/ChangeLog
@@ -1,9 +1,29 @@
 # ChangeLog for net-analyzer/xnetload
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/ChangeLog,v 1.1 2002/11/07 07:43:54 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/ChangeLog,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  xnetload-1.11.3.ebuild:
+  Stable on ppc.
+
+  03 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> xnetload-1.11.3.ebuild:
+  added ~amd64 to KEYWORDS. fixes #59348
+
+  27 Aug 2004; Tom Gall <tgall@gentoo.org> xnetload-1.11.3.ebuild:
+  stable on ppc64, bug #59348
+
+  03 Aug 2004; David Holm <dholm@gentoo.org> xnetload-1.11.3.ebuild:
+  Added to ~ppc.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  xnetload-1.11.3.ebuild:
+  Added missing IUSE. Added metadata.
 
 *xnetload-1.11.3 (06 Nov 2002)
 
+  17 Mar 2003; Jason Wever <weeve@gentoo.org> xnetload-1.11.3.ebuild:
+  Added ~sparc to keywords.
+
   06 Nov 2002; Seemant Kulleen <seemant@gentoo.org> xnetload-1.11.3.ebuild
   ChangeLog files/digest-xnetload-1.11.3 :
 
diff --git a/net-analyzer/xnetload/Manifest b/net-analyzer/xnetload/Manifest
index e69de29bb2d1..2cc8ce11bc44 100644
--- a/net-analyzer/xnetload/Manifest
+++ b/net-analyzer/xnetload/Manifest
@@ -0,0 +1,4 @@
+MD5 7477444b1906cbe62846c14de9f1413b metadata.xml 292
+MD5 10c02c31f7ba66000962bb55b1fd1f57 xnetload-1.11.3.ebuild 653
+MD5 8b6ab4837e0f13b4dc64dffa32164708 ChangeLog 1163
+MD5 239beaeb4ec727cb8336089495b1a003 files/digest-xnetload-1.11.3 66
diff --git a/net-analyzer/xnetload/xnetload-1.11.3.ebuild b/net-analyzer/xnetload/xnetload-1.11.3.ebuild
index 2f5a032b062a..76d595281981 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.3.ebuild
@@ -1,20 +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/net-analyzer/xnetload/xnetload-1.11.3.ebuild,v 1.1 2002/11/07 07:43:54 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xnetload/xnetload-1.11.3.ebuild,v 1.1.1.1 2005/11/30 10:12:35 chriswhite Exp $
 
-IUSE=""
-
-S=${WORKDIR}/${P}
 DESCRIPTION="This little tool displays a count and a graph of the traffic over a specified network connection."
 HOMEPAGE="http://www.xs4all.nl/~rsmith/software/"
 SRC_URI="http://www.xs4all.nl/~rsmith/software/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ppc ppc64 ~sparc x86"
 
 DEPEND="virtual/x11"
 
+IUSE=""
+
 src_compile() {
 	make || die
 }
diff --git a/net-analyzer/xprobe/ChangeLog b/net-analyzer/xprobe/ChangeLog
index facbdadff4c1..bde891379118 100644
--- a/net-analyzer/xprobe/ChangeLog
+++ b/net-analyzer/xprobe/ChangeLog
@@ -1,8 +1,72 @@
 # ChangeLog for net-analyzer/xprobe
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/ChangeLog,v 1.1 2002/08/17 11:36:27 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/ChangeLog,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
+
+  04 Sep 2005; Daniel Black <dragonheart@gentoo.org> -xprobe-0.2.1.ebuild,
+  xprobe-0.2.2.ebuild, xprobe-0.3.ebuild:
+  remove broken version (compile fail). stop installing COPYING
+
+  23 Aug 2005; Homer Parker <hparker@gentoo.org> xprobe-0.3.ebuild:
+  Marked ~amd64.
+
+  02 Aug 2005; Simon Stelling <blubb@gentoo.org> xprobe-0.2.2.ebuild:
+  added ~amd64 keyword
+
+*xprobe-0.3 (31 Jul 2005)
+
+  31 Jul 2005; Marcelo Goes <vanquirius@gentoo.org> metadata.xml,
+  +xprobe-0.3.ebuild:
+  Version bump. Moved description from ebuild to metadata.xml, where it
+  belongs. I also did some layout clean up on the ebuild. Fixes bug 100865.
+  Thanks to Garrett Hoxie <shoegoo@gmail.com>.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> xprobe-0.2.2.ebuild:
+  Added to ~ppc.
+
+  14 May 2005; Marcelo Goes <vanquirius@gentoo.org>
+  -files/xprobe-0.0.2-gentoo.patch, xprobe-0.2.2.ebuild:
+  Marked x86 stable, removed old patch.
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -xprobe-0.0.2.ebuild,
+  xprobe-0.2.2.ebuild:
+  Ebuild cleanup, remove old ebuild.
+
+  30 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> xprobe-0.0.2.ebuild,
+  xprobe-0.2.1.ebuild, xprobe-0.2.2.ebuild:
+  Update HOMEPAGE for bug 87201.
+
+  17 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> xprobe-0.2.2.ebuild:
+  version bump. also end of CHOST CFLAGS problems.
+
+  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> xprobe-0.2.1.ebuild:
+  Marked stable on x86.
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> xprobe-0.0.2.ebuild,
+  xprobe-0.2.1.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+*xprobe-0.2.1 (01 Jan 2005)
+
+  01 Jan 2005; Jason Wever <weeve@gentoo.org> xprobe-0.2.1.ebuild:
+  Added ~sparc keyword as it went missing in the version bump.
+
+  27 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org> :
+  New version of xprobe xprobe, so called xprobe2, due to xprobe1 being
+  obsoleted. xprobe 2 has different approach to operating system
+  fingerprinting. Xprobe2 rely on fuzzy signature matching, probabilistic
+  guesses, multiple matches simultaneously, and a signature database.
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  xprobe-0.0.2.ebuild:
+  Tidy up.
+
+  12 Jun 2003; <msterret@gentoo.org> xprobe-0.0.2.ebuild:
+  fix Header
 
 *xprobe-0.0.2 (17 Aug 2002)
 
+  17 Mar 2003; Jason Wever <weeve@gentoo.org> xprobe-0.0.2.ebuild:
+  Added ~sparc to keywords
+
   17 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> xprobe-0.0.2.ebuild:
   Initial import. Ebuild submitted by Stoyan Zhekov <zhware@hotpop.com>.
diff --git a/net-analyzer/xprobe/Manifest b/net-analyzer/xprobe/Manifest
index e69de29bb2d1..25754de3bf30 100644
--- a/net-analyzer/xprobe/Manifest
+++ b/net-analyzer/xprobe/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0006a5b26424dce7285040092ecc33e3 ChangeLog 2710
+MD5 b3e3e6e4f94dae37fe5d8bd33d7c9de0 xprobe-0.3.ebuild 644
+MD5 38db7df6633dc3f15d81ba139207693b metadata.xml 478
+MD5 512e3af97af14a1e252b106356a22612 xprobe-0.2.2.ebuild 922
+MD5 333d965a82d82d7505e765d8a4418ee9 files/digest-xprobe-0.3 63
+MD5 deeacb60b94a028e0f05b2c33f504488 files/digest-xprobe-0.2.2 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGwhXmdTrptrqvGERAmkFAKCRfMEXCHNT94y7JUxBdJqAIOarcQCfebTg
+Cg6xciFpYo7zYlm6q4BTSss=
+=s75e
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/xprobe/metadata.xml b/net-analyzer/xprobe/metadata.xml
index 4e880c7a3470..bdfa8b544298 100644
--- a/net-analyzer/xprobe/metadata.xml
+++ b/net-analyzer/xprobe/metadata.xml
@@ -2,5 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
-<longdescription>Active OS fingerprinting tool</longdescription>
+<longdescription>Active OS fingerprinting tool. This is the new xprobe, called
+xprobe2, due to xprobe1 being obsoleted. xprobe2 has a different approach to
+OS fingerprinting. xprobe2 relies on fuzzy signature matching, probabilistic
+guesses, multiple matches simultaneously, and a signature
+database.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/xprobe/xprobe-0.2.2.ebuild b/net-analyzer/xprobe/xprobe-0.2.2.ebuild
index 663a78dddd21..651cb2f0b91a 100644
--- a/net-analyzer/xprobe/xprobe-0.2.2.ebuild
+++ b/net-analyzer/xprobe/xprobe-0.2.2.ebuild
@@ -1,42 +1,28 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/xprobe-0.2.2.ebuild,v 1.1 2005/02/17 13:45:17 radek Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/xprobe-0.2.2.ebuild,v 1.1.1.1 2005/11/30 10:12:05 chriswhite Exp $
 
 # This is new xprobe, so called xprobe2, due to xprobe1 being obsoleted.
-# xprobe 2 has different approach to operating system fingerprinting. 
+# xprobe 2 has different approach to operating system fingerprinting.
 # Xprobe2 rely on fuzzy signature matching, probabilistic guesses, multiple
 # matches simultaneously, and a signature database.
-#
+
 DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
 SRC_URI="mirror://sourceforge/${PN}/${PN}2-${PV}.tar.gz"
-HOMEPAGE="http://www.sys-security.com/html/projects/X.html"
+HOMEPAGE="http://www.sys-security.com/index.php?page=xprobe"
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
-
-DEPEND="virtual/libpcap"
 IUSE=""
 
-src_unpack() {
-
-	unpack ${A}
-}
+DEPEND="virtual/libpcap"
 
-src_compile() {
-
-	cd "${WORKDIR}/${PN}2-${PV}"
-	econf || die "could not configure"
-	emake || die "could not make"
-}
+S="${WORKDIR}/${PN}2-${PV}"
 
 src_install () {
-	cd "${WORKDIR}/${PN}2-${PV}"
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS CREDITS COPYING
+	dodoc AUTHORS CREDITS
 	dodoc CHANGELOG TODO README
 	dodoc docs/*
 }
-
diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3.ebuild
index 7f0b09786be1..06a906af25de 100644
--- a/net-analyzer/xprobe/xprobe-0.3.ebuild
+++ b/net-analyzer/xprobe/xprobe-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/net-analyzer/xprobe/xprobe-0.3.ebuild,v 1.1 2005/07/31 17:52:34 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xprobe/xprobe-0.3.ebuild,v 1.1.1.1 2005/11/30 10:12:06 chriswhite Exp $
 
 MY_P="${PN}2-${PV}"
 DESCRIPTION="Active OS fingerprinting tool - this is Xprobe2"
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.sys-security.com/index.php?page=xprobe"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/libpcap"
@@ -17,5 +17,5 @@ S="${WORKDIR}/${MY_P}"
 
 src_install () {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS CREDITS COPYING CHANGELOG TODO README docs/*
+	dodoc AUTHORS CREDITS CHANGELOG TODO README docs/*
 }
diff --git a/net-analyzer/xtraceroute/ChangeLog b/net-analyzer/xtraceroute/ChangeLog
index 90ea51ee55a7..1a11b39b4fa8 100644
--- a/net-analyzer/xtraceroute/ChangeLog
+++ b/net-analyzer/xtraceroute/ChangeLog
@@ -1,11 +1,61 @@
 # ChangeLog for net-analyzer/xtraceroute
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xtraceroute/ChangeLog,v 1.1 2002/06/28 11:54:12 bangert Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xtraceroute/ChangeLog,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
+  03 Sep 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  xtraceroute-0.9.1.ebuild:
+  Changed note to reference eselect instead of opengl-update.
+
+  15 Jul 2005; George Shapovalov <george@gentoo.org> xtraceroute-0.9.1.ebuild:
+  changed dependency net-misc/host -> net-dns/host to account for package move
+
+  30 May 2005; Marcus D. Hanwell <marcus@gentoo.org>
+  xtraceroute-0.9.1.ebuild:
+  Stable on amd64.
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -xtraceroute-0.9.0.ebuild:
+  Removing old ebuild.
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> xtraceroute-0.9.1.ebuild:
+  Fixed problem with head. Closes #63019.
+
+  27 Jul 2004; <malc@gentoo.org> xtraceroute-0.9.1.ebuild:
+  Add ~amd64, closes bug #57735
+
+  21 Jul 2004; Eldad Zack <eldad@gentoo.org> xtraceroute-0.9.1.ebuild:
+  Added information about recurring problem with gtkglarea-1.2.3-r1 needing to
+  opengl-update prior to building xtraceroute. Thanks to je_fro
+  <jeff2712@yahoo.com>. Closes #57504.
+
+  15 Jul 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  xtraceroute-0.9.1.ebuild:
+  Stable on sparc
+
+  11 Jul 2004; Eldad Zack <eldad@gentoo.org> xtraceroute-0.9.1.ebuild:
+  marked x86 stable
+
+*xtraceroute-0.9.1 (04 Jun 2004)
+
+  04 Jun 2004; Jon Hood <squinky86@gentoo.org> +metadata.xml,
+  +xtraceroute-0.9.1.ebuild:
+  version bump, closes #51707
+
+  29 Apr 2004; David Holm <dholm@gentoo.org> xtraceroute-0.9.0.ebuild:
+  Added to ~ppc.
+
+  10 Oct 2003; Michael Sterrett <mr_bones_@gentoo.org>
+  xtraceroute-0.9.0.ebuild:
+  add nls USE flag support; more error messages; tidy
+
+  01 Aug 2003; Aron Griffis <agriffis@gentoo.org> xtraceroute-0.9.0.ebuild:
+  Fix bug 25395 by specifying --from-code=ISO-8859-1
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
   moved to net-analyzer - added SLOT
 
-*xtraceroute-0.9.0,  (10 May 2002)
+*xtraceroute-0.9.0 (10 May 2002)
 
   11 May 2002; G Shapovalov <george@gentoo.org> ChangeLog :
 
diff --git a/net-analyzer/xtraceroute/Manifest b/net-analyzer/xtraceroute/Manifest
index e69de29bb2d1..527c810197b7 100644
--- a/net-analyzer/xtraceroute/Manifest
+++ b/net-analyzer/xtraceroute/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f165801229e83fc27c60146d8a07b05a ChangeLog 2187
+MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 c85e938b2e6842f9ea43ae2e86844f1b xtraceroute-0.9.1.ebuild 1767
+MD5 890ee7981ab95097dfc101e8880bd66a files/digest-xtraceroute-0.9.1 130
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDGidjArHZZzCEUG0RAlQ9AJ9vni9uHdsL4KK950il/ZfTMdAxRwCdGcgd
+6H7Sw/WoN30mzAfzp4dnpic=
+=tCa7
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/xtraceroute/xtraceroute-0.9.1.ebuild b/net-analyzer/xtraceroute/xtraceroute-0.9.1.ebuild
index 21f7126d0fcd..a57f7792bceb 100644
--- a/net-analyzer/xtraceroute/xtraceroute-0.9.1.ebuild
+++ b/net-analyzer/xtraceroute/xtraceroute-0.9.1.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/net-analyzer/xtraceroute/xtraceroute-0.9.1.ebuild,v 1.1 2004/06/04 20:40:58 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/xtraceroute/xtraceroute-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:12:13 chriswhite Exp $
 
 DESCRIPTION="neat graphical traceroute displaying route on the globe"
 SRC_URI="http://www.dtek.chalmers.se/~d3august/xt/dl/${P}.tar.gz
 	http://www.dtek.chalmers.se/~d3august/xt/dl/ndg_files.tar.gz"
 HOMEPAGE="http://www.dtek.chalmers.se/~d3august/xt/"
 
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="amd64 ~ppc sparc x86"
 LICENSE="GPL-2"
 SLOT="0"
 
@@ -18,9 +18,13 @@ DEPEND="virtual/x11
 	net-analyzer/traceroute
 	<x11-libs/gtkglarea-1.99.0
 	media-libs/gdk-pixbuf
-	net-misc/host"
+	net-dns/host"
 
 src_compile() {
+
+	# Fix 'head' problem, Bug #63019 (21 Nov 2004 eldad)
+	sed -i -e 's/head -1/head -n 1/' share/xtraceroute-resolve-location.sh.in
+
 	# specify --from-code to fix bug 25395 (01 Aug 2003 agriffis)
 	XGETTEXT='/usr/bin/xgettext --from-code=ISO-8859-1' \
 	./configure \
@@ -29,7 +33,17 @@ src_compile() {
 		--prefix=/usr \
 		--with-host=/usr/bin/hostx \
 		--infodir=/usr/share/info \
-		--mandir=/usr/share/man || die "./configure failed"
+		--mandir=/usr/share/man
+
+	if [ $? != 0 ]; then
+		echo
+		eerror "If configure fails with 'Cannot find proper gtkgl version'"
+		eerror "try to 'eselect opengl' and then re-emerge =gtkglarea-1.2.3*."
+		eerror "# eselect opengl set <GL implementation>"
+		eerror "# emerge =gtkglarea-1.2.3*"
+		echo
+		die "configure failed."
+	fi
 
 	emake || die "emake failed"
 }
diff --git a/net-analyzer/zabbix-agent/ChangeLog b/net-analyzer/zabbix-agent/ChangeLog
index 3e52fc7d193f..1abfad748772 100644
--- a/net-analyzer/zabbix-agent/ChangeLog
+++ b/net-analyzer/zabbix-agent/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-analyzer/zabbix-agent
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/ChangeLog,v 1.1 2005/04/26 21:46:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/ChangeLog,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  zabbix-agent-1.1_alpha7.ebuild:
+  Use -1 instead of /bin/false on enewuser call.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org> zabbix-agent-1.1_alpha7.ebuild:
+  Added to ~ppc.
+
+  26 Apr 2005; Brian Jackson <iggy@gentoo.org> metadata.xml:
+  fixed metadata.xml
 
 *zabbix-agent-1.1_alpha7 (26 Apr 2005)
 *zabbix-agent-1.0 (26 Apr 2005)
diff --git a/net-analyzer/zabbix-agent/Manifest b/net-analyzer/zabbix-agent/Manifest
index 239d2063c7da..1203b5e35abb 100644
--- a/net-analyzer/zabbix-agent/Manifest
+++ b/net-analyzer/zabbix-agent/Manifest
@@ -1,22 +1,24 @@
-MD5 c8b3aadf5a20e70ac7191421108443b6 ChangeLog 1033
-MD5 87e116d55a0b46ca2ad90540ae28e6e3 metadata.xml 264
-MD5 666a046d859faca6fd874de9da9f69d0 zabbix-agent-1.0.ebuild 1623
-MD5 526a685499b13aec0c31e10e2ba631c8 zabbix-agent-1.1_alpha5.ebuild 1645
-MD5 29166a813b654da428a61a6b009eb822 zabbix-agent-1.1_alpha7.ebuild 1652
-MD5 29166a813b654da428a61a6b009eb822 zabbix-agent-1.1_alpha5-r1.ebuild 1652
-MD5 44d6c3f823d9eee301130916100fd8fb files/digest-zabbix-agent-1.0 63
-MD5 ea360bd7734b3dd1d730c8ae9b6a14b9 files/digest-zabbix-agent-1.1_alpha5 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 67b38f4a647a546571b383feea9dbd79 ChangeLog 2066
+MD5 80ff384524561533482492cd99da3348 zabbix-agent-1.0.ebuild 1701
+MD5 b1db95a637a4d01f39e5f20b09dbfeeb zabbix-agent-1.1_alpha7.ebuild 1739
+MD5 00648db30cf75f155ed226e0d42c8626 metadata.xml 341
 MD5 4990ea7476a1a66671f7faf9b1c93719 files/digest-zabbix-agent-1.1_alpha7 68
-MD5 ea360bd7734b3dd1d730c8ae9b6a14b9 files/digest-zabbix-agent-1.1_alpha5-r1 68
+MD5 44d6c3f823d9eee301130916100fd8fb files/digest-zabbix-agent-1.0 63
 MD5 909c827e35c478944b9b7ba470d1e31d files/1.0/zabbix_agent.conf 1124
 MD5 6a60283a6c3b457428af0c79ce1774b3 files/1.0/zabbix_agentd.conf 1956
-MD5 909c827e35c478944b9b7ba470d1e31d files/1.1_alpha5/zabbix_agent.conf 1124
-MD5 6a60283a6c3b457428af0c79ce1774b3 files/1.1_alpha5/zabbix_agentd.conf 1956
 MD5 dca8d533925687d02825a5401e723c3d files/1.1_alpha7/zabbix_agent.conf 1129
 MD5 03be35f02a504402ea6355782675b139 files/1.1_alpha7/zabbix_agentd.conf 1961
-MD5 6426b1212530786e6fef78039605e1fb files/1.0/init.d/zabbix-agentd 403
-MD5 37ec3a7466aa6407cec028ac781a4cc5 files/1.0/conf.d/zabbix-agentd 214
-MD5 6426b1212530786e6fef78039605e1fb files/1.1_alpha5/init.d/zabbix-agentd 403
-MD5 37ec3a7466aa6407cec028ac781a4cc5 files/1.1_alpha5/conf.d/zabbix-agentd 214
-MD5 6426b1212530786e6fef78039605e1fb files/1.1_alpha7/init.d/zabbix-agentd 403
-MD5 37ec3a7466aa6407cec028ac781a4cc5 files/1.1_alpha7/conf.d/zabbix-agentd 214
+MD5 c98787ba2f94c526ecfef18318b2cbb4 files/1.0/init.d/zabbix-agentd 525
+MD5 3d23f2a55281f4dee207ba003058583b files/1.0/conf.d/zabbix-agentd 330
+MD5 d7e8783f3e9d21287a92ed332dd5dc09 files/1.1_alpha7/init.d/zabbix-agentd 532
+MD5 3c18418797fcdcbc7d1f20f3bea2591f files/1.1_alpha7/conf.d/zabbix-agentd 337
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC1uoj5H05b2HAEkRApugAJ9+IJbvnCUAZ4GAQ/E2Awidn8tgCACgk6di
+oh5fzfl5bp+OWp2ulppvSG0=
+=7Ejv
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix-agent/files/1.0/conf.d/zabbix-agentd b/net-analyzer/zabbix-agent/files/1.0/conf.d/zabbix-agentd
index 230d878c5ca4..ffdd960c8e61 100644
--- a/net-analyzer/zabbix-agent/files/1.0/conf.d/zabbix-agentd
+++ b/net-analyzer/zabbix-agent/files/1.0/conf.d/zabbix-agentd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/files/1.0/conf.d/zabbix-agentd,v 1.1 2005/04/26 21:46:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/files/1.0/conf.d/zabbix-agentd,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 # Config file for /etc/conf.d/zabbix-agentd
 
diff --git a/net-analyzer/zabbix-agent/files/1.0/init.d/zabbix-agentd b/net-analyzer/zabbix-agent/files/1.0/init.d/zabbix-agentd
index 9623522edd37..624a5fbd3789 100644
--- a/net-analyzer/zabbix-agent/files/1.0/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix-agent/files/1.0/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/files/1.0/init.d/zabbix-agentd,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/net-analyzer/zabbix-agent/files/1.1_alpha7/conf.d/zabbix-agentd b/net-analyzer/zabbix-agent/files/1.1_alpha7/conf.d/zabbix-agentd
index eb5708c40d75..2de4910886d5 100644
--- a/net-analyzer/zabbix-agent/files/1.1_alpha7/conf.d/zabbix-agentd
+++ b/net-analyzer/zabbix-agent/files/1.1_alpha7/conf.d/zabbix-agentd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/files/1.1_alpha7/conf.d/zabbix-agentd,v 1.1 2005/04/26 21:46:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/files/1.1_alpha7/conf.d/zabbix-agentd,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 # Config file for /etc/conf.d/zabbix-agentd
 
diff --git a/net-analyzer/zabbix-agent/files/1.1_alpha7/init.d/zabbix-agentd b/net-analyzer/zabbix-agent/files/1.1_alpha7/init.d/zabbix-agentd
index 9623522edd37..f53be85dc772 100644
--- a/net-analyzer/zabbix-agent/files/1.1_alpha7/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix-agent/files/1.1_alpha7/init.d/zabbix-agentd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/files/1.1_alpha7/init.d/zabbix-agentd,v 1.1.1.1 2005/11/30 10:12:26 chriswhite Exp $
 
 opts="${opts} reload"
 
diff --git a/net-analyzer/zabbix-agent/metadata.xml b/net-analyzer/zabbix-agent/metadata.xml
index cfba83e0d3f8..ec5e1eecd67c 100644
--- a/net-analyzer/zabbix-agent/metadata.xml
+++ b/net-analyzer/zabbix-agent/metadata.xml
@@ -4,7 +4,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
   <maintainer>
-    <email>swtaylor@gentoo.org</email>
+    <email>iggy@gentoo.org</email>
   </maintainer>
   <longdescription>ZABBIX is software for monitoring of your applications, network and servers.</longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild b/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild
index 9ce36d5b9c3d..cfd4fa065248 100644
--- a/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild
+++ b/net-analyzer/zabbix-agent/zabbix-agent-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/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild,v 1.1 2005/04/26 21:46:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/zabbix-agent-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild b/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild
index 7cb7cfb08188..b7bc55f7f06d 100644
--- a/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild
+++ b/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.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/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild,v 1.1 2005/04/26 21:46:18 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-agent/zabbix-agent-1.1_alpha7.ebuild,v 1.1.1.1 2005/11/30 10:12:25 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/zabbix/${MY_P}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 IUSE=""
 
@@ -31,7 +31,7 @@ S=${WORKDIR}/${MY_P}-${MY_PV}
 
 pkg_setup() {
 	enewgroup zabbix
-	enewuser zabbix -1 /bin/false /dev/null zabbix
+	enewuser zabbix -1 -1 /dev/null zabbix
 }
 
 
diff --git a/net-analyzer/zabbix-frontend/ChangeLog b/net-analyzer/zabbix-frontend/ChangeLog
index 461bfa01222b..2e37ef7a1c90 100644
--- a/net-analyzer/zabbix-frontend/ChangeLog
+++ b/net-analyzer/zabbix-frontend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/zabbix-frontend
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-frontend/ChangeLog,v 1.1 2005/04/26 22:17:42 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-frontend/ChangeLog,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
+
+  19 Jul 2005; David Holm <dholm@gentoo.org>
+  zabbix-frontend-1.1_alpha7.ebuild:
+  Added to ~ppc.
 
 *zabbix-frontend-1.1_alpha7 (26 Apr 2005)
 
diff --git a/net-analyzer/zabbix-frontend/Manifest b/net-analyzer/zabbix-frontend/Manifest
index ff1fc88c925f..2485e23b6393 100644
--- a/net-analyzer/zabbix-frontend/Manifest
+++ b/net-analyzer/zabbix-frontend/Manifest
@@ -1,2 +1,4 @@
-MD5 e6894e1d42e5632a2895e55638763ef6 zabbix-frontend-1.1_alpha7.ebuild 627
+MD5 b994ddefe4d408dd583955a32d4853a2 ChangeLog 603
+MD5 00648db30cf75f155ed226e0d42c8626 metadata.xml 341
+MD5 f470d192246d10edc5f49522bb23ad6e zabbix-frontend-1.1_alpha7.ebuild 749
 MD5 4990ea7476a1a66671f7faf9b1c93719 files/digest-zabbix-frontend-1.1_alpha7 68
diff --git a/net-analyzer/zabbix-frontend/zabbix-frontend-1.1_alpha7.ebuild b/net-analyzer/zabbix-frontend/zabbix-frontend-1.1_alpha7.ebuild
index 6d1c99779ff0..b39bfe1aa2fb 100644
--- a/net-analyzer/zabbix-frontend/zabbix-frontend-1.1_alpha7.ebuild
+++ b/net-analyzer/zabbix-frontend/zabbix-frontend-1.1_alpha7.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/net-analyzer/zabbix-frontend/zabbix-frontend-1.1_alpha7.ebuild,v 1.1 2005/04/26 22:17:42 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-frontend/zabbix-frontend-1.1_alpha7.ebuild,v 1.1.1.1 2005/11/30 10:12:08 chriswhite Exp $
 
 inherit eutils webapp
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zabbix/${MY_P}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 RDEPEND="virtual/php"
 
@@ -28,7 +28,7 @@ src_install() {
 }
 
 pkg_postinst(){
-	einfo ""
+	einfo
 	einfo "For setting the SQL server settings, see include/db.inc.php"
-	einfo ""
+	einfo
 }
diff --git a/net-analyzer/zabbix-server/ChangeLog b/net-analyzer/zabbix-server/ChangeLog
index cb703bfc6256..0645274c8856 100644
--- a/net-analyzer/zabbix-server/ChangeLog
+++ b/net-analyzer/zabbix-server/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-analyzer/zabbix-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.1 2005/04/26 22:06:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/ChangeLog,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  zabbix-server-1.1_alpha7.ebuild:
+  Use -1 instead of /bin/false on enewuser call.
+
+  19 Jul 2005; David Holm <dholm@gentoo.org>
+  zabbix-server-1.1_alpha7.ebuild:
+  Added to ~ppc.
+
+  29 Apr 2005; Brian Jackson <iggy@gentoo.org>
+  files/1.0/init.d/zabbix-suckerd, files/1.0/init.d/zabbix-trapperd,
+  files/1.1_alpha7/init.d/zabbix-server:
+  fixup the init scripts
 
 *zabbix-server-1.1_alpha7 (26 Apr 2005)
 *zabbix-server-1.0 (26 Apr 2005)
diff --git a/net-analyzer/zabbix-server/Manifest b/net-analyzer/zabbix-server/Manifest
index 45afb7b0b944..3206e1510cd3 100644
--- a/net-analyzer/zabbix-server/Manifest
+++ b/net-analyzer/zabbix-server/Manifest
@@ -1,18 +1,28 @@
-MD5 d6d5bb6a7112de6d575e5083e77b3a82 zabbix-server-1.0.ebuild 3071
-MD5 365cb03ea9a0ebfccec19dbfd79b8c76 ChangeLog 1514
-MD5 246243519a5aa032275c5e30d7809709 zabbix-server-1.1_alpha7.ebuild 2911
-MD5 87e116d55a0b46ca2ad90540ae28e6e3 metadata.xml 264
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 398d5b2459964351fd302178c99b8a69 zabbix-server-1.0.ebuild 3108
+MD5 5527376efd81520b8bcf4c92e00461fa ChangeLog 2816
+MD5 89646fde9d4a16939ec0599b1624d7d9 zabbix-server-1.1_alpha7.ebuild 2926
+MD5 00648db30cf75f155ed226e0d42c8626 metadata.xml 341
 MD5 44d6c3f823d9eee301130916100fd8fb files/digest-zabbix-server-1.0 63
 MD5 4990ea7476a1a66671f7faf9b1c93719 files/digest-zabbix-server-1.1_alpha7 68
 MD5 4dbd247f56a8f798505fcd22a47a5b64 files/1.0/zabbix_suckerd.conf 1825
-MD5 1efa7eb89acc8800f985323d3193fa2e files/1.0/zabbix_trapper.conf 770
 MD5 1a70ae90c2e9f4e94bc5798c80a01697 files/1.0/zabbix_trapperd.conf 1197
+MD5 1efa7eb89acc8800f985323d3193fa2e files/1.0/zabbix_trapper.conf 770
+MD5 cdfb81599cdbef1978ae712aba19d878 files/1.1_alpha7/zabbix_server.conf 2063
 MD5 6fcb3e9aa99f741618094b6d5e482e2f files/1.1_alpha7/zabbix-snmpv3.fix.patch 2010
 MD5 9832a81e134c8e2c11e2a06b7adbf88f files/1.1_alpha7/zabbix_trapper.conf 762
-MD5 cdfb81599cdbef1978ae712aba19d878 files/1.1_alpha7/zabbix_server.conf 2063
-MD5 e2388b8100999e9298717ec0b03d444b files/1.0/conf.d/zabbix-suckerd 216
-MD5 b9748453c8fc51992f1ea58f04f5c226 files/1.0/conf.d/zabbix-trapperd 218
-MD5 ad09743d6e57844d88965baa9d3149ac files/1.0/init.d/zabbix-suckerd 391
-MD5 22319696aa92352a8ffe14a35c8e657e files/1.0/init.d/zabbix-trapperd 394
-MD5 e9b8c902eacbad3c8422a8df37abfa4a files/1.1_alpha7/conf.d/zabbix-server 214
-MD5 d4845b8a0f65827489a1d61ca8805c4e files/1.1_alpha7/init.d/zabbix-server 389
+MD5 5bcc174b701a0bb701392c2cb7e692e8 files/1.0/init.d/zabbix-suckerd 530
+MD5 f7c6c922206cf9c162a9ab5a7aa66514 files/1.0/init.d/zabbix-trapperd 534
+MD5 ee29fececd9e7e7b108b691b854020b0 files/1.0/conf.d/zabbix-suckerd 334
+MD5 982b22f8da53a2810028d9561177fdbb files/1.0/conf.d/zabbix-trapperd 337
+MD5 eecfecec3c84a8972e98068fbe981b50 files/1.1_alpha7/init.d/zabbix-server 534
+MD5 e4dd6d5b2b1a84b5b1f74ab450e2b50b files/1.1_alpha7/conf.d/zabbix-server 338
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC1tnj5H05b2HAEkRApX8AKClQMuP9wBfo6E3r7mokbQGTnn/pwCeI9Ul
+DJr6BworVe5SecJo2Ane+Do=
+=4bOw
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-suckerd b/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-suckerd
index 21aaa67cf544..bca30a2621ac 100644
--- a/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-suckerd
+++ b/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-suckerd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-suckerd,v 1.1 2005/04/26 22:06:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-suckerd,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 # Config file for /etc/conf.d/zabbix-suckerd
 
diff --git a/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-trapperd b/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-trapperd
index 3ac0f41e73cd..a70322a55785 100644
--- a/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-trapperd
+++ b/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-trapperd
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-trapperd,v 1.1 2005/04/26 22:06:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.0/conf.d/zabbix-trapperd,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 # Config file for /etc/conf.d/zabbix-trapperd
 
diff --git a/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-suckerd b/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-suckerd
index fce258189046..fe05013a6ccd 100644
--- a/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-suckerd
+++ b/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-suckerd
@@ -1,12 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-suckerd,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 opts="${opts} reload"
 
 depend() {
-		need net mysql
+	need net
+	use mysql postgresql
 }
 
 start() {
diff --git a/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-trapperd b/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-trapperd
index 380a6e9acd37..e4019ccf1862 100644
--- a/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-trapperd
+++ b/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-trapperd
@@ -1,12 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.0/init.d/zabbix-trapperd,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 opts="${opts} reload"
 
 depend() {
-		need net mysql
+	need net
+	use mysql postgresql
 }
 
 start() {
diff --git a/net-analyzer/zabbix-server/files/1.1_alpha7/conf.d/zabbix-server b/net-analyzer/zabbix-server/files/1.1_alpha7/conf.d/zabbix-server
index 3baba1223abe..6c6a5ad8e658 100644
--- a/net-analyzer/zabbix-server/files/1.1_alpha7/conf.d/zabbix-server
+++ b/net-analyzer/zabbix-server/files/1.1_alpha7/conf.d/zabbix-server
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.1_alpha7/conf.d/zabbix-server,v 1.1 2005/04/26 22:06:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.1_alpha7/conf.d/zabbix-server,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 # Config file for /etc/conf.d/zabbix-server
 
diff --git a/net-analyzer/zabbix-server/files/1.1_alpha7/init.d/zabbix-server b/net-analyzer/zabbix-server/files/1.1_alpha7/init.d/zabbix-server
index f272d74b5ebe..903cbec62651 100644
--- a/net-analyzer/zabbix-server/files/1.1_alpha7/init.d/zabbix-server
+++ b/net-analyzer/zabbix-server/files/1.1_alpha7/init.d/zabbix-server
@@ -1,12 +1,13 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/files/1.1_alpha7/init.d/zabbix-server,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 #opts="${opts} reload"
 
 depend() {
-		need net mysql
+	need net
+	use mysql postgresql
 }
 
 start() {
diff --git a/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild
index 535b8564cdcf..02609aabdfbd 100644
--- a/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild
+++ b/net-analyzer/zabbix-server/zabbix-server-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/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild,v 1.1 2005/04/26 22:06:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.0.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild b/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild
index b9dbd88a4a86..ee3ef7dda50e 100644
--- a/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild
+++ b/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.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/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild,v 1.1 2005/04/26 22:06:07 iggy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix-server/zabbix-server-1.1_alpha7.ebuild,v 1.1.1.1 2005/11/30 10:12:11 chriswhite Exp $
 
 inherit eutils
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/zabbix/${MY_P}-${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 IUSE="snmp mysql postgres"
 
@@ -29,7 +29,7 @@ S=${WORKDIR}/${MY_P}-${MY_PV}
 
 pkg_setup() {
 	enewgroup zabbix
-	enewuser zabbix -1 /bin/false /dev/null zabbix
+	enewuser zabbix -1 -1 /dev/null zabbix
 }
 
 src_unpack() {
diff --git a/net-analyzer/zodiac/ChangeLog b/net-analyzer/zodiac/ChangeLog
index ceb52ffb42e0..33c6bc28cc00 100644
--- a/net-analyzer/zodiac/ChangeLog
+++ b/net-analyzer/zodiac/ChangeLog
@@ -1,8 +1,24 @@
 # ChangeLog for net-analyzer/zodiac
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/ChangeLog,v 1.1 2003/02/26 02:55:12 vapier Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/ChangeLog,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
+
+  29 Jan 2005; Daniel Black <dragonheart@gentoo.org> zodiac-0.4.9-r1.ebuild,
+  zodiac-0.4.9.ebuild:
+  changed net-libs/libpcap depend to virtual/libcap
+
+  10 Jul 2004; Eldad Zack <eldad@gentoo.org> +metadata.xml,
+  zodiac-0.4.9-r1.ebuild, zodiac-0.4.9.ebuild:
+  Added missing IUSE. Added metadata.
+
+*zodiac-0.4.9-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *zodiac-0.4.9 (25 Feb 2003)
 
+  07 Mar 2003; Martin Holzer <mholzer@gentoo.org> zodiac-0.4.9.ebuild :
+  Fixed Depend to libnet-1.0*. Closes #17017.
+
   25 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me for #11784.
diff --git a/net-analyzer/zodiac/Manifest b/net-analyzer/zodiac/Manifest
index e69de29bb2d1..ea9332534d79 100644
--- a/net-analyzer/zodiac/Manifest
+++ b/net-analyzer/zodiac/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 00ad67f6b0e013c9f9ff51ab327058f5 ChangeLog 910
+MD5 9d50dc1be3426aae869374880067a371 zodiac-0.4.9-r1.ebuild 937
+MD5 456fe4e64c0fd3de60cdcab00c471083 zodiac-0.4.9.ebuild 789
+MD5 f91d9123c97f69351203d3930bd4c2a8 metadata.xml 216
+MD5 5975e291b98f9130cb34be64d7e8aeac files/0.4.9-libnet-1.0.patch 1921
+MD5 512754e3be6eb5e2866a9bd5817ee7b0 files/digest-zodiac-0.4.9 63
+MD5 512754e3be6eb5e2866a9bd5817ee7b0 files/digest-zodiac-0.4.9-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB+xtcmdTrptrqvGERAnIbAJ9rjl7PXwKcinQr+pPj0elcsRNeeACeJ86V
+pboTc6Cw41uJEvIVonmvA7g=
+=px/r
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/zodiac/zodiac-0.4.9-r1.ebuild b/net-analyzer/zodiac/zodiac-0.4.9-r1.ebuild
index cafa5f3b60b1..d06d53b329a7 100644
--- a/net-analyzer/zodiac/zodiac-0.4.9-r1.ebuild
+++ b/net-analyzer/zodiac/zodiac-0.4.9-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/net-analyzer/zodiac/zodiac-0.4.9-r1.ebuild,v 1.1 2003/08/21 05:05:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/zodiac-0.4.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
 inherit eutils
 
@@ -10,14 +10,15 @@ SRC_URI="http://www.packetfactory.net/projects/zodiac/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 DEPEND="sys-libs/ncurses
-	>=net-libs/libnet-1.0.2a-r3
 	<net-libs/libnet-1.1
-	net-libs/libpcap"
+	>=net-libs/libnet-1.0.2a-r3
+	virtual/libpcap"
 
 S=${WORKDIR}/${PN}
+IUSE=""
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-analyzer/zodiac/zodiac-0.4.9.ebuild b/net-analyzer/zodiac/zodiac-0.4.9.ebuild
index ae05a67f48ef..df3be9720a62 100644
--- a/net-analyzer/zodiac/zodiac-0.4.9.ebuild
+++ b/net-analyzer/zodiac/zodiac-0.4.9.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/net-analyzer/zodiac/zodiac-0.4.9.ebuild,v 1.1 2003/02/26 02:55:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zodiac/zodiac-0.4.9.ebuild,v 1.1.1.1 2005/11/30 10:12:19 chriswhite Exp $
 
 DESCRIPTION="DNS protocol analyzer"
 HOMEPAGE="http://www.packetfactory.net/projects/zodiac/"
@@ -11,10 +11,11 @@ SLOT="0"
 KEYWORDS="x86"
 
 DEPEND="sys-libs/ncurses
-	net-libs/libnet
-	net-libs/libpcap"
+	=net-libs/libnet-1.0*
+	virtual/libpcap"
 
 S=${WORKDIR}/${PN}
+IUSE=""
 
 src_compile() {
 	cd src
diff --git a/net-firewall/arptables/ChangeLog b/net-firewall/arptables/ChangeLog
index f9f4a8c45596..e5bb73c1df9f 100644
--- a/net-firewall/arptables/ChangeLog
+++ b/net-firewall/arptables/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/arptables
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/ChangeLog,v 1.1 2004/02/28 09:33:02 solar Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> arptables-0.0.3.ebuild:
+  Added to ~ppc.
+
+  31 Jan 2005; Simon Stelling <blubb@gentoo.org> arptables-0.0.3.ebuild:
+  added ~amd64
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  arptables-0.0.3.ebuild:
+  virtual/glibc -> virtual/libc
 
 *arptables-0.0.3 (28 Feb 2004)
 
diff --git a/net-firewall/arptables/Manifest b/net-firewall/arptables/Manifest
index b8aec732c28f..e20c234d3913 100644
--- a/net-firewall/arptables/Manifest
+++ b/net-firewall/arptables/Manifest
@@ -1,2 +1,14 @@
-MD5 4ccbdd3a3e21eb0cc86b9300c8585f11 arptables-0.0.3.ebuild 626
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3eaf375e87551d0b332db3a82109c9d7 metadata.xml 221
+MD5 4a98111de235efe619eacbf3fbdf7a75 arptables-0.0.3.ebuild 650
+MD5 148c0f15f1fd05cfb4b80da55dbb26a4 ChangeLog 786
 MD5 dab844f5d0908181fa638560485b5cc2 files/digest-arptables-0.0.3 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDMh8qgIKl8Uu19MoRAnc2AJ9dq4vuz1y2p05AY6SV19ULYBvX/wCfYpKN
+6WQbs5PiyhHkWsZhbxExWiY=
+=PQrI
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/arptables/arptables-0.0.3.ebuild b/net-firewall/arptables/arptables-0.0.3.ebuild
index 7a8d9e73c590..7c0db5c950f9 100644
--- a/net-firewall/arptables/arptables-0.0.3.ebuild
+++ b/net-firewall/arptables/arptables-0.0.3.ebuild
@@ -1,26 +1,24 @@
-# 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/net-firewall/arptables/arptables-0.0.3.ebuild,v 1.1 2004/02/28 09:33:02 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/arptables/arptables-0.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 EXT=-2
-DESCRIPTION="Arptables is used to set up, maintain, and inspect the tables of ARP rules in the Linux kernel. It is analogous to iptables, but operates at the ARP layer rather than the IP layer."
+DESCRIPTION="set up, maintain, and inspect the tables of ARP rules in the Linux kernel"
+HOMEPAGE="http://ebtables.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ebtables/${PN}-v${PV}${EXT}.tar.gz"
 
-HOMEPAGE=""
-KEYWORDS="~x86"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
 
-S=${WORKDIR}/${PN}-v${PV}${EXT}/
-
-DEPEND="virtual/glibc"
+S=${WORKDIR}/${PN}-v${PV}${EXT}
 
 src_compile() {
-	cd ${S}
-	emake
+	emake || die
 }
 
 src_install() {
-	dodir /sbin/
-	einstall PREFIX=${D}/ MANDIR=${D}/usr/share/man/
+	dodir /sbin
+	einstall PREFIX=${D}/ MANDIR=${D}/usr/share/man/ || die
 }
diff --git a/net-firewall/dshieldpy/ChangeLog b/net-firewall/dshieldpy/ChangeLog
index fc79bddae3b4..1c1a0711b9d5 100644
--- a/net-firewall/dshieldpy/ChangeLog
+++ b/net-firewall/dshieldpy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/dshieldpy
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/dshieldpy/ChangeLog,v 1.1 2003/08/15 14:52:13 aliz Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/dshieldpy/ChangeLog,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> dshieldpy-3.2.ebuild:
+  Added to ~ppc.
 
 *dshieldpy-3.2 (15 Aug 2003)
 
diff --git a/net-firewall/dshieldpy/Manifest b/net-firewall/dshieldpy/Manifest
index 762aa17080da..ede08140f78a 100644
--- a/net-firewall/dshieldpy/Manifest
+++ b/net-firewall/dshieldpy/Manifest
@@ -1,2 +1,3 @@
-MD5 3de1998d1db6bc9ddced15d199108088 dshieldpy-3.2.ebuild 478
+MD5 c53dffcac7061763642c9827831ba022 ChangeLog 420
+MD5 e3cadc472a999c054140bf536ce62761 dshieldpy-3.2.ebuild 609
 MD5 21d8cc7b89f0736abc472f5584334db2 files/digest-dshieldpy-3.2 64
diff --git a/net-firewall/dshieldpy/dshieldpy-3.2.ebuild b/net-firewall/dshieldpy/dshieldpy-3.2.ebuild
index 3b306eca3960..98526191afd4 100644
--- a/net-firewall/dshieldpy/dshieldpy-3.2.ebuild
+++ b/net-firewall/dshieldpy/dshieldpy-3.2.ebuild
@@ -1,13 +1,13 @@
-# 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/net-firewall/dshieldpy/dshieldpy-3.2.ebuild,v 1.1 2003/08/15 14:52:13 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/dshieldpy/dshieldpy-3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
-DESCRIPTION="This is a sample skeleton ebuild file"
+DESCRIPTION="Python script to submit firewall logs to dshield.org"
 HOMEPAGE="http://dshieldpy.sourceforge.net/"
 SRC_URI="mirror://sourceforge/dshieldpy/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc x86"
 IUSE=""
 DEPEND="virtual/python"
 RDEPEND=""
diff --git a/net-firewall/ebtables/ChangeLog b/net-firewall/ebtables/ChangeLog
index 3bc37beb57e8..dd2ec0969d85 100644
--- a/net-firewall/ebtables/ChangeLog
+++ b/net-firewall/ebtables/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-firewall/ebtables
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.1 2004/02/28 09:25:14 solar Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  07 Jun 2005; <solar@gentoo.org> ebtables-2.0.6.ebuild:
+  - ebtables used the host compiler vs the cross compiler while merging. We use
+  toolchain-funcs now
+
+  31 Dec 2004; Sven Wegener <swegener@gentoo.org> ebtables-2.0.6.ebuild:
+  Moved inherit to the top. Don't use variables in HOMEPAGE. Use MY_P.
+
+  11 Dec 2004; <solar@gentoo.org> ebtables-2.0.6.ebuild:
+  stable on x86
+
+  24 Jul 2004; <solar@gentoo.org> ebtables-2.0.6.ebuild:
+  update for ebtables -p support. bug 58116. Reported by Andrej Kacian
+
+  19 Jul 2004; Travis Tilley <lv@gentoo.org>
+  +files/ebtables-2.0.6-gcc34.patch, ebtables-2.0.6.ebuild:
+  added 'inherit eutils', fixed compiling with gcc 3.4, and added ~amd64 keyword
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ebtables-2.0.6.ebuild:
+  virtual/glibc -> virtual/libc
+
+  19 Jun 2004; David Holm <dholm@gentoo.org> ebtables-2.0.6.ebuild:
+  Added to ~ppc.
 
 *ebtables-2.0.6 (28 Feb 2004)
 
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest
index a4ae763be603..28d304c80fd4 100644
--- a/net-firewall/ebtables/Manifest
+++ b/net-firewall/ebtables/Manifest
@@ -1,3 +1,17 @@
-MD5 6300572aedf512c1d24aa47b1203f71a ebtables-2.0.6.ebuild 518
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9979552c18681dd6edfe1e91f6717609 ebtables-2.0.6.ebuild 975
+MD5 3212022ecac9dfe74493b71305fe0ee3 ChangeLog 1347
 MD5 3eaf375e87551d0b332db3a82109c9d7 metadata.xml 221
+MD5 0488ef6b4eb8aa41352527597cb5d2ad files/ebtables-2.0.6-gcc34.patch 272
 MD5 72232fd4c734d316f9f588216d3228f2 files/digest-ebtables-2.0.6 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iQCVAwUBQqZUpJ4WFLgrx1GWAQIcsAQAxwinc5q0S1SvqJbV6t8loNMMDzqHgD0+
+lDB5XJYZNk97nMV+UQB4JATLz4aemyYfs0WULDYsi6E+nWzMP9s/l6WjZiQkebu5
+13nAS18+A+jW8gVTPQzhsAh4MUZ5klg+kSeOWRT52NRGyKOd6OszdsPZmiBNYvev
+NY8zv2L6izs=
+=y9pC
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ebtables/ebtables-2.0.6.ebuild b/net-firewall/ebtables/ebtables-2.0.6.ebuild
index 9140d24a5f4e..40bb964e703a 100644
--- a/net-firewall/ebtables/ebtables-2.0.6.ebuild
+++ b/net-firewall/ebtables/ebtables-2.0.6.ebuild
@@ -1,17 +1,35 @@
-# 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/net-firewall/ebtables/ebtables-2.0.6.ebuild,v 1.1 2004/02/28 09:25:14 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ebtables/ebtables-2.0.6.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P="${PN}-v${PV}"
 
 DESCRIPTION="Utility that enables basic Ethernet frame filtering on a Linux bridge, MAC NAT and brouting."
-SRC_URI="mirror://sourceforge/${PN}/${PN}-v${PV}.tar.gz"
-HOMEPAGE=""
-KEYWORDS="~x86"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://ebtables.sourceforge.net/"
+KEYWORDS="x86 ~ppc ~amd64"
+IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
 
-S=${WORKDIR}/${PN}-v${PV}/
+S="${WORKDIR}/${MY_P}"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# fix "label at end of compound statement" error that
+	# prevents ebtables from being compilable with >=gcc-3.4
+	epatch ${FILESDIR}/ebtables-2.0.6-gcc34.patch
+}
 
 src_install() {
 	dodir /sbin/
diff --git a/net-firewall/firehol/ChangeLog b/net-firewall/firehol/ChangeLog
index a4f1bbc836d3..19f9fe758bf8 100644
--- a/net-firewall/firehol/ChangeLog
+++ b/net-firewall/firehol/ChangeLog
@@ -1,6 +1,99 @@
 # ChangeLog for net-firewall/firehol
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.1 2003/04/05 19:20:22 cybersystem Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/ChangeLog,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
+
+  21 Apr 2005; Dominik Stadler <centic@gentoo.org> firehol-1.226-r1.ebuild:
+  Mark stable on x86
+
+  17 Mar 2005; Joseph Jezak <josejx@gentoo.org> firehol-1.226-r1.ebuild:
+  Marked ~ppc for bug #85474.
+
+  13 Feb 2005; Dominik Stadler <centic@gentoo.org> firehol-1.226-r1.ebuild:
+  Small fix to comments
+
+*firehol-1.226-r1 (12 Feb 2005)
+
+  12 Feb 2005; Dominik Stadler <centic@gentoo.org>
+  files/firehol.initrd:
+  Fix firehol.initrd with try-action. Fixes Bug 81313
+
+*firehol-1.226-r1 (12 Feb 2005)
+
+  12 Feb 2005; Dominik Stadler <centic@gentoo.org>
+  +files/firehol-1.226-to-228.patch, +firehol-1.226-r1.ebuild:
+  Add patch to include changes from 1.228 for embedded Gentoo-GNAP.
+  Also add check to make sure that iproute2 is not installed with 
+  USE="minimal", fixes Bug 81600.
+  
+
+  02 Feb 2005; Dominik Stadler <centic@gentoo.org> -firehol-1.191-r2.ebuild,
+  -firehol-1.214.ebuild:
+  Remove old versions.
+
+*firehol-1.226 (02 Feb 2005)
+
+  02 Feb 2005; Dominik Stadler <centic@gentoo.org> +firehol-1.226.ebuild:
+  Add new Version 1.226
+
+*firehol-1.224 (27 Jan 2005)
+
+  27 Jan 2005; Dominik Stadler <centic@gentoo.org>
+  +files/firehol-1.224-to-226.patch, +firehol-1.224.ebuild:
+  Add new version to fix security problems, see Bug 79330
+
+  30 Dec 2004; Dominik Stadler <centic@gentoo.org> firehol-1.159-r1.ebuild,
+  -firehol-1.159.ebuild, -firehol-1.191-r1.ebuild, firehol-1.191-r2.ebuild,
+  -firehol-1.191.ebuild, firehol-1.214.ebuild, -firehol-1.91.ebuild:
+  Remove old versions and mark stable on x86.
+
+  12 Nov 2004; Simon Stelling <blubb@gentoo.org> firehol-1.214.ebuild:
+  added ~amd64
+
+*firehol-1.214 (09 Nov 2004)
+
+  09 Nov 2004; Dominik Stadler <centic@gentoo.org> files/firehol.initrd,
+  +firehol-1.214.ebuild:
+  Add new Version 1.214, fix order of options in init-script
+
+*firehol-1.191-r2 (02 Oct 2004)
+
+  02 Oct 2004; Dominik Stadler <centic@gentoo.org> metadata.xml,
+  files/firehol.initrd, firehol-1.191-r1.ebuild, +firehol-1.191-r2.ebuild:
+  Add 1.191-r2 with enhanced init-script, fixes Bug 65718, thanks to Eric R.
+  Stoeckel, Jr. for the script. Update metadata.xml
+
+*firehol-1.191-r1 (01 Aug 2004)
+
+  01 Aug 2004; Dominik Stadler <centic@gentoo.org>
+  +files/firehol-1.191-bash-3.0.patch, +firehol-1.191-r1.ebuild:
+  Add patch to fix problems with bash-3.0, see Bug 59098
+
+*firehol-1.191 (18 May 2004)
+
+  18 May 2004; Dominik Stadler <centic@gentoo.org> +files/firehol.initrd,
+  +firehol-1.191.ebuild:
+  Add new Version 1.191, should fix Bug 49822 and also Bug 46487 and Bug 33428
+
+  03 May 2004; David Holm <dholm@gentoo.org> firehol-1.159-r1.ebuild:
+  Added to ~ppc.
+
+*firehol-1.159-r1 (02 May 2004)
+
+  02 May 2004; Dominik Stadler <centic@gentoo.org> +metadata.xml,
+  firehol-1.120.ebuild, +firehol-1.159-r1.ebuild, firehol-1.159.ebuild:
+  Avoid warnings because of deprectated command syntax when calling 'head'. Add
+  missing IUSE.
+
+*firehol-1.159 (14 Oct 2003)
+
+  14 Oct 2003; Martin Holzer <mholzer@gentoo.org> firehol-1.159.ebuild:
+  Version bumped. closes #31052.
+
+*firehol-1.120 (06 April 2003)
+
+  06 April 2003; Sascha Schwabbauer <cybersystem@gentoo.org> firehol-1.120.ebuild, files/digest-firehol-1.120 :
+
+  Version bump, again thanks to Maik Schreiber <blizzy@blizzy.de> in bug #18837
 
 *firehol-1.91 (05 April 2003)
 
diff --git a/net-firewall/firehol/Manifest b/net-firewall/firehol/Manifest
index e69de29bb2d1..0ecdfea49ee5 100644
--- a/net-firewall/firehol/Manifest
+++ b/net-firewall/firehol/Manifest
@@ -0,0 +1,17 @@
+MD5 1327142e6da8458136a6e3aec0f6d8ac ChangeLog 3665
+MD5 354dc2b953dae45ec818e9493f5f46a1 firehol-1.120.ebuild 1111
+MD5 9e95e869b12d85696a6faf1b1106daf1 firehol-1.224.ebuild 1637
+MD5 cd64ad4c0a154cfdde7e36757d61e758 firehol-1.226.ebuild 1494
+MD5 4086491e8b7c76b8138dc140f7742978 metadata.xml 232
+MD5 4efca5574b9f1e90a16df17797ef557c firehol-1.159-r1.ebuild 1101
+MD5 317b52d0e52a696fffd3a1355bc11f97 firehol-1.226-r1.ebuild 2015
+MD5 9217f80319c21b460ace2c676d2a8430 files/firehol.initrd 1212
+MD5 5bbd5e937bfbca1a18412642dd122eb6 files/digest-firehol-1.159-r1 65
+MD5 900023a168850621684489055919f9ed files/digest-firehol-1.120 65
+MD5 b1fe20f99ed0e74e40f3b11f1261b50b files/digest-firehol-1.224 66
+MD5 c38742ecf1870604915679223db730fd files/digest-firehol-1.226 66
+MD5 32a409eeb7b55602f5a83b77a8f1662b files/firehol-1.191-bash-3.0.patch 5663
+MD5 0d4eceaa49f1a12171145a685e42c015 files/firehol-1.226-to-228.patch 2311
+MD5 c38742ecf1870604915679223db730fd files/digest-firehol-1.226-r1 66
+MD5 76b78f59bdc0f07399dd54e1b756c3cb files/firehol.conf.d 70
+MD5 90281f0915d86f29b50587c1ff726b01 files/firehol-1.224-to-226.patch 2339
diff --git a/net-firewall/firehol/files/firehol-1.224-to-226.patch b/net-firewall/firehol/files/firehol-1.224-to-226.patch
index b0998f420179..1e6cf4c83b0f 100644
--- a/net-firewall/firehol/files/firehol-1.224-to-226.patch
+++ b/net-firewall/firehol/files/firehol-1.224-to-226.patch
@@ -5,24 +5,6 @@ retrieving revision 1.226
 diff -u -r1.224 -r1.226
 --- firehol/firehol/firehol.sh	2005/01/24 22:24:48	1.224
 +++ firehol/firehol/firehol.sh	2005/01/25 21:28:19	1.226
-@@ -10,7 +10,7 @@
- #
- # config: /etc/firehol/firehol.conf
- #
--# $Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
-+# $Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
- #
- 
- # Make sure only root can run us.
-@@ -114,7 +114,7 @@
- # Find our minor version
- firehol_minor_version() {
- ${CAT_CMD} <<"EOF" | ${CUT_CMD} -d ' ' -f 3 | ${CUT_CMD} -d '.' -f 2
--$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
-+$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
- EOF
- }
- 
 @@ -144,7 +144,7 @@
  # Directories and files
  
@@ -90,39 +72,3 @@ diff -u -r1.224 -r1.226
  	
  elif [ -f "/lib/modules/`${UNAME_CMD} -r`/build/.config" ]
  then
-@@ -5121,7 +5121,7 @@
- 		else
- 		
- 		${CAT_CMD} <<EOF
--$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
-+$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
- (C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
- FireHOL is distributed under GPL.
- 
-@@ -5307,7 +5307,7 @@
- 	
- 	${CAT_CMD} <<EOF
- 
--$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
-+$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
- (C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
- FireHOL is distributed under GPL.
- Home Page: http://firehol.sourceforge.net
-@@ -5601,7 +5601,7 @@
- 	
- 	"${CAT_CMD}" >&2 <<EOF
- 
--$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
-+$Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
- (C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
- FireHOL is distributed under GPL.
- Home Page: http://firehol.sourceforge.net
-@@ -5684,7 +5684,7 @@
- 	echo "# "
- 
- 	${CAT_CMD} <<EOF
--# $Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
-+# $Id: firehol-1.224-to-226.patch,v 1.1 2005/01/27 17:44:47 centic Exp $
- # (C) Copyright 2003, Costa Tsaousis <costa@tsaousis.gr>
- # FireHOL is distributed under GPL.
- # Home Page: http://firehol.sourceforge.net
diff --git a/net-firewall/firehol/files/firehol.initrd b/net-firewall/firehol/files/firehol.initrd
index 3724057d51c8..22efc77d1872 100644
--- a/net-firewall/firehol/files/firehol.initrd
+++ b/net-firewall/firehol/files/firehol.initrd
@@ -1,24 +1,66 @@
 #!/sbin/runscript
-# 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/net-firewall/firehol/files/firehol.initrd,v 1.1 2004/05/18 18:43:52 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/files/firehol.initrd,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
-opts="start stop"
+
+opts="start stop restart try status panic save"
 
 depend() {
-	need net
+	before net
 	provide firewall
 }
 
+checkrules() {
+	if [ ! -f ${FIREHOL_CONF} ]; then
+		eerror "Not starting FireHOL. Create ${FIREHOL_CONF}"
+		eerror "and fill it with some rules."
+		eerror "man firehol.conf for more info."
+		return 1
+	fi
+}
+
 start() {
+	checkrules || return 1
 	ebegin "Starting FireHOL"
-	/usr/sbin/firehol start 1>/dev/null
+		/usr/sbin/firehol ${FIREHOL_CONF} start > /dev/null
 	eend $? 
 }
 
 stop() {
 	ebegin "Stopping FireHOL"
-	/usr/sbin/firehol stop 1>/dev/null
+		/usr/sbin/firehol stop > /dev/null
+	eend $?
+}
+
+restart() {
+        ebegin "Restarting Firewall"
+                svc_stop;
+                svc_start;
+        eend $?
+}
+
+
+try() {
+	ebegin "Trying FireHOL configuration"
+	/usr/sbin/firehol ${FIREHOL_CONF} try
 	eend $?
 }
 
+status() {
+	ebegin "Showing FireHOL status"
+	/usr/sbin/firehol status
+	eend $?
+}
+
+panic() {
+	ebegin "FireHOL PANIC"
+	/usr/sbin/firehol panic
+	eend $?
+}
+
+save() {
+	ebegin "Saving FireHOL configuration"
+	/usr/sbin/firehol save
+	eend $?
+}
diff --git a/net-firewall/firehol/firehol-1.120.ebuild b/net-firewall/firehol/firehol-1.120.ebuild
index 0bb0394ac5f3..14e1d431f6ae 100644
--- a/net-firewall/firehol/firehol-1.120.ebuild
+++ b/net-firewall/firehol/firehol-1.120.ebuild
@@ -1,16 +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/net-firewall/firehol/firehol-1.120.ebuild,v 1.1 2003/04/06 10:47:21 cybersystem Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.120.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 DESCRIPTION="iptables firewall generator"
 HOMEPAGE="http://firehol.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
 KEYWORDS="x86"
 
 RDEPEND="net-firewall/iptables
-	sys-apps/iproute"
+	sys-apps/iproute2"
 
 src_compile() {
 	mv firehol.sh firehol.sh.orig
diff --git a/net-firewall/firehol/firehol-1.159-r1.ebuild b/net-firewall/firehol/firehol-1.159-r1.ebuild
index f14984436e07..07720a357a9f 100644
--- a/net-firewall/firehol/firehol-1.159-r1.ebuild
+++ b/net-firewall/firehol/firehol-1.159-r1.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/net-firewall/firehol/firehol-1.159-r1.ebuild,v 1.1 2004/05/02 15:22:09 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.159-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 DESCRIPTION="iptables firewall generator"
 HOMEPAGE="http://firehol.sourceforge.net"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND="net-firewall/iptables
 	sys-apps/iproute2"
diff --git a/net-firewall/firehol/firehol-1.224.ebuild b/net-firewall/firehol/firehol-1.224.ebuild
index a60a231630eb..03802bbabb6b 100644
--- a/net-firewall/firehol/firehol-1.224.ebuild
+++ b/net-firewall/firehol/firehol-1.224.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/net-firewall/firehol/firehol-1.224.ebuild,v 1.1 2005/01/27 17:44:47 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.224.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 RDEPEND="net-firewall/iptables
 	sys-apps/iproute2
diff --git a/net-firewall/firehol/firehol-1.226-r1.ebuild b/net-firewall/firehol/firehol-1.226-r1.ebuild
index 09110188ce9b..6aa1bde49be3 100644
--- a/net-firewall/firehol/firehol-1.226-r1.ebuild
+++ b/net-firewall/firehol/firehol-1.226-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/net-firewall/firehol/firehol-1.226-r1.ebuild,v 1.1 2005/02/12 20:40:35 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.226-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 
 RDEPEND="net-firewall/iptables
 	sys-apps/iproute2
@@ -22,7 +22,7 @@ RDEPEND="net-firewall/iptables
 	)"
 
 pkg_setup() {
-	# Bug 81600 fail if iproute2 is built without minimal
+	# Bug 81600 fail if iproute2 is built with minimal
 	if built_with_use sys-apps/iproute2 minimal; then
 		eerror "Firehol requires iproute2 to be emerged without"
 		eerror "the USE-Flag \"minimal\"."
diff --git a/net-firewall/firehol/firehol-1.226.ebuild b/net-firewall/firehol/firehol-1.226.ebuild
index 6aef606b1f9d..dbf0775d640d 100644
--- a/net-firewall/firehol/firehol-1.226.ebuild
+++ b/net-firewall/firehol/firehol-1.226.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/net-firewall/firehol/firehol-1.226.ebuild,v 1.1 2005/02/02 20:33:13 centic Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.226.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-firewall/firehol/metadata.xml b/net-firewall/firehol/metadata.xml
index 20ce219711a2..3db6319a8af1 100644
--- a/net-firewall/firehol/metadata.xml
+++ b/net-firewall/firehol/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>no-herd</herd>
+<maintainer>
+  <email>centic@gentoo.org</email>
+  <name>Dominik Stadler</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/firestarter/ChangeLog b/net-firewall/firestarter/ChangeLog
index 53b7cd354e0f..f084006ee960 100644
--- a/net-firewall/firestarter/ChangeLog
+++ b/net-firewall/firestarter/ChangeLog
@@ -1,10 +1,106 @@
-# ChangeLog for net-misc/firestarter
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# Author: Jos� Alberto Su�rez L�pez <bass@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/ChangeLog,v 1.1 2003/02/09 16:50:36 mholzer Exp $
- 
+# ChangeLog for net-firewall/firestarter
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  03 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/firestarter-0.9.2-kernel_2.6_fix.patch,
+  -firestarter-0.9.2-r1.ebuild, -firestarter-0.9.3.ebuild:
+  remove old version 0.9 files and ebuilds
+
+  01 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  firestarter-1.0.3.ebuild:
+  Stable for sparc, closing Bug 99688, at request of Mr_Bones_.
+
+  01 Aug 2005; Joseph Jezak <josejx@gentoo.org> firestarter-1.0.3.ebuild:
+  Marked ppc stable for bug #99688.
+
+  22 Jul 2005; Herbie Hopkins <herbs@gentoo.org> firestarter-1.0.3.ebuild:
+  Stable on amd64 wrt bug #99688.
+
+  22 Jul 2005; Markus Rothe <corsair@gentoo.org> firestarter-1.0.3.ebuild:
+  Stable on ppc64 (bug #99688)
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  firestarter-0.9.3.ebuild, firestarter-1.0.3.ebuild:
+  Stable on alpha.
+
+  10 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  firestarter-1.0.3.ebuild:
+  stable for x86
+
+  21 May 2005; Bryan Østergaard <kloeri@gentoo.org>
+  firestarter-0.9.3.ebuild:
+  Stable on alpha.
+
+*firestarter-1.0.3 (10 May 2005)
+
+  10 May 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/firestarter-1.0.3, firestarter-0.9.3.ebuild,
+  +firestarter-1.0.3.ebuild:
+  version bump to 1.0.3 (currently masked until testing is done); stablize
+  0.9.3 for x86.
+  init script from Ryan Stinnett, ebuild additions from Russell Chait
+  (bug #76450)
+
+  03 May 2005; Aron Griffis <agriffis@gentoo.org> firestarter-0.9.3.ebuild:
+  stable on amd64
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
+  firestarter-0.9.2-r1.ebuild:
+  Stable on ppc.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  28 Sep 2004; Simon Stelling <blubb@gentoo.org> firestarter-0.9.3.ebuild:
+  added ~amd64
+
+  29 Aug 2004; Tom Gall <tgall@gentoo.org> firestarter-0.9.3.ebuild:
+  added ~ppc64 bug #60780
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org>
+  firestarter-0.9.2-r1.ebuild:
+  Stable on alpha.
+
+  04 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  firestarter-0.8.3.ebuild, firestarter-0.9.2.ebuild,
+  files/firestarter-0.9.1-gcc2_fixes.patch:
+  clean out old ebuilds and files
+
+*firestarter-0.9.3 (04 Jun 2004)
+
+  04 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  firestarter-0.9.3.ebuild:
+  version bump (bug #52468)
+
+*firestarter-0.9.2-r1 (06 Dec 2003)
+
+  06 Dec 2003; foser <foser@gentoo.org> firestarter-0.9.2-r1.ebuild :
+  Added patch to fix kernel 2.6 detection, patch taken from 
+  reported by James Lademann <jwlademann@myrealbox.com> in #32903
+
+  09 Jul 2003; Alastair Tse <liquidx@gentoo.org> firestarter-0.9.1.ebuild,
+  firestarter-0.9.2.ebuild:
+  added pkgconfig deps
+
+*firestarter-0.9.2 (12 Jun 2003)
+
+  12 Jun 2003; <msterret@gentoo.org> firestarter-0.9.2.ebuild:
+  version bump
+
 *firestarter-0.9.1 (31 Jan 2003)
 
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> firestarter-0.8.2.ebuild,
+  firestarter-0.8.3.ebuild, firestarter-0.9.0.ebuild,
+  firestarter-0.9.1.ebuild:
+  changed sys-apps/iptables to net-firewall/iptables
+
+  04 Mar 2003; Aron Griffis <agriffis@gentoo.org> firestarter-0.9.1.ebuild:
+  Mark stable on alpha
+
+  15 Feb 2003; foser <foser@gentoo.org> firestarter-0.9.1.ebuild :
+  Added gcc2 fixes patch kindly provided by <michael.sterrett@coat.com> (#15461)
+
   09 Feb 2003; Martin Holzer <mholzer@gentoo.org> :
   Moved from net-misc to net-firewall
 
diff --git a/net-firewall/firestarter/Manifest b/net-firewall/firestarter/Manifest
index e69de29bb2d1..e0c703da0d67 100644
--- a/net-firewall/firestarter/Manifest
+++ b/net-firewall/firestarter/Manifest
@@ -0,0 +1,5 @@
+MD5 4f0a940bc2890d6db486101ddcc920c0 metadata.xml 221
+MD5 a3ad4610a4bf4cbacd31b338395d1e5c firestarter-1.0.3.ebuild 1372
+MD5 3ec56e0f42199133138582497eedae1a ChangeLog 5048
+MD5 922be035ddca4574178cc2525738831d files/firestarter-1.0.3 1002
+MD5 2e24074660b59430a450e1d701d6e9e0 files/digest-firestarter-1.0.3 70
diff --git a/net-firewall/firestarter/files/firestarter-1.0.3 b/net-firewall/firestarter/files/firestarter-1.0.3
index fa107604ff5a..04d09525851f 100644
--- a/net-firewall/firestarter/files/firestarter-1.0.3
+++ b/net-firewall/firestarter/files/firestarter-1.0.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/files/firestarter-1.0.3,v 1.1 2005/05/10 05:43:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/files/firestarter-1.0.3,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 opts="${opts} lock"
 
diff --git a/net-firewall/firestarter/firestarter-1.0.3.ebuild b/net-firewall/firestarter/firestarter-1.0.3.ebuild
index 244165b52f67..77cd2eeae6e3 100644
--- a/net-firewall/firestarter/firestarter-1.0.3.ebuild
+++ b/net-firewall/firestarter/firestarter-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/net-firewall/firestarter/firestarter-1.0.3.ebuild,v 1.1 2005/05/10 05:43:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestarter/firestarter-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND=">=x11-libs/gtk+-2
diff --git a/net-firewall/firestarter/metadata.xml b/net-firewall/firestarter/metadata.xml
index a7ccd37b9234..3e4afe385a91 100644
--- a/net-firewall/firestarter/metadata.xml
+++ b/net-firewall/firestarter/metadata.xml
@@ -2,5 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<maintainer><email>msterret@gentoo.org</email></maintainer>
+<maintainer>
+<email>mr_bones_@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-firewall/firestorm/ChangeLog b/net-firewall/firestorm/ChangeLog
index cb99ea2d4661..0da94c21f023 100644
--- a/net-firewall/firestorm/ChangeLog
+++ b/net-firewall/firestorm/ChangeLog
@@ -1,6 +1,26 @@
-# ChangeLog for media-plugins/xmms-crossfade
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestorm/ChangeLog,v 1.1 2003/05/12 19:06:27 mholzer Exp $
+# ChangeLog for net-firewall/firestorm
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestorm/ChangeLog,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+*firestorm-0.5.5 (24 Nov 2004)
+
+  24 Nov 2004; Daniel Black <dragonheart@gentoo.org> +firestorm-0.5.5.ebuild:
+  version bump thanks to bug #72064. Bug report by cpu <cpu@ztpnet.pl>
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  firestorm-0.5.2.ebuild, firestorm-0.5.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> firestorm-0.5.4.ebuild:
+  Added to ~ppc.
+
+  16 Apr 2004; Michael McCabe <randy@gentoo.org> firestorm-0.5.4.ebuild:
+  adding s390 keywords
+
+*firestorm-0.5.4 (31 Mar 2004)
+
+  31 Mar 2004; Michael Boman <mboman@gentoo.org> firestorm-0.5.4.ebuild:
+  New upstream version. Closes 46032.
 
 *firestorm-0.5.2 (12 May 2003)
 
diff --git a/net-firewall/firestorm/Manifest b/net-firewall/firestorm/Manifest
index e29652eff207..fb16afe27cca 100644
--- a/net-firewall/firestorm/Manifest
+++ b/net-firewall/firestorm/Manifest
@@ -1,6 +1,17 @@
-MD5 068e5664c064315d811cd479f889f85d ChangeLog 1079
-MD5 5df32aa19f66e504ed7a587b67444451 firestorm-0.5.2.ebuild 627
-MD5 6d192017ad564f0f3919036bd851c9df files/digest-xmms-crossfade-0.2.9 72
-MD5 a6e09b517d5a7276b054ccc846c7aabd files/digest-xmms-crossfade-0.3.1 72
-MD5 e67409230d4aed82b9666593bccac058 files/digest-xmms-crossfade-0.3.2 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a71a3b703a06a5c000468c2f4195541a ChangeLog 1067
+MD5 5e1414eb19cc7a6f12f0781798464231 firestorm-0.5.2.ebuild 615
+MD5 7c17faba1f3c503b22169914de74d8c1 firestorm-0.5.4.ebuild 625
+MD5 4a0a986e8db5ac1ff443334f5b26225f firestorm-0.5.5.ebuild 630
 MD5 5fd77e2f02542a16e419af97f39edb06 files/digest-firestorm-0.5.2 67
+MD5 36474e9be9cd5c6d37f465ee7408d561 files/digest-firestorm-0.5.4 67
+MD5 c29ef45ce159d15a5bad558a335ab671 files/digest-firestorm-0.5.5 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBpJZNmdTrptrqvGERAvJ8AJwMwD2Af6pi/WSALV/Z0xtOpoQ94gCcDkA4
+stcbF6FoWSrwVsSuEN9v+qI=
+=slkR
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/firestorm/firestorm-0.5.2.ebuild b/net-firewall/firestorm/firestorm-0.5.2.ebuild
index f849582edd75..bd3ce244be10 100644
--- a/net-firewall/firestorm/firestorm-0.5.2.ebuild
+++ b/net-firewall/firestorm/firestorm-0.5.2.ebuild
@@ -1,17 +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/net-firewall/firestorm/firestorm-0.5.2.ebuild,v 1.1 2003/05/12 19:06:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestorm/firestorm-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network IDS"
 SRC_URI="http://www.scaramanga.co.uk/firestorm/v${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.scaramanga.co.uk/firestorm/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf || die
diff --git a/net-firewall/firestorm/firestorm-0.5.4.ebuild b/net-firewall/firestorm/firestorm-0.5.4.ebuild
index 9f8b30d6d21e..8b55bf209096 100644
--- a/net-firewall/firestorm/firestorm-0.5.4.ebuild
+++ b/net-firewall/firestorm/firestorm-0.5.4.ebuild
@@ -1,17 +1,17 @@
-# 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/net-firewall/firestorm/firestorm-0.5.4.ebuild,v 1.1 2004/03/31 10:04:42 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestorm/firestorm-0.5.4.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Network IDS"
 SRC_URI="http://www.scaramanga.co.uk/firestorm/v${PV}/${P}.tar.gz"
 HOMEPAGE="http://www.scaramanga.co.uk/firestorm/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 s390 ~ppc"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 
 src_compile() {
 	econf || die
diff --git a/net-firewall/firestorm/firestorm-0.5.5.ebuild b/net-firewall/firestorm/firestorm-0.5.5.ebuild
index 1e2dd9439bba..dd1737793e78 100644
--- a/net-firewall/firestorm/firestorm-0.5.5.ebuild
+++ b/net-firewall/firestorm/firestorm-0.5.5.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/net-firewall/firestorm/firestorm-0.5.5.ebuild,v 1.1 2004/11/24 14:10:15 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firestorm/firestorm-0.5.5.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 DESCRIPTION="Network IDS"
 SRC_URI="http://www.scaramanga.co.uk/firestorm/v${PV}/${P}.tar.gz"
diff --git a/net-firewall/fwanalog/ChangeLog b/net-firewall/fwanalog/ChangeLog
index ab899bc2c1a6..0961d7989add 100644
--- a/net-firewall/fwanalog/ChangeLog
+++ b/net-firewall/fwanalog/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for app-admin/fwanalog
-# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwanalog/ChangeLog,v 1.1 2004/06/06 10:49:32 dragonheart Exp $
+# ChangeLog for net-firewall/fwanalog
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwanalog/ChangeLog,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
+
+  16 Jun 2004; Jason Wever <weeve@gentoo.org> fwanalog-0.6.4.ebuild:
+  Stable on sparc.
+
+  06 Jun 2004; Daniel Black <dragonheart@gentoo.org>
+  -.#fwanalog-0.6.4.ebuild.1.3, fwanalog-0.6.4.ebuild,
+  metadata.xml:
+  x86 stable. cleanup from bad move
 
   06 Jun 2004; Daniel Black <dragonheart@gentoo.org>
   +.#fwanalog-0.6.4.ebuild.1.3, +fwanalog-0.4-r2.ebuild,
diff --git a/net-firewall/fwanalog/Manifest b/net-firewall/fwanalog/Manifest
index ad075768d2fa..ac31db6da8e1 100644
--- a/net-firewall/fwanalog/Manifest
+++ b/net-firewall/fwanalog/Manifest
@@ -1,7 +1,8 @@
+MD5 6fcdc681080eb974cf7e105918bce744 ChangeLog 1796
+MD5 1bef036e557235580f68ef9a124cb092 fwanalog-0.4-r2.ebuild 1064
+MD5 fd2b7050fb9b0e0959d4cc8ae07a9372 fwanalog-0.6.2.ebuild 1063
+MD5 87e2a0b0c69ddc87110fbad95ea836ce fwanalog-0.6.4.ebuild 1063
+MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
 MD5 2fb1753be7be4de2375fe436671df67e files/digest-fwanalog-0.4-r2 63
 MD5 b37fb766d36553b90635b5d71080444a files/digest-fwanalog-0.6.2 66
 MD5 ba212938784ef2ca1c8167f51ef821d7 files/digest-fwanalog-0.6.4 66
-MD5 30592ecfcb0c50ca58dce0f3f580b7d3 ChangeLog 1336
-MD5 1af9973198eee64c2bda6d6c18247b3b fwanalog-0.4-r2.ebuild 1069
-MD5 03abbaf9bdb1a5c0277e0bb83d0b2c3d fwanalog-0.6.2.ebuild 1068
-MD5 bfd2ad5f4d0d7d393fce3b1bb2c2cd65 fwanalog-0.6.4.ebuild 1070
diff --git a/net-firewall/fwanalog/fwanalog-0.4-r2.ebuild b/net-firewall/fwanalog/fwanalog-0.4-r2.ebuild
index 14f3cb4877be..62937a4f54a8 100644
--- a/net-firewall/fwanalog/fwanalog-0.4-r2.ebuild
+++ b/net-firewall/fwanalog/fwanalog-0.4-r2.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/net-firewall/fwanalog/fwanalog-0.4-r2.ebuild,v 1.1 2004/06/06 10:49:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwanalog/fwanalog-0.4-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
diff --git a/net-firewall/fwanalog/fwanalog-0.6.2.ebuild b/net-firewall/fwanalog/fwanalog-0.6.2.ebuild
index 0c34f8ff4b81..528151726ec9 100644
--- a/net-firewall/fwanalog/fwanalog-0.6.2.ebuild
+++ b/net-firewall/fwanalog/fwanalog-0.6.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/net-firewall/fwanalog/fwanalog-0.6.2.ebuild,v 1.1 2004/06/06 10:49:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwanalog/fwanalog-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
@@ -8,7 +8,7 @@ SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc"
+KEYWORDS="x86 ppc sparc"
 IUSE=""
 
 DEPEND="" # this is just a bash script
diff --git a/net-firewall/fwanalog/fwanalog-0.6.4.ebuild b/net-firewall/fwanalog/fwanalog-0.6.4.ebuild
index 2e4ba3d31ff2..f99571e4df9b 100644
--- a/net-firewall/fwanalog/fwanalog-0.6.4.ebuild
+++ b/net-firewall/fwanalog/fwanalog-0.6.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/net-firewall/fwanalog/fwanalog-0.6.4.ebuild,v 1.1 2004/06/06 10:49:32 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwanalog/fwanalog-0.6.4.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 DESCRIPTION="Script to parse firewall logs and analyze them with Analog"
 HOMEPAGE="http://tud.at/programm/fwanalog/"
@@ -8,7 +8,7 @@ SRC_URI="http://tud.at/programm/fwanalog/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc sparc"
 IUSE=""
 
 DEPEND="" # this is just a bash script
diff --git a/net-firewall/fwbuilder/ChangeLog b/net-firewall/fwbuilder/ChangeLog
index 29c8834c292c..d04ba9c8ac6f 100644
--- a/net-firewall/fwbuilder/ChangeLog
+++ b/net-firewall/fwbuilder/ChangeLog
@@ -1,6 +1,185 @@
-# ChangeLog for net-misc/fwbuilder
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.1 2003/01/06 12:46:17 mholzer Exp $
+# ChangeLog for net-firewall/fwbuilder
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+  06 Oct 2005; Fernando J. Pereda <ferdy@gentoo.org> fwbuilder-2.0.9.ebuild:
+  marked ~alpha wrt bug #107450
+
+*fwbuilder-2.0.9 (20 Sep 2005)
+
+  20 Sep 2005; Benjamin Smee <strerror@gentoo.org> +fwbuilder-2.0.9.ebuild:
+  version bump
+
+*fwbuilder-2.0.8 (11 Jul 2005)
+
+  11 Jul 2005; Carsten Lohrke <carlo@gentoo.org> fwbuilder-2.0.6.ebuild,
+  fwbuilder-2.0.7.ebuild, +fwbuilder-2.0.8.ebuild:
+  assure Qt 3 is used to build, version bump
+
+*fwbuilder-2.0.7 (12 May 2005)
+
+  12 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  -files/fwbuilder-2.0.3-errno.patch, -fwbuilder-2.0.0.ebuild,
+  -fwbuilder-2.0.1.ebuild, -fwbuilder-2.0.2.ebuild, -fwbuilder-2.0.3.ebuild,
+  -fwbuilder-2.0.4.ebuild, -fwbuilder-2.0.5.ebuild, +fwbuilder-2.0.7.ebuild:
+  version bump, desktop entry, clean up
+
+  17 Apr 2005; Eric Shattow <jnc@gentoo.org> fwbuilder-2.0.6.ebuild:
+  Stable on x86; Bug #85580
+
+  29 Mar 2005; Markus Rothe <corsair@gentoo.org> fwbuilder-2.0.6.ebuild:
+  Stable on ppc64; bug #85580
+
+  19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> fwbuilder-2.0.6.ebuild:
+  stable on amd64 wrt #85580
+
+  19 Mar 2005; Joseph Jezak <josejx@gentoo.org> fwbuilder-2.0.6.ebuild:
+  Marked ppc stable for bug #85580.
+
+  17 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> fwbuilder-2.0.6.ebuild:
+  Stable on sparc wrt #85580
+
+*fwbuilder-2.0.6 (21 Feb 2005)
+
+  21 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +fwbuilder-2.0.6.ebuild:
+  version bump
+
+*fwbuilder-2.0.5 (07 Feb 2005)
+
+  07 Feb 2005; Carsten Lohrke <carlo@gentoo.org> +fwbuilder-2.0.5.ebuild:
+  version bump
+
+*fwbuilder-2.0.4 (18 Dec 2004)
+
+  18 Dec 2004; Carsten Lohrke <carlo@gentoo.org> +fwbuilder-2.0.4.ebuild:
+  version bump
+
+*fwbuilder-2.0.3 (05 Oct 2004)
+
+  05 Oct 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-2.0.3.ebuild:
+  Version bump, closing #66116.
+
+  05 Oct 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-2.0.2.ebuild:
+  Added QMAKESPEC, closing #62715.
+
+  07 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> fwbuilder-2.0.0.ebuild:
+  Stable on sparc
+
+*fwbuilder-2.0.2 (01 Sep 2004)
+
+  01 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-2.0.0.ebuild,
+  fwbuilder-2.0.2.ebuild:
+  Version bump.
+
+  01 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-2.0.0.ebuild,
+  fwbuilder-2.0.1.ebuild:
+  Fix DEPEND vars, closing #61991.
+
+*fwbuilder-2.0.1 (18 Aug 2004)
+
+  18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-2.0.1.ebuild:
+  Version bump, closing #60153.
+  Added dependency to libxslt, closing #59223.
+
+  06 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-2.0.0.ebuild:
+  Added missing arches.
+
+  02 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump, ebuild contributed by Carsten Lohrke <carlo@gentoo.org> in
+  #58794.
+
+*fwbuilder-2.0.0 (02 Aug 2004)
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> fwbuilder-1.0.11.ebuild,
+  fwbuilder-1.1.1-r1.ebuild, fwbuilder-1.1.1.ebuild:
+  Fix use invocation
+
+  07 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.2.ebuild,
+  files/fwbuilder-1.1.2-nls_fix.patch:
+  Fix compilation when nls is disabled.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> fwbuilder-1.0.11.ebuild,
+  fwbuilder-1.1.1-r1.ebuild, fwbuilder-1.1.1.ebuild:
+  Add flag-o-matic for bug 49179
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.2.ebuild:
+  Move inherit line.
+
+  10 Apr 2004; David Holm <dholm@gentoo.org> fwbuilder-1.1.2.ebuild:
+  Added to ~ppc.
+
+  12 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.2.ebuild:
+  Small update to postinst message.
+
+  10 Mar 2004; Jason Wever <weeve@gentoo.org> fwbuilder-1.1.2.ebuild:
+  Marked stable on sparc.
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org> fwbuilder-1.1.1-r1.ebuild:
+  Stable on sparc.
+
+  27 Feb 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.2.ebuild:
+  x86 and amd64 unmask.
+
+*fwbuilder-1.1.1-r1 (08 Feb 2004)
+
+  08 Feb 2004; <nerdboy@gentoo.org> fwbuilder-1.1.1-r1.ebuild:
+  updated 1.1.1-r1 to fix nasty autoconf voodoo
+
+*fwbuilder-1.1.2 (23 Jan 2004)
+
+  23 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.2.ebuild:
+  Version bump
+
+*fwbuilder-1.1.1 (12 Dec 2003)
+
+  12 Dec 2003; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.1.ebuild:
+  Version bump
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> fwbuilder-1.0.11.ebuild:
+  Marked stable on sparc.
+
+*fwbuilder-1.1.0 (26 Nov 2003)
+
+  26 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.1.0.ebuild:
+  Version bump
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> fwbuilder-1.0.10.ebuild,
+  fwbuilder-1.0.11.ebuild, fwbuilder-1.0.6.ebuild:
+  adding RESTRICT="nomirror"
+
+  05 Oct 2003; Jason Wever <weeve@gentoo.org> fwbuilder-1.0.11.ebuild:
+  Added replace-flags fix for overoptimization, fixes bug #30256.
+
+*fwbuilder-1.0.11 (19 Sep 2003)
+
+  19 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.0.11.ebuild:
+  Version bump
+
+  13 Jul 2003; Martin Holzer <mholzer@gentoo.org> fwbuilder-1.0.10.ebuild,
+  fwbuilder-1.0.6.ebuild, fwbuilder-1.0.7.ebuild, fwbuilder-1.0.8.ebuild,
+  fwbuilder-1.0.9-r1.ebuild, fwbuilder-1.0.9.ebuild:
+  Updated Depend. Closes #24364.
+
+*fwbuilder-1.0.10 (27 May 2003)
+
+  27 May 2003; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.0.10.ebuild :
+  Version bump and ebuild cleanup.  
+
+*fwbuilder-1.0.9-r1 (20 Mar 2003)
+
+  20 Mar 2003; Aron Griffis <agriffis@gentoo.org> fwbuilder-1.0.6.ebuild,
+  fwbuilder-1.0.7.ebuild, fwbuilder-1.0.8.ebuild, fwbuilder-1.0.9-r1.ebuild,
+  fwbuilder-1.0.9.ebuild:
+  Remove pic USE-flag and bump rev
+
+*fwbuilder-1.0.9 (01 Mar 2003)
+
+  01 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Version bump.
+
+  10 Jan 2003; Daniel Ahlberg <aliz@gentoo.org> fwbuilder-1.0.6.ebuild, fwbuilder-1.0.7.ebuild,
+						fwbuilder-1.0.8.ebuild :
+  Make dependency on libfwbuilder strict.
 
 *fwbuilder-1.0.8 (05 Jan 2003)
 
diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
index b85ae3925108..fb18e5ecc1f9 100644
--- a/net-firewall/fwbuilder/Manifest
+++ b/net-firewall/fwbuilder/Manifest
@@ -1,13 +1,23 @@
-MD5 de96c2648511b2224d7c177c563c99ae ChangeLog 3143
-MD5 e8bd706d688111df7f9cb3e5899f1371 fwbuilder-1.0.6.ebuild 1315
-MD5 9d895574346e3aad1bff3528d7fe196b fwbuilder-1.0.7.ebuild 1317
-MD5 6e8e8e85202a86929be07e189741e797 fwbuilder-1.0.8.ebuild 1309
-MD5 0aad6afa6704d2733e2207872d97a5d2 fwbuilder-1.0.9.ebuild 1309
-MD5 f45e22721c7ac63f16707d71ccb9a5ef fwbuilder-1.0.9-r1.ebuild 1312
-MD5 29bc5f3dcacd366b542a8b65458baae3 fwbuilder-1.0.10.ebuild 1581
-MD5 ff88c9bc83f87f89dbab85052a8685f2 files/digest-fwbuilder-1.0.6 68
-MD5 ee884582f7dc337755dd63cb5fdcaec4 files/digest-fwbuilder-1.0.7 68
-MD5 2e40fcf75502829eabb8a96c888d8ced files/digest-fwbuilder-1.0.8 68
-MD5 8ae569f3176113c39384f3f96cd3cdda files/digest-fwbuilder-1.0.10 69
-MD5 328c3430dfa4115be942913d53ec19e6 files/digest-fwbuilder-1.0.9 68
-MD5 e37f0a179f98cd591d41e6edc0f83f2b files/digest-fwbuilder-1.0.9-r1 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3f87b8e4164e6f4c3f71fd427a2f6019 fwbuilder-2.0.7.ebuild 1065
+MD5 11e6f232f520cdf75476e709f2b3bc7e fwbuilder-1.1.2.ebuild 1390
+MD5 e52a5762b7b935db4155c3c5d10f62da fwbuilder-2.0.9.ebuild 1072
+MD5 665b2d8e8a0822627a068fb476f6af4b fwbuilder-2.0.6.ebuild 897
+MD5 c4b7edfc17c76edf4f94cc4a96223e86 fwbuilder-2.0.8.ebuild 1065
+MD5 46ed69ca7ad7a898b8bc98263998e71c ChangeLog 8318
+MD5 37236013e0d26d43c6bff35a8a48e8ec metadata.xml 220
+MD5 b7ecd1d8440ad584eead03ccddd2a800 files/fwbuilder-1.1.2-nls_fix.patch 382
+MD5 c1a7d072ddaa87c67e47e135f6cbd1cf files/digest-fwbuilder-1.1.2 68
+MD5 70fea7193b1f73a34e3cf49a2ac9c9c7 files/digest-fwbuilder-2.0.6 68
+MD5 99c3ff5a964d751686899517a6b90485 files/digest-fwbuilder-2.0.7 68
+MD5 1675a2e188765ced03b1eefd161a103f files/digest-fwbuilder-2.0.8 68
+MD5 654b2735bc2da5c253033998bd6ae490 files/digest-fwbuilder-2.0.9 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDRZTOViELBEf1JB0RAsRXAJ4342DJuqEbYyefRJJlnPPS5pchBwCeIbYI
+o6owhbgWYKX4RGYFJbIcVV0=
+=kwX/
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/fwbuilder/fwbuilder-1.1.2.ebuild b/net-firewall/fwbuilder/fwbuilder-1.1.2.ebuild
index 4ed7b9e669de..7ffaa62f4e87 100644
--- a/net-firewall/fwbuilder/fwbuilder-1.1.2.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-1.1.2.ebuild
@@ -1,16 +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/net-firewall/fwbuilder/fwbuilder-1.1.2.ebuild,v 1.1 2004/01/23 11:44:21 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+inherit flag-o-matic eutils
 
 DESCRIPTION="A firewall GUI"
-SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 HOMEPAGE="http://www.fwbuilder.org/"
-RESTRICT="nomirror"
-S=${WORKDIR}/${P}
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
-KEYWORDS="~x86 ~sparc ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="x86 sparc amd64 ~ppc"
 IUSE="static nls"
 
 DEPEND="sys-devel/autoconf
@@ -20,32 +20,31 @@ DEPEND="sys-devel/autoconf
 	=dev-libs/libsigc++-1.0*
 	nls? ( >=sys-devel/gettext-0.11 )
 	~net-libs/libfwbuilder-1.0.2"
-RDEPEND="$DEPEND"
 
-# Added by Jason Wever <weeve@gentoo.org>
-# Fix for bug #30256.
-if [ "${ARCH}" = "sparc" ]; then
-	inherit flag-o-matic
-	replace-flags "-O3" "-O2"
-fi
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-nls_fix.patch
+}
 
 src_compile() {
+	use sparc && replace-flags -O3 -O2
 	local myconf
-	myconf="--with-gnu-ld"
-	use static	&&	myconf="${myconf} --enable-shared=no --enable-static=yes"
-	use nls		||	myconf="${myconf} --disable-nls"
+	use static && myconf="${myconf} --enable-shared=no --enable-static=yes"
+	use nls || myconf="${myconf} --disable-nls"
 
 	./autogen.sh \
 		--prefix=/usr \
-		--host=${CHOST}	|| die "./configure failed"
+		--host=${CHOST}	\
+		${myconf} \
+		|| die "./configure failed"
 
 	sed -i -e "s:#define HAVE_XMLSAVEFORMATFILE 1://:" config.h
 
-	if [ "`use static`" ]
-	then
+	if use static ; then
 		emake LDFLAGS="-static" || die "emake LDFLAGS failed"
 	else
-		emake || die "emake failed"
+		make -j1 || die "emake failed"
 	fi
 }
 
@@ -54,7 +53,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "You may have to install iproute on the machine that"
+	einfo "You need to emerge iproute2 on the machine that"
 	einfo "will run the firewall script."
 }
-
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild
index 7c09f6dac741..4a3a3f68fa8e 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.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/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild,v 1.1 2005/02/21 20:36:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.6.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+KEYWORDS="x86 amd64 sparc ppc ppc64"
 IUSE="nls"
 
 DEPEND="~net-libs/libfwbuilder-${PV}
@@ -19,6 +19,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 
 src_compile() {
 	export QMAKESPEC="linux-g++"
+	export QMAKE="${QTDIR}/bin/qmake"
 
 	econf `use_enable nls` || die
 
@@ -31,8 +32,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo ""
+	echo
 	einfo "You need to emerge iproute2 on the machine that"
 	einfo "will run the firewall script."
-	echo ""
+	echo
 }
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild
index 2e1366ab8ec6..777326b992df 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.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/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild,v 1.1 2005/05/12 23:36:37 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.7.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils
 
@@ -19,6 +19,7 @@ DEPEND="~net-libs/libfwbuilder-${PV}
 
 src_compile() {
 	export QMAKESPEC="linux-g++"
+	export QMAKE="${QTDIR}/bin/qmake"
 
 	econf `use_enable nls` || die
 
@@ -34,8 +35,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	echo ""
+	echo
 	einfo "You need to emerge iproute2 on the machine that"
 	einfo "will run the firewall script."
-	echo ""
+	echo
 }
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild
index df3bd3bb51d1..785f49ddf344 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.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/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild,v 1.1 2005/07/11 10:57:31 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-firewall/fwbuilder/fwbuilder-2.0.9.ebuild b/net-firewall/fwbuilder/fwbuilder-2.0.9.ebuild
index 9cdce657f678..db5ce33ea804 100644
--- a/net-firewall/fwbuilder/fwbuilder-2.0.9.ebuild
+++ b/net-firewall/fwbuilder/fwbuilder-2.0.9.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/net-firewall/fwbuilder/fwbuilder-2.0.9.ebuild,v 1.1 2005/09/20 12:52:52 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls"
 
 DEPEND="~net-libs/libfwbuilder-${PV}
diff --git a/net-firewall/fwipsec/ChangeLog b/net-firewall/fwipsec/ChangeLog
index 72375bd22802..41e834e2f325 100644
--- a/net-firewall/fwipsec/ChangeLog
+++ b/net-firewall/fwipsec/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-firewall/fwipsec
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwipsec/ChangeLog,v 1.1 2004/06/04 19:51:08 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwipsec/ChangeLog,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> fwipsec-0.4.2-r1.ebuild:
+  Mark 0.4.2-r1 stable on alpha
+
+  21 Jul 2005; Seemant Kulleen <seemant@gentoo.org> fwipsec-0.4.2-r1.ebuild:
+  use newinitd for the initscript
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> fwipsec-0.4.2-r1.ebuild:
+  stable on ia64
+
+*fwipsec-0.4.2-r1 (07 Feb 2005)
+
+  07 Feb 2005; Marcus D. Hanwell <cryos@gentoo.org> +fwipsec-0.4.2-r1.ebuild,
+  -fwipsec-0.4.2.ebuild:
+  Corrected installation location of man page, marked stable on x86 and amd64
+  for Seemant.
 
 *fwipsec-0.4.2 (04 Jun 2004)
 
diff --git a/net-firewall/fwipsec/Manifest b/net-firewall/fwipsec/Manifest
index 6367ddd76a57..a8fe63853b4f 100644
--- a/net-firewall/fwipsec/Manifest
+++ b/net-firewall/fwipsec/Manifest
@@ -1,2 +1,4 @@
-MD5 14a139ba9dec26ffc08dfe51b6b96a44 fwipsec-0.4.2.ebuild 745
-MD5 d7fa6046a7b05c8c38efcd35b3b1b37a files/digest-fwipsec-0.4.2 65
+MD5 6e74dc477ea12630b37ce9bfa549a137 metadata.xml 427
+MD5 b4629098bf7cb17ef6ddf74b84bae96e ChangeLog 1057
+MD5 4ef5addccc8560d2cab7c13c6aa89736 fwipsec-0.4.2-r1.ebuild 783
+MD5 d7fa6046a7b05c8c38efcd35b3b1b37a files/digest-fwipsec-0.4.2-r1 65
diff --git a/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild b/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild
index dfdf1f89fb7c..f249f2bcff48 100644
--- a/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild
+++ b/net-firewall/fwipsec/fwipsec-0.4.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/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild,v 1.1 2005/02/07 13:05:25 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwipsec/fwipsec-0.4.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Firewall scripts that control iptables, FreeS/WAN, and squid."
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
-KEYWORDS="x86 ~ppc ~sparc ~alpha amd64 ~hppa ~mips ~ia64"
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ~ppc ~sparc x86"
 
 DEPEND="virtual/linux-sources
 		>=net-firewall/iptables-1.2.7
@@ -19,8 +19,7 @@ DEPEND="virtual/linux-sources
 src_install() {
 	exeinto /etc/fwipsec
 	doexe fwipsec.*
-	exeinto /etc/init.d
-	doexe fwipsec
+	newinitd fwipsec
 
 	dodoc LICENSE DOCS/README*
 	doman DOCS/*.5
diff --git a/net-firewall/gshield/ChangeLog b/net-firewall/gshield/ChangeLog
index 22d13016da4a..70fea308e253 100644
--- a/net-firewall/gshield/ChangeLog
+++ b/net-firewall/gshield/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/gshield
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/gshield/ChangeLog,v 1.1 2003/03/31 17:08:46 mholzer Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/gshield/ChangeLog,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
+
+  23 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> gshield-2.8-r2.ebuild:
+  Don't use cp -a.
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> gshield-2.8-r2.ebuild:
+  Added to ~ppc.
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> gshield-2.8-r1.ebuild,
+  gshield-2.8.ebuild:
+  tidy older versions
 
 *gshield-2.8 (31 Mar 2003)
 
diff --git a/net-firewall/gshield/Manifest b/net-firewall/gshield/Manifest
index e69de29bb2d1..6ab15ea5726a 100644
--- a/net-firewall/gshield/Manifest
+++ b/net-firewall/gshield/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 791cd16769f4ef782bb507d11f386c23 ChangeLog 1578
+MD5 12b1171e8d9d1b6e69038c819576eb84 gshield-2.8-r2.ebuild 1527
+MD5 c30931b8fa657e89dfc003f26a7d99af files/gshield.init 648
+MD5 35bd7996b009c8816bc810139001de45 files/digest-gshield-2.8-r2 59
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC2e8j5H05b2HAEkRAsC5AKCSjVEdTndjXaXNhXimqQWDwyBWqgCcCnPi
+mVJhxaCZ4dpQmm2bxJ3vz94=
+=hffk
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/gshield/files/gshield.init b/net-firewall/gshield/files/gshield.init
index 55741f0b7e2b..c6784b3d1e38 100644
--- a/net-firewall/gshield/files/gshield.init
+++ b/net-firewall/gshield/files/gshield.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/gshield/files/gshield.init,v 1.1 2003/03/31 17:09:14 mholzer Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/gshield/files/gshield.init,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 depend() {
 	need logger net
@@ -20,8 +20,8 @@ stop() {
 	/usr/share/gshield/gShield.rc stop > /dev/null
 	# check that it unloaded
 	if iptables -L DMZ > /dev/null 2>&1 ; then
-	    eend 1
+		eend 1
 	else
-	    eend 0;
+		eend 0;
 	fi
 }
diff --git a/net-firewall/gshield/gshield-2.8-r2.ebuild b/net-firewall/gshield/gshield-2.8-r2.ebuild
index ad1f74532e66..dd214521a9e8 100644
--- a/net-firewall/gshield/gshield-2.8-r2.ebuild
+++ b/net-firewall/gshield/gshield-2.8-r2.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/net-firewall/gshield/gshield-2.8-r2.ebuild,v 1.1 2003/03/31 17:08:46 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/gshield/gshield-2.8-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 # re-capitalize gShield
 S=${WORKDIR}/gShield-${PV}
@@ -11,7 +11,8 @@ SRC_URI="ftp://muse.linuxmafia.org/pub/gShield/v2/gShield-${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86"
+KEYWORDS="~ppc x86"
+IUSE=""
 
 RDEPEND="net-firewall/iptables
 	net-dns/bind-tools"
@@ -19,7 +20,7 @@ RDEPEND="net-firewall/iptables
 src_install() {
 	# config files
 	dodir /etc/gshield
-	cp -a * ${D}/etc/gshield
+	cp -pPR * ${D}/etc/gshield
 	ln -s gshield ${D}/etc/firewall
 
 	# get rid of docs from config
diff --git a/net-firewall/guarddog/ChangeLog b/net-firewall/guarddog/ChangeLog
index 2aa44c3c0421..ca651ae80fd5 100644
--- a/net-firewall/guarddog/ChangeLog
+++ b/net-firewall/guarddog/ChangeLog
@@ -1,7 +1,77 @@
-# ChangeLog for net-misc/guarddog
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# Author Bart Verwilst <verwilst@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/guarddog/ChangeLog,v 1.1 2003/05/01 11:11:50 mholzer Exp $
+# ChangeLog for net-firewall/guarddog
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/guarddog/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> guarddog-2.4.0.ebuild:
+  added ~amd64 keyword
+
+  07 May 2005; David Holm <dholm@gentoo.org> guarddog-2.4.0.ebuild:
+  Added to ~ppc.
+
+  18 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> guarddog-2.4.0.ebuild:
+  Stable on sparc
+
+  18 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> guarddog-2.4.0.ebuild:
+  Stable on x86.
+
+*guarddog-2.4.0 (17 Dec 2004)
+
+  17 Dec 2004; Carsten Lohrke <carlo@gentoo.org> -guarddog-2.0.0.ebuild,
+  -guarddog-2.3.2.ebuild, +guarddog-2.4.0.ebuild:
+  version bump
+
+  26 Nov 2004; Jason Wever <weeve@gentoo.org> guarddog-2.2.0.ebuild:
+  Stable on sparc.
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> guarddog-2.2.0.ebuild:
+  stable on x86
+
+*guarddog-2.3.2 (11 Oct 2004)
+
+  11 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +metadata.xml,
+  -guarddog-1.9.16.ebuild, guarddog-2.0.0.ebuild, +guarddog-2.2.0.ebuild,
+  -guarddog-2.3.1.ebuild, +guarddog-2.3.2.ebuild:
+  version bump, clean up, metadata.xml
+
+  08 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> guarddog-2.1.5.ebuild,
+  guarddog-2.1.7.ebuild, guarddog-2.2.0.ebuild:
+  clean older ebuilds
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> guarddog-1.9.16.ebuild,
+  guarddog-2.0.0.ebuild, guarddog-2.1.5.ebuild, guarddog-2.1.7.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*guarddog-2.3.1 (08 Mar 2004)
+
+  08 Mar 2004; Dominik Stadler <centic@gentoo.org> guarddog-2.3.1.ebuild:
+  Version bumped, more protocols and more fixes for 2.6. Also add rdepend to
+  gawk based on information in README.
+
+  09 Jan 2004; Jason Wever <weeve@gentoo.org> guarddog-2.0.0.ebuild:
+  Marked stable on sparc.
+
+  29 Dec 2003; Martin Holzer <mholzer@gentoo.org> guarddog-1.9.16.ebuild,
+  guarddog-2.0.0.ebuild, guarddog-2.1.5.ebuild, guarddog-2.1.7.ebuild,
+  guarddog-2.2.0.ebuild:
+  changing depend to rdepend. Closes 36611
+
+*guarddog-2.2.0 (09 Nov 2003)
+
+  09 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> guarddog-2.2.0.ebuild:
+  version bump (bug 32832)
+
+*guarddog-2.1.7 (12 Aug 2003)
+
+  12 Aug 2003; Martin Holzer <mholzer@gentoo.org> guarddog-2.1.7.ebuild:
+  Version bumped. Now 2.6 Kernel Supported. Closes #24915.
+
+*guarddog-2.1.5 (09 Jul 2003)
+
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org> guarddog-2.1.5.ebuild:
+  Version bumped. Closes #23841
 
 *guarddog-2.0.0 (01 May 2003)
 
@@ -26,7 +96,7 @@
   07 Jul 2002; phoen][x <phoenix@gentoo.org> guarddog-1.9.16.ebuild :
   Added KEYWORDS.
 
-  28 Jun 2002; J.Alberto Su�rez L. <bass@gentoo.org> guarddog-1.9.16.ebuild:
+  28 Jun 2002; J.Alberto Suárez L. <bass@gentoo.org> guarddog-1.9.16.ebuild:
   Bumped new version.
 
 *guarddog-1.9.15 (4 May 2002)
diff --git a/net-firewall/guarddog/Manifest b/net-firewall/guarddog/Manifest
index bf41c3efe96d..dc6231184f96 100644
--- a/net-firewall/guarddog/Manifest
+++ b/net-firewall/guarddog/Manifest
@@ -1,9 +1,14 @@
-MD5 cef41e0e913ea6bd62052af33d70eea5 ChangeLog 1842
-MD5 9581de6e5b433c243443dd89c6f2aa35 guarddog-1.9.14.ebuild 531
-MD5 ad2237962da13d9e853c3dc4ff3dd519 guarddog-1.9.15.ebuild 529
-MD5 1045e72fe35960aec9bb38e235bcf92e guarddog-1.9.16.ebuild 529
-MD5 b97842842ac7c800ced27e00d59b61b3 guarddog-2.0.0.ebuild 527
-MD5 0a9552cd1ff99218615f6c7b95b13e6c files/digest-guarddog-1.9.14 67
-MD5 456fe767965d850fbbe93a29a19381b2 files/digest-guarddog-1.9.15 67
-MD5 e9ddebda7ffe67fa5c9114a9072dd580 files/digest-guarddog-1.9.16 67
-MD5 3e8e679c65f3fe358520ed81a1a9f994 files/digest-guarddog-2.0.0 66
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 71043a87c13a448227d5ac9161c39e5c guarddog-2.4.0.ebuild 547
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 75982d0de105fe4adeac76cbc39a9aad ChangeLog 4398
+MD5 4232a1275f79f0188d6e0b9db96003a8 files/digest-guarddog-2.4.0 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1NXLLFUmVNQ7rkRAtDiAJ9HFW51UckYOSvQ9vHGFOImnGmjWgCfRuSG
+DeGTeZq0XWPGGA1BPtpujN0=
+=dBjf
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/guarddog/guarddog-2.4.0.ebuild b/net-firewall/guarddog/guarddog-2.4.0.ebuild
index c828b226518c..5cdc6e34b8de 100644
--- a/net-firewall/guarddog/guarddog-2.4.0.ebuild
+++ b/net-firewall/guarddog/guarddog-2.4.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/net-firewall/guarddog/guarddog-2.4.0.ebuild,v 1.1 2004/12/17 22:36:32 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/guarddog/guarddog-2.4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit kde
 
@@ -10,9 +10,9 @@ SRC_URI="http://www.simonzone.com/software/guarddog/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 IUSE=""
 
 RDEPEND=">=net-firewall/iptables-1.2.5
 	sys-apps/gawk"
-need-kde 3
\ No newline at end of file
+need-kde 3
diff --git a/net-firewall/guarddog/metadata.xml b/net-firewall/guarddog/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/net-firewall/guarddog/metadata.xml
+++ b/net-firewall/guarddog/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>kde-other</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/net-firewall/ipchains-firewall/ChangeLog b/net-firewall/ipchains-firewall/ChangeLog
index 9977fc1ecd73..49ab540de14d 100644
--- a/net-firewall/ipchains-firewall/ChangeLog
+++ b/net-firewall/ipchains-firewall/ChangeLog
@@ -1,6 +1,11 @@
-# ChangeLog for net-misc/ipchains-firewall
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains-firewall/ChangeLog,v 1.1 2003/02/09 14:22:13 mholzer Exp $
+# ChangeLog for net-firewall/ipchains-firewall
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains-firewall/ChangeLog,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
+
+*ipchains-firewall-1.7.3 (24 Feb 2003)
+
+  24 Feb 2003; Martin Holzer <mholzer@gentoo.org> ipchains-firewall-1.7.3.ebuild files/digest-ipchains-firewall-1.7.3 ChangeLog :
+  Corrected Homepage, updated SRC_URI, Version bumped.
 
 *ipchains-firewall-1.7.0-r1 (1 Feb 2002)
 
diff --git a/net-firewall/ipchains-firewall/Manifest b/net-firewall/ipchains-firewall/Manifest
index e69de29bb2d1..9853f192cdbd 100644
--- a/net-firewall/ipchains-firewall/Manifest
+++ b/net-firewall/ipchains-firewall/Manifest
@@ -0,0 +1,3 @@
+MD5 782f42c23b605cb0ce3785eddb846cbb ipchains-firewall-1.7.3.ebuild 800
+MD5 35f5c93c66f535baf29db6dd0429dc4f ChangeLog 1142
+MD5 2461dc93bcbf51dbec0c23389bbc8bc1 files/digest-ipchains-firewall-1.7.3 74
diff --git a/net-firewall/ipchains-firewall/ipchains-firewall-1.7.3.ebuild b/net-firewall/ipchains-firewall/ipchains-firewall-1.7.3.ebuild
index 3a18576abe87..84a7d4e23008 100644
--- a/net-firewall/ipchains-firewall/ipchains-firewall-1.7.3.ebuild
+++ b/net-firewall/ipchains-firewall/ipchains-firewall-1.7.3.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/net-firewall/ipchains-firewall/ipchains-firewall-1.7.3.ebuild,v 1.1 2003/02/24 19:38:41 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains-firewall/ipchains-firewall-1.7.3.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 S=${WORKDIR}/ipchains-firewall-1.7
 DESCRIPTION="IP-Chains Firewall Script "
 SRC_URI="mirror://sourceforge/plonk/${P}.tar.gz"
 HOMEPAGE="http://plonk.sourceforge.net/"
 KEYWORDS="x86 sparc "
+IUSE=""
 LICENSE="as-is"
 SLOT="0"
 
-RDEPEND="sys-devel/perl"
+RDEPEND="dev-lang/perl"
 
 src_install() {
 	cd ${S}
diff --git a/net-firewall/ipchains/ChangeLog b/net-firewall/ipchains/ChangeLog
index 375553c8aee7..b80391eba273 100644
--- a/net-firewall/ipchains/ChangeLog
+++ b/net-firewall/ipchains/ChangeLog
@@ -1,15 +1,20 @@
-# ChangeLog for sys-apps/ipchains
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ChangeLog,v 1.1 2003/03/11 21:57:03 mholzer Exp $
+# ChangeLog for net-firewall/ipchains
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ChangeLog,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
-*ipchains-1.3.10-r1 (11 Mar 2003)
+  06 Jun 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ipchains-1.3.10-fixman.patch, +files/ipchains-1.3.10-gcc34.patch,
+  +files/ipchains-1.3.10-nonroot.patch, ipchains-1.3.10-r1.ebuild:
+  Add some patches from Fedora and a gcc-3.4 fix by Felix Braun #95149.
 
-  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> ipchains-1.3.10-r1.ebuild:
-  moved from sys-apps/ipchains to net-firewall/ipchains
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ipchains-1.3.10-r1.ebuild:
+  virtual/glibc -> virtual/libc
 
 *ipchains-1.3.10-r1 (11 Mar 2003)
 
-  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> ipchains-1.3.10-r1.ebuild:
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> ipchains-1.3.10-r1.ebuild
+  ChangeLog files/digest-ipchains-1.3.10-r1 :
   moved from sys-apps/ipchains to net-firewall/ipchains
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
diff --git a/net-firewall/ipchains/Manifest b/net-firewall/ipchains/Manifest
index c7b508c51d8a..ce5427fbee20 100644
--- a/net-firewall/ipchains/Manifest
+++ b/net-firewall/ipchains/Manifest
@@ -1,3 +1,6 @@
-MD5 b419bfbf64ab97befbab2abc3c7a80c1 ChangeLog 1157
-MD5 445d80dc9273f2a1e2f26638ec738f3d ipchains-1.3.10-r1.ebuild 924
+MD5 bd9eb8827464e827d7c294dd2e40cffb ChangeLog 1531
+MD5 8bf08027848957057e8e5431265d1635 ipchains-1.3.10-r1.ebuild 968
 MD5 ebb9ed3d5eac0864d86cf8e6077f3b54 files/digest-ipchains-1.3.10-r1 67
+MD5 6c4ee5543479d2c86de59020481725aa files/ipchains-1.3.10-fixman.patch 376
+MD5 bb1a03972c81d3fda897d362e0f63f6d files/ipchains-1.3.10-nonroot.patch 783
+MD5 2111980d79ec47864e11f7084e5447b5 files/ipchains-1.3.10-gcc34.patch 214
diff --git a/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild b/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild
index f9ad62caad83..36bc711aa149 100644
--- a/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild
+++ b/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild
@@ -1,25 +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: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild,v 1.1 2003/03/11 21:57:03 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipchains/ipchains-1.3.10-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
+
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="legacy Linux firewall/packet mangling tools"
-SRC_URI="http://netfilter.kernelnotes.org/ipchains/${P}.tar.gz"
 HOMEPAGE="http://netfilter.filewatcher.org/ipchains/"
-KEYWORDS="x86 ppc sparc "
-SLOT="0"
+SRC_URI="http://netfilter.kernelnotes.org/ipchains/${P}.tar.gz"
+
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc sparc x86"
+IUSE=""
 
-DEPEND="virtual/glibc"
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	mv Makefile Makefile.orig
-	sed -e "s/= -g -O/= ${CFLAGS}/" Makefile.orig > Makefile
-	cd ${S}/libipfwc
-	mv Makefile Makefile.orig
-	sed -e "s/= -g -O/= ${CFLAGS}/" Makefile.orig > Makefile
+	cd "${S}"
+	epatch "${FILESDIR}"/ipchains-1.3.10-gcc34.patch
+	epatch "${FILESDIR}"/ipchains-1.3.10-fixman.patch
+	epatch "${FILESDIR}"/ipchains-1.3.10-nonroot.patch
+	sed -i \
+		-e "s/= -g -O/= ${CFLAGS}/" \
+		Makefile libipfwc/Makefile \
+		|| die "sed CFLAGS"
 }
 
 src_compile() {
@@ -29,9 +34,9 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin ipchains
+	dosbin ipchains || die
 	doman ipfw.4 ipchains.8
-	dodoc COPYING README
+	dodoc README
 	docinto ps
 	dodoc ipchains-quickref.ps
 }
diff --git a/net-firewall/ipkungfu/ChangeLog b/net-firewall/ipkungfu/ChangeLog
index eb4bb94b514c..54001684b70e 100644
--- a/net-firewall/ipkungfu/ChangeLog
+++ b/net-firewall/ipkungfu/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-firewall/ipkungfu
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/ChangeLog,v 1.1 2003/08/31 20:32:52 weeve Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/ChangeLog,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> ipkungfu-0.5.2-r1.ebuild:
+  Added to ~ppc.
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> ipkungfu-0.5.2-r1.ebuild:
+  added ~amd64 to KEYWORDS. fixes #78422.
+
+  13 Aug 2004; Daniel Goller <morfic@gentoo.org> ipkungfu-0.5.2-r1.ebuild:
+  Stable on x86
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ipkungfu-0.5.0.ebuild, ipkungfu-0.5.2-r1.ebuild, ipkungfu-0.5.2.ebuild:
+  virtual/glibc -> virtual/libc
+
+*ipkungfu-0.5.2-r1 (22 Feb 2004)
+
+  22 Feb 2004; Jason Wever <weeve@gentoo.org> ipkungfu-0.5.2-r1.ebuild:
+  Revision bump, fixes bug #42443.
+
+*ipkungfu-0.5.2 (03 Oct 2003)
+
+  03 Oct 2003; Jason Wever <weeve@gentoo.org> ipkungfu-0.5.2.ebuild:
+  Version bump to 0.5.2, fixes bug #30245.
 
 *ipkungfu-0.5.0 (31 Aug 2003)
 
diff --git a/net-firewall/ipkungfu/Manifest b/net-firewall/ipkungfu/Manifest
index 37d6147a6e49..f52fb3966dd7 100644
--- a/net-firewall/ipkungfu/Manifest
+++ b/net-firewall/ipkungfu/Manifest
@@ -1,2 +1,10 @@
-MD5 e922696f77ca98100c7702c1d8163a00 ipkungfu-0.5.0.ebuild 463
+MD5 9568bd18be1f1eb2213ccbe24ba191cc ChangeLog 1122
+MD5 987768e41b13ea2ae26492b38a4a2ef7 ipkungfu-0.5.0.ebuild 1235
+MD5 de13a87f6f32377b93be1e845b858689 ipkungfu-0.5.2-r1.ebuild 1434
+MD5 ee74114b2d04c0ad2e07f18383f4b278 ipkungfu-0.5.2.ebuild 1235
+MD5 090c8bf1c488922d2608e28ebdc2b6d1 metadata.xml 330
 MD5 bf86133a04973ce6906c064a84144ff6 files/digest-ipkungfu-0.5.0 62
+MD5 74da2b4eff58484c9beaf346d9bdd6ba files/digest-ipkungfu-0.5.2 62
+MD5 74da2b4eff58484c9beaf346d9bdd6ba files/digest-ipkungfu-0.5.2-r1 62
+MD5 6e389b85a8c81149db783b51397f2246 files/ipkungfu.init 484
+MD5 10d5fd73c86de3d53c242d70f00e1b98 files/nat_ftp.patch 262
diff --git a/net-firewall/ipkungfu/files/ipkungfu.init b/net-firewall/ipkungfu/files/ipkungfu.init
index 10f9059b6aca..304c9d24c6c6 100644
--- a/net-firewall/ipkungfu/files/ipkungfu.init
+++ b/net-firewall/ipkungfu/files/ipkungfu.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/files/ipkungfu.init,v 1.1 2003/08/31 20:32:52 weeve Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/files/ipkungfu.init,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 depend() {
 	need logger net
diff --git a/net-firewall/ipkungfu/ipkungfu-0.5.0.ebuild b/net-firewall/ipkungfu/ipkungfu-0.5.0.ebuild
index 86fd4f078e96..4c402be28225 100644
--- a/net-firewall/ipkungfu/ipkungfu-0.5.0.ebuild
+++ b/net-firewall/ipkungfu/ipkungfu-0.5.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/net-firewall/ipkungfu/ipkungfu-0.5.0.ebuild,v 1.1 2003/08/31 20:32:52 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/ipkungfu-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 inherit eutils
 
@@ -10,16 +10,16 @@ SRC_URI="http://www.linuxkungfu.org/ipkungfu/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc" 
+KEYWORDS="~x86 ~sparc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	net-firewall/iptables"
 
 
 src_unpack() {
 	unpack ${A}
-	
+
 	# man page comes bzip2'd, so bunzip2 it.
 	cd ${WORKDIR}/${P}/files
 	bunzip2 ipkungfu.8.bz2
@@ -27,7 +27,7 @@ src_unpack() {
 
 src_install() {
 
-	# Package comes with a hard coded shell script, so here we 
+	# Package comes with a hard coded shell script, so here we
 	# replicate what they did, but so it's compatible with portage.
 
 	# Install shell script executable
@@ -35,7 +35,7 @@ src_install() {
 
 	# Install Gentoo init script
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ipkungfu.init ipkungfu	
+	newexe ${FILESDIR}/ipkungfu.init ipkungfu
 
 	# Install config files into /etc
 	dodir /etc/ipkungfu
diff --git a/net-firewall/ipkungfu/ipkungfu-0.5.2-r1.ebuild b/net-firewall/ipkungfu/ipkungfu-0.5.2-r1.ebuild
index 712244b08690..9b894f29d840 100644
--- a/net-firewall/ipkungfu/ipkungfu-0.5.2-r1.ebuild
+++ b/net-firewall/ipkungfu/ipkungfu-0.5.2-r1.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/net-firewall/ipkungfu/ipkungfu-0.5.2-r1.ebuild,v 1.1 2004/02/23 01:00:44 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/ipkungfu-0.5.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 inherit eutils
 
@@ -10,10 +10,10 @@ SRC_URI="http://www.linuxkungfu.org/ipkungfu/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	net-firewall/iptables"
 
 
diff --git a/net-firewall/ipkungfu/ipkungfu-0.5.2.ebuild b/net-firewall/ipkungfu/ipkungfu-0.5.2.ebuild
index c4808cc7f24e..65515a7ae61d 100644
--- a/net-firewall/ipkungfu/ipkungfu-0.5.2.ebuild
+++ b/net-firewall/ipkungfu/ipkungfu-0.5.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/net-firewall/ipkungfu/ipkungfu-0.5.2.ebuild,v 1.1 2003/10/04 00:13:02 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipkungfu/ipkungfu-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	net-firewall/iptables"
 
 
diff --git a/net-firewall/ipp2p/ChangeLog b/net-firewall/ipp2p/ChangeLog
index 97a031cb792c..3d3ab4b64e9c 100644
--- a/net-firewall/ipp2p/ChangeLog
+++ b/net-firewall/ipp2p/ChangeLog
@@ -1,6 +1,73 @@
 # ChangeLog for net-firewall/ipp2p
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.1 2004/10/26 08:31:50 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ChangeLog,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
+
+*ipp2p-0.8.0 (28 Oct 2005)
+
+  28 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +ipp2p-0.8.0.ebuild:
+  Version bump.
+
+  07 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ipp2p-0.7.4-r2.ebuild, ipp2p-0.8.0_rc3.ebuild:
+  Fix bug #101635.
+
+  06 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/ipp2p-0.7-Makefile.patch, -ipp2p-0.7.1-r1.ebuild,
+  ipp2p-0.7.4-r2.ebuild:
+  Stable amd64, sparc, x86 as the older version doesn't build with current
+  kernels. Removing older version.
+
+*ipp2p-0.8.0_rc3 (25 Jul 2005)
+*ipp2p-0.7.4-r2 (25 Jul 2005)
+
+  25 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ipp2p-0.7.4-r1.ebuild, +ipp2p-0.7.4-r2.ebuild, +ipp2p-0.8.0_rc3.ebuild:
+  Don't use CFLAGS when building the kernel module.  Version bump.
+
+  25 Jun 2005; David Holm <dholm@gentoo.org> ipp2p-0.7.4-r1.ebuild:
+  Added to ~ppc.
+
+*ipp2p-0.7.4-r1 (25 Jun 2005)
+
+  25 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ipp2p-0.7.4.ebuild, +ipp2p-0.7.4-r1.ebuild:
+  Fixed version detection of iptables.  Moved iptables to RDEPEND.
+
+*ipp2p-0.7.4 (24 Jun 2005)
+
+  24 Jun 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/ipp2p-0.6-Makefile.patch, +ipp2p-0.7.4.ebuild:
+  Version bump.  Closes bug #95965.
+
+*ipp2p-0.7.1-r1 (02 Mar 2005)
+
+  02 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -ipp2p-0.6-r1.ebuild, +ipp2p-0.7.1-r1.ebuild, -ipp2p-0.7.1.ebuild,
+  -ipp2p-0.7.ebuild:
+  Revbump since it was incompatible with a change in linux-mod. See bug
+  #80499. Stable amd64, x86.
+
+*ipp2p-0.7.1 (11 Jan 2005)
+
+  11 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  ipp2p-0.6-r1.ebuild, -ipp2p-0.6.ebuild, +ipp2p-0.7.1.ebuild:
+  Version bump closes bug #77457.  Moving 0.6-r1 to stable.
+
+*ipp2p-0.7 (26 Dec 2004)
+
+  26 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/ipp2p-0.7-Makefile.patch, +ipp2p-0.7.ebuild:
+  Version bump closes bug #75652.
+
+*ipp2p-0.6-r1 (07 Dec 2004)
+
+  07 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +ipp2p-0.6-r1.ebuild:
+  Converted to linux-mod eclass.
+
+  06 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> ipp2p-0.6.ebuild:
+  Updated HOMEPAGE per request of upstream author.  Stable amd64, x86.
 
 *ipp2p-0.6 (26 Oct 2004)
 
diff --git a/net-firewall/ipp2p/Manifest b/net-firewall/ipp2p/Manifest
index 947cd9b548dc..888a7a55e106 100644
--- a/net-firewall/ipp2p/Manifest
+++ b/net-firewall/ipp2p/Manifest
@@ -1,2 +1,18 @@
-MD5 5cb4ef39f1b7de7dc367c2788960461a ipp2p-0.6.ebuild 3111
-MD5 7dde11c31f867f3b9c624ac8dcb944a4 files/digest-ipp2p-0.6 58
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dfe3ceb19ede75af3f251f92ede29323 ChangeLog 2576
+MD5 365ee13da4034ff82a0b8abd6055f9cc files/digest-ipp2p-0.7.4-r2 62
+MD5 08d3c2a63c11372897fb93c3b66b63a8 files/digest-ipp2p-0.8.0 62
+MD5 a282b5a7786f803a6d63f41ee34251e2 files/digest-ipp2p-0.8.0_rc3 66
+MD5 72379179076a0247afe7b5901655c099 ipp2p-0.7.4-r2.ebuild 1497
+MD5 a8e80bbc33726c93e732e42a665ac56a ipp2p-0.8.0.ebuild 1497
+MD5 ac78b036f1f0d6ea6ad85092f7c77b29 ipp2p-0.8.0_rc3.ebuild 1501
+MD5 3923b6ae9bc25fc124e24e7747c8a802 metadata.xml 226
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDYcYnOpjtAl+gMRURAnhkAJ4lrqIg0LJbFZFXg1tIovF/NHRZGQCgsGf5
+zGsctNYuEYicg8SFSst5lTg=
+=LTKS
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild b/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild
index 84740dbfbada..e59464393bda 100644
--- a/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.7.4-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/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild,v 1.1 2005/08/06 03:17:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.7.4-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.ipp2p.org/downloads/${P}.tar.gz"
 
 SLOT="${KV}"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc sparc x86"
 
 RDEPEND="virtual/modutils
 	 >=net-firewall/iptables-1.2.11"
@@ -33,14 +33,17 @@ src_unpack() {
 
 	cd ${S}
 	convert_to_m ${S}/Makefile
+
+	sed -i -e 's/^IPTABLES_VERSION/#IPTABLES_VERSION/' ${S}/Makefile
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" libipt_ipp2p.so || die "Failed to build iptables module"
+	local IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)"
+	emake CFLAGS="${CFLAGS}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" libipt_ipp2p.so || die "Failed to build iptables module"
 
-	xarch="${ARCH}"
+	local xarch="${ARCH}"
 	unset ARCH
-	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" IPTABLES_BIN="${ROOT}/sbin/iptables" || die "Failed to build kernel modle."
+	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" || die "Failed to build kernel modle."
 	ARCH="${xarch}"
 }
 
diff --git a/net-firewall/ipp2p/ipp2p-0.8.0.ebuild b/net-firewall/ipp2p/ipp2p-0.8.0.ebuild
index f596fc074047..590c97ee0c1c 100644
--- a/net-firewall/ipp2p/ipp2p-0.8.0.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.8.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/net-firewall/ipp2p/ipp2p-0.8.0.ebuild,v 1.1 2005/10/28 06:32:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 IUSE=""
 
diff --git a/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild b/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild
index 264166ef1b98..225cb2d654fd 100644
--- a/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild
+++ b/net-firewall/ipp2p/ipp2p-0.8.0_rc3.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/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild,v 1.1 2005/08/06 03:17:54 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipp2p/ipp2p-0.8.0_rc3.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 IUSE=""
 
@@ -33,14 +33,17 @@ src_unpack() {
 
 	cd ${S}
 	convert_to_m ${S}/Makefile
+
+	sed -i -e 's/^IPTABLES_VERSION/#IPTABLES_VERSION/' ${S}/Makefile
 }
 
 src_compile() {
-	emake CFLAGS="${CFLAGS}" libipt_ipp2p.so || die "Failed to build iptables module"
+	local IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)"
+	emake CFLAGS="${CFLAGS}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" libipt_ipp2p.so || die "Failed to build iptables module"
 
-	xarch="${ARCH}"
+	local xarch="${ARCH}"
 	unset ARCH
-	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="$(${ROOT}/sbin/iptables --version | cut -f2 -dv)" IPTABLES_BIN="${ROOT}/sbin/iptables" || die "Failed to build kernel modle."
+	emake KERNEL_SRC="${KV_DIR}" IPTABLES_SRC="${ROOT}/usr" IPTABLES_VERSION="${IPTABLES_VERSION}" || die "Failed to build kernel modle."
 	ARCH="${xarch}"
 }
 
diff --git a/net-firewall/ipsec-tools/ChangeLog b/net-firewall/ipsec-tools/ChangeLog
index 275c64ec060f..08871ed64b68 100644
--- a/net-firewall/ipsec-tools/ChangeLog
+++ b/net-firewall/ipsec-tools/ChangeLog
@@ -1,6 +1,133 @@
 # ChangeLog for net-firewall/ipsec-tools
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.1 2003/12/16 18:04:33 plasmaroo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ChangeLog,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
+
+*ipsec-tools-0.6.2 (26 Oct 2005)
+
+  26 Oct 2005; Peter Johanson <latexer@gentoo.org>
+  +ipsec-tools-0.6.2.ebuild:
+  Bump.
+
+  25 Jun 2005; Sven Wegener <swegener@gentoo.org> ipsec-tools-0.5.ebuild,
+  ipsec-tools-0.5-r1.ebuild, ipsec-tools-0.5-r2.ebuild,
+  ipsec-tools-0.5.2.ebuild:
+  Removed useless || dependency.
+
+*ipsec-tools-0.5.2 (21 Jun 2005)
+*ipsec-tools-0.5-r2 (21 Jun 2005)
+
+  21 Jun 2005; Peter Johanson <latexer@gentoo.org>
+  +files/ipsec-tools-0.5-ipv6.diff, +ipsec-tools-0.5-r2.ebuild,
+  +ipsec-tools-0.5.2.ebuild:
+  Revision bump with fix for IPV6 problem (bug #87920), and bump version (bug
+  #92363).
+
+  15 Apr 2005; Joseph Jezak <josejx@gentoo.org> :
+  Marked ~ppc.
+
+  23 Mar 2005; Peter Johanson <latexer@gentoo.org> ipsec-tools-0.4-r1.ebuild:
+  Marking stable on x86, see bug #84479
+
+  20 Mar 2005; Jason Wever <weeve@gentoo.org> ipsec-tools-0.4-r1.ebuild:
+  Stable on SPARC wrt security bug #84479.
+
+  20 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> ipsec-tools-0.4-r1.ebuild:
+  stable on amd64 wrt bug #84479
+
+*ipsec-tools-0.4-r1 (14 Mar 2005)
+
+  14 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  +files/ipsec-tools-0.5-isakmp-underrun.diff, +ipsec-tools-0.4-r1.ebuild,
+  +ipsec-tools-0.5-r1.ebuild:
+  Security bump for buffer underrun. See bug #84479.
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org>
+  -ipsec-tools-0.5_rc1.ebuild:
+  Remove broken release candidate.
+
+  10 Mar 2005; Peter Johanson <latexer@gentoo.org> ipsec-tools-0.5.ebuild:
+  Fix problem on VIA C3 processors. See bug #77369.
+
+*ipsec-tools-0.5 (08 Mar 2005)
+
+  08 Mar 2005; Peter Johanson <latexer@gentoo.org> +ipsec-tools-0.5.ebuild:
+  Bump. Removed --enable-samode-unspec per bug #77369.
+
+  11 Jan 2005; John Mylchreest <johnm@gentoo.org>
+  ipsec-tools-0.5_rc1.ebuild:
+  fixing linux-headers DEPEND for 2005.0. can we get away with a virtual?
+
+*ipsec-tools-0.5_rc1 (10 Jan 2005)
+
+  10 Jan 2005; Peter Johanson <latexer@gentoo.org>
+  +ipsec-tools-0.5_rc1.ebuild:
+  Bump. Includes the fixes for bug #76741. Also fix the headers for the
+  copyright date.
+
+*ipsec-tools-0.4 (16 Dec 2004)
+
+  16 Dec 2004; Peter Johanson <latexer@gentoo.org> metadata.xml,
+  +files/ipsec-tools-0.4-gcc34.diff, +ipsec-tools-0.4.ebuild:
+  Bump to new release. Add my self to the maintainers list.
+
+  06 Sep 2004; <plasmaroo@gentoo.org> ipsec-tools-0.2.5.ebuild,
+  ipsec-tools-0.3.1.ebuild, ipsec-tools-0.3.3.ebuild:
+  Added an RDEPEND for sec-policy/selinux-ipsec-tools for SELinux USE flag
+  users, bug #62902.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ipsec-tools-0.2.5.ebuild, ipsec-tools-0.3.1.ebuild,
+  ipsec-tools-0.3.3.ebuild:
+  virtual/glibc -> virtual/libc
+
+  29 Jun 2004; Jason Wever <weeve@gentoo.org> ipsec-tools-0.3.3.ebuild:
+  Stable on sparc.
+
+  21 Jun 2004; <plasmaroo@gentoo.org> ipsec-tools-0.3.3.ebuild:
+  Marking stable on x86, closes bug #51416.
+
+  21 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> ipsec-tools-0.3.3.ebuild:
+  Marked stable on amd64.
+
+*ipsec-tools-0.3.3 (15 Jun 2004)
+
+  15 Jun 2004; <plasmaroo@gentoo.org> +ipsec-tools-0.3.3.ebuild:
+  Version bump for a security vulnerability; please see bug #53915 for more
+  details.
+
+  24 Apr 2004; Peter Johanson <latexer@gentoo.org> ipsec-tools-0.3.1.ebuild:
+  Marking ~sparc, see bug #48847
+
+*ipsec-tools-0.3.1 (24 Apr 2004)
+
+  24 Apr 2004; Peter Johanson <latexer@gentoo.org> ipsec-tools-0.3.1.ebuild:
+  Bump, fix for ISAKMP vulnerability. See bug #48847
+
+  12 Apr 2004; <plasmaroo@gentoo.org> files/racoon.conf.d,
+  files/racoon.init.d:
+  Changed the initialization scripts to flush the tables when racoon is 
+  stopped - closes bug #47089.
+
+  09 Apr 2004; Jason Wever <weeve@gentoo.org> ipsec-tools-0.2.5.ebuild:
+  It only takes a ~sparc, to get an ipsec tunnel going...
+
+*ipsec-tools-0.2.5 (06 Apr 2004)
+
+  06 Apr 2004; Peter Johanson <latexer@gentoo.org> ipsec-tools-0.2.2.ebuild,
+  ipsec-tools-0.2.3.ebuild, ipsec-tools-0.2.4.ebuild,
+  ipsec-tools-0.2.5.ebuild:
+  Bump and remove all old versions. Issue in all previous versions with x.509
+  certificate handling. See
+  http://sourceforge.net/mailarchive/forum.php?thread_id=4180505&forum_id=32000
+
+*ipsec-tools-0.2.4 (01 Feb 2004)
+*ipsec-tools-0.2.3 (01 Feb 2004)
+
+  01 Feb 2004; <plasmaroo@gentoo.org> ipsec-tools-0.2.2.ebuild,
+  ipsec-tools-0.2.3.ebuild, ipsec-tools-0.2.4.ebuild:
+  Version bumps to 0.2.3 and 0.2.4 and I also fixed the configure scripts to use
+  the /usr/src/linux includes rather than those of the current kernel. Closes
+  bug #38807.
 
 *ipsec-tools-0.2.2 (16 Dec 2003)
 
diff --git a/net-firewall/ipsec-tools/Manifest b/net-firewall/ipsec-tools/Manifest
index 7a426c3a96d5..88087de49779 100644
--- a/net-firewall/ipsec-tools/Manifest
+++ b/net-firewall/ipsec-tools/Manifest
@@ -1,6 +1,28 @@
-MD5 2a388ec3796d055df69095a16ab8e181 ChangeLog 571
-MD5 8906ebdd50784b94d1611eeaeebf407b ipsec-tools-0.2.2.ebuild 1095
-MD5 880e14fe000918f6a94070c38a33d6fe files/racoon.conf.d 479
+MD5 3dc8c88c5bdd1d41e9ed803f1f549f87 ipsec-tools-0.5.ebuild 1474
+MD5 8ab0f354384bf0af0ac5f036bf870678 ipsec-tools-0.3.1.ebuild 1601
+MD5 1e8b9993c9d4f8bc53955cf690469564 ipsec-tools-0.4.ebuild 1692
+MD5 a428291d8a22a606eda6e16845741e9a ipsec-tools-0.2.5.ebuild 1549
+MD5 ef740a7e16a969008e0ed2bdf22019a8 ipsec-tools-0.5-r1.ebuild 1552
+MD5 20913a445c3eac38edca0ae43e36b1de ipsec-tools-0.3.3.ebuild 1599
+MD5 00899be8895a3d4f5c704e0dec3b8729 ChangeLog 5045
+MD5 32ef126c26f7354eee96eb430068db74 metadata.xml 222
+MD5 d99501b6fa9700e3b7e8904150d8799f ipsec-tools-0.4-r1.ebuild 1743
+MD5 47cb6792bf1c84666919e3f22600b7ca ipsec-tools-0.5-r2.ebuild 1683
+MD5 228ff7a8380ec6efeedd68194846e678 ipsec-tools-0.5.2.ebuild 1552
+MD5 cc182cf7948e409898ffe2ca4b51b9cf ipsec-tools-0.6.2.ebuild 1618
 MD5 84cffb83a2579976f872a29d42767714 files/ipsec.conf.sample 260
-MD5 e183eace529012c4d6d61282b643d757 files/digest-ipsec-tools-0.2.2 69
-MD5 1b92416a20f032c713fb26c9cdfe7413 files/racoon.init.d 1129
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4 67
+MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5 68
+MD5 2060a9a972f7975e1fdc755eec1d7791 files/digest-ipsec-tools-0.4-r1 67
+MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r1 68
+MD5 6ed9fbfd1bce8915be1e87a159802c46 files/digest-ipsec-tools-0.2.5 69
+MD5 25ac1660a8d1d054bb9c848a21ad907a files/digest-ipsec-tools-0.3.1 69
+MD5 c35a69d989ddc45b7a7e30909479d91e files/digest-ipsec-tools-0.3.3 69
+MD5 788e3de82c1c6532dab0dc0c19c1bf40 files/racoon.conf.d 621
+MD5 0e62b8655b5b72cb0b312b710b28e471 files/ipsec-tools-0.4-gcc34.diff 1008
+MD5 fa8e82259951e612a6d684983daefc3d files/racoon.init.d 1274
+MD5 b847486c75c3d9d4a1bef744e05ae006 files/ipsec-tools-0.5-isakmp-underrun.diff 714
+MD5 bb97988702b7573a0ffdaa46d1494e77 files/ipsec-tools-0.5-ipv6.diff 307
+MD5 da6f1a46fe846d9a36c49865af536935 files/digest-ipsec-tools-0.5-r2 68
+MD5 3101edbfff1f3a77e0711002dcd675ac files/digest-ipsec-tools-0.5.2 70
+MD5 832e8761ccd34bfba26e6034336521d7 files/digest-ipsec-tools-0.6.2 70
diff --git a/net-firewall/ipsec-tools/files/racoon.conf.d b/net-firewall/ipsec-tools/files/racoon.conf.d
index 8d2f2c3483b1..c0e08ca03061 100644
--- a/net-firewall/ipsec-tools/files/racoon.conf.d
+++ b/net-firewall/ipsec-tools/files/racoon.conf.d
@@ -1,13 +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/net-firewall/ipsec-tools/files/racoon.conf.d,v 1.1 2003/12/16 18:04:33 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/files/racoon.conf.d,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 # Config file for /etc/init.d/racoon
 
-# see man pages for racoon or run `racoon --help`
-# for valid cmdline options
+# See the manual pages for racoon or run `racoon --help`
+# for valid command-line options
+
 RACOON_OPTS="-4"
 
 RACOON_CONF="/etc/racoon/racoon.conf"
 RACOON_PSK_FILE="/etc/racoon/psk.txt"
 SETKEY_CONF="/etc/ipsec.conf"
+
+# Comment or remove the following if you don't want the policy tables
+# to be flushed when racoon is stopped.
+
+RACOON_RESET_TABLES="true"
diff --git a/net-firewall/ipsec-tools/files/racoon.init.d b/net-firewall/ipsec-tools/files/racoon.init.d
index 35728362befe..a0b47237a768 100644
--- a/net-firewall/ipsec-tools/files/racoon.init.d
+++ b/net-firewall/ipsec-tools/files/racoon.init.d
@@ -1,8 +1,9 @@
 #!/sbin/runscript
-# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
+	before netmount
 	use net
 }
 
@@ -48,4 +49,10 @@ stop() {
 	ebegin "Stopping racoon"
 	kill `cat /var/run/racoon.pid`
 	eend $?
+	if [ -n "${RACOON_RESET_TABLES}" ]; then
+		ebegin "Flushing policy entries"
+		/usr/sbin/setkey -F
+		/usr/sbin/setkey -FP
+		eend $?
+	fi
 }
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.2.5.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.2.5.ebuild
index 840fbc653dc7..6a21688a9619 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.2.5.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.2.5.ebuild
@@ -1,16 +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/net-firewall/ipsec-tools/ipsec-tools-0.2.5.ebuild,v 1.1 2004/04/07 00:19:31 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.2.5.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation."
 HOMEPAGE="http://ipsec-tools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~x86 amd64"
+KEYWORDS="~x86 amd64 ~sparc"
 SLOT="0"
-IUSE=""
-DEPEND="virtual/glibc
+IUSE="selinux"
+DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ipsec-tools )"
 
 pkg_setup() {
 	my_KV=`echo ${KV} | cut -f-2 -d "."`
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.3.1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.3.1.ebuild
index da2b6b85a78f..6b6a693d83bc 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.3.1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.3.1.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/net-firewall/ipsec-tools/ipsec-tools-0.3.1.ebuild,v 1.1 2004/04/24 04:39:12 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation."
 HOMEPAGE="http://ipsec-tools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~sparc amd64"
 SLOT="0"
-IUSE=""
-DEPEND="virtual/glibc
+IUSE="selinux"
+DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6"
-
-S=${WORKDIR}/${P}
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ipsec-tools )"
 
 pkg_setup() {
 	my_KV=`echo ${KV} | cut -f-2 -d "."`
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.3.3.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.3.3.ebuild
index f025b5d0dedf..5a37223e4a57 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.3.3.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.3.3.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/net-firewall/ipsec-tools/ipsec-tools-0.3.3.ebuild,v 1.1 2004/06/15 21:33:03 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.3.3.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation."
 HOMEPAGE="http://ipsec-tools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~x86 ~sparc ~amd64"
+KEYWORDS="x86 amd64 sparc"
 SLOT="0"
-IUSE=""
-DEPEND="virtual/glibc
+IUSE="selinux"
+DEPEND="virtual/libc
 	>=dev-libs/openssl-0.9.6"
-
-S=${WORKDIR}/${P}
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-ipsec-tools )"
 
 pkg_setup() {
 	my_KV=`echo ${KV} | cut -f-2 -d "."`
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.4-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.4-r1.ebuild
index 0abf2283ea65..5f60caac1cdb 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.4-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.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/net-firewall/ipsec-tools/ipsec-tools-0.4-r1.ebuild,v 1.1 2005/03/14 19:08:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IP
 HOMEPAGE="http://ipsec-tools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
-KEYWORDS="~x86 ~amd64 ~sparc"
+KEYWORDS="x86 amd64 sparc"
 SLOT="0"
 IUSE="selinux"
 DEPEND="virtual/libc
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild
index 4dc03f4dfc9f..1952a216ff49 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-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/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild,v 1.1 2004/12/16 21:41:26 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils
 
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild
index 515456662058..3b13a25f91fc 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.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/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild,v 1.1 2005/03/14 19:08:05 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,12 +10,12 @@ DESCRIPTION="IPsec-Tools is a port of KAME's IPsec utilities to the Linux-2.6 IP
 HOMEPAGE="http://ipsec-tools.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 LICENSE="BSD"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
index 9b9c51fc08d1..b6faf8dbac31 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.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/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild,v 1.1 2005/06/21 03:05:58 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
index 7f9ddcc075d1..a5e380f61196 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5.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/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild,v 1.1 2005/06/21 03:05:58 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild
index 317d947e5a5e..2bdc8976672a 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.5.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/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild,v 1.1 2005/03/09 03:35:00 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 MY_P=${P/_/-}
 
@@ -15,7 +15,7 @@ SLOT="0"
 IUSE="ipv6 selinux"
 S=${WORKDIR}/${MY_P}
 DEPEND="virtual/libc
-	|| ( >=sys-kernel/linux-headers-2.6 sys-kernel/linux26-headers )
+	>=sys-kernel/linux-headers-2.6
 	>=dev-libs/openssl-0.9.6"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-ipsec-tools )"
@@ -28,6 +28,10 @@ src_unpack() {
 }
 
 src_compile() {
+	# Filter the c3 flag for now. Probably a GCC problem, but we'll
+	# avoid it here for now. See bug #61025
+	filter-flags -march=c3
+
 	econf	\
 		--enable-hybrid \
 		--enable-dpd \
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.6.2.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.6.2.ebuild
index 47bcc10a2033..b3a2be53a320 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.6.2.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.6.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/net-firewall/ipsec-tools/ipsec-tools-0.6.2.ebuild,v 1.1 2005/10/26 07:55:31 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:19 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
diff --git a/net-firewall/ipsec-tools/metadata.xml b/net-firewall/ipsec-tools/metadata.xml
index 7ba772c43ab2..9657301e23cf 100644
--- a/net-firewall/ipsec-tools/metadata.xml
+++ b/net-firewall/ipsec-tools/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>plasmaroo@gentoo.org</email>
+	<email>latexer@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog
index ea51541c837f..c61d46c10133 100644
--- a/net-firewall/ipset/ChangeLog
+++ b/net-firewall/ipset/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.1 2005/03/10 09:56:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+  26 Sep 2005; Robin H. Johnson <robbat2@gentoo.org>
+  ipset-2.1.0.20050119-r1.ebuild:
+  Stable on x86, 146 days in ~x86.
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org>
+  ipset-2.1.0.20050119.ebuild, ipset-2.1.0.20050119-r1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*ipset-2.1.0.20050119-r1 (03 May 2005)
+
+  03 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +ipset-2.1.0.20050119-r1.ebuild:
+  Convert to use linux-info eclass.
+
+  26 Apr 2005; Andrej Kacian <ticho@gentoo.org> ipset-2.1.0.20050119.ebuild:
+  Added ~amd64 keyword.
 
 *ipset-2.1.0.20050119 (10 Mar 2005)
 
diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest
index 6e1d9c2a374f..49189062a0a4 100644
--- a/net-firewall/ipset/Manifest
+++ b/net-firewall/ipset/Manifest
@@ -1,2 +1,6 @@
-MD5 edb26346a11067ff6206db9f21cda327 ipset-2.1.0.20050119.ebuild 1596
+MD5 8c5675e36f2f7d393dd634e387f538d6 ipset-2.1.0.20050119.ebuild 1711
+MD5 81097c0394419fcc18c0d10d5e11bca7 ipset-2.1.0.20050119-r1.ebuild 1608
+MD5 a6be5b32657b9c804e789eb54b62e705 ChangeLog 974
+MD5 21cd68602737d7c996bceabf6e62c468 metadata.xml 223
+MD5 eeb0a192ff8d4aa8efabfbae1e3ccf7c files/digest-ipset-2.1.0.20050119-r1 72
 MD5 eeb0a192ff8d4aa8efabfbae1e3ccf7c files/digest-ipset-2.1.0.20050119 72
diff --git a/net-firewall/ipset/ipset-2.1.0.20050119-r1.ebuild b/net-firewall/ipset/ipset-2.1.0.20050119-r1.ebuild
index a4cf54d9efc4..1aff8a4a3710 100644
--- a/net-firewall/ipset/ipset-2.1.0.20050119-r1.ebuild
+++ b/net-firewall/ipset/ipset-2.1.0.20050119-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/net-firewall/ipset/ipset-2.1.0.20050119-r1.ebuild,v 1.1 2005/05/03 08:54:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.1.0.20050119-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils flag-o-matic versionator linux-info
 
@@ -11,9 +11,9 @@ HOMEPAGE="http://people.netfilter.org/kadlec/ipset/"
 SRC_URI="${HOMEPAGE}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE=""
-RDEPEND=">=net-firewall/iptables-1.3*"
+RDEPEND=">=net-firewall/iptables-1.3"
 DEPEND="${RDEPEND}
 		virtual/linux-sources"
 S="${WORKDIR}/${PN}"
diff --git a/net-firewall/ipset/ipset-2.1.0.20050119.ebuild b/net-firewall/ipset/ipset-2.1.0.20050119.ebuild
index 6759f7614b13..95e092d4ba51 100644
--- a/net-firewall/ipset/ipset-2.1.0.20050119.ebuild
+++ b/net-firewall/ipset/ipset-2.1.0.20050119.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/net-firewall/ipset/ipset-2.1.0.20050119.ebuild,v 1.1 2005/03/10 09:56:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.1.0.20050119.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 inherit eutils flag-o-matic versionator
 
@@ -11,9 +11,9 @@ HOMEPAGE="http://people.netfilter.org/kadlec/ipset/"
 SRC_URI="${HOMEPAGE}/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
-RDEPEND=">=net-firewall/iptables-1.3*"
+RDEPEND=">=net-firewall/iptables-1.3"
 DEPEND="${RDEPEND}
 		virtual/linux-sources"
 S="${WORKDIR}/${PN}"
diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 4f8b076acebf..5afccbcf381b 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,9 +1,396 @@
-# ChangeLog for sys-apps/iptables
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.1 2003/03/11 21:50:24 mholzer Exp $
+# ChangeLog for net-firewall/iptables
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
+
+  19 Nov 2005; Marcus D. Hanwell <cryos@gentoo.org> iptables-1.3.4.ebuild:
+  Stable on amd64.
+
+  18 Nov 2005; Michael Hanselmann <hansmi@gentoo.org> iptables-1.3.4.ebuild:
+  Stable on hppa, ppc.
+
+  14 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> iptables-1.3.4.ebuild:
+  Stable on sparc
+
+  13 Nov 2005; Mark Loeser <halcy0n@gentoo.org> iptables-1.3.4.ebuild:
+  Stable on x86; bug #112351
+
+*iptables-1.3.4 (05 Nov 2005)
+
+  05 Nov 2005; Mike Frysinger <vapier@gentoo.org> +iptables-1.3.4.ebuild:
+  Version bump to fix #110758 by Brian Kroth.
+
+  15 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/1.2.7a-files/01_all_grsecurity.patch.bz2,
+  -files/1.2.7a-files/02_all_imq.patch.bz2,
+  -files/1.2.7a-files/03_all_mac_fix.patch.bz2,
+  -files/1.2.7a-files/04_all_no_optimize_fix.patch.bz2,
+  -files/1.2.9-files/01_all_grsecurity.patch.bz2,
+  -files/1.2.9-files/02_all_imq.patch.bz2,
+  -files/1.2.9-files/03_hppa_gentoo.patch.bz2,
+  -files/1.2.9-files/04_all_install_ipv6_apps.patch.bz2,
+  -files/1.2.9-files/05_all_install_all_dev_files.patch.bz2,
+  -files/1.2.9-files/06_all_l7.patch.bz2,
+  -files/1.2.9-files/sparc64_limit_fix.patch.bz2, -files/ip6tables.confd,
+  -files/iptables-1.2.7a-hppa.diff, -files/sparc64_limit_fix.patch.bz2,
+  -files/ip6tables.init, -files/iptables-1.2.9-hppa.patch.bz2,
+  -files/iptables.confd, -files/iptables.init, -iptables-1.2.7a-r3.ebuild,
+  -iptables-1.2.9.ebuild, -iptables-1.2.9-r1.ebuild,
+  -iptables-1.2.9-r4.ebuild, -iptables-1.3.1-r4.ebuild,
+  -iptables-1.3.3.ebuild:
+  cleanout of old version and patches
+
+*iptables-1.3.3-r2 (25 Sep 2005)
+
+  25 Sep 2005; Daniel Black <dragonheart@gentoo.org>  iptables-1.3.3-r2.ebuild:
+  updated to use l7-filter-2.0-beta
+
+*iptables-1.3.3-r1 (17 Sep 2005)
+
+  17 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  +iptables-1.3.3-r1.ebuild:
+  updated to use l7-filter-1.5 - bug #106009
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> iptables-1.3.2.ebuild:
+  Mark 1.3.2 stable on alpha
+
+  03 Sep 2005; Markus Rothe <corsair@gentoo.org> iptables-1.3.2.ebuild:
+  Stable on ppc64
+
+  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org> iptables-1.3.2.ebuild:
+  Stable on ppc.
+
+  18 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org> iptables-1.3.2.ebuild:
+  Stable on sparc
+
+*iptables-1.3.3 (16 Aug 2005)
+
+  16 Aug 2005; Robin H. Johnson <robbat2@gentoo.org> +iptables-1.3.3.ebuild:
+  Bug #102682, version bump.
+
+  08 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> iptables-1.3.1-r4.ebuild,
+  iptables-1.3.2.ebuild:
+  Re-added ~mips for bug 91285.
+
+*iptables-1.3.2 (12 Jul 2005)
+
+  12 Jul 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/ip6tables-1.3.2.confd, +files/iptables-1.3.2.confd,
+  +files/iptables-1.3.2.init, +iptables-1.3.2.ebuild:
+  Version bump #98641 by Lars (Polynomial-C).  Unified the iptables/ip6tables
+  init.d scripts.  Added a new 'panic' option to init.d #72033 by Colin 
+  Kingsley.  Warn about issues upgrading from 1.2.x to 1.3.x #92535 by Volkov 
+  Peter.
+
+*iptables-1.3.1-r4 (05 May 2005)
+
+  05 May 2005; Mike Frysinger <vapier@gentoo.org>
+  files/iptables-1.2.9-r1.init, files/iptables.init, metadata.xml,
+  -iptables-1.3.1-r3.ebuild, +iptables-1.3.1-r4.ebuild:
+  Make sure /var/lib/iptables/rules-saves is only read/writable by root #91468
+  by eromang.
+
+  03 May 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  iptables-1.3.1-r3.ebuild:
+  mark ~ppc wrt #91285
+
+  03 May 2005; Herbie Hopkins <herbs@gentoo.org> iptables-1.3.1-r3.ebuild:
+  Multilib fixes.
+
+  03 May 2005; Omkhar Arasaratnam <omkhar@gentoo.org>
+  iptables-1.3.1-r3.ebuild:
+  Keyworded ~ppc64 wrt #91285
+
+  03 May 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  iptables-1.3.1-r3.ebuild:
+  (re-)added ~amd64 to KEYWORDS wrt #91285
+
+  03 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  iptables-1.3.1-r3.ebuild:
+  Keyworded ~sparc wrt #91285
+
+*iptables-1.3.1-r3 (03 May 2005)
+
+  03 May 2005; Robin H. Johnson <robbat2@gentoo.org> :
+  iptables-1.3.1-r2.ebuild, +iptables-1.3.1-r3.ebuild
+  Clean up 1.3.1 ebuilds, and forcable mark as KEYWORDS=~x86 ONLY, as I want
+  arches to test it first.
+
+*iptables-1.3.1-r2 (21 Apr 2005)
+
+  21 Apr 2005; Daniel Black <dragonheart@gentoo.org> -iptables-1.3.1.ebuild,
+  -iptables-1.3.1-r1.ebuild, +iptables-1.3.1-r2.ebuild:
+  As per bug #89500 removed old iptables-1.3* due to memory leak in the l7
+  filter section. Revision bump includes l7 filter 1.2.
+
+  28 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  iptables-1.2.11-r3.ebuild, iptables-1.3.1-r1.ebuild:
+  Use proper toolchain compiler.
+
+  28 Mar 2005; Daniel Black <dragonheart@gentoo.org> iptables-1.3.1-r1.ebuild,
+  iptables-1.3.1.ebuild:
+  added conditional unpack on l7-filter thanks to Marcelo Góes (vanquirius)
+
+*iptables-1.3.1-r1 (23 Mar 2005)
+
+  23 Mar 2005; Daniel Black <dragonheart@gentoo.org>
+  +iptables-1.3.1-r1.ebuild:
+  revision bump to support l7-filter-1.1. Doco fixes included
+
+*iptables-1.3.1 (09 Mar 2005)
+
+  09 Mar 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2,
+  +files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2,
+  +files/1.3.1-files/install_ipv6_apps.patch.bz2,
+  +files/1.3.1-files/iptables-1.3.1-compilefix.patch,
+  +iptables-1.3.1.ebuild:
+  Bug #80556, initial work, lots of changes here. This is hardmasked for
+  testing still. It didn't compile against my mm-sources kernel, but does
+  compile against a stock kernel.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  09 Nov 2004; Aron Griffis <agriffis@gentoo.org> iptables-1.2.11-r3.ebuild:
+  stable on ia64
+
+  08 Nov 2004; Markus Rothe <corsair@gentoo.org> iptables-1.2.11-r3.ebuild:
+  Stable on ppc64; bug #70240
+
+  08 Nov 2004; Simon Stelling <blubb@gentoo.org> iptables-1.2.11-r3.ebuild:
+  stable for security reasons (bug #70240)
+
+  08 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
+  iptables-1.2.11-r3.ebuild:
+  Stable on alpha, bug 70240.
+
+  08 Nov 2004; <SeJo@gentoo.org> iptables-1.2.11-r3.ebuild:
+  stable on ppc gsla: 70240
+
+  07 Nov 2004; Olivier Crete <tester@gentoo.org> iptables-1.2.11-r3.ebuild:
+  Stable on x86 per security bug #70240
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> iptables-1.2.11-r3.ebuild:
+  Stable on sparc wrt security bug #70240.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> iptables-1.2.11-r3.ebuild:
+  Marked stable on mips.
+
+  07 Nov 2004; Joshua Kinard <kumba@gentoo.org> iptables-1.2.11-r2.ebuild:
+  Marked stable on mips.
+
+*iptables-1.2.11-r3 (06 Nov 2004)
+
+  06 Nov 2004; <solar@gentoo.org> +files/1.2.11-files/CAN-2004-0986.patch,
+  +iptables-1.2.11-r3.ebuild:
+  security bump. Exception handling error. bug 70240
+
+  10 Sep 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r2.ebuild,
+  files/1.2.11-files/round-robin.patch:
+  Added round-robin patch, closing #60979.
+
+  05 Sep 2004; Guy Martin <gmsoft@gentoo.org>
+  -files/1.2.11-files/hppa.patch.bz2, iptables-1.2.11-r2.ebuild:
+  Stable on hppa. Removed no more needed hppa patch.
+
+  29 Aug 2004; Tom Gall <tgall@gentoo.org> iptables-1.2.11-r2.ebuild:
+  stable on ppc64, bug #60780
+
+  22 Aug 2004; Seemant Kulleen <seemant@gentoo.org> iptables-1.2.11-r2.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9-r4.ebuild, iptables-1.2.9.ebuild:
+  fix spelling error. Thanks to: Kurt McKee <kurtmckee@northwestern.edu> in bug
+  #61325
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> iptables-1.2.11-r2.ebuild:
+  Stable on alpha.
+
+  20 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  iptables-1.2.11-r2.ebuild:
+  Stable on sparc
+
+  18 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r2.ebuild,
+  files/ip6tables-1.2.9-r1.confd, files/ip6tables-1.2.9-r1.init,
+  files/iptables-1.2.9-r1.confd, files/iptables-1.2.9-r1.init:
+  Enable saving state when stopping service, closing #60680.
+  Unmasking on x86 and amd64.
+
+  10 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> files/ip6tables.init:
+  Fix typo in init file, closing #56537.
+
+  05 Jul 2004; Michal Januszewski <spock@gentoo.org>
+  iptables-1.2.11-r2.ebuild:
+  Fixed problems with iptables installing into /usr/local/sbin/.
+
+  04 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r2.ebuild:
+  + Fix installation path, initscript and config script. Closing #55978.
+  + Fix dependencies. Closing #55605
+
+  04 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r4.ebuild:
+  + Fix dependencies. Closing #55605
+
+  03 Jul 2004; Seemant Kulleen <seemant@gentoo.org> iptables-1.2.11-r2.ebuild:
+  sed statement fix, thanks to x1bncwn in #gentoo
+
+*iptables-1.2.9-r4 (03 Jul 2004)
+*iptables-1.2.11-r2 (03 Jul 2004)
+
+  03 Jul 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11-r1.ebuild,
+  iptables-1.2.9-r3.ebuild:
+  For some reason iptables may decide to compile in the src_install section
+  too, make sure it compiles against the correct KERNEL_DIR. Closing #55489.
+
+  02 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  iptables-1.2.11-r1.ebuild, iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9-r3.ebuild, iptables-1.2.9.ebuild:
+  || die's to make install to avoid problems like we see in bug #55489.
+
+  02 Jul 2004; Lars Weiler <pylon@gentoo.org> iptables-1.2.9-r3.ebuild:
+  Stable on ppc as iptables-1.2.7a-r3 does not compile any more.
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11.ebuild,
+  iptables-1.2.9-r3.ebuild:
+  Revision bump these so they propagate correctly.
+
+*iptables-1.2.11-r1 (28 Jun 2004)
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.11.ebuild:
+  Version bump and updated IMQ and l7 patches. Closing #54067 and #55308.
+
+*iptables-1.2.9-r3 (28 Jun 2004)
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r3.ebuild:
+  New revision with a new local use flag that toggles the applying of
+  3rd party patches and building against linux sources. Without the new
+  use flag no 3rd party extensions patches will be applied and iptables
+  will be built against linux-headers.
+
+  Be aware that iptables doesn't always build against the newest kernels
+  and manual patching may be required.
+
+  Closing #54440
+
+  28 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9.ebuild:
+  Step back to an earlier date to clean up the mess, 
+  change "Gentoo Technologies Inc" to "Gentoo Foundation".
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.9-r1.ebuild, iptables-1.2.9.ebuild:
+  Fix use invocation and replace unnecessary subshell with if..then..fi
+
+  07 Jun 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r1.ebuild:
+  + Only run check_KV if /usr/src/liunx is a symlink or a directory, possible 
+    fix for #46817.
+  + Handle extensionpatches that was added for 1.2.9-r1. Closing #51418.
+
+  10 May 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r1.ebuild:
+  CFLAGS must have -O flag, closing #44204
+
+*iptables-1.2.9-r1 (25 Apr 2004)
+
+  25 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9-r1.ebuild:
+  + Depend on virtual/linux-sources.
+  + Add static build support.
+  + Install all headers, patch contributed by Thomas Jacob <jacob@internet24.de>.
+  + l7-filter support, closing #39761.
+  + Made initscript run before net, closing #27087.
+  + Removed ipforwarding from initscripts as it doesn't belong here and added einfo about it.
+  + Removed some old ebuilds.
+
+  21 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.7a-r3.ebuild,
+  iptables-1.2.7a-r4.ebuild, iptables-1.2.8.ebuild:
+  Added IUSE=
+
+  09 Mar 2004; <agriffis@gentoo.org> iptables-1.2.9.ebuild:
+  stable on alpha and ia64
+
+  09 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9.ebuild:
+  + Added einfo about kernel 2.4.21, closing #25919.
+  + Install ip6tables-save and ip6tables-restore, closing #39833.
+  + Really enable IPv6, closing #41624.
+
+  28 Jan 2004; <gustavoz@gentoo.org> iptables-1.2.9.ebuild:
+  stable on hppa and sparc
+
+  23 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> files/iptables.init, files/ip6tables.init, iptables-1.2.9.ebuild:
+  Add reload support to initscript. Closing #21801.
+  Added note about saving your rules if upgrading. Closing #35135.
+  Unmasked, closing #34910.
+
+  21 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9.ebuild :
+  Replae -O0 with -O2, same as the the lack of -O flag problem. Closing #33899.
+
+*iptables-1.2.9 (04 Nov 2003)
+
+  04 Nov 2003; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.9.ebuild :
+  Version bump.
+
+*iptables-1.2.8-r2 (15 Oct 2003)
+
+  15 Oct 2003; John Mylchreest <johnm@gentoo.org>; iptables-1.2.8-r2.ebuild:
+  fixes bug #22223
+
+  21 Sep 2003; Matthew Rickard <frogger@gentoo.org> iptables-1.2.8-r1.ebuild:
+  "-fstack-protector" breaks "iptables -p icmp".  We will
+  filter this flag until this is fixed properly.
+
+  19 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> files/ip6tables.init:
+  Closing #29087.
+
+  06 May 2003; Christian Birchinger <joker@gentoo.org>
+  iptables-1.2.8-r1.ebuild:
+  Added stable sparc keyword
+
+  05 May 2003; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.8-r1.ebuild :
+  Unmasked on x86.
+
+*iptables-1.2.8-r1 (04 May 2003)
+
+  02 Jul 2003; Guy Martin <gmsoft@gentoo.org>  files/1.2.8-files/03_hppa_gentoo.patch.bz2,
+  iptables-1.2.8-r1.ebuild :
+  Bzipped 03_hppa_gentoo.patch.bz2 which was not. Marked stable for hppa.
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.8-r1.ebuild, files/iptables.init 
+							files/iptables.confd, files/ip6tables.init
+							files/ip6tables.confd :
+  Fixed ipv6 support. Closes #17155.
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> files/1.2.8-files/03_hppa_gentoo.patch.bz2 :
+  doh! uncompressed patch.
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> files/iptables.init :
+  Removed auto saving of rules when stopping iptables. Closing #15333 
+  and #13673.
+
+  02 May 2003; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.8.ebuild :
+  Force -O2 if no -O flag is set. Remove 03_all_no_optimize_fix.patch.bz2.
+
+  19 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Removed 03_all_mac_fix.patch.bz2 becuse it was fixed in 1.2.8.
+
+*iptables-1.2.8 (19 Apr 2003)
+
+  19 Apr 2003; Daniel Ahlberg <aliz@gentoo.org> iptables-1.2.8.ebuild :
+  Version bump.
+
+*iptables-1.2.7a-r4 (10 Apr 2003)
+
+  19 apr 2003; Preston A. Elder <prez@gentoo.org> iptables-1.2.7a-r4.ebuild :
+  Enabled -r4 for x86
+
+  10 apr 2003; Preston A. Elder <prez@gentoo.org> iptables-1.2.7a-r4.ebuild :
+  Added compilation of development tools
 
 *iptables-1.2.7a-r3 (11 Mar 2003)
 
+  15 Mar 2003; Jason Wever <weeve@gentoo.org>
+  files/sparc64_limit_fix.patch.bz2:
+  Added sparc64_limit_fix.patch.bz2 back into the files directory as it got lost
+  in the moving of iptables from sys-apps to net-firewall.
+
+  15 Mar 2003; Jan Seidel <tuxus@gentoo.org> :
+  Added mips to KEYWORDS
+
   11 Mar 2003; Martin Holzer <mholzer@gentoo.org> iptables-1.2.7a-r3.ebuild,
   files/grsecurity-1.2.7a-iptables.patch, files/iptables-1.2.6a-imq.diff-3,
   files/iptables-1.2.7a-gentoo.diff, files/iptables-1.2.7a-hppa.diff,
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index e69de29bb2d1..e1eeb80c6940 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -0,0 +1,40 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a7d8e2d425f285c45bcd462b1cb8e220 ChangeLog 20883
+MD5 756f721b4c0c0646a174993befa199c4 files/1.2.11-files/CAN-2004-0986.patch 1365
+MD5 1d104ede1329b4433cd31e2bf734aaaa files/1.2.11-files/grsecurity-1.2.8-iptables.patch.bz2 763
+MD5 e501a7bffac71e8c86aa8c62414d1621 files/1.2.11-files/install_all_dev_files.patch.bz2 1041
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.2.11-files/install_ipv6_apps.patch.bz2 334
+MD5 3e4bb17303647ee7a43279f6aa6f0d61 files/1.2.11-files/iptables-1.2.9-imq1.diff.bz2 1420
+MD5 66834df31d6b9d23cac3f4226a865cb2 files/1.2.11-files/iptables-layer7-0.9.0.patch.bz2 3815
+MD5 b0150e53cd00cec2a3c1cff0e2e7673f files/1.2.11-files/round-robin.patch 830
+MD5 bcbdd7e40a2fd78796c9a00a5ae463cb files/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2 801
+MD5 76a42dd64d1a4f419a5f07de5a6cb0c2 files/1.3.1-files/install_all_dev_files.patch-1.3.1.bz2 1098
+MD5 0eacca16bacc2e2d7cc125d3aa65b30d files/1.3.1-files/install_ipv6_apps.patch.bz2 334
+MD5 628b6569018552e77bd5543d98baa664 files/1.3.1-files/iptables-1.3.1-compilefix.patch 539
+MD5 1457a4df1ce1faccfaccc8c7208bc432 files/digest-iptables-1.2.11-r3 68
+MD5 396ad08a192cd926417a200569060278 files/digest-iptables-1.3.2 206
+MD5 6eb9a9d6ef4fb4b8275a482b4671f1a5 files/digest-iptables-1.3.3-r1 206
+MD5 57dd4f2755bb43094f081d87347571b2 files/digest-iptables-1.3.3-r2 211
+MD5 d08593cc4d24d53934c8603dc1b14913 files/digest-iptables-1.3.4 211
+MD5 dd4f4563c89d33fc6987043d95531e05 files/ip6tables-1.2.9-r1.confd 266
+MD5 f74f2424c062e1b2f4b22e4e11db909b files/ip6tables-1.2.9-r1.init 1792
+MD5 dbef6253ff7e347e7fa35a02652ab684 files/ip6tables-1.3.2.confd 293
+MD5 4e055c59114fd6abc5a27bdaa97d2946 files/iptables-1.2.9-r1.confd 264
+MD5 8ac77b3fbebfb5ceb9c6166823afe21d files/iptables-1.2.9-r1.init 1829
+MD5 956ebf5ab69e5a1e1d3983541eab643b files/iptables-1.3.2.confd 290
+MD5 be57c10dd117e845d0367ac4abfdc6d2 files/iptables-1.3.2.init 2548
+MD5 83b159bf81dca9ddaa1e0b4e9c606a70 iptables-1.2.11-r3.ebuild 5355
+MD5 cdad781be189255fe3fd04bedce629e5 iptables-1.3.2.ebuild 4963
+MD5 b5b107c8cf13e1c278bf83b4daea0c70 iptables-1.3.3-r1.ebuild 5030
+MD5 3e7ee88a2de7f0ffd26b9b1111a09ab8 iptables-1.3.3-r2.ebuild 5030
+MD5 63e24d2ef04466b4df9b40baa49dba91 iptables-1.3.4.ebuild 5026
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDgBOkgIKl8Uu19MoRArVaAJ9mM+jDbAMjCeDXrFjrxh/yIJ3vWQCeMjTN
+46jJbzvqZFQYBt9g02ROE0g=
+=r1kx
+-----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/files/digest-iptables-1.3.2 b/net-firewall/iptables/files/digest-iptables-1.3.2
index eb3d054b2ad9..3dde90ceb0a7 100644
--- a/net-firewall/iptables/files/digest-iptables-1.3.2
+++ b/net-firewall/iptables/files/digest-iptables-1.3.2
@@ -1,3 +1,3 @@
 MD5 9a951971de3f6c7f60dece4023a48687 iptables-1.3.2.tar.bz2 186255
 MD5 9adae8be9562775a176fc1b275b3cb29 iptables-1.3.0-imq1.diff 5369
-MD5 24963993a6f0727206a3a2d1a9c5e83b netfilter-layer7-v1.2.tar.gz 71697
+MD5 7ce3a8ca7635ffbd231cc061fad3c228 netfilter-layer7-v1.4.tar.gz 72293
diff --git a/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd b/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd
index b5177e9942aa..ef8e61552dd6 100644
--- a/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd
+++ b/net-firewall/iptables/files/ip6tables-1.2.9-r1.confd
@@ -4,3 +4,6 @@ IP6TABLES_SAVE="/var/lib/ip6tables/rules-save"
 
 #Options to pass to iptables-save and iptables-restore 
 SAVE_RESTORE_OPTIONS="-c"
+
+#Save state on stopping iptables
+SAVE_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/ip6tables-1.2.9-r1.init b/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
index eaeb33f65e28..0618ead9bb5e 100644
--- a/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
+++ b/net-firewall/iptables/files/ip6tables-1.2.9-r1.init
@@ -1,13 +1,13 @@
 #!/sbin/runscript
-# 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/net-firewall/iptables/files/ip6tables-1.2.9-r1.init,v 1.1 2004/04/25 16:30:36 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/ip6tables-1.2.9-r1.init,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
-opts="start stop save reload"
+opts="save reload"
 
 depend() {
 	before net
-	need logger
+	use logger
 }
 
 checkrules() {
@@ -20,7 +20,7 @@ checkrules() {
 }
 
 start() {
-	checkrules || return 1	
+	checkrules || return 1
 	ebegin "Loading ip6tables state and starting firewall"
 	einfo "Restoring ip6tables ruleset"
 		/sbin/ip6tables-restore ${SAVE_RESTORE_OPTIONS} < ${IP6TABLES_SAVE}
@@ -28,45 +28,46 @@ start() {
 }
 
 stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save || return 1
+	fi
 	ebegin "Stopping firewall"
-		for a in `cat /proc/net/ip6_tables_names`; do
-			ip6tables -F -t $a
-			ip6tables -X -t $a
+	for a in `cat /proc/net/ip6_tables_names`; do
+		ip6tables -F -t $a
+		ip6tables -X -t $a
 
-			if [ $a == nat ]; then
-				/sbin/ip6tables -t nat -P PREROUTING ACCEPT
-				/sbin/ip6tables -t nat -P POSTROUTING ACCEPT
-				/sbin/ip6tables -t nat -P OUTPUT ACCEPT
-			elif [ $a == mangle ]; then
-				/sbin/ip6tables -t mangle -P PREROUTING ACCEPT
-				/sbin/ip6tables -t mangle -P INPUT ACCEPT
-				/sbin/ip6tables -t mangle -P FORWARD ACCEPT
-				/sbin/ip6tables -t mangle -P OUTPUT ACCEPT
-				/sbin/ip6tables -t mangle -P POSTROUTING ACCEPT
-			elif [ $a == filter ]; then
-				/sbin/ip6tables -t filter -P INPUT ACCEPT
-				/sbin/ip6tables -t filter -P FORWARD ACCEPT
-				/sbin/ip6tables -t filter -P OUTPUT ACCEPT
-			fi
-		done
+		if [ $a == nat ]; then
+			/sbin/ip6tables -t nat -P PREROUTING ACCEPT
+			/sbin/ip6tables -t nat -P POSTROUTING ACCEPT
+			/sbin/ip6tables -t nat -P OUTPUT ACCEPT
+		elif [ $a == mangle ]; then
+			/sbin/ip6tables -t mangle -P PREROUTING ACCEPT
+			/sbin/ip6tables -t mangle -P INPUT ACCEPT
+			/sbin/ip6tables -t mangle -P FORWARD ACCEPT
+			/sbin/ip6tables -t mangle -P OUTPUT ACCEPT
+			/sbin/ip6tables -t mangle -P POSTROUTING ACCEPT
+		elif [ $a == filter ]; then
+			/sbin/ip6tables -t filter -P INPUT ACCEPT
+			/sbin/ip6tables -t filter -P FORWARD ACCEPT
+			/sbin/ip6tables -t filter -P OUTPUT ACCEPT
+		fi
+	done
 	eend $?
 }
 
 reload() {
 	ebegin "Flushing firewall"
-		for a in `cat /proc/net/ip_tables_names`; do
-			/sbin/ip6tables -F -t $a
-			/sbin/ip6tables -X -t $a
-		done;
+	for a in `cat /proc/net/ip_tables_names`; do
+		/sbin/ip6tables -F -t $a
+		/sbin/ip6tables -X -t $a
+	done
 	eend $?
 
 	start
 }
 
-
 save() {
-        ebegin "Saving ip6tables state"
-        /sbin/ip6tables-save ${SAVE_RESTORE_OPTIONS} > ${IP6TABLES_SAVE}
-        eend $?
+	ebegin "Saving ip6tables state"
+	/sbin/ip6tables-save ${SAVE_RESTORE_OPTIONS} > ${IP6TABLES_SAVE}
+	eend $?
 }
-
diff --git a/net-firewall/iptables/files/iptables-1.2.9-r1.confd b/net-firewall/iptables/files/iptables-1.2.9-r1.confd
index e0e2c7a6137d..a2d070fc48e3 100644
--- a/net-firewall/iptables/files/iptables-1.2.9-r1.confd
+++ b/net-firewall/iptables/files/iptables-1.2.9-r1.confd
@@ -4,3 +4,6 @@ IPTABLES_SAVE="/var/lib/iptables/rules-save"
 
 #Options to pass to iptables-save and iptables-restore 
 SAVE_RESTORE_OPTIONS="-c"
+
+#Save state on stopping iptables
+SAVE_ON_STOP="yes"
diff --git a/net-firewall/iptables/files/iptables-1.2.9-r1.init b/net-firewall/iptables/files/iptables-1.2.9-r1.init
index 67af39b880b7..ccb765752ff2 100644
--- a/net-firewall/iptables/files/iptables-1.2.9-r1.init
+++ b/net-firewall/iptables/files/iptables-1.2.9-r1.init
@@ -1,13 +1,13 @@
 #!/sbin/runscript
-# 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/net-firewall/iptables/files/iptables-1.2.9-r1.init,v 1.1 2004/04/25 16:30:36 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.2.9-r1.init,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
-opts="start stop save reload"
+opts="save reload"
 
 depend() {
 	before net
-	need logger
+	use logger
 }
 
 checkrules() {
@@ -20,52 +20,57 @@ checkrules() {
 }
 
 start() {
-	checkrules || return 1	
+	checkrules || return 1
 	ebegin "Loading iptables state and starting firewall"
 	einfo "Restoring iptables ruleset"
-		/sbin/iptables-restore ${SAVE_RESTORE_OPTIONS} < ${IPTABLES_SAVE}
+	/sbin/iptables-restore ${SAVE_RESTORE_OPTIONS} < ${IPTABLES_SAVE}
 	eend $?
 }
 
 stop() {
+	if [ "${SAVE_ON_STOP}" = "yes" ]; then
+		save || return 1
+	fi
 	ebegin "Stopping firewall"
-		for a in `cat /proc/net/ip_tables_names`; do
-			/sbin/iptables -F -t $a
-			/sbin/iptables -X -t $a
-	
-			if [ $a == nat ]; then
-				/sbin/iptables -t nat -P PREROUTING ACCEPT
-				/sbin/iptables -t nat -P POSTROUTING ACCEPT
-				/sbin/iptables -t nat -P OUTPUT ACCEPT
-			elif [ $a == mangle ]; then
-				/sbin/iptables -t mangle -P PREROUTING ACCEPT
-				/sbin/iptables -t mangle -P INPUT ACCEPT
-				/sbin/iptables -t mangle -P FORWARD ACCEPT
-				/sbin/iptables -t mangle -P OUTPUT ACCEPT
-				/sbin/iptables -t mangle -P POSTROUTING ACCEPT
-			elif [ $a == filter ]; then
-				/sbin/iptables -t filter -P INPUT ACCEPT
-				/sbin/iptables -t filter -P FORWARD ACCEPT
-				/sbin/iptables -t filter -P OUTPUT ACCEPT
-			fi
-		done
+	for a in `cat /proc/net/ip_tables_names`; do
+		/sbin/iptables -F -t $a
+		/sbin/iptables -X -t $a
+
+		if [ $a == nat ]; then
+			/sbin/iptables -t nat -P PREROUTING ACCEPT
+			/sbin/iptables -t nat -P POSTROUTING ACCEPT
+			/sbin/iptables -t nat -P OUTPUT ACCEPT
+		elif [ $a == mangle ]; then
+			/sbin/iptables -t mangle -P PREROUTING ACCEPT
+			/sbin/iptables -t mangle -P INPUT ACCEPT
+			/sbin/iptables -t mangle -P FORWARD ACCEPT
+			/sbin/iptables -t mangle -P OUTPUT ACCEPT
+			/sbin/iptables -t mangle -P POSTROUTING ACCEPT
+		elif [ $a == filter ]; then
+			/sbin/iptables -t filter -P INPUT ACCEPT
+			/sbin/iptables -t filter -P FORWARD ACCEPT
+			/sbin/iptables -t filter -P OUTPUT ACCEPT
+		fi
+	done
 	eend $?
 }
 
 reload() {
 	ebegin "Flushing firewall"
-		for a in `cat /proc/net/ip_tables_names`; do
-			/sbin/iptables -F -t $a
-			/sbin/iptables -X -t $a
-		done;
-        eend $?
+	for a in `cat /proc/net/ip_tables_names`; do
+		/sbin/iptables -F -t $a
+		/sbin/iptables -X -t $a
+	done;
+	eend $?
 
 	start
 }
 
 save() {
-        ebegin "Saving iptables state"
-        /sbin/iptables-save ${SAVE_RESTORE_OPTIONS} > ${IPTABLES_SAVE}
-        eend $?
+	local ret
+	ebegin "Saving iptables state"
+	/sbin/iptables-save ${SAVE_RESTORE_OPTIONS} > ${IPTABLES_SAVE}
+	ret=$?
+	chmod 0600 ${IPTABLES_SAVE}
+	eend ${ret}
 }
-
diff --git a/net-firewall/iptables/files/iptables-1.3.2.init b/net-firewall/iptables/files/iptables-1.3.2.init
index e58d2b770145..e7f56d9283ed 100755
--- a/net-firewall/iptables/files/iptables-1.3.2.init
+++ b/net-firewall/iptables/files/iptables-1.3.2.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.1 2005/07/12 02:38:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/files/iptables-1.3.2.init,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
 opts="save reload panic"
 
@@ -79,7 +79,7 @@ stop() {
 reload() {
 	checkkernel || return 1
 	ebegin "Flushing firewall"
-	for a in $(<${iptabes_proc}) ; do
+	for a in $(<${iptables_proc}) ; do
 		${iptables_bin} -F -t $a
 		${iptables_bin} -X -t $a
 	done
diff --git a/net-firewall/iptables/iptables-1.2.11-r3.ebuild b/net-firewall/iptables/iptables-1.2.11-r3.ebuild
index 3756d2c1c8dc..0598e7556707 100644
--- a/net-firewall/iptables/iptables-1.2.11-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.2.11-r3.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/net-firewall/iptables/iptables-1.2.11-r3.ebuild,v 1.1 2004/11/06 16:43:41 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.2.11-r3.ebuild,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic toolchain-funcs
 
 #extensions versions
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.iptables.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
 IUSE="ipv6 static extensions"
 
 DEPEND="virtual/os-headers
@@ -24,7 +24,7 @@ pkg_setup() {
 		einfo "WARNING: 3rd party extensions has been enabled."
 		einfo "This means that iptables will use your currently installed"
 		einfo "kernel in /usr/src/linux as headers for iptables."
-		einfo ""
+		einfo
 		einfo "You may have to patch your kernel to allow iptables to build."
 		einfo "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ for patches"
 		einfo "for your kernel."
@@ -87,6 +87,7 @@ src_compile() {
 			MANDIR=/usr/share/man \
 			INCDIR=/usr/include \
 			KERNEL_DIR=/usr/src/linux \
+			CC="$(tc-getCC)" \
 			|| die "Please check http://cvs.iptables.org/patch-o-matic-ng/updates/ if your kernel needs to be patched for iptables"
 	else
 		make COPT_FLAGS="${CFLAGS}" ${myconf} \
@@ -96,6 +97,7 @@ src_compile() {
 			MANDIR=/usr/share/man \
 			INCDIR=/usr/include \
 			KERNEL_DIR=/usr \
+			CC="$(tc-getCC)" \
 			|| die
 	fi
 }
@@ -156,22 +158,22 @@ src_install() {
 pkg_postinst() {
 	einfo "This package now includes an initscript which loads and saves"
 	einfo "rules stored in /var/lib/iptables/rules-save"
-	use ipv6 >/dev/null && einfo "and /var/lib/ip6tables/rules-save"
+	use ipv6 && einfo "and /var/lib/ip6tables/rules-save"
 	einfo "This location can be changed in /etc/conf.d/iptables"
-	einfo ""
+	einfo
 	einfo "If you are using the iptables initsscript you should save your"
 	einfo "rules using the new iptables version before rebooting."
-	einfo ""
+	einfo
 	einfo "If you are upgrading to a >=2.4.21 kernel you may need to rebuild"
 	einfo "iptables."
-	einfo ""
+	einfo
 	ewarn "!!! ipforwarding is now not a part of the iptables initscripts."
-	einfo "Until a more permanent solution is implemented adding the following"
-	einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:"
-	einfo "  echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding"
-	if useq ipv6; then
+	einfo
+	einfo "To enable ipforwarding at bootup:"
+	einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
+	if use ipv6 ; then
 		einfo "and/or"
-		einfo "  echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding"
+		einfo "  net.ipv6.ip_forward = 1"
 		einfo "for ipv6."
 	fi
 }
diff --git a/net-firewall/iptables/iptables-1.3.2.ebuild b/net-firewall/iptables/iptables-1.3.2.ebuild
index 1866136df23d..d46c71e1ade2 100644
--- a/net-firewall/iptables/iptables-1.3.2.ebuild
+++ b/net-firewall/iptables/iptables-1.3.2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.2.ebuild,v 1.1 2005/07/12 02:38:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
-L7_PN="netfilter-layer7"
-L7_PV="1.2"
-L7_P="${L7_PN}-v${L7_PV}"
+L7_PV="1.4"
+L7_P="netfilter-layer7-v${L7_PV}"
 L7_PATCH="iptables-layer7-${L7_PV}.patch"
 IMQ_PATCH="iptables-1.3.0-imq1.diff"
 
@@ -20,7 +19,7 @@ SRC_URI="http://www.iptables.org/files/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-*" #~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ipv6 static extensions"
 
 DEPEND="virtual/os-headers
@@ -55,18 +54,16 @@ src_unpack() {
 	# this provide's grsec's stealth match
 	EPATCH_OPTS="-p0" \
 	epatch "${FILESDIR}"/1.3.1-files/grsecurity-1.2.8-iptables.patch-1.3.1.bz2
-
 	sed -i \
 		-e "s/PF_EXT_SLIB:=/PF_EXT_SLIB:=stealth /g" \
-		extensions/Makefile \
-		|| die "failed to enable stealth extension"
+		extensions/Makefile || die "failed to enable stealth extension"
 
 	EPATCH_OPTS="-p1" \
 	epatch "${FILESDIR}"/1.3.1-files/${PN}-1.3.1-compilefix.patch
 
 	if use extensions ; then
-		EPATCH_OPTS="-p1" epatch ${DISTDIR}/${IMQ_PATCH}
-		EPATCH_OPTS="-p1" epatch ${WORKDIR}/${L7_P}/${L7_PATCH}
+		EPATCH_OPTS="-p1" epatch "${DISTDIR}"/${IMQ_PATCH}
+		EPATCH_OPTS="-p1" epatch "${WORKDIR}"/${L7_P}/${L7_PATCH}
 		chmod +x extensions/{.IMQ-test*,.childlevel-test*,.layer7-test*}
 	fi
 }
@@ -147,12 +144,16 @@ pkg_postinst() {
 	einfo "iptables."
 	einfo
 	ewarn "!!! ipforwarding is now not a part of the iptables initscripts."
-	einfo "Until a more permanent solution is implemented adding the following"
-	einfo "to /etc/conf.d/local.start will enable ipforwarding at bootup:"
-	einfo "  echo \"1\" > /proc/sys/net/ipv4/conf/all/forwarding"
+	einfo
+	einfo "To enable ipforwarding at bootup:"
+	einfo "/etc/sysctl.conf and set net.ipv4.ip_forward = 1"
 	if use ipv6 ; then
 		einfo "and/or"
-		einfo "  echo \"1\" > /proc/sys/net/ipv6/conf/all/forwarding"
+		einfo "  net.ipv6.ip_forward = 1"
 		einfo "for ipv6."
 	fi
+	echo
+	ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
+	ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
+	ewarn "http://bugs.gentoo.org/show_bug.cgi?id=92535"
 }
diff --git a/net-firewall/iptables/iptables-1.3.3-r1.ebuild b/net-firewall/iptables/iptables-1.3.3-r1.ebuild
index a7bf2564c3f5..0fda03a436d9 100644
--- a/net-firewall/iptables/iptables-1.3.3-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.3.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/net-firewall/iptables/iptables-1.3.3-r1.ebuild,v 1.1 2005/09/17 09:15:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.3-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
diff --git a/net-firewall/iptables/iptables-1.3.3-r2.ebuild b/net-firewall/iptables/iptables-1.3.3-r2.ebuild
index 6f2d46511399..7b8e36febc6c 100644
--- a/net-firewall/iptables/iptables-1.3.3-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.3.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/net-firewall/iptables/iptables-1.3.3-r2.ebuild,v 1.1 2005/09/24 23:24:54 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.3-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
diff --git a/net-firewall/iptables/iptables-1.3.4.ebuild b/net-firewall/iptables/iptables-1.3.4.ebuild
index 6b7664dcd56e..b387274b13dc 100644
--- a/net-firewall/iptables/iptables-1.3.4.ebuild
+++ b/net-firewall/iptables/iptables-1.3.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/net-firewall/iptables/iptables-1.3.4.ebuild,v 1.1 2005/11/05 08:01:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.4.ebuild,v 1.1.1.1 2005/11/30 10:11:16 chriswhite Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -19,7 +19,7 @@ SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86"
 IUSE="ipv6 static extensions"
 
 DEPEND="virtual/os-headers
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index 8060c04f89e1..96a2d586367d 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/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>aliz@gentoo.org</email>
-</maintainer>
+<herd>base-system</herd>
 </pkgmetadata>
diff --git a/net-firewall/kmyfirewall/ChangeLog b/net-firewall/kmyfirewall/ChangeLog
index b0273e335d30..dccab254d474 100644
--- a/net-firewall/kmyfirewall/ChangeLog
+++ b/net-firewall/kmyfirewall/ChangeLog
@@ -1,6 +1,86 @@
-# ChangeLog for net-misc/kmyfirewall
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/ChangeLog,v 1.1 2003/03/26 15:28:16 mholzer Exp $
+# ChangeLog for net-firewall/kmyfirewall
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  kmyfirewall-0.9.6.2-r1.ebuild:
+  Mark 0.9.6.2-r1 stable on alpha
+
+  30 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  kmyfirewall-0.9.6.2-r1.ebuild:
+  Stable on sparc
+
+  28 Aug 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmyfirewall-0.9.6.2-r1.ebuild:
+  Stable on amd64 and x86.
+
+  29 May 2005; Marcus D. Hanwell <cryos@gentoo.org>
+  kmyfirewall-0.9.6.2.ebuild:
+  Stable on amd64.
+
+*kmyfirewall-0.9.6.2-r1 (01 May 2005)
+
+  01 May 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kmyfirewall-0.9.6.2-configure-arts.patch,
+  +kmyfirewall-0.9.6.2-r1.ebuild:
+  remove configure check for arts
+
+  10 Jan 2005; Karol Wojtaszek <sekretarz@gentoo.org>
+  kmyfirewall-0.9.6.2.ebuild:
+  Added to ~amd64, bug #71047
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> -kmyfirewall-0.9.4.ebuild,
+  -kmyfirewall-0.9.5.ebuild, kmyfirewall-0.9.6.2.ebuild:
+  removed old ebuilds, QA: need-kde after R/DEPEND
+
+  19 Apr 2004; Daniel Black <dragonheart@gentoo.org> kmyfirewall-0.4.5.ebuild,
+  kmyfirewall-0.9.4.ebuild, kmyfirewall-0.9.5.ebuild,
+  kmyfirewall-0.9.6.2.ebuild:
+  version 0.9.6.2 stable on x86 sparc alpha. removed version 0.4.5. Added
+  iptables depend to versions 0.9.4 0.9.5. Thanks again to Federico Zenith
+  <zenith@chemeng.ntnu.no>
+
+  18 Apr 2004; Daniel Black <dragonheart@gentoo.org>
+  kmyfirewall-0.9.6.2.ebuild, kmyfirewall-0.9.6.ebuild, metadata.xml:
+  Dependancy update to 0.9.6.2 and remove 0.9.6 due to fault. Thanks to Federico
+  Zenith <zenith@chemeng.ntnu.no> in bug #48123
+
+  01 Apr 2004; David Holm <dholm@gentoo.org> kmyfirewall-0.9.6.2.ebuild:
+  Added to ~ppc.
+
+*kmyfirewall-0.9.6.2 (31 Mar 2004)
+
+  31 Mar 2004; Michael Boman <mboman@gentoo.org> kmyfirewall-0.9.6.2.ebuild:
+  New upstream version. Closes 46032
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  kmyfirewall-0.4.5.ebuild, kmyfirewall-0.9.4.ebuild,
+  kmyfirewall-0.9.5.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  25 Feb 2004; Sven Blumenstein <bazik@gentoo.org> kmyfirewall-0.9.6.ebuild:
+  Stable and Kbloated on sparc.
+
+  14 Jan 2004; Aron Griffis <agriffis@gentoo.org> kmyfirewall-0.9.6.ebuild:
+  add ~alpha
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> kmyfirewall-0.9.6.ebuild:
+  Added ~sparc keyword.
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> kmyfirewall-0.4.5.ebuild,
+  kmyfirewall-0.9.4.ebuild, kmyfirewall-0.9.5.ebuild,
+  kmyfirewall-0.9.6.ebuild:
+  adding RESTRICT="nomirror"
+
+  03 Oct 2003; Caleb Tennis <caleb@gentoo.org> kmyfirewall-0.9.6.ebuild:
+  Supports something called Gentoo mode, so lets turn it on
+  by default in the configuration file.
+  Closes bug #22124
+
+*kmyfirewall-0.9.6 (28 May 2003)
+
+  28 May 2003; Caleb Tennis <caleb@gentoo.org> kmyfirewall-0.9.6.ebuild:
+  Version bump, ebuild thanks to Jorg Spanke (closes bug #20598)
 
 *kmyfirewall-0.9.4 (30 Mar 2003)
 
@@ -10,6 +90,9 @@
 
 *kmyfirewall-0.9.5 (12 Feb 2003)
 
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> kmyfirewall-0.9.5.ebuild:
+  Mark as x86 stable.
+
   12 Feb 2003; Hannes Mehnert <hannes@gentoo.org> kmyfirewall-0.9.5.ebuild:
   version bump
 
@@ -27,7 +110,7 @@
 
   New upstream version.
 
-*kmyfirewall-0.4.5.ebuild (03 Aug 2002)
+*kmyfirewall-0.4.5 (03 Aug 2002)
 
   03 Aug 2002; Nick Hadaway <raker@gentoo.org>
   kmyfirewall-0.4.5.ebuild, files/digest-kmyfirewall-0.4.5 :
diff --git a/net-firewall/kmyfirewall/Manifest b/net-firewall/kmyfirewall/Manifest
index c2289aab3825..8091ab0d2474 100644
--- a/net-firewall/kmyfirewall/Manifest
+++ b/net-firewall/kmyfirewall/Manifest
@@ -1,9 +1,7 @@
-MD5 1676726f512137fbc5f9ea3a4d5c2ba4 kmyfirewall-0.9.4.ebuild 536
-MD5 6339be9339b50db817c25b18dce77e79 kmyfirewall-0.9.6.ebuild 510
-MD5 30b128ad33fedbe117daa4cb6d639a4a kmyfirewall-0.4.5.ebuild 594
-MD5 a03694a616ce92b687221cf39746b248 ChangeLog 2267
-MD5 6339be9339b50db817c25b18dce77e79 kmyfirewall-0.9.5.ebuild 510
-MD5 b29e7a166a613bcac1bf63a2f8fb14e3 files/digest-kmyfirewall-0.4.5 74
-MD5 7e830ab257c4ae6a9088071832d4835d files/digest-kmyfirewall-0.9.4 70
-MD5 eb3eab1fb0fe51bb510c20f045561c06 files/digest-kmyfirewall-0.9.5 70
-MD5 8b74fa15d32f2524498c16fc08afbf59 files/digest-kmyfirewall-0.9.6 70
+MD5 85c361bad9cce731ed599dfc99ce38f4 metadata.xml 696
+MD5 b80b85f0684cf75183051dc4b877aae1 ChangeLog 5071
+MD5 5a0451e37dbdd06bdde83c33ce1c2877 kmyfirewall-0.9.6.2-r1.ebuild 696
+MD5 73de5f376591b456fa76bfbad31e77c2 kmyfirewall-0.9.6.2.ebuild 659
+MD5 80cc54abedc0473d0a3d399fdd43467a files/kmyfirewall-0.9.6.2-configure-arts.patch 3478
+MD5 a0940eb3f5939500bee4e738121dcb58 files/digest-kmyfirewall-0.9.6.2 72
+MD5 a0940eb3f5939500bee4e738121dcb58 files/digest-kmyfirewall-0.9.6.2-r1 72
diff --git a/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2-r1.ebuild b/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2-r1.ebuild
index 933f61ad3b62..31dd8f7b1191 100644
--- a/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2-r1.ebuild
+++ b/net-firewall/kmyfirewall/kmyfirewall-0.9.6.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/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2-r1.ebuild,v 1.1 2005/05/01 20:11:06 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit kde eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/kmyfirewall/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha ~ppc ~amd64"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND="net-firewall/iptables"
diff --git a/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2.ebuild b/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2.ebuild
index ad925575faf9..a2376e92b7e0 100644
--- a/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2.ebuild
+++ b/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2.ebuild
@@ -1,17 +1,21 @@
-# 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/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2.ebuild,v 1.1 2004/03/31 12:11:05 mboman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/kmyfirewall/kmyfirewall-0.9.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
 inherit kde
-need-kde 3
 
-IUSE=""
 DESCRIPTION="Graphical KDE iptables configuration tool"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://kmyfirewall.sourceforge.net/"
-RESTRICT="nomirror"
+SRC_URI="mirror://sourceforge/kmyfirewall/${P}.tar.bz2"
 
+SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~alpha"
+KEYWORDS="alpha amd64 ~ppc sparc x86"
+IUSE=""
+
+DEPEND="sys-apps/sed"
+RDEPEND="net-firewall/iptables"
+need-kde 3
 
 src_unpack() {
 	kde_src_unpack
diff --git a/net-firewall/knetfilter/ChangeLog b/net-firewall/knetfilter/ChangeLog
index bee9be0244e2..cd7a636ab9a0 100644
--- a/net-firewall/knetfilter/ChangeLog
+++ b/net-firewall/knetfilter/ChangeLog
@@ -1,6 +1,55 @@
-# ChangeLog for net-misc/knetfilter
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/ChangeLog,v 1.1 2003/02/17 20:51:43 mholzer Exp $
+# ChangeLog for net-firewall/knetfilter
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> knetfilter-3.4.0.ebuild:
+  Added to ~ppc.
+
+*knetfilter-3.4.0 (01 May 2005)
+
+  01 May 2005; Carsten Lohrke <carlo@gentoo.org> +knetfilter-3.4.0.ebuild:
+  version bump
+
+  26 Nov 2004; Jason Wever <weeve@gentoo.org> knetfilter-3.3.0.ebuild:
+  Stable on sparc.
+
+  23 Nov 2004; Carsten Lohrke <carlo@gentoo.org> knetfilter-3.3.0.ebuild:
+  stable on x86
+
+*knetfilter-3.3.0 (11 Oct 2004)
+
+  11 Oct 2004; Carsten Lohrke <carlo@gentoo.org> +metadata.xml,
+  +knetfilter-3.3.0.ebuild:
+  version bump
+
+*knetfilter-3.2.0 (10 Jul 2004)
+
+  10 Jul 2004; Carsten Lohrke <carlo@gentoo.org> +knetfilter-3.2.0.ebuild:
+  version bump
+
+  06 Jul 2004; Carsten Lohrke <carlo@gentoo.org> -knetfilter-3.0.2.ebuild,
+  -knetfilter-3.0.3.ebuild, -knetfilter-3.1.0.ebuild, knetfilter-3.1.1.ebuild:
+  removed old ebuilds, QA: newdepend -> R/DEPEND, need-kde
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  knetfilter-3.0.2.ebuild, knetfilter-3.0.3.ebuild, knetfilter-3.1.0.ebuild,
+  knetfilter-3.1.1.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  06 Jan 2004; Jason Wever <weeve@gentoo.org> knetfilter-3.1.1.ebuild:
+  Marked stable on sparc.
+
+*knetfilter-3.1.1 (20 Mar 2003)
+
+  06 Apr 2003; Dan Armak <danarmak@gentoo.org> knetfilter-3.1.1.ebuild:
+  Mark as x86 stable.
+
+  20 Mar 2003; Jason Wever <weeve@gentoo.org> knetfilter-3.1.0.ebuild,
+  knetfilter-3.1.1.ebuild:
+  Added ~sparc to keywords.
+
+  20 Mar 2003; Hannes Mehnert <hannes@gentoo.org> knetfilter-3.1.1.ebuild:
+  version bump
 
   30 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
@@ -10,6 +59,10 @@
 
 *knetfilter-3.1.0 (19 Dec 2002)
 
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> knetfilter-3.0.2.ebuild,
+  knetfilter-3.0.3.ebuild, knetfilter-3.1.0.ebuild:
+  changed sys-apps/iptables to net-firewall/iptables
+
   19 Dec 2002; Dan Armak <danarmak@gentoo.org> ChangeLog  :
 
   A new upstream version.
diff --git a/net-firewall/knetfilter/Manifest b/net-firewall/knetfilter/Manifest
index 414aa08881a9..7e610f2db10b 100644
--- a/net-firewall/knetfilter/Manifest
+++ b/net-firewall/knetfilter/Manifest
@@ -1,9 +1,6 @@
-MD5 9404b445ecb0b45e12fe967d2c99ea97 ChangeLog 2780
-MD5 606a722413828e99df6eb846608f8bfe knetfilter-3.0.2.ebuild 633
-MD5 b64bca8093dd9a432e41f725e35cfea7 knetfilter-3.0.3.ebuild 647
-MD5 4fd2352be598c36e8e96899edf04eb05 knetfilter-3.1.0.ebuild 651
-MD5 001216399781924f57ec0909a3732fe0 knetfilter-3.1.1.ebuild 628
-MD5 0516c3f31ed142f6015d3e72f8d98640 files/digest-knetfilter-3.0.2 69
-MD5 80c9b97cc10d8dcb20631d7bf78902a7 files/digest-knetfilter-3.0.3 69
-MD5 d072ef346faaf30d30896020260b5b8d files/digest-knetfilter-3.1.0 69
-MD5 51d22e72cb798fd2bd4b7a0c80fe3ce7 files/digest-knetfilter-3.1.1 69
+MD5 965ebb36ac2906ae4e18026121b452d5 ChangeLog 3947
+MD5 ed63beca1d7c74ec82802079a959ab5e knetfilter-3.3.0.ebuild 651
+MD5 963de7b0cd9a1d19e3c381278bdeb449 knetfilter-3.4.0.ebuild 608
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 0560547615e22f8c3664b4574a114ec6 files/digest-knetfilter-3.3.0 68
+MD5 4f0786575477cc86bb46f79773696bd8 files/digest-knetfilter-3.4.0 69
diff --git a/net-firewall/knetfilter/knetfilter-3.3.0.ebuild b/net-firewall/knetfilter/knetfilter-3.3.0.ebuild
index 492eaf407e59..696f4e7deb90 100644
--- a/net-firewall/knetfilter/knetfilter-3.3.0.ebuild
+++ b/net-firewall/knetfilter/knetfilter-3.3.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/knetfilter-3.3.0.ebuild,v 1.1 2004/10/11 16:45:13 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/knetfilter-3.3.0.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="Manage Iptables firewalls with this KDE app"
-HOMEPAGE="http://expansa.sns.it:8080/knetfilter/"
-SRC_URI="http://expansa.sns.it:8080/knetfilter/${P}.tar.gz"
+HOMEPAGE="http://expansa.sns.it/knetfilter/"
+SRC_URI="http://expansa.sns.it/knetfilter/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 sparc"
 IUSE=""
 
 DEPEND=">=net-firewall/iptables-1.2.5"
diff --git a/net-firewall/knetfilter/knetfilter-3.4.0.ebuild b/net-firewall/knetfilter/knetfilter-3.4.0.ebuild
index ca1a6ef6ba80..cdc22d8116e9 100644
--- a/net-firewall/knetfilter/knetfilter-3.4.0.ebuild
+++ b/net-firewall/knetfilter/knetfilter-3.4.0.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/knetfilter-3.4.0.ebuild,v 1.1 2005/05/01 13:44:02 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/knetfilter/knetfilter-3.4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit kde
 
 DESCRIPTION="Manage Iptables firewalls with this KDE app"
-HOMEPAGE="http://expansa.sns.it:8080/knetfilter/"
-SRC_URI="http://expansa.sns.it:8080/knetfilter/${P}.tar.gz"
+HOMEPAGE="http://expansa.sns.it/knetfilter/"
+SRC_URI="http://expansa.sns.it/knetfilter/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=">=net-firewall/iptables-1.2.5"
diff --git a/net-firewall/knetfilter/metadata.xml b/net-firewall/knetfilter/metadata.xml
index b435a8440ccd..8d1e86a9cefb 100644
--- a/net-firewall/knetfilter/metadata.xml
+++ b/net-firewall/knetfilter/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>kde-other</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/net-firewall/lutelwall/ChangeLog b/net-firewall/lutelwall/ChangeLog
index 08ff7e8f1274..c16b9a069e04 100644
--- a/net-firewall/lutelwall/ChangeLog
+++ b/net-firewall/lutelwall/ChangeLog
@@ -1,6 +1,50 @@
 # ChangeLog for net-firewall/lutelwall
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/ChangeLog,v 1.1 2005/03/27 18:11:00 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/ChangeLog,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
+
+  17 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> -lutelwall-0.98.ebuild:
+  Removing old version.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> lutelwall-0.99.ebuild:
+  Mark 0.99 stable on alpha
+
+  26 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> lutelwall-0.99.ebuild:
+  Stabilizing on Tomasz's request to push iptables version bug fix.
+
+*lutelwall-0.99 (25 Aug 2005)
+
+  25 Aug 2005; Marcelo Goes <vanquirius@gentoo.org> -lutelwall-0.97.ebuild,
+  +lutelwall-0.99.ebuild:
+  Version bump, thanks to Tomasz Lutelmowski <tomek@lutel.pl>.
+
+*lutelwall-0.98 (09 Jun 2005)
+
+  09 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> +lutelwall-0.98.ebuild:
+  Version bump, marking it x86 stable as it fixes a security issue.
+
+  29 Apr 2005; Marcelo Goes <vanquirius@gentoo.org> -lutelwall-0.96.ebuild,
+  lutelwall-0.97.ebuild:
+  Marked 0.97 x86 stable, removing old version.
+
+  07 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> lutelwall-0.97.ebuild:
+  ~alpha keyword, bug 86882.
+
+*lutelwall-0.97 (28 Mar 2005)
+
+  28 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +lutelwall-0.97.ebuild:
+  Version bump.
+
+  28 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> lutelwall-0.96.ebuild:
+  added ~amd64 to KEYWORDS wrt #86882
+
+  27 Mar 2005; Jason Wever <weeve@gentoo.org> lutelwall-0.96.ebuild:
+  Added ~sparc keyword wrt bug #86882.
+
+  27 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> metadata.xml:
+  Added Tomek Lutelmowski as a third party ebuild maintainer to metadata.xml.
+
+  27 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> lutelwall-0.96.ebuild:
+  Added to ~ppc.
 
 *lutelwall-0.96 (27 Mar 2005)
 
diff --git a/net-firewall/lutelwall/Manifest b/net-firewall/lutelwall/Manifest
index 4eeb2a510a67..12ad12c0a1b1 100644
--- a/net-firewall/lutelwall/Manifest
+++ b/net-firewall/lutelwall/Manifest
@@ -1,4 +1,5 @@
-MD5 b00e6bf9a05d42e101462a5cb281e518 lutelwall-0.96.ebuild 679
-MD5 bdf8dea3987f4fb9fe70ae3107688c62 metadata.xml 615
-MD5 fef2974bb2d7ea5a836e69362ab639e8 files/digest-lutelwall-0.96 65
-MD5 e90f20a574d8e15633128cbd1965916b files/lutelwall 366
+MD5 82d866baa93a2471fb5ddff7147df12b lutelwall-0.99.ebuild 811
+MD5 8c9d5aa35898d91f2320964788cdeb80 ChangeLog 1974
+MD5 4294c738bdb7e97e266e93850ede8705 metadata.xml 839
+MD5 df3a29421976b77deb55c17b2d9c16b4 files/digest-lutelwall-0.99 65
+MD5 b85dc7b7070dd0aa724f8095dbddb8db files/lutelwall 470
diff --git a/net-firewall/lutelwall/files/lutelwall b/net-firewall/lutelwall/files/lutelwall
index 187feafb2b6b..34d2ae834813 100644
--- a/net-firewall/lutelwall/files/lutelwall
+++ b/net-firewall/lutelwall/files/lutelwall
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/files/lutelwall,v 1.1 2005/03/27 18:11:00 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/files/lutelwall,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-firewall/lutelwall/lutelwall-0.99.ebuild b/net-firewall/lutelwall/lutelwall-0.99.ebuild
index bf7e51edb92d..a917d83b1eb6 100644
--- a/net-firewall/lutelwall/lutelwall-0.99.ebuild
+++ b/net-firewall/lutelwall/lutelwall-0.99.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/lutelwall-0.99.ebuild,v 1.1 2005/08/25 18:59:50 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/lutelwall/lutelwall-0.99.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 DESCRIPTION="High-level tool for firewall configuration"
 HOMEPAGE="http://firewall.lutel.pl"
 SRC_URI="http://firewall.lutel.pl/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND=">=net-firewall/iptables-1.2.6
diff --git a/net-firewall/lutelwall/metadata.xml b/net-firewall/lutelwall/metadata.xml
index 39636bb67014..61843b9ce870 100644
--- a/net-firewall/lutelwall/metadata.xml
+++ b/net-firewall/lutelwall/metadata.xml
@@ -3,8 +3,14 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <maintainer>
+    <email>tomek@lutel.pl</email>
+    <name>Tomek Lutelmowski</name>
+    <description>LuteWall developer, third party maintainer</description>     
+</maintainer>
+<maintainer>
     <email>vanquirius@gentoo.org</email>
     <name>Marcelo Goes</name>
+    <description>Gentoo maintainer</description>
 </maintainer>
 <longdescription>
 LutelWall is high-level firewall configuration tool. It uses human-readable and easy 
diff --git a/net-firewall/metadata.xml b/net-firewall/metadata.xml
index bb35fbb35c60..a403ad76f341 100644
--- a/net-firewall/metadata.xml
+++ b/net-firewall/metadata.xml
@@ -4,5 +4,25 @@
 	<longdescription lang="en">
 		The net-firewall category contains network firewall software.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-firewall enthült Firewall-Software.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-firewall contiene programas relacionados con
+		cortafuegos de redes.
+	</longdescription>
+	<longdescription lang="ja">
+		net-firewall カテゴリーにはネットワーク・ファイアウォールの
+		ソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-firewall categorie bevat firewall-software.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-firewall chứa các phần mềm firewall.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-firewall contiene software per firewall.
+	</longdescription>
 </catmetadata>
 
diff --git a/net-firewall/psad/ChangeLog b/net-firewall/psad/ChangeLog
index 26e7cc1dc70d..95666fc8a47d 100644
--- a/net-firewall/psad/ChangeLog
+++ b/net-firewall/psad/ChangeLog
@@ -1,6 +1,133 @@
 # ChangeLog for net-firewall/psad
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.1 2003/09/17 23:32:46 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/ChangeLog,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
+
+  21 Sep 2005; Seemant Kulleen <seemant@gentoo.org> psad-1.4.0.ebuild,
+  psad-1.4.2.ebuild:
+  fix the grep for mydomain so that it takes only ^domain, as the word domain
+  can appear in other places in resolv.conf. Thanks to Chandler Carruth
+  (chandlerc on IRC)
+
+  31 Jul 2005; Bryan Stine <battousai@gentoo.org> psad-1.3.4.ebuild:
+  Stable x86...whoops.
+
+*psad-1.4.2 (31 Jul 2005)
+
+  31 Jul 2005; Bryan Stine <battousai@gentoo.org> -psad-1.3.1.ebuild,
+  -psad-1.3.2.ebuild, psad-1.3.4.ebuild, psad-1.4.0.ebuild,
+  +psad-1.4.2.ebuild:
+  Bump to 1.4.2, add a fix for hostname and DNS domain name detection when
+  using newer baselayout. Closes bug #90544.
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> psad-1.3.2.ebuild:
+  Stable on ppc.
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> psad-1.3.2.ebuild:
+  stable on amd64
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> psad-1.3.2.ebuild:
+  Stable on alpha.
+
+  07 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.4.0.ebuild:
+  Sync up installed files with RPM spec.
+
+  06 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.3.1.ebuild,
+  psad-1.3.2.ebuild, psad-1.3.4.ebuild, psad-1.4.0.ebuild:
+  A couple of fixes for unreported bugs. Typo fixes for postinst einfo in
+  1.3.1-1.3.4 ebuilds. Removed that same postinst einfo from 1.4.0 and added
+  detection for different sysloggers, giving conf suggestions for each. Closes
+  bug #76966.
+
+  05 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.3.2.ebuild:
+  x86 stable 1.3.2.
+
+  05 Jan 2005; Bryan D. Stine <battousai@gentoo.org> psad-1.3.1.ebuild,
+  psad-1.3.2.ebuild, psad-1.3.4.ebuild, psad-1.4.0.ebuild:
+  Changed dependancy on mailx to virtual/mailx. Fixes bug #73972.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*psad-1.4.0 (01 Dec 2004)
+
+  01 Dec 2004; Bryan D. Stine <battousai@gentoo.org> +psad-1.3.4.ebuild,
+  +psad-1.4.0.ebuild:
+  I need to keep up with the bumps better. The latest two bumps close #69263
+  (thanks Daniel Webert) and #72990 (thanks Alexey Portnov). The new upstream
+  version have changed the init-script locations in the tarballs, so the
+  ebuilds were updated accordingly.
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> psad-1.3.1.ebuild,
+  psad-1.3.2.ebuild:
+  Typo in DESCRIPTION: Scannning -> Scanning. Bug 59717.
+
+*psad-1.3.2 (24 Jun 2004)
+
+  24 Jun 2004; Bryan Stine <battousai@gentoo.org>; psad-1.3.1.ebuild,
+  +psad-1.3.2.ebuild:
+  Version bump to new 1.3.2 release. This release also resulted in a few
+  rewritten installation instructions and some changed filenames. Also changed
+  /etc/init.d doins stuff to doexe.
+
+  21 Jun 2004; Bryan Stine <battousai@gentoo.org>; psad-1.3.1.ebuild:
+  The ebuild now installs manfiles. Thanks to Michael Rash for pointing this out.
+
+  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> psad-1.3.1.ebuild:
+  Stable on alpha.
+
+  30 May 2004; Robin H. Johnson <robbat2@gentoo.org> psad-1.3.1.ebuild:
+  mailx move
+
+  23 Mar 2004; Bryan Stine <battousai@gentoo.org> psad-1.2.4-r1.ebuild,
+  psad-1.3.1.ebuild, psad-1.3.ebuild:
+  Expunged old ebuilds. Bumping 1.3.1 to x86 stable, but need to wait on deps
+  for the other arches.
+
+  02 Feb 2004; Bryan Stine <battousai@gentoo.org>; psad-1.2.4-r1.ebuild,
+  psad-1.3.1.ebuild, psad-1.3.ebuild:
+  Added information about conf changes required for system loggers, closes bug
+  38234
+
+*psad-1.3.1 (13 Jan 2004)
+
+  13 Jan 2004; Bryan Stine <battousai@gentoo.org> psad-1.3.1.ebuild,
+  psad-1.2.4-r1.ebuild, psad-1.3.ebuild:
+  Version bump. Thanks to seemant for helping me maintain this before now.
+  Also, hppa, mips, ia64 and arm have been removed from KEYWORDS. Runtime
+  dependencies are not yet available for those architectures.
+
+*psad-1.3 (01 Dec 2003)
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> psad-1.2.3-r1.ebuild,
+  psad-1.2.4-r1.ebuild, psad-1.2.4.ebuild, psad-1.3.ebuild:
+  version bump, and moved 1.2.4-r1 to stable x86.  The usual Battoussai
+  acknowledgement here :)
+
+*psad-1.2.4-r1 (28 Oct 2003)
+
+  28 Oct 2003; Seemant Kulleen <seemant@gentoo.org> psad-1.2.4-r1.ebuild,
+  files/psad-1.2.4-metalog.patch:
+  new patch to make psad work better with metalog. The patch was written by:
+  Dennis Freise <cat@final-frontier.ath.cx> and sent to psad's upstream author
+  and myself. Battoussai rediff'd it and updated the ebuild for us.
+
+*psad-1.2.4 (20 Oct 2003)
+
+  20 Oct 2003; Seemant Kulleen <seemant@gentoo.org> psad-1.2.4.ebuild:
+  version bump, with fixes: This one seds the machine's hostname (based on
+  /etc/hostname and /etc/dnsdomainname) into the psad.conf file. I also fixed a
+  problem regarding the perl modules bundled with psad (they needed to be put
+  into subdirs of the /usr/lib/psad directory). And finally, diskmond has been
+  removed from the package -- All this work was done by Battoussai.
+
+*psad-1.2.3-r1 (06 Oct 2003)
+
+  06 Oct 2003; Seemant Kulleen <seemant@gentoo.org> psad-1.2.3-r1.ebuild:
+  Moved bundled PERL module locations to /usr/lib/psad to avoid conflicts with
+  the system PERL tree -- thanks again to Battoussai
+
+  19 Sep 2003; Seemant Kulleen <seemant@gentoo.org> :
+  version bump, thanks again to Battoussai (Bryan Stine <admin@kentonet.net>)
 
 *psad-1.2.1 (17 Sep 2003)
 
diff --git a/net-firewall/psad/Manifest b/net-firewall/psad/Manifest
index 2c727862b6c5..f42b7bbea3c7 100644
--- a/net-firewall/psad/Manifest
+++ b/net-firewall/psad/Manifest
@@ -1,3 +1,8 @@
-MD5 2856a24c42cbcc36c566f33176ff1e0d psad-1.2.1.ebuild 2181
-MD5 f2b3c9d267411358904b006c5c78e859 ChangeLog 511
-MD5 624441f5e21afa19251eedc583e0c4e7 metadata.xml 433
+MD5 8c9bf20e188665ad7e82c0df8103786a ChangeLog 5717
+MD5 ac85ccaacab6bf7a9dd356b8c92b3bac metadata.xml 326
+MD5 fde5b466342b85c1d8a14fd9db682cba psad-1.4.2.ebuild 4354
+MD5 3548d3a3ad47688c78143dd4350da6e1 psad-1.4.0.ebuild 4109
+MD5 d925a282fcb7b9d6bbf91c2d260c633f psad-1.3.4.ebuild 3405
+MD5 295923dc84bcfb6e5978b5039ffc0a3a files/digest-psad-1.3.4 63
+MD5 c43f2f1a27860fdad099c9000d373b01 files/digest-psad-1.4.0 63
+MD5 3ddd128f7239ca0bde300b2125ed63ab files/digest-psad-1.4.2 63
diff --git a/net-firewall/psad/metadata.xml b/net-firewall/psad/metadata.xml
index cefbc16f77a9..4d9d1f7b430b 100644
--- a/net-firewall/psad/metadata.xml
+++ b/net-firewall/psad/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 	<herd>hardened</herd>
 	<maintainer>
-		<email>hardened@gentoo.org</email>
-		<description>Bastille Currently Has No Primary Gentoo Maintainer</description>
+		<email>battousai@gentoo.org</email>
 	</maintainer>
-	<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
+	<longdescription>PSAD provides port scanning attack detection and protection.</longdescription>
 </pkgmetadata>
diff --git a/net-firewall/psad/psad-1.3.4.ebuild b/net-firewall/psad/psad-1.3.4.ebuild
index 6b54cdfb761a..694326e453c4 100644
--- a/net-firewall/psad/psad-1.3.4.ebuild
+++ b/net-firewall/psad/psad-1.3.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/net-firewall/psad/psad-1.3.4.ebuild,v 1.1 2004/12/01 08:15:12 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.3.4.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit eutils perl-module
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.cipherdyne.org/psad"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~alpha ~sparc"
+KEYWORDS="x86 amd64 ppc alpha ~sparc"
 
 DEPEND="${DEPEND}
 	dev-lang/perl"
@@ -20,7 +20,7 @@ DEPEND="${DEPEND}
 RDEPEND="virtual/logger
 	dev-perl/Unix-Syslog
 	dev-perl/Date-Calc
-	mail-client/mailx
+	virtual/mailx
 	net-firewall/iptables"
 
 src_compile() {
@@ -78,11 +78,7 @@ src_install() {
 
 	cd ${S}
 
-	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	cp psad.conf psad.conf.orig
-	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+	fix_psad_conf
 
 	insinto /etc/psad
 	doins *.conf
@@ -117,7 +113,23 @@ pkg_postinst() {
 	einfo "HOME_NET settings at the least."
 	echo
 	einfo "If you are using a logger other than sysklogd, please be sure to change the"
-	einfo "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
+	einfo "syslogdCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
 	einfo "would be:"
-	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+	einfo "		syslogdCmd	/usr/sbin/syslog-ng;"
+}
+
+fix_psad_conf() {
+	cp psad.conf psad.conf.orig
+
+	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
+	[ -e /etc/hostname ] && myhostname="$(< /etc/hostname)"
+	[ "${myhostname}" == "" ] && myhostname="$HOSTNAME"
+	mydomain=".$(grep ^domain /etc/resolv.conf | cut -d" " -f2)"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
+
+	# Fix up paths
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
 }
diff --git a/net-firewall/psad/psad-1.4.0.ebuild b/net-firewall/psad/psad-1.4.0.ebuild
index f04315310e2e..7475f56dc21b 100644
--- a/net-firewall/psad/psad-1.4.0.ebuild
+++ b/net-firewall/psad/psad-1.4.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/net-firewall/psad/psad-1.4.0.ebuild,v 1.1 2004/12/01 08:15:12 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit eutils perl-module
 
@@ -20,7 +20,7 @@ DEPEND="${DEPEND}
 RDEPEND="virtual/logger
 	dev-perl/Unix-Syslog
 	dev-perl/Date-Calc
-	mail-client/mailx
+	virtual/mailx
 	net-firewall/iptables"
 
 src_compile() {
@@ -78,16 +78,12 @@ src_install() {
 
 	cd ${S}
 
-	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
-	myhostname="$(< /etc/hostname)"
-	[ -e /etc/dnsdomainname ] && mydomain=".$(< /etc/dnsdomainname)"
-	cp psad.conf psad.conf.orig
-	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "Sed failed."
+	fix_psad_conf
 
 	insinto /etc/psad
 	doins *.conf
 	doins psad_*
-	doins auto_dl icmp_types posf signatures
+	doins auto_dl icmp_types posf signatures pf.os
 
 	cd ${S}/init-scripts
 	exeinto /etc/init.d
@@ -116,8 +112,43 @@ pkg_postinst() {
 	einfo "the validity of the HOSTNAME setting and replace the EMAIL_ADDRESSES and"
 	einfo "HOME_NET settings at the least."
 	echo
-	einfo "If you are using a logger other than sysklogd, please be sure to change the"
-	einfo "syslogCmd setting in /etc/psad/psad.conf. An example for syslog-ng users"
-	einfo "would be:"
-	einfo "		syslogCmd = /usr/sbin/syslog-ng;"
+	if has_version ">=app-admin/syslog-ng-0.0.0"
+	then
+		ewarn "You appear to have installed syslog-ng. If you are using syslog-ng as your"
+		ewarn "default system logger, please change the SYSLOG_DAEMON entry in"
+		ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
+		ewarn "		SYSLOG_DAEMON	syslog-ng;"
+		echo
+	fi
+	if has_version ">=app-admin/sysklogd-0.0.0"
+	then
+		einfo "You have sysklogd installed. If this is your default system logger, no"
+		einfo "special configuration is needed. If it is not, please set SYSLOG_DAEMON"
+		einfo "in /etc/psad/psad.conf accordingly."
+		echo
+	fi
+	if has_version ">=app-admin/metalog-0.0"
+	then
+		ewarn "You appear to have installed metalog. If you are using metalog as your"
+		ewarn "default system logger, please change the SYSLOG_DAEMON entry in"
+		ewarn "/etc/psad/psad.conf to the following (per examples in psad.conf):"
+		ewarn "		SYSLOG_DAEMON	metalog"
+	fi
 }
+
+fix_psad_conf() {
+	cp psad.conf psad.conf.orig
+
+	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
+	[ -e /etc/hostname ] && myhostname="$(< /etc/hostname)"
+	[ "${myhostname}" == "" ] && myhostname="$HOSTNAME"
+	mydomain=".$(grep ^domain /etc/resolv.conf | cut -d" " -f2)"
+	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
+
+	# Fix up paths
+	sed -i "s:/sbin/syslogd:/usr/sbin/syslogd:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/sbin/syslog-ng:/usr/sbin/syslog-ng:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/uname:/usr/bin/uname:g" psad.conf || die "fix_psad_conf failed"
+	sed -i "s:/bin/mknod:/usr/bin/mknod:g" psad.conf || die "fix_psad_conf failed"
+}
+
diff --git a/net-firewall/psad/psad-1.4.2.ebuild b/net-firewall/psad/psad-1.4.2.ebuild
index 4717ab543b4d..92771b80c629 100644
--- a/net-firewall/psad/psad-1.4.2.ebuild
+++ b/net-firewall/psad/psad-1.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/net-firewall/psad/psad-1.4.2.ebuild,v 1.1 2005/07/31 03:09:02 battousai Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/psad/psad-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:18 chriswhite Exp $
 
 inherit eutils perl-module
 
@@ -146,7 +146,7 @@ fix_psad_conf() {
 	# Ditch the _CHANGEME_ for hostname, substituting in our real hostname
 	[ -e /etc/hostname ] && myhostname="$(< /etc/hostname)"
 	[ "${myhostname}" == "" ] && myhostname="$HOSTNAME"
-	mydomain=".$(grep domain /etc/resolv.conf | cut -d" " -f2)"
+	mydomain=".$(grep ^domain /etc/resolv.conf | cut -d" " -f2)"
 	sed -i "s:HOSTNAME\(.\+\)\_CHANGEME\_;:HOSTNAME\1${myhostname}${mydomain};:" psad.conf || die "fix_psad_conf failed"
 
 	# Fix up paths
diff --git a/net-firewall/quicktables/ChangeLog b/net-firewall/quicktables/ChangeLog
index c4cd92ba8809..da95405b0f3c 100644
--- a/net-firewall/quicktables/ChangeLog
+++ b/net-firewall/quicktables/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/quicktables
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/quicktables/ChangeLog,v 1.1 2005/07/12 02:41:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/quicktables/ChangeLog,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
+
+  12 Jul 2005; David Holm <dholm@gentoo.org> quicktables-2.3.ebuild:
+  Added to ~ppc.
 
 *quicktables-2.3 (11 Jul 2005)
 
diff --git a/net-firewall/quicktables/Manifest b/net-firewall/quicktables/Manifest
index c3c3060a9ac2..b3e7ed0e4f86 100644
--- a/net-firewall/quicktables/Manifest
+++ b/net-firewall/quicktables/Manifest
@@ -1,2 +1,3 @@
-MD5 1f62d60d479fd39cac3d453da77948ac quicktables-2.3.ebuild 543
+MD5 108d7f13869199994d0a3d0997da9f02 ChangeLog 461
+MD5 5abf7648b0943858f4068bce72df7f67 quicktables-2.3.ebuild 539
 MD5 00a0c3461c456b01bfbc44b3210b6b5f files/digest-quicktables-2.3 66
diff --git a/net-firewall/quicktables/quicktables-2.3.ebuild b/net-firewall/quicktables/quicktables-2.3.ebuild
index 01b937e8efad..cd23aee6f700 100644
--- a/net-firewall/quicktables/quicktables-2.3.ebuild
+++ b/net-firewall/quicktables/quicktables-2.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/net-firewall/quicktables/quicktables-2.3.ebuild,v 1.1 2005/07/12 02:41:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/quicktables/quicktables-2.3.ebuild,v 1.1.1.1 2005/11/30 10:11:17 chriswhite Exp $
 
 DESCRIPTION="a quick iptables script generator"
 HOMEPAGE="http://qtables.radom.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://qtables.radom.org/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="0"
 
 RDEPEND="net-firewall/iptables"
diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 82fd311fa01e..7909671a18c9 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,387 @@
 # ChangeLog for net-firewall/shorewall
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.1 2003/02/05 14:37:16 aliz Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+*shorewall-2.4.6 (05 Nov 2005)
+
+  05 Nov 2005; Marcelo Goes <vanquirius@gentoo.org> +shorewall-2.4.6.ebuild:
+  2.4.6 version bump for bug 111567. Thanks to Joakim <moonwalker at astro dot
+  nu>.
+
+  14 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -shorewall-2.4.1.ebuild:
+  remove vulnerable version
+
+  14 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org> shorewall-2.4.2.ebuild:
+  stable on alpha, wrt bug #99398
+
+  13 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
+  shorewall-2.4.2.ebuild:
+  Stable on hppa.
+
+  13 Sep 2005; Simon Stelling <blubb@gentoo.org> shorewall-2.4.2.ebuild:
+  stable on amd64 wrt bug 99398
+
+  13 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -shorewall-2.0.17.ebuild, -shorewall-2.2.6.ebuild:
+  removed 2.0.17 and 2.2.6 - no major upgrade transition plans mentioned in
+  the comprehensive shorewall documentation. Thanks Gustavo for convincing me
+
+  13 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shorewall-2.4.2.ebuild:
+  Stable on sparc wrt #99398
+
+*shorewall-2.4.4 (13 Sep 2005)
+*shorewall-2.4.2 (13 Sep 2005)
+*shorewall-2.2.6 (13 Sep 2005)
+*shorewall-2.0.17 (13 Sep 2005)
+
+  13 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -shorewall-2.0.7.ebuild, -shorewall-2.0.13.ebuild,
+  +shorewall-2.0.17.ebuild, -shorewall-2.2.0_rc5.ebuild,
+  -shorewall-2.2.0.ebuild, -shorewall-2.2.3.ebuild, -shorewall-2.2.4.ebuild,
+  -shorewall-2.2.5.ebuild, +shorewall-2.2.6.ebuild, -shorewall-2.4.0.ebuild,
+  +shorewall-2.4.2.ebuild, +shorewall-2.4.4.ebuild:
+  GLSA 200507-20 was not corrected properly. Fixes are included in 2.0.17,
+  2.2.6 and 2.4.2. 2.4.4 is just a version bump. Removed most vulnerable
+  versions (except 2.4.1 awaiting arch testing)
+
+  21 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.4.1.ebuild:
+  Stable on alpha, bug 99398.
+
+  20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> files/shorewall:
+  We actually want to make sure it starts after ulogd since it can be used as
+  a logger
+
+  18 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  shorewall-2.4.1.ebuild:
+  Stable on hppa. bug #99398
+
+  18 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shorewall-2.4.1.ebuild:
+  Stable on sparc wrt #99398
+
+  18 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> shorewall-2.4.1.ebuild:
+  Marked stable on amd64 wrt Security BUG #99398.
+
+*shorewall-2.2.5 (18 Jul 2005)
+
+  18 Jul 2005; Daniel Black <dragonheart@gentoo.org>
+  shorewall-2.0.13.ebuild, shorewall-2.2.0_rc5.ebuild,
+  shorewall-2.2.0.ebuild, shorewall-2.2.4.ebuild, +shorewall-2.2.5.ebuild,
+  shorewall-2.4.0.ebuild, shorewall-2.4.1.ebuild:
+  version bump and ppc/x86 stable for
+  http://seclists.org/lists/fulldisclosure/2005/Jul/0409.html
+
+*shorewall-2.4.1 (15 Jul 2005)
+
+  15 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.4.1.ebuild:
+  Version bump.
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.2.3.ebuild:
+  Stable on alpha.
+
+  22 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+  shorewall-2.2.3.ebuild:
+  Stable on sparc
+
+  20 Jun 2005; Jonathan Smith <smithj@gentoo.org> -shorewall-1.4.10f.ebuild,
+  -shorewall-2.0.4.ebuild, -shorewall-2.2.2.ebuild, shorewall-2.2.3.ebuild:
+  2.2.3 stable x86; cleanup
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  shorewall-2.0.7.ebuild:
+  Stable on ppc.
+
+*shorewall-2.4.0 (14 Jun 2005)
+
+  14 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.4.0.ebuild:
+  Version bump for bug 95887.
+
+  14 May 2005; Guy Martin <gmsoft@gentoo.org> shorewall-2.2.4.ebuild:
+  Stable on hppa.
+
+*shorewall-2.2.4 (06 May 2005)
+
+  06 May 2005; Marcelo Goes <vanquirius@gentoo.org> +shorewall-2.2.4.ebuild:
+  Version bump, fixes bug 91662. Thanks to Costas Cavouracis <cca@freemail.gr>
+  and Joseph Booker <joe@neoturbine.net>.
+
+*shorewall-2.2.3 (20 Apr 2005)
+
+  20 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.2.3.ebuild:
+  Version bump for bug 88947.
+
+*shorewall-2.2.2 (23 Mar 2005)
+
+  23 Mar 2005; Marcelo Goes <vanquirius@gentoo.org> +shorewall-2.2.2.ebuild:
+  Version bump.
+
+  21 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  shorewall-2.2.0_rc5.ebuild:
+  stable on amd64. fixes #82640
+
+*shorewall-2.2.0 (02 Feb 2005)
+
+  02 Feb 2005; Aaron Walker <ka0ttic@gentoo.org> +shorewall-2.2.0.ebuild:
+  Version bump for bug 79907.
+
+*shorewall-2.2.0_rc5 (25 Jan 2005)
+
+  25 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> -shorewall-2.0.10.ebuild,
+  +shorewall-2.2.0_rc5.ebuild:
+  Version bump for bug 78468. Removed 2.0.10.
+
+  22 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.0.7.ebuild:
+  Stable on alpha.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*shorewall-2.0.13 (17 Dec 2004)
+
+  17 Dec 2004; Eldad Zack <eldad@gentoo.org> +shorewall-2.0.13.ebuild,
+  -shorewall-2.0.6.ebuild:
+  Version bump
+
+  11 Dec 2004; Jason Wever <weeve@gentoo.org> shorewall-2.0.7.ebuild:
+  Stable on sparc.
+
+  22 Nov 2004; Eldad Zack <eldad@gentoo.org> shorewall-2.0.6.ebuild,
+  shorewall-2.0.7.ebuild:
+  x86 stable
+
+*shorewall-2.0.10 (21 Nov 2004)
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> +shorewall-2.0.10.ebuild:
+  Version bump. Closes #63867.
+
+  21 Nov 2004; Eldad Zack <eldad@gentoo.org> files/shorewall:
+  initscript: added clear function to remove firewall rules, /dev/null'd restart
+  output. Closes #24882.
+
+  22 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> shorewall-2.0.4.ebuild:
+  Stable on alpha.
+
+  20 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> shorewall-2.0.4.ebuild:
+  Stable on sparc
+
+  17 Aug 2004; Eldad Zack <eldad@gentoo.org> shorewall-2.0.4.ebuild:
+  x86 stable
+
+*shorewall-2.0.7 (07 Aug 2004)
+
+  07 Aug 2004; Jon Hood <squinky86@gentoo.org> +shorewall-2.0.7.ebuild:
+  Version bump, closes #59682; thanks Andreas Simon <yuipx@gmx.net>!
+
+*shorewall-2.0.6 (21 Jul 2004)
+
+  21 Jul 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.6.ebuild:
+  Version bumped.
+
+  09 Jul 2004; Aron Griffis <agriffis@gentoo.org> files/shorewall:
+  Fix bug 55576: Mention svc_stop/svc_start in the init-script so that
+  runscript.sh doesn't complain
+
+*shorewall-2.0.4 (09 Jul 2004)
+
+  09 Jul 2004; Eldad Zack <eldad@gentoo.org> +shorewall-2.0.4.ebuild:
+  Version bump. Closes #56375
+
+  08 Jul 2004; Luca Barbato <lu_zero@gentoo.org> shorewall-1.4.10f.ebuild:
+  Marked ppc
+
+  07 Jul 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10f.ebuild:
+  x86 stable
+
+*shorewall-2.0.3c (07 Jul 2004)
+
+  07 Jul 2004; Martin Holzer <mholzer@gentoo.org> +shorewall-2.0.3c.ebuild:
+  Version bumped. Fixes 55816
+
+  03 Jul 2004; Jason Wever <weeve@gentoo.org> shorewall-1.4.10f.ebuild:
+  Stable on sparc.
+
+  03 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> shorewall-1.4.10f.ebuild:
+  Stable on alpha, bug #55675.
+
+  02 Jul 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.3a.ebuild:
+  minor fixes. see 51260
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  shorewall-1.4.10b.ebuild, shorewall-1.4.10c.ebuild,
+  shorewall-1.4.10f.ebuild, shorewall-1.4.5-r1.ebuild,
+  shorewall-2.0.3a.ebuild:
+  virtual/glibc -> virtual/libc
+
+*shorewall-2.0.3a (01 Jul 2004)
+*shorewall-1.4.10f (01 Jul 2004)
+
+  01 Jul 2004; Martin Holzer <mholzer@gentoo.org> +shorewall-2.0.3a.ebuild:
+  Version bumped. Closes  55675
+
+  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> shorewall-1.4.10b.ebuild,
+  shorewall-1.4.10c.ebuild, shorewall-1.4.5-r1.ebuild, shorewall-2.0.0.ebuild,
+  shorewall-2.0.1.ebuild:
+  Fix use invocation
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> shorewall-1.4.10c.ebuild:
+  Keyworded alpha, requested in bug #51550.
+
+  21 Apr 2004; rob holland <tigger@gentoo.org> shorewall-1.4.10b.ebuild,
+  shorewall-1.4.10c.ebuild, shorewall-1.4.5-r1.ebuild, shorewall-2.0.0.ebuild,
+  shorewall-2.0.1.ebuild:
+  Fix iproute dep after spanky broke it ;P
+
+*shorewall-2.0.1 (20 Apr 2004)
+
+  20 Apr 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.1.ebuild:
+  Version bumped. Closes 41907 
+
+*shorewall-2.0.0 (19 Apr 2004)
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org> shorewall-2.0.0.ebuild:
+  Version bumped.
+
+  18 Apr 2004; Dylan Carlson <absinthe@gentoo.org> shorewall-1.4.10c.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+  03 Mar 2004; Jason Wever <weeve@gentoo.org> shorewall-1.4.10b.ebuild:
+  Marked stable on sparc.
+
+  02 Mar 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10b.ebuild:
+  x86 stable.
+
+*shorewall-1.4.10c (02 Mar 2004)
+
+  02 Mar 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10c.ebuild:
+  Version bumpe.d
+
+*shorewall-1.4.10b (28 Feb 2004)
+
+  28 Feb 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10b.ebuild:
+  Version bumped.
+
+*shorewall-1.4.10a (11 Feb 2004)
+
+  11 Feb 2004; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.10a.ebuild:
+  Version bumped. Closes 41239.
+
+  06 Dec 2003; Jason Wever <weeve@gentoo.org> shorewall-1.4.7c.ebuild:
+  Marked stable on sparc.
+
+*shorewall-1.4.8 (19 Nov 2003)
+
+  19 Nov 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.8.ebuild:
+  Version bumped. Closes #33138.
+
+*shorewall-1.4.7c (02 Nov 2003)
+
+  02 Nov 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r3.ebuild,
+  shorewall-1.4.7c.ebuild:
+  Version bupmed. Closes #32294
+
+  22 Oct 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.5-r1.ebuild,
+  shorewall-1.4.6-r3.ebuild:
+  adding RESTRICT="nomirror"
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r3.ebuild:
+  Added more docs to install. Closes #29476.
+
+*shorewall-1.4.6-r3 (27 Aug 2003)
+
+  27 Aug 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r3.ebuild:
+  Version bumped.
+
+*shorewall-1.4.6-r2 (06 Aug 2003)
+
+  06 Aug 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r2.ebuild:
+  Version bumped.
+
+*shorewall-1.4.6-r1 (25 Jul 2003)
+
+  25 Jul 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6-r1.ebuild:
+  Subrelease of 1.4.6
+
+*shorewall-1.4.6 (22 Jul 2003)
+
+  22 Jul 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.6.ebuild,
+  files/shorewall:
+  Version bumped.
+
+*shorewall-1.4.5-r1 (15 Jul 2003)
+
+  15 Jul 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.5-r1.ebuild:
+  Adding docs. Marked x86 stable. Closes #24518
+  
+*shorewall-1.4.5 (23 Jun 2003)
+
+  23 Jun 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.5.ebuild:
+  Version bumped.
+
+  19 Jun 2003; Seemant Kulleen <seemant@gentoo.org> shorewall-1.4.4b.ebuild:
+  stop /var/lib/shorewall from being removed on remerge, and /var/state is
+  provided by baselayout
+
+*shorewall-1.4.4a (12 Jun 2003)
+
+  12 Jun 2003; <msterret@gentoo.org> shorewall-1.4.4.ebuild,
+  shorewall-1.4.4a.ebuild, shorewall-1.4.4b.ebuild:
+  fix Header
+
+*shorewall-1.4.4b (29 May 2003)
+
+  29 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.4b.ebuild:
+  Version bumped & x86 stable
+
+*shorewall-1.4.4 (24 May 2003)
+
+  24 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild,
+  shorewall-1.4.3.ebuild, shorewall-1.4.3a.ebuild, shorewall-1.4.4.ebuild:
+  Version bumped & Marked stable & Cleanup.
+
+*shorewall-1.4.3a (20 May 2003)
+
+  20 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild,
+  shorewall-1.4.3a.ebuild:
+  Version bumped.
+
+*shorewall-1.4.3 (18 May 2003)
+
+  20 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild:
+  Fixing ebuild
+
+  18 May 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.3.ebuild:
+  Version bumped.
+
+*shorewall-1.4.2 (14 Apr 2003)
+
+  22 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  shorewall-1.4.1a.ebuild, shorewall-1.4.2.ebuild:
+  Remove to install a startup script through install.sh Closes #19208.
+
+  14 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
+  shorewall-1.4.2.ebuild:
+  Version bumped.
+
+*shorewall-1.4.1a (03 Apr 2003)
+
+  03 Apr 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.4.1a.ebuild:
+  Version bumped. Closes #18273.
+
+*shorewall-1.4.0 (19 Mar 2003)
+
+  19 Mar 2003; Zach Welch <zwelch@gentoo.org> shorewall-1.4.0.ebuild:
+  bump version; bug 17847
+
+*shorewall-1.3.14 (24 Feb 2003)
+
+  11 Mar 2003; Martin Holzer <mholzer@gentoo.org> shorewall-1.3.13.ebuild,
+  shorewall-1.3.14.ebuild, shorewall-1.3.9b.ebuild:
+  changed sys-apps/iptables to net-firewall/iptables
+
+  24 Feb 2003; Zach Welch <zwelch@gentoo.org> shorewall-1.3.14.ebuild files/digest-shorewall-1.3.14 :
+  Bump version; closes bug 15555
 
 *shorewall-1.3.13 (05 Feb 2003)
 
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 0e59892996d7..c0d8b16959ac 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,12 +1,9 @@
-MD5 ac483b545be736591d53d02dd219a446 shorewall-1.4.1a.ebuild 803
-MD5 aedc24bd7307b582454fc3d8153bb3be shorewall-1.3.14.ebuild 816
-MD5 80c1651447acb27b20879c062c24bf6d shorewall-1.3.9b.ebuild 902
-MD5 e5398da69415e4d14453bdfaf0022719 shorewall-1.3.13.ebuild 809
-MD5 ad0ef5143a419557ae8926165c5e3719 ChangeLog 1333
-MD5 aedc24bd7307b582454fc3d8153bb3be shorewall-1.4.0.ebuild 816
-MD5 92673ca0dbde666a62cb8bce314e1e76 files/digest-shorewall-1.4.0 65
-MD5 8504d85a79fc497d7af21b2ab7dc5b8a files/digest-shorewall-1.3.13 66
-MD5 68c19e365c9dd79ec6dee578593ab2e0 files/digest-shorewall-1.3.14 66
-MD5 3412d8c9a261ad9a8a5119feac82d5be files/digest-shorewall-1.3.9b 66
-MD5 84488f78e793227b3abb0c86543754dc files/digest-shorewall-1.4.1a 66
-MD5 2bb788dc55a65a1daee4a13ca9240fab files/shorewall 433
+MD5 561cf6684de229fe37921356b62bb6c1 shorewall-2.4.2.ebuild 1488
+MD5 58b85b4e4d95e42681ea8ce8cabcdc1d shorewall-2.4.4.ebuild 1499
+MD5 aa66e9cdc5deae5576646b86bf3984c8 shorewall-2.4.6.ebuild 1498
+MD5 aed5dd323d6f9ccb70a2663376122ed1 ChangeLog 12910
+MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
+MD5 e119bb212e45f53e1948e7a1ed93ef36 files/digest-shorewall-2.4.2 139
+MD5 40658e202a62d4ef2e1e973e1c949bac files/digest-shorewall-2.4.4 139
+MD5 05f9a37c3a717f3075ef08dbdff13ceb files/digest-shorewall-2.4.6 139
+MD5 874d62a846eefd6330b3bba8b8721cef files/shorewall 1057
diff --git a/net-firewall/shorewall/files/shorewall b/net-firewall/shorewall/files/shorewall
index 843cf279fa9b..c849780cddb4 100644
--- a/net-firewall/shorewall/files/shorewall
+++ b/net-firewall/shorewall/files/shorewall
@@ -1,10 +1,14 @@
 #!/sbin/runscript
-# 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/net-firewall/shorewall/files/shorewall,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
+
+opts="start stop restart clear"
 
 depend() {
 	need net
 	provide firewall
+	after ulogd
 }
 
 start() {
@@ -20,7 +24,20 @@ stop() {
 }
 
 restart() {
+	# shorewall comes with its own control script that includes a
+	# restart function, so refrain from calling svc_stop/svc_start
+	# here.  Note that this comment is required to fix bug 55576;
+	# runscript.sh greps this script...  (09 Jul 2004 agriffis)
 	ebegin "Restarting firewall"
-	/sbin/shorewall restart
+	/sbin/shorewall restart 1>/dev/null
+	eend $?
+}
+
+clear() {
+	# clear will remove all the rules and bring the system to an unfirewalled
+	# state. (21 Nov 2004 eldad)
+
+	ebegin "Clearing all firewall rules and setting policy to ACCEPT"
+	/sbin/shorewall clear
 	eend $?
 }
diff --git a/net-firewall/shorewall/shorewall-2.4.2.ebuild b/net-firewall/shorewall/shorewall-2.4.2.ebuild
index dd843126b9c0..392306f440cd 100644
--- a/net-firewall/shorewall/shorewall-2.4.2.ebuild
+++ b/net-firewall/shorewall/shorewall-2.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/net-firewall/shorewall/shorewall-2.4.2.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
@@ -11,7 +11,7 @@ SRC_URI="http://shorewall.net/pub/${PN}/2.4/${P}/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc sparc x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
diff --git a/net-firewall/shorewall/shorewall-2.4.4.ebuild b/net-firewall/shorewall/shorewall-2.4.4.ebuild
index 1e4be152fa87..6b73df10a947 100644
--- a/net-firewall/shorewall/shorewall-2.4.4.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.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/net-firewall/shorewall/shorewall-2.4.4.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.4.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
diff --git a/net-firewall/shorewall/shorewall-2.4.6.ebuild b/net-firewall/shorewall/shorewall-2.4.6.ebuild
index 59689540cf25..61a1d63dda52 100644
--- a/net-firewall/shorewall/shorewall-2.4.6.ebuild
+++ b/net-firewall/shorewall/shorewall-2.4.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/net-firewall/shorewall/shorewall-2.4.6.ebuild,v 1.1 2005/11/05 17:46:27 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.6.ebuild,v 1.1.1.1 2005/11/30 10:11:21 chriswhite Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
diff --git a/net-firewall/tuxfrw/ChangeLog b/net-firewall/tuxfrw/ChangeLog
index 448566844bd2..9472a1f2dfaa 100644
--- a/net-firewall/tuxfrw/ChangeLog
+++ b/net-firewall/tuxfrw/ChangeLog
@@ -1,6 +1,31 @@
-# ChangeLog for net-firewall/tuxfirewall
+# ChangeLog for net-firewall/tuxfrw
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/tuxfrw/ChangeLog,v 1.1 2005/01/24 22:23:00 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/tuxfrw/ChangeLog,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
+
+  18 Oct 2005; <otavio@gentoo.org> -tuxfrw-2.58-r1.ebuild:
+  Removed old version
+
+  17 Oct 2005; Joseph Jezak <josejx@gentoo.org> tuxfrw-2.61.ebuild:
+  Marked ~ppc for bug #108081.
+
+*tuxfrw-2.61 (04 Oct 2005)
+
+  04 Oct 2005; Otavio R. Piske <angusyoung@gentoo.org> files/tuxfrw,
+  +tuxfrw-2.61.ebuild:
+  Added tuxfrw-2.61.
+
+  25 Sep 2005; <otavio@gentoo.org> tuxfrw-2.58-r1.ebuild:
+  Converted ebuild to linux-info.
+
+  26 Jul 2005; David Holm <dholm@gentoo.org> tuxfrw-2.58-r1.ebuild:
+  Added to ~ppc.
+
+*tuxfrw-2.58-r1 (27 Jan 2005)
+
+  27 Jan 2005; Otavio R. Piske <angusyoung@gentoo.org> +tuxfrw-2.58-r1.ebuild,
+  -tuxfrw-2.58.ebuild:
+  Removed old ebuild that was not installing main script and added -r1 that does
+  this correctly
 
 *tuxfrw-2.58 (24 Jan 2005)
 
diff --git a/net-firewall/tuxfrw/Manifest b/net-firewall/tuxfrw/Manifest
index c5cb0be473f1..8fedb1317ac5 100644
--- a/net-firewall/tuxfrw/Manifest
+++ b/net-firewall/tuxfrw/Manifest
@@ -1,5 +1,5 @@
-MD5 0869618ff4896c52c845d4c18b926f67 tuxfrw-2.58.ebuild 1606
-MD5 4cc1ac67ffcbe3c0926942081ca5c846 ChangeLog 125
+MD5 791b40d13afa188917651102c0d41146 tuxfrw-2.61.ebuild 2296
+MD5 e9d2f7efeeca92ed11fc054c0bc031d9 ChangeLog 1377
 MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
-MD5 ed2c6cea0dbd3b533794fb7f3e43f3d0 files/digest-tuxfrw-2.58 62
-MD5 232c3594bfcdf37631020d2a52bcba00 files/tuxfrw 774
+MD5 23fbd6f1103e398f2621bcbb4ff6a0df files/digest-tuxfrw-2.61 62
+MD5 d9daedf197d9508efc355eb97e7d614d files/tuxfrw 766
diff --git a/net-firewall/tuxfrw/files/tuxfrw b/net-firewall/tuxfrw/files/tuxfrw
index 05c7b402ac0e..727c1cbfe6cb 100644
--- a/net-firewall/tuxfrw/files/tuxfrw
+++ b/net-firewall/tuxfrw/files/tuxfrw
@@ -9,13 +9,13 @@ depend() {
         provide firewall
 }
 
-svc_start() {
+start() {
         ebegin "Starting firewall"
         /usr/sbin/tuxfrw start
         eend $?
 }
 
-svc_stop() {
+stop() {
         ebegin "Stopping firewall"
         /usr/sbin/tuxfrw stop
         eend $?
diff --git a/net-firewall/tuxfrw/tuxfrw-2.61.ebuild b/net-firewall/tuxfrw/tuxfrw-2.61.ebuild
index 5a50352fbdc5..049645ddd857 100644
--- a/net-firewall/tuxfrw/tuxfrw-2.61.ebuild
+++ b/net-firewall/tuxfrw/tuxfrw-2.61.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/net-firewall/tuxfrw/tuxfrw-2.61.ebuild,v 1.1 2005/10/04 14:56:36 angusyoung Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/tuxfrw/tuxfrw-2.61.ebuild,v 1.1.1.1 2005/11/30 10:11:20 chriswhite Exp $
 
 inherit eutils linux-info
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://tuxfrw.sf.net/"
 SRC_URI="mirror://sourceforge/tuxfrw/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 DEPEND="net-firewall/iptables"
 
diff --git a/net-im/aim/ChangeLog b/net-im/aim/ChangeLog
index 362c74059907..f5af053d03ea 100644
--- a/net-im/aim/ChangeLog
+++ b/net-im/aim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/aim
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/aim/ChangeLog,v 1.1 2003/10/26 03:03:30 spyderous Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/aim/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
+
+  06 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; aim-1.5.286.ebuild:
+  (#103487) Don't use cp -d, it's GNU-specific.
+
+  14 Dec 2003; Donnie Berkholz <spyderous@gentoo.org>; aim-1.5.286.ebuild:
+  Stable on x86. Fix DEPEND to virtual/x11 instead of x11-base/xfree.
 
 *aim-1.5.286 (25 Oct 2003)
 
diff --git a/net-im/aim/Manifest b/net-im/aim/Manifest
index bbc95f2b64f3..83b4ece076c8 100644
--- a/net-im/aim/Manifest
+++ b/net-im/aim/Manifest
@@ -1,6 +1,4 @@
-MD5 55eb6fcde5664e6090c368b641f6715a aim-1.5.277.ebuild 758
-MD5 c74595964e4c46342ddf94b82799be95 aim-1.5.286.ebuild 1053
-MD5 ed159a817d135ce03126699b85f9a917 aim-1.5.286.ebuild.orig 1110
-MD5 aa15536cbad767e6ac3c6583951cf019 files/10aim 38
-MD5 dd5f7d111ce2b73aa5fa4559491e1f47 files/aim-run 60
+MD5 20649b818bc3814cafff5588d80f466e ChangeLog 713
+MD5 2b17f87e57efe36e26e0d7515dceaaf2 aim-1.5.286.ebuild 1043
+MD5 606bff1991eeef73e8bf886f3b939ec1 metadata.xml 251
 MD5 f2c13cec5b5c5b43f48ea01cf4a8c881 files/digest-aim-1.5.286 61
diff --git a/net-im/aim/aim-1.5.286.ebuild b/net-im/aim/aim-1.5.286.ebuild
index 6ceded6d7fd3..8de880068e70 100644
--- a/net-im/aim/aim-1.5.286.ebuild
+++ b/net-im/aim/aim-1.5.286.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/net-im/aim/aim-1.5.286.ebuild,v 1.1 2003/10/26 03:03:30 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/aim/aim-1.5.286.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 IUSE=""
 DESCRIPTION="AOL's Instant Messenger client"
@@ -8,11 +8,11 @@ SRC_URI="${P}.tgz"
 HOMEPAGE="http://www.aim.com/get_aim/linux/latest_linux.adp"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 RESTRICT="nostrip fetch"
 DEPEND="=x11-libs/gtk+-1.2*
 		>=dev-libs/glib-1.2
-		x11-base/xfree"
+		virtual/x11"
 S="${WORKDIR}"
 
 pkg_nofetch() {
@@ -26,7 +26,7 @@ src_install() {
 	# Initial install
 	dodir /opt/${PN}
 	cd ${S}/usr
-	cp -dR * ${D}/opt/${PN}/
+	cp -pPR * ${D}/opt/${PN}/
 
 	# Set up paths for env
 	echo "LDPATH=/opt/${PN}/lib" > ${T}/99aim
diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index 55cadecb7bca..2911195e20ba 100644
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,8 +1,171 @@
 # ChangeLog for net-im/amsn
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.1 2002/07/04 12:32:50 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
-*amsn-0.60 (3 July 2002) Bart Verwilst <verwilst@gentoo.org>
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> amsn-0.94.ebuild:
+  Mark 0.94 stable on alpha
+
+  05 Sep 2005; Olivier Crête <tester@gentoo.org> metadata.xml:
+  Fixed utf-8 issues in per bug #104663
+
+  26 Aug 2005; <sekretarz@gentoo.org> amsn-0.94.ebuild:
+  Using -pPR instead -a option in cp, bug #103487
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> amsn-0.94.ebuild:
+  stable on amd64
+
+  17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> amsn-0.94.ebuild:
+  Stable on ppc.
+
+  05 Jan 2005; Guy Martin <gmsoft@gentoo.org> amsn-0.94.ebuild:
+  Stable on hppa.
+
+  02 Dec 2004; Olivier Crete <tester@gentoo.org> amsn-0.94.ebuild:
+  Stable on x86
+
+  16 Nov 2004; Olivier Crete <tester@gentoo.org> amsn-0.94.ebuild:
+  Fix traydock installation, bug 56188
+
+*amsn-0.94 (06 Nov 2004)
+
+  06 Nov 2004; Olivier Crete <tester@gentoo.org> metadata.xml,
+  -amsn-0.90.ebuild, -amsn-0.92.ebuild, +amsn-0.94.ebuild:
+  Version bump and clean up older versions
+
+  05 Nov 2004; Travis Tilley <lv@gentoo.org> amsn-0.93.ebuild:
+  stable on amd64
+
+  05 Oct 2004; Guy Martin <gmsoft@gentoo.org> amsn-0.93.ebuild:
+  Stable on hppa.
+
+  14 Sep 2004; Olivier Crete <tester@gentoo.org> amsn-0.93.ebuild:
+  Stable on x86
+
+*amsn-0.93 (28 Aug 2004)
+
+  28 Aug 2004; <tester@gentoo.org> +amsn-0.93.ebuild:
+  Version bump
+
+  03 Aug 2004; Guy Martin <gmsoft@gentoo.org> amsn-0.92.ebuild:
+  Marked stable on hppa.
+
+  23 Jun 2004; <tester@gentoo.org> -amsn-0.83.ebuild, -amsn-0.91.ebuild:
+  Cleaned up 0.83 and 0.91
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> amsn-0.83.ebuild,
+  amsn-0.90.ebuild:
+  Fix use invocation
+
+*amsn-0.92 (31 May 2004)
+
+  31 May 2004; <tester@gentoo.org> amsn-0.92.ebuild, amsn-0.91.ebuild:
+  Version bump, removed imagemagick useflag, it doesnt work well without it
+
+  01 May 2004; <tester@gentoo.org> amsn-0.91.ebuild:
+  Changed dep to tcltk >=8.4 because of a bug in tk <=8.4. Fixed installation
+  to not depend on tcllib.
+
+*amsn-0.91 (30 Apr 2004)
+
+  30 Apr 2004; <tester@gentoo.org> +amsn-0.91.ebuild:
+  Version bump, cleaned up the ebuild.
+
+  12 Apr 2004; Danny van Dyk <kugelfang@gentoo.org> amsn-0.90.ebuild:
+  marked ~amd64
+
+  04 Apr 2004; Guy Martin <gmsoft@gentoo.org> amsn-0.90.ebuild:
+  Marked stable on hppa.
+
+  31 Mar 2004; Lars Weiler <pylon@gentoo.org> amsn-0.90.ebuild:
+  Added ~ppc to keywords as requested in bug 45854
+
+  23 Feb 2004; <tester@gentoo.org> amsn-0.90.ebuild:
+  tls dependency is NOT optional... Also fixed .desktop file so it actually works
+
+  23 Feb 2004; Tavis Ormandy <taviso@gentoo.org> amsn-0.90.ebuild:
+  marking ~alpha
+
+  22 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; amsn-0.90.ebuild:
+  Fixed DEPEND
+
+  21 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; amsn-0.90.ebuild:
+  Adding some dependencies thanks to Patrick <spantie@painfullscratch.nl> in bug
+  41984
+
+*amsn-0.90 (18 Feb 2004)
+
+  18 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; amsn-0.90.ebuild:
+  Adding version 0.9. Thanks to aq169@netscape.net in bug 41984
+
+  04 Jan 2004; Olivier Crete <tester@gentoo.org> files/amsn.desktop:
+  Improved .desktop file by Abraham Marin Perez <abraham@alumni.uv.es> from bug
+  #36830
+
+*amsn-0.83 (20 Oct 2003)
+
+  26 Dec 2003; Guy Martin <gmsoft@gentoo.org> amsn-0.83.ebuild :
+  Marked stable on hppa.
+
+  20 Oct 2003; Olivier Crete <tester@gentoo.org> amsn-0.83.ebuild:
+  Updated to 0.83, because of the msn protocol change, the older version is no
+  longer working. Putting this one straight into stable
+
+  08 Oct 2003; Olivier Crete <tester@gentoo.org> amsn-0.82.ebuild:
+  Mark 0.82 stable
+
+  23 Sep 2003; Olivier Crete <tester@gentoo.org> amsn-0.82.ebuild,
+  metadata.xml:
+  Add dev-tcltk/tls per submitted ebuild by Erik Tørrissen <iron@chatservice.org>
+
+*amsn-0.82 (23 Sep 2003)
+
+  23 Sep 2003; Olivier Crete <tester@gentoo.org> amsn-0.81.ebuild,
+  amsn-0.82.ebuild, metadata.xml:
+  New upstream version, mark previous version as stable
+
+*amsn-0.81 (06 Aug 2003)
+
+  06 Aug 2003; Olivier Crete <tester@gentoo.org> amsn-0.81.ebuild:
+  Version bump
+
+*amsn-0.80 (24 Jul 2003)
+  01 Aug 2003; Tavis Ormandy <taviso@gentoo.org> amsn-0.80.ebuild:
+  sandbox issues, quick fix.	 
+
+  24 Jul 2003; Olivier Crete <tester@gentoo.org> amsn-0.80.ebuild,
+  files/amsn.desktop:
+  Adding ebuild for 0.80, based on submission by Eduardo Garcia Cebollero
+  <kiwnix@yahoo.es>, fixes bug #19511
+
+*amsn-0.71 (7 Dec 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  15 Apr 2003: Jason Wever <weeve@gentoo.org> amsn-0.71.ebuild:
+  Added ~sparc to keywords.
+ 
+  03 Feb 2003; Jon Nall <nall@gentoo.org> amsn-0.71.ebuild :
+  added ~ppc
+
+  New version
+
+*amsn-0.61.3 (26 Nov 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  Another snapshot.. Only 3 days after the previous one, but hey :o)
+
+*amsn-0.61.2 (9 Nov 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  Another snapshot, with quite a nice changelog. Brought to my attention 
+  by Diego Palacios.
+
+* amsn-0.61.1 (15 Sept 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  This is actually a snapshot, with lots of bufixes and new features, 
+  also, filetransfer seems much more stable now :o) Enjoy!
+
+* amsn-0.60 (3 July 2002) Bart Verwilst <verwilst@gentoo.org>
 
   Initial ebuild
 
+  1 Sept 2002; Bart Verwilst <verwilst@gentoo.org>:
+
+  Added tk to the DEPEND, wouldn't start otherwise
+
diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index e69de29bb2d1..32f4341e8233 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -0,0 +1,5 @@
+MD5 68a37776cafc080b07475914c4a16b6b amsn-0.94.ebuild 2434
+MD5 0e256a8d05feddb125d5bf560873bea8 metadata.xml 228
+MD5 d31d23a2d1b4fcca30043bc8263cb351 ChangeLog 5457
+MD5 34cdd985d3d7a0cf5f84a79cca1c728f files/digest-amsn-0.94 62
+MD5 70919744c42f27e436339d14c678f731 files/amsn.desktop 273
diff --git a/net-im/amsn/amsn-0.94.ebuild b/net-im/amsn/amsn-0.94.ebuild
index 9150ecd6889b..0d18745c8a4d 100644
--- a/net-im/amsn/amsn-0.94.ebuild
+++ b/net-im/amsn/amsn-0.94.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/net-im/amsn/amsn-0.94.ebuild,v 1.1 2004/11/06 15:51:16 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.94.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 S="${WORKDIR}/${P/./_}"
 DESCRIPTION="Alvaro's Messenger client for MSN"
@@ -11,7 +11,7 @@ IUSE="gnome kde imlib xmms"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~hppa ~amd64"
+KEYWORDS="alpha amd64 hppa ppc ~sparc x86"
 
 
 DEPEND=">=dev-lang/tcl-8.3
@@ -36,7 +36,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr/share/amsn/
-	cp -a ${S}/* ${D}/usr/share/amsn/
+	cp -pPR ${S}/* ${D}/usr/share/amsn/
 
 	# Remove all CVS extra stuff
 	# not here in this version
@@ -48,7 +48,7 @@ src_install() {
 		cp ${D}/usr/share/amsn/amsn.desktop ${D}/usr/share/applications
 		einfo "Installing GNOME Icons in /usr/share/pixmaps"
 		dodir /usr/share/pixmaps
-		cp -a ${S}/icons/32x32/* ${D}/usr/share/pixmaps/
+		cp -pPR ${S}/icons/32x32/* ${D}/usr/share/pixmaps/
 	fi
 
 
@@ -57,16 +57,17 @@ src_install() {
 		dodir /usr/share/applnk/Internet
 		cp ${D}/usr/share/amsn/amsn.desktop ${D}/usr/share/applnk/Internet/
 		einfo "Installing KDE Icons in default theme"
-		dodir ${KDEDIR}/share/icons/default.kde
-		cp -a ${S}/icons/* ${D}/${KDEDIR}/share/icons/default.kde
+		dodir /usr/share/pixmaps
+		cp -pPR ${S}/icons/32x32/* ${D}/usr/share/pixmaps/
 	fi
 
 	if use imlib
 	then
 		einfo "Installing the freedesktop notification plugin"
 		dodir /usr/lib/amsn/plugins/traydock
-		mv ${D}/usr/share/amsn/plugins/traydock/libtray.so ${D}/usr/lib/amsn/plugins/traydock
-		ln -s /usr/lib/amsn/plugins/traydock ${D}/usr/share/amsn/plugins/traydock
+		mv ${D}/usr/share/amsn/plugins/traydock/libtray.so ${D}/usr/lib/amsn/plugins/traydock/
+		rm -rf  ${D}/usr/share/amsn/plugins/traydock/
+		ln -s ../../../lib/amsn/plugins/traydock/ ${D}/usr/share/amsn/plugins/
 	else
 		rm -rf ${D}/usr/share/amsn/plugins/traydock
 	fi
@@ -79,7 +80,7 @@ src_install() {
 	rm -rf ${D}/usr/share/amsn/utils/
 
 	dodir /usr/bin/
-	ln -s /usr/share/amsn/amsn ${D}/usr/bin/amsn
+	ln -s ../share/amsn/amsn ${D}/usr/bin/amsn
 
 	cd ${D}/usr/share/amsn
 	dodoc TODO README FAQ CREDITS HELP
diff --git a/net-im/amsn/files/amsn.desktop b/net-im/amsn/files/amsn.desktop
index cf721f12bd68..f5bbaf261741 100644
--- a/net-im/amsn/files/amsn.desktop
+++ b/net-im/amsn/files/amsn.desktop
@@ -1,11 +1,12 @@
 [Desktop Entry]
 Name=aMSN
 Exec=amsn
-Icon=messenger.png
+Icon=amsn.png
 Info=AMSN
 Comment="MSN Messenger for Linux"
 Comment[fr]="MSN Messenger pour Linux"
 Comment[de]="MSN Messenger f�r Linux"
+Comment[es_ES]="MSN Messenger para Linux"
 Terminal=0
 Type=Application
 Categories=Application;Network;
diff --git a/net-im/amsn/metadata.xml b/net-im/amsn/metadata.xml
index d12172fbb700..907f7370826d 100644
--- a/net-im/amsn/metadata.xml
+++ b/net-im/amsn/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>tester@gentoo.org</email>
-  <name>Olivier Cr�te</name> 
-</maintainer>
-<longdescription>A MSN Messenger clone for Linux</longdescription>
+<longdescription>Alvaro's Messenger client for MSN</longdescription>
 </pkgmetadata>
diff --git a/net-im/ccmsn/ChangeLog b/net-im/ccmsn/ChangeLog
index b314daacebd6..47666866af58 100644
--- a/net-im/ccmsn/ChangeLog
+++ b/net-im/ccmsn/ChangeLog
@@ -1,8 +1,11 @@
 # ChangeLog for net-im/ccmsn
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ccmsn/ChangeLog,v 1.1 2002/06/30 23:41:45 owen Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ccmsn/ChangeLog,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
-*ccmsn-0.3-r3 (30 Jun 2002)
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ccmsn-0.3.ebuild:
+  Added IUSE=
+
+*ccmsn-0.3 (30 Jun 2002)
 
   30 Jun 2002; New ebuild, ccmsn. Sort of a hack job but I've always used it like this.
   Scripts get moved to /usr/lib/ccmsn-0.3p3 and a small two line shell script gets put
diff --git a/net-im/ccmsn/Manifest b/net-im/ccmsn/Manifest
index e69de29bb2d1..9a228ce1d255 100644
--- a/net-im/ccmsn/Manifest
+++ b/net-im/ccmsn/Manifest
@@ -0,0 +1,4 @@
+MD5 3d5267aa709a7e858327367f28fb790d ccmsn-0.3.ebuild 735
+MD5 edbe4e149b56fd1b37c667ce63a505ef ChangeLog 542
+MD5 8186f42c23619dfcf67e1ff1332725b2 files/ccmsn 43
+MD5 6e992655bfea1b79e89e00fc450b764e files/digest-ccmsn-0.3 59
diff --git a/net-im/ccmsn/ccmsn-0.3.ebuild b/net-im/ccmsn/ccmsn-0.3.ebuild
index 8f20096b0c28..fcffb3294d45 100644
--- a/net-im/ccmsn/ccmsn-0.3.ebuild
+++ b/net-im/ccmsn/ccmsn-0.3.ebuild
@@ -1,19 +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/net-im/ccmsn/ccmsn-0.3.ebuild,v 1.1 2002/06/30 23:41:45 owen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ccmsn/ccmsn-0.3.ebuild,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
-RP="ccmsn-0.3p3"
+IUSE=""
+RP="${P}p3"
+S=${WORKDIR}/${RP}
 DESCRIPTION="A nice little MSN Client written in TclTk"
-HOMEPAGE="http://messenger.compucreations.com"
-LICENSE="gpl"
+HOMEPAGE="http://messenger.compucreations.com/"
+SRC_URI="http://messenger.compucreations.com/${RP}.tgz"
 
 SLOT="0"
-DEPEND="dev-lang/tcl dev-lang/tk"
-RDEPEND=""
+LICENSE="GPL-2"
+KEYWORDS="x86 ppc"
 
-SRC_URI="http://messenger.compucreations.com/${RP}.tgz"
 
-S=${WORKDIR}/${RP}
+DEPEND="dev-lang/tcl dev-lang/tk"
+RDEPEND=""
 
 src_compile() {
 	mkdir ${S}/${RP}
diff --git a/net-im/curphoo/ChangeLog b/net-im/curphoo/ChangeLog
index cf6402fff5df..2f3bdf7f5a81 100644
--- a/net-im/curphoo/ChangeLog
+++ b/net-im/curphoo/ChangeLog
@@ -1,6 +1,54 @@
-# ChangeLog for net-misc/curphoo
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/ChangeLog,v 1.1 2003/10/08 14:16:43 lanius Exp $
+# ChangeLog for net-im/curphoo
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/ChangeLog,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
+
+  01 Oct 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  curphoo-0.3.12-r1.ebuild:
+  Keywording ~amd64.
+
+*curphoo-0.3.12-r1 (08 Aug 2005)
+
+  08 Aug 2005; Matthew Kennedy <mkennedy@gentoo.org>
+  +files/0.3.12-session-server-gentoo.patch, -files/encodep.py-gentoo.patch,
+  -curphoo-0.3.11.ebuild, -curphoo-0.3.12.ebuild, +curphoo-0.3.12-r1.ebuild:
+  Added patch to follow recent changes in authentication server; Removed old
+  ebuilds; Added metadata.xml.
+
+  25 Sep 2004; <mkennedy@gentoo.org> curphoo-0.3.12.ebuild:
+  Added patch for 64-bit cleanliness.
+
+  03 Jul 2004; David Holm <dholm@gentoo.org> curphoo-0.3.12.ebuild:
+  Added to ~ppc.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  curphoo-0.3.11.ebuild, curphoo-0.3.12.ebuild:
+  virtual/glibc -> virtual/libc
+
+*curphoo-0.3.12 (01 Jul 2004)
+
+  01 Jul 2004; <mkennedy@gentoo.org> +curphoo-0.3.12.ebuild:
+  New upstream version
+
+  16 Apr 2004; <mkennedy@gentoo.org> +files/curphoo.1, curphoo-0.3.11.ebuild:
+  Use manpage from CVS
+
+  16 Apr 2004; <mkennedy@gentoo.org> files/curphoo.sh:
+  Fix wrapper script to proliferate command line options
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> curphoo-0.3.11.ebuild:
+  Added IUSE=, removed S=.
+
+  23 Mar 2004; Martin Holzer <mholzer@gentoo.org> curphoo-0.3.11.ebuild:
+  fixing depend qa issue. see 45343.
+
+*curphoo-0.3.11 (21 Jan 2004)
+
+  21 Jan 2004; <mkennedy@gentoo.org> curphoo-0.3.11.ebuild,
+  curphoo-0.3.9.ebuild:
+  new upstream
+
+  11 Dec 2003; <mkennedy@gentoo.org> curphoo-0.3.9.ebuild:
+  removed old, obsolete homepage url to avoid confusion
 
 *curphoo-0.3.7-r1 (08 Oct 2003)
 
diff --git a/net-im/curphoo/Manifest b/net-im/curphoo/Manifest
index 6ff496d42090..87d618336009 100644
--- a/net-im/curphoo/Manifest
+++ b/net-im/curphoo/Manifest
@@ -1,13 +1,17 @@
-MD5 84b7cc09861ce64e0ee3866acc3a60ec curphoo-0.3.5.ebuild 915
-MD5 1d96e54d7c9ce8683bce9ff9e78999db curphoo-0.03.2.ebuild 961
-MD5 a79b9d443c04fb48c958db18e229ec2e curphoo-0.3.7.ebuild 907
-MD5 7441acc9e5c4f60a7962ce0add10ea24 curphoo-0.3.9.ebuild 985
-MD5 488da8bac015f8c1fb31eca6ccf37ad9 curphoo-0.3.7-r1.ebuild 956
-MD5 7f694de29691691169e191b415c910c9 ChangeLog 1438
-MD5 bf702c387489441cb06e3c1239d0ba29 files/encodep.py-gentoo.patch 4290
-MD5 61bb02be86a70981da3d3cf3e61d70db files/digest-curphoo-0.3.5 65
-MD5 7f42d8dc52c330035bee1818bc2b1be7 files/digest-curphoo-0.3.7 65
-MD5 6f0a2c26f1e8249c199f0029a6d1476f files/digest-curphoo-0.3.9 64
-MD5 7f42d8dc52c330035bee1818bc2b1be7 files/digest-curphoo-0.3.7-r1 65
-MD5 3b04b3a217cdf5e53eb3387d8253094c files/digest-curphoo-0.03.2 66
-MD5 764acbdbc75119813fd516d6132eb61f files/curphoo.sh 108
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3fc65d8a7759a87efcec2f29419ec74e ChangeLog 2990
+MD5 896d5fe4110ac5174882964651e10736 curphoo-0.3.12-r1.ebuild 1039
+MD5 2bfae1e5bb975f12d5062aa546c12884 metadata.xml 224
+MD5 122cab072db3abe0d1b856902409642f files/0.3.12-session-server-gentoo.patch 507
+MD5 1a18c568484293132a02204630d6324d files/curphoo.1 1755
+MD5 7bfb17e560e41bd3286ed9948e874972 files/curphoo.sh 113
+MD5 b967810475a0de3912a90f4f4f20ab1c files/digest-curphoo-0.3.12-r1 140
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDPvnUyiNZaEAZA+ARAiX0AJ9JGVpg2XXsjtXpqIpGXGvPAOOorQCeNOUy
+tXcXVbMWASI6DEkhdItIjMQ=
+=gnwc
+-----END PGP SIGNATURE-----
diff --git a/net-im/curphoo/curphoo-0.3.12-r1.ebuild b/net-im/curphoo/curphoo-0.3.12-r1.ebuild
index 03b8684bd3bf..d8c2964fdbb2 100644
--- a/net-im/curphoo/curphoo-0.3.12-r1.ebuild
+++ b/net-im/curphoo/curphoo-0.3.12-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/net-im/curphoo/curphoo-0.3.12-r1.ebuild,v 1.1 2005/08/08 16:13:56 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/curphoo/curphoo-0.3.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-amd64.patch.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="x86 sparc ~ppc ~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.1
diff --git a/net-im/curphoo/files/curphoo.sh b/net-im/curphoo/files/curphoo.sh
index 2f6c97ee1340..97c34ce4bafb 100644
--- a/net-im/curphoo/files/curphoo.sh
+++ b/net-im/curphoo/files/curphoo.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 export PYTHONPATH=${PYTHONPATH}:@PHOOPATH@ 
 export TERM=linux
-exec /usr/lib/@PHOOPATH@/curphoo.py
+exec /usr/lib/@PHOOPATH@/curphoo.py "$@"
diff --git a/net-im/ekg/ChangeLog b/net-im/ekg/ChangeLog
index 25cb917c8197..60f8410c5ab5 100644
--- a/net-im/ekg/ChangeLog
+++ b/net-im/ekg/ChangeLog
@@ -1,12 +1,111 @@
 # ChangeLog for net-im/ekg
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.1 2003/09/16 21:24:31 seemant Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ChangeLog,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ekg-1.6_rc3.ebuild:
+  Mark 1.6_rc3 stable on alpha
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> ekg-1.6_rc3.ebuild:
+  stable on ia64
+
+  25 Jul 2005; <sekretarz@gentoo.org> ekg-1.6_rc3.ebuild:
+  Stable on x86 due security bug #99583
+
+  21 Jul 2005; Jory A. Pratt <anarchy@gentoo.org> ekg-1.6_rc3.ebuild:
+  Stable on PPC. bug #99583
+
+  21 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> ekg-1.6_rc3.ebuild:
+  Stable on hppa. bug #99583
+
+*ekg-1.6_rc3 (20 Jul 2005)
+
+  20 Jul 2005; <sekretarz@gentoo.org> +files/ekg-1.6_rc3-libgadu.patch,
+  +ekg-1.6_rc3.ebuild:
+  Version bump due security bug, bug #99583
+
+  14 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org> ekg-1.6_rc1-r1.ebuild:
+  Stable on hppa.
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org> ekg-1.6_rc1-r1.ebuild:
+  Marked stable on x86.
+
+*ekg-1.6_rc1-r1 (28 Apr 2005)
+
+  28 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  +ekg-1.6_rc1-r1.ebuild:
+  Added support for building ekg with both ui-ncurses and ui-readline.
+
+  14 Apr 2005; Michał Januszewski <spock@gentoo.org>
+  +files/ekg-1.6_rc1-fpic.patch, ekg-1.6_rc1.ebuild:
+  Added a patch that should fix bug #88713.
+
+  01 Apr 2005; Aron Griffis <agriffis@gentoo.org> ekg-1.6_rc1.ebuild:
+  stable on ia64
+
+*ekg-1.6_rc1 (20 Mar 2005)
+
+  20 Mar 2005; Michał Januszewski <spock@gentoo.org> +ekg-1.6_rc1.ebuild:
+  Version bump.
+
+  06 Sep 2004; Guy Martin <gmsoft@gentoo.org> ekg-1.5.ebuild:
+  Marked stable on hppa.
+
+  04 Sep 2004; Michal Januszewski <spock@gentoo.org> -ekg-1.3.ebuild,
+  -ekg-1.4.ebuild, ekg-1.5.ebuild:
+  Removed old ebuilds, marked 1.5 stable on x86.
+
+*ekg-1.5 (28 Jun 2004)
+
+  28 Jun 2004; Michal Januszewski <spock@gentoo.org> +ekg-1.5.ebuild:
+  Version bump.
+
+*ekg-1.5_rc2 (13 May 2004)
+
+  13 May 2004; Michal Januszewski <spock@gentoo.org> +ekg-1.5_rc2.ebuild:
+  Version bump.
+
+*ekg-1.5_rc1 (17 Apr 2004)
+
+  17 Apr 2004; Michal Januszewski <spock@gentoo.org> metadata.xml,
+  +ekg-1.5_rc1.ebuild:
+  Version bump.
+
+  14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> ekg-1.3.ebuild:
+  Fixes IUSE.
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> ekg-1.4-r1.ebuild:
+  Stable on hppa
+
+  27 Mar 2004; Michal Januszewski <spock@gentoo.org> ekg-1.3.ebuild,
+  metadata.xml:
+  Ebuild and metadata clean-ups.
+
+  21 Jan 2004; Michal Januszewski <spock@gentoo.org> ekg-1.3.ebuild,
+  ekg-1.4-r1.ebuild, ekg-1.4.ebuild:
+  Bumped to stable on x86.
+
+*ekg-1.4-r1 (16 Jan 2004)
+
+  16 Jan 2004; Michal Januszewski <spock@gentoo.org> ekg-1.3.ebuild,
+  ekg-1.4-r1.ebuild, ekg-1.4.ebuild, metadata.xml:
+  Changed --enable-python to --with-python. Thanks to Pawel Maczewski
+  <pawelma@op.pl> for pointing this out. Updated metadata.
+
+*ekg-1.4 (01 Dec 2003)
+
+  01 Dec 2003; Seemant Kulleen <seemant@gentoo.org> ekg-1.4.ebuild:
+  version bump, thanks to: Michal 'Spock' Januszewski <spock@o2.pl> in bug
+  #34345. Note that this bump also fixes bug #34257 by Rafal Dejewski
+  <r2dtu@wp.pl> to enable pthreads and dynamic/shared libgadu for kopete
 
 *ekg-1.3 (16 Sep 2003)
 
   16 Sep 2003; Seemant Kulleen <seemant@gentoo.org> ekg-1.3.ebuild:
   New client for gadu-gadu messenger protocol for my Polish friends. This ebuild
   thanks to: Michal 'Spock' Januszewski <spock@o2.pl> and Piotr Piasny
-  <p1t3r05@o2.pl> in bug #28656. I'll be relying on Mr. Spock and Mr. Piasny to
-  maintain this indirectly. All bug reports should be cc'd to them
-
+  <p1t3r05@o2.pl> in bug #28656.  Also: AstralStorm
+  <astralstorm@gorzow.mm.pl> in bug #24201, and Radoslaw Stachowiak
+  <radek@alter.pl> in bug#20363.  Thanks to all who submitted an ebuild,
+  sorry for the delay in getting it into portage.  I hope you will all help
+  me to maintain this package and fixing bugs with it. (Will be cc'ing all
+  of you on bug reports).
diff --git a/net-im/ekg/Manifest b/net-im/ekg/Manifest
index ac06a85105ff..c987900eca11 100644
--- a/net-im/ekg/Manifest
+++ b/net-im/ekg/Manifest
@@ -1,2 +1,14 @@
-MD5 582741bc102b29625bf5ccce5d688c5c ekg-1.3.ebuild 909
-MD5 fa4379b937783ca0ff3bc06452e35ea1 files/digest-ekg-1.3 59
+MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
+MD5 3e3c676c4be1c5bcc141eb3cbfc801d9 ekg-1.6_rc1.ebuild 1367
+MD5 18d7404fc325cd36b932b63a1efe5079 ChangeLog 3831
+MD5 c51666e26f26b1a47a35fca7cfd60b4e ekg-1.6_rc1-r1.ebuild 1463
+MD5 b6a1b9883325f35c64c1c7101fa9d435 ekg-1.6_rc3.ebuild 1484
+MD5 f43c4aa49c2172a1d4f64eef10bca1f5 ekg-1.5.ebuild 1224
+MD5 4da0ca4266b73a113cab33b4dba8ef03 ekg-1.4-r1.ebuild 1109
+MD5 2bc5f13c9e2cc840a2f8f61fc3a51391 files/digest-ekg-1.4-r1 59
+MD5 fabb312576862c943792eed047bac7a8 files/digest-ekg-1.5 59
+MD5 73bffbc0a70d4856d52bc58a58fd5615 files/ekg-1.6_rc3-libgadu.patch 833
+MD5 811e95299fbf084137ceb9b517843924 files/digest-ekg-1.6_rc1 62
+MD5 7e938e2282dbaf23d5789db2a53c1ddd files/ekg-1.6_rc1-fpic.patch 487
+MD5 5f85e8a786d72281d79bb0adacc7df71 files/digest-ekg-1.6_rc3 62
+MD5 811e95299fbf084137ceb9b517843924 files/digest-ekg-1.6_rc1-r1 62
diff --git a/net-im/ekg/ekg-1.4-r1.ebuild b/net-im/ekg/ekg-1.4-r1.ebuild
index 42a7d6463f7f..c36a936ba73c 100644
--- a/net-im/ekg/ekg-1.4-r1.ebuild
+++ b/net-im/ekg/ekg-1.4-r1.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/net-im/ekg/ekg-1.4-r1.ebuild,v 1.1 2004/01/16 10:24:10 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 IUSE="ssl ncurses zlib python"
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.null.pl/ekg/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~mips ~ia64 ~amd64"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	ncurses? ( sys-libs/ncurses )
diff --git a/net-im/ekg/ekg-1.5.ebuild b/net-im/ekg/ekg-1.5.ebuild
index 696cc7963670..103131c271c7 100644
--- a/net-im/ekg/ekg-1.5.ebuild
+++ b/net-im/ekg/ekg-1.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/net-im/ekg/ekg-1.5.ebuild,v 1.1 2004/06/28 21:23:02 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.5.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 IUSE="ssl ncurses zlib python spell"
 
@@ -10,7 +10,7 @@ SRC_URI="http://dev.null.pl/ekg/${P/_/}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~alpha hppa ~mips ~ia64 ~amd64"
 
 S="${WORKDIR}/${P/_/}"
 
diff --git a/net-im/ekg/ekg-1.6_rc1-r1.ebuild b/net-im/ekg/ekg-1.6_rc1-r1.ebuild
index 878d09ef0ec0..de4a0273f45a 100644
--- a/net-im/ekg/ekg-1.6_rc1-r1.ebuild
+++ b/net-im/ekg/ekg-1.6_rc1-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/net-im/ekg/ekg-1.6_rc1-r1.ebuild,v 1.1 2005/04/28 18:00:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.6_rc1-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.null.pl/ekg/${P/_/}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ia64 ~amd64"
+KEYWORDS="~alpha ~amd64 hppa ia64 ~mips ~ppc ~sparc x86"
 
 S="${WORKDIR}/${P/_/}"
 
diff --git a/net-im/ekg/ekg-1.6_rc1.ebuild b/net-im/ekg/ekg-1.6_rc1.ebuild
index 460dd1721990..914a5cf391bc 100644
--- a/net-im/ekg/ekg-1.6_rc1.ebuild
+++ b/net-im/ekg/ekg-1.6_rc1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.6_rc1.ebuild,v 1.1 2005/03/20 17:45:28 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.6_rc1.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
-IUSE="ssl ncurses zlib python spell"
+inherit eutils
+
+IUSE="ssl ncurses zlib python spell threads"
 
 DESCRIPTION="EKG (Eksperymentalny Klient Gadu-Gadu) - a text client for Polish instant messaging system Gadu-Gadu"
 HOMEPAGE="http://dev.null.pl/ekg/"
@@ -10,7 +12,7 @@ SRC_URI="http://dev.null.pl/ekg/${P/_/}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~mips ~ia64 ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha hppa ~mips ia64 ~amd64"
 
 S="${WORKDIR}/${P/_/}"
 
@@ -21,13 +23,20 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6 )
 	python? ( dev-lang/python )
 	spell? ( >=app-text/aspell-0.50.3 )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/ekg-1.6_rc1-fpic.patch
+}
+
 src_compile() {
-	local myconf="--enable-ioctld --enable-shared --with-pthread --enable-dynamic"
+	local myconf="--enable-ioctld --enable-shared --enable-dynamic"
 	use ssl     || myconf="$myconf --disable-openssl"
 	use ncurses || myconf="$myconf --disable-ui-ncurses --enable-ui-readline"
 	use zlib    || myconf="$myconf --disable-zlib"
 	use python  && myconf="$myconf --with-python"
 	use spell   && myconf="$myconf --enable-aspell"
+	use threads && myconf="$myconf --with-pthread"
 
 	econf ${myconf} || die
 	emake || die
diff --git a/net-im/ekg/ekg-1.6_rc3.ebuild b/net-im/ekg/ekg-1.6_rc3.ebuild
index 0af1ade9750f..0320181c33d7 100644
--- a/net-im/ekg/ekg-1.6_rc3.ebuild
+++ b/net-im/ekg/ekg-1.6_rc3.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/net-im/ekg/ekg-1.6_rc3.ebuild,v 1.1 2005/07/20 19:31:48 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ekg/ekg-1.6_rc3.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.null.pl/ekg/${P/_/}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~sparc ~x86"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ~sparc x86"
 
 S="${WORKDIR}/${P/_/}"
 
diff --git a/net-im/ekg/metadata.xml b/net-im/ekg/metadata.xml
index 63ff1aecd217..daa8053eefc4 100644
--- a/net-im/ekg/metadata.xml
+++ b/net-im/ekg/metadata.xml
@@ -3,9 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-  <email>spock@o2.pl</email>
-  <name>Michal 'Spock' Januszewski</name>
-  <description>He's the third party maintainer through
-  seemant@gentoo.org</description>
+  <email>spock@gentoo.org</email>
+  <name>Michal Januszewski</name>
 </maintainer>
 </pkgmetadata>
diff --git a/net-im/express/ChangeLog b/net-im/express/ChangeLog
index 30329e3468e6..1e2a78c91e33 100644
--- a/net-im/express/ChangeLog
+++ b/net-im/express/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-im/express
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/express/ChangeLog,v 1.1 2005/09/07 03:44:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/express/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 *express-* (06 Sep 2005)
 
diff --git a/net-im/express/Manifest b/net-im/express/Manifest
index 1f5f875940cb..f9bc37827cb5 100644
--- a/net-im/express/Manifest
+++ b/net-im/express/Manifest
@@ -1,2 +1,14 @@
-MD5 b4f6478f62fd2bf7fb3aec8ba74b364a express-9999.ebuild 404
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 fea39951bacc77c34d1d1dd65f942577 metadata.xml 250
+MD5 1cf62d57ddad6fccd0b9037fcdb87991 ChangeLog 343
+MD5 18808ee571af05afb79609323668f1fb express-9999.ebuild 412
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-express-9999 0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDHmJwgIKl8Uu19MoRAgTTAJ9jRfzjDFZgHzc2zfAwcGRj6gjTFACfZ0M1
+RVihEb/vJzPduWktvGRzBbg=
+=kKjp
+-----END PGP SIGNATURE-----
diff --git a/net-im/express/express-9999.ebuild b/net-im/express/express-9999.ebuild
index 0060e47841da..0441b24ac72b 100644
--- a/net-im/express/express-9999.ebuild
+++ b/net-im/express/express-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/net-im/express/express-9999.ebuild,v 1.1 2005/09/07 03:44:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/express/express-9999.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 inherit enlightenment
 
diff --git a/net-im/gaim-blogger/ChangeLog b/net-im/gaim-blogger/ChangeLog
index 1d605fe5f428..e2fdec1ffd38 100644
--- a/net-im/gaim-blogger/ChangeLog
+++ b/net-im/gaim-blogger/ChangeLog
@@ -1,6 +1,70 @@
 # ChangeLog for net-im/gaim-blogger
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-blogger/ChangeLog,v 1.1 2004/01/17 05:05:15 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-blogger/ChangeLog,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
+
+  19 Jul 2005; Herbie Hopkins <herbs@gentoo.org> gaim-blogger-1.0.0.ebuild:
+  Stable on amd64.
+
+  22 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  gaim-blogger-1.0.0.ebuild:
+  Multilib cleanups and don't use einstall. Use proper toolchain CC.
+  Added to ~amd64.
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -gaim-blogger-0.81.ebuild,
+  -gaim-blogger-0.82.ebuild, gaim-blogger-1.0.0.ebuild:
+  Stable on x86, pruning old versions
+
+*gaim-blogger-1.0.0 (18 Sep 2004)
+
+  18 Sep 2004; Don Seiler <rizzo@gentoo.org> +gaim-blogger-1.0.0.ebuild:
+  Version bump
+
+*gaim-blogger-0.82 (27 Aug 2004)
+
+  27 Aug 2004; Don Seiler <rizzo@gentoo.org> -gaim-blogger-0.79_p1.ebuild,
+  +gaim-blogger-0.82.ebuild:
+  Version bump and pruning obsoletes
+
+*gaim-blogger-0.81 (09 Aug 2004)
+
+  09 Aug 2004; Don Seiler <rizzo@gentoo.org> +gaim-blogger-0.81.ebuild:
+  Version bump
+
+*gaim-blogger-0.79_p1 (03 Jul 2004)
+
+  03 Jul 2004; Don Seiler <rizzo@gentoo.org> +gaim-blogger-0.79_p1.ebuild:
+  Version bump for new upstream patch release
+
+  30 Jun 2004; Don Seiler <rizzo@gentoo.org> :
+  Version bump
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org> :
+  Removing old files for gaim pruning
+
+*gaim-blogger-0.78 (31 May 2004)
+
+  31 May 2004; Don Seiler <rizzo@gentoo.org>; +gaim-blogger-0.78.ebuild:
+  Version bump for Bug #52599.
+
+  27 Apr 2004; Don Seiler <rizzo@gentoo.org>; -gaim-blogger-0.76.ebuild:
+  Removing obsolete version
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> gaim-blogger-0.77.ebuild:
+  Added to ~ppc.
+
+*gaim-blogger-0.77 (23 Apr 2004)
+
+  23 Apr 2004; Don Seiler <rizzo@gentoo.org>; +gaim-blogger-0.77.ebuild:
+  Version bump
+
+*gaim-blogger-0.76 (02 Apr 2004)
+
+  02 Apr 2004; Don Seiler <rizzo@gentoo.org>; gaim-blogger-0.75.ebuild,
+  gaim-blogger-0.76.ebuild:
+  Version bump
+
+  02 Apr 2004; Don Seiler <rizzo@gentoo.org>; gaim-blogger-0.75.ebuild:
+  Changing dep to gaim-0.75
 
 *gaim-blogger-0.75 (16 Jan 2004)
 
diff --git a/net-im/gaim-blogger/Manifest b/net-im/gaim-blogger/Manifest
index 9f630edc6e3e..d9c17bd3b674 100644
--- a/net-im/gaim-blogger/Manifest
+++ b/net-im/gaim-blogger/Manifest
@@ -1,3 +1,14 @@
-MD5 5afc72d30373207aee5126fb21c0af95 gaim-blogger-0.75.ebuild 2632
-MD5 6b738174eafd00cf16c49c94d70a620d metadata.xml 393
-MD5 45a01f61c560de934e33b28bb2a5a7ff files/digest-gaim-blogger-0.75 69
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f49f8c674cdee77506283947beacd51f gaim-blogger-1.0.0.ebuild 1066
+MD5 cb2ee221fa4a2ed2194fb19dc2fe9abc ChangeLog 2268
+MD5 5019c0014995f021a1a81596f6dacc04 metadata.xml 477
+MD5 6ba6036d95785c26d53ab610aa23791c files/digest-gaim-blogger-1.0.0 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3V9U2G5bA0cA/ScRAvy0AKCCwG+Jy+NnGGQ48UmgCmRKiKe+MgCgu41U
+0U7UDHl7vT5YLrAC4B0mzXo=
+=NB4a
+-----END PGP SIGNATURE-----
diff --git a/net-im/gaim-blogger/gaim-blogger-1.0.0.ebuild b/net-im/gaim-blogger/gaim-blogger-1.0.0.ebuild
index a5bc554fe0df..e4af14bd1739 100644
--- a/net-im/gaim-blogger/gaim-blogger-1.0.0.ebuild
+++ b/net-im/gaim-blogger/gaim-blogger-1.0.0.ebuild
@@ -1,35 +1,39 @@
-# 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/net-im/gaim-blogger/gaim-blogger-1.0.0.ebuild,v 1.1 2004/09/18 15:04:27 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-blogger/gaim-blogger-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
+
+inherit multilib toolchain-funcs
 
 DESCRIPTION="Gaim-blogger is a protocol plugin for Gaim which makes use of Gaim's IM interface to post, edit, view and track blogs."
 HOMEPAGE="http://gaim-blogger.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 DEPEND=">=net-im/gaim-1.0.0"
-#RDEPEND=""
 
 S=${WORKDIR}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	sed -i -e 's:PREFIX = /usr/local:PREFIX = '${D}'/usr:g' Makefile
-	sed -i -e 's:GTK_PREFIX = $(PREFIX):GTK_PREFIX = /usr:g' Makefile
-	sed -i -e 's:GAIM_TOP = ../gaim:GAIM_TOP = /usr/include/gaim:g' Makefile
+	sed -i -e 's:PREFIX = /usr/local:PREFIX = /usr:g' \
+	       -e 's:GAIM_TOP = ../gaim:GAIM_TOP = /usr/include/gaim:g' Makefile
+
+	[[ $(get_libdir) == "lib" ]] || sed -i -e "s:/lib/:/$(get_libdir)/:g" Makefile
 }
 
 src_compile() {
-	emake || die
+	emake CC="$(tc-getCC)" || die
 }
 
 src_install() {
-	dodir /usr/lib/gaim
-	dodir /usr/share/pixmaps/gaim/status/default
-	einstall || die
+	exeinto /usr/$(get_libdir)/gaim
+	doexe libblogger.so
+
+	insinto /usr/share/pixmaps/gaim/status/default
+	doins pixmaps/blogger.png
 
 	dodoc COPYING ChangeLog
 }
diff --git a/net-im/gaim-blogger/metadata.xml b/net-im/gaim-blogger/metadata.xml
index 2ec669eab42b..3a2af8e3ee52 100644
--- a/net-im/gaim-blogger/metadata.xml
+++ b/net-im/gaim-blogger/metadata.xml
@@ -2,10 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-  <description>You hang out in #gaim, you learn about stuff.</description>
-</maintainer>
 <longdescription>Gaim-blogger is a protocol plugin for Gaim which makes use of Gaim's IM interface to post, edit, view and track blogs.  This plugin implements the xml-rpc blogger api 1.0, published by Blogger. Gaim-blogger is not endorsed by or affiliated with Blogger or its parent company Google.</longdescription>
 </pkgmetadata>
diff --git a/net-im/gaim-meanwhile/ChangeLog b/net-im/gaim-meanwhile/ChangeLog
index cd890bf2d0c4..1712e5fc6107 100644
--- a/net-im/gaim-meanwhile/ChangeLog
+++ b/net-im/gaim-meanwhile/ChangeLog
@@ -1,6 +1,89 @@
 # ChangeLog for net-im/gaim-meanwhile
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-meanwhile/ChangeLog,v 1.1 2004/07/19 01:05:26 rizzo Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-meanwhile/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
+
+*gaim-meanwhile-1.2.5 (14 Nov 2005)
+
+  14 Nov 2005; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.2.5.ebuild:
+  Version bump.  Closes bug #111271
+
+  08 Nov 2005; Brent Baude <ranger@gentoo.org> gaim-meanwhile-1.2.3.ebuild:
+  Marking ppc64 stable after 30 days
+
+  19 Aug 2005; Brent Baude <ranger@gentoo.org> gaim-meanwhile-1.2.3.ebuild:
+  gaim-meanwhile-1.2.3.ebuild marked ~ppc64 for testing
+
+  21 Jul 2005; Don Seiler <rizzo@gentoo.org> -gaim-meanwhile-1.0.2.ebuild,
+  -gaim-meanwhile-1.2.0.ebuild, -gaim-meanwhile-1.2.2.ebuild,
+  gaim-meanwhile-1.2.3.ebuild:
+  Stable 1.2.3 on x86 and cleanup
+
+*gaim-meanwhile-1.2.4 (21 Jul 2005)
+
+  21 Jul 2005; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.2.4.ebuild:
+  Version bump
+
+*gaim-meanwhile-1.2.3 (14 Jun 2005)
+
+  14 Jun 2005; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.2.3.ebuild:
+  Version bump
+
+*gaim-meanwhile-1.2.2 (04 May 2005)
+
+  04 May 2005; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.2.2.ebuild:
+  Version bump
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  gaim-meanwhile-1.2.0.ebuild:
+  added ~amd64
+
+*gaim-meanwhile-1.2.0 (18 Mar 2005)
+
+  18 Mar 2005; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.2.0.ebuild:
+  Version bump
+
+  08 Feb 2005; Don Seiler <rizzo@gentoo.org> gaim-meanwhile-1.0.2.ebuild:
+  Stable on x86
+
+  16 Jan 2005; Jason Wever <weeve@gentoo.org> gaim-meanwhile-1.0.2.ebuild:
+  Added ~sparc keyword wrt bug #77973.
+
+*gaim-meanwhile-1.0.2 (10 Nov 2004)
+
+  10 Nov 2004; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.0.2.ebuild:
+  Version bump
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -gaim-meanwhile-0.81.ebuild,
+  -gaim-meanwhile-0.82.ebuild, -gaim-meanwhile-1.0.0.ebuild,
+  gaim-meanwhile-1.0.1.ebuild:
+  Stable on x86, pruning old versions
+
+*gaim-meanwhile-1.0.1 (16 Oct 2004)
+
+  16 Oct 2004; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.0.1.ebuild:
+  Version bump.  Closes Bug #67734
+
+  07 Oct 2004; Don Seiler <rizzo@gentoo.org> gaim-meanwhile-1.0.0.ebuild:
+  Stable on x86.  Closes bug #66435.
+
+*gaim-meanwhile-1.0.0 (18 Sep 2004)
+
+  18 Sep 2004; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-1.0.0.ebuild:
+  Version bump
+
+  08 Sep 2004; Don Seiler <rizzo@gentoo.org> gaim-meanwhile-0.82.ebuild:
+  Stable on x86.  Closes Bug #63234.
+
+*gaim-meanwhile-0.82 (28 Aug 2004)
+
+  28 Aug 2004; Don Seiler <rizzo@gentoo.org> -gaim-meanwhile-0.80.ebuild,
+  gaim-meanwhile-0.81.ebuild, +gaim-meanwhile-0.82.ebuild:
+  Version bump for 0.82, stabilizing 0.81, and removing 0.80
+
+*gaim-meanwhile-0.81 (06 Aug 2004)
+
+  06 Aug 2004; Don Seiler <rizzo@gentoo.org> +gaim-meanwhile-0.81.ebuild:
+  Version bump
 
 *gaim-meanwhile-0.80 (18 Jul 2004)
 
diff --git a/net-im/gaim-meanwhile/Manifest b/net-im/gaim-meanwhile/Manifest
index fa3a43d30ca0..b14b61c4167e 100644
--- a/net-im/gaim-meanwhile/Manifest
+++ b/net-im/gaim-meanwhile/Manifest
@@ -1,4 +1,8 @@
-MD5 1a7685e9f1d5ad5795eeb448d8800f8f gaim-meanwhile-0.79.ebuild 708
-MD5 ef34f4ca8e6519380b7ef1210dc35f56 gaim-meanwhile-0.80.ebuild 643
-MD5 bf65714116b0ee4137a2feab2745499f files/digest-gaim-meanwhile-0.79 71
-MD5 b1ac3581d684d36fc4073087ffa980b3 files/digest-gaim-meanwhile-0.80 71
+MD5 10480e86752d1a0bfc611bf1ded27a17 ChangeLog 3016
+MD5 62a50c250b28b0ac09ec04c83ae4ee6e gaim-meanwhile-1.2.5.ebuild 644
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+MD5 9ecc19cd7e2069dddf882277f33175e5 gaim-meanwhile-1.2.3.ebuild 650
+MD5 e3192c471aa6609913eb9c276aa14302 gaim-meanwhile-1.2.4.ebuild 644
+MD5 e68483f7c5f1ab6d83fd5b968f665cab files/digest-gaim-meanwhile-1.2.5 72
+MD5 d1e4a29aa0ec5b6f4f82e119bba6f45c files/digest-gaim-meanwhile-1.2.3 72
+MD5 f44984ac2e4ce4c2a71535f62ea2cf28 files/digest-gaim-meanwhile-1.2.4 72
diff --git a/net-im/gaim-meanwhile/gaim-meanwhile-1.2.3.ebuild b/net-im/gaim-meanwhile/gaim-meanwhile-1.2.3.ebuild
index 2fdbbc87c220..bc47d1869b07 100644
--- a/net-im/gaim-meanwhile/gaim-meanwhile-1.2.3.ebuild
+++ b/net-im/gaim-meanwhile/gaim-meanwhile-1.2.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/net-im/gaim-meanwhile/gaim-meanwhile-1.2.3.ebuild,v 1.1 2005/06/14 13:19:02 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-meanwhile/gaim-meanwhile-1.2.3.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 inherit debug
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://meanwhile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/meanwhile/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="~amd64 ~ppc ppc64 ~sparc x86"
 DEPEND=">=net-libs/meanwhile-0.4.2
 	>=net-im/gaim-1.2.1"
 IUSE=""
diff --git a/net-im/gaim-meanwhile/gaim-meanwhile-1.2.4.ebuild b/net-im/gaim-meanwhile/gaim-meanwhile-1.2.4.ebuild
index 88c9538d2ea9..cccfd03f3d08 100644
--- a/net-im/gaim-meanwhile/gaim-meanwhile-1.2.4.ebuild
+++ b/net-im/gaim-meanwhile/gaim-meanwhile-1.2.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/net-im/gaim-meanwhile/gaim-meanwhile-1.2.4.ebuild,v 1.1 2005/07/21 03:15:39 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-meanwhile/gaim-meanwhile-1.2.4.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 inherit debug
 
diff --git a/net-im/gaim-meanwhile/gaim-meanwhile-1.2.5.ebuild b/net-im/gaim-meanwhile/gaim-meanwhile-1.2.5.ebuild
index b0d25a021ff5..18bc05f19615 100644
--- a/net-im/gaim-meanwhile/gaim-meanwhile-1.2.5.ebuild
+++ b/net-im/gaim-meanwhile/gaim-meanwhile-1.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/net-im/gaim-meanwhile/gaim-meanwhile-1.2.5.ebuild,v 1.1 2005/11/14 18:47:48 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-meanwhile/gaim-meanwhile-1.2.5.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 inherit debug
 
diff --git a/net-im/gaim-meanwhile/metadata.xml b/net-im/gaim-meanwhile/metadata.xml
index e81d825904df..3e2b4181f5be 100644
--- a/net-im/gaim-meanwhile/metadata.xml
+++ b/net-im/gaim-meanwhile/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/net-im/gaim-snpp/ChangeLog b/net-im/gaim-snpp/ChangeLog
index 8499f88a65a9..e2f3f0dee2fb 100644
--- a/net-im/gaim-snpp/ChangeLog
+++ b/net-im/gaim-snpp/ChangeLog
@@ -1,6 +1,84 @@
 # ChangeLog for net-im/gaim-snpp
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-snpp/ChangeLog,v 1.1 2004/03/02 19:49:12 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-snpp/ChangeLog,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
+
+  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  gaim-snpp-0.8.0.ebuild:
+  Stable on ppc.
+
+  19 Jul 2005; Herbie Hopkins <herbs@gentoo.org> gaim-snpp-0.8.0.ebuild:
+  Stable on amd64.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> gaim-snpp-0.8.0.ebuild:
+  added ~amd64
+
+  21 Oct 2004; Don Seiler <rizzo@gentoo.org> -gaim-snpp-0.6.1.ebuild,
+  -gaim-snpp-0.7.1.ebuild, gaim-snpp-0.8.0.ebuild:
+  Stable on x86, pruning old versions
+
+*gaim-snpp-0.8.0 (19 Sep 2004)
+
+  19 Sep 2004; Don Seiler <rizzo@gentoo.org> +gaim-snpp-0.8.0.ebuild:
+  Version bump
+
+  03 Sep 2004; Don Seiler <rizzo@gentoo.org> gaim-snpp-0.7.1.ebuild:
+  Stable on x86
+
+*gaim-snpp-0.7.1 (25 Aug 2004)
+
+  25 Aug 2004; Don Seiler <rizzo@gentoo.org> +gaim-snpp-0.7.1.ebuild:
+  Version bump
+
+*gaim-snpp-0.6.1 (23 Jul 2004)
+
+  23 Jul 2004; Don Seiler <rizzo@gentoo.org> +gaim-snpp-0.6.1.ebuild:
+  Version bump
+
+*gaim-snpp-0.6.0 (16 Jul 2004)
+
+  16 Jul 2004; Don Seiler <rizzo@gentoo.org> +gaim-snpp-0.6.0.ebuild:
+  Version bump
+
+  28 Jun 2004; Don Seiler <rizzo@gentoo.org> -gaim-snpp-0.1.0.ebuild,
+  -gaim-snpp-0.4.0.ebuild:
+  Removing old files for gaim pruning
+
+*gaim-snpp-0.5.0 (24 Jun 2004)
+
+  24 Jun 2004; Don Seiler <rizzo@gentoo.org> +gaim-snpp-0.5.0.ebuild:
+  Version bump
+
+*gaim-snpp-0.4.0 (30 May 2004)
+
+  30 May 2004; Don Seiler <rizzo@gentoo.org>; +gaim-snpp-0.4.0.ebuild:
+  Version bump
+
+  29 Apr 2004; Don Seiler <rizzo@gentoo.org>; gaim-snpp-0.3.0.ebuild:
+  Marking stable on x86
+
+  27 Apr 2004; Don Seiler <rizzo@gentoo.org>; -gaim-snpp-0.2.0.ebuild:
+  Removing obsolete version
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> gaim-snpp-0.3.0.ebuild:
+  Added to ~ppc.
+
+*gaim-snpp-0.3.0 (22 Apr 2004)
+
+  22 Apr 2004; Don Seiler <rizzo@gentoo.org>; +gaim-snpp-0.3.0.ebuild:
+  Version bump
+
+*gaim-snpp-0.2.0 (02 Apr 2004)
+
+  02 Apr 2004; Don Seiler <rizzo@gentoo.org>; gaim-snpp-0.2.0.ebuild:
+  Version bump
+
+  29 Mar 2004; Don Seiler <rizzo@gentoo.org>; gaim-snpp-0.1.0_beta.ebuild:
+  Removing obsoleteness
+
+*gaim-snpp-0.1.0 (29 Mar 2004)
+
+  29 Mar 2004; Don Seiler <rizzo@gentoo.org>; gaim-snpp-0.1.0.ebuild:
+  Version bump
 
 *gaim-snpp-0.1.0_beta (02 Mar 2004)
 
diff --git a/net-im/gaim-snpp/Manifest b/net-im/gaim-snpp/Manifest
index 8687be342a14..660af5d7bd4d 100644
--- a/net-im/gaim-snpp/Manifest
+++ b/net-im/gaim-snpp/Manifest
@@ -1,2 +1,4 @@
-MD5 626fe66d8d7e3e819192544a2d3c6561 gaim-snpp-0.1.0_beta.ebuild 778
-MD5 3faaf76cd7e55c40e3c6a8ebee4afdce files/digest-gaim-snpp-0.1.0_beta 72
+MD5 5202df9bd857f7fffdc188c30e5bed1f gaim-snpp-0.8.0.ebuild 633
+MD5 9b491355156c64a34d2294df5354eaed metadata.xml 354
+MD5 afe7031d9a8c53e75ad19f724f9e7d13 ChangeLog 2461
+MD5 6197af66a1a89a1cf327056548e2dcff files/digest-gaim-snpp-0.8.0 67
diff --git a/net-im/gaim-snpp/gaim-snpp-0.8.0.ebuild b/net-im/gaim-snpp/gaim-snpp-0.8.0.ebuild
index 94fb131c960e..ea79aa2bca10 100644
--- a/net-im/gaim-snpp/gaim-snpp-0.8.0.ebuild
+++ b/net-im/gaim-snpp/gaim-snpp-0.8.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/net-im/gaim-snpp/gaim-snpp-0.8.0.ebuild,v 1.1 2004/09/19 05:51:38 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-snpp/gaim-snpp-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 inherit debug
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 DEPEND=">=net-im/gaim-1.0.0"
diff --git a/net-im/gaim-snpp/metadata.xml b/net-im/gaim-snpp/metadata.xml
index d6b5cd1ea28d..64bb67ee3542 100644
--- a/net-im/gaim-snpp/metadata.xml
+++ b/net-im/gaim-snpp/metadata.xml
@@ -2,9 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-  <email>rizzo@gentoo.org</email>
-  <description>I am the author of gaim-snpp</description>
-</maintainer>
 <longdescription>gaim-snpp is a protocol plug-in for Gaim that allows sending messages to pager servers (like qpage) via the Simple Network Paging Protocol ("SNPP" - RFC 1861).</longdescription>
 </pkgmetadata>
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog
index d4ddae5f7d72..554e3cf605d8 100644
--- a/net-im/gajim/ChangeLog
+++ b/net-im/gajim/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-im/gajim
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.1 2005/06/05 13:31:38 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
+
+  26 Sep 2005; Luis Medinas <metalgod@gentoo.org> gajim-0.8.2.ebuild:
+  Marked Stable on amd64
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> gajim-0.8.2.ebuild:
+  Mark 0.8.2 stable on alpha
+
+*gajim-0.8.2 (12 Sep 2005)
+
+  12 Sep 2005; Sergey Kuleshov <svyatogor@gentoo.org> +gajim-0.8.2.ebuild:
+  New version added - 0.8.2
+
+  28 Aug 2005; Sergey Kuleshov <svyatogor@gentoo.org> gajim-0.8-r1.ebuild:
+  Verify that pygtk was emerged with USE=gnome, cause we need pygton glade modules.
+
+*gajim-0.8-r1 (27 Aug 2005)
+
+  27 Aug 2005; Sergey Kuleshov <svyatogor@gentoo.org> +gajim-0.8-r1.ebuild:
+  New ebuild version wich supports dbus and srv USE flags. Also added ~ppc to
+  use flags, as it is reported to be ok by one of the users.
+
+*gajim-0.8 (24 Aug 2005)
+
+  24 Aug 2005; <sekretarz@gentoo.org> +gajim-0.8.ebuild:
+  Version bump, bug #103097
+
+  28 Jun 2005; Aron Griffis <agriffis@gentoo.org> gajim-0.7.1.ebuild:
+  Fix use invocation, it was completely broken.  Fix indentation
+
+  25 Jun 2005; Simon Stelling <blubb@gentoo.org>
+  +files/gajim-0.7.1-multilib.patch, gajim-0.7.1.ebuild:
+  make gajim multilib-capable
+
+  06 Jun 2005; Sergey Kuleshov <svyatogor@gentoo.org> gajim-0.7.1.ebuild:
+  Added nls and spell USE flags.
 
 *gajim-0.7.1 (05 Jun 2005)
 
diff --git a/net-im/gajim/Manifest b/net-im/gajim/Manifest
index 578bc4b32d05..cf7bb8db30de 100644
--- a/net-im/gajim/Manifest
+++ b/net-im/gajim/Manifest
@@ -1,4 +1,21 @@
-MD5 5a2dd4c08f49b38688104568fbd98bd4 gajim-0.7.1.ebuild 548
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 395663d2f52667c67cdd1dd8b40bef2b ChangeLog 1591
+MD5 3fdc0fa74cf9aa8bb935b17dfd27ca69 gajim-0.7.1.ebuild 935
 MD5 aeded6d40742a2f4f21777446c628a75 metadata.xml 256
-MD5 57a8ce3fc1e79df68883ffac91b64981 ChangeLog 278
+MD5 656905dd3111adff62b7bc8386d6d008 gajim-0.8-r1.ebuild 1194
+MD5 dba3a4b9977143b405af1409247142b8 gajim-0.8.ebuild 866
+MD5 3550a55fbbb772a7e346e810966eeb14 gajim-0.8.2.ebuild 1190
 MD5 6f1aa51ef02f0ae0d5408a8efa7e49dd files/digest-gajim-0.7.1 64
+MD5 5a8c6770554dbd5a01ddb6cba24c301b files/gajim-0.7.1-multilib.patch 836
+MD5 806ff24c3bf7811892738a9118a25f1b files/digest-gajim-0.8 62
+MD5 806ff24c3bf7811892738a9118a25f1b files/digest-gajim-0.8-r1 62
+MD5 8ac503ffbd2c564b199a8c93db918653 files/digest-gajim-0.8.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDOIkJwUpWvClEHQoRAg2hAJ0VoDx0D/pL2Ub02IsC+uPcKI88CQCdHQjO
+/KiqGpSwO4DiclSZno6fvLo=
+=E/fl
+-----END PGP SIGNATURE-----
diff --git a/net-im/gajim/gajim-0.7.1.ebuild b/net-im/gajim/gajim-0.7.1.ebuild
index e14edf8c0ad3..32d0e846c571 100644
--- a/net-im/gajim/gajim-0.7.1.ebuild
+++ b/net-im/gajim/gajim-0.7.1.ebuild
@@ -1,26 +1,38 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.7.1.ebuild,v 1.1 2005/06/05 13:31:38 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.7.1.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
-inherit virtualx
+inherit virtualx multilib eutils
 
-DESCRIPTION="Jabber client written in PyGTK."
+DESCRIPTION="Jabber client written in PyGTK"
 HOMEPAGE="http://www.gajim.org/"
 SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~alpha ~amd64"
-IUSE=""
+IUSE="nls spell"
 
 DEPEND=">=dev-python/pygtk-2.4.0
 	>=dev-lang/python-2.3.0
-	>=x11-libs/gtk+-2.4"
+	>=x11-libs/gtk+-2.4
+	spell? ( >=app-text/gtkspell-2.0.4 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-multilib.patch
+}
 
 src_compile() {
-	Xmake || die "Xmake failed"
+	targets="idle trayicon"
+	use nls && targets="${targets} translation"
+	use spell && targets="${targets} gtkspell"
+	Xemake ${targets} || die "Xmake failed"
 }
+
 src_install() {
-	Xmake DESTDIR=${D} install || die
+	Xemake DESTDIR=${D} LIBDIR=$(get_libdir) install || die
 	dodoc README AUTHORS COPYING
 }
diff --git a/net-im/gajim/gajim-0.8-r1.ebuild b/net-im/gajim/gajim-0.8-r1.ebuild
index 484df307685a..dfa16be63c63 100644
--- a/net-im/gajim/gajim-0.8-r1.ebuild
+++ b/net-im/gajim/gajim-0.8-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/net-im/gajim/gajim-0.8-r1.ebuild,v 1.1 2005/08/27 09:06:32 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit virtualx multilib eutils
 
@@ -20,6 +20,17 @@ DEPEND=">=dev-python/pygtk-2.4.0
 	!alpha? ( dbus? ( >=sys-apps/dbus-0.23 ) )
 	srv? ( >=dev-python/dnspython-1.3.3 )"
 
+src_unpack() {
+	if ! built_with_use dev-python/pygtk gnome
+	then
+		einfo "Gajim requires galde python modules."
+		einfo "Please rebuild pygtk with USE=\"gnome\"."
+		die "python glade modules missing"
+	fi
+	unpack ${A}
+	cd ${S}
+}
+
 src_compile() {
 	targets="idle trayicon"
 	use nls && targets="${targets} translation"
diff --git a/net-im/gajim/gajim-0.8.2.ebuild b/net-im/gajim/gajim-0.8.2.ebuild
index d0c8420dce9e..8b6d7420e987 100644
--- a/net-im/gajim/gajim-0.8.2.ebuild
+++ b/net-im/gajim/gajim-0.8.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/net-im/gajim/gajim-0.8.2.ebuild,v 1.1 2005/09/12 17:16:47 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.8.2.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit virtualx multilib eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.gajim.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ~alpha ~amd64 ~ppc"
+KEYWORDS="alpha amd64 ~ppc x86"
 IUSE="nls spell dbus srv"
 
 DEPEND=">=dev-python/pygtk-2.4.0
diff --git a/net-im/gajim/gajim-0.8.ebuild b/net-im/gajim/gajim-0.8.ebuild
index ee1999d8e996..6b3e0869c343 100644
--- a/net-im/gajim/gajim-0.8.ebuild
+++ b/net-im/gajim/gajim-0.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/net-im/gajim/gajim-0.8.ebuild,v 1.1 2005/08/24 21:50:17 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.8.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit virtualx multilib eutils
 
diff --git a/net-im/gg-transport/ChangeLog b/net-im/gg-transport/ChangeLog
index cfa874fd7905..3597d43995e2 100644
--- a/net-im/gg-transport/ChangeLog
+++ b/net-im/gg-transport/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gg-transport
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/ChangeLog,v 1.1 2005/08/24 23:22:32 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/ChangeLog,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
+
+  18 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  gg-transport-2.2.1.ebuild:
+  Stable on x86. Ebuild cleanup.
 
 *gg-transport-2.2.1 (24 Aug 2005)
 
diff --git a/net-im/gg-transport/Manifest b/net-im/gg-transport/Manifest
index 6ca824e8c5eb..8a194087bb48 100644
--- a/net-im/gg-transport/Manifest
+++ b/net-im/gg-transport/Manifest
@@ -1,4 +1,5 @@
-MD5 00da30602e3faee1fbe8f1246fb1af21 gg-transport-2.2.1.ebuild 838
-MD5 c68394e089fc42927af7b8aa24fd6333 files/jggtrans 270
-MD5 3f1b97ae41ee2a30b0a5f7d0c5beaa30 files/digest-gg-transport-2.2.0 78
+MD5 375ddb874474d4f29fcd7a4105407547 ChangeLog 547
 MD5 322741c40ca016d2712932de6f8d801c files/digest-gg-transport-2.2.1 78
+MD5 08e2ae03e285aa58e2b9a2aaf197ed7c files/jggtrans 370
+MD5 4a94f05d1bda942d5fee0b4dffc6a1e6 gg-transport-2.2.1.ebuild 836
+MD5 1b2166e604744970799c1cc476d4e855 metadata.xml 375
diff --git a/net-im/gg-transport/files/jggtrans b/net-im/gg-transport/files/jggtrans
index 40f25dbfc78f..5c0b36ac1e09 100644
--- a/net-im/gg-transport/files/jggtrans
+++ b/net-im/gg-transport/files/jggtrans
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/files/jggtrans,v 1.1 2005/08/24 23:22:33 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/files/jggtrans,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 depend() {
 	need net jabber-server
diff --git a/net-im/gg-transport/gg-transport-2.2.1.ebuild b/net-im/gg-transport/gg-transport-2.2.1.ebuild
index 2836de93ca8a..43dfadd5abd1 100644
--- a/net-im/gg-transport/gg-transport-2.2.1.ebuild
+++ b/net-im/gg-transport/gg-transport-2.2.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/net-im/gg-transport/gg-transport-2.2.1.ebuild,v 1.1 2005/08/24 23:22:32 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gg-transport/gg-transport-2.2.1.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 DESCRIPTION="GG transport for Jabber"
 HOMEPAGE="http://jabberstudio.org/projects/jabber-gg-transport/project/view.php"
@@ -8,27 +8,20 @@ SRC_URI="http://files.jabberstudio.org/jabber-gg-transport/jabber-gg-transport-$
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
-DEPEND=">=net-im/jabberd-1.4
+DEPEND="net-im/jabberd
 	>=dev-libs/glib-2.6.4
 	net-dns/libidn"
 
 S="${WORKDIR}/jabber-gg-transport-${PV}"
 
-src_compile() {
-
-	econf || die "econf failed"
-	emake || die "emake failed"
-
-}
-
 src_install() {
 
 	make DESTDIR=${D} install || die "install failed"
 
-	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog COPYING INSTALL INSTALL.Pl
+	dodoc ABOUT-NLS AUTHORS BUGS ChangeLog
 	dodoc README README.Pl NEWS TODO
 
 	exeinto /etc/init.d
diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog
index 4a68bc0182b0..56f27f976dfb 100644
--- a/net-im/gnomemeeting/ChangeLog
+++ b/net-im/gnomemeeting/ChangeLog
@@ -1,10 +1,288 @@
 # ChangeLog for net-im/gnomemeeting
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.1 2002/07/03 23:15:51 raker Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> gnomemeeting-1.2.1.ebuild:
+  Mark 1.2.1 stable on alpha
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.1.ebuild,
+  gnomemeeting-1.2.2.ebuild:
+  Fix DEPENDS, add dev-perl/XML-Parser, (#81077).
+
+  15 Sep 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.1.ebuild:
+  Fix DEPENDS, gnomemeeting-1.2.1 only works w/ pwlib-1.8.4 and openh323-1.15.3
+  (#105979).
+
+  13 Sep 2005; <dang@gentoo.org> files/gnomemeeting-1.2.2-dbus.diff,
+  gnomemeeting-1.2.2.ebuild:
+  Patch gnomemeeting 1.2.2 to use the new dbus used by gnome 2.12
+
+*gnomemeeting-1.2.2 (12 Sep 2005)
+
+  12 Sep 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/gnomemeeting-1.2.2-dbus.diff, +gnomemeeting-1.2.2.ebuild:
+  Version bump and cleanups.
+
+  29 Jul 2005; <stkn@gentoo.org> gnomemeeting-1.2.1.ebuild,
+  gnomemeeting-1.2.0.ebuild:
+  -O3 causes trouble with audio plugins, replace with -O2
+  (bug #88710).
+
+  27 Jul 2005; Pieter Van den Abeele <pvdabeel@gentoo.org>
+  gnomemeeting-1.2.0.ebuild, gnomemeeting-1.2.1.ebuild:
+  Stable mask. This version has Howl support (Gnome version of
+  mdns/zeroconf/bonjour) and detects people on the intranet using
+  Gnomemeeting. Also, this is the target for testing Altivec optimized
+  Openh323 in the Freescale DES.
+
+  11 Apr 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/gnomemeeting-1.2.1-configure.patch, gnomemeeting-1.2.1.ebuild:
+  Fix bug #88711, install schema file into proper directories
+
+  11 Apr 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.1.ebuild:
+  Fixed depends.
+
+*gnomemeeting-1.2.1 (11 Apr 2005)
+
+  11 Apr 2005; Stefan Knoblich <stkn@gentoo.org> +gnomemeeting-1.2.1.ebuild:
+  Version bump.
+
+  10 Apr 2005; Stefan Knoblich <stkn@gentoo.org> -gnomemeeting-0.94.1.ebuild:
+  cleanup part #1
+
+  25 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  gnomemeeting-1.2.0.ebuild:
+  Readded ~amd64 keyword.
+
+  13 Mar 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/gnomemeeting-1.2.0-nosdl.patch, gnomemeeting-1.2.0.ebuild:
+  Patch fixes compiling on systems without libsdl installed, closes #82811.
+
+  06 Feb 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/gnomemeeting-1.00-gcc34.patch, gnomemeeting-1.00.ebuild:
+  Added patch for gcc-3.4, provided by Christian Hartmann <ian@gentoo.org>
+  (bug #80232).
+
+  14 Jan 2005; <avatar@gentoo.org> gnomemeeting-1.2.0.ebuild:
+  Added to ~ppc.
+
+  10 Jan 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.0.ebuild:
+  Updated the description to reflect recent changes in gnomeeting-1.2.0 (by request
+  of gnomemeeting head developer).
+
+  10 Jan 2005; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.2.0.ebuild:
+  Marked ~alpha.
+
+  09 Jan 2005; Jason Wever <weeve@gentoo.org> gnomemeeting-1.2.0.ebuild:
+  Added ~sparc keyword as it went missing in the version bump.
+
+*gnomemeeting-1.2.0 (09 Jan 2005)
+
+  09 Jan 2005; Stefan Knoblich <stkn@gentoo.org>
+  +files/gnomemeeting-1.2.0-gk-hang-fix.patch, +gnomemeeting-1.2.0.ebuild:
+  New version, ebuild changes submitted by Stefan Schweizer
+  <genstef@gentoo.org>, patch for gk issues included thx to Mihai Rusu
+  <dizzy@roedu.net>
+
+*gnomemeeting-1.0.2-r1 (22 Dec 2004)
+
+  22 Dec 2004; Mike Gardiner <obz@gentoo.org> +gnomemeeting-1.0.2-r1.ebuild,
+  gnomemeeting-1.0.2.ebuild:
+  Call gnome2_pkg_postinst in our pkg_postinst() otherwise we don't install
+  the gconf schema. Fixes bug #59764
+
+  31 Oct 2004; Joseph Jezak <josejx@gentoo.org> gnomemeeting-1.0.2.ebuild:
+  Marked ppc stable to fix compilation problems with GCC 3.4
+
+  23 Oct 2004; Jason Wever <weeve@gentoo.org> gnomemeeting-1.0.2.ebuild:
+  Added ~sparc keyword.
+
+  31 Aug 2004; <stkn@gentoo.org> metadata.xml:
+  re-added gnome herd to metadata.xml
+
+  19 Aug 2004; foser <foser@gentoo.org> gnomemeeting-1.0.2.ebuild :
+  Remove linc dep for future releases (#45789)
+  Add long description to metadata (#45789)
+
+  12 Aug 2004; Mike Gardiner <obz@gentoo.org> gnomemeeting-1.0.2.ebuild:
+  Added fix for GConf permissions, see bug #59764
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnomemeeting-0.98.0.ebuild,
+  gnomemeeting-0.98.5-r1.ebuild, gnomemeeting-0.98.5.ebuild,
+  gnomemeeting-1.0.2.ebuild, gnomemeeting-1.00.ebuild:
+  Fix use invocation
+
+  27 May 2004; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.00.ebuild,
+  metadata.xml:
+  gnomemeeting-1.00 stable on x86, fixed #47929, new maintainer, changed
+  description
+
+  09 May 2004; David Holm <dholm@gentoo.org> gnomemeeting-1.0.2.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
+  gnomemeeting-0.98.5-r1.ebuild, gnomemeeting-0.98.5.ebuild,
+  gnomemeeting-1.0.2.ebuild:
+  Add inherit eutils
+
+*gnomemeeting-1.0.2 (27 Apr 2004)
+
+  27 Apr 2004; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.0.2.ebuild,
+  files/gnomemeeting-1.0.2-configure.diff:
+  version bump
+
+  30 Mar 2004; Lars Weiler <pylon@gentoo.org> gnomemeeting-1.00.ebuild:
+  Added ~ppc on request of cybersystem
+
+  19 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  gnomemeeting-1.00.ebuild:
+  ~sparc lovin
+
+*gnomemeeting-1.00 (17 Mar 2004)
+
+  17 Mar 2004; Stefan Knoblich <stkn@gentoo.org> gnomemeeting-1.00.ebuild:
+  version bump. added scrollkeeper as a DEPEND, non-gnome users need it.
+
+*gnomemeeting-0.98.5-r1 (03 Feb 2004)
+
+  03 Feb 2004; <spider@gentoo.org> :
+  fix DEPEND vs. RDEPEND issue
+
+  09 Nov 2003; Jason Wever <weeve@gentoo.org> gnomemeeting-0.98.5.ebuild:
+  Added ~sparc keyword.
+
+  08 Nov 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.98.5.ebuild:
+  added patch to compile against libxml2-2.6.x (#32810)
+
+*gnomemeeting-0.98.5 (16 Sep 2003)
+
+  16 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.98.5.ebuild:
+  version bump
+
+*gnomemeeting-0.98.4 (03 Sep 2003)
+
+  03 Sep 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.96.0.ebuild,
+  gnomemeeting-0.96.1.ebuild, gnomemeeting-0.98.0.ebuild:
+  version bump and cleanups
+
+  21 Jul 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.98.0.ebuild:
+  removed gnome USE flag because it doesn't work anymore
+
+*gnomemeeting-0.98.0 (27 Jun 2003)
+
+  27 Jun 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.98.0.ebuild:
+  version bump. using standard include paths rather than /usr/share/*/include
+
+  17 May 2003; Alastair Tse <liquidx@gentoo.org>
+  gnomemeeting-0.96.1-r1.ebuild:
+  marked as x86 stable
+
+*gnomemeeting-0.96.1-r1 (01 Apr 2003)
+
+  01 Apr 2003; Alastair Tse <liquidx@gentoo.org>
+  gnomemeeting-0.96.1-r1.ebuild,
+  files/gnomemeeting-0.96.1-pwcworkaround.patch:
+  backported patch from cvs to fix for PWC cameras. 
+  added gnome and ipv6 use flags. deps cleanup.
+  depends on newest openh323 and pwlib
+
+*gnomemeeting-0.96.1 (20 Mar 2003)
+
+  20 Mar 2003; Alastair Tse <liquidx@gentoo.org> gnomemeeting-0.96.1.ebuild:
+  Version bump.
+
+*gnomemeeting-0.96.0 (28 Jan 2003)
+
+  01 Feb 2003; Nick Hadaway <raker@gentoo.org> gnomemeeting-0.96.0.ebuild :
+  Marked stable.
+
+  28 Jan 2003; Nick Hadaway <raker@gentoo.org> gnomemeeting-0.96.0.ebuild,
+  files/digest-gnomemeeting-0.96.0 :
+  Version bump. :)
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*gnomemeeting-0.94.1 (12 Nov 2002)
+
+  10 Dec 2002; Martin Holzer <mholzer@gentoo.org> gnomemeeting-0.94.1.ebuild Changelog
+  added  esound dependency. Fixes #11642
+
+  12 Nov 2002; Matt Keadle <mkeadle@gentoo.org>
+  gnomemeeting-*.ebuild:
+
+  Changed instances of 'Speex' to 'speex'
+
+*gnomemeeting-0.94.1 (24 Oct 2002)
+
+  30 Oct 2002; Nick Hadaway <raker@gentoo.org>
+  gnomemeeting-0.94.1.ebuild :
+  Tightened dependancies.
+
+  24 Oct 2002; Nick Hadaway <raker@gentoo.org>
+  gnomemeeting-0.94.1.ebuild, files/digest-gnomemeeting-0.94.1 :
+  Version bump.  Now supports the "Speex" voice codec.  Lots of 
+  bugs fixed and features added.
+
+*gnomemeeting-0.93.1 (10 Aug 2002)
+
+  17 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  gnomemeeting-0.93.1.ebuild :
+  Tightened dependancies further.  Added ssl and sdl use variables.
+  I am hoping with the adding of the sdl use flag bug #7444 will be
+  addressed.  Changed to econf.
+
+  11 Sep 2002; Nick Hadaway <raker@gentoo.org>
+  gnomemeeting-0.93.1.ebuild :
+  Updated dependancies to require >=gnome-base/gnome-2.0.0
+
+  10 Aug 2002; Nick Hadaway <raker@gentoo.org>
+  gnomemeeting-0.93.1.ebuild, files/digest-gnomemeeting-0.93.1 :
+  Version bump.  This time the arts code is fixed. :)
+  
+
+*gnomemeeting-0.93.0 (20 Jul 2002)
+
+  22 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  ChangeLog :
+  I just got an email back from the head developer of GnomeMeeting.
+  He says it is a consequence of building SDL with arts support.
+  He says in the next release it will be fixed by using a wrapper call
+  to artsddsp.
+
+  20 Jul 2002; Nick Hadaway <raker@gentoo.org>
+  gnomemeeting-0.93.0.ebuild, files/digest-gnomemeeting-0.93.0,
+  files/ifarts.diff :
+  *NOTE* - arts suspend support (disabling arts during gnomemeeting call)
+  isn't compilling correctly.  I have a patch for the mean time which
+  checks if you have the kde use variable set, and if you do, disables
+  arts support.  Version bump.  Removed old versions from cvs.
+  - SDL support (video in popup window + fullscreen video) (Damien)
+  - Improved Quicknet Support (Damien)
+  - Improved Video Snapshots saving in png's (Damien)
+  - Support for callto URLs (see FAQ) (Damien)
+  - Support for URLs at startup via a Bonobo Factory (Damien)
+  - Improved LDAP browser usability (Damien)
+  - Added right-click popup menu for video (Damien)
+  - Made Quicknet optional (Damien)
+  - Made SDL optional (Damien, Miguel)
+  - Simplified gconf installation problems detection (Miguel)
+  - Artsd suspend support (Stefan)
+  - Flashing messages in the statusbar (Damien)
+  - Code reorganizations (Kenneth)
+  - Updated translations: German by Stefan Bruns , Spanish by 
+  Jacobo Tarrio , French by Fabrice Alphonso , Galician by Jacobo Tarrio , 
+  Dutch by Huib Kleinhout , Portuguese by Duarte Loreto , 
+  Russian by Leon Kanter , Slovak by Martin Lacko , Swedish by 
+  Christian Rose , Traditional Chinese by Chung-Yen Chang
+
+*gnomemeeting-0.92.1-r1 (07 Jul 2002)
+
+  07 Jul 2002; Gabriele Giorgetti <stroke@gentoo.org> gnomemeeting-0.92.1-r1.ebuild
+    gnome2 eclassed. Updated dependencies. SLOT and LICENSE added.
+
 
 *gnomemeeting-0.92.1 (03 Jul 2002)
 
   03 Jul 2002; Nick Hadaway <raker@gentoo.org> gnomemeeting-0.92.1.ebuild
-  
-  Updated to Gnome2 dependancies.  GnomeMeeting does NOT require the
+    Updated to Gnome2 dependancies.  GnomeMeeting does NOT require the
   whole gnome2 desktop to be installed, just some of the libraries.
diff --git a/net-im/gnomemeeting/Manifest b/net-im/gnomemeeting/Manifest
index d5f52317ef11..080e296e2c79 100644
--- a/net-im/gnomemeeting/Manifest
+++ b/net-im/gnomemeeting/Manifest
@@ -1,11 +1,23 @@
-MD5 8024f335f52c23e64a48fa9947643d6a ChangeLog 4353
-MD5 9125b0114ab29f20517e4d0a4159b464 gnomemeeting-0.94.1.ebuild 2054
-MD5 15ce27e8c51935be2ba7e5ff738b515b gnomemeeting-0.96.0.ebuild 2024
-MD5 1fdaf524c2f0b4538ade1339b56f5c5e gnomemeeting-0.96.1-r1.ebuild 2237
-MD5 ce825d2606f46eb8229491a67f863f57 gnomemeeting-0.96.1.ebuild 2029
-MD5 458cb44a30e47a07c5116219068ab5a3 files/digest-gnomemeeting-0.94.1 72
-MD5 0ebd76f122695483b4073de3a8e7ba89 files/digest-gnomemeeting-0.96.0 72
-MD5 978186afd59d560ab2bba226c2742451 files/ifarts.diff 42145
-MD5 abb5207ac1546a0bb5e8bdefb8755631 files/digest-gnomemeeting-0.96.1 72
-MD5 4ee8954cda5e11a1c1a5345408df45ba files/gnomemeeting-0.96.1-pwcworkaround.patch 612
-MD5 abb5207ac1546a0bb5e8bdefb8755631 files/digest-gnomemeeting-0.96.1-r1 72
+MD5 a90d873b38a939fba966f9b04e58ac42 gnomemeeting-0.98.0.ebuild 1687
+MD5 5e442d151db50f960aa0ed3ef72c081a gnomemeeting-1.00.ebuild 2043
+MD5 eed4f567de688fc863665054fba871e6 metadata.xml 722
+MD5 d677e723fe6195a008184eb578985e2f ChangeLog 10634
+MD5 26eba92c1c989f6ecebf8c0614e0c6da gnomemeeting-1.2.1.ebuild 3020
+MD5 2eca81a5c31cfef1cd02675db4e996c6 gnomemeeting-1.0.2-r1.ebuild 2288
+MD5 600e50cb52f072809c3f46a0fe8d02ed gnomemeeting-0.98.5-r1.ebuild 1860
+MD5 698cb54471981882511cf00e76533a54 gnomemeeting-0.98.5.ebuild 1855
+MD5 9adb1bf9d688e8be734b36bc0e54c110 gnomemeeting-1.0.2.ebuild 2286
+MD5 4a22b08d5bda79ed889cc36d84c08985 gnomemeeting-1.2.2.ebuild 2946
+MD5 99311f0023ae8d29bca828f49a5bb750 files/digest-gnomemeeting-1.0.2-r1 71
+MD5 99311f0023ae8d29bca828f49a5bb750 files/digest-gnomemeeting-1.0.2 71
+MD5 637cd5da4664cab0b50c709e88908a31 files/digest-gnomemeeting-1.2.1 71
+MD5 67fe9473695e53f1d3eb2093e925fa9b files/digest-gnomemeeting-1.00 70
+MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5-r1 73
+MD5 22a027be44dee7bbf4a030a0392bcda8 files/digest-gnomemeeting-1.2.2 71
+MD5 967c15eee4dba436c91d06bda647a525 files/gnomemeeting-0.98.5-libxml_2.6.patch 406
+MD5 c91514d9a4bf338c62c4ef78ddb97553 files/digest-gnomemeeting-0.98.0 73
+MD5 e154855fe35cc7fdcf276eaa2e4f2e4c files/gnomemeeting-1.2.2-dbus.diff 2007
+MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5 73
+MD5 683dfd499a4dd803dd3cb8797a4d0efe files/gnomemeeting-1.2.1-configure.patch 669
+MD5 0c651ec46c87a73e45039d9ab14fddd0 files/gnomemeeting-1.0.2-configure.diff 1304
+MD5 0cc72cbb5df4cb6b2ac1e8d7953f79f0 files/gnomemeeting-1.00-gcc34.patch 892
diff --git a/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.0 b/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.0
index 29df981910a4..4a63d36a3986 100644
--- a/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.0
+++ b/net-im/gnomemeeting/files/digest-gnomemeeting-0.98.0
@@ -1 +1 @@
-MD5 4da5099d044602c712b613c078020bf7 gnomemeeting-0.98.0.tar.gz 2132241
+MD5 c0f81440cfd90ec9aa6be7a4624d37a8 gnomemeeting-0.98.0.tar.bz2 1467399
diff --git a/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff b/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff
index 026d8015bff4..f1a2b76410af 100644
--- a/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff
+++ b/net-im/gnomemeeting/files/gnomemeeting-1.2.2-dbus.diff
@@ -1,92 +1,46 @@
---- gnomemeeting-1.2.2/configure.orig	2005-09-09 20:31:42.000000000 +0000
-+++ gnomemeeting-1.2.2/configure	2005-09-09 20:32:44.000000000 +0000
-@@ -23106,12 +23106,12 @@
-   if test "x$ac_cv_env_DBUS_CFLAGS_set" = "xset"; then
- 	pkg_cv_DBUS_CFLAGS=$ac_cv_env_DBUS_CFLAGS_value
- elif test -n "$PKG_CONFIG"; then
--	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 = 0.22 dbus-glib-1 = 0.22\" >/dev/null 2>&1") >&5
--  ($PKG_CONFIG --exists "dbus-1 = 0.22 dbus-glib-1 = 0.22" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 >= 0.22 dbus-glib-1 >= 0.22\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" >/dev/null 2>&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--		pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 = 0.22 dbus-glib-1 = 0.22" 2>/dev/null`
-+		pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -23129,12 +23129,12 @@
-   if test "x$ac_cv_env_DBUS_LIBS_set" = "xset"; then
- 	pkg_cv_DBUS_LIBS=$ac_cv_env_DBUS_LIBS_value
- elif test -n "$PKG_CONFIG"; then
--	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 = 0.22 dbus-glib-1 = 0.22\" >/dev/null 2>&1") >&5
--  ($PKG_CONFIG --exists "dbus-1 = 0.22 dbus-glib-1 = 0.22" >/dev/null 2>&1) 2>&5
-+	if { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists \"dbus-1 >= 0.22 dbus-glib-1 >= 0.22\" >/dev/null 2>&1") >&5
-+  ($PKG_CONFIG --exists "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" >/dev/null 2>&1) 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--		pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 = 0.22 dbus-glib-1 = 0.22" 2>/dev/null`
-+		pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.22 dbus-glib-1 >= 0.22" 2>/dev/null`
- 	else
- 		pkg_failed=yes
- 	fi
-@@ -23146,18 +23146,18 @@
- echo "${ECHO_T}$pkg_cv_DBUS_LIBS" >&6
- 
- if test $pkg_failed = yes; then
--	DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 = 0.22 dbus-glib-1 = 0.22"`
-+	DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 0.22 dbus-glib-1 >= 0.22"`
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$DBUS_PKG_ERRORS" 1>&5
- 
--	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-1 = 0.22 dbus-glib-1 = 0.22) were not met.
-+	{ { echo "$as_me:$LINENO: error: Package requirements (dbus-1 >= 0.22 dbus-glib-1 >= 0.22) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnomemeeting-1.2.2.orig/Makefile.am gnomemeeting-1.2.2/Makefile.am
+--- gnomemeeting-1.2.2.orig/Makefile.am	2004-12-02 11:45:19.000000000 -0500
++++ gnomemeeting-1.2.2/Makefile.am	2005-09-13 15:54:09.000000000 -0400
+@@ -37,7 +37,8 @@
+ 	gconftool-2 --shutdown
  
- Alternatively you may set the DBUS_CFLAGS and DBUS_LIBS environment variables
- to avoid the need to call pkg-config.  See the pkg-config man page for
- more details." >&5
--echo "$as_me: error: Package requirements (dbus-1 = 0.22 dbus-glib-1 = 0.22) were not met.
-+echo "$as_me: error: Package requirements (dbus-1 >= 0.22 dbus-glib-1 >= 0.22) were not met.
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
+ install-services: gnomemeeting.service
+-	cp gnomemeeting.service $(libdir)/dbus-1.0/services/
++	mkdir -p $(DESTDIR)$(libdir)/dbus-1.0/services/
++	cp gnomemeeting.service $(DESTDIR)$(libdir)/dbus-1.0/services/
  
---- gnomemeeting-1.2.2/configure.in.orig	2005-09-09 20:33:23.000000000 +0000
-+++ gnomemeeting-1.2.2/configure.in	2005-09-09 20:33:38.000000000 +0000
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local: install-schemas 
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnomemeeting-1.2.2.orig/configure.in gnomemeeting-1.2.2/configure.in
+--- gnomemeeting-1.2.2.orig/configure.in	2005-09-05 06:35:30.000000000 -0400
++++ gnomemeeting-1.2.2/configure.in	2005-09-13 15:52:48.000000000 -0400
 @@ -424,7 +424,7 @@
  fi
  
  if test x"${enable_dbus}" = xyes ; then
 -   PKG_CHECK_MODULES(DBUS,  dbus-1 = 0.22 dbus-glib-1 = 0.22)
-+   PKG_CHECK_MODULES(DBUS,  dbus-1 >= 0.22 dbus-glib-1 >= 0.22)
++   PKG_CHECK_MODULES(DBUS,  dbus-1 >= 0.36 dbus-glib-1 >= 0.36)
     GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS $DBUS_CFLAGS -DHAS_DBUS"
     GNOMEMEETING_LIBS="$GNOMEMEETING_LIBS $DBUS_LIBS"
  fi
---- gnomemeeting-1.2.2/Makefile.am.orig	2005-09-09 20:38:42.000000000 +0000
-+++ gnomemeeting-1.2.2/Makefile.am	2005-09-09 20:38:55.000000000 +0000
-@@ -37,7 +37,7 @@
- 	gconftool-2 --shutdown
- 
- install-services: gnomemeeting.service
--	cp gnomemeeting.service $(libdir)/dbus-1.0/services/
-+	cp gnomemeeting.service $(DESTDIR)$(libdir)/dbus-1.0/services/
- 
- if GCONF_SCHEMAS_INSTALL
- install-data-local: install-schemas 
---- gnomemeeting-1.2.2/Makefile.in.orig	2005-09-09 20:37:49.000000000 +0000
-+++ gnomemeeting-1.2.2/Makefile.in	2005-09-09 20:38:30.000000000 +0000
-@@ -702,7 +702,10 @@
- 	gconftool-2 --shutdown
- 
- install-services: gnomemeeting.service
--	cp gnomemeeting.service $(libdir)/dbus-1.0/services/
-+	if [ ! -d $(DESTDIR)$(libdir)/dbus-1.0/services ]; then \
-+		mkdir -m755 -p $(DESTDIR)$(libdir)/dbus-1.0/services ; \
-+	fi
-+	cp gnomemeeting.service $(DESTDIR)$(libdir)/dbus-1.0/services/
+diff --exclude-from=/home/dang/.diffrc -u -ruN gnomemeeting-1.2.2.orig/src/dbus_component.cpp gnomemeeting-1.2.2/src/dbus_component.cpp
+--- gnomemeeting-1.2.2.orig/src/dbus_component.cpp	2005-04-06 16:10:34.000000000 -0400
++++ gnomemeeting-1.2.2/src/dbus_component.cpp	2005-09-13 15:52:48.000000000 -0400
+@@ -346,7 +346,7 @@
+     
+     if (self->owns_the_service == FALSE)
+       self->owns_the_service 
+-	= (dbus_bus_acquire_service (self->connection, 
++	= (dbus_bus_request_name (self->connection, 
+ 				     GM_DBUS_SERVICE, 0, NULL) >= 0);
+     
+  
+@@ -465,7 +465,7 @@
+ 			DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+ 
+   if (dbus_message_is_signal (message,
+-                              DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
++                              DBUS_INTERFACE_LOCAL,
+                               "Disconnected"))
+     {
  
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local: install-schemas 
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
index 07e93bbba514..84d4c0de9212 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild
@@ -1,35 +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/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.1 2003/06/27 12:29:59 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.0.ebuild,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
 
-IUSE="sdl ssl ipv6 gnome"
+IUSE="sdl ssl ipv6"
 
-inherit gnome2
+inherit gnome.org gnome2
 
-SRC_URI="http://www.gnomemeeting.org/downloads/latest/sources/${P}.tar.gz"
 HOMEPAGE="http://www.gnomemeeting.org"
 DESCRIPTION="Gnome NetMeeting client"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 ppc -sparc"
 
 DEPEND=">=dev-libs/pwlib-1.5.0
 	>=net-libs/openh323-1.12.0
 	>=net-nds/openldap-2.0.25
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	sdl? ( >=media-libs/libsdl-1.2.4 )
-    gnome? ( >=gnome-base/libbonoboui-2.0
-    	>=gnome-base/libbonobo-2.0
-    	>=gnome-base/libgnomeui-2.0
-        >=gnome-base/libgnome-2.0
-		>=net-libs/linc-0.5.0 )
+	>=gnome-base/libbonoboui-2.0
+	>=gnome-base/libbonobo-2.0
+	>=gnome-base/libgnomeui-2.0
+	>=gnome-base/libgnome-2.0
+	>=net-libs/linc-0.5.0
 	>=x11-libs/gtk+-2.0.0
-	>=dev-libs/glib-2.0.0    
+	>=dev-libs/glib-2.0.0
 	>=gnome-base/gconf-2.0
 	>=dev-libs/libxml2-2.4.23
-	>=media-sound/esound-0.2.28 
-    >=gnome-base/ORBit2-2.5.0"
+	>=media-sound/esound-0.2.28
+	>=gnome-base/orbit-2.5.0"
 
 RDEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -41,33 +40,27 @@ MAKEOPTS="${MAKEOPTS} -j1"
 src_compile() {
 
 	local myconf
-    
-    myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
-    myconf="${myconf} --with-ptlib-libs=/usr/lib"
-    myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
-    myconf="${myconf} --with-openh323-libs=/usr/lib"
-    
-    if [ -n "`use ssl`" ]; then
+
+	myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib"
+	myconf="${myconf} --with-ptlib-libs=/usr/lib"
+	myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
+	myconf="${myconf} --with-openh323-libs=/usr/lib"
+
+	if use ssl; then
 		myconf="${myconf} --with-openssl-libs=/usr/lib"
 		myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
-    fi
-    
+	fi
+
 	use sdl \
 		&& myconf="${myconf} --with-sdl-prefix=/usr" \
 		|| myconf="${myconf} --disable-sdltest"
-		
+
 	use ipv6 \
 		&& myconf="${myconf} --enable-ipv6" \
-    	|| myconf="${myconf} --disable-ipv6"
+		|| myconf="${myconf} --disable-ipv6"
 
-	use gnome || myconf="${myconf} --disable-gnome"
-        
-    econf ${myconf} || die "configure failed"
+	econf ${myconf} || die "configure failed"
 	emake || die
 }
 
 DOCS="AUTHORS ChangeLog COPYING README INSTALL NEWS FAQ TODO"
-G2CONF="${G2CONF} --enable-platform-gnome-2"
-SCHEMAS="gnomemeeting.schema"
-	
-															
diff --git a/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild b/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
index 90029b5d5c81..c559f9e18c70 100644
--- a/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-0.98.5.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/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild,v 1.1 2003/09/16 15:02:27 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-0.98.5.ebuild,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome NetMeeting client"
 HOMEPAGE="http://www.gnomemeeting.org"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnomemeeting.org"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc -sparc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE="sdl ssl ipv6"
 
 DEPEND=">=dev-libs/pwlib-1.5.0
@@ -27,9 +27,9 @@ DEPEND=">=dev-libs/pwlib-1.5.0
 	>=x11-libs/gtk+-2.0.0
 	>=dev-libs/glib-2.0.0
 	>=gnome-base/gconf-2.0
-	>=dev-libs/libxml2-2.5.11
+	>=dev-libs/libxml2-2.6.1
 	>=media-sound/esound-0.2.28
-	>=gnome-base/ORBit2-2.5.0"
+	>=gnome-base/orbit-2.5.0"
 
 RDEPEND="${DEPEND}
 	>=dev-util/pkgconfig-0.12.0
@@ -38,6 +38,11 @@ RDEPEND="${DEPEND}
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-libxml_2.6.patch
+}
+
 src_compile() {
 
 	local myconf
@@ -47,7 +52,7 @@ src_compile() {
 	myconf="${myconf} --with-openh323-includes=/usr/include/openh323"
 	myconf="${myconf} --with-openh323-libs=/usr/lib"
 
-	if [ -n "`use ssl`" ]; then
+	if use ssl; then
 		myconf="${myconf} --with-openssl-libs=/usr/lib"
 		myconf="${myconf} --with-openssl-includes=/usr/include/openssl"
 	fi
diff --git a/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild b/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild
index 35a16e0d5612..4e09c2dbef55 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-1.0.2-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/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild,v 1.1 2004/12/22 02:45:46 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.0.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild b/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild
index f6a590747d27..cd8ccb379a8c 100644
--- a/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild
+++ b/net-im/gnomemeeting/gnomemeeting-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/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild,v 1.1 2005/09/12 20:11:10 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
 
 inherit gnome2 eutils flag-o-matic
 
@@ -39,6 +39,9 @@ DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.12.0
 	>=dev-util/intltool-0.20
 	dev-lang/perl
+	dev-perl/XML-Parser
+	>=sys-devel/automake-1.7
+	sys-devel/autoconf
 	gnome? ( app-text/scrollkeeper )"
 
 src_unpack() {
@@ -50,6 +53,8 @@ src_unpack() {
 
 	# Relax dbus version check and fix installation of service file
 	epatch ${FILESDIR}/${PN}-1.2.2-dbus.diff
+	WANT_AUTOMAKE=1.7 automake || die
+	autoconf || die
 }
 
 src_compile() {
diff --git a/net-im/gnugadu/ChangeLog b/net-im/gnugadu/ChangeLog
index 08f8befdd693..74b95764b5c1 100644
--- a/net-im/gnugadu/ChangeLog
+++ b/net-im/gnugadu/ChangeLog
@@ -1,6 +1,177 @@
 # ChangeLog for net-im/gnugadu
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/ChangeLog,v 1.1 2004/02/07 11:30:46 spock Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/ChangeLog,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
+
+*gnugadu-2.2.8 (23 Oct 2005)
+
+  23 Oct 2005; Michał Januszewski <spock@gentoo.org> +gnugadu-2.2.8.ebuild:
+  Version bump.
+
+  22 Jul 2005; <sekretarz@gentoo.org> gnugadu-2.2.6-r1.ebuild:
+  Stable on x86 due security bug #99816
+
+  21 Jul 2005; <sekretarz@gentoo.org> gnugadu-2.2.6-r1.ebuild:
+  Added gnutls USE flag, bug #94277
+
+*gnugadu-2.2.6-r1 (21 Jul 2005)
+
+  21 Jul 2005; <sekretarz@gentoo.org> +gnugadu-2.2.6-r1.ebuild:
+  Forced gnugadu to use external gg lib, because internal one has security
+  holes. Added net-libs/libgadu to DEPEND. bug #99816
+
+  07 Jul 2005; Michał Januszewski <spock@gentoo.org> gnugadu-2.2.6.ebuild:
+  Marked stable on x86.
+
+*gnugadu-2.2.6 (27 May 2005)
+
+  27 May 2005; Michał Januszewski <spock@gentoo.org> gnugadu-2.2.5.ebuild,
+  +gnugadu-2.2.6.ebuild:
+  Version bump. Marked 2.2.5 stable on x86.
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org> gnugadu-2.2.5.ebuild:
+  Added ~sparc keyword.
+
+  01 Apr 2005; Michał Januszewski <spock@gentoo.org> -gnugadu-2.2.2.ebuild,
+  -gnugadu-2.2.3.ebuild:
+  Removed old ebuilds.
+
+*gnugadu-2.2.5 (01 Apr 2005)
+
+  01 Apr 2005; Michał Januszewski <spock@gentoo.org> +gnugadu-2.2.5.ebuild:
+  Version bump.
+
+  13 Jan 2005; Michal Januszewski <spock@gentoo.org> gnugadu-2.2.4.ebuild:
+  Added installation of gg2.desktop into /usr/share/applications.
+
+  12 Jan 2005; Michal Januszewski <spock@gentoo.org> gnugadu-2.2.2.ebuild,
+  gnugadu-2.2.3.ebuild, gnugadu-2.2.4.ebuild:
+  Marked stable on x86.
+
+*gnugadu-2.2.4 (08 Jan 2005)
+
+  08 Jan 2005; Michal Januszewski <spock@gentoo.org> -gnugadu-2.2.0.ebuild,
+  -gnugadu-2.2.1.ebuild, +gnugadu-2.2.4.ebuild:
+  Version bump. Removed old ebuilds.
+
+*gnugadu-2.2.3 (20 Nov 2004)
+
+  20 Nov 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.2.3.ebuild:
+  Version bump.
+
+*gnugadu-2.2.2 (06 Nov 2004)
+
+  06 Nov 2004; Michal Januszewski <spock@gentoo.org> -gnugadu-2.0.5.ebuild,
+  -gnugadu-2.0.6.ebuild, +gnugadu-2.2.2.ebuild:
+  Version bump, closes #70234. Removed old ebuilds.
+
+  24 Oct 2004; Karol Wojtaszek,,, <sekretarz@gentoo.org>
+  gnugadu-2.2.1.ebuild:
+  Added ~amd64
+
+*gnugadu-2.2.1 (23 Oct 2004)
+
+  23 Oct 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.2.1.ebuild:
+  Version bump.
+
+  21 Oct 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.2.0.ebuild:
+  Fixed loudmouth dep.
+
+*gnugadu-2.2.0 (21 Oct 2004)
+
+  21 Oct 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.2.0.ebuild:
+  Version bump.
+
+  15 Oct 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.5.ebuild,
+  gnugadu-2.0.6.ebuild:
+  Changed --with-spell to use_with.. Closes bug #61430.
+
+  02 Oct 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.5.ebuild,
+  gnugadu-2.0.6.ebuild:
+  Added app-text/gtkspell to DEPEND. Thanks to Majestic for the suggestion.
+
+*gnugadu-2.0.6 (08 Sep 2004)
+
+  08 Sep 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.0.6.ebuild:
+  Version bump.
+
+  23 Aug 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.5.ebuild:
+  Changed the GTK+ dep to >= gtk-2.4.0 to match the one specified in the
+  program's ChangeLog.
+
+*gnugadu-2.0.5 (23 Aug 2004)
+
+  23 Aug 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.0.5.ebuild:
+  Version bump.
+
+  21 Aug 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.4.ebuild:
+  Added support for history. Closed bug #60404.
+
+*gnugadu-2.0.4 (05 Aug 2004)
+
+  05 Aug 2004; Michal Januszewski <spock@gentoo.org> -gnugadu-2.0.1.ebuild,
+  -gnugadu-2.0.2.ebuild, -gnugadu-2.0.3.ebuild, +gnugadu-2.0.4.ebuild,
+  -gnugadu-2.0.ebuild:
+  Version bump, removed old ebuilds.
+
+*gnugadu-2.0.3-r1 (03 Jul 2004)
+
+  03 Jul 2004; Michal Januszewski <spock@gentoo.org>
+  +files/gnugadu-2.0.3-aspell-link.patch, +gnugadu-2.0.3-r1.ebuild:
+  Included a fix for aspell. Gnugadu can now be compiled with gtkspell support,
+  if the 'spell' USE flag is set. Thanks to Azarah for the patch.
+
+  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> gnugadu-2.0.1.ebuild,
+  gnugadu-2.0.2.ebuild, gnugadu-2.0.3.ebuild, gnugadu-2.0.ebuild:
+  fix use invocation
+
+  27 Jun 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.1.ebuild,
+  gnugadu-2.0.2.ebuild, gnugadu-2.0.3.ebuild, gnugadu-2.0.ebuild:
+  Fixed broken arts support. This closes bug #55161. Thanks to Marcin Kryczek
+  for the fix.
+
+*gnugadu-2.0.3 (12 Jun 2004)
+
+  12 Jun 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.0.3.ebuild:
+  Version bump.
+
+*gnugadu-2.0.2 (09 May 2004)
+
+  09 May 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.0.2.ebuild:
+  Version bump.
+
+  26 Apr 2004; David Holm <dholm@gentoo.org> gnugadu-2.0.1.ebuild:
+  Added to ~ppc.
+
+*gnugadu-2.0.1 (25 Apr 2004)
+
+  25 Apr 2004; Michal Januszewski <spock@gentoo.org> +gnugadu-2.0.1.ebuild,
+  gnugadu-2.0.ebuild:
+  Version bump.
+
+  07 Apr 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.ebuild:
+  Dropping gtkspell support because gnugadu works only with gtkspell-2.0.2.
+
+*gnugadu-2.0 (04 Apr 2004)
+
+  04 Apr 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0.ebuild:
+  Version bump.
+
+  17 Mar 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0_pre8.ebuild:
+  Added full spell-checking support, thanks to MadeJ <madej@afn.no-ip.org>
+  for his comments on gtkspell.
+
+  17 Mar 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0_pre8.ebuild:
+  Fixed Perl support, added preliminary support for gtkspell.
+
+*gnugadu-2.0_pre8 (17 Mar 2004)
+
+  17 Mar 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0_pre8.ebuild:
+  Version bump, closes bug #44754.
+
+*gnugadu-2.0_pre7 (02 Mar 2004)
+
+  02 Mar 2004; Michal Januszewski <spock@gentoo.org> gnugadu-2.0_pre7.ebuild:
+  Version bump, updated ebuild submitted by MadeJ <madej@afn.no-ip.org>.
 
 *gnugadu-2.0_pre6 (07 Feb 2004)
 
diff --git a/net-im/gnugadu/Manifest b/net-im/gnugadu/Manifest
index 8d63bfeba84b..ef00f666e870 100644
--- a/net-im/gnugadu/Manifest
+++ b/net-im/gnugadu/Manifest
@@ -1,4 +1,22 @@
-MD5 04c375152de7139ace81ad43c46ce6c5 gnugadu-2.0_pre6.ebuild 1256
-MD5 41f572044d4439e293ac3527c86442e5 ChangeLog 434
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5a84ebdc8e1f7b3574ad3dd615c8770d gnugadu-2.2.8.ebuild 1788
+MD5 12c0a7540f3fe441cec4f73e7fc35a9d gnugadu-2.2.5.ebuild 1676
+MD5 cf7004c50488eb9542028b1d9f65e2ba gnugadu-2.2.6-r1.ebuild 1794
+MD5 b902d9ba834f78dec76da1607df01e73 gnugadu-2.2.4.ebuild 1669
+MD5 125e1f4323fbca7015f2a0cb57249ddd ChangeLog 6064
+MD5 d3a8cf5ea9d347cf08384961a6d63872 gnugadu-2.2.6.ebuild 1676
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
-MD5 baa3a461b1bc11936966878547fb5233 files/digest-gnugadu-2.0_pre6 64
+MD5 c4f50a14397cc53dd6d4522dc9acae7f files/digest-gnugadu-2.2.4 62
+MD5 030cb19dc0f02935c02d14d07642d160 files/digest-gnugadu-2.2.5 62
+MD5 8ed4cad39d0d407c3a96a3d76f18b0d2 files/digest-gnugadu-2.2.6 62
+MD5 12bb70ec4d83ea5109f098bcb96c9c98 files/digest-gnugadu-2.2.8 62
+MD5 8ed4cad39d0d407c3a96a3d76f18b0d2 files/digest-gnugadu-2.2.6-r1 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDW5rhchej4aZK9/cRAqc9AJ9evfeY18nIemNswP9sXSh5Zx1/bwCfbw/r
+VN6dmnIgXIAG5Gh7k4Nv95Y=
+=vC7b
+-----END PGP SIGNATURE-----
diff --git a/net-im/gnugadu/gnugadu-2.2.4.ebuild b/net-im/gnugadu/gnugadu-2.2.4.ebuild
index cd5e6c056a91..2012daa88fad 100644
--- a/net-im/gnugadu/gnugadu-2.2.4.ebuild
+++ b/net-im/gnugadu/gnugadu-2.2.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/net-im/gnugadu/gnugadu-2.2.4.ebuild,v 1.1 2005/01/08 12:53:06 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/gnugadu-2.2.4.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 IUSE="debug tlen esd oss xosd arts jabber perl spell"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gadu.gnu.pl/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 DEPEND=">=x11-libs/gtk+-2.4.0
 	sys-devel/gettext
@@ -59,6 +59,8 @@ src_compile() {
 src_install () {
 
 	make DESTDIR=${D} install || die
+	insinto /usr/share/applications
+	doins gg2.desktop
 	dodoc AUTHORS ChangeLog NEWS README TODO
 }
 
diff --git a/net-im/gnugadu/gnugadu-2.2.5.ebuild b/net-im/gnugadu/gnugadu-2.2.5.ebuild
index 7fa87df5a2b1..16ec08f49e23 100644
--- a/net-im/gnugadu/gnugadu-2.2.5.ebuild
+++ b/net-im/gnugadu/gnugadu-2.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/net-im/gnugadu/gnugadu-2.2.5.ebuild,v 1.1 2005/04/01 19:35:25 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/gnugadu-2.2.5.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 IUSE="debug tlen esd oss xosd arts jabber perl spell"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gadu.gnu.pl/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 
 DEPEND=">=x11-libs/gtk+-2.4.0
 	sys-devel/gettext
diff --git a/net-im/gnugadu/gnugadu-2.2.6-r1.ebuild b/net-im/gnugadu/gnugadu-2.2.6-r1.ebuild
index 242e3d8b5f24..2091c5c30478 100644
--- a/net-im/gnugadu/gnugadu-2.2.6-r1.ebuild
+++ b/net-im/gnugadu/gnugadu-2.2.6-r1.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/net-im/gnugadu/gnugadu-2.2.6-r1.ebuild,v 1.1 2005/07/21 18:30:05 sekretarz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/gnugadu-2.2.6-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
-IUSE="debug tlen esd oss xosd arts jabber perl spell"
+IUSE="debug tlen esd oss xosd arts jabber perl spell gnutls"
 
 inherit eutils
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gadu.gnu.pl/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="~amd64 ~ppc ~sparc x86"
 
 DEPEND=">=net-libs/libgadu-20050719
 	>=x11-libs/gtk+-2.4.0
@@ -27,7 +27,8 @@ DEPEND=">=net-libs/libgadu-20050719
 	arts? ( >=kde-base/arts-0.9.5 )
 	esd? ( media-sound/esound )
 	tlen? ( net-libs/libtlen )
-	spell? ( app-text/gtkspell )"
+	spell? ( app-text/gtkspell )
+	gnutls? ( net-libs/gnutls )"
 
 src_unpack() {
 	unpack ${A}
@@ -53,7 +54,8 @@ src_compile() {
 		`use_with perl` \
 		`use_with tlen` \
 		`use_with jabber` \
-		`use_with spell gtkspell` || die
+		`use_with spell gtkspell` \
+		`use_with gnutls` || die
 	emake || die
 }
 
diff --git a/net-im/gnugadu/gnugadu-2.2.6.ebuild b/net-im/gnugadu/gnugadu-2.2.6.ebuild
index 43dfcf0081c2..7e36bcb621f4 100644
--- a/net-im/gnugadu/gnugadu-2.2.6.ebuild
+++ b/net-im/gnugadu/gnugadu-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/net-im/gnugadu/gnugadu-2.2.6.ebuild,v 1.1 2005/05/27 19:17:03 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/gnugadu-2.2.6.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 IUSE="debug tlen esd oss xosd arts jabber perl spell"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://gadu.gnu.pl/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 
 DEPEND=">=x11-libs/gtk+-2.4.0
 	sys-devel/gettext
diff --git a/net-im/gnugadu/gnugadu-2.2.8.ebuild b/net-im/gnugadu/gnugadu-2.2.8.ebuild
index 5a879d30b9cb..55acc764d61a 100644
--- a/net-im/gnugadu/gnugadu-2.2.8.ebuild
+++ b/net-im/gnugadu/gnugadu-2.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/net-im/gnugadu/gnugadu-2.2.8.ebuild,v 1.1 2005/10/23 14:14:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gnugadu/gnugadu-2.2.8.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 IUSE="debug tlen esd oss xosd arts jabber perl spell gnutls"
 
diff --git a/net-im/gossip/ChangeLog b/net-im/gossip/ChangeLog
index 1c2dd0f6bd86..01ac699d4ad5 100644
--- a/net-im/gossip/ChangeLog
+++ b/net-im/gossip/ChangeLog
@@ -1,6 +1,131 @@
 # ChangeLog for net-im/gossip
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/ChangeLog,v 1.1 2003/07/26 19:25:31 foser Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
+
+*gossip-0.9 (16 Aug 2005)
+
+  16 Aug 2005; Marinus Schraal <foser@gentoo.org> gossip-0.9.ebuild :
+  New release
+
+  19 Jul 2005; Olivier Crête <tester@gentoo.org> gossip-0.8.ebuild:
+  Marking amd64 (it is as stable as on x86)
+
+  27 May 2005; foser <foser@gentoo.org> gossip-0.8.ebuild :
+  Fix Xss configure check (#77241(
+
+  02 May 2005; Jason Wever <weeve@gentoo.org> gossip-0.8.ebuild:
+  Stable on SPARC.
+
+  30 Apr 2005; Spider <spider@gentoo.org> gossip-0.8.ebuild:
+  Stable x86 following loudmouth and gnutls
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org> gossip-0.7.8.ebuild:
+  Stable on SPARC.
+
+*gossip-0.8 (08 Jan 2005)
+
+  08 Jan 2005; foser <foser@gentoo.org> gossip-0.8.ebuild :
+  New release (#76125)
+
+  10 Oct 2004; Jason Wever <weeve@gentoo.org> gossip-0.7.8.ebuild:
+  Added ~sparc keyword wrt bug #53667.
+
+  06 Oct 2004; Olivier Crete <tester@gentoo.org> gossip-0.7.6.ebuild:
+  Fix incorrect gtk/glib/gnome-vfs deps
+
+  03 Sep 2004; Tom Martin <slarti@gentoo.org> gossip-0.7.8.ebuild:
+  Marked ~amd64, resolves bug 58323. Thanks to Joe Seeder <seeder@pf.pl> for
+  reporting.
+
+*gossip-0.7.8 (03 Sep 2004)
+
+  03 Sep 2004; <spider@gentoo.org> +gossip-0.7.8.ebuild:
+  New version, new dependencies. Lost ~sparc along the way due to
+  desktop-file-utils dependency.
+
+  03 Sep 2004; <spider@gentoo.org> gossip-0.7.6.ebuild:
+  stable on x86
+
+*gossip-0.7.6-r1 02 Sep 2004
+
+  02 Sep 2004; Spider <spider@gentoo.org> 
+  # INSERT ENTRY HERE
+
+*gossip-0.7.6 (12 Aug 2004)
+
+  12 Aug 2004; Tom Martin <slarti@gentoo.org> gossip-0.7.6.ebuild:
+  Marked ~amd64. Resolves bug 58273. Thanks to Joe Seeder <seeder@pf.lj> for
+  reporting.
+
+*gossip-0.7.5 (21 May 2004)
+
+  21 May 2004; Yi Qiang <khai@gentoo.org> +gossip-0.7.5.ebuild:
+  Version bump
+
+  21 May 2004; Yi Qiang <khai@gentoo.org> gossip-0.6-r1.ebuild,
+  gossip-0.6.ebuild, gossip-0.7.2.ebuild, gossip-0.7.4.ebuild:
+  Fixed HOMEPAGE 
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> gossip-0.6-r1.ebuild:
+  Add inherit eutils
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> gossip-0.7.4.ebuild:
+  Added to ~ppc.
+
+*gossip-0.7.4 (07 Apr 2004)
+
+  07 Apr 2004; foser <foser@gentoo.org> gossip-0.7.4.ebuild :
+  New release (#46717)
+
+  29 Feb 2004; Jason Wever <weeve@gentoo.org> gossip-0.7.2.ebuild:
+  It's been a hard day's night, and I've been ~sparc'in like a dog.
+
+*gossip-0.7.2 (11 Feb 2004)
+
+  11 Feb 2004; foser <foser@gentoo.org> gossip-0.7.2.ebuild :
+  New release (#41199)
+  Fix intltool dep cause of parser issues
+  Disable experimental dbus interface by default
+
+*gossip-0.7.1-r1 (06 Feb 2004)
+
+  06 Feb 2004; <spider@gentoo.org> gossip-0.7.1-r1.ebuild:
+  revisionbump with a hard dep on the new loudmouth, so things dont break if
+  somone updates loudmouth + gnutls (you have to rebuild gossip in that case)
+
+*gossip-0.7.1 (03 Feb 2004)
+
+  03 Feb 2004; <spider@gentoo.org> gossip-0.7.1.ebuild:
+  Versionbump
+
+*gossip-0.7 (22 Jan 2004)
+
+  22 Jan 2004; <spider@gentoo.org> gossip-0.7.ebuild:
+  Homepage update, remove now unnecessary intltool fixes + patch.
+
+  30 Dec 2003; foser <foser@gentoo.org> metadata.xml :
+  remove spider as maintainer, covered by gnome herd
+
+*gossip-0.6-r1 (07 Dec 2003)
+
+  07 Dec 2003; <spider@gentoo.org> gossip-0.6-r1.ebuild,
+  files/gossip-0.6-click.patch:
+  Added a patch that will stop gossip from crashing when you tripple or
+  quadruple click on the notification area icon
+  See http://bugzilla.gnome.org/show_bug.cgi?id=128730
+
+  07 Dec 2003; <spider@gentoo.org> gossip-0.6.ebuild:
+  Bumping to stable x86
+
+*gossip-0.6 (18 Nov 2003)
+
+  18 Nov 2003; <spider@gentoo.org> gossip-0.6.ebuild:
+  Updated build, fix for intltool-merge , updated deps
+
+*gossip-0.5 (18 Aug 2003)
+
+  18 Aug 2003; foser <foser@gentoo.org> gossip-0.5.ebuild :
+  New version, updated deps
 
 *gossip-0.4 (26 Jul 2003)
 
diff --git a/net-im/gossip/Manifest b/net-im/gossip/Manifest
index 8e3b6f22ad57..bd05f3c375aa 100644
--- a/net-im/gossip/Manifest
+++ b/net-im/gossip/Manifest
@@ -1,6 +1,11 @@
-MD5 d41d8cd98f00b204e9800998ecf8427e 0 0
-MD5 d41d8cd98f00b204e9800998ecf8427e 1 0
-MD5 3e92ef73af84dcd80f7eeef8c1059756 gossip-0.4.ebuild 576
-MD5 0bd83d2f57e3c4dfd7ea15bbe1ca90de ChangeLog 291
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d7e215724acc5309680b5df316c18cc1 files/digest-gossip-0.4 63
+MD5 9629b65413873bf3701936c9601cfc82 gossip-0.7.6.ebuild 850
+MD5 437d9a126a558753c5c800a575c64c6d gossip-0.7.8.ebuild 894
+MD5 906e2ab1e943b7cd601677dfe1e1b405 gossip-0.9.ebuild 870
+MD5 82b9d7296670f18ad728682fe64f8d66 gossip-0.8.ebuild 974
+MD5 a2849be2191170f3086c6c5c95093add ChangeLog 4118
+MD5 9a9ed8f43621c860f0323fcd365a2dbf metadata.xml 271
+MD5 8f16fde24fd9fe4c80d9aa70a0674dec files/digest-gossip-0.8 63
+MD5 3db79d8ff10d29aaa94dbc80cb13a37b files/digest-gossip-0.9 63
+MD5 4050efbfb3d0d651099c4786b55eed9d files/digest-gossip-0.7.6 65
+MD5 8306015f92ba6d545883f19eaf3baa4d files/digest-gossip-0.7.8 65
+MD5 4d6353e147a3018802c29a0de9fc5c17 files/gossip-0.8-find_xss.patch 491
diff --git a/net-im/gossip/gossip-0.7.6.ebuild b/net-im/gossip/gossip-0.7.6.ebuild
index fa0c330bcd20..a8a5a0fc3d0c 100644
--- a/net-im/gossip/gossip-0.7.6.ebuild
+++ b/net-im/gossip/gossip-0.7.6.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/net-im/gossip/gossip-0.7.6.ebuild,v 1.1 2004/07/28 18:50:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/gossip-0.7.6.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,16 +9,17 @@ HOMEPAGE="http://gossip.imendio.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="x86 ~sparc ~ppc"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=x11-libs/gtk+-2.0.4
+RDEPEND=">=dev-libs/glib-2.4.0
+	>=x11-libs/gtk+-2.4.0
 	>=gnome-base/libglade-2
 	>=gnome-base/gconf-1.2
 	>=dev-libs/libxml2-2.4.7
 	>=dev-libs/libxslt-1
 	>=gnome-base/libgnomeui-2
+	>=gnome-base/gnome-vfs-2
 	>=net-libs/loudmouth-0.15.1"
 
 DEPEND="${RDEPEND}
diff --git a/net-im/gossip/gossip-0.7.8.ebuild b/net-im/gossip/gossip-0.7.8.ebuild
index 3a3f1e36296f..e1a3f758732b 100644
--- a/net-im/gossip/gossip-0.7.8.ebuild
+++ b/net-im/gossip/gossip-0.7.8.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/net-im/gossip/gossip-0.7.8.ebuild,v 1.1 2004/09/02 22:55:24 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/gossip-0.7.8.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://gossip.imendio.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64 sparc"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4.0
diff --git a/net-im/gossip/gossip-0.8.ebuild b/net-im/gossip/gossip-0.8.ebuild
index 1374f66a3724..edcf010fe053 100644
--- a/net-im/gossip/gossip-0.8.ebuild
+++ b/net-im/gossip/gossip-0.8.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/gossip-0.8.ebuild,v 1.1 2005/01/08 15:21:20 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/gossip-0.8.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Lightweight Jabber client for GNOME"
 HOMEPAGE="http://gossip.imendio.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="amd64 ~ppc sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.4
@@ -32,3 +32,14 @@ G2CONF="${G2CONF} --disable-dbus"
 DOCS="AUTHORS README COPYING ChangeLog INSTALL NEWS README"
 
 USE_DESTDIR="1"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-find_xss.patch
+
+	autoconf || die
+
+}
diff --git a/net-im/gossip/gossip-0.9.ebuild b/net-im/gossip/gossip-0.9.ebuild
index 23b98fb2608c..0c3ccded6fc7 100644
--- a/net-im/gossip/gossip-0.9.ebuild
+++ b/net-im/gossip/gossip-0.9.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/net-im/gossip/gossip-0.9.ebuild,v 1.1 2005/08/16 13:45:23 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gossip/gossip-0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/gossip/metadata.xml b/net-im/gossip/metadata.xml
index da6fd63d0085..57e60bceca1a 100644
--- a/net-im/gossip/metadata.xml
+++ b/net-im/gossip/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<longdescription>
+Gossip is a Gnome integrated and HIG compliant jabber messaging client.    
+</longdescription>
 </pkgmetadata>
diff --git a/net-im/gtalk/ChangeLog b/net-im/gtalk/ChangeLog
index 4400e12fae06..e89e8d0c9280 100644
--- a/net-im/gtalk/ChangeLog
+++ b/net-im/gtalk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-im/gtalk
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gtalk/ChangeLog,v 1.1 2004/01/04 11:55:30 aliz Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gtalk/ChangeLog,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> gtalk-0.99.10.ebuild:
+  virtual/glibc -> virtual/libc
 
 *gtalk-0.99.10 (04 Jan 2004)
 
diff --git a/net-im/gtalk/Manifest b/net-im/gtalk/Manifest
index 88584a27e241..c917be494417 100644
--- a/net-im/gtalk/Manifest
+++ b/net-im/gtalk/Manifest
@@ -1,2 +1,3 @@
-MD5 3c04cadee07bf9afd05ce5cf58b26e13 gtalk-0.99.10.ebuild 1296
+MD5 9f09c3039b940beef91e59bea29a797e ChangeLog 495
+MD5 947333f104fc80dc0e405d441ea4c51b gtalk-0.99.10.ebuild 1386
 MD5 786daa1beae2f9ba93539bb7585f5d69 files/digest-gtalk-0.99.10 65
diff --git a/net-im/gtalk/gtalk-0.99.10.ebuild b/net-im/gtalk/gtalk-0.99.10.ebuild
index 2ed32572662c..e1d5b70936c9 100644
--- a/net-im/gtalk/gtalk-0.99.10.ebuild
+++ b/net-im/gtalk/gtalk-0.99.10.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/net-im/gtalk/gtalk-0.99.10.ebuild,v 1.1 2004/01/04 11:55:30 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gtalk/gtalk-0.99.10.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
 inherit elisp
 
@@ -12,7 +12,7 @@ KEYWORDS="~x86 ~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	ncurses? ( >=sys-libs/ncurses-5.2 )
 	gtk? ( =x11-libs/gtk+-1* )
 	X? ( virtual/x11 )"
diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index 797baba321aa..db312bf002d4 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,6 +1,268 @@
 # ChangeLog for net-im/jabberd
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.1 2004/01/12 00:04:44 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
+
+  23 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r5.ebuild, jabberd-2.0.9.ebuild:
+  QA issue #103421
+
+  07 Aug 2005; Wolfram Schlich <wschlich@gentoo.org>
+  -files/jabberd-2.0.8-r2-FindBin.patch, -jabberd-2.0.8-r2.ebuild:
+  remove vulnerable version (SA16291)
+
+*jabberd-2.0.9 (07 Aug 2005)
+
+  07 Aug 2005; Wolfram Schlich <wschlich@gentoo.org> +jabberd-2.0.9.ebuild:
+  version bump due to security fix (SA16291)
+
+  08 Jul 2005; Wolfram Schlich <wschlich@gentoo.org>
+  jabberd-2.0.8-r2.ebuild:
+  fix patch filename
+
+*jabberd-2.0.8-r2 (08 Jul 2005)
+
+  08 Jul 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/jabberd-2.0.8-r2-FindBin.patch, -files/jabberd-2.0s8-FindBin.patch,
+  -jabberd-2.0-r2.ebuild, -jabberd-2.0.8-r1.ebuild,
+  +jabberd-2.0.8-r2.ebuild, -jabberd-2.0.8.ebuild,
+  -jabberd-2.0_p20050119.ebuild:
+  fix FindBin patch, remove old versions
+
+*jabberd-2.0.8-r1 (13 Jun 2005)
+
+  13 Jun 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/jabberd-2.0s8-FindBin.patch, +jabberd-2.0.8-r1.ebuild:
+  fix FindBin issue
+
+  24 May 2005; Jason Wever <weeve@gentoo.org> jabberd-1.4.3-r5.ebuild:
+  Stable on SPARC wrt security bug #91478.
+
+  22 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  jabberd-1.4.3-r5.ebuild:
+  Stable on hppa; bug #91478
+
+*jabberd-1.4.3-r5 (21 May 2005)
+
+  21 May 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/jabber.rc6-r8, +jabberd-1.4.3-r5.ebuild:
+  New revision to help solve a small sec problem.
+
+*jabberd-2.0.8 (28 Apr 2005)
+
+  28 Apr 2005; Wolfram Schlich <wschlich@gentoo.org>
+  +files/self-cert.jabberd-2.sh, +jabberd-2.0.8.ebuild:
+  add jabberd2 specific self-cert.sh
+
+*jabberd-2.0.8 (28 Apr 2005)
+
+  28 Apr 2005; Wolfram Schlich <wschlich@gentoo.org> +jabberd-2.0.8.ebuild:
+  initial import
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org> jabberd-1.4.3-r4.ebuild:
+  Stable on SPARC.
+
+  25 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  jabberd-1.4.3-r4.ebuild:
+  Add ~alpha keyword, bug 83819.
+
+  12 Mar 2005; Wolfram Schlich <wschlich@gentoo.org>
+  jabberd-2.0_p20050119.ebuild:
+  add missing inherit flag-o-matic for USE=debug
+
+  01 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -jabberd-1.4.3-r3.ebuild:
+  Can delete older version with small sec problem as all arches have updated.
+
+*jabberd-2.0_p20050119 (31 Jan 2005)
+
+  31 Jan 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +jabberd-2.0_p20050119.ebuild:
+  Adding cvs snapshot hardmasked. Credit to Wolfram Schlich
+  <wschlich@gentoo.org> for updating alot of stuff here.
+
+  15 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-2.0-r2.ebuild:
+  Fixing bug 74200, thanks to Henning Gunther for the tip.
+
+  02 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r4.ebuild:
+  Changing pth dep to >=1.4.0 and not =1.4.0. Thanks to Daniel Webert in bug
+  73042
+
+  24 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Removed stray digest.
+
+*jabberd-2.0-r2 (24 Nov 2004)
+
+  24 Nov 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  -jabberd-2.0-r1.ebuild, +jabberd-2.0-r2.ebuild, -jabberd-2.0.ebuild:
+  Removing older 2.0 releases and adding 2.0.s4 with fix for exploit
+  http://archives.neohapsis.com/archives/fulldisclosure/2004-11/1075.html
+
+  27 Oct 2004; Tom Martin <slarti@gentoo.org> jabberd-1.4.3-r4.ebuild,
+  jabberd-2.0-r1.ebuild:
+  Marked ~amd64 for bug 59436.
+
+  21 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r4.ebuild:
+  Adding expat dep.
+
+  20 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r3.ebuild, jabberd-1.4.3-r4.ebuild:
+  Added ewarn about ipv6 in USE flag thanks to guido in bug #63845 for bringing
+  this to our attention
+
+*jabberd-1.4.3-r4 (20 Sep 2004)
+
+  20 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +jabberd-1.4.3-r4.ebuild:
+  Bumping version with fix for DoS attack. See bug #64741 for more info. Thanks
+  to justin-gentoo at openaether.org for bringing this to our attention.
+
+  01 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-2.0-r1.ebuild:
+  Fixing new way that configure receives parameters, closes bug 61896
+
+*jabberd-2.0-r1 (12 Aug 2004)
+
+  12 Aug 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +jabberd-2.0-r1.ebuild:
+  Updated to s3, I still need reports on how this works with the older
+  transports, please report back at bug #39395
+
+  08 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber.rc6-r7,
+  jabberd-1.4.3-r3.ebuild:
+  Small correction to init script. Thanks to Wendall Cada for help with testing
+
+  07 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r3.ebuild:
+  Stable on hppa so that deps dont break
+
+  05 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber.rc6-r7:
+  New update to init script
+
+  03 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  -jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild:
+  Marking ~hppa because of dependencies not stable
+
+  02 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r3.ebuild:
+  Added icq to USE
+
+  24 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber-conf.d,
+  files/jabber.rc6-r7:
+  Small update to init script
+
+  23 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  -jabberd-1.4.3-r1.ebuild, jabberd-1.4.3-r2.ebuild:
+  Deletting older version and making 1.4.3-r2 depend on the correct older
+  transports, because some in some arch -r3 is not marked stable
+
+  19 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r3.ebuild:
+  Marking stable on x86
+
+  18 Jun 2004; Jason Wever <weeve@gentoo.org> jabberd-1.4.3-r3.ebuild,
+  jabberd-2.0.ebuild:
+  Bringing back the ~sparc keywords, yay\!
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> jabberd-1.4.3-r1.ebuild,
+  jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild:
+  Fix use invocation
+
+  08 Jun 2004; Guy Martin <gmsoft@gentoo.org> jabberd-1.4.3-r3.ebuild:
+  Marked stable on hppa.
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> jabberd-1.4.3-r1.ebuild,
+  jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild:
+  Added to ~ppc.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> jabberd-1.4.3-r1.ebuild,
+  jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, jabberd-2.0.ebuild:
+  Add inherit eutils
+
+  09 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>; jabberd-2.0.ebuild:
+  Added patch to a XML stream bug. See
+  http://www.jabberstudio.org/projects/jabberd2/bugs/view.php?id=3061 credit for
+  this must be given to cfs@nova.es
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> jabberd-2.0.ebuild:
+  Added to ~ppc.
+
+*jabberd-2.0 (08 Apr 2004)
+
+  08 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>; jabberd-2.0.ebuild,
+  files/README.Gentoo, files/jabber.rc6-r7:
+  Adding jabberd2 to portage. This must stay hardmasked because it needs further
+  testing.
+
+*jabberd-1.4.3-r3 (08 Apr 2004)
+
+  08 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r2.ebuild, jabberd-1.4.3-r3.ebuild, files/jabber-conf.d,
+  files/jabber.rc6-r7:
+  Adding hard masked -r3 version that will only start the main server. See bug
+  43851
+
+  29 Mar 2004; Gustavo Felisberto <humpback@gentoo.org>; files/self-cert.sh:
+  Small fix in self-cert.sh thanks to Tom Forsythe <gentoobugs@animelover.com>
+  in bug 46039
+
+  27 Mar 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r2.ebuild:
+  Fixed bug 45830. Thanks to Antonio <netbix@netbix.net> .
+
+  27 Mar 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r2.ebuild:
+  Small correction see bug 45830.
+
+*jabberd-1.4.3-r2 (01 Mar 2004)
+
+  01 Mar 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber.rc6-r6:
+  Updating stop portion of init.d script thanks to Piotr Banasik
+  <piotr@t-p-l.com>. Also updating dependencies.
+
+  25 Feb 2004; Jason Wever <weeve@gentoo.org> jabberd-1.4.3-r1.ebuild:
+  Added ~sparc keyword, helps resolve bug #42928.
+
+  21 Feb 2004; Don Seiler <rizzo@gentoo.org>; jabberd-1.4.3-r1.ebuild:
+  Added use of msn, yahoo, and oscar USE flags
+
+  17 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r1.ebuild:
+  Marking stable on x86
+
+  13 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r1.ebuild, files/multiple-xml-patch-00:
+  Ebuild now patches the oficial config file to the Gentoo path's instead of
+  using our own file
+
+  11 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; files/multiple.xml:
+  Added comments to multiple.xml
+
+  10 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r1.ebuild:
+  Changed useradd to enewuser
+
+  02 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; files/jabber.rc6-r5:
+  Updated the start/stop script
+
+  29 Jan 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r1.ebuild, jabberd-1.4.3.ebuild:
+  Removing touch of .keep . Closes bug 39813
+
+  27 Jan 2004; Gustavo Felisberto <humpback@gentoo.org>; files/multiple.xml:
+  Added <browse> </browse> to multiple.xml
+
+  26 Jan 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  jabberd-1.4.3-r1.ebuild:
+  Fixed  ${P} to ${PF} in einfo about doc
+
+*jabberd-1.4.3-r1 (23 Jan 2004)
+
+  23 Jan 2004; Gustavo Felisberto <humpback@gentoo.org>; 
+  jabberd-1.4.3-r1.ebuild, metadata.xml:
+  Revision bump to add ipv6 support.
 
 *jabberd-1.4.3 (11 Jan 2004)
 
diff --git a/net-im/jabberd/Manifest b/net-im/jabberd/Manifest
index a0ffd0f23c98..a2f48c9d2e76 100644
--- a/net-im/jabberd/Manifest
+++ b/net-im/jabberd/Manifest
@@ -1,7 +1,34 @@
-MD5 dd4775f4d546cb80f3f4ea1cba03371c jabberd-1.4.3.ebuild 3510
-MD5 ea9fd33274bbf4cc48afe34d0921fba9 files/xdb-ldap.xml 963
-MD5 bc605a772d428ee0977b948ecdae26d3 files/mio_ssl.c.patch 874
-MD5 80f43fc0899830f2741b92fd271e011c files/multiple.xml 4901
-MD5 c0945b1bc206e13be453cd2c1bb7e3f1 files/digest-jabberd-1.4.3 129
-MD5 e05ff7b611c3c638bbd5b9f15a6cd9b0 files/self-cert.sh 409
-MD5 ca9fa3d865453ede2b7d678ee3d56d1d files/jabber.rc6-r5 796
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 83c97a3de0a570a5792290adf653fe07 jabberd-1.4.3-r5.ebuild 5808
+MD5 95d2d330856a7b80ead26d0c334d5571 jabberd-2.0.9.ebuild 3621
+MD5 1de04ab5d7e18332a5d73790aadf336f jabberd-1.4.3-r4.ebuild 5813
+MD5 4b98113bcadc3fff9bcdccb47a9932b0 ChangeLog 9795
+MD5 073710b6dd1869d3930f8f2e857341e8 metadata.xml 411
+MD5 40ed7d521eda61aa9f67390099e5b693 files/patch-c2s-buffers 12112
+MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r4 201
+MD5 264b9719c0773f480ee42d8a61c34d0a files/digest-jabberd-1.4.3-r5 201
+MD5 5aeafd17644a405b363de0ea1eb22d8b files/multiple-xml-patch-00 5934
+MD5 0067018951674e703063f0f4337c5a2c files/multiple-xml-patch-01 303
+MD5 a8408aaabc3453cfd3cbe3df1a65f67e files/xml-stream-patch-00 726
+MD5 92ba69168d2fb8c1384e8e13e03dcbc2 files/xdb-ldap.xml 985
+MD5 73c38af347fdcf7d7cb6dd3490344bfa files/multiple.xml 15387
+MD5 3a5219d7870e60f5b16d6aefb1c63a0e files/jabber-conf.d 525
+MD5 4817e867644d7d7bd2e1a0724571fbe9 files/digest-jabberd-2.0.9 65
+MD5 1d08c47f5fe30ced5227f28bac65f6fd files/self-cert.jabberd-2.sh 688
+MD5 1a325b6068e591bc222376a7d70f6e17 files/README.Gentoo 984
+MD5 1813a30dabb60fa0a15ee3ed3aaad28d files/jabber.init.gentoo 2118
+MD5 6ec1c588cf732d89e8bc7b5864842ab9 files/self-cert.sh 494
+MD5 3d8c2953acd251416c2fdb9a721b9e52 files/jabber.init.bundled 626
+MD5 8d4ca5fb6338d837674ab33c8f969273 files/jabber.rc6-r5 874
+MD5 6912454f1d1d480cbb711f715292e3cc files/jabber.rc6-r6 953
+MD5 4ea516e4527dd2de19281709704238ee files/jabber.rc6-r7 1842
+MD5 078528dc08a082b7a0534d4f6c5c5f5e files/jabber.rc6-r8 800
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC5rx8zY1VwezZiERAqR6AKCXZEJ3sFDK48F55Am4TH/XR9euWACggkXb
+TxQhYqQUQBviR1u2ZVr594k=
+=QPpm
+-----END PGP SIGNATURE-----
diff --git a/net-im/jabberd/files/README.Gentoo b/net-im/jabberd/files/README.Gentoo
index 53ff900a4ee5..8ce6f52cc3a7 100644
--- a/net-im/jabberd/files/README.Gentoo
+++ b/net-im/jabberd/files/README.Gentoo
@@ -1,3 +1,7 @@
+This instructions are valid if you are using jabberd14 as the main server. If
+you are going to use jabberd2 you must edit /etc/confd/jabberd and change 
+jabberd14 to jabberd2.
+
 This is a small help to get you started with Jabber in Gentoo.
 Edit /etc/jabber/multiple.xml . This is the main jabber server config file.
 There change all references to localhost with the FQDN (Fully Qualified Domain 
diff --git a/net-im/jabberd/files/jabber-conf.d b/net-im/jabberd/files/jabber-conf.d
index d75bc37ea8db..389f65882d68 100644
--- a/net-im/jabberd/files/jabber-conf.d
+++ b/net-im/jabberd/files/jabber-conf.d
@@ -1,8 +1,12 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.1 2004/04/08 02:00:51 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber-conf.d,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
-# Configure which is the default jabberd server. Right now it only knows about
-# jabberd14 . In the future jabberd2 will also be available.
+# Configure which is the default jabberd server. Any value that is not
+# jabberd14 and jabberd2 will be started
 
 JABBERD="jabberd14"
+
+#Right now this is only used by the init script, but i would like to find a way
+#for jabberd to include this in the conf
+JPIDFILE="/var/log/jabber/jabberd14.pid"
diff --git a/net-im/jabberd/files/jabber.init.bundled b/net-im/jabberd/files/jabber.init.bundled
index 92910a741682..3cfd2b160237 100755
--- a/net-im/jabberd/files/jabber.init.bundled
+++ b/net-im/jabberd/files/jabber.init.bundled
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.bundled,v 1.1 2005/01/31 23:05:41 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.bundled,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-im/jabberd/files/jabber.init.gentoo b/net-im/jabberd/files/jabber.init.gentoo
index 35117b4bd4b0..7c3298a0ee95 100755
--- a/net-im/jabberd/files/jabber.init.gentoo
+++ b/net-im/jabberd/files/jabber.init.gentoo
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.gentoo,v 1.1 2005/01/31 23:05:41 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.init.gentoo,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-im/jabberd/files/jabber.rc6-r5 b/net-im/jabberd/files/jabber.rc6-r5
index ae098761bd22..26c2b854c449 100644
--- a/net-im/jabberd/files/jabber.rc6-r5
+++ b/net-im/jabberd/files/jabber.rc6-r5
@@ -1,15 +1,16 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r5,v 1.1 2004/01/12 00:04:44 rizzo Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r5,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
+
 depend() {
-        need net
+	need net
 }
 
 start() {
-        ebegin "Starting Jabber Server"
+	ebegin "Starting Jabber Server"
 
-        jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
+	jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
 	for addon in /etc/jabber/*.xml; do
 		if [ "$addon" == "/etc/jabber/jit.xml" ]; then
 			jit-wpjabber -d -c $addon >/dev/null 2>&1
@@ -20,16 +21,19 @@ start() {
 		fi
 	done
 
-
-        eend $?
+	eend $?
 }
 
 stop() {
-        ebegin "Stopping Jabber Server"
-        killall jabberd
-		if [ "$addon" == "/etc/jabber/jit.xml" ]; then
-    	    killall jit-wpjabber
-        fi
-    	sleep 2
-        eend $?
+	ebegin "Stopping Jabber Server"
+	killall jabberd
+	if [ "$addon" == "/etc/jabber/jit.xml" ]; then
+		killall jit-wpjabber
+	fi
+	sleep 2
+	killall -9 jabberd
+	if [ "$addon" == "/etc/jabber/jit.xml" ]; then
+		killall -9 jit-wpjabber
+	fi
+	eend $?
 }
diff --git a/net-im/jabberd/files/jabber.rc6-r6 b/net-im/jabberd/files/jabber.rc6-r6
index 5f1a597accce..0882693cc7aa 100644
--- a/net-im/jabberd/files/jabber.rc6-r6
+++ b/net-im/jabberd/files/jabber.rc6-r6
@@ -1,45 +1,45 @@
 #!/sbin/runscript
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r6,v 1.1 2004/03/01 12:06:36 humpback Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r6,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
+
 depend() {
-        need net
+	need net
 }
 
 start() {
-        ebegin "Starting Jabber Server"
+	ebegin "Starting Jabber Server"
 
-        jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
+	jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
 	for addon in /etc/jabber/*.xml; do
 		if [ "$addon" == "/etc/jabber/jit.xml" ]; then
 			jit-wpjabber -d -c $addon >/dev/null 2>&1
 		else	
-		if [ "$addon" != "/etc/jabber/multiple.xml" ]; then
-			jabberd -B -c $addon >/dev/null 2>&1
-		fi
+			if [ "$addon" != "/etc/jabber/multiple.xml" ]; then
+				jabberd -B -c $addon >/dev/null 2>&1
+			fi
 		fi
 	done
 
-
-        eend $?
+	eend $?
 }
 
 stop() {
-        ebegin "Stopping Jabber Server"
+	ebegin "Stopping Jabber Server"
 		
-        killall jabberd
-		sleep 2
-		if (( `ps -e | grep jabberd | wc -l`>0 )); then 
-			killall -9 jabberd
-		fi
+	killall jabberd
+	sleep 2
+	if (( `ps -e | grep jabberd | wc -l`>0 )); then 
+		killall -9 jabberd
+	fi
 				
-		if [ -e /etc/jabber/jit.xml ]; then
-				killall jit-wpjabber
-				sleep 2
-				if (( `ps -e | grep jit-wpjabber | wc -l`>0 )); then
-					killall -9 jit-wpjabber
-				fi
+	if [ -e /etc/jabber/jit.xml ]; then
+		killall jit-wpjabber
+		sleep 2
+		if (( `ps -e | grep jit-wpjabber | wc -l`>0 )); then
+			killall -9 jit-wpjabber
 		fi
+	fi
 				
-        eend $?
+	eend $?
 }
diff --git a/net-im/jabberd/files/jabber.rc6-r7 b/net-im/jabberd/files/jabber.rc6-r7
index c552b9d91c98..ddf5c4605215 100644
--- a/net-im/jabberd/files/jabber.rc6-r7
+++ b/net-im/jabberd/files/jabber.rc6-r7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-im/jabberd/files/jabber.rc6-r7,v 1.1 2004/04/08 02:00:51 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r7,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 depend() {
 	need net
@@ -12,19 +12,60 @@ start() {
 	ebegin "Starting main Jabber Component"
 	if [ "${JABBERD}" = "jabberd14" ]
 	then
+		if [ -f ${JPIDFILE} ]; then
+			if [ -z $(ps ax | grep `cat ${JPIDFILE}` | grep -v grep ) ]
+			then
+				rm -f ${JPIDFILE}
+			fi
+		fi
 		jabberd -B -c /etc/jabber/multiple.xml >/dev/null 2>&1
+	else
+		ebegin "   Router"
+			start-stop-daemon --start -b -q -x /usr/bin/router
+		eend $?
+		ebegin "   Resolver"
+			start-stop-daemon --start -b -q -x /usr/bin/resolver
+		eend $?
+		ebegin "   Session Manager"
+			start-stop-daemon --start -b -q -x /usr/bin/sm
+		eend $?
+		ebegin "   Client to Server Component"
+			start-stop-daemon --start -b -q -x /usr/bin/c2s
+		eend $?
+		ebegin "   Server to Server Component"
+			start-stop-daemon --start -b -q -x /usr/bin/s2s
+		eend $?	
 	fi
+	
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping main Jabber Component"
-	kill `/var/log/jabber/jabberd14.pid`
-	sleep 2
-        if ( -f /var/log/jabber/jabberd14.pid ); then
-		kill -9 `cat /var/log/jabber/jabberd14.pid`
-		rm -f /var/log/jabber/jabberd14.pid
+	if [ "${JABBERD}" = "jabberd14" ]
+	then
+		kill `cat ${JPIDFILE}`
+		sleep 2
+        	if [ -f ${JPIDFILE} ]; then
+			kill -9 `cat ${JPIDFILE}`
+			rm -f ${JPIDFILE}
+		fi
+	else
+		ebegin "   Router"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/router.pid
+		eend $?
+		ebegin "   Resolver"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/resolver.pid
+		eend $?
+		ebegin "   Session Manager"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/sm.pid
+		eend $?
+		ebegin "   Client to Server Component"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/c2s.pid
+		eend $?
+		ebegin "   Server to Server Component"
+			start-stop-daemon --stop -q --pidfile /var/jabberd/pid/s2s.pid
+		eend $?
 	fi
-						        fi
 	eend $?
 }
diff --git a/net-im/jabberd/files/jabber.rc6-r8 b/net-im/jabberd/files/jabber.rc6-r8
index da2e281c52b4..28e912d583d1 100644
--- a/net-im/jabberd/files/jabber.rc6-r8
+++ b/net-im/jabberd/files/jabber.rc6-r8
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r8,v 1.1 2005/05/21 18:35:51 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/files/jabber.rc6-r8,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-im/jabberd/files/multiple.xml b/net-im/jabberd/files/multiple.xml
index 6a46a2be6cf0..5a7fc33038c6 100644
--- a/net-im/jabberd/files/multiple.xml
+++ b/net-im/jabberd/files/multiple.xml
@@ -1,8 +1,60 @@
 <jabber>
+  <!--
+  This is the Jabber server configuration file. The file is
+  broken into different sections based on the services being 
+  managed by jabberd, the server daemon. Most of the important 
+  sections have comments and are easy to modify.
+
+  At http://jabberd.jabberstudio.org/1.4/ you find further
+  instructions including an annotated version of this con-
+  figuration file and an installation guide.
+  
+  Note that when you see a tag like "jabberd:cmdline", it's
+  automatically replaced on startup with the command line flag
+  passed in to jabberd. This enables you to override para-
+  meters set in this configuration file if necessary or de-
+  sired. Also note as you comment things in and out that
+  jabberd does not like comments within comments, so be care-
+  ful with your XML. :)
+  -->
+ 
+ 
+ <!-- 
+  The following <service/> section is for the session manager, 
+  the most important component within the server. This section
+  contains the following types of information: 
+
+    * the server's hostname
+    * other basic server information
+    * the location of the session log file
+    * email addresses for server administrators 
+    * registration instructions for new users
+    * a welcome message for new users
+    * a list of agents with which users can register
+    * load rules for the modules within the session manager
+
+  -->
 
   <service id="sessions">
+    <!-- 
+    Replace all occurrences of "localhost" in this file by
+    the hostname of your Jabber server. Be aware changing
+    the server's name is all but impossible once users start
+    to use the server. So choose a name that is permanent
+    (especially no Intranet hostnames or IP addresses).
 
-    <host>localhost</host>
+    Multiple <host/> entries are allowed - each one is for a 
+    separate virtual server. Note that each host entry must 
+    be on one line, the server doesn't like it otherwise! :)
+    Use lowercase for the hostname.
+    -->
+
+    <host><jabberd:cmdline flag="h">localhost</jabberd:cmdline></host>
+    
+    <!-- 
+    This is the custom configuration section for the 
+    Jabber session manager, a.k.a. "JSM". 
+    -->
 
     <jsm xmlns="jabber:config:jsm">
 
@@ -32,26 +84,59 @@
               </actions>
           </allow>
       </filter>
-
+	<!-- The server vCard -->
       <vCard>
         <FN>localhost</FN>
         <DESC>localhost</DESC>
         <URL>http://localhost/</URL>
       </vCard>
 
-      <!-- commented out so no one can register!!! -->
+      <!-- commented out so no one can register!!! 
       <register notify="yes">
         <instructions>Choose a username and password to register with this server.</instructions>
         <name/>
         <email/>
       </register>
-      <!-- -->
+      -->
+
+      <!-- 
+      A welcome note that is sent to every new user who registers 
+      with your server. Comment it out to disable this function.
+      -->
 
       <welcome>
         <subject>Welcome!</subject>
         <body>Welcome to the Private Jabber server at localhost -- we hope you enjoy this service! For Questions and Remarks, please contact Foo Bar [ foobar@localhost ]. </body>
       </welcome>
 
+      <!-- 
+      IDs with admin access - these people will receive admin 
+      messages (any message to="yourhostname" is an admin
+      message).  These addresses must be local ids, they cannot
+      be remote addresses.
+
+      Note that they can also send announcements to all
+      users of the server, or to all online users. To use
+      the announcement feature, you need to send raw xml and be
+      logged in as one of the admin users. Here is the syntax 
+      for sending an announcement to online users:
+
+        <message to="yourhostname/announce/online">
+          <body>announcement here</body>
+        </message>
+
+        <message to="yourhostname/announce/motd">
+          <body>message (of the day) that is sent only once to all users that are logged in and additionally to new ones as they log in</body>
+        </message>
+
+      Sending to /announce/motd/delete will remove any existing
+      motd, and to /announce/motd/update will only update the motd
+      without re-announcing to all logged in users.
+
+      The <reply> will be the message that is automatically
+      sent in response to any admin messages.
+      -->
+
       <admin>
         <read>foobar@localhost</read>
         <write>foobar@localhost</write>
@@ -61,12 +146,31 @@
         </reply>
       </admin>
 
-      <!--<update><jabberd:cmdline flag="h">localhost</jabberd:cmdline></update>-->
 
       <vcard2jud/>
+	<browse>
 
+<!-- Place to "advertise" your transports -->
+<!--
+      The <browse/> section identifies the transports and other
+      services that are available from this server. Note that each
+      entity identified here must exist elsewhere or be further 
+      defined in its own <service/> section below. These services 
+      will appear in the user interface of Jabber clients that
+      connect to your server.
+      The <browse/> section is also used by mod_disco (see below)
+      for building the disco#items reply.
+      -->
+<!-- An example that would setup a Jabber User Directory could be:
 
-    </jsm>
+<service type="jud" jid="jud.localhost" name="Jabber User Directory">
+        <ns>jabber:iq:search</ns>
+        <ns>jabber:iq:register</ns>
+</service>
+
+-->
+	</browse>
+	</jsm>
 
     <load main="jsm">
       <jsm>/usr/lib/jabberd/jsm.so</jsm>
@@ -85,15 +189,19 @@
       <mod_presence>/usr/lib/jabberd/jsm.so</mod_presence>
       <mod_auth_plain>/usr/lib/jabberd/jsm.so</mod_auth_plain>
       <mod_auth_digest>/usr/lib/jabberd/jsm.so</mod_auth_digest>
-      <mod_auth_0k>/usr/lib/jabberd/jsm.so</mod_auth_0k>
       <mod_log>/usr/lib/jabberd/jsm.so</mod_log>
-<!-- commented out so no one can register!!! -->
+<!-- commented out so no one can register!!!
       <mod_register>/usr/lib/jabberd/jsm.so</mod_register>
-<!-- -->
+-->
       <mod_xml>/usr/lib/jabberd/jsm.so</mod_xml>
     </load>
 
   </service>
+ <!--
+  The <xdb/> component handles all data storage, using the filesystem.
+  Make sure the spool directory defined here exists and has proper
+  permissions.
+  -->
 
   <xdb id="xdb">
     <host/>
@@ -105,6 +213,32 @@
     </xdb_file>
   </xdb>
 
+  <!--
+  The following service manages incoming client socket connections.
+  There are several items you can set here to optimize performance:
+
+    * authtime - default is unlimited, but you can set this to
+      limit the amount of time allowed for authentication to be
+      completed, e.g., <authtime>10</authtime> for 10 seconds
+
+    * heartbeat - default is to not send out heartbeat packets
+      to the clients.  This option allows you to specify that
+      you want heartbeats to happen every x seconds.  This is
+      useful if you have a lot of dial-up or laptop users who
+      may drop their connection without logging off of jabber.
+      Otherwise the server won't notice that they are offline until
+      someone tries to send a packet to them (and the message is
+      lost).  Example: <heartbeat>60</heartbeat>
+
+    * karma - this is an input/output rate limiting system that
+      the Jabber team came up with to prevent bandwidth hogging.
+      For details about karma, read the io section at the bottom.
+      These are the low settings and apply per connection/socket
+      and can be changed as desired.
+      To disable rate limiting just delete the <karma/> section.
+  -->
+
+
   <service id="c2s">
     <load>
       <pthsock_client>/usr/lib/jabberd/pthsock_client.so</pthsock_client>
@@ -116,14 +250,36 @@
         <max>10</max>
         <inc>1</inc>
         <dec>1</dec>
+	<heartbeat>60</heartbeat>
         <penalty>-6</penalty>
         <restore>10</restore>
       </karma>
+
+        <!-- 
+      Use these to listen on particular addresses and/or ports.
+      Example: <ip port="5222">127.0.0.1</ip>
+      Default is to listen on port 5222 on every interface.
+      Remove the <ip/> section to disable non-ssl client connections.
+      -->
       <ip port="5222"/>
-      <ssl port="5223"/><!-- 10.1.2.3</ssl> -->
+
+      <!--
+      The <ssl/> tag acts pretty much like the <ip/> tag,
+      except it defines that SSL is to be used on the 
+      ports and IP addresses specified. You must specify
+      an IP address here, or the connections will fail.
+      <ssl port='5223'>127.0.0.1</ssl>
+      <ssl port='5224'>192.168.1.100</ssl>
+      -->
+
 	
-	 </pthcsock>
+	</pthcsock>
   </service>
+  
+  <!-- 
+  This is the default server error logging component, 
+  which copies to a file and to STDERR. 
+  -->
 
   <log id='elogger'>
     <host/>
@@ -150,7 +306,15 @@
     	<resend>s2s</resend>
     </dnsrv>
   </service>
-
+  
+  <!--
+  The following 's2s' config handles server connections and 
+  dialback hostname verification.  The <legacy/> element is 
+  here to enable communication with old 1.0 servers. The 
+  karma settings are a little higher here to handle the 
+  higher traffic of server-to-server connections (read
+  the io section below for more details, medium settings).
+  -->
   <service id="s2s">
     <load>
       <dialback>/usr/lib/jabberd/dialback.so</dialback>
@@ -169,15 +333,133 @@
     </dialback>
   </service>
 
+ <!--
+  update.jabber.org is long dead but some clients still
+  request update information. In order to avoid errors
+  in the logs, just drop packages for update.jabber.org.
+  -->
+  <service id="update.jabber.org">
+    <host>update.jabber.org</host>
+    <null/>
+  </service>
 
+  <!-- 
+  If you identified additional agents in the main <service/> 
+  section (see examples above), you'll need to define each 
+  of them here using a separate <service/> section for each 
+  <agent/> you identified. Note that the <agent/> sections
+  determine what gets shown to clients that connect to your
+  server, whereas the following <service/> sections define
+  these services within the server itself. The following are
+  examples only, you will need to create/modify them to get 
+  them working on your Jabber server. See the README files 
+  for each agent and/or the server howto for further 
+  information/instructions. 
+  -->
+
+  <!-- we're commenting these out, of course :)
+<service id="jud">
+  <host>jud.localhost</host>
+  <load><jud>/usr/lib/jabberd/jud.so</jud></load>
+  <jud xmlns="jabber:config:jud">
+    <vCard>
+      <FN>Local User Directory</FN>
+      <DESC>This service provides a simple user directory service.</DESC>
+      <URL>http://jud.jabberstudio.org/</URL>
+    </vCard>
+  </jud>
+</service>
+	-->
 
   <io>
-    <rate points="10" time="25"/>
+    <!-- Set the default karma for *all* sockets -->
+    <!-- definition of terms:
+
+      * Avg. Throughput - The number of bytes you can
+        send every second without incuring any penalty.
+
+      * Burst Allowed - The maximum number of bytes you
+        can send in 2 seconds without incurring any penalty.
+
+      * Max Sustained Rate - If you send data as fast as 
+        you can, you will hit penalty, and will not be 
+        able to send for 10 seconds; the max sustained 
+        rate is the average rate you can dump data when 
+        you are dumping as much data as you can, as fast 
+        as you can.
+
+      * Seconds to Recover from Burst - The amount of time 
+        it will take to reach Avg. Throughput capability 
+        after sending a max burst of data.
+
+      * Penalty Length - The length of your penalty is
+        determined according to this formula:
+              abs(penalty) * Heartbeat seconds
+        E.g., a penalty of -5 and heartbeat of 2 will 
+        cause your penalty length to be 10 seconds. 
+   Note that a penalty CANNOT be less than -100, 
+        otherwise strange things might happen.
+
+    -->
+     <!-- Example of Low Karma Limits 
+        Avg. Throughput: 1k-2k/s 
+        Burst Allowed To: 5.5k/s 
+        Max Sustained Rate: 485b/s
+        Seconds to Recover from Burst: 20
+        Penalty Length: 12 seconds
+    <karma>
+      <heartbeat>2</heartbeat>
+      <init>10</init>
+      <max>10</max>
+      <inc>1</inc>
+      <dec>1</dec>
+      <penalty>-6</penalty>
+      <restore>10</restore>
+    </karma>
+    -->
+
+       <!-- 
+    Set rate limits to monitor the number of connection
+    attempts from a single IP, any more than [points]
+    within [time] will engage the limit.  This setting
+    applies to all incoming connections to any service,
+    unless otherwise overridden by that service.
+    -->
+    
+    <rate points="5" time="25"/>
+
+        <!-- 
+    The following section initializes SSL for top-level I/O.
+    This works only when the server is compiled with openssl!
+    Use IPs here or connections will fail.
+    -->
+
     <ssl>
       <key ip="64.57.168.155">/etc/jabber/gentoo.pem</key>
     </ssl>
+  <!-- 
+    The following section is used to allow or deny 
+    communications from specified IP networks or 
+    addressses. If there is no <allow/> section, 
+    then *all* IPs will be allowed to connect. If 
+    you allow one block, then only that block may 
+    connect. Note that <allow/> is checked before
+    <deny/>, so if a specific address is allowed 
+    but the network for that address is denied, 
+    then that address will still be denied.
+    -->
+    <!--
+    <allow><ip>127.0.0.0</ip><mask>255.255.255.0</mask></allow>
+    <allow><ip>12.34.56.78</ip></allow>
+    <deny><ip>22.11.44.0</ip><mask>255.255.255.0</mask></deny>
+    -->
+
   </io>
 
+  <!--
+  This specifies the file to store the pid of the process in.
+  -->
+
   <pidfile>/var/run/jabber.pid</pidfile>
 
 </jabber>
diff --git a/net-im/jabberd/files/self-cert.sh b/net-im/jabberd/files/self-cert.sh
index 3711e349fec5..9c1e339052c3 100644
--- a/net-im/jabberd/files/self-cert.sh
+++ b/net-im/jabberd/files/self-cert.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 ######
 #
 # Generate a certificate and key with no passphrase.
diff --git a/net-im/jabberd/jabberd-1.4.3-r4.ebuild b/net-im/jabberd/jabberd-1.4.3-r4.ebuild
index 48cf71be2298..287a3476b850 100644
--- a/net-im/jabberd/jabberd-1.4.3-r4.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r4.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/net-im/jabberd/jabberd-1.4.3-r4.ebuild,v 1.1 2004/09/20 15:50:53 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r4.ebuild,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
 
 inherit eutils
 
@@ -13,11 +13,12 @@ SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc hppa ~sparc"
+KEYWORDS="x86 ~ppc hppa sparc ~amd64 ~alpha"
 IUSE="ssl ldap ipv6 msn oscar yahoo icq"
 
 DEPEND="!net-im/jabber-server
-	=dev-libs/pth-1.4.0
+	>=dev-libs/pth-1.4.0
+	dev-libs/expat
 	ssl? ( >=dev-libs/openssl-0.9.6i )
 	ldap? ( =net-nds/openldap-2* )"
 
@@ -26,6 +27,15 @@ PDEPEND="msn? ( net-im/msn-transport )
 		 yahoo? ( net-im/yahoo-transport )
 		 icq? ( net-im/jit )"
 
+pkg_setup() {
+
+	if use ipv6 ; then
+		ewarn "You are about to build with ipv6 support, if your system is not using ipv6"
+		ewarn "do control-c now and emerge with \"USE=-ipv6\" "
+		epause 5
+	fi
+}
+
 src_unpack() {
 	unpack jabberd-${PV}.tar.gz
 	cd ${S}
diff --git a/net-im/jabberd/jabberd-1.4.3-r5.ebuild b/net-im/jabberd/jabberd-1.4.3-r5.ebuild
index 5c1b27654e95..016ac74cc5f2 100644
--- a/net-im/jabberd/jabberd-1.4.3-r5.ebuild
+++ b/net-im/jabberd/jabberd-1.4.3-r5.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/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.1 2005/05/21 18:35:51 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.4.3-r5.ebuild,v 1.1.1.1 2005/11/30 10:09:42 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="http://jabberd.jabberstudio.org/1.4/dist/jabberd-${PV}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~hppa ~sparc ~amd64 ~alpha"
+KEYWORDS="~alpha ~amd64 hppa ~ppc sparc x86"
 IUSE="ssl ldap ipv6 msn oscar yahoo icq"
 
 DEPEND="!net-im/jabber-server
@@ -111,7 +111,7 @@ src_install() {
 	local test_user=`grep ^jabber: /etc/passwd | cut -d: -f1`
 	if [ -z $test_user ]
 	then
-		enewuser jabber -1 /bin/false /var/spool/jabber jabber
+		enewuser jabber -1 -1 /var/spool/jabber jabber
 	fi
 
 	dodoc README UPGRADE ${FILESDIR}/README.Gentoo
diff --git a/net-im/jabberd/jabberd-2.0.9.ebuild b/net-im/jabberd/jabberd-2.0.9.ebuild
index d6bd7dadbd52..96e8e2b7cbda 100644
--- a/net-im/jabberd/jabberd-2.0.9.ebuild
+++ b/net-im/jabberd/jabberd-2.0.9.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/net-im/jabberd/jabberd-2.0.9.ebuild,v 1.1 2005/08/07 20:23:39 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-2.0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:43 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -67,7 +67,7 @@ src_install() {
 
 	## add user and group
 	enewgroup jabber
-	enewuser jabber -1 /bin/false /var/jabberd jabber
+	enewuser jabber -1 -1 /var/jabberd jabber
 
 	## set binary permissions
 	fowners :jabber /usr/bin/{jabberd,router,resolver,sm,c2s,s2s}
@@ -83,7 +83,7 @@ src_install() {
 		done
 	done
 
-	#� jabberd config & init script
+	#ä jabberd config & init script
 	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.bundled jabber
 #	exeinto /etc/init.d; newexe ${FILESDIR}/jabber.init.gentoo jabber
 	exeinto /etc/jabberd; newexe ${FILESDIR}/self-cert.jabberd-2.sh self-cert.sh
diff --git a/net-im/jabberd/metadata.xml b/net-im/jabberd/metadata.xml
index fa4290d8cdea..54ca97977a52 100644
--- a/net-im/jabberd/metadata.xml
+++ b/net-im/jabberd/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>net-im</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-  <description>Holding this until Humpback (Gustavo Felisberto) graduates from Dev U.</description>
+  <email>humpback@gentoo.org</email>
+  <name>Gustavo Felisberto</name>
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
+<longdescription>This is the original implementation of jabberd server.
+This serves as the basis for running a jabber server in Gentoo.</longdescription>
 </pkgmetadata>
diff --git a/net-im/jit/ChangeLog b/net-im/jit/ChangeLog
index 178d9a7d1ef5..e9f21a408014 100644
--- a/net-im/jit/ChangeLog
+++ b/net-im/jit/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for net-im/jit
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.1 2004/01/12 01:00:49 rizzo Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/ChangeLog,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
+
+  17 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> jit-1.1.6-r3.ebuild:
+  alpha needs >=net-im/jabberd-1.4.3-r3 first
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> jit-1.1.6-r3.ebuild:
+  Mark 1.1.6-r3 stable on alpha
+
+  09 Jul 2005; Sven Wegener <swegener@gentoo.org> jit-1.1.6-r3.ebuild:
+  QA: ${PN}-${PVR} -> ${PF}; Moved unpack to src_unpack()
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org> jit-1.1.6-r3.ebuild:
+  Stable on SPARC.
+
+  25 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> jit-1.1.6-r3.ebuild:
+  Add ~alpha keyword, bug 83819.
+
+  27 Oct 2004; Tom Martin <slarti@gentoo.org> jit-1.1.6-r3.ebuild:
+  Marked ~amd64.
+
+  21 Aug 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  files/jit-transport.init:
+  Fixed typo in init script, closes bug #60343
+
+  07 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r3.ebuild:
+  Stable on hppa so that deps dont break
+
+  05 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r3.ebuild:
+  Marking ~hppa
+
+  03 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>; -jit-1.1.6-r1.ebuild,
+  -jit-1.1.6-r2.ebuild:
+  Cleanning older versions
+
+  19 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r3.ebuild:
+  Marking stable on x86
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> jit-1.1.6-r2.ebuild,
+  jit-1.1.6-r3.ebuild:
+  Fix use invocation
+
+  08 Jun 2004; Guy Martin <gmsoft@gentoo.org> jit-1.1.6-r3.ebuild:
+  Marked stable on hppa.
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> jit-1.1.6-r2.ebuild,
+  jit-1.1.6-r3.ebuild:
+  Add inherit eutils
+
+  09 Apr 2004; David Holm <dholm@gentoo.org> jit-1.1.6-r3.ebuild:
+  Added to ~ppc.
+
+*jit-1.1.6-r3 (07 Apr 2004)
+
+  07 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r3.ebuild,
+  files/jit.xml:
+  This version adds the ability of starting jit as a independent service. See
+  bug 43851. Also fixed a small bug in the jit.xml Bug 43854
+
+  28 Mar 2004; Jason Wever <weeve@gentoo.org> jit-1.1.6-r2.ebuild,
+  files/jit-sparc.patch:
+  Added patch for sparc and ~sparc keyword wrt bug #42928.
+
+  15 Mar 2004; Don Seiler <rizzo@gentoo.org>; jit-1.1.6-r2.ebuild:
+  Bumping to stable since -r1 has gcc failures
+
+*jit-1.1.6-r2 (26 Feb 2004)
+
+  26 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r2.ebuild,
+  files/jit-patch-00:
+  Adding -r2 with a patch to help build with gcc 3. See bug 42335. Thanks to
+  Alan <alan@ufies.org>
+
+  17 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r1.ebuild:
+  Marking stable on x86
+
+*jit-1.1.6-r1 (24 Jan 2004)
+  24 Jan 2004; Gustavo Felisberto <humpback@gentoo.org>; jit-1.1.6-r1.ebuild:
+  Better dependencies.
 
 *jit-1.1.6 (11 Jan 2004)
 
diff --git a/net-im/jit/Manifest b/net-im/jit/Manifest
index b3c884ad7630..44cde595117e 100644
--- a/net-im/jit/Manifest
+++ b/net-im/jit/Manifest
@@ -1,4 +1,9 @@
-MD5 35d74d13696b976cec24b49ee38c221c jit-1.1.6.ebuild 825
-MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6 61
+MD5 7790f4556753d2a09382cb1123d3253c metadata.xml 403
+MD5 8b0ccaaa12a2ca736cd461d4e39744b8 jit-1.1.6-r3.ebuild 1385
+MD5 f8892c572d5dea05acbc212cafa399a9 ChangeLog 3037
+MD5 1aff6a87f50b47b6f76b349cfb1e6a67 files/jit-transport.init 433
+MD5 2823c4cf16925056ce9b9094bc47b0bd files/jit.xml 4007
 MD5 54f7c7c05a3bf14a77d8a9e592079c18 files/README.Gentoo 1479
-MD5 1b9cebaa84401871db0325d28a7cd51a files/jit.xml 3943
+MD5 de04a2ef800e243b5c5f46fab4d4059d files/jit-sparc.patch 422
+MD5 50412e85cf54ff2a36e6b51564731c82 files/jit-patch-00 1271
+MD5 84e79bea97642c2440440e8257497a79 files/digest-jit-1.1.6-r3 61
diff --git a/net-im/jit/files/jit-transport.init b/net-im/jit/files/jit-transport.init
index 8c82c7bf5de9..7d342cf57cad 100644
--- a/net-im/jit/files/jit-transport.init
+++ b/net-im/jit/files/jit-transport.init
@@ -7,15 +7,15 @@ depend() {
 
 start() {
 	ebegin "Starting ICQ Jabber Transport"
-	/usr/sbin/jabberd -d -c /etc/jabber/jit.xml -H /var/spool/jabber >/dev/null 2>&1
+	/usr/sbin/jit-wpjabber -d -c /etc/jabber/jit.xml -H /var/spool/jabber >/dev/null 2>&1
 	eend $?
 }
 
 stop() {
-	ebegin "Stoping ICQ Jabber Transport"
+	ebegin "Stopping ICQ Jabber Transport"
 	kill `cat /var/log/jabber/jit.pid`
 	sleep 2
-	if ( -f /var/log/jabber/jit.pid ); then
+	if [ -f /var/log/jabber/jit.pid ]; then
 		kill -9 `cat /var/log/jabber/jit.pid`
 		rm -f /var/log/jabber/jit.pid
 	fi
diff --git a/net-im/jit/files/jit.xml b/net-im/jit/files/jit.xml
index 005c528e1613..cb2dd053f533 100644
--- a/net-im/jit/files/jit.xml
+++ b/net-im/jit/files/jit.xml
@@ -90,7 +90,7 @@
       <no_jabber_roster/>
       
       <!-- File with stats -->        
-      <user_count_file>session_count.log</user_count_file>
+      <user_count_file>/var/log/jabber/jit.session_count.log</user_count_file>
       
       <!-- Interval beetween checking sessions: ping, messages, acks -->                 
       <session_check>5</session_check>
@@ -122,6 +122,8 @@
 
   </service>
 
+<pidfile>/var/log/jabber/jit.pid</pidfile>
+
   <!--
      The settings here have to match the setting you made
      in your main Jabber server's configuration file.
diff --git a/net-im/jit/jit-1.1.6-r3.ebuild b/net-im/jit/jit-1.1.6-r3.ebuild
index 3bb1dca13290..81728d66ddea 100644
--- a/net-im/jit/jit-1.1.6-r3.ebuild
+++ b/net-im/jit/jit-1.1.6-r3.ebuild
@@ -1,10 +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/net-im/jit/jit-1.1.6-r3.ebuild,v 1.1 2004/04/07 16:52:34 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jit/jit-1.1.6-r3.ebuild,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
-DESCRIPTION="ICQ transport for WPjabber/Jabberd"
+DESCRIPTION="ICQ transport for wpjabber / jabberd"
 HOMEPAGE="http://jit.jabberstudio.org/"
 SRC_URI="http://www.jabberstudio.org/files/jit/${P}.tar.gz"
 
@@ -13,15 +13,20 @@ SLOT="0"
 
 IUSE=""
 
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~alpha ~amd64 hppa ~ppc sparc x86"
 
 DEPEND=""
-RDEPEND=">=net-im/jabberd-1.4.3"
+RDEPEND=">=net-im/jabberd-1.4.3-r3"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
 
-src_compile() {
 	epatch ${FILESDIR}/jit-patch-00
-	[ `use sparc` ] && epatch ${FILESDIR}/jit-sparc.patch
+	use sparc && epatch ${FILESDIR}/jit-sparc.patch
+}
+
+src_compile() {
 	./configure
 	emake || die
 	cp ${S}/jabberd/jabberd ${S}/jabberd/jit-wpjabber
@@ -44,9 +49,8 @@ src_install() {
 }
 
 pkg_postinst() {
-
 	einfo
-	einfo "Please read /usr/share/doc/${P}/README.Gentoo.gz"
+	einfo "Please read /usr/share/doc/${PF}/README.Gentoo.gz"
 	einfo "And please notice that now jit-transport comes with a init.d script"
 	einfo "dont forget to add it to your runlevel."
 	einfo
diff --git a/net-im/jit/metadata.xml b/net-im/jit/metadata.xml
index fa4290d8cdea..86b26dac7ebf 100644
--- a/net-im/jit/metadata.xml
+++ b/net-im/jit/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 <herd>net-im</herd>
 <maintainer>
-  <email>rizzo@gentoo.org</email>
-  <name>Don Seiler</name>
-  <description>Holding this until Humpback (Gustavo Felisberto) graduates from Dev U.</description>
+  <email>humpback@gentoo.org</email>
+  <name>Gustavo Felisberto</name>
 </maintainer>
-<!-- <longdescription>Long description of the package</longdescription> -->
+  <longdescription>ICQ transport for jabber. It uses wp-jabber but connects to jabberd (only jabber server supported right now)</longdescription>
 </pkgmetadata>
diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index 18f0cf9d314d..f34ee8071f9e 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -1,6 +1,101 @@
 # ChangeLog for net-im/kmess
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.1 2002/04/24 21:08:02 verwilst Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
+
+*kmess-1.4.1 (29 Sep 2005)
+
+  29 Sep 2005; Gregorio Guidi <greg_g@gentoo.org> +kmess-1.4.1.ebuild:
+  New version (#106850).
+
+  24 Aug 2005; Olivier Crête <tester@gentoo.org> kmess-1.4_pre1.ebuild:
+  Marked ~amd64, thanks to Jim Laflin for testing
+
+*kmess-1.4_pre1 (21 Aug 2005)
+
+  21 Aug 2005; Gregorio Guidi <greg_g@gentoo.org> +kmess-1.4_pre1.ebuild:
+  New version (#100214).
+
+  05 Feb 2005; Dominik Stadler <centic@gentoo.org> kmess-1.3.ebuild:
+  Add missing inherit of eutils
+
+  15 Jan 2005; Dan Armak <danarmak@gentoo.org> kmess-1.2.1.ebuild,
+  kmess-1.3.ebuild:
+  Changed dep on a kde-base monolithic package to accept the equivalent split
+  or -meta package. KDE 3.4 has 'split' packages as well as monolithic, and
+  either alternative may provide the same files. This dep may have to be
+  narrowed down in the future to the precise split packages required.
+
+  25 Nov 2004; Simone Gotti <motaboy@gentoo.org> +metadata.xml,
+  +files/kmess-1.3-compilation-fix.patch, kmess-1.3.ebuild:
+  Added a patch to fix various compilation problems. Fixes bug #62793. Also
+  added missing metadata.xml.
+
+  28 Jun 2004; Carsten Lohrke <carlo@gentoo.org> kmess-1.2.1.ebuild,
+  kmess-1.3.ebuild:
+  QA: put need-kde after R/DEPEND
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> kmess-1.2.1.ebuild,
+  kmess-1.3.ebuild:
+  inherit kde instead of deprecated kde-base
+
+  15 Feb 2004; David Holm <dholm@gentoo.org> kmess-1.3.ebuild:
+  Added to ~ppc.
+
+  04 Dec 2003; Caleb Tennis <caleb@gentoo.org> kmess-1.3.ebuild:
+  x86 stable
+
+*kmess-1.3 (19 Oct 2003)
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> kmess-1.1.ebuild,
+  kmess-1.3.ebuild:
+  bump
+
+  30 Jul 2003; Caleb Tennis <caleb@gentoo.org> kmess-1.2.1.ebuild:
+  Add kdenetwork dependency.
+
+  29 May 2003; Jason Wever <weeve@gentoo.org> kmess-1.2.1.ebuild:
+  Added ~sparc to keywords.
+
+*kmess-1.2.1 (28 May 2003)
+
+  28 May 2003; Caleb Tennis <caleb@gentoo.org> kmess-1.2.1.ebuild:
+  version bump, thanks to Isam Bayazidi for ebuild.  Closes bug #20976
+
+*kmess-1.1 (16 Mar 2003)
+
+  16 Mar 2003; Hannes Mehnert <hannes@gentoo.org> kmess-1.1.ebuild:
+  version bump, closes bugs #15887, #17411, #17591. thanks to reporters of these
+  bugs.
+
+*kmess-0.9.8 (15 December 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  New version.
+
+*kmess-0.9.6 (20 June 2002) Bart Verwilst <verwilst@gentoo.org>
+
+  Filetransfer added, and compiles with gcc 3.1
+
+*kmess-0.9.5 (29 May 2002)
+
+  29 May 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  Release Note:  Added a drop-down emoticon chooser to the chat window to 
+	select emoticons; the ability to associate an image with each contact to 
+	popup when the contact comes online; a new GPL emoticon theme, with 3 
+	smiley colors; display of a contact's MSN profile via the RMB popup menu; 
+	the ability to delete an unused account from the Settings menu; support 
+	for international characters; the ability to enable / disable Other 
+	Folder Notification; inviting contacts to join multi-party chats; and 
+	Brazilian Portuguese and Italian translations. .
+
+*kmess-0.9.3 (26 April 2002)
+
+  26 April 2002; Bart Verwilst <verwilst@gentoo.org> ChangeLog :
+
+  Release Note:  Added a button and shortcut for adding carriage returns
+  in chats; and a Spanish translation (untested). Re-enabled "you are 
+  typing".
+
 
 *kmess-0.9.2 (24 April 2002)
 
diff --git a/net-im/kmess/Manifest b/net-im/kmess/Manifest
index 2491a04a7a4d..429d1f019bed 100644
--- a/net-im/kmess/Manifest
+++ b/net-im/kmess/Manifest
@@ -1,5 +1,7 @@
-MD5 21b6015bd6e68c12161c0bf79510bfd2 kmess-1.1.ebuild 422
-MD5 21b6015bd6e68c12161c0bf79510bfd2 kmess-1.2.1.ebuild 422
-MD5 caa0f47bb9fc243071ced1d0ebcdcb1c ChangeLog 1802
-MD5 643bf57d56166379ea9ffc3a558e0006 files/digest-kmess-1.2.1 64
-MD5 b368b9eb65d9282e06a607839f095dd6 files/digest-kmess-1.1 62
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 1d9119f0fba19cc69d8860e27021515c kmess-1.4.1.ebuild 446
+MD5 6a3d6b27daf6934b34eaff9c4b476990 ChangeLog 3632
+MD5 f4eceff12866f1895c48f02ffcaf6a1a kmess-1.3.ebuild 580
+MD5 c383ac2a5ed132e6b2ab8a5ea59a09ba files/digest-kmess-1.3 62
+MD5 e12777ab311fc4456e711cac5452542d files/kmess-1.3-compilation-fix.patch 1673
+MD5 74476fcd2dd800adec3fd0798d49941e files/digest-kmess-1.4.1 64
diff --git a/net-im/kmess/kmess-1.3.ebuild b/net-im/kmess/kmess-1.3.ebuild
index 66e0477147f6..6d324d9aa6ef 100644
--- a/net-im/kmess/kmess-1.3.ebuild
+++ b/net-im/kmess/kmess-1.3.ebuild
@@ -1,17 +1,24 @@
-# 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/net-im/kmess/kmess-1.3.ebuild,v 1.1 2003/10/19 14:11:55 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-1.3.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
-inherit kde-base
+inherit kde eutils
 
-need-kde 3
 
-IUSE=""
 DESCRIPTION="MSN Messenger clone for KDE"
-SRC_URI="mirror://sourceforge/kmess/${P}.tar.gz"
 HOMEPAGE="http://kmess.sourceforge.net"
+SRC_URI="mirror://sourceforge/kmess/${P}.tar.gz"
 
+SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~ppc"
+IUSE=""
+
+DEPEND="|| ( kde-base/kdenetwork-meta kde-base/kdenetwork )"
+need-kde 3
+
+src_unpack() {
+	kde_src_unpack
 
-DEPEND="kde-base/kdenetwork"
+	epatch ${FILESDIR}/${P}-compilation-fix.patch
+}
diff --git a/net-im/kmess/kmess-1.4.1.ebuild b/net-im/kmess/kmess-1.4.1.ebuild
index 7d318bd95c65..aab39701cc91 100644
--- a/net-im/kmess/kmess-1.4.1.ebuild
+++ b/net-im/kmess/kmess-1.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/net-im/kmess/kmess-1.4.1.ebuild,v 1.1 2005/09/29 16:23:44 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
 inherit kde eutils
 
diff --git a/net-im/kmess/metadata.xml b/net-im/kmess/metadata.xml
index 7a70bd761f0b..8d1e86a9cefb 100644
--- a/net-im/kmess/metadata.xml
+++ b/net-im/kmess/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>kde-themes</herd>
+<herd>kde</herd>
 </pkgmetadata>
diff --git a/net-im/licq/ChangeLog b/net-im/licq/ChangeLog
index 6d516b6acd98..d2641b8a918b 100644
--- a/net-im/licq/ChangeLog
+++ b/net-im/licq/ChangeLog
@@ -1,13 +1,342 @@
 # ChangeLog for net-im/licq
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.1 2002/02/01 21:53:32 gbevin Exp $
-
-*licq-1.0.4-r1 (1 Feb 2002)
-
-  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
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/ChangeLog,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
+
+  12 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> licq-1.3.2.ebuild,
+  licq-1.3.2-r1.ebuild:
+  Removed minor typo, spotted by Torsten Veller.
+
+  12 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> licq-1.3.2.ebuild:
+  Goes stable on amd64.
+
+*licq-1.3.2-r1 (12 Nov 2005)
+
+  12 Nov 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.2-r1.ebuild:
+  Now using configure's cache to speed up things a bit.
+
+*licq-1.3.2 (21 Oct 2005)
+
+  21 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -licq-1.3.2_rc1.ebuild,
+  -licq-1.3.2_rc2.ebuild, -licq-1.3.2_rc3.ebuild, +files/1.3.2-email_typo.patch,
+  +licq-1.3.2.ebuild:
+  Bump to final release.
+
+*licq-1.3.2_rc3 (19 Oct 2005)
+
+  19 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.2_rc3.ebuild:
+  Final RC.
+
+*licq-1.3.2_rc2 (02 Oct 2005)
+
+  02 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.2_rc2.ebuild:
+  Bump.
+
+*licq-1.3.2_rc1 (01 Oct 2005)
+
+  01 Oct 2005; Konstantin Arkhipov <voxus@gentoo.org> -licq-1.3.0-r3.ebuild,
+  -licq-1.3.0-r4.ebuild, -licq-1.3.0-r5.ebuild, -licq-1.3.0-r6.ebuild,
+  -licq-1.3.0-r7.ebuild, -licq-1.3.0-r8.ebuild, -files/1.3.0-koloboks.patch,
+  -files/1.3.0-save_koloboks.patch, -files/1.3.0-include_iconv.patch,
+  -files/1.3.0-msnpacket_sync.patch, -files/1.3.0-missing_chars.patch,
+  +licq-1.3.2_rc1.ebuild:
+  Version bump. CVS snapshots dropped.
+
+  05 Sep 2005; Olivier Crête <tester@gentoo.org> metadata.xml:
+  Make metadata.xml header say utf-8, bug #104663
+
+*licq-1.3.0-r8 (02 Sep 2005)
+
+  02 Sep 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r8.ebuild:
+  Probably the last branch update.
+
+  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> licq-1.3.0.ebuild:
+  Move epatch to src_unpack.  Stable on ia64
+
+  10 Aug 2005; Herbie Hopkins <herbs@gentoo.org> licq-1.3.0-r7.ebuild:
+  Multilib fixes.
+
+*licq-1.3.0-r7 (03 Aug 2005)
+
+  03 Aug 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r7.ebuild:
+  Branch update.
+
+*licq-1.3.0-r6 (14 Jul 2005)
+
+  14 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r6.ebuild,
+  +files/1.3.0-include_iconv.patch, +files/1.3.0-missing_chars.patch,
+  +files/1.3.0-save_koloboks.patch:
+  Closing bugs #97982, #98263 and #98584.
+
+  07 Jul 2005; Caleb Tennis <caleb@gentoo.org> licq-1.2.7.ebuild,
+  licq-1.3.0.ebuild, licq-1.3.0-r3.ebuild, licq-1.3.0-r4.ebuild,
+  licq-1.3.0-r5.ebuild:
+  Fix qt dep
+
+*licq-1.3.0-r5 (03 Jul 2005)
+
+  03 Jul 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r5.ebuild,
+  +files/1.3.0-koloboks.patch:
+  Updated to cvs snapshot from 20050703. Anti-koloboks patch updated too.
+
+*licq-1.3.0-r4 (29 May 2005)
+
+  29 May 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r4.ebuild,
+  +files/1.3.0-suse_bool.patch:
+  Closing bugs #93217 (patch taken from SuSE) and #93662.
+
+  23 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> -licq-1.3.0-r1.ebuild,
+  -licq-1.3.0-r2.ebuild:
+  Dropped older ebuild same keyworded as -r3.
+
+*licq-1.3.0-r3 (20 Mar 2005)
+
+  20 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r3.ebuild,
+  +files/1.3.0-msnpacket_sync.patch:
+  Trivial fix for bug #86000.
+
+*licq-1.3.0-r2 (18 Mar 2005)
+
+  18 Mar 2005; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0-r2.ebuild:
+  Branch update from licq's cvs. Many bugfixes and updated gpg support.
+
+  29 Jan 2005; Gregorio Guidi <greg_g@gentoo.org> licq-1.2.7.ebuild,
+  licq-1.3.0-r1.ebuild, licq-1.3.0.ebuild:
+  Proper usage of kde eclasses, to make sure KDEDIR is defined (#33079).
+
+*licq-1.3.0-r1 (04 Nov 2004)
+
+  04 Nov 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  +licq-1.3.0-r1.ebuild:
+  Closing bug #68452, thanks to Sascha (kn0rki) Hoppe.
+  New cdk version now hard depended due to bug #66332.
+
+  30 Oct 2004; Joseph Jezak <josejx@gentoo.org> +metadata.xml,
+  licq-1.3.0.ebuild:
+  Keyworded ppc to fix compiling with gcc 3.4, added metadata
+
+  03 Oct 2004; Michael Sterrett <mr_bones_@gentoo.org> licq-1.3.0.ebuild:
+  Add back in keywords that were dropped on version bump
+
+*licq-1.3.0 (01 Oct 2004)
+
+  01 Oct 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre2.ebuild,
+  +licq-1.3.0.ebuild:
+  Version bump, fixed gpgme dep, which closes #65882
+  Small fixes contributed by Daniel Black. Thanks.
+
+*licq-1.3.0_pre2 (28 Sep 2004)
+
+  28 Sep 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre-r5.ebuild,
+  +licq-1.3.0_pre2.ebuild:
+  Version bump.
+
+*licq-1.3.0_pre-r5 (22 Aug 2004)
+
+  22 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre-r4,
+  +licq-1.3.0_pre-r5,
+  files/1.3.0-gpgme3_hack.patch:
+  Totally and finally fixed gpg support.
+
+*licq-1.3.0_pre-r4 (22 Aug 2004)
+
+  22 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre-r3,
+  +licq-1.3.0_pre-r4,
+  files/1.3.0-gpgme3_hack.patch:
+  Re-fixed gpgme3 support, thanks to
+  Arash Abedinzadeh <thunfisch@thunfisch.org> for patches.
+
+*licq-1.3.0_pre-r3 (21 Aug 2004)
+
+  21 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre-r2,
+  +licq-1.3.0_pre-r3,
+  +files/1.3.0-gcc3.4.patch:
+  Dummy patch for gcc 3.4, closing #61138.
+
+*licq-1.3.0_pre-r2 (21 Aug 2004)
+
+  21 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org>
+  -licq-1.3.0_pre-r1,
+  +licq-1.3.0_pre-r2,
+  +files/1.3.0-gpgme3_hack.patch,
+  +files/1.3.0-upgradepath.patch,
+  +files/1.3.0-no_stupid_koloboks.patch:
+  Yet another fix for gpgme and ability to kill koloboks from message view
+  introduced by trivial patch.
+
+*licq-1.3.0_pre (20 Aug 2004)
+
+  20 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org> -licq-1.3.0_pre.ebuild,
+  +licq-1.3.0_pre-r1.ebuild:
+  Fixed gpgme support.
+
+*licq-1.3.0_pre (20 Aug 2004)
+
+  20 Aug 2004; Konstantin Arkhipov <voxus@gentoo.org> +licq-1.3.0_pre.ebuild:
+  Version bump, closing #60767.
+  Thanks to Andy Crook <crook@mc.iba.by>.
+
+  29 Jun 2004; Carsten Lohrke <carlo@gentoo.org> licq-1.2.7.ebuild:
+  QA: kde-base -> kde (in comment)
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> licq-1.2.7.ebuild:
+  Fix use invocation
+
+  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> licq-1.2.7.ebuild:
+  Add inherit eutils
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> licq-1.2.7.ebuild:
+  stable on alpha and ia64
+
+  14 Mar 2004; Heinrich Wendel <lanius@gentoo.org> licq-1.2.7.ebuild,
+  files/1.2.7-nptl.patch:
+  compile with nptl, bug #44126
+
+  19 Oct 2003; Heinrich Wendel <lanius@gentoo.org> licq-1.2.6-r1.ebuild,
+  licq-1.2.6.ebuild, licq-1.2.7.ebuild:
+  cleanups, bug #22136
+
+  24 Sep 2003; Chuck Short <zul@gentoo.org> licq-1.2.7.ebuild:
+  Unmasked for sparc.
+
+  29 Aug 2003; Chuck Short <zul@gentoo.org> licq-1.2.7.ebuild:
+  Added ~sparc to keywords, closes #27522.
+
+  27 Aug 2003; Caleb Tennis <caleb@gentoo.org> licq-1.2.7.ebuild:
+  Change kde dependency issue to resolve bug #26857.
+
+  13 Aug 2003; Stewart <stewart@gentoo.org> licq-1.2.7.ebuild:
+  Marked for testing on PPC
+
+  09 Jul 2003; Martin Holzer <mholzer@gentoo.org> licq-1.2.7.ebuild:
+  Adding doc dir for docs. Closes #24026
+
+  07 Jul 2003; Brad Laue <brad@gentoo.org> licq-1.2.7.ebuild:
+  Marking 1.2.7 stable on x86 - calling all architecture people, this one needs
+  some love.
+
+*licq-1.2.7 (27 Jun 2003)
+
+  27 Jun 2003; Brad Laue <brad@gentoo.org> licq-1.2.7.ebuild,
+  files/1.2.7-debugflag.patch:
+  Update to version 1.2.7 - many bugfixes in this version. Updated the
+  debugflags patch to suit.
+
+  20 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> licq-1.2.6-r1.ebuild,
+  files/1.2.6-debugflag.patch:
+  Added patch for correct stripping of debug flags (bug 21009)
+
+*licq-1.2.6-r1 (04 June 2003)
+  04 June 2003; Brad Laue <brad@gentoo.org> licq-1.2.6-r1.ebuild:
+  Mark stable.
+
+*licq-1.2.6-r1 (04 May 2003)
+  04 May 2003; Thomas Raschbacher <lordvan@gentoo.org> licq-1.2.6-r1.ebuild:
+  fixes from brad@gentoo.org (bug #18205)
+	
+*licq-1.2.6 (22 Apr 2003)
+
+  22 Apr 2003; Daniel Robbins <drobbins@gentoo.org> licq-1.2.6.ebuild: A
+  tricky hack to fix the illegal "need kde && inherit kde-base". newdepend()
+  tweaks the DEPEND line, and we can't tweak dependencies in a conditional
+  as this messes up our dependency caching. This closes bugs #12436, #17925,
+  #18205.
+
+*licq-1.2.4-r2 (07 Feb 2003)
+
+  10 Feb 2003; Seemant Kulleen <seemant@gentoo.org> licq-1.2.4-r2.ebuild :
+
+  Changed ncurses dependency to be not strict on version.
+
+  07 Feb 2003; Thomas Raschbacher <lordvan@gentoo.org> licq-1.2.4-r2.ebuild:
+  removed old fix for #12436 and added new (set kde-gui as default)
+
+  07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> licq-1.2.4-r2.ebuild :
+
+  Some sed magic to detect which plugin is preferred
+
+  07 Feb 2003; Thomas Raschbacher <lordvan@gentoo.org> licq-1.2.4-r2.ebuild
+  files/licq.cpp-plugins.patch :
+
+  Console plugin only gets installed if ncurses is in USE.
+
+  07 Feb 2003; Seemant Kulleen <seemant@gentoo.org> licq-1.2.4-r2.ebuild
+  files/digest-licq-1.2.4-r2 :
+
+  There are a number of plugins that come with licq: Qt gui, GTK gui,
+  console front-end, remote management and auto-respond.  Only the Qt was
+  getting built, and the console plugin was a separate package in
+  portage(!!).  Qt and GTK are USE dependent, and the console, remote
+  management and auto-respond are built by default now.  Closes bug #15084
+  by Bruno Lustosa <bruno@lustosa.net>
+
+*licq-1.2.4-r1 (31 Jan 2003)
+
+  03 Feb 2003; Seemant Kulleen <seemant@gentoo.org> licq-1.2.4-r1.ebuild :
+
+  Fixed a typo that caused bug #15084 by Bruno Lustosa <bruno@lustosa.net>
+  where licq-console was still calling kde and qt as dependencies.
+
+  01 Feb 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix a typo that caused bug #13572 (ineffective USE flags).
+
+  31 Jan 2003; Dan Armak <danarmak@gentoo.org> ChangeLog  :
+
+  Fix bug #12436: create a symlink from the qt-only gui plugin to the kde
+  one when the kde plugin is built.
+
+*licq-1.2.4 (29 Jan 2003)
+
+  29 Jan 2003; Hannes Mehnert <hannes@gentoo.org> licq-1.2.4.ebuild:
+  version bump
+
+*licq-1.2.3 (10 Jan 2003)
+
+  10 Jan 2003; Hannes Mehnert <hannes@gentoo.org> licq-1.2.3.ebuild:
+  version bump, compiles fine with qt-3.1 and gcc-3.2.1 without patching
+  source, fixes bug #13493
+
+*licq-1.2.0a-r3 (26 Dec 2002)
+
+  26 Dec 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  licq-1.2.0a-r3.ebuild, files/digest-licq-1.2.0a-r3, ChangeLog,
+  files/1.2.0a-gcc3-gentoo.patch :
+
+  C++ fix for gcc3. Resolves bug 12623. (Marking ~x86 until tested).
+
+  26 Dec 2002; Matthew Kennedy <mkennedy@gentoo.org>
+  licq-1.2.0a-r3.ebuild, ChangeLog :
+
+  Marked as stable after receiving positive test feedback.
+
+*licq-1.2.0a-r2 (01 Dec 2002)
+
+  01 Dec 2002; Hannes Mehnert <hannes@gentoo.org> licq-1.2.0a-r2.ebuild:
+  added patch to work with qt-3.1. Thanks to toojays@toojays.net (John Steele
+  Scott) for submission (bug #11423)
+
+*licq-1.2.0a-r1 (13 Aug 2002)
+
+  15 Aug 2002; Arcady Genkin <agenkin@thpoon.com> licq-1.2.0a-r1.ebuild :
+
+  Added configure patch by <matt@schick.mine.nu> to fix compilation under
+  gcc-3.
+
+*licq-1.2.0a (13 Aug 2002)
+
+  13 Aug 2002; Arcady Genkin <agenkin@thpoon.com> licq-1.2.0a.ebuild :
+
+  Update to version 1.2.0a.  Thanks to Matt Rinsch <gfunkmonk@mochamail.com>
+  for the update.
+
+*licq-1.0.4-r2 (4 Apr 2002)
+
+  4 Apr 2002; Grant Goodyear <g2boojum@gentoo.org> :
+
+  Added patch from Paul de Vrieze to fix the problem that
+  kdeconf resets the cwd (to ${S}?).
diff --git a/net-im/licq/Manifest b/net-im/licq/Manifest
index 21bbbfb49096..4d30ceb7e840 100644
--- a/net-im/licq/Manifest
+++ b/net-im/licq/Manifest
@@ -1,12 +1,16 @@
-MD5 eca1447e2992d69d784803614a5873fd licq-1.2.4-r1.ebuild 1695
-MD5 819673c4d3476aa7e50072ddd8d2e09f licq-1.2.0a-r3.ebuild 1759
-MD5 57f9c9037e9db62bf2df7f7db9f7d921 licq-1.2.4-r2.ebuild 3741
-MD5 57f9c9037e9db62bf2df7f7db9f7d921 licq-1.2.6.ebuild 3741
-MD5 98018372dc2f08a0212a2c6eeb51c271 ChangeLog 3359
-MD5 75137b18c40ae9b662f3475b4c0becb9 files/digest-licq-1.2.0a-r3 65
-MD5 a8826dd5f10c7c144c806bdaced90479 files/digest-licq-1.2.4-r1 64
-MD5 a8826dd5f10c7c144c806bdaced90479 files/digest-licq-1.2.4-r2 64
-MD5 361d20e528b72b61170b815694ebe1c7 files/digest-licq-1.2.6 64
-MD5 ea0b7f8aa5cf8b175753ede6025f06ce files/1.2.0a-qt31.patch 1306
-MD5 3b10872fafb342e13b1b81dacae7d68e files/1.2.0a-gcc3-gentoo.patch 1996
-MD5 6d0aca705b508a2fef7714d742683001 files/1.2.0a-config.patch 996
+MD5 d91e7f5c82182d60951d34240ea1044c ChangeLog 11383
+MD5 c18e90be9c36c7efb06211733ad765ff files/1.2.7-debugflag.patch 396
+MD5 5f64e4b71c311ff7b6489953fc8bf1f9 files/1.2.7-nptl.patch 1178
+MD5 5dbb2a47d1d863a55f564e874c871d30 files/1.3.0-gpgme3_hack.patch 878
+MD5 52dadf7b64ef4fb690c7892d94b445d6 files/1.3.0-no_stupid_koloboks.patch 3160
+MD5 100dc5f1d551dc769a337a71734d0e59 files/1.3.0-suse_bool.patch 191
+MD5 60faacd9044ad4dd88db77e0bd53dc7f files/1.3.2-email_typo.patch 620
+MD5 3795e526fdf015e985be17fca698e2d1 files/digest-licq-1.2.7 64
+MD5 b0a924ef22c21dd596d7918631f18559 files/digest-licq-1.3.0 64
+MD5 b7d176e7d3091d82fed1f4931604b327 files/digest-licq-1.3.2 64
+MD5 b7d176e7d3091d82fed1f4931604b327 files/digest-licq-1.3.2-r1 64
+MD5 f30c97a120a37f90edd8abdf612cd52a licq-1.2.7.ebuild 3368
+MD5 f8691d71dd37438ad228897e6e32b908 licq-1.3.0.ebuild 3800
+MD5 b6602d07b65d88645dac04ab170a8f51 licq-1.3.2-r1.ebuild 4987
+MD5 153de58b78fe36946f7d7ac33ecda9f4 licq-1.3.2.ebuild 4857
+MD5 7adc6310a4dbd42bad26caa80683d4ec metadata.xml 249
diff --git a/net-im/licq/files/1.3.0-gpgme3_hack.patch b/net-im/licq/files/1.3.0-gpgme3_hack.patch
index 8ce36cedb163..996b4169edbd 100644
--- a/net-im/licq/files/1.3.0-gpgme3_hack.patch
+++ b/net-im/licq/files/1.3.0-gpgme3_hack.patch
@@ -1,5 +1,5 @@
---- configure~	2004-08-20 23:11:47.676939085 +0400
-+++ configure	2004-08-20 23:11:57.560881631 +0400
+--- configure~	2004-08-22 20:10:52.000000000 +0400
++++ configure	2004-08-22 20:11:10.000000000 +0400
 @@ -6388,7 +6388,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -9,3 +9,23 @@
  cat >conftest.$ac_ext <<_ACEOF
  #line $LINENO "configure"
  /* confdefs.h.  */
+@@ -6438,7 +6438,7 @@
+ echo "${ECHO_T}$ac_cv_lib_gpgme_gpgme_check_version" >&6
+ if test $ac_cv_lib_gpgme_gpgme_check_version = yes; then
+ 
+-                    LIBS="$LIBS -lgpgme"
++                    LIBS="$LIBS -lgpgme3"
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBGPGME 1
+--- include/licq_gpg.h.orig	2004-08-22 22:58:46.660566481 +0400
++++ include/licq_gpg.h	2004-08-22 22:57:15.460429001 +0400
+@@ -3,7 +3,7 @@
+ #define _LICQ_GPG_H_INCLUDED_
+ 
+ #ifdef HAVE_LIBGPGME
+-#include <gpgme.h>
++#include <gpgme3/gpgme.h>
+ #endif
+ #include <pthread.h>
+ 
diff --git a/net-im/licq/files/1.3.0-no_stupid_koloboks.patch b/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
index a76080c2845e..76ee1be9eb48 100644
--- a/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
+++ b/net-im/licq/files/1.3.0-no_stupid_koloboks.patch
@@ -1,9 +1,7 @@
-Only in src~: 1.3.0-no_stupid_koloboks.patch
-Common subdirectories: src/CVS and src~/CVS
-diff -u src/mainwin.h src~/mainwin.h
---- src/mainwin.h	2004-08-10 17:49:24.000000000 +0400
-+++ src~/mainwin.h	2004-08-20 22:49:01.383931834 +0400
-@@ -131,6 +131,7 @@
+diff -uraN src/mainwin.h src~/mainwin.h
+--- src/mainwin.h	2004-09-15 19:14:06.000000000 +0400
++++ src~/mainwin.h	2004-09-28 19:16:56.485815523 +0400
+@@ -150,6 +150,7 @@
         m_bAutoPosReplyWin,
         m_bAutoSendThroughServer,
         m_bEnableMainwinMouseMovement,
@@ -11,24 +9,22 @@ diff -u src/mainwin.h src~/mainwin.h
         m_bPopEmail,
         m_bPopPhone,
         m_bPopFax,
-diff -u src/mlview3.cpp src~/mlview3.cpp
---- src/mlview3.cpp	2004-08-20 23:21:25.338742474 +0400
-+++ src~/mlview3.cpp	2004-08-20 23:26:33.794602521 +0400
+diff -uraN src/mlview3.cpp src~/mlview3.cpp
+--- src/mlview3.cpp	2004-01-17 16:18:18.000000000 +0300
++++ src~/mlview3.cpp	2004-09-28 19:17:53.767142190 +0400
 @@ -83,7 +83,8 @@
    // not used for html now QString text = QStyleSheet::escape(s);
    QString text = useHTML ? s: QStyleSheet::escape(s);
  
 -  gMainWindow->emoticons->ParseMessage(text);
 +  if (gMainWindow->m_bShowKoloboks)
-+     gMainWindow->emoticons->ParseMessage(text);
++    gMainWindow->emoticons->ParseMessage(text);
  
      // We must hightlight URLs at this step, before we convert
      // linebreaks to richtext tags and such.  Also, check to make sure
-Common subdirectories: src/moc and src~/moc
-Common subdirectories: src/obj and src~/obj
-diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
---- src/optionsdlg.cpp	2004-07-12 05:36:17.000000000 +0400
-+++ src~/optionsdlg.cpp	2004-08-20 22:53:43.592957691 +0400
+diff -uraN src/optionsdlg.cpp src~/optionsdlg.cpp
+--- src/optionsdlg.cpp	2004-09-06 16:50:56.000000000 +0400
++++ src~/optionsdlg.cpp	2004-09-28 19:19:38.975690580 +0400
 @@ -216,6 +216,7 @@
    chkAutoPosReplyWin->setChecked(mainwin->m_bAutoPosReplyWin);
    chkAutoSendThroughServer->setChecked(mainwin->m_bAutoSendThroughServer);
@@ -37,7 +33,7 @@ diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
    popEmail->setChecked(mainwin->m_bPopEmail);
    popPhone->setChecked(mainwin->m_bPopPhone);
    popFax->setChecked(mainwin->m_bPopFax);
-@@ -491,6 +492,7 @@
+@@ -494,6 +495,7 @@
    mainwin->m_bAutoPosReplyWin = chkAutoPosReplyWin->isChecked();
    mainwin->m_bAutoSendThroughServer = chkAutoSendThroughServer->isChecked();
    mainwin->m_bEnableMainwinMouseMovement = chkEnableMainwinMouseMovement->isChecked();
@@ -45,7 +41,7 @@ diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
  
    mainwin->m_bPopEmail= popEmail->isChecked();
    mainwin->m_bPopPhone= popPhone->isChecked();
-@@ -752,6 +754,8 @@
+@@ -768,6 +770,8 @@
    chkEnableMainwinMouseMovement = new QCheckBox(tr("Allow dragging main window"), boxMainWin);
    QWhatsThis::add(chkEnableMainwinMouseMovement, tr("Lets you drag around the main window "
     "with your mouse"));
@@ -54,16 +50,16 @@ diff -u src/optionsdlg.cpp src~/optionsdlg.cpp
  
    chkMsgChatView = new QCheckBox(tr("Chatmode Messageview"), boxMainWin);
    QWhatsThis::add(chkMsgChatView, tr("Show the current chat history in Send Window"));
-diff -u src/optionsdlg.h src~/optionsdlg.h
+diff -uraN src/optionsdlg.h src~/optionsdlg.h
 --- src/optionsdlg.h	2004-07-12 05:36:17.000000000 +0400
-+++ src~/optionsdlg.h	2004-08-20 23:22:49.063329574 +0400
-@@ -79,7 +79,7 @@
++++ src~/optionsdlg.h	2004-09-28 19:19:52.303971975 +0400
+@@ -79,7 +79,8 @@
               *chkAlwaysShowONU, *chkScrollBar, *chkShowExtIcons,
               *chkSysBack, *chkSendFromClipboard, *chkMsgChatView, *chkAutoPosReplyWin,
  	     *chkAutoSendThroughServer, *chkTabbedChatting,
 -             *chkEnableMainwinMouseMovement;
-+             *chkEnableMainwinMouseMovement, *chkShowKoloboks;
++             *chkEnableMainwinMouseMovement,
++	     *chkShowKoloboks;
     QRadioButton *rdbDockDefault, *rdbDockThemed, *rdbDockSmall;
     QComboBox *cmbDockTheme, *cmbSortBy;
  
-Common subdirectories: src/xpm and src~/xpm
diff --git a/net-im/licq/licq-1.2.7.ebuild b/net-im/licq/licq-1.2.7.ebuild
index c03cdf78c51d..3ce734b04099 100644
--- a/net-im/licq/licq-1.2.7.ebuild
+++ b/net-im/licq/licq-1.2.7.ebuild
@@ -1,35 +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/net-im/licq/licq-1.2.7.ebuild,v 1.1 2003/06/27 09:54:57 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.2.7.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
-inherit kde-base
-need-kde 3.0
+inherit eutils kde-functions
 
-DESCRIPTION="ICQ Client with v8 support" 
+DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
 SRC_URI="http://download.sourceforge.net/licq/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc alpha ia64 ~amd64"
 IUSE="ssl socks5 qt kde ncurses"
 
-# we can't have conditional dependencies so "use kde && inherit kde-base" 
+# we can't have conditional dependencies so "use kde && inherit kde"
 # won't work -- messes up dep caching.
 
 # need-kde and their eclass friends inject things into DEPEND. But we only
 # want them enabled if the kde USE flag is set. We get around this in the
 # following dep lines:
-RDEPEND="kde? ( ${DEPEND} )"
-DEPEND="kde? ( ${DEPEND} )
+RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )"
+DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( >=x11-libs/qt-3.0.0 )
+	qt? ( =x11-libs/qt-3* )
 	ncurses? ( sys-libs/ncurses )"
 
 src_unpack() {
 	unpack ${A}
 
-	if [ "`use kde`" ]
+	if use kde
 	then
 		# fix for #12436
 		ebegin "Setting kde plugin as default..."
@@ -38,7 +37,7 @@ src_unpack() {
 			${T}/licq.conf.h > ${S}/src/licq.conf.h
 		eend $?
 	else
-		if [ -z "`use qt`" ]
+		if ! use qt
 		then
 				ebegin "Setting console plugin as default..."
 				cp ${S}/src/licq.conf.h ${T}
@@ -48,7 +47,8 @@ src_unpack() {
 		fi
 	fi
 	cd ${S}
-	patch -p0 < ${FILESDIR}/1.2.7-debugflag.patch || die "patch failed"
+	epatch ${FILESDIR}/1.2.7-debugflag.patch
+	epatch ${FILESDIR}/1.2.7-nptl.patch
 }
 
 src_compile() {
@@ -58,19 +58,15 @@ src_compile() {
 
 	econf ${myconf} || die
 	emake || die
-	
+
 	# Create the various plug-ins
 
 	# First, the Qt plug-in
-	if [ "`use qt`" ] 
+	if use qt
 	then
-		# A hack to build against the latest QT:
-		local v
-		for v in /usr/qt/[0-9]
-		do
-			[ -d "${v}" ] && export QTDIR="${v}"
-		done
-		use kde && kde_src_compile myconf
+		set-qtdir 3
+		set-kdedir 3
+
 		use kde && myconf="${myconf} --with-kde"
 
 		# note! watch the --prefix=/usr placement;
@@ -85,7 +81,7 @@ src_compile() {
 	fi
 
 	# Now the console plug-in
-	if [ "`use ncurses `" ]
+	if use ncurses
 	then
 		cd ${S}/plugins/console
 		einfo "Compiling the Console plug-in"
@@ -109,25 +105,25 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 
-	dodoc ChangeLog INSTALL README*
+	dodoc ChangeLog INSTALL README* doc/*
 
 	# Install the plug-ins
-	if [ "`use qt`" ] 
+	if use qt
 	then
 		cd ${S}/plugins/qt-gui
-		make DESTDIR=${D} install || die	
+		make DESTDIR=${D} install || die
 		docinto plugins/qt-gui
 		dodoc README*
-		
+
 		# fix bug #12436, see my comment there
-##		if [ "`use kde`" ]; then
+##		if use kde; then
 ##			cd $D/usr/lib/licq
 ##			ln -s licq_kde-gui.la licq_qt-gui.la
 ##			ln -s licq_kde-gui.so licq_qt-gui.so
 ##		fi
 	fi
 
-	if [ "`use ncurses`" ]
+	if use ncurses
 	then
 	    cd ${S}/plugins/console
 	    make DESTDIR=${D} install || die
@@ -145,4 +141,7 @@ src_install() {
 	make DESTDIR=${D} install || die
 	docinto plugins/rms
 	dodoc README licq_rms.conf
+
+	# fixes bug #22136
+	rm -fR ${D}/var
 }
diff --git a/net-im/licq/licq-1.3.0.ebuild b/net-im/licq/licq-1.3.0.ebuild
index cee550d4822e..ff6a96ed0c18 100644
--- a/net-im/licq/licq-1.3.0.ebuild
+++ b/net-im/licq/licq-1.3.0.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/net-im/licq/licq-1.3.0.ebuild,v 1.1 2004/10/01 14:47:37 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.0.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
-inherit eutils
+inherit eutils kde-functions
 
 DESCRIPTION="ICQ Client with v8 support"
 HOMEPAGE="http://www.licq.org/"
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_pre/-PRE}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ia64 ppc ~sparc ~x86"
 IUSE="ssl socks5 qt kde ncurses crypt"
 
 # we can't have conditional dependencies so "use kde && inherit kde"
@@ -22,12 +22,10 @@ IUSE="ssl socks5 qt kde ncurses crypt"
 RDEPEND="kde? ( >=kde-base/kdelibs-3.0 )"
 DEPEND="kde? ( >=kde-base/kdelibs-3.0 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )
-	qt? ( >=x11-libs/qt-3.0.0 )
+	qt? ( =x11-libs/qt-3* )
 	ncurses? ( sys-libs/ncurses dev-libs/cdk )
 	crypt? ( =app-crypt/gpgme-0.3.14-r1 )"
 
-S=${WORKDIR}/${P}
-
 src_unpack() {
 	unpack ${A}
 
@@ -54,6 +52,11 @@ src_unpack() {
 	cd ${S}/plugins/qt-gui && \
 		epatch ${FILESDIR}/${PV}-no_stupid_koloboks.patch || \
 		ewarn "Fail to kill koloboks, forget it"
+
+	if use crypt; then
+		cd ${S}
+		epatch ${FILESDIR}/1.3.0-gpgme3_hack.patch
+	fi
 }
 
 src_compile() {
@@ -63,7 +66,6 @@ src_compile() {
 	if use crypt
 	then
 		myconf="${myconf} --enable-gpgme"
-		epatch ${FILESDIR}/1.3.0-gpgme3_hack.patch
 	else
 		myconf="${myconf} --disable-gpgme"
 	fi
@@ -76,13 +78,9 @@ src_compile() {
 	# First, the Qt plug-in
 	if use qt
 	then
-		# A hack to build against the latest QT:
-		local v
-		for v in /usr/qt/[0-9]
-		do
-			[ -d "${v}" ] && export QTDIR="${v}"
-		done
-#		use kde && kde_src_compile myconf
+		set-qtdir 3
+		set-kdedir 3
+
 		use kde && myconf="${myconf} --with-kde"
 
 		# note! watch the --prefix=/usr placement;
diff --git a/net-im/licq/licq-1.3.2-r1.ebuild b/net-im/licq/licq-1.3.2-r1.ebuild
index 7f3c8e73a148..188dce87d9b0 100644
--- a/net-im/licq/licq-1.3.2-r1.ebuild
+++ b/net-im/licq/licq-1.3.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/net-im/licq/licq-1.3.2-r1.ebuild,v 1.1 2005/11/12 12:02:08 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
 inherit eutils kde-functions multilib
 
@@ -36,7 +36,6 @@ src_unpack() {
 	if use kde
 	then
 		# fix for #12436
-		inherit
 		ebegin "Setting kde plugin as default"
 		cp ${S}/src/licq.conf.h ${T}
 		sed "s:Plugin1 = qt-gui:Plugin1 = kde-gui:" \
diff --git a/net-im/licq/licq-1.3.2.ebuild b/net-im/licq/licq-1.3.2.ebuild
index f76fb9c0049a..ed910c58aa98 100644
--- a/net-im/licq/licq-1.3.2.ebuild
+++ b/net-im/licq/licq-1.3.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/net-im/licq/licq-1.3.2.ebuild,v 1.1 2005/10/21 16:08:34 voxus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/licq/licq-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
 inherit eutils kde-functions multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 amd64"
 IUSE="ssl socks5 qt kde ncurses crypt msn"
 
 # we can't have conditional dependencies so "use kde && inherit kde"
@@ -36,7 +36,6 @@ src_unpack() {
 	if use kde
 	then
 		# fix for #12436
-		inherit
 		ebegin "Setting kde plugin as default"
 		cp ${S}/src/licq.conf.h ${T}
 		sed "s:Plugin1 = qt-gui:Plugin1 = kde-gui:" \
diff --git a/net-im/licq/metadata.xml b/net-im/licq/metadata.xml
index 9691588a26eb..17d6694798be 100644
--- a/net-im/licq/metadata.xml
+++ b/net-im/licq/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
diff --git a/net-im/linpopup/ChangeLog b/net-im/linpopup/ChangeLog
index 8e6b2d21bc5a..7c1e6dee9cee 100644
--- a/net-im/linpopup/ChangeLog
+++ b/net-im/linpopup/ChangeLog
@@ -1,8 +1,43 @@
-# ChangeLog for app-admin/gentoolkit
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.1 2003/01/05 12:53:42 mholzer Exp $
+# ChangeLog for net-im/linpopup
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/ChangeLog,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
-*linpopup-1.2.0.ebuild (04 Jan 2002)
+*linpopup-2.0.4-r1 (01 Jan 2005)
+
+  01 Jan 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/2.0.4-overflow.patch, +linpopup-2.0.4-r1.ebuild,
+  -linpopup-2.0.4.ebuild:
+  Add patch from upstream cvs #74705.
+
+*linpopup-2.0.4 (30 Dec 2004)
+
+  30 Dec 2004; Mike Frysinger <vapier@gentoo.org> -linpopup-1.2.0.ebuild,
+  -linpopup-2.0.3.ebuild, +linpopup-2.0.4.ebuild:
+  Version bump #74705.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> linpopup-2.0.2.ebuild,
+  linpopup-2.0.3.ebuild:
+  Fix use invocation
+
+  09 May 2004; <SeJo@gentoo.org> linpopup-2.0.3.ebuild:
+  added ~ppc keyword
+
+  23 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> linpopup-2.0.2.ebuild:
+  Unmask on x86, added IUSE and removed S=
+
+*linpopup-2.0.3 (24 Mar 2004)
+
+  24 Mar 2004; Martin Holzer <mholzer@gentoo.org> linpopup-2.0.3.ebuild:
+  Version bumped. Closes 45596
+
+*linpopup-2.0.2 (25 Sep 2003)
+
+  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> linpopup-2.0.2.ebuild,
+  files/linpopup.desktop:
+  Version bumped. Ebuild submitted by Nicholas D. Wolfwood
+  <wolfwood@users.sourceforge.net> in #29474.
+
+*linpopup-1.2.0 (04 Jan 2002)
 
   04 Jan 2002; Martin Holzer <mholzer@gentoo.org> linpopup-1.2.0.ebuild files/digest-linpopup-1.2.0 ChangeLog :
   Initial Version submitted by m@lcolm.org.uk in #11861.
diff --git a/net-im/linpopup/Manifest b/net-im/linpopup/Manifest
index e69de29bb2d1..33dca0a60ca6 100644
--- a/net-im/linpopup/Manifest
+++ b/net-im/linpopup/Manifest
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 48ef497c6193964d906bae7314aa5095 ChangeLog 1476
+MD5 9ead3179060cb377805546495dba637f linpopup-2.0.4-r1.ebuild 1582
+MD5 a3fcae3408f094817d2ad03286f02d1f linpopup-2.0.2.ebuild 1520
+MD5 52071c5040fa5348d84e3afe928ea50b files/digest-linpopup-2.0.4-r1 67
+MD5 cc6067f86d972179bff61a52dbec66fa files/digest-linpopup-2.0.2 67
+MD5 64959795c47be33ab1bf172f96c02371 files/linpopup.desktop 188
+MD5 1bbbe64c9e5268b1b46a7989561a20d2 files/2.0.4-overflow.patch 1336
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFB1yDBroRuSHgZdywRAq1hAJ47puxzddaIGHD7bDCsm8xA6lRYMQCdH9DY
+iZkZZiKwVofOJC6RlhDBOcU=
+=QMz0
+-----END PGP SIGNATURE-----
diff --git a/net-im/linpopup/linpopup-2.0.2.ebuild b/net-im/linpopup/linpopup-2.0.2.ebuild
index 649282e56de0..00f75f9e2f27 100644
--- a/net-im/linpopup/linpopup-2.0.2.ebuild
+++ b/net-im/linpopup/linpopup-2.0.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/net-im/linpopup/linpopup-2.0.2.ebuild,v 1.1 2003/09/24 20:23:27 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 inherit gnome2
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://linpopup2.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 RDEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/glib-2
@@ -21,14 +21,12 @@ RDEPEND=">=x11-libs/gtk+-2
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
-
+IUSE="gnome"
 DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MANUAL NEWS README THANKS TODO"
 
-S=${WORKDIR}/${P}
-
 src_install() {
 	# Install icon and .desktop for menu entry
-	if [ `use gnome` ] ; then
+	if use gnome ; then
 		insinto /usr/share/pixmaps
 		newins ${S}/pixmaps/icon_256.xpm linpopup.xpm
 		insinto /usr/share/applications
diff --git a/net-im/linpopup/linpopup-2.0.4-r1.ebuild b/net-im/linpopup/linpopup-2.0.4-r1.ebuild
index b09eec8ae8b9..00062f096286 100644
--- a/net-im/linpopup/linpopup-2.0.4-r1.ebuild
+++ b/net-im/linpopup/linpopup-2.0.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/net-im/linpopup/linpopup-2.0.4-r1.ebuild,v 1.1 2005/01/01 22:14:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/linpopup/linpopup-2.0.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 inherit gnome2 eutils
 
diff --git a/net-im/mercury-bin/ChangeLog b/net-im/mercury-bin/ChangeLog
index 9b0967ee9bea..a918bdfb663e 100644
--- a/net-im/mercury-bin/ChangeLog
+++ b/net-im/mercury-bin/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-im/mercury-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/ChangeLog,v 1.1 2005/02/04 18:27:21 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/ChangeLog,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
+
+*mercury-bin-1709_rc1 (17 Mar 2005)
+
+  17 Mar 2005; Thomas Matthijs <axxo@gentoo.org>
+  +mercury-bin-1709_rc1.ebuild:
+  version bump
+
+  08 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>; files/mercury.sh:
+  Axxo made a very nice job at traking down the deps. This is "almost" ready for
+  unmasking.
+
+*mercury-bin-1709_beta7 (01 Mar 2005)
+
+  01 Mar 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +mercury-bin-1709_beta7.ebuild:
+  New version :) Lots of fixes and some more new bugs.
 
 *mercury-bin-1708 (04 Feb 2005)
 
diff --git a/net-im/mercury-bin/Manifest b/net-im/mercury-bin/Manifest
index 8f8ec1b2f70b..73132c2b3a82 100644
--- a/net-im/mercury-bin/Manifest
+++ b/net-im/mercury-bin/Manifest
@@ -1,4 +1,16 @@
-MD5 750a90d7126c59e4329e7ae5ac04f4f8 mercury-bin-1708.ebuild 1194
-MD5 7a12a89ab59240f3ac8944ae258eca10 files/digest-mercury-bin-1708 67
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 db64959ca5ce9c020a13dcd2b9ab5970 mercury-bin-1709_rc1.ebuild 1570
+MD5 9b1cab5624d2988449e5056c4281cb8e ChangeLog 921
+MD5 16021df92c2051cb101ec0833e9cc116 metadata.xml 634
 MD5 037a6938a09ec22db8941a747726772d files/icon32.gif 1262
-MD5 6b68b0266d5cffafbd1ac77e0d9f7132 files/mercury.sh 265
+MD5 63491834fd49c7eb2696650ee9f2d4f3 files/mercury.sh 242
+MD5 1060171931d5b6a95e652650f4e2507e files/digest-mercury-bin-1709_rc1 58
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCOc/q/rLF9B432nYRAgWrAJ0ayl+h/1ET+n5GGVfO0DLOVieLxwCcCqDL
+zdHUIX0PCSLe8T7zDLwM2Hk=
+=auW8
+-----END PGP SIGNATURE-----
diff --git a/net-im/mercury-bin/files/mercury.sh b/net-im/mercury-bin/files/mercury.sh
index 5c9961787a00..956db56ca5ca 100644
--- a/net-im/mercury-bin/files/mercury.sh
+++ b/net-im/mercury-bin/files/mercury.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
 MERCURY_INSTALL_PATH="/opt/mercury-bin"
-JDICTRAY_INSTALL_PATH="/opt/jdictrayapi/lib/"
 cd ${MERCURY_INSTALL_PATH}
-java -Djava.library.path=${JDICTRAY_INSTALL_PATH} -classpath $(java-config -p jdom-1.0_beta6,jdictrayapi,jmf-bin,mercury-bin) com.dMSN.Main
+java -Djava.library.path=$(java-config -i jdictrayapi) -classpath $(java-config -p jdom-1.0,jdictrayapi,jmf-bin,mercury-bin,xpp3,jgoodies-looks-1.3) com.dMSN.Main
diff --git a/net-im/mercury-bin/mercury-bin-1709_rc1.ebuild b/net-im/mercury-bin/mercury-bin-1709_rc1.ebuild
index c69c0759d70f..c26d20ddf367 100644
--- a/net-im/mercury-bin/mercury-bin-1709_rc1.ebuild
+++ b/net-im/mercury-bin/mercury-bin-1709_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/net-im/mercury-bin/mercury-bin-1709_rc1.ebuild,v 1.1 2005/03/17 18:41:20 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mercury-bin/mercury-bin-1709_rc1.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 inherit eutils java-pkg
 
diff --git a/net-im/msn-transport/ChangeLog b/net-im/msn-transport/ChangeLog
index 4c26d3bc9145..0abc33deec24 100644
--- a/net-im/msn-transport/ChangeLog
+++ b/net-im/msn-transport/ChangeLog
@@ -1,6 +1,83 @@
 # ChangeLog for net-im/msn-transport
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.1 2004/01/23 18:12:27 humpback Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
+
+  17 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  msn-transport-20040531-r1.ebuild:
+  alpha needs >=net-im/jabberd-1.4 first
+
+  17 Sep 2005; Aron Griffis <agriffis@gentoo.org>
+  msn-transport-20040531-r1.ebuild:
+  Mark 20040531-r1 stable on alpha
+
+  05 May 2005; Sven Wegener <swegener@gentoo.org>
+  msn-transport-20040531.ebuild, msn-transport-20040531-r1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  02 Apr 2005; Jason Wever <weeve@gentoo.org>
+  msn-transport-20040531-r1.ebuild:
+  Stable on SPARC.
+
+  25 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
+  msn-transport-20040531-r1.ebuild:
+  Add ~alpha keyword, bug 83819.
+
+  27 Oct 2004; Tom Martin <slarti@gentoo.org>
+  msn-transport-20040531-r1.ebuild:
+  Marked ~amd64.
+
+  21 Aug 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  files/msn-transport.init, files/msn-transport.init-r2:
+  Fixed typo in init script, closes bug #60344
+
+*msn-transport-20040531-r1 (09 Jul 2004)
+
+  09 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +files/msn-transport-conf.d, +files/msn-transport.init-r2,
+  +msn-transport-20040531-r1.ebuild:
+  New revision that installs more stable init.d script
+
+  07 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  msn-transport-20040531.ebuild:
+  Stable on hppa so that deps dont break
+
+  03 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  -msn-transport-1.2.8_rc1.ebuild, msn-transport-20040531.ebuild:
+  Better dependencies
+
+  19 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  msn-transport-20040531.ebuild:
+  Marking stable on x86
+
+  08 Jun 2004; Guy Martin <gmsoft@gentoo.org> msn-transport-20040531.ebuild:
+  Marked stable on hppa.
+
+  03 Jun 2004; David Holm <dholm@gentoo.org> msn-transport-20040531.ebuild:
+  Added to ~ppc.
+
+*msn-transport-20040531 (01 Jun 2004)
+
+  01 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  msn-transport-20040531.ebuild, files/msn-transport.init:
+  Adding new version and updating init script. Getting close to update.
+
+  24 May 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  msn-transport-1.2.8_rc1.ebuild, msn-transport-20040228.ebuild:
+  Changed description, thanks to Daniel Webert <daniel_webert@web.de> in bug
+  51673
+
+*msn-transport-20040228 (08 Apr 2004)
+
+  08 Apr 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  msn-transport-20040228.ebuild:
+  Adding version 20040228 and it's init script, helps fix bug 43851.
+
+  25 Feb 2004; Jason Wever <weeve@gentoo.org> msn-transport-1.2.8_rc1.ebuild:
+  Added ~sparc keyword, helps resolve bug #42928.
+
+  17 Feb 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  msn-transport-1.2.8_rc1.ebuild:
+  Marking stable on x86
 
 *msn-transport-1.2.8_rc1 (23 Jan 2004)
 
diff --git a/net-im/msn-transport/Manifest b/net-im/msn-transport/Manifest
index 8c4221fc2337..f5395c4dc345 100644
--- a/net-im/msn-transport/Manifest
+++ b/net-im/msn-transport/Manifest
@@ -1,6 +1,12 @@
-MD5 1ab34f7c3d67191ae6bc8ab1826daa98 msn-transport-1.2.8_rc1.ebuild 1046
 MD5 d76a7c620d2b4630a7f3f6d6a0f4e353 metadata.xml 319
-MD5 308a246e02cf5736ff25acd664cce371 ChangeLog 479
-MD5 96efe3e8d5fb4bfc38fd35545dd1140b files/msnt.xml 3285
+MD5 41f5164ee5a44e0e7ba4880c76afcb0b msn-transport-20040531-r1.ebuild 1408
+MD5 0fe05e70940f3741ebea8bbe52a1a472 ChangeLog 3110
+MD5 2aea16c7d42f1ead12631a358664375c msn-transport-20040531.ebuild 1311
+MD5 5fab4d7c4c2ae4b6dcf45a407c56f8ea files/msn-transport.init 423
+MD5 b10c249fc6c73b6357de44efcc6b93f9 files/msn-transport.init-r2 697
+MD5 95e51aeefb99a8ede13bef28054f9922 files/msn-transport-conf.d 427
 MD5 052318a7b8dfc18122569ed5aac82ab2 files/README.Gentoo 1495
 MD5 2bb7338640063281eeef587f8ce0fd5e files/msn-configure-patch-00 805
+MD5 6b5eaadda94bd02fb01ef8ae6631c7fd files/digest-msn-transport-20040531 75
+MD5 5fd3cce8c18bc9ca1aa9ff085bcb3f7e files/msnt.xml 3328
+MD5 6b5eaadda94bd02fb01ef8ae6631c7fd files/digest-msn-transport-20040531-r1 75
diff --git a/net-im/msn-transport/files/msn-transport-conf.d b/net-im/msn-transport/files/msn-transport-conf.d
index 3f4a06c84e34..849411c1133d 100644
--- a/net-im/msn-transport/files/msn-transport-conf.d
+++ b/net-im/msn-transport/files/msn-transport-conf.d
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/files/msn-transport-conf.d,v 1.1 2004/07/09 18:07:04 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/files/msn-transport-conf.d,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 CONFIG="/etc/jabber/msnt.xml"
 
diff --git a/net-im/msn-transport/files/msn-transport.init b/net-im/msn-transport/files/msn-transport.init
index 18d2e954d5cc..9d5ad2b5696c 100644
--- a/net-im/msn-transport/files/msn-transport.init
+++ b/net-im/msn-transport/files/msn-transport.init
@@ -6,14 +6,18 @@ depend() {
 }
 
 start() {
+	ebegin "Starting MSN Jabber Transport"
 	jabberd -B -c /etc/jabber/msnt.xml -H /var/spool/jabber >/dev/null 2>&1
+	eend $?
 }
 
 stop() {
+	ebegin "Stopping MSN Jabber Transport"
 	kill `cat /var/log/jabber/msnt.pid`
 	sleep 2
-	if ( -f /var/log/jabber/msnt.pid ); then
+	if [ -f /var/log/jabber/msnt.pid ]; then
 		kill -9 `cat /var/log/jabber/msnt.pid`
 		rm -f /var/log/jabber/msnt.pid
 	fi
+	eend $?
 }
diff --git a/net-im/msn-transport/files/msn-transport.init-r2 b/net-im/msn-transport/files/msn-transport.init-r2
index faf0e1d40996..143b9f4c7b31 100644
--- a/net-im/msn-transport/files/msn-transport.init-r2
+++ b/net-im/msn-transport/files/msn-transport.init-r2
@@ -19,7 +19,7 @@ start() {
 }
 
 stop() {
-	ebegin "Stoping MSN Jabber Transport"
+	ebegin "Stopping MSN Jabber Transport"
         if [ -f ${PIDFILE} ]; then
                 kill `cat ${PIDFILE}`
         fi
diff --git a/net-im/msn-transport/files/msnt.xml b/net-im/msn-transport/files/msnt.xml
index 41e60f48bfc4..e61955e7045f 100644
--- a/net-im/msn-transport/files/msnt.xml
+++ b/net-im/msn-transport/files/msnt.xml
@@ -102,5 +102,5 @@
       <secret>test</secret>
     </connect>
   </service>
-
+<pidfile>/var/log/jabber/msnt.pid</pidfile>
 </jabber>
diff --git a/net-im/msn-transport/msn-transport-20040531-r1.ebuild b/net-im/msn-transport/msn-transport-20040531-r1.ebuild
index 2570e7362d19..aa0981a64f55 100644
--- a/net-im/msn-transport/msn-transport-20040531-r1.ebuild
+++ b/net-im/msn-transport/msn-transport-20040531-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/net-im/msn-transport/msn-transport-20040531-r1.ebuild,v 1.1 2004/07/09 18:07:04 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 MY_PV="2004-05-31"
 #Ugly, msn-transport weired version numbers
@@ -11,11 +11,11 @@ HOMEPAGE="http://msn-transport.jabberstudio.org/"
 SRC_URI="http://msn-transport.jabberstudio.org/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc hppa ~sparc"
+KEYWORDS="~alpha ~amd64 hppa ~ppc sparc x86"
 IUSE=""
 SLOT="0"
 
-DEPEND=">=net-im/jabberd-1.4*
+DEPEND=">=net-im/jabberd-1.4
 		net-misc/curl"
 
 src_compile() {
diff --git a/net-im/msn-transport/msn-transport-20040531.ebuild b/net-im/msn-transport/msn-transport-20040531.ebuild
index d4c18e4ff1a0..254f036f1ddd 100644
--- a/net-im/msn-transport/msn-transport-20040531.ebuild
+++ b/net-im/msn-transport/msn-transport-20040531.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/net-im/msn-transport/msn-transport-20040531.ebuild,v 1.1 2004/06/01 11:24:14 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msn-transport/msn-transport-20040531.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 MY_PV="2004-05-31"
 #Ugly, msn-transport weired version numbers
@@ -11,11 +11,11 @@ HOMEPAGE="http://msn-transport.jabberstudio.org/"
 SRC_URI="http://msn-transport.jabberstudio.org/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc hppa ~sparc"
 IUSE=""
 SLOT="0"
 
-DEPEND=">=net-im/jabberd-1.4.3-r3
+DEPEND=">=net-im/jabberd-1.4
 		net-misc/curl"
 
 src_compile() {
diff --git a/net-im/msnlib/ChangeLog b/net-im/msnlib/ChangeLog
index d422b7c4c320..ab989dc8d666 100644
--- a/net-im/msnlib/ChangeLog
+++ b/net-im/msnlib/ChangeLog
@@ -1,9 +1,58 @@
 # ChangeLog for net-im/msnlib
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/ChangeLog,v 1.1 2003/04/19 14:00:45 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/ChangeLog,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
+
+  07 Aug 2005; Joseph Jezak <josejx@gentoo.org> msnlib-3.4.ebuild:
+  Marked ppc stable for bug #101233.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  18 Jun 2004; David Holm <dholm@gentoo.org> msnlib-3.4.ebuild:
+  Added to ~ppc.
+
+*msnlib-3.4 (15 Jun 2004)
+
+  15 Jun 2004; Alastair Tse <liquidx@gentoo.org> msnlib-3.3.ebuild,
+  +msnlib-3.4.ebuild:
+  version bump (#46294)
+
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> msnlib-2.0.ebuild:
+  Remove default S.
+
+*msnlib-3.3 (04 Feb 2004)
+
+  04 Feb 2004; Alastair Tse <liquidx@gentoo.org> msnlib-3.3.ebuild:
+  version bump, installs msntk
+
+  23 Nov 2003; Michael Sterrett <mr_bones_@gentoo.org> msnlib-2.0.ebuild,
+  msnlib-3.2.ebuild:
+  Specify which OSL license.
+
+  08 Oct 2003; Alastair Tse <liquidx@gentoo.org> msnlib-2.1.ebuild,
+  msnlib-3.2.ebuild:
+  bump to stable
+
+*msnlib-3.2 (02 Oct 2003)
+
+  02 Oct 2003; Alastair Tse <liquidx@gentoo.org> msnlib-3.2.ebuild:
+  new version. required to connect after 15 October 2003 due to protocol changes.
+
+  28 Aug 2003; Alastair Tse <liquidx@gentoo.org> msnlib-2.0.ebuild,
+  msnlib-4.ebuild:
+  removed msnlib-4 and added msnlib-2.1. thanks to Alberto Bertogli (#27333).
+
+*msnlib-2.0 (20 Jun 2003)
+
+  20 Jun 2003; Alastair Tse <liquidx@gentoo.org> msnlib-2.0.ebuild,
+  msnlib-4.ebuild:
+  new version thanks to Alberto Bertogli <albertogli@telpin.com.ar>
 
 *msnlib-4 (19 Apr 2003)
 
+  24 Apr 2003; Alastair Tse <liquidx@gentoo.org> msnlib-4.ebuild:
+  fix doc and dependencies at the request of the author.
+
   19 Apr 2003; Alastair Tse <liquidx@gentoo.org> Manifest, msnlib-4.ebuild:
   initial ebuild
 
diff --git a/net-im/msnlib/Manifest b/net-im/msnlib/Manifest
index 876936ba8616..03715b03aa59 100644
--- a/net-im/msnlib/Manifest
+++ b/net-im/msnlib/Manifest
@@ -1,3 +1,16 @@
-MD5 dca730e0198a450750a461cb34059764 msnlib-4.ebuild 493
-MD5 7ac966240fbab168b0dd02e64e752d60 files/digest-msnlib-3 60
-MD5 4955e9338a884eaaac1f40edf9a5377a files/digest-msnlib-4 60
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4147e0251fe176c271aaecb24bfb1cce ChangeLog 1856
+MD5 24481030c53a152b59aeb0b14291394f msnlib-3.4.ebuild 684
+MD5 eccd3e44b1e8fc954692d4faf329cf38 metadata.xml 218
+MD5 8dd3ce3dd6babaeadb622036e470aa27 msnlib-3.3.ebuild 682
+MD5 84abb721b620625b031d2e35dbd622a3 files/digest-msnlib-3.3 62
+MD5 077f41042bf22094e9a23f2086764ba1 files/digest-msnlib-3.4 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC9om7csIHjyDViGQRAkRgAJ0a74iOG5hRFo47q0SGTLL5jrXvuwCg5MpK
+9kDhxU0r86SFWyc2ceipRYk=
+=ZDIU
+-----END PGP SIGNATURE-----
diff --git a/net-im/msnlib/msnlib-3.3.ebuild b/net-im/msnlib/msnlib-3.3.ebuild
index 57bcc707b6e7..dc021cb974be 100644
--- a/net-im/msnlib/msnlib-3.3.ebuild
+++ b/net-im/msnlib/msnlib-3.3.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/net-im/msnlib/msnlib-3.3.ebuild,v 1.1 2004/02/04 20:05:04 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-3.3.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://auriga.wearlab.de/~alb/msnlib/files/${P}.tar.bz2"
 
 LICENSE="OSL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 DEPEND=">=dev-lang/python-2.2.2"
 
 DOCS="README INSTALL doc/*"
diff --git a/net-im/msnlib/msnlib-3.4.ebuild b/net-im/msnlib/msnlib-3.4.ebuild
index 0d7544778219..411e67ffe6f3 100644
--- a/net-im/msnlib/msnlib-3.4.ebuild
+++ b/net-im/msnlib/msnlib-3.4.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/net-im/msnlib/msnlib-3.4.ebuild,v 1.1 2004/06/15 15:00:52 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-3.4.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://auriga.wearlab.de/~alb/msnlib/files/${P}.tar.bz2"
 
 LICENSE="OSL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="ppc ~sparc x86"
 DEPEND=">=dev-lang/python-2.2.2"
 
 DOCS="README INSTALL doc/*"
diff --git a/net-im/naim-modules/ChangeLog b/net-im/naim-modules/ChangeLog
index 5c9ee7034cad..94d7da5ea60a 100644
--- a/net-im/naim-modules/ChangeLog
+++ b/net-im/naim-modules/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-im/naim-modules
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/ChangeLog,v 1.1 2003/10/14 19:05:35 vapier Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/ChangeLog,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
+
+*naim-modules-0.0.11.7.2-r1 (10 May 2005)
+
+  10 May 2005; Don Seiler <rizzo@gentoo.org>
+  +naim-modules-0.0.11.7.2-r1.ebuild:
+  Upstream distfile changed but kept same name
+
+*naim-modules-0.0.11.7.2 (25 Jan 2005)
+
+  25 Jan 2005; Don Seiler <rizzo@gentoo.org> +metadata.xml,
+  +naim-modules-0.0.11.7.2.ebuild:
+  Version bump, closes bug #56860
 
 *naim-modules-0.0.11.6.1_pre20030923 (14 Oct 2003)
 
diff --git a/net-im/naim-modules/Manifest b/net-im/naim-modules/Manifest
index 04cd1995df83..44970c66a150 100644
--- a/net-im/naim-modules/Manifest
+++ b/net-im/naim-modules/Manifest
@@ -1,3 +1,6 @@
-MD5 d88d895bcf62ce99bbc4ced27c5875ee files/digest-naim-modules-0.0.11.6.1_pre20030923 91
-MD5 f11628aa9d9cf4a74b2defc5cc4f4809 naim-modules-0.0.11.6.1_pre20030923.ebuild 849
-MD5 0c1b6b3e6c6e8a19f277060e72a6d6bc ChangeLog 342
+MD5 bd307e5163b11b234e0ecf74f496e2b3 ChangeLog 676
+MD5 31eb16ab3167732affb0076b50e41779 naim-modules-0.0.11.7.2.ebuild 818
+MD5 8b9315e0eb39178622eff7b321b18517 metadata.xml 326
+MD5 118c037ac271405655b105f7ef3dce90 naim-modules-0.0.11.7.2-r1.ebuild 821
+MD5 b5a0e77bb9063c9b1c0a145eb0eb1fd3 files/digest-naim-modules-0.0.11.7.2 92
+MD5 b5a0e77bb9063c9b1c0a145eb0eb1fd3 files/digest-naim-modules-0.0.11.7.2-r1 92
diff --git a/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild b/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild
index bad99e640264..6bcb83fc5eb8 100644
--- a/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild
+++ b/net-im/naim-modules/naim-modules-0.0.11.7.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/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild,v 1.1 2005/05/10 04:21:09 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/naim-modules-0.0.11.7.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 MY_PV="${PV}-2004-07-20-0047"
 DESCRIPTION="a bunch of modules for the naim im client"
diff --git a/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild b/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild
index 79e04a7e2cf5..1c63e4114823 100644
--- a/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild
+++ b/net-im/naim-modules/naim-modules-0.0.11.7.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/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild,v 1.1 2005/01/25 19:12:00 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim-modules/naim-modules-0.0.11.7.2.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 MY_PV="${PV}-2004-07-20-0047"
 DESCRIPTION="a bunch of modules for the naim im client"
diff --git a/net-im/naim/ChangeLog b/net-im/naim/ChangeLog
index ad7dcab0c227..67d953712eb5 100644
--- a/net-im/naim/ChangeLog
+++ b/net-im/naim/ChangeLog
@@ -1,6 +1,244 @@
 # ChangeLog for net-im/naim
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/naim/ChangeLog,v 1.1 2002/07/17 09:08:09 seemant Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/ChangeLog,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
+
+  16 Oct 2005; Joshua Kinard <kumba@gentoo.org> naim-0.11.7.3.1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> naim-0.11.7.2.ebuild:
+  stable on amd64
+
+*naim-0.11.7.3.1 (26 Jan 2005)
+
+  26 Jan 2005; Don Seiler <rizzo@gentoo.org> +naim-0.11.7.3.1.ebuild,
+  -naim-0.11.7.3.ebuild:
+  Version bump for bug in 0.11.7.3
+
+*naim-0.11.7.3 (25 Jan 2005)
+
+  25 Jan 2005; Don Seiler <rizzo@gentoo.org> metadata.xml,
+  naim-0.11.7.2.ebuild, +naim-0.11.7.3.ebuild:
+  Version bump, also adding DEPEND on screen since we do --enable-detach.
+  Closes bugs #79398 and #77658.
+
+  14 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> naim-0.11.7.2.ebuild:
+  Stable on alpha.
+
+  01 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> naim-0.11.7.2.ebuild:
+  ~alpha keyword.
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> naim-0.11.7.2.ebuild:
+  KEYWORDS ~amd64. Note: FEATURES=maketest fails, but otherwise package builds
+  and works.
+
+  05 Oct 2004; Jason Wever <weeve@gentoo.org> naim-0.11.7.2.ebuild:
+  Added ~sparc keyword as it mysteriously disappeared.
+
+  05 Oct 2004; Guy Martin <gmsoft@gentoo.org> naim-0.11.7.2.ebuild:
+  Stable on hppa.
+
+  14 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>; naim-0.11.7.2.ebuild:
+  marking stable on x86
+
+  07 Aug 2004; Tom Martin <slarti@gentoo.org> naim-0.11.6.4.ebuild:
+  Stable on amd64
+
+*naim-0.11.7.2 (25 Jul 2004)
+
+  25 Jul 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +naim-0.11.7.2.ebuild:
+  Version bump. Thanks to Luke Macken in bug 57980.
+
+  22 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> naim-0.11.7.1.ebuild:
+  Added to macos. Closing bug #57807
+
+*naim-0.11.7.1 (13 Jul 2004)
+
+  13 Jul 2004; Don Seiler <rizzo@gentoo.org> +naim-0.11.7.1.ebuild:
+  Version bump, thanks to Luke Macken for reporting.  Closes Bug #56573.
+
+  03 Jun 2004; Gustavo Felisberto <humpback@gentoo.org>; :
+  Version bump. Thanks to Luke Macken <lewk@csh.rit.edu> for calling our
+  attention in bug 52793
+
+  30 Mar 2004; Chris Aniszczyk <zx@gentoo.org> naim-0.11.6.4.ebuild:
+  Marking stable on hppa.
+
+  09 Mar 2004; <agriffis@gentoo.org> naim-0.11.6.4.ebuild:
+  stable on alpha and ia64
+
+  24 Jan 2004; Nick Hadaway <raker@gentoo.org> naim-0.11.6.4.ebuild:
+  Marked stabled on x86.  Gentoo gets a gold star! :)
+
+  15 Jan 2004; Jon Portnoy <avenj@gentoo.org> naim-0.11.6.1.ebuild :
+  Stable on AMD64.
+
+  13 Jan 2004; Aron Griffis <agriffis@gentoo.org> naim-0.11.6.4.ebuild:
+  Re-enable other arches and mark stable on alpha
+
+*naim-0.11.6.4 (08 Jan 2004)
+
+  08 Jan 2004; Jason A Mobarak <aether@gentoo.org> metadata.xml,
+  naim-0.11.5.9.ebuild, naim-0.11.6.1.ebuild, naim-0.11.6.4.ebuild:
+  Added new naim version 0.11.6.4 and metadata.xml
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> naim-0.11.6.1.ebuild:
+  Corrected homepage and source URL.
+
+*naim-0.11.6.1 (02 Oct 2003)
+
+  02 Oct 2003; Joel Hill <hillster@gentoo.org> naim-0.11.6.1.ebuild:
+  Version bump, general cleanup added current docs in tarball, and updated
+  homepage/sourceurl.
+
+  02 Oct 2003; Brad House <brad_mssw@gentoo.org> naim-0.11.6.ebuild:
+  add ~amd64 flag
+
+*naim-0.11.6-r1 (25 Jul 2003)
+
+  25 Jul 2003; Nick Hadaway <raker@gentoo.org> naim-0.11.6-r1.ebuild:
+  Changed back to a make install routine.  Removed the static USE flag.
+  Added the debug USE flag.  Other general build cleanups.
+  
+
+*naim-0.11.5.9 (09 Jun 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> naim-0.11.5.9.ebuild:
+  Marked stable.  Changed SRC_URI to a more stable location.  Changed
+  HOMEPAGE.  Added symlinks for nirc, nicq, and nlily.
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> naim-0.11.5.9.ebuild:
+  Version bump.  0.11.5.8 has a problem with stack corruption and .9 
+  changes the default TOC server to toc.n.ml.org as AOL is being flaky.
+
+*naim-0.11.5.8 (04 Jun 2003)
+
+  04 Jun 2003; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.8.ebuild:
+  Bump
+
+*naim-0.11.5.7 (23 Apr 2003)
+
+  23 Apr 2003; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.7.ebuild:
+  Bump
+
+*naim-0.11.5.6-r1 (20 Mar 2003)
+
+  25 Mar 2003; Jason Wever <weeve@gentoo.org> naim-0.11.5.6-r1.ebuild:
+  Changed ~sparc keyword to sparc.
+
+  20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> naim-0.11.5.6-r1.ebuild:
+  removed pic stuff
+
+*naim-0.11.5.6 (10 Mar 2003)
+
+  20 Mar 2003; Seemant Kulleen <seemant@gentoo.org> naim-0.11.5.1.ebuild,
+  naim-0.11.5.4.ebuild, naim-0.11.5.5.ebuild, naim-0.11.5.6.ebuild:
+  removed pic stuff
+
+  10 Mar 2003; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.6.ebuild:
+  Bump, please check this one and mark stable as soon as possible, server fixes.
+
+*naim-0.11.5.5 (22 Feb 2003)
+
+  05 Mar 2003; Jason Wever <weeve@gentoo.org> naim-0.11.5.5.ebuild:
+  Added ~sparc to keywords.
+
+  22 Feb 2003; Nick Hadaway <raker@gentoo.org> naim-0.11.5.5.ebuild,
+  files/digest-naim-0.11.5.5 :
+  The "I just realized naim has more subversions than the linux kernel"
+  release.  Version bump.  Lots of nice fixes.  As much as the critics
+  guffaw at using a "console" program in x-windows, it is plausible :)
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> naim-0.11.5.1.ebuild naim-0.11.5.4.ebuild :
+  Added ~alpha to KEYWORDS
+
+*naim-0.11.5.4 (20 Mar 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*naim-0.11.5.3-r1 (20 Jan 2003)
+
+  19 Jan 2003; Nick Hadaway <raker@gentoo.org> naim-0.11.5.3-r1.ebuild,
+  files/digest-naim-0.11.5.3-r1 :
+  install pertinent files into /usr/share/doc/naim as noted by "The
+  guy who wrote NAIM" so help functions work.
+
+*naim-0.11.5.3 (15 Jan 2003)
+
+  15 Jan 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.3.ebuild :
+  Fixes a bug in the automatic encryption.
+
+*naim-0.11.5.2 (14 Jan 2003)
+
+  14 Jan 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.2.ebuild :
+  Minor update to 0.11.5.2
+
+*naim-0.11.5.1 (21 Dec 2002)
+
+  21 Dec 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.1.ebuild :
+  Minor update to 0.11.5.1
+
+*naim-0.11.5 (10 Dec 2002)
+
+  10 Dec 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5.ebuild :
+  Final realease, check the site changelog for more info.  The
+  autocomplete is really neat, check it out.  I've been running this
+  series for a few weeks, I see no reason to leave it unstable for long.
+
+*naim-0.11.5_rc3 (10 Dec 2002)
+
+  10 Dec 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5_rc3.ebuild :
+  Looks like this should be the last _rc release before final.  Has some
+  new features this time like better window resize.  Check his
+  changelogs for more info.
+
+*naim-0.11.5_rc1 (08 Dec 2002)
+
+  08 Dec 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5_rc1.ebuild :
+  Dan is getting ready for release, and we will be right with him :)
+
+*naim-0.11.5_pre1 (04 Dec 2002)
+
+  04 Dec 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.5_pre1.ebuild :
+
+  Add an unstable prerelease version from the 0.11.5 series, because 0.11.4
+  is breaking for me lately.  Enjoy, please let me know how it works.
+
+*naim-0.11.4.13 (16 Nov 2002)
+
+  16 Nov 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.4.13.ebuild :
+
+  Another bugfix release.  Do we see a trend?  I did some work to make
+  the SRC_URI more forward compatible in this one.
+
+*naim-0.11.4.9 (25 Oct 2002)
+
+  25 Oct 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.4.9.ebuild :
+
+  Another bugfix release.
+
+*naim-0.11.4.8 (19 Oct 2002)
+
+  19 Oct 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.4.8.ebuild :
+
+  And moments later he made it a release... not masking, because it has
+  lots of goodness over the old one, bugfixes only.
+
+*naim-0.11.4.8_pre1 (19 Oct 2002)
+
+  19 Oct 2002; Brandon Low <lostlogic@gentoo.org> naim-0.11.4.8_pre1.ebuild :
+
+  New version thanks to RPI Dan (upstream dev) who I worked with today
+  to get a bug I was experiencing fixed.  This version should allow
+  those of us with hugs buddy lists to sign on and not get kicked off
+  immediatly.
+
+*naim-0.11.4p1 (01 Oct 2002)
+
+  01 Oct 2002; Mike Frysinger <vapier@gentoo.org> naim-0.11.4_p1.ebuild :
+  Updated version since older versions were unable to connect to aol servers
+  Also redid the compile/install process since the old one was weak :x
 
 *naim-0.11.2 (08 Feb 2002)
 
diff --git a/net-im/naim/Manifest b/net-im/naim/Manifest
index 73b2ea3a5cc9..7e049c71a348 100644
--- a/net-im/naim/Manifest
+++ b/net-im/naim/Manifest
@@ -1,13 +1,14 @@
-MD5 9b98b005a2acc0d29f476adc558840dc naim-0.11.5.6-r1.ebuild 1600
-MD5 bb64df18741b511aab708d2fd67b584a naim-0.11.5.5.ebuild 1647
-MD5 a2297b99c10845bbc6529027492b7929 naim-0.11.5.7.ebuild 1657
-MD5 e4b2c245e15adc6207083f3cde9b51a9 naim-0.11.5.4.ebuild 1625
-MD5 a38410e4b821d3cd3427b95bddcaaee1 naim-0.11.5.6.ebuild 1600
-MD5 958009311da2343c57e72faea25830f4 naim-0.11.5.1.ebuild 1502
-MD5 02a5bd4c967db78cb0c9ff03e6da6179 ChangeLog 4351
-MD5 6a57fb36efd2eab12dea6ce483a634e6 files/digest-naim-0.11.5.6-r1 65
-MD5 23216ff5f63546b3610e43eb95f69def files/digest-naim-0.11.5.1 65
-MD5 bdcd7be9b2adad22c5d35b24c69d9c20 files/digest-naim-0.11.5.4 65
-MD5 7809c92ae378819d39630956c3d47230 files/digest-naim-0.11.5.5 65
-MD5 6a57fb36efd2eab12dea6ce483a634e6 files/digest-naim-0.11.5.6 65
-MD5 04f619f4087cba06775afde685225050 files/digest-naim-0.11.5.7 65
+MD5 be624f52ca74d79ce8cc0ecb47a55c55 ChangeLog 8434
+MD5 cce37b118d5ddc9511362f4996c41680 files/digest-naim-0.11.6.1 66
+MD5 4f0d7cdac355995f31c937363881b089 files/digest-naim-0.11.6.4 66
+MD5 8173d59a57157573df8be77614285f60 files/digest-naim-0.11.6.7 66
+MD5 4483bed10e96873921b21e2622ea3568 files/digest-naim-0.11.7.1 66
+MD5 c27b1fe8e0711b6c14cda7a75f4c5188 files/digest-naim-0.11.7.2 66
+MD5 67395540f649e8c1d14a9e93ea51ec4f files/digest-naim-0.11.7.3.1 68
+MD5 8b9315e0eb39178622eff7b321b18517 metadata.xml 326
+MD5 71cff1e8494ea5084330449ab8f16056 naim-0.11.6.1.ebuild 880
+MD5 3414779fb362cb1ad799b39558a8a7c0 naim-0.11.6.4.ebuild 857
+MD5 b6403355ed392cba1ba5313e31e4b9d4 naim-0.11.6.7.ebuild 818
+MD5 1400e2d202dd704ac659676cc42032fc naim-0.11.7.1.ebuild 828
+MD5 c3fbb2e2c7dc0cc10e2400fabb5243fe naim-0.11.7.2.ebuild 884
+MD5 58403568d30a9a41f765abf6f357ab41 naim-0.11.7.3.1.ebuild 1132
diff --git a/net-im/naim/metadata.xml b/net-im/naim/metadata.xml
index c3c7c6fb7f6e..be000d28fe5f 100644
--- a/net-im/naim/metadata.xml
+++ b/net-im/naim/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-im</herd>
-<maintainer>
-<email>rizzo@gentoo.org</email>
-<!--  <name>Full name</name> -->
-<!--  <description>Description of the maintainership</description> -->
-</maintainer>
 <longdescription>
   naim is a console client for AOL Instant Messenger (AIM), 
   AOL I Seek You (ICQ), Internet Relay Chat (IRC), and The lily CMC.
diff --git a/net-im/naim/naim-0.11.6.1.ebuild b/net-im/naim/naim-0.11.6.1.ebuild
index 2ae84ae2ad84..f603e94ac26d 100644
--- a/net-im/naim/naim-0.11.6.1.ebuild
+++ b/net-im/naim/naim-0.11.6.1.ebuild
@@ -1,37 +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/net-im/naim/naim-0.11.6.1.ebuild,v 1.1 2003/10/02 23:17:14 hillster Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.6.1.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
-IUSE="debug"
 
-DESCRIPTION="An ncurses based AOL Instant Messenger."
-SRC_URI="http://site.n.ml.org/download/20030923195458/naim/${P}.tar.bz2"
-HOMEPAGE="http://site.n.ml.org/info/naim/"
+DESCRIPTION="An ncurses based AOL Instant Messenger"
+HOMEPAGE="http://naim.n.ml.org"
+SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~arm ~mips"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~mips ~alpha ~hppa ia64 amd64"
+IUSE="debug"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
 src_compile() {
-	local myconf
-	myconf="--with-gnu-ld --enable-detach"
+	local myconf=""
 	# --enable-profile
 	# --experimental-buddy-grouping
+	use debug && myconf="--enable-debug"
 
-	# by default will install to /usr/share/doc/${P}
-	myconf="${myconf} --with-pkgdocdir=/usr/share/doc/${PN}-${PVR}"
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	econf ${myconf}	|| die "configure failed"
-
+	econf \
+		--with-pkgdocdir=/usr/share/doc/${PF} \
+		--enable-detach \
+		${myconf} \
+		|| die "configure failed"
 	emake || die "make failed"
 }
 
 src_install() {
 	make DESTDIR=${D} install || die "make install failed"
-
-	dodoc AUTHORS COPYING FAQ BUGS README NEWS ChangeLog doc/*.hlp
+	dodoc AUTHORS FAQ BUGS README NEWS ChangeLog doc/*.hlp
 }
diff --git a/net-im/naim/naim-0.11.6.4.ebuild b/net-im/naim/naim-0.11.6.4.ebuild
index 52d2870bb11c..463b0db2fbd2 100644
--- a/net-im/naim/naim-0.11.6.4.ebuild
+++ b/net-im/naim/naim-0.11.6.4.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/net-im/naim/naim-0.11.6.4.ebuild,v 1.1 2004/01/08 09:32:38 aether Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.6.4.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
@@ -9,7 +9,7 @@ SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~x86"
+KEYWORDS="x86 ~ppc ~sparc ~mips alpha hppa ia64 amd64"
 IUSE="debug"
 
 DEPEND=">=sys-libs/ncurses-5.2"
diff --git a/net-im/naim/naim-0.11.6.7.ebuild b/net-im/naim/naim-0.11.6.7.ebuild
index 9d9bb6a36ac5..01727d5ba2b4 100644
--- a/net-im/naim/naim-0.11.6.7.ebuild
+++ b/net-im/naim/naim-0.11.6.7.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/net-im/naim/naim-0.11.6.7.ebuild,v 1.1 2004/06/03 15:02:53 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.6.7.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
diff --git a/net-im/naim/naim-0.11.7.1.ebuild b/net-im/naim/naim-0.11.7.1.ebuild
index 5215142361bb..bcc6181d52d0 100644
--- a/net-im/naim/naim-0.11.7.1.ebuild
+++ b/net-im/naim/naim-0.11.7.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/net-im/naim/naim-0.11.7.1.ebuild,v 1.1 2004/07/13 15:01:17 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.7.1.ebuild,v 1.1.1.1 2005/11/30 10:09:47 chriswhite Exp $
 
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
@@ -9,7 +9,7 @@ SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ppc-macos"
 IUSE="debug"
 
 DEPEND=">=sys-libs/ncurses-5.2"
diff --git a/net-im/naim/naim-0.11.7.2.ebuild b/net-im/naim/naim-0.11.7.2.ebuild
index 5af4475f72ac..9971decd7066 100644
--- a/net-im/naim/naim-0.11.7.2.ebuild
+++ b/net-im/naim/naim-0.11.7.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/net-im/naim/naim-0.11.7.2.ebuild,v 1.1 2004/07/25 14:03:43 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.7.2.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
@@ -9,10 +9,11 @@ SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc-macos ~sparc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/ncurses-5.2"
+DEPEND=">=sys-libs/ncurses-5.2
+	app-misc/screen"
 
 src_compile() {
 	# --enable-profile
diff --git a/net-im/naim/naim-0.11.7.3.1.ebuild b/net-im/naim/naim-0.11.7.3.1.ebuild
index c5dbfbcc9648..8d822a2907ff 100644
--- a/net-im/naim/naim-0.11.7.3.1.ebuild
+++ b/net-im/naim/naim-0.11.7.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/net-im/naim/naim-0.11.7.3.1.ebuild,v 1.1 2005/01/26 18:55:54 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/naim/naim-0.11.7.3.1.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 
 DESCRIPTION="An ncurses based AOL Instant Messenger"
@@ -9,7 +9,7 @@ SRC_URI="http://shell.n.ml.org/n/naim/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~ppc-macos ~hppa ~sparc ~amd64 ~alpha"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~sparc ~x86 ~mips"
 IUSE="debug"
 
 DEPEND=">=sys-libs/ncurses-5.2
diff --git a/net-im/ntame/ChangeLog b/net-im/ntame/ChangeLog
index ddc2256a0560..c8af3270fe6a 100644
--- a/net-im/ntame/ChangeLog
+++ b/net-im/ntame/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-im/ntame
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/ntame/ChangeLog,v 1.1 2002/06/21 19:31:50 rphillips Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ntame/ChangeLog,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
 *ntame-998020954 (21 Jun 2002)
 
diff --git a/net-im/ntame/Manifest b/net-im/ntame/Manifest
index e69de29bb2d1..5510dd8dec0d 100644
--- a/net-im/ntame/Manifest
+++ b/net-im/ntame/Manifest
@@ -0,0 +1,3 @@
+MD5 315526c6675ecc4d38550dce3f8b001e ntame-998020954.ebuild 724
+MD5 ee1f1dc6608aa7dd5b9abe22865e5a61 ChangeLog 673
+MD5 0a9c6317b11a4f88bc512413db7be184 files/digest-ntame-998020954 67
diff --git a/net-im/ntame/ntame-998020954.ebuild b/net-im/ntame/ntame-998020954.ebuild
index 3070f07e8777..ddf1931bb621 100644
--- a/net-im/ntame/ntame-998020954.ebuild
+++ b/net-im/ntame/ntame-998020954.ebuild
@@ -1,27 +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/net-im/ntame/ntame-998020954.ebuild,v 1.1 2002/06/21 19:31:50 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ntame/ntame-998020954.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
 S=${WORKDIR}/ntaim
-DESCRITION="Ncurses based AOL Instant Messenger"
+DESCRIPTION="Ncurses based AOL Instant Messenger"
 HOMEPAGE="http://tame.sourceforge.net/"
 SRC_URI="mirror://sourceforge/tame/ntaim.${PV}.tar.gz"
 DEPEND=">=sys-libs/ncurses-5.2"
+
 SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+IUSE=""
 
 src_compile () {
-    
+
 	./configure --prefix=/usr --host=${CHOST} || die
-    emake || die
+	emake || die
 
 }
 
 src_install () {
-    
+
 	dodir /usr/bin
-    make DESTDIR=${D} install || die
-	
-	dodoc AUTHORS BUGS INSTALL NEWS README
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS BUGS NEWS README TODO
 }
 
 pkg_postinst () {
diff --git a/net-im/ohphone/ChangeLog b/net-im/ohphone/ChangeLog
index 0c2995627bcb..ac8d460f246f 100644
--- a/net-im/ohphone/ChangeLog
+++ b/net-im/ohphone/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-im/ohphone
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ChangeLog,v 1.1 2003/09/03 10:35:59 liquidx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ChangeLog,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
+
+*ohphone-1.4.3_pre20050304 (06 Jul 2005)
+
+  06 Jul 2005; Alastair Tse <liquidx@gentoo.org> -ohphone-1.4.1.ebuild,
+  +ohphone-1.4.3_pre20050304.ebuild:
+  version bump. fixes compile problems with (#44177)
+
+  30 Jun 2005; Aron Griffis <agriffis@gentoo.org> ohphone-1.4.1-r1.ebuild:
+  It's really obvious this was never tested on ppc. The way the ebuild was
+  written, the ppc binary would never have been installed.
+
+  11 Jul 2004; Lars Weiler <pylon@gentoo.org> ohphone-1.4.1-r1.ebuild:
+  Add ~ppc to keywords.
+
+*ohphone-1.4.1-r1 (06 Sep 2003)
+
+  06 Sep 2003; Alastair Tse <liquidx@gentoo.org> ohphone-1.4.1-r1.ebuild:
+  added optional X and svgalib support, although in essense, if SDL support was
+  enabled with pwlib, it'll still be compiled in. also updated the deps to
+  newest openh323 and pwlib
 
 *ohphone-1.4.1 (03 Sep 2003)
 
diff --git a/net-im/ohphone/Manifest b/net-im/ohphone/Manifest
index 8d0560dbf36f..752dd824d2c7 100644
--- a/net-im/ohphone/Manifest
+++ b/net-im/ohphone/Manifest
@@ -1,2 +1,16 @@
-MD5 a211d73040cb8e68616e2f7dafb3a224 ohphone-1.4.1.ebuild 814
-MD5 eb00a184805b4c495b46976ce6ccfbbf files/digest-ohphone-1.4.1 64
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f802d84e9374d2ca19ee00e80656ac32 ChangeLog 1170
+MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
+MD5 31f36cf8a6e240dc87ba502b154c8c78 ohphone-1.4.1-r1.ebuild 1295
+MD5 44a2ec1569f78a1c2033b5b3eb7adefa ohphone-1.4.3_pre20050304.ebuild 1371
+MD5 eb00a184805b4c495b46976ce6ccfbbf files/digest-ohphone-1.4.1-r1 64
+MD5 50a3ec4868bd9ba46b1b7d9af3eb4352 files/digest-ohphone-1.4.3_pre20050304 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCy7KITM53OX+9xmMRAkB8AJ9j9cstr5PvNgGVTpFH0lLNBxhgGQCeNcFp
+BEmOfv0W9A9fX/fbbVebfoA=
+=rYwG
+-----END PGP SIGNATURE-----
diff --git a/net-im/ohphone/ohphone-1.4.1-r1.ebuild b/net-im/ohphone/ohphone-1.4.1-r1.ebuild
index e9334aa4b70a..3b1b2671c7fa 100644
--- a/net-im/ohphone/ohphone-1.4.1-r1.ebuild
+++ b/net-im/ohphone/ohphone-1.4.1-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/net-im/ohphone/ohphone-1.4.1-r1.ebuild,v 1.1 2003/09/06 17:25:24 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ohphone-1.4.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 DESCRIPTION="Command line H.323 client"
 HOMEPAGE="http://www.openh323.org/"
@@ -8,19 +8,19 @@ SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
 
 LICENSE="MPL-1.0"
 SLOT="0"
-KEYWORDS="~x86"
-IUSE="X"
+KEYWORDS="~x86 ~ppc"
+IUSE="X svga"
 
 DEPEND=">=net-libs/openh323-1.12.2
 	>=dev-libs/pwlib-1.5.2
 	X? ( virtual/x11 )
-	svga? ( media-libs/svga )"
+	svga? ( media-libs/svgalib )"
 
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	
+
 	use svga \
 		|| sed -e "s:-lvga::" -e "s:-DHAS_VGALIB::" -i ${S}/Makefile \
 		|| die "failed to turn off SVGAlib support"
@@ -28,7 +28,7 @@ src_unpack() {
 
 src_compile() {
 	local myopts
-	
+
 	use X \
 		&& myopts="${myopts} XINCDIR=/usr/X11R6/include XLIBDIR=/usr/X11R6/lib" \
 		|| myopts="${myopts} XINCDIR=/dev/null XLIBDIR=/dev/null"
@@ -46,9 +46,13 @@ src_compile() {
 src_install() {
 	cd ${WORKDIR}/${PN}
 	doman ohphone.1
-	
+
 	# fill in for other archs
-	if [ ${ARCH} = "x86" ]; then
+	if use x86; then
 		dobin obj_linux_x86_r/ohphone
+	elif use ppc; then
+		dobin obj_linux_ppc_r/ohphone
+	else
+		die "no binary available for your arch"
 	fi
 }
diff --git a/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild b/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild
index 4092df82491f..848500ad2bbc 100644
--- a/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild
+++ b/net-im/ohphone/ohphone-1.4.3_pre20050304.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/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild,v 1.1 2005/07/06 10:28:48 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ohphone/ohphone-1.4.3_pre20050304.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 PV_PRE=${PV#*_pre}
 PV_MAJOR=${PV%_pre*}
diff --git a/net-im/openc6/ChangeLog b/net-im/openc6/ChangeLog
index c7e91e7a0d73..00f7f6e61a35 100644
--- a/net-im/openc6/ChangeLog
+++ b/net-im/openc6/ChangeLog
@@ -1,8 +1,45 @@
 # ChangeLog for net-im/openc6
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/ChangeLog,v 1.1 2003/10/16 03:36:06 lu_zero Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/ChangeLog,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
+
+*openc6-0.9.7 (25 Apr 2005)
+
+  25 Apr 2005; Don Seiler <rizzo@gentoo.org> +openc6-0.9.7.ebuild:
+  Version bump, closes bug #81679. Thanks to Giulio Malventi and Michele
+  Beltrame.
+
+  24 Nov 2004; Karol Wojtaszek <sekretarz@gentoo.org>
+  openc6-0.9.6_beta.ebuild:
+  Added to ~amd64, bug #72370
+
+  13 Jul 2004; Don Seiler <rizzo@gentoo.org>
+  -files/openc6-0.9.5_beta-fixes.patch, -openc6-0.9.2.ebuild,
+  -openc6-0.9.3_beta1.ebuild, -openc6-0.9.4_beta.ebuild,
+  -openc6-0.9.5_beta.ebuild:
+  Removing old unstable versions
+
+*openc6-0.9.6_beta (13 Jul 2004)
+
+  13 Jul 2004; Don Seiler <rizzo@gentoo.org> +openc6-0.9.6_beta.ebuild:
+  Version bump, thanks to Matteo Giordano for reporting.  Closes Bug #55792
+
+*openc6-0.9.5_beta (12 May 2004)
+
+  12 May 2004; Luca Barbato <lu_zero@gentoo.org>
+  +files/openc6-0.9.5_beta-fixes.patch, +openc6-0.9.5_beta.ebuild:
+  New version
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> openc6-0.9.2.ebuild,
+  openc6-0.9.3_beta1.ebuild, openc6-0.9.4_beta.ebuild:
+  inherit kde instead of deprecated kde-base
+
+*openc6-0.9.4_beta (29 Nov 2003)
+
+  29 Nov 2003; Luca Barbato <lu_zero@gentoo.org> openc6-0.9.4_beta.ebuild:
+  New version, thanks to Giulio Malventi <giulio@vene.ws> for the ebuild
 
 *openc6-0.9.2 (16 Oct 2003)
+*openc6-0.9.3_beta1 (16 Oct 2003)
 
   16 Oct 2003; Luca Barbato <lu_zero@gentoo.org> openc6-0.9.2.ebuild,
   openc6-0.9.3_beta1.ebuild:
diff --git a/net-im/openc6/Manifest b/net-im/openc6/Manifest
index 4a8ac8112d25..509a4d4ff226 100644
--- a/net-im/openc6/Manifest
+++ b/net-im/openc6/Manifest
@@ -1,4 +1,7 @@
-MD5 c3f68760547e55f3e1594d133d46f476 openc6-0.9.2.ebuild 485
-MD5 38d5c52c5f183ab88f88e1645e85f92a openc6-0.9.3_beta1.ebuild 521
-MD5 9470439cb27679aefc0f08019700981c files/digest-openc6-0.9.2 65
-MD5 6997651366ce6c97593bec8e4bb9b6f2 files/digest-openc6-0.9.3_beta1 72
+MD5 5a23c641737d9bdde7c630634d8808b9 ChangeLog 1606
+MD5 1e166df1349442a8a9901c20a3406b37 openc6-0.9.7.ebuild 562
+MD5 6b30fa712aa3e1267858434c227a8b4f openc6-0.9.6_beta.ebuild 650
+MD5 a574ec2607edf5e80117d65415e01d3c metadata.xml 159
+MD5 dfdc2db98d76171baf62465152d04f36 files/digest-openc6-0.9.7 65
+MD5 f0fd438c32cdb30cd9b55c63e1e0e723 files/openc6-0.9.6_beta-fixes.patch 533
+MD5 f9cc4ad4d63731039030f7c21009839d files/digest-openc6-0.9.6_beta 70
diff --git a/net-im/openc6/openc6-0.9.6_beta.ebuild b/net-im/openc6/openc6-0.9.6_beta.ebuild
index b2d9ea88fd2b..343690a5cb6d 100644
--- a/net-im/openc6/openc6-0.9.6_beta.ebuild
+++ b/net-im/openc6/openc6-0.9.6_beta.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/net-im/openc6/openc6-0.9.6_beta.ebuild,v 1.1 2004/07/13 17:01:54 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.6_beta.ebuild,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 inherit kde eutils
 need-qt 3.1
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openc6/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~amd64"
 IUSE="kde"
 
 src_unpack() {
diff --git a/net-im/openc6/openc6-0.9.7.ebuild b/net-im/openc6/openc6-0.9.7.ebuild
index 4ec299c9ddd4..6458e431dc3f 100644
--- a/net-im/openc6/openc6-0.9.7.ebuild
+++ b/net-im/openc6/openc6-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/net-im/openc6/openc6-0.9.7.ebuild,v 1.1 2005/04/25 17:42:22 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.7.ebuild,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 inherit kde eutils
 need-qt 3.1
diff --git a/net-im/pork/ChangeLog b/net-im/pork/ChangeLog
index 1df946fb40f3..3ff6ec71a5ae 100644
--- a/net-im/pork/ChangeLog
+++ b/net-im/pork/ChangeLog
@@ -1,6 +1,137 @@
 # ChangeLog for net-im/pork
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pork/ChangeLog,v 1.1 2003/01/13 17:34:41 lostlogic Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/ChangeLog,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
+
+  16 Oct 2005; Joshua Kinard <kumba@gentoo.org> pork-0.99.8.1.ebuild:
+  Added ~mips to KEYWORDS.
+
+  15 Sep 2005; Aron Griffis <agriffis@gentoo.org> pork-0.99.8.1.ebuild:
+  Mark 0.99.8.1 stable on alpha
+
+  01 Aug 2005; Jonathan Smith <smithj@gentoo.org> pork-0.99.8.1.ebuild:
+  cleaned up ebuild
+
+  18 Jul 2005; Jonathan Smith <smithj@gentoo.org> pork-0.99.8.1.ebuild:
+  added ~ppc-macos
+
+  09 Jul 2005; Joseph Jezak <josejx@gentoo.org> pork-0.99.8.1.ebuild:
+  Marked ppc stable.
+
+  09 Jul 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml,
+  pork-0.99.8.1.ebuild:
+  stable sparc
+
+  26 Jun 2005; Jonathan Smith <smithj@gentoo.org> pork-0.99.8.1.ebuild:
+  stable amd64
+
+  14 Jun 2005; Jonathan Smith <smithj@gentoo.org> pork-0.99.8.1.ebuild:
+  0.99.8.1 stable on x86
+
+  13 Jun 2005; Jonathan Smith <smithj@gentoo.org> metadata.xml,
+  -pork-0.99.1.ebuild, -pork-0.99.5.ebuild:
+  cleaned up old ebuilds and added self as maintainer (with approval from net-im)
+
+*pork-0.99.8.1 (05 May 2005)
+
+  05 May 2005; Don Seiler <rizzo@gentoo.org> +pork-0.99.8.1.ebuild:
+  Version bump, closes bug 91505
+
+  05 May 2005; Don Seiler <rizzo@gentoo.org> pork-0.99.7.ebuild:
+  Stable on x86, addressing bug 76173
+
+*pork-0.99.7 (03 Jan 2005)
+
+  03 Jan 2005; Don Seiler <rizzo@gentoo.org> +pork-0.99.7.ebuild:
+  Version bump.  Closes bug #75751, thanks to Jonathan Smith
+
+*pork-0.99.5 (27 Sep 2004)
+
+  27 Sep 2004; Don Seiler <rizzo@gentoo.org> +pork-0.99.5.ebuild:
+  Version bump
+
+  30 Aug 2004; Tom Martin <slarti@gentoo.org> pork-0.99.4.ebuild:
+  Marked ~amd64.
+
+*pork-0.99.4 (05 Aug 2004)
+
+  05 Aug 2004; Don Seiler <rizzo@gentoo.org> +pork-0.99.4.ebuild:
+  Version bump
+
+  21 Jul 2004; David Holm <dholm@gentoo.org> pork-0.99.3.ebuild:
+  Added to ~ppc.
+
+*pork-0.99.3 (19 Jul 2004)
+
+  19 Jul 2004; Brandon Low <lostlogic@gentoo.org> +metadata.xml,
+  +pork-0.99.3.ebuild:
+  Bump, add metadata
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> pork-0.99.1.ebuild,
+  pork-0.99.2.ebuild:
+  Fix use invocation
+
+  28 Apr 2004; Jason Wever <weeve@gentoo.org> pork-0.99.2.ebuild:
+  ~sparc, it does an ebuild good.
+
+  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> pork-0.99.1.ebuild,
+  pork-0.99.2.ebuild:
+  Add die following econf for bug 48950
+
+*pork-0.99.2 (19 Nov 2003)
+
+  19 Nov 2003; Brandon Low <lostlogic@gentoo.org> pork-0.7.0.ebuild,
+  pork-0.8.0.ebuild, pork-0.99.0.ebuild, pork-0.99.1.ebuild,
+  pork-0.99.2.ebuild:
+  mark 0.99.1 stable, bump unstable, and cleanup
+
+*pork-0.99.1 (23 Jul 2003)
+
+  23 Jul 2003; Brandon Low <lostlogic@gentoo.org> pork-0.99.1.ebuild:
+  Bump
+
+*pork-0.99.0 (08 Jul 2003)
+
+  08 Jul 2003; Brandon Low <lostlogic@gentoo.org> pork-0.99.0.ebuild:
+  Bump
+
+*pork-0.8.0 (27 Apr 2003)
+
+  27 Apr 2003; Brandon Low <lostlogic@gentoo.org> pork-0.8.0.ebuild:
+  Bump
+
+*pork-0.7.0 (09 Apr 2003)
+
+  17 Apr 2003; Brandon Low <lostlogic@gentoo.org> pork-0.7.0.ebuild:
+  Stable x86 keyword
+
+  09 Apr 2003; Brandon Low <lostlogic@gentoo.org> pork-0.7.0.ebuild:
+  Bump
+
+*pork-0.6.0 (03 Mar 2003)
+
+  03 Mar 2003; Brandon Low <lostlogic@gentoo.org> pork-0.6.0.ebuild:
+  Bump
+
+*pork-0.5.0 (03 Feb 2003)
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> pork-0.5.0.ebuild :
+  Added ~alpha to KEYWORDS.
+
+  03 Feb 2003; Brandon Low <lostlogic@gentoo.org> pork-0.5.0.ebuild:
+  Bump, bugfixes, and new QUICK_START document (deprecates the one I wrote)
+
+*pork-0.4.0 (28 Jan 2003)
+
+  28 Jan 2003; Brandon Low <lostlogic@gentoo.org> pork-0.4.0.ebuild:
+  Bump, now includes a help system and a bunch of bugfixes :)
+
+*pork-0.3.0-r1 (13 Jan 2003)
+
+  13 Jan 2003; Brandon Low <lostlogic@gentoo.org> pork-0.3.0-r1.ebuild,
+  files/pork-0.3.0-help.patch:
+
+  Add the help command to pork, submitted upstream.
+
 
 *pork-0.3.0 (13 Jan 2003)
 
diff --git a/net-im/pork/Manifest b/net-im/pork/Manifest
index 9281e7d305d5..d6c9e580d2de 100644
--- a/net-im/pork/Manifest
+++ b/net-im/pork/Manifest
@@ -1,4 +1,6 @@
-MD5 82e7ddbfd3f89f1d76797d960f344798 manifest 299
-MD5 5b90c9d7ce7093294605b503c765e14b pork-0.7.0.ebuild 809
-MD5 37ccf3ca51bfc56fa2c261f6fbaca6d7 ChangeLog 1491
-MD5 d68d9496a49229a7353bc8424244514b files/digest-pork-0.7.0 122
+MD5 9cd7db2ad0bc6789dcfeea6e41dcf1a2 ChangeLog 4251
+MD5 47d5b5f21b2d264a13cd4b4198a45391 files/digest-pork-0.99.7 63
+MD5 6c14a8f6820250a5ce7a79dc84c5e102 files/digest-pork-0.99.8.1 65
+MD5 01d933d85d8f282b16e5390ecf2380be metadata.xml 321
+MD5 b3fa6e0066ac61156a89da8ac6f2f51a pork-0.99.7.ebuild 988
+MD5 c20e4fc95eb86539e0c040cf30e93335 pork-0.99.8.1.ebuild 949
diff --git a/net-im/pork/metadata.xml b/net-im/pork/metadata.xml
index 3bedb7b12e59..98dbb88fb340 100644
--- a/net-im/pork/metadata.xml
+++ b/net-im/pork/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>net-im</herd>
+<maintainer><email>smithj@gentoo.org</email></maintainer>
 <longdescription>
 	Pork is an AIM client based on the GAIM libraries with an interface similar to IRCII.
 </longdescription>
diff --git a/net-im/pork/pork-0.99.7.ebuild b/net-im/pork/pork-0.99.7.ebuild
index 7c7615e27585..e2976117fc16 100644
--- a/net-im/pork/pork-0.99.7.ebuild
+++ b/net-im/pork/pork-0.99.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/net-im/pork/pork-0.99.7.ebuild,v 1.1 2005/01/03 15:46:10 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.7.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 DESCRIPTION="Console based AIM client that looks like ircII"
 HOMEPAGE="http://dev.ojnk.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
+KEYWORDS="x86 ~alpha ~sparc ~ppc ~amd64"
 IUSE="perl"
 
 DEPEND="perl? ( dev-lang/perl )
diff --git a/net-im/pork/pork-0.99.8.1.ebuild b/net-im/pork/pork-0.99.8.1.ebuild
index 077fbdd5cc40..932c4393cf7b 100644
--- a/net-im/pork/pork-0.99.8.1.ebuild
+++ b/net-im/pork/pork-0.99.8.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/net-im/pork/pork-0.99.8.1.ebuild,v 1.1 2005/05/05 13:47:53 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pork/pork-0.99.8.1.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 DESCRIPTION="Console based AIM client that looks like ircII"
 HOMEPAGE="http://dev.ojnk.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/ojnk/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ~ppc ~amd64"
+KEYWORDS="alpha amd64 ppc ~ppc-macos sparc x86 ~mips"
 IUSE="perl"
 
 DEPEND="perl? ( dev-lang/perl )
@@ -16,10 +16,8 @@ DEPEND="perl? ( dev-lang/perl )
 
 src_compile() {
 	local myconf=""
-	use perl || myconf="${myconf} --disable-perl"
-	einfo "Configure options: ${myconf}"
-	econf ${myconf} || die "econf failed"
-	emake
+	econf $(use_enable perl) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/net-im/pymsn-t/ChangeLog b/net-im/pymsn-t/ChangeLog
index 7cbbe328aec4..2ef65fd50f29 100644
--- a/net-im/pymsn-t/ChangeLog
+++ b/net-im/pymsn-t/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for net-im/pymsn-t
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.1 2005/04/18 11:35:36 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
+
+*pymsn-t-0.9.5-r1 (14 Sep 2005)
+
+  14 Sep 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -pymsn-t-0.9.5.ebuild, +pymsn-t-0.9.5-r1.ebuild:
+  Fixing path in config file, credits to Albert Holm for spoting this one in
+  #105998
+
+*pymsn-t-0.9.5 (28 Aug 2005)
+
+  28 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/pymsn-t-0.9.3-arguments.patch, -files/pymsn-t-0.9.3-config.patch,
+  +files/pymsn-t-0.9.5-arguments.patch, files/pymsn-t.initd,
+  -pymsn-t-0.9.3.ebuild, +pymsn-t-0.9.5.ebuild:
+  Updated to 0.9.5 and changed the ebuild to use the new jabber-base package.
+  This will make it easyer to maintain jabber packages.
+
+*pymsn-t-0.9.3 (23 Aug 2005)
+
+  23 Aug 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  -files/pymsn-t-0.9.2-arguments.patch,
+  +files/pymsn-t-0.9.3-arguments.patch, +files/pymsn-t-0.9.3-config.patch,
+  -pymsn-t-0.9.2.ebuild, +pymsn-t-0.9.3.ebuild:
+  Removed old version and added new 0.9.3, also QA issue #103421
 
 *pymsn-t-0.9.2 (18 Apr 2005)
 
diff --git a/net-im/pymsn-t/Manifest b/net-im/pymsn-t/Manifest
index 263481f5c937..0a2de0ed433c 100644
--- a/net-im/pymsn-t/Manifest
+++ b/net-im/pymsn-t/Manifest
@@ -1,4 +1,16 @@
-MD5 de62d98b0f82c9a448a482b13215324c pymsn-t-0.9.2.ebuild 1462
-MD5 a5d34b92f593910aa4e4e6efd01d3dbf files/digest-pymsn-t-0.9.2 63
-MD5 eccf7d429ba0a26d05d96e04376d203e files/pymsn-t-0.9.2-arguments.patch 256
-MD5 786423ba715473aa0fa09fc54b0725d0 files/pymsn-t.initd 405
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ead305fa3c66bdfeacddef845619bc21 pymsn-t-0.9.5-r1.ebuild 1939
+MD5 1a6b5710ef33fcc74035d3e1ebda3da9 ChangeLog 1375
+MD5 08d64f26d0872c7dfe0f37e7ea6a83c3 metadata.xml 301
+MD5 bb6822e06ee573f7897518abba0db917 files/pymsn-t-0.9.5-arguments.patch 263
+MD5 d06863dd9cbeea1d2bd016de6b27742c files/digest-pymsn-t-0.9.5-r1 63
+MD5 a0581c27b7e350c2d92b331ea1b3a4f2 files/pymsn-t.initd 420
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDKJ0H8zY1VwezZiERAtZcAJ9Dah04ii7JsuhsIBn14SGGu++HBQCdHl+W
+3JiJJr/Iqn3WOToGe/+hS3E=
+=PJZk
+-----END PGP SIGNATURE-----
diff --git a/net-im/pymsn-t/files/pymsn-t.initd b/net-im/pymsn-t/files/pymsn-t.initd
index 9fb448a38616..92fc8f7eab40 100644
--- a/net-im/pymsn-t/files/pymsn-t.initd
+++ b/net-im/pymsn-t/files/pymsn-t.initd
@@ -7,14 +7,14 @@ depend() {
 
 start() {
 	ebegin "Starting MSN Jabber Transport"
-	cd /var/run/pymsn-t
-	start-stop-daemon --start --quiet --background --chuid pymsn-t:jabber \
-		--exec /usr/lib/pymsn-t/pymsn-t -- /etc/pymsn-t.xml
+	cd /var/run/jabber
+	start-stop-daemon --start --quiet --background --chuid jabber:jabber \
+		--exec /usr/lib/PATH/site-packages/PyMSNt -- /etc/jabber/pymsn-t.xml
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping MSN Jabber Transport"
-	start-stop-daemon --stop --quiet --pidfile /var/run/pymsn-t/PyMSNt.pid
+	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pymsn-t.pid
 	eend $?
 }
diff --git a/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild b/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild
index fe8b5d9ef1ba..cf68c7f44f54 100644
--- a/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild
+++ b/net-im/pymsn-t/pymsn-t-0.9.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/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild,v 1.1 2005/09/14 21:59:42 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.9.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 inherit eutils python
 
diff --git a/net-im/silc-client/ChangeLog b/net-im/silc-client/ChangeLog
index 7bbc04015e0d..615693c4f6c6 100644
--- a/net-im/silc-client/ChangeLog
+++ b/net-im/silc-client/ChangeLog
@@ -1,6 +1,117 @@
-# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.1 2002/04/12 19:53:33 spider Exp $
+# ChangeLog for net-im/silc-client
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/ChangeLog,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
+
+*silc-client-1.0.2 (07 May 2005)
+
+  07 May 2005; Sven Wegener <swegener@gentoo.org>
+  -silc-client-0.9.11.ebuild, -silc-client-0.9.12.1.ebuild,
+  -silc-client-0.9.14.ebuild, -silc-client-1.0.ebuild,
+  -silc-client-1.0.1.ebuild, +silc-client-1.0.2.ebuild:
+  Version bump, bug #91756.
+
+  22 Apr 2005; Alin Nastac <mrness@gentoo.org> silc-client-0.9.12.1.ebuild,
+  silc-client-0.9.14.ebuild, silc-client-1.0.ebuild,
+  silc-client-1.0.1.ebuild:
+  net-misc/dante -> net-proxy/dante
+
+  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org>
+  silc-client-1.0.1-r1.ebuild:
+  Stable on amd64.
+
+  15 Jul 2004; Sven Wegener <swegener@gentoo.org> silc-client-1.0.1-r1.ebuild:
+  Marked stable on x86.
+
+*silc-client-1.0.1-r1 (07 Jul 2004)
+
+  07 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +silc-client-1.0.1-r1.ebuild:
+  Modified to allow installation of net-im/silc-toolkit and net-im/silc-client
+  at the time. Made CFLAGS aware.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org> silc-client-0.9.11.ebuild,
+  silc-client-0.9.12.1.ebuild, silc-client-0.9.14.ebuild,
+  silc-client-1.0.1.ebuild, silc-client-1.0.ebuild:
+  Fix use invocation
+
+  14 Feb 2004; Chuck Short <zul@gentoo.org> silc-client-1.0.1.ebuild:
+  Perl modules was not being installed into the right directories. Closes #40610.
+
+  08 Feb 2004; <absinthe@gentoo.org> silc-client-1.0.1.ebuild:
+  added amd64 keyword.
+
+  28 Jan 2004; Chuck Short <zul@gentoo.org> silc-client-1.0.1.ebuild:
+  MMarked stable for x86.
+
+*silc-client-1.0.1 (18 Jan 2004)
+
+  18 Jan 2004; Chuck Short <zul@gentoo.org> silc-client-1.0.1.ebuild:
+  Version bump, closes #38488.
+
+  18 Jan 2004; Chuck Short <zul@gentoo.org> metadata.xml,
+  silc-client-1.0.ebuild:
+  Marked stable on x86.
+
+*silc-client-1.0 (03 Jan 2004)
+
+  03 Jan 2004; Chuck Short <zul@gentoo.org> silc-client-0.9.11.ebuild,
+  silc-client-0.9.12.1.ebuild, silc-client-0.9.14.ebuild,
+  silc-client-1.0.ebuild:
+  silc-0.19.4 marked stable
+  silc-1.0 version bump
+  updated copyright years
+
+*silc-client-0.9.14 (15 Nov 2003)
+
+  15 Nov 2003; Chuck Short <zul@gentoo.org> silc-client-0.9.14.ebuild:
+  New version, closes bug #32255.
+
+  15 Sep 2003; Jason Wever <weeve@gentoo.org> silc-client-0.9.12.1.ebuild:
+  Added ~sparc keyword, fixes bug #28174.
+
+*silc-client-0.9.12.1 (22 Apr 2003)
+
+  24 Apr 2003; Alastair Tse <liquidx@gentoo.org> silc-client-0.9.11.ebuild,
+  silc-client-0.9.12.1.ebuild:
+  fix stray man dir
+
+  22 Apr 2003; Martin Holzer <mholzer@gentoo.org> silc-client-0.9.12.1.ebuild:
+  Fixing echonfig is broken by a typo. Closes #19791
+
+  22 Apr 2003; Dylan Carlson <absinthe@gentoo.org>
+  silc-client-0.9.12.1.ebuild:
+  Version bump to fix buffer overflow and other various bugs.
+
+*silc-client-0.9.11 (08 Jan 2003)
+
+  08 Jan 2002; Phil Bordelon <sunflare@gentoo.org> silc-client-0.9.11.ebuild :
+  ppc -> ~ppc flags since I haven't tested it on ppc, but I have no reason to believe
+  that it won't build on the PPC platform.
+
+  08 Jan 2003; Phil Bordelon <sunflare@gentoo.org> silc-client-0.9.11.ebuild :
+  Version bump.  New fixes had to be added for documentation locations.
+
+*silc-client-0.9.5.1 (25 Sep 2002)
+
+  19 Nov 2002; Calum Selkirk <cselkirk@gentoo.org> silc-client-0.9.5.1.ebuild 
+  silc-client-0.9.4.ebuild :
+
+  Tested and added ppc to KEYWORDS.
+
+  25 Sep 2002; Phil Bordelon <sunflare@gentoo.org> silc-client-0.9.5.1.ebuild :
+  Version bump.  Fixes a number of crashes and the like.
+
+*silc-client-0.9.4 (25 Jun 2002)
+
+  25 Jun 2002; Phil Bordelon <sunflare@gentoo.org> silc-client-0.9.4.ebuild :
+
+  Version bump.  Cleaned up the build to match current standards as well.
+
+*silc-client-0.9.1 (19 May 2002)
+
+  19 May 2002; Ryan Phillips <rphillips@gentoo.org> silc-client-0.9.1.ebuild :
+
+  Updated package to new version
 
 *silc-client-0.7.6.2 (11 Apr 2002)
   11 Apr 2002; Spider <spider@gentoo.org>
diff --git a/net-im/silc-client/Manifest b/net-im/silc-client/Manifest
index a5b2cb461e4e..1bba5316a636 100644
--- a/net-im/silc-client/Manifest
+++ b/net-im/silc-client/Manifest
@@ -1,5 +1,16 @@
-MD5 676f5da21f4fe67707ee4d4b34d35c77 silc-client-0.9.12.1.ebuild 1750
-MD5 bccd496b5f226b555131ff60de1fdc21 silc-client-0.9.11.ebuild 1350
-MD5 465b8d8769437bfab19784997a77f963 ChangeLog 1472
-MD5 fb190d39f5c608735fb3650027e4499f files/digest-silc-client-0.9.11 72
-MD5 c0de3b6dda921ad76210c11a653f40ee files/digest-silc-client-0.9.12.1 74
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 2706e0989e687c2511ab4450d1867c0f silc-client-1.0.1-r1.ebuild 1614
+MD5 f0acfdeccca1c389b178c078cadec6b0 silc-client-1.0.2.ebuild 1614
+MD5 574134143301a4c9fcb5e75df829c1aa ChangeLog 4142
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 0e20ae96be7ad95ac6ce7f84345a569c files/digest-silc-client-1.0.1-r1 71
+MD5 2981293a75cd40e2c78b1dc73655aae2 files/digest-silc-client-1.0.2 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCfP9/I1lqEGTUzyQRArIVAJ9MNWuLUkwWbJbt9BYQ/fSpCTss2gCgqHa+
+13YlJvUa2TPGFhnYPX2UHko=
+=xwKF
+-----END PGP SIGNATURE-----
diff --git a/net-im/silc-client/silc-client-1.0.1-r1.ebuild b/net-im/silc-client/silc-client-1.0.1-r1.ebuild
index ef71955f9cdd..d7166d0e40fe 100644
--- a/net-im/silc-client/silc-client-1.0.1-r1.ebuild
+++ b/net-im/silc-client/silc-client-1.0.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/net-im/silc-client/silc-client-1.0.1-r1.ebuild,v 1.1 2004/07/07 08:43:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
 DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
@@ -8,7 +8,7 @@ HOMEPAGE="http://silcnet.org/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc ~sparc amd64"
 IUSE="ipv6 perl debug"
 
 DEPEND="=dev-libs/glib-1.2*
@@ -39,14 +39,15 @@ src_compile() {
 		--with-mandir=/usr/share/man \
 		--with-ncurses \
 		--without-silcd \
-		`use_enable ipv6` \
-		`use_enable debug` \
+		$(use_enable ipv6) \
+		$(use_enable debug) \
 		|| die "econf failed"
 	emake -j1 || die "emake failed"
 }
 
 src_install() {
 	local myflags=""
+
 	if use perl
 	then
 		R1="s/installsitearch='//"
diff --git a/net-im/silc-client/silc-client-1.0.2.ebuild b/net-im/silc-client/silc-client-1.0.2.ebuild
index 92f65716e8f2..fa89e8a1d51d 100644
--- a/net-im/silc-client/silc-client-1.0.2.ebuild
+++ b/net-im/silc-client/silc-client-1.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/net-im/silc-client/silc-client-1.0.2.ebuild,v 1.1 2005/05/07 17:48:26 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-client/silc-client-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:09:52 chriswhite Exp $
 
 DESCRIPTION="IRSSI-based text client for Secure Internet Live Conferencing"
 SRC_URI="http://www.silcnet.org/download/client/sources/${P}.tar.bz2"
diff --git a/net-im/silc-plugin/ChangeLog b/net-im/silc-plugin/ChangeLog
index 953ed049bc09..bcd2b19701ae 100644
--- a/net-im/silc-plugin/ChangeLog
+++ b/net-im/silc-plugin/ChangeLog
@@ -1,9 +1,77 @@
 # ChangeLog for net-im/silc-plugin
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.1 2004/08/31 15:11:48 ticho Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
+
+*silc-plugin-1.0.1-r4 (29 Aug 2005)
+
+  29 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  +silc-plugin-1.0.1-r4.ebuild:
+  Only change term_type to term_charset if installed irssi is >=0.8.10. Bug
+  #104046 by Daniel Link <stagger at gmx.net>.
+
+  21 Aug 2005; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r3.ebuild:
+  Depend on glib-1.2.
+
+*silc-plugin-1.0.1-r3 (02 Aug 2005)
+
+  02 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  +silc-plugin-1.0.1-r3.ebuild:
+  Fix pic USEflag abuse. Bug #101050.
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  silc-plugin-1.0.1-r1.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  03 Jan 2005; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r2.ebuild:
+  Added necessary perl modules into RDEPEND, according to
+  https://lists.silcnet.org/pipermail/silc-users/2003-November/000404.html.
+  Thanks to Jochen Eisinger.
+
+  24 Dec 2004; Dylan Carlson <absinthe@gentoo.org>
+  silc-plugin-1.0.1-r2.ebuild:
+  Keywords ~amd64. Removed restriction to irssi-0.8.9 since it seems to work
+  as a plugin for 0.8.10 in my testing. You can flame me in a bug if it does
+  not.
+
+  30 Nov 2004; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r1.ebuild,
+  silc-plugin-1.0.1-r2.ebuild, silc-plugin-1.0.1.ebuild:
+  Changed wording on postinst einfo message regarding perl scripts.
+
+*silc-plugin-1.0.1-r2 (28 Nov 2004)
+
+  28 Nov 2004; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r1.ebuild,
+  +silc-plugin-1.0.1-r2.ebuild:
+  Added a RDEPEND on dev-perl/MIME-tools-5.413 for silc-mime.pl script. Closes
+  #72653, reported by Daniel Webert <rockoo@rockoo.homelinux.org>.
+
+*silc-plugin-1.0.1-r1 (17 Oct 2004)
+
+  17 Oct 2004; Andrej Kacian <ticho@gentoo.org>
+  +silc-plugin-1.0.1-r1.ebuild, +files/1.0.1-branch-update.patch:
+  Removing MAKEOPTS for silc-client's lib compilation, as parallel build (-jX)
+  breaks it. Thanks to viq <viq@go2.pl> for reporting this, and to Jochen
+  Eisinger <jochen@penguin-breeder.org> for finding the solution. Closes
+  #67390.
+
+  12 Oct 2004; Andrej Kacian <ticho@gentoo.org> +files/1.0.1-gcc34.patch,
+  silc-plugin-1.0.1.ebuild:
+  Fix compile-time error with gcc3.4. Closes #67255, reported by viq
+  <viq@go2.pl>. Thanks to c0ffee for providing the fix promptly.
+
+  05 Sep 2004; David Holm <dholm@gentoo.org> silc-plugin-1.0.1.ebuild:
+  Added to ~ppc.
+
+  04 Sep 2004; Jon Hood <squinky86@gentoo.org> silc-plugin-1.0.1.ebuild:
+  Change virtual/glibc --> virtual/libc.
+
+  01 Sep 2004; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1.ebuild:
+  Changed leading spaces to tabs, made src_compile() use emake where possible.
+
+  31 Aug 2004; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1.ebuild:
+  Some QA fixes (thanks to seemant)
 
 *silc-plugin-1.0.1 (31 Aug 2004)
 
   31 Aug 2004; <ticho@gentoo.org> +metadata.xml, +silc-plugin-1.0.1.ebuild:
-  Initial import, from bug #61189. Marked unstable on x86 and sparc.
+  Initial import, closes bug #60189. Marked unstable on x86 and sparc.
 
diff --git a/net-im/silc-plugin/Manifest b/net-im/silc-plugin/Manifest
index 020eb6a57e8c..cb7b3ffd792d 100644
--- a/net-im/silc-plugin/Manifest
+++ b/net-im/silc-plugin/Manifest
@@ -1,4 +1,24 @@
-MD5 8ef83170bd497c5c2ec6b4fd2dd10b33 silc-plugin-1.0.1.ebuild 2540
-MD5 e94b325b4053b8e70f9356ea046bb820 ChangeLog 388
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 519516107c584f989f4808400037cab0 silc-plugin-1.0.1-r2.ebuild 3209
+MD5 df8902665ca5c0a82e3658b7c73911c2 silc-plugin-1.0.1-r4.ebuild 3435
+MD5 ee20a764d4ace9b102fc2ce743b88a0f silc-plugin-1.0.1-r1.ebuild 3164
+MD5 86c039cfdc524867233a99ade0f016e7 silc-plugin-1.0.1-r3.ebuild 3375
+MD5 1887420b45884f78f3f4d8ed56117f7b ChangeLog 3108
 MD5 3d21d1bc81cfd81bfd0b0b3b2123b71c metadata.xml 271
+MD5 635a1184b49ddfa3fdc72dfdf177ef33 silc-plugin-1.0.1.ebuild 3023
+MD5 71989b1101d6cf41e9f61a1b62d2cc85 files/1.0.1-branch-update.patch 6717
 MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1 202
+MD5 1acb3335a10232ac14f179305e20477f files/1.0.1-gcc34.patch 471
+MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r1 202
+MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r2 202
+MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r3 202
+MD5 ce1069db2e4cfc5c0b0d4b988c6c053c files/digest-silc-plugin-1.0.1-r4 202
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDFF4oQlM6RnzZP+IRAinDAKCoASXfZOsLF1wj1J4RasHnsqXC5ACgn3r2
+/kdH6qt6PWHD7CVi3CBLydA=
+=HSGG
+-----END PGP SIGNATURE-----
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild
index 66912fd4db38..4040fefa4d7a 100644
--- a/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.0.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/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild,v 1.1 2004/10/17 19:11:23 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ IUSE="debug pic"
 
 # All necessary dependencies are pulled in by irssi.
 DEPEND="virtual/libc"
-RDEPEND="~net-irc/irssi-0.8.9"
+RDEPEND="~net-irc/irssi-0.8.9
+	>=perl-core/MIME-Base64-3.03"
 
 S_SILC="${S}/../silc-client-${PV}"
 S_IRSSI="${S}/../irssi-${IRSSI_PV}"
@@ -85,7 +86,8 @@ pkg_postinst() {
 	einfo "enter a passphrase for this keypair twice. If you leave the passphrase"
 	einfo "empty, your key will not be stored encrypted."
 	einfo
-	einfo "You should also load the perl scripts:"
+	einfo "To make full use of silc-plugin, you should load the following perl scripts"
+	einfo "into irssi:"
 	einfo
 	einfo "\t/SCRIPT LOAD silc"
 	einfo "\t/SCRIPT LOAD silc-mime"
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r2.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r2.ebuild
index 986d4bba9a5e..acc107bfb84c 100644
--- a/net-im/silc-plugin/silc-plugin-1.0.1-r2.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-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/net-im/silc-plugin/silc-plugin-1.0.1-r2.ebuild,v 1.1 2004/11/28 12:59:33 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r2.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils
 
@@ -14,13 +14,15 @@ SRC_URI="http://irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="debug pic"
 
 # All necessary dependencies are pulled in by irssi.
 DEPEND="virtual/libc"
-RDEPEND="~net-irc/irssi-0.8.9
-	>=dev-perl/MIME-tools-5.413"
+RDEPEND=">=net-irc/irssi-0.8.9
+	>=dev-perl/MIME-tools-5.413
+	dev-perl/File-MMagic
+	dev-perl/MailTools"
 
 S_SILC="${S}/../silc-client-${PV}"
 S_IRSSI="${S}/../irssi-${IRSSI_PV}"
@@ -86,7 +88,8 @@ pkg_postinst() {
 	einfo "enter a passphrase for this keypair twice. If you leave the passphrase"
 	einfo "empty, your key will not be stored encrypted."
 	einfo
-	einfo "You should also load the perl scripts:"
+	einfo "To make full use of silc-plugin, you should load the following perl scripts"
+	einfo "into irssi:"
 	einfo
 	einfo "\t/SCRIPT LOAD silc"
 	einfo "\t/SCRIPT LOAD silc-mime"
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r3.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r3.ebuild
index 0526d4d4aeee..061470bbfc69 100644
--- a/net-im/silc-plugin/silc-plugin-1.0.1-r3.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-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/net-im/silc-plugin/silc-plugin-1.0.1-r3.ebuild,v 1.1 2005/08/02 14:04:12 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r3.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils
 
@@ -18,7 +18,8 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="debug"
 
 # All necessary dependencies are pulled in by irssi.
-DEPEND="virtual/libc"
+DEPEND="virtual/libc
+	=dev-libs/glib-1.2*"
 RDEPEND=">=net-irc/irssi-${IRSSI_PV}
 	>=dev-perl/MIME-tools-5.413
 	dev-perl/File-MMagic
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
index 21658546b677..d72b883a9e24 100644
--- a/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-r4.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/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild,v 1.1 2005/08/29 15:02:32 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ src_compile() {
 	echo
 	einfo "Preparing silc-client\n"
 	cd ${S_SILC}
-	if has_version ">=net-irc/irssi-0.8.10" ; then
+	if has_version ">=net-irc/irssi-0.8.10_rc1" ; then
 		sed -i -e "s:\"term_type\":\"term_charset\":" \
 			irssi/src/silc/core/silc-servers.c
 		sed -i -e "s:\"term_type\":\"term_charset\":" \
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1.ebuild
index 8d054ed2f061..838d9d368326 100644
--- a/net-im/silc-plugin/silc-plugin-1.0.1.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.0.1.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/net-im/silc-plugin/silc-plugin-1.0.1.ebuild,v 1.1 2004/08/31 15:11:48 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
+
+inherit eutils
 
 IRSSI_PV=0.8.9
 
@@ -8,88 +10,89 @@ DESCRIPTION="A SILC plugin for Irssi"
 HOMEPAGE="http://penguin-breeder.org/silc/"
 SRC_URI="http://irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
 	http://silcnet.org/download/client/sources/silc-client-${PV}.tar.gz
-	http://penguin-breeder.org/silc/download/silc-plugin-${PV}.tar.gz"
+	http://penguin-breeder.org/silc/download/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="~x86 ~sparc ~ppc"
 IUSE="debug pic"
 
 # All necessary dependencies are pulled in by irssi.
-DEPEND="virtual/glibc"
+DEPEND="virtual/libc"
 RDEPEND="~net-irc/irssi-0.8.9"
 
 S_SILC="${S}/../silc-client-${PV}"
 S_IRSSI="${S}/../irssi-${IRSSI_PV}"
 
 src_compile() {
-    local myconf
-
-    echo ${S_SILC}
-    use debug && myconf="${myconf} --enable-debug"
-    use pic && myconf="${myconf} --with-pic"
-
-    echo
-    einfo "Preparing silc-client\n"
-    cd ${S_SILC}
-    econf --with-helpdir=${D}/usr/share/irssi/help/silc/ \
-	--without-libtoolfix \
-	--enable-static \
-	${myconf}
-    make -C lib
-
-    echo
-    einfo "Patching irssi source for silc-plugin\n"
-    cd ${S}
-    make patch IRSSI=${S_IRSSI} SILC=${S_SILC}
-
-    echo
-    einfo "Configuring irssi\n"
-    cd ${S_IRSSI}
-    econf --sysconfdir=/etc
-    echo
-    einfo "Compiling silc-plugin\n"
-    make -C src/perl
-    make -C src/fe-common/silc
-    make -C src/silc/core
+
+	echo
+	einfo "Preparing silc-client\n"
+	cd ${S_SILC}
+	econf --with-helpdir=${D}/usr/share/irssi/help/silc/ \
+		--without-libtoolfix \
+		--enable-static \
+		`use_with pic` \
+		`use_enable debug` || die "silc-client configure failed"
+	emake -C lib || die "silc-client's lib compilation failed"
+
+	echo
+	einfo "Patching irssi source for silc-plugin\n"
+	cd ${S}
+	emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
+
+	cd ${S_IRSSI}
+
+	# this tiny patch fixes a compile-time error (bug #67255)  - ticho
+	epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
+
+	echo
+	einfo "Configuring irssi\n"
+	econf --sysconfdir=/etc || die "irssi configure failed"
+	echo
+	einfo "Compiling silc-plugin\n"
+	emake -C src/perl || die "irssi's src/perl compilation failed"
+	emake -C src/fe-common/silc || die "irssi's src/fe-common/silc compilation failed"
+	emake -C src/silc/core || die "irssi's src/silc/core compilation failed"
 }
 
 src_install() {
-    cd ${S_IRSSI}
-    make -C src/perl/silc DESTDIR=${D} install
-    make -C src/fe-common/silc DESTDIR=${D} install
-    make -C src/silc/core install DESTDIR=${D} install
+	cd ${S_IRSSI}
+	make -C src/perl/silc DESTDIR=${D} install || die "irssi's src/perl/silc installation failed"
+	make -C src/fe-common/silc DESTDIR=${D} install || die "irssi's src/fe-common/silc installation failed"
+	make -C src/silc/core install DESTDIR=${D} install ||  die "irssi's src/silc/core installation failed"
 
-    cd ${S_SILC}
-    make -C irssi/docs/help install
+	cd ${S_SILC}
+	make -C irssi/docs/help install || die "silc-client's helpfiles installation failed"
 
-    cd ${S}
-    insinto /usr/share/irssi/scripts
-    doins scripts/*
+	cd ${S}
+	insinto /usr/share/irssi/scripts
+	doins scripts/*
 
-    insinto /usr/share/irssi
-    doins default.theme
+	insinto /usr/share/irssi
+	doins default.theme
 
-    dodoc AUTHORS COPYING README USAGE
+	dodoc AUTHORS COPYING README USAGE
 }
 
 pkg_postinst() {
-    einfo "You can load the plugin with following command in Irssi:"
-    einfo
-    einfo "\t/LOAD silc"
-    einfo
-    einfo "It will automatically generate a new key pair for you. You will be asked to"
-    einfo "enter a passphrase for this keypair twice. If you leave the passphrase"
-    einfo "empty, your key will not be stored encrypted."
-    einfo
-    einfo "You should also load the perl scripts:"
-    einfo
-    einfo "\t/SCRIPT LOAD silc"
-    einfo "\t/SCRIPT LOAD silc-mime"
-    einfo
-    einfo "To connect to the SILCNet, you can use following command in Irssi:"
-    einfo
-    einfo "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
-    einfo
-    einfo "Have fun."
+	einfo "You can load the plugin with following command in Irssi:"
+	einfo
+	einfo "\t/LOAD silc"
+	einfo
+	einfo "It will automatically generate a new key pair for you. You will be asked to"
+	einfo "enter a passphrase for this keypair twice. If you leave the passphrase"
+	einfo "empty, your key will not be stored encrypted."
+	einfo
+	einfo "To make full use of silc-plugin, you should load the following perl scripts"
+	einfo "into irssi:"
+	einfo
+	einfo "\t/SCRIPT LOAD silc"
+	einfo "\t/SCRIPT LOAD silc-mime"
+	einfo
+	einfo "To connect to the SILCNet, you can use following command in Irssi:"
+	einfo
+	einfo "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
+	einfo
+	einfo "Have fun."
 }
diff --git a/net-im/silc-server/ChangeLog b/net-im/silc-server/ChangeLog
index 141f295a7d5f..0bd185bfca4c 100644
--- a/net-im/silc-server/ChangeLog
+++ b/net-im/silc-server/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for net-im/silc-server
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.1 2004/07/15 21:36:02 swegener Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/ChangeLog,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
+
+*silc-server-1.0-r1 (08 Sep 2005)
+
+  08 Sep 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.0-tempfile-vuln.patch, -silc-server-1.0.ebuild,
+  +silc-server-1.0-r1.ebuild:
+  Revision bump, security bug #94587.
+
+  10 Aug 2005; Sven Wegener <swegener@gentoo.org> silc-server-1.0.ebuild:
+  Fix the version mismatch problem, bug #99952.
+
+*silc-server-1.0 (08 Jun 2005)
+
+  08 Jun 2005; Sven Wegener <swegener@gentoo.org>
+  +files/1.0-banlist-fix.patch, +files/1.0-fPIC.patch,
+  -files/silc-server.rc6, files/silcd.rc6, -silc-server-0.9.18.ebuild,
+  -silc-server-0.9.19.ebuild, -silc-server-0.9.21.ebuild,
+  +silc-server-1.0.ebuild:
+  Version bump, security bug #94794.
+
+*silc-server-0.9.21 (07 May 2005)
+
+  07 May 2005; Sven Wegener <swegener@gentoo.org>
+  -silc-server-0.9.20.ebuild, +silc-server-0.9.21.ebuild:
+  Version bump.
+
+*silc-server-0.9.20 (03 May 2005)
+
+  03 May 2005; Sven Wegener <swegener@gentoo.org> silc-server-0.9.18.ebuild,
+  silc-server-0.9.19.ebuild, +silc-server-0.9.20.ebuild:
+  Version bump, bug #90734.
+
+*silc-server-0.9.19 (07 Apr 2005)
+
+  07 Apr 2005; Andrej Kacian <ticho@gentoo.org> -files/silc-server.init.d,
+  +files/silc-server.rc6, +files/silcd.rc6, silc-server-0.9.18.ebuild,
+  +silc-server-0.9.19.ebuild:
+  Version bump. Moved configuration to /etc/silc. Renamed initscript to silcd.
+  Link against existing silc-toolkit if found.
+
+  05 Dec 2004; Sven Wegener <swegener@gentoo.org> files/silc-server.init.d:
+  Added a &>/dev/null output redirection to the init script. Closes bug #72656.
+
+  17 Jul 2004; David Holm <dholm@gentoo.org> silc-server-0.9.18.ebuild:
+  Added to ~ppc.
 
 *silc-server-0.9.18 (15 Jul 2004)
 
diff --git a/net-im/silc-server/Manifest b/net-im/silc-server/Manifest
index e4af27003a7d..6ce454c83eae 100644
--- a/net-im/silc-server/Manifest
+++ b/net-im/silc-server/Manifest
@@ -1,3 +1,18 @@
-MD5 5ecdfe4aa0a7f79cecdca3f8e661d231 silc-server-0.9.18.ebuild 1400
-MD5 f6b465867deda9bc8629f6399aa0c025 files/silc-server.init.d 428
-MD5 35c2cb3f96d044d2fa789fdaee59b960 files/digest-silc-server-0.9.18 72
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4850a13089239174d7221c92e2f510ca ChangeLog 2020
+MD5 bc8dbf4b64aee6fb4265bc1834e8fc6f files/1.0-banlist-fix.patch 428
+MD5 1d2c979312a0f446a2c84f2b3a98f76b files/1.0-fPIC.patch 296
+MD5 4cf5e0d2734feda88b77fecd650ef181 files/1.0-tempfile-vuln.patch 509
+MD5 16f7bf5863b8fe1ce3293e158882ee35 files/digest-silc-server-1.0-r1 68
+MD5 e6e284a15d071cfdf8df8a2b7bff775a files/silcd.rc6 519
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 8cc57cf62f2c65e8bbfb9b3edef407f6 silc-server-1.0-r1.ebuild 1806
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDID1EI1lqEGTUzyQRArA8AKCr7NLj9BK8yfqqWEiRXPs02FWqJgCdGyt3
+NlWaaLijPKbrMAEeytXlIIw=
+=9RuV
+-----END PGP SIGNATURE-----
diff --git a/net-im/silc-server/files/silcd.rc6 b/net-im/silc-server/files/silcd.rc6
index e9e3d39a6ac5..194ccf9bde48 100644
--- a/net-im/silc-server/files/silcd.rc6
+++ b/net-im/silc-server/files/silcd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-im/silc-server/files/silcd.rc6,v 1.1 2005/04/07 13:37:22 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/files/silcd.rc6,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-im/silc-server/silc-server-1.0-r1.ebuild b/net-im/silc-server/silc-server-1.0-r1.ebuild
index 871610110646..dfe83c9718c8 100644
--- a/net-im/silc-server/silc-server-1.0-r1.ebuild
+++ b/net-im/silc-server/silc-server-1.0-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/net-im/silc-server/silc-server-1.0-r1.ebuild,v 1.1 2005/09/08 13:31:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-server/silc-server-1.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:45 chriswhite Exp $
 
 inherit eutils autotools
 
diff --git a/net-im/silc-toolkit/ChangeLog b/net-im/silc-toolkit/ChangeLog
index 014eede34bcb..d250771258b1 100644
--- a/net-im/silc-toolkit/ChangeLog
+++ b/net-im/silc-toolkit/ChangeLog
@@ -1,6 +1,200 @@
 # ChangeLog for net-im/silc-toolkit
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.1 2004/02/14 17:56:01 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/ChangeLog,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
+
+  24 Aug 2005; Aron Griffis <agriffis@gentoo.org> silc-toolkit-1.0.ebuild:
+  stable on ia64
+
+  06 Aug 2005; Bryan Østergaard <kloeri@gentoo.org>
+  silc-toolkit-1.0.ebuild:
+  Stable on alpha.
+
+  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
+  silc-toolkit-1.0.ebuild:
+  stable on mips
+
+  10 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
+  silc-toolkit-1.0.ebuild:
+  Stable on hppa.
+
+  19 Jun 2005; Jason Wever <weeve@gentoo.org> silc-toolkit-1.0.ebuild:
+  Stable on SPARC.
+
+  18 Jun 2005; Markus Rothe <corsair@gentoo.org> silc-toolkit-1.0.ebuild:
+  Stable on ppc64
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  silc-toolkit-1.0.ebuild:
+  Stable on ppc.
+
+  16 Jun 2005; Andrej Kacian <ticho@gentoo.org> silc-toolkit-1.0.ebuild:
+  Stable on x86.
+
+*silc-toolkit-1.0 (11 May 2005)
+
+  11 May 2005; Andrej Kacian <ticho@gentoo.org> +silc-toolkit-1.0.ebuild:
+  Version bump.
+
+  10 Apr 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  silc-toolkit-0.9.13.ebuild:
+  Fix proper -fPIC usage on amd64.  Fixed dependencies.  
+
+*silc-toolkit-0.9.13 (07 Apr 2005)
+
+  07 Apr 2005; Andrej Kacian <ticho@gentoo.org> +silc-toolkit-0.9.13.ebuild:
+  Version bump.
+
+  18 Feb 2005; Tom Martin <slarti@gentoo.org> silc-toolkit-0.9.12-r3.ebuild:
+  Change amd64 detection code, add libtoolize --copy --force to resolve a
+  ltmain.sh et al version mismatch.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  17 Dec 2004; Markus Rothe <corsair@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Stable on ppc64
+
+  15 Nov 2004; Markus Rothe <corsair@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Marked ~ppc64; bug #58170
+
+  21 Oct 2004; Hardave Riar <hardave@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Stable on mips, bug #68271.
+
+  05 Oct 2004; Guy Martin <gmsoft@gentoo.org> silc-toolkit-0.9.12-r3.ebuild:
+  Stable on hppa.
+
+  03 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Stable on alpha.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> silc-toolkit-0.9.12-r3.ebuild:
+  Stable on sparc.
+
+  02 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Stable amd64.
+
+  29 Sep 2004; Andrej Kacian <ticho@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Stable on x86.
+
+  18 Sep 2004; Sven Wegener <swegener@gentoo.org>
+  silc-toolkit-0.9.12-r3.ebuild:
+  Changed order of sed scripts to avoid running automake at compile time. Closes
+  bug 64495.
+
+  17 Sep 2004; Andrej Kacian <ticho@gentoo.org> silc-toolkit-0.9.12-r3.ebuild:
+  Modify install location of tutorial files also in Makefile.am, since on some
+  systems (amd64 reported this so far), the build process seems to start over
+  and recreate Makefile .in from .am. Thanks to Jocelyn Mayer
+  <l_indien@magic.fr> for the report and following fix (bug #63089).
+
+*silc-toolkit-0.9.12-r3 (05 Sep 2004)
+
+  05 Sep 2004; Andrej Kacian <ticho@gentoo.org> silc-toolkit-0.9.12-r3.ebuild:
+  Fixed install locations.
+
+  05 Sep 2004; Andrej Kacian <ticho@gentoo.org> :
+  Install /usr/lib/pkgconfig/silc.pc, as some packages will need it soon. Next
+  official release of silc-toolkit should install this file itself, so the
+  ebuild will have to be adjusted. Closes #62843. Also, use $(get_libdir).
+
+  29 Aug 2004; Sven Wegener <swegener@gentoo.org>
+  -silc-toolkit-0.9.11-r1.ebuild, -silc-toolkit-0.9.11.ebuild,
+  -silc-toolkit-0.9.12-r1.ebuild, -silc-toolkit-0.9.12.ebuild:
+  Removed old ebuilds.
+
+  02 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org>
+  silc-toolkit-0.9.12-r2.ebuild:
+  Stable on hppa wrt #58612
+
+  30 Jul 2004; Stephen P. Becker <geoman@gentoo.org>
+  silc-toolkit-0.9.12-r2.ebuild:
+  Directly to stable to satisfy mips repoman deps.
+
+  28 Jul 2004; <agriffis@gentoo.org> silc-toolkit-0.9.12-r2.ebuild:
+  stable on ia64
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  silc-toolkit-0.9.12-r2.ebuild:
+  Stable on alpha.
+
+  08 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  silc-toolkit-0.9.12-r2.ebuild:
+  Stable sparc.
+
+  07 Jul 2004; Travis Tilley <lv@gentoo.org> silc-toolkit-0.9.12-r2.ebuild:
+  stable on amd64
+
+  07 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  silc-toolkit-0.9.12-r2.ebuild:
+  Stable on x86
+
+*silc-toolkit-0.9.12-r2 (07 Jul 2004)
+
+  07 Jul 2004; Sven Wegener <swegener@gentoo.org>
+  +silc-toolkit-0.9.12-r2.ebuild:
+  Modified to allow installation of net-im/silc-toolkit and net-im/silc-client
+  at the time. Made CFLAGS aware.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  silc-toolkit-0.9.11-r1.ebuild, silc-toolkit-0.9.11.ebuild,
+  silc-toolkit-0.9.12-r1.ebuild, silc-toolkit-0.9.12.ebuild:
+  virtual/glibc -> virtual/libc
+
+  18 Jun 2004; Sven Wegener <swegener@gentoo.org>
+  silc-toolkit-0.9.11-r1.ebuild, silc-toolkit-0.9.11.ebuild,
+  silc-toolkit-0.9.12-r1.ebuild:
+  Removed RDEPEND="${DEPEND}" and added inherit flag-o-matic.
+
+  10 Jun 2004; Aron Griffis <agriffis@gentoo.org>
+  silc-toolkit-0.9.11-r1.ebuild:
+  Fix use invocation
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> silc-toolkit-0.9.12.ebuild:
+  Add ~alpha and ~ia64
+
+*silc-toolkit-0.9.12-r1 (01 Jun 2004)
+
+  01 Jun 2004; Dylan Carlson <absinthe@gentoo.org>
+  +files/silc-toolkit-0.9.12-r1-64bit_goodness.patch,
+  +silc-toolkit-0.9.12-r1.ebuild:
+  -fPIC workaround for amd64 so that Gaim will build with USE=silc.
+
+  31 May 2004; Dylan Carlson <absinthe@gentoo.org> silc-toolkit-0.9.12.ebuild:
+  Added ~amd64 to KEYWORDS.
+
+  19 Apr 2004; Chuck Short <zul@gentoo.org> silc-toolkit-0.9.11.ebuild:
+  marked stable for x86.
+
+  19 Apr 2004; Chuck Short <zul@gentoo.org> silc-toolkit-0.9.11-r1.ebuild:
+  Marked stable for x86.
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> silc-toolkit-0.9.11-r1.ebuild,
+  silc-toolkit-0.9.11.ebuild, silc-toolkit-0.9.12.ebuild:
+  Added to ~ppc.
+
+*silc-toolkit-0.9.12 (11 Mar 2004)
+
+  11 Mar 2004; Chuck Short <zul@gentoo.org> silc-toolkit-0.9.12.ebuild:
+  Version bump, closes #43994.
+
+*silc-toolkit-0.9.11-r1 (05 Mar 2004)
+
+  05 Mar 2004; Chuck Short <zul@gentoo.org> silc-toolkit-0.9.11-r1.ebuild:
+  Version bump, better perl support. Ebuild by Andrej Kacian <andrej -at-
+  kacian.sk>. Closes #42871.
+
+  24 Feb 2004; Sven Blumenstein <bazik@gentoo.org> silc-toolkit-0.9.11.ebuild:
+  KEYWORDS+=~sparc, thanks to Michael Hellwig <michael.hellwig@uibk.ac.at> for
+  testing!
+
+  17 Feb 2004; Chuck Short <zul@gentoo.org> silc-toolkit-0.9.11.ebuild:
+  Blocks silc-client. Added includedir so it does not clobber any files.
+  Fixes 41808.
 
 *silc-toolkit-0.9.11 (13 Feb 2004)
 
diff --git a/net-im/silc-toolkit/Manifest b/net-im/silc-toolkit/Manifest
index 818a7ce39f99..d03e311165d0 100644
--- a/net-im/silc-toolkit/Manifest
+++ b/net-im/silc-toolkit/Manifest
@@ -1,2 +1,11 @@
-MD5 6d025140ba8a4a8e3d10d4bb58aa748e silc-toolkit-0.9.11.ebuild 1286
-MD5 f40b47266698753b0bc58c24ce9aac4e files/digest-silc-toolkit-0.9.11 73
+MD5 713de6b02db7b5d09da44fb708c5041e silc-toolkit-0.9.12-r2.ebuild 1597
+MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
+MD5 817b96c8f8894dbd14d416a20801c1ac ChangeLog 6863
+MD5 3c975927b34a886038be8810e319c1a9 silc-toolkit-0.9.13.ebuild 1661
+MD5 9e5cbd4d2a7f087e91e6ecc8e95b5965 silc-toolkit-0.9.12-r3.ebuild 2158
+MD5 c8bd2066d538bba558750c4714f99390 silc-toolkit-1.0.ebuild 1608
+MD5 1f39114276cc8e15b38e0c9d013057f1 files/digest-silc-toolkit-1.0 70
+MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r2 73
+MD5 18e62467bfd5c7bf0d4de43e5b7c72a5 files/digest-silc-toolkit-0.9.13 73
+MD5 f5feddf04be28d35adc7b14360eac931 files/digest-silc-toolkit-0.9.12-r3 73
+MD5 6c8639c61522d4e5e7ee452088000fc3 files/silc-toolkit-0.9.12-64bit_goodness.patch 4563
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild
index 94408e6305b3..80391d96ec59 100644
--- a/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-0.9.12-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/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild,v 1.1 2004/07/07 08:43:33 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r2.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
 IUSE="debug ipv6"
 
 DEPEND="!<=net-im/silc-client-1.0.1"
@@ -60,5 +60,5 @@ src_install() {
 	rm -rf \
 		${D}/usr/share/man \
 		${D}/etc/${PN}/silcd.conf \
-		${D}/usr/share/doc/${PF}/tutorial
+		${D}/usr/share/doc/${PF}/{tutorial,examples}
 }
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild
index 379843181477..06491f729077 100644
--- a/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.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/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild,v 1.1 2004/09/05 11:03:27 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.12-r3.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~alpha ~ia64 ~mips"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc sparc x86 ppc64"
 IUSE="debug ipv6"
 
 DEPEND="!<=net-im/silc-client-1.0.1
@@ -20,29 +20,38 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
+	# also modify Makefile.am, since the build process seems to recreate
+	# Makefile.in and start over (see bug 63089)
 	sed -i \
-		-e 's:-cp -R $(srcdir)/tutorial $(prefix):-cp -R $(srcdir)/tutorial $(docdir):' \
+		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
+		Makefile.am
+
+	sed -i \
+		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
 		Makefile.in
+
 	sed -i \
 		-e "s:-g -O2:${CFLAGS}:g" \
 		configure
 
 	# Fix for amd64
-	[ "${ARCH}" = "amd64" ] && epatch ${FILESDIR}/${P}-64bit_goodness.patch
+	use amd64 && epatch ${FILESDIR}/${P}-64bit_goodness.patch
+
+	libtoolize --copy --force
 }
 
 src_compile() {
 	# Fix for amd64
-	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+	use amd64 && append-flags -fPIC
 
 	econf \
-		--datadir=/$(get_libdir)/share/${PN} \
-		--mandir=/$(get_libdir)/share/man \
-		--includedir=/$(get_libdir)/include/${PN} \
+		--datadir=/usr/share/${PN} \
+		--mandir=/usr/share/man \
+		--includedir=/usr/include/${PN} \
 		--with-etcdir=/etc/${PN} \
-		--with-helpdir=/$(get_libdir)/share/${PN}/help \
-		--with-simdir=/$(get_libdir)/lib/${PN} \
-		--with-docdir=/$(get_libdir)/share/doc/${PF} \
+		--with-helpdir=/usr/share/${PN}/help \
+		--with-simdir=/usr/$(get_libdir)/${PN} \
+		--with-docdir=/usr/share/doc/${PF} \
 		--with-logsdir=/var/log/${PN} \
 		--enable-shared \
 		--enable-static \
@@ -59,16 +68,16 @@ src_install() {
 	make install DESTDIR=${D} || die "make install failed"
 
 	rm -rf \
-		${D}/$(get_libdir)/share/man \
+		${D}/usr/share/man \
 		${D}/etc/${PN}/silcd.conf \
-		${D}/$(get_libdir)/share/doc/${PF}/{tutorial,examples}
+		${D}/usr/share/doc/${PF}/{tutorial,examples}
 
-	dodir $(get_libdir)/pkgconfig
-	cat >${D}/$(get_libdir)/pkgconfig/silc.pc <<EOF
+	dodir /usr/$(get_libdir)/pkgconfig
+	cat >${D}/usr/$(get_libdir)/pkgconfig/silc.pc <<EOF
 prefix=/usr
 exec_prefix=\${prefix}
-libdir=/usr/$(get_libdir)
-includedir=/usr/include
+libdir=\${prefix}/$(get_libdir)
+includedir=\${prefix}/include
 
 Name: silc
 Version: ${PV}
diff --git a/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild b/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild
index beee8cb0be4c..7a2947830241 100644
--- a/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-0.9.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/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild,v 1.1 2005/04/07 12:06:26 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-0.9.13.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -13,37 +13,23 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64"
 IUSE="debug ipv6"
 
-DEPEND="!<=net-im/silc-client-1.0.1
+RDEPEND="!<=net-im/silc-client-1.0.1"
+
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	# also modify Makefile.am, since the build process seems to recreate
-	# Makefile.in and start over (see bug 63089)
-	sed -i \
-		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
-		Makefile.am
-
-	sed -i \
-		-e "s:\$(srcdir)/tutorial \$(prefix):\$(srcdir)/tutorial \$(docdir):" \
-		Makefile.in
 
-	sed -i \
-		-e "s:-g -O2:${CFLAGS}:g" \
-		configure
+	# They have incorrect DESTDIR usage
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' ${S}/Makefile.am
+	sed -i '/\$(srcdir)\/tutorial/s/\$(prefix)/\$(docdir)/' ${S}/Makefile.in
 
-	# Fix for amd64
-	use amd64 && epatch ${FILESDIR}/${P}-64bit_goodness.patch
-
-	libtoolize --copy --force
+	# Stop them from unsetting our CFLAGS
+	sed -i '/^CFLAGS=$/d' ${S}/configure || die
 }
 
 src_compile() {
-	# Fix for amd64
-	use amd64 && append-flags -fPIC
-
 	econf \
 		--datadir=/usr/share/${PN} \
 		--mandir=/usr/share/man \
@@ -57,15 +43,15 @@ src_compile() {
 		--enable-static \
 		--without-irssi \
 		--without-silcd \
-		`use_enable debug` \
-		`use_enable ipv6` \
-		|| die "econf failed"
+		$(use_enable debug) \
+		$(use_enable ipv6)
+
 	emake || die "emake failed"
 	emake -C lib || die "emake -C lib failed"
 }
 
 src_install() {
-	make install DESTDIR=${D} || die "make install failed"
+	make install DESTDIR="${D}" || die "make install failed"
 
 	rm -rf \
 		${D}/etc/${PN}/silcd.conf \
diff --git a/net-im/silc-toolkit/silc-toolkit-1.0.ebuild b/net-im/silc-toolkit/silc-toolkit-1.0.ebuild
index ed2c6bccdc2b..e1c8382c6d1a 100644
--- a/net-im/silc-toolkit/silc-toolkit-1.0.ebuild
+++ b/net-im/silc-toolkit/silc-toolkit-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/net-im/silc-toolkit/silc-toolkit-1.0.ebuild,v 1.1 2005/05/11 10:57:56 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-toolkit/silc-toolkit-1.0.ebuild,v 1.1.1.1 2005/11/30 10:09:50 chriswhite Exp $
 
 inherit eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="http://silcnet.org/download/toolkit/sources/${P}.tar.bz2"
 
 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="debug ipv6"
 
 RDEPEND="!<=net-im/silc-client-1.0.1"
diff --git a/net-im/silky/ChangeLog b/net-im/silky/ChangeLog
index 031739cb0424..1bce0c17a9a6 100644
--- a/net-im/silky/ChangeLog
+++ b/net-im/silky/ChangeLog
@@ -1,6 +1,66 @@
 # ChangeLog for net-im/silky
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silky/ChangeLog,v 1.1 2004/03/18 15:57:51 zul Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/ChangeLog,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
+
+  20 Aug 2005; Andrej Kacian <ticho@gentoo.org>
+  +files/silky-0.5.4-getopt.patch, silky-0.5.4.ebuild:
+  Apply patch to compile on current lib versions. Bug #103034 by Daniel Link
+  <stagger at gmx.net>.
+
+  01 May 2005; Michael Hanselmann <hansmi@gentoo.org> silky-0.5.4.ebuild:
+  Stable on ppc.
+
+  27 Apr 2005; Andrej Kacian <ticho@gentoo.org> silky-0.5.4.ebuild:
+  Stable on x86.
+
+  03 Apr 2005; Andrej Kacian <ticho@gentoo.org> -silky-0.5.3.ebuild:
+  Removed ebuild for 0.5.3, since it's just a 0.5.4 without a certain bugfix.
+
+*silky-0.5.4 (20 Mar 2005)
+
+  20 Mar 2005; Andrej Kacian <ticho@gentoo.org> +silky-0.5.4.ebuild:
+  Version bump.
+
+*silky-0.5.3 (18 Mar 2005)
+
+  18 Mar 2005; Andrej Kacian <ticho@gentoo.org> +silky-0.5.3.ebuild:
+  Version bump.
+
+  21 Jan 2005; Andrej Kacian <ticho@gentoo.org> silky-0.5.2.ebuild:
+  Stable on x86.
+
+*silky-0.5.2 (09 Oct 2004)
+
+  09 Oct 2004; Andrej Kacian <ticho@gentoo.org> +silky-0.5.2.ebuild:
+  Version bump.
+
+  08 Jul 2004; Sven Wegener <swegener@gentoo.org> -silky-0.5.0.ebuild,
+  silky-0.5.1.ebuild:
+  Stable on x86 and ebuild cleanup.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> silky-0.5.0.ebuild,
+  silky-0.5.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+*silky-0.5.1 (19 Apr 2004)
+
+  19 Apr 2004; Chuck Short <zul@gentoo.org> silky-0.5.0.ebuild,
+  silky-0.5.1.ebuild:
+  Version bump, closes #48231.
+
+  13 Apr 2004; Don Seiler <rizzo@gentoo.org>; silky-0.5.0.ebuild:
+  Removing dependency on xfree, since gtk+ already depends on virtual/x11
+
+  19 Apr 2004; Chuck Short <zul@gentoo.org> silky-0.5.0.ebuild:
+  Marked stable for x86.
+
+  24 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> silky-0.5.0.ebuild:
+  keyworded ~sparc thanks to tnkflx in #gentoo-sparc
+
+*silky-0.5.0 (19 Mar 2004)
+
+  19 Mar 2004; David Holm <dholm@gentoo.org> silky-0.5.0.ebuild:
+  Added to ~ppc.
 
   18 Mar 2004; <chuck@gentoo.org> :
   Initial version, ebuild written by Andrej Kacian < andrej @ kacian.sk >
diff --git a/net-im/silky/Manifest b/net-im/silky/Manifest
index b3078eb13068..ca7d32672654 100644
--- a/net-im/silky/Manifest
+++ b/net-im/silky/Manifest
@@ -1,2 +1,19 @@
-MD5 6313d1b148f1e5dcb5aecd6c014cae86 silky-0.5.0.ebuild 1101
-MD5 0f010e26f4d85b18adf0986dd71de78a files/digest-silky-0.5.0 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bf019be6e8c6cb0e6144f8bfffc063c8 silky-0.5.4.ebuild 915
+MD5 95d2f6925cd1116a28c6321d776ae382 silky-0.5.1.ebuild 914
+MD5 6d1f626cefd6e273bf77537e8d0f03e1 silky-0.5.2.ebuild 914
+MD5 13cfa14a5792bbbd47334ef752f3f79d ChangeLog 2162
+MD5 b9fdb558af0dc40960d563eb57947c0f metadata.xml 221
+MD5 503565a71edccf299762fa80d5242be0 files/digest-silky-0.5.1 63
+MD5 900486724c3fdb64a030bf3ac331fa2c files/digest-silky-0.5.2 63
+MD5 64b0ff9aabc431d9800b93cfcb98002a files/digest-silky-0.5.4 63
+MD5 799fd743b2b48bc4967bf8909af1bc05 files/silky-0.5.4-getopt.patch 1931
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDB0BoQlM6RnzZP+IRAoyHAKCmbS0bwy6RZghk3zIDt5qwTDSWdwCeKX0+
+0oo/tdK/IQL96QVZFOJLkEo=
+=V87c
+-----END PGP SIGNATURE-----
diff --git a/net-im/silky/metadata.xml b/net-im/silky/metadata.xml
index 6ef15e900f17..b44c011b0925 100644
--- a/net-im/silky/metadata.xml
+++ b/net-im/silky/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>net-irc</herd>
+<maintainer>
+  <email>ticho@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/net-im/silky/silky-0.5.1.ebuild b/net-im/silky/silky-0.5.1.ebuild
index 0985a62aa05a..d4c7cdbe18a1 100644
--- a/net-im/silky/silky-0.5.1.ebuild
+++ b/net-im/silky/silky-0.5.1.ebuild
@@ -1,20 +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/net-im/silky/silky-0.5.1.ebuild,v 1.1 2004/04/19 22:19:40 zul Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
-IUSE=""
+IUSE="debug"
 
 DESCRIPTION="Simple and easy to use GTK+ based os-independent SILC client."
-HOMEPAGE="http://silky.sourceforge.net"
-SRC_URI="mirror://sourceforge/silky/silky-${PV}.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc"
+HOMEPAGE="http://silky.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+KEYWORDS="x86 ~ppc ~sparc"
 LICENSE="GPL-2"
 
 SLOT="0"
 
-# Silky currently does not work with silc-toolkit newer than 0.9.11. This bug
-# is to be addressed in next release of Silky.
-DEPEND="sys-libs/glibc
+DEPEND="virtual/libc
 	sys-libs/zlib
 	>=gnome-base/libglade-2
 	>=x11-libs/gtk+-2.2
@@ -23,30 +21,17 @@ DEPEND="sys-libs/glibc
 	>=dev-libs/glib-2.2
 	dev-libs/libxml2
 	app-misc/mime-types
-	net-im/silc-toolkit"
-
-RDEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-}
+	>=net-im/silc-toolkit-0.9.12-r2"
 
 src_compile() {
-	local myconf
-
-	myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit "
-	myconf="${myconf} --with-silc-libs=/usr/lib "
-
-	if [ "${DEBUG}" ]
-	then
-		einfo "debugging"
-		myconf="${myconf} --enable-debug"
-	fi
-
-	econf ${myconf} || die "./configure failed"
-	emake || die
+	econf \
+		--with-silc-includes=/usr/include/silc-toolkit \
+		--with-silc-libs=/usr/lib \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install
+	make DESTDIR=${D} install || die "make install failed"
 }
diff --git a/net-im/silky/silky-0.5.2.ebuild b/net-im/silky/silky-0.5.2.ebuild
index 8176f4918a3a..8fc91b09efb7 100644
--- a/net-im/silky/silky-0.5.2.ebuild
+++ b/net-im/silky/silky-0.5.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/net-im/silky/silky-0.5.2.ebuild,v 1.1 2004/10/08 22:56:36 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
 IUSE="debug"
 
 DESCRIPTION="Simple and easy to use GTK+ based os-independent SILC client."
 HOMEPAGE="http://silky.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/net-im/silky/silky-0.5.4.ebuild b/net-im/silky/silky-0.5.4.ebuild
index 75327c5d2f20..c5ef8f68399a 100644
--- a/net-im/silky/silky-0.5.4.ebuild
+++ b/net-im/silky/silky-0.5.4.ebuild
@@ -1,14 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.4.ebuild,v 1.1 2005/03/20 01:59:16 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silky/silky-0.5.4.ebuild,v 1.1.1.1 2005/11/30 10:09:44 chriswhite Exp $
 
-IUSE=""
+inherit eutils
 
 DESCRIPTION="Simple and easy to use GTK+ based os-independent SILC client."
 HOMEPAGE="http://silky.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc"
 LICENSE="GPL-2"
+IUSE=""
 
 SLOT="0"
 
@@ -23,6 +24,12 @@ DEPEND="virtual/libc
 	app-misc/mime-types
 	>=net-im/silc-toolkit-0.9.12-r2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-getopt.patch || die "epatch failed"
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake || die "emake failed"
diff --git a/net-im/simpserver-bin/ChangeLog b/net-im/simpserver-bin/ChangeLog
index 595f0ee17f24..b7da10d0ed96 100644
--- a/net-im/simpserver-bin/ChangeLog
+++ b/net-im/simpserver-bin/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-im/simpserver-bin
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/ChangeLog,v 1.1 2004/03/13 08:17:51 eradicator Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/ChangeLog,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 *simpserver-bin-0.9 (13 Mar 2004)
 
diff --git a/net-im/simpserver-bin/Manifest b/net-im/simpserver-bin/Manifest
index d3942eae41fe..bb3014556d9a 100644
--- a/net-im/simpserver-bin/Manifest
+++ b/net-im/simpserver-bin/Manifest
@@ -1,5 +1,5 @@
-MD5 3ec42400162cbb8756d5c77cb15d3109 simpserver-bin-0.9.ebuild 792
-MD5 23c955097fb4170005f4db8b67f4e5d6 ChangeLog 364
+MD5 3b967540621091750c18da152b127955 simpserver-bin-0.9.ebuild 905
+MD5 8e73605aeb25252323ca22b990a16626 ChangeLog 451
 MD5 f2abe2a10510203f9f0b9ba9d71c3a01 metadata.xml 871
-MD5 66af1eb23e273725cb8e19fcaff80cb6 files/simpserver.rc 474
+MD5 21c2bed1c3d33663ba378ad78c469de4 files/simpserver.rc 585
 MD5 d6d8ac1f540c378a9dac6c845e44976b files/digest-simpserver-bin-0.9 73
diff --git a/net-im/simpserver-bin/files/simpserver.rc b/net-im/simpserver-bin/files/simpserver.rc
index b6609066a8e1..72450f4c0a14 100644
--- a/net-im/simpserver-bin/files/simpserver.rc
+++ b/net-im/simpserver-bin/files/simpserver.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-im/simpserver-bin/files/simpserver.rc,v 1.1 2004/03/13 08:17:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/files/simpserver.rc,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 depend() {
 	need net
diff --git a/net-im/simpserver-bin/simpserver-bin-0.9.ebuild b/net-im/simpserver-bin/simpserver-bin-0.9.ebuild
index 6d61709aa9df..b527bcc83a09 100644
--- a/net-im/simpserver-bin/simpserver-bin-0.9.ebuild
+++ b/net-im/simpserver-bin/simpserver-bin-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/net-im/simpserver-bin/simpserver-bin-0.9.ebuild,v 1.1 2004/03/13 08:17:51 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/simpserver-bin/simpserver-bin-0.9.ebuild,v 1.1.1.1 2005/11/30 10:09:46 chriswhite Exp $
 
 MY_PN=${PN/-bin/}
 MY_P="${MY_PN}-${PV}"
@@ -11,6 +11,7 @@ HOMEPAGE="http://www.secway.fr/"
 LICENSE="simpserver-test"
 
 KEYWORDS="-* ~x86"
+IUSE=""
 SLOT="0"
 S=${WORKDIR}/simp
 
diff --git a/net-im/tmsnc/ChangeLog b/net-im/tmsnc/ChangeLog
index faa19cc01dd2..f24dfb502433 100644
--- a/net-im/tmsnc/ChangeLog
+++ b/net-im/tmsnc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-im/tmsnc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/tmsnc/ChangeLog,v 1.1 2005/09/06 00:56:19 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tmsnc/ChangeLog,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
+
+  14 Nov 2005; Luis Medinas <metalgod@gentoo.org> -tmsnc-0.2.4.ebuild,
+  tmsnc-0.2.5.ebuild:
+  Marked Stable on amd64. Removing older version.
+
+*tmsnc-0.3.0 (20 Oct 2005)
+
+  20 Oct 2005; Luis Medinas <metalgod@gentoo.org> +tmsnc-0.3.0.ebuild:
+  Version bump.
+
+*tmsnc-0.2.5 (01 Oct 2005)
+
+  01 Oct 2005; Luis Medinas <metalgod@gentoo.org> +tmsnc-0.2.5.ebuild:
+  Version Bump.
 
 *tmsnc-0.2.4 (06 Sep 2005)
 
diff --git a/net-im/tmsnc/Manifest b/net-im/tmsnc/Manifest
index 8c8933373bad..26489e705f53 100644
--- a/net-im/tmsnc/Manifest
+++ b/net-im/tmsnc/Manifest
@@ -1,3 +1,16 @@
-MD5 9bb36348c2f94730f20e24feac7ab623 tmsnc-0.2.4.ebuild 1018
-MD5 aa080b19fd87d4fb29ad20a27d2fb32d ChangeLog 291
-MD5 fb5cdbfe31d6f8753f77a5d0868b5ff4 files/digest-tmsnc-0.2.4 63
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c77f9a43957e90189bed35b357aaeaae ChangeLog 753
+MD5 8b105b1aef1e3ecc9a59746e20db13b1 files/digest-tmsnc-0.2.5 63
+MD5 96107b54f248cf1898d8720e668a7de5 files/digest-tmsnc-0.3.0 63
+MD5 a9df75e0d6358c894c7236055a417c7d metadata.xml 583
+MD5 13c20485194caf694513157208803978 tmsnc-0.2.5.ebuild 1112
+MD5 7fdad03e80cdcf82a35be1c2d8c39512 tmsnc-0.3.0.ebuild 1113
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDeJqowUpWvClEHQoRApcEAJsFK4ceLNlJSRcq1ZPsFgGMPJwC3QCdETee
+uAbF8MsD7FK612Oewu0IuQs=
+=572B
+-----END PGP SIGNATURE-----
diff --git a/net-im/tmsnc/metadata.xml b/net-im/tmsnc/metadata.xml
index a014315639db..c0e510cf3ab5 100644
--- a/net-im/tmsnc/metadata.xml
+++ b/net-im/tmsnc/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></herd>
+<herd>no-herd</herd>
 <maintainer>
 <email>metalgod@gentoo.org</email>
 <name>Luis Medinas</name>
diff --git a/net-im/tmsnc/tmsnc-0.2.5.ebuild b/net-im/tmsnc/tmsnc-0.2.5.ebuild
index 7f0bc6815e83..751e487f59cd 100644
--- a/net-im/tmsnc/tmsnc-0.2.5.ebuild
+++ b/net-im/tmsnc/tmsnc-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/net-im/tmsnc/tmsnc-0.2.5.ebuild,v 1.1 2005/10/01 00:31:18 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tmsnc/tmsnc-0.2.5.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 DESCRIPTION="TMSNC is a textbased MSN client written in C."
 HOMEPAGE="http://tmsnc.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/tmsnc/${P}.tar.gz"
 
 LICENSE="IRPDL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="nls ssl talkfilters"
 
 DEPEND="virtual/libc
diff --git a/net-im/tmsnc/tmsnc-0.3.0.ebuild b/net-im/tmsnc/tmsnc-0.3.0.ebuild
index 7b0b03742e0a..d46387d12240 100644
--- a/net-im/tmsnc/tmsnc-0.3.0.ebuild
+++ b/net-im/tmsnc/tmsnc-0.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/net-im/tmsnc/tmsnc-0.3.0.ebuild,v 1.1 2005/10/20 03:57:07 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/tmsnc/tmsnc-0.3.0.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 DESCRIPTION="TMSNC is a textbased MSN client written in C."
 HOMEPAGE="http://tmsnc.sourceforge.net/"
diff --git a/net-im/twinkle/ChangeLog b/net-im/twinkle/ChangeLog
index d17b5d2e38cb..f16ded87551c 100644
--- a/net-im/twinkle/ChangeLog
+++ b/net-im/twinkle/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-im/twinkle
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.1 2005/10/11 11:10:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/ChangeLog,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
+
+*twinkle-0.4.1 (20 Nov 2005)
+
+  20 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-0.4.1-badcflags.patch, +twinkle-0.4.1.ebuild:
+  version bump - bug #112978 thanks to Captain Sifff
+
+*twinkle-0.3.2-r1 (13 Nov 2005)
+
+  13 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/twinkle-0.3-parallel.patch, -twinkle-0.3.ebuild,
+  +twinkle-0.3.2-r1.ebuild:
+  arts USE flag added- bug #112147 thanks to Felix Tiede
+
+*twinkle-0.3.2 (07 Nov 2005)
+
+  07 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-0.3.2-amd64.patch, +files/twinkle-0.3.2-badcflags.patch,
+  +twinkle-0.3.2.ebuild:
+  amd64 patch added to version bump thanks to Diego - bug #110856
+
+*twinkle-0.3.1 (17 Oct 2005)
+
+  17 Oct 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/twinkle-0.3.1-badcflags.patch, +twinkle-0.3.1.ebuild:
+  version bump
 
 *twinkle-0.3 (11 Oct 2005)
 
diff --git a/net-im/twinkle/Manifest b/net-im/twinkle/Manifest
index cfd4e9af6d85..48cd805716a2 100644
--- a/net-im/twinkle/Manifest
+++ b/net-im/twinkle/Manifest
@@ -1,5 +1,24 @@
-MD5 5759632bfdf378d11dd83034f464cc02 ChangeLog 325
-MD5 26e3bc4492a54c2f58604cad013570e9 files/digest-twinkle-0.3 63
-MD5 70aa928120e8267e9314805c95cd3903 files/twinkle-0.3-parallel.patch 3724
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 47b0b96153f116ae54285395b08d623c ChangeLog 1257
+MD5 dc5a3058857036eb5ca33a35819f1164 files/digest-twinkle-0.3.1 65
+MD5 7190799a48d4e6410e3b085f6060ec58 files/digest-twinkle-0.3.2 65
+MD5 7190799a48d4e6410e3b085f6060ec58 files/digest-twinkle-0.3.2-r1 65
+MD5 849a2819d504bbbdf7d3cb372179f8bd files/digest-twinkle-0.4.1 65
+MD5 bd526be23363739d99a572793a4340fa files/twinkle-0.3.1-badcflags.patch 1850
+MD5 e5260d884a6822201c94886d32c5154d files/twinkle-0.3.2-amd64.patch 503
+MD5 9a6bdc1d520938fd26446b34f7414d06 files/twinkle-0.3.2-badcflags.patch 14878
+MD5 bed5e3eed5c8eaef4460598e15633da5 files/twinkle-0.4.1-badcflags.patch 492
 MD5 81380b5fa13f903ff321873d95ed35bb metadata.xml 458
-MD5 38459c667a456388bcbed479b8bd9dab twinkle-0.3.ebuild 752
+MD5 7abbf78091ee015b297347fb0b1c9d09 twinkle-0.3.1.ebuild 855
+MD5 e2a484f7eed40b4feb94cac24975e8a3 twinkle-0.3.2-r1.ebuild 1031
+MD5 6927584c0ecd78f39a77a33016dc3df8 twinkle-0.3.2.ebuild 892
+MD5 10128ef335cfe934c39355c200ec03b7 twinkle-0.4.1.ebuild 995
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFDgEXamdTrptrqvGERAsc4AJ0c90csA68vu2/YcsZAFwM+EmeRUQCeIhmm
+QC2+X/NyjbWpRoBY8PtI4kM=
+=12iZ
+-----END PGP SIGNATURE-----
diff --git a/net-im/twinkle/twinkle-0.3.1.ebuild b/net-im/twinkle/twinkle-0.3.1.ebuild
index af8e89e01847..0f08d35b8ae5 100644
--- a/net-im/twinkle/twinkle-0.3.1.ebuild
+++ b/net-im/twinkle/twinkle-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/net-im/twinkle/twinkle-0.3.1.ebuild,v 1.1 2005/10/17 19:14:36 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 inherit eutils qt3
 
diff --git a/net-im/twinkle/twinkle-0.3.2-r1.ebuild b/net-im/twinkle/twinkle-0.3.2-r1.ebuild
index 2ab5f761dbad..2cf4655a6084 100644
--- a/net-im/twinkle/twinkle-0.3.2-r1.ebuild
+++ b/net-im/twinkle/twinkle-0.3.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/net-im/twinkle/twinkle-0.3.2-r1.ebuild,v 1.1 2005/11/13 11:22:21 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.3.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 inherit eutils qt3
 
diff --git a/net-im/twinkle/twinkle-0.3.2.ebuild b/net-im/twinkle/twinkle-0.3.2.ebuild
index a2313cf05fb7..2c5907e838a0 100644
--- a/net-im/twinkle/twinkle-0.3.2.ebuild
+++ b/net-im/twinkle/twinkle-0.3.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/net-im/twinkle/twinkle-0.3.2.ebuild,v 1.1 2005/11/07 10:54:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 inherit eutils qt3
 
diff --git a/net-im/twinkle/twinkle-0.4.1.ebuild b/net-im/twinkle/twinkle-0.4.1.ebuild
index 44243f377a83..4edfb47a3f9d 100644
--- a/net-im/twinkle/twinkle-0.4.1.ebuild
+++ b/net-im/twinkle/twinkle-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/net-im/twinkle/twinkle-0.4.1.ebuild,v 1.1 2005/11/20 09:45:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/twinkle/twinkle-0.4.1.ebuild,v 1.1.1.1 2005/11/30 10:09:51 chriswhite Exp $
 
 inherit eutils qt3
 
diff --git a/net-im/universalkopete/ChangeLog b/net-im/universalkopete/ChangeLog
index 5a0088ea5154..2ab57b29c5cc 100644
--- a/net-im/universalkopete/ChangeLog
+++ b/net-im/universalkopete/ChangeLog
@@ -1,10 +1,24 @@
 # ChangeLog for net-im/universalkopete
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/universalkopete/ChangeLog,v 1.1 2004/03/15 21:19:34 humpback Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/universalkopete/ChangeLog,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
+
+  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
+
+  17 Jan 2005; Dan Armak <danarmak@gentoo.org> universalkopete-0.1.ebuild:
+  Changed dep on kde-base/kdenetwork to allow for kde-base/kdenetwork-meta of
+  the new split ebuilds. Someone should take the time to determine what
+  exactly (other than kde-base/kopete) is needed and refine this dep further.
+
+  03 Jul 2004; Carsten Lohrke <carlo@gentoo.org> universalkopete-0.1.ebuild:
+  QA: need-kde after R/DEPEND
+
+  24 May 2004; Gustavo Felisberto <humpback@gentoo.org>; :
+  Fixed problem with digest, thanks to andre@vliegt.nl in bug 50661
 
 *universalkopete-0.1 (15 Mar 2004)
 
   15 Mar 2004; Gustavo Felisberto <humpback@gentoo.org>;
   universalkopete-0.1.ebuild:
-  Initial import thanks to Diego Petten� <dgp85@users.sourceforge.net>
+  Initial import thanks to Diego Pettenò <dgp85@users.sourceforge.net>
 
diff --git a/net-im/universalkopete/Manifest b/net-im/universalkopete/Manifest
index 61b70103681e..b961ff554f4b 100644
--- a/net-im/universalkopete/Manifest
+++ b/net-im/universalkopete/Manifest
@@ -1,2 +1,14 @@
-MD5 ef35ffe35bbd5e0238ffb3997506e506 universalkopete-0.1.ebuild 583
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 397450b312e01a7cd6f2a282a859756c universalkopete-0.1.ebuild 702
+MD5 777dd6192cc0e6ca0bc051ab9f92a54a metadata.xml 221
+MD5 e5b9a2709d9d4ff59b8a92912c1179d8 ChangeLog 1064
 MD5 c084d724beaae042e949b1fafddbc305 files/digest-universalkopete-0.1 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK1R+LLFUmVNQ7rkRAoffAJ9lKLxUHbE3mnFjaawFNy41IOHSFwCfQfAL
+M3t8C6vXXHsUyFrDeH1vfaE=
+=+ZGE
+-----END PGP SIGNATURE-----
diff --git a/net-im/universalkopete/universalkopete-0.1.ebuild b/net-im/universalkopete/universalkopete-0.1.ebuild
index b9b5219d1e64..05a1bce2ef74 100644
--- a/net-im/universalkopete/universalkopete-0.1.ebuild
+++ b/net-im/universalkopete/universalkopete-0.1.ebuild
@@ -1,9 +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/net-im/universalkopete/universalkopete-0.1.ebuild,v 1.1 2004/03/15 21:19:34 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/universalkopete/universalkopete-0.1.ebuild,v 1.1.1.1 2005/11/30 10:09:49 chriswhite Exp $
 
 inherit kde
-need-kde 3.2
 
 S=${WORKDIR}/universalkopete
 
@@ -11,15 +10,12 @@ DESCRIPTION="Allows Kopete to embed into the Universal Sidebar and become part\
 			of your KDE desktop as opposed to a floating window."
 SRC_URI="http://www.nemohackers.org/software/universalkopete/${P}.tar.bz2
 		http://flameeyes.web.ctonet.it/mirror/${P}.tar.bz2"
-
 HOMEPAGE="http://www.nemohackers.org/"
 
-LICENSE="GPL-2"
-
 SLOT="0"
-
+LICENSE="GPL-2"
 KEYWORDS="~x86"
-
 IUSE=""
 
-DEPEND=">=kde-base/kdenetwork-3.2_rc1"
+DEPEND="|| ( kde-base/kopete >=kde-base/kdenetwork-3.2 )"
+need-kde 3.2
\ No newline at end of file
diff --git a/net-im/ysm/ChangeLog b/net-im/ysm/ChangeLog
index bfa7283b4a02..7a1c3cda69cd 100644
--- a/net-im/ysm/ChangeLog
+++ b/net-im/ysm/ChangeLog
@@ -1,8 +1,42 @@
 # ChangeLog for net-im/ysm
-# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ysm/ChangeLog,v 1.1 2002/08/14 07:56:29 aliz Exp $
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ysm/ChangeLog,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
+
+  31 Aug 2004; David Holm <dholm@gentoo.org> ysm-2.9.6.ebuild:
+  Added to ~ppc.
+
+*ysm-2.9.6 (06 Aug 2004)
+
+  06 Aug 2004; Daniel Ahlberg <aliz@gentoo.org> ysm-2.9.0.ebuild, 
+  ysm-2.9.6.ebuild:
+  + Version bump found by yunus <yunussg@hotmail.com> in #58462.
+  + Unmasked 2.9.0.
+  + Removed old version.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> ysm-2.7.1.ebuild,
+  ysm-2.8.1-r1.ebuild, ysm-2.9.0.ebuild:
+  virtual/glibc -> virtual/libc
+
+*ysm-2.9.0 (17 Sep 2003)
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> ysm-2.9.0.ebuild :
+  Version bump. Ebuild contributed by Michael Postmann <michael.postmann@gmx.at> in #26403.
+
+*ysm-2.8.1-r1 (17 Sep 2003)
+
+  17 Sep 2003; Daniel Ahlberg <aliz@gentoo.org> ysm-2.8.1-r1.ebuild :
+  Fixes installation of binaries and man page.
+  Ebuild contributed by Michael Postmann <michael.postmann@gmx.at> in #26403.
+
+*ysm-2.8.1 (04 May 2003)
+
+  04 May 2003; Daniel Ahlberg <aliz@gentoo.org> ysm-2.8.1.ebuild :
+  Version bump. Found by Filipe Almeida <filipe@rnl.ist.utl.pt> in #12112.
 
 *ysm-2.7.1 (14 Aug 2002)
 
   14 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> ysm-2.7.1.ebuild:
+  Added installation of man page and docs.
+
+  14 Aug 2002; Daniel Ahlberg <aliz@gentoo.org> ysm-2.7.1.ebuild:
   Initial import. Ebuild submitted by Filipe Almeida <filipe@rnl.ist.utl.pt>.
diff --git a/net-im/ysm/Manifest b/net-im/ysm/Manifest
index e69de29bb2d1..8fec6a333ae3 100644
--- a/net-im/ysm/Manifest
+++ b/net-im/ysm/Manifest
@@ -0,0 +1,7 @@
+MD5 e2a3bbbfa82f422e3e7ed5c603af24e2 ChangeLog 1506
+MD5 e1585a881b4cd8fbb699b469f41b2b27 ysm-2.8.1-r1.ebuild 633
+MD5 c0ea8750c93dd5534fc43726d85357a6 ysm-2.9.0.ebuild 617
+MD5 c2f4a20b6ff0c9dba3acd89a434763b8 ysm-2.9.6.ebuild 631
+MD5 a74a224d5b3af023250cb504ff29a7d6 files/digest-ysm-2.8.1-r1 64
+MD5 ece3633ce866e45ad37a16e4e18708c5 files/digest-ysm-2.9.0 64
+MD5 8a3be9685ebdcb9da0f8ac33dfa969a1 files/digest-ysm-2.9.6 64
diff --git a/net-im/ysm/ysm-2.8.1-r1.ebuild b/net-im/ysm/ysm-2.8.1-r1.ebuild
index bbea0bc6b3fa..91772bbbd517 100644
--- a/net-im/ysm/ysm-2.8.1-r1.ebuild
+++ b/net-im/ysm/ysm-2.8.1-r1.ebuild
@@ -1,16 +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/net-im/ysm/ysm-2.8.1-r1.ebuild,v 1.1 2003/09/17 14:33:59 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ysm/ysm-2.8.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 MY_PV=${PV//./_}
 DESCRIPTION="A console ICQ client supporting versions 7/8"
 HOMEPAGE="http://ysmv7.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ysmv7/${PN}v7_${MY_PV}.tar.bz2"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}v7_${MY_PV}
 
@@ -19,4 +21,3 @@ src_install () {
 	doman src/man/ysm.1
 	dodoc README AUTHORS COMMANDS INSTALL
 }
-
diff --git a/net-im/ysm/ysm-2.9.0.ebuild b/net-im/ysm/ysm-2.9.0.ebuild
index 6e163a02e994..b29c1b67d20a 100644
--- a/net-im/ysm/ysm-2.9.0.ebuild
+++ b/net-im/ysm/ysm-2.9.0.ebuild
@@ -1,16 +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/net-im/ysm/ysm-2.9.0.ebuild,v 1.1 2003/09/17 14:33:59 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ysm/ysm-2.9.0.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 MY_PV=${PV//./_}
 DESCRIPTION="A console ICQ client supporting versions 7/8"
 HOMEPAGE="http://ysmv7.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ysmv7/${PN}v7_${MY_PV}.tar.bz2"
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-DEPEND="virtual/glibc"
-RDEPEND="virtual/glibc"
+KEYWORDS="x86"
+IUSE=""
+DEPEND="virtual/libc"
+RDEPEND="virtual/libc"
 
 S=${WORKDIR}/${PN}v7_${MY_PV}
 
@@ -19,4 +21,3 @@ src_install () {
 	doman src/man/ysm.1
 	dodoc README AUTHORS INSTALL
 }
-
diff --git a/net-im/ysm/ysm-2.9.6.ebuild b/net-im/ysm/ysm-2.9.6.ebuild
index 96f873bce2ef..5449f723a0d3 100644
--- a/net-im/ysm/ysm-2.9.6.ebuild
+++ b/net-im/ysm/ysm-2.9.6.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/net-im/ysm/ysm-2.9.6.ebuild,v 1.1 2004/08/06 19:18:32 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ysm/ysm-2.9.6.ebuild,v 1.1.1.1 2005/11/30 10:09:48 chriswhite Exp $
 
 MY_PV=${PV//./_}
 DESCRIPTION="A console ICQ client supporting versions 7/8"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/ysmv7/${PN}v7_${MY_PV}.tar.bz2"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 DEPEND="virtual/libc"
 RDEPEND="virtual/libc"
diff --git a/net-zope/abracadabraobject/ChangeLog b/net-zope/abracadabraobject/ChangeLog
index ce3d2687c9ce..0181a6099614 100644
--- a/net-zope/abracadabraobject/ChangeLog
+++ b/net-zope/abracadabraobject/ChangeLog
@@ -1,8 +1,16 @@
 # ChangeLog for net-zope/abracadabraobject
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/abracadabraobject/ChangeLog,v 1.1 2003/04/11 23:10:23 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/abracadabraobject/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  27 Mar 2004; Heinrich Wendel <lanius@gentoo.org>
+  abracadabraobject-1.5.1.ebuild:
+  remove broken ppc keyword
+
+  22 Jun 2003; Jason Shoemaker <kustsuya@gentoo.org>
+  abracadabraobject-1.5.1.ebuild: ~x86 ~ppc -> x86 ppc
 
 *abracadabraobject-1.5.1 (11 Apr 2003)
 
-  11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> abracadabraobject-1.5.1.ebuild : Initial import.
+  11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  abracadabraobject-1.5.1.ebuild : Initial import.
 
diff --git a/net-zope/abracadabraobject/Manifest b/net-zope/abracadabraobject/Manifest
index 5fc00ce4009f..dbb4f1ae20d1 100644
--- a/net-zope/abracadabraobject/Manifest
+++ b/net-zope/abracadabraobject/Manifest
@@ -1,3 +1,4 @@
-MD5 6fd3de05e7c09d219aa8b2b198342e9d abracadabraobject-1.5.1.ebuild 605
-MD5 5f8e70e1151c6029b32521ec6f39b120 ChangeLog 377
+MD5 3a47e580d94236f2cedc7b85aaf98007 abracadabraobject-1.5.1.ebuild 594
+MD5 72d278bb6f388e7aa1a110ca7b64132e ChangeLog 595
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 fbcdf20a77b893ed8fc68f04fdf30864 files/digest-abracadabraobject-1.5.1 74
diff --git a/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild b/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild
index 96237126d1e1..3f7ff7cec0f8 100644
--- a/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild
+++ b/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild,v 1.1 2003/04/11 23:10:23 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/abracadabraobject/abracadabraobject-1.5.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +8,7 @@ DESCRIPTION="This can add pre-configured ZOPE-objects to folders through ZMI."
 HOMEPAGE="http://www.zope.org/Members/mjablonski/AbracadabraObject"
 SRC_URI="${HOMEPAGE}/AbracadabraObject-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86"
 RDEPEND="net-zope/propertyfolder
 	net-zope/propertyobject
 	${RDEPEND}"
diff --git a/net-zope/annotations/ChangeLog b/net-zope/annotations/ChangeLog
index 6633afebf0c0..fbf2c4f84d90 100644
--- a/net-zope/annotations/ChangeLog
+++ b/net-zope/annotations/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-zope/annotations
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/annotations/ChangeLog,v 1.1 2004/09/28 15:30:09 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/annotations/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> annotations-0.4.3.ebuild:
+  added ~amd64
+
+*annotations-0.4.3 (14 Oct 2004)
+
+  14 Oct 2004; David Holm <dholm@gentoo.org> annotations-0.4.3.ebuild:
+  Added to ~ppc.
+
+*annotations-0.4.3 (14 Oct 2004)
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  annotations-0.4.3.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
   28 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> :
   Initial release, needed for silva-1.0.2
diff --git a/net-zope/annotations/Manifest b/net-zope/annotations/Manifest
index 0292ff4c5937..02ab0b946132 100644
--- a/net-zope/annotations/Manifest
+++ b/net-zope/annotations/Manifest
@@ -1,4 +1,4 @@
+MD5 95841ec6efc687ee02eb8153f4d077ba ChangeLog 691
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 4924cc40c00e1711756de21c601f763f annotations-0.4.3.ebuild 397
-MD5 ac21e63f6958c3d00a18e5cd44a358bc files/digest-sprout-0.5 58
+MD5 f0cd645d53e519c1c65725bbb3bd336e annotations-0.4.3.ebuild 513
 MD5 e9814e9de817884a88766ab0f9fc134c files/digest-annotations-0.4.3 64
diff --git a/net-zope/annotations/annotations-0.4.3.ebuild b/net-zope/annotations/annotations-0.4.3.ebuild
index 6eb08c5b6cf7..af3e6241d1b4 100644
--- a/net-zope/annotations/annotations-0.4.3.ebuild
+++ b/net-zope/annotations/annotations-0.4.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/net-zope/annotations/annotations-0.4.3.ebuild,v 1.1 2004/09/28 15:30:09 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/annotations/annotations-0.4.3.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Annotations is a generic way to add information to arbitrary Zope o
 HOMEPAGE="http://www.infrae.com/download/Annotations"
 SRC_URI="${HOMEPAGE}/${PV}/Annotations-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 ZPROD_LIST="Annotations"
diff --git a/net-zope/archetypes/ChangeLog b/net-zope/archetypes/ChangeLog
index 113498de592e..b0eedb451799 100644
--- a/net-zope/archetypes/ChangeLog
+++ b/net-zope/archetypes/ChangeLog
@@ -1,7 +1,74 @@
 # ChangeLog for net-zope/archetypes
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/ChangeLog,v 1.1 2003/10/11 09:02:08 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> archetypes-1.3.1.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> archetypes-1.3.1.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+*archetypes-1.3.1 (04 Dec 2004)
+
+  04 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +archetypes-1.3.1.ebuild:
+  new release.
+
+  18 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  -archetypes-1.2.5_rc4.ebuild, -archetypes-1.3.0_beta3.ebuild,
+  -archetypes-1.3.0_rc2.ebuild:
+  cleaning not needed ebuilds.
+
+  06 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +archetypes-1.3.0.ebuild:
+  New release from author.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  archetypes-1.2.5_rc5.ebuild:
+  marked as stable on x86 and ppc
+
+  13 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  archetypes-1.2.5_rc4.ebuild, archetypes-1.2.5_rc5.ebuild,
+  archetypes-1.3.0_beta3.ebuild, archetypes-1.3.0_rc2.ebuild:
+  added SLOT
+
+*archetypes-1.3.0_rc2 (12 Sep 2004)
+
+  12 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +archetypes-1.2.5_rc5.ebuild, +archetypes-1.3.0_rc2.ebuild:
+  version bump
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; :
+  oops, ebuild was not added to cvs
+
+*archetypes-1.3.0_beta3 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; -archetypes-1.0.1.ebuild,
+  -archetypes-1.2.3.ebuild, archetypes-1.2.5_rc4.ebuild,
+  +archetypes-1.3.0_beta3.ebuild:
+  version bump, removing old ebuild, added IUSE
+
+  27 Mar 2004; David Holm <dholm@gentoo.org> archetypes-1.2.5_rc4.ebuild:
+  Added to ~ppc.
+
+*archetypes-1.2.5_rc4 (27 Mar 2004)
+
+  27 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>; archetypes-1.0.1.ebuild,
+  archetypes-1.2.5_rc4.ebuild:
+  corrected copyright (repoman),
+  version bump, it's better to use generator and validation shipped with
+  archetypes than the python packages
+
+*archetypes-1.2.3 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> archetypes-1.0.ebuild,
+  archetypes-1.2.3.ebuild:
+  version bump
+
+  11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
+
+*archetypes-1.0.1 (11 Oct 2003)
 *archetypes-1.0 (11 Oct 2003)
 
   11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> archetypes-1.0.1.ebuild,
diff --git a/net-zope/archetypes/Manifest b/net-zope/archetypes/Manifest
index 37c0a148eb77..099ab29ce655 100644
--- a/net-zope/archetypes/Manifest
+++ b/net-zope/archetypes/Manifest
@@ -1,4 +1,8 @@
-MD5 463af50b959047e150847914b7ec4dcb archetypes-1.0.1.ebuild 664
-MD5 95ac0bb0b41f9f9e26bad5648c2f8f7d archetypes-1.0.ebuild 681
-MD5 616e79a9cb70b6117b75b990c0c0f94c files/digest-archetypes-1.0 69
-MD5 223af5173c7341daf23e517d356b0a0e files/digest-archetypes-1.0.1 65
+MD5 aca27b4e8dd0057d3050142272dddad1 archetypes-1.3.1.ebuild 751
+MD5 0929c787f11e87d52a4ac530d4e45bec archetypes-1.2.5_rc5.ebuild 661
+MD5 25ec3812a21eac1ec6f704684f8ce40c archetypes-1.3.2.ebuild 842
+MD5 9a0a23eb1fd11366e20ef3b21b03cb40 ChangeLog 2513
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 37c846011334d0541cc73f2b945b34b0 files/digest-archetypes-1.3.1 74
+MD5 687ed5a2b2b3ca04db8473a1b6238a29 files/digest-archetypes-1.3.2 74
+MD5 b2c84d4daad233137f3c9ac65b342715 files/digest-archetypes-1.2.5_rc5 72
diff --git a/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild b/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild
index 9ed076f97d9a..bf6b873ddc85 100644
--- a/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild
+++ b/net-zope/archetypes/archetypes-1.2.5_rc5.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/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild,v 1.1 2004/09/11 22:27:42 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/archetypes-1.2.5_rc5.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,8 +11,9 @@ HOMEPAGE="http://www.sourceforge.net/projects/${PN}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 S=${WORKDIR}/${MY_P}
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
+SLOT="1.2"
 
 RDEPEND=">=net-zope/plone-1.0.1
 		net-zope/portaltransforms
diff --git a/net-zope/archetypes/archetypes-1.3.1.ebuild b/net-zope/archetypes/archetypes-1.3.1.ebuild
index 8b0eaa39a89e..28f075bd8636 100644
--- a/net-zope/archetypes/archetypes-1.3.1.ebuild
+++ b/net-zope/archetypes/archetypes-1.3.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/net-zope/archetypes/archetypes-1.3.1.ebuild,v 1.1 2004/12/04 20:15:27 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/archetypes-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Allows creation of new content types for Plone"
 WEBPAGE="http://www.sourceforge.net/projects/${PN}"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 SLOT="1.3"
 
diff --git a/net-zope/archetypes/archetypes-1.3.2.ebuild b/net-zope/archetypes/archetypes-1.3.2.ebuild
index 1f139a083e75..13b38be9507f 100644
--- a/net-zope/archetypes/archetypes-1.3.2.ebuild
+++ b/net-zope/archetypes/archetypes-1.3.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/net-zope/archetypes/archetypes-1.3.2.ebuild,v 1.1 2005/04/15 17:04:53 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/archetypes/archetypes-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/atcontenttypes/ChangeLog b/net-zope/atcontenttypes/ChangeLog
index be9210a12ba7..aa4d98e27a2c 100644
--- a/net-zope/atcontenttypes/ChangeLog
+++ b/net-zope/atcontenttypes/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for net-zope/atcontenttypes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/atcontenttypes/ChangeLog,v 1.1 2005/03/26 02:11:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/atcontenttypes/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
 
 *atcontenttypes-0.2.0 (26 Mar 2005)
 
   26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +metadata.xml,
   +atcontenttypes-0.2.0.ebuild:
-  initial release based on Kai Schl�ter work (#85755).
+  initial release based on Kai Schlüter work (#85755).
 
diff --git a/net-zope/atcontenttypes/Manifest b/net-zope/atcontenttypes/Manifest
index 98e4203910c0..4bdb055336f3 100644
--- a/net-zope/atcontenttypes/Manifest
+++ b/net-zope/atcontenttypes/Manifest
@@ -1,3 +1,14 @@
-MD5 5cc3fec801ae1d4ed53d4cfb1434ed21 atcontenttypes-0.2.0.ebuild 345
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 aaef1734ec4710f4033b53df5476b982 atcontenttypes-0.2.0.ebuild 578
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 fe5ea38a991105fa375c33aaed6ba721 ChangeLog 525
 MD5 aaac75ebf650cf0ee631199e2d347288 files/digest-atcontenttypes-0.2.0 78
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK2IJLLFUmVNQ7rkRAnKCAJ44YmQyejk+0itGuRuPI0qj0BaE+ACdFnn4
+KWOswH9zm0ofZh2Nf2uASXM=
+=+QvD
+-----END PGP SIGNATURE-----
diff --git a/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild b/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild
index aca082f168c8..d5fab8be6a74 100644
--- a/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild
+++ b/net-zope/atcontenttypes/atcontenttypes-0.2.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/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild,v 1.1 2005/03/26 02:11:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/atcontenttypes/atcontenttypes-0.2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/btreefolder2/ChangeLog b/net-zope/btreefolder2/ChangeLog
index ccf2ce785979..f0c0c0b28d0d 100644
--- a/net-zope/btreefolder2/ChangeLog
+++ b/net-zope/btreefolder2/ChangeLog
@@ -1,9 +1,38 @@
 # ChangeLog for net-zope/btreefolder2
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/ChangeLog,v 1.1 2003/03/03 21:44:50 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> btreefolder2-1.0.1.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> btreefolder2-1.0.1.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; btreefolder2-1.0.1.ebuild:
+  marked stable
+
+*btreefolder2-1.0.1 (11 Sep 2004)
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> btreefolder2-0.5.0.ebuild,
+  +btreefolder2-1.0.1.ebuild, btreefolder2-1.0.ebuild:
+  version bump
+
+  27 Mar 2004; Heinrich Wendel <lanius@gentoo.org> btreefolder2-0.5.0.ebuild:
+  remove broken ppc keyword
+
+*btreefolder2-1.0 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> btreefolder2-1.0.ebuild:
+  version bump
 
 *btreefolder2-0.5.0 (27 Feb 2003)
 
+  18 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> btreefolder2-0.5.0.ebuild:
+  ~ppc -> ppc
+
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> btreefolder2-0.5.0.ebuild:
+  ~x86 -> x86 and added ~ppc. Changed description.
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> btreefolder2-0.5.0.ebuild:
   Moving from net-www to net-zope. Shorter description.
 
diff --git a/net-zope/btreefolder2/Manifest b/net-zope/btreefolder2/Manifest
index e69de29bb2d1..a25f483dc6a2 100644
--- a/net-zope/btreefolder2/Manifest
+++ b/net-zope/btreefolder2/Manifest
@@ -0,0 +1,8 @@
+MD5 e1a1d99053e07a608f93f76b1d906640 ChangeLog 1462
+MD5 d79699fd380904e90c3b9a9765dc1550 btreefolder2-0.5.0.ebuild 531
+MD5 61a8bccfc7272edae62e6226ced1dbdb btreefolder2-1.0.1.ebuild 536
+MD5 43cba9f3bfd735d763e419e64e0ac2ad btreefolder2-1.0.ebuild 535
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 5f9af7e791e225acb40040c82a872157 files/digest-btreefolder2-0.5.0 68
+MD5 254b1fabcd0cd1b5095ef32477fcd5ca files/digest-btreefolder2-1.0 67
+MD5 d8bc6a40a0034c9bd1c899f4aec00315 files/digest-btreefolder2-1.0.1 69
diff --git a/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild b/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild
index 38e5be051de9..7f2b2f665af8 100644
--- a/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild
+++ b/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public Form License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild,v 1.1 2003/03/03 21:44:50 kutsuya Exp $
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
-DESCRIPTION="This product acts like a Zope folder but can store many more items."
+DESCRIPTION="Acts like a Zope folder but can store many more items."
 HOMEPAGE="http://hathaway.freezope.org/Software/BTreeFolder2/"
 SRC_URI="http://hathaway.freezope.org/Software/BTreeFolder2/BTreeFolder2-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 ZPROD_LIST="BTreeFolder2"
+IUSE=""
diff --git a/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild b/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild
index b50a66244c37..8c51fef9b6f0 100644
--- a/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild
+++ b/net-zope/btreefolder2/btreefolder2-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/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild,v 1.1 2004/09/11 21:59:48 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Acts like a Zope folder but can store many more items."
 HOMEPAGE="http://hathawaymix.org/Software/BTreeFolder2/"
 SRC_URI="http://hathawaymix.org/Software/BTreeFolder2/BTreeFolder2-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 ZPROD_LIST="BTreeFolder2"
 IUSE=""
diff --git a/net-zope/btreefolder2/btreefolder2-1.0.ebuild b/net-zope/btreefolder2/btreefolder2-1.0.ebuild
index ee50243182ed..5723c0cf2940 100644
--- a/net-zope/btreefolder2/btreefolder2-1.0.ebuild
+++ b/net-zope/btreefolder2/btreefolder2-1.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/net-zope/btreefolder2/btreefolder2-1.0.ebuild,v 1.1 2004/01/19 13:17:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/btreefolder2/btreefolder2-1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,3 +11,4 @@ LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 
 ZPROD_LIST="BTreeFolder2"
+IUSE=""
diff --git a/net-zope/calendarx/ChangeLog b/net-zope/calendarx/ChangeLog
index c0e3c19a7a77..7cee87106339 100644
--- a/net-zope/calendarx/ChangeLog
+++ b/net-zope/calendarx/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for net-zope/zodb
+# ChangeLog for net-zope/calendarx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/calendarx/ChangeLog,v 1.1 2005/04/19 17:03:05 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/calendarx/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> calendarx-0.6.0.ebuild:
+  added ~amd64 to KEYWORDS, fixes #90691
+
+*calendarx-0.6.0 (22 Apr 2005)
+
+  22 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +calendarx-0.6.0.ebuild:
+  version bump
 
 *calendarx-0.4.15 (18 Apr 2005)
 
diff --git a/net-zope/calendarx/Manifest b/net-zope/calendarx/Manifest
index 280d1ba41b71..a1a0d4e16c17 100644
--- a/net-zope/calendarx/Manifest
+++ b/net-zope/calendarx/Manifest
@@ -1,4 +1,16 @@
-MD5 3626f1010f678963df446221edb56f7a calendarx-0.4.15.ebuild 538
-MD5 6dcf568664a43cc5f159acbbf3523c67 ChangeLog 357
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d8206842083580d7102531d84af7254 calendarx-0.4.15.ebuild 641
+MD5 9c8455228fa21f2ec95ef3ff76bdd613 calendarx-0.6.0.ebuild 651
+MD5 89b06d88886e68291ad27b1a0bdf5169 ChangeLog 617
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 68bf1f6178e03200a196bbe515eb5be6 files/digest-calendarx-0.6.0 67
 MD5 21a2938f905b10b3210f9d1d313661ec files/digest-calendarx-0.4.15 68
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCckZu06ebR+OMO78RAi1lAJwObGcUdv+F3P7p2E+BlXr7+VJNfACeNZCz
+zO5kAdqnsmN7licpklD++wA=
+=7JfN
+-----END PGP SIGNATURE-----
diff --git a/net-zope/calendarx/calendarx-0.4.15.ebuild b/net-zope/calendarx/calendarx-0.4.15.ebuild
index 3be8942486f2..cafc8db0884f 100644
--- a/net-zope/calendarx/calendarx-0.4.15.ebuild
+++ b/net-zope/calendarx/calendarx-0.4.15.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/net-zope/calendarx/calendarx-0.4.15.ebuild,v 1.1 2005/04/19 17:03:05 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/calendarx/calendarx-0.4.15.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/calendarx/calendarx-0.6.0.ebuild b/net-zope/calendarx/calendarx-0.6.0.ebuild
index 515e2e9b80f3..0fec34f68ffe 100644
--- a/net-zope/calendarx/calendarx-0.6.0.ebuild
+++ b/net-zope/calendarx/calendarx-0.6.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/net-zope/calendarx/calendarx-0.6.0.ebuild,v 1.1 2005/04/22 18:05:59 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/calendarx/calendarx-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}//CalendarX-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE=""
 
 DEPEND="=net-zope/plone-2.0*"
diff --git a/net-zope/cmf/ChangeLog b/net-zope/cmf/ChangeLog
index cd107424505d..e954863501ef 100644
--- a/net-zope/cmf/ChangeLog
+++ b/net-zope/cmf/ChangeLog
@@ -1,9 +1,93 @@
-# ChangeLog for net-www/cmf
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/ChangeLog,v 1.1 2003/03/03 22:18:31 kutsuya Exp $
+# ChangeLog for net-zope/cmf
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+*cmf-1.5.1 (26 Apr 2005)
+
+  26 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> -cmf-1.4.2-r1.ebuild,
+  +cmf-1.5.1.ebuild:
+  version bump + removed old unstable ebuild cruft.
+
+*cmf-1.5.0 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +cmf-1.5.0.ebuild:
+  version bump in new slot. arches reverted to ~
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> cmf-1.4.7.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> cmf-1.4.7.ebuild:
+  added ~amd64
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; cmf-1.4.7.ebuild:
+  marked stable
+
+*cmf-1.4.7 (11 Sep 2004)
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +cmf-1.4.7.ebuild:
+  version bump
+
+*cmf-1.4.4 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; -cmf-1.3.1.ebuild,
+  -cmf-1.4.2.ebuild, +cmf-1.4.4.ebuild:
+  version bump, removed old versions, added to ~ppc
+
+  16 Mar 2004; David Holm <dholm@gentoo.org> cmf-1.3.2.ebuild:
+  Added to ~ppc.
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> cmf-1.4.2-r1.ebuild:
+  Added to ~ppc.
+
+*cmf-1.4.2-r1 (29 Jan 2004)
+
+  29 Jan 2004; Heinrich Wendel <lanius@gentoo.org> cmf-1.3.1.ebuild,
+  cmf-1.3.2.ebuild, cmf-1.4.1.ebuild, cmf-1.4.2-r1.ebuild, cmf-1.4.2.ebuild:
+  remove ppc keywords; add DCWorkflow to ZPROD_LIST; mark 1.3.2 stable on x86
+
+*cmf-1.4.2 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> cmf-1.4.2.ebuild,
+  cmf-1.4.ebuild:
+  version bump
+
+*cmf-1.4.1 (10 Oct 2003)
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> cmf-1.3.2.ebuild,
+  cmf-1.4.1.ebuild:
+  version bump on cmf-1.4 series and cleanups for both cmf-1.3.2 and
+  cmf-1.4.1
+
+*cmf-1.3.2 (10 Oct 2003)
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> cmf-1.3.2.ebuild:
+  version bump on cmf-1.3.2 for security fix
+
+*cmf-1.4 (21 Jun 2003)
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmf-1.4.ebuild:
+  Version bump. This is the other slotted version. Masked all archs to
+  unstable.
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmf-1.3.1.ebuild:
+  ~ppc -> ppc. CMF is now slotted because of plone.
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmf-1.3.ebuild:
+  Removing cmf-1.3 and its digest.
+
+*cmf-1.3.1 (09 Mar 2003)
+
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmf-1.3.1.ebuild :
+  ~x86 -> x86 and added ~ppc.
+
+  09 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmf-1.3.1.ebuild :
+  Version bump.
 
 *cmf-1.3 (16 Feb 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmf-1.3.ebuild :
+  ~x86 -> x86 and added ~ppc.
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to 
   net-zope.
 
diff --git a/net-zope/cmf/Manifest b/net-zope/cmf/Manifest
index e69de29bb2d1..505d72815ba5 100644
--- a/net-zope/cmf/Manifest
+++ b/net-zope/cmf/Manifest
@@ -0,0 +1,12 @@
+MD5 005d15ef122b1647c0270e61e7ee6c2d cmf-1.5.1.ebuild 630
+MD5 0bd21c9026a86216222d9bcfbf6063c9 cmf-1.3.2.ebuild 587
+MD5 b239351e8a1af19bebe5a3658c07ecc9 cmf-1.4.7.ebuild 628
+MD5 348b2bbe2cf0b364ab8d5b3e8dbdafa1 cmf-1.5.0.ebuild 630
+MD5 51da574d949095dcdefc755d0d282b56 ChangeLog 2896
+MD5 1bf88f1d81e1cb9432053533ebbf6f33 cmf-1.4.4.ebuild 599
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 371e9a33722acc784fbbe12734fb395d files/digest-cmf-1.3.2 61
+MD5 34d3be0655c857447b8574eb7005f231 files/digest-cmf-1.4.4 61
+MD5 f52277d74614e10fa6ffdff76db99a67 files/digest-cmf-1.4.7 61
+MD5 49c7ffc900dfff6e902e6d5c1725d706 files/digest-cmf-1.5.0 61
+MD5 b32d859be4c2b18d91457353a14f3cbe files/digest-cmf-1.5.1 61
diff --git a/net-zope/cmf/cmf-1.3.2.ebuild b/net-zope/cmf/cmf-1.3.2.ebuild
index e49e7572f134..95a96887adcb 100644
--- a/net-zope/cmf/cmf-1.3.2.ebuild
+++ b/net-zope/cmf/cmf-1.3.2.ebuild
@@ -1,23 +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/net-zope/cmf/cmf-1.3.2.ebuild,v 1.1 2003/10/10 21:58:21 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
-S=${WORKDIR}/CMF-${PV}
 
 DESCRIPTION="Content Management Framework. Services for content-oriented portal sites."
 
 HOMEPAGE="http://cmf.zope.org/"
-SRC_URI="${HOMEPAGE}/download/CMF-${PV}/CMF-${PV}.tar.gz"
+MY_PN="CMF"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="${HOMEPAGE}/download/${MY_P}/${MY_P}.tar.gz"
 SLOT=1.3
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic"
-MYDOC="DEPENDENCIES.txt INSTALL_CVS.txt ${MYDOC}"
-
-
-
-
-
-
+MYDOC="*.txt ${MYDOC}"
+S=${WORKDIR}/${MY_P}
diff --git a/net-zope/cmf/cmf-1.4.4.ebuild b/net-zope/cmf/cmf-1.4.4.ebuild
index 5a6f5a8c1bb1..4d3e847e06e1 100644
--- a/net-zope/cmf/cmf-1.4.4.ebuild
+++ b/net-zope/cmf/cmf-1.4.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/net-zope/cmf/cmf-1.4.4.ebuild,v 1.1 2004/07/27 19:04:48 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.4.4.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmf/cmf-1.4.7.ebuild b/net-zope/cmf/cmf-1.4.7.ebuild
index f0ae6b19b120..01705b205b58 100644
--- a/net-zope/cmf/cmf-1.4.7.ebuild
+++ b/net-zope/cmf/cmf-1.4.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/net-zope/cmf/cmf-1.4.7.ebuild,v 1.1 2004/09/11 21:33:49 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.4.7.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -12,7 +12,7 @@ MY_P="${MY_PN}-${PV}"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${MY_P}/${MY_P}.tar.gz"
 SLOT=1.4
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64 ~sparc"
 IUSE=""
 
 ZPROD_LIST="CMFCalendar CMFCore CMFDefault CMFTopic DCWorkflow"
diff --git a/net-zope/cmf/cmf-1.5.0.ebuild b/net-zope/cmf/cmf-1.5.0.ebuild
index ed8be712239f..ab38df431515 100644
--- a/net-zope/cmf/cmf-1.5.0.ebuild
+++ b/net-zope/cmf/cmf-1.5.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/net-zope/cmf/cmf-1.5.0.ebuild,v 1.1 2005/03/26 14:49:01 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmf/cmf-1.5.1.ebuild b/net-zope/cmf/cmf-1.5.1.ebuild
index ae04804f4173..6d5968de95f2 100644
--- a/net-zope/cmf/cmf-1.5.1.ebuild
+++ b/net-zope/cmf/cmf-1.5.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/net-zope/cmf/cmf-1.5.1.ebuild,v 1.1 2005/04/26 16:50:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmf/cmf-1.5.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfactionicons/ChangeLog b/net-zope/cmfactionicons/ChangeLog
index daf805269dbd..3a58fef245a1 100644
--- a/net-zope/cmfactionicons/ChangeLog
+++ b/net-zope/cmfactionicons/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-zope/cmfactionicons
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfactionicons/ChangeLog,v 1.1 2004/01/19 13:27:22 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfactionicons/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> cmfactionicons-0.9.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> cmfactionicons-0.9.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; cmfactionicons-0.9.ebuild:
+  marked as stable on x86 and ppc
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> cmfactionicons-0.9.ebuild:
+  Added to ~ppc.
 
 *cmfactionicons-0.9 (19 Jan 2004)
 
diff --git a/net-zope/cmfactionicons/Manifest b/net-zope/cmfactionicons/Manifest
index bc5cc8fd6b03..0d6b982c34d8 100644
--- a/net-zope/cmfactionicons/Manifest
+++ b/net-zope/cmfactionicons/Manifest
@@ -1,2 +1,4 @@
-MD5 5bb3fd1f4ab910eff79114ba9d342fa9 cmfactionicons-0.9.ebuild 582
+MD5 c7afa6ece8ad0c8a615c8cbe781d903a ChangeLog 780
+MD5 4f1c13466389b2d6403dddba586a4592 cmfactionicons-0.9.ebuild 593
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 c13cd38e06b1fb99662e72cb9cd87d32 files/digest-cmfactionicons-0.9 69
diff --git a/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild b/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild
index f030ca06548f..e94089b53028 100644
--- a/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild
+++ b/net-zope/cmfactionicons/cmfactionicons-0.9.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/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild,v 1.1 2004/01/19 13:27:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfactionicons/cmfactionicons-0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 DESCRIPTION="CMFActionIcons: icon mapping tool, factored for reuse."
 HOMEPAGE="http://zope.org/Members/tseaver/CMFActionIcons/"
 SRC_URI="http://zope.org/Members/tseaver/${MY_PN}/${MY_PN}-${PV}/${MY_PN}-${PV}.tar.gz"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
+LICENSE="ZPL"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 ZPROD_LIST="CMFActionIcons"
diff --git a/net-zope/cmfboard/ChangeLog b/net-zope/cmfboard/ChangeLog
index 6ec9065103e2..245ad7e9f9e1 100644
--- a/net-zope/cmfboard/ChangeLog
+++ b/net-zope/cmfboard/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-zope/cmfboard
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/ChangeLog,v 1.1 2004/01/19 13:34:21 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+*cmfboard-2.1.4 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +cmfboard-2.1.4.ebuild:
+  version bump
+
+*cmfboard-2.1.2 (12 Sep 2004)
+
+  12 Sep 2004; Heinrich Wendel <lanius@gentoo.org> cmfboard-1.4.3.ebuild,
+  +cmfboard-2.1.2.ebuild:
+  version bump, bug #60963
+
+  25 Apr 2004; David Holm <dholm@gentoo.org> cmfboard-1.4.3.ebuild:
+  Added to ~ppc.
 
 *cmfboard-1.4.3 (19 Jan 2004)
 
diff --git a/net-zope/cmfboard/Manifest b/net-zope/cmfboard/Manifest
index eca6a5f7545b..940c55f8421e 100644
--- a/net-zope/cmfboard/Manifest
+++ b/net-zope/cmfboard/Manifest
@@ -1,2 +1,8 @@
-MD5 43aad148bdb038aa3dd04fdba8d34a41 cmfboard-1.4.3.ebuild 546
+MD5 8e833f5ee128dfab8d23fa425a9ad872 cmfboard-2.1.2.ebuild 557
+MD5 d8d4e07e03eadd7eb181f8d3385f6000 cmfboard-2.1.4.ebuild 556
+MD5 fdc5f95363f8930090b02f9f735ca2ac cmfboard-1.4.3.ebuild 556
+MD5 859fe56169ffcc5bf3f88bc4716e9ed5 ChangeLog 724
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 dc2a6150d4eed9677b2404410974dff9 files/digest-cmfboard-1.4.3 66
+MD5 f0b0aba559295ce7f7c5af5bf245dc74 files/digest-cmfboard-2.1.2 66
+MD5 3384a48942c21723ca1e3668678fcace files/digest-cmfboard-2.1.4 66
diff --git a/net-zope/cmfboard/cmfboard-1.4.3.ebuild b/net-zope/cmfboard/cmfboard-1.4.3.ebuild
index 65959457f37a..362720b1ad0c 100644
--- a/net-zope/cmfboard/cmfboard-1.4.3.ebuild
+++ b/net-zope/cmfboard/cmfboard-1.4.3.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/net-zope/cmfboard/cmfboard-1.4.3.ebuild,v 1.1 2004/01/19 13:34:21 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/cmfboard-1.4.3.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,10 +8,11 @@ DESCRIPTION="Zope/CMF product which provides a forum"
 HOMEPAGE="http://www.cmfboard.org"
 SRC_URI="http://www.cmfboard.org/download/CMFBoard-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 RDEPEND=">=net-zope/cmf-1.3.3
 	>=net-zope/plone-1.0.5
 	>=net-zope/archetypes-1.0.1
 	${RDEPEND}"
 
 ZPROD_LIST="CMFBoard"
+IUSE=""
diff --git a/net-zope/cmfboard/cmfboard-2.1.2.ebuild b/net-zope/cmfboard/cmfboard-2.1.2.ebuild
index f44f108e9a8f..ccbaf975b6b8 100644
--- a/net-zope/cmfboard/cmfboard-2.1.2.ebuild
+++ b/net-zope/cmfboard/cmfboard-2.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/net-zope/cmfboard/cmfboard-2.1.2.ebuild,v 1.1 2004/09/11 22:42:00 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/cmfboard-2.1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfboard/cmfboard-2.1.4.ebuild b/net-zope/cmfboard/cmfboard-2.1.4.ebuild
index f8079af0c6c9..87eae393cafa 100644
--- a/net-zope/cmfboard/cmfboard-2.1.4.ebuild
+++ b/net-zope/cmfboard/cmfboard-2.1.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/net-zope/cmfboard/cmfboard-2.1.4.ebuild,v 1.1 2005/04/15 16:12:40 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfboard/cmfboard-2.1.4.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfcollectorng/ChangeLog b/net-zope/cmfcollectorng/ChangeLog
index 70b51537cde8..d75f40364af7 100644
--- a/net-zope/cmfcollectorng/ChangeLog
+++ b/net-zope/cmfcollectorng/ChangeLog
@@ -1,9 +1,28 @@
 # ChangeLog for net-zope/cmfcollectorng
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfcollectorng/ChangeLog,v 1.1 2003/03/09 04:06:12 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfcollectorng/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  30 Apr 2004; David Holm <dholm@gentoo.org> cmfcollectorng-0.20.ebuild:
+  Added to ~ppc.
+
+  27 Mar 2004; Heinrich Wendel <lanius@gentoo.org> cmfcollectorng-0.20.ebuild:
+  fix broken ppc keyword
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfcollectorng-0.20.ebuild:
+  ~ppc -> ppc. Added MYDOC variable.
 
 *cmfcollectorng-0.20 (08 Mar 2003)
 
+  06 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfcollectorng-0.20.ebuild:
+  Changed wording of ewarnings, to recommend using cmfquickinstallertool.
+
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfcollectorng-0.20.ebuild:
+  ~x86 -> x86 and added ~ppc. Added ewarning to read the docs about cmf
+  add-ons.
+
   08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfcollectorng-0.20.ebuild:
   Initial import.
 
diff --git a/net-zope/cmfcollectorng/Manifest b/net-zope/cmfcollectorng/Manifest
index e69de29bb2d1..f640fc1212d9 100644
--- a/net-zope/cmfcollectorng/Manifest
+++ b/net-zope/cmfcollectorng/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d78eb591643f71cf73754af70d6f3369 cmfcollectorng-0.20.ebuild 790
+MD5 89252c06bc8b9d7129db17beacea4a9e ChangeLog 1058
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 5c750ae965064848a19d06a90199a85a files/digest-cmfcollectorng-0.20 71
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBooAtI1lqEGTUzyQRAuaRAJ9ETomSfzoUzEtc3uERvEirKBenzQCgqE4D
+ROQRrfmMToPwBcmowiDfeBk=
+=vcQi
+-----END PGP SIGNATURE-----
diff --git a/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild b/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild
index d5e985c1bf59..93744b440be5 100644
--- a/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild
+++ b/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 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/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild,v 1.1 2003/03/09 04:06:12 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfcollectorng/cmfcollectorng-0.20.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,8 +8,17 @@ DESCRIPTION="Zope/CMF-based bugtracking system."
 HOMEPAGE="http://www.zope.org/Members/ajung/CMFCollectorNG/Wiki/FrontPage"
 SRC_URI="mirror://sourceforge/cmfcollectorng/CMFCollectorNG-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 RDEPEND=">=net-zope/cmf-1.3
 	${RDEPEND}"
+
 ZPROD_LIST="CMFCollectorNG"
+MYDOC="MIGRATION.txt ${MYDOC}"
+
+pkg_postinst()
+{
+	zproduct_pkg_postinst
+	ewarn "Please use CMFQuickInstallerTool or read the documentation of this"
+	ewarn "product for instruction on how to add this product to your CMF/Plone site."
+}
 
diff --git a/net-zope/cmfformcontroller/ChangeLog b/net-zope/cmfformcontroller/ChangeLog
index a2761fe1e1c0..1a272ec91f83 100644
--- a/net-zope/cmfformcontroller/ChangeLog
+++ b/net-zope/cmfformcontroller/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for net-zope/cmfformcontroller
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/ChangeLog,v 1.1 2004/01/22 14:51:36 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  cmfformcontroller-1.0.3.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org>
+  cmfformcontroller-1.0.3.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  cmfformcontroller-1.0.3.ebuild:
+  marked as stable on x86 and ppc
+
+*cmfformcontroller-1.0.3 (12 Sep 2004)
+
+  12 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  +cmfformcontroller-1.0.3.ebuild:
+  version bump
+
+*cmfformcontroller-1.0.2 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  cmfformcontroller-1.0.1.ebuild, +cmfformcontroller-1.0.2.ebuild,
+  -cmfformcontroller-1.0_rc1.ebuild:
+  version bump, added IUSE
+
+*cmfformcontroller-1.0.1 (26 Mar 2004)
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> cmfformcontroller-1.0_rc1.ebuild:
+  Added to ~ppc.
+
+  28 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  cmfformcontroller-1.0_rc1.ebuild:
+  added cmf to RDEPEND
 
 *cmfformcontroller-1.0_rc1 (22 Jan 2004)
 
diff --git a/net-zope/cmfformcontroller/Manifest b/net-zope/cmfformcontroller/Manifest
index 4f92c041f367..83a3b5c1a3ab 100644
--- a/net-zope/cmfformcontroller/Manifest
+++ b/net-zope/cmfformcontroller/Manifest
@@ -1,2 +1,8 @@
-MD5 bb8a507bd489e4abde601f3445b53c5d cmfformcontroller-1.0_rc1.ebuild 568
-MD5 bd64d230e165d9bbe0a8ec30e87f38a1 files/digest-cmfformcontroller-1.0_rc1 76
+MD5 86d4e6fd6ee898c8c19e04b5820948b6 ChangeLog 1347
+MD5 2a07c82bdc3bac636261a1b4e42b079c cmfformcontroller-1.0.1.ebuild 592
+MD5 93f7430de4ab2a6756da821be3b41519 cmfformcontroller-1.0.2.ebuild 589
+MD5 5b900486e5617f4202b09aed05e27bfc cmfformcontroller-1.0.3.ebuild 590
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 aef754ad993a618c6259583301f55787 files/digest-cmfformcontroller-1.0.1 74
+MD5 5d09b7870edf1c29f8c3cb420082d0d6 files/digest-cmfformcontroller-1.0.2 71
+MD5 6960e722ea3b3e4950b213fda8079cf7 files/digest-cmfformcontroller-1.0.3 79
diff --git a/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild b/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild
index 3f7b2ec9a872..ccd5607da989 100644
--- a/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild
+++ b/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.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/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild,v 1.1 2004/03/26 22:56:27 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/cmfformcontroller-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,6 +10,7 @@ SRC_URI="mirror://sourceforge/collective/CMFFormController-${PV}.tar.gz"
 LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 SLOT="0"
+IUSE=""
 
 RDEPEND="${RDEPEND}
 	net-zope/cmf"
diff --git a/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild b/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild
index f9e31b5cd657..34df1c9a4c2b 100644
--- a/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild
+++ b/net-zope/cmfformcontroller/cmfformcontroller-1.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/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild,v 1.1 2004/07/27 19:17:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/cmfformcontroller-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild b/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild
index 99c98810641c..be2d485048a5 100644
--- a/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild
+++ b/net-zope/cmfformcontroller/cmfformcontroller-1.0.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/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild,v 1.1 2004/09/11 22:31:23 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfformcontroller/cmfformcontroller-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,9 +8,7 @@ DESCRIPTION="CMFFormController replaces the portal_form form validation mechanis
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/CMFFormController-${PV}-beta.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
-SLOT="0"
-IUSE=""
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 RDEPEND="${RDEPEND}
 	net-zope/cmf"
diff --git a/net-zope/cmfforum/ChangeLog b/net-zope/cmfforum/ChangeLog
index d3ad420dfe38..5bc5c09dcd94 100644
--- a/net-zope/cmfforum/ChangeLog
+++ b/net-zope/cmfforum/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/cmfforum
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfforum/ChangeLog,v 1.1 2003/04/06 12:04:05 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfforum/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> cmfforum-1.0.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfforum-1.0.ebuild:
+  ~ppc -> ppc. Modified ewarning to mention QuickInstaller.
 
 *cmfforum-1.0 (06 Apr 2003)
 
diff --git a/net-zope/cmfforum/Manifest b/net-zope/cmfforum/Manifest
index e69de29bb2d1..7c98beacdf08 100644
--- a/net-zope/cmfforum/Manifest
+++ b/net-zope/cmfforum/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3538932cdac06180b4db4fbf973de120 cmfforum-1.0.ebuild 712
+MD5 2e1c29490f8028385e88923d3db92e5e ChangeLog 647
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 a4f6d20407dda961d8d668c4c62fef45 files/digest-cmfforum-1.0 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBooBhI1lqEGTUzyQRAu7sAKDUCuxYqAz5NHjdrC2rqCRcOjQmpQCgh0+n
+y5VScDyNYxp/va9hC3oSGOw=
+=efv8
+-----END PGP SIGNATURE-----
diff --git a/net-zope/cmfforum/cmfforum-1.0.ebuild b/net-zope/cmfforum/cmfforum-1.0.ebuild
index 2fe05abcbce8..ae6411ac9ec7 100644
--- a/net-zope/cmfforum/cmfforum-1.0.ebuild
+++ b/net-zope/cmfforum/cmfforum-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2002-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/net-zope/cmfforum/cmfforum-1.0.ebuild,v 1.1 2003/04/06 12:04:05 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfforum/cmfforum-1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -12,11 +12,11 @@ KEYWORDS="x86 ~ppc"
 RDEPEND=">=net-zope/cmf-1.3
 	${RDEPEND}"
 
-ZPROD_LIST="CMFForum" 
+ZPROD_LIST="CMFForum"
 
 pkg_postinst()
 {
 	zproduct_pkg_postinst
-	ewarn "Please read README.txt.gz for this product. This product needs to"
-    ewarn "be manually added to a CMF/Plone site."
+	ewarn "Please use CMFQuickInstallerTool or read the documentation of this"
+	ewarn "product for instruction on how to add this product to your CMF/Plone site."
 }
diff --git a/net-zope/cmfforum/files/digest-cmfforum-1.0 b/net-zope/cmfforum/files/digest-cmfforum-1.0
index c16d98d42273..c4261adfd0d7 100644
--- a/net-zope/cmfforum/files/digest-cmfforum-1.0
+++ b/net-zope/cmfforum/files/digest-cmfforum-1.0
@@ -1,2 +1 @@
-MD5 fe8f7cde85e026458ed37102c094b4ea /cmfforum-1.0.ebuild 586
 MD5 dc9ee26b8c78a32238afd2540dcf258c CMFForum-1.0.tgz 19096
diff --git a/net-zope/cmfmember/ChangeLog b/net-zope/cmfmember/ChangeLog
index b3f93fe90751..957f59d2b9bc 100644
--- a/net-zope/cmfmember/ChangeLog
+++ b/net-zope/cmfmember/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-zope/cmfmember
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/ChangeLog,v 1.1 2005/02/24 13:58:41 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+*cmfmember-1.0 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -cmfmember-1.0_beta5.ebuild, +cmfmember-1.0.ebuild:
+  Thanx to Adam Theo information, version bump closes #85111.
+  Also removed oldest ebuild.
+
+  25 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  cmfmember-1.0_rc3.ebuild:
+  version bump.
+
+  25 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  cmfmember-1.0_beta5.ebuild:
+  Better description and corrected homepage.
 
 *cmfmember-1.0_beta5 (24 Feb 2005)
 
diff --git a/net-zope/cmfmember/Manifest b/net-zope/cmfmember/Manifest
index 86f835d65989..26fec4fbf1c4 100644
--- a/net-zope/cmfmember/Manifest
+++ b/net-zope/cmfmember/Manifest
@@ -1,4 +1,6 @@
-MD5 899bda544d33b9f460a7f126c5ac67dc cmfmember-1.0_beta5.ebuild 701
-MD5 fc4fe05e5d8436e4f5512867b3b5d550 ChangeLog 306
+MD5 3d43464195ac66ea06a79c090609446a cmfmember-1.0_rc3.ebuild 750
+MD5 bf7017f3ca640e21a530cf9d4af1f2a4 cmfmember-1.0.ebuild 730
+MD5 685dcd2e4625ee2df61552fc14cd159c ChangeLog 855
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 ec1b72632374509cebf418bff17937d2 files/digest-cmfmember-1.0_beta5 70
+MD5 a477a8e53355bc9cbe269abec2d3a8ba files/digest-cmfmember-1.0 71
+MD5 560e79a2e02d6a13546af19c0e8eada9 files/digest-cmfmember-1.0_rc3 68
diff --git a/net-zope/cmfmember/cmfmember-1.0.ebuild b/net-zope/cmfmember/cmfmember-1.0.ebuild
index a05956a02e16..39eeb7b6e14e 100644
--- a/net-zope/cmfmember/cmfmember-1.0.ebuild
+++ b/net-zope/cmfmember/cmfmember-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/net-zope/cmfmember/cmfmember-1.0.ebuild,v 1.1 2005/03/26 01:08:30 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/cmfmember-1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild b/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild
index fad1f0e4bfb6..7ad91a13a231 100644
--- a/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild
+++ b/net-zope/cmfmember/cmfmember-1.0_rc3.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/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild,v 1.1 2005/02/25 14:43:15 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfmember/cmfmember-1.0_rc3.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfoodocument/ChangeLog b/net-zope/cmfoodocument/ChangeLog
index aebed4c0302c..3ca6a57104c4 100644
--- a/net-zope/cmfoodocument/ChangeLog
+++ b/net-zope/cmfoodocument/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-zope/cmfoodocument
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfoodocument/ChangeLog,v 1.1 2004/01/28 15:01:22 lanius Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfoodocument/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 *cmfoodocument-0.2.1 (28 Jan 2004)
 
diff --git a/net-zope/cmfoodocument/Manifest b/net-zope/cmfoodocument/Manifest
index 0538b1d90bdc..8af02db3c751 100644
--- a/net-zope/cmfoodocument/Manifest
+++ b/net-zope/cmfoodocument/Manifest
@@ -1,2 +1,4 @@
-MD5 225ba02d5ff7a7963661bb38a7935ab5 cmfoodocument-0.2.1.ebuild 601
+MD5 d601c75d31c4c040701f994c146a541b ChangeLog 391
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 24c533f5ae1f4a326f7011b08b12bb61 cmfoodocument-0.2.1.ebuild 636
 MD5 4d4bd908a5d469849815ec3734c6e200 files/digest-cmfoodocument-0.2.1 70
diff --git a/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild b/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild
index 69cb4aa8a0bb..31d133521eb5 100644
--- a/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild
+++ b/net-zope/cmfoodocument/cmfoodocument-0.2.1.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/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild,v 1.1 2004/01/28 15:01:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfoodocument/cmfoodocument-0.2.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfopenflow/ChangeLog b/net-zope/cmfopenflow/ChangeLog
index 17ac4522ad5a..85e896788905 100644
--- a/net-zope/cmfopenflow/ChangeLog
+++ b/net-zope/cmfopenflow/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for net-zope/cmfopenflow
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfopenflow/ChangeLog,v 1.1 2004/01/28 15:11:07 lanius Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfopenflow/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+*cmfopenflow-1.0.99 (28 Jan 2004)
 
   28 Jan 2004; Heinrich Wendel <lanius@gentoo.org> :
   initial commit, thx to solution2u.net
diff --git a/net-zope/cmfopenflow/Manifest b/net-zope/cmfopenflow/Manifest
index b07a599d7413..9c823639c864 100644
--- a/net-zope/cmfopenflow/Manifest
+++ b/net-zope/cmfopenflow/Manifest
@@ -1,2 +1,4 @@
-MD5 503dacad9f6dd534e27861c12e7d263a cmfopenflow-1.0.99.ebuild 640
+MD5 0694219e3d8132298e994733c921e9c4 cmfopenflow-1.0.99.ebuild 639
+MD5 05b940c384f3030ac9822beda264de3d ChangeLog 344
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 988d17423765d4032d3492fdea443475 files/digest-cmfopenflow-1.0.99 58
diff --git a/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild b/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild
index f95971408764..ba5cd27d7dde 100644
--- a/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild
+++ b/net-zope/cmfopenflow/cmfopenflow-1.0.99.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/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild,v 1.1 2004/01/28 15:11:07 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfopenflow/cmfopenflow-1.0.99.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/cmfphoto/ChangeLog b/net-zope/cmfphoto/ChangeLog
index 6e8e2c8d0c5e..9640d5453a61 100644
--- a/net-zope/cmfphoto/ChangeLog
+++ b/net-zope/cmfphoto/ChangeLog
@@ -1,9 +1,60 @@
 # ChangeLog for net-zope/cmfphoto
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/ChangeLog,v 1.1 2003/03/08 11:12:44 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -cmfphoto-0.3.ebuild,
+  -cmfphoto-0.4.2.ebuild:
+  remove old versions
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> cmfphoto-0.5.0.ebuild:
+  Marked stable on the 2004.3 way.
+
+*cmfphoto-0.5.0 (26 Sep 2004)
+
+  26 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> +cmfphoto-0.5.0.ebuild:
+  version bump, IUSE added.
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> cmfphoto-0.3.ebuild,
+  cmfphoto-0.4.2.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+  12 May 2004; Jodok Batlogg <batlogg@gentoo.org>; cmfphoto-0.4.2.ebuild:
+  fixed typo, re-added help text
+
+*cmfphoto-0.4.2 (12 May 2004)
+
+  12 May 2004; Jodok Batlogg <batlogg@gentoo.org>; cmfphoto-0.2.ebuild,
+  cmfphoto-0.4.2.ebuild:
+  version bump
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> cmfphoto-0.2.ebuild:
+  down to ~ppc until deps are stable
+
+*cmfphoto-0.3 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> cmfphoto-0.1.ebuild,
+  cmfphoto-0.3.ebuild:
+  version bump
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphoto-0.2.ebuild:
+  ~x86 ~ppc -> x86 ppc
+
+*cmfphoto-0.2 (17 Apr 2003)
+
+  17 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphoto-0.2.ebuild:  
+  Version bumped.
 
 *cmfphoto-0.1 (08 Mar 2003)
 
-  08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphoto-0.1.ebuild:
+  06 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphoto-0.1.ebuild: 
+  ~x86 -> x86 and added ~ppc. Added extra instructions.
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> cmfphoto-0.1.ebuild: 
+  Automated cleanup of LICENSE
+
+  08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphoto-0.1.ebuild: 
   Inital import.
 
diff --git a/net-zope/cmfphoto/Manifest b/net-zope/cmfphoto/Manifest
index 4511c4cd549f..96a1aecd781e 100644
--- a/net-zope/cmfphoto/Manifest
+++ b/net-zope/cmfphoto/Manifest
@@ -1,3 +1,4 @@
-MD5 7b5d95b9d15de7b32ce441b07c3d1eb1 cmfphoto-0.2.ebuild 642
-MD5 b3f8871f8a3aaec91ee70ed746b824a2 cmfphoto-0.2.ebuild~ 742
-MD5 8949cc37a5edf58d38007f0084c5e5e5 files/digest-cmfphoto-0.2 63
+MD5 bd49d7f2e8e520bd0bf479275172c69a ChangeLog 1922
+MD5 aa5fdeb9783498e5e2003c6b35ceb489 cmfphoto-0.5.0.ebuild 855
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 a8d7890391aeb9af5863106abec4d9a5 files/digest-cmfphoto-0.5.0 65
diff --git a/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild b/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild
index cb85df587b31..0ca4e67f0de2 100644
--- a/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild
+++ b/net-zope/cmfphoto/cmfphoto-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/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild,v 1.1 2004/09/25 23:06:42 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphoto/cmfphoto-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Zope product to have photos."
 HOMEPAGE="http://sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFPhoto-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 RDEPEND="dev-python/imaging
 		>=net-zope/cmf-1.3
 		>=net-zope/plone-1.0.1
diff --git a/net-zope/cmfphotoalbum/ChangeLog b/net-zope/cmfphotoalbum/ChangeLog
index 1a7b802b1b77..0dc9c89769a4 100644
--- a/net-zope/cmfphotoalbum/ChangeLog
+++ b/net-zope/cmfphotoalbum/ChangeLog
@@ -1,6 +1,56 @@
-# ChangeLog for net-www/cmfphotoalbum
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/ChangeLog,v 1.1 2003/03/04 01:59:48 kutsuya Exp $
+# ChangeLog for net-zope/cmfphotoalbum
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+  08 Nov 2004; Heinrich Wendel <lanius@gentoo.org> -cmfphotoalbum-0.3.ebuild,
+  -cmfphotoalbum-0.4.ebuild:
+  remove old versions
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  cmfphotoalbum-0.5.0.ebuild:
+  stable on x86 on the 2004.3 way
+
+*cmfphotoalbum-0.5.0 (26 Sep 2004)
+
+  26 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +cmfphotoalbum-0.5.0.ebuild:
+  version bump, IUSE added.
+
+*cmfphotoalbum-0.4 (12 May 2004)
+
+  12 May 2004; Jodok Batlogg <batlogg@gentoo.org>; cmfphotoalbum-0.2.ebuild,
+  cmfphotoalbum-0.4.ebuild:
+  version bump
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  cmfphotoalbum-0.2.ebuild:
+  down to ~ppc until deps are stable
+
+*cmfphotoalbum-0.3 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> cmfphotoalbum-0.1.ebuild,
+  cmfphotoalbum-0.3.ebuild:
+  version bump
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphotoalbum-0.2.ebuild:
+  ~x86 ~ppc -> x86 ppc
+
+*cmfphotoalbum-0.2 (17 Apr 2003)
+
+  17 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphotoalbum-0.2.ebuild:
+  Version bumped. Added ${PV} in SRC_URI and to cmfphoto in RDEPEND.
+
+*cmfphotoalbum-0.1 (08 Mar 2003)
+
+  06 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphotoalbum-0.1.ebuild:
+  ~x86 -> x86 and added ~ppc. Added extra instructions.
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> cmfphotoalbum-0.1.ebuild:
+  Automated cleanup of LICENSE
+
+  08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> cmfphotoalbum-0.1.ebuild:
+  This ebuild makes .22 obsolete, strange as that sounds. So will remove .22 to
+  avoid versioning problems.
 
 *cmfphotoalbum-0.22 (27 Feb 2003)
 
diff --git a/net-zope/cmfphotoalbum/Manifest b/net-zope/cmfphotoalbum/Manifest
index ee21d7f54934..63eb5bdd0e75 100644
--- a/net-zope/cmfphotoalbum/Manifest
+++ b/net-zope/cmfphotoalbum/Manifest
@@ -1,3 +1,4 @@
-MD5 53b3b71f4a2a3223c160870ebe1a66fe cmfphotoalbum-0.2.ebuild 705
-MD5 9f4f13f257207c06afed17520df8c58c cmfphotoalbum-0.2.ebuild~ 704
-MD5 f47ffd13763455987655cbe2d7a120c7 files/digest-cmfphotoalbum-0.2 68
+MD5 3219cbfb38969b8558a319b7d3f4d555 cmfphotoalbum-0.5.0.ebuild 816
+MD5 1c88fb7ea8e54fadcd0b0345b9963880 ChangeLog 2109
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 63b48f152da9b37f6d0acfc04c02a956 files/digest-cmfphotoalbum-0.5.0 70
diff --git a/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild b/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild
index c48e2349b694..f2bc17bb961a 100644
--- a/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild
+++ b/net-zope/cmfphotoalbum/cmfphotoalbum-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/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild,v 1.1 2004/09/25 23:08:56 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfphotoalbum/cmfphotoalbum-0.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Zope/CMF product to organize e-pics into hierarchical photo album."
 HOMEPAGE="http://sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFPhotoAlbum-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 RDEPEND="=net-zope/cmfphoto-${PV}*
 	    >=net-zope/btreefolder2-0.5.0
 	    ${RDEPEND}"
diff --git a/net-zope/cmfquickinstallertool/ChangeLog b/net-zope/cmfquickinstallertool/ChangeLog
index 41b8b24927b3..f76e83af5c2d 100644
--- a/net-zope/cmfquickinstallertool/ChangeLog
+++ b/net-zope/cmfquickinstallertool/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for net-zope/cmfquickinstallertool
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/ChangeLog,v 1.1 2003/04/06 09:17:25 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  cmfquickinstallertool-1.5.0.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org>
+  cmfquickinstallertool-1.5.0.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  cmfquickinstallertool-1.5.0.ebuild:
+  marked stable
+
+*cmfquickinstallertool-1.5.0 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  -cmfquickinstallertool-1.0.ebuild, -cmfquickinstallertool-1.1.ebuild,
+  cmfquickinstallertool-1.4.ebuild, +cmfquickinstallertool-1.5.0.ebuild:
+  version bump, removed old ebuilds, added IUSE
+
+  26 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  cmfquickinstallertool-1.0.ebuild, cmfquickinstallertool-1.1.ebuild,
+  cmfquickinstallertool-1.4.ebuild:
+  corrected errors repoman reported, ~ppc for the 1.0 version
+  ewarn in 1.4 is not necessary anymore, plone2 installs it automatically
+
+*cmfquickinstallertool-1.4 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  cmfquickinstallertool-1.4.ebuild:
+  version bump
+
+*cmfquickinstallertool-1.1 (22 Jun 2003)
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org>
+  cmfquickinstallertool-1.1.ebuild: Version bump. Masked archs to unstable.
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org>
+  cmfquickinstallertool-1.0.ebuild: ~ppc -> ppc
 
 *cmfquickinstallertool-1.0 (06 Apr 2003)
 
diff --git a/net-zope/cmfquickinstallertool/Manifest b/net-zope/cmfquickinstallertool/Manifest
index e69de29bb2d1..2acfb9fa9e86 100644
--- a/net-zope/cmfquickinstallertool/Manifest
+++ b/net-zope/cmfquickinstallertool/Manifest
@@ -0,0 +1,6 @@
+MD5 318a6e00d24f5e6cfd095b50dfbd2496 ChangeLog 1719
+MD5 d1dcc01130def9129f9c2fcc3eb18256 cmfquickinstallertool-1.4.ebuild 570
+MD5 888cff42130f7e93cc77bf67f8115ff4 cmfquickinstallertool-1.5.0.ebuild 582
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 578fafcdc9d8e830b9feb16066d8b665 files/digest-cmfquickinstallertool-1.4 73
+MD5 fe65ad761c32cc0347f21847c832ad24 files/digest-cmfquickinstallertool-1.5.0 75
diff --git a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild
index b8208feb2920..2647540c811e 100644
--- a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild
+++ b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.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/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild,v 1.1 2004/01/19 13:43:02 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.4.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,14 +9,8 @@ HOMEPAGE="http://www.sf.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFQuickInstallerTool_${PV}.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
 RDEPEND=">=net-zope/cmf-1.3
 	${RDEPEND}"
 
 ZPROD_LIST="CMFQuickInstallerTool"
-
-pkg_postinst()
-{
-	zproduct_pkg_postinst
-	ewarn "Please read README.txt.gz for this product. This product needs to"
-	ewarn "be manually added to a CMF/Plone site."
-}
diff --git a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild
index 5dbfbbbdcc75..eda4d3f8466d 100644
--- a/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild
+++ b/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.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/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild,v 1.1 2004/07/27 19:24:37 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cmfquickinstallertool/cmfquickinstallertool-1.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Makes it easy to install cmf/plone products."
 HOMEPAGE="http://www.sf.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/CMFQuickInstallerTool-${PV}.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 RDEPEND=">=net-zope/cmf-1.3
 	${RDEPEND}"
diff --git a/net-zope/coreblog/ChangeLog b/net-zope/coreblog/ChangeLog
index 124d2e0d482c..700b8a05082f 100644
--- a/net-zope/coreblog/ChangeLog
+++ b/net-zope/coreblog/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for net-zope/coreblog
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/ChangeLog,v 1.1 2004/04/18 20:40:55 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  18 Oct 2005; <dang@gentoo.org> coreblog-1.20.ebuild:
+  Marked ~amd64
+
+*coreblog-1.20 (24 Sep 2005)
+
+  24 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> +coreblog-1.20.ebuild:
+  version bump, closes #105460
+
+*coreblog-1.11 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +coreblog-1.11.ebuild:
+  Version bump based at information (#85338) from Maurizio Pucci.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> coreblog-1.0.ebuild:
+  Stable on x86 - slitghtly faster because of testing and 2004.3 deadline.
+
+  08 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> coreblog-0.6.ebuild,
+  +coreblog-1.0.ebuild:
+  QA: added missing IUSE.
+
+*coreblog-1.0 (08 Oct 2004)
+
+  08 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> +coreblog-1.0.ebuild:
+  New version released. Ebuild submitted by liris <hirokun-72@bb.excite.co.jp>.
+
+*coreblog-0.6 (18 Apr 2004)
 
   18 Apr 2004; Jodok Batlogg <batlogg@gentoo.org>; :
   user contributed ebuild, thanks to Thomas Geiger <tg@wahuu.at>
diff --git a/net-zope/coreblog/Manifest b/net-zope/coreblog/Manifest
index a95a3d384e9c..d5b3a9a49620 100644
--- a/net-zope/coreblog/Manifest
+++ b/net-zope/coreblog/Manifest
@@ -1,2 +1,20 @@
-MD5 8bb1470de33ca4178103eb07191939d7 coreblog-0.6.ebuild 476
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7df2a78cbc36888bcf4dec9123e46baa ChangeLog 1201
+MD5 5801c5ea76209eb3e1a73a2abaf70dcd coreblog-0.6.ebuild 454
+MD5 5ce9fb7fc6a263abff4381c67a2fa00f coreblog-1.0.ebuild 452
+MD5 eb7b8f9d83035b2f6563690aa6baaff1 coreblog-1.11.ebuild 455
+MD5 038d13a744ed6c0e8fa530bcfcf1f9e8 coreblog-1.20.ebuild 460
 MD5 b7d463c1b662da09f7cd4c9283bc2ff6 files/digest-coreblog-0.6 59
+MD5 bb2032e03623aab437333e6985010ca6 files/digest-coreblog-1.0 58
+MD5 f38c7624b4d10057ff505bdeb88eb3a8 files/digest-coreblog-1.11 59
+MD5 b4991e7135a17cbe8a166ba9dc99e984 files/digest-coreblog-1.20 58
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDVF5xomPajV0RnrERAg2JAJ9ZVqnMYAGyt26eyGbckIa4KGps8gCeL4E+
+rvWKSFcjXGhUDp0MvciNcdg=
+=Hmyx
+-----END PGP SIGNATURE-----
diff --git a/net-zope/coreblog/coreblog-0.6.ebuild b/net-zope/coreblog/coreblog-0.6.ebuild
index ad2ec6923627..3cb7d7ed990d 100644
--- a/net-zope/coreblog/coreblog-0.6.ebuild
+++ b/net-zope/coreblog/coreblog-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/net-zope/coreblog/coreblog-0.6.ebuild,v 1.1 2004/04/18 20:40:55 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-0.6.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,5 +11,6 @@ HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog06b.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/coreblog/coreblog-1.0.ebuild b/net-zope/coreblog/coreblog-1.0.ebuild
index a81736cdc3c2..9d1247453738 100644
--- a/net-zope/coreblog/coreblog-1.0.ebuild
+++ b/net-zope/coreblog/coreblog-1.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/net-zope/coreblog/coreblog-1.0.ebuild,v 1.1 2004/10/08 10:01:50 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Blog/Weblog/Web Nikki system for Zope."
 HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog10.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 IUSE=""
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/coreblog/coreblog-1.11.ebuild b/net-zope/coreblog/coreblog-1.11.ebuild
index 7014e0045cd5..42d2dc710b08 100644
--- a/net-zope/coreblog/coreblog-1.11.ebuild
+++ b/net-zope/coreblog/coreblog-1.11.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/net-zope/coreblog/coreblog-1.11.ebuild,v 1.1 2005/03/26 01:00:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.11.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/coreblog/coreblog-1.20.ebuild b/net-zope/coreblog/coreblog-1.20.ebuild
index 3ad5fedc2429..aba0801ae80e 100644
--- a/net-zope/coreblog/coreblog-1.20.ebuild
+++ b/net-zope/coreblog/coreblog-1.20.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/net-zope/coreblog/coreblog-1.20.ebuild,v 1.1 2005/09/24 12:40:03 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/coreblog/coreblog-1.20.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Blog/Weblog/Web Nikki system for Zope."
 HOMEPAGE="http://coreblog.org/"
 SRC_URI="${HOMEPAGE}/junk/COREBlog12.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 ZPROD_LIST="COREBlog"
diff --git a/net-zope/cvsfile/ChangeLog b/net-zope/cvsfile/ChangeLog
index 72099fa4234c..66bcf5966947 100644
--- a/net-zope/cvsfile/ChangeLog
+++ b/net-zope/cvsfile/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-zope/cvsfile
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/cvsfile/ChangeLog,v 1.1 2004/04/18 21:53:07 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cvsfile/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org> cvsfile-0.9.0.ebuild:
+  Bug #69831: Ensure unzip is in DEPEND.
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> cvsfile-0.9.0.ebuild:
+  fix depend syntax 58347
 
 *cvsfile-0.9.0 (18 Apr 2004)
 
diff --git a/net-zope/cvsfile/Manifest b/net-zope/cvsfile/Manifest
index ff328fb28842..28c92229695f 100644
--- a/net-zope/cvsfile/Manifest
+++ b/net-zope/cvsfile/Manifest
@@ -1,3 +1,4 @@
-MD5 7805bc9a4c987d4dc82df11ca1cb5ace cvsfile-0.9.0.ebuild 690
+MD5 baddc707e53ed29d3a37ee83e884555b cvsfile-0.9.0.ebuild 712
+MD5 850b282e8cc94d338c75f22abf7a37c9 ChangeLog 591
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 850c73b9be3157245ac4be36f3ba980a files/digest-cvsfile-0.9.0 62
diff --git a/net-zope/cvsfile/cvsfile-0.9.0.ebuild b/net-zope/cvsfile/cvsfile-0.9.0.ebuild
index 6d145589f188..b8fe3c6d8c90 100644
--- a/net-zope/cvsfile/cvsfile-0.9.0.ebuild
+++ b/net-zope/cvsfile/cvsfile-0.9.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/net-zope/cvsfile/cvsfile-0.9.0.ebuild,v 1.1 2004/04/18 21:53:07 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/cvsfile/cvsfile-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -12,7 +12,8 @@ HOMEPAGE="http://zope.org/Members/arielpartners/CVSFile"
 SRC_URI="${HOMEPAGE}/${PV}/CVSFile-${NEW_PV}.zip"
 LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
-RDEPEND=">=net-zope/externalfile
+RDEPEND="net-zope/externalfile
 	${RDEPEND}"
+DEPEND="${DEPEND} app-arch/unzip"
 
 ZPROD_LIST="CVSFile"
diff --git a/net-zope/epoz/ChangeLog b/net-zope/epoz/ChangeLog
index 63996ba6b49b..f98e9061d307 100644
--- a/net-zope/epoz/ChangeLog
+++ b/net-zope/epoz/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for net-zope/epoz
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/ChangeLog,v 1.1 2004/03/26 23:45:59 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> epoz-0.8.4.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> epoz-0.8.4.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; epoz-0.8.4.ebuild:
+  marked stable
+
+*epoz-0.8.4 (11 Sep 2004)
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +epoz-0.8.4.ebuild:
+  version bump
 
 *epoz-0.8.0 (27 Mar 2004)
 
diff --git a/net-zope/epoz/Manifest b/net-zope/epoz/Manifest
index 7eee21b35198..61ce886779e0 100644
--- a/net-zope/epoz/Manifest
+++ b/net-zope/epoz/Manifest
@@ -1,2 +1,6 @@
-MD5 bd4ff6bc900c72351dd7a305a53ea9b8 epoz-0.8.0.ebuild 651
+MD5 281555defac3196a20cdd640107f9f48 ChangeLog 703
+MD5 e59879d13fea8cf082fa2161735e2588 epoz-0.8.0.ebuild 662
+MD5 f1ff04e41fb85ea6c3fbb929c809cabc epoz-0.8.4.ebuild 671
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 25aa6148d1e4bdac4c55ddf50acfe351 files/digest-epoz-0.8.0 61
+MD5 0e2f9b6b8f057b190adb6ca158890cdd files/digest-epoz-0.8.4 61
diff --git a/net-zope/epoz/epoz-0.8.0.ebuild b/net-zope/epoz/epoz-0.8.0.ebuild
index 71dcf5e8935b..ac79a6433000 100644
--- a/net-zope/epoz/epoz-0.8.0.ebuild
+++ b/net-zope/epoz/epoz-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/net-zope/epoz/epoz-0.8.0.ebuild,v 1.1 2004/03/26 23:45:59 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/epoz-0.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,3 +11,4 @@ LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
 ZPROD_LIST="Epoz"
+IUSE=""
diff --git a/net-zope/epoz/epoz-0.8.4.ebuild b/net-zope/epoz/epoz-0.8.4.ebuild
index f7c73cfbb43e..ca9fc7db833f 100644
--- a/net-zope/epoz/epoz-0.8.4.ebuild
+++ b/net-zope/epoz/epoz-0.8.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/net-zope/epoz/epoz-0.8.4.ebuild,v 1.1 2004/09/11 21:53:59 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/epoz/epoz-0.8.4.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION=" Epoz allows you to edit Zope- or Plone-objects with a wysiwyg-edit
 HOMEPAGE="http://mjablonski.zope.de/Epoz"
 SRC_URI="http://mjablonski.zope.de/Epoz/releases/Epoz-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 ZPROD_LIST="Epoz"
 IUSE=""
diff --git a/net-zope/externaleditor/ChangeLog b/net-zope/externaleditor/ChangeLog
index e7c7215d46ed..d045a665a39a 100644
--- a/net-zope/externaleditor/ChangeLog
+++ b/net-zope/externaleditor/ChangeLog
@@ -1,9 +1,56 @@
 # ChangeLog for net-zope/externaleditor
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/ChangeLog,v 1.1 2003/03/29 23:28:07 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> externaleditor-0.8.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> externaleditor-0.8.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> externaleditor-0.8.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; externaleditor-0.8.ebuild:
+  marked stable
+
+*externaleditor-0.7.2 (11 Sep 2004)
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  externaleditor-0.7-r1.ebuild, +externaleditor-0.7.2.ebuild:
+  version bump; mark 0.7-r1 stable on x86
+
+*externaleditor-0.8 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; -externaleditor-0.5.ebuild,
+  externaleditor-0.7-r1.ebuild, -externaleditor-0.7.ebuild,
+  +externaleditor-0.8.ebuild:
+  version bump, removed old ebuild, added IUSE
+
+*externaleditor-0.7-r1 (22 Jan 2004)
+
+  22 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  externaleditor-0.7-r1.ebuild:
+  separate zopeedit as extra ebuild
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  externaleditor-0.7.ebuild:
+  fix RDEPEND
+
+*externaleditor-0.7 (10 Oct 2003)
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  externaleditor-0.7.ebuild:
+  version bump and major revision of ebuild
+
+  12 Jun 2003; <msterret@gentoo.org> externaleditor-0.5.ebuild:
+  fix Header
 
 *externaleditor-0.5 (29 Mar 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> externaleditor-0.5.ebuild:
+  ~x86 -> x86
+
   29 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> externaleditor-0.5.ebuild:
   Initial import. #16307
 
diff --git a/net-zope/externaleditor/Manifest b/net-zope/externaleditor/Manifest
index e69de29bb2d1..6e983e041aee 100644
--- a/net-zope/externaleditor/Manifest
+++ b/net-zope/externaleditor/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 008a07bd59dfd433fa8344fc7aa09d38 externaleditor-0.8.ebuild 1566
+MD5 5ea25f885f51a059f1ef2765dffee17e externaleditor-0.7.2.ebuild 669
+MD5 39dfa6d09a8ed919d57b6cb1c5917d6e externaleditor-0.7-r1.ebuild 665
+MD5 51e63085884318a75eaf318ead0a82b4 ChangeLog 1829
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 9c96522e61b418eae5359dc95e00f956 files/digest-externaleditor-0.8 134
+MD5 e6e71f5b187c7572e8ed4778db273374 files/digest-externaleditor-0.7-r1 66
+MD5 ead5a6e6c77a46299c0ee93ab627cae8 files/digest-externaleditor-0.7.2 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCe4U8I1lqEGTUzyQRAjiUAJ9AsK5+AbOOXWWrY7h6rFG6mbX7bwCfbQBy
+2iOnPKRyEyD3AaFcR/FNDh0=
+=9qgT
+-----END PGP SIGNATURE-----
diff --git a/net-zope/externaleditor/externaleditor-0.7-r1.ebuild b/net-zope/externaleditor/externaleditor-0.7-r1.ebuild
index 9daa5ff62740..0416e336d92f 100644
--- a/net-zope/externaleditor/externaleditor-0.7-r1.ebuild
+++ b/net-zope/externaleditor/externaleditor-0.7-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/net-zope/externaleditor/externaleditor-0.7-r1.ebuild,v 1.1 2004/01/22 14:35:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.7-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,6 +8,7 @@ DESCRIPTION="The ExternalEditor is a Zope product and configurable helper applic
 HOMEPAGE="http://www.zope.org/Members/Caseman/ExternalEditor/"
 SRC_URI="http://www.zope.org/Members/Caseman/ExternalEditor/${PV}/ExternalEditor-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
+IUSE=""
 
 ZPROD_LIST="ExternalEditor"
diff --git a/net-zope/externaleditor/externaleditor-0.7.2.ebuild b/net-zope/externaleditor/externaleditor-0.7.2.ebuild
index 3145f9d3087f..ab499068c2c9 100644
--- a/net-zope/externaleditor/externaleditor-0.7.2.ebuild
+++ b/net-zope/externaleditor/externaleditor-0.7.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/net-zope/externaleditor/externaleditor-0.7.2.ebuild,v 1.1 2004/09/11 21:23:25 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.7.2.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/externaleditor/externaleditor-0.8.ebuild b/net-zope/externaleditor/externaleditor-0.8.ebuild
index 8d76dc140493..436df067a670 100644
--- a/net-zope/externaleditor/externaleditor-0.8.ebuild
+++ b/net-zope/externaleditor/externaleditor-0.8.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/net-zope/externaleditor/externaleditor-0.8.ebuild,v 1.1 2004/07/27 20:22:17 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externaleditor/externaleditor-0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -13,13 +13,13 @@ SRC_URI_BASE="${HOMEPAGE}/${PV}"
 SRC_URI="${SRC_URI_BASE}/${MY_P}.tgz
 	${SRC_URI_BASE}/${MY_P2}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 ZPROD_LIST="${MY_PN}"
 
 # the base of teh application is in Python2.1, but zopeedit.py wants Python2.2
 RDEPEND="${RDEPEND}
-		>=dev-lang/python-2.2*"
+		>=dev-lang/python-2.2"
 
 S_ZPROD=${WORKDIR}/${MY_PN}
 S_SRC=${WORKDIR}/${MY_P2}
diff --git a/net-zope/externalfile/ChangeLog b/net-zope/externalfile/ChangeLog
index eab297493735..c6c510fde88a 100644
--- a/net-zope/externalfile/ChangeLog
+++ b/net-zope/externalfile/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-zope/externalfile
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/externalfile/ChangeLog,v 1.1 2004/04/18 21:45:16 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externalfile/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  17 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  externalfile-1.2.0.ebuild:
+  Bug #69831: Ensure unzip is in DEPEND.
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> externalfile-1.2.0.ebuild:
+  add ZPROD_LSIT, bug #62173
+
+  04 Sep 2004; Thomas Matthijs <axxo@gentoo.org> externalfile-1.2.0.ebuild:
+  fix depend syntax 58347
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> externalfile-1.2.0.ebuild:
+  Typo in DESCRIPTION: accessable -> accessible. Bug 59717.
+
+*externalfile-1.2.0 (18 Apr 2004)
 
   18 Apr 2004; Jodok Batlogg <batlogg@gentoo.org>; :
   #47251 thanks to Salim Fadhley <sal@stodge.org>
diff --git a/net-zope/externalfile/Manifest b/net-zope/externalfile/Manifest
index ae33d2b363cb..c9c50308dfc3 100644
--- a/net-zope/externalfile/Manifest
+++ b/net-zope/externalfile/Manifest
@@ -1,3 +1,4 @@
+MD5 61c798c965f3ceeab94930e133f2e6de ChangeLog 824
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 579b1927390041ce29068f8e55705534 externalfile-1.2.0.ebuild 738
+MD5 adecb60c739ef0aa90abe904e5fcf91c externalfile-1.2.0.ebuild 805
 MD5 1424b1538e4271b048299467055fe807 files/digest-externalfile-1.2.0 66
diff --git a/net-zope/externalfile/externalfile-1.2.0.ebuild b/net-zope/externalfile/externalfile-1.2.0.ebuild
index 61b6b8795449..b1fedbfebd06 100644
--- a/net-zope/externalfile/externalfile-1.2.0.ebuild
+++ b/net-zope/externalfile/externalfile-1.2.0.ebuild
@@ -1,16 +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/net-zope/externalfile/externalfile-1.2.0.ebuild,v 1.1 2004/04/18 21:45:16 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/externalfile/externalfile-1.2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
 NEW_PV="${PV//./-}"
 
 RESTRICT="nomirror"
-DESCRIPTION="ExternalFile extends Zope to work with files in the filesystem. You can create instances of ExternalFile that behave like standard Zope objects except that they get their contents from a file located anywhere in a Zope-accessable filesystem."
+DESCRIPTION="ExternalFile extends Zope to work with files in the filesystem. You can create instances of ExternalFile that behave like standard Zope objects except that they get their contents from a file located anywhere in a Zope-accessible filesystem."
 HOMEPAGE="http://www.zope.org/Members/arielpartners/ExternalFile"
 SRC_URI="${HOMEPAGE}/${PV}/ExternalFile-${NEW_PV}.zip"
 LICENSE="ZPL"
 KEYWORDS="x86 ~ppc"
-RDEPEND=">=net-zope/zope
+RDEPEND="net-zope/zope
 	${RDEPEND}"
+DEPEND="${DEPEND} app-arch/unzip"
+ZPROD_LIST="ExternalFile"
+IUSE=""
diff --git a/net-zope/extfile/ChangeLog b/net-zope/extfile/ChangeLog
index 8fdb93038f9a..4bcb386a9d26 100644
--- a/net-zope/extfile/ChangeLog
+++ b/net-zope/extfile/ChangeLog
@@ -1,9 +1,34 @@
 # ChangeLog for net-zope/extfile
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/ChangeLog,v 1.1 2003/04/11 08:17:52 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*extfile-1.4.2 (24 Oct 2004)
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> +extfile-1.4.2.ebuild:
+  version bump
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org>
+  -extfile-1.2.0_beta1.ebuild, extfile-1.2.0_beta2.ebuild:
+  fix -py21 dependency
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  extfile-1.2.0_beta1.ebuild, extfile-1.2.0_beta2.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  extfile-1.2.0_beta2.ebuild:
+  down to ~ppc until deps are stable
+
+*extfile-1.2.0_beta2 (22 Jun 2003)
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> extfile-1.2.0_beta2.ebuild:
+  Version Bump. Marking archs as stable.
 
 *extfile-1.2.0_beta1 (11 Apr 2003)
 
   11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> extfile-1.2.0_beta1.ebuild:
-  Initial import.
+  Initial import.#17598
 
diff --git a/net-zope/extfile/Manifest b/net-zope/extfile/Manifest
index cf5ea50d2481..b2b8a264fc54 100644
--- a/net-zope/extfile/Manifest
+++ b/net-zope/extfile/Manifest
@@ -1,3 +1,6 @@
-MD5 1f4d818ab3dc9428ec4b8c84801205da extfile-1.2.0_beta1.ebuild 542
-MD5 60ae2e0bc2a5d1cd63a2bf4fb10e1e5b ChangeLog 356
-MD5 0a7f5b428c0a8d43720c9adce73098cd files/digest-extfile-1.2.0_beta1 135
+MD5 3fa719b03444b070e32d75760150c142 ChangeLog 1151
+MD5 c5e5b1df6ff334a5086d4bda0f3a345d extfile-1.4.2.ebuild 513
+MD5 25547d46ca2cc712c85576f1b15b3bbe extfile-1.2.0_beta2.ebuild 537
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 131614c11aae264816c27dbdfd6d8ee3 files/digest-extfile-1.2.0_beta2 66
+MD5 de5ce1081764572af93654b16a2ca0b2 files/digest-extfile-1.4.2 64
diff --git a/net-zope/extfile/extfile-1.2.0_beta2.ebuild b/net-zope/extfile/extfile-1.2.0_beta2.ebuild
index 38226e204e3c..e69acdb0f007 100644
--- a/net-zope/extfile/extfile-1.2.0_beta2.ebuild
+++ b/net-zope/extfile/extfile-1.2.0_beta2.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/extfile/extfile-1.2.0_beta2.ebuild,v 1.1 2003/06/22 20:52:10 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.2.0_beta2.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 PV_NEW=${PV/_beta/b}
@@ -10,8 +9,9 @@ DESCRIPTION="Zope proxy objects for files on the filesystem"
 HOMEPAGE="http://www.zope.org/Members/shh/ExtFile"
 SRC_URI="${HOMEPAGE}/ExtFile-${PV_NEW}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="x86 ppc"
-RDEPEND=">=dev-python/Imaging-py21-1.1.3
+KEYWORDS="x86 ~ppc"
+RDEPEND=">=dev-python/imaging-1.1.3
 	${RDEPEND}"
 
 ZPROD_LIST="ExtFile"
+IUSE=""
diff --git a/net-zope/extfile/extfile-1.4.2.ebuild b/net-zope/extfile/extfile-1.4.2.ebuild
index fb00554d0923..a761d0ced244 100644
--- a/net-zope/extfile/extfile-1.4.2.ebuild
+++ b/net-zope/extfile/extfile-1.4.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/net-zope/extfile/extfile-1.4.2.ebuild,v 1.1 2004/10/23 22:50:32 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/extfile/extfile-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/exuserfolder/ChangeLog b/net-zope/exuserfolder/ChangeLog
index fbc26b36f0b6..f022aa3fada9 100644
--- a/net-zope/exuserfolder/ChangeLog
+++ b/net-zope/exuserfolder/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/exuserfolder
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/ChangeLog,v 1.1 2003/10/09 18:55:58 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+*exuserfolder-0.20.0-r1 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  exuserfolder-0.20.0-r1.ebuild:
+  added patch from solution2u.net
+
+  05 Dec 2003; Heinrich Wendel <lanius@gentoo.org> exuserfolder-0.20.0.ebuild:
+  fixed chown syntax
 
 *exuserfolder-0.20.0 (09 Oct 2003)
 
diff --git a/net-zope/exuserfolder/Manifest b/net-zope/exuserfolder/Manifest
index 8abdda32135f..6c4c2e584651 100644
--- a/net-zope/exuserfolder/Manifest
+++ b/net-zope/exuserfolder/Manifest
@@ -1,2 +1,6 @@
-MD5 92f864ea2c4aa313b0ed5937264a1b17 exuserfolder-0.20.0.ebuild 979
+MD5 4d12e18147174050fb9f8569d3c3bc31 exuserfolder-0.20.0.ebuild 988
+MD5 65fb26b40348d98006fa0299159a65ce exuserfolder-0.20.0-r1.ebuild 600
+MD5 9187a3baad130383469613d35c431bee ChangeLog 613
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 00be1d95808e9dc72cb1e78d284915a5 files/digest-exuserfolder-0.20.0 68
+MD5 c1471829b1676cbf49cd9ca8671745c1 files/digest-exuserfolder-0.20.0-r1 77
diff --git a/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild b/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild
index df253372c5f3..7b0e70910ea2 100644
--- a/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild
+++ b/net-zope/exuserfolder/exuserfolder-0.20.0-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/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild,v 1.1 2004/01/19 14:26:44 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/exuserfolder-0.20.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild b/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild
index f0a875467878..fd3479bfbfd1 100644
--- a/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild
+++ b/net-zope/exuserfolder/exuserfolder-0.20.0.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/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild,v 1.1 2003/10/09 18:55:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/exuserfolder/exuserfolder-0.20.0.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -23,7 +23,7 @@ src_install() {
 	zproduct_src_install
 	# fix permissions on files
 	DIR=${D}/usr/share/zproduct/${PF}
-	find ${DIR} -exec chown zope.root \{} \;
+	find ${DIR} -exec chown zope:root \{} \;
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
diff --git a/net-zope/filesystemsite/ChangeLog b/net-zope/filesystemsite/ChangeLog
index 30970f468ab0..080caa297d22 100644
--- a/net-zope/filesystemsite/ChangeLog
+++ b/net-zope/filesystemsite/ChangeLog
@@ -1,9 +1,36 @@
 # ChangeLog for net-zope/filesystemsite
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/ChangeLog,v 1.1 2003/03/25 11:42:15 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  04 May 2005; David Holm <dholm@gentoo.org> filesystemsite-1.4.1.ebuild:
+  Added to ~ppc.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org>
+  filesystemsite-1.4.1.ebuild:
+  added ~amd64
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  filesystemsite-1.4.1.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
+
+*filesystemsite-1.4.1 (28 Sep 2004)
+
+  28 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +filesystemsite-1.4.1.ebuild:
+  Version bump.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  filesystemsite-1.2.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> filesystemsite-1.2.ebuild:
+  ~ppc -> ppc
 
 *filesystemsite-1.2 (25 Mar 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> filesystemsite-1.2.ebuild:
+  ~x86 -> x86
+
   25 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> filesystemsite-1.2.ebuild:
   Initial import. #17596
 
diff --git a/net-zope/filesystemsite/Manifest b/net-zope/filesystemsite/Manifest
index e69de29bb2d1..868ac6646368 100644
--- a/net-zope/filesystemsite/Manifest
+++ b/net-zope/filesystemsite/Manifest
@@ -0,0 +1,6 @@
+MD5 7a00396e73b71d9de73eff29ed49ca00 ChangeLog 1131
+MD5 05f260e84d10302ec333848d1108cdf2 filesystemsite-1.2.ebuild 494
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 95f00267eff3ca80141bfbfb11be549a filesystemsite-1.4.1.ebuild 565
+MD5 7e97ce266b09ba5ad5cf1d85b220e142 files/digest-filesystemsite-1.2 66
+MD5 4376a99ec59004911106ee74fbc8ec76 files/digest-filesystemsite-1.4.1 68
diff --git a/net-zope/filesystemsite/filesystemsite-1.2.ebuild b/net-zope/filesystemsite/filesystemsite-1.2.ebuild
index ca2e677e61b2..a04c29d4fb50 100644
--- a/net-zope/filesystemsite/filesystemsite-1.2.ebuild
+++ b/net-zope/filesystemsite/filesystemsite-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2002-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/net-zope/filesystemsite/filesystemsite-1.2.ebuild,v 1.1 2003/03/25 11:42:15 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/filesystemsite-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,6 +8,6 @@ DESCRIPTION="Zope proxy objects for files on the filesystem."
 HOMEPAGE="http://www.zope.org/Members/k_vertigo/Products/FileSystemSite"
 SRC_URI="${HOMEPAGE}/FileSystemSite-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="FileSystemSite"
diff --git a/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild b/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild
index 3cfec324624c..da87235ca37a 100644
--- a/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild
+++ b/net-zope/filesystemsite/filesystemsite-1.4.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/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild,v 1.1 2004/09/28 15:20:49 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/filesystemsite/filesystemsite-1.4.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Zope proxy objects for files on the filesystem."
 HOMEPAGE="http://www.zope.org/Members/infrae/FileSystemSite"
 SRC_URI="${HOMEPAGE}/FileSystemSite-${PV}/FileSystemSite-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE=""
 
 RDEPEND=">=net-zope/cmf-1.4.2
diff --git a/net-zope/fle3/ChangeLog b/net-zope/fle3/ChangeLog
index 83dcc4f3da72..9067f12440ce 100644
--- a/net-zope/fle3/ChangeLog
+++ b/net-zope/fle3/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-zope/fle3
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/ChangeLog,v 1.1 2003/04/22 09:15:57 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*fle3-1.4.5 (24 Oct 2004)
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> +fle3-1.4.5.ebuild:
+  version bump
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> fle3-1.4.2.ebuild:
+  fix -py21 dependencies
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> fle3-1.4.2.ebuild:
+  Typo in DESCRIPTION: Furture -> Future. Bug 59717.
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> fle3-1.4.2.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
 
 *fle3-1.4.2 (22 Apr 2003)
 
diff --git a/net-zope/fle3/Manifest b/net-zope/fle3/Manifest
index ff8246926697..9f14025b3953 100644
--- a/net-zope/fle3/Manifest
+++ b/net-zope/fle3/Manifest
@@ -1,3 +1,6 @@
-MD5 cd96e41607993e460e27b70dd4cb5d26 fle3-1.4.2.ebuild 418
-MD5 f506105faa9a972dfd42064d2bd0d153 fle3-1.4.2.ebuild~ 672
+MD5 4b1ae03d6ff92dd02410e1767df0ce13 ChangeLog 874
+MD5 5a6a68bb32d62bd01a1bd4503b9eb33f fle3-1.4.2.ebuild 502
+MD5 0e954235d713f7b8fcd999bd20c980c0 fle3-1.4.5.ebuild 503
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 1b2790fb908e923f9d10021e556a6ef0 files/digest-fle3-1.4.2 61
+MD5 4e8ac6b69bb4da869f33d412057c0947 files/digest-fle3-1.4.5 61
diff --git a/net-zope/fle3/fle3-1.4.2.ebuild b/net-zope/fle3/fle3-1.4.2.ebuild
index a2216ba88ed6..2ac33c4a8255 100644
--- a/net-zope/fle3/fle3-1.4.2.ebuild
+++ b/net-zope/fle3/fle3-1.4.2.ebuild
@@ -1,17 +1,18 @@
-# Copyright 2002-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/net-zope/fle3/fle3-1.4.2.ebuild,v 1.1 2003/04/22 09:15:57 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/fle3-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 P_NEW="fle_${PV}"
 
-DESCRIPTION="Furture Learning Environment for collaborative learning"
+DESCRIPTION="Future Learning Environment for collaborative learning"
 HOMEPAGE="http://fle3.uiah.fi/"
 SRC_URI="${HOMEPAGE}/download/${P_NEW}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-RDEPEND="dev-python/Imaging-py21
+KEYWORDS="x86 ~ppc"
+RDEPEND="dev-python/imaging
 	${RDEPEND}"
 
-ZPROD_LIST="FLE"
\ No newline at end of file
+ZPROD_LIST="FLE"
+IUSE=""
diff --git a/net-zope/fle3/fle3-1.4.5.ebuild b/net-zope/fle3/fle3-1.4.5.ebuild
index 101e1f35d3ea..206db9563b1b 100644
--- a/net-zope/fle3/fle3-1.4.5.ebuild
+++ b/net-zope/fle3/fle3-1.4.5.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/net-zope/fle3/fle3-1.4.5.ebuild,v 1.1 2004/10/23 22:57:58 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/fle3/fle3-1.4.5.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 P_NEW="fle_${PV}"
diff --git a/net-zope/formulator/ChangeLog b/net-zope/formulator/ChangeLog
index 63570bf9296b..d1c5352d8ee1 100644
--- a/net-zope/formulator/ChangeLog
+++ b/net-zope/formulator/ChangeLog
@@ -1,9 +1,57 @@
 # ChangeLog for net-zope/formulator
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/ChangeLog,v 1.1 2003/03/03 22:23:11 kutsuya Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*formulator-1.8.0 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +formulator-1.8.0.ebuild:
+  version bump. also changed homepage, as new version are hosted and
+  developed by infrae guys.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> formulator-1.6.2.ebuild:
+  added ~amd64
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; formulator-1.6.2.ebuild:
+  marking stable
+
+  06 Apr 2004; Jason Wever <weeve@gentoo.org> formulator-1.6.2.ebuild:
+  Added ~sparc keyword wrt bug #46924.
+
+*formulator-1.6.2 (29 Mar 2004)
+
+  29 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>; formulator-1.3.1.ebuild,
+  formulator-1.6.2.ebuild:
+  version bump, 1.3.1 is now ~ppc (repoman)
+
+*formulator-1.6.1 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> formulator-1.4.1.ebuild,
+  formulator-1.6.1.ebuild:
+  version bump
+
+  13 Jan 2004; Heinrich Wendel <lanius@gentoo.org> formulator-1.3.1.ebuild,
+  formulator-1.4.1.ebuild, formulator-1.4.2.ebuild:
+  fixed SRC_URI
+
+*formulator-1.4.2 (26 Jun 2003)
+
+  26 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> formulator-1.4.2.ebuild:
+  Version bump.
+
+*formulator-1.4.1 (20 Jun 2003)
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> formulator-1.4.1.ebuild:
+  Version bump. Masked all archs as unstable.
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> formulator-1.3.1.ebuild:
+  ~ppc -> ppc
 
 *formulator-1.3.1 (16 Feb 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> formulator-1.3.1.ebuild:
+  ~x86 -> x86 and added ~ppc. Shorter description.
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to 
   net-zope.
 
diff --git a/net-zope/formulator/Manifest b/net-zope/formulator/Manifest
index e69de29bb2d1..bd9f19f4e12c 100644
--- a/net-zope/formulator/Manifest
+++ b/net-zope/formulator/Manifest
@@ -0,0 +1,12 @@
+MD5 1270c7840c3d64e253338bdca3f5a82d formulator-1.6.2.ebuild 548
+MD5 2bcace0772125d6f734751f212b78b1d formulator-1.8.0.ebuild 539
+MD5 9513e4aa2d038fc6656910016131d0bd formulator-1.6.1.ebuild 536
+MD5 4a546782ae4161a31ba9b77601c56db7 formulator-1.4.2.ebuild 522
+MD5 be30be86ade5f6ba5ea15b6b84a7af51 formulator-1.3.1.ebuild 521
+MD5 83eecfc58b3257c39839cd1e8e9868b3 ChangeLog 1898
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 26afeaac04342be233ba6e537b73113c files/digest-formulator-1.3.1 64
+MD5 19d9d7e29c2a2e711e0064db88cc5ddd files/digest-formulator-1.4.2 64
+MD5 9e1ed4bc5daa49ba99fee30ccae0c9a9 files/digest-formulator-1.6.1 64
+MD5 05457a75074d7f0888b3a64de4fb7922 files/digest-formulator-1.6.2 64
+MD5 cb9a808aa2f153d5d872d2c1f2f9c63a files/digest-formulator-1.8.0 64
diff --git a/net-zope/formulator/formulator-1.3.1.ebuild b/net-zope/formulator/formulator-1.3.1.ebuild
index a24766d41d0c..7438ce7def4a 100644
--- a/net-zope/formulator/formulator-1.3.1.ebuild
+++ b/net-zope/formulator/formulator-1.3.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 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/net-zope/formulator/formulator-1.3.1.ebuild,v 1.1 2003/03/03 22:23:11 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/formulator-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
-DESCRIPTION="An extensible framework that eases creation and validation of web-forms in Zope."
+DESCRIPTION="Extensible framework that eases creation/validation of web-forms."
 
 HOMEPAGE="http://www.zope.org/Members/faassen/Formulator"
-SRC_URI="${HOMEPAGE}/Formulator-${PV}.tgz"
+SRC_URI="http://zope.org/Members/faassen/Formulator/${PV}/Formulator-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="Formulator"
diff --git a/net-zope/formulator/formulator-1.4.2.ebuild b/net-zope/formulator/formulator-1.4.2.ebuild
index cf5317f6bbfc..b64eb97fec2a 100644
--- a/net-zope/formulator/formulator-1.4.2.ebuild
+++ b/net-zope/formulator/formulator-1.4.2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 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/net-zope/formulator/formulator-1.4.2.ebuild,v 1.1 2003/06/26 15:47:06 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/formulator-1.4.2.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
 DESCRIPTION="Extensible framework that eases creation/validation of web-forms."
 
 HOMEPAGE="http://www.zope.org/Members/faassen/Formulator"
-SRC_URI="${HOMEPAGE}/Formulator-${PV}.tgz"
+SRC_URI="http://zope.org/Members/faassen/Formulator/${PV}/Formulator-${PV}.tgz"
 LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 
diff --git a/net-zope/formulator/formulator-1.6.1.ebuild b/net-zope/formulator/formulator-1.6.1.ebuild
index aee61e17aacf..d82337702127 100644
--- a/net-zope/formulator/formulator-1.6.1.ebuild
+++ b/net-zope/formulator/formulator-1.6.1.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/net-zope/formulator/formulator-1.6.1.ebuild,v 1.1 2004/01/19 14:03:12 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/formulator-1.6.1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/formulator/formulator-1.6.2.ebuild b/net-zope/formulator/formulator-1.6.2.ebuild
index ce665ee79d92..e53c5ab85f86 100644
--- a/net-zope/formulator/formulator-1.6.2.ebuild
+++ b/net-zope/formulator/formulator-1.6.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/net-zope/formulator/formulator-1.6.2.ebuild,v 1.1 2004/03/29 13:42:24 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/formulator-1.6.2.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,6 +9,6 @@ DESCRIPTION="Extensible framework that eases creation/validation of web-forms."
 HOMEPAGE="http://www.zope.org/Members/infrae/Formulator/"
 SRC_URI="http://www.zope.org/Members/infrae/Formulator/Formulator-${PV}/Formulator-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 ZPROD_LIST="Formulator"
diff --git a/net-zope/formulator/formulator-1.8.0.ebuild b/net-zope/formulator/formulator-1.8.0.ebuild
index 34ad735ba06c..977d91b55280 100644
--- a/net-zope/formulator/formulator-1.8.0.ebuild
+++ b/net-zope/formulator/formulator-1.8.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/net-zope/formulator/formulator-1.8.0.ebuild,v 1.1 2005/03/28 15:24:32 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/formulator/formulator-1.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/generator/ChangeLog b/net-zope/generator/ChangeLog
index c2ff869d49de..9dcea96837c2 100644
--- a/net-zope/generator/ChangeLog
+++ b/net-zope/generator/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for net-zope/generator
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/generator/ChangeLog,v 1.1 2004/10/07 21:32:59 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/generator/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*generator-1.3.0.13 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +generator-1.3.0.13.ebuild:
+  version bump
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> generator-1.3.0.11.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> generator-1.3.0.11.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+*generator-1.3.0.11 (04 Dec 2004)
+
+  04 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +generator-1.3.0.11.ebuild:
+  New release from archetypes-1.3.1 tree.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  generator-1.3.0.ebuild:
+  Unstable - mistaken package selected due to similar portage names :(
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  generator-1.3.0.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
 *generator-1.3.0 (06 Oct 2004)
 
diff --git a/net-zope/generator/Manifest b/net-zope/generator/Manifest
index f284eb295bbd..8b60213593e2 100644
--- a/net-zope/generator/Manifest
+++ b/net-zope/generator/Manifest
@@ -1,4 +1,8 @@
-MD5 1b7e5c20b3298ef547720dd7021a4b94 generator-1.3.0.ebuild 751
-MD5 a0c9d57085298a6b3bd28f5fd7d83e99 ChangeLog 369
+MD5 850c33e7a86d5c734afa0df755fd55a0 generator-1.3.0.ebuild 743
+MD5 e3704cfcfd7322ff2805160e6ae1636a generator-1.3.0.11.ebuild 771
+MD5 2d4f7e9a18a95334849b172db5ed1f85 generator-1.3.0.13.ebuild 746
+MD5 1662c91fbde77f1365a0eab584cd1548 ChangeLog 1242
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 f2aa42fefb0344b3646f77fb0d3b6975 files/digest-generator-1.3.0 64
+MD5 aa9266e2f5537c95d7a26603013d35f9 files/digest-generator-1.3.0.11 68
+MD5 c8677fd9610c7e1f56e76b957e4995ff files/digest-generator-1.3.0.13 68
diff --git a/net-zope/generator/generator-1.3.0.11.ebuild b/net-zope/generator/generator-1.3.0.11.ebuild
index 12ab1b364bd3..0c3711ffdfeb 100644
--- a/net-zope/generator/generator-1.3.0.11.ebuild
+++ b/net-zope/generator/generator-1.3.0.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/net-zope/generator/generator-1.3.0.11.ebuild,v 1.1 2004/12/04 20:08:58 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/generator/generator-1.3.0.11.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Widget generator package, originally designed for Archetypes."
 WEBPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
 SRC_URI="mirror://sourceforge/${MASTER_PN}/${PN}-1.3.0-11.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 SLOT="1.3"
 
diff --git a/net-zope/generator/generator-1.3.0.13.ebuild b/net-zope/generator/generator-1.3.0.13.ebuild
index 3ce4fc99812d..12299dfd140d 100644
--- a/net-zope/generator/generator-1.3.0.13.ebuild
+++ b/net-zope/generator/generator-1.3.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/net-zope/generator/generator-1.3.0.13.ebuild,v 1.1 2005/04/15 17:20:05 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/generator/generator-1.3.0.13.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/generator/generator-1.3.0.ebuild b/net-zope/generator/generator-1.3.0.ebuild
index 8e3fd4d68ba6..e694ecb9aed1 100644
--- a/net-zope/generator/generator-1.3.0.ebuild
+++ b/net-zope/generator/generator-1.3.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/net-zope/generator/generator-1.3.0.ebuild,v 1.1 2004/10/07 21:32:59 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/generator/generator-1.3.0.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/genericuserfolder/ChangeLog b/net-zope/genericuserfolder/ChangeLog
index 66c4a080f0cf..c2b0d51eb64d 100644
--- a/net-zope/genericuserfolder/ChangeLog
+++ b/net-zope/genericuserfolder/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-zope/genericuserfolder
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/genericuserfolder/ChangeLog,v 1.1 2003/10/09 18:38:40 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/genericuserfolder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  05 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  genericuserfolder-1.2.4.ebuild:
+  fixed chown syntax
+
+  09 Oct 2003; Robin H. Johnson <robbat2@gentoo.org>
+  genericuserfolder-1.2.4.ebuild:
+  fix SRC_URI
 
 *genericuserfolder-1.2.4 (09 Oct 2003)
 
diff --git a/net-zope/genericuserfolder/Manifest b/net-zope/genericuserfolder/Manifest
index 9734266bf981..0930632358eb 100644
--- a/net-zope/genericuserfolder/Manifest
+++ b/net-zope/genericuserfolder/Manifest
@@ -1,2 +1,4 @@
-MD5 f45e9b130b795f68572cd741908105ff genericuserfolder-1.2.4.ebuild 819
+MD5 8f246d0e1e551d69dbf9bebe5577bda6 genericuserfolder-1.2.4.ebuild 832
+MD5 b11c1c61208aa213be82d0d7a05ffcb6 ChangeLog 581
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 1ede0ae32b95d62e4b664c4ecffc60cc files/digest-genericuserfolder-1.2.4 71
diff --git a/net-zope/genericuserfolder/genericuserfolder-1.2.4.ebuild b/net-zope/genericuserfolder/genericuserfolder-1.2.4.ebuild
index d816aa8f778b..4c1c2402df59 100644
--- a/net-zope/genericuserfolder/genericuserfolder-1.2.4.ebuild
+++ b/net-zope/genericuserfolder/genericuserfolder-1.2.4.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/net-zope/genericuserfolder/genericuserfolder-1.2.4.ebuild,v 1.1 2003/10/09 18:38:40 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/genericuserfolder/genericuserfolder-1.2.4.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ MY_PV="${PV//./-}"
 MY_P="${MY_PN}-${MY_PV}"
 DESCRIPTION="The GenericUserFolder is a roll-your-own user folder"
 HOMEPAGE="http://www.zope.org/Members/Zen/${MY_PN}"
-SRC_URI="${HOMEPAGE}/${PV}/${MY_P}.tgz"
+SRC_URI="${HOMEPAGE}/${MY_PV}/${MY_P}.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
 
@@ -21,7 +21,7 @@ src_install() {
 	zproduct_src_install
 	# fix permissions on files
 	DIR=${D}/usr/share/zproduct/${PF}
-	find ${DIR} -exec chown zope.root \{} \;
+	find ${DIR} -exec chown zope:root \{} \;
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
diff --git a/net-zope/groups/ChangeLog b/net-zope/groups/ChangeLog
index c1c341f2d284..8331b4877fcc 100644
--- a/net-zope/groups/ChangeLog
+++ b/net-zope/groups/ChangeLog
@@ -1,9 +1,26 @@
 # ChangeLog for net-zope/groups
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/groups/ChangeLog,v 1.1 2003/03/30 07:48:57 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groups/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> groups-0.3.1.ebuild:
+  down to ~ppc until deps are stable
+
+*groups-0.3.2 (22 Jun 2003)
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> groups-0.3.2.ebuild:
+  Version bump. Masked all archs as unstable.
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> groups-0.3.1.ebuild:
+  ~ppc -> ppc
 
 *groups-0.3.1 (29 Mar 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> groups-0.3.1.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   29 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> groups-0.3.1.ebuild:
   Initial import. #17599
 
diff --git a/net-zope/groups/Manifest b/net-zope/groups/Manifest
index e69de29bb2d1..482043a9ffe6 100644
--- a/net-zope/groups/Manifest
+++ b/net-zope/groups/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 90ec0317c2b928f927d379cc140e9336 groups-0.3.1.ebuild 447
+MD5 3de834ab389cb357d9b1c2fa02645100 groups-0.3.2.ebuild 448
+MD5 3951c5f829bcb79975b696ff0a9e5089 ChangeLog 856
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 afc3673fd22b849dee0886845de8a43f files/digest-groups-0.3.1 60
+MD5 73a175fb11e9eb0e1d08534ee6ac3a1c files/digest-groups-0.3.2 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBooCVI1lqEGTUzyQRAq45AKCESDB9WvWqCcavmSbnJlyXsp4kUQCZAVTZ
+dZld2/U1giUKVxHaieHFcD8=
+=HPDb
+-----END PGP SIGNATURE-----
diff --git a/net-zope/groups/groups-0.3.1.ebuild b/net-zope/groups/groups-0.3.1.ebuild
index 0aaa8248531a..43ea38c86452 100644
--- a/net-zope/groups/groups-0.3.1.ebuild
+++ b/net-zope/groups/groups-0.3.1.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/groups/groups-0.3.1.ebuild,v 1.1 2003/03/30 07:48:57 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groups/groups-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,6 +8,6 @@ DESCRIPTION="Group support (including local roles) for Zope"
 HOMEPAGE="http://www.zope.org/Members/faassen/Groups"
 SRC_URI="${HOMEPAGE}/Groups-${PV}.tgz"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
-ZPROD_LIST="Groups"
\ No newline at end of file
+ZPROD_LIST="Groups"
diff --git a/net-zope/groups/groups-0.3.2.ebuild b/net-zope/groups/groups-0.3.2.ebuild
index 5f5a11d9e12f..dbd624988aea 100644
--- a/net-zope/groups/groups-0.3.2.ebuild
+++ b/net-zope/groups/groups-0.3.2.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/groups/groups-0.3.2.ebuild,v 1.1 2003/06/22 21:26:51 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groups/groups-0.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,4 +10,4 @@ SRC_URI="${HOMEPAGE}/Groups-${PV}.tgz"
 LICENSE="BSD"
 KEYWORDS="~x86 ~ppc"
 
-ZPROD_LIST="Groups"
\ No newline at end of file
+ZPROD_LIST="Groups"
diff --git a/net-zope/groupuserfolder/ChangeLog b/net-zope/groupuserfolder/ChangeLog
index 404b79654190..56ea76cc3a21 100644
--- a/net-zope/groupuserfolder/ChangeLog
+++ b/net-zope/groupuserfolder/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for net-zope/groupuserfolder
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/groupuserfolder/ChangeLog,v 1.1 2004/01/22 15:33:39 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groupuserfolder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> groupuserfolder-3.2.ebuild:
+  added ~amd64
+
+*groupuserfolder-3.2 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +groupuserfolder-3.2.ebuild:
+  version bump, closes #85120, opens pandora box for plone 2.0 ;)
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> groupuserfolder-2.0.1.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  groupuserfolder-2.0.1.ebuild:
+  marked stable
+
+*groupuserfolder-2.0.1 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  -groupuserfolder-1.32.ebuild, +groupuserfolder-2.0.1.ebuild,
+  groupuserfolder-2.0.ebuild, -groupuserfolder-2.0_beta3.ebuild:
+  version bump, removed old ebuilds, added IUSE
+
+*groupuserfolder-2.0 (27 Mar 2004)
+
+  27 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>; groupuserfolder-2.0.ebuild:
+  version bump
+
+*groupuserfolder-2.0_beta3 (13 Mar 2004)
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> groupuserfolder-2.0_beta3.ebuild:
+  Added to ~ppc.
+
+*groupuserfolder-1.32 (22 Jan 2004)
 
   22 Jan 2004; Heinrich Wendel <lanius@gentoo.org> :
   initial import, thx to solution2u.net
diff --git a/net-zope/groupuserfolder/Manifest b/net-zope/groupuserfolder/Manifest
index 03521e3ffe2b..f10dd41592ad 100644
--- a/net-zope/groupuserfolder/Manifest
+++ b/net-zope/groupuserfolder/Manifest
@@ -1,6 +1,8 @@
-MD5 5c64910b198aa413933f9a0d957c562c groupuserfolder-2.0_beta3.ebuild 585
-MD5 eae2ee9a16fa35a463111d47ee91c537 groupuserfolder-1.32.ebuild 568
-MD5 2db59899077f70bf4fb9bf53dafcffe5 ChangeLog 227
+MD5 7862c872daecebd1df566eefd412aeb8 ChangeLog 1385
+MD5 ee891cdaca37ea012249d52da906db4b groupuserfolder-2.0.1.ebuild 573
+MD5 1bfa3b4ebe19675d7e3352f858276400 groupuserfolder-2.0.ebuild 571
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 2c76998f962f34247f3d9c54483427c4 files/digest-groupuserfolder-1.32 72
-MD5 f6603ca4d7cc6caae595d88774af8256 files/digest-groupuserfolder-2.0_beta3 76
+MD5 ec9ed6a012eb0c662c898621f16de297 groupuserfolder-3.2.ebuild 875
+MD5 97fe85abf757de758cf218e48cb940ab files/digest-groupuserfolder-2.0 71
+MD5 b5a69998a6fbad05724df225e1220820 files/digest-groupuserfolder-2.0.1 70
+MD5 0c1c127aee440ca8ceb8c32ed49151ca files/digest-groupuserfolder-3.2 71
diff --git a/net-zope/groupuserfolder/groupuserfolder-2.0.1.ebuild b/net-zope/groupuserfolder/groupuserfolder-2.0.1.ebuild
index 79d1e8581031..b0d05781326e 100644
--- a/net-zope/groupuserfolder/groupuserfolder-2.0.1.ebuild
+++ b/net-zope/groupuserfolder/groupuserfolder-2.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/net-zope/groupuserfolder/groupuserfolder-2.0.1.ebuild,v 1.1 2004/07/27 19:32:56 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groupuserfolder/groupuserfolder-2.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="GroupUserFolder is a kind of user folder that provides a special ki
 HOMEPAGE="http://ingeniweb.sourceforge.net/Products/GroupUserFolder/"
 SRC_URI="mirror://sourceforge/collective/GroupUserFolder-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE=""
 
 ZPROD_LIST="GroupUserFolder"
diff --git a/net-zope/groupuserfolder/groupuserfolder-2.0.ebuild b/net-zope/groupuserfolder/groupuserfolder-2.0.ebuild
index 2c053c2ff633..e7ff7c4171c4 100644
--- a/net-zope/groupuserfolder/groupuserfolder-2.0.ebuild
+++ b/net-zope/groupuserfolder/groupuserfolder-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/net-zope/groupuserfolder/groupuserfolder-2.0.ebuild,v 1.1 2004/03/26 23:01:31 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groupuserfolder/groupuserfolder-2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,5 +9,6 @@ HOMEPAGE="http://ingeniweb.sourceforge.net/Products/GroupUserFolder/"
 SRC_URI="mirror://sourceforge/collective/GroupUserFolder-${PV}.tar.gz"
 LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 ZPROD_LIST="GroupUserFolder"
diff --git a/net-zope/groupuserfolder/groupuserfolder-3.2.ebuild b/net-zope/groupuserfolder/groupuserfolder-3.2.ebuild
index 5db82f43c2d4..c15a6080fcd5 100644
--- a/net-zope/groupuserfolder/groupuserfolder-3.2.ebuild
+++ b/net-zope/groupuserfolder/groupuserfolder-3.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/net-zope/groupuserfolder/groupuserfolder-3.2.ebuild,v 1.1 2005/03/26 01:33:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/groupuserfolder/groupuserfolder-3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="GroupUserFolder is a kind of user folder that provides a special ki
 HOMEPAGE="http://ingeniweb.sourceforge.net/Products/GroupUserFolder/"
 SRC_URI="mirror://sourceforge/collective/GroupUserFolder-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 
 ZPROD_LIST="GroupUserFolder"
diff --git a/net-zope/indexedcatalog/ChangeLog b/net-zope/indexedcatalog/ChangeLog
index 21774345a8b7..a40f1d680a70 100644
--- a/net-zope/indexedcatalog/ChangeLog
+++ b/net-zope/indexedcatalog/ChangeLog
@@ -1,6 +1,8 @@
 # ChangeLog for net-zope/indexedcatalog
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/indexedcatalog/ChangeLog,v 1.1 2003/11/09 13:46:02 lanius Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/indexedcatalog/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+*indexedcatalog-0.6.0 (09 Nov 2003)
 
   09 Nov 2003; Heinrich Wendel <lanius@gentoo.org>
   indexedcatalog-0.6.0.ebuild, metadata.xml:
diff --git a/net-zope/indexedcatalog/Manifest b/net-zope/indexedcatalog/Manifest
index 9287f78c7c62..f9447594a221 100644
--- a/net-zope/indexedcatalog/Manifest
+++ b/net-zope/indexedcatalog/Manifest
@@ -1,2 +1,4 @@
-MD5 ba7c3bb63cbdf059c42783c5fe26e45c indexedcatalog-0.6.0.ebuild 576
+MD5 7bbfe95f868db4acc351394e5bd6615d indexedcatalog-0.6.0.ebuild 556
+MD5 f301ba7ab0be70097480f2abb9567e11 ChangeLog 418
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 3d4b61b8c617108dabe28b4b9888c0bc files/digest-indexedcatalog-0.6.0 72
diff --git a/net-zope/indexedcatalog/indexedcatalog-0.6.0.ebuild b/net-zope/indexedcatalog/indexedcatalog-0.6.0.ebuild
index c9472a441811..3ae666b6fb32 100644
--- a/net-zope/indexedcatalog/indexedcatalog-0.6.0.ebuild
+++ b/net-zope/indexedcatalog/indexedcatalog-0.6.0.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/net-zope/indexedcatalog/indexedcatalog-0.6.0.ebuild,v 1.1 2003/11/09 13:46:02 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/indexedcatalog/indexedcatalog-0.6.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-zope/issuetrackerproduct/ChangeLog b/net-zope/issuetrackerproduct/ChangeLog
index 0d3efb9fd346..8e6e6661b32a 100644
--- a/net-zope/issuetrackerproduct/ChangeLog
+++ b/net-zope/issuetrackerproduct/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-zope/issuetrackerproduct
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/issuetrackerproduct/ChangeLog,v 1.1 2003/04/08 08:34:41 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/issuetrackerproduct/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*issuetrackerproduct-0.6.5 (19 Apr 2005)
+
+  19 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +issuetrackerproduct-0.6.5.ebuild:
+  version bump.
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+*issuetrackerproduct-0.5.2 (24 Oct 2004)
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org>
+  issuetrackerproduct-0.5.0b.ebuild, +issuetrackerproduct-0.5.2.ebuild:
+  version bump
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  issuetrackerproduct-0.5.0b.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org>
+  issuetrackerproduct-0.5.0b.ebuild: ~x86 ~ppc -> x86 ppc
 
 *issuetrackerproduct-0.5.0b (08 Apr 2003)
 
diff --git a/net-zope/issuetrackerproduct/Manifest b/net-zope/issuetrackerproduct/Manifest
index e69de29bb2d1..9ba119daf4d7 100644
--- a/net-zope/issuetrackerproduct/Manifest
+++ b/net-zope/issuetrackerproduct/Manifest
@@ -0,0 +1,8 @@
+MD5 6f84899dafeea0db023d3e05ab6cdc6c issuetrackerproduct-0.5.0b.ebuild 605
+MD5 da3ee7b77d99e3350539aff6f151d656 issuetrackerproduct-0.5.2.ebuild 551
+MD5 9dc45e3ee4d399c9ee7104963d9e65c4 issuetrackerproduct-0.6.5.ebuild 561
+MD5 a7d3bf1d19fb350527691888b45a5016 ChangeLog 1019
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 ef2d3c621c778d98cc79089f8733d249 files/digest-issuetrackerproduct-0.5.2 74
+MD5 67b4cc5cb6c4f407d7fd81dc939e12e9 files/digest-issuetrackerproduct-0.6.5 74
+MD5 03f9c0febe272e98966116945e2684a1 files/digest-issuetrackerproduct-0.5.0b 75
diff --git a/net-zope/issuetrackerproduct/files/digest-issuetrackerproduct-0.5.0b b/net-zope/issuetrackerproduct/files/digest-issuetrackerproduct-0.5.0b
index 27ac0195f177..b013ca0465cb 100644
--- a/net-zope/issuetrackerproduct/files/digest-issuetrackerproduct-0.5.0b
+++ b/net-zope/issuetrackerproduct/files/digest-issuetrackerproduct-0.5.0b
@@ -1,2 +1 @@
-MD5 2c60bc89d3dd7c42f0e63546f350064d /issuetrackerproduct-0.5.0b.ebuild 512
 MD5 d1a1be49ea61e7719f82adf220d51182 IssueTrackerProduct-0.5.0b.tgz 100414
diff --git a/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.0b.ebuild b/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.0b.ebuild
index b9187f43937d..7b9618b55481 100644
--- a/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.0b.ebuild
+++ b/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 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/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.0b.ebuild,v 1.1 2003/04/08 08:34:41 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.0b.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,10 +8,10 @@ DESCRIPTION="Issue tracking system."
 HOMEPAGE="http://www.zope.org/Members/peterbe/IssueTrackerProduct"
 SRC_URI="${HOMEPAGE}/IssueTrackerProduct-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 # Wondering if these should be turned into local USE flags.
-RDEPEND=">=dev-python/email-py21-2.5
-	>=dev-python/stripogram-py21-1.4
+RDEPEND=">=dev-python/stripogram-1.4
 	${RDEPEND}"
 
-ZPROD_LIST="IssueTrackerProduct" 
+ZPROD_LIST="IssueTrackerProduct"
+IUSE=""
diff --git a/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.2.ebuild b/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.2.ebuild
index b0da5e0105d6..882556e1dd11 100644
--- a/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.2.ebuild
+++ b/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.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/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.2.ebuild,v 1.1 2004/10/23 22:53:54 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/issuetrackerproduct/issuetrackerproduct-0.5.2.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/issuetrackerproduct/issuetrackerproduct-0.6.5.ebuild b/net-zope/issuetrackerproduct/issuetrackerproduct-0.6.5.ebuild
index fc6bd1e2df83..96d0f02abb33 100644
--- a/net-zope/issuetrackerproduct/issuetrackerproduct-0.6.5.ebuild
+++ b/net-zope/issuetrackerproduct/issuetrackerproduct-0.6.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/net-zope/issuetrackerproduct/issuetrackerproduct-0.6.5.ebuild,v 1.1 2005/04/19 17:43:42 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/issuetrackerproduct/issuetrackerproduct-0.6.5.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/ldapuserfolder/ChangeLog b/net-zope/ldapuserfolder/ChangeLog
index a0339ad74753..67c32018447d 100644
--- a/net-zope/ldapuserfolder/ChangeLog
+++ b/net-zope/ldapuserfolder/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for net-zope/ldapuserfolder
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/ldapuserfolder/ChangeLog,v 1.1 2003/03/30 06:49:42 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ldapuserfolder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+  22 May 2005; Jason Wever <weeve@gentoo.org> ldapuserfolder-2.4.ebuild:
+  Added ~sparc keyword.
+
+  09 Nov 2004; <heino@gentoo.org> ldapuserfolder-2.4.ebuild:
+  remove sed in global scope
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -ldapuserfolder-2.0.ebuild,
+  -ldapuserfolder-2.1_beta3.ebuild, ldapuserfolder-2.4.ebuild:
+  remove old versions
+
+*ldapuserfolder-2.4 (11 Sep 2004)
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +ldapuserfolder-2.4.ebuild:
+  version bump
+
+*ldapuserfolder-2.1_beta3 (05 Apr 2003)
+
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> ldapuserfolder-2.0.ebuild,
+  ldapuserfolder-2.1_beta3.ebuild: Version bumped. Currently unmasked. #18540
 
 *ldapuserfolder-2.0 (29 Mar 2003)
 
diff --git a/net-zope/ldapuserfolder/Manifest b/net-zope/ldapuserfolder/Manifest
index 0012efda2fca..933209a80e79 100644
--- a/net-zope/ldapuserfolder/Manifest
+++ b/net-zope/ldapuserfolder/Manifest
@@ -1,5 +1,4 @@
-MD5 4472b768dace5b6544fd90af032240a6 ldapuserfolder-2.0.ebuild 580
-MD5 e3eb210d01d39ff593c35ad64a40fd40 ldapuserfolder-2.1_beta3.ebuild 589
-MD5 6d0597852b5ea5b70e3e2c93537f2422 ChangeLog 568
-MD5 8112fad354189a59f52d3ef03f236fe5 files/digest-ldapuserfolder-2.0 134
-MD5 e3000eacda5c4e90ce60f574ac9d8b2a files/digest-ldapuserfolder-2.1_beta3 145
+MD5 b9765350f766125c0e035ed5d5a75d18 ChangeLog 1041
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 f5c948c3f38a825a0cda855a1b338fe1 ldapuserfolder-2.4.ebuild 574
+MD5 24bc85e0b885b23c5367f353b28b4232 files/digest-ldapuserfolder-2.4 66
diff --git a/net-zope/ldapuserfolder/ldapuserfolder-2.4.ebuild b/net-zope/ldapuserfolder/ldapuserfolder-2.4.ebuild
index 9cee216d63eb..948af3bce42b 100644
--- a/net-zope/ldapuserfolder/ldapuserfolder-2.4.ebuild
+++ b/net-zope/ldapuserfolder/ldapuserfolder-2.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/net-zope/ldapuserfolder/ldapuserfolder-2.4.ebuild,v 1.1 2004/09/11 21:42:11 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ldapuserfolder/ldapuserfolder-2.4.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
-PV_NEW=$(echo ${PV/_/} |sed -e "s:\.:_:g")
+PV_NEW=${PV/./_}
 
 DESCRIPTION="LDAP User Authentication for Zope."
 HOMEPAGE="http://www.dataflake.org/software/ldapuserfolder/"
 SRC_URI="${HOMEPAGE}/${PN}_${PV}/LDAPUserFolder-${PV_NEW}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~sparc x86"
 RDEPEND=">=dev-python/python-ldap-2.0.0_pre05
 	$RDEPEND"
 
diff --git a/net-zope/localfs/ChangeLog b/net-zope/localfs/ChangeLog
index 8b757a5d8b16..a4064f9eb362 100644
--- a/net-zope/localfs/ChangeLog
+++ b/net-zope/localfs/ChangeLog
@@ -1,9 +1,33 @@
 # ChangeLog for net-zope/localfs
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/ChangeLog,v 1.1 2003/03/26 04:43:45 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*localfs-1.7_rc1 (01 Apr 2005)
+
+  01 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +localfs-1.7_rc1.ebuild:
+  version bump
+
+*localfs-1.6 (18 Feb 2005)
+
+  18 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> +localfs-1.6.ebuild:
+  New version. From now, its based on adreas fork, which is maintained,
+  has more features, and better performance.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> localfs-1.0.0.ebuild:
+  down to ~ppc until deps are stable
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> localfs-1.0.0.ebuild:
+  ~ppc -> ppc. Use bash to construct PV_NEW instead of sed.
 
 *localfs-1.0.0 (25 Mar 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> localfs-1.0.0.ebuild:
+  ~x86 -> x86
+
+  26 Mar 2003; Graham Forest <vladimir@gentoo.org> localfs-1.0.0.ebuild:
+  Automated cleanup of LICENSE
+
   25 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> localfs-1.0.0.ebuild:
   Initial import. Based on ebuild submitted in #15420.
 
diff --git a/net-zope/localfs/Manifest b/net-zope/localfs/Manifest
index e69de29bb2d1..ebab61d68c56 100644
--- a/net-zope/localfs/Manifest
+++ b/net-zope/localfs/Manifest
@@ -0,0 +1,8 @@
+MD5 fc82265de9ce342712eeb26673c0a03e localfs-1.7_rc1.ebuild 490
+MD5 beff821bc9c2395f9ba3520499509676 localfs-1.0.0.ebuild 534
+MD5 e6bc1d9c48f0ad215650cdaf578086ef localfs-1.6.ebuild 486
+MD5 dd8bcbc3ba8cb97bab2b0ac16723ab17 ChangeLog 1158
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 bf5d5ce9b92cc8daa4c1786642d40c59 files/digest-localfs-1.0.0 61
+MD5 74fc3822301b0d67c97450f28389d099 files/digest-localfs-1.6 70
+MD5 74fc3822301b0d67c97450f28389d099 files/digest-localfs-1.7_rc1 70
diff --git a/net-zope/localfs/localfs-1.0.0.ebuild b/net-zope/localfs/localfs-1.0.0.ebuild
index 224a31bb8caf..06d24592360c 100644
--- a/net-zope/localfs/localfs-1.0.0.ebuild
+++ b/net-zope/localfs/localfs-1.0.0.ebuild
@@ -1,16 +1,17 @@
-# Copyright 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/net-zope/localfs/localfs-1.0.0.ebuild,v 1.1 2003/03/26 04:43:45 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/localfs-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
+
 S="${WORKDIR}/lib/python/Products/"
-PV_NEW=$(echo ${PV} |sed -e "s/\./-/g")
+PV_NEW=${PV//./-}
 
 DESCRIPTION="Zope product for accessing the local filesystem"
 HOMEPAGE="http://sourceforge.net/projects/localfs/"
 SRC_URI="mirror://sourceforge/localfs/LocalFS-${PV_NEW}.tgz"
-LICENSE="GPL"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="LocalFS"
diff --git a/net-zope/localfs/localfs-1.6.ebuild b/net-zope/localfs/localfs-1.6.ebuild
index 45faaaf8b0d9..485c72d13b5e 100644
--- a/net-zope/localfs/localfs-1.6.ebuild
+++ b/net-zope/localfs/localfs-1.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/net-zope/localfs/localfs-1.6.ebuild,v 1.1 2005/02/18 18:32:30 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/localfs-1.6.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/localfs/localfs-1.7_rc1.ebuild b/net-zope/localfs/localfs-1.7_rc1.ebuild
index 096460bbf8f3..3e2a619ea09b 100644
--- a/net-zope/localfs/localfs-1.7_rc1.ebuild
+++ b/net-zope/localfs/localfs-1.7_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/net-zope/localfs/localfs-1.7_rc1.ebuild,v 1.1 2005/04/01 12:49:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localfs/localfs-1.7_rc1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/localizer/ChangeLog b/net-zope/localizer/ChangeLog
index 604e63f679c8..d4893677fb9e 100644
--- a/net-zope/localizer/ChangeLog
+++ b/net-zope/localizer/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for net-zope/localizer
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/localizer/ChangeLog,v 1.1 2003/03/03 22:41:08 kutsuya Exp $
+# Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localizer/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  25 Aug 2004; Sven Wegener <swegener@gentoo.org> localizer-1.0.0-r1.ebuild,
+  localizer-1.0.1.ebuild, localizer-1.1.0_alpha1.ebuild:
+  Changed SRC_URI to use mirror:// syntax. Added missing IUSE and DEPEND.
+
+*localizer-1.1.0_alpha1 (26 Jun 2003)
+
+  26 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  localizer-1.1.0_alpha1.ebuild: Version bumped.
+
+  26 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> localizer-1.0.0-r1.ebuild,
+  localizer-1.0.1.ebuild: Added $MYDOC, removed DOTTXT_PROTECT.
+
+*localizer-1.0.1 (09 Apr 2003)
+
+  09 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> localizer-1.0.1.ebuild:
+  Version bumped.
 
 *localizer-1.0.0-r1 (26 Feb 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> localizer-1.0.0-r1.ebuild:
+  ~x86 -> x86 and added ~ppc.
+
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> localizer-1.0.0-r1.ebuild:
+  Added ${DOTTXT_PROTECT} to the DOTTXT_PROTECT variable. 
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to 
   net-zope.
 
@@ -15,4 +41,4 @@
   18 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : Initial import.
  
 
- 
\ No newline at end of file
+ 
diff --git a/net-zope/localizer/Manifest b/net-zope/localizer/Manifest
index e69de29bb2d1..d522f736a496 100644
--- a/net-zope/localizer/Manifest
+++ b/net-zope/localizer/Manifest
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 ea2af49188b95efce7c11ac58091703b localizer-1.1.0_alpha1.ebuild 593
+MD5 9474064d99f5b0f0ee3ec7437c8b6928 localizer-1.0.1.ebuild 544
+MD5 6f4ebdf26d868e3fd2e18ca5d9d33c44 ChangeLog 1528
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 acd3188a587fae5644577822e41c9613 localizer-1.0.0-r1.ebuild 548
+MD5 3f8f43b42225585543961468215a81dc files/digest-localizer-1.1.0_alpha1 71
+MD5 b6a105e31d507683d40974013a7dfb9f files/digest-localizer-1.0.1 64
+MD5 d00932aa32235cb02a1c05730b777aa9 files/digest-localizer-1.0.0-r1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBooEDI1lqEGTUzyQRAtYDAKCbDPkl99DGxuZ6Qxj6w+WZCCOo6ACgwiFr
+h8SwPppMOo4bO6eyjGnMrWg=
+=lXT4
+-----END PGP SIGNATURE-----
diff --git a/net-zope/localizer/files/digest-localizer-1.0.1 b/net-zope/localizer/files/digest-localizer-1.0.1
index 58c499b477b7..b19d26720494 100644
--- a/net-zope/localizer/files/digest-localizer-1.0.1
+++ b/net-zope/localizer/files/digest-localizer-1.0.1
@@ -1,2 +1 @@
-MD5 55016e2e12132a346fb90532ba9be93d /localizer-1.0.1.ebuild 442
 MD5 87d82f24d94eee8a7fa334c4c5422b69 Localizer-1.0.1.tgz 140104
diff --git a/net-zope/localizer/localizer-1.0.0-r1.ebuild b/net-zope/localizer/localizer-1.0.0-r1.ebuild
index 865fd6c710a8..85335682dff6 100644
--- a/net-zope/localizer/localizer-1.0.0-r1.ebuild
+++ b/net-zope/localizer/localizer-1.0.0-r1.ebuild
@@ -1,15 +1,19 @@
-# Copyright 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/net-zope/localizer/localizer-1.0.0-r1.ebuild,v 1.1 2003/03/03 22:41:08 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localizer/localizer-1.0.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
 DESCRIPTION="Helps to build multilingual zope websites and zope products."
 HOMEPAGE="http://www.localizer.org"
-SRC_URI="http://unc.dl.sourceforge.net/lleu/Localizer-${PV}.tgz"
+SRC_URI="mirror://sourceforge/lleu/Localizer-${PV}.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+IUSE=""
+
+DEPEND=""
 
 ZPROD_LIST="Localizer"
-DOTTXT_PROTECT="languages.txt charsets.txt"
+MYDOC="BUGS.txt old/CHANGES.txt old/UPGRADE.txt RELEASE-*txt* ${MYDOC}"
+
+
 
diff --git a/net-zope/localizer/localizer-1.0.1.ebuild b/net-zope/localizer/localizer-1.0.1.ebuild
index 234e18a27349..a79b19bb2cba 100644
--- a/net-zope/localizer/localizer-1.0.1.ebuild
+++ b/net-zope/localizer/localizer-1.0.1.ebuild
@@ -1,15 +1,18 @@
-# Copyright 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/net-zope/localizer/localizer-1.0.1.ebuild,v 1.1 2003/04/09 18:07:43 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localizer/localizer-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
 DESCRIPTION="Helps to build multilingual zope websites and zope products."
 HOMEPAGE="http://www.localizer.org"
-SRC_URI="http://unc.dl.sourceforge.net/lleu/Localizer-${PV}.tgz"
+SRC_URI="mirror://sourceforge/lleu/Localizer-${PV}.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=""
 
 ZPROD_LIST="Localizer"
-DOTTXT_PROTECT="languages.txt charsets.txt ${DOTTXT_PROTECT}"
+MYDOC="BUGS.txt old/CHANGES.txt old/UPGRADE.txt RELEASE-*txt* ${MYDOC}"
+
 
diff --git a/net-zope/localizer/localizer-1.1.0_alpha1.ebuild b/net-zope/localizer/localizer-1.1.0_alpha1.ebuild
index 4fa639868743..4128b7c6ceea 100644
--- a/net-zope/localizer/localizer-1.1.0_alpha1.ebuild
+++ b/net-zope/localizer/localizer-1.1.0_alpha1.ebuild
@@ -1,15 +1,18 @@
-# Copyright 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/net-zope/localizer/localizer-1.1.0_alpha1.ebuild,v 1.1 2003/06/26 16:27:41 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/localizer/localizer-1.1.0_alpha1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 PV_NEW=${PV/_/-}
 
 DESCRIPTION="Helps to build multilingual zope websites and zope products."
 HOMEPAGE="http://www.localizer.org"
-SRC_URI="http://unc.dl.sourceforge.net/lleu/Localizer-${PV_NEW}.tgz"
+SRC_URI="mirror://sourceforge/lleu/Localizer-${PV_NEW}.tgz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
+IUSE=""
+
+DEPEND=""
 
 ZPROD_LIST="Localizer"
 MYDOC="BUGS.txt old/CHANGES.txt old/UPGRADE.txt RELEASE-*txt* ${MYDOC}"
diff --git a/net-zope/metadata.xml b/net-zope/metadata.xml
index 0e2ad0db9d6d..902acbf601e6 100644
--- a/net-zope/metadata.xml
+++ b/net-zope/metadata.xml
@@ -2,7 +2,29 @@
 <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
-		The net-zope category contains Zope software.
+		The net-zope category contains all Zope (zope.org) related software including third party products and tools.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie net-zope enthält Software rund um Zope (zope.org), inklusive externerProdukte und Werkzeuge.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría net-zope contiene todo el software relacionado con Zope
+		(zope.org) incluyendo herramientas y módulos de terceros.
+	</longdescription>
+	<longdescription lang="ja">
+		net-zopeカテゴリーにはサードパーティ製プロダクトとツールも含めたZope全般の
+		ソフトウェアが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De net-zope categorie bevat alle Zope (zope.org) gerelateerde applicaties.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm net-zope chứa các phần mềm liên quan đến Zope (zope.org)
+		bao gồm các sản phẩm của bên thứ ba.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria net-zope contiene tutto il software relativo a Zope (zope.org)
+		compreso il software sviluppato da terze parti.
 	</longdescription>
 </catmetadata>
 
diff --git a/net-zope/mimetypesregistry/ChangeLog b/net-zope/mimetypesregistry/ChangeLog
index 4a9906c30630..4dd4a82e1e8e 100644
--- a/net-zope/mimetypesregistry/ChangeLog
+++ b/net-zope/mimetypesregistry/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for net-zope/mimetypesregistry
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/mimetypesregistry/ChangeLog,v 1.1 2004/10/07 21:33:36 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mimetypesregistry/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org>
+  mimetypesregistry-1.3.3.ebuild:
+  added ~amd64 keyword
+
+  08 May 2005; Jason Wever <weeve@gentoo.org>
+  mimetypesregistry-1.3.3.ebuild:
+  Added ~sparc keyword as it was accidentily dropped in the version bump.
+
+*mimetypesregistry-1.3.3 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +mimetypesregistry-1.3.3.ebuild:
+  version bump
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  mimetypesregistry-1.3.2.7.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org>
+  mimetypesregistry-1.3.2.7.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+*mimetypesregistry-1.3.2.7 (04 Dec 2004)
+
+  04 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +mimetypesregistry-1.3.2.7.ebuild:
+  New release from archetypes-1.3.1 tree.
 
 *mimetypesregistry-1.3.2 (06 Oct 2004)
 
diff --git a/net-zope/mimetypesregistry/Manifest b/net-zope/mimetypesregistry/Manifest
index 2886b2377e56..c5fed1d07b2c 100644
--- a/net-zope/mimetypesregistry/Manifest
+++ b/net-zope/mimetypesregistry/Manifest
@@ -1,3 +1,8 @@
-MD5 1d46104a058be3a1b5366c84171417b7 mimetypesregistry-1.3.2.ebuild 643
+MD5 13d2bc020e50fe58fd1110c00b84010b ChangeLog 1188
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 15785438d4762b6dca5954ceca84f35e mimetypesregistry-1.3.2.7.ebuild 693
+MD5 b27997e76b89fc9aa9e5e558b1bd2a75 mimetypesregistry-1.3.2.ebuild 674
+MD5 c30c01df2dfb7fc60470641bb08ce675 mimetypesregistry-1.3.3.ebuild 670
 MD5 bf26d0635fb6ab28e73044e307651a55 files/digest-mimetypesregistry-1.3.2 73
+MD5 42eb4bc8aacd794786c998d02a6cde9d files/digest-mimetypesregistry-1.3.2.7 76
+MD5 20050a10071c0e892549717e2c129768 files/digest-mimetypesregistry-1.3.3 80
diff --git a/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.7.ebuild b/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.7.ebuild
index 8dd71e6c309c..f77571ce0a60 100644
--- a/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.7.ebuild
+++ b/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.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/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.7.ebuild,v 1.1 2004/12/04 20:12:15 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.7.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,7 +11,7 @@ DESCRIPTION="Mimetypes Registry for Archetypes and PortalTransforms used in Plon
 WEBPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
 SRC_URI="mirror://sourceforge/${MASTER_PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 SLOT="1.3"
 
diff --git a/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.ebuild b/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.ebuild
index f9a5256fd78b..a1dfa3d1244f 100644
--- a/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.ebuild
+++ b/net-zope/mimetypesregistry/mimetypesregistry-1.3.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/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.ebuild,v 1.1 2004/10/07 21:33:36 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mimetypesregistry/mimetypesregistry-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/mimetypesregistry/mimetypesregistry-1.3.3.ebuild b/net-zope/mimetypesregistry/mimetypesregistry-1.3.3.ebuild
index 73bb06032d0f..639e84990660 100644
--- a/net-zope/mimetypesregistry/mimetypesregistry-1.3.3.ebuild
+++ b/net-zope/mimetypesregistry/mimetypesregistry-1.3.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/net-zope/mimetypesregistry/mimetypesregistry-1.3.3.ebuild,v 1.1 2005/04/15 17:13:59 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mimetypesregistry/mimetypesregistry-1.3.3.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Mimetypes Registry for Archetypes and PortalTransforms used in Plon
 WEBPAGE="http://www.sourceforge.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 SLOT="1.3"
 
diff --git a/net-zope/mpoll/ChangeLog b/net-zope/mpoll/ChangeLog
index b20a39c683fa..7c210f650792 100644
--- a/net-zope/mpoll/ChangeLog
+++ b/net-zope/mpoll/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-zope/mpoll
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/mpoll/ChangeLog,v 1.1 2003/10/11 20:57:47 lanius Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mpoll/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 *mpoll-0.3.1 (11 Oct 2003)
 
diff --git a/net-zope/mpoll/Manifest b/net-zope/mpoll/Manifest
index df02f0d2071c..f2172e11ed37 100644
--- a/net-zope/mpoll/Manifest
+++ b/net-zope/mpoll/Manifest
@@ -1,3 +1,4 @@
-MD5 2b015440a778304c3cf02a0afb962194 mpoll-0.3.1.ebuild 527
+MD5 5d77e2feda53437e171b08dcc1c6e924 ChangeLog 367
+MD5 c5170b6d8421dabbbb7c79ff880e6b19 mpoll-0.3.1.ebuild 529
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 88cc419761694abd4cdc748533802d18 files/digest-mpoll-0.3.1 62
diff --git a/net-zope/mpoll/mpoll-0.3.1.ebuild b/net-zope/mpoll/mpoll-0.3.1.ebuild
index 5936059f5768..58b3cce934f8 100644
--- a/net-zope/mpoll/mpoll-0.3.1.ebuild
+++ b/net-zope/mpoll/mpoll-0.3.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/net-zope/mpoll/mpoll-0.3.1.ebuild,v 1.1 2003/10/11 20:57:47 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mpoll/mpoll-0.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/mymediamanager/ChangeLog b/net-zope/mymediamanager/ChangeLog
index 48db05c5224e..638428ff2f63 100644
--- a/net-zope/mymediamanager/ChangeLog
+++ b/net-zope/mymediamanager/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for net-zope/mymediamanger
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/mymediamanager/ChangeLog,v 1.1 2004/09/25 23:35:56 radek Exp $
+# ChangeLog for net-zope/mymediamanager
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mymediamanager/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> mymediamanager-1.3.1.ebuild:
+  Added to ~ppc.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  27 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
 *mymediamanager-1.3.1 (26 Sep 2004)
 
diff --git a/net-zope/mymediamanager/Manifest b/net-zope/mymediamanager/Manifest
index 93b47301081e..500c327af24b 100644
--- a/net-zope/mymediamanager/Manifest
+++ b/net-zope/mymediamanager/Manifest
@@ -1,4 +1,4 @@
-MD5 d055e8e3f838cfcc4a023df6ba4a22a0 mymediamanager-1.3.1.ebuild 697
-MD5 e650d4a513e7c3642f56ca173fce1814 ChangeLog 320
+MD5 46636156b813396ea52e2072826443d1 ChangeLog 682
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 29efe7fc2411e255b68770810a07a71f mymediamanager-1.3.1.ebuild 816
 MD5 4aced0e5b6c0fbab3a4a30bc14479ab4 files/digest-mymediamanager-1.3.1 72
diff --git a/net-zope/mymediamanager/mymediamanager-1.3.1.ebuild b/net-zope/mymediamanager/mymediamanager-1.3.1.ebuild
index 1508ffc18ea2..8d745ff20ef9 100644
--- a/net-zope/mymediamanager/mymediamanager-1.3.1.ebuild
+++ b/net-zope/mymediamanager/mymediamanager-1.3.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/net-zope/mymediamanager/mymediamanager-1.3.1.ebuild,v 1.1 2004/09/25 23:35:56 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/mymediamanager/mymediamanager-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Zope product for streaming content management."
 HOMEPAGE="http://www.mmmanager.org/"
 SRC_URI="http://zope.org/Members/gittew/MyMediaManager/${PV}/MyMediaManager-1.3-1.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 RDEPEND=">=net-zope/zope-2.6.4
 		>=net-zope/cmf-1.4.2
 		>=net-zope/plone-2.0
diff --git a/net-zope/neoboard/ChangeLog b/net-zope/neoboard/ChangeLog
index fe8a09a838c8..34f0027c4d99 100644
--- a/net-zope/neoboard/ChangeLog
+++ b/net-zope/neoboard/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/neoboard
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/neoboard/ChangeLog,v 1.1 2003/04/07 04:00:22 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/neoboard/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> neoboard-1.1.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kustsuya@gentoo.org> neoboard-1.1.ebuild:
+  ~x86 ~ppc -> x86 ppc
 
 *neoboard-1.1 (06 Apr 2003)
 
diff --git a/net-zope/neoboard/Manifest b/net-zope/neoboard/Manifest
index e69de29bb2d1..0a8099dc9613 100644
--- a/net-zope/neoboard/Manifest
+++ b/net-zope/neoboard/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f78ee4b4954b0893091a2e3074d5e083 neoboard-1.1.ebuild 760
+MD5 7de4506c62f5353a3d3d120f1c933dba ChangeLog 611
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 6ee7c29cdaa177c24908f6efebfe4dc7 files/digest-neoboard-1.1 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBooEzI1lqEGTUzyQRAj/UAJ99xdEu4e6bezplpWRU5vm8ZGW/8gCfXgSz
+AbwfIozyUcBIfstMoseBTaI=
+=2NiQ
+-----END PGP SIGNATURE-----
diff --git a/net-zope/neoboard/files/digest-neoboard-1.1 b/net-zope/neoboard/files/digest-neoboard-1.1
index aabe8c5a7d68..7d07756e12fd 100644
--- a/net-zope/neoboard/files/digest-neoboard-1.1
+++ b/net-zope/neoboard/files/digest-neoboard-1.1
@@ -1,2 +1 @@
-MD5 722e7439b84e3536556560f5cdd9f625 /neoboard-1.1.ebuild 668
 MD5 715a5df04a3e166ed01ab1e58d7ef08a NeoBoard-1.1.tar.gz 149512
diff --git a/net-zope/neoboard/neoboard-1.1.ebuild b/net-zope/neoboard/neoboard-1.1.ebuild
index fb8dad8f6540..d298dec28cc9 100644
--- a/net-zope/neoboard/neoboard-1.1.ebuild
+++ b/net-zope/neoboard/neoboard-1.1.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/neoboard/neoboard-1.1.ebuild,v 1.1 2003/04/07 04:00:22 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/neoboard/neoboard-1.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 P_NEW="NeoBoard-${PV}"
@@ -10,7 +9,7 @@ DESCRIPTION="Threaded message boards w/articles, attachments, & i18n."
 HOMEPAGE="http://www.zoper.net/"
 SRC_URI="${HOMEPAGE}/Downloads/${P_NEW}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 RDEPEND="net-zope/neoportallibrary
 	${RDEPEND}"
 
@@ -26,5 +25,5 @@ pkg_postinst()
 {
 	zproduct_pkg_postinst
 	ewarn "There are three different ways to add this product to your"
-    ewarn "Zope/CMF/Plone site. Please consult the documentation."
+	ewarn "Zope/CMF/Plone site. Please consult the documentation."
 }
diff --git a/net-zope/neoportallibrary/ChangeLog b/net-zope/neoportallibrary/ChangeLog
index abc6a9faa1b8..081465107cf5 100644
--- a/net-zope/neoportallibrary/ChangeLog
+++ b/net-zope/neoportallibrary/ChangeLog
@@ -1,9 +1,19 @@
 # ChangeLog for net-zope/neoportallibrary
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/neoportallibrary/ChangeLog,v 1.1 2003/04/07 03:58:06 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/neoportallibrary/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  23 Nov 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed digest.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  neoportallibrary-0.9b.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kustsuya@gentoo.org>
+  neoportallibrary-0.9b.ebuild: ~x86 ~ppc -> x86 ppc. Added MYDOC variable.
 
 *neoportallibrary-0.9b (06 Apr 2003)
 
-  06 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> neoportallibrary-0.9b.ebuild:
-  Initial import.
+  06 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  neoportallibrary-0.9b.ebuild: Initial import.
 
diff --git a/net-zope/neoportallibrary/Manifest b/net-zope/neoportallibrary/Manifest
index e69de29bb2d1..7b7cac938b71 100644
--- a/net-zope/neoportallibrary/Manifest
+++ b/net-zope/neoportallibrary/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 6085f2de8616604838eea07acfd26695 neoportallibrary-0.9b.ebuild 619
+MD5 6a55e1e71c6bb58bf2fd9e7c3ae5c7ad ChangeLog 689
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 298c7f1614c919e8f367eee6a1cec8b5 files/digest-neoportallibrary-0.9b 73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBooFnI1lqEGTUzyQRAlFrAKCi3PPhlB+sv2m5tCphGInhfLcd1gCeLrba
+La787WM36fEFEQE5JT8HrJ0=
+=7vKO
+-----END PGP SIGNATURE-----
diff --git a/net-zope/neoportallibrary/files/digest-neoportallibrary-0.9b b/net-zope/neoportallibrary/files/digest-neoportallibrary-0.9b
index 04afc3018ce7..280c4e3b650d 100644
--- a/net-zope/neoportallibrary/files/digest-neoportallibrary-0.9b
+++ b/net-zope/neoportallibrary/files/digest-neoportallibrary-0.9b
@@ -1,2 +1 @@
-MD5 cd0b23289b368bfa11c5e07a0fe41a18 /neoportallibrary-0.9b.ebuild 465
 MD5 0835e3741982967ecbb104f00a2f3762 NeoPortalLibrary-0.9b.tar.gz 142949
diff --git a/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild b/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild
index 82af6ad12fd7..878292b18011 100644
--- a/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild
+++ b/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild,v 1.1 2003/04/07 03:58:06 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/neoportallibrary/neoportallibrary-0.9b.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 P_NEW="NeoPortalLibrary-${PV}"
@@ -10,9 +9,10 @@ DESCRIPTION="Collection of modules to build Zope/CMF/Plone products."
 HOMEPAGE="http://www.zoper.net/"
 SRC_URI="${HOMEPAGE}/Downloads/${P_NEW}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="NeoPortalLibrary"
+MYDOC="doc/Developers_Guide.txt ${MYDOC}"
 
 src_unpack()
 {
diff --git a/net-zope/parsedxml/ChangeLog b/net-zope/parsedxml/ChangeLog
index 3d228ed32826..1cda578cf16f 100644
--- a/net-zope/parsedxml/ChangeLog
+++ b/net-zope/parsedxml/ChangeLog
@@ -1,9 +1,39 @@
 # ChangeLog for net-zope/parsedxml
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/parsedxml/ChangeLog,v 1.1 2003/03/25 11:51:26 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/parsedxml/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> parsedxml-1.4.ebuild:
+  added ~amd64
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -parsedxml-1.3.1.ebuild,
+  parsedxml-1.4.ebuild:
+  remove old version
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> parsedxml-1.4.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
+
+*parsedxml-1.4 (28 Sep 2004)
+
+  28 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> +parsedxml-1.4.ebuild:
+  Version bump.
+
+  20 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> parsedxml-1.3.1.ebuild:
+  Adjust RDEPEND from dev-python/PyXML-py21 to dev-python/pyxml-py21.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> parsedxml-1.3.1.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> parsedxml-1.3.1.ebuild:
+  ~ppc -> ppc. Added MYDOC.
 
 *parsedxml-1.3.1 (25 Mar 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> parsedxml-1.3.1.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   25 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> parsedxml-1.3.1.ebuild:
   Initial import. #17594
 
diff --git a/net-zope/parsedxml/Manifest b/net-zope/parsedxml/Manifest
index e69de29bb2d1..bdbbbee48760 100644
--- a/net-zope/parsedxml/Manifest
+++ b/net-zope/parsedxml/Manifest
@@ -0,0 +1,4 @@
+MD5 d6a6d6df81dec6e28af18bafcb01cfc0 parsedxml-1.4.ebuild 546
+MD5 d32b0de96326099f48fce99621807f15 ChangeLog 1383
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 476f79a12465245e6b68d945d12c4e1c files/digest-parsedxml-1.4 62
diff --git a/net-zope/parsedxml/parsedxml-1.4.ebuild b/net-zope/parsedxml/parsedxml-1.4.ebuild
index 80262c6ea115..b2d92f291544 100644
--- a/net-zope/parsedxml/parsedxml-1.4.ebuild
+++ b/net-zope/parsedxml/parsedxml-1.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/net-zope/parsedxml/parsedxml-1.4.ebuild,v 1.1 2004/09/28 15:24:35 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/parsedxml/parsedxml-1.4.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="XML objects for Zope."
 HOMEPAGE="http://www.infrae.com/download/ParsedXML"
 SRC_URI="${HOMEPAGE}/${PV}/ParsedXML-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 RDEPEND=">=dev-python/pyxml-0.8.3
 	${RDEPEND}"
diff --git a/net-zope/photo/ChangeLog b/net-zope/photo/ChangeLog
index f13a702ee12d..293b838995be 100644
--- a/net-zope/photo/ChangeLog
+++ b/net-zope/photo/ChangeLog
@@ -1,9 +1,35 @@
 # ChangeLog for net-zope/photo
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/photo/ChangeLog,v 1.1 2003/04/03 23:54:14 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/photo/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*photo-1.2.4 (28 Aug 2005)
+
+  28 Aug 2005; Radoslaw Stachowiak <radek@gentoo.org> +photo-1.2.4.ebuild:
+  version bump,old url non working.
+
+  07 May 2005; Steve Arnold <nerdboy@gentoo.org> photo-1.2.3.ebuild:
+  keyworded for sparc (decided it was better not to bump)
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> photo-1.2.3.ebuild:
+  fix -py21 dependencie
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> photo-1.2.3.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org> photo-1.2.3.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> photo-1.2.3.ebuild:
+  ~ppc -> ppc. Changed HOMEPAGE and added MYDOC.
 
 *photo-1.2.3 (03 Apr 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> photo-1.2.3.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> photo-1.2.3.ebuild:
   Initial import. #15306
 
diff --git a/net-zope/photo/Manifest b/net-zope/photo/Manifest
index e69de29bb2d1..39a72e5bbc71 100644
--- a/net-zope/photo/Manifest
+++ b/net-zope/photo/Manifest
@@ -0,0 +1,6 @@
+MD5 1dc7ab04c85e610f80481a4dd397d70d photo-1.2.4.ebuild 637
+MD5 8674ff619f0bf9d68ff64d8b4bf5c95c photo-1.2.3.ebuild 621
+MD5 67c2369edca81a30d5d06e6881efd24c ChangeLog 1259
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 1f8827c1b24f9b294695c4b1d323a1f6 files/digest-photo-1.2.3 59
+MD5 1c7dde9268caaacdc9681941e20223bd files/digest-photo-1.2.4 59
diff --git a/net-zope/photo/photo-1.2.3.ebuild b/net-zope/photo/photo-1.2.3.ebuild
index 8f8b77eae433..d3f1e5641e36 100644
--- a/net-zope/photo/photo-1.2.3.ebuild
+++ b/net-zope/photo/photo-1.2.3.ebuild
@@ -1,19 +1,20 @@
-# Copyright 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/net-zope/photo/photo-1.2.3.ebuild,v 1.1 2003/04/03 23:12:51 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/photo/photo-1.2.3.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
 DESCRIPTION="Zope product for managing photos and photo albums"
 
-HOMEPAGE="http://sourceforge.net/projects/zopephoto/"
+HOMEPAGE="http://www.zope.org/Members/rbickers/Photo"
 SRC_URI="mirror://sourceforge/zopephoto/Photo-${PV}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
-RDEPEND="dev-python/Imaging-py21
+KEYWORDS="x86 ~ppc ~sparc"
+RDEPEND="dev-python/imaging
 	media-gfx/imagemagick
 	${RDEPEND}"
 
 ZPROD_LIST="Photo"
- 
+MYDOC="FAQ.txt THANKS.txt UPGRADE.txt DEPENDENCIES.txt ${MYDOC}"
+IUSE=""
diff --git a/net-zope/photo/photo-1.2.4.ebuild b/net-zope/photo/photo-1.2.4.ebuild
index 1eab1b62ea1c..b1083d5944ca 100644
--- a/net-zope/photo/photo-1.2.4.ebuild
+++ b/net-zope/photo/photo-1.2.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/net-zope/photo/photo-1.2.4.ebuild,v 1.1 2005/08/28 13:10:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/photo/photo-1.2.4.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/placelesstranslationservice-fork/ChangeLog b/net-zope/placelesstranslationservice-fork/ChangeLog
index e3d678e98d14..13ddd7243e7a 100644
--- a/net-zope/placelesstranslationservice-fork/ChangeLog
+++ b/net-zope/placelesstranslationservice-fork/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for net-zope/placelesstranslationservice-fork
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice-fork/ChangeLog,v 1.1 2004/03/26 22:52:07 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice-fork/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  placelesstranslationservice-fork-1.0_rc7.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org>
+  placelesstranslationservice-fork-1.0_rc7.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  placelesstranslationservice-fork-1.0_rc7.ebuild:
+  marked stable
+
+*placelesstranslationservice-fork-1.0_rc7 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  placelesstranslationservice-fork-1.0_rc3.ebuild,
+  +placelesstranslationservice-fork-1.0_rc7.ebuild:
+  version bump, added IUSE
+
+  27 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  placelesstranslationservice-fork-1.0_rc3.ebuild:
+  added to ~ppc
 
 *placelesstranslationservice-fork-1.0_rc3 (26 Mar 2004)
 
diff --git a/net-zope/placelesstranslationservice-fork/Manifest b/net-zope/placelesstranslationservice-fork/Manifest
index 1adfab6b9fd3..099524edac4c 100644
--- a/net-zope/placelesstranslationservice-fork/Manifest
+++ b/net-zope/placelesstranslationservice-fork/Manifest
@@ -1,3 +1,6 @@
-MD5 ecda50e88457b513115f049459090ec7 placelesstranslationservice-fork-1.0_rc3.ebuild 607
+MD5 45fa6eba12792acfb49307f2c8b815f6 ChangeLog 1161
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 52c05d77c43bff4b01ae9bb8a7459a3e placelesstranslationservice-fork-1.0_rc3.ebuild 616
+MD5 cacedce58e1f8ea37bf1301e29554468 placelesstranslationservice-fork-1.0_rc7.ebuild 626
 MD5 0fec3c276b4226c175be71cd8a28e065 files/digest-placelesstranslationservice-fork-1.0_rc3 90
+MD5 b4057c71ffaba5dabfadbc92cb1ecafd files/digest-placelesstranslationservice-fork-1.0_rc7 90
diff --git a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild
index afc0bc2d9141..c15f710665e0 100644
--- a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild
+++ b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.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/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild,v 1.1 2004/03/26 22:52:07 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc3.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,6 +10,7 @@ DESCRIPTION="Translation service based on potfiles in the filesystem. (forked ve
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/PlacelessTranslationService-${MY_P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 
 ZPROD_LIST="PlacelessTranslationService"
diff --git a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild
index 937a5c2ad4a5..94e70e6e8dfa 100644
--- a/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild
+++ b/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.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/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild,v 1.1 2004/07/27 19:38:05 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice-fork/placelesstranslationservice-fork-1.0_rc7.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Translation service based on potfiles in the filesystem. (forked ve
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/PlacelessTranslationService-${MY_P}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE=""
 
 ZPROD_LIST="PlacelessTranslationService"
diff --git a/net-zope/placelesstranslationservice/ChangeLog b/net-zope/placelesstranslationservice/ChangeLog
index 7203319ec4b8..278883db7355 100644
--- a/net-zope/placelesstranslationservice/ChangeLog
+++ b/net-zope/placelesstranslationservice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/placelesstranslationservice
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice/ChangeLog,v 1.1 2004/01/22 15:09:54 lanius Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  03 Sep 2004; David Holm <dholm@gentoo.org>
+  placelesstranslationservice-1.0_beta3.ebuild:
+  Added to ~ppc.
 
 *placelesstranslationservice-1.0_beta3 (22 Jan 2004)
 
diff --git a/net-zope/placelesstranslationservice/Manifest b/net-zope/placelesstranslationservice/Manifest
index caacec6805bb..d29e753719f7 100644
--- a/net-zope/placelesstranslationservice/Manifest
+++ b/net-zope/placelesstranslationservice/Manifest
@@ -1,2 +1,4 @@
-MD5 0dc47ec027b4600b577a0b68497551ab placelesstranslationservice-1.0_beta3.ebuild 572
+MD5 3033f1a23a45e19ca4e8fcbb5a007dfa placelesstranslationservice-1.0_beta3.ebuild 584
+MD5 4dc42967cecea0aa06c8075f4ac20e51 ChangeLog 551
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 54475386dd0256752519b24e611d70bd files/digest-placelesstranslationservice-1.0_beta3 93
diff --git a/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild b/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild
index 66692476d677..5b5787bf464e 100644
--- a/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild
+++ b/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.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/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild,v 1.1 2004/01/22 15:09:54 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/placelesstranslationservice/placelesstranslationservice-1.0_beta3.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,6 +10,6 @@ DESCRIPTION="Translation service based on potfiles in the filesystem."
 HOMEPAGE="http://sf.net/projects/collective"
 SRC_URI="mirror://sourceforge/collective/PlacelessTranslationService-${MY_P}.tar.bz2"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 ZPROD_LIST="PlacelessTranslationService"
diff --git a/net-zope/plone/ChangeLog b/net-zope/plone/ChangeLog
index b53551bb5d1b..808306799aa6 100644
--- a/net-zope/plone/ChangeLog
+++ b/net-zope/plone/ChangeLog
@@ -1,9 +1,122 @@
-# ChangeLog for net-www/plone
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/ChangeLog,v 1.1 2003/03/03 23:07:06 kutsuya Exp $
+# ChangeLog for net-zope/plone
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+  14 Nov 2005; Seemant Kulleen <seemant@gentoo.org> plone-2.0.4.ebuild:
+  keywording for amd64 testing
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org> plone-2.0.4.ebuild,
+  plone-2.0.5.ebuild, plone-2.0.5-r1.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+  25 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> plone-2.0.5-r1.ebuild:
+  fixed formulator dependency after reply from infrae.com
+
+*plone-2.0.5-r1 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +plone-2.0.5-r1.ebuild:
+  fixes bug #88149
+  It should still be checked with AT1.3.2 and GRUF3.*
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> plone-2.0.5.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> plone-2.0.5.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  05 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org> +plone-2.0.5.ebuild:
+  New version released, almost no changes in ebuild except
+  for strict python2.3.4 dependency.
+
+  20 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> plone-2.0.4.ebuild:
+  Added zope-config dependency to fix bug #68180.
+
+  18 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> -plone-2.0.3.ebuild:
+  cleaning unneeded ebuilds.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; plone-2.0.4.ebuild:
+  marked as stable on x86 and ppc.
+
+*plone-2.0.4 (12 Sep 2004)
+
+  12 Sep 2004; Heinrich Wendel <lanius@gentoo.org> +plone-2.0.4.ebuild:
+  version bump
+
+*plone-2.0.3 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; -plone-1.0.3.ebuild,
+  -plone-2.0.0_rc3.ebuild, +plone-2.0.3.ebuild:
+  version bump, removed old ebuild, added IUSE
+
+*plone-1.0.6 (25 Jul 2004)
+
+  25 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; plone-1.0.3.ebuild,
+  plone-1.0.5.ebuild, +plone-1.0.6.ebuild, plone-2.0.0_rc3.ebuild,
+  plone-2.0.ebuild:
+  added IUSE
+
+*plone-1.0.6 (25 Jul 2004)
+
+  25 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; +plone-1.0.6.ebuild:
+  version bump
+
+*plone-2.0 (27 Mar 2004)
+
+  27 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>; plone-2.0.ebuild:
+  version bump
+
+  16 Mar 2004; David Holm <dholm@gentoo.org> plone-1.0.5.ebuild:
+  Added to ~ppc.
+
+  13 Mar 2004; David Holm <dholm@gentoo.org> plone-2.0.0_rc3.ebuild:
+  Added to ~ppc.
+
+*plone-2.0.0_rc3 (27 Jan 2004)
+
+  27 Jan 2004; Heinrich Wendel <lanius@gentoo.org> plone-1.0.1-r1.ebuild,
+  plone-1.0.2.ebuild, plone-1.0.4.ebuild, plone-1.0.5.ebuild,
+  plone-2.0.0_rc3.ebuild:
+  remove old versions; mark 1.0.5 stable on x86, fix keywords
+
+*plone-2.0.0_rc3 (27 Jan 2004)
+
+  27 Jan 2004; Heinrich Wendel <lanius@gentoo.org> plone-2.0.0_rc3.ebuild:
+  version bump
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> plone-1.0.1-r1.ebuild,
+  plone-1.0.2.ebuild, plone-1.0.3.ebuild, plone-1.0.4.ebuild,
+  plone-1.0.5.ebuild:
+  remove obsolete message
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> plone-1.0.2.ebuild,
+  plone-1.0.3.ebuild, plone-1.0.4.ebuild, plone-1.0.5.ebuild:
+  fix net-zope/cmf dependancies
+
+*plone-1.0.5 (10 Oct 2003)
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> plone-1.0.4.ebuild,
+  plone-1.0.5.ebuild:
+  version bump
+
+*plone-1.0.3 (21 Jun 2003)
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> plone-1.0.3.ebuild:
+  Version bump.
+
+*plone-1.0.2 (21 Jun 2003)
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> plone-1.0.2.ebuild:
+  Version bump. Masked all archs to unstable.
+
+  21 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> plone-1.0.1-r1.ebuild:
+  ~ppc -> ppc. Give a warning about not using this with >cmf-1.3.1.
 
 *plone-1.0.1-r1 (18 Feb 2003)
 
+  04 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> plone-1.0.1-r1.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to 
   net-zope. Removed localizer and translationservice as dependencies.
 
diff --git a/net-zope/plone/Manifest b/net-zope/plone/Manifest
index e69de29bb2d1..203ac7304d76 100644
--- a/net-zope/plone/Manifest
+++ b/net-zope/plone/Manifest
@@ -0,0 +1,14 @@
+MD5 28d9222ebc354090445fbe3d7a2d7487 ChangeLog 4383
+MD5 9e35feee29aeb8a7ecb18106d3378df0 files/digest-plone-1.0.5 66
+MD5 16d7a68ca1aee9115817c3a98c410fd0 files/digest-plone-1.0.6 63
+MD5 069f9e1bb877e5e659d3f3c8b37bce38 files/digest-plone-2.0 71
+MD5 4a7478c84170f5e7bcf8a00a6f13576f files/digest-plone-2.0.4 67
+MD5 a7677837a9758dbd21316659b0f03dc5 files/digest-plone-2.0.5 67
+MD5 a7677837a9758dbd21316659b0f03dc5 files/digest-plone-2.0.5-r1 67
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 72796f7938457a98137f4c611896145e plone-1.0.5.ebuild 856
+MD5 53f432ea4742b88abd9a858322a34965 plone-1.0.6.ebuild 855
+MD5 1b5715e2a3f7fe16cd8767b1b7332f27 plone-2.0.4.ebuild 1015
+MD5 60ce279e22850e598f24e4010f21329c plone-2.0.5-r1.ebuild 1049
+MD5 bc2ba4471a666e7ff324f57c0b299151 plone-2.0.5.ebuild 1048
+MD5 2d1a94dd580e3db9261603947d4d172e plone-2.0.ebuild 950
diff --git a/net-zope/plone/plone-1.0.5.ebuild b/net-zope/plone/plone-1.0.5.ebuild
index b343bbca2277..573fdd13b9e3 100644
--- a/net-zope/plone/plone-1.0.5.ebuild
+++ b/net-zope/plone/plone-1.0.5.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/net-zope/plone/plone-1.0.5.ebuild,v 1.1 2003/10/10 21:19:47 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 S="${WORKDIR}/CMFPlone-${PV}"
@@ -9,8 +9,9 @@ DESCRIPTION="A Zope Content Management System, based on Zope CMF."
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/CMFPlone${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-RDEPEND="=net-zope/cmf-1.3.1*
+KEYWORDS="x86 ~ppc"
+IUSE=""
+RDEPEND="=net-zope/cmf-1.3*
 	>=net-zope/formulator-1.2.0
 	${RDEPEND}"
 
@@ -29,5 +30,4 @@ pkg_postinst()
 {
 	zproduct_pkg_postinst
 	einfo "---> NOTE: i18n folder location: ${ZP_DIR}/${PF}"
-	ewarn "Using >net-zope/cmf-1.3.1 will break this product."
 }
diff --git a/net-zope/plone/plone-1.0.6.ebuild b/net-zope/plone/plone-1.0.6.ebuild
index d721c6ab19a0..bfc2f0648c60 100644
--- a/net-zope/plone/plone-1.0.6.ebuild
+++ b/net-zope/plone/plone-1.0.6.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/net-zope/plone/plone-1.0.6.ebuild,v 1.1 2004/07/24 22:56:26 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-1.0.6.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 S="${WORKDIR}/CMFPlone-${PV}"
diff --git a/net-zope/plone/plone-2.0.4.ebuild b/net-zope/plone/plone-2.0.4.ebuild
index 3bcd1c1051a1..e521d8a6e762 100644
--- a/net-zope/plone/plone-2.0.4.ebuild
+++ b/net-zope/plone/plone-2.0.4.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/net-zope/plone/plone-2.0.4.ebuild,v 1.1 2004/09/11 22:34:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 SLOT="2.0"
 
@@ -10,10 +10,10 @@ DESCRIPTION="A Zope Content Management System, based on Zope CMF."
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 RDEPEND=">=net-zope/cmf-1.4.7
-	>=net-zope/zope-2.7*
+	>=net-zope/zope-2.7
 	>=net-zope/btreefolder2-1.0.1
 	>=net-zope/cmfactionicons-0.9
 	>=net-zope/cmfformcontroller-1.0.2
@@ -27,6 +27,7 @@ RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/portaltransforms-1.0.4
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
+	>=app-admin/zope-config-0.4
 	${RDEPEND}"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.5-r1.ebuild b/net-zope/plone/plone-2.0.5-r1.ebuild
index d3a56bd7cd9e..32ffeb1d21c0 100644
--- a/net-zope/plone/plone-2.0.5-r1.ebuild
+++ b/net-zope/plone/plone-2.0.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/net-zope/plone/plone-2.0.5-r1.ebuild,v 1.1 2005/04/15 16:27:55 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 SLOT="2.0"
 
@@ -10,7 +10,7 @@ DESCRIPTION="A Zope Content Management System, based on Zope CMF."
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 RDEPEND="=net-zope/cmf-1.4*
 	=net-zope/zope-2.7*
@@ -18,7 +18,7 @@ RDEPEND="=net-zope/cmf-1.4*
 	>=net-zope/cmfactionicons-0.9
 	>=net-zope/cmfformcontroller-1.0.2
 	>=net-zope/cmfquickinstallertool-1.5.0
-	=net-zope/formulator-1.6*
+	>=net-zope/formulator-1.6.2
 	>=net-zope/groupuserfolder-2.0.1
 	>=net-zope/placelesstranslationservice-fork-1.0_rc7
 	>=net-zope/ploneerrorreporting-0.11
@@ -28,7 +28,7 @@ RDEPEND="=net-zope/cmf-1.4*
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
 	>=app-admin/zope-config-0.5
-	>=dev-lang/python-2.3*
+	>=dev-lang/python-2.3
 	${RDEPEND}"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.5.ebuild b/net-zope/plone/plone-2.0.5.ebuild
index cdaf63496ee8..d1c692aaf3e7 100644
--- a/net-zope/plone/plone-2.0.5.ebuild
+++ b/net-zope/plone/plone-2.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/net-zope/plone/plone-2.0.5.ebuild,v 1.1 2004/12/05 16:54:58 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 SLOT="2.0"
 
@@ -10,10 +10,10 @@ DESCRIPTION="A Zope Content Management System, based on Zope CMF."
 HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 RDEPEND=">=net-zope/cmf-1.4.7
-	>=net-zope/zope-2.7*
+	>=net-zope/zope-2.7
 	>=net-zope/btreefolder2-1.0.1
 	>=net-zope/cmfactionicons-0.9
 	>=net-zope/cmfformcontroller-1.0.2
@@ -28,7 +28,7 @@ RDEPEND=">=net-zope/cmf-1.4.7
 	>=net-zope/externaleditor-0.8
 	>=net-zope/epoz-0.8.2
 	>=app-admin/zope-config-0.5
-	>=dev-lang/python-2.3*
+	>=dev-lang/python-2.3
 	${RDEPEND}"
 
 ZPROD_LIST="CMFPlone"
diff --git a/net-zope/plone/plone-2.0.ebuild b/net-zope/plone/plone-2.0.ebuild
index 8b2cbc7562d9..36151cf15a5d 100644
--- a/net-zope/plone/plone-2.0.ebuild
+++ b/net-zope/plone/plone-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/net-zope/plone/plone-2.0.ebuild,v 1.1 2004/03/27 00:09:24 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plone/plone-2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 SLOT="2.0"
 
@@ -11,6 +11,7 @@ HOMEPAGE="http://plone.org"
 SRC_URI="mirror://sourceforge/plone/PloneBase-2.0-final.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86"
+IUSE=""
 RDEPEND=">=net-zope/cmf-1.4.2
 	>=net-zope/btreefolder2-1.0
 	>=net-zope/cmfactionicons-0.9
diff --git a/net-zope/plonecollectorng/ChangeLog b/net-zope/plonecollectorng/ChangeLog
index db5a128019f8..c9ffe1c18908 100644
--- a/net-zope/plonecollectorng/ChangeLog
+++ b/net-zope/plonecollectorng/ChangeLog
@@ -1,6 +1,25 @@
-# ChangeLog for net-zope/plonetranslations
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/ChangeLog,v 1.1 2004/07/27 20:43:50 batlogg Exp $
+# ChangeLog for net-zope/plonecollectorng
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+  06 May 2005; Sven Wegener <swegener@gentoo.org>
+  plonecollectorng-1.2.6.ebuild:
+  Removed * postfix from <, <=, >= and > dependencies.
+
+*plonecollectorng-1.2.6 (17 Feb 2005)
+
+  17 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +plonecollectorng-1.2.6.ebuild:
+  version bump.
+
+*plonecollectorng-1.2.2 (13 Sep 2004)
+
+  13 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  plonecollectorng-1.2.2.ebuild, +plonecollectorng-1.2.3.ebuild:
+  version bump, fixed masked deps
+
+  05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
+  Fixed ChangeLog header.
 
   27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; :
   oh! a new ebuild
diff --git a/net-zope/plonecollectorng/Manifest b/net-zope/plonecollectorng/Manifest
index d27580bab613..eb3357cbf113 100644
--- a/net-zope/plonecollectorng/Manifest
+++ b/net-zope/plonecollectorng/Manifest
@@ -1,4 +1,18 @@
-MD5 6ba4c3ec9d3f94aebf82962d450982ce plonecollectorng-1.2.2.ebuild 623
-MD5 9c7d1345ca4fe7af475a2c607ae09d53 ChangeLog 227
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 456ab907885bf14dc10844d1a5d71a3e plonecollectorng-1.2.6.ebuild 694
+MD5 a6d86e729ad7d53469275a1a9b4694fd plonecollectorng-1.2.3.ebuild 699
+MD5 006c82632d95cd60403a79be68452f8b plonecollectorng-1.2.2.ebuild 699
+MD5 ef268ebf5fcb3c9772f5704e496e26fb ChangeLog 850
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 683d8faeaa24514bd79856b6b525d684 files/digest-plonecollectorng-1.2.2 74
+MD5 54b62f0b3423589a29af97f1710fe416 files/digest-plonecollectorng-1.2.3 74
+MD5 8b0d63ad9f44cf392056e1165204fa2e files/digest-plonecollectorng-1.2.6 74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCe4WxI1lqEGTUzyQRAo3aAJ0QPO0lqRAJCMY5EMgcCq0flCyrSwCfeA/P
+dN67qEC5moyf3pri7/ibvL4=
+=XlWF
+-----END PGP SIGNATURE-----
diff --git a/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild b/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild
index 5d3eeedc452e..b8176e7fc55f 100644
--- a/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild
+++ b/net-zope/plonecollectorng/plonecollectorng-1.2.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/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild,v 1.1 2004/07/27 20:43:50 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/plonecollectorng-1.2.2.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,6 +11,6 @@ LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 RDEPEND=">=net-zope/plone-2.0.3
-		>=net-zope/archetypes-1.3.0_beta3
+		>=net-zope/archetypes-1.3.0_rc2
 		${RDEPEND}"
 ZPROD_LIST="PloneCollectorNG"
diff --git a/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild b/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild
index 2b65dde14bb8..d3406caa673e 100644
--- a/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild
+++ b/net-zope/plonecollectorng/plonecollectorng-1.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/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild,v 1.1 2004/09/12 22:10:27 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/plonecollectorng-1.2.3.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild b/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild
index cc04abd4469e..4ea5a57485ad 100644
--- a/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild
+++ b/net-zope/plonecollectorng/plonecollectorng-1.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/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild,v 1.1 2005/02/17 14:22:19 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonecollectorng/plonecollectorng-1.2.6.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/collective/PloneCollectorNG-${PV}.tar.gz"
 LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-RDEPEND=">=net-zope/plone-2.0*
-		>=net-zope/archetypes-1.3*
+RDEPEND=">=net-zope/plone-2.0
+		>=net-zope/archetypes-1.3
 		${RDEPEND}"
 ZPROD_LIST="PloneCollectorNG"
diff --git a/net-zope/ploneerrorreporting/ChangeLog b/net-zope/ploneerrorreporting/ChangeLog
index 5cd1c15def53..7db840860b46 100644
--- a/net-zope/ploneerrorreporting/ChangeLog
+++ b/net-zope/ploneerrorreporting/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-zope/ploneerrorreporting
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/ploneerrorreporting/ChangeLog,v 1.1 2004/03/26 23:09:38 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ploneerrorreporting/ChangeLog,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  ploneerrorreporting-0.11.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org>
+  ploneerrorreporting-0.11.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  ploneerrorreporting-0.11.ebuild:
+  marked as stable on x86 and ppc
+
+*ploneerrorreporting-0.11 (12 Sep 2004)
+
+  12 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  ploneerrorreporting-0.1.ebuild, +ploneerrorreporting-0.11.ebuild:
+  version bump
 
 *ploneerrorreporting-0.1 (27 Mar 2004)
 
diff --git a/net-zope/ploneerrorreporting/Manifest b/net-zope/ploneerrorreporting/Manifest
index f93bf0eca189..786bfe8b4636 100644
--- a/net-zope/ploneerrorreporting/Manifest
+++ b/net-zope/ploneerrorreporting/Manifest
@@ -1,2 +1,6 @@
-MD5 4ce9b6ac7962ca084fedec33dc143f8b ploneerrorreporting-0.1.ebuild 591
+MD5 599774c24d53b7a50bab1cda0aa58f53 ChangeLog 889
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 8c04494e1d5778f0fb608723a87a5dfe ploneerrorreporting-0.1.ebuild 594
+MD5 85c4de59275bcb497b142b5cf0377ecd ploneerrorreporting-0.11.ebuild 606
 MD5 5572015a80c9667ba20f348cb9c6d0b8 files/digest-ploneerrorreporting-0.1 73
+MD5 7cf7cda4fadf9bb72f5213f849cfd683 files/digest-ploneerrorreporting-0.11 75
diff --git a/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild b/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild
index c6e396706b4d..a19ffc2d533e 100644
--- a/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild
+++ b/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.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/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild,v 1.1 2004/03/26 23:09:38 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ploneerrorreporting/ploneerrorreporting-0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,3 +11,4 @@ LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 
 ZPROD_LIST="PloneErrorReporting"
+IUSE=""
diff --git a/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild b/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild
index 007aee0d32f5..1bc2b8381d40 100644
--- a/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild
+++ b/net-zope/ploneerrorreporting/ploneerrorreporting-0.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/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild,v 1.1 2004/09/11 22:08:25 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ploneerrorreporting/ploneerrorreporting-0.11.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="PloneErrorReporting replaces error messages with pages that facilit
 HOMEPAGE="http://www.sourceforge.net/projects/collective/"
 SRC_URI="mirror://sourceforge/collective/PloneErrorReporting-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 ZPROD_LIST="PloneErrorReporting"
 IUSE=""
diff --git a/net-zope/plonelanguagetool/ChangeLog b/net-zope/plonelanguagetool/ChangeLog
index 7542e7e24ce9..31611dd11b50 100644
--- a/net-zope/plonelanguagetool/ChangeLog
+++ b/net-zope/plonelanguagetool/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-zope/plonelanguagetool
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plonelanguagetool/ChangeLog,v 1.1 2005/04/19 17:14:12 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonelanguagetool/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 *plonelanguagetool-0.5 (19 Apr 2005)
 
diff --git a/net-zope/plonelanguagetool/Manifest b/net-zope/plonelanguagetool/Manifest
index 170758631d24..2693331eab4d 100644
--- a/net-zope/plonelanguagetool/Manifest
+++ b/net-zope/plonelanguagetool/Manifest
@@ -1,2 +1,4 @@
-MD5 e130be2f2e58df1307a248d15fe321de plonelanguagetool-0.5.ebuild 571
+MD5 c5f812208e6e39dca941ec4131076dbb plonelanguagetool-0.5.ebuild 571
+MD5 1d773e49d24e3e08f9aa9c7d653485a0 ChangeLog 421
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 c87b4466896282d626f0404462194bdb files/digest-plonelanguagetool-0.5 72
diff --git a/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild b/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild
index 3529e5c64233..f0bd8b3795c6 100644
--- a/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild
+++ b/net-zope/plonelanguagetool/plonelanguagetool-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/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild,v 1.1 2005/04/19 17:14:12 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonelanguagetool/plonelanguagetool-0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/plonepopoll/ChangeLog b/net-zope/plonepopoll/ChangeLog
index c616181604b7..0abdbe165b3b 100644
--- a/net-zope/plonepopoll/ChangeLog
+++ b/net-zope/plonepopoll/ChangeLog
@@ -1,10 +1,13 @@
 # ChangeLog for net-zope/plonepopoll
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plonepopoll/ChangeLog,v 1.1 2005/04/19 17:30:49 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonepopoll/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
+  Converted to UTF-8, fixed encoding screwups
 
 *plonepopoll-2.3 (19 Apr 2005)
 
   19 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> +metadata.xml,
   +plonepopoll-2.3.ebuild:
-  initial release thanks to Bj�rn Michaelsen <bmichaelsen@gmx.de>, closes #89133
+  initial release thanks to Björn Michaelsen <bmichaelsen@gmx.de>, closes #89133
 
diff --git a/net-zope/plonepopoll/Manifest b/net-zope/plonepopoll/Manifest
index 74c8cd0c84a3..c3d1f7782361 100644
--- a/net-zope/plonepopoll/Manifest
+++ b/net-zope/plonepopoll/Manifest
@@ -1,4 +1,14 @@
-MD5 f621bc23fd026a71a13c868c58842c38 ChangeLog 331
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a8c3e1673c6fbabc22c12c42a59a2ebf plonepopoll-2.3.ebuild 556
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 f9bb0e5a435c5677c3e47fb42eb10141 plonepopoll-2.3.ebuild 459
+MD5 d17c41e6aa33098f91569e2fafeee8e6 ChangeLog 535
 MD5 91d89c89beed872376f70a486c4b4875 files/digest-plonepopoll-2.3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDK2JKLLFUmVNQ7rkRAg9vAKCHR9qZKrMbeBzGoM+dLmdyURvGTwCfVIoy
+f0eWMfEYfe4fgsCwOfI6cP0=
+=u0Ny
+-----END PGP SIGNATURE-----
diff --git a/net-zope/plonepopoll/plonepopoll-2.3.ebuild b/net-zope/plonepopoll/plonepopoll-2.3.ebuild
index 0cd0efab6159..08b682bb0e87 100644
--- a/net-zope/plonepopoll/plonepopoll-2.3.ebuild
+++ b/net-zope/plonepopoll/plonepopoll-2.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/net-zope/plonepopoll/plonepopoll-2.3.ebuild,v 1.1 2005/04/19 17:30:49 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonepopoll/plonepopoll-2.3.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -15,7 +15,6 @@ SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
 
-DEPEND=""
 DEPEND=">=net-zope/plone-2.0"
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/plonetranslations/ChangeLog b/net-zope/plonetranslations/ChangeLog
index 7b8278b32bad..035e2c74b543 100644
--- a/net-zope/plonetranslations/ChangeLog
+++ b/net-zope/plonetranslations/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for net-zope/plonetranslations
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/plonetranslations/ChangeLog,v 1.1 2004/03/26 23:19:08 batlogg Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonetranslations/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  plonetranslations-0.5.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> plonetranslations-0.5.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  plonetranslations-0.5.ebuild:
+  marked stable
+
+*plonetranslations-0.5 (12 Sep 2004)
+
+  12 Sep 2004; Heinrich Wendel <lanius@gentoo.org>
+  plonetranslations-0.1.ebuild, +plonetranslations-0.5.ebuild:
+  version bump
 
 *plonetranslations-0.1 (27 Mar 2004)
 
diff --git a/net-zope/plonetranslations/Manifest b/net-zope/plonetranslations/Manifest
index 5fd8bd47f3d0..4f3be93ea3a7 100644
--- a/net-zope/plonetranslations/Manifest
+++ b/net-zope/plonetranslations/Manifest
@@ -1,2 +1,6 @@
-MD5 42ccd8fa251f65e098e2755a860d53e0 plonetranslations-0.1.ebuild 597
+MD5 6317589b56422a1595ca197e9e2c4f97 ChangeLog 858
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 bd6135d7fce8b9a3e20f52fc03935c40 plonetranslations-0.1.ebuild 600
+MD5 e73fdd1eb2585c7f954ad4aad42118d9 plonetranslations-0.5.ebuild 611
 MD5 b73e4c58400d07235c13d66bcd35355f files/digest-plonetranslations-0.1 74
+MD5 05a8c2c5aee1e5646e8d23e9daaba1f7 files/digest-plonetranslations-0.5 74
diff --git a/net-zope/plonetranslations/plonetranslations-0.1.ebuild b/net-zope/plonetranslations/plonetranslations-0.1.ebuild
index 2b4fbe86bee6..cbcf8888ba40 100644
--- a/net-zope/plonetranslations/plonetranslations-0.1.ebuild
+++ b/net-zope/plonetranslations/plonetranslations-0.1.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/net-zope/plonetranslations/plonetranslations-0.1.ebuild,v 1.1 2004/03/26 23:19:08 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonetranslations/plonetranslations-0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,3 +11,4 @@ LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 
 ZPROD_LIST="PloneTranslations"
+IUSE=""
diff --git a/net-zope/plonetranslations/plonetranslations-0.5.ebuild b/net-zope/plonetranslations/plonetranslations-0.5.ebuild
index a3cb48b0f6f3..6d8d146a7b77 100644
--- a/net-zope/plonetranslations/plonetranslations-0.5.ebuild
+++ b/net-zope/plonetranslations/plonetranslations-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/net-zope/plonetranslations/plonetranslations-0.5.ebuild,v 1.1 2004/09/11 22:32:33 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/plonetranslations/plonetranslations-0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="This product contains the .po files for CMFPlone. PlacelessTranslat
 HOMEPAGE="http://www.sourceforge.net/projects/plone-i18n/"
 SRC_URI="mirror://sourceforge/plone-i18n/PloneTranslations-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 
 ZPROD_LIST="PloneTranslations"
 IUSE=""
diff --git a/net-zope/portaltransforms/ChangeLog b/net-zope/portaltransforms/ChangeLog
index 471517b3c78a..b9dd049ce34f 100644
--- a/net-zope/portaltransforms/ChangeLog
+++ b/net-zope/portaltransforms/ChangeLog
@@ -1,6 +1,91 @@
 # ChangeLog for net-zope/portaltransforms
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/ChangeLog,v 1.1 2003/10/11 08:23:32 robbat2 Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org>
+  portaltransforms-1.3.3.ebuild:
+  added ~amd64 keyword
+
+  08 May 2005; Jason Wever <weeve@gentoo.org> portaltransforms-1.3.3.ebuild:
+  Added ~sparc keyword as it was accidentily dropped in the version bump.
+
+*portaltransforms-1.3.3 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +portaltransforms-1.3.3.ebuild:
+  version bump for AT-1.3.2
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org>
+  portaltransforms-1.3.2.7.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org>
+  portaltransforms-1.3.2.7.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+  15 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
+  portaltransforms-1.0.3.ebuild, portaltransforms-1.0.4.ebuild,
+  portaltransforms-1.3.2.ebuild, portaltransforms-1.3.2.7.ebuild:
+  Dependency update: net-www/lynx -> www-client/lynx.
+
+*portaltransforms-1.3.2.7 (04 Dec 2004)
+
+  04 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +portaltransforms-1.3.2.7.ebuild:
+  New release from archetypes-1.3.1 tree.
+
+  08 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  portaltransforms-1.0.4.ebuild:
+  Fixed bug with missing tool.gif.
+
+*portaltransforms-1.3.2 (07 Oct 2004)
+
+  07 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +portaltransforms-1.3.2.ebuild:
+  New slotted (1.3) release for Archetypes-1.3
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  portaltransforms-1.0.4.ebuild:
+  marked as stable on x86 and ppc
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  portaltransforms-1.0.4.ebuild:
+  marked stable
+
+*portaltransforms-1.0.4 (27 Jul 2004)
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  -portaltransforms-1.0.2-r1.ebuild, -portaltransforms-1.0.2.ebuild,
+  +portaltransforms-1.0.4.ebuild, -portaltransforms-1.0_alpha3.ebuild:
+  version bump, removed old ebuilds, added IUSE
+
+  27 Mar 2004; David Holm <dholm@gentoo.org> portaltransforms-1.0.3.ebuild:
+  Added to ~ppc.
+
+  27 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  portaltransforms-1.0_alpha3.ebuild:
+  corrected copyright (repoman)
+
+*portaltransforms-1.0.3 (27 Mar 2004)
+
+  27 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>;
+  portaltransforms-1.0.3.ebuild:
+  version bump
+
+*portaltransforms-1.0.2-r1 (29 Jan 2004)
+
+  29 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  portaltransforms-1.0.2-r1.ebuild:
+  fixed bug #39748, some required files weren't installed
+
+*portaltransforms-1.0.2 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org>
+  portaltransforms-1.0.2.ebuild:
+  version bump
+
+  11 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> metadata.xml:
+  add metadata.xml
 
 *portaltransforms-1.0_alpha3 (11 Oct 2003)
 
diff --git a/net-zope/portaltransforms/Manifest b/net-zope/portaltransforms/Manifest
index ecc0dff149b0..3ea52435d24f 100644
--- a/net-zope/portaltransforms/Manifest
+++ b/net-zope/portaltransforms/Manifest
@@ -1,3 +1,12 @@
-MD5 581ff7f570fd9b992cd64962fea939d5 portaltransforms-1.0_alpha3.ebuild 446
-MD5 4f70f86914b7a3d0acd7782ead75bf24 files/digest-portaltransforms-1.0_alpha2 75
-MD5 da5716a7aedd8c22d1d5a4a69cc809d8 files/digest-portaltransforms-1.0_alpha3 74
+MD5 c743c092ea8d77753322f3acddff08cf ChangeLog 3064
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 8be1fbd49c731c53dc9c3c7a7293c6ea portaltransforms-1.0.3.ebuild 1116
+MD5 74f07b7f3f88125ffdef2fbac9c76b7f portaltransforms-1.0.4.ebuild 1154
+MD5 888e9d492a60e057df7a425f4dc7ce9f portaltransforms-1.3.2.7.ebuild 845
+MD5 cbcc07c1285c528c32df2a81474e509b portaltransforms-1.3.2.ebuild 828
+MD5 15498d03d5c3eeb2de7d504f68e48a0e portaltransforms-1.3.3.ebuild 847
+MD5 e99beeef3cb5d46572961e0b38e1b7ca files/digest-portaltransforms-1.0.3 71
+MD5 ef0ccb5a871e069463dd79e5498c5e21 files/digest-portaltransforms-1.0.4 71
+MD5 739426d5510ba8e3295bc6cd52f0cb61 files/digest-portaltransforms-1.3.2 73
+MD5 3146c144db0cc7871b78fd6f9decca10 files/digest-portaltransforms-1.3.2.7 76
+MD5 c2cc7a3837b5abd40632e6c33e2e005c files/digest-portaltransforms-1.3.3 80
diff --git a/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild b/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild
index 6d81f47ec23e..79fc3b0cd729 100644
--- a/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-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: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild,v 1.1 2004/03/26 23:37:02 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,12 +11,13 @@ DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tgz"
 LICENSE="GPL-1"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 ZPROD_LIST="${MY_PN}"
 MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
 
 DEPEND_BOTH="dev-python/docutils
-		net-www/lynx
+		www-client/lynx
 		app-text/pdftohtml"
 
 RDEPEND="${RDEPEND}
diff --git a/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild b/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild
index 0748a2e79d96..6cc65b561b0f 100644
--- a/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.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/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild,v 1.1 2004/07/27 19:52:37 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,13 +11,13 @@ DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tgz"
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ppc"
 IUSE=""
 ZPROD_LIST="${MY_PN}"
 MYDOC="${MYDOC} TODO README LICENSE.txt ChangeLog"
 
 DEPEND_BOTH="dev-python/docutils
-		net-www/lynx
+		www-client/lynx
 		app-text/pdftohtml"
 
 RDEPEND="${RDEPEND}
@@ -40,5 +40,6 @@ src_install() {
 	DIR=`ls -d build/scripts*`
 	S=${S}/build dobin ${DIR}/transform
 	S=${S}/build/lib/Products zproduct_src_install all
-	cp -a ${S}/{zope,www,skins} ${D}/${ZP_DIR}/${PF}/PortalTransforms
+	cp -a ${S}/{zope,www,skins} ${D}/${ZP_DIR}/${PF}/${MY_PN}
+	cp ${S}/tool.gif ${D}/${ZP_DIR}/${PF}/${MY_PN}
 }
diff --git a/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild b/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild
index 29a20b20f7b6..c76f333ddf29 100644
--- a/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.3.2.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/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild,v 1.1 2004/12/04 20:13:55 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.2.7.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}.tar.gz"
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="1.3"
 IUSE=""
 
@@ -25,7 +25,7 @@ RDEPEND=">=net-zope/cmf-1.4.7
 		app-text/xlhtml
 		app-text/unrtf
 		dev-python/docutils
-		net-www/lynx
+		www-client/lynx
 		app-text/pdftohtml"
 
 src_install()
diff --git a/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild b/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild
index 94878176dbe1..60e76d57d638 100644
--- a/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.3.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/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild,v 1.1 2004/10/07 21:34:47 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.2.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -25,7 +25,7 @@ RDEPEND=">=net-zope/cmf-1.4.7
 		app-text/xlhtml
 		app-text/unrtf
 		dev-python/docutils
-		net-www/lynx
+		www-client/lynx
 		app-text/pdftohtml"
 
 src_install()
diff --git a/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild b/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild
index b6798fe8cbc2..58e0e6e0fe90 100644
--- a/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild
+++ b/net-zope/portaltransforms/portaltransforms-1.3.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/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild,v 1.1 2005/04/15 17:22:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/portaltransforms/portaltransforms-1.3.3.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="MIME-type based transformations for Archetypes"
 HOMEPAGE="http://www.sf.net/projects/archetypes"
 SRC_URI="mirror://sourceforge/archetypes/${MY_P}-final.tar.gz"
 LICENSE="GPL-1"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 SLOT="1.3"
 IUSE=""
 
diff --git a/net-zope/propertyfolder/ChangeLog b/net-zope/propertyfolder/ChangeLog
index daded1b5b711..2c1c3f07df0c 100644
--- a/net-zope/propertyfolder/ChangeLog
+++ b/net-zope/propertyfolder/ChangeLog
@@ -1,8 +1,16 @@
 # ChangeLog for net-zope/propertyfolder
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyfolder/ChangeLog,v 1.1 2003/04/11 23:07:32 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyfolder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  propertyfolder-1.3.3.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  propertyfolder-1.3.3.ebuild: ~x86 ~ppc -> x86 ppc
 
 *propertyfolder-1.3.3 (11 Apr 2003)
 
-  11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> propertyfolder-1.3.3.ebuild : Initial import.
+  11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  propertyfolder-1.3.3.ebuild : Initial import.
 
diff --git a/net-zope/propertyfolder/Manifest b/net-zope/propertyfolder/Manifest
index 96a09168346d..2947b8fa311f 100644
--- a/net-zope/propertyfolder/Manifest
+++ b/net-zope/propertyfolder/Manifest
@@ -1,3 +1,4 @@
-MD5 b89ddd533511ab07b87547ee18dda07c propertyfolder-1.3.3.ebuild 521
-MD5 53492e2598801adda44537e5ef5928b8 ChangeLog 365
+MD5 aca3b2c5e4084e086adee3eeaa70c41c propertyfolder-1.3.3.ebuild 515
+MD5 cf2db7e349086575a3a23361f69bac4a ChangeLog 590
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 0895034bcfc94c95f735d059aa2cd57d files/digest-propertyfolder-1.3.3 71
diff --git a/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild b/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild
index 1183d6906f9a..36f4617ba210 100644
--- a/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild
+++ b/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild,v 1.1 2003/04/11 23:07:32 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyfolder/propertyfolder-1.3.3.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,6 +8,6 @@ DESCRIPTION="Intended mainly for use with PropertyObject and AbracadabraObject."
 HOMEPAGE="http://www.zope.org/Members/mjablonski/PropertyFolder"
 SRC_URI="${HOMEPAGE}/PropertyFolder-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="PropertyFolder"
diff --git a/net-zope/propertyobject/ChangeLog b/net-zope/propertyobject/ChangeLog
index cb2c004feb46..be42b021ec12 100644
--- a/net-zope/propertyobject/ChangeLog
+++ b/net-zope/propertyobject/ChangeLog
@@ -1,8 +1,16 @@
 # ChangeLog for net-zope/propertyobject
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyobject/ChangeLog,v 1.1 2003/04/11 22:54:34 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyobject/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  propertyobject-1.3.3.ebuild:
+  down to ~ppc until deps are stable
+
+  22 Jun 2003; Jason Shoemaker <kustsuya@gentoo.org>
+  propertyobject-1.3.3.ebuild: ~x86 ~ppc -> x86 ppc
 
 *propertyobject-1.3.3 (11 Apr 2003)
 
-  11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> propertyobject-1.3.3.ebuild : Initial import.
+  11 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  propertyobject-1.3.3.ebuild : Initial import.
 
diff --git a/net-zope/propertyobject/Manifest b/net-zope/propertyobject/Manifest
index e69de29bb2d1..b86c4cd2f23b 100644
--- a/net-zope/propertyobject/Manifest
+++ b/net-zope/propertyobject/Manifest
@@ -0,0 +1,4 @@
+MD5 3e23be7f6e52c00ba9051260639c7b43 propertyobject-1.3.3.ebuild 516
+MD5 ffb53debfe75d94ddc27c4407e265481 ChangeLog 590
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 0ddcfa9fec6cbf1d056f99ad62f83733 files/digest-propertyobject-1.3.3 71
diff --git a/net-zope/propertyobject/propertyobject-1.3.3.ebuild b/net-zope/propertyobject/propertyobject-1.3.3.ebuild
index af1ab57a0695..3f2f7fdcd24d 100644
--- a/net-zope/propertyobject/propertyobject-1.3.3.ebuild
+++ b/net-zope/propertyobject/propertyobject-1.3.3.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/propertyobject/propertyobject-1.3.3.ebuild,v 1.1 2003/04/11 22:54:34 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/propertyobject/propertyobject-1.3.3.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,6 +8,6 @@ DESCRIPTION="Intended mainly for use with PropertyFolder and AbracadabraObject."
 HOMEPAGE="http://www.zope.org/Members/mjablonski/PropertyObject/"
 SRC_URI="${HOMEPAGE}/PropertyObject-${PV}.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="PropertyObject"
diff --git a/net-zope/proxyindex/ChangeLog b/net-zope/proxyindex/ChangeLog
index 93e7a1e5d290..47433a18cb86 100644
--- a/net-zope/proxyindex/ChangeLog
+++ b/net-zope/proxyindex/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/proxyindex
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/proxyindex/ChangeLog,v 1.1 2004/09/28 15:32:11 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/proxyindex/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> proxyindex-1.2.ebuild:
+  added ~amd64
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> proxyindex-1.2.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> proxyindex-1.2.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
 *proxyindex-1.2 (28 Sep 2004)
 
diff --git a/net-zope/proxyindex/Manifest b/net-zope/proxyindex/Manifest
index 1ea2eac22a03..ac83746b1205 100644
--- a/net-zope/proxyindex/Manifest
+++ b/net-zope/proxyindex/Manifest
@@ -1,5 +1,4 @@
+MD5 fa1e64e578a5bb1fe8ed7f6d28c65387 ChangeLog 657
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 504d02ac8fffe4f54ef089d2e53c8430 proxyindex-1.2.ebuild 364
-MD5 ac21e63f6958c3d00a18e5cd44a358bc files/digest-sprout-0.5 58
-MD5 e9814e9de817884a88766ab0f9fc134c files/digest-annotations-0.4.3 64
+MD5 882d287e5f2da5b915c83923e2bf25b8 proxyindex-1.2.ebuild 477
 MD5 a6636674079d17197dd532d29d750fb9 files/digest-proxyindex-1.2 61
diff --git a/net-zope/proxyindex/proxyindex-1.2.ebuild b/net-zope/proxyindex/proxyindex-1.2.ebuild
index 067c48da3ae6..0a9c86aa6b34 100644
--- a/net-zope/proxyindex/proxyindex-1.2.ebuild
+++ b/net-zope/proxyindex/proxyindex-1.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/net-zope/proxyindex/proxyindex-1.2.ebuild,v 1.1 2004/09/28 15:32:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/proxyindex/proxyindex-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="ProxyIndex is a plugin to zope catalog index."
 HOMEPAGE="http://www.infrae.com/download/ProxyIndex"
 SRC_URI="${HOMEPAGE}/${PV}/ProxyIndex-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 ZPROD_LIST="ProxyIndex"
diff --git a/net-zope/silva/ChangeLog b/net-zope/silva/ChangeLog
index 4bbac977a672..cb50e910a70b 100644
--- a/net-zope/silva/ChangeLog
+++ b/net-zope/silva/ChangeLog
@@ -1,9 +1,48 @@
 # ChangeLog for net-zope/silva
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/ChangeLog,v 1.1 2003/03/25 12:22:52 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  04 May 2005; David Holm <dholm@gentoo.org> silva-1.2.ebuild:
+  Added to ~ppc.
+
+*silva-1.2 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> -silva-0.9.1.ebuild,
+  -silva-1.1.ebuild, +silva-1.2.ebuild:
+  new version, and removed all unnecessary ones.
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> silva-1.1-r1.ebuild:
+  added ~amd64
+
+*silva-1.1-r1 (14 Oct 2004)
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> silva-1.1-r1.ebuild:
+  Stable on x86, silva1.1 release for 2004.3
+
+  11 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> :
+  Added dependency to SilvaDocument.
+
+*silva-1.1 (08 Oct 2004)
+
+  08 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> +silva-1.1.ebuild:
+  New version released. No dependencies were changed.
+  Please be aware, that this release still do not have SilvaDocument type.
+
+*silva-1.0.2 (28 Sep 2004)
+
+  28 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> +silva-1.0.2.ebuild:
+  New release, new homepage, dependecies, and supporting products.
+
+*silva-0.9.1.2 (05 Apr 2003)
+
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> silva-0.9.1.2.ebuild:
+  Version bumped.
 
 *silva-0.9.1 (25 Mar 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> silva-0.9.1.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   25 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> silva-0.9.1.ebuild:
   Initial import. #14051
 
diff --git a/net-zope/silva/Manifest b/net-zope/silva/Manifest
index e69de29bb2d1..a22fce116fd5 100644
--- a/net-zope/silva/Manifest
+++ b/net-zope/silva/Manifest
@@ -0,0 +1,10 @@
+MD5 932edbe1af7aeb041ef320edc4c4fbd4 ChangeLog 1554
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 74c8db28f62309d3aefaf6b9e401fa11 silva-0.9.1.2.ebuild 568
+MD5 8325d48db74017bed8b98e90055ea811 silva-1.0.2.ebuild 752
+MD5 1b06aaf44bd579ce763136a675fbcaef silva-1.1-r1.ebuild 789
+MD5 e28babf63e65e7e7a4303a9443008c84 silva-1.2.ebuild 793
+MD5 5ff4580b4c8e190b5642f7fcef3730ac files/digest-silva-0.9.1.2 62
+MD5 eacefadb7b5941ba179384041d96fcdf files/digest-silva-1.0.2 61
+MD5 5c563e115c48a45ffe015c4968445cc9 files/digest-silva-1.1-r1 59
+MD5 262c7a9c1dc96f398d1b2cdb385fad28 files/digest-silva-1.2 59
diff --git a/net-zope/silva/files/digest-silva-0.9.1.2 b/net-zope/silva/files/digest-silva-0.9.1.2
index e1ae4e145b08..78242d7ef96e 100644
--- a/net-zope/silva/files/digest-silva-0.9.1.2
+++ b/net-zope/silva/files/digest-silva-0.9.1.2
@@ -1,2 +1 @@
-MD5 87d3e34751b3068b65b1ef3900b7f929 /silva-0.9.1.2.ebuild 606
 MD5 fdb0b3cfc370224689d1df79a35d4b7d Silva-0.9.1.2.tgz 337497
diff --git a/net-zope/silva/silva-0.9.1.2.ebuild b/net-zope/silva/silva-0.9.1.2.ebuild
index 25f5f75378b4..d88ac1bd0a57 100644
--- a/net-zope/silva/silva-0.9.1.2.ebuild
+++ b/net-zope/silva/silva-0.9.1.2.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/silva/silva-0.9.1.2.ebuild,v 1.1 2003/04/06 04:16:34 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-0.9.1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -11,9 +10,9 @@ SRC_URI="${HOMEPAGE}/Silva-${PV}.tgz"
 LICENSE="ZPL"
 KEYWORDS="x86 ~ppc"
 RDEPEND=">=net-zope/parsedxml-1.3.1
-         >=net-zope/formulator-1.3.1
-         >=net-zope/xmlwidgets-0.8.4
-         >=net-zope/filesystemsite-1.2
-         ${RDEPEND}"
+	>=net-zope/formulator-1.3.1
+	>=net-zope/xmlwidgets-0.8.4
+	>=net-zope/filesystemsite-1.2
+	${RDEPEND}"
 
 ZPROD_LIST="Silva"
diff --git a/net-zope/silva/silva-1.0.2.ebuild b/net-zope/silva/silva-1.0.2.ebuild
index 278a94ad10f5..e388478648ed 100644
--- a/net-zope/silva/silva-1.0.2.ebuild
+++ b/net-zope/silva/silva-1.0.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/net-zope/silva/silva-1.0.2.ebuild,v 1.1 2004/09/28 15:40:42 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-1.0.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/silva/silva-1.1-r1.ebuild b/net-zope/silva/silva-1.1-r1.ebuild
index 3404b9ca402e..5e904e69d63f 100644
--- a/net-zope/silva/silva-1.1-r1.ebuild
+++ b/net-zope/silva/silva-1.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/net-zope/silva/silva-1.1-r1.ebuild,v 1.1 2004/10/11 18:00:39 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-1.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Web based CMS for creating publications for the web, paper, and oth
 HOMEPAGE="http://www.infrae.com/download/Silva"
 SRC_URI="${HOMEPAGE}/${PV}/Silva-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 RDEPEND="
 	>=net-zope/annotations-0.4.3
diff --git a/net-zope/silva/silva-1.2.ebuild b/net-zope/silva/silva-1.2.ebuild
index c97f9c2a5f32..8cd5b248a77d 100644
--- a/net-zope/silva/silva-1.2.ebuild
+++ b/net-zope/silva/silva-1.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/net-zope/silva/silva-1.2.ebuild,v 1.1 2005/03/28 16:29:55 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silva/silva-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Web based CMS for creating publications for the web, paper, and oth
 HOMEPAGE="http://www.infrae.com/download/Silva"
 SRC_URI="${HOMEPAGE}/${PV}/Silva-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 RDEPEND="
 	>=net-zope/annotations-0.4.3
diff --git a/net-zope/silvadocument/ChangeLog b/net-zope/silvadocument/ChangeLog
index 1a1502ce5a25..fd76072d0b6e 100644
--- a/net-zope/silvadocument/ChangeLog
+++ b/net-zope/silvadocument/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for net-zope/silvadocument
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/ChangeLog,v 1.1 2004/10/11 17:59:16 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+*silvadocument-1.2.1 (08 May 2005)
+*silvadocument-1.1.5 (08 May 2005)
+
+  08 May 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +silvadocument-1.1.5.ebuild, +silvadocument-1.2.1.ebuild:
+  version bump and removed broken 1.1.4
+
+  04 May 2005; David Holm <dholm@gentoo.org> silvadocument-1.2.ebuild:
+  Added to ~ppc.
+
+*silvadocument-1.2 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +silvadocument-1.2.ebuild:
+  version bump
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> silvadocument-1.1.ebuild:
+  added ~amd64
+
+*silvadocument-1.1 (14 Oct 2004)
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  silvadocument-1.1.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
   11 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>:
   Initial insert into portage.
diff --git a/net-zope/silvadocument/Manifest b/net-zope/silvadocument/Manifest
index 4178724af7f3..174500e9b9ca 100644
--- a/net-zope/silvadocument/Manifest
+++ b/net-zope/silvadocument/Manifest
@@ -1,2 +1,10 @@
-MD5 86e8b17854aec18a7d7007585587f15f silvadocument-1.1.ebuild 522
+MD5 3d07eb4c5af893532e07022fb761dccb silvadocument-1.2.ebuild 545
+MD5 e74b1104fd34c8b4152847b6e7158c31 silvadocument-1.2.1.ebuild 547
+MD5 f4ff2388563c40a3e2feb60238ed4cfe silvadocument-1.1.5.ebuild 542
+MD5 29ebefdeda6e5151dbf954e9eeb5e7fa silvadocument-1.1.ebuild 534
+MD5 5552b279f7f78bda3901bc301b15a602 ChangeLog 1008
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 b1713aa8e20e8c376f15fbf114cd9ce6 files/digest-silvadocument-1.1 66
+MD5 b455da6ece35bc6702ca22924be217a8 files/digest-silvadocument-1.2 66
+MD5 be7bb368819580fd7303d687861ded65 files/digest-silvadocument-1.1.5 68
+MD5 c7614873c12bfbf0d86fa8f7cbec77a8 files/digest-silvadocument-1.2.1 68
diff --git a/net-zope/silvadocument/silvadocument-1.1.5.ebuild b/net-zope/silvadocument/silvadocument-1.1.5.ebuild
index cebe3c2696f3..c81cfc7ec581 100644
--- a/net-zope/silvadocument/silvadocument-1.1.5.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.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/net-zope/silvadocument/silvadocument-1.1.5.ebuild,v 1.1 2005/05/08 19:23:33 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.1.5.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/silvadocument/silvadocument-1.1.ebuild b/net-zope/silvadocument/silvadocument-1.1.ebuild
index 966c9f45c630..ee8aa23c30e7 100644
--- a/net-zope/silvadocument/silvadocument-1.1.ebuild
+++ b/net-zope/silvadocument/silvadocument-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/net-zope/silvadocument/silvadocument-1.1.ebuild,v 1.1 2004/10/11 17:59:16 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, fo
 HOMEPAGE="http://www.infrae.com/download/${MY_PN}/"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_PN}-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/silvadocument/silvadocument-1.2.1.ebuild b/net-zope/silvadocument/silvadocument-1.2.1.ebuild
index 5b75baa3dbfd..12f4c7f0f2a1 100644
--- a/net-zope/silvadocument/silvadocument-1.2.1.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.2.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/net-zope/silvadocument/silvadocument-1.2.1.ebuild,v 1.1 2005/05/08 19:23:33 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.2.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/silvadocument/silvadocument-1.2.ebuild b/net-zope/silvadocument/silvadocument-1.2.ebuild
index 3badebb80ea8..5946d4e85502 100644
--- a/net-zope/silvadocument/silvadocument-1.2.ebuild
+++ b/net-zope/silvadocument/silvadocument-1.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/net-zope/silvadocument/silvadocument-1.2.ebuild,v 1.1 2005/03/28 16:03:26 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvadocument/silvadocument-1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ DESCRIPTION="SilvaDocument provides the Silva Document, including its editor, fo
 HOMEPAGE="http://www.infrae.com/download/SilvaDocument/"
 SRC_URI="${HOMEPAGE}/${PV}/${MY_PN}-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 IUSE=""
 
 ZPROD_LIST="${MY_PN}"
diff --git a/net-zope/silvametadata/ChangeLog b/net-zope/silvametadata/ChangeLog
index abaa5aff9e33..c55e3e7b8526 100644
--- a/net-zope/silvametadata/ChangeLog
+++ b/net-zope/silvametadata/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-zope/silvametadata
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/silvametadata/ChangeLog,v 1.1 2004/09/28 15:35:09 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvametadata/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> silvametadata-0.8.ebuild:
+  added ~amd64
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> silvametadata-0.8.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  silvametadata-0.8.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
 *silvametadata-0.8 (28 Sep 2004)
 
diff --git a/net-zope/silvametadata/Manifest b/net-zope/silvametadata/Manifest
index 6746e2f1c7d1..244195679438 100644
--- a/net-zope/silvametadata/Manifest
+++ b/net-zope/silvametadata/Manifest
@@ -1,4 +1,4 @@
+MD5 73a41d05be5b4884a0e1bafffbc22ba4 ChangeLog 695
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 cd25b71e9924d1c90e2158f0d3f35001 silvametadata-0.8.ebuild 422
-MD5 ac21e63f6958c3d00a18e5cd44a358bc files/digest-sprout-0.5 58
+MD5 e8c21af80b0f1379c5865aa2b6f01abe silvametadata-0.8.ebuild 541
 MD5 8290816986ce0f754de3abe7b9b52fb2 files/digest-silvametadata-0.8 65
diff --git a/net-zope/silvametadata/silvametadata-0.8.ebuild b/net-zope/silvametadata/silvametadata-0.8.ebuild
index 08609dfd40f2..3a218bf0ca38 100644
--- a/net-zope/silvametadata/silvametadata-0.8.ebuild
+++ b/net-zope/silvametadata/silvametadata-0.8.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/net-zope/silvametadata/silvametadata-0.8.ebuild,v 1.1 2004/09/28 15:35:09 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvametadata/silvametadata-0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Silva Metadata can be used to create metadata sets and associate th
 HOMEPAGE="http://www.infrae.com/download/SilvaMetadata"
 SRC_URI="${HOMEPAGE}/${PV}/SilvaMetadata-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 ZPROD_LIST="SilvaMetadata"
diff --git a/net-zope/silvaviews/ChangeLog b/net-zope/silvaviews/ChangeLog
index 96eec9746f0a..fb50fd00c569 100644
--- a/net-zope/silvaviews/ChangeLog
+++ b/net-zope/silvaviews/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-zope/silvaviews
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/silvaviews/ChangeLog,v 1.1 2004/09/28 15:37:37 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvaviews/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*silvaviews-0.10 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +silvaviews-0.10.ebuild:
+  version bump
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> silvaviews-0.9.ebuild:
+  added ~amd64
+
+  17 Oct 2004; David Holm <dholm@gentoo.org> silvaviews-0.9.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> silvaviews-0.9.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
 *silvaviews-0.9 (28 Sep 2004)
 
diff --git a/net-zope/silvaviews/Manifest b/net-zope/silvaviews/Manifest
index 2a42d4ceae25..20e84c900f76 100644
--- a/net-zope/silvaviews/Manifest
+++ b/net-zope/silvaviews/Manifest
@@ -1,5 +1,6 @@
+MD5 edbe5041bbb66b08359ca34ed09fcf32 silvaviews-0.10.ebuild 509
+MD5 c2ca0a07cc2d7c4dd7fe92bd024e5cd5 silvaviews-0.9.ebuild 507
+MD5 0e3f2c1c4d2e4b7a053bd9deef7e43aa ChangeLog 801
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 0fb4fde8958cf2e08c76e6d925e38512 silvaviews-0.9.ebuild 394
-MD5 ac21e63f6958c3d00a18e5cd44a358bc files/digest-sprout-0.5 58
-MD5 8290816986ce0f754de3abe7b9b52fb2 files/digest-silvametadata-0.8 65
+MD5 7605ad155fe48b2a75aa667709f56bdb files/digest-silvaviews-0.10 62
 MD5 e78a719bf8c10f16022fe3812da4788e files/digest-silvaviews-0.9 61
diff --git a/net-zope/silvaviews/silvaviews-0.10.ebuild b/net-zope/silvaviews/silvaviews-0.10.ebuild
index a8432b6b6dc3..fee74f940d5a 100644
--- a/net-zope/silvaviews/silvaviews-0.10.ebuild
+++ b/net-zope/silvaviews/silvaviews-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/net-zope/silvaviews/silvaviews-0.10.ebuild,v 1.1 2005/03/28 15:59:10 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvaviews/silvaviews-0.10.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/silvaviews/silvaviews-0.9.ebuild b/net-zope/silvaviews/silvaviews-0.9.ebuild
index 1b6a899e7fc0..6b758d08a0b7 100644
--- a/net-zope/silvaviews/silvaviews-0.9.ebuild
+++ b/net-zope/silvaviews/silvaviews-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/net-zope/silvaviews/silvaviews-0.9.ebuild,v 1.1 2004/09/28 15:37:37 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/silvaviews/silvaviews-0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="SilvaViews is a component that is used by Silva to attach views to
 HOMEPAGE="http://www.infrae.com/download/SilvaViews"
 SRC_URI="${HOMEPAGE}/${PV}/SilvaViews-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 ZPROD_LIST="SilvaViews"
diff --git a/net-zope/simpleuserfolder/ChangeLog b/net-zope/simpleuserfolder/ChangeLog
index 4f6047f9cd86..47655e6dcbbf 100644
--- a/net-zope/simpleuserfolder/ChangeLog
+++ b/net-zope/simpleuserfolder/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/simpleuserfolder
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/simpleuserfolder/ChangeLog,v 1.1 2003/10/09 18:45:16 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/simpleuserfolder/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  05 Dec 2003; Heinrich Wendel <lanius@gentoo.org>
+  simpleuserfolder-0.9.0.ebuild:
+  fixed chown syntax
 
 *simpleuserfolder-0.9.0 (09 Oct 2003)
 
diff --git a/net-zope/simpleuserfolder/Manifest b/net-zope/simpleuserfolder/Manifest
index 604d4ae8c695..6266206df93e 100644
--- a/net-zope/simpleuserfolder/Manifest
+++ b/net-zope/simpleuserfolder/Manifest
@@ -1,2 +1,4 @@
-MD5 8c3f9241a6d36c66db24959103af7c2b simpleuserfolder-0.9.0.ebuild 928
+MD5 5ccb3598eab3c9f6802b8150eb3d87e6 simpleuserfolder-0.9.0.ebuild 898
+MD5 b6e36a63a9a5d862ae452068b0f9d5fa ChangeLog 474
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 f4bb97f1d761f1435a7c94fa5c04a384 files/digest-simpleuserfolder-0.9.0 73
diff --git a/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild b/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild
index 6a8599a224c5..e0444cbdc2c0 100644
--- a/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild
+++ b/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.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/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild,v 1.1 2003/10/09 18:45:16 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/simpleuserfolder/simpleuserfolder-0.9.0.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -21,7 +21,7 @@ src_install() {
 	zproduct_src_install
 	# fix permissions on files
 	DIR=${D}/usr/share/zproduct/${PF}
-	find ${DIR} -exec chown zope.root \{} \;
+	find ${DIR} -exec chown zope:root \{} \;
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
diff --git a/net-zope/speedpack/ChangeLog b/net-zope/speedpack/ChangeLog
index 102b8ee8ad2f..1c99d65c2a7e 100644
--- a/net-zope/speedpack/ChangeLog
+++ b/net-zope/speedpack/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for net-zope/speedpack
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/speedpack/ChangeLog,v 1.1 2005/05/14 12:25:50 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/speedpack/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 *speedpack-0.3 (14 May 2005)
 
diff --git a/net-zope/speedpack/Manifest b/net-zope/speedpack/Manifest
index c5663f0dcdd3..1290da9b586a 100644
--- a/net-zope/speedpack/Manifest
+++ b/net-zope/speedpack/Manifest
@@ -1,3 +1,4 @@
-MD5 d910d52154768dde7e965e5bef3f4faa speedpack-0.3.ebuild 438
+MD5 5b53df8fa88c1c68b69de0df5bb7f272 speedpack-0.3.ebuild 538
+MD5 7178e0a5a7e571823b39bea152d21b0e ChangeLog 366
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 58296d4008155b2245097d1d032a9961 files/digest-speedpack-0.3 64
diff --git a/net-zope/speedpack/speedpack-0.3.ebuild b/net-zope/speedpack/speedpack-0.3.ebuild
index d85607679639..60bc57088dd9 100644
--- a/net-zope/speedpack/speedpack-0.3.ebuild
+++ b/net-zope/speedpack/speedpack-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/net-zope/speedpack/speedpack-0.3.ebuild,v 1.1 2005/05/14 12:25:50 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/speedpack/speedpack-0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/sprout/ChangeLog b/net-zope/sprout/ChangeLog
index a6af5718ab2d..91ac48433ad2 100644
--- a/net-zope/sprout/ChangeLog
+++ b/net-zope/sprout/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for net-zope/sprout
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/ChangeLog,v 1.1 2004/09/28 15:33:37 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+*sprout-0.5.1 (24 Apr 2005)
+
+  24 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> +sprout-0.5.1.ebuild:
+  new version for silva-1.1.4
+
+*sprout-0.6.1 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +sprout-0.6.1.ebuild:
+  version bump
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> sprout-0.5.ebuild:
+  added ~amd64
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> sprout-0.5.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> sprout-0.5.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
 
 *sprout-0.5 (28 Sep 2004)
 
diff --git a/net-zope/sprout/Manifest b/net-zope/sprout/Manifest
index 272377bc2060..1324e4c98741 100644
--- a/net-zope/sprout/Manifest
+++ b/net-zope/sprout/Manifest
@@ -1,3 +1,8 @@
-MD5 e94ff7b0a782ee7012d406173665c31a sprout-0.5.ebuild 388
+MD5 4a7a791ac909118dae8cf1d97ef4ea59 sprout-0.6.1.ebuild 479
+MD5 a8fdbbbdea3a68e6c474783bfb7d982e sprout-0.5.ebuild 476
+MD5 447c4694b4f21726d686f2e0c14d2c25 sprout-0.5.1.ebuild 479
+MD5 73e08098c1d44ebe3fd7a462d6d769c1 ChangeLog 909
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 d34baa7f0bb0c0d36ca63564b999e2f3 files/digest-sprout-0.5.1 60
+MD5 68c847c2a4601f37327fe070c0cd349a files/digest-sprout-0.6.1 60
 MD5 ac21e63f6958c3d00a18e5cd44a358bc files/digest-sprout-0.5 58
diff --git a/net-zope/sprout/sprout-0.5.1.ebuild b/net-zope/sprout/sprout-0.5.1.ebuild
index 9252bd12c180..74a6eadf3a1c 100644
--- a/net-zope/sprout/sprout-0.5.1.ebuild
+++ b/net-zope/sprout/sprout-0.5.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/net-zope/sprout/sprout-0.5.1.ebuild,v 1.1 2005/04/24 13:00:02 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/sprout-0.5.1.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/sprout/sprout-0.5.ebuild b/net-zope/sprout/sprout-0.5.ebuild
index c201419a562f..7b4a30f03df8 100644
--- a/net-zope/sprout/sprout-0.5.ebuild
+++ b/net-zope/sprout/sprout-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/net-zope/sprout/sprout-0.5.ebuild,v 1.1 2004/09/28 15:33:37 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/sprout-0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="Python library which contains reusable components (XML related)."
 HOMEPAGE="http://www.infrae.com/download/Sprout"
 SRC_URI="${HOMEPAGE}/${PV}/Sprout-${PV}.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc ~amd64"
 IUSE=""
 
 ZPROD_LIST="Sprout"
diff --git a/net-zope/sprout/sprout-0.6.1.ebuild b/net-zope/sprout/sprout-0.6.1.ebuild
index 16e5bb5c2ca5..97a3b3abf428 100644
--- a/net-zope/sprout/sprout-0.6.1.ebuild
+++ b/net-zope/sprout/sprout-0.6.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/net-zope/sprout/sprout-0.6.1.ebuild,v 1.1 2005/03/28 15:50:35 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/sprout/sprout-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/squishdot/ChangeLog b/net-zope/squishdot/ChangeLog
index c7e9ad942b69..f6bf56f0b243 100644
--- a/net-zope/squishdot/ChangeLog
+++ b/net-zope/squishdot/ChangeLog
@@ -1,9 +1,20 @@
 # ChangeLog for net-zope/squishdot
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/squishdot/ChangeLog,v 1.1 2003/03/03 21:55:52 kutsuya Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/squishdot/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  07 May 2005; Steve Arnold <nerdboy@gentoo.org> squishdot-1.5.0.ebuild
+  +squishdot-1.5.0-r1.ebuild:
+  keyworded for ~sparc, works just fine here with zope 2.7x; plus
+  long overdue stable bump for x86
+
+  26 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> squishdot-1.5.0.ebuild:
+  Added $MYDOC.
 
 *squishdot-1.5.0 (16 Feb 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> squishdot-1.5.0.ebuild:
+  ~x86 -> x86 and added ~ppc. Rearranged some code to make it consistent.
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to 
   net-zope.
 
diff --git a/net-zope/squishdot/Manifest b/net-zope/squishdot/Manifest
index e69de29bb2d1..57e076e53ad1 100644
--- a/net-zope/squishdot/Manifest
+++ b/net-zope/squishdot/Manifest
@@ -0,0 +1,6 @@
+MD5 53675b88c3dbf6b0f6338729f17cbe5b ChangeLog 851
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 6aee0d4a70b4d693f8fc2017cab05901 squishdot-1.5.0.ebuild 548
+MD5 0485c41781e859632eac492213dbdbd5 squishdot-1.5.0-r1.ebuild 558
+MD5 af451d125672d84f4e34de81d99a15da files/digest-squishdot-1.5.0 67
+MD5 af451d125672d84f4e34de81d99a15da files/digest-squishdot-1.5.0-r1 67
diff --git a/net-zope/squishdot/squishdot-1.5.0-r1.ebuild b/net-zope/squishdot/squishdot-1.5.0-r1.ebuild
index 5b8642b61590..6c31e6178fe2 100644
--- a/net-zope/squishdot/squishdot-1.5.0-r1.ebuild
+++ b/net-zope/squishdot/squishdot-1.5.0-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/net-zope/squishdot/squishdot-1.5.0-r1.ebuild,v 1.1 2005/05/08 03:03:35 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/squishdot/squishdot-1.5.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 NEW_PV="${PV//./-}"
diff --git a/net-zope/squishdot/squishdot-1.5.0.ebuild b/net-zope/squishdot/squishdot-1.5.0.ebuild
index e696794418c8..f769428f760d 100644
--- a/net-zope/squishdot/squishdot-1.5.0.ebuild
+++ b/net-zope/squishdot/squishdot-1.5.0.ebuild
@@ -1,16 +1,21 @@
-# Copyright 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/net-zope/squishdot/squishdot-1.5.0.ebuild,v 1.1 2003/03/03 21:55:52 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/squishdot/squishdot-1.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
+NEW_PV="${PV//./-}"
 
 DESCRIPTION="A web-based news publishing and discussion product for Zope."
 HOMEPAGE="http://squishdot.org/"
-NEW_PV=$(echo ${PV} |sed -e "s/\./-/g")
 SRC_URI="${HOMEPAGE}/Download/Squishdot-${NEW_PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+IUSE=""
+
+KEYWORDS="x86"
+
 ZPROD_LIST="Squishdot"
+MYDOC="License.txt Changes.txt Credits.txt ${MYDOC}"
+
 
 
 
diff --git a/net-zope/tinytableplus/ChangeLog b/net-zope/tinytableplus/ChangeLog
index b98f28ce5e20..fa3e538378f8 100644
--- a/net-zope/tinytableplus/ChangeLog
+++ b/net-zope/tinytableplus/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-zope/tinytableplus
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/tinytableplus/ChangeLog,v 1.1 2004/02/09 13:32:01 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/tinytableplus/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+*tinytableplus-0.9-r1 (07 May 2005)
+
+  07 May 2005; Steve Arnold <nerdboy@gentoo.org> +tinytableplus-0.9-r1.ebuild
+  tinytableplus-0.9.ebuild:
+  keyworded for ~sparc, works just fine here with squishdot and zope 2.7x
+  long overdue stable bump for x86
+
+  14 Aug 2004; Sven Wegener <swegener@gentoo.org> tinytableplus-0.9.ebuild:
+  Trimmed trailing whitespace and added IUSE="".
 
 *tinytableplus-0.9 (09 Feb 2004)
 
diff --git a/net-zope/tinytableplus/Manifest b/net-zope/tinytableplus/Manifest
index b49dc6139142..491d734bd846 100644
--- a/net-zope/tinytableplus/Manifest
+++ b/net-zope/tinytableplus/Manifest
@@ -1,2 +1,6 @@
-MD5 c8c9956603645031059ac38b2287a37a tinytableplus-0.9.ebuild 520
+MD5 6737a8a7ed16265bfbe051ae30b07e30 ChangeLog 782
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 66d1800f8aaf3890bf32b63ebdb07996 tinytableplus-0.9.ebuild 591
+MD5 b41baf1e1b3bc966dc366c1cc166d8b0 tinytableplus-0.9-r1.ebuild 601
 MD5 e9d35289dc985764f9b23b60bddbaf6d files/digest-tinytableplus-0.9 65
+MD5 e9d35289dc985764f9b23b60bddbaf6d files/digest-tinytableplus-0.9-r1 65
diff --git a/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild b/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild
index 631c43cdee01..aa9ba86f56a8 100644
--- a/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild
+++ b/net-zope/tinytableplus/tinytableplus-0.9-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/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild,v 1.1 2005/05/08 02:56:13 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/tinytableplus/tinytableplus-0.9-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 NEW_PV="${PV//./-}"
diff --git a/net-zope/tinytableplus/tinytableplus-0.9.ebuild b/net-zope/tinytableplus/tinytableplus-0.9.ebuild
index 6f07b7dbf839..30a75854c553 100644
--- a/net-zope/tinytableplus/tinytableplus-0.9.ebuild
+++ b/net-zope/tinytableplus/tinytableplus-0.9.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/net-zope/tinytableplus/tinytableplus-0.9.ebuild,v 1.1 2004/02/09 13:32:01 lanius Exp $ 
+# $Header: /var/cvsroot/gentoo-x86/net-zope/tinytableplus/tinytableplus-0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 NEW_PV="${PV//./-}"
@@ -10,6 +10,7 @@ HOMEPAGE="http://www.zope.org/Members/hathawsh/TinyTablePlus"
 SRC_URI="${HOMEPAGE}/default/TinyTablePlus-${PV}.tgz"
 S=${WORKDIR}/lib/python/Products
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+IUSE=""
 
 ZPROD_LIST="TinyTablePlus"
diff --git a/net-zope/translationservice/ChangeLog b/net-zope/translationservice/ChangeLog
index 3a251b2e8bff..eb9d1e35d20c 100644
--- a/net-zope/translationservice/ChangeLog
+++ b/net-zope/translationservice/ChangeLog
@@ -1,13 +1,33 @@
 # ChangeLog for net-zope/translationservice
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/ChangeLog,v 1.1 2003/03/03 22:47:55 kutsuya Exp $
+# Copyright 2003-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+  08 Aug 2004; Tom Martin <slarti@gentoo.org> translationservice-0.3.ebuild,
+  translationservice-0.4.ebuild:
+  Typo in DESCRIPTION: servive -> service. Bug 59717.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  translationservice-0.3.ebuild:
+  down to ~ppc until deps are stable
+
+*translationservice-0.4 (20 Jun 2003)
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org>
+  translationservice-0.4.ebuild:
+  Version bump. Masked all archs unstable.
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org>
+  translationservice-0.3.ebuild: ~ppc -> ppc
 
 *translationservice-0.3 (18 Feb 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> 
+  translationservice-0.3.ebuild: ~x86 -> x86 and added ~ppc
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to 
   net-zope.
 
   18 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : Initial import.
  
 
- 
\ No newline at end of file
+ 
diff --git a/net-zope/translationservice/Manifest b/net-zope/translationservice/Manifest
index e69de29bb2d1..6675b28bd2f4 100644
--- a/net-zope/translationservice/Manifest
+++ b/net-zope/translationservice/Manifest
@@ -0,0 +1,6 @@
+MD5 7e403c81d7c8ca6804fc6832ce19667a translationservice-0.4.ebuild 505
+MD5 0da55846beafdfd31ee33ef9f5378b2c ChangeLog 1103
+MD5 72dbbc7dbd1636bd90a5caa4f5fd72f1 translationservice-0.3.ebuild 504
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 593dddb4cf1ae7b13fc6f46f50036e3e files/digest-translationservice-0.3 70
+MD5 0f47b403338e143a1aeec3f24959fc35 files/digest-translationservice-0.4 70
diff --git a/net-zope/translationservice/translationservice-0.3.ebuild b/net-zope/translationservice/translationservice-0.3.ebuild
index a3503214eeb6..f8287969506b 100644
--- a/net-zope/translationservice/translationservice-0.3.ebuild
+++ b/net-zope/translationservice/translationservice-0.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 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/net-zope/translationservice/translationservice-0.3.ebuild,v 1.1 2003/03/03 22:47:55 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/translationservice-0.3.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
-DESCRIPTION="Translation servive for zope. i18n tags in ZPT."
+DESCRIPTION="Translation service for zope. i18n tags in ZPT."
 HOMEPAGE="http://www.zope.org/Members/efge/TranslationService/"
 SRC_URI="${HOMEPAGE}/TranslationService-${PV}.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
-ZPROD_LIST="TranslationService"
\ No newline at end of file
+ZPROD_LIST="TranslationService"
diff --git a/net-zope/translationservice/translationservice-0.4.ebuild b/net-zope/translationservice/translationservice-0.4.ebuild
index 4f8add95c0c6..09bac704403d 100644
--- a/net-zope/translationservice/translationservice-0.4.ebuild
+++ b/net-zope/translationservice/translationservice-0.4.ebuild
@@ -1,10 +1,10 @@
-# Copyright 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/net-zope/translationservice/translationservice-0.4.ebuild,v 1.1 2003/06/21 05:00:22 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/translationservice/translationservice-0.4.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
-DESCRIPTION="Translation servive for zope. i18n tags in ZPT."
+DESCRIPTION="Translation service for zope. i18n tags in ZPT."
 HOMEPAGE="http://www.zope.org/Members/efge/TranslationService/"
 SRC_URI="${HOMEPAGE}/TranslationService-${PV}.tgz"
 LICENSE="GPL-2"
diff --git a/net-zope/ttwtype/ChangeLog b/net-zope/ttwtype/ChangeLog
index a5500d5aaf7f..fe368cc6b38b 100644
--- a/net-zope/ttwtype/ChangeLog
+++ b/net-zope/ttwtype/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-zope/ttwtype
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/ttwtype/ChangeLog,v 1.1 2003/04/03 23:51:55 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ttwtype/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 *ttwtype-0.9.1 (03 Apr 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> ttwtype-0.9.1.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> ttwtype-0.9.1.ebuild:
   Initial import. #17875
 
diff --git a/net-zope/ttwtype/Manifest b/net-zope/ttwtype/Manifest
index e69de29bb2d1..6ab48712b1cc 100644
--- a/net-zope/ttwtype/Manifest
+++ b/net-zope/ttwtype/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 079f7a05fc52e54895fdd91c2fa5a176 ttwtype-0.9.1.ebuild 501
+MD5 dba0cf4c78fabfb37a6ec766d44192af ChangeLog 441
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 984c5ddf22f5a246bea38385c240e5b7 files/digest-ttwtype-0.9.1 60
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBo4sRI1lqEGTUzyQRAgxHAJ4sqbXNWEBijYV/9vrJmW7Bpgw4+QCfYd4M
+/awc//CyeoVYirC1wPLyBrE=
+=ezVI
+-----END PGP SIGNATURE-----
diff --git a/net-zope/ttwtype/files/digest-ttwtype-0.9.1 b/net-zope/ttwtype/files/digest-ttwtype-0.9.1
index 7aa58fcbfba7..233f675a3f2b 100644
--- a/net-zope/ttwtype/files/digest-ttwtype-0.9.1
+++ b/net-zope/ttwtype/files/digest-ttwtype-0.9.1
@@ -1,2 +1 @@
-MD5 1e6e152f66fea8dea9d8d269b54ac9b8 /ttwtype-0.9.1.ebuild 400
 MD5 f05b90eb3e6d8f1d3f868135896dc4da TTWType-0.9.1.tgz 9448
diff --git a/net-zope/ttwtype/ttwtype-0.9.1.ebuild b/net-zope/ttwtype/ttwtype-0.9.1.ebuild
index f617bf3df740..1da2b11e391c 100644
--- a/net-zope/ttwtype/ttwtype-0.9.1.ebuild
+++ b/net-zope/ttwtype/ttwtype-0.9.1.ebuild
@@ -1,7 +1,6 @@
- 
-# Copyright 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/net-zope/ttwtype/ttwtype-0.9.1.ebuild,v 1.1 2003/04/03 23:51:55 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/ttwtype/ttwtype-0.9.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,9 +8,9 @@ DESCRIPTION="Create new content types via the ZMI for plone."
 HOMEPAGE="http://www.zope.org/Members/comlounge/TTWType/"
 SRC_URI="${HOMEPAGE}TTWType-${PV}.tgz"
 LICENSE="BSD"
-KEYWORDS="~x86"
+KEYWORDS="x86 ~ppc"
 
 RDEPEND=">=net-zope/plone-1.0.1
 	${RDEPEND}"
 
-ZPROD_LIST="TTWType"
\ No newline at end of file
+ZPROD_LIST="TTWType"
diff --git a/net-zope/validation/ChangeLog b/net-zope/validation/ChangeLog
index c10fb24583b9..dd683c821dab 100644
--- a/net-zope/validation/ChangeLog
+++ b/net-zope/validation/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for net-zope/validation
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/ChangeLog,v 1.1 2004/10/07 21:30:24 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*validation-1.3.1 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +validation-1.3.1.ebuild:
+  version bump
+
+  02 Apr 2005; Simon Stelling <blubb@gentoo.org> validation-1.3.0.11.ebuild:
+  added ~amd64
+
+  19 Mar 2005; Jason Wever <weeve@gentoo.org> validation-1.3.0.11.ebuild:
+  Added ~sparc keyword wrt bug #84791.
+
+*validation-1.3.0.11 (04 Dec 2004)
+
+  04 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +validation-1.3.0.11.ebuild:
+  New release from archetypes-1.3.1 tree.
 
 *validation-1.3.0 (06 Oct 2004)
 
diff --git a/net-zope/validation/Manifest b/net-zope/validation/Manifest
index 816368ab3db8..83818d61f4e6 100644
--- a/net-zope/validation/Manifest
+++ b/net-zope/validation/Manifest
@@ -1,4 +1,8 @@
-MD5 adadc28f78b0ab4cb30ddc9d7cf2e7fc validation-1.3.0.ebuild 710
-MD5 1d8b3007cbd4ef4461273ccd28ea636a ChangeLog 379
+MD5 a72046f131a9ce8ce302fb6913902ee1 validation-1.3.1.ebuild 743
+MD5 d5dcc51497db520f64d4cf2a6fab6015 validation-1.3.0.11.ebuild 775
+MD5 d21a3e875391821396636fd26a9d8d01 validation-1.3.0.ebuild 747
+MD5 938d2c1421b17e6df1705480099a958d ChangeLog 971
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 8a248ae0fbc6afce94fb3d4d56e020bb files/digest-validation-1.3.0 65
+MD5 d849b12d12d0fc00bfa16e2d8833e80a files/digest-validation-1.3.1 73
+MD5 4dfbfa96729122a58e91fb3c8386550a files/digest-validation-1.3.0.11 69
diff --git a/net-zope/validation/validation-1.3.0.11.ebuild b/net-zope/validation/validation-1.3.0.11.ebuild
index c875e5e923ca..778b6f713a38 100644
--- a/net-zope/validation/validation-1.3.0.11.ebuild
+++ b/net-zope/validation/validation-1.3.0.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/net-zope/validation/validation-1.3.0.11.ebuild,v 1.1 2004/12/04 20:09:54 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/validation-1.3.0.11.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,7 +10,7 @@ DESCRIPTION="Data validation package, originally designed for Archetypes."
 WEBPAGE="http://www.sourceforge.net/projects/${MASTER_PN}"
 SRC_URI="mirror://sourceforge/${MASTER_PN}/${PN}-1.3.0-11.tar.gz"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 IUSE=""
 SLOT="1.3"
 
diff --git a/net-zope/validation/validation-1.3.0.ebuild b/net-zope/validation/validation-1.3.0.ebuild
index f0b8a08d9290..09c103972456 100644
--- a/net-zope/validation/validation-1.3.0.ebuild
+++ b/net-zope/validation/validation-1.3.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/net-zope/validation/validation-1.3.0.ebuild,v 1.1 2004/10/07 21:30:24 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/validation-1.3.0.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/validation/validation-1.3.1.ebuild b/net-zope/validation/validation-1.3.1.ebuild
index 63333b596a43..251c3f654166 100644
--- a/net-zope/validation/validation-1.3.1.ebuild
+++ b/net-zope/validation/validation-1.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/net-zope/validation/validation-1.3.1.ebuild,v 1.1 2005/04/15 17:16:44 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/validation/validation-1.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/verbosesecurity/ChangeLog b/net-zope/verbosesecurity/ChangeLog
index bccbad84c1d2..f7a8f39135c0 100644
--- a/net-zope/verbosesecurity/ChangeLog
+++ b/net-zope/verbosesecurity/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-zope/verbosesecurity
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/verbosesecurity/ChangeLog,v 1.1 2003/10/11 21:12:18 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/verbosesecurity/ChangeLog,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
+
+*verbosesecurity-0.6 (13 Jan 2005)
+
+  13 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +verbosesecurity-0.6.ebuild:
+  New version for zope 2.7.0
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
+  verbosesecurity-0.5.ebuild:
+  Switch to use epause and ebeep, bug #62950
 
 *verbosesecurity-0.5 (11 Oct 2003)
 
diff --git a/net-zope/verbosesecurity/Manifest b/net-zope/verbosesecurity/Manifest
index 30621e751345..e0765ba62735 100644
--- a/net-zope/verbosesecurity/Manifest
+++ b/net-zope/verbosesecurity/Manifest
@@ -1,3 +1,6 @@
-MD5 857dabe0a2edc872c75c81a01cf4dd3d verbosesecurity-0.5.ebuild 641
+MD5 242487e1c5196cd93de9d26a82b26b79 verbosesecurity-0.5.ebuild 794
+MD5 87b5be7ef7c03a9c3adc8b1420d26a74 verbosesecurity-0.6.ebuild 754
+MD5 a1110d8fe4f87f0a6731e295a504623f ChangeLog 679
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 b22a0d364d55fc3174c3b211d67b1dc0 files/digest-verbosesecurity-0.5 69
+MD5 49b1d8b7dcb3612ad56774a06caf7578 files/digest-verbosesecurity-0.6 69
diff --git a/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild b/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild
index c98e3e109c89..f96a0908034f 100644
--- a/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild
+++ b/net-zope/verbosesecurity/verbosesecurity-0.5.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/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild,v 1.1 2003/10/11 21:12:18 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/verbosesecurity/verbosesecurity-0.5.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
-inherit zproduct
+inherit zproduct eutils
 
 DESCRIPTION="Zope Product which explains the reason for denied security access"
 HOMEPAGE="http://hathaway.freezope.org/Software/VerboseSecurity"
@@ -20,7 +20,6 @@ pkg_preinst() {
 	ewarn "This product does a 'monkey patch' to Zope."
 	ewarn "One of the results being that zope will execute a little slower."
 	echo
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1 ; echo -ne "\a" ; sleep 1
-	sleep 8
+	ebeep 5
+	epause 8
 }
diff --git a/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild b/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild
index f1e5aa7306a0..a60d584111ac 100644
--- a/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild
+++ b/net-zope/verbosesecurity/verbosesecurity-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/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild,v 1.1 2005/01/13 20:56:11 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/verbosesecurity/verbosesecurity-0.6.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit zproduct eutils
 
diff --git a/net-zope/xmlwidgets/ChangeLog b/net-zope/xmlwidgets/ChangeLog
index 1a22d0cf3b59..27cc47eaeb53 100644
--- a/net-zope/xmlwidgets/ChangeLog
+++ b/net-zope/xmlwidgets/ChangeLog
@@ -1,9 +1,57 @@
 # ChangeLog for net-zope/xmlwidgets
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/ChangeLog,v 1.1 2003/03/25 12:17:56 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  04 May 2005; David Holm <dholm@gentoo.org> xmlwidgets-0.11.ebuild:
+  Added to ~ppc.
+
+*xmlwidgets-0.11 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -xmlwidgets-0.8.5.ebuild, +xmlwidgets-0.11.ebuild:
+  removed oldest version.
+
+*xmlwidgets-0.11 (28 Mar 2005)
+
+  28 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +xmlwidgets-0.11.ebuild:
+  version bump
+
+  21 Feb 2005; Simon Stelling <blubb@gentoo.org> xmlwidgets-0.10.3.ebuild:
+  added ~amd64
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  xmlwidgets-0.10.3.ebuild:
+  Stable on x86, for silva1.1 release for 2004.3
+
+*xmlwidgets-0.10.3 (28 Sep 2004)
+
+  28 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +xmlwidgets-0.10.3.ebuild:
+  Version bump.
+
+  05 Apr 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  xmlwidgets-0.8.5.ebuild:
+  down to ~ppc until deps are stable
+
+*xmlwidgets-0.9 (23 Jun 2003)
+ 
+  13 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> :
+  Added missing changelog entry.
+
+*xmlwidgets-0.8.5 (22 Jun 2003)
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> xmlwidgets-0.9.ebuild:
+  Version bump. Marked as unstable.
+
+  22 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> xmlwidgets-0.8.5.ebuild:
+  Version bump. Marked as stable. Removed 0.8.4
 
 *xmlwidgets-0.8.4 (25 Mar 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> xmlwidgets-0.8.4.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   25 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> xmlwidgets-0.8.4.ebuild:
   Initial import. #14050
 
diff --git a/net-zope/xmlwidgets/Manifest b/net-zope/xmlwidgets/Manifest
index e69de29bb2d1..9be43eb4fac7 100644
--- a/net-zope/xmlwidgets/Manifest
+++ b/net-zope/xmlwidgets/Manifest
@@ -0,0 +1,8 @@
+MD5 5543bd80d6dce38c3b8e18ae5f00b926 ChangeLog 1700
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 f95dfeeb9984b3ce1022cb488d62fe52 xmlwidgets-0.9.ebuild 498
+MD5 358e9fab51d6e0a76b6f10b6d3470af5 xmlwidgets-0.10.3.ebuild 509
+MD5 8e34c768e527ef25d9dfbe3717150565 xmlwidgets-0.11.ebuild 513
+MD5 1efe8a9ad483223417e3f456a93f2d94 files/digest-xmlwidgets-0.9 62
+MD5 6dcc73f65e47d5a38483ed2cf57dc65f files/digest-xmlwidgets-0.10.3 65
+MD5 ee4bc79266ddd4c325369af3247a557b files/digest-xmlwidgets-0.11 63
diff --git a/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild b/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild
index 6a4663ce3d1b..7e1349576d48 100644
--- a/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild
+++ b/net-zope/xmlwidgets/xmlwidgets-0.10.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/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild,v 1.1 2004/09/28 15:26:27 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/xmlwidgets-0.10.3.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.infrae.com/download/XMLWidgets"
 SRC_URI="${HOMEPAGE}/${PV}/XMLWidgets-${PV}.tgz"
 LICENSE="ZPL"
 IUSE=""
-KEYWORDS="~x86"
+KEYWORDS="x86 ~amd64"
 RDEPEND=">=net-zope/parsedxml-1.4
 	${RDEPEND}"
 
diff --git a/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild b/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild
index fccbacd671e5..7f6ba8b11fdf 100644
--- a/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild
+++ b/net-zope/xmlwidgets/xmlwidgets-0.11.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/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild,v 1.1 2005/03/28 15:56:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/xmlwidgets-0.11.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.infrae.com/download/XMLWidgets"
 SRC_URI="${HOMEPAGE}/${PV}/XMLWidgets-${PV}.tgz"
 LICENSE="ZPL"
 IUSE=""
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~x86 ~amd64 ~ppc"
 RDEPEND=">=net-zope/parsedxml-1.4
 	${RDEPEND}"
 
diff --git a/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild b/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild
index 73ce7f112df7..3f7623d3f134 100644
--- a/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild
+++ b/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 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/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild,v 1.1 2003/06/23 04:37:34 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xmlwidgets/xmlwidgets-0.9.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,8 +10,6 @@ SRC_URI="${HOMEPAGE}/XMLWidgets-${PV}.tgz"
 LICENSE="ZPL"
 KEYWORDS="~x86 ~ppc"
 RDEPEND=">=net-zope/parsedxml-1.3.1
-         ${RDEPEND}"
+	${RDEPEND}"
 
 ZPROD_LIST="XMLWidgets"
-
-
diff --git a/net-zope/xron/ChangeLog b/net-zope/xron/ChangeLog
index 0f88ee180288..a7b8c6b9ac18 100644
--- a/net-zope/xron/ChangeLog
+++ b/net-zope/xron/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-zope/xron
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/xron/ChangeLog,v 1.1 2003/10/03 21:43:20 robbat2 Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xron/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+  15 Dec 2003; <spider@gentoo.org> xron-0.0.10.ebuild:
+  QA: fixing chown user.group to user:group, bug #35127
 
 *xron-0.0.10 (03 Oct 2003)
 
diff --git a/net-zope/xron/Manifest b/net-zope/xron/Manifest
index 5d3ab1250038..20f2556da33d 100644
--- a/net-zope/xron/Manifest
+++ b/net-zope/xron/Manifest
@@ -1,2 +1,4 @@
-MD5 aa57940fcea3de3b2a4ceafad248d6bb xron-0.0.10.ebuild 568
+MD5 365b971a5de80e9964a368f24385cbcb xron-0.0.10.ebuild 771
+MD5 dd3577ed4171e734cb5763edcf117497 ChangeLog 432
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 39696e8d743f1d3af5a595aea8096fa8 files/digest-xron-0.0.10 59
diff --git a/net-zope/xron/xron-0.0.10.ebuild b/net-zope/xron/xron-0.0.10.ebuild
index 814716b3e457..452b7f6ce345 100644
--- a/net-zope/xron/xron-0.0.10.ebuild
+++ b/net-zope/xron/xron-0.0.10.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/net-zope/xron/xron-0.0.10.ebuild,v 1.1 2003/10/03 21:43:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/xron/xron-0.0.10.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
@@ -20,7 +20,7 @@ src_install() {
 	zproduct_src_install
 	# fix permissions on files
 	DIR=${D}/usr/share/zproduct/${PF}
-	find ${DIR} -exec chown zope.root \{} \;
+	find ${DIR} -exec chown zope:root \{} \;
 	find ${DIR} -exec chmod 644 \{} \;
 	find ${DIR} -type d -exec chmod +x \{} \;
 }
diff --git a/net-zope/zaaplugins/ChangeLog b/net-zope/zaaplugins/ChangeLog
index 5f05ec92b791..01207b7024dc 100644
--- a/net-zope/zaaplugins/ChangeLog
+++ b/net-zope/zaaplugins/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-zope/zaaplugins
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zaaplugins/ChangeLog,v 1.1 2004/09/26 21:08:52 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zaaplugins/ChangeLog,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
+
+  14 Oct 2004; David Holm <dholm@gentoo.org> zaaplugins-2.12.ebuild:
+  Added to ~ppc.
 
 *zaaplugins-2.12 (26 Sep 2004)
 
diff --git a/net-zope/zaaplugins/Manifest b/net-zope/zaaplugins/Manifest
index aec6851d26e7..93b44f12d43f 100644
--- a/net-zope/zaaplugins/Manifest
+++ b/net-zope/zaaplugins/Manifest
@@ -1,2 +1,4 @@
-MD5 c18f38a4a4566f75c3010f309ad2520b zaaplugins-2.12.ebuild 712
+MD5 fd0b491f1514e906255d8a118a5f54e8 ChangeLog 503
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 d8e014256654ad229feac0599671748d zaaplugins-2.12.ebuild 867
 MD5 94ae0a564a438639fff6ed536f4b9a95 files/digest-zaaplugins-2.12 68
diff --git a/net-zope/zaaplugins/zaaplugins-2.12.ebuild b/net-zope/zaaplugins/zaaplugins-2.12.ebuild
index 39586951655f..bddfc0a7fcfb 100644
--- a/net-zope/zaaplugins/zaaplugins-2.12.ebuild
+++ b/net-zope/zaaplugins/zaaplugins-2.12.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/net-zope/zaaplugins/zaaplugins-2.12.ebuild,v 1.1 2004/09/26 21:08:52 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zaaplugins/zaaplugins-2.12.ebuild,v 1.1.1.1 2005/11/30 10:11:07 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="A collection of ZAttachmentAttribute Plugins"
 HOMEPAGE="http://ingeniweb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ingeniweb/ZAAPlugins-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND=">=net-zope/zattachmentattribute-2.12
 		>=app-text/wv-1.0.0
diff --git a/net-zope/zattachmentattribute/ChangeLog b/net-zope/zattachmentattribute/ChangeLog
index fcca9d989550..7089556c4399 100644
--- a/net-zope/zattachmentattribute/ChangeLog
+++ b/net-zope/zattachmentattribute/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-zope/zattachmentattribute
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zattachmentattribute/ChangeLog,v 1.1 2004/09/26 21:06:17 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zattachmentattribute/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  14 Oct 2004; David Holm <dholm@gentoo.org>
+  zattachmentattribute-2.13.ebuild:
+  Added to ~ppc.
 
 *zattachmentattribute-2.13 (26 Sep 2004)
 
diff --git a/net-zope/zattachmentattribute/Manifest b/net-zope/zattachmentattribute/Manifest
index 7ddfc7054f7e..163dbd281ce5 100644
--- a/net-zope/zattachmentattribute/Manifest
+++ b/net-zope/zattachmentattribute/Manifest
@@ -1,2 +1,4 @@
-MD5 09608754c745e6d1b9bb18b2f7dbcbd2 zattachmentattribute-2.13.ebuild 784
+MD5 c518f0b0f5c25937ee7bba1378c225c1 ChangeLog 526
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 4c1dccfcad400698a3004538e36b26a1 zattachmentattribute-2.13.ebuild 790
 MD5 0e18a2ffcff72a009e88fec2847668e3 files/digest-zattachmentattribute-2.13 76
diff --git a/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild b/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild
index 8b8ae07e546e..00cd9a1cd3cb 100644
--- a/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild
+++ b/net-zope/zattachmentattribute/zattachmentattribute-2.13.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/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild,v 1.1 2004/09/26 21:06:17 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zattachmentattribute/zattachmentattribute-2.13.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,7 @@ DESCRIPTION="ZAttachmentAttribute simplifies the use of simple attachment files
 HOMEPAGE="http://ingeniweb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/ingeniweb/ZAttachmentAttribute-${PV}.tar.gz"
 LICENSE="ZPL"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 IUSE=""
 
 DEPEND=">=net-zope/cmf-1.4.2-r1
diff --git a/net-zope/zfspath/ChangeLog b/net-zope/zfspath/ChangeLog
index 99c728348540..f489afde1066 100644
--- a/net-zope/zfspath/ChangeLog
+++ b/net-zope/zfspath/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-zope/zfspath
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zfspath/ChangeLog,v 1.1 2004/09/25 21:13:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zfspath/ChangeLog,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> zfspath-1.0.1.ebuild:
+  Added to ~ppc.
+
+*zfspath-1.0.1 (25 Sep 2004)
+
+  25 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> zfspath-1.0.1.ebuild:
+  added IUSE as its not inherited from eclass.
 
   25 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> :
   Initial version ebuild by Daniel Palmer <onenonly@itmanagers.net>.
diff --git a/net-zope/zfspath/Manifest b/net-zope/zfspath/Manifest
index 14490799e9a7..be87f549d9d0 100644
--- a/net-zope/zfspath/Manifest
+++ b/net-zope/zfspath/Manifest
@@ -1,4 +1,4 @@
-MD5 90a3a05773fb45bd5dc5f832d0a02602 zfspath-1.0.1.ebuild 562
-MD5 9bc8f8b2d6f7f4f7070daa896b3d4eb2 ChangeLog 243
+MD5 533524945372d118c3e08e672cf26588 ChangeLog 569
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 b878b40ffe4006a7e7fa9dfd594c3688 zfspath-1.0.1.ebuild 673
 MD5 1482dfa309d08b331731acdacec69a4b files/digest-zfspath-1.0.1 61
diff --git a/net-zope/zfspath/zfspath-1.0.1.ebuild b/net-zope/zfspath/zfspath-1.0.1.ebuild
index 6904ca09143c..c90506b049fd 100644
--- a/net-zope/zfspath/zfspath-1.0.1.ebuild
+++ b/net-zope/zfspath/zfspath-1.0.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/net-zope/zfspath/zfspath-1.0.1.ebuild,v 1.1 2004/09/25 21:13:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zfspath/zfspath-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:04 chriswhite Exp $
 
 inherit zproduct
 
@@ -8,7 +8,8 @@ DESCRIPTION="Zope product to allow access to the filesystem."
 HOMEPAGE="http://zope.org/Members/asterisk/ZFSPath/"
 SRC_URI="http://zope.org/Members/asterisk/ZFSPath/${PV}/ZFSPath-${PV}.tgz"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
+IUSE=""
 RDEPEND=">=net-zope/zope-2.6.4
 	    ${RDEPEND}"
 
diff --git a/net-zope/zmysqlda/ChangeLog b/net-zope/zmysqlda/ChangeLog
index f75aebbbadaf..d02acc9979e4 100644
--- a/net-zope/zmysqlda/ChangeLog
+++ b/net-zope/zmysqlda/ChangeLog
@@ -1,9 +1,31 @@
 # ChangeLog for net-zope/zmysqlda
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/ChangeLog,v 1.1 2003/03/07 03:52:09 kutsuya Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*zmysqlda-2.0.8-r1 (02 Jan 2005)
+
+  02 Jan 2005; Jodok Batlogg <batlogg@gentoo.org>; +zmysqlda-2.0.8-r1.ebuild:
+  fix for #71398, dependency >=dev-python/python-mysql-1.0
+
+  24 Oct 2004; Sven Wegener <swegener@gentoo.org> zmysqlda-2.0.8.ebuild:
+  Fixed LICENSE syntax and broken Manifest.
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> zmysqlda-2.0.8.ebuild:
+  fix -py21 dependency
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> zmysqlda-2.0.8-r1.ebuild:
+  remove this version again, the patch caused breakage
+
+*zmysqlda-2.0.8-r1 (19 Jan 2004)
+
+  19 Jan 2004; Heinrich Wendel <lanius@gentoo.org> zmysqlda-2.0.8-r1.ebuild:
+  added solution2u.net patch
 
 *zmysqlda-2.0.8 (06 Mar 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> zmysqlda-2.0.8.ebuild:
+  ~x86 -> x86 and added ~ppc
+
   06 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> zmysqlda-2.0.8.ebuild:
   Initial import.
 
diff --git a/net-zope/zmysqlda/Manifest b/net-zope/zmysqlda/Manifest
index e69de29bb2d1..6c188fdc9a9d 100644
--- a/net-zope/zmysqlda/Manifest
+++ b/net-zope/zmysqlda/Manifest
@@ -0,0 +1,6 @@
+MD5 6128180c743d71e2fdd058b8b713e125 zmysqlda-2.0.8-r1.ebuild 587
+MD5 8818d0f49475cf835b38c30a60a5d325 zmysqlda-2.0.8.ebuild 585
+MD5 fda3d6d31e246c8efbc15d53b0b0e8be ChangeLog 1100
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 e9a7a5cd66f90aedf983fdfcef9f2c36 files/digest-zmysqlda-2.0.8 65
+MD5 e9a7a5cd66f90aedf983fdfcef9f2c36 files/digest-zmysqlda-2.0.8-r1 65
diff --git a/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8-r1 b/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8-r1
index 7f97bc2883f8..369742138c35 100644
--- a/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8-r1
+++ b/net-zope/zmysqlda/files/digest-zmysqlda-2.0.8-r1
@@ -1 +1 @@
-MD5 f1bfc87f5c4dbadf5b5e0228075d7cd7 zmysqlda-2.0.8-s2upatch.tar.gz 21970
+MD5 74332272e53b13c6b19d3185d575699c ZMySQLDA-2.0.8.tar.gz 12442
diff --git a/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild b/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild
index 485933ac7226..4cb6d3e5017d 100644
--- a/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild
+++ b/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild
@@ -1,16 +1,17 @@
-# 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/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild,v 1.1 2004/01/19 14:33:10 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/zmysqlda-2.0.8-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
+S="${WORKDIR}/lib/python/Products/"
 
 DESCRIPTION="A MySQL Database Adapter(DA) for zope."
 HOMEPAGE="http://sourceforge.net/projects/mysql-python"
-SRC_URI="http://www.gentoo.at/distfiles/zmysqlda-2.0.8-s2upatch.tar.gz"
-LICENSE="GPL-2 | CNRI"
+SRC_URI="mirror://sourceforge/mysql-python/ZMySQLDA-${PV}.tar.gz"
+LICENSE="|| ( GPL-2 CNRI )"
 KEYWORDS="~x86 ~ppc"
-RDEPEND=">=dev-python/mysql-python-py21-0.9.2
+RDEPEND=">=dev-python/mysql-python-1.0
 	${RDEPEND}"
 
 ZPROD_LIST="ZMySQLDA"
-
+IUSE=""
diff --git a/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild b/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
index fe988dcbab94..5e6dc8094b6e 100644
--- a/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
+++ b/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2002-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/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild,v 1.1 2003/03/07 03:52:09 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zmysqlda/zmysqlda-2.0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 S="${WORKDIR}/lib/python/Products/"
@@ -8,10 +8,10 @@ S="${WORKDIR}/lib/python/Products/"
 DESCRIPTION="A MySQL Database Adapter(DA) for zope."
 HOMEPAGE="http://sourceforge.net/projects/mysql-python"
 SRC_URI="mirror://sourceforge/mysql-python/ZMySQLDA-${PV}.tar.gz"
-LICENSE="GPL-2 | CNRI"
-KEYWORDS="~x86"
-RDEPEND=">=dev-python/mysql-python-py21-0.9.2 
+LICENSE="|| ( GPL-2 CNRI )"
+KEYWORDS="x86 ~ppc"
+RDEPEND=">=dev-python/mysql-python-0.9.2
 	${RDEPEND}"
 
 ZPROD_LIST="ZMySQLDA"
-
+IUSE=""
diff --git a/net-zope/zodb/ChangeLog b/net-zope/zodb/ChangeLog
index 1cfba16c04e9..e0c90bb394e3 100644
--- a/net-zope/zodb/ChangeLog
+++ b/net-zope/zodb/ChangeLog
@@ -1,10 +1,99 @@
 # ChangeLog for net-zope/zodb
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/ChangeLog,v 1.1 2003/10/30 13:23:17 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+*zodb-3.5.1 (01 Oct 2005)
+
+  01 Oct 2005; Chris Bainbridge <chrb@gentoo.org> +zodb-3.5.1.ebuild:
+  Version bump. This corresponds to the ZODB that will ship in Zope 3.1.0
+  final. ZODB 3.5.1 contains (just) a few bugfixes relative to 3.5.0,
+  involving Zope 3's zeoctl and mkzeoinst scripts, and the ZopeUndo.Prefix
+  class.
+
+*zodb-3.5.0 (10 Sep 2005)
+
+  10 Sep 2005; Chris Bainbridge <chrb@gentoo.org> +zodb-3.5.0.ebuild:
+  Version bump to 3.5.0, which corresponds to the ZODB in Zope 3.1. ZODB 3.5
+  cannot be used with Zope 2.7 or earlier. Removed some cruft from the ebuild,
+  corrected SLOTS.
+
+*zodb-3.4.1 (10 Aug 2005)
+
+  10 Aug 2005; Chris Bainbridge <chrb@gentoo.org> +zodb-3.4.1.ebuild:
+  Zodb version bump - this is the version that will ship with Zope 2.8.1. It
+  includes bugfixes for memory leaks and ZEO client cache tracing. It does not
+  support Zope 2.6 or 2.7.
+
+*zodb-3.2.9 (08 Jul 2005)
+
+  08 Jul 2005; Radoslaw Stachowiak <radek@gentoo.org> -zodb-3.2.6.ebuild,
+  +zodb-3.2.9.ebuild:
+  version bump
+
+  11 Jun 2005; David Holm <dholm@gentoo.org> zodb-3.4.0.ebuild:
+  Added to ~ppc.
+
+*zodb-3.4.0 (10 Jun 2005)
+
+  10 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org> +zodb-3.4.0.ebuild:
+  version bump
+
+  06 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org> -zodb-3.2.5.ebuild,
+  zodb-3.2.8.ebuild, zodb-3.3.1.ebuild:
+  removed old 3.2.5 ebuild
+  stable on x86 for 3.2.8 and 3.3.1
+
+*zodb-3.2.8 (08 May 2005)
+
+  08 May 2005; Radoslaw Stachowiak <radek@gentoo.org> +zodb-3.2.8.ebuild,
+  -zodb-3.3.ebuild:
+  version bump, and removed 3.3.0
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> zodb-3.2.6.ebuild:
+  stable on x86 for zodb-3.2.6 (10 days earlier but its by purpose)
+
+*zodb-3.3.1 (15 Apr 2005)
+
+  15 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/zodb-3.3.1_umaskbug.patch, +zodb-3.3.1.ebuild:
+  3.3slot version bump
+
+  10 Apr 2005; Simon Stelling <blubb@gentoo.org> zodb-3.2.6.ebuild:
+  added ~amd64
+
+  08 Apr 2005; Seemant Kulleen <seemant@gentoo.org> zodb-3.3.ebuild:
+  marked testing on amd64
+
+  04 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> :
+  Fixed patch to nooffset version, closing bug #85798
+
+*zodb-3.2.6 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +zodb-3.2.6.ebuild:
+  version bump
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/zodb-3.3_umaskbug.patch, zodb-3.3.ebuild:
+  Fixed bug 85798, using information from Henk Spaaij <zaai@spaaij.net>.
+
+  19 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> zodb-3.2.5.ebuild,
+  -zodb-3.2.ebuild:
+  marked 3.2.5 stable on x86
+  removed unnecesary old 3.2.ebuild
+
+*zodb-3.2.5 (14 Jan 2005)
+
+  14 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org> +zodb-3.2.5.ebuild:
+  new release (compatible with zope-2.7.4). added slot 3.2.
+
+*zodb-3.3 (14 Oct 2004)
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> +zodb-3.3.ebuild:
+  New release of ZODB.
 
 *zodb-3.2 (30 Oct 2003)
 
   30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> metadata.xml,
   zodb-3.2.ebuild:
-  initial release, thx to Axxackall <axxackall@yahoo.com> #32033
+  initial release, thx to Thomas Eckert <eckert.thomas@gmx.net> #31968
 
diff --git a/net-zope/zodb/Manifest b/net-zope/zodb/Manifest
index 224d3cb183a8..3debc6123467 100644
--- a/net-zope/zodb/Manifest
+++ b/net-zope/zodb/Manifest
@@ -1,3 +1,17 @@
-MD5 02c3df837dfbe450e2f7b215181edced zodb-3.2.ebuild 606
+MD5 9dde5c17148090afccb8be3cfc964649 ChangeLog 3263
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 36032654af7eb3f0bfe2cffd89884416 files/digest-zodb-3.2 61
+MD5 399820563467ed67eb17a91be0d9d495 zodb-3.2.8.ebuild 620
+MD5 7fe8aae559966a4f5e10cbb99dae84da zodb-3.2.9.ebuild 621
+MD5 65893b0816da3a9513e272105ca81614 zodb-3.3.1.ebuild 740
+MD5 3740dcb62c6784df9849c0e2364e536a zodb-3.4.0.ebuild 740
+MD5 0d855454f68dad39082c57c2aad4c826 zodb-3.4.1.ebuild 739
+MD5 4639db8bf1a78ca716347320d2d4190f zodb-3.5.0.ebuild 518
+MD5 ed6105d2b80f6f79b12060660b69efec zodb-3.5.1.ebuild 518
+MD5 4b4349967cd390c49c5f8b7f6d991f14 files/zodb-3.3.1_umaskbug.patch 704
+MD5 9142c6655945c0e3d7b51811d3450654 files/digest-zodb-3.4.0 61
+MD5 269f8c9bd2bc1984f206920eda497856 files/digest-zodb-3.5.0 61
+MD5 3d574bdd418fdbcf73684f535731af8f files/digest-zodb-3.3.1 61
+MD5 cbb73e06606a55c4a9bce4d3a69a1119 files/digest-zodb-3.4.1 61
+MD5 bba3dd71ab0181e4c5df51ae064986a7 files/digest-zodb-3.5.1 61
+MD5 27a91b40c9701da470369eda322ef786 files/digest-zodb-3.2.8 60
+MD5 ccd57537a21261a171605e4205d626d0 files/digest-zodb-3.2.9 60
diff --git a/net-zope/zodb/zodb-3.2.8.ebuild b/net-zope/zodb/zodb-3.2.8.ebuild
index 72db12651c06..cf3fbaeec816 100644
--- a/net-zope/zodb/zodb-3.2.8.ebuild
+++ b/net-zope/zodb/zodb-3.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/net-zope/zodb/zodb-3.2.8.ebuild,v 1.1 2005/05/08 19:34:30 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.2.8.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="${HOMEPAGE}/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
 IUSE=""
 LICENSE="ZPL"
 SLOT="3.2"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 
 DEPEND=">=dev-lang/python-2.3.4"
 
diff --git a/net-zope/zodb/zodb-3.2.9.ebuild b/net-zope/zodb/zodb-3.2.9.ebuild
index 64b81dcd48a9..bd195df0a65c 100644
--- a/net-zope/zodb/zodb-3.2.9.ebuild
+++ b/net-zope/zodb/zodb-3.2.9.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/net-zope/zodb/zodb-3.2.9.ebuild,v 1.1 2005/07/08 21:08:38 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.2.9.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-zope/zodb/zodb-3.3.1.ebuild b/net-zope/zodb/zodb-3.3.1.ebuild
index 2b47937cdcfc..55cbf5982469 100644
--- a/net-zope/zodb/zodb-3.3.1.ebuild
+++ b/net-zope/zodb/zodb-3.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/net-zope/zodb/zodb-3.3.1.ebuild,v 1.1 2005/04/15 16:56:42 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.3.1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://zope.org/Products/${MY_P}3.3/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
 
 LICENSE="ZPL"
 SLOT="3.3"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.3.4"
diff --git a/net-zope/zodb/zodb-3.4.0.ebuild b/net-zope/zodb/zodb-3.4.0.ebuild
index 263e679081af..e4ff86ccaf7d 100644
--- a/net-zope/zodb/zodb-3.4.0.ebuild
+++ b/net-zope/zodb/zodb-3.4.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/net-zope/zodb/zodb-3.4.0.ebuild,v 1.1 2005/06/10 19:43:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.4.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://zope.org/Products/ZODB3.4"
 SRC_URI="http://zope.org/Products/${MY_P}3.4/${MY_P}%20${PV}/${MY_P}3-${PV}.tgz"
 LICENSE="ZPL"
 SLOT="3.4"
-KEYWORDS="~x86"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 DEPEND=">=dev-lang/python-2.3.5"
diff --git a/net-zope/zodb/zodb-3.4.1.ebuild b/net-zope/zodb/zodb-3.4.1.ebuild
index 0c3b65c9edf6..08b9dae9cbbb 100644
--- a/net-zope/zodb/zodb-3.4.1.ebuild
+++ b/net-zope/zodb/zodb-3.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/net-zope/zodb/zodb-3.4.1.ebuild,v 1.1 2005/08/10 19:59:32 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.4.1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-zope/zodb/zodb-3.5.0.ebuild b/net-zope/zodb/zodb-3.5.0.ebuild
index a3732e8345e5..94db8421cff5 100644
--- a/net-zope/zodb/zodb-3.5.0.ebuild
+++ b/net-zope/zodb/zodb-3.5.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/net-zope/zodb/zodb-3.5.0.ebuild,v 1.1 2005/09/10 22:13:45 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.5.0.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-zope/zodb/zodb-3.5.1.ebuild b/net-zope/zodb/zodb-3.5.1.ebuild
index b0feb19f3234..fa5bf25649bf 100644
--- a/net-zope/zodb/zodb-3.5.1.ebuild
+++ b/net-zope/zodb/zodb-3.5.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/net-zope/zodb/zodb-3.5.1.ebuild,v 1.1 2005/10/01 16:38:27 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zodb/zodb-3.5.1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-zope/zope/ChangeLog b/net-zope/zope/ChangeLog
index 904226cf3b1f..62096b548f20 100644
--- a/net-zope/zope/ChangeLog
+++ b/net-zope/zope/ChangeLog
@@ -1,38 +1,362 @@
 # ChangeLog for net-zope/zope
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: 
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/ChangeLog,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
-06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords 
+  23 Oct 2005; Simon Stelling <blubb@gentoo.org> zope-2.7.8.ebuild:
+  stable on amd64 wrt bug 109087
+
+  20 Oct 2005; Mark Loeser <halcy0n@gentoo.org> zope-2.7.8.ebuild:
+  Stable on x86; bug #109087
+
+*zope-2.8.3 (19 Oct 2005)
+
+  19 Oct 2005; Radoslaw Stachowiak <radek@gentoo.org> +zope-2.8.3.ebuild:
+  version bump, closes bug #109087
+
+  18 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> zope-2.7.8.ebuild:
+  Stable on alpha, bug 109087.
+
+  18 Oct 2005; Michael Hanselmann <hansmi@gentoo.org> zope-2.7.8.ebuild:
+  Stable on ppc.
+
+  18 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> zope-2.7.8.ebuild:
+  Stable on sparc wrt #109087
+
+*zope-2.8.2 (17 Oct 2005)
+*zope-2.7.8 (17 Oct 2005)
+
+  17 Oct 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/2.7.8/i18n-1.0.0.patch, +zope-2.7.8.ebuild, +zope-2.8.2.ebuild:
+  version bump in 2.7 and 2.8. also fixes security bug #109087
+
+  18 Sep 2005; Simon Stelling <blubb@gentoo.org> zope-2.8.1.ebuild:
+  make zope multilib-strict aware; bug 106234
+
+  11 Sep 2005; Aron Griffis <agriffis@gentoo.org> zope-2.7.7.ebuild:
+  Mark 2.7.7 stable on alpha
+
+  26 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.7.ebuild:
+  marking stable on ppc and amd64
+
+  26 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>; zope-2.8.1.ebuild:
+  disabled stx i18n patch
+
+  26 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>; -files/2.7.2/gid.patch,
+  -files/2.7.2/zope.initd, -zope-2.7.2-r2.ebuild, zope-2.8.1.ebuild:
+  cleanup, cosmetic fixes
+
+  25 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>;
+  +files/2.8.1/i18n-1.0.0.patch:
+  #103714 i18n patch was missing
+
+  25 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>;
+  +files/2.7.7/i18n-1.0.0.patch:
+  fix for #103590 - sorry, files were not checked in
+
+*zope-2.8.1 (23 Aug 2005)
+
+  23 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>; +zope-2.7.7.ebuild,
+  zope-2.8.0.ebuild, +zope-2.8.1.ebuild:
+  version bump (2.7.7, 2.8.1), QA #103421
+
+  14 Jun 2005; Jason Wever <weeve@gentoo.org> zope-2.7.6.ebuild:
+  Stable on SPARC.
+
+*zope-2.8.0 (11 Jun 2005)
+
+  11 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/2.7.3/zope.initd, -zope-2.7.3.ebuild, -zope-2.7.4.ebuild,
+  zope-2.7.6.ebuild, +zope-2.8.0.ebuild:
+  added zope-2.8.0 (downgraded all arches to ~)
+  removed obsolete 2.7.3 and 2.7.4 ebuilds
+  marked stable 2.7.6 on x86
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> zope-2.7.5.ebuild:
+  stable on amd64
+
+  14 May 2005; Jason Wever <weeve@gentoo.org> zope-2.7.5.ebuild:
+  Stable on SPARC.
+
+*zope-2.7.6 (08 May 2005)
+
+  08 May 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +files/2.7.6/i18n-1.0.0.patch, zope-2.7.5.ebuild, +zope-2.7.6.ebuild:
+  2.7.5 stable on x86
+  version bump
+
+  21 Apr 2005; Simon Stelling <blubb@gentoo.org> zope-2.7.2-r2.ebuild:
+  stable on amd64
+
+*zope-2.7.5 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +zope-2.7.5.ebuild:
+  Version bump, downgraded all arches to ~
+
+  24 Feb 2005; Jason Wever <weeve@gentoo.org> zope-2.7.4.ebuild:
+  Stable on sparc.
+
+  22 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> zope-2.7.4.ebuild:
+  fixed bug #82707 regarding python-2.3.5 and zope-2.7.4.
+  added --with-python=/usr/bin/python2.3 to configure cmd.
+
+  18 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> zope-2.7.4.ebuild:
+  marked stable on x86.
+
+  14 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
+  -files/2.7.1/zdctl.patch, -files/2.7.1/zope.confd,
+  -files/2.7.1/zope.initd, -zope-2.7.1.ebuild:
+  Remove old zope-2.7.1 at mr_bone_'s requests.
+
+*zope-2.7.4 (14 Jan 2005)
+
+  14 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org> +files/zope.initd,
+  +files/2.7.4/i18n-1.0.0.patch, +zope-2.7.4.ebuild:
+  New version 2.7.4. Changed i18n patch, and moved initd to global FILES.
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+  07 Nov 2004; Jason Wever <weeve@gentoo.org> zope-2.7.3.ebuild:
+  Stable on sparc.
+
+  04 Nov 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.3.ebuild:
+  marked stable on x86
+
+  26 Oct 2004; Jodok Batlogg <batlogg@gentoo.org>; -files/2.7.3/gid.patch,
+  zope-2.7.3.ebuild:
+  removed gid.patch for amd64, #68969
+
+  25 Oct 2004; Jodok Batlogg <batlogg@gentoo.org>; files/2.7.2/zope.initd,
+  files/2.7.3/zope.initd:
+  reload needs to call zope's restart
+
+*zope-2.7.3 (24 Oct 2004)
+
+  24 Oct 2004; Jodok Batlogg <batlogg@gentoo.org>; +files/2.7.3/gid.patch,
+  +files/2.7.3/zope.initd, +zope-2.7.3.ebuild:
+  version bump, unstable on all platforms
+
+  18 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> -zope-2.7.2-r1.ebuild,
+  -zope-2.7.2.ebuild:
+  cleaning unneeded ebuilds.
+
+  03 Oct 2004; Jason Wever <weeve@gentoo.org> zope-2.7.2-r2.ebuild:
+  Stable on sparc.
+
+  02 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> zope-2.6.4-r1.ebuild,
+  zope-2.7.1.ebuild, zope-2.7.2-r1.ebuild:
+  Removed sed calls from global scope. Bug 66021.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/2.7.2/zope.initd:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
+
+  26 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> zope-2.6.4-r1.ebuild:
+  Fixed permission problem (775/664 or 755/644 depending on new/present
+  installation). Removed default instance creation at emerge time (zope-config
+  gives errors).
+
+  26 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> zope-2.7.2-r2.ebuild:
+  fixed bug #65254, removed init.d dir creation, changed --prefix to .
+
+  24 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.2-r2.ebuild:
+  marked as stable on x86 and ppc
+
+  20 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.2-r2.ebuild:
+  missing /
+
+*zope-2.7.2-r2 (18 Sep 2004)
+
+  18 Sep 2004; Jodok Batlogg <batlogg@gentoo.org>; files/2.7.2/zope.initd,
+  +zope-2.7.2-r2.ebuild:
+  removed instance creation stuff, this port now only installs the base, zope
+  user and group are only created for backward compatiblity. CAUTION: you need
+  to emerge zope-config manually if you want the ncurses interfaces. thanks to
+  Bernd Dorn.
+
+  18 Sep 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.7.2-r1.ebuild:
+  fix double slashes, bug #63915
+
+  11 Sep 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.7.2-r1.ebuild:
+  fix permissions, bug #59217
+
+  06 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> zope-2.6.4-r1.ebuild:
+  Switch to use epause and ebeep, bug #62950
+
+  01 Aug 2004; Tom Martin <slarti@gentoo.org> zope-2.7.2.ebuild:
+  Marked ~amd64, added gid.patch. Closing bug 48696 (thanks to Markus Gapp
+  <markus.gapp@tznets.com>.
+
+  27 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.6.4-r1.ebuild,
+  zope-2.7.1.ebuild, zope-2.7.2.ebuild:
+  fixed #58526, QA issues with enew inside pkg_setup
+
+  25 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.2.ebuild:
+  readding ZS_DIR and ZI_DIR
+
+  25 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; :
+  improving initscript
+
+  25 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; :
+  cleaning up
+
+*zope-2.7.2 (24 Jul 2004)
+
+  24 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; +files/2.7.2/zope.initd,
+  +zope-2.7.2.ebuild:
+  adding changes from #41508, simplifying initscript, moving instance home,
+  quite a lot of other changes
+
+  20 Jul 2004; Lars Weiler <pylon@gentoo.org> zope-2.6.4-r1.ebuild:
+  Stable on ppc.
+
+  15 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.1.ebuild:
+  virtual/glibc -> virtual/libc, oops once more
+
+  14 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.4.0-r6.ebuild,
+  zope-2.5.1.ebuild, zope-2.6.4.ebuild:
+  repoman qa fixes
+
+*zope-2.7.1 (14 Jul 2004)
+
+  14 Jul 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.7.1.ebuild,
+  files/2.7.1/zdctl.patch, files/2.7.1/zope.confd, files/2.7.1/zope.initd:
+  finally zope-2.7.1 made it's way to portage, adding user commited eduilds and
+  patches from #41508
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> zope-2.4.0-r6.ebuild,
+  zope-2.5.1.ebuild, zope-2.6.4-r1.ebuild, zope-2.6.4.ebuild:
+  virtual/glibc -> virtual/libc
+
+  25 Jun 2004; Aron Griffis <agriffis@gentoo.org> zope-2.4.0-r6.ebuild,
+  zope-2.5.1.ebuild:
+  QA - fix use invocation
+
+  24 May 2004; Bryan Østergaard <kloeri@gentoo.org> zope-2.6.4-r1.ebuild:
+  Keyworded ~alpha, requested in bug #51550.
+
+  11 Apr 2004; Jason Wever <weeve@gentoo.org> zope-2.6.4-r1.ebuild:
+  Stable on sparc.
+
+  02 Apr 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.6.4-r1.ebuild:
+  change utf-8 use flag to global unicode useflag
+
+  27 Mar 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.6.4-r1.ebuild:
+  mark zope-2.6.4-r1 stable on x86
+
+  26 Mar 2004; Jodok Batlogg <batlogg@gentoo.org>; zope-2.6.3.ebuild:
+  zope 2.6.3 is known to be buggy. it's better to take it out of portage
+
+  29 Mar 2004; Heinrich Wendel <lanius@gentoo.org> files/2.6.4/zope.initd:
+  fix 2.6.1 <> 2.6.4 in zope init script, bug #45892
+
+  15 Mar 2004; David Holm <dholm@gentoo.org> zope-2.6.4-r1.ebuild:
+  Added to ~ppc.
+
+*zope-2.6.4-r1 (14 Mar 2004)
+
+  14 Mar 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.6.4-r1.ebuild,
+  files/2.6.4/zope.confd, files/2.6.4/zope.initd:
+  some fixes from solution2u.net, bug #42111
+
+  05 Mar 2004; David Holm <dholm@gentoo.org> zope-2.6.4.ebuild:
+  Added to ~ppc.
+
+  17 Feb 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.6.4.ebuild:
+  mark stable, it fixes some serious bugs from 2.6.3
+
+*zope-2.6.4 (12 Feb 2004)
+
+  12 Feb 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.6.4.ebuild,
+  zope-2.6.4_rc1.ebuild:
+  version bump
+
+*zope-2.6.4_rc1 (21 Jan 2004)
+
+  21 Jan 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.4.0-r6.ebuild,
+  zope-2.5.1.ebuild, zope-2.6.3.ebuild, zope-2.6.4_rc1.ebuild,
+  files/i18n-1.0.0.patch:
+  version bump
+  added slot
+  added i18n stx patch
+
+*zope-2.6.3 (17 Jan 2004)
+
+  17 Jan 2004; Heinrich Wendel <lanius@gentoo.org> zope-2.6.1.ebuild,
+  zope-2.6.2-r1.ebuild, zope-2.6.2.ebuild, zope-2.6.3.ebuild:
+  security update
+
+  05 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> zope-2.4.0-r6.ebuild,
+  zope-2.5.1.ebuild, zope-2.6.1.ebuild, zope-2.6.2-r1.ebuild,
+  zope-2.6.2.ebuild, files/zope, files/zope.rc6:
+  fix tail -1 issue and copyright headers, remove ppc keywords as they don't
+  have a valid python.
+
+  15 Dec 2003; <spider@gentoo.org> zope-2.4.0-r6.ebuild, zope-2.5.1.ebuild:
+  QA: fixing chown user.group to user:group, bug #35127
+
+  13 Dec 2003; Heinrich Wendel <lanius@gentoo.org> zope-2.6.2-r1.ebuild:
+  fixed depend stuff
+
+*zope-2.6.2-r1 (10 Dec 2003)
+
+  10 Dec 2003; Heinrich Wendel <lanius@gentoo.org> zope-2.6.2-r1.ebuild:
+  added support for specifying python version, thx to Andy Dustman
+  <andy-gentoo.54e552@dustman.net>, bug #35471
+
+06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+  15 Nov 2003; Heinrich Wendel <lanius@gentoo.org> files/2.6.1/zope.initd:
+  bug #33228, fixed init script status() function
+
+*zope-2.6.2 (30 Oct 2003)
+
+  30 Oct 2003; Heinrich Wendel <lanius@gentoo.org> zope-2.6.0-r1.ebuild,
+  zope-2.6.0-r2.ebuild, zope-2.6.0-r3.ebuild, zope-2.6.0.ebuild,
+  zope-2.6.2.ebuild:
+  version bump, cleanups (enewuser, enewgroup), bug #32073
+
+  10 Oct 2003; Robin H. Johnson <robbat2@gentoo.org> zope-2.4.0-r6.ebuild,
+  zope-2.5.1.ebuild:
+  fix bug #28165 - $A setting in ebuilds
+
+  09 Jun 2003; <msterret@gentoo.org> zope-2.6.0-r1.ebuild:
+  DEPEND on sed >= 4 in zope-2.6.0-r1.ebuild
 
 *zope-2.6.1 (26 Feb 2003)
 
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-2.6.1.ebuild:
+  Stopped removal of /etc files. ~x86 -> x86 and added ~ppc
+
   03 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> : Moving from net-www to     net-zope.
 
-  26 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : Version bump.	
+  26 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : Version bump.
 
 *zope-2.6.0-r3 (25 Feb 2003)
 
-  25 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-r2.initd : A bug fix 
-  revision mostly. Fixed dependencies. Changed SLOT back to 0, hopefully this 
+  25 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-r2.initd : A bug fix
+  revision mostly. Fixed dependencies. Changed SLOT back to 0, hopefully this
   won't cause too much trouble. Changed 'zope' user abit in pkg_seup().Added
   RCNAME as a global varibale to ease revising the rcscripts. Fixed 'example
-  zope applications,' which was mention by Macros73 to be missing. Also added 
-  the option, for developers, of using virtual/python with 
-  PYTHON_SLOT_VERSION=VIRTUAL. 
+  zope applications,' which was mention by Macros73 to be missing. Also added
+  the option, for developers, of using virtual/python with
+  PYTHON_SLOT_VERSION=VIRTUAL.
 
 *zope-2.6.0-r2 (16 Feb 2003)
 
   16 Feb 2003; Jason Shoemaker <kutsuya@gentoo.org> : A major revision.
   New rcscript (along with zope-config) makes it possible to have several zope
-  instances runing at the same time. Also has better PID management fixing 
-  #14173. /etc/env.d/zope and /etc/conf.d/zope are now placed in 
+  instances runing at the same time. Also has better PID management fixing
+  #14173. /etc/env.d/zope and /etc/conf.d/zope are now placed in
   /etc/conf.d/zope-2_6_0. Also added a DateTime patch. Improved security.
-  
+
 *zope-2.6.0-r1 (23 Nov 2002)
 
+  10 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> zope-2.6.0-r1.ebuild:
+  Fixed some typos, and corrected stated location of ebuild. #17258
+
   23 Nov 2002; Grant Goodyear <g2boojum@gentoo.org> zope-2.6.0-r1.ebuild :
   Added ebuild from Bug #10758 (thanks to Maurizio Disimino!) which should
-  ensure that python 2.1.3* is used, the init script is now properly 
+  ensure that python 2.1.3* is used, the init script is now properly
   located in /etc/init.d, and probably one or two other fixes.
 
 *zope-2.6.0 (24 Oct 2002)
@@ -41,12 +365,12 @@
   Security update. Ebuild contributed by Jason S <kutsuya1@yahoo.com> in #9474.
 
 *zope-2.5.1 (2 Jul 2002)
-	
+
   2 Jul 2002; Jon Nelson <jnelson@gentoo.org> zope-2.5.1.ebuild:
-  Use python 2.1.3 ebuild explicitly  
+  Use python 2.1.3 ebuild explicitly
   Thanks for Matt Behrens <matt@zigg.com>
   Hopefully closes #468
-  
+
 *unreleased-as-yet-still-using-masked-zope-2.4.0-r6
 
   1 Jul 2002; Jon Nelson <jnelson@gentoo.org> zope-2.4.0-r6:
@@ -57,4 +381,4 @@
 *zope-2.4.0-r6 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog : Initial import.
-  
+
diff --git a/net-zope/zope/Manifest b/net-zope/zope/Manifest
index e69de29bb2d1..dc34792c7813 100644
--- a/net-zope/zope/Manifest
+++ b/net-zope/zope/Manifest
@@ -0,0 +1,29 @@
+MD5 2b3460b2cde28f638933351f6089321a ChangeLog 13765
+MD5 a18ddd3f2cdcb815cf86f4b9c4bdd6fe files/2.6.4/zope.confd 950
+MD5 4d278d26bb7be7693f7213861a9d3805 files/2.6.4/zope.initd 3791
+MD5 c97d6dc27b456ae0fbfdf8ee5627ac1b files/2.7.4/i18n-1.0.0.patch 7630
+MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.6/i18n-1.0.0.patch 7634
+MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.7/i18n-1.0.0.patch 7634
+MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.7.8/i18n-1.0.0.patch 7634
+MD5 adfe59eaafb05edb1c4a445563b04c08 files/2.8.1/i18n-1.0.0.patch 7634
+MD5 ddddbf81a9803fef7474cb22df00a924 files/digest-zope-2.6.4-r1 64
+MD5 515774f7b0464e0ce8c3283141c676c7 files/digest-zope-2.7.5 66
+MD5 8bf817c4c3e6ad2b06e92a95c6ffd7e0 files/digest-zope-2.7.6 66
+MD5 5d8e83203542dfc8d07354dcdd682134 files/digest-zope-2.7.7 66
+MD5 dd38699498b0cab29b7eb5df48c4674a files/digest-zope-2.7.8 66
+MD5 17edb3696d5d99b37864d9bb7cc23d21 files/digest-zope-2.8.0 69
+MD5 47255f0bd3319908dc8ee081f6c8cf17 files/digest-zope-2.8.1 66
+MD5 e1516616e08b645a062860a4903fa4fe files/digest-zope-2.8.2 69
+MD5 f26477bbd15c975a265ea05f285e728e files/digest-zope-2.8.3 66
+MD5 037cf91a5b4d60efe166f90210c837ed files/i18n-1.0.0.patch 8080
+MD5 28b31acf9b00b4388850af2acd90b2e3 files/zope.initd 1232
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 5416407eff85546578bb4e7c61f45d5e zope-2.6.4-r1.ebuild 5629
+MD5 42625ed029875b4d13c9af34f02aa7ed zope-2.7.5.ebuild 3334
+MD5 e3ebbd463da7c5b7f7cacd4d79323c46 zope-2.7.6.ebuild 3335
+MD5 8664a857f90291f6bd82968b54b23e0d zope-2.7.7.ebuild 3332
+MD5 7d64d093b4a5953de46ae0c53f831649 zope-2.7.8.ebuild 3329
+MD5 03dd7525a3392e245889fba308edc438 zope-2.8.0.ebuild 3362
+MD5 a51712c4e56687605942d3c914c60d31 zope-2.8.1.ebuild 3512
+MD5 6e4ba5b7bd92b20ad3f28cb7e3158deb zope-2.8.2.ebuild 3515
+MD5 0ce3afe5cd3f944a3fa984afa74a43af zope-2.8.3.ebuild 3512
diff --git a/net-zope/zope/files/2.6.4/zope.initd b/net-zope/zope/files/2.6.4/zope.initd
index 355211f43f69..0a2b3d76b8d1 100644
--- a/net-zope/zope/files/2.6.4/zope.initd
+++ b/net-zope/zope/files/2.6.4/zope.initd
@@ -2,7 +2,7 @@
 # Zope rc-script for Gentoo Linux
 # Copyright 2002-2003 by Jason Shoemaker
 # Distributed under the terms of the GNU General Public License, v2 or later.
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.6.4/zope.initd,v 1.1 2004/03/14 12:32:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/2.6.4/zope.initd,v 1.1.1.1 2005/11/30 10:11:10 chriswhite Exp $
 
 python=
 
@@ -130,8 +130,8 @@ start_zope()
     if [ "${RESULT}" -eq 0 ] ; then
 	setup_exports
 	umask 077    # Recommended by Zope
-	# "normal" logfile: e.g. /var/log/zope/zope-2_6_1, 
-	# startup log: /var/log/zope/zope-2_6_1.log
+	# "normal" logfile: e.g. /var/log/zope/zope-2_6_4, 
+	# startup log: /var/log/zope/zope-2_6_4.log
 	env /usr/bin/${python} ${ZOPE_HOME}z2.py ${ZOPE_OPTS} > \
 	    ${EVENT_LOG_FILE}.log 2>&1 &
 	RESULT=${?}
diff --git a/net-zope/zope/files/zope.initd b/net-zope/zope/files/zope.initd
index 191ef17c6c8e..3aded1b86f5b 100644
--- a/net-zope/zope/files/zope.initd
+++ b/net-zope/zope/files/zope.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/zope.initd,v 1.1 2005/01/14 21:16:20 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/files/zope.initd,v 1.1.1.1 2005/11/30 10:11:10 chriswhite Exp $
 
 opts="start stop reload kill quit status help"
 
diff --git a/net-zope/zope/zope-2.6.4-r1.ebuild b/net-zope/zope/zope-2.6.4-r1.ebuild
index fa200edb8891..233cf0d6f409 100644
--- a/net-zope/zope/zope-2.6.4-r1.ebuild
+++ b/net-zope/zope/zope-2.6.4-r1.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/net-zope/zope/zope-2.6.4-r1.ebuild,v 1.1 2004/03/14 12:32:15 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.6.4-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit eutils
 
@@ -10,8 +10,8 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-src.tgz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~x86 ~sparc"
-IUSE="utf8"
+KEYWORDS="x86 sparc ppc ~alpha"
+IUSE="unicode"
 
 # This is for developers that wish to test Zope with virtual/python.
 # If this is a problem, let me know right away. --kutsuya@gentoo.org
@@ -34,14 +34,14 @@ RDEPEND="${RDEPEND}
 !net-zope/verbosesecurity"
 
 DEPEND="${RDEPEND}
-virtual/glibc
+virtual/libc
 >=sys-apps/sed-4.0.5
 >=app-admin/zope-config-0.3"
 
 S="${WORKDIR}/Zope-${PV}-src"
 
 ZUID=zope
-ZGID=$(echo ${P} |sed -e "s:\.:_:g")
+ZGID=${P//./_}
 ZS_DIR=${ROOT}/usr/share/zope/
 ZI_DIR=${ROOT}/var/lib/zope/
 ZSERVDIR=${ZS_DIR}/${PF}/
@@ -57,6 +57,10 @@ RCNAME=zope.initd
 # * Other's should not have any access to ${ZSERVDIR},
 #   because they can work through the Zope web interface.
 #   This should protect our code/data better.
+#
+# UPDATE: ${ZSERVDIR} is a lib directory and should be world readable
+# like e.g /usr/lib/python we do not store any user data there,
+# currently removed all custom permission stuff, for ${ZSERVDIR}
 
 # Parameters:
 #  $1 = instance directory
@@ -65,14 +69,18 @@ RCNAME=zope.initd
 setup_security() {
 	chown -R ${ZUID}:${2} ${1}
 	chmod -R g+u ${1}
-	chmod -R o-rwx ${1}
+	# 20040926 <radek@gentoo.org> changed, due to errors in ebuild and policy
+	chmod -R go+rX ${1}
 }
 
 install_help() {
-	einfo "Need to setup an inituser (admin) before executing zope:"
-		einfo "\tzope-config --zpasswd"
-		einfo "To execute default Zope instance:"
-		einfo "\t/etc/init.d/${ZGID} start"
+	einfo "Be warned that you need at least one zope instance to run zope."
+	einfo "Please emerge zope-config for futher instance management."
+}
+
+pkg_preinst() {
+	enewgroup ${ZGID}
+	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
 }
 
 pkg_setup() {
@@ -85,14 +93,12 @@ pkg_setup() {
 					fi
 					ewarn "Zope Corp. only recommends using python-2.1.3 "
 					ewarn "with this version of zope. Emerge at your own risk."
-					sleep 12
+					epause 12
 	fi
-	enewgroup ${ZGID}
-	enewuser ${ZUID} 261 /bin/bash ${ZS_DIR} ${ZGID}
 }
 
 src_compile() {
-	$python wo_pcgi.py || die "Failed to compile."
+	${python} wo_pcgi.py || die "Failed to compile."
 }
 
 src_install() {
@@ -111,9 +117,9 @@ src_install() {
 	# If this is a problem, let me know right away. --batlogg@solution2u.net
 	# I wondering if we need a USE flag for this and wheter we can set the
 	# sys.encoding automtically
-	# so i defined a use flag utf-8
+	# so i defined a use flag
 
-	if use utf8; then
+	if use unicode; then
 		einfo "Patching structured text"
 		einfo "make sure you have set the system pythong encoding to utf-8"
 		einfo "create the file sitecusomize.py inside your site-packages"
@@ -162,8 +168,8 @@ src_install() {
 
 pkg_postinst() {
 	# Here we add our default zope instance.
-	/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} \
-		--zgid=${ZGID}
+	# UPDATE 20040925: disabled due to zope-config, errors
+	#/usr/sbin/zope-config --zserv=${ZSERVDIR} --zinst=${ZINSTDIR} --zgid=${ZGID}
 	install_help
 }
 
@@ -173,7 +179,7 @@ pkg_postrm() {
 	# Delete .default if this ebuild is the default. zprod-manager will
 	# have to handle a missing default;
 	local VERSION_DEF="$(zope-config --zidef-get)"
-	if [ "${ZGID}" = "$VERSION_DEF" ] ; then
+	if [ "${ZGID}" = "${VERSION_DEF}" ] ; then
 		rm -f ${ZI_DIR}/.default
 	fi
 }
diff --git a/net-zope/zope/zope-2.7.5.ebuild b/net-zope/zope/zope-2.7.5.ebuild
index 40a3e8048dd3..5a06a35e7731 100644
--- a/net-zope/zope/zope-2.7.5.ebuild
+++ b/net-zope/zope/zope-2.7.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/net-zope/zope/zope-2.7.5.ebuild,v 1.1 2005/03/26 02:07:10 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.5.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="~alpha amd64 ~ppc sparc x86"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
diff --git a/net-zope/zope/zope-2.7.6.ebuild b/net-zope/zope/zope-2.7.6.ebuild
index bf1601a6691d..760ad3642cb6 100644
--- a/net-zope/zope/zope-2.7.6.ebuild
+++ b/net-zope/zope/zope-2.7.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/net-zope/zope/zope-2.7.6.ebuild,v 1.1 2005/05/08 20:03:47 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.6.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~x86 ~sparc ~ppc ~alpha ~amd64"
+KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
diff --git a/net-zope/zope/zope-2.7.7.ebuild b/net-zope/zope/zope-2.7.7.ebuild
index 78a8f58cbb44..a58e1dc00170 100644
--- a/net-zope/zope/zope-2.7.7.ebuild
+++ b/net-zope/zope/zope-2.7.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/net-zope/zope/zope-2.7.7.ebuild,v 1.1 2005/08/23 19:48:57 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.7.ebuild,v 1.1.1.1 2005/11/30 10:11:10 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~alpha ~amd64 ~ppc sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
diff --git a/net-zope/zope/zope-2.7.8.ebuild b/net-zope/zope/zope-2.7.8.ebuild
index afe314cca99c..cf0132712cc7 100644
--- a/net-zope/zope/zope-2.7.8.ebuild
+++ b/net-zope/zope/zope-2.7.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/net-zope/zope/zope-2.7.8.ebuild,v 1.1 2005/10/17 22:05:29 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.7.8.ebuild,v 1.1.1.1 2005/11/30 10:11:10 chriswhite Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.zope.org/Products/Zope/${PV}/Zope-${PV}-final.tgz"
 LICENSE="ZPL"
 SLOT="${PV}"
 
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE="unicode"
 
 RDEPEND="=dev-lang/python-2.3*"
diff --git a/net-zope/zope/zope-2.8.0.ebuild b/net-zope/zope/zope-2.8.0.ebuild
index 59f24b225936..68d3b569278d 100644
--- a/net-zope/zope/zope-2.8.0.ebuild
+++ b/net-zope/zope/zope-2.8.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/net-zope/zope/zope-2.8.0.ebuild,v 1.1 2005/06/11 11:56:33 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.0.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit eutils
 
@@ -24,7 +24,7 @@ S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
 ZS_DIR=${ROOT%/}/usr/lib
-ZSERVDIR=${ZS_DIR}/${PN}-${PV}
+ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
 # Security plan:
@@ -92,7 +92,7 @@ pkg_postinst() {
 	# create the zope user and group for backward compatibility
 	enewgroup ${ZGID} 261
 	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
-	enewuser ${ZUID} 261 /bin/false /var/lib/zope  ${ZGID}
+	enewuser ${ZUID} 261 -1 /var/lib/zope  ${ZGID}
 
 	einfo "Be warned that you need at least one zope instance to run zope."
 	einfo "Please emerge zope-config for futher instance management."
diff --git a/net-zope/zope/zope-2.8.1.ebuild b/net-zope/zope/zope-2.8.1.ebuild
index 4acf80802503..c0e05d8615d7 100644
--- a/net-zope/zope/zope-2.8.1.ebuild
+++ b/net-zope/zope/zope-2.8.1.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/net-zope/zope/zope-2.8.1.ebuild,v 1.1 2005/08/23 19:48:57 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.1.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
-inherit eutils
+inherit eutils multilib
 
 DESCRIPTION="Zope is a web application platform used for building high-performance, dynamic web sites."
 HOMEPAGE="http://www.zope.org"
@@ -23,7 +23,7 @@ virtual/libc
 S="${WORKDIR}/Zope-${PV}-final"
 ZUID=zope
 ZGID=zope
-ZS_DIR=${ROOT%/}/usr/lib
+ZS_DIR=${ROOT%/}/usr/$(get_libdir)
 ZSERVDIR=${ZS_DIR}/${P}
 
 # Narrow the scope of ownership/permissions.
@@ -72,8 +72,10 @@ src_install() {
 		einfo "create the file sitecustomize.py inside your site-packages"
 	 	einfo "import sys"
 		einfo "sys.setdefaultencoding('utf8')"
-		cd ${S}/lib/python/StructuredText/
-		epatch ${FILESDIR}/2.7.6/i18n-1.0.0.patch
+		# stx i18n support borked. --batlogg@gentoo.org
+		ewarn "sorry, the Structured Text patch doesn't work yet for zope-2.8."
+		#cd ${S}/lib/python/StructuredText/
+		#epatch ${FILESDIR}/${PV}/i18n-1.0.0.patch
 		sleep 15
 		cd ${S}
 	fi
@@ -92,7 +94,7 @@ pkg_postinst() {
 	# create the zope user and group for backward compatibility
 	enewgroup ${ZGID} 261
 	usermod -g ${ZGID} ${ZUID} 2>&1 >/dev/null || \
-	enewuser ${ZUID} 261 -1 /var/lib/zope  ${ZGID}
+	enewuser ${ZUID} 261 -1 /var/$(get_libdir)/zope  ${ZGID}
 
 	einfo "Be warned that you need at least one zope instance to run zope."
 	einfo "Please emerge zope-config for futher instance management."
diff --git a/net-zope/zope/zope-2.8.2.ebuild b/net-zope/zope/zope-2.8.2.ebuild
index 3d0e88f13077..f647b315b9d8 100644
--- a/net-zope/zope/zope-2.8.2.ebuild
+++ b/net-zope/zope/zope-2.8.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/net-zope/zope/zope-2.8.2.ebuild,v 1.1 2005/10/17 22:05:29 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.2.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit eutils multilib
 
diff --git a/net-zope/zope/zope-2.8.3.ebuild b/net-zope/zope/zope-2.8.3.ebuild
index a9a86cd0e04b..efe26c005151 100644
--- a/net-zope/zope/zope-2.8.3.ebuild
+++ b/net-zope/zope/zope-2.8.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/net-zope/zope/zope-2.8.3.ebuild,v 1.1 2005/10/19 20:47:01 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zope/zope-2.8.3.ebuild,v 1.1.1.1 2005/11/30 10:11:09 chriswhite Exp $
 
 inherit eutils multilib
 
diff --git a/net-zope/zopeedit/ChangeLog b/net-zope/zopeedit/ChangeLog
index 2ef43fb22e33..fe1d219f8837 100644
--- a/net-zope/zopeedit/ChangeLog
+++ b/net-zope/zopeedit/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-zope/zopeedit
-# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeedit/ChangeLog,v 1.1 2004/01/22 14:41:34 lanius Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeedit/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*zopeedit-0.8 (02 Jan 2005)
+
+  02 Jan 2005; Jodok Batlogg <batlogg@gentoo.org>; zopeedit-0.7.ebuild,
+  +zopeedit-0.8.ebuild:
+  revision bump, repoman fixes, marked x86
+
+  10 Jul 2004; Danny van Dyk <kugelfang@gentoo.org> zopeedit-0.7.ebuild:
+  Marked ~amd64.
 
 *zopeedit-0.7 (22 Jan 2004)
 
diff --git a/net-zope/zopeedit/Manifest b/net-zope/zopeedit/Manifest
index c9e600866ae9..578c077544f0 100644
--- a/net-zope/zopeedit/Manifest
+++ b/net-zope/zopeedit/Manifest
@@ -1,2 +1,6 @@
-MD5 8751ef2593ce7fe6d7405968d2ece69b zopeedit-0.7.ebuild 616
+MD5 c54d858edfc30f89eb0ce77b08ebca09 zopeedit-0.8.ebuild 667
+MD5 37161c1e02bdb03193a5051ab13c2e70 zopeedit-0.7.ebuild 664
+MD5 9fef197eebbc6b0bda2f0060ed31ba6c ChangeLog 619
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 0fac49e75295b33ebd93019d2b974500 files/digest-zopeedit-0.7 64
+MD5 1deb880f90eaa25b5676acbc2df72241 files/digest-zopeedit-0.8 64
diff --git a/net-zope/zopeedit/zopeedit-0.7.ebuild b/net-zope/zopeedit/zopeedit-0.7.ebuild
index db301a565c53..b3943ad967c1 100644
--- a/net-zope/zopeedit/zopeedit-0.7.ebuild
+++ b/net-zope/zopeedit/zopeedit-0.7.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/net-zope/zopeedit/zopeedit-0.7.ebuild,v 1.1 2004/01/22 14:41:34 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeedit/zopeedit-0.7.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit distutils
 
@@ -8,6 +8,7 @@ DESCRIPTION="The ExternalEditor is a Zope product and configurable helper applic
 HOMEPAGE="http://www.zope.org/Members/Caseman/ExternalEditor/"
 SRC_URI="http://www.zope.org/Members/Caseman/ExternalEditor/0.7/zopeedit-${PV}-src.tgz"
 LICENSE="ZPL"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 SLOT="0"
+IUSE=""
 S=${WORKDIR}/${PN}-${PV}-src
diff --git a/net-zope/zopeedit/zopeedit-0.8.ebuild b/net-zope/zopeedit/zopeedit-0.8.ebuild
index 9ed052bf45ca..da2d68da2821 100644
--- a/net-zope/zopeedit/zopeedit-0.8.ebuild
+++ b/net-zope/zopeedit/zopeedit-0.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/net-zope/zopeedit/zopeedit-0.8.ebuild,v 1.1 2005/01/02 14:17:40 batlogg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeedit/zopeedit-0.8.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit distutils
 
diff --git a/net-zope/zopeinterface/ChangeLog b/net-zope/zopeinterface/ChangeLog
index 68cd31247516..139071305df7 100644
--- a/net-zope/zopeinterface/ChangeLog
+++ b/net-zope/zopeinterface/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for net-zope/zopeinterface
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/ChangeLog,v 1.1 2004/11/09 18:17:07 radek Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/ChangeLog,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
+
+  05 Nov 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  zopeinterface-3.0.1.ebuild:
+  marked ~alpha as a dep of twisted
+
+  23 Aug 2005; Jodok Batlogg <batlogg@gentoo.org>; zopeinterface-3.0.1.ebuild:
+  QA #103487, cp parameters
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> zopeinterface-3.0.1.ebuild:
+  added ~amd64 keyword
+
+  15 May 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  zopeinterface-3.0.1.ebuild:
+  stable on x86
+
+  14 May 2005; Mark Loeser <halcy0n@gentoo.org>
+  +files/zopeinterface-3.0.1-gcc4.patch, zopeinterface-3.0.1.ebuild:
+  GCC4 compile fix; bug #91924
+
+  30 Apr 2005; David Holm <dholm@gentoo.org> zopeinterface-3.0.1.ebuild:
+  Added to ~ppc.
+
+  09 Apr 2005; Jason Wever <weeve@gentoo.org> zopeinterface-3.0.1.ebuild:
+  Added ~sparc keyword.
+
+  18 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  zopeinterface-3.0.1.ebuild:
+  changed cp -a to --recursive (portage ownership bug)
+
+*zopeinterface-3.0.1 (17 Feb 2005)
+
+  17 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  +zopeinterface-3.0.1.ebuild:
+  version bump.
+
+  11 Nov 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  zopeinterface-3.0.0.ebuild:
+  fix HOMEPAGE and use invocation
 
 *zopeinterface-3.0.0 (09 Nov 2004)
 
diff --git a/net-zope/zopeinterface/Manifest b/net-zope/zopeinterface/Manifest
index 83b545281d91..01b816088b36 100644
--- a/net-zope/zopeinterface/Manifest
+++ b/net-zope/zopeinterface/Manifest
@@ -1,3 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1e7e9a0e5edf31aa4ffcab9cc7e260a5 zopeinterface-3.0.1.ebuild 811
+MD5 e1f0a6bd9f3b97c575138e475d59e930 ChangeLog 1589
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 568b98a447d29af71702746227865517 zopeinterface-3.0.0.ebuild 601
+MD5 207c6814bd1934b0c530c11ff5019b8e zopeinterface-3.0.0.ebuild 712
 MD5 f272ae0b346de2f2e7081d1e314329e2 files/digest-zopeinterface-3.0.0 68
+MD5 6b53a0ef10de6ad609d5c345b0ab424d files/digest-zopeinterface-3.0.1 68
+MD5 bf5b2fab1194b14762c644e97169a595 files/zopeinterface-3.0.1-gcc4.patch 752
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbSdbViELBEf1JB0RAi+OAJ4yXPKDUAuSZ1MTqw/flLCIHZgsOACcCd/Z
+KQ4Mg+Yl/16VEvooxsNzizU=
+=DuG/
+-----END PGP SIGNATURE-----
diff --git a/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild b/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild
index 620829d0e046..e5068aaba203 100644
--- a/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild
+++ b/net-zope/zopeinterface/zopeinterface-3.0.0.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/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild,v 1.1 2004/11/09 18:17:07 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/zopeinterface-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit distutils
 
 MY_PN="ZopeInterface"
 
 DESCRIPTION="Standalone Zope interface library"
-HOMEPAGE="http://zope.org/Products/${MY_PN}"
+HOMEPAGE="http://zope.org/Products/ZopeInterface"
 SRC_URI="http://www.zope.org/Products/${MY_PN}/${PV}/${MY_PN}-${PV}.tgz"
 LICENSE="ZPL"
 
@@ -23,7 +23,7 @@ src_install() {
 
 	distutils_src_install
 
-	if [ `use doc` ]; then
+	if use doc ; then
 		cp -a $MY_PN ${D}/usr/share/doc/${PF}/
 	fi
 }
diff --git a/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild b/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild
index edcc420203db..c2ae36cc21b6 100644
--- a/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild
+++ b/net-zope/zopeinterface/zopeinterface-3.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/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild,v 1.1 2005/02/17 14:27:06 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopeinterface/zopeinterface-3.0.1.ebuild,v 1.1.1.1 2005/11/30 10:11:02 chriswhite Exp $
 
 inherit distutils
 
@@ -12,19 +12,25 @@ SRC_URI="http://www.zope.org/Products/${MY_PN}/${PV}final/${MY_PN}-${PV}.tgz"
 LICENSE="ZPL"
 
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc x86"
 IUSE="doc"
 
 RDEPEND=">=dev-lang/python-2.3"
 
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+src_unpack() {
+	unpack ${A}
+
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_install() {
 
 	distutils_src_install
 
 	if use doc ; then
-		cp -a $MY_PN ${D}/usr/share/doc/${PF}/
+		cp -pR $MY_PN ${D}/usr/share/doc/${PF}/
 	fi
 }
 
diff --git a/net-zope/zopex3/ChangeLog b/net-zope/zopex3/ChangeLog
index 5fc442e13d2b..95d596689808 100644
--- a/net-zope/zopex3/ChangeLog
+++ b/net-zope/zopex3/ChangeLog
@@ -1,6 +1,44 @@
 # ChangeLog for net-zope/zopex3
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zopex3/ChangeLog,v 1.1 2004/09/27 19:45:56 radek Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopex3/ChangeLog,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
+
+  17 Oct 2005; Radoslaw Stachowiak <radek@gentoo.org> zopex3-3.0.0.ebuild:
+  fixed bug #109482
+
+  21 May 2005; Simon Stelling <blubb@gentoo.org> zopex3-3.0.0.ebuild:
+  added ~amd64 keyword
+
+  21 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> :
+  Strictly specified python version to allow zope to work with 2.3.5+
+
+  18 Feb 2005; Radoslaw Stachowiak <radek@gentoo.org> zopex3-3.0.0.ebuild,
+  -zopex3-3.0.0_rc3.ebuild:
+  removed old rc3 ebuild, marked stable 3.0.0
+
+  08 Nov 2004; Radoslaw Stachowiak <radek@gentoo.org> +zopex3-3.0.0.ebuild:
+  New FINAL release of ZOPEx3.
+
+*zopex3-3.0.0_rc3 (27 Oct 2004)
+
+  27 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +zopex3-3.0.0_rc3.ebuild:
+  Version bump.
+
+  18 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  -zopex3-3.0.0_rc1.ebuild:
+  Removed old ebuild, obsoleted by rc2.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> zopex3-3.0.0_rc2.ebuild:
+  Added to ~ppc.
+
+*zopex3-3.0.0_rc2 (08 Oct 2004)
+
+  08 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +zopex3-3.0.0_rc2.ebuild:
+  New version released.
+
+  28 Sep 2004; Sven Wegener <swegener@gentoo.org> files/zope.initd:
+  Gentoo Technologies, Inc. -> Gentoo Foundation
 
 *zopex3-3.0.0_rc1 (27 Sep 2004)
 
diff --git a/net-zope/zopex3/Manifest b/net-zope/zopex3/Manifest
index e302a17fa65d..b501a21693a2 100644
--- a/net-zope/zopex3/Manifest
+++ b/net-zope/zopex3/Manifest
@@ -1,4 +1,5 @@
-MD5 2f521e1279f221dbc05d3793757fba13 zopex3-3.0.0_rc1.ebuild 2714
 MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
-MD5 89f6d421e38a89b2ea414facc3a78a26 files/digest-zopex3-3.0.0_rc1 64
-MD5 877fd78114387f2f237d3ca67effd0d7 files/zope.initd 1327
+MD5 8e33e5e8a748636ebcfb64883967dc9b zopex3-3.0.0.ebuild 2679
+MD5 3b627ab62248136f08326a92b5c1ae27 ChangeLog 1592
+MD5 dc6beeaa42a91779d1d707dcd32cc6cb files/zope.initd 1316
+MD5 a7e95c0d99387463b485eb833730f980 files/digest-zopex3-3.0.0 62
diff --git a/net-zope/zopex3/files/zope.initd b/net-zope/zopex3/files/zope.initd
index f08d28ac3255..cb5489f8bc45 100644
--- a/net-zope/zopex3/files/zope.initd
+++ b/net-zope/zopex3/files/zope.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# 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/net-zope/zopex3/files/zope.initd,v 1.1 2004/09/27 19:45:56 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopex3/files/zope.initd,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 opts="start stop restart kill quit status help"
 
diff --git a/net-zope/zopex3/zopex3-3.0.0.ebuild b/net-zope/zopex3/zopex3-3.0.0.ebuild
index 6ff20f7c36f4..fd9fd4e7ad31 100644
--- a/net-zope/zopex3/zopex3-3.0.0.ebuild
+++ b/net-zope/zopex3/zopex3-3.0.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/net-zope/zopex3/zopex3-3.0.0.ebuild,v 1.1 2004/11/08 09:31:28 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zopex3/zopex3-3.0.0.ebuild,v 1.1.1.1 2005/11/30 10:11:05 chriswhite Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ LICENSE="ZPL"
 SLOT="${PV}"
 IUSE=""
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc ~amd64"
 
 RDEPEND="=dev-lang/python-2.3*"
 python='python2.3'
@@ -34,7 +34,7 @@ src_unpack() {
 }
 
 src_compile() {
-	./configure --prefix=${D}${ZSERVDIR} || die "Failed to configure."
+	./configure --prefix=${D}${ZSERVDIR} --with-python=/usr/bin/python2.3 || die "Failed to configure."
 	emake || die "Failed to compile."
 }
 
@@ -63,8 +63,9 @@ src_install() {
 
 pkg_postinst() {
 
-	einfo "This release ($PN) can create default instance. Please use command shown below:"
-	einfo "  ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
+	einfo
+	einfo "This release ($PN) can create default instance using command: ebuild  --config =${PV}"
+	einfo
 }
 
 pkg_prerm() {
diff --git a/net-zope/zphotoslides/ChangeLog b/net-zope/zphotoslides/ChangeLog
index 8d8eedacc4e6..1d9880f30274 100644
--- a/net-zope/zphotoslides/ChangeLog
+++ b/net-zope/zphotoslides/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for net-zope/zphotoslides
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/ChangeLog,v 1.1 2003/04/11 07:07:47 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+  29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
+
+*zphotoslides-2.0 (24 Oct 2004)
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> +zphotoslides-2.0.ebuild:
+  version bump
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> zphotoslides-1.1-r1.ebuild,
+  -zphotoslides-1.1.ebuild:
+  fix -py21 dependency
+
+  19 Jul 2004; Bryan Østergaard <kloeri@gentoo.org>
+  zphotoslides-1.1-r1.ebuild, zphotoslides-1.1.ebuild:
+  dev-python/Imaging renamed to dev-python/imaging.
+
+*zphotoslides-1.1-r1 (18 Jun 2003)
+
+  18 Jun 2003; <msterret@gentoo.org> zphotoslides-1.1-r1.ebuild:
+  update HOMEPAGE and SRC_URI (bug 20512)
 
 *zphotoslides-1.1 (11 Apr 2003)
 
diff --git a/net-zope/zphotoslides/Manifest b/net-zope/zphotoslides/Manifest
index e69de29bb2d1..3e9c2dfbd063 100644
--- a/net-zope/zphotoslides/Manifest
+++ b/net-zope/zphotoslides/Manifest
@@ -0,0 +1,6 @@
+MD5 738a282e6bb2018d40e442342cc44c22 zphotoslides-2.0.ebuild 555
+MD5 fff4b45dee5e063d596f5db3523770a0 ChangeLog 1012
+MD5 6e198fe1bc173c0bcf187e1db29fbef9 zphotoslides-1.1-r1.ebuild 612
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 cb90bc9664693b24399c5d9a3624ccf5 files/digest-zphotoslides-2.0 68
+MD5 8145c1c025b0fca5505c00fddad16298 files/digest-zphotoslides-1.1-r1 69
diff --git a/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild b/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
index 57117c4fec36..df0d826086dc 100644
--- a/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
+++ b/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 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/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild,v 1.1 2003/06/19 05:57:57 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-1.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
@@ -10,9 +10,10 @@ SRC_URI="mirror://sourceforge/zphotoslides/ZPhotoSlides-${PV}b.tar.gz"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc"
 
-RDEPEND=">=dev-python/Imaging-py21-1.1.3
+RDEPEND=">=dev-python/imaging-1.1.3
 	>=net-zope/localfs-1.0.0
 	${RDEPEND}"
 
 ZPROD_LIST="ZPhotoSlides"
 DOTTXT_PROTECT="country-codes.txt ${DOTTXT_PROTECT}"
+IUSE=""
diff --git a/net-zope/zphotoslides/zphotoslides-2.0.ebuild b/net-zope/zphotoslides/zphotoslides-2.0.ebuild
index eec59b06cac9..27f86bf90154 100644
--- a/net-zope/zphotoslides/zphotoslides-2.0.ebuild
+++ b/net-zope/zphotoslides/zphotoslides-2.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/net-zope/zphotoslides/zphotoslides-2.0.ebuild,v 1.1 2004/10/23 22:54:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zphotoslides/zphotoslides-2.0.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/zpsycopgda/ChangeLog b/net-zope/zpsycopgda/ChangeLog
index d74fea006814..2e565118f269 100644
--- a/net-zope/zpsycopgda/ChangeLog
+++ b/net-zope/zpsycopgda/ChangeLog
@@ -1,9 +1,21 @@
 # ChangeLog for net-zope/zpsycopgda
-# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/ChangeLog,v 1.1 2003/03/09 00:26:49 kutsuya Exp $
+# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/ChangeLog,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
+
+*zpsycopgda-1.1.15 (24 Oct 2004)
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> +zpsycopgda-1.1.15.ebuild,
+  zpsycopgda-1.1.2.ebuild:
+  version bump
+
+  24 Oct 2004; Heinrich Wendel <lanius@gentoo.org> zpsycopgda-1.1.2.ebuild:
+  fix -py21 dependency
 
 *zpsycopgda-1.1.2 (08 Mar 2003)
 
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> zpsycopgda-1.1.2.ebuild:
+  ~x86 -> x86 and added ~ppc. Renamed DEPEND variable to RDEPEND
+
   08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> zpsycopgda-1.1.2.ebuild:
   Initial import.
 
diff --git a/net-zope/zpsycopgda/Manifest b/net-zope/zpsycopgda/Manifest
index e69de29bb2d1..899e2cea0682 100644
--- a/net-zope/zpsycopgda/Manifest
+++ b/net-zope/zpsycopgda/Manifest
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3cc93cd324fac11f270761b6f3206db0 zpsycopgda-1.1.15.ebuild 635
+MD5 d911ba7d7a40b923f399e1cce507373c zpsycopgda-1.1.2.ebuild 634
+MD5 40cb0748120d3288c7b2a80a421a3259 ChangeLog 738
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 380e74d272fbd4c4f0d1abd20c23f460 files/digest-zpsycopgda-1.1.2 65
+MD5 8ebd6298fe5d6837e93909612aecf857 files/digest-zpsycopgda-1.1.15 66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBo4tBI1lqEGTUzyQRAvGWAKCCRcxtobtWsfMhOtxV3qlmNxs19gCgx9gy
+vjcc5ozUbL2WvjpQywad/VA=
+=P2bK
+-----END PGP SIGNATURE-----
diff --git a/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild b/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild
index 1fdd9bb4e685..7951feb2eb9c 100644
--- a/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild
+++ b/net-zope/zpsycopgda/zpsycopgda-1.1.15.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/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild,v 1.1 2004/10/23 23:01:03 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/zpsycopgda-1.1.15.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
 inherit zproduct
 S="${WORKDIR}/psycopg-${PV}/"
diff --git a/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild b/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild
index 136e014820e5..542b9370b461 100644
--- a/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild
+++ b/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild
@@ -1,22 +1,23 @@
-# Copyright 2002-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/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild,v 1.1 2003/03/09 00:26:49 kutsuya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zpsycopgda/zpsycopgda-1.1.2.ebuild,v 1.1.1.1 2005/11/30 10:11:03 chriswhite Exp $
 
-inherit zproduct 
+inherit zproduct
 S="${WORKDIR}/psycopg-${PV}/"
 
 DESCRIPTION="PostgreSQL database adapter for Zope."
 SRC_URI="http://initd.org/pub/software/psycopg/psycopg-${PV}.tar.gz"
 HOMEPAGE="http://www.initd.org/software/psycopg.py"
-DEPEND="=dev-python/psycopg-py21-${PV}
-	${DEPEND}"
-KEYWORDS="~x86"
+RDEPEND=">=dev-python/psycopg-${PV}
+	${RDEPEND}"
+KEYWORDS="x86 ~ppc"
 LICENSE="GPL-2"
 
 ZPROD_LIST="ZPsycopgDA"
+IUSE=""
 
 src_compile()
 {
 	rm -f * >& /dev/null
-	rm -fR debian/ doc/ tests/ 
+	rm -fR debian/ doc/ tests/
 }
diff --git a/net-zope/zsyncer/ChangeLog b/net-zope/zsyncer/ChangeLog
index e69de29bb2d1..2ae4c291e4a4 100644
--- a/net-zope/zsyncer/ChangeLog
+++ b/net-zope/zsyncer/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for net-zope/zsyncer
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zsyncer/ChangeLog,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
+
+  23 Apr 2005; Sven Wegener <swegener@gentoo.org> :
+  Created missing ChangeLog.
+
diff --git a/net-zope/zsyncer/Manifest b/net-zope/zsyncer/Manifest
index da8929063707..ce3694ccbb7f 100644
--- a/net-zope/zsyncer/Manifest
+++ b/net-zope/zsyncer/Manifest
@@ -1,2 +1,14 @@
-MD5 99292a5bd7ae0b85bf47eb9fa034a3b9 zsyncer-0.6.1.ebuild 444
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d2258a72fc8b91e40b834e1ae84645d9 zsyncer-0.6.1.ebuild 542
+MD5 fa671f723f66b5fdf93616acd39089f9 ChangeLog 289
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
 MD5 f2a317e0dba55419c6459eb1fc133505 files/digest-zsyncer-0.6.1 61
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCakmII1lqEGTUzyQRAovyAJ9TZp6La9saPFo2mM9OHBrJtmK6BgCfYRNK
+XUcc6LYcA0jd6svYS0+g52U=
+=ImLl
+-----END PGP SIGNATURE-----
diff --git a/net-zope/zsyncer/zsyncer-0.6.1.ebuild b/net-zope/zsyncer/zsyncer-0.6.1.ebuild
index f7235ee489d9..571c7dc2e9d3 100644
--- a/net-zope/zsyncer/zsyncer-0.6.1.ebuild
+++ b/net-zope/zsyncer/zsyncer-0.6.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/net-zope/zsyncer/zsyncer-0.6.1.ebuild,v 1.1 2005/04/19 17:22:51 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zsyncer/zsyncer-0.6.1.ebuild,v 1.1.1.1 2005/11/30 10:11:08 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/zwiki/ChangeLog b/net-zope/zwiki/ChangeLog
index c8bd2614fe43..292ef1c25b47 100644
--- a/net-zope/zwiki/ChangeLog
+++ b/net-zope/zwiki/ChangeLog
@@ -1,6 +1,110 @@
 # ChangeLog for net-zope/zwiki
-# Copyright 2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/ChangeLog,v 1.1 2003/03/03 22:01:08 kutsuya Exp $
+# Copyright 2003-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/ChangeLog,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
+
+*zwiki-0.45 (02 Sep 2005)
+
+  02 Sep 2005; Radoslaw Stachowiak <radek@gentoo.org> +zwiki-0.45.ebuild:
+  version bump
+
+*zwiki-0.44 (28 Aug 2005)
+
+  28 Aug 2005; Radoslaw Stachowiak <radek@gentoo.org> +zwiki-0.44.ebuild:
+  version bump
+
+  28 Aug 2005; Radoslaw Stachowiak <radek@gentoo.org> zwiki-0.42.ebuild:
+  stable on x86
+
+  22 Jun 2005; Jason Wever <weeve@gentoo.org> zwiki-0.42.ebuild:
+  Added ~sparc keyword.
+
+*zwiki-0.42 (06 Jun 2005)
+
+  06 Jun 2005; Radoslaw Stachowiak <radek@gentoo.org>
+  -files/zwiki-0.36.2-r1_xss.patch, -zwiki-0.22.0.ebuild,
+  -zwiki-0.34.0.ebuild, -zwiki-0.36.2.ebuild, -zwiki-0.36.2-r1.ebuild,
+  zwiki-0.40.ebuild, +zwiki-0.42.ebuild:
+  version bump 0.42
+  stable on x86 for 0.40
+  removed old versions
+
+*zwiki-0.40 (03 Apr 2005)
+
+  03 Apr 2005; Radoslaw Stachowiak <radek@gentoo.org> zwiki-0.37.ebuild,
+  -zwiki-0.39.ebuild, +zwiki-0.40.ebuild:
+  Marked stable on x86 0.37
+  Removed ebuild for 0.39
+  Added new version 0.40
+
+*zwiki-0.39 (26 Mar 2005)
+
+  26 Mar 2005; Radoslaw Stachowiak <radek@gentoo.org> +zwiki-0.39.ebuild:
+  version bump
+
+*zwiki-0.37 (14 Jan 2005)
+
+  14 Jan 2005; Radoslaw Stachowiak <radek@gentoo.org> +zwiki-0.37.ebuild:
+  new version.
+
+  21 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  zwiki-0.36.2-r1.ebuild:
+  Marked stable on x86 due to security bug fixed.
+
+*zwiki-0.36.2-r1 (20 Dec 2004)
+
+  20 Dec 2004; Radoslaw Stachowiak <radek@gentoo.org>
+  +zwiki-0.36.2-r1.ebuild:
+  Patched 0.36.2 version due to XSS vulnerability, bug #72315.
+
+*zwiki-0.36.2 (18 Dec 2004)
+
+  18 Dec 2004; Jodok Batlogg <batlogg@gentoo.org>; +zwiki-0.36.2.ebuild:
+  version bump
+  repoman wanted fixes for 0.22.0 - iuse was missing, no digest
+
+  18 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> -zwiki-0.17.0.ebuild,
+  -zwiki-0.19.0.ebuild:
+  cleaning unneeded ebuilds.
+
+  18 Oct 2004; David Holm <dholm@gentoo.org> zwiki-0.34.0.ebuild:
+  Added to ~ppc.
+
+  14 Oct 2004; Radoslaw Stachowiak <radek@gentoo.org> zwiki-0.34.0.ebuild:
+  Marking stable.
+
+*zwiki-0.34.0 (25 Sep 2004)
+
+  25 Sep 2004; Radoslaw Stachowiak <radek@gentoo.org> :
+  version bump to 0.34
+
+*zwiki-0.22.0 (13 Oct 2003)
+
+  13 Oct 2003; Heinrich Wendel <lanius@gentoo.org> zwiki-0.22.0.ebuild:
+  bump
+
+*zwiki-0.19.0 (20 Jun 2003)
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> zwiki-0.17.0.ebuild,
+  zwiki-0.19.0.ebuild: New version. Masked as unstable for all archs.
+
+  20 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> zwiki-0.17.0.ebuild:
+  Added MYDOC variable.
+
+  18 Jun 2003; Jason Shoemaker <kutsuya@gentoo.org> zwiki-0.17.0.ebuild:
+  ~ppc -> ppc
+
+*zwiki-0.17.0 (05 Apr 2003)
+
+  05 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> zwiki-0.17.0.ebuild:
+  Version bumped.
+
+*zwiki-0.16.0 (08 Mar 2003)
+
+  03 Apr 2003; Jason Shoemaker <kutsuya@gentoo.org> zwiki-0.16.0.ebuild:
+  ~x86 -> x86 and added ~ppc
+
+  08 Mar 2003; Jason Shoemaker <kutsuya@gentoo.org> zwiki-0.16.0.ebuild:
+  Version bump.
 
 *zwiki-0.15.0 (03 Mar 2003)
 
diff --git a/net-zope/zwiki/Manifest b/net-zope/zwiki/Manifest
index e69de29bb2d1..41aff7d59b4e 100644
--- a/net-zope/zwiki/Manifest
+++ b/net-zope/zwiki/Manifest
@@ -0,0 +1,12 @@
+MD5 45f730490932542b23d6064ac9763be6 zwiki-0.37.ebuild 483
+MD5 06755b9f06ffda4471f33a7afc6e4a2e zwiki-0.45.ebuild 516
+MD5 067b393c127dccc0a8bec1e1a39773ee zwiki-0.40.ebuild 483
+MD5 9cd6146a73292805c2ffff0494126eeb zwiki-0.42.ebuild 515
+MD5 ae23ac1e69621b1fd0611525a735d44a zwiki-0.44.ebuild 516
+MD5 94490d78ce854110f448a89b41c880b8 ChangeLog 3325
+MD5 7890d88c5c6d189fbe6b187a3ebb6532 metadata.xml 161
+MD5 c5e330ddedbbbd8b06f8d6176cd3f786 files/digest-zwiki-0.37 61
+MD5 1439cea48c2d0dbe1025001a943c8e44 files/digest-zwiki-0.40 61
+MD5 90bd04a9986ba84814ce22ce2fce69e9 files/digest-zwiki-0.42 61
+MD5 1504cc1bd90a6d701f361b8e0d5e7c7a files/digest-zwiki-0.44 61
+MD5 0334460f21a3fcfd2f4dc8cf3a40f060 files/digest-zwiki-0.45 61
diff --git a/net-zope/zwiki/zwiki-0.37.ebuild b/net-zope/zwiki/zwiki-0.37.ebuild
index 105257f273ed..b805d3bd1c4e 100644
--- a/net-zope/zwiki/zwiki-0.37.ebuild
+++ b/net-zope/zwiki/zwiki-0.37.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/net-zope/zwiki/zwiki-0.37.ebuild,v 1.1 2005/01/14 23:03:10 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.37.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="ZWiki"
 MYDOC="ChangeLog GPL.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.40.ebuild b/net-zope/zwiki/zwiki-0.40.ebuild
index 4fdc5a840644..15e097612e99 100644
--- a/net-zope/zwiki/zwiki-0.40.ebuild
+++ b/net-zope/zwiki/zwiki-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/net-zope/zwiki/zwiki-0.40.ebuild,v 1.1 2005/04/03 17:43:18 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.40.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 ZPROD_LIST="ZWiki"
 MYDOC="ChangeLog GPL.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.42.ebuild b/net-zope/zwiki/zwiki-0.42.ebuild
index c5cb06c67610..2b884fd93cdf 100644
--- a/net-zope/zwiki/zwiki-0.42.ebuild
+++ b/net-zope/zwiki/zwiki-0.42.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/net-zope/zwiki/zwiki-0.42.ebuild,v 1.1 2005/06/06 20:22:45 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.42.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://zwiki.org"
 SRC_URI="${HOMEPAGE}/releases/ZWiki-${PV}.0.tgz"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~sparc x86"
 
 ZPROD_LIST="ZWiki"
 MYDOC="CHANGES.txt LICENSE.txt README.txt GPL.txt ${MYDOC}"
diff --git a/net-zope/zwiki/zwiki-0.44.ebuild b/net-zope/zwiki/zwiki-0.44.ebuild
index fc7a26a50163..44fcb355775f 100644
--- a/net-zope/zwiki/zwiki-0.44.ebuild
+++ b/net-zope/zwiki/zwiki-0.44.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/net-zope/zwiki/zwiki-0.44.ebuild,v 1.1 2005/08/28 12:55:47 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.44.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/net-zope/zwiki/zwiki-0.45.ebuild b/net-zope/zwiki/zwiki-0.45.ebuild
index d0dc698c724d..197bccb948a7 100644
--- a/net-zope/zwiki/zwiki-0.45.ebuild
+++ b/net-zope/zwiki/zwiki-0.45.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/net-zope/zwiki/zwiki-0.45.ebuild,v 1.1 2005/09/02 17:25:34 radek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-zope/zwiki/zwiki-0.45.ebuild,v 1.1.1.1 2005/11/30 10:11:06 chriswhite Exp $
 
 inherit zproduct
 
diff --git a/perl-core/CGI/CGI-3.05.ebuild b/perl-core/CGI/CGI-3.05.ebuild
index 2cee90c10210..c8e3f5829bf2 100644
--- a/perl-core/CGI/CGI-3.05.ebuild
+++ b/perl-core/CGI/CGI-3.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/perl-core/CGI/CGI-3.05.ebuild,v 1.1 2005/05/24 14:16:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.05.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/CGI/CGI-3.07.ebuild b/perl-core/CGI/CGI-3.07.ebuild
index fcb6b3091422..28db02e59b0b 100644
--- a/perl-core/CGI/CGI-3.07.ebuild
+++ b/perl-core/CGI/CGI-3.07.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/perl-core/CGI/CGI-3.07.ebuild,v 1.1 2005/05/24 14:16:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.07.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/CGI/CGI-3.09.ebuild b/perl-core/CGI/CGI-3.09.ebuild
index c28058f279dd..60d3169998d8 100644
--- a/perl-core/CGI/CGI-3.09.ebuild
+++ b/perl-core/CGI/CGI-3.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/perl-core/CGI/CGI-3.09.ebuild,v 1.1 2005/05/24 14:16:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.09.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/CGI/CGI-3.10.ebuild b/perl-core/CGI/CGI-3.10.ebuild
index 91cbfdc3b332..d29374fbb03c 100644
--- a/perl-core/CGI/CGI-3.10.ebuild
+++ b/perl-core/CGI/CGI-3.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/perl-core/CGI/CGI-3.10.ebuild,v 1.1 2005/05/24 14:16:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/CGI-3.10.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/CGI/ChangeLog b/perl-core/CGI/ChangeLog
index 47746d2c1d92..ab6a77de2f5d 100644
--- a/perl-core/CGI/ChangeLog
+++ b/perl-core/CGI/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for dev-perl/CGI
+# ChangeLog for perl-core/CGI
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/ChangeLog,v 1.1 2005/05/24 14:16:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/CGI/ChangeLog,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 *CGI-3.05 (24 May 2005)
 
@@ -53,7 +53,7 @@
   19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> CGI-3.05.ebuild:
   Stable on amd64.
 
-  06 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> CGI-3.05.ebuild:
+  06 Oct 2004; Bryan Østergaard <kloeri@gentoo.org> CGI-3.05.ebuild:
   Stable on alpha.
 
   27 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> CGI-3.05.ebuild:
diff --git a/perl-core/CGI/Manifest b/perl-core/CGI/Manifest
index 20d1d606f00b..b7368a2c0b9e 100644
--- a/perl-core/CGI/Manifest
+++ b/perl-core/CGI/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 cf9b7a6fd227d05363144dfe81b58207 CGI-3.10.ebuild 638
-MD5 bd7e830a5920f337e9693b3dd89c5ee6 CGI-3.09.ebuild 632
-MD5 969aaae1c8add533f1217f8abc08e0d7 CGI-3.05.ebuild 598
-MD5 797eafe906da5a1ccce64a1e21b10ad4 ChangeLog 6440
+MD5 b1bdbc350e4524f6f9bf730c151d4cff CGI-3.05.ebuild 599
+MD5 db9fcd1b38525387c0120750cfc6a9c4 CGI-3.07.ebuild 639
+MD5 08bf1b9488f46714d107860d5c23e492 CGI-3.09.ebuild 639
+MD5 0be69fd0b1af1a3f1bed9a4ddab15f47 CGI-3.10.ebuild 639
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 4c755456f1d58b9eb8fec751656527e5 CGI-3.07.ebuild 638
+MD5 eb50fc6ef2e42fdb291499b18c1faac6 ChangeLog 6656
+MD5 e1cdd0f4a93e8a20503212fda36e4912 files/digest-CGI-3.05 63
 MD5 d636390da4b89f77f8d5459b1b863405 files/digest-CGI-3.07 63
-MD5 d656932fa84869904712f20b547ad76d files/digest-CGI-3.10 63
 MD5 95947d372e3976e31909b70bc1cb3053 files/digest-CGI-3.09 63
-MD5 e1cdd0f4a93e8a20503212fda36e4912 files/digest-CGI-3.05 63
+MD5 d656932fa84869904712f20b547ad76d files/digest-CGI-3.10 63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCijGJtG5z4I8BtQoRAv6gAJ0SrimUZa1YHHGyjWzMwXguwZw5BgCfYRUd
-GcEUmyVnAS0opeENIigYd2U=
-=XuXw
+iD8DBQFDK/vNKf2g/qXtneoRAsS0AKCjsHQA2YK1FXVdbd0E5nJOrUwpDgCfT3yT
+ufBsH7ObNhimqDa7vx9w3oM=
+=j/W3
 -----END PGP SIGNATURE-----
diff --git a/perl-core/DB_File/ChangeLog b/perl-core/DB_File/ChangeLog
index d855a02d9eaa..b20e5218fe71 100644
--- a/perl-core/DB_File/ChangeLog
+++ b/perl-core/DB_File/ChangeLog
@@ -1,6 +1,31 @@
-# ChangeLog for dev-perl/DB_File
+# ChangeLog for perl-core/DB_File
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/ChangeLog,v 1.1 2005/05/24 14:37:15 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/ChangeLog,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
+
+*DB_File-1.814 (13 Nov 2005)
+
+  13 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +DB_File-1.814.ebuild:
+  Version bump upstream
+
+*DB_File-1.813 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +DB_File-1.813.ebuild:
+  Version bump upstream
+
+*DB_File-1.811-r1 (30 Jun 2005)
+
+  30 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  +files/DB_File-MakeMaker.patch, +DB_File-1.811-r1.ebuild,
+  DB_File-1.811.ebuild:
+  Bumped for patch. The default Makefile.PL was overriding any calls for
+  INSTALLDIRS and placing the module in the core perl dirs instead of vendor.
+  The patch changes perl to vendor in the Makefile.PL (another kludge) to
+  correct this. Will eventually fix bugs 97476, 97497
+
+  26 May 2005; Herbie Hopkins <herbs@gentoo.org> DB_File-1.811.ebuild:
+  Multilib fix.
 
 *DB_File-1.811 (24 May 2005)
 
@@ -16,7 +41,7 @@
   02 Apr 2005; Stephen P. Becker <geoman@gentoo.org> DB_File-1.811.ebuild:
   stable on mips
 
-  25 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> DB_File-1.811.ebuild:
+  25 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> DB_File-1.811.ebuild:
   Stable on alpha, bug 85185.
 
   17 Mar 2005; Joseph Jezak <josejx@gentoo.org> DB_File-1.811.ebuild:
diff --git a/perl-core/DB_File/DB_File-1.811-r1.ebuild b/perl-core/DB_File/DB_File-1.811-r1.ebuild
index cf9a38a0c528..59963877abb0 100644
--- a/perl-core/DB_File/DB_File-1.811-r1.ebuild
+++ b/perl-core/DB_File/DB_File-1.811-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/perl-core/DB_File/DB_File-1.811-r1.ebuild,v 1.1 2005/06/30 16:41:51 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.811-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module multilib eutils
 
diff --git a/perl-core/DB_File/DB_File-1.811.ebuild b/perl-core/DB_File/DB_File-1.811.ebuild
index 9f01ed69bfd1..d414193b2bff 100644
--- a/perl-core/DB_File/DB_File-1.811.ebuild
+++ b/perl-core/DB_File/DB_File-1.811.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/perl-core/DB_File/DB_File-1.811.ebuild,v 1.1 2005/05/24 14:37:15 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.811.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
-inherit perl-module
+inherit perl-module multilib eutils
 
 DESCRIPTION="A Berkeley DB Support Perl Module"
 HOMEPAGE="http://www.cpan.org/modules/by-module/DB_File/${P}.readme"
@@ -18,3 +18,13 @@ DEPEND="sys-libs/db"
 SRC_TEST="do"
 
 mydoc="Changes"
+
+src_unpack() {
+	unpack ${A}
+	if [ $(get_libdir) != "lib" ] ; then
+		sed -i -e "s:^LIB.*:LIB = /usr/$(get_libdir):" \
+		${S}/config.in || die
+	fi
+	cd ${S}
+	epatch ${FILESDIR}/DB_File-MakeMaker.patch
+}
diff --git a/perl-core/DB_File/DB_File-1.813.ebuild b/perl-core/DB_File/DB_File-1.813.ebuild
index 90febe113143..ceeb39090c95 100644
--- a/perl-core/DB_File/DB_File-1.813.ebuild
+++ b/perl-core/DB_File/DB_File-1.813.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/perl-core/DB_File/DB_File-1.813.ebuild,v 1.1 2005/11/11 00:47:38 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.813.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module multilib eutils
 
diff --git a/perl-core/DB_File/DB_File-1.814.ebuild b/perl-core/DB_File/DB_File-1.814.ebuild
index 5b275380c9a1..60e7e5a7522a 100644
--- a/perl-core/DB_File/DB_File-1.814.ebuild
+++ b/perl-core/DB_File/DB_File-1.814.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/perl-core/DB_File/DB_File-1.814.ebuild,v 1.1 2005/11/13 14:21:14 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/DB_File/DB_File-1.814.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module multilib eutils
 
diff --git a/perl-core/DB_File/Manifest b/perl-core/DB_File/Manifest
index a4fde0354e64..5690c8fa89f1 100644
--- a/perl-core/DB_File/Manifest
+++ b/perl-core/DB_File/Manifest
@@ -1,15 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1f1ddfd91f3e51947d872f2da5740743 ChangeLog 4298
-MD5 7295068176a8231642a37b54d51da233 DB_File-1.811.ebuild 594
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 39e05c876bca92ce6db02f4cb73bb483 ChangeLog 5278
+MD5 fd70565e0d9cc8afeb68fd536f908510 DB_File-1.811-r1.ebuild 818
+MD5 29ec4bf3df6cd0b8c361ec5f07d2a56e DB_File-1.811.ebuild 815
+MD5 24fe783e3e63fbc463e9fdd8937a595c DB_File-1.813.ebuild 828
+MD5 33bd59766990e268c061b61be3e0b9b9 DB_File-1.814.ebuild 828
+MD5 a8508928a7565d049db19d4045693201 files/DB_File-MakeMaker.patch 569
 MD5 2259e73a14e4f2c7bd63215dba073b10 files/config.in 3121
 MD5 1900638402c237ae141b03ef26fe6933 files/digest-DB_File-1.811 64
+MD5 1900638402c237ae141b03ef26fe6933 files/digest-DB_File-1.811-r1 64
+MD5 be1f6d276d491e58897fd1011deaae51 files/digest-DB_File-1.813 64
+MD5 ff4fbe2030e1bb500bac3c91284e03b2 files/digest-DB_File-1.814 64
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbO1MtG5z4I8BtQoRAr6gAJ0R+ksE1+OSe1Cb+6uE+T9+DDcEOgCfeU5r
-6HeE7B3lba13x97iYoaIwCw=
-=MkzJ
+iD8DBQFDd0vjtG5z4I8BtQoRAm7NAJwJf8n+siRbeQDGZDT6tQQZ+s5XpgCggfMU
+vZq8UB6AU1tNtAPWNDk4AXI=
+=G4Jf
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Digest-MD5/ChangeLog b/perl-core/Digest-MD5/ChangeLog
index 0cd4475b55a1..a554c35790e7 100644
--- a/perl-core/Digest-MD5/ChangeLog
+++ b/perl-core/Digest-MD5/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for dev-perl/Digest-MD5
+# ChangeLog for perl-core/Digest-MD5
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-MD5/ChangeLog,v 1.1 2005/05/24 15:29:57 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-MD5/ChangeLog,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
 
 *Digest-MD5-2.33 (24 May 2005)
 
diff --git a/perl-core/Digest-MD5/Digest-MD5-2.33.ebuild b/perl-core/Digest-MD5/Digest-MD5-2.33.ebuild
index e4ab0ea116a4..02b9d2726ac2 100644
--- a/perl-core/Digest-MD5/Digest-MD5-2.33.ebuild
+++ b/perl-core/Digest-MD5/Digest-MD5-2.33.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/perl-core/Digest-MD5/Digest-MD5-2.33.ebuild,v 1.1 2005/05/24 15:29:57 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Digest-MD5/Digest-MD5-2.33.ebuild,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Digest-MD5/Manifest b/perl-core/Digest-MD5/Manifest
index 9ecdcf4f2910..01ceb221a55a 100644
--- a/perl-core/Digest-MD5/Manifest
+++ b/perl-core/Digest-MD5/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 70b206ff6c836e54068e52aa18ec9cd5 ChangeLog 3588
-MD5 a6b2f4644ddcc8d06fd6b00d070f7d8a Digest-MD5-2.33.ebuild 563
+MD5 f7d71c2c84633cf37a06c34666f9cd62 Digest-MD5-2.33.ebuild 563
+MD5 6f0c8c84c90bc1c7c592503407eb4250 ChangeLog 3751
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 23c1bf0346e2de80f4b8a3cb547508a3 files/digest-Digest-MD5-2.33 66
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCk0EHtG5z4I8BtQoRAu4oAJoCzXdzmHiHK7tE3nvxdPykLcQiaQCfaFYV
-a2U9nr0JwKdDhP7eCTtJyqI=
-=yK1/
+iD8DBQFCli04I1lqEGTUzyQRAuuoAJ9zcCmymnArL6OFXkBev9zU3NJxFQCdGy9R
+gVS4jkvwqq5qooYtPKydhIg=
+=WPFE
 -----END PGP SIGNATURE-----
diff --git a/perl-core/ExtUtils-MakeMaker/ChangeLog b/perl-core/ExtUtils-MakeMaker/ChangeLog
index aef145772a01..fcefdc4b9eb9 100644
--- a/perl-core/ExtUtils-MakeMaker/ChangeLog
+++ b/perl-core/ExtUtils-MakeMaker/ChangeLog
@@ -1,6 +1,20 @@
-# ChangeLog for dev-perl/ExtUtils-MakeMaker
+# ChangeLog for perl-core/ExtUtils-MakeMaker
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.1 2005/05/25 16:49:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ChangeLog,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
+
+  10 Nov 2005; Luis Medinas <metalgod@gentoo.org>
+  ExtUtils-MakeMaker-6.21.ebuild:
+  Marked Stable on amd64 .Bug #111947.
+
+*ExtUtils-MakeMaker-6.30 (09 Nov 2005)
+
+  09 Nov 2005; Chris White <chriswhite@gentoo.org>
+  +ExtUtils-MakeMaker-6.30.ebuild:
+  Version bump to 6.30 for bug #111933.
+
+  12 Aug 2005; Michael Cummings <mcummings@gentoo.org>
+  ExtUtils-MakeMaker-6.21.ebuild:
+  Marking stable x86
 
 *ExtUtils-MakeMaker-6.20 (25 May 2005)
 
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild
index aba4cd55b689..ac7dc426fb1d 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.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/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild,v 1.1 2005/05/25 16:49:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r4.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${P}.tar.gz"
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r5.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r5.ebuild
index 32590ff53a38..9bedea2d0f7d 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r5.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r5.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/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r5.ebuild,v 1.1 2005/05/25 16:49:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r5.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${P}.tar.gz"
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r6.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r6.ebuild
index be7b9341c6f1..8487a8e7dede 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r6.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r6.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/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r6.ebuild,v 1.1 2005/05/25 16:49:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.05-r6.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${P}.tar.gz"
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.20.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.20.ebuild
index d5193d551637..d8010416ec6c 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.20.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.20.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/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.20.ebuild,v 1.1 2005/05/25 16:49:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.20.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${P}.tar.gz"
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.21.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.21.ebuild
index b939d6f02b76..750c4b632bb5 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.21.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.21.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/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.21.ebuild,v 1.1 2005/05/25 16:49:27 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.21.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${P}.tar.gz"
@@ -8,7 +8,7 @@ HOMEPAGE="http://search.cpan.org/~mschwern/${P}/"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ppc ~sparc ~mips alpha arm hppa ~amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-lang/perl-5.8.0-r12
diff --git a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.ebuild b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.ebuild
index 26e6f024eb83..d24e88716a69 100644
--- a/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.ebuild
+++ b/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.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/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.ebuild,v 1.1 2005/11/09 09:57:50 chriswhite Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/ExtUtils-MakeMaker/ExtUtils-MakeMaker-6.30.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 DESCRIPTION="MakeMaker Perl Module"
 SRC_URI="mirror://cpan/authors/id/M/MS/MSCHWERN/${P}.tar.gz"
diff --git a/perl-core/ExtUtils-MakeMaker/Manifest b/perl-core/ExtUtils-MakeMaker/Manifest
index e55f956ec9a3..87436b0f08a4 100644
--- a/perl-core/ExtUtils-MakeMaker/Manifest
+++ b/perl-core/ExtUtils-MakeMaker/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 73b18970d49b2e810d90a215c59a14c7 ChangeLog 7115
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 307cc3a4e130afef6f4d9c46443c1dbe ExtUtils-MakeMaker-6.05-r4.ebuild 3255
-MD5 82892cd4bc989da8c6295c5a668de4fe ExtUtils-MakeMaker-6.05-r5.ebuild 3257
-MD5 bf2de9b2dfa1c8729a21668d92e24457 ExtUtils-MakeMaker-6.05-r6.ebuild 3556
-MD5 c16bcfbf16a53bb776fcc2584f8a4c10 ExtUtils-MakeMaker-6.20.ebuild 2610
-MD5 674596a391133c821d1734424d731de4 ExtUtils-MakeMaker-6.21.ebuild 2664
+MD5 39dc935c42bdc546b4900a2a8586de4a ChangeLog 7842
+MD5 bbb5fa761442abb898b753e888bd9720 ExtUtils-MakeMaker-6.05-r4.ebuild 3255
+MD5 6564275cfbfbbab8de5046ea90e3b68c ExtUtils-MakeMaker-6.05-r5.ebuild 3257
+MD5 1ece84699ff9c557d1cb5fb1c41dc557 ExtUtils-MakeMaker-6.05-r6.ebuild 3556
+MD5 b6101e2a012512d477e09c0e1a895f84 ExtUtils-MakeMaker-6.20.ebuild 2610
+MD5 81d962e0f2ee56368b1732a1b4426bdb ExtUtils-MakeMaker-6.21.ebuild 2661
+MD5 76b302f5da7844695912a811c6f5c0d3 ExtUtils-MakeMaker-6.30.ebuild 2692
 MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r4 75
 MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r5 75
 MD5 2cc7445bb2472696df202d4f1eccae98 files/digest-ExtUtils-MakeMaker-6.05-r6 75
 MD5 9076228369ef3b268a01f2f48a45524a files/digest-ExtUtils-MakeMaker-6.20 75
 MD5 a144b0676694d7282d1ffba23685c004 files/digest-ExtUtils-MakeMaker-6.21 75
+MD5 876dd5d697686a46d47953d9efe05fa9 files/digest-ExtUtils-MakeMaker-6.30 75
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFB2pK4tG5z4I8BtQoRApE+AJ9hCcVx8otUwB8AwB/uxydjSSsrAwCgkTCb
-8go3MNl8TGT9rVbairc4IWw=
-=zt2P
+iD8DBQFDc5WAwUpWvClEHQoRAoRSAJkBuAkQpemVPsIppB2dtOUJ29uo9QCeONJf
+7xxajj+HOmXtnfSD3JPlTCk=
+=QcpS
 -----END PGP SIGNATURE-----
diff --git a/perl-core/File-Spec/ChangeLog b/perl-core/File-Spec/ChangeLog
index 37846d56fb83..8bdd95b9ebbc 100644
--- a/perl-core/File-Spec/ChangeLog
+++ b/perl-core/File-Spec/ChangeLog
@@ -1,6 +1,41 @@
-# ChangeLog for dev-perl/File-Spec
+# ChangeLog for perl-core/File-Spec
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/ChangeLog,v 1.1 2005/05/25 13:36:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/ChangeLog,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
+
+*File-Spec-3.12 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +File-Spec-3.12.ebuild:
+  Version bump upstream
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> File-Spec-3.06.ebuild:
+  Stable on ppc.
+
+  29 Jul 2005; Danny van Dyk <kugelfang@gentoo.org> File-Spec-0.87.ebuild:
+  Marked stable on amd64.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> File-Spec-3.06.ebuild:
+  Stable on ppc64
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org> File-Spec-3.06.ebuild:
+  Stable on alpha.
+
+  29 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  File-Spec-3.06.ebuild:
+  unmasking for x86 and sparc
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> File-Spec-0.87.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> File-Spec-0.87.ebuild:
+  Stable on alpha.
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  File-Spec-0.87.ebuild:
+  Tested on raq2, bumping for mips
+
+  02 Jun 2005; Michael Cummings <mcummings@gentoo.org> File-Spec-0.87.ebuild:
+  Keywording to match min version with most perls
 
 *File-Spec-3.06 (25 May 2005)
 
diff --git a/perl-core/File-Spec/File-Spec-0.84-r1.ebuild b/perl-core/File-Spec/File-Spec-0.84-r1.ebuild
index 05f00eb672a6..8a84438b4246 100644
--- a/perl-core/File-Spec/File-Spec-0.84-r1.ebuild
+++ b/perl-core/File-Spec/File-Spec-0.84-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/perl-core/File-Spec/File-Spec-0.84-r1.ebuild,v 1.1 2005/05/25 13:36:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-0.84-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 myconf='INSTALLDIRS=vendor'
 inherit perl-module
diff --git a/perl-core/File-Spec/File-Spec-0.87.ebuild b/perl-core/File-Spec/File-Spec-0.87.ebuild
index 69dcb6c98960..160bf1bb234b 100644
--- a/perl-core/File-Spec/File-Spec-0.87.ebuild
+++ b/perl-core/File-Spec/File-Spec-0.87.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/perl-core/File-Spec/File-Spec-0.87.ebuild,v 1.1 2005/05/25 13:36:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-0.87.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 myconf='INSTALLDIRS=vendor'
 inherit perl-module
@@ -11,7 +11,7 @@ SRC_URI="mirror://cpan/authors/id/K/KW/KWILLIAMS/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/module-build"
diff --git a/perl-core/File-Spec/File-Spec-3.01.ebuild b/perl-core/File-Spec/File-Spec-3.01.ebuild
index 77d1b9ba4689..7d380046ee14 100644
--- a/perl-core/File-Spec/File-Spec-3.01.ebuild
+++ b/perl-core/File-Spec/File-Spec-3.01.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/perl-core/File-Spec/File-Spec-3.01.ebuild,v 1.1 2005/05/25 13:36:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-3.01.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 MY_P="PathTools-${PV}"
 S=${WORKDIR}/${MY_P}
diff --git a/perl-core/File-Spec/File-Spec-3.06.ebuild b/perl-core/File-Spec/File-Spec-3.06.ebuild
index 76533b463352..65ad61a23989 100644
--- a/perl-core/File-Spec/File-Spec-3.06.ebuild
+++ b/perl-core/File-Spec/File-Spec-3.06.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/perl-core/File-Spec/File-Spec-3.06.ebuild,v 1.1 2005/05/25 13:36:00 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-3.06.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 MY_P="PathTools-${PV}"
 S=${WORKDIR}/${MY_P}
@@ -14,7 +14,7 @@ SRC_URI="mirror://cpan/authors/id/K/KW/KWILLIAMS/${MY_P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha ~amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="dev-perl/module-build"
diff --git a/perl-core/File-Spec/File-Spec-3.12.ebuild b/perl-core/File-Spec/File-Spec-3.12.ebuild
index 7abaae5055c4..a6a271053ce0 100644
--- a/perl-core/File-Spec/File-Spec-3.12.ebuild
+++ b/perl-core/File-Spec/File-Spec-3.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/perl-core/File-Spec/File-Spec-3.12.ebuild,v 1.1 2005/11/11 02:06:46 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Spec/File-Spec-3.12.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 MY_P="PathTools-${PV}"
 S=${WORKDIR}/${MY_P}
diff --git a/perl-core/File-Spec/Manifest b/perl-core/File-Spec/Manifest
index afc192638eb0..0d71fbdec2d0 100644
--- a/perl-core/File-Spec/Manifest
+++ b/perl-core/File-Spec/Manifest
@@ -1,10 +1,22 @@
-MD5 adaed9a34d6de3f8576f900007a78211 File-Spec-0.84-r1.ebuild 646
-MD5 5e53accd608c75d6024cb81e497f67a8 File-Spec-0.87.ebuild 628
-MD5 063015d48b3d070bc24ce05438131d25 File-Spec-3.06.ebuild 679
-MD5 3ec52a239bdc857a70ad30ec9461eeec File-Spec-3.01.ebuild 679
-MD5 a82aa6a0f5edc1548b700e980f54085f ChangeLog 3005
-MD5 24aa63fc8db1ae9616cba4285022c7eb metadata.xml 596
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b884f653032b98ad50d3e205571a6dec ChangeLog 4315
+MD5 5081ac797edca2c2428292468783d8ac File-Spec-0.84-r1.ebuild 646
+MD5 81754d706af1e6ef45f3d08a847628bd File-Spec-0.87.ebuild 621
+MD5 84bbeaa4289f4f671c01f41598a21427 File-Spec-3.01.ebuild 680
+MD5 5f66da3bbadc5e4c2831acac37e0d0da File-Spec-3.06.ebuild 668
+MD5 e06d0e13115c776bfc3fc35f5ac4c14b File-Spec-3.12.ebuild 680
+MD5 144ba852cf94f6d50b9e39e953c5936a files/digest-File-Spec-0.84-r1 65
 MD5 e8c2b2625d8031840c76c7fd1fdafcad files/digest-File-Spec-0.87 65
 MD5 5ef01c0e76ba047775421be5b11033c6 files/digest-File-Spec-3.01 65
 MD5 690e170d12aed701e762e1eda88e2535 files/digest-File-Spec-3.06 66
-MD5 144ba852cf94f6d50b9e39e953c5936a files/digest-File-Spec-0.84-r1 65
+MD5 235519af71c6ddcb5c93217b5ba95760 files/digest-File-Spec-3.12 66
+MD5 24aa63fc8db1ae9616cba4285022c7eb metadata.xml 596
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFDc/y/tG5z4I8BtQoRAvIlAJ0e3VWBZoUpB/Lo31lbx5T5OLtwiwCfYNL/
+Vp9fCaO+mREOxD0kzoTNIaQ=
+=LaYk
+-----END PGP SIGNATURE-----
diff --git a/perl-core/File-Temp/ChangeLog b/perl-core/File-Temp/ChangeLog
index d054215501cc..69a3a589d9b3 100644
--- a/perl-core/File-Temp/ChangeLog
+++ b/perl-core/File-Temp/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for dev-perl/File-Temp
+# ChangeLog for perl-core/File-Temp
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/ChangeLog,v 1.1 2005/05/25 13:48:18 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/ChangeLog,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> File-Temp-0.14.ebuild,
+  File-Temp-0.16.ebuild:
+  add ia64 keywords
+
+  27 May 2005; Michael Cummings <mcummings@gentoo.org>
+  File-Temp-0.14.ebuild, File-Temp-0.16.ebuild:
+  Missed the CATEGORY var in this one after the migration. Should close bug 94195
 
 *File-Temp-0.14 (25 May 2005)
 
@@ -43,7 +51,7 @@
   05 Jun 2004; Michael Cummings <mcummings@gentoo.org> File-Temp-0.14.ebuild:
   new version on cpan
 
-  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> File-Temp-0.12.ebuild:
+  05 May 2004; Bryan Østergaard <kloeri@gentoo.org> File-Temp-0.12.ebuild:
   Stable on alpha.
 
   08 Jun 2003; <rac@gentoo.org> File-Temp-0.12.ebuild:
diff --git a/perl-core/File-Temp/File-Temp-0.14.ebuild b/perl-core/File-Temp/File-Temp-0.14.ebuild
index df2d2ffd3825..6749c583a545 100644
--- a/perl-core/File-Temp/File-Temp-0.14.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.14.ebuild
@@ -1,19 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.14.ebuild,v 1.1 2005/05/25 13:48:18 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.14.ebuild,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
 
 inherit perl-module
 
-MY_P=File-Temp-${PV}
-S=${WORKDIR}/${MY_P}
-CATEGORY="dev-perl"
-
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
-HOMEPAGE="http://www.cpan.org/modules/by-module/File/${MY_P}.readme"
-SRC_URI="mirror://cpan/authors/id/T/TJ/TJENNESS/${MY_P}.tar.gz"
+HOMEPAGE="http://www.cpan.org/modules/by-module/File/${P}.readme"
+SRC_URI="mirror://cpan/authors/id/T/TJ/TJENNESS/${P}.tar.gz"
 SRC_TEST="do"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha ppc64"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
diff --git a/perl-core/File-Temp/File-Temp-0.16.ebuild b/perl-core/File-Temp/File-Temp-0.16.ebuild
index c6a746d5c2d1..308277f742b8 100644
--- a/perl-core/File-Temp/File-Temp-0.16.ebuild
+++ b/perl-core/File-Temp/File-Temp-0.16.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.16.ebuild,v 1.1 2005/05/25 13:48:18 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/File-Temp/File-Temp-0.16.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
-CATEGORY="dev-perl"
-
 DESCRIPTION="File::Temp can be used to create and open temporary files in a safe way."
 HOMEPAGE="http://search.cpan.org/~tjenness/${P}/"
 SRC_URI="mirror://cpan/authors/id/T/TJ/TJENNESS/${P}.tar.gz"
@@ -13,5 +11,5 @@ SRC_TEST="do"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~ppc64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
diff --git a/perl-core/File-Temp/Manifest b/perl-core/File-Temp/Manifest
index 26df42ed584a..b09857198f2b 100644
--- a/perl-core/File-Temp/Manifest
+++ b/perl-core/File-Temp/Manifest
@@ -1,6 +1,16 @@
-MD5 29c94ad6fc70582d4eb04fcb71047778 ChangeLog 1637
-MD5 ce1b017883a5401af7a9f9407ca8c993 File-Temp-0.14.ebuild 636
-MD5 50ea04c639886cf98f71d6fecbeda1b6 File-Temp-0.16.ebuild 579
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 49e7ba392873b3da1628eb9cf0a3d112 File-Temp-0.14.ebuild 573
+MD5 2b3beb962ac0a94bdbe3adeb5411fdb2 File-Temp-0.16.ebuild 564
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 983a6ef0c9f7cffb10a5eb99ee8df6e9 ChangeLog 2126
 MD5 a7c29fdf7d2b55c5a7dc99ac85c73a68 files/digest-File-Temp-0.14 65
 MD5 222c236bc63a5223f6333ac0b8a23a74 files/digest-File-Temp-0.16 65
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDK/wuKf2g/qXtneoRAm25AJ47XM92O7iyw0OOg3ULePAOEmV4UwCfdaMV
+37/O5vjOLfrkaWT9UjPqBLE=
+=DH+U
+-----END PGP SIGNATURE-----
diff --git a/perl-core/Getopt-Long/ChangeLog b/perl-core/Getopt-Long/ChangeLog
index 6d23da862f6f..9c318956828d 100644
--- a/perl-core/Getopt-Long/ChangeLog
+++ b/perl-core/Getopt-Long/ChangeLog
@@ -1,6 +1,10 @@
-# ChangeLog for dev-perl/Getopt-Long
+# ChangeLog for perl-core/Getopt-Long
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Getopt-Long/ChangeLog,v 1.1 2005/05/25 13:57:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Getopt-Long/ChangeLog,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  Getopt-Long-2.34.ebuild:
+  Tested on raq2, bumping for mips
 
 *Getopt-Long-2.34 (25 May 2005)
 
diff --git a/perl-core/Getopt-Long/Getopt-Long-2.34.ebuild b/perl-core/Getopt-Long/Getopt-Long-2.34.ebuild
index 9cde4404ecbc..54061523301e 100644
--- a/perl-core/Getopt-Long/Getopt-Long-2.34.ebuild
+++ b/perl-core/Getopt-Long/Getopt-Long-2.34.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/perl-core/Getopt-Long/Getopt-Long-2.34.ebuild,v 1.1 2005/05/25 13:57:55 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Getopt-Long/Getopt-Long-2.34.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.cpan.org/modules/by-authors/id/J/JV/JV/${P}.readme"
 
 SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
-KEYWORDS="x86 amd64 alpha ppc sparc hppa ~mips ia64 ppc64"
+KEYWORDS="x86 amd64 alpha ppc sparc hppa mips ia64 ppc64"
 IUSE=""
 
 DEPEND="dev-perl/PodParser"
diff --git a/perl-core/Getopt-Long/Manifest b/perl-core/Getopt-Long/Manifest
index a648b056ff0f..b9ba7e587113 100644
--- a/perl-core/Getopt-Long/Manifest
+++ b/perl-core/Getopt-Long/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d661d013428f32d4df452ed668768ce5 ChangeLog 1279
-MD5 a2e03f45926e818f363ae60d99c746ae Getopt-Long-2.34.ebuild 574
+MD5 fec382a937dace4c0007bfaedb722706 ChangeLog 1564
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 ea4079708a8821ca8f83ef16d84f60a1 Getopt-Long-2.34.ebuild 573
 MD5 ef72aad0758beb5a213eecdce43e9835 files/digest-Getopt-Long-2.34 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbR65tG5z4I8BtQoRAvJmAJ0eRflwlj6BSTPtR+uVKjCZTML5VQCeIXDi
-OAeVc4p++JvJSpAUuQnwxAs=
-=+not
+iD8DBQFCoSKatG5z4I8BtQoRAnFIAJ9Y/3yD3EqDM6S1IuBkZ4OkETEl8wCdELir
+1ISsxFEygaRjIiLEURftX2s=
+=yo/9
 -----END PGP SIGNATURE-----
diff --git a/perl-core/MIME-Base64/ChangeLog b/perl-core/MIME-Base64/ChangeLog
index 34482a5c6b6f..200671534754 100644
--- a/perl-core/MIME-Base64/ChangeLog
+++ b/perl-core/MIME-Base64/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for dev-perl/MIME-Base64
+# ChangeLog for perl-core/MIME-Base64
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/ChangeLog,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/ChangeLog,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 *MIME-Base64-2.20 (25 May 2005)
 
diff --git a/perl-core/MIME-Base64/MIME-Base64-2.12-r1.ebuild b/perl-core/MIME-Base64/MIME-Base64-2.12-r1.ebuild
index 20942b69b265..1f5478e750cf 100644
--- a/perl-core/MIME-Base64/MIME-Base64-2.12-r1.ebuild
+++ b/perl-core/MIME-Base64/MIME-Base64-2.12-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/perl-core/MIME-Base64/MIME-Base64-2.12-r1.ebuild,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/MIME-Base64-2.12-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/MIME-Base64/MIME-Base64-2.12-r2.ebuild b/perl-core/MIME-Base64/MIME-Base64-2.12-r2.ebuild
index bcd7d9e74257..47860a16d945 100644
--- a/perl-core/MIME-Base64/MIME-Base64-2.12-r2.ebuild
+++ b/perl-core/MIME-Base64/MIME-Base64-2.12-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/perl-core/MIME-Base64/MIME-Base64-2.12-r2.ebuild,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/MIME-Base64-2.12-r2.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/MIME-Base64/MIME-Base64-2.20.ebuild b/perl-core/MIME-Base64/MIME-Base64-2.20.ebuild
index d037410d445f..b663c44702fe 100644
--- a/perl-core/MIME-Base64/MIME-Base64-2.20.ebuild
+++ b/perl-core/MIME-Base64/MIME-Base64-2.20.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/perl-core/MIME-Base64/MIME-Base64-2.20.ebuild,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/MIME-Base64-2.20.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/MIME-Base64/MIME-Base64-3.00.ebuild b/perl-core/MIME-Base64/MIME-Base64-3.00.ebuild
index c479c4c50cca..2ff8df080c2c 100644
--- a/perl-core/MIME-Base64/MIME-Base64-3.00.ebuild
+++ b/perl-core/MIME-Base64/MIME-Base64-3.00.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/perl-core/MIME-Base64/MIME-Base64-3.00.ebuild,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/MIME-Base64-3.00.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/MIME-Base64/MIME-Base64-3.01.ebuild b/perl-core/MIME-Base64/MIME-Base64-3.01.ebuild
index fe434ebad129..aaed7f2fb4ce 100644
--- a/perl-core/MIME-Base64/MIME-Base64-3.01.ebuild
+++ b/perl-core/MIME-Base64/MIME-Base64-3.01.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/perl-core/MIME-Base64/MIME-Base64-3.01.ebuild,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/MIME-Base64-3.01.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/MIME-Base64/MIME-Base64-3.05.ebuild b/perl-core/MIME-Base64/MIME-Base64-3.05.ebuild
index 2183b1007550..426055eddf6b 100644
--- a/perl-core/MIME-Base64/MIME-Base64-3.05.ebuild
+++ b/perl-core/MIME-Base64/MIME-Base64-3.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/perl-core/MIME-Base64/MIME-Base64-3.05.ebuild,v 1.1 2005/05/25 14:05:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/MIME-Base64/MIME-Base64-3.05.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/MIME-Base64/Manifest b/perl-core/MIME-Base64/Manifest
index 74337bd0a115..fd86bb05d8d3 100644
--- a/perl-core/MIME-Base64/Manifest
+++ b/perl-core/MIME-Base64/Manifest
@@ -1,14 +1,24 @@
-MD5 2a253e2dcbc6a6080c824ab395c45bb8 ChangeLog 4028
-MD5 f8a0fd86c7c4e5efe99221af5d570b7c MIME-Base64-2.12-r1.ebuild 514
-MD5 6dd65b9992b93908aba57cc4030d483f MIME-Base64-2.12-r2.ebuild 519
-MD5 578034467ef967fab602e1c538325553 MIME-Base64-2.20.ebuild 527
-MD5 a3fe33c9823d8c0f2df283c8ba8eddea MIME-Base64-3.00.ebuild 550
-MD5 8d16bc05af31b053ff0979aadef93d0c MIME-Base64-3.01.ebuild 565
-MD5 e4de4ea33cb403488c5bd6169db4a013 MIME-Base64-3.05.ebuild 554
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 710a29c227d7957ac6fbfe6f4adac394 MIME-Base64-2.20.ebuild 527
+MD5 e4248e9463a73ac3f8ab0466dc728e3b MIME-Base64-2.12-r1.ebuild 514
+MD5 2c4f77f3e831943252d5db539f08aff8 MIME-Base64-3.01.ebuild 566
+MD5 d82010fddebf72f8f7592c2d2597806f MIME-Base64-3.05.ebuild 556
+MD5 78bc43f3cff742373fac36f203157613 ChangeLog 4336
+MD5 4028d3f21d53ef17f6c5ec97175056f6 MIME-Base64-3.00.ebuild 550
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 262427ec8c8955cc86c98d28acc92f93 MIME-Base64-2.12-r2.ebuild 519
 MD5 bf2998bdf5e911b4c19f575c2bffa9fc files/digest-MIME-Base64-2.12-r1 67
 MD5 bf2998bdf5e911b4c19f575c2bffa9fc files/digest-MIME-Base64-2.12-r2 67
 MD5 afe4122fbb2110dd01ef4ff79e07c187 files/digest-MIME-Base64-2.20 67
 MD5 46ed8c04abebefdc68776750cc9f2417 files/digest-MIME-Base64-3.00 67
 MD5 2c356a9c0e53e1db84e16cb3a8ff7f20 files/digest-MIME-Base64-3.01 67
 MD5 01872381846a3e2bb2f49d330dc3fbfc files/digest-MIME-Base64-3.05 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCli36I1lqEGTUzyQRAji0AJ94ya+yIaxtTHo9JL3auhfp0blA3gCgoVVi
+yvZipZGXWoKFqeb4YAhwyjQ=
+=Sjad
+-----END PGP SIGNATURE-----
diff --git a/perl-core/Math-BigInt/ChangeLog b/perl-core/Math-BigInt/ChangeLog
index 95da70781981..01b7d26aa940 100644
--- a/perl-core/Math-BigInt/ChangeLog
+++ b/perl-core/Math-BigInt/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for dev-perl/Math-BigInt
+# ChangeLog for perl-core/Math-BigInt
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/ChangeLog,v 1.1 2005/05/24 17:52:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/ChangeLog,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
+
+*Math-BigInt-1.77 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +Math-BigInt-1.77.ebuild:
+  Version bump upstream
+
+  02 Oct 2005; Aron Griffis <agriffis@gentoo.org> Math-BigInt-1.73.ebuild:
+  Mark 1.73 stable on ia64
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> Math-BigInt-1.73.ebuild:
+  add ~ia64
 
 *Math-BigInt-1.73 (24 May 2005)
 
diff --git a/perl-core/Math-BigInt/Manifest b/perl-core/Math-BigInt/Manifest
index 4d44e35ccd9b..b625110a0e1b 100644
--- a/perl-core/Math-BigInt/Manifest
+++ b/perl-core/Math-BigInt/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d05458646b7611c65350a28b4b7e9682 ChangeLog 1984
-MD5 4fd88260ffd4f9eda35fdc9e7fa114c6 Math-BigInt-1.69.ebuild 586
-MD5 b2245fc564368c5ad98dfd97260ba060 Math-BigInt-1.70.ebuild 591
-MD5 8822e8cd78c3a6f0b0bd7ff1a91a5e47 Math-BigInt-1.73.ebuild 598
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 7db6b604656eb256b7ca0e522dc20fe8 ChangeLog 2537
+MD5 f3a8f7c20e12a96f00dd349c49fe4525 Math-BigInt-1.69.ebuild 587
+MD5 61705195ceb28c886ecb4d0ed1429d64 Math-BigInt-1.70.ebuild 592
+MD5 95efd87dcaa8f9c6f6da6b629606db9d Math-BigInt-1.73.ebuild 607
+<<<<<<< Manifest
+MD5 f3a8f7c20e12a96f00dd349c49fe4525 Math-BigInt-1.69.ebuild 587
+MD5 109b3f67b6c2ed044cbd5921a74aa244 files/digest-Math-BigInt-1.73 68
+MD5 d6a633b9a6acedb716053a67339c2a00 files/digest-Math-BigInt-1.70 68
+=======
+MD5 20c66d023932eca2c92b554655174925 Math-BigInt-1.77.ebuild 614
+>>>>>>> 1.11
 MD5 b461900d92f57d4e040ce12dfe67f876 files/digest-Math-BigInt-1.69 68
+<<<<<<< Manifest
+=======
 MD5 d6a633b9a6acedb716053a67339c2a00 files/digest-Math-BigInt-1.70 68
 MD5 109b3f67b6c2ed044cbd5921a74aa244 files/digest-Math-BigInt-1.73 68
+MD5 6bc4996509cd0bee8aa18599440f4572 files/digest-Math-BigInt-1.77 68
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCcSCbtG5z4I8BtQoRAun7AKCBu4DZkzDJT3iP0qSE+F0iW8uXxgCeMpcL
-KkDXB9j4s6/Zb08fHHeYVHE=
-=VnLI
+iD8DBQFDc/5TtG5z4I8BtQoRApcEAKCRp0hbqsC2Zwx/YODihHDeNyl97ACdH3hN
+gbemj+87wxHoqINMh/hMW9U=
+=P50q
 -----END PGP SIGNATURE-----
+>>>>>>> 1.11
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.69.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.69.ebuild
index 7ab371773ed8..ae04d43cbda5 100644
--- a/perl-core/Math-BigInt/Math-BigInt-1.69.ebuild
+++ b/perl-core/Math-BigInt/Math-BigInt-1.69.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/perl-core/Math-BigInt/Math-BigInt-1.69.ebuild,v 1.1 2005/05/24 17:52:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.69.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.70.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.70.ebuild
index b102ffaa3922..e0ec72365cf0 100644
--- a/perl-core/Math-BigInt/Math-BigInt-1.70.ebuild
+++ b/perl-core/Math-BigInt/Math-BigInt-1.70.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/perl-core/Math-BigInt/Math-BigInt-1.70.ebuild,v 1.1 2005/05/24 17:52:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.70.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.73.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.73.ebuild
index 73df5458a37b..e3ca6c56e974 100644
--- a/perl-core/Math-BigInt/Math-BigInt-1.73.ebuild
+++ b/perl-core/Math-BigInt/Math-BigInt-1.73.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/perl-core/Math-BigInt/Math-BigInt-1.73.ebuild,v 1.1 2005/05/24 17:52:54 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.73.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://cpan/authors/id/T/TE/TELS/math/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc s390 sparc x86"
+KEYWORDS="alpha amd64 ia64 ~ppc s390 sparc x86"
 IUSE=""
 
 DEPEND=">=dev-perl/Scalar-List-Utils-1.14"
diff --git a/perl-core/Math-BigInt/Math-BigInt-1.77.ebuild b/perl-core/Math-BigInt/Math-BigInt-1.77.ebuild
index fccdaf23a292..5e455603c020 100644
--- a/perl-core/Math-BigInt/Math-BigInt-1.77.ebuild
+++ b/perl-core/Math-BigInt/Math-BigInt-1.77.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/perl-core/Math-BigInt/Math-BigInt-1.77.ebuild,v 1.1 2005/11/11 02:13:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Math-BigInt/Math-BigInt-1.77.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Memoize/ChangeLog b/perl-core/Memoize/ChangeLog
index 4cf22132aea1..038316e6c506 100644
--- a/perl-core/Memoize/ChangeLog
+++ b/perl-core/Memoize/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for dev-perl/Memoize
+# ChangeLog for perl-core/Memoize
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Memoize/ChangeLog,v 1.1 2005/05/25 14:29:41 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Memoize/ChangeLog,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> Memoize-1.01.ebuild:
+  add ia64
 
 *Memoize-1.01 (25 May 2005)
 
diff --git a/perl-core/Memoize/Manifest b/perl-core/Memoize/Manifest
index be7a624d9d8e..66dccfc08efc 100644
--- a/perl-core/Memoize/Manifest
+++ b/perl-core/Memoize/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 94bba1194e88c0a644124ebf934d63c8 ChangeLog 1617
-MD5 203c158b057202c49a74f18b7121183f Memoize-1.01.ebuild 526
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 17cd0caad7756a92569b4c2517abc9d8 ChangeLog 1858
+MD5 46080c5a53d7eda667745fb6b80936ab Memoize-1.01.ebuild 531
 MD5 568392e47cac61fb1d8d954d21d91b56 files/digest-Memoize-1.01 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcSD5tG5z4I8BtQoRAnW9AJ9Vjpi/UvLgD4GFZsHUBVN3gePA8gCfbreW
-UY3po7E+BlJanOty7l46tSk=
-=AUUL
------END PGP SIGNATURE-----
diff --git a/perl-core/Memoize/Memoize-1.01.ebuild b/perl-core/Memoize/Memoize-1.01.ebuild
index 8f4bcbfa7588..dd234c9d6c1b 100644
--- a/perl-core/Memoize/Memoize-1.01.ebuild
+++ b/perl-core/Memoize/Memoize-1.01.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/perl-core/Memoize/Memoize-1.01.ebuild,v 1.1 2005/05/25 14:29:41 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Memoize/Memoize-1.01.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 inherit perl-module
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://cpan/authors/id/M/MJ/MJD/${P}.tar.gz"
 
 LICENSE="Artistic GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa amd64"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/perl-core/Safe/ChangeLog b/perl-core/Safe/ChangeLog
index 802e2870318f..188ce0a3fce3 100644
--- a/perl-core/Safe/ChangeLog
+++ b/perl-core/Safe/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for dev-perl/Safe
+# ChangeLog for perl-core/Safe
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Safe/ChangeLog,v 1.1 2005/05/25 14:32:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Safe/ChangeLog,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
+
+  26 Aug 2005; Aron Griffis <agriffis@gentoo.org> Safe-2.11.ebuild:
+  add ia64
 
 *Safe-2.11 (25 May 2005)
 
diff --git a/perl-core/Safe/Manifest b/perl-core/Safe/Manifest
index a28697872f29..f715aacbc512 100644
--- a/perl-core/Safe/Manifest
+++ b/perl-core/Safe/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0a9074548a043b4a0a6dc4f76238068d ChangeLog 1637
-MD5 e504bd107d031195b7fcd0c489b252b8 Safe-2.11.ebuild 508
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 6c2b9a6966195d2fb9e01e80fafe25f8 ChangeLog 1869
+MD5 c507257b93f8d58eed4fc00b253ff018 Safe-2.11.ebuild 513
 MD5 bd0886ea2addfa17ef854a25004a1ba0 files/digest-Safe-2.11 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcTMYtG5z4I8BtQoRAqegAJ9OrAQuUzTgAesVGyoRCRVUPNawswCghpP0
-ZmUCF777zkhbWrMKfEyaYCQ=
-=J3V7
------END PGP SIGNATURE-----
diff --git a/perl-core/Safe/Safe-2.11.ebuild b/perl-core/Safe/Safe-2.11.ebuild
index d94905cd8229..075485021053 100644
--- a/perl-core/Safe/Safe-2.11.ebuild
+++ b/perl-core/Safe/Safe-2.11.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/perl-core/Safe/Safe-2.11.ebuild,v 1.1 2005/05/25 14:32:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Safe/Safe-2.11.ebuild,v 1.1.1.1 2005/11/30 10:11:11 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,5 +10,5 @@ SRC_URI="mirror://cpan/authors/id/R/RG/RGARCIA/Safe-2.11.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc alpha mips hppa"
+KEYWORDS="alpha amd64 hppa ia64 mips ppc sparc x86"
 IUSE=""
diff --git a/perl-core/Storable/ChangeLog b/perl-core/Storable/ChangeLog
index 763fa9dc6b9a..7117ed420a6e 100644
--- a/perl-core/Storable/ChangeLog
+++ b/perl-core/Storable/ChangeLog
@@ -1,6 +1,22 @@
-# ChangeLog for dev-perl/Storable
+# ChangeLog for perl-core/Storable
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/ChangeLog,v 1.1 2005/05/25 14:33:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/ChangeLog,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
+
+*Storable-2.15 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +Storable-2.15.ebuild:
+  Version bump upstream
+
+  30 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> Storable-2.13.ebuild:
+  Stable on sh.
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org> Storable-2.13.ebuild:
+  Tested on raq2, bumping for mips
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  Storable-2.07-r1.ebuild:
+  dev-perl/Test-Simple => perl-core/Test-Simple migration
 
 *Storable-2.07-r1 (25 May 2005)
 
diff --git a/perl-core/Storable/Manifest b/perl-core/Storable/Manifest
index 98c605b8ce16..5979a26762ac 100644
--- a/perl-core/Storable/Manifest
+++ b/perl-core/Storable/Manifest
@@ -1,16 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 bd257329608c73781f1a51741d7b31fb ChangeLog 4484
-MD5 94f87eba926ec79ffb1f17adf7e1e7bf Storable-2.07-r1.ebuild 579
-MD5 71042c8ccebeb807339d57d38e0491a2 Storable-2.13.ebuild 527
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 f779c9ba3bd801bd1783ec7e97f162e2 files/digest-Storable-2.13 65
+MD5 1730d6bffb5220969295a719769cc9bc ChangeLog 5151
+MD5 b4325334d4c3c3c0ee7b8b3370cab23e Storable-2.07-r1.ebuild 581
+MD5 8ac248df59a56d94a9f70d108c17daba Storable-2.13.ebuild 530
+MD5 5d680e585d651860408899a7ec7748bd Storable-2.15.ebuild 545
 MD5 02de96e5539723f410332029029a9924 files/digest-Storable-2.07-r1 64
+MD5 f779c9ba3bd801bd1783ec7e97f162e2 files/digest-Storable-2.13 65
+MD5 da0bc65fa2533f5380e945a87294b39f files/digest-Storable-2.15 65
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCb7watG5z4I8BtQoRAimKAJ9HHlw792KFo84XTtCUHdvDU1ztogCfbcnt
-pge9UV/LxDQxp0GwijG632M=
-=Xyzz
+iD8DBQFDc/8ItG5z4I8BtQoRAkEOAJ9itIZfkJIBGJdaYFIlSHCxJA5tywCgkb34
+DZ17EGFrHC8T6zYorfodiCQ=
+=mllO
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Storable/Storable-2.07-r1.ebuild b/perl-core/Storable/Storable-2.07-r1.ebuild
index b0a998d28c87..3a7784945a5f 100644
--- a/perl-core/Storable/Storable-2.07-r1.ebuild
+++ b/perl-core/Storable/Storable-2.07-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/perl-core/Storable/Storable-2.07-r1.ebuild,v 1.1 2005/05/25 14:33:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/Storable-2.07-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
@@ -12,4 +12,4 @@ SLOT="0"
 LICENSE="Artistic"
 KEYWORDS="ia64 x86 amd64 ~ppc alpha sparc hppa mips"
 
-DEPEND="|| ( dev-perl/Test-Simple >=dev-lang/perl-5.8.0-r12 )"
+DEPEND="|| ( perl-core/Test-Simple >=dev-lang/perl-5.8.0-r12 )"
diff --git a/perl-core/Storable/Storable-2.13.ebuild b/perl-core/Storable/Storable-2.13.ebuild
index 35555364bcdc..ac1bf5da7709 100644
--- a/perl-core/Storable/Storable-2.13.ebuild
+++ b/perl-core/Storable/Storable-2.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/perl-core/Storable/Storable-2.13.ebuild,v 1.1 2005/05/25 14:33:45 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/Storable-2.13.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://cpan/authors/id/A/AM/AMS/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/Storable/Storable-2.15.ebuild b/perl-core/Storable/Storable-2.15.ebuild
index 8c6ec7f9faf3..af3ae45f5d0b 100644
--- a/perl-core/Storable/Storable-2.15.ebuild
+++ b/perl-core/Storable/Storable-2.15.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/perl-core/Storable/Storable-2.15.ebuild,v 1.1 2005/11/11 02:16:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Storable/Storable-2.15.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Harness/ChangeLog b/perl-core/Test-Harness/ChangeLog
index b015aa4fe013..762baff8eb9a 100644
--- a/perl-core/Test-Harness/ChangeLog
+++ b/perl-core/Test-Harness/ChangeLog
@@ -1,6 +1,18 @@
-# ChangeLog for dev-perl/Test-Harness
+# ChangeLog for perl-core/Test-Harness
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/ChangeLog,v 1.1 2005/05/25 14:48:47 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/ChangeLog,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
+
+*Test-Harness-2.56 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +Test-Harness-2.56.ebuild:
+  Version bump upstream
+
+*Test-Harness-2.52 (17 Jul 2005)
+
+  17 Jul 2005; Michael Cummings <mcummings@gentoo.org>
+  +Test-Harness-2.52.ebuild:
+  Upstream bump
 
 *Test-Harness-2.30 (25 May 2005)
 
diff --git a/perl-core/Test-Harness/Manifest b/perl-core/Test-Harness/Manifest
index de859f0c59c5..45cb0d5079a1 100644
--- a/perl-core/Test-Harness/Manifest
+++ b/perl-core/Test-Harness/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fc39392a2f1a9e866fe2c34815330676 ChangeLog 4714
-MD5 fd3dce82b7f211c53483d6066885a72d Test-Harness-2.30.ebuild 650
-MD5 e8631a2ac76de45a7132da715c7c4964 Test-Harness-2.42.ebuild 558
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 86a6b060e4be72b66f1e93b28ec9a0dd ChangeLog 5188
+MD5 a46b9720b0af6d279574e20ee7075325 Test-Harness-2.30.ebuild 650
+MD5 0077c6a764ad462f7e6b0aa1f09652d8 Test-Harness-2.42.ebuild 561
+MD5 a7b789089d6eb1d2dc6476c5c00e7b75 Test-Harness-2.52.ebuild 573
+MD5 40f42c9f7d989032d9b40a0604acbcc8 Test-Harness-2.56.ebuild 587
 MD5 0a02516f5c2671f44dfbadefb6d3f1a1 files/digest-Test-Harness-2.30 68
 MD5 7fcf6195e61ac31b053354603b6dcd65 files/digest-Test-Harness-2.42 68
+MD5 d10275c423471454d7ec6f2bb9f864f4 files/digest-Test-Harness-2.52 68
+MD5 8af0441b138a525dca564aab7a5b5984 files/digest-Test-Harness-2.56 68
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFClIEutG5z4I8BtQoRAki5AJ9llDvuuLwtbcO3VpNvPmcpKmFlVwCgg9OS
-k83IbKMKucVbBOdtACEPl34=
-=N6ZD
+iD8DBQFDc//dtG5z4I8BtQoRAsQWAJ9ubISZ1djciR76iZ3TfZk7yHMuNwCbB23h
++Jr8Ios7x2ijcAdDgptFiEM=
+=oSdz
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Test-Harness/Test-Harness-2.30.ebuild b/perl-core/Test-Harness/Test-Harness-2.30.ebuild
index e700e20645a2..2db692971507 100644
--- a/perl-core/Test-Harness/Test-Harness-2.30.ebuild
+++ b/perl-core/Test-Harness/Test-Harness-2.30.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/perl-core/Test-Harness/Test-Harness-2.30.ebuild,v 1.1 2005/05/25 14:48:47 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-2.30.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Harness/Test-Harness-2.42.ebuild b/perl-core/Test-Harness/Test-Harness-2.42.ebuild
index 415b09a3ac11..2b9031d2984f 100644
--- a/perl-core/Test-Harness/Test-Harness-2.42.ebuild
+++ b/perl-core/Test-Harness/Test-Harness-2.42.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/perl-core/Test-Harness/Test-Harness-2.42.ebuild,v 1.1 2005/05/25 14:48:47 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-2.42.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Harness/Test-Harness-2.52.ebuild b/perl-core/Test-Harness/Test-Harness-2.52.ebuild
index f95809b23457..87d93d1c915d 100644
--- a/perl-core/Test-Harness/Test-Harness-2.52.ebuild
+++ b/perl-core/Test-Harness/Test-Harness-2.52.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/perl-core/Test-Harness/Test-Harness-2.52.ebuild,v 1.1 2005/07/17 23:56:21 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-2.52.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Harness/Test-Harness-2.56.ebuild b/perl-core/Test-Harness/Test-Harness-2.56.ebuild
index 289b85ff217d..2939897f11ac 100644
--- a/perl-core/Test-Harness/Test-Harness-2.56.ebuild
+++ b/perl-core/Test-Harness/Test-Harness-2.56.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/perl-core/Test-Harness/Test-Harness-2.56.ebuild,v 1.1 2005/11/11 02:20:04 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Harness/Test-Harness-2.56.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Simple/ChangeLog b/perl-core/Test-Simple/ChangeLog
index add2ee1eea19..2a94d12ed6b8 100644
--- a/perl-core/Test-Simple/ChangeLog
+++ b/perl-core/Test-Simple/ChangeLog
@@ -1,6 +1,21 @@
-# ChangeLog for dev-perl/Test-Simple
+# ChangeLog for perl-core/Test-Simple
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/ChangeLog,v 1.1 2005/05/25 14:54:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/ChangeLog,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
+
+  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
+  Test-Simple-0.54.ebuild:
+  Stable on ppc.
+
+  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
+  Test-Simple-0.54.ebuild:
+  Stable on alpha.
+
+  06 Jun 2005; Markus Rothe <corsair@gentoo.org> Test-Simple-0.54.ebuild:
+  Stable on ppc64
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  Test-Simple-0.54.ebuild:
+  Tested on raq2, bumping for mips
 
 *Test-Simple-0.54 (25 May 2005)
 
diff --git a/perl-core/Test-Simple/Manifest b/perl-core/Test-Simple/Manifest
index 8d999cd0e211..fd7cdb07a240 100644
--- a/perl-core/Test-Simple/Manifest
+++ b/perl-core/Test-Simple/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 06b903f27e39f3fc8b2e269117cb4ae0 ChangeLog 3747
-MD5 786a273f881bdb05cfbb20e0ae0fb794 Test-Simple-0.47-r1.ebuild 733
-MD5 8ed13b28fdf527750f26181d5cc9e346 Test-Simple-0.53.ebuild 650
-MD5 743950734d4b8b3aaf63cd5a2ca5451a Test-Simple-0.54.ebuild 645
+MD5 e9ee180f2c789bb1a78797de9c302e50 Test-Simple-0.60.ebuild 660
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 c148ec885b660fb0afbdd25488e9b2fc Test-Simple-0.60.ebuild 653
+MD5 2255cd946a6528bc62c8874808394557 ChangeLog 4404
+MD5 42875e7c0e4bd3372a8317b9a7b75ceb Test-Simple-0.53.ebuild 651
+MD5 5cb33cddbc0a96ea9bd3ad44dbea3780 Test-Simple-0.47-r1.ebuild 733
+MD5 2debf0ba0b61ec4506662383fa27b472 Test-Simple-0.54.ebuild 647
 MD5 6c92c841c2a87efdcbbcb3e66ec05494 files/digest-Test-Simple-0.47-r1 67
 MD5 d67588559692c2e16600d1a23dd8ab73 files/digest-Test-Simple-0.53 67
 MD5 92843a9ec74e56d38b026d35c9c5098d files/digest-Test-Simple-0.54 67
 MD5 86f4b0adac643442cd9e23c294de79c2 files/digest-Test-Simple-0.60 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFClJFztG5z4I8BtQoRAsV2AJ4zjLiJcl5P8YGAszr+lOztUXYBzgCfajWh
-MAWPjy9QNP44MXS4oh/o1wk=
-=n78u
------END PGP SIGNATURE-----
diff --git a/perl-core/Test-Simple/Test-Simple-0.47-r1.ebuild b/perl-core/Test-Simple/Test-Simple-0.47-r1.ebuild
index ccc6b665b5fb..9467ae1a9e77 100644
--- a/perl-core/Test-Simple/Test-Simple-0.47-r1.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.47-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/perl-core/Test-Simple/Test-Simple-0.47-r1.ebuild,v 1.1 2005/05/25 14:54:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.47-r1.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Simple/Test-Simple-0.53.ebuild b/perl-core/Test-Simple/Test-Simple-0.53.ebuild
index 120979464087..ba1c6eba41bd 100644
--- a/perl-core/Test-Simple/Test-Simple-0.53.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.53.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/perl-core/Test-Simple/Test-Simple-0.53.ebuild,v 1.1 2005/05/25 14:54:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.53.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Test-Simple/Test-Simple-0.54.ebuild b/perl-core/Test-Simple/Test-Simple-0.54.ebuild
index b33d5f193d22..62a0b0dd9fc7 100644
--- a/perl-core/Test-Simple/Test-Simple-0.54.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.54.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/perl-core/Test-Simple/Test-Simple-0.54.ebuild,v 1.1 2005/05/25 14:54:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.54.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://search.cpan.org/~mschwern/${P}/"
 IUSE=""
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 
 mydoc="rfc*.txt"
 myconf="INSTALLDIRS=vendor"
diff --git a/perl-core/Test-Simple/Test-Simple-0.60.ebuild b/perl-core/Test-Simple/Test-Simple-0.60.ebuild
index 10d8ca1cf7ea..00e41b85953d 100644
--- a/perl-core/Test-Simple/Test-Simple-0.60.ebuild
+++ b/perl-core/Test-Simple/Test-Simple-0.60.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/perl-core/Test-Simple/Test-Simple-0.60.ebuild,v 1.1 2005/05/25 14:54:32 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test-Simple/Test-Simple-0.60.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://search.cpan.org/~mschwern/${P}/"
 IUSE=""
 SLOT="0"
 LICENSE="Artistic"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~hppa ~mips ~ppc64 ~arm ~ia64  ~s390"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 mydoc="rfc*.txt"
 myconf="INSTALLDIRS=vendor"
diff --git a/perl-core/Test/ChangeLog b/perl-core/Test/ChangeLog
index 3acc86ce6d58..b10bd5ed8674 100644
--- a/perl-core/Test/ChangeLog
+++ b/perl-core/Test/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for dev-perl/Test
+# ChangeLog for perl-core/Test
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Test/ChangeLog,v 1.1 2005/05/24 17:45:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test/ChangeLog,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org> Test-1.25.ebuild:
+  Tested on raq2, bumping for mips
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> Test-1.25.ebuild:
+  dev-perl/Test-Harness => perl-core/Test-Harness migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org> Test-1.24.ebuild:
+  dev-perl/Test-Harness => perl-core/Test-Harness migration
 
 *Test-1.25 (24 May 2005)
 
diff --git a/perl-core/Test/Manifest b/perl-core/Test/Manifest
index 207629bf73f0..dadba21623d6 100644
--- a/perl-core/Test/Manifest
+++ b/perl-core/Test/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8fcd61d26aa311a4638d0d34fb78dc59 ChangeLog 1168
+MD5 0d79148470c3b275c2d4e93e42a63697 Test-1.24.ebuild 549
+MD5 9771ddde587876b2e1a9d75bb26633f8 ChangeLog 1720
+MD5 057e6051db1339c5b2fb99d607279cad Test-1.25.ebuild 579
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 407182971f5790493838e6a66af7d314 Test-1.24.ebuild 547
-MD5 a548bdc3409fe69d1a949aea2c5dfc8e Test-1.25.ebuild 575
 MD5 5355451430e8ac7e50aab602035de558 files/digest-Test-1.24 60
 MD5 9eeb3da9ccd9792e535f2bdd778fc715 files/digest-Test-1.25 60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCbKYpKf2g/qXtneoRAmx8AKCdsDG5iMKDNFAfsPlIWcRhg4CjkACfam+a
-8C4rfHXuSOIk2FglhFtAROg=
-=6tUG
+iD8DBQFCoSHhtG5z4I8BtQoRAmSqAJ9MVCrAD9a9HLY7qblrOIyHGN7rbwCfVjLV
+qGTMQWBV/h3LvGUwJLSPKjs=
+=IVkq
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Test/Test-1.24.ebuild b/perl-core/Test/Test-1.24.ebuild
index c0e778407271..7704fa14bcb8 100644
--- a/perl-core/Test/Test-1.24.ebuild
+++ b/perl-core/Test/Test-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/perl-core/Test/Test-1.24.ebuild,v 1.1 2005/05/24 17:45:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test/Test-1.24.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
@@ -12,5 +12,5 @@ SLOT="0"
 LICENSE="|| ( Artistic GPL-2 )"
 KEYWORDS="x86 amd64 alpha hppa mips ppc sparc"
 
-DEPEND="dev-perl/Test-Harness"
+DEPEND="perl-core/Test-Harness"
 
diff --git a/perl-core/Test/Test-1.25.ebuild b/perl-core/Test/Test-1.25.ebuild
index 95f8bb8dd59d..f4e93676f732 100644
--- a/perl-core/Test/Test-1.25.ebuild
+++ b/perl-core/Test/Test-1.25.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/perl-core/Test/Test-1.25.ebuild,v 1.1 2005/05/24 17:45:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Test/Test-1.25.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,9 +10,9 @@ SRC_URI="mirror://cpan/authors/id/S/SB/SBURKE/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ~ppc64 s390 sparc x86"
 IUSE=""
 
-DEPEND="dev-perl/Test-Harness"
+DEPEND="perl-core/Test-Harness"
 
 SRC_TEST="do"
diff --git a/perl-core/Text-Balanced/ChangeLog b/perl-core/Text-Balanced/ChangeLog
index 88b9e7138f62..2f1807d65d0a 100644
--- a/perl-core/Text-Balanced/ChangeLog
+++ b/perl-core/Text-Balanced/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for dev-perl/Text-Balanced
+# ChangeLog for perl-core/Text-Balanced
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Text-Balanced/ChangeLog,v 1.1 2005/05/25 15:18:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Text-Balanced/ChangeLog,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 *Text-Balanced-1.95 (25 May 2005)
 
diff --git a/perl-core/Text-Balanced/Manifest b/perl-core/Text-Balanced/Manifest
index c84e8a294bdc..89c9fd9f7649 100644
--- a/perl-core/Text-Balanced/Manifest
+++ b/perl-core/Text-Balanced/Manifest
@@ -1,4 +1,4 @@
-MD5 b94892c9dff94dc7e70f6ba1fc3767df ChangeLog 1289
-MD5 6f44aafd7717df319939e60347a41e42 Text-Balanced-1.95.ebuild 560
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 78b4871e7ec425572af826a6e41aac61 ChangeLog 1459
+MD5 af429000e08293ed602b751e91f15ddc Text-Balanced-1.95.ebuild 563
 MD5 40bc19dc4e7572e6180a139ad6f6043a files/digest-Text-Balanced-1.95 69
diff --git a/perl-core/Text-Balanced/Text-Balanced-1.95.ebuild b/perl-core/Text-Balanced/Text-Balanced-1.95.ebuild
index 0b8a4e9396f3..f611a1ade858 100644
--- a/perl-core/Text-Balanced/Text-Balanced-1.95.ebuild
+++ b/perl-core/Text-Balanced/Text-Balanced-1.95.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/perl-core/Text-Balanced/Text-Balanced-1.95.ebuild,v 1.1 2005/05/25 15:18:43 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Text-Balanced/Text-Balanced-1.95.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Time-HiRes/ChangeLog b/perl-core/Time-HiRes/ChangeLog
index aec13c4e6b35..a938656f7a3f 100644
--- a/perl-core/Time-HiRes/ChangeLog
+++ b/perl-core/Time-HiRes/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for dev-perl/Time-HiRes
+# ChangeLog for perl-core/Time-HiRes
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/ChangeLog,v 1.1 2005/05/25 15:21:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/ChangeLog,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
+
+*Time-HiRes-1.82 (11 Nov 2005)
+
+  11 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +Time-HiRes-1.82.ebuild:
+  Version bump upstream
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  Time-HiRes-1.66.ebuild:
+  Tested on raq2, bumping for mips
 
 *Time-HiRes-1.66 (25 May 2005)
 
diff --git a/perl-core/Time-HiRes/Manifest b/perl-core/Time-HiRes/Manifest
index ba7fead931d4..13e50ad9a1de 100644
--- a/perl-core/Time-HiRes/Manifest
+++ b/perl-core/Time-HiRes/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 96445136f09cde5df8906883fffef0d4 ChangeLog 4649
-MD5 97eaa5f3ae9c879da9dc0455a2df5ca0 Time-HiRes-1.66.ebuild 623
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 b0a524c8139de45850f145b27e557b17 ChangeLog 5070
+MD5 3eb54986987eea8036782a76d3bbdec3 Time-HiRes-1.66.ebuild 625
+MD5 24b0fc5022f0fc66c5fc4b502aef77e5 Time-HiRes-1.82.ebuild 638
 MD5 b262894962dc80c2da7c94a0e267483c files/digest-Time-HiRes-1.66 66
+MD5 8a3f6c45fb62aac99ba5d7b890aeb4ad files/digest-Time-HiRes-1.82 66
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCb7sTtG5z4I8BtQoRApMaAJ0Wk/w3uIpQ/8WrSFDV8/CJX9UhDQCghgh1
-/iZPwCgfGS4dCBeJ7eaSyA8=
-=n61d
+iD8DBQFDc+mRtG5z4I8BtQoRAn2xAJ4puEImSZc3PKd9amuJ+wn18RexRwCfbHo0
+faPEGipsPrA+Px/IE7q9AsE=
+=eblX
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Time-HiRes/Time-HiRes-1.66.ebuild b/perl-core/Time-HiRes/Time-HiRes-1.66.ebuild
index d0ec2371a2ce..d019e073a4a7 100644
--- a/perl-core/Time-HiRes/Time-HiRes-1.66.ebuild
+++ b/perl-core/Time-HiRes/Time-HiRes-1.66.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/perl-core/Time-HiRes/Time-HiRes-1.66.ebuild,v 1.1 2005/05/25 15:21:30 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/Time-HiRes-1.66.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://cpan/authors/id/J/JH/JHI/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/perl-core/Time-HiRes/Time-HiRes-1.82.ebuild b/perl-core/Time-HiRes/Time-HiRes-1.82.ebuild
index 2120059d1768..20b0bb222fa1 100644
--- a/perl-core/Time-HiRes/Time-HiRes-1.82.ebuild
+++ b/perl-core/Time-HiRes/Time-HiRes-1.82.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/perl-core/Time-HiRes/Time-HiRes-1.82.ebuild,v 1.1 2005/11/11 00:44:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-HiRes/Time-HiRes-1.82.ebuild,v 1.1.1.1 2005/11/30 10:11:13 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/Time-Local/ChangeLog b/perl-core/Time-Local/ChangeLog
index 68bc30955712..56ce5b80cdea 100644
--- a/perl-core/Time-Local/ChangeLog
+++ b/perl-core/Time-Local/ChangeLog
@@ -1,6 +1,10 @@
-# ChangeLog for dev-perl/Time-Local
+# ChangeLog for perl-core/Time-Local
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-Local/ChangeLog,v 1.1 2005/05/25 15:34:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-Local/ChangeLog,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
+
+  04 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  Time-Local-1.10.ebuild:
+  Tested on raq2, bumping for mips
 
 *Time-Local-1.11 (25 May 2005)
 
diff --git a/perl-core/Time-Local/Manifest b/perl-core/Time-Local/Manifest
index 5942e197fe77..66218428d2e4 100644
--- a/perl-core/Time-Local/Manifest
+++ b/perl-core/Time-Local/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 37bdb366e60de342fdc03848eea5c5da ChangeLog 1842
-MD5 27aa5fcf30437822bc6f7a5ebda80414 Time-Local-1.11.ebuild 580
-MD5 0921bafaef5d9887e846500843ca9324 Time-Local-1.10.ebuild 568
+MD5 e4e65644efb82f88f76453461bdb2ad2 ChangeLog 2149
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 d4bd7eef7574ad755d16476d2b7fc48a files/digest-Time-Local-1.11 66
+MD5 7d1a67d1444ffc7e9d48710ee9261cac Time-Local-1.10.ebuild 570
+MD5 994edc06f7cc871fce0f445472a3afd2 Time-Local-1.11.ebuild 581
 MD5 418190d3eea5c695354ed8a054d462ee files/digest-Time-Local-1.10 66
+MD5 d4bd7eef7574ad755d16476d2b7fc48a files/digest-Time-Local-1.11 66
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFCclHUtG5z4I8BtQoRAm5AAJsH/nCPY0DUgot1qo9BQ6u0ujeyDgCWPGF2
-V8C/mcvG54V+VCDsoflnAA==
-=qRn9
+iD8DBQFCoSL+tG5z4I8BtQoRAmlTAJwOz+XxLm7cEeOFfHdZSRdHR2cH6ACfa0pd
+weQ+WEW/LCKkuvlefwjBinA=
+=lmiF
 -----END PGP SIGNATURE-----
diff --git a/perl-core/Time-Local/Time-Local-1.10.ebuild b/perl-core/Time-Local/Time-Local-1.10.ebuild
index 3ff3c444b5fc..a6d172429895 100644
--- a/perl-core/Time-Local/Time-Local-1.10.ebuild
+++ b/perl-core/Time-Local/Time-Local-1.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/perl-core/Time-Local/Time-Local-1.10.ebuild,v 1.1 2005/05/25 15:34:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-Local/Time-Local-1.10.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://cpan/authors/id/D/DR/DROLSKY/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/Time-Local/Time-Local-1.11.ebuild b/perl-core/Time-Local/Time-Local-1.11.ebuild
index 45094d087235..0197c779bd9e 100644
--- a/perl-core/Time-Local/Time-Local-1.11.ebuild
+++ b/perl-core/Time-Local/Time-Local-1.11.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/perl-core/Time-Local/Time-Local-1.11.ebuild,v 1.1 2005/05/25 15:34:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/Time-Local/Time-Local-1.11.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/digest-base/ChangeLog b/perl-core/digest-base/ChangeLog
index 1e162eb2c02e..fe045b669f63 100644
--- a/perl-core/digest-base/ChangeLog
+++ b/perl-core/digest-base/ChangeLog
@@ -1,6 +1,41 @@
-# ChangeLog for dev-perl/digest-base
+# ChangeLog for perl-core/digest-base
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/ChangeLog,v 1.1 2005/05/24 14:56:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/ChangeLog,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
+
+*digest-base-1.13 (13 Nov 2005)
+
+  13 Nov 2005; Michael Cummings <mcummings@gentoo.org>
+  +digest-base-1.13.ebuild:
+  Version bump upstream
+
+  10 Oct 2005; Hardave Riar <hardave@gentoo.org> digest-base-1.10.ebuild:
+  Stable on mips.
+
+  17 Sep 2005; Marcus D. Hanwell <cryos@gentoo.org> digest-base-1.10.ebuild:
+  Stable on amd64.
+
+  13 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+  digest-base-1.10.ebuild:
+  Stable on ppc.
+
+  07 Jul 2005; Markus Rothe <corsair@gentoo.org> digest-base-1.10.ebuild:
+  Stable on ppc64
+
+  02 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
+  digest-base-1.10.ebuild:
+  Stable on alpha.
+
+  29 Jun 2005; Michael Cummings <mcummings@gentoo.org>
+  digest-base-1.10.ebuild:
+  unmasking for x86 and sparc
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  digest-base-1.10.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
+
+  25 May 2005; Michael Cummings <mcummings@gentoo.org>
+  digest-base-1.08.ebuild:
+  dev-perl/MIME-Base64 => perl-core/MIME-Base64 migration
 
 *digest-base-1.10 (24 May 2005)
 
diff --git a/perl-core/digest-base/Manifest b/perl-core/digest-base/Manifest
index 44c1c1557a87..8ebf54b634b5 100644
--- a/perl-core/digest-base/Manifest
+++ b/perl-core/digest-base/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8bd24abe9e7c20ce7bdeaa9d36ae41bc ChangeLog 1933
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 36db689c9a2dc4becf9503746e4f1a24 digest-base-1.05.ebuild 589
-MD5 556a809167d835f5a8d1ec893dc1ed31 digest-base-1.08.ebuild 644
-MD5 c933de06aee4a4a814368a0252e471a3 digest-base-1.10.ebuild 644
-MD5 3d509a58b2378e7d62f5163a5e58c508 files/digest-digest-base-1.10 61
+MD5 c255265fc94f1ae2e6ef0648908b7334 ChangeLog 3164
+MD5 e706dff64d9dbfd06bfe1f07dec80873 digest-base-1.05.ebuild 589
+MD5 b0eab3436874706df4bce6c12b201ccf digest-base-1.08.ebuild 646
+MD5 1d978089832613376d69bef2716253ad digest-base-1.10.ebuild 633
+MD5 fbec6ae8da1d3ab4b2913c0d96450932 digest-base-1.13.ebuild 646
 MD5 35900ffbfad8f86b1af3a6ad4e16018e files/digest-digest-base-1.05 61
 MD5 824966168d7aa40d2879cf23686d97df files/digest-digest-base-1.08 61
+MD5 3d509a58b2378e7d62f5163a5e58c508 files/digest-digest-base-1.10 61
+MD5 8c074cb64d58e1ec49e6e621324bec11 files/digest-digest-base-1.13 61
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCa6kDtG5z4I8BtQoRAidAAJ9T6sYVP0PmQq6LVg/8ZQ6uYi5m4ACfRyJJ
-zXjj57pu+W9s6tDYGpHnrSY=
-=ikb8
+iD8DBQFDd0yhtG5z4I8BtQoRAhD5AJ9Z1kVXUMKTZm2fKv4SFtbA049kOgCghGFO
+xReNOpx5Oc/Whh3lLlideyo=
+=A+C5
 -----END PGP SIGNATURE-----
diff --git a/perl-core/digest-base/digest-base-1.05.ebuild b/perl-core/digest-base/digest-base-1.05.ebuild
index 347b19ae0757..49d0dd4c76d5 100644
--- a/perl-core/digest-base/digest-base-1.05.ebuild
+++ b/perl-core/digest-base/digest-base-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/perl-core/digest-base/digest-base-1.05.ebuild,v 1.1 2005/05/24 14:56:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/digest-base-1.05.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/digest-base/digest-base-1.08.ebuild b/perl-core/digest-base/digest-base-1.08.ebuild
index 374d596315b4..1298010bec4f 100644
--- a/perl-core/digest-base/digest-base-1.08.ebuild
+++ b/perl-core/digest-base/digest-base-1.08.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/perl-core/digest-base/digest-base-1.08.ebuild,v 1.1 2005/05/24 14:56:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/digest-base-1.08.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
@@ -19,4 +19,4 @@ IUSE=""
 
 mydoc="rfc*.txt"
 
-DEPEND="dev-perl/MIME-Base64"
+DEPEND="perl-core/MIME-Base64"
diff --git a/perl-core/digest-base/digest-base-1.10.ebuild b/perl-core/digest-base/digest-base-1.10.ebuild
index 46dfa66b7ddd..91933550f615 100644
--- a/perl-core/digest-base/digest-base-1.10.ebuild
+++ b/perl-core/digest-base/digest-base-1.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/perl-core/digest-base/digest-base-1.10.ebuild,v 1.1 2005/05/24 14:56:40 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/digest-base-1.10.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
@@ -13,10 +13,10 @@ SRC_URI="mirror://cpan/authors/id/G/GA/GAAS/${MY_P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64 ~ia64 ~s390 ~ppc64"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 SRC_TEST="do"
 IUSE=""
 
 mydoc="rfc*.txt"
 
-DEPEND="dev-perl/MIME-Base64"
+DEPEND="perl-core/MIME-Base64"
diff --git a/perl-core/digest-base/digest-base-1.13.ebuild b/perl-core/digest-base/digest-base-1.13.ebuild
index aa7f0702d90d..c149726d9ed7 100644
--- a/perl-core/digest-base/digest-base-1.13.ebuild
+++ b/perl-core/digest-base/digest-base-1.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/perl-core/digest-base/digest-base-1.13.ebuild,v 1.1 2005/11/13 14:24:23 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/digest-base/digest-base-1.13.ebuild,v 1.1.1.1 2005/11/30 10:11:12 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/i18n-langtags/ChangeLog b/perl-core/i18n-langtags/ChangeLog
index 9c99b2a89bed..becd79e08bdb 100644
--- a/perl-core/i18n-langtags/ChangeLog
+++ b/perl-core/i18n-langtags/ChangeLog
@@ -1,6 +1,9 @@
-# ChangeLog for dev-perl/i18n-langtags
+# ChangeLog for perl-core/i18n-langtags
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/i18n-langtags/ChangeLog,v 1.1 2005/05/24 18:05:04 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/i18n-langtags/ChangeLog,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
+
+  25 May 2005; Yuta SATOH <nigoro@gentoo.org> i18n-langtags-0.35.ebuild:
+  Stable on ppc64
 
 *i18n-langtags-0.35 (24 May 2005)
 
diff --git a/perl-core/i18n-langtags/Manifest b/perl-core/i18n-langtags/Manifest
index 7e6382b79cce..a3cfef00ffc2 100644
--- a/perl-core/i18n-langtags/Manifest
+++ b/perl-core/i18n-langtags/Manifest
@@ -1,4 +1,14 @@
-MD5 00eb98d4eb4c4ff2a09c31a177cc0ace ChangeLog 2383
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f52274c908eb8491d60201d2c7a361a8 i18n-langtags-0.35.ebuild 610
+MD5 802d7c70753b32248b7bfe12d89925b5 ChangeLog 2648
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 2057b2fe4302d1bffd0131889e40017b i18n-langtags-0.35.ebuild 610
 MD5 bea0042056964503f6c79cf18ddaf666 files/digest-i18n-langtags-0.35 69
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCljBoI1lqEGTUzyQRAglhAJ9d17ePrvqPC+apAyozdtOvONlwfQCfesjq
+29HI+igc9P23rfjIgAqpgJI=
+=BouB
+-----END PGP SIGNATURE-----
diff --git a/perl-core/i18n-langtags/i18n-langtags-0.35.ebuild b/perl-core/i18n-langtags/i18n-langtags-0.35.ebuild
index 4de5bd05f0b8..64a26153c1ed 100644
--- a/perl-core/i18n-langtags/i18n-langtags-0.35.ebuild
+++ b/perl-core/i18n-langtags/i18n-langtags-0.35.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/perl-core/i18n-langtags/i18n-langtags-0.35.ebuild,v 1.1 2005/05/24 18:05:04 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/i18n-langtags/i18n-langtags-0.35.ebuild,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
 
 inherit perl-module
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://cpan/authors/id/S/SB/SBURKE/${MY_P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/perl-core/locale-maketext/ChangeLog b/perl-core/locale-maketext/ChangeLog
index 1b77ee1aad04..91a1ed380377 100644
--- a/perl-core/locale-maketext/ChangeLog
+++ b/perl-core/locale-maketext/ChangeLog
@@ -1,6 +1,6 @@
-# ChangeLog for dev-perl/locale-maketext
+# ChangeLog for perl-core/locale-maketext
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/ChangeLog,v 1.1 2005/05/25 15:38:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/ChangeLog,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 *locale-maketext-1.09 (25 May 2005)
 
diff --git a/perl-core/locale-maketext/Manifest b/perl-core/locale-maketext/Manifest
index e8310b44f9db..34c3e1fa7d97 100644
--- a/perl-core/locale-maketext/Manifest
+++ b/perl-core/locale-maketext/Manifest
@@ -1,14 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 63b3f81985b4574cc0ddf238eced5c84 ChangeLog 2523
-MD5 d5f04d5ef9c7fd406f5cbf2cbdcb6efd locale-maketext-1.09.ebuild 658
+MD5 02c2a857f02ce5bf83e0285fef5bd7c0 locale-maketext-1.09.ebuild 658
+MD5 ac341dc7e23fd36b195a64da602f01d7 ChangeLog 2697
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 a3b5536c5be2c15a2cc26f8cf4271ddc files/digest-locale-maketext-1.09 71
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCk2z5tG5z4I8BtQoRAk5sAJ4zMqo+VRoP+mjqDDi0oZV1wTKdeACeOF4f
-uiEueqDWL3/L1MXwIp1EnSs=
-=rN17
+iD8DBQFCljCQI1lqEGTUzyQRAntJAKCaHRRO6ZWh4uB6cNgg9TGKPLcM3wCcCC53
+mv+locKt0sUiC5SvRoNHDfU=
+=+e/Z
 -----END PGP SIGNATURE-----
diff --git a/perl-core/locale-maketext/locale-maketext-1.09.ebuild b/perl-core/locale-maketext/locale-maketext-1.09.ebuild
index 6fe9c78ac98f..b46b52213d79 100644
--- a/perl-core/locale-maketext/locale-maketext-1.09.ebuild
+++ b/perl-core/locale-maketext/locale-maketext-1.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/perl-core/locale-maketext/locale-maketext-1.09.ebuild,v 1.1 2005/05/25 15:38:48 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/locale-maketext/locale-maketext-1.09.ebuild,v 1.1.1.1 2005/11/30 10:11:14 chriswhite Exp $
 
 inherit perl-module
 
diff --git a/perl-core/metadata.xml b/perl-core/metadata.xml
index e01932742c44..0c2cd1594295 100644
--- a/perl-core/metadata.xml
+++ b/perl-core/metadata.xml
@@ -6,13 +6,17 @@
 		Perl programming language.
 	</longdescription>
 	<longdescription lang="de">
-		Die Kategorie perl-core enthält Bibliotheken und Werkzeuge für die 
+		Die Kategorie perl-core enthält Bibliotheken und Werkzeuge für die 
 		Programmiersprache Perl.
 	</longdescription>
 	<longdescription lang="es">
 		La categoría perl-core contiene librerías y utilidades referentes
 		al lenguaje de programación Perl.
 	</longdescription>
+	<longdescription lang="ja">
+		perl-coreカテゴリーにはPerl プログラミング言語に関連にするライブラリと
+		ユーティリティが含まれて>います。
+	</longdescription>
 	<longdescription lang="nl">
 		De perl-core categorie bevat bibliotheken en hulpmiddelen voor het gebruik
 		van de programmeertaal Perl.
@@ -21,5 +25,9 @@
 		Nhóm perl-core chứa các thư viện và tiện ích liên quan
 		đến ngôn ngữ lập trình Perl.
 	</longdescription>
+	<longdescription lang="it">
+		La categoria perl-core contiene librerie ed utilità per il linguaggio di
+		programmazione Perl.
+	</longdescription>
 </catmetadata>
 
diff --git a/perl-core/net-ping/ChangeLog b/perl-core/net-ping/ChangeLog
index ac7907ea8f94..1bbd1c6e506c 100644
--- a/perl-core/net-ping/ChangeLog
+++ b/perl-core/net-ping/ChangeLog
@@ -1,6 +1,15 @@
-# ChangeLog for dev-perl/net-ping
+# ChangeLog for perl-core/net-ping
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/net-ping/ChangeLog,v 1.1 2005/05/25 15:40:19 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/net-ping/ChangeLog,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
+
+  12 Nov 2005; Brent Baude <ranger@gentoo.org> net-ping-2.31.ebuild:
+  Marking net-ping-2.31 ~ppc64 for bug# 112220
+
+  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> net-ping-2.31.ebuild:
+  stable on ia64
+
+  10 Jul 2005; Tom Martin <slarti@gentoo.org> net-ping-2.31.ebuild:
+  Marked ~ia64.
 
 *net-ping-2.31 (25 May 2005)
 
diff --git a/perl-core/net-ping/Manifest b/perl-core/net-ping/Manifest
index 96f6ae0ec755..b95298927990 100644
--- a/perl-core/net-ping/Manifest
+++ b/perl-core/net-ping/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9f58d06102bdf97a51cb4fb1015844b2 ChangeLog 991
+MD5 dde41a044c34f52af13dba47356ca431 ChangeLog 1442
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
-MD5 75951bb8931dc638665ff796a2b759d0 net-ping-2.31.ebuild 547
+MD5 85694af0dc78854e3c2c19753c9ad3e1 net-ping-2.31.ebuild 537
 MD5 64b48720c4d5239cdd1b4ab08bc79fef files/digest-net-ping-2.31 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCcnLCtG5z4I8BtQoRArfcAJ9RdrzZ4hineAxzNIZwveyHPf796gCggG3H
-3/oVwVao52wCATJjDi/SFIk=
-=tgYP
------END PGP SIGNATURE-----
diff --git a/perl-core/net-ping/net-ping-2.31.ebuild b/perl-core/net-ping/net-ping-2.31.ebuild
index 5bd4e3ff3456..3f6760f440fc 100644
--- a/perl-core/net-ping/net-ping-2.31.ebuild
+++ b/perl-core/net-ping/net-ping-2.31.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/perl-core/net-ping/net-ping-2.31.ebuild,v 1.1 2005/05/25 15:40:19 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/perl-core/net-ping/net-ping-2.31.ebuild,v 1.1.1.1 2005/11/30 10:11:15 chriswhite Exp $
 
 inherit perl-module
 
@@ -12,7 +12,5 @@ SRC_URI="mirror://cpan/authors/id/B/BB/BBB/${MY_P}.tar.gz"
 HOMEPAGE="http://search.cpan.org/author/BBB/${MY_P}/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha ~hppa"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86"
 IUSE=""
-
-DEPEND="${DEPEND}"
diff --git a/rox-base/metadata.xml b/rox-base/metadata.xml
index 2b397a3647d5..94cf2ab5a58c 100644
--- a/rox-base/metadata.xml
+++ b/rox-base/metadata.xml
@@ -4,5 +4,23 @@
 	<longdescription lang="en">
 		The rox-base category contains core Rox packages.
 	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie rox-base enthält die Basispakete für den Rox-Desktop.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría rox-base contiene aplicaciones base de Rox.
+	</longdescription>
+	<longdescription lang="ja">
+		rox-baseカテゴリーにはRoxコア・パッケージが含まれています。
+	</longdescription>
+	<longdescription lang="nl">
+		De rox-base categorie bevat de basispakketten van Rox.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm rox-base chứa các phần mềm cốt lõi của Rox.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria rox-base contiene applicazioni base per Rox.
+	</longdescription>
 </catmetadata>
 
diff --git a/rox-base/mime-editor/ChangeLog b/rox-base/mime-editor/ChangeLog
index 9b585267abac..9a24e7e61d47 100644
--- a/rox-base/mime-editor/ChangeLog
+++ b/rox-base/mime-editor/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for rox-base/mime-editor
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/mime-editor/ChangeLog,v 1.1 2004/11/27 10:09:30 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/mime-editor/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+  25 Jun 2005; Simon Stelling <blubb@gentoo.org> mime-editor-0.1.3.ebuild:
+  added ~amd64 keyword
 
 *mime-editor-0.1.3 (27 Nov 2004)
 
diff --git a/rox-base/mime-editor/Manifest b/rox-base/mime-editor/Manifest
index b75ada917644..d00ba8ceda44 100644
--- a/rox-base/mime-editor/Manifest
+++ b/rox-base/mime-editor/Manifest
@@ -1,3 +1,4 @@
-MD5 339ceb8e114aa1d7f1bd6c21fb208053 mime-editor-0.1.3.ebuild 394
+MD5 5428d456f1d7e2b9db785e580bad322a ChangeLog 556
 MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 1af50ea51b96feac846874741b72d3e5 mime-editor-0.1.3.ebuild 507
 MD5 ef0dfe619213f6d4f3f29350a721f6c5 files/digest-mime-editor-0.1.3 65
diff --git a/rox-base/mime-editor/mime-editor-0.1.3.ebuild b/rox-base/mime-editor/mime-editor-0.1.3.ebuild
index aee8cda2d2c1..1effb8e180a1 100644
--- a/rox-base/mime-editor/mime-editor-0.1.3.ebuild
+++ b/rox-base/mime-editor/mime-editor-0.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/rox-base/mime-editor/mime-editor-0.1.3.ebuild,v 1.1 2004/11/27 10:09:30 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/mime-editor/mime-editor-0.1.3.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="MIME-Editor is editor for the Shared MIME Database for ROX Desktop"
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~x86"
 
 IUSE=""
 
diff --git a/rox-base/oroborox/ChangeLog b/rox-base/oroborox/ChangeLog
index eb5d4427e355..0642ec3b9b06 100644
--- a/rox-base/oroborox/ChangeLog
+++ b/rox-base/oroborox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/oroborox
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.1 2004/12/01 15:27:02 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+*oroborox-0.9.7.9 (19 Nov 2005)
+
+  19 Nov 2005; Sergey Kuleshov <svyatogor@gentoo.org>
+  +oroborox-0.9.7.9.ebuild:
+  Version bump. Ebuild by Peter Hyman.  Bug #106247.
 
 *oroborox-0.9.5 (01 Dec 2004)
 
diff --git a/rox-base/oroborox/Manifest b/rox-base/oroborox/Manifest
index 96dff754f08c..7ae8e14c0f58 100644
--- a/rox-base/oroborox/Manifest
+++ b/rox-base/oroborox/Manifest
@@ -1,3 +1,16 @@
-MD5 a85cb45140e8b4bde9bf8479c04f2c25 oroborox-0.9.5.ebuild 443
-MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4134bbace3eac4b4277f6c5cb7376f4b ChangeLog 615
 MD5 9381810c4900deba7459674996d12d0e files/digest-oroborox-0.9.5 67
+MD5 2ec7c4fc26682d6209c321fbd2cac9ff files/digest-oroborox-0.9.7.9 69
+MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 9d458e3b36764708263a9f3254112ef3 oroborox-0.9.5.ebuild 544
+MD5 e08a4edddb0e7edf7accb64f662f830c oroborox-0.9.7.9.ebuild 884
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDf311I1lqEGTUzyQRAr3JAJ4grZpcd/Bzcya74Q46gmiQKAl/CACeLtUO
+DzugPxTITgwPxu+afiTY6v4=
+=0nJT
+-----END PGP SIGNATURE-----
diff --git a/rox-base/oroborox/oroborox-0.9.5.ebuild b/rox-base/oroborox/oroborox-0.9.5.ebuild
index a4080c813eb2..f5df4d47e3c0 100644
--- a/rox-base/oroborox/oroborox-0.9.5.ebuild
+++ b/rox-base/oroborox/oroborox-0.9.5.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/rox-base/oroborox/oroborox-0.9.5.ebuild,v 1.1 2004/12/01 15:27:02 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.5.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="OroboROX is a small window manager for the ROX Desktop."
 
diff --git a/rox-base/oroborox/oroborox-0.9.7.9.ebuild b/rox-base/oroborox/oroborox-0.9.7.9.ebuild
index 5cf1a9dd789e..8ed982265204 100644
--- a/rox-base/oroborox/oroborox-0.9.7.9.ebuild
+++ b/rox-base/oroborox/oroborox-0.9.7.9.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/rox-base/oroborox/oroborox-0.9.7.9.ebuild,v 1.1 2005/11/19 18:07:18 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/oroborox/oroborox-0.9.7.9.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 MY_PN="OroboROX"
 
@@ -16,7 +16,7 @@ IUSE=""
 
 DEPEND="virtual/x11
 		virtual/xft
-		>=freetype-2.0"
+		>=media-libs/freetype-2.0"
 
 S=${WORKDIR}
 ROX_LIB_VER=1.9.14
diff --git a/rox-base/pager/ChangeLog b/rox-base/pager/ChangeLog
index 95a4412d75ef..986fd4034cb7 100644
--- a/rox-base/pager/ChangeLog
+++ b/rox-base/pager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/pager
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/ChangeLog,v 1.1 2004/11/27 10:14:50 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/ChangeLog,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
+
+*pager-1.0.1 (24 Oct 2005)
+
+  24 Oct 2005; Sergey Kuleshov <svyatogor@gentoo.org>
+  +files/01_all_libwnck-2-fix.patch, +pager-1.0.1.ebuild:
+  New version of rox pager with patch to make it actually compile.
 
 *pager-1.0.0 (27 Nov 2004)
 
diff --git a/rox-base/pager/Manifest b/rox-base/pager/Manifest
index 945f05edd7f8..8f39e184edb8 100644
--- a/rox-base/pager/Manifest
+++ b/rox-base/pager/Manifest
@@ -1,2 +1,7 @@
-MD5 f1573d82042dc86c56f746e6d56ecbdb pager-1.0.0.ebuild 401
+MD5 4d279253826a45f806ceabef68467a22 pager-1.0.0.ebuild 488
+MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 84b377ba5d7dca52a466e54c4de576dc ChangeLog 638
+MD5 f1bf96999ab4a5621840a35b6562d31c pager-1.0.1.ebuild 679
 MD5 cd37cec48b86ee7a8e463b1c2557f2f0 files/digest-pager-1.0.0 59
+MD5 d552445fe92b9373f09eca796de3f79d files/digest-pager-1.0.1 59
+MD5 414741eb1cef4b2d639aa822bc17c3a9 files/01_all_libwnck-2-fix.patch 13436
diff --git a/rox-base/pager/pager-1.0.0.ebuild b/rox-base/pager/pager-1.0.0.ebuild
index ac6d075361c5..0d1c500f43c7 100644
--- a/rox-base/pager/pager-1.0.0.ebuild
+++ b/rox-base/pager/pager-1.0.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/rox-base/pager/pager-1.0.0.ebuild,v 1.1 2004/11/27 10:14:50 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.0.ebuild,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
 
 DESCRIPTION="Pager - A pager applet for ROX-Filer"
 
diff --git a/rox-base/pager/pager-1.0.1.ebuild b/rox-base/pager/pager-1.0.1.ebuild
index a7ed1b748bf6..f2f88a71220c 100644
--- a/rox-base/pager/pager-1.0.1.ebuild
+++ b/rox-base/pager/pager-1.0.1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.1.ebuild,v 1.1 2005/10/24 11:14:43 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/pager/pager-1.0.1.ebuild,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
 
-inherit rox eutils
 
 PAGER_PATCH_FN="01_all_libwnck-2-fix.patch"
 DESCRIPTION="Pager - A pager applet for ROX-Filer"
@@ -20,6 +19,8 @@ ROX_LIB_VER=1.9.14
 APPNAME=Pager
 SET_PERM=true
 
+inherit rox eutils
+
 src_unpack() {
 	unpack ${A}
 	cd ${WORKDIR}/${P}/${APPNAME}/src
diff --git a/rox-base/rox-clib/ChangeLog b/rox-base/rox-clib/ChangeLog
index ccdd9cb96155..c8905a883290 100644
--- a/rox-base/rox-clib/ChangeLog
+++ b/rox-base/rox-clib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for rox-base/rox-clib
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/ChangeLog,v 1.1 2004/11/26 21:12:10 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+*rox-clib-2.1.5 (03 Oct 2005)
+
+  03 Oct 2005; Sergey Kuleshov <svyatogor@gentoo.org>
+  +rox-clib-2.1.5.ebuild:
+  Version bump! Using 2.1.5 from now on
+
+  06 Mar 2005; Joseph Jezak <josejx@gentoo.org> rox-clib-2.1.1.ebuild:
+  Marked ~ppc for bug #83706.
 
 *rox-clib-2.1.1 (26 Nov 2004)
 
diff --git a/rox-base/rox-clib/Manifest b/rox-base/rox-clib/Manifest
index 6357d116011f..4cae8463d2f8 100644
--- a/rox-base/rox-clib/Manifest
+++ b/rox-base/rox-clib/Manifest
@@ -1,2 +1,6 @@
-MD5 af474bb96bca9cf04434bb14373fd28b rox-clib-2.1.1.ebuild 615
+MD5 e156c0e30e3a58fd4a698f043eb23471 rox-clib-2.1.1.ebuild 711
+MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 9a1e78ce9cc2e2fe93463e217593905a ChangeLog 699
+MD5 b039ea5986a9be5039ea74216cb7ded9 rox-clib-2.1.5.ebuild 735
 MD5 8d9ae64d1a331e02ab7dc49d5b2e35c8 files/digest-rox-clib-2.1.1 66
+MD5 b2d334d203c0b6e0d328d0482ccac0b4 files/digest-rox-clib-2.1.5 66
diff --git a/rox-base/rox-clib/rox-clib-2.1.1.ebuild b/rox-base/rox-clib/rox-clib-2.1.1.ebuild
index bb02f79bdc8e..5523a6871a60 100644
--- a/rox-base/rox-clib/rox-clib-2.1.1.ebuild
+++ b/rox-base/rox-clib/rox-clib-2.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/rox-base/rox-clib/rox-clib-2.1.1.ebuild,v 1.1 2004/11/26 21:12:10 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="A library for ROX applications written in C."
 
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc"
 
 IUSE=""
 
diff --git a/rox-base/rox-clib/rox-clib-2.1.5.ebuild b/rox-base/rox-clib/rox-clib-2.1.5.ebuild
index c5843a1e41e9..727ee33c85d8 100644
--- a/rox-base/rox-clib/rox-clib-2.1.5.ebuild
+++ b/rox-base/rox-clib/rox-clib-2.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/rox-base/rox-clib/rox-clib-2.1.5.ebuild,v 1.1 2005/10/03 10:30:52 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-clib/rox-clib-2.1.5.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="A library for ROX applications written in C."
 
diff --git a/rox-base/rox-lib/ChangeLog b/rox-base/rox-lib/ChangeLog
index c0aeec0ad9d8..e0fa2442d8c8 100644
--- a/rox-base/rox-lib/ChangeLog
+++ b/rox-base/rox-lib/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for rox-base/rox-lib
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/ChangeLog,v 1.1 2004/11/26 19:44:56 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+*rox-lib-2.0.2 (30 Sep 2005)
+
+  30 Sep 2005; Sergey Kuleshov <svyatogor@gentoo.org> +rox-lib-2.0.2.ebuild:
+  New version added. Bug #79333
+
+  22 May 2005; Simon Stelling <blubb@gentoo.org> rox-lib-1.9.16.ebuild:
+  added ~amd64 keyword
+
+  06 Mar 2005; Joseph Jezak <josejx@gentoo.org> rox-lib-1.9.16.ebuild:
+  Marked ~ppc for bug #83706.
 
 *rox-lib-1.9.16 (26 Nov 2004)
 
diff --git a/rox-base/rox-lib/Manifest b/rox-base/rox-lib/Manifest
index 7704ac60787b..0f7317b74281 100644
--- a/rox-base/rox-lib/Manifest
+++ b/rox-base/rox-lib/Manifest
@@ -1,2 +1,6 @@
-MD5 61e99009e14f3fe722bae40d7fa4032c rox-lib-1.9.16.ebuild 480
+MD5 70cd161ea700442f196de78e440e1054 rox-lib-1.9.16.ebuild 584
+MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 85a8f5cc58b6ba156b9a8339f02b743f ChangeLog 763
+MD5 01a9d43d2de848b4f71ded53969b3758 rox-lib-2.0.2.ebuild 739
 MD5 128e38e085816fd65a118f6188b0b0dd files/digest-rox-lib-1.9.16 63
+MD5 e7f53df1b025b4495960b15cf3a25d70 files/digest-rox-lib-2.0.2 62
diff --git a/rox-base/rox-lib/rox-lib-1.9.16.ebuild b/rox-base/rox-lib/rox-lib-1.9.16.ebuild
index 54f701edf5e0..7e2e57987198 100644
--- a/rox-base/rox-lib/rox-lib-1.9.16.ebuild
+++ b/rox-base/rox-lib/rox-lib-1.9.16.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/rox-base/rox-lib/rox-lib-1.9.16.ebuild,v 1.1 2004/11/26 19:44:56 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/rox-lib-1.9.16.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="ROX-Lib2 - Shared code for ROX applications by Thomas Leonard"
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 IUSE=""
 
diff --git a/rox-base/rox-lib/rox-lib-2.0.2.ebuild b/rox-base/rox-lib/rox-lib-2.0.2.ebuild
index 642eec55f8b2..0930c0e9b9a1 100644
--- a/rox-base/rox-lib/rox-lib-2.0.2.ebuild
+++ b/rox-base/rox-lib/rox-lib-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/rox-base/rox-lib/rox-lib-2.0.2.ebuild,v 1.1 2005/09/30 08:04:10 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-lib/rox-lib-2.0.2.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 inherit python
 
diff --git a/rox-base/rox-session/ChangeLog b/rox-base/rox-session/ChangeLog
index ac07ce9d148f..eabf19e7484c 100644
--- a/rox-base/rox-session/ChangeLog
+++ b/rox-base/rox-session/ChangeLog
@@ -1,6 +1,16 @@
-# ChangeLog for app-misc/rox-session
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.1 2004/11/26 18:43:55 sergey Exp $
+# ChangeLog for rox-base/rox-session
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/ChangeLog,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
+
+*rox-session-0.26 (12 Oct 2005)
+
+  12 Oct 2005; Sergey Kuleshov <svyatogor@gentoo.org>
+  +rox-session-0.26.ebuild:
+  Brand new version rox-session. Bug #106262
+
+  26 Nov 2004; Sergey Kuleshov <svyatogor@gentoo.org>
+  rox-session-0.1.20.ebuild, rox-session-0.1.21.ebuild:
+  Update dependencies, due to move from app-misc/ to rox-base
 
 *rox-session-0.1.21 (26 Nov 2004)
 
diff --git a/rox-base/rox-session/Manifest b/rox-base/rox-session/Manifest
index d5b65ec58667..bf9c4d881edc 100644
--- a/rox-base/rox-session/Manifest
+++ b/rox-base/rox-session/Manifest
@@ -1,7 +1,9 @@
-MD5 fa625ca5a74e7a8c0baa6afe257b85ac ChangeLog 1022
+MD5 a061d9418f171ef39bacc91b06d96450 ChangeLog 1599
 MD5 1652522405f5936eb29776ef8d5ffa5b metadata.xml 310
-MD5 4e4be861670cf32d2060a5382ee84a9f rox-session-0.1.20.ebuild 728
-MD5 9d870283207049cd430c5cae5cfe1409 rox-session-0.1.21.ebuild 732
+MD5 c4fbbdb31c794f57433bc07589c2bcd0 rox-session-0.1.20.ebuild 726
+MD5 51fd19eda7aacd844c1bd5a6cd57d151 rox-session-0.1.21.ebuild 730
+MD5 fdb4c2be9c4980830c208712b4ccdb51 rox-session-0.26.ebuild 1602
 MD5 6746e572a2e4a848f5228873903fad07 files/ROX-Session 51
 MD5 2fbd5b90cd0ab5251e571069b37ce294 files/digest-rox-session-0.1.20 67
 MD5 69620f9bcf7f4ca9ce765d68d957c25e files/digest-rox-session-0.1.21 67
+MD5 bed7c6fdff0fc34302a88e622fa4f54e files/digest-rox-session-0.26 65
diff --git a/rox-base/rox-session/rox-session-0.1.20.ebuild b/rox-base/rox-session/rox-session-0.1.20.ebuild
index 984181ee0f73..f7634962ecb4 100644
--- a/rox-base/rox-session/rox-session-0.1.20.ebuild
+++ b/rox-base/rox-session/rox-session-0.1.20.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/rox-base/rox-session/rox-session-0.1.20.ebuild,v 1.1 2004/11/26 18:43:55 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.1.20.ebuild,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
 
 MY_PN="ROX-Session"
 DESCRIPTION="Rox-Session is a really simple session manager"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc"
 IUSE=""
 
-DEPEND="app-misc/rox"
+DEPEND="rox-base/rox"
 
 S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
 
diff --git a/rox-base/rox-session/rox-session-0.1.21.ebuild b/rox-base/rox-session/rox-session-0.1.21.ebuild
index f64e49b7ee87..205c72c77d24 100644
--- a/rox-base/rox-session/rox-session-0.1.21.ebuild
+++ b/rox-base/rox-session/rox-session-0.1.21.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/rox-base/rox-session/rox-session-0.1.21.ebuild,v 1.1 2004/11/26 18:43:55 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.1.21.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 MY_PN="ROX-Session"
 DESCRIPTION="Rox-Session is a really simple session manager"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 ~sparc ppc"
 IUSE=""
 
-DEPEND="app-misc/rox"
+DEPEND="rox-base/rox"
 
 S="${WORKDIR}/${MY_PN}-${PV}/${MY_PN}"
 
diff --git a/rox-base/rox-session/rox-session-0.26.ebuild b/rox-base/rox-session/rox-session-0.26.ebuild
index 11e900727253..387e03e3d76e 100644
--- a/rox-base/rox-session/rox-session-0.26.ebuild
+++ b/rox-base/rox-session/rox-session-0.26.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/rox-base/rox-session/rox-session-0.26.ebuild,v 1.1 2005/10/12 20:32:47 svyatogor Exp $
-
-inherit rox eutils
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox-session/rox-session-0.26.ebuild,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
 
 MY_PN="ROX-Session"
 DESCRIPTION="Rox-Session is a really simple session manager"
@@ -21,6 +19,8 @@ DEPEND="rox-base/rox
 APPNAME=${MY_PN}
 S="${WORKDIR}/${MY_PN}-${PV}"
 
+inherit rox eutils
+
 src_unpack() {
 	if ! built_with_use sys-apps/dbus python
 	then
diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index 2de1ca33beee..091c66b62f9d 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,52 @@
-# ChangeLog for app-misc/rox
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.1 2004/11/26 18:30:19 sergey Exp $
+# ChangeLog for rox-base/rox
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
+
+*rox-2.3 (25 Sep 2005)
+
+  25 Sep 2005; Sergey Kuleshov <svyatogor@gentoo.org> +rox-2.3.ebuild:
+  New version of ROX-Filer added with patch from CVS tree to go cut down on
+  shared-mime dependencies. Thanks to Peter Hayman for this ebuild and the patch
+  (Bug #102228).
+
+  10 Jul 2005; Heinrich Wendel <lanius@gentoo.org>
+  +files/rox-2.2.0-gcc4.patch, rox-2.2.0.ebuild:
+  gcc4 fix
+
+  07 Apr 2005; Simon Stelling <blubb@gentoo.org> rox-2.2.0.ebuild:
+  stable on amd64
+
+  20 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> rox-2.2.0.ebuild:
+  Stable on alpha.
+
+  17 Mar 2005; Joseph Jezak <josejx@gentoo.org> rox-2.2.0.ebuild:
+  Marked ppc stable for bug #85617.
+
+  21 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> rox-2.2.0.ebuild:
+  Stable on sparc
+
+  18 Feb 2005; Sergey Kuleshov <svyatogor@gentoo.org> rox-2.2.0.ebuild:
+  Marked stable on x86.
+
+*rox-2.2.0 (10 Feb 2005)
+
+  10 Feb 2005; Sergey Kuleshov <svyatogor@gentoo.org> +rox-2.2.0.ebuild:
+  Simple version bump. Thanks to affinity in bug #79954 for reporting.
+
+  27 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> rox-2.1.4.ebuild:
+  Stable on sparc
+
+*rox-2.1.5 (27 Jan 2005)
+
+  27 Jan 2005; lanius@gentoo.org -rox-2.1.2.ebuild, rox-2.1.4.ebuild,
+  +rox-2.1.5.ebuild:
+  add 2.1.5; mark 2.1.4 stable on x86; amd64
+
+  23 Jan 2005; Bryan Østergaard <kloeri@gentoo.org> rox-2.1.3.ebuild:
+  Stable on alpha.
+
+  02 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> :
+  Change encoding to UTF-8 for GLEP 31 compliance
 
 *rox-2.1.2 (26 Nov 2004)
 
@@ -42,7 +88,7 @@
   Added fixes for sparc as having PLATFORM set causes problems between how rox
   is built and how it is run.
 
-  13 Aug 2004; Bryan �stergaard <kloeri@gentoo.org> rox-2.1.2.ebuild:
+  13 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> rox-2.1.2.ebuild:
   Stable on alpha.
 
 *rox-2.1.2-r1 (02 Aug 2004)
@@ -69,7 +115,7 @@
   rox-2.1.2.ebuild:
   version bump; mark 2.1.1 stable
 
-  04 May 2004; Bryan �stergaard <kloeri@gentoo.org> rox-2.1.1.ebuild:
+  04 May 2004; Bryan Østergaard <kloeri@gentoo.org> rox-2.1.1.ebuild:
   Stable on alpha.
 
   10 Mar 2004; Lars Weiler <pylon@gentoo.org> rox-2.1.1.ebuild:
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index 08ffe83c3ac5..20e483d1a255 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -1,9 +1,14 @@
-MD5 c386d1d4209b5c37e581166a8d2c779f ChangeLog 5185
-MD5 5c816611ce8b3873a5f3663ac8f5655a rox-2.1.4.ebuild 1654
-MD5 367cab8056ba0069d81ea49368c3c6ac rox-2.1.2.ebuild 1654
+MD5 405e56b760faa7acd5dea5fd58165cd6 ChangeLog 6914
+MD5 d2259b48b71edd757994a7420e6efd53 rox-2.2.0.ebuild 1741
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 bc37123e425c02a326d85de63d666f6d rox-2.1.3.ebuild 1650
-MD5 d7f3344d55ed0b3c386ef215755c31cf files/digest-rox-2.1.4 59
-MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2 59
+MD5 d199bff10c128f6ed3f508320225f54e rox-2.1.5.ebuild 1654
+MD5 b57d6ce63d5ba32c8ff37e77e8ae673f rox-2.1.3.ebuild 1650
+MD5 e6bfd1872018b9fe59555171994a71bc rox-2.1.4.ebuild 1653
+MD5 bbc2bb80b4fcf6ff31956ea7747b3535 rox-2.3.ebuild 1935
 MD5 16ef34ea63806f156b1cf68e34055f12 files/2.1.2-crash-save-display-settings.patch.bz2 1910
+MD5 93f2d819182714fd4bd786848bb6e9a6 files/digest-rox-2.2.0 59
 MD5 41ab2c5f1d5e3be857ddbad7ba6a7d2a files/digest-rox-2.1.3 59
+MD5 d7f3344d55ed0b3c386ef215755c31cf files/digest-rox-2.1.4 59
+MD5 b7b99c9a9584fa68610e637fabb7b95e files/digest-rox-2.1.5 59
+MD5 27db9585e8acfde2e54224f63bed8e80 files/digest-rox-2.3 129
+MD5 6582a6fac3d7f42181413ef84b8ef834 files/rox-2.2.0-gcc4.patch 746
diff --git a/rox-base/rox/rox-2.1.3.ebuild b/rox-base/rox/rox-2.1.3.ebuild
index 26a8d2773ba6..5c84ca906474 100644
--- a/rox-base/rox/rox-2.1.3.ebuild
+++ b/rox-base/rox/rox-2.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/rox-base/rox/rox-2.1.3.ebuild,v 1.1 2004/11/26 18:30:19 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.1.3.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/rox/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~alpha sparc ~amd64"
+KEYWORDS="x86 ppc alpha sparc ~amd64"
 
 DEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/glib-2.2
diff --git a/rox-base/rox/rox-2.1.4.ebuild b/rox-base/rox/rox-2.1.4.ebuild
index d9d0d811c6c8..9115d881842f 100644
--- a/rox-base/rox/rox-2.1.4.ebuild
+++ b/rox-base/rox/rox-2.1.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/rox-base/rox/rox-2.1.4.ebuild,v 1.1 2004/11/26 18:30:19 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.1.4.ebuild,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/rox/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="x86 ~ppc ~alpha sparc amd64"
 
 DEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/glib-2.2
diff --git a/rox-base/rox/rox-2.1.5.ebuild b/rox-base/rox/rox-2.1.5.ebuild
index 7831c1ce998f..35de1b24f06d 100644
--- a/rox-base/rox/rox-2.1.5.ebuild
+++ b/rox-base/rox/rox-2.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/rox-base/rox/rox-2.1.5.ebuild,v 1.1 2005/01/27 13:42:44 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.1.5.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
diff --git a/rox-base/rox/rox-2.2.0.ebuild b/rox-base/rox/rox-2.2.0.ebuild
index add28001e719..1dfea6085aa6 100644
--- a/rox-base/rox/rox-2.2.0.ebuild
+++ b/rox-base/rox/rox-2.2.0.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/rox-base/rox/rox-2.2.0.ebuild,v 1.1 2005/02/10 19:29:05 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.2.0.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+inherit eutils
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -8,7 +10,7 @@ SRC_URI="mirror://sourceforge/rox/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
+KEYWORDS="x86 ppc alpha sparc amd64"
 
 DEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/glib-2.2
@@ -18,6 +20,12 @@ DEPEND=">=x11-libs/gtk+-2.2
 
 IUSE="svg"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gcc4.patch
+}
+
 src_compile() {
 #	rm ROX-Filer/src/configure # see bug #26162
 
diff --git a/rox-base/rox/rox-2.3.ebuild b/rox-base/rox/rox-2.3.ebuild
index 2f03366bf215..17b4269074ba 100644
--- a/rox-base/rox/rox-2.3.ebuild
+++ b/rox-base/rox/rox-2.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/rox-base/rox/rox-2.3.ebuild,v 1.1 2005/09/25 10:32:57 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.3.ebuild,v 1.1.1.1 2005/11/30 10:14:31 chriswhite Exp $
 
 inherit eutils
 
diff --git a/rox-base/systemtray/ChangeLog b/rox-base/systemtray/ChangeLog
index fbaa076a5fac..85cb8a50f1a1 100644
--- a/rox-base/systemtray/ChangeLog
+++ b/rox-base/systemtray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for rox-base/systemtray
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/ChangeLog,v 1.1 2004/11/27 10:49:17 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+*systemtray-0.2-r1 (03 Oct 2005)
+
+  03 Oct 2005; Sergey Kuleshov <svyatogor@gentoo.org>
+  +systemtray-0.2-r1.ebuild:
+  Fixing permisions. Closing bug #99711
 
 *systemtray-0.2 (27 Nov 2004)
 
diff --git a/rox-base/systemtray/Manifest b/rox-base/systemtray/Manifest
index 1bd9f625683f..f6b2f9ccc13a 100644
--- a/rox-base/systemtray/Manifest
+++ b/rox-base/systemtray/Manifest
@@ -1,2 +1,6 @@
-MD5 86212e8b04af3eeb8d102e0c9f95f431 systemtray-0.2.ebuild 480
+MD5 203bf382f5b5d7bc2289e28c8cb04c45 systemtray-0.2.ebuild 583
+MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 a3e0a90775f9f3a5e401eb307b68b044 ChangeLog 611
+MD5 532d4d613cf642bce21bef05c116c805 systemtray-0.2-r1.ebuild 596
 MD5 9340afd03dd2c10530e4151120f8918e files/digest-systemtray-0.2 62
+MD5 9340afd03dd2c10530e4151120f8918e files/digest-systemtray-0.2-r1 62
diff --git a/rox-base/systemtray/systemtray-0.2-r1.ebuild b/rox-base/systemtray/systemtray-0.2-r1.ebuild
index b398879d03eb..9b342592e057 100644
--- a/rox-base/systemtray/systemtray-0.2-r1.ebuild
+++ b/rox-base/systemtray/systemtray-0.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/rox-base/systemtray/systemtray-0.2-r1.ebuild,v 1.1 2005/10/03 18:57:50 svyatogor Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/systemtray-0.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 MY_PN="SystemTray"
 DESCRIPTION="SystemTray is a notification area applet for ROX-Filer"
diff --git a/rox-base/systemtray/systemtray-0.2.ebuild b/rox-base/systemtray/systemtray-0.2.ebuild
index a83c3f91f701..93e1ad33803f 100644
--- a/rox-base/systemtray/systemtray-0.2.ebuild
+++ b/rox-base/systemtray/systemtray-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/rox-base/systemtray/systemtray-0.2.ebuild,v 1.1 2004/11/27 10:49:17 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/systemtray/systemtray-0.2.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="SystemTray is a notification area applet for ROX-Filer"
 
diff --git a/rox-base/volume/ChangeLog b/rox-base/volume/ChangeLog
index 92ca07190889..14752db8e769 100644
--- a/rox-base/volume/ChangeLog
+++ b/rox-base/volume/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for rox-base/volume
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/volume/ChangeLog,v 1.1 2004/12/18 19:19:00 sergey Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/rox-base/volume/ChangeLog,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
+
+*volume-0.0.7 (17 Oct 2005)
+
+  17 Oct 2005; Sergey Kuleshov <svyatogor@gentoo.org> +volume-0.0.7.ebuild:
+  Version bump up to 0.0.7. Thanks to Peter Hyman bug #109110.
 
 *volume-0.0.6 (18 Dec 2004)
 
diff --git a/rox-base/volume/Manifest b/rox-base/volume/Manifest
index 5469aeb1a514..7ac356ffa039 100644
--- a/rox-base/volume/Manifest
+++ b/rox-base/volume/Manifest
@@ -1,3 +1,6 @@
-MD5 15e6be2dd0b3d31f6fd562e6327f8909 volume-0.0.6.ebuild 389
+MD5 5baac310fcb930985311f770858ca116 volume-0.0.6.ebuild 553
 MD5 5394559a5f84d1ca65c57c3b2380195b metadata.xml 256
+MD5 044d679ccc18e841f8358304316321d9 ChangeLog 529
+MD5 03326465adf8e2603c59b483327227e8 volume-0.0.7.ebuild 660
 MD5 4a29d0b4504581bd150fa17ce14654d4 files/digest-volume-0.0.6 58
+MD5 f299ed53e95371e2eb02b0cf6182820b files/digest-volume-0.0.7 58
diff --git a/rox-base/volume/volume-0.0.6.ebuild b/rox-base/volume/volume-0.0.6.ebuild
index bc814f1cb1e0..817450ccb544 100644
--- a/rox-base/volume/volume-0.0.6.ebuild
+++ b/rox-base/volume/volume-0.0.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/rox-base/volume/volume-0.0.6.ebuild,v 1.1 2004/12/18 19:19:00 sergey Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/volume/volume-0.0.6.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 DESCRIPTION="Volume - A Volume control Applet and a Mixer for ROX Desktop"
 
@@ -8,9 +8,9 @@ MY_PN="Volume"
 
 MY_PV="006"
 
-HOMEPAGE=""
+HOMEPAGE="http://www.hayber.us/rox/Volume"
 
-SRC_URI="${MY_PN}-${MY_PV}.tgz"
+SRC_URI="http://www.hayber.us/rox/applets/${MY_PN}-${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 
diff --git a/rox-base/volume/volume-0.0.7.ebuild b/rox-base/volume/volume-0.0.7.ebuild
index deaf6f95c02e..5b62f52cf080 100644
--- a/rox-base/volume/volume-0.0.7.ebuild
+++ b/rox-base/volume/volume-0.0.7.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/rox-base/volume/volume-0.0.7.ebuild,v 1.1 2005/10/17 09:41:46 svyatogor Exp $
-
-inherit rox
+# $Header: /var/cvsroot/gentoo-x86/rox-base/volume/volume-0.0.7.ebuild,v 1.1.1.1 2005/11/30 10:14:30 chriswhite Exp $
 
 MY_PN="Volume"
 MY_PV=`echo "${PV}" | sed -e 's/\.//g'`
@@ -23,3 +21,4 @@ ROX_LIB_VER=2.0.0
 APPNAME=${MY_PN}
 S=${WORKDIR}
 
+inherit rox
diff --git a/x11-apps/appres/ChangeLog b/x11-apps/appres/ChangeLog
index 667da40d1790..0d19e7f4479f 100644
--- a/x11-apps/appres/ChangeLog
+++ b/x11-apps/appres/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/appres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*appres-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +appres-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> appres-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *appres-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
index 8bb47224b47d..d91b4c47487c 100644
--- a/x11-apps/appres/Manifest
+++ b/x11-apps/appres/Manifest
@@ -1,2 +1,6 @@
-MD5 2f8ab9a0518554356f7ad299886142f6 appres-0.99.0.ebuild 321
+MD5 4c1f92e2ae52eecce8d7ec1e7c6b51e0 ChangeLog 684
+MD5 781f788790740d04a7db56e9a8a10421 appres-0.99.0.ebuild 443
+MD5 53d627352f57b5aeecf76c9e9b6571d5 appres-0.99.1.ebuild 446
 MD5 9f343d8d89afad7b128590f7fe341d60 files/digest-appres-0.99.0 65
+MD5 4691ed81ff534fc81fdce4a8861164fd files/digest-appres-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/appres/appres-0.99.0.ebuild b/x11-apps/appres/appres-0.99.0.ebuild
index 2e162fcc104b..1aeeddb22b33 100644
--- a/x11-apps/appres/appres-0.99.0.ebuild
+++ b/x11-apps/appres/appres-0.99.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-apps/appres/appres-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/appres-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org appres application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/appres/appres-0.99.1.ebuild b/x11-apps/appres/appres-0.99.1.ebuild
index 98a24abd6b3b..14de1647debd 100644
--- a/x11-apps/appres/appres-0.99.1.ebuild
+++ b/x11-apps/appres/appres-0.99.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-apps/appres/appres-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/appres-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/bdftopcf/ChangeLog b/x11-apps/bdftopcf/ChangeLog
index f59da172c942..296accd68032 100644
--- a/x11-apps/bdftopcf/ChangeLog
+++ b/x11-apps/bdftopcf/ChangeLog
@@ -1,6 +1,36 @@
 # ChangeLog for x11-apps/bdftopcf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*bdftopcf-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +bdftopcf-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*bdftopcf-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +bdftopcf-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> bdftopcf-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  01 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> bdftopcf-0.99.0.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> bdftopcf-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> bdftopcf-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> bdftopcf-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *bdftopcf-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
index b079aa9ccc96..e257e836a123 100644
--- a/x11-apps/bdftopcf/Manifest
+++ b/x11-apps/bdftopcf/Manifest
@@ -1,2 +1,8 @@
-MD5 8b51977c761a3d29c3d7c06ac64ac806 bdftopcf-0.99.0.ebuild 309
+MD5 765c5a920c0cf2451dfc757490ff28ba ChangeLog 1203
+MD5 85e1be070f38bef6f65b018dbf3db95f bdftopcf-0.99.0.ebuild 451
+MD5 1a827ae726f54ff660536ca5887c1ede bdftopcf-0.99.1.ebuild 454
+MD5 258b8a95a2b7e77eafbe39c04a14a915 bdftopcf-0.99.2.ebuild 458
 MD5 fe4ed2eb4a706fddfc7eedb74723d765 files/digest-bdftopcf-0.99.0 67
+MD5 557d35c178ac336e70e397ece8af5502 files/digest-bdftopcf-0.99.1 67
+MD5 afe5ac5154c97763f53de35e301b0389 files/digest-bdftopcf-0.99.2 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/bdftopcf/bdftopcf-0.99.0.ebuild b/x11-apps/bdftopcf/bdftopcf-0.99.0.ebuild
index 466b636322aa..7e903916a300 100644
--- a/x11-apps/bdftopcf/bdftopcf-0.99.0.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-0.99.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-apps/bdftopcf/bdftopcf-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org bdftopcf application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libXfont"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/bdftopcf-0.99.1.ebuild b/x11-apps/bdftopcf/bdftopcf-0.99.1.ebuild
index 5668c58352ef..76d3796e67b9 100644
--- a/x11-apps/bdftopcf/bdftopcf-0.99.1.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-0.99.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-apps/bdftopcf/bdftopcf-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/bdftopcf/bdftopcf-0.99.2.ebuild b/x11-apps/bdftopcf/bdftopcf-0.99.2.ebuild
index ff31ecd50a1f..a18904804511 100644
--- a/x11-apps/bdftopcf/bdftopcf-0.99.2.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-0.99.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-apps/bdftopcf/bdftopcf-0.99.2.ebuild,v 1.1 2005/11/11 19:47:04 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/beforelight/ChangeLog b/x11-apps/beforelight/ChangeLog
index 144a5c18e09c..4f382cfea9cc 100644
--- a/x11-apps/beforelight/ChangeLog
+++ b/x11-apps/beforelight/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for x11-apps/beforelight
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*beforelight-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +beforelight-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*beforelight-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +beforelight-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  09 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  beforelight-0.99.0.ebuild:
+  Add missing dep on libXaw, reported by Gerte Hoogewerf <gerte@nieuwenborg.nl>.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  beforelight-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *beforelight-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
index 0f6b8765e495..cb8d66b67f1c 100644
--- a/x11-apps/beforelight/Manifest
+++ b/x11-apps/beforelight/Manifest
@@ -1,2 +1,8 @@
-MD5 403344d361efce1f5a9e7723774df4d2 beforelight-0.99.0.ebuild 350
+MD5 a91dbff50b50a4aa976635fe250f32db ChangeLog 1033
+MD5 6a61b5f76f3a51d22a567a82ae8205ba beforelight-0.99.0.ebuild 499
+MD5 4c98875c8bce6424b494377568ee10f4 beforelight-0.99.1.ebuild 502
+MD5 7183966f412ca3cfa4f97b5144b8e556 beforelight-0.99.2.ebuild 506
 MD5 9004a378f0ac9252d6f8e89146b7e5d2 files/digest-beforelight-0.99.0 70
+MD5 c96994fd4d5036ad01b86b01d42c6e98 files/digest-beforelight-0.99.1 70
+MD5 6fbfab3761720166dbf178707ec2a0a9 files/digest-beforelight-0.99.2 70
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/beforelight/beforelight-0.99.0.ebuild b/x11-apps/beforelight/beforelight-0.99.0.ebuild
index 6d2053ca3f33..d7c34dda2cdc 100644
--- a/x11-apps/beforelight/beforelight-0.99.0.ebuild
+++ b/x11-apps/beforelight/beforelight-0.99.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-apps/beforelight/beforelight-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/beforelight-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,8 +8,9 @@
 inherit x-modular
 
 DESCRIPTION="X.Org beforelight application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXScrnSaver
-	x11-libs/libXt"
+	x11-libs/libXt
+	x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/beforelight/beforelight-0.99.1.ebuild b/x11-apps/beforelight/beforelight-0.99.1.ebuild
index 4fc1a5fdc43a..5e162135994f 100644
--- a/x11-apps/beforelight/beforelight-0.99.1.ebuild
+++ b/x11-apps/beforelight/beforelight-0.99.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-apps/beforelight/beforelight-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/beforelight-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/beforelight/beforelight-0.99.2.ebuild b/x11-apps/beforelight/beforelight-0.99.2.ebuild
index f21d80ca5d80..20f512b7ba44 100644
--- a/x11-apps/beforelight/beforelight-0.99.2.ebuild
+++ b/x11-apps/beforelight/beforelight-0.99.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-apps/beforelight/beforelight-0.99.2.ebuild,v 1.1 2005/11/11 19:47:29 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/beforelight/beforelight-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/bitmap/ChangeLog b/x11-apps/bitmap/ChangeLog
index 0ed9573489d4..62a69b2df42e 100644
--- a/x11-apps/bitmap/ChangeLog
+++ b/x11-apps/bitmap/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/bitmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*bitmap-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +bitmap-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  14 Oct 2005; <dang@gentoo.org> bitmap-0.99.0.ebuild:
+  Marked ~amd64
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> bitmap-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *bitmap-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
index 5b8887eaeb5f..1a7f1044d79c 100644
--- a/x11-apps/bitmap/Manifest
+++ b/x11-apps/bitmap/Manifest
@@ -1,2 +1,6 @@
-MD5 77d422214e7e66d852986fd9a4754917 bitmap-0.99.0.ebuild 546
+MD5 672a384e02cafa5ce2f4c913136007cd ChangeLog 756
+MD5 99ae4816ac71fb59b8d9dcce5edb1014 bitmap-0.99.0.ebuild 675
+MD5 1530052a25d24e7c524ab42facac00c7 bitmap-0.99.1.ebuild 678
 MD5 d6d3cf0f93f8859831e591dce2561e04 files/digest-bitmap-0.99.0 65
+MD5 d763833f9e74ab73aa444dda1ef3ff3e files/digest-bitmap-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/bitmap/bitmap-0.99.0.ebuild b/x11-apps/bitmap/bitmap-0.99.0.ebuild
index 8eaf3ccb8809..d0206b72e38d 100644
--- a/x11-apps/bitmap/bitmap-0.99.0.ebuild
+++ b/x11-apps/bitmap/bitmap-0.99.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-apps/bitmap/bitmap-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org bitmap application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
diff --git a/x11-apps/bitmap/bitmap-0.99.1.ebuild b/x11-apps/bitmap/bitmap-0.99.1.ebuild
index 81d581bbbfdf..d32d4674dfa6 100644
--- a/x11-apps/bitmap/bitmap-0.99.1.ebuild
+++ b/x11-apps/bitmap/bitmap-0.99.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-apps/bitmap/bitmap-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bitmap/bitmap-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/editres/ChangeLog b/x11-apps/editres/ChangeLog
index b8a9e348e670..342fc13e71c8 100644
--- a/x11-apps/editres/ChangeLog
+++ b/x11-apps/editres/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/editres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*editres-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +editres-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> editres-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *editres-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
index 4e3eaa22a104..0cf3240a118f 100644
--- a/x11-apps/editres/Manifest
+++ b/x11-apps/editres/Manifest
@@ -1,2 +1,6 @@
-MD5 3da3305dbccb2b1b27946565e3f64179 editres-0.99.0.ebuild 544
+MD5 25525a4d8c924ebc3b065143b13b0fa4 ChangeLog 691
+MD5 ae1d5f01929b5d8d5c4a727254c08055 editres-0.99.0.ebuild 668
+MD5 c052d0669b81e998359e78d3af8a4f4d editres-0.99.1.ebuild 671
 MD5 cda4257e7c9bf835b56c06e033d7ed38 files/digest-editres-0.99.0 66
+MD5 3977285e3734c8e94e03cc4446ef397e files/digest-editres-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/editres/editres-0.99.0.ebuild b/x11-apps/editres/editres-0.99.0.ebuild
index 36550d61c10c..e5b38cefc2bd 100644
--- a/x11-apps/editres/editres-0.99.0.ebuild
+++ b/x11-apps/editres/editres-0.99.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-apps/editres/editres-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/editres-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org editres application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/editres/editres-0.99.1.ebuild b/x11-apps/editres/editres-0.99.1.ebuild
index 2c30693ad785..33cc32331750 100644
--- a/x11-apps/editres/editres-0.99.1.ebuild
+++ b/x11-apps/editres/editres-0.99.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-apps/editres/editres-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/editres/editres-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/elapse/ChangeLog b/x11-apps/elapse/ChangeLog
index 82c83ed49dc1..e2f9cb2caf3f 100644
--- a/x11-apps/elapse/ChangeLog
+++ b/x11-apps/elapse/ChangeLog
@@ -1,6 +1,6 @@
 # ChangeLog for x11-apps/elapse
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/elapse/ChangeLog,v 1.1 2005/10/13 00:04:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/elapse/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 *elapse-* (12 Oct 2005)
 
diff --git a/x11-apps/elapse/Manifest b/x11-apps/elapse/Manifest
index 5bcf75e51490..83596dd7088a 100644
--- a/x11-apps/elapse/Manifest
+++ b/x11-apps/elapse/Manifest
@@ -1,2 +1,14 @@
-MD5 38867ddc58e7c25165474a42cfe8c12f elapse-9999.ebuild 259
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5cac9e2b8fabea82f7310c3bd7162145 ChangeLog 344
+MD5 b6c0e28f694b40c5502b12bb00cce129 elapse-9999.ebuild 355
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-elapse-9999 0
+MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDTaURgIKl8Uu19MoRAp/rAJ9ac5A8fRz9vqpLT7yZ6mPBjTEmDQCfVgD5
+1i3XGhFc6Ohl1ybI1+oUcAg=
+=Njxc
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/elapse/elapse-9999.ebuild b/x11-apps/elapse/elapse-9999.ebuild
index 4bf69ff62c1e..30b0df23675d 100644
--- a/x11-apps/elapse/elapse-9999.ebuild
+++ b/x11-apps/elapse/elapse-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-apps/elapse/elapse-9999.ebuild,v 1.1 2005/10/13 00:04:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/elapse/elapse-9999.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 ECVS_MODULE="misc/elapse"
 inherit enlightenment
diff --git a/x11-apps/fonttosfnt/ChangeLog b/x11-apps/fonttosfnt/ChangeLog
index 9a60df83dd0a..685b6625c23d 100644
--- a/x11-apps/fonttosfnt/ChangeLog
+++ b/x11-apps/fonttosfnt/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-apps/fonttosfnt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*fonttosfnt-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fonttosfnt-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*fonttosfnt-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +fonttosfnt-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  fonttosfnt-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *fonttosfnt-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
index a490bd0dc602..c85e03781670 100644
--- a/x11-apps/fonttosfnt/Manifest
+++ b/x11-apps/fonttosfnt/Manifest
@@ -1,2 +1,8 @@
-MD5 0b66438aaba3d0cf902434a18ad85d68 fonttosfnt-0.99.0.ebuild 355
+MD5 47247d7379974567f55fe73dedb4cfdf ChangeLog 858
 MD5 56f377aaed74f81f0df927c532649678 files/digest-fonttosfnt-0.99.0 69
+MD5 c780e41ac0d7472e26f20482c276a005 files/digest-fonttosfnt-0.99.1 69
+MD5 84119b6bef0ef537810796ef89ca64c4 files/digest-fonttosfnt-0.99.2 69
+MD5 28bef689ea0b7ea98b656c69428da348 fonttosfnt-0.99.0.ebuild 485
+MD5 f436534e7fc940d8d6c4baea1781e5a4 fonttosfnt-0.99.1.ebuild 488
+MD5 2cb4e78f327243b271cdea32f83f312d fonttosfnt-0.99.2.ebuild 492
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/fonttosfnt/fonttosfnt-0.99.0.ebuild b/x11-apps/fonttosfnt/fonttosfnt-0.99.0.ebuild
index 577cd6ab00fc..2a8a70d6af78 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-0.99.0.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-0.99.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-apps/fonttosfnt/fonttosfnt-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org fonttosfnt application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	=media-libs/freetype-2*
 	x11-libs/libfontenc"
diff --git a/x11-apps/fonttosfnt/fonttosfnt-0.99.1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-0.99.1.ebuild
index 30611d32c4e6..58e7a17ac7eb 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-0.99.1.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-0.99.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-apps/fonttosfnt/fonttosfnt-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/fonttosfnt/fonttosfnt-0.99.2.ebuild b/x11-apps/fonttosfnt/fonttosfnt-0.99.2.ebuild
index 2c42aa63ca4a..ec4daae1ba69 100644
--- a/x11-apps/fonttosfnt/fonttosfnt-0.99.2.ebuild
+++ b/x11-apps/fonttosfnt/fonttosfnt-0.99.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-apps/fonttosfnt/fonttosfnt-0.99.2.ebuild,v 1.1 2005/11/11 19:47:59 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fonttosfnt/fonttosfnt-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/fslsfonts/ChangeLog b/x11-apps/fslsfonts/ChangeLog
index e544104c3e13..c771b629afc5 100644
--- a/x11-apps/fslsfonts/ChangeLog
+++ b/x11-apps/fslsfonts/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/fslsfonts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*fslsfonts-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +fslsfonts-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> fslsfonts-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *fslsfonts-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
index d1cb3a89cec4..5e501ea69c35 100644
--- a/x11-apps/fslsfonts/Manifest
+++ b/x11-apps/fslsfonts/Manifest
@@ -1,2 +1,6 @@
-MD5 994dd9e6cc03f0f05c6954b7bfce81c0 fslsfonts-0.99.0.ebuild 324
+MD5 6511fd29cb9e89e3cbf6a0f2a9d42bf9 ChangeLog 705
 MD5 0ceadc204448499927a6111cf06ac655 files/digest-fslsfonts-0.99.0 68
+MD5 1de2e17f4df00711a0a4eaadf0d9a572 files/digest-fslsfonts-0.99.1 68
+MD5 c6a0609631633d2b7be23d1e8dd96002 fslsfonts-0.99.0.ebuild 452
+MD5 2cb03a8e3811993968a395a14a0facdb fslsfonts-0.99.1.ebuild 455
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/fslsfonts/fslsfonts-0.99.0.ebuild b/x11-apps/fslsfonts/fslsfonts-0.99.0.ebuild
index a97bc7bdbec4..dcefa47e83c0 100644
--- a/x11-apps/fslsfonts/fslsfonts-0.99.0.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-0.99.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-apps/fslsfonts/fslsfonts-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org fslsfonts application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/fslsfonts/fslsfonts-0.99.1.ebuild b/x11-apps/fslsfonts/fslsfonts-0.99.1.ebuild
index 0e270401215e..920fc8ab225c 100644
--- a/x11-apps/fslsfonts/fslsfonts-0.99.1.ebuild
+++ b/x11-apps/fslsfonts/fslsfonts-0.99.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-apps/fslsfonts/fslsfonts-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fslsfonts/fslsfonts-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/fstobdf/ChangeLog b/x11-apps/fstobdf/ChangeLog
index 1fef68aacd20..f0ca30064078 100644
--- a/x11-apps/fstobdf/ChangeLog
+++ b/x11-apps/fstobdf/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-apps/fstobdf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*fstobdf-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +fstobdf-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*fstobdf-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +fstobdf-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> fstobdf-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *fstobdf-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
index aa1686e858c7..ece61eed4fe5 100644
--- a/x11-apps/fstobdf/Manifest
+++ b/x11-apps/fstobdf/Manifest
@@ -1,2 +1,8 @@
-MD5 5228eb8b629c3a49b3f03d59531994b7 fstobdf-0.99.0.ebuild 322
+MD5 0e3b093e9a25f0bd7a278d50ae80f7c3 ChangeLog 829
 MD5 12ea4845d8868c4671a6fafbca4d4c09 files/digest-fstobdf-0.99.0 66
+MD5 7b334e3784c4cb6fd6fdb937efe27b55 files/digest-fstobdf-0.99.1 66
+MD5 acdad5754899d0276263f39e0cafce69 files/digest-fstobdf-0.99.2 66
+MD5 e3da6f6b5c587db1746ffbf86a1b5496 fstobdf-0.99.0.ebuild 446
+MD5 8736bc681926126b71c099f407efa4b7 fstobdf-0.99.1.ebuild 449
+MD5 d6bd188e4604a68e9de7e28e6d8ac076 fstobdf-0.99.2.ebuild 453
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/fstobdf/fstobdf-0.99.0.ebuild b/x11-apps/fstobdf/fstobdf-0.99.0.ebuild
index 7082272812c2..fdc0a88afe85 100644
--- a/x11-apps/fstobdf/fstobdf-0.99.0.ebuild
+++ b/x11-apps/fstobdf/fstobdf-0.99.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-apps/fstobdf/fstobdf-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org fstobdf application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/fstobdf/fstobdf-0.99.1.ebuild b/x11-apps/fstobdf/fstobdf-0.99.1.ebuild
index 8799e144cea7..267b5134a5ac 100644
--- a/x11-apps/fstobdf/fstobdf-0.99.1.ebuild
+++ b/x11-apps/fstobdf/fstobdf-0.99.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-apps/fstobdf/fstobdf-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/fstobdf/fstobdf-0.99.2.ebuild b/x11-apps/fstobdf/fstobdf-0.99.2.ebuild
index 9c41a10d608e..f0f6f5a06acb 100644
--- a/x11-apps/fstobdf/fstobdf-0.99.2.ebuild
+++ b/x11-apps/fstobdf/fstobdf-0.99.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-apps/fstobdf/fstobdf-0.99.2.ebuild,v 1.1 2005/11/11 19:48:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/fstobdf/fstobdf-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/iceauth/ChangeLog b/x11-apps/iceauth/ChangeLog
index 813862e3ce92..d7203650a9a6 100644
--- a/x11-apps/iceauth/ChangeLog
+++ b/x11-apps/iceauth/ChangeLog
@@ -1,6 +1,30 @@
 # ChangeLog for x11-apps/iceauth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*iceauth-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +iceauth-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> iceauth-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> iceauth-0.99.0.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> iceauth-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> iceauth-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> iceauth-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *iceauth-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
index d95bae1db7bc..59cf104c1e26 100644
--- a/x11-apps/iceauth/Manifest
+++ b/x11-apps/iceauth/Manifest
@@ -1,2 +1,6 @@
-MD5 99dd14107499c32044dd93ba94d4f3c1 iceauth-0.99.0.ebuild 323
+MD5 ccd0cdd1609f920338403e4b97c00646 ChangeLog 1052
 MD5 226d5dc40985e1cbaa39cd8e6b2573ca files/digest-iceauth-0.99.0 66
+MD5 cb4fecfe40e4f85936e4f0bd910e3ff5 files/digest-iceauth-0.99.1 66
+MD5 0d609b5798dabef053586ec47c4f51ac iceauth-0.99.0.ebuild 463
+MD5 47171169d0da854a2ac712623ef2fb18 iceauth-0.99.1.ebuild 466
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/iceauth/iceauth-0.99.0.ebuild b/x11-apps/iceauth/iceauth-0.99.0.ebuild
index 31f6106f9922..7582633e00fc 100644
--- a/x11-apps/iceauth/iceauth-0.99.0.ebuild
+++ b/x11-apps/iceauth/iceauth-0.99.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-apps/iceauth/iceauth-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org iceauth application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libICE"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/iceauth/iceauth-0.99.1.ebuild b/x11-apps/iceauth/iceauth-0.99.1.ebuild
index 5fa3e3b5a60c..1915502ee6c8 100644
--- a/x11-apps/iceauth/iceauth-0.99.1.ebuild
+++ b/x11-apps/iceauth/iceauth-0.99.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-apps/iceauth/iceauth-0.99.1.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/ico/ChangeLog b/x11-apps/ico/ChangeLog
index 449b00dc5b2d..febaf67869f9 100644
--- a/x11-apps/ico/ChangeLog
+++ b/x11-apps/ico/ChangeLog
@@ -1,6 +1,41 @@
 # ChangeLog for x11-apps/ico
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*ico-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +ico-0.99.3.ebuild:
+  Bump for 7.0RC2.
+
+  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; -ico-0.99.0.ebuild,
+  -ico-0.99.1_pre20050905.ebuild:
+  Pull old versions.
+
+*ico-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +ico-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  ico-0.99.1_pre20050905.ebuild:
+  Fixed snapshot SRC_URI.
+
+*ico-0.99.1_pre20050905 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +ico-0.99.1_pre20050905.ebuild, -ico-0.99.1.ebuild:
+  Fixed version in anticipation of upstream release.
+
+*ico-0.99.1 (05 Sep 2005)
+
+  05 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> +ico-0.99.1.ebuild:
+  New snapshot.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> ico-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *ico-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/ico/Manifest b/x11-apps/ico/Manifest
index 0ca245e68794..730fc21e8fd6 100644
--- a/x11-apps/ico/Manifest
+++ b/x11-apps/ico/Manifest
@@ -1,2 +1,6 @@
-MD5 6296cee0794b2a1a8038e29642704992 ico-0.99.0.ebuild 302
-MD5 0d1e39b90654b3f1857a536b795e971a files/digest-ico-0.99.0 62
+MD5 e80ec4a3e694f37d3d85cc9e85753e12 ChangeLog 1360
+MD5 9d50add6a214d957f7ebb3350bb96650 files/digest-ico-0.99.2 62
+MD5 a74d292d4c6ed8fedab10d4e2b26a083 files/digest-ico-0.99.3 62
+MD5 5d7301a9759c88ac822f0d3aabb25868 ico-0.99.2.ebuild 435
+MD5 0b6af3d6e4e61cf118b70b200b96e707 ico-0.99.3.ebuild 439
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/ico/ico-0.99.2.ebuild b/x11-apps/ico/ico-0.99.2.ebuild
index 848174ebe70b..482aad428ed9 100644
--- a/x11-apps/ico/ico-0.99.2.ebuild
+++ b/x11-apps/ico/ico-0.99.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-apps/ico/ico-0.99.2.ebuild,v 1.1 2005/10/20 00:45:20 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ico-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/ico/ico-0.99.3.ebuild b/x11-apps/ico/ico-0.99.3.ebuild
index 6aff58805771..a5544f88fe55 100644
--- a/x11-apps/ico/ico-0.99.3.ebuild
+++ b/x11-apps/ico/ico-0.99.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-apps/ico/ico-0.99.3.ebuild,v 1.1 2005/11/11 19:48:50 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/ico/ico-0.99.3.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/lbxproxy/ChangeLog b/x11-apps/lbxproxy/ChangeLog
index 09dfd22ec191..3472d327bf57 100644
--- a/x11-apps/lbxproxy/ChangeLog
+++ b/x11-apps/lbxproxy/ChangeLog
@@ -1,6 +1,34 @@
 # ChangeLog for x11-apps/lbxproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*lbxproxy-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +lbxproxy-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*lbxproxy-0.99.1-r1 (27 Oct 2005)
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +lbxproxy-0.99.1-r1.ebuild:
+  Rev-bump for new USE flag.
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  lbxproxy-0.99.1.ebuild:
+  Add ipv6 USE flag.
+
+*lbxproxy-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +lbxproxy-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> lbxproxy-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *lbxproxy-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/lbxproxy/Manifest b/x11-apps/lbxproxy/Manifest
index 262e9f99a9f4..387270bb6e7b 100644
--- a/x11-apps/lbxproxy/Manifest
+++ b/x11-apps/lbxproxy/Manifest
@@ -1,2 +1,10 @@
-MD5 357d769097f763e9a41fa6ec28b76119 lbxproxy-0.99.0.ebuild 416
+MD5 961ed7f0b36bd8fc2016b213a7369b0e ChangeLog 1095
 MD5 cc5c333bac297f84d1b2a16a9fb5be80 files/digest-lbxproxy-0.99.0 68
+MD5 8a600882f963930496f448d64073b753 files/digest-lbxproxy-0.99.1 68
+MD5 8a600882f963930496f448d64073b753 files/digest-lbxproxy-0.99.1-r1 68
+MD5 3ab4165df338be0e945d46c3adb87674 files/digest-lbxproxy-0.99.2 68
+MD5 ebfd8f3b05ae4aed98dd23f3aee8aa23 lbxproxy-0.99.0.ebuild 542
+MD5 7be213d46a55ce73eaed1c4d289787fa lbxproxy-0.99.1-r1.ebuild 604
+MD5 57ccb0ae4b80e9bb15cd626cf3d373e4 lbxproxy-0.99.1.ebuild 601
+MD5 c6f65d7633e95b505fb9aaf0f28e5a15 lbxproxy-0.99.2.ebuild 601
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/lbxproxy/lbxproxy-0.99.0.ebuild b/x11-apps/lbxproxy/lbxproxy-0.99.0.ebuild
index 9f034123f463..fcd3dedeb7ad 100644
--- a/x11-apps/lbxproxy/lbxproxy-0.99.0.ebuild
+++ b/x11-apps/lbxproxy/lbxproxy-0.99.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-apps/lbxproxy/lbxproxy-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/lbxproxy-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org lbxproxy application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/xtrans
 	x11-libs/libXext
 	x11-libs/liblbxutil
diff --git a/x11-apps/lbxproxy/lbxproxy-0.99.1-r1.ebuild b/x11-apps/lbxproxy/lbxproxy-0.99.1-r1.ebuild
index bf4474cf88f6..967c9ee9e181 100644
--- a/x11-apps/lbxproxy/lbxproxy-0.99.1-r1.ebuild
+++ b/x11-apps/lbxproxy/lbxproxy-0.99.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-apps/lbxproxy/lbxproxy-0.99.1-r1.ebuild,v 1.1 2005/10/27 15:20:54 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/lbxproxy-0.99.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/lbxproxy/lbxproxy-0.99.1.ebuild b/x11-apps/lbxproxy/lbxproxy-0.99.1.ebuild
index 3e6866255126..267a0219fc21 100644
--- a/x11-apps/lbxproxy/lbxproxy-0.99.1.ebuild
+++ b/x11-apps/lbxproxy/lbxproxy-0.99.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-apps/lbxproxy/lbxproxy-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/lbxproxy-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -16,3 +16,6 @@ RDEPEND="x11-libs/xtrans
 	x11-libs/libICE"
 DEPEND="${RDEPEND}
 	x11-proto/xproxymanagementprotocol"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/lbxproxy/lbxproxy-0.99.2.ebuild b/x11-apps/lbxproxy/lbxproxy-0.99.2.ebuild
index 9f0a6761c9a7..18d04d24d2de 100644
--- a/x11-apps/lbxproxy/lbxproxy-0.99.2.ebuild
+++ b/x11-apps/lbxproxy/lbxproxy-0.99.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-apps/lbxproxy/lbxproxy-0.99.2.ebuild,v 1.1 2005/11/11 19:49:16 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/lbxproxy/lbxproxy-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/listres/ChangeLog b/x11-apps/listres/ChangeLog
index 414deb5487de..9c07fceb15b7 100644
--- a/x11-apps/listres/ChangeLog
+++ b/x11-apps/listres/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/listres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*listres-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +listres-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> listres-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *listres-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
index 052bc0d3a56f..491e6d9b1d52 100644
--- a/x11-apps/listres/Manifest
+++ b/x11-apps/listres/Manifest
@@ -1,2 +1,6 @@
-MD5 7320db59284faf6f0b6e09a3843cad88 listres-0.99.0.ebuild 544
+MD5 081584deda4a17360b8df3e42f3c1a3e ChangeLog 691
 MD5 60c8277df82dd59b74e292aba08e911b files/digest-listres-0.99.0 66
+MD5 c9adf77b94e3d850cd60df139cc4149f files/digest-listres-0.99.1 66
+MD5 0a1c02a64134266bb900e44aff08a71d listres-0.99.0.ebuild 668
+MD5 dbb2cc8e4a620bf32fecc81cd29546f4 listres-0.99.1.ebuild 671
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/listres/listres-0.99.0.ebuild b/x11-apps/listres/listres-0.99.0.ebuild
index fba0eb4c8295..136dd6910c24 100644
--- a/x11-apps/listres/listres-0.99.0.ebuild
+++ b/x11-apps/listres/listres-0.99.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-apps/listres/listres-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/listres-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org listres application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
diff --git a/x11-apps/listres/listres-0.99.1.ebuild b/x11-apps/listres/listres-0.99.1.ebuild
index 922818cc7e54..b80af2a5ce36 100644
--- a/x11-apps/listres/listres-0.99.1.ebuild
+++ b/x11-apps/listres/listres-0.99.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-apps/listres/listres-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/listres/listres-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/luit/ChangeLog b/x11-apps/luit/ChangeLog
index 5770e1f6847b..a9aa58dcf843 100644
--- a/x11-apps/luit/ChangeLog
+++ b/x11-apps/luit/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-apps/luit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/ChangeLog,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*luit-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +luit-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> luit-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *luit-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/luit/Manifest b/x11-apps/luit/Manifest
index c72b6eacc95a..71c564e3ee2a 100644
--- a/x11-apps/luit/Manifest
+++ b/x11-apps/luit/Manifest
@@ -1,2 +1,6 @@
-MD5 a6d0943bde8b5f49192a3749d95f413e luit-0.99.0.ebuild 324
+MD5 37dfa34221b5d806553ba71b9e670076 ChangeLog 666
 MD5 a3f9bc891eeed91fe2d7edd450460d43 files/digest-luit-0.99.0 63
+MD5 0270dd6b4e259d0a3d463c1106fb6909 files/digest-luit-0.99.1 63
+MD5 fad54619b5fe95497e2ae60aed21097a luit-0.99.0.ebuild 442
+MD5 43888357e2f1e973409fc6cd2e4bd800 luit-0.99.1.ebuild 445
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
diff --git a/x11-apps/luit/luit-0.99.0.ebuild b/x11-apps/luit/luit-0.99.0.ebuild
index d61bd82bd1ec..e15ac5566d5c 100644
--- a/x11-apps/luit/luit-0.99.0.ebuild
+++ b/x11-apps/luit/luit-0.99.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-apps/luit/luit-0.99.0.ebuild,v 1.1 2005/08/08 06:28:09 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/luit-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org luit application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libfontenc"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/luit/luit-0.99.1.ebuild b/x11-apps/luit/luit-0.99.1.ebuild
index 8182182165d8..b23b8bf7006f 100644
--- a/x11-apps/luit/luit-0.99.1.ebuild
+++ b/x11-apps/luit/luit-0.99.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-apps/luit/luit-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/luit/luit-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/metadata.xml b/x11-apps/metadata.xml
index ea612f96a9b3..38eb046487c7 100644
--- a/x11-apps/metadata.xml
+++ b/x11-apps/metadata.xml
@@ -2,11 +2,14 @@
 <!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <catmetadata>
 	<longdescription lang="en">
-		x11-apps contain various non-core X11 related applications and utlities.
+		x11-apps contains applications distributed as part of X.Org X11.
 	</longdescription>
 	<longdescription lang="ja">
-		x11-appsカテゴリには様々なコアなしX11に関連したアプリケーションと
-		ユーティリティが含まれます。
+		x11-appsカテゴリにはX.Org X11のパッケージソフトが含まれます。
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie x11-apps enthält Applikationen welche mit X.Org 
+		X11 ausgeliefert werden.
 	</longdescription>
 </catmetadata>
 
diff --git a/x11-apps/mkcfm/ChangeLog b/x11-apps/mkcfm/ChangeLog
index a7cea2766023..d28bcd3d773c 100644
--- a/x11-apps/mkcfm/ChangeLog
+++ b/x11-apps/mkcfm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/mkcfm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/ChangeLog,v 1.1 2005/10/20 01:08:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*mkcfm-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +mkcfm-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *mkcfm-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/mkcfm/Manifest b/x11-apps/mkcfm/Manifest
index 050f7b6684aa..0ee59adf4c40 100644
--- a/x11-apps/mkcfm/Manifest
+++ b/x11-apps/mkcfm/Manifest
@@ -1,5 +1,6 @@
-MD5 a50f0c97ec43cb55f021ac0d2f4a9ff0 ChangeLog 541
+MD5 30d2d190c0a4c44df32a9fb86d51f445 ChangeLog 489
 MD5 4e0156c9c00a57d2c580d2dbf9ba50dd files/digest-mkcfm-0.99.1 64
+MD5 1ca5e9170a449b5ff7e0c0a28d1e1747 files/digest-mkcfm-0.99.2 64
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 5c974c0164d5ad0ae667f0381f16cf25 mkcfm-0.99.0.ebuild 421
-MD5 5bbac436656646d62427a3e6358c3cea mkcfm-0.99.1.ebuild 572
+MD5 824ca34a97821eb597109616b1b0ce6d mkcfm-0.99.1.ebuild 577
+MD5 e5149746f5a83a4db16c51ba451443c3 mkcfm-0.99.2.ebuild 581
diff --git a/x11-apps/mkcfm/mkcfm-0.99.1.ebuild b/x11-apps/mkcfm/mkcfm-0.99.1.ebuild
index 8e6894ea233d..13e7ab2064ee 100644
--- a/x11-apps/mkcfm/mkcfm-0.99.1.ebuild
+++ b/x11-apps/mkcfm/mkcfm-0.99.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-apps/mkcfm/mkcfm-0.99.1.ebuild,v 1.1 2005/10/20 01:08:05 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/mkcfm-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/mkcfm/mkcfm-0.99.2.ebuild b/x11-apps/mkcfm/mkcfm-0.99.2.ebuild
index bf0cb720441c..ff199c64afdd 100644
--- a/x11-apps/mkcfm/mkcfm-0.99.2.ebuild
+++ b/x11-apps/mkcfm/mkcfm-0.99.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-apps/mkcfm/mkcfm-0.99.2.ebuild,v 1.1 2005/11/11 19:49:50 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkcfm/mkcfm-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/mkfontdir/ChangeLog b/x11-apps/mkfontdir/ChangeLog
index d15632c6e30f..bb97fd2329a2 100644
--- a/x11-apps/mkfontdir/ChangeLog
+++ b/x11-apps/mkfontdir/ChangeLog
@@ -1,6 +1,31 @@
 # ChangeLog for x11-apps/mkfontdir
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*mkfontdir-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +mkfontdir-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  mkfontdir-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  29 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> mkfontdir-0.99.0.ebuild:
+  Marked ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> mkfontdir-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> mkfontdir-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mkfontdir-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *mkfontdir-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
index dec86b9dbb5a..9ffe3e8df601 100644
--- a/x11-apps/mkfontdir/Manifest
+++ b/x11-apps/mkfontdir/Manifest
@@ -1,2 +1,6 @@
-MD5 2e4d7b338d88086bc85296f4a07c1b8e mkfontdir-0.99.0.ebuild 313
+MD5 9c927695fa97f54c4f5c86548af1b7fc ChangeLog 1077
 MD5 29aa0018fc2b45e1b62f7667964f7810 files/digest-mkfontdir-0.99.0 68
+MD5 77732e7a25f3f8991e462b06af2edfaf files/digest-mkfontdir-0.99.1 68
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 61daebc929834ccbcfafbcca8f8cd190 mkfontdir-0.99.0.ebuild 457
+MD5 41f62eebfe9b0000df27f200f87f7517 mkfontdir-0.99.1.ebuild 460
diff --git a/x11-apps/mkfontdir/mkfontdir-0.99.0.ebuild b/x11-apps/mkfontdir/mkfontdir-0.99.0.ebuild
index c1f548c90141..2abe6c7c9851 100644
--- a/x11-apps/mkfontdir/mkfontdir-0.99.0.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-0.99.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-apps/mkfontdir/mkfontdir-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org mkfontdir application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-apps/mkfontscale"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontdir/mkfontdir-0.99.1.ebuild b/x11-apps/mkfontdir/mkfontdir-0.99.1.ebuild
index a09489145a2d..7d13152cbd68 100644
--- a/x11-apps/mkfontdir/mkfontdir-0.99.1.ebuild
+++ b/x11-apps/mkfontdir/mkfontdir-0.99.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-apps/mkfontdir/mkfontdir-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/mkfontscale/ChangeLog b/x11-apps/mkfontscale/ChangeLog
index f3d91b2c423a..1dd1c4b014d0 100644
--- a/x11-apps/mkfontscale/ChangeLog
+++ b/x11-apps/mkfontscale/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for x11-apps/mkfontscale
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*mkfontscale-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +mkfontscale-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  mkfontscale-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  28 Aug 2005; MATSUU Takuto <matsuu@gentoo.org> mkfontscale-0.99.0.ebuild:
+  Marked ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> mkfontscale-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> mkfontscale-0.99.0.ebuild:
+  Marked ~amd64
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  mkfontscale-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *mkfontscale-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
index a0224479fe30..6dfe7ffb9604 100644
--- a/x11-apps/mkfontscale/Manifest
+++ b/x11-apps/mkfontscale/Manifest
@@ -1,2 +1,6 @@
-MD5 a3c91e793bdb61bf074d342719aacf34 mkfontscale-0.99.0.ebuild 339
+MD5 f3ba893814c332e835a0dc6264e367fe ChangeLog 1100
 MD5 b333547d334c7cc23e5948319f6a202a files/digest-mkfontscale-0.99.0 70
+MD5 3ea497ad91cb5ad03dff10c5bd7b1ad0 files/digest-mkfontscale-0.99.1 70
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 1aadd082e9a91eef9cb8a051f02937b0 mkfontscale-0.99.0.ebuild 487
+MD5 71fd7809a231e50c80c508e94b0ed586 mkfontscale-0.99.1.ebuild 490
diff --git a/x11-apps/mkfontscale/mkfontscale-0.99.0.ebuild b/x11-apps/mkfontscale/mkfontscale-0.99.0.ebuild
index 64bfa2060878..6f9551daa9c0 100644
--- a/x11-apps/mkfontscale/mkfontscale-0.99.0.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-0.99.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-apps/mkfontscale/mkfontscale-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org mkfontscale application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libfontenc
 	=media-libs/freetype-2*"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/mkfontscale-0.99.1.ebuild b/x11-apps/mkfontscale/mkfontscale-0.99.1.ebuild
index c8a53826a7fc..ca01561bc2aa 100644
--- a/x11-apps/mkfontscale/mkfontscale-0.99.1.ebuild
+++ b/x11-apps/mkfontscale/mkfontscale-0.99.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-apps/mkfontscale/mkfontscale-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/oclock/ChangeLog b/x11-apps/oclock/ChangeLog
index 2c2fcb76f50a..f418705bcaff 100644
--- a/x11-apps/oclock/ChangeLog
+++ b/x11-apps/oclock/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/oclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> oclock-0.99.1.ebuild:
+  Marked ~amd64.
+
+*oclock-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +oclock-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> oclock-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *oclock-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
index 5b899cd12f26..16b7841dbc52 100644
--- a/x11-apps/oclock/Manifest
+++ b/x11-apps/oclock/Manifest
@@ -1,2 +1,16 @@
-MD5 344308dbdcf9ee93986688c14ab5889c oclock-0.99.0.ebuild 340
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b4749c4b9432564c917b255c3a816b88 ChangeLog 769
 MD5 6c5397e7fc892e2faa8c32134ca092f5 files/digest-oclock-0.99.0 65
+MD5 49a6410ed5a0927e34fac58d26061622 files/digest-oclock-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 808422845ccb6cfca693013957d12ae3 oclock-0.99.0.ebuild 462
+MD5 a01defbc4cd1bc6da2f218fe9b1bd293 oclock-0.99.1.ebuild 468
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfGkF2G5bA0cA/ScRAmLkAKCK9zXP/y0omRD7vOS4QevbFrACfwCeKeh9
+K+8mKjm3GudbfBZ/Pp3SeEs=
+=wYct
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/oclock/oclock-0.99.0.ebuild b/x11-apps/oclock/oclock-0.99.0.ebuild
index 8b4d77340968..addefe63c1bb 100644
--- a/x11-apps/oclock/oclock-0.99.0.ebuild
+++ b/x11-apps/oclock/oclock-0.99.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-apps/oclock/oclock-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/oclock-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org oclock application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXext"
diff --git a/x11-apps/oclock/oclock-0.99.1.ebuild b/x11-apps/oclock/oclock-0.99.1.ebuild
index 1ebf794a5d1d..0a7b9c621613 100644
--- a/x11-apps/oclock/oclock-0.99.1.ebuild
+++ b/x11-apps/oclock/oclock-0.99.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-apps/oclock/oclock-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/oclock/oclock-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org oclock application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu
 	x11-libs/libXext"
diff --git a/x11-apps/pclcomp/ChangeLog b/x11-apps/pclcomp/ChangeLog
index 60bc4bef3036..b83facbea2a2 100644
--- a/x11-apps/pclcomp/ChangeLog
+++ b/x11-apps/pclcomp/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/pclcomp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+*pclcomp-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +pclcomp-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> pclcomp-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *pclcomp-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/pclcomp/Manifest b/x11-apps/pclcomp/Manifest
index e5e2781052a2..db659eb159cb 100644
--- a/x11-apps/pclcomp/Manifest
+++ b/x11-apps/pclcomp/Manifest
@@ -1,2 +1,6 @@
-MD5 24da7edd1ec37806c9e9d0180e2741f3 pclcomp-0.99.0.ebuild 291
+MD5 d8c251971f693cebd4d4a4989330fa51 ChangeLog 691
 MD5 a3742b95cac5021ada83a1885fcf51c9 files/digest-pclcomp-0.99.0 66
+MD5 a362b7af1478ddccc998b268be82ad68 files/digest-pclcomp-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a62b67bef603f664ad2057290acd59f3 pclcomp-0.99.0.ebuild 415
+MD5 80c4e795ee4c92795bbbd8f9c1478864 pclcomp-0.99.1.ebuild 418
diff --git a/x11-apps/pclcomp/pclcomp-0.99.0.ebuild b/x11-apps/pclcomp/pclcomp-0.99.0.ebuild
index 4ff90d41a6f3..ce1eb6d52ccf 100644
--- a/x11-apps/pclcomp/pclcomp-0.99.0.ebuild
+++ b/x11-apps/pclcomp/pclcomp-0.99.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-apps/pclcomp/pclcomp-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/pclcomp-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org pclcomp application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND=""
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/pclcomp/pclcomp-0.99.1.ebuild b/x11-apps/pclcomp/pclcomp-0.99.1.ebuild
index 9ee4afadea99..70facd56f600 100644
--- a/x11-apps/pclcomp/pclcomp-0.99.1.ebuild
+++ b/x11-apps/pclcomp/pclcomp-0.99.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-apps/pclcomp/pclcomp-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/pclcomp/pclcomp-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/proxymngr/ChangeLog b/x11-apps/proxymngr/ChangeLog
index 382e0a229fbb..2e95128fddd0 100644
--- a/x11-apps/proxymngr/ChangeLog
+++ b/x11-apps/proxymngr/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/proxymngr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*proxymngr-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +proxymngr-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> proxymngr-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *proxymngr-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/proxymngr/Manifest b/x11-apps/proxymngr/Manifest
index dc340ca0de7d..758a7cb87ac2 100644
--- a/x11-apps/proxymngr/Manifest
+++ b/x11-apps/proxymngr/Manifest
@@ -1,2 +1,6 @@
-MD5 65563fa28fca757b5f649dfba5600fad proxymngr-0.99.0.ebuild 377
+MD5 2bd354ded5e755f8372039ca5f0070c5 ChangeLog 705
 MD5 4ab0d2e0615f8ddec808855d456c9bc3 files/digest-proxymngr-0.99.0 68
+MD5 c4b4e3494601849a93fe196ec97d8017 files/digest-proxymngr-0.99.1 68
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 d2c0050a9a1c322807e6e701e5b0a932 proxymngr-0.99.0.ebuild 505
+MD5 a6368031de327e18c51e61c532b77121 proxymngr-0.99.1.ebuild 508
diff --git a/x11-apps/proxymngr/proxymngr-0.99.0.ebuild b/x11-apps/proxymngr/proxymngr-0.99.0.ebuild
index 0b3b5df12f38..2beb9cba61fc 100644
--- a/x11-apps/proxymngr/proxymngr-0.99.0.ebuild
+++ b/x11-apps/proxymngr/proxymngr-0.99.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-apps/proxymngr/proxymngr-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/proxymngr-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org proxymngr application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libICE
 	x11-libs/libXt
 	x11-libs/libX11"
diff --git a/x11-apps/proxymngr/proxymngr-0.99.1.ebuild b/x11-apps/proxymngr/proxymngr-0.99.1.ebuild
index 80c04394918b..dbfa5211e8cc 100644
--- a/x11-apps/proxymngr/proxymngr-0.99.1.ebuild
+++ b/x11-apps/proxymngr/proxymngr-0.99.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-apps/proxymngr/proxymngr-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/proxymngr/proxymngr-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/rgb/ChangeLog b/x11-apps/rgb/ChangeLog
index a3fa50c16f4a..3ea1ecae091b 100644
--- a/x11-apps/rgb/ChangeLog
+++ b/x11-apps/rgb/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for x11-apps/rgb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*rgb-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +rgb-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*rgb-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +rgb-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> rgb-0.99.0-r1.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> rgb-0.99.0-r1.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -rgb-0.99.0.ebuild:
+  Remove old versions.
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> rgb-0.99.0.ebuild,
+  rgb-0.99.0-r1.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> rgb-0.99.0-r1.ebuild:
+  Marked ~amd64.
+
+*rgb-0.99.0-r1 (14 Aug 2005)
+
+  14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/rgb-path.patch, +rgb-0.99.0-r1.ebuild:
+  Fix default RGB path. This should make it work by default instead of needing
+  to set RgbPath in xorg.conf.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> rgb-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *rgb-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
index 040da8e5ce30..72748dd92f45 100644
--- a/x11-apps/rgb/Manifest
+++ b/x11-apps/rgb/Manifest
@@ -1,2 +1,9 @@
-MD5 39e7b56d12657eaf57ee78ab2f8f123d rgb-0.99.0.ebuild 318
-MD5 a0e8d44f277795142cd2f367dfba4c0c files/digest-rgb-0.99.0 62
+MD5 de27e79298f602473c952ca4b3315a3a ChangeLog 1509
+MD5 a0e8d44f277795142cd2f367dfba4c0c files/digest-rgb-0.99.0-r1 62
+MD5 4961d643905235128c2c167eb9592cd5 files/digest-rgb-0.99.1 62
+MD5 95d7afa61262ae5e25dabfc1a1af9b8c files/digest-rgb-0.99.2 62
+MD5 7bb4ec5db2b791569bb91c5fc4aa7810 files/rgb-path.patch 811
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 55d3b4ff57903c26faf829b641c6862a rgb-0.99.0-r1.ebuild 490
+MD5 bd84b3dac1bd316d2c9f1844cf52e377 rgb-0.99.1.ebuild 453
+MD5 29e391cd5c9ea9f701bcbcb5341a0a77 rgb-0.99.2.ebuild 457
diff --git a/x11-apps/rgb/rgb-0.99.0-r1.ebuild b/x11-apps/rgb/rgb-0.99.0-r1.ebuild
index 67791caa8ea0..f3562b3a7b2d 100644
--- a/x11-apps/rgb/rgb-0.99.0-r1.ebuild
+++ b/x11-apps/rgb/rgb-0.99.0-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-apps/rgb/rgb-0.99.0-r1.ebuild,v 1.1 2005/08/14 18:25:37 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-0.99.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -10,7 +10,7 @@ inherit x-modular
 PATCHES="${FILESDIR}/rgb-path.patch"
 
 DESCRIPTION="X.Org rgb application"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/rgb/rgb-0.99.1.ebuild b/x11-apps/rgb/rgb-0.99.1.ebuild
index ea17be66e455..7549f8ec9580 100644
--- a/x11-apps/rgb/rgb-0.99.1.ebuild
+++ b/x11-apps/rgb/rgb-0.99.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-apps/rgb/rgb-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/rgb/rgb-0.99.2.ebuild b/x11-apps/rgb/rgb-0.99.2.ebuild
index 4c1e909da665..3d8aa475ee65 100644
--- a/x11-apps/rgb/rgb-0.99.2.ebuild
+++ b/x11-apps/rgb/rgb-0.99.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-apps/rgb/rgb-0.99.2.ebuild,v 1.1 2005/11/11 19:50:21 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/rstart/ChangeLog b/x11-apps/rstart/ChangeLog
index 81be55e33000..3ee0d64ef850 100644
--- a/x11-apps/rstart/ChangeLog
+++ b/x11-apps/rstart/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/rstart
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/rstart/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rstart/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*rstart-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +rstart-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> rstart-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *rstart-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
index 1efd9b0226fa..aec888e5c6d1 100644
--- a/x11-apps/rstart/Manifest
+++ b/x11-apps/rstart/Manifest
@@ -1,3 +1,7 @@
-MD5 9a57b1e3774b31c4003f4126875ba041 rstart-0.99.0.ebuild 392
-MD5 f2e4dcff95e33ac48480e6cf5b315bc0 files/rstart-destdir.patch 3060
+MD5 cb6b1f0d70e34db72cb4a32f04e4f89c ChangeLog 713
 MD5 cdd5a59500569e6aa3443f33ea500d45 files/digest-rstart-0.99.0 65
+MD5 e7be8bdb39039eb66f135c136cd17e84 files/digest-rstart-0.99.1 65
+MD5 f2e4dcff95e33ac48480e6cf5b315bc0 files/rstart-destdir.patch 3060
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 ec018ae430aa15e496c14a9df57a558d rstart-0.99.0.ebuild 514
+MD5 f00241e0c638eff17343c81409ae479b rstart-0.99.1.ebuild 519
diff --git a/x11-apps/rstart/rstart-0.99.0.ebuild b/x11-apps/rstart/rstart-0.99.0.ebuild
index fa5fae69ab07..6f524cbb7a8e 100644
--- a/x11-apps/rstart/rstart-0.99.0.ebuild
+++ b/x11-apps/rstart/rstart-0.99.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-apps/rstart/rstart-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rstart/rstart-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make autoreconf run for our patch
@@ -9,7 +9,7 @@ SNAPSHOT="yes"
 inherit x-modular
 
 DESCRIPTION="X.Org rstart application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
 
diff --git a/x11-apps/rstart/rstart-0.99.1.ebuild b/x11-apps/rstart/rstart-0.99.1.ebuild
index a6a0bf4bc4a4..74530ad3b644 100644
--- a/x11-apps/rstart/rstart-0.99.1.ebuild
+++ b/x11-apps/rstart/rstart-0.99.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-apps/rstart/rstart-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rstart/rstart-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make autoreconf run for our patch
diff --git a/x11-apps/scripts/ChangeLog b/x11-apps/scripts/ChangeLog
index 74c4b8613d62..b0cb6ed2e555 100644
--- a/x11-apps/scripts/ChangeLog
+++ b/x11-apps/scripts/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/scripts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*scripts-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +scripts-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> scripts-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *scripts-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
index ce0ec19b2e4d..d0f4bb7c6483 100644
--- a/x11-apps/scripts/Manifest
+++ b/x11-apps/scripts/Manifest
@@ -1,2 +1,6 @@
-MD5 d0c58c511de0d5b1a81517db8d7a247f scripts-0.99.0.ebuild 306
+MD5 7687eef94648d4569eb64e3cd6e1db72 ChangeLog 691
 MD5 7d6021bf21ef2dc6f6f083eeaea437ef files/digest-scripts-0.99.0 66
+MD5 8fce5c6682369720b16a78965c469163 files/digest-scripts-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 e27767f9100038d56539c062a57654b2 scripts-0.99.0.ebuild 430
+MD5 210ee3e6db4330d0638c230199d4fa47 scripts-0.99.1.ebuild 433
diff --git a/x11-apps/scripts/scripts-0.99.0.ebuild b/x11-apps/scripts/scripts-0.99.0.ebuild
index 7ad6fd6b1c6b..d0fa8e6f6621 100644
--- a/x11-apps/scripts/scripts-0.99.0.ebuild
+++ b/x11-apps/scripts/scripts-0.99.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-apps/scripts/scripts-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/scripts-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org scripts application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/scripts/scripts-0.99.1.ebuild b/x11-apps/scripts/scripts-0.99.1.ebuild
index 9afb76fdb852..2cdd613e2946 100644
--- a/x11-apps/scripts/scripts-0.99.1.ebuild
+++ b/x11-apps/scripts/scripts-0.99.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-apps/scripts/scripts-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/scripts/scripts-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/sessreg/ChangeLog b/x11-apps/sessreg/ChangeLog
index 57601ae98083..cc501b82ab84 100644
--- a/x11-apps/sessreg/ChangeLog
+++ b/x11-apps/sessreg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/sessreg
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/ChangeLog,v 1.1 2005/10/20 01:08:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+  15 Nov 2005; Stephen P. Becker <geoman@gentoo.org> sessreg-0.99.1.ebuild:
+  added ~mips keyword
 
 *sessreg-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
index 693b290bf6bc..b667b563e197 100644
--- a/x11-apps/sessreg/Manifest
+++ b/x11-apps/sessreg/Manifest
@@ -1,5 +1,4 @@
-MD5 a50f0c97ec43cb55f021ac0d2f4a9ff0 ChangeLog 541
+MD5 89149e4ef69912837e0aa7c9f482a209 ChangeLog 459
 MD5 f909854b3fa7f54a30a47ecb40a7facd files/digest-sessreg-0.99.1 66
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 5c974c0164d5ad0ae667f0381f16cf25 sessreg-0.99.0.ebuild 421
-MD5 b479bfba50295aa487ac32f9956ab5d3 sessreg-0.99.1.ebuild 403
+MD5 d8ef4ef3465c57e2ccaf0ece3406c922 sessreg-0.99.1.ebuild 415
diff --git a/x11-apps/sessreg/sessreg-0.99.1.ebuild b/x11-apps/sessreg/sessreg-0.99.1.ebuild
index 0ce9b7e6398f..d9a30f360c67 100644
--- a/x11-apps/sessreg/sessreg-0.99.1.ebuild
+++ b/x11-apps/sessreg/sessreg-0.99.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-apps/sessreg/sessreg-0.99.1.ebuild,v 1.1 2005/10/20 01:08:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/sessreg/sessreg-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org sessreg application"
-KEYWORDS="~x86"
+KEYWORDS="~mips ~x86"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	x11-proto/xproto"
diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index 4260972f47a0..6d77fd7cfce2 100644
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,33 @@
 # ChangeLog for x11-apps/setxkbmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+*setxkbmap-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +setxkbmap-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+  06 Nov 2005; <dang@gentoo.org> setxkbmap-0.99.1-r1.ebuild:
+  Marked ~amd64
+
+*setxkbmap-0.99.1-r1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/use-right-xkb-config-root.patch, +setxkbmap-0.99.1-r1.ebuild:
+  Make setxkbmap work.
+
+*setxkbmap-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +setxkbmap-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> setxkbmap-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *setxkbmap-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
index 84315127608d..b36184e07b96 100644
--- a/x11-apps/setxkbmap/Manifest
+++ b/x11-apps/setxkbmap/Manifest
@@ -1,2 +1,11 @@
-MD5 e848b6ee1ddae54fb605f0b5ab7e5026 setxkbmap-0.99.0.ebuild 329
+MD5 211778edd70551ef81e3c133b3dc254b ChangeLog 1111
 MD5 c053d339c7b79917597fe46183919047 files/digest-setxkbmap-0.99.0 68
+MD5 f0304b55b1842a33be29c71f5a5fb008 files/digest-setxkbmap-0.99.1 68
+MD5 f0304b55b1842a33be29c71f5a5fb008 files/digest-setxkbmap-0.99.1-r1 68
+MD5 9562c4181864a40034ed6496adca9f25 files/digest-setxkbmap-0.99.2 68
+MD5 19019a10aba86e28761af7a5f789f503 files/use-right-xkb-config-root.patch 441
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 479f9250b44aa02474611e44cc5f8c91 setxkbmap-0.99.0.ebuild 457
+MD5 1e24d9f2a410c6753281023b43900cbc setxkbmap-0.99.1-r1.ebuild 519
+MD5 d815b47f6259d0f5cd404e5a7a72ed76 setxkbmap-0.99.1.ebuild 460
+MD5 83de1918bd9535e998d3bf502b8e756a setxkbmap-0.99.2.ebuild 484
diff --git a/x11-apps/setxkbmap/setxkbmap-0.99.0.ebuild b/x11-apps/setxkbmap/setxkbmap-0.99.0.ebuild
index 5adab0b4ce76..02bd405238f3 100644
--- a/x11-apps/setxkbmap/setxkbmap-0.99.0.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-0.99.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-apps/setxkbmap/setxkbmap-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org setxkbmap application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild b/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild
index 553fef460283..eb16343a4448 100644
--- a/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-0.99.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-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild,v 1.1 2005/10/20 22:21:26 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-0.99.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -10,7 +10,7 @@ inherit x-modular
 PATCHES="${FILESDIR}/use-right-xkb-config-root.patch"
 
 DESCRIPTION="X.Org setxkbmap application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/setxkbmap/setxkbmap-0.99.1.ebuild b/x11-apps/setxkbmap/setxkbmap-0.99.1.ebuild
index 22be65fc1ab3..ee938908ee6b 100644
--- a/x11-apps/setxkbmap/setxkbmap-0.99.1.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-0.99.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-apps/setxkbmap/setxkbmap-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/setxkbmap/setxkbmap-0.99.2.ebuild b/x11-apps/setxkbmap/setxkbmap-0.99.2.ebuild
index 1b21108e2183..22c8bd02a94b 100644
--- a/x11-apps/setxkbmap/setxkbmap-0.99.2.ebuild
+++ b/x11-apps/setxkbmap/setxkbmap-0.99.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-apps/setxkbmap/setxkbmap-0.99.2.ebuild,v 1.1 2005/11/11 19:50:57 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # SNAPSHOT="yes"
diff --git a/x11-apps/showfont/ChangeLog b/x11-apps/showfont/ChangeLog
index 7e969095eceb..9bde00c7b035 100644
--- a/x11-apps/showfont/ChangeLog
+++ b/x11-apps/showfont/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/showfont
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+*showfont-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +showfont-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> showfont-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *showfont-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
index dc86dd55f5b5..5c9fe1a8533c 100644
--- a/x11-apps/showfont/Manifest
+++ b/x11-apps/showfont/Manifest
@@ -1,2 +1,6 @@
-MD5 c9cc79d1a141889ac08cbf9b75d26d71 showfont-0.99.0.ebuild 306
+MD5 d11e3e3693af258d97a66920ae50f338 ChangeLog 698
 MD5 1707c04d231d3999702510c9d6975ca3 files/digest-showfont-0.99.0 67
+MD5 22e733046d950031d5200387a7cf1d56 files/digest-showfont-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 6e29d85aa66a5c56a46630ee27ce363a showfont-0.99.0.ebuild 432
+MD5 8ee5b38c8a81e7771f410a56647b01ea showfont-0.99.1.ebuild 435
diff --git a/x11-apps/showfont/showfont-0.99.0.ebuild b/x11-apps/showfont/showfont-0.99.0.ebuild
index 56fc2ab89c8c..1ffe592d7783 100644
--- a/x11-apps/showfont/showfont-0.99.0.ebuild
+++ b/x11-apps/showfont/showfont-0.99.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-apps/showfont/showfont-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/showfont-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org showfont application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/showfont/showfont-0.99.1.ebuild b/x11-apps/showfont/showfont-0.99.1.ebuild
index 3aa58a852394..796b9a37ffa4 100644
--- a/x11-apps/showfont/showfont-0.99.1.ebuild
+++ b/x11-apps/showfont/showfont-0.99.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-apps/showfont/showfont-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/showfont/showfont-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/smproxy/ChangeLog b/x11-apps/smproxy/ChangeLog
index afbfeb58a207..cf4e7a18f6e1 100644
--- a/x11-apps/smproxy/ChangeLog
+++ b/x11-apps/smproxy/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/smproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*smproxy-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +smproxy-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> smproxy-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *smproxy-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
index ee2c10160bcf..c07d2396b502 100644
--- a/x11-apps/smproxy/Manifest
+++ b/x11-apps/smproxy/Manifest
@@ -1,2 +1,6 @@
-MD5 001b39d230e782b25a99389a22b833e7 smproxy-0.99.0.ebuild 322
+MD5 4a38cd748a46653efa531d09de9bf157 ChangeLog 691
 MD5 67c1b3b34aa26aa326380454b578b650 files/digest-smproxy-0.99.0 66
+MD5 ab0e4c7ac1d02a61218d77973ce61e6c files/digest-smproxy-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a0538693c409ab8f21bdd346ebd4e68c smproxy-0.99.0.ebuild 446
+MD5 9f9a4246196f748a6740559b963b4f45 smproxy-0.99.1.ebuild 449
diff --git a/x11-apps/smproxy/smproxy-0.99.0.ebuild b/x11-apps/smproxy/smproxy-0.99.0.ebuild
index 82fdc77a4205..0cbfebd713a4 100644
--- a/x11-apps/smproxy/smproxy-0.99.0.ebuild
+++ b/x11-apps/smproxy/smproxy-0.99.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-apps/smproxy/smproxy-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/smproxy-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org smproxy application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXt
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/smproxy-0.99.1.ebuild b/x11-apps/smproxy/smproxy-0.99.1.ebuild
index f50344570d6a..6c8bb3f0bbee 100644
--- a/x11-apps/smproxy/smproxy-0.99.1.ebuild
+++ b/x11-apps/smproxy/smproxy-0.99.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-apps/smproxy/smproxy-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/smproxy/smproxy-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/viewres/ChangeLog b/x11-apps/viewres/ChangeLog
index 7b4dfbc0959b..e057802749cc 100644
--- a/x11-apps/viewres/ChangeLog
+++ b/x11-apps/viewres/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/viewres
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*viewres-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +viewres-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> viewres-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *viewres-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
index 82ab979799d4..e265b4d58239 100644
--- a/x11-apps/viewres/Manifest
+++ b/x11-apps/viewres/Manifest
@@ -1,2 +1,6 @@
-MD5 4488f759327cf5ed73ad85bfc8208915 viewres-0.99.0.ebuild 494
+MD5 4d9c777427f0826b4b9e00142e8b1732 ChangeLog 691
 MD5 d354cbedfec8736d35f8b96ec36cc2b1 files/digest-viewres-0.99.0 66
+MD5 fabca810c6aaafb6a12173b9c947f5dd files/digest-viewres-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 1bbe5488fafb15fbfd5284a44173a5f3 viewres-0.99.0.ebuild 618
+MD5 16cadefc094faabcd4925c8202d9fe34 viewres-0.99.1.ebuild 621
diff --git a/x11-apps/viewres/viewres-0.99.0.ebuild b/x11-apps/viewres/viewres-0.99.0.ebuild
index 6883ae3ddc94..0e34e565b274 100644
--- a/x11-apps/viewres/viewres-0.99.0.ebuild
+++ b/x11-apps/viewres/viewres-0.99.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-apps/viewres/viewres-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/viewres-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org viewres application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/viewres/viewres-0.99.1.ebuild b/x11-apps/viewres/viewres-0.99.1.ebuild
index 54b954fd87ae..82484d7a8ddf 100644
--- a/x11-apps/viewres/viewres-0.99.1.ebuild
+++ b/x11-apps/viewres/viewres-0.99.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-apps/viewres/viewres-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/viewres/viewres-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/x11perf/ChangeLog b/x11-apps/x11perf/ChangeLog
index 21efb544fb34..3023785cebc9 100644
--- a/x11-apps/x11perf/ChangeLog
+++ b/x11-apps/x11perf/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/x11perf
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> x11perf-0.99.1.ebuild:
+  Marked ~amd64.
+
+*x11perf-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +x11perf-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> x11perf-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *x11perf-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
index 4ca984428fba..e6abfb6a3ff7 100644
--- a/x11-apps/x11perf/Manifest
+++ b/x11-apps/x11perf/Manifest
@@ -1,2 +1,16 @@
-MD5 82429be3aacc4267f664b20153cbc3cb x11perf-0.99.0.ebuild 323
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 3f6e0e20e535eeed81a8ebf29a92ce66 ChangeLog 777
 MD5 7470d5ddb9a2261b33c458864b337c4d files/digest-x11perf-0.99.0 67
+MD5 928d78bab0ed7897fc4fc9656634df58 files/digest-x11perf-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 48ba85ac451841bb02de1d2db734f80a x11perf-0.99.0.ebuild 447
+MD5 44d0b8b6302f091158a583d4a81de032 x11perf-0.99.1.ebuild 453
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfGlq2G5bA0cA/ScRAt5AAKCR9NLWZ5Vun4xMLg7bV4+i9tgwrQCePaY+
+RucMxSNZ7ounhKhL1tj5IWI=
+=T/2A
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/x11perf/x11perf-0.99.0.ebuild b/x11-apps/x11perf/x11perf-0.99.0.ebuild
index 97e4131fe73a..d8875b3bed46 100644
--- a/x11-apps/x11perf/x11perf-0.99.0.ebuild
+++ b/x11-apps/x11perf/x11perf-0.99.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-apps/x11perf/x11perf-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/x11perf-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org x11perf application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/x11perf-0.99.1.ebuild b/x11-apps/x11perf/x11perf-0.99.1.ebuild
index 0971a03c06f9..e15a555474a2 100644
--- a/x11-apps/x11perf/x11perf-0.99.1.ebuild
+++ b/x11-apps/x11perf/x11perf-0.99.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-apps/x11perf/x11perf-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/x11perf/x11perf-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org x11perf application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/ChangeLog b/x11-apps/xauth/ChangeLog
index 451bd3beaba0..0b74e18d846e 100644
--- a/x11-apps/xauth/ChangeLog
+++ b/x11-apps/xauth/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for x11-apps/xauth
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*xauth-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xauth-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xauth-0.99.1-r1 (27 Oct 2005)
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xauth-0.99.1-r1.ebuild:
+  Rev-bump for new USE flag.
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xauth-0.99.1.ebuild:
+  Add ipv6 USE flag.
+
+*xauth-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xauth-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> xauth-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xauth-0.99.0.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xauth-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xauth-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xauth-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xauth-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
index 7c2c678e4a3b..cfb15cc4ebc0 100644
--- a/x11-apps/xauth/Manifest
+++ b/x11-apps/xauth/Manifest
@@ -1,2 +1,10 @@
-MD5 3b6a48b1df44ea095c881d9cd6bf295b xauth-0.99.0.ebuild 356
+MD5 ac54fd7ada594e29c62b0b16ed4a07c8 ChangeLog 1409
 MD5 90404d10addaf1b73adf8051cc3f7c77 files/digest-xauth-0.99.0 64
+MD5 4477ce92c13f067558cedfb314c73acd files/digest-xauth-0.99.1 64
+MD5 4477ce92c13f067558cedfb314c73acd files/digest-xauth-0.99.1-r1 64
+MD5 630a4e127dec5d8239133a5a8eee4c20 files/digest-xauth-0.99.2 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a8d97d27c179e6f1c87e35a965f62de4 xauth-0.99.0.ebuild 492
+MD5 d793216c100e476f7869434c49a8aa76 xauth-0.99.1-r1.ebuild 554
+MD5 757eeb5acd2a5563842ab1f93760b4ea xauth-0.99.1.ebuild 551
+MD5 8cd40e0f53c15e2cfb698f0398f40b0c xauth-0.99.2.ebuild 551
diff --git a/x11-apps/xauth/xauth-0.99.0.ebuild b/x11-apps/xauth/xauth-0.99.0.ebuild
index 53550e573169..f1e49475df48 100644
--- a/x11-apps/xauth/xauth-0.99.0.ebuild
+++ b/x11-apps/xauth/xauth-0.99.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-apps/xauth/xauth-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xauth application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXau
 	x11-libs/libXext
diff --git a/x11-apps/xauth/xauth-0.99.1-r1.ebuild b/x11-apps/xauth/xauth-0.99.1-r1.ebuild
index c2947cee5ac1..366691e4fe37 100644
--- a/x11-apps/xauth/xauth-0.99.1-r1.ebuild
+++ b/x11-apps/xauth/xauth-0.99.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-apps/xauth/xauth-0.99.1-r1.ebuild,v 1.1 2005/10/27 15:21:55 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-0.99.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xauth/xauth-0.99.1.ebuild b/x11-apps/xauth/xauth-0.99.1.ebuild
index c1a7e4c496fe..9e202e72ecd6 100644
--- a/x11-apps/xauth/xauth-0.99.1.ebuild
+++ b/x11-apps/xauth/xauth-0.99.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-apps/xauth/xauth-0.99.1.ebuild,v 1.1 2005/10/20 00:45:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -14,3 +14,6 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xauth/xauth-0.99.2.ebuild b/x11-apps/xauth/xauth-0.99.2.ebuild
index db9cf1a71979..39dad2e1bf87 100644
--- a/x11-apps/xauth/xauth-0.99.2.ebuild
+++ b/x11-apps/xauth/xauth-0.99.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-apps/xauth/xauth-0.99.2.ebuild,v 1.1 2005/11/11 19:51:27 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xbiff/ChangeLog b/x11-apps/xbiff/ChangeLog
index bcd7af565d3f..b8435907e75f 100644
--- a/x11-apps/xbiff/ChangeLog
+++ b/x11-apps/xbiff/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xbiff
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*xbiff-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xbiff-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  27 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; xbiff-0.99.0.ebuild:
+  Add note about xprint being optional as of today's CVS.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xbiff-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xbiff-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
index 1bee912903ab..16d5da0d92e9 100644
--- a/x11-apps/xbiff/Manifest
+++ b/x11-apps/xbiff/Manifest
@@ -1,2 +1,6 @@
-MD5 43d06a8d8db64f9857f07aa162b65923 xbiff-0.99.0.ebuild 499
+MD5 b0f60985a56ba9e2056ba2b71177b90f ChangeLog 808
 MD5 2f5ccc747384ae473b643a1c75b22799 files/digest-xbiff-0.99.0 64
+MD5 01305f18e10cb943e3d749fc4f2c6331 files/digest-xbiff-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 c4bfeb1356527f4d0bcd5741a5e78c61 xbiff-0.99.0.ebuild 679
+MD5 e1b01e8d34fe617e64b1f4720d91aab4 xbiff-0.99.1.ebuild 502
diff --git a/x11-apps/xbiff/xbiff-0.99.0.ebuild b/x11-apps/xbiff/xbiff-0.99.0.ebuild
index 4b046d28714d..60f487ed97e8 100644
--- a/x11-apps/xbiff/xbiff-0.99.0.ebuild
+++ b/x11-apps/xbiff/xbiff-0.99.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-apps/xbiff/xbiff-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/xbiff-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,8 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xbiff application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+# As of 20050927, we should be able to make xprint optional
 #IUSE="xprint"
 RDEPEND="x11-libs/libXaw
 	x11-misc/xbitmaps"
diff --git a/x11-apps/xbiff/xbiff-0.99.1.ebuild b/x11-apps/xbiff/xbiff-0.99.1.ebuild
index 7bc53a9a1f3b..caf2a5899539 100644
--- a/x11-apps/xbiff/xbiff-0.99.1.ebuild
+++ b/x11-apps/xbiff/xbiff-0.99.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-apps/xbiff/xbiff-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xbiff/xbiff-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xcalc/ChangeLog b/x11-apps/xcalc/ChangeLog
index 09dafbef179a..84675b8fca46 100644
--- a/x11-apps/xcalc/ChangeLog
+++ b/x11-apps/xcalc/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xcalc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xcalc-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xcalc-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xcalc-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xcalc-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xcalc-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
index 7cb725db3132..c98269ada888 100644
--- a/x11-apps/xcalc/Manifest
+++ b/x11-apps/xcalc/Manifest
@@ -1,2 +1,16 @@
-MD5 d594b7311681dfe8cbc10b8d680ec7d7 xcalc-0.99.0.ebuild 492
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 95ba18f1585ba88907fe16a36372ceb6 ChangeLog 757
 MD5 5fdfd0786b43e6b9df59995bb983cc24 files/digest-xcalc-0.99.0 64
+MD5 9efcdb2f358a2423ea5827e7b42fa431 files/digest-xcalc-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 0b82ddd8ce5d1bdd02347846eae03c86 xcalc-0.99.0.ebuild 612
+MD5 5c3487a62b60b1c3961929759c62a7eb xcalc-0.99.1.ebuild 618
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfG0d2G5bA0cA/ScRAuyPAJ9vhNTHuviUctqgxru6IbEOmbbsJACfb8lt
+M0KRzsmzKynm8q5wGGSoRkk=
+=5vAT
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xcalc/xcalc-0.99.0.ebuild b/x11-apps/xcalc/xcalc-0.99.0.ebuild
index b913797418fe..7585437f4f65 100644
--- a/x11-apps/xcalc/xcalc-0.99.0.ebuild
+++ b/x11-apps/xcalc/xcalc-0.99.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-apps/xcalc/xcalc-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/xcalc-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xcalc application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/xcalc-0.99.1.ebuild b/x11-apps/xcalc/xcalc-0.99.1.ebuild
index a27bb41fb412..28241eec2afe 100644
--- a/x11-apps/xcalc/xcalc-0.99.1.ebuild
+++ b/x11-apps/xcalc/xcalc-0.99.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-apps/xcalc/xcalc-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcalc/xcalc-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xcalc application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclipboard/ChangeLog b/x11-apps/xclipboard/ChangeLog
index 0b295d8faad0..86e3b3f7ce0c 100644
--- a/x11-apps/xclipboard/ChangeLog
+++ b/x11-apps/xclipboard/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-apps/xclipboard
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*xclipboard-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xclipboard-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xclipboard-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xclipboard-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
index 4b03161eaa6e..b269c13e2bcc 100644
--- a/x11-apps/xclipboard/Manifest
+++ b/x11-apps/xclipboard/Manifest
@@ -1,2 +1,6 @@
-MD5 3778ce451ef6b9d224bb37c61de8356f xclipboard-0.99.0.ebuild 497
+MD5 6d358700ee659f5ea8ef239b11997202 ChangeLog 714
 MD5 3f52e540fb44a4472080d912654e3081 files/digest-xclipboard-0.99.0 69
+MD5 c3158823992452a546264096f448816c files/digest-xclipboard-0.99.1 69
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 5abfe55ed54ea916639137c8a817a706 xclipboard-0.99.0.ebuild 627
+MD5 be00a02e6f9daa4fc6423152d664e3aa xclipboard-0.99.1.ebuild 630
diff --git a/x11-apps/xclipboard/xclipboard-0.99.0.ebuild b/x11-apps/xclipboard/xclipboard-0.99.0.ebuild
index 673a0c0a7fd7..c4dd356101df 100644
--- a/x11-apps/xclipboard/xclipboard-0.99.0.ebuild
+++ b/x11-apps/xclipboard/xclipboard-0.99.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-apps/xclipboard/xclipboard-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/xclipboard-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xclipboard application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclipboard/xclipboard-0.99.1.ebuild b/x11-apps/xclipboard/xclipboard-0.99.1.ebuild
index 0ca46bb858a5..3962eb5c980b 100644
--- a/x11-apps/xclipboard/xclipboard-0.99.1.ebuild
+++ b/x11-apps/xclipboard/xclipboard-0.99.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-apps/xclipboard/xclipboard-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclipboard/xclipboard-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xclock/ChangeLog b/x11-apps/xclock/ChangeLog
index 32a1939fac0a..00a0cbe61b49 100644
--- a/x11-apps/xclock/ChangeLog
+++ b/x11-apps/xclock/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-apps/xclock
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+  07 Nov 2005; Doug Goldstein <cardoe@gentoo.org> xclock-0.99.1.ebuild:
+  adding ~ppc keyword
+
+  30 Oct 2005; <dang@gentoo.org> xclock-0.99.1.ebuild:
+  Marked ~amd64
+
+*xclock-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xclock-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> xclock-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xclock-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xclock-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
index d7adaca3039b..bfc0cc43b68d 100644
--- a/x11-apps/xclock/Manifest
+++ b/x11-apps/xclock/Manifest
@@ -1,2 +1,16 @@
-MD5 5161bc23b10910e38a19b4020c6752dc xclock-0.99.0.ebuild 569
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 52f97b55fba3cc329bc21de9d3bf2763 ChangeLog 946
 MD5 1a3cf8d56e130ea86fe79f9d716061e6 files/digest-xclock-0.99.0 65
+MD5 f72386976e619d0c9cfe8197b47c1bbd files/digest-xclock-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 dfef70ad4c11a9b38755a19dd6fdf1ca xclock-0.99.0.ebuild 691
+MD5 ce2a18e462d4113320cf16020d85be90 xclock-0.99.1.ebuild 703
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbuUCBtvusYtCZMsRAmzcAJ9hoBMdhW9fyR2nlKfKY94+cWjTTACfbJmv
+Kr0J4YZ0Rw3KXr2VjB5yd+I=
+=k5K2
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xclock/xclock-0.99.0.ebuild b/x11-apps/xclock/xclock-0.99.0.ebuild
index 5a55cf0d2643..79ec7a894577 100644
--- a/x11-apps/xclock/xclock-0.99.0.ebuild
+++ b/x11-apps/xclock/xclock-0.99.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-apps/xclock/xclock-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/xclock-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xclock application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrender
diff --git a/x11-apps/xclock/xclock-0.99.1.ebuild b/x11-apps/xclock/xclock-0.99.1.ebuild
index 69006babd99e..097d7398a968 100644
--- a/x11-apps/xclock/xclock-0.99.1.ebuild
+++ b/x11-apps/xclock/xclock-0.99.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-apps/xclock/xclock-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xclock/xclock-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xclock application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXrender
diff --git a/x11-apps/xcmsdb/ChangeLog b/x11-apps/xcmsdb/ChangeLog
index 49fe3907e321..55ee581dacac 100644
--- a/x11-apps/xcmsdb/ChangeLog
+++ b/x11-apps/xcmsdb/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xcmsdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*xcmsdb-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xcmsdb-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xcmsdb-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xcmsdb-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
index 4b16f2f799d1..f67f96d18ec1 100644
--- a/x11-apps/xcmsdb/Manifest
+++ b/x11-apps/xcmsdb/Manifest
@@ -1,2 +1,6 @@
-MD5 9cb7eec858314485e78c07955def0fcc xcmsdb-0.99.0.ebuild 305
+MD5 512c896e2aab9d36aa36433fe6452fbc ChangeLog 684
 MD5 85d589f110329dbad3b0ab39b6d57602 files/digest-xcmsdb-0.99.0 65
+MD5 4c1d31620c73825b3ea959b0123ae0c6 files/digest-xcmsdb-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 14ffe466767ad4f800ede2b6f5dbf1dc xcmsdb-0.99.0.ebuild 427
+MD5 461fa7c2304f07e7fee09ac7bfd755d6 xcmsdb-0.99.1.ebuild 430
diff --git a/x11-apps/xcmsdb/xcmsdb-0.99.0.ebuild b/x11-apps/xcmsdb/xcmsdb-0.99.0.ebuild
index 6d0f554ab21b..49b514273516 100644
--- a/x11-apps/xcmsdb/xcmsdb-0.99.0.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-0.99.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-apps/xcmsdb/xcmsdb-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xcmsdb application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcmsdb/xcmsdb-0.99.1.ebuild b/x11-apps/xcmsdb/xcmsdb-0.99.1.ebuild
index 448f0162ff78..d5b11732d83f 100644
--- a/x11-apps/xcmsdb/xcmsdb-0.99.1.ebuild
+++ b/x11-apps/xcmsdb/xcmsdb-0.99.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-apps/xcmsdb/xcmsdb-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcmsdb/xcmsdb-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xconsole/ChangeLog b/x11-apps/xconsole/ChangeLog
index 7eab9b15b90e..c777e1fb3f9f 100644
--- a/x11-apps/xconsole/ChangeLog
+++ b/x11-apps/xconsole/ChangeLog
@@ -1,6 +1,27 @@
 # ChangeLog for x11-apps/xconsole
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xconsole-0.99.2.ebuild:
+  Marked ~amd64.
+
+*xconsole-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xconsole-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xconsole-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xconsole-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xconsole-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xconsole-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
index db1fbc73d861..b7e018b9b5f4 100644
--- a/x11-apps/xconsole/Manifest
+++ b/x11-apps/xconsole/Manifest
@@ -1,2 +1,18 @@
-MD5 2c6cde60ecfb8d447e7c7409675f5a39 xconsole-0.99.0.ebuild 495
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 57c3b6ce7d2f0e0a7dc6928573857505 ChangeLog 921
 MD5 1e1e1d32300eb1bf6ae97bf7a326785f files/digest-xconsole-0.99.0 67
+MD5 c250486a1376ee103cfb028abb0546e5 files/digest-xconsole-0.99.1 67
+MD5 95350870af8e56299b32935c2e7a1617 files/digest-xconsole-0.99.2 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 261d3badfad4e3ff6828c792cf17e23e xconsole-0.99.0.ebuild 610
+MD5 e40490f840a46f3c2f11f6c33c46a799 xconsole-0.99.1.ebuild 613
+MD5 e12b584b67596eb3fcfac3f9aac527dc xconsole-0.99.2.ebuild 616
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfGyB2G5bA0cA/ScRAh13AJ4lHXyA5gYXC7rdPbDcPYgUniyBeQCeLd5k
+EiULfWZzdLj+M2kDQxBWxcM=
+=wVOa
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xconsole/xconsole-0.99.0.ebuild b/x11-apps/xconsole/xconsole-0.99.0.ebuild
index 9e0e51d71335..466e5bd2f93b 100644
--- a/x11-apps/xconsole/xconsole-0.99.0.ebuild
+++ b/x11-apps/xconsole/xconsole-0.99.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-apps/xconsole/xconsole-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/xconsole-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xconsole application"
-KEYWORDS="~x86"
+KEYWORDS="~mips ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xconsole/xconsole-0.99.1.ebuild b/x11-apps/xconsole/xconsole-0.99.1.ebuild
index 0097746f7626..70767efed1cc 100644
--- a/x11-apps/xconsole/xconsole-0.99.1.ebuild
+++ b/x11-apps/xconsole/xconsole-0.99.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-apps/xconsole/xconsole-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/xconsole-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xconsole/xconsole-0.99.2.ebuild b/x11-apps/xconsole/xconsole-0.99.2.ebuild
index 078f3e4b4d0d..ad3cdc251d55 100644
--- a/x11-apps/xconsole/xconsole-0.99.2.ebuild
+++ b/x11-apps/xconsole/xconsole-0.99.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-apps/xconsole/xconsole-0.99.2.ebuild,v 1.1 2005/11/11 19:51:57 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xconsole/xconsole-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xconsole application"
-KEYWORDS="~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcursorgen/ChangeLog b/x11-apps/xcursorgen/ChangeLog
index 0ac7db89e5bd..cc3fb445f338 100644
--- a/x11-apps/xcursorgen/ChangeLog
+++ b/x11-apps/xcursorgen/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for x11-apps/xcursorgen
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/ChangeLog,v 1.1 2005/08/08 05:06:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*xcursorgen-0.99.1 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xcursorgen-0.99.1.ebuild:
+  Bump for 7.0RC2.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xcursorgen-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xcursorgen-0.99.0.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xcursorgen-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xcursorgen-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xcursorgen-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xcursorgen-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
index ac97b683fd86..9840beaebc93 100644
--- a/x11-apps/xcursorgen/Manifest
+++ b/x11-apps/xcursorgen/Manifest
@@ -1,2 +1,6 @@
-MD5 9a76669c5eead64114cb310a95fd4569 xcursorgen-0.99.0.ebuild 355
+MD5 721b359bb170cead41e19071afdfdc9b ChangeLog 1094
 MD5 b44d55ae8bcce033bcdbf1d416a86acb files/digest-xcursorgen-0.99.0 69
+MD5 e38595a24586a215849f0e6acdd892be files/digest-xcursorgen-0.99.1 69
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 848e926d0e1b3366edcd268250f01c8f xcursorgen-0.99.0.ebuild 501
+MD5 8b44609ed0e222dd18756d27ff232497 xcursorgen-0.99.1.ebuild 508
diff --git a/x11-apps/xcursorgen/xcursorgen-0.99.0.ebuild b/x11-apps/xcursorgen/xcursorgen-0.99.0.ebuild
index dc9185550d2b..b17124773e1f 100644
--- a/x11-apps/xcursorgen/xcursorgen-0.99.0.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-0.99.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-apps/xcursorgen/xcursorgen-0.99.0.ebuild,v 1.1 2005/08/08 05:06:15 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xcursorgen application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXcursor
 	=media-libs/libpng-1.2*"
diff --git a/x11-apps/xcursorgen/xcursorgen-0.99.1.ebuild b/x11-apps/xcursorgen/xcursorgen-0.99.1.ebuild
index c8ae8d864993..170b1be5eee4 100644
--- a/x11-apps/xcursorgen/xcursorgen-0.99.1.ebuild
+++ b/x11-apps/xcursorgen/xcursorgen-0.99.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-apps/xcursorgen/xcursorgen-0.99.1.ebuild,v 1.1 2005/11/11 19:52:29 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xdbedizzy/ChangeLog b/x11-apps/xdbedizzy/ChangeLog
index 986fdc73443b..300c00da4917 100644
--- a/x11-apps/xdbedizzy/ChangeLog
+++ b/x11-apps/xdbedizzy/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-apps/xdbedizzy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/ChangeLog,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*xdbedizzy-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdbedizzy-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xdbedizzy-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xdbedizzy-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xdbedizzy-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xdbedizzy-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
index e4b44c8d87d9..d35dbf5370d1 100644
--- a/x11-apps/xdbedizzy/Manifest
+++ b/x11-apps/xdbedizzy/Manifest
@@ -1,2 +1,8 @@
-MD5 332ec892f4104090fe8568d3f81a8f62 xdbedizzy-0.99.0.ebuild 526
+MD5 de72cd9f3b04f9fa39c3190d8c272f02 ChangeLog 847
 MD5 737a46bfbdf25cef248f981510f7c927 files/digest-xdbedizzy-0.99.0 68
+MD5 af43c1df136a26a8e91c7c96147d092b files/digest-xdbedizzy-0.99.1 68
+MD5 306625ab0d91888b9dde9a04e05d9a39 files/digest-xdbedizzy-0.99.2 68
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 e7d6a31f0c12df5742e733a9c9bfb89a xdbedizzy-0.99.0.ebuild 654
+MD5 91b4277f4c5cbb90f698dbd682b922c0 xdbedizzy-0.99.1.ebuild 657
+MD5 bc422b6c28d4bafa22da7bb601125d87 xdbedizzy-0.99.2.ebuild 661
diff --git a/x11-apps/xdbedizzy/xdbedizzy-0.99.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-0.99.0.ebuild
index 446b5477728a..f12f002de054 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-0.99.0.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-0.99.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-apps/xdbedizzy/xdbedizzy-0.99.0.ebuild,v 1.1 2005/08/08 06:28:10 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/xdbedizzy-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xdbedizzy application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 
 # xprint support isn't optional, despite what configure says.
 #IUSE="xprint"
diff --git a/x11-apps/xdbedizzy/xdbedizzy-0.99.1.ebuild b/x11-apps/xdbedizzy/xdbedizzy-0.99.1.ebuild
index 369a216f5db1..06cca33d42b6 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-0.99.1.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-0.99.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-apps/xdbedizzy/xdbedizzy-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/xdbedizzy-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xdbedizzy/xdbedizzy-0.99.2.ebuild b/x11-apps/xdbedizzy/xdbedizzy-0.99.2.ebuild
index de625c53eb9f..1aa55165c4bd 100644
--- a/x11-apps/xdbedizzy/xdbedizzy-0.99.2.ebuild
+++ b/x11-apps/xdbedizzy/xdbedizzy-0.99.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-apps/xdbedizzy/xdbedizzy-0.99.2.ebuild,v 1.1 2005/11/11 19:52:59 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdbedizzy/xdbedizzy-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xditview/ChangeLog b/x11-apps/xditview/ChangeLog
index 66adfd79ac79..3b491082076a 100644
--- a/x11-apps/xditview/ChangeLog
+++ b/x11-apps/xditview/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xditview
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*xditview-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xditview-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xditview-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xditview-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
index 07270e2699c1..6003549e359a 100644
--- a/x11-apps/xditview/Manifest
+++ b/x11-apps/xditview/Manifest
@@ -1,2 +1,6 @@
-MD5 62833645b74cafe6ec34ec7d96ec6cec xditview-0.99.0.ebuild 495
+MD5 f927c5b831951030a65d326e78e95c7c ChangeLog 698
 MD5 047d7e4c68dc77479167d0d3887abb49 files/digest-xditview-0.99.0 67
+MD5 780520e9df20839248fb359e977c9e9a files/digest-xditview-0.99.1 68
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 51d30df5cf8043cf523703182c5b300c xditview-0.99.0.ebuild 621
+MD5 9fe24ca28fb485834ce96cb161991e41 xditview-0.99.1.ebuild 624
diff --git a/x11-apps/xditview/xditview-0.99.0.ebuild b/x11-apps/xditview/xditview-0.99.0.ebuild
index a8b0e946a203..59137ce71ea8 100644
--- a/x11-apps/xditview/xditview-0.99.0.ebuild
+++ b/x11-apps/xditview/xditview-0.99.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-apps/xditview/xditview-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/xditview-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xditview application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xditview/xditview-0.99.1.ebuild b/x11-apps/xditview/xditview-0.99.1.ebuild
index a78d945b71be..9ea3b30597ee 100644
--- a/x11-apps/xditview/xditview-0.99.1.ebuild
+++ b/x11-apps/xditview/xditview-0.99.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-apps/xditview/xditview-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xditview/xditview-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xdm/ChangeLog b/x11-apps/xdm/ChangeLog
index 2f3c861c1fb5..d7e7d680d46f 100644
--- a/x11-apps/xdm/ChangeLog
+++ b/x11-apps/xdm/ChangeLog
@@ -1,6 +1,138 @@
 # ChangeLog for x11-apps/xdm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*xdm-0.99.3_p20051113-r1 (17 Nov 2005)
+
+  17 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdm-0.99.3_p20051113-r1.ebuild:
+  Drop gentoo_locations patch as it was installing scripts into /etc.  Upstream
+  configure scripts now handle paths the way we want them to.
+
+*xdm-0.99.3_p20051113 (14 Nov 2005)
+
+  14 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdm-0.99.3_p20051113.ebuild:
+  Add a new snapshot in attempt to provide a working xdm.
+
+*xdm-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo_locations-0.99.3.patch, +xdm-0.99.3.ebuild:
+  Bump for 7.0RC2.
+
+  06 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xdm-0.99.2_p20051026-r2.ebuild:
+  Add missing xrdb runtime dependency (compnerd).
+
+*xdm-0.99.2_p20051026-r2 (02 Nov 2005)
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xdm-0.99.2_p20051026-r2.ebuild:
+  Install Xsession to /usr/libdir, not /etc, so we don't get 2 copies of it.
+
+*xdm-0.99.2_p20051026-r1 (02 Nov 2005)
+
+  02 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xdm-0.99.2_p20051026.ebuild, +xdm-0.99.2_p20051026-r1.ebuild:
+  Set --with-xdm-configdir correctly so files don't end up directly in /etc.
+
+  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xdm-0.99.0-r2.ebuild, -xdm-0.99.1_pre20050905-r1.ebuild,
+  -xdm-0.99.1_pre20051014.ebuild, -xdm-0.99.2.ebuild:
+  Pull old versions.
+
+  28 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xdm-0.99.2_p20051026.ebuild:
+  Drop SNAPSHOT flag as autoreconf isn't needed.
+
+*xdm-0.99.2_p20051026 (27 Oct 2005)
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo_locations.patch, +xdm-0.99.2_p20051026.ebuild:
+  Add new snapshot that includes greeter lib.  Also re-do some installation
+  paths to refine what follows upstream rules and what doesn't.
+
+*xdm-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xdm-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xdm-0.99.1_pre20051014.ebuild:
+  added ~mips keyword
+
+*xdm-0.99.1_pre20051014 (14 Oct 2005)
+
+  14 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xdm-0.99.1_pre20051014.ebuild:
+  New snapshot. Fixes zero-size files in /etc/X11/xdm: xdm-config, Xresources
+  and Xservers.
+
+  13 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xdm-0.99.1_pre20050905-r1.ebuild:
+  Add --libdir=/etc/X11 (yes, an apparent hack) so all the /usr/lib/xdm stuff
+  installs to /etc/X11/xdm as it should.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xdm-0.99.1_pre20050905.ebuild:
+  Remove old revision.
+
+*xdm-0.99.1_pre20050905-r1 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdm-0.99.1_pre20050905-r1.ebuild:
+  Fixed snapshot SRC_URI and removed installation of xdm init script (now in
+  x11-apps/xinit).  Added resultant xinit dep.
+
+*xdm-0.99.1_pre20050905 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xdm-0.99.1_pre20050905.ebuild, -xdm-0.99.1.ebuild:
+  Fixed version in anticipation of upstream release.
+
+*xdm-0.99.1 (05 Sep 2005)
+
+  05 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xdm-0.99.1.ebuild:
+  New snapshot.
+
+*xdm-0.99.0-r2 (04 Sep 2005)
+
+  04 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> files/xdm.pamd,
+  -xdm-0.99.0.ebuild, -xdm-0.99.0-r1.ebuild, +xdm-0.99.0-r2.ebuild:
+  Changed pam install to use newpamd from pam.eclass.  Also updated pam script
+  to use new include syntax.  Hopefully this will fix pam issues for everyone
+  who had them, especially BSD.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xdm-0.99.0-r1.ebuild:
+  Added ~sh
+
+  30 Aug 2005; Joshua Baergen <joshuabaergen@gentoo.org> files/xdm.start:
+  Fixed a couple important typos in the xdm init script. Thanks to
+  plasmagunman in bug #104289.
+
+  23 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xdm-0.99.0-r1.ebuild:
+  Marked ~amd64.
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xdm-0.99.0.ebuild,
+  xdm-0.99.0-r1.ebuild:
+  Marked ~ppc
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/xdm.start:
+  Get rid of references to /usr/X11R6.
+
+*xdm-0.99.0-r1 (16 Aug 2005)
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/Xsession,
+  +files/xdm.pamd, +files/xdm.start, +xdm-0.99.0-r1.ebuild:
+  Install all the files monolith did, including init script. (#97897) Remove
+  pam_console reference in pam file.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xdm-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xdm-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
index 91e1a1c3a8ae..dd190da050f3 100644
--- a/x11-apps/xdm/Manifest
+++ b/x11-apps/xdm/Manifest
@@ -1,2 +1,17 @@
-MD5 8e0940c2d541cbcab6ae0f482509e0ee xdm-0.99.0.ebuild 573
-MD5 d73361c3f6f0e02b6250ec10fc75339b files/digest-xdm-0.99.0 63
+MD5 02d3ec47f39929f8664772f6180110dd ChangeLog 4950
+MD5 c6dd3e9a9e557b9cba51ff77cb6108a4 files/Xsession 1521
+MD5 9802977e2e111eff050f7532453a83d5 files/digest-xdm-0.99.2_p20051026-r1 73
+MD5 9802977e2e111eff050f7532453a83d5 files/digest-xdm-0.99.2_p20051026-r2 73
+MD5 2f1e9782c240ac184d81d1237a657c71 files/digest-xdm-0.99.3 63
+MD5 f334099b690e3810f47a684f71907360 files/digest-xdm-0.99.3_p20051113 73
+MD5 f334099b690e3810f47a684f71907360 files/digest-xdm-0.99.3_p20051113-r1 73
+MD5 e5c7d9c37e12ad0fc570a818e8304876 files/gentoo_locations-0.99.3.patch 313
+MD5 41e31f3a9d8c6a1e4520bb34eaaaa49a files/gentoo_locations.patch 266
+MD5 4a17967449d093f6430fbee47a24afba files/xdm.pamd 169
+MD5 584252c9909d51023ea18799151cf12e files/xdm.start 3415
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 856df95596b1d453300cf2f1301324bd xdm-0.99.2_p20051026-r1.ebuild 1074
+MD5 b1e9160b9be8daf79d30513d9db7541e xdm-0.99.2_p20051026-r2.ebuild 1116
+MD5 8637181448c2c5586d0b0e37ced8e169 xdm-0.99.3.ebuild 1039
+MD5 82307b84f95520dd43bcaaffb0565053 xdm-0.99.3_p20051113-r1.ebuild 1071
+MD5 add6bc4f97d61c2bf9209571feeb61f1 xdm-0.99.3_p20051113.ebuild 1120
diff --git a/x11-apps/xdm/files/xdm.pamd b/x11-apps/xdm/files/xdm.pamd
index 339f4162bb38..5d2b2b56b068 100644
--- a/x11-apps/xdm/files/xdm.pamd
+++ b/x11-apps/xdm/files/xdm.pamd
@@ -1,6 +1,6 @@
 #%PAM-1.0
-auth       required	pam_stack.so service=system-auth
+auth       include	system-auth
 auth       required	pam_nologin.so
-account    required	pam_stack.so service=system-auth
-password   required	pam_stack.so service=system-auth
-session    required	pam_stack.so service=system-auth
+account    include	system-auth
+password   include	system-auth
+session    include	system-auth
diff --git a/x11-apps/xdm/files/xdm.start b/x11-apps/xdm/files/xdm.start
index ab8eee1167cf..5015d462abe2 100755
--- a/x11-apps/xdm/files/xdm.start
+++ b/x11-apps/xdm/files/xdm.start
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/files/xdm.start,v 1.1 2005/08/16 02:53:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/files/xdm.start,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -24,10 +24,10 @@
 # runlevel never gets changed to this runlevel.  Along with the "a"
 # runlevel, the "once" key word means that startDM.sh will only be
 # run when we specify it to run, thus eliminating respawning
-# startDM.sh when "xdm" is not added to the default runleve, as was
+# startDM.sh when "xdm" is not added to the default runlevel, as was
 # done previously.
 #
-# This script then just calls "tellinit a", and init will run
+# This script then just calls "telinit a", and init will run
 # /etc/X11/startDM.sh after the current runlevel completes (this
 # script should only be added to the actual runlevel the user is
 # using).
@@ -62,17 +62,14 @@ setup_dm() {
 			;;
 		*)
 			EXE=
-			for x in /usr/bin /usr/X11R6/bin
-			do
-				# Fix #65586, where MY_XDM is empty so EXE=somedir
-				[ -x "${x}/${MY_XDM}" -a -f "${x}/${MY_XDM}" ] \
-					&& EXE="${x}/${MY_XDM}"
-			done
-			[ -z "${EXE}" ] && EXE="/usr/X11R6/bin/xdm"
+			# Fix #65586, where MY_XDM is empty so EXE=somedir
+			[ -x "/usr/bin/${MY_XDM}" -a -f "/usr/bin/${MY_XDM}" ] \
+				&& EXE="/usr/bin/${MY_XDM}"
+			[ -z "${EXE}" ] && EXE="/usr/bin/xdm"
 			;;
 	esac
 
-	test ! -x "${EXE}" && EXE=/usr/X11R6/bin/xdm
+	test ! -x "${EXE}" && EXE=/usr/bin/xdm
 
 	SERVICE="${EXE##*/}"
 }
diff --git a/x11-apps/xdm/xdm-0.99.2_p20051026-r1.ebuild b/x11-apps/xdm/xdm-0.99.2_p20051026-r1.ebuild
index d23a1047c483..09d3f835f91d 100644
--- a/x11-apps/xdm/xdm-0.99.2_p20051026-r1.ebuild
+++ b/x11-apps/xdm/xdm-0.99.2_p20051026-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-apps/xdm/xdm-0.99.2_p20051026-r1.ebuild,v 1.1 2005/11/02 04:21:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.2_p20051026-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild b/x11-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild
index 67e0c192570f..9dcaa0843175 100644
--- a/x11-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild
+++ b/x11-apps/xdm/xdm-0.99.2_p20051026-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-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild,v 1.1 2005/11/02 06:20:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.2_p20051026-r2.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -10,7 +10,8 @@ inherit multilib x-modular pam
 DESCRIPTION="X.Org xdm application"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 IUSE="xprint ipv6 pam"
-RDEPEND="x11-libs/libXdmcp
+RDEPEND="x11-apps/xrdb
+	x11-libs/libXdmcp
 	x11-libs/libXaw
 	>=x11-apps/xinit-0.99.1_pre20050905-r1
 	x11-libs/libX11
diff --git a/x11-apps/xdm/xdm-0.99.3.ebuild b/x11-apps/xdm/xdm-0.99.3.ebuild
index 24004c5914f6..7acf794e1b84 100644
--- a/x11-apps/xdm/xdm-0.99.3.ebuild
+++ b/x11-apps/xdm/xdm-0.99.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-apps/xdm/xdm-0.99.3.ebuild,v 1.1 2005/11/11 19:20:47 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.3.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
diff --git a/x11-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild b/x11-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild
index b43caae9ef19..c34dd2e9e128 100644
--- a/x11-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild
+++ b/x11-apps/xdm/xdm-0.99.3_p20051113-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-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild,v 1.1 2005/11/17 04:12:58 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.3_p20051113-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xdm/xdm-0.99.3_p20051113.ebuild b/x11-apps/xdm/xdm-0.99.3_p20051113.ebuild
index ed201d2893b8..4cc1d4745b37 100644
--- a/x11-apps/xdm/xdm-0.99.3_p20051113.ebuild
+++ b/x11-apps/xdm/xdm-0.99.3_p20051113.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-apps/xdm/xdm-0.99.3_p20051113.ebuild,v 1.1 2005/11/14 05:21:28 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdm/xdm-0.99.3_p20051113.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
diff --git a/x11-apps/xdpyinfo/ChangeLog b/x11-apps/xdpyinfo/ChangeLog
index 07a365415e94..e81e7c1d6f0d 100644
--- a/x11-apps/xdpyinfo/ChangeLog
+++ b/x11-apps/xdpyinfo/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for x11-apps/xdpyinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*xdpyinfo-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xdpyinfo-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  15 Sep 2005; Herbie Hopkins <herbs@gentoo.org> xdpyinfo-0.99.0.ebuild:
+  Marked ~amd64.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xineramaproto.patch, xdpyinfo-0.99.0.ebuild:
+  Look for xineramaproto, not panoramix. Reported by steev.
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xdpyinfo-0.99.0.ebuild:
+  panoramixproto moved to xineramaproto.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xdpyinfo-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xdpyinfo-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
index a1e521a2c38b..a5f04f12343f 100644
--- a/x11-apps/xdpyinfo/Manifest
+++ b/x11-apps/xdpyinfo/Manifest
@@ -1,2 +1,7 @@
-MD5 ad24933be9b708970f8d5cec1678eb0a xdpyinfo-0.99.0.ebuild 731
+MD5 b4fe74b9b910adf4e71281b418728d62 ChangeLog 1082
 MD5 6453b4398f2dfe421e785ae76b8be63d files/digest-xdpyinfo-0.99.0 67
+MD5 348af8a311dad63d775992dab8ee3b22 files/digest-xdpyinfo-0.99.1 67
+MD5 98f2babe4660c8a5112133b01b62edde files/xineramaproto.patch 610
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 7ca28e06ba9640444fbd4381702f0763 xdpyinfo-0.99.0.ebuild 905
+MD5 c972556877b2321a1d15c0a33510bddd xdpyinfo-0.99.1.ebuild 866
diff --git a/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild b/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild
index 8c08cdb682ea..fdd3983220fb 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild
@@ -1,14 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
+PATCHES="${FILESDIR}/xineramaproto.patch"
+
 DESCRIPTION="X.Org xdpyinfo application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXext
 	x11-libs/libX11
 	x11-libs/libXtst
@@ -28,6 +30,6 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/inputproto
 	x11-proto/renderproto
-	x11-proto/panoramixproto
+	x11-proto/xineramaproto
 	x11-proto/dmxproto
 	x11-proto/printproto"
diff --git a/x11-apps/xdpyinfo/xdpyinfo-0.99.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-0.99.1.ebuild
index 9cf3608dee9e..0ec3ec3dc704 100644
--- a/x11-apps/xdpyinfo/xdpyinfo-0.99.1.ebuild
+++ b/x11-apps/xdpyinfo/xdpyinfo-0.99.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-apps/xdpyinfo/xdpyinfo-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xdriinfo/ChangeLog b/x11-apps/xdriinfo/ChangeLog
index 3bcd7aaf59c3..c58fe7d1dac8 100644
--- a/x11-apps/xdriinfo/ChangeLog
+++ b/x11-apps/xdriinfo/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-apps/xdriinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.1 2005/09/09 02:52:04 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xdriinfo-0.99.0_pre20050908.ebuild:
+  Pull old versions.
+
+*xdriinfo-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xdriinfo-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
 
 *xdriinfo-0.99.0_pre20050908 (09 Sep 2005)
 
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 76fc7633b509..c73405d7c457 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,3 +1,4 @@
-MD5 12f33b83f361e0fae3a029f6f6abb4b7 ChangeLog 293
-MD5 bf860dd5556d2029934c2b67f3e6276d xdriinfo-0.99.0_pre20050908.ebuild 529
-MD5 63ab6f4cf13a90444d29d6babb42e75f files/digest-xdriinfo-0.99.0_pre20050908 79
+MD5 9023fae4ff7b62dd187b95c75547419e ChangeLog 723
+MD5 ec7017d97f84bd6d6b6d10edbb7bd158 files/digest-xdriinfo-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 98d176c2693da53601a2229a38821f61 xdriinfo-0.99.1.ebuild 431
diff --git a/x11-apps/xdriinfo/xdriinfo-0.99.1.ebuild b/x11-apps/xdriinfo/xdriinfo-0.99.1.ebuild
index dfc73bf6d43f..f47e63f050b9 100644
--- a/x11-apps/xdriinfo/xdriinfo-0.99.1.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-0.99.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-apps/xdriinfo/xdriinfo-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xedit/ChangeLog b/x11-apps/xedit/ChangeLog
index de6f85eae38b..603a1d18e332 100644
--- a/x11-apps/xedit/ChangeLog
+++ b/x11-apps/xedit/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for x11-apps/xedit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xedit-0.99.2.ebuild:
+  Marked ~amd64.
+
+*xedit-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xedit-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xedit-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xedit-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  28 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; xedit-0.99.0.ebuild:
+  Add note about xprint being optional as of today's CVS.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  22 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; xedit-0.99.0.ebuild:
+  Broken without xprint.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xedit-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xedit-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
index f5347a82e436..5af3bd68724e 100644
--- a/x11-apps/xedit/Manifest
+++ b/x11-apps/xedit/Manifest
@@ -1,2 +1,18 @@
-MD5 25b8deb37d3c632db52398397c37fe2c xedit-0.99.0.ebuild 528
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f01dfc12e8b81044585472fe9efc125f ChangeLog 1124
 MD5 215aa7769c436bb259b3b28bb49af9ea files/digest-xedit-0.99.0 65
+MD5 295f8cd8c45acaa44e58e9b6ce1ae6cb files/digest-xedit-0.99.1 65
+MD5 5d45768d2db4a4a7046745b64092afcb files/digest-xedit-0.99.2 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 40aa2fa0d78736bd06271f3375f08d08 xedit-0.99.0.ebuild 851
+MD5 eaa2bcccea1fcc49c041347f00d0908e xedit-0.99.1.ebuild 745
+MD5 ac09109eb321a64fa325d99021cbf921 xedit-0.99.2.ebuild 748
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIUv2G5bA0cA/ScRAkX3AKCgik9cpmqgseY14RyUzO3lzcmRdgCeNWMe
+Wfnfi8TMxpa414KF8NRkXK4=
+=4zdj
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xedit/xedit-0.99.0.ebuild b/x11-apps/xedit/xedit-0.99.0.ebuild
index d7088e7c56a2..64e8b52dc28e 100644
--- a/x11-apps/xedit/xedit-0.99.0.ebuild
+++ b/x11-apps/xedit/xedit-0.99.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-apps/xedit/xedit-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/xedit-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,16 +8,24 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xedit application"
-KEYWORDS="~x86"
-IUSE="xprint"
-RDEPEND="xprint? ( x11-libs/libXprintUtil )
+KEYWORDS="~mips ~sparc ~x86"
+# As of 20050927, we should be able to make xprint optional
+#IUSE="xprint"
+RDEPEND="x11-libs/libXprintUtil
 	x11-libs/libXaw"
+#xprint? ( x11-libs/libXprintUtil )
 DEPEND="${RDEPEND}"
 
-CONFIGURE_OPTIONS="$(use_enable xprint)"
+#CONFIGURE_OPTIONS="$(use_enable xprint)"
 
 pkg_setup() {
-	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
+#	if use xprint && ! built_with_use x11-libs/libXaw xprint; then
+	if ! built_with_use x11-libs/libXaw xprint; then
 		die "Build x11-libs/libXaw with USE=xprint."
 	fi
 }
+
+src_compile() {
+	x-modular_src_configure
+	emake -j1 || die "emake failed"
+}
diff --git a/x11-apps/xedit/xedit-0.99.1.ebuild b/x11-apps/xedit/xedit-0.99.1.ebuild
index e726aba58aca..51f45d9ac442 100644
--- a/x11-apps/xedit/xedit-0.99.1.ebuild
+++ b/x11-apps/xedit/xedit-0.99.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-apps/xedit/xedit-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/xedit-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xedit/xedit-0.99.2.ebuild b/x11-apps/xedit/xedit-0.99.2.ebuild
index 141180471a99..10c764c5b146 100644
--- a/x11-apps/xedit/xedit-0.99.2.ebuild
+++ b/x11-apps/xedit/xedit-0.99.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-apps/xedit/xedit-0.99.2.ebuild,v 1.1 2005/11/11 19:53:35 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xedit/xedit-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xedit application"
-KEYWORDS="~mips ~sparc ~x86"
+KEYWORDS="~amd64 ~mips ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXprintUtil
 	x11-libs/libXaw
diff --git a/x11-apps/xev/ChangeLog b/x11-apps/xev/ChangeLog
index 538865d7f9cf..ba5f4ae94fbb 100644
--- a/x11-apps/xev/ChangeLog
+++ b/x11-apps/xev/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xev
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*xev-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xev-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  23 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xev-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xev-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xev-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
index c7e646e47d08..82f6b1d5e340 100644
--- a/x11-apps/xev/Manifest
+++ b/x11-apps/xev/Manifest
@@ -1,2 +1,6 @@
-MD5 485540eaa2c04498ea815226448f5781 xev-0.99.0.ebuild 302
+MD5 79b22ff635e4b4cece3bb72249bb861d ChangeLog 745
 MD5 30bdfc490b33a8ee96ec2e8ccf34cd62 files/digest-xev-0.99.0 62
+MD5 9687de04d37ecc1bbe2f30cbb187c005 files/digest-xev-0.99.1 62
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 d831e5e809b84a8157c8b8aaf382899b xev-0.99.0.ebuild 425
+MD5 836bc2c766b215024bd318800cc63c2b xev-0.99.1.ebuild 428
diff --git a/x11-apps/xev/xev-0.99.0.ebuild b/x11-apps/xev/xev-0.99.0.ebuild
index 2fd3ecdddbb6..83ae10c6e21b 100644
--- a/x11-apps/xev/xev-0.99.0.ebuild
+++ b/x11-apps/xev/xev-0.99.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-apps/xev/xev-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xev application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xev/xev-0.99.1.ebuild b/x11-apps/xev/xev-0.99.1.ebuild
index c0bfef3b3bae..bb60a3862922 100644
--- a/x11-apps/xev/xev-0.99.1.ebuild
+++ b/x11-apps/xev/xev-0.99.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-apps/xev/xev-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xev/xev-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xeyes/ChangeLog b/x11-apps/xeyes/ChangeLog
index 6293fa1ab2cf..3bc3a639e562 100644
--- a/x11-apps/xeyes/ChangeLog
+++ b/x11-apps/xeyes/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xeyes
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xeyes-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xeyes-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xeyes-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xeyes-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xeyes-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
index cd9784ef4924..48c33179664f 100644
--- a/x11-apps/xeyes/Manifest
+++ b/x11-apps/xeyes/Manifest
@@ -1,2 +1,16 @@
-MD5 1a7993909d4bd79d3b84960e1a12b052 xeyes-0.99.0.ebuild 355
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 73780fdf8b37064a70615b4fc94b6077 ChangeLog 757
 MD5 14717fe8a3d47edbbe362d416867aa8f files/digest-xeyes-0.99.0 64
+MD5 4100df60283091f89309ed6d4e92ba7b files/digest-xeyes-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 7ce82993183b90486359432593e10c65 xeyes-0.99.0.ebuild 475
+MD5 2c4820080fdaad008ea49be80419e515 xeyes-0.99.1.ebuild 481
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIWm2G5bA0cA/ScRAngpAJ9+rZ7MP5WdMBG/swR1u4+Q82Z9kQCfeTdT
+wIYEDFDUDT6Hd/ffm/0ODq4=
+=osdt
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xeyes/xeyes-0.99.0.ebuild b/x11-apps/xeyes/xeyes-0.99.0.ebuild
index 195c5f78cb94..0bee32a6807c 100644
--- a/x11-apps/xeyes/xeyes-0.99.0.ebuild
+++ b/x11-apps/xeyes/xeyes-0.99.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-apps/xeyes/xeyes-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/xeyes-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext
diff --git a/x11-apps/xeyes/xeyes-0.99.1.ebuild b/x11-apps/xeyes/xeyes-0.99.1.ebuild
index 87aec09e31b5..a6ac9a4fbc50 100644
--- a/x11-apps/xeyes/xeyes-0.99.1.ebuild
+++ b/x11-apps/xeyes/xeyes-0.99.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-apps/xeyes/xeyes-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xeyes/xeyes-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xeyes application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext
diff --git a/x11-apps/xf86dga/ChangeLog b/x11-apps/xf86dga/ChangeLog
index 438e35f91c32..73df3baf9db1 100644
--- a/x11-apps/xf86dga/ChangeLog
+++ b/x11-apps/xf86dga/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-apps/xf86dga
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+*xf86dga-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xf86dga-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xf86dga-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xf86dga-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xf86dga-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xf86dga-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
index 91cdb11da285..2e8c277d28f6 100644
--- a/x11-apps/xf86dga/Manifest
+++ b/x11-apps/xf86dga/Manifest
@@ -1,2 +1,8 @@
-MD5 53ead8aeddbea1670041f720fc5c62db xf86dga-0.99.0.ebuild 328
+MD5 c4e7fedc9e57170794ddd12d4d967d82 ChangeLog 829
 MD5 b10c79c8019c059bd44c6372d08e5b0f files/digest-xf86dga-0.99.0 66
+MD5 a6433c5f8782794c63f6156b58692293 files/digest-xf86dga-0.99.1 66
+MD5 6aee75d52fa55c45c75748617a9ae39b files/digest-xf86dga-0.99.2 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 851d3eec668bc96db808a52084f393ec xf86dga-0.99.0.ebuild 452
+MD5 898a87a8b1d16c0ab7583652f0d25f97 xf86dga-0.99.1.ebuild 455
+MD5 b3c00b2a7b3cc6321432ac94eb9c77ee xf86dga-0.99.2.ebuild 459
diff --git a/x11-apps/xf86dga/xf86dga-0.99.0.ebuild b/x11-apps/xf86dga/xf86dga-0.99.0.ebuild
index 2978e75d9e47..1e8c9d9401b9 100644
--- a/x11-apps/xf86dga/xf86dga-0.99.0.ebuild
+++ b/x11-apps/xf86dga/xf86dga-0.99.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-apps/xf86dga/xf86dga-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xf86dga application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXxf86dga"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xf86dga/xf86dga-0.99.1.ebuild b/x11-apps/xf86dga/xf86dga-0.99.1.ebuild
index ab62710982cc..75192cbe33f2 100644
--- a/x11-apps/xf86dga/xf86dga-0.99.1.ebuild
+++ b/x11-apps/xf86dga/xf86dga-0.99.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-apps/xf86dga/xf86dga-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xf86dga/xf86dga-0.99.2.ebuild b/x11-apps/xf86dga/xf86dga-0.99.2.ebuild
index 98593b143912..4ab31a34c35a 100644
--- a/x11-apps/xf86dga/xf86dga-0.99.2.ebuild
+++ b/x11-apps/xf86dga/xf86dga-0.99.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-apps/xf86dga/xf86dga-0.99.2.ebuild,v 1.1 2005/11/11 19:54:15 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xf86dga/xf86dga-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xfd/ChangeLog b/x11-apps/xfd/ChangeLog
index d446e91c59dd..6094a765d59d 100644
--- a/x11-apps/xfd/ChangeLog
+++ b/x11-apps/xfd/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xfd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*xfd-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xfd-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  28 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; xfd-0.99.0.ebuild:
+  Add note about xprint being optional as of today's CVS.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xfd-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xfd-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
index eb62dad5ae1f..3ef33f51f2ca 100644
--- a/x11-apps/xfd/Manifest
+++ b/x11-apps/xfd/Manifest
@@ -1,2 +1,6 @@
-MD5 4ed48ce65d9531a4ebb763298e17e689 xfd-0.99.0.ebuild 562
+MD5 f498afe5ebf2422782749f0641f6bd35 ChangeLog 792
 MD5 0a7afb456adad031438816c42636154f files/digest-xfd-0.99.0 62
+MD5 8fd11f866a17d8b542be9bf7c516927d files/digest-xfd-0.99.1 62
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 f613e6ef7dda91a717d68684d814f56a xfd-0.99.0.ebuild 676
+MD5 66b6c37dda47f91f005173a22ae49fe7 xfd-0.99.1.ebuild 632
diff --git a/x11-apps/xfd/xfd-0.99.0.ebuild b/x11-apps/xfd/xfd-0.99.0.ebuild
index 3c11adfbfd4d..d6146520bc76 100644
--- a/x11-apps/xfd/xfd-0.99.0.ebuild
+++ b/x11-apps/xfd/xfd-0.99.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-apps/xfd/xfd-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/xfd-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,8 +8,8 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xfd application"
-KEYWORDS="~x86"
-# xprint support isn't optional, despite what configure says.
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+# As of 20050927, we should be able to make xprint optional
 #IUSE="xprint"
 RDEPEND="=media-libs/freetype-2*
 	media-libs/fontconfig
diff --git a/x11-apps/xfd/xfd-0.99.1.ebuild b/x11-apps/xfd/xfd-0.99.1.ebuild
index f4c1100f4fa4..e63c0a87c24a 100644
--- a/x11-apps/xfd/xfd-0.99.1.ebuild
+++ b/x11-apps/xfd/xfd-0.99.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-apps/xfd/xfd-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfd/xfd-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xfindproxy/ChangeLog b/x11-apps/xfindproxy/ChangeLog
index d9d11266ad65..6ba9b9483de7 100644
--- a/x11-apps/xfindproxy/ChangeLog
+++ b/x11-apps/xfindproxy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-apps/xfindproxy
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/ChangeLog,v 1.1 2005/10/20 01:08:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*xfindproxy-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xfindproxy-0.99.2.ebuild:
+  Bump for 7.0RC2.
 
 *xfindproxy-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xfindproxy/Manifest b/x11-apps/xfindproxy/Manifest
index 16e331d1dd94..2ed3dbd8eec4 100644
--- a/x11-apps/xfindproxy/Manifest
+++ b/x11-apps/xfindproxy/Manifest
@@ -1,5 +1,6 @@
-MD5 a50f0c97ec43cb55f021ac0d2f4a9ff0 ChangeLog 541
+MD5 7de77b5a7657ae17d484b9509d653e0c ChangeLog 519
 MD5 6c014ac962b996f9eaff72e6f091e1ec files/digest-xfindproxy-0.99.1 69
+MD5 59b6a8c3cd11624183990cfce892b3d3 files/digest-xfindproxy-0.99.2 69
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 5c974c0164d5ad0ae667f0381f16cf25 xfindproxy-0.99.0.ebuild 421
-MD5 5c7b79d2b7e8c655d77185d1e55e95fd xfindproxy-0.99.1.ebuild 436
+MD5 799fccd6c2d79b1fac6b2bc8374dd371 xfindproxy-0.99.1.ebuild 451
+MD5 2dcd478dd40b628248e37037c77764d7 xfindproxy-0.99.2.ebuild 455
diff --git a/x11-apps/xfindproxy/xfindproxy-0.99.1.ebuild b/x11-apps/xfindproxy/xfindproxy-0.99.1.ebuild
index f36dc034446e..17cc23f51ec5 100644
--- a/x11-apps/xfindproxy/xfindproxy-0.99.1.ebuild
+++ b/x11-apps/xfindproxy/xfindproxy-0.99.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-apps/xfindproxy/xfindproxy-0.99.1.ebuild,v 1.1 2005/10/20 01:08:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/xfindproxy-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xfindproxy/xfindproxy-0.99.2.ebuild b/x11-apps/xfindproxy/xfindproxy-0.99.2.ebuild
index 112297d7247c..058ac4f1083f 100644
--- a/x11-apps/xfindproxy/xfindproxy-0.99.2.ebuild
+++ b/x11-apps/xfindproxy/xfindproxy-0.99.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-apps/xfindproxy/xfindproxy-0.99.2.ebuild,v 1.1 2005/11/11 19:54:43 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfindproxy/xfindproxy-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xfontsel/ChangeLog b/x11-apps/xfontsel/ChangeLog
index fdf15dc170c5..168a0c48f33a 100644
--- a/x11-apps/xfontsel/ChangeLog
+++ b/x11-apps/xfontsel/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xfontsel
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+  06 Nov 2005; <dang@gentoo.org> xfontsel-0.99.1.ebuild:
+  Marked ~amd64
+
+*xfontsel-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xfontsel-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xfontsel-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xfontsel-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
index f3b45d9f6b80..e021534c95bb 100644
--- a/x11-apps/xfontsel/Manifest
+++ b/x11-apps/xfontsel/Manifest
@@ -1,2 +1,6 @@
-MD5 0bbc75b3184cfd046ecbf9917421df36 xfontsel-0.99.0.ebuild 495
+MD5 be5e70ed646397f2ccbcd5f3ca366682 ChangeLog 767
 MD5 ac7b52bfc7738dcb94ebd6f10316e7c8 files/digest-xfontsel-0.99.0 67
+MD5 5aed554bf374fd037ed43cb049c1e821 files/digest-xfontsel-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 56da789b637e703b3c56880c2cf58b8a xfontsel-0.99.0.ebuild 621
+MD5 c408665475e0e687afda4a76ab6d6f28 xfontsel-0.99.1.ebuild 626
diff --git a/x11-apps/xfontsel/xfontsel-0.99.0.ebuild b/x11-apps/xfontsel/xfontsel-0.99.0.ebuild
index 70ea93311c9e..a0478244ee81 100644
--- a/x11-apps/xfontsel/xfontsel-0.99.0.ebuild
+++ b/x11-apps/xfontsel/xfontsel-0.99.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-apps/xfontsel/xfontsel-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/xfontsel-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xfontsel application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfontsel/xfontsel-0.99.1.ebuild b/x11-apps/xfontsel/xfontsel-0.99.1.ebuild
index 6775961d054d..91dc0f114204 100644
--- a/x11-apps/xfontsel/xfontsel-0.99.1.ebuild
+++ b/x11-apps/xfontsel/xfontsel-0.99.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-apps/xfontsel/xfontsel-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfontsel/xfontsel-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xfontsel application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog
index d0d79c371a1d..703e6b845c33 100644
--- a/x11-apps/xfs/ChangeLog
+++ b/x11-apps/xfs/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for x11-apps/xfs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*xfs-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xfs-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+  31 Oct 2005; <dang@gentoo.org> xfs-0.99.1.ebuild:
+  Marked ~amd64
+
+*xfs-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xfs-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; xfs-0.99.0-r1.ebuild:
+  (#103421) Don't feed enewuser a false login shell; it figures out a correct
+  one.
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -xfs-0.99.0.ebuild:
+  Remove old versions.
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/xfs.start:
+  Get rid of references to /usr/X11R6.
+
+*xfs-0.99.0-r1 (16 Aug 2005)
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/xfs.conf.d,
+  +files/xfs.config, +files/xfs.start, +xfs-0.99.0-r1.ebuild:
+  Add all the files that the monolith installed, including an init script. Add
+  a hack for changing configdir that needs to be transformed to autoconf.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xfs-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xfs-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xfs/Manifest b/x11-apps/xfs/Manifest
index 3ae2092868b3..157f56db321b 100644
--- a/x11-apps/xfs/Manifest
+++ b/x11-apps/xfs/Manifest
@@ -1,2 +1,11 @@
-MD5 7054c993bfc8a422ed01079867f2e4bb xfs-0.99.0.ebuild 394
-MD5 2b625fca7f05e81ffba38dafd2d58454 files/digest-xfs-0.99.0 63
+MD5 52be09b48387bfe43162881073075c90 ChangeLog 1551
+MD5 2b625fca7f05e81ffba38dafd2d58454 files/digest-xfs-0.99.0-r1 63
+MD5 1e8bba56aaafbf491b50b56dcd0f2217 files/digest-xfs-0.99.1 63
+MD5 46fc55834bedd8d84d3c367d48448d7a files/digest-xfs-0.99.2 63
+MD5 dc1de0a27cd95fd08dd071c4c4d919a6 files/xfs.conf.d 777
+MD5 1534836c0fd6c5fecaa75a8648f3b8c2 files/xfs.config 1117
+MD5 461fb4cfc46e7c83a98af4e4557b0a95 files/xfs.start 7638
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 49837fca5a9ce923ff722da8f07aa616 xfs-0.99.0-r1.ebuild 939
+MD5 fa2c8f181824d108d1b69abb8bf4b739 xfs-0.99.1.ebuild 961
+MD5 13d40a7ffda3e9bd07b2cc890b441142 xfs-0.99.2.ebuild 970
diff --git a/x11-apps/xfs/files/xfs.conf.d b/x11-apps/xfs/files/xfs.conf.d
index aa4de5a87412..2c5816b81da5 100644
--- a/x11-apps/xfs/files/xfs.conf.d
+++ b/x11-apps/xfs/files/xfs.conf.d
@@ -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-apps/xfs/files/xfs.conf.d,v 1.1 2005/08/16 03:08:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.conf.d,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Config file for /etc/init.d/xfs
 
diff --git a/x11-apps/xfs/files/xfs.start b/x11-apps/xfs/files/xfs.start
index 52a9270dd92e..5b1bdaf9d240 100755
--- a/x11-apps/xfs/files/xfs.start
+++ b/x11-apps/xfs/files/xfs.start
@@ -2,7 +2,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.1 2005/08/16 03:08:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 #NB: Config is in /etc/conf.d/xfs
 
@@ -184,9 +184,9 @@ setup_font_dirs() {
 	umask 022
 
 	local NEEDED_BIN
-	local NEEDED_BINS="/usr/X11R6/bin/mkfontdir
-		/usr/X11R6/bin/mkfontscale
-		/usr/X11R6/bin/ttmkfdir"
+	local NEEDED_BINS="/usr/bin/mkfontdir
+		/usr/bin/mkfontscale
+		/usr/bin/ttmkfdir"
 	for NEEDED_BIN in ${NEEDED_BINS}
 	do
 		if [ ! -x ${NEEDED_BIN} ]
@@ -204,7 +204,7 @@ setup_font_dirs() {
 	fi
 
 	# Generate the encodings.dir ...
-	/usr/X11R6/bin/mkfontdir -n \
+	/usr/bin/mkfontdir -n \
 		-e /usr/share/fonts/encodings \
 		-e /usr/share/fonts/encodings/large \
 		-- /usr/share/fonts/encodings
@@ -241,14 +241,14 @@ setup_font_dirs() {
 			if [ "${x/encodings}" = "${x}" -a \
 			     -n "$(find ${x} -iname '*.tt[cf]' -print)" ]
 			then
-				/usr/X11R6/bin/ttmkfdir -x 2 \
+				/usr/bin/ttmkfdir -x 2 \
 					-e /usr/share/fonts/encodings/encodings.dir \
 					-o ${x}/fonts.scale -d ${x} > /dev/null
 				# ttmkfdir fails on some stuff, so try mkfontscale if it does
 				local ttmkfdir_return=$?
 				if [ ${ttmkfdir_return} -ne 0 ]
 				then
-					/usr/X11R6/bin/mkfontscale \
+					/usr/bin/mkfontscale \
 						-a /usr/share/fonts/encodings/encodings.dir \
 						-- ${x}
 				fi
@@ -257,7 +257,7 @@ setup_font_dirs() {
 			elif [ "${x/encodings}" = "${x}" -a \
 				-n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ]
 			then
-				/usr/X11R6/bin/mkfontscale \
+				/usr/bin/mkfontscale \
 					-a /usr/share/fonts/encodings/encodings.dir \
 					-- ${x}
 			fi
@@ -265,17 +265,17 @@ setup_font_dirs() {
 		  	# Now generate fonts.dir files ...
 			if [ "${x/encodings}" = "${x}" ]
 			then
-				/usr/X11R6/bin/mkfontdir \
+				/usr/bin/mkfontdir \
 					-e /usr/share/fonts/encodings \
 					-e /usr/share/fonts/encodings/large \
 					-- ${x} > /dev/null
 			fi
 
-			if [ "${x/encodings}" = "${x}" -a -x /usr/X11R6/bin/xftcache ] && \
+			if [ "${x/encodings}" = "${x}" -a -x /usr/bin/xftcache ] && \
 			   [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ]
 			then
 				# xftcache is broken, but run it anyhow ...
-				/usr/X11R6/bin/xftcache ${x} &> /dev/null
+				/usr/bin/xftcache ${x} &> /dev/null
 			fi
 			eend 0
 
@@ -312,11 +312,11 @@ start() {
 		mkdir /tmp/.font-unix
 		chmod 1777 /tmp/.font-unix
 
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+		start-stop-daemon --start --quiet --exec /usr/bin/xfs \
 			-- -daemon -config /etc/X11/fs/config \
 				-droppriv -user xfs -port ${XFS_PORT} 1>&2
 	else
-		start-stop-daemon --start --quiet --exec /usr/X11R6/bin/xfs \
+		start-stop-daemon --start --quiet --exec /usr/bin/xfs \
 			-- -daemon -config /etc/X11/fs/config \
 				-port ${XFS_PORT} 1>&2
 	fi
@@ -325,7 +325,7 @@ start() {
 
 stop() {
 	ebegin "Stopping X Font Server"
-	start-stop-daemon --stop --quiet --exec /usr/X11R6/bin/xfs 1>&2
+	start-stop-daemon --stop --quiet --exec /usr/bin/xfs 1>&2
 	rm -rf /tmp/.font-unix
 	eend $?
 }
diff --git a/x11-apps/xfs/xfs-0.99.0-r1.ebuild b/x11-apps/xfs/xfs-0.99.0-r1.ebuild
index 72e4da5cc754..6f542e5fbb73 100644
--- a/x11-apps/xfs/xfs-0.99.0-r1.ebuild
+++ b/x11-apps/xfs/xfs-0.99.0-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-apps/xfs/xfs-0.99.0-r1.ebuild,v 1.1 2005/08/16 03:08:47 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-0.99.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -8,7 +8,7 @@ SNAPSHOT="yes"
 inherit x-modular
 
 DESCRIPTION="X.Org xfs application"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="ipv6"
 RDEPEND="x11-libs/libFS
 	x11-libs/libXfont"
@@ -19,7 +19,7 @@ CONFIGURE_OPTIONS="$(use_enable ipv6)"
 
 pkg_setup() {
 	enewgroup xfs 33
-	enewuser xfs 33 /bin/false /etc/X11/fs xfs
+	enewuser xfs 33 -1 /etc/X11/fs xfs
 }
 
 src_unpack() {
diff --git a/x11-apps/xfs/xfs-0.99.1.ebuild b/x11-apps/xfs/xfs-0.99.1.ebuild
index a3b2421bc540..8d7f8cade70e 100644
--- a/x11-apps/xfs/xfs-0.99.1.ebuild
+++ b/x11-apps/xfs/xfs-0.99.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-apps/xfs/xfs-0.99.1.ebuild,v 1.1 2005/10/20 00:45:22 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xfs application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="ipv6"
 RDEPEND="x11-libs/libFS
 	x11-libs/libXfont"
diff --git a/x11-apps/xfs/xfs-0.99.2.ebuild b/x11-apps/xfs/xfs-0.99.2.ebuild
index f7d66cc24474..cae5b1e67f57 100644
--- a/x11-apps/xfs/xfs-0.99.2.ebuild
+++ b/x11-apps/xfs/xfs-0.99.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-apps/xfs/xfs-0.99.2.ebuild,v 1.1 2005/11/11 19:55:14 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/xfs-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xfsinfo/ChangeLog b/x11-apps/xfsinfo/ChangeLog
index 02fd8697f48d..ab5caca87b48 100644
--- a/x11-apps/xfsinfo/ChangeLog
+++ b/x11-apps/xfsinfo/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xfsinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*xfsinfo-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xfsinfo-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xfsinfo-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xfsinfo-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xfsinfo/Manifest b/x11-apps/xfsinfo/Manifest
index 9952ad3b5924..9d07b458151f 100644
--- a/x11-apps/xfsinfo/Manifest
+++ b/x11-apps/xfsinfo/Manifest
@@ -1,2 +1,6 @@
-MD5 6fe85372f22fc13396630eac646aefee xfsinfo-0.99.0.ebuild 322
+MD5 ce0b6e90771c48a09f89fdcc177bab46 ChangeLog 691
 MD5 9775e297225e7fd343bdf7d7b85ef7f7 files/digest-xfsinfo-0.99.0 66
+MD5 515eb5d84af92ff90d3018e83586be01 files/digest-xfsinfo-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 40a6fc5c4c2304986a4dcd64d7ac1208 xfsinfo-0.99.0.ebuild 435
+MD5 8078090b3320129c3b7c02244586df89 xfsinfo-0.99.1.ebuild 438
diff --git a/x11-apps/xfsinfo/xfsinfo-0.99.0.ebuild b/x11-apps/xfsinfo/xfsinfo-0.99.0.ebuild
index e4a6ecc1aa23..9db8b46f2b41 100644
--- a/x11-apps/xfsinfo/xfsinfo-0.99.0.ebuild
+++ b/x11-apps/xfsinfo/xfsinfo-0.99.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-apps/xfsinfo/xfsinfo-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/xfsinfo-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xfsinfo application"
-KEYWORDS="~x86"
+KEYWORDS="~mips ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libFS"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfsinfo/xfsinfo-0.99.1.ebuild b/x11-apps/xfsinfo/xfsinfo-0.99.1.ebuild
index 40b52a696a87..8af85f52588b 100644
--- a/x11-apps/xfsinfo/xfsinfo-0.99.1.ebuild
+++ b/x11-apps/xfsinfo/xfsinfo-0.99.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-apps/xfsinfo/xfsinfo-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfsinfo/xfsinfo-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xfwp/ChangeLog b/x11-apps/xfwp/ChangeLog
index c10849c32a77..28f1681718c0 100644
--- a/x11-apps/xfwp/ChangeLog
+++ b/x11-apps/xfwp/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-apps/xfwp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*xfwp-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xfwp-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xfwp-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xfwp-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xfwp/Manifest b/x11-apps/xfwp/Manifest
index 9b1e796296c3..218a5dac0d0a 100644
--- a/x11-apps/xfwp/Manifest
+++ b/x11-apps/xfwp/Manifest
@@ -1,2 +1,6 @@
-MD5 838a9d357b3b8a56efe6cc2975cb35e7 xfwp-0.99.0.ebuild 356
+MD5 e649fd03d40f33031567c00f1ae9f88e ChangeLog 666
 MD5 bc0965047fafeae371f08acfdac0f07c files/digest-xfwp-0.99.0 63
+MD5 a711caec0d36614a0231681274d0b70d files/digest-xfwp-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 1e9484aeef3aa5a793dbc335abc90eab xfwp-0.99.0.ebuild 474
+MD5 0d15487c5e42579f5e226b36805f7724 xfwp-0.99.1.ebuild 477
diff --git a/x11-apps/xfwp/xfwp-0.99.0.ebuild b/x11-apps/xfwp/xfwp-0.99.0.ebuild
index 3195e95ec3bc..fe7ee9ea27d8 100644
--- a/x11-apps/xfwp/xfwp-0.99.0.ebuild
+++ b/x11-apps/xfwp/xfwp-0.99.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-apps/xfwp/xfwp-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/xfwp-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xfwp application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libICE"
 DEPEND="${RDEPEND}
diff --git a/x11-apps/xfwp/xfwp-0.99.1.ebuild b/x11-apps/xfwp/xfwp-0.99.1.ebuild
index a01582e84254..3e54a5674a39 100644
--- a/x11-apps/xfwp/xfwp-0.99.1.ebuild
+++ b/x11-apps/xfwp/xfwp-0.99.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-apps/xfwp/xfwp-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfwp/xfwp-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xgamma/ChangeLog b/x11-apps/xgamma/ChangeLog
index 290fa5a71545..52a6ab0e5616 100644
--- a/x11-apps/xgamma/ChangeLog
+++ b/x11-apps/xgamma/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xgamma
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*xgamma-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xgamma-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xgamma-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xgamma-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
index 63471d26cc5b..b5f326b834cb 100644
--- a/x11-apps/xgamma/Manifest
+++ b/x11-apps/xgamma/Manifest
@@ -1,2 +1,6 @@
-MD5 66c0c126fc9e323e875ef5b908aa3204 xgamma-0.99.0.ebuild 309
+MD5 7b1de161a77319fa3c04f129041eeec2 ChangeLog 684
 MD5 01d9bc25b70676bdd469ce1a78c57212 files/digest-xgamma-0.99.0 65
+MD5 d449aa3dc187b345be38e8f346b4c25f files/digest-xgamma-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a32c35f088ef255ba5374cc10864874b xgamma-0.99.0.ebuild 431
+MD5 22eff39eaf914ed075864330965898e2 xgamma-0.99.1.ebuild 434
diff --git a/x11-apps/xgamma/xgamma-0.99.0.ebuild b/x11-apps/xgamma/xgamma-0.99.0.ebuild
index 68bd2abc8e4b..46671175aa94 100644
--- a/x11-apps/xgamma/xgamma-0.99.0.ebuild
+++ b/x11-apps/xgamma/xgamma-0.99.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-apps/xgamma/xgamma-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xgamma application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgamma/xgamma-0.99.1.ebuild b/x11-apps/xgamma/xgamma-0.99.1.ebuild
index cc0ef76d8a60..33cab779a2f5 100644
--- a/x11-apps/xgamma/xgamma-0.99.1.ebuild
+++ b/x11-apps/xgamma/xgamma-0.99.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-apps/xgamma/xgamma-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgamma/xgamma-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xgc/ChangeLog b/x11-apps/xgc/ChangeLog
index 6b5063ca0352..1ed0cfa841e5 100644
--- a/x11-apps/xgc/ChangeLog
+++ b/x11-apps/xgc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-apps/xgc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*xgc-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xgc-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xgc-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xgc-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
index 10f23911c35c..df06618d5984 100644
--- a/x11-apps/xgc/Manifest
+++ b/x11-apps/xgc/Manifest
@@ -1,2 +1,6 @@
-MD5 03cf631c854a37e0800be04fa337c982 xgc-0.99.0.ebuild 490
+MD5 269fde77d8ff087a55a64385d724bb5d ChangeLog 659
 MD5 175a526d6f633801acb877c2bcbbae87 files/digest-xgc-0.99.0 63
+MD5 c9b1a363f77f2963ea0511745e14e87c files/digest-xgc-0.99.1 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 195b3ca2add69ec0d684008e739f277b xgc-0.99.0.ebuild 606
+MD5 590e58879c9f1525295742dd76fcef6f xgc-0.99.1.ebuild 609
diff --git a/x11-apps/xgc/xgc-0.99.0.ebuild b/x11-apps/xgc/xgc-0.99.0.ebuild
index f50e81ac742f..bf2de1874515 100644
--- a/x11-apps/xgc/xgc-0.99.0.ebuild
+++ b/x11-apps/xgc/xgc-0.99.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-apps/xgc/xgc-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/xgc-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xgc application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/xgc-0.99.1.ebuild b/x11-apps/xgc/xgc-0.99.1.ebuild
index b5d8c4ec68f4..d73efd759a32 100644
--- a/x11-apps/xgc/xgc-0.99.1.ebuild
+++ b/x11-apps/xgc/xgc-0.99.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-apps/xgc/xgc-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xgc/xgc-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xhost/ChangeLog b/x11-apps/xhost/ChangeLog
index 813df7920099..0ddaff46884e 100644
--- a/x11-apps/xhost/ChangeLog
+++ b/x11-apps/xhost/ChangeLog
@@ -1,6 +1,45 @@
 # ChangeLog for x11-apps/xhost
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*xhost-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xhost-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xhost-0.99.1-r1 (27 Oct 2005)
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xhost-0.99.1-r1.ebuild:
+  Rev-bump for new USE flag.
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xhost-0.99.1.ebuild:
+  Add ipv6 USE flag.
+
+*xhost-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xhost-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> xhost-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xhost-0.99.0.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xhost-0.99.0.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xhost-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xhost-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xhost-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
index 4ae9b3487765..f524493ba09c 100644
--- a/x11-apps/xhost/Manifest
+++ b/x11-apps/xhost/Manifest
@@ -1,2 +1,10 @@
-MD5 d98b5679b9d3edb8ca82114f840df04c xhost-0.99.0.ebuild 321
+MD5 3c1c7a21a73377d584f23945648dec57 ChangeLog 1409
 MD5 d47c0fb93bec00d81788e4d992be415d files/digest-xhost-0.99.0 64
+MD5 f93d22c7bad8661796b36e6259307081 files/digest-xhost-0.99.1 64
+MD5 f93d22c7bad8661796b36e6259307081 files/digest-xhost-0.99.1-r1 64
+MD5 3eb1d007d6a3dd193c72d5fb3b6d3698 files/digest-xhost-0.99.2 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 b0a3a8e7ecf03764ba1275ebd31f8e3b xhost-0.99.0.ebuild 457
+MD5 f0ed9717c1d606ba2281d920b5450077 xhost-0.99.1-r1.ebuild 519
+MD5 85ff8f493d163953e2334bc266f5ec06 xhost-0.99.1.ebuild 516
+MD5 4c775ebffcd2ba572fbfdafe0feea4c0 xhost-0.99.2.ebuild 516
diff --git a/x11-apps/xhost/xhost-0.99.0.ebuild b/x11-apps/xhost/xhost-0.99.0.ebuild
index d7f085b936f5..1babfad256b3 100644
--- a/x11-apps/xhost/xhost-0.99.0.ebuild
+++ b/x11-apps/xhost/xhost-0.99.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-apps/xhost/xhost-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xhost application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xhost/xhost-0.99.1-r1.ebuild b/x11-apps/xhost/xhost-0.99.1-r1.ebuild
index 8705c76ac926..acdb88e281dc 100644
--- a/x11-apps/xhost/xhost-0.99.1-r1.ebuild
+++ b/x11-apps/xhost/xhost-0.99.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-apps/xhost/xhost-0.99.1-r1.ebuild,v 1.1 2005/10/27 15:23:07 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-0.99.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xhost/xhost-0.99.1.ebuild b/x11-apps/xhost/xhost-0.99.1.ebuild
index b96482180d04..75cec7496949 100644
--- a/x11-apps/xhost/xhost-0.99.1.ebuild
+++ b/x11-apps/xhost/xhost-0.99.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-apps/xhost/xhost-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -12,3 +12,6 @@ KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xhost/xhost-0.99.2.ebuild b/x11-apps/xhost/xhost-0.99.2.ebuild
index cd2e4beecf25..54551d259ead 100644
--- a/x11-apps/xhost/xhost-0.99.2.ebuild
+++ b/x11-apps/xhost/xhost-0.99.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-apps/xhost/xhost-0.99.2.ebuild,v 1.1 2005/11/11 19:55:41 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 0c8da75f4dc8..154b3091348f 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,118 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*xinit-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/gentoo-startx-customization-0.99.3.patch, +xinit-0.99.3.ebuild:
+  Bump for 7.0RC2.  Also add regenerated startx customization patch, which was
+  probably around longer than I've been using Linux.
+
+  02 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> xinit-0.99.2-r1.ebuild:
+  If you use dopamd, inherit pam eclass.
+
+  30 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xinit-0.99.2-r1.ebuild:
+  Add twm, xclock and xterm to RDEPEND since they're required for the fallback
+  state.
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xinit-0.99.0-r2.ebuild, -xinit-0.99.1_pre20050905-r3.ebuild,
+  -xinit-0.99.2.ebuild:
+  Drop old versions.
+
+*xinit-0.99.2-r1 (20 Oct 2005)
+
+  20 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.2-r1.ebuild:
+  Uncomment SNAPSHOT so that Makefile.am patch takes effect.
+
+*xinit-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xinit-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xinit-0.99.1_pre20050905-r3.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+*xinit-0.99.1_pre20050905-r3 (08 Sep 2005)
+
+  08 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> files/xinitrc,
+  -xinit-0.99.1_pre20050905-r2.ebuild, +xinit-0.99.1_pre20050905-r3.ebuild:
+  Use /etc/X11/X{modmap,resources} instead of /usr/lib/X11/xinit/...  Fixes bug
+  #89624.  Reference: bug #25273 comment 8.
+
+*xinit-0.99.1_pre20050905-r2 (07 Sep 2005)
+
+  07 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/xserver.pamd, -xinit-0.99.1_pre20050905-r1.ebuild,
+  +xinit-0.99.1_pre20050905-r2.ebuild:
+  Added /etc/pam.d/xserver from xorg-x11.
+
+  07 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  xinit-0.99.1_pre20050905-r1.ebuild:
+  Marked ~ppc.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -xinit-0.99.1_pre20050905.ebuild:
+  Remove old revision.
+
+*xinit-0.99.1_pre20050905-r1 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org> +files/xdm.start,
+  +xinit-0.99.1_pre20050905-r1.ebuild:
+  Fixed snapshot SRC_URI and added xdm init script.
+
+*xinit-0.99.1_pre20050905 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.1_pre20050905.ebuild, -xinit-0.99.1.ebuild:
+  Fixed version in anticipation of upstream release.
+
+*xinit-0.99.1 (05 Sep 2005)
+
+  05 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xinit-0.99.1.ebuild:
+  New snapshot.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xinit-0.99.0-r2.ebuild:
+  Added ~sh
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -xinit-0.99.0.ebuild,
+  -xinit-0.99.0-r1.ebuild:
+  Remove old versions.
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/xinitrc:
+  System files shouldn't have a . prefix. Change to Xresources and Xmodmap.
+
+  16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; files/chooser.sh,
+  files/xinitrc:
+  Get rid of references to /usr/X11R6.
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xinit-0.99.0-r2.ebuild:
+  Marked ~amd64.
+
+*xinit-0.99.0-r2 (14 Aug 2005)
+
+  14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/Xsession,
+  +files/chooser.sh, +files/gentoo-startx-customization.patch,
+  +files/startDM.sh, +files/xinitrc, +xinit-0.99.0-r2.ebuild:
+  Add all the old Gentoo xinit stuff, so it works properly with /etc/rc.conf
+  and so on.
+
+*xinit-0.99.0-r1 (11 Aug 2005)
+
+  11 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/nolisten-tcp-and-black-background.patch, +xinit-0.99.0-r1.ebuild:
+  By popular demand, add nolisten-tcp-and-black-background.patch.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xinit-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xinit-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index 8905374c7afd..e5801e71b0a8 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,2 +1,15 @@
-MD5 b44bf6c8f375816cfcf36117ec4d45c8 xinit-0.99.0.ebuild 304
-MD5 a2cf0fce1909bbe52e7485c8143baf66 files/digest-xinit-0.99.0 64
+MD5 8ec14e4616d8c6139e0aafa216bd4a42 ChangeLog 4183
+MD5 a0ce0f1c8a5771a1194f5895211a3f66 files/Xsession 2187
+MD5 2b07bc84cc3afab6b4de90b9e9c597c3 files/chooser.sh 1566
+MD5 25ca8e4cacf6c712886ea0e8a69a05fe files/digest-xinit-0.99.2-r1 64
+MD5 30803bb817492ff1c760da0c48d4b144 files/digest-xinit-0.99.3 64
+MD5 8eeb098734b1dde61e349ed74f7e8b28 files/gentoo-startx-customization-0.99.3.patch 3987
+MD5 c6b1ec1d810ca971703b0cc7291d3e7c files/gentoo-startx-customization.patch 3931
+MD5 8d14d094be7182b9870a0727a5d8e87b files/nolisten-tcp-and-black-background.patch 381
+MD5 965333ca03efda8a7302620a63c429f6 files/startDM.sh 922
+MD5 2d8c9c76bd932f311ad86f490680d349 files/xdm.start 3418
+MD5 49f1bd860cfa5fc4adb6023d8a1bb4f8 files/xinitrc 900
+MD5 708a3daf8950bbfe3aa231efb7533cb0 files/xserver.pamd 125
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 ffc35e70872b2bcf32d0338bfefd2fd3 xinit-0.99.2-r1.ebuild 1144
+MD5 bc5712924900c54f22f63aca90231cc9 xinit-0.99.3.ebuild 1152
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh
index 16054d166440..86374115d2f2 100644
--- a/x11-apps/xinit/files/chooser.sh
+++ b/x11-apps/xinit/files/chooser.sh
@@ -2,7 +2,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.1 2005/08/14 00:12:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # If $XSESSION is "", source first /etc/conf.d/basic, and then /etc/rc.conf
 if [ -z "${XSESSION}" ]
@@ -54,7 +54,7 @@ if [ -n "${XSESSION}" ]; then
 		done
 
 		# If all else fail, run twm
-		GENTOO_EXEC="/usr/X11R6/bin/twm"
+		GENTOO_EXEC="/usr/bin/twm"
 	fi
 fi
 
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index ad2c9ead627a..9a7667217d4a 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -2,7 +2,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author: Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.1 2005/08/14 00:12:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 source /etc/init.d/functions.sh
 
diff --git a/x11-apps/xinit/files/xdm.start b/x11-apps/xinit/files/xdm.start
index fe4b191d2ea0..1e1255247a57 100755
--- a/x11-apps/xinit/files/xdm.start
+++ b/x11-apps/xinit/files/xdm.start
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.1 2005/09/06 19:33:51 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.start,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
diff --git a/x11-apps/xinit/files/xinitrc b/x11-apps/xinit/files/xinitrc
index 53cde32559d2..f2ba1d79626b 100644
--- a/x11-apps/xinit/files/xinitrc
+++ b/x11-apps/xinit/files/xinitrc
@@ -3,9 +3,9 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-xinitdir=/usr/X11R6/lib/X11/xinit
-sysresources=$xinitdir/.Xresources
-sysmodmap=$xinitdir/.Xmodmap
+xinitdir=/etc/X11
+sysresources=$xinitdir/Xresources
+sysmodmap=$xinitdir/Xmodmap
 
 # merge in defaults and keymaps
 
diff --git a/x11-apps/xinit/xinit-0.99.2-r1.ebuild b/x11-apps/xinit/xinit-0.99.2-r1.ebuild
index 6ebd0198543b..23510e5ea158 100644
--- a/x11-apps/xinit/xinit-0.99.2-r1.ebuild
+++ b/x11-apps/xinit/xinit-0.99.2-r1.ebuild
@@ -1,16 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.2-r1.ebuild,v 1.1 2005/10/20 18:26:34 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.2-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
 SNAPSHOT="yes"
 
-inherit x-modular
+inherit x-modular pam
 
 DESCRIPTION="X.Org xinit application"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
-RDEPEND="x11-libs/libX11"
+RDEPEND="x11-libs/libX11
+		x11-wm/twm
+		x11-apps/xclock
+		x11-terms/xterm"
 DEPEND="${RDEPEND}"
 
 PATCHES="${FILESDIR}/nolisten-tcp-and-black-background.patch
diff --git a/x11-apps/xinit/xinit-0.99.3.ebuild b/x11-apps/xinit/xinit-0.99.3.ebuild
index 150679a5b699..39798e6688ca 100644
--- a/x11-apps/xinit/xinit-0.99.3.ebuild
+++ b/x11-apps/xinit/xinit-0.99.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-apps/xinit/xinit-0.99.3.ebuild,v 1.1 2005/11/11 19:38:36 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/xinit-0.99.3.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 # This is enabled due to modified Makefile.am from the patches
diff --git a/x11-apps/xkbcomp/ChangeLog b/x11-apps/xkbcomp/ChangeLog
index 1251a369e8da..dc863eafe1e3 100644
--- a/x11-apps/xkbcomp/ChangeLog
+++ b/x11-apps/xkbcomp/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for x11-apps/xkbcomp
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.1 2005/08/08 05:06:43 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*xkbcomp-0.99.1-r1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkbcomp-0.99.1-r1.ebuild:
+  We're installing to /usr/share, not /usr/lib. Change symlink origins.
+
+*xkbcomp-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkbcomp-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
+  xkbcomp-0.99.0-r1.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  04 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> xkbcomp-0.99.0-r1.ebuild:
+  Added ~sh
+
+  30 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xkbcomp-0.99.0-r1.ebuild:
+  s/lib/$(get_libdir)
+
+  20 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  -xkbcomp-0.99.0.ebuild:
+  Remove old versions.
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xkbcomp-0.99.0.ebuild,
+  xkbcomp-0.99.0-r1.ebuild:
+  Marked ~ppc
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xkbcomp-0.99.0-r1.ebuild:
+  Marked ~amd64.
+
+*xkbcomp-0.99.0-r1 (15 Aug 2005)
+
+  15 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkbcomp-0.99.0-r1.ebuild:
+  Make symlink to /usr/lib/X11/xkb/xkbcomp.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xkbcomp-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xkbcomp-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
index a7ba51324baf..6dc752d808e9 100644
--- a/x11-apps/xkbcomp/Manifest
+++ b/x11-apps/xkbcomp/Manifest
@@ -1,2 +1,8 @@
-MD5 e7fabff57d4704159d892ad753a7a5af xkbcomp-0.99.0.ebuild 327
-MD5 ac7b6aeddc4bf31acc3f0b13d6128ff8 files/digest-xkbcomp-0.99.0 67
+MD5 31601ff83561fbae3a67cd06793c6286 ChangeLog 1649
+MD5 ac7b6aeddc4bf31acc3f0b13d6128ff8 files/digest-xkbcomp-0.99.0-r1 67
+MD5 52b5a8764b2d5ef37246d5b728db97f9 files/digest-xkbcomp-0.99.1 67
+MD5 52b5a8764b2d5ef37246d5b728db97f9 files/digest-xkbcomp-0.99.1-r1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a5752dd6c1a08d90de862df4340f27bf xkbcomp-0.99.0-r1.ebuild 618
+MD5 ccf04552e646453288b7f7b7a9fabac0 xkbcomp-0.99.1-r1.ebuild 605
+MD5 8f76e2c5ea84ca3da9644b266e7dc0b5 xkbcomp-0.99.1.ebuild 618
diff --git a/x11-apps/xkbcomp/xkbcomp-0.99.0-r1.ebuild b/x11-apps/xkbcomp/xkbcomp-0.99.0-r1.ebuild
index aad20f58064e..002c32981b1f 100644
--- a/x11-apps/xkbcomp/xkbcomp-0.99.0-r1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-0.99.0-r1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-0.99.0-r1.ebuild,v 1.1 2005/08/15 02:33:55 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-0.99.0-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
 
-inherit x-modular
+inherit x-modular multilib
 
 DESCRIPTION="X.Org xkbcomp application"
-KEYWORDS="~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sh ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
 DEPEND="${RDEPEND}"
@@ -16,6 +16,6 @@ DEPEND="${RDEPEND}"
 src_install() {
 	x-modular_src_install
 
-	dodir usr/lib/X11/xkb
-	dosym ../../../bin/xkbcomp /usr/lib/X11/xkb/xkbcomp
+	dodir usr/$(get_libdir)/X11/xkb
+	dosym ../../../bin/xkbcomp /usr/$(get_libdir)/X11/xkb/xkbcomp
 }
diff --git a/x11-apps/xkbcomp/xkbcomp-0.99.1-r1.ebuild b/x11-apps/xkbcomp/xkbcomp-0.99.1-r1.ebuild
index cb60c92dc910..aadf93ca67b1 100644
--- a/x11-apps/xkbcomp/xkbcomp-0.99.1-r1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-0.99.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-apps/xkbcomp/xkbcomp-0.99.1-r1.ebuild,v 1.1 2005/10/20 21:54:59 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-0.99.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xkbcomp/xkbcomp-0.99.1.ebuild b/x11-apps/xkbcomp/xkbcomp-0.99.1.ebuild
index e884e7899997..cbf7b947b4d0 100644
--- a/x11-apps/xkbcomp/xkbcomp-0.99.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-0.99.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-apps/xkbcomp/xkbcomp-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xkbevd/ChangeLog b/x11-apps/xkbevd/ChangeLog
index 4e1b87b01133..7ca0b365dadb 100644
--- a/x11-apps/xkbevd/ChangeLog
+++ b/x11-apps/xkbevd/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for x11-apps/xkbevd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*xkbevd-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbevd-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xkbevd-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkbevd-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xkbevd-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xkbevd-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
index 9d4d73046d68..194a494310b1 100644
--- a/x11-apps/xkbevd/Manifest
+++ b/x11-apps/xkbevd/Manifest
@@ -1,2 +1,8 @@
-MD5 6380ef9df8203f2390590da344ea55be xkbevd-0.99.0.ebuild 309
+MD5 32b89d95a31ebf0b707a7d77ca51218d ChangeLog 820
 MD5 133e59551c15f4d6ec5d4607e92b1988 files/digest-xkbevd-0.99.0 65
+MD5 e602e6bac34aed710afb5758244b7025 files/digest-xkbevd-0.99.1 66
+MD5 b7b8d3c9aa0308637c471450cd5e1896 files/digest-xkbevd-0.99.2 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 80ab74ea0e3c40eb765c1debb5a77e3d xkbevd-0.99.0.ebuild 431
+MD5 7bc550427b2aebb8557433e949fb70c0 xkbevd-0.99.1.ebuild 434
+MD5 c8eb06d8adbf786b866585e551140740 xkbevd-0.99.2.ebuild 438
diff --git a/x11-apps/xkbevd/xkbevd-0.99.0.ebuild b/x11-apps/xkbevd/xkbevd-0.99.0.ebuild
index a690d4ea4983..11f6a57e6b47 100644
--- a/x11-apps/xkbevd/xkbevd-0.99.0.ebuild
+++ b/x11-apps/xkbevd/xkbevd-0.99.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-apps/xkbevd/xkbevd-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkbevd application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libxkbfile"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbevd/xkbevd-0.99.1.ebuild b/x11-apps/xkbevd/xkbevd-0.99.1.ebuild
index 71d2cab6e6c4..4d0690e04139 100644
--- a/x11-apps/xkbevd/xkbevd-0.99.1.ebuild
+++ b/x11-apps/xkbevd/xkbevd-0.99.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-apps/xkbevd/xkbevd-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xkbevd/xkbevd-0.99.2.ebuild b/x11-apps/xkbevd/xkbevd-0.99.2.ebuild
index 62dec63085a2..e69230061107 100644
--- a/x11-apps/xkbevd/xkbevd-0.99.2.ebuild
+++ b/x11-apps/xkbevd/xkbevd-0.99.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-apps/xkbevd/xkbevd-0.99.2.ebuild,v 1.1 2005/11/11 19:56:07 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbevd/xkbevd-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xkbprint/ChangeLog b/x11-apps/xkbprint/ChangeLog
index caa0a5d6137b..5eadd2df6363 100644
--- a/x11-apps/xkbprint/ChangeLog
+++ b/x11-apps/xkbprint/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xkbprint
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xkbprint-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xkbprint-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xkbprint-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xkbprint-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xkbprint-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
index b47ace6837a9..95436bd5a6bb 100644
--- a/x11-apps/xkbprint/Manifest
+++ b/x11-apps/xkbprint/Manifest
@@ -1,2 +1,16 @@
-MD5 35c70c9c5c3fffab2c0ecdd5ec11b5c7 xkbprint-0.99.0.ebuild 311
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b1765faf5917ecf822ddc3dcaa810bf1 ChangeLog 785
 MD5 6ddefadcca5b9e1d3d25de51ae2b7f2c files/digest-xkbprint-0.99.0 67
+MD5 1ab7ea9460a86364902f4374c1d055d1 files/digest-xkbprint-0.99.1 68
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 65dc613b90314c6fc00934a67e39d9dd xkbprint-0.99.0.ebuild 437
+MD5 0cfa58cd5d2fb69f713f05874ec007c0 xkbprint-0.99.1.ebuild 443
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIZ22G5bA0cA/ScRAq8zAKCqgNP7qOq3FJLWOIJGqnzE6jU7QwCgnOE/
+YZR2DmPYKRJP6vustypL0xc=
+=4moQ
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xkbprint/xkbprint-0.99.0.ebuild b/x11-apps/xkbprint/xkbprint-0.99.0.ebuild
index 62b0ce5e9ea1..a4c077fed542 100644
--- a/x11-apps/xkbprint/xkbprint-0.99.0.ebuild
+++ b/x11-apps/xkbprint/xkbprint-0.99.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-apps/xkbprint/xkbprint-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/xkbprint-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkbprint application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libxkbfile"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbprint/xkbprint-0.99.1.ebuild b/x11-apps/xkbprint/xkbprint-0.99.1.ebuild
index 7a2d927cc0e4..b38a8e7d309d 100644
--- a/x11-apps/xkbprint/xkbprint-0.99.1.ebuild
+++ b/x11-apps/xkbprint/xkbprint-0.99.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-apps/xkbprint/xkbprint-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbprint/xkbprint-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkbprint application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libxkbfile"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbutils/ChangeLog b/x11-apps/xkbutils/ChangeLog
index 5e0e2f17938b..a4d8eb91be84 100644
--- a/x11-apps/xkbutils/ChangeLog
+++ b/x11-apps/xkbutils/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xkbutils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xkbutils-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xkbutils-0.99.1 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xkbutils-0.99.1.ebuild:
+  Bump for 7.0RC2.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xkbutils-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xkbutils-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
index f050f2d28d61..938913d862a4 100644
--- a/x11-apps/xkbutils/Manifest
+++ b/x11-apps/xkbutils/Manifest
@@ -1,2 +1,16 @@
-MD5 1df8b0c5c65b2b12c4e60fdc957a2e67 xkbutils-0.99.0.ebuild 516
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a1477e216bd3d497b43804e70ef350fe ChangeLog 786
 MD5 d005ea700b22101a43beaafc75fabdbd files/digest-xkbutils-0.99.0 67
+MD5 6fcf907309fc4376e367af78f136c230 files/digest-xkbutils-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 a8c757fc70ad3335234089cff09690ff xkbutils-0.99.0.ebuild 642
+MD5 fa81c8e9b55984f018a09f8ec9ea1790 xkbutils-0.99.1.ebuild 648
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIcx2G5bA0cA/ScRAniGAKCwSylKEuvGZ2kfeTT9rLF0Mzpv1ACfWp62
+y+z8usDn3odjoUmmleB6Hi4=
+=OTfl
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xkbutils/xkbutils-0.99.0.ebuild b/x11-apps/xkbutils/xkbutils-0.99.0.ebuild
index 807357e3ab35..f29698c05318 100644
--- a/x11-apps/xkbutils/xkbutils-0.99.0.ebuild
+++ b/x11-apps/xkbutils/xkbutils-0.99.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-apps/xkbutils/xkbutils-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/xkbutils-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkbutils application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libXaw"
diff --git a/x11-apps/xkbutils/xkbutils-0.99.1.ebuild b/x11-apps/xkbutils/xkbutils-0.99.1.ebuild
index 38ab32dc8712..d48d654765d5 100644
--- a/x11-apps/xkbutils/xkbutils-0.99.1.ebuild
+++ b/x11-apps/xkbutils/xkbutils-0.99.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-apps/xkbutils/xkbutils-0.99.1.ebuild,v 1.1 2005/11/11 19:56:53 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbutils/xkbutils-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkbutils application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libxkbfile
 	x11-libs/libXaw"
diff --git a/x11-apps/xkill/ChangeLog b/x11-apps/xkill/ChangeLog
index aa8cb7378b12..1b84c3a1bbc1 100644
--- a/x11-apps/xkill/ChangeLog
+++ b/x11-apps/xkill/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xkill
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xkill-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xkill-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xkill-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xkill-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xkill-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
index afdd321ce9ef..c3974f4a65a4 100644
--- a/x11-apps/xkill/Manifest
+++ b/x11-apps/xkill/Manifest
@@ -1,2 +1,16 @@
-MD5 1bcf8ec09f478eb8372fd07496c53adf xkill-0.99.0.ebuild 321
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 873557817798564e17145e125cc058c2 ChangeLog 757
 MD5 b9c4c6c97f640ae07017c0a99527766d files/digest-xkill-0.99.0 64
+MD5 a2fa2c78bfd47c23f89b4249c1561530 files/digest-xkill-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 323041065efb709c067a505520f7ac52 xkill-0.99.0.ebuild 441
+MD5 c122b398622eb25ad530bb22a34beb49 xkill-0.99.1.ebuild 447
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIYZ2G5bA0cA/ScRAunzAKCifUFa3hsMf7Bui243pm1uAilkgQCfR4+T
+ZV7AC+4Y7aWHnE7XF8woD8g=
+=pdyg
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xkill/xkill-0.99.0.ebuild b/x11-apps/xkill/xkill-0.99.0.ebuild
index 92e2fc208bff..570d001f832f 100644
--- a/x11-apps/xkill/xkill-0.99.0.ebuild
+++ b/x11-apps/xkill/xkill-0.99.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-apps/xkill/xkill-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkill application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkill/xkill-0.99.1.ebuild b/x11-apps/xkill/xkill-0.99.1.ebuild
index 3aaa9656aec8..c7e00761150b 100644
--- a/x11-apps/xkill/xkill-0.99.1.ebuild
+++ b/x11-apps/xkill/xkill-0.99.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-apps/xkill/xkill-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xkill application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xload/ChangeLog b/x11-apps/xload/ChangeLog
index edc79d150e38..4ba5fe85f817 100644
--- a/x11-apps/xload/ChangeLog
+++ b/x11-apps/xload/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xload
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/ChangeLog,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xload-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xload-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xload-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xload-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xload-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
index 38bbb1f04a4b..17df9caa9811 100644
--- a/x11-apps/xload/Manifest
+++ b/x11-apps/xload/Manifest
@@ -1,2 +1,16 @@
-MD5 e388edaf48dd018305ca1348f5a00655 xload-0.99.0.ebuild 492
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7e5b6ec31f70d2278f25ff2341101e0e ChangeLog 757
 MD5 7932be82168fa056e6752643ad445cd8 files/digest-xload-0.99.0 64
+MD5 dc2a009f3fe939cc6fef3d848b71e493 files/digest-xload-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 07d61c00f9c239c93a97be41f71be87e xload-0.99.0.ebuild 612
+MD5 ecbb38943a8528733109ab37976f7078 xload-0.99.1.ebuild 618
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIeR2G5bA0cA/ScRApoFAJ4+8VGklaQCHU4Xu2fSY2uMy29VgACfVUOK
+952amFg+XLUK10F5znEE8uQ=
+=KBol
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xload/xload-0.99.0.ebuild b/x11-apps/xload/xload-0.99.0.ebuild
index ae72e0531b53..886a47d35789 100644
--- a/x11-apps/xload/xload-0.99.0.ebuild
+++ b/x11-apps/xload/xload-0.99.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-apps/xload/xload-0.99.0.ebuild,v 1.1 2005/08/08 06:28:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xload application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xload/xload-0.99.1.ebuild b/x11-apps/xload/xload-0.99.1.ebuild
index e1eeb6cbb94f..5c3a7d140945 100644
--- a/x11-apps/xload/xload-0.99.1.ebuild
+++ b/x11-apps/xload/xload-0.99.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-apps/xload/xload-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xload/xload-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xload application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlogo/ChangeLog b/x11-apps/xlogo/ChangeLog
index 78e4d4bbb7d4..e1f5f24de72b 100644
--- a/x11-apps/xlogo/ChangeLog
+++ b/x11-apps/xlogo/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xlogo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xlogo-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xlogo-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xlogo-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xlogo-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xlogo-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
index 49a3240b3db5..ff49fc9c83eb 100644
--- a/x11-apps/xlogo/Manifest
+++ b/x11-apps/xlogo/Manifest
@@ -1,2 +1,16 @@
-MD5 ba4abd6da9f539e322bdc92ee52b12ee xlogo-0.99.0.ebuild 469
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 87f2522327e3f3189e85c9e000c728ad ChangeLog 757
 MD5 6dd4ed8d30aedc2fa474845f6a73265a files/digest-xlogo-0.99.0 64
+MD5 2109410f1fb1c8f5bad472046895459d files/digest-xlogo-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 1c598780ef7e1b5213f4acc31d3ecef5 xlogo-0.99.0.ebuild 589
+MD5 f57470fd41873aee7b5a5a575f262009 xlogo-0.99.1.ebuild 595
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIff2G5bA0cA/ScRAiHiAJ41/mj8E9t5d99VsJ+lzXwQJvayrQCdEsUc
+IBzRXEpVv8V6PzyPmuzi7yo=
+=/9xf
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xlogo/xlogo-0.99.0.ebuild b/x11-apps/xlogo/xlogo-0.99.0.ebuild
index 8aebdfa402b8..451d3e6290d0 100644
--- a/x11-apps/xlogo/xlogo-0.99.0.ebuild
+++ b/x11-apps/xlogo/xlogo-0.99.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-apps/xlogo/xlogo-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlogo application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 # Broken without xprint
 #IUSE="xprint"
 RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlogo/xlogo-0.99.1.ebuild b/x11-apps/xlogo/xlogo-0.99.1.ebuild
index 5d470bf6a928..c04c0dde1328 100644
--- a/x11-apps/xlogo/xlogo-0.99.1.ebuild
+++ b/x11-apps/xlogo/xlogo-0.99.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-apps/xlogo/xlogo-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlogo application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 # Broken without xprint
 #IUSE="xprint"
 RDEPEND="x11-libs/libXrender
diff --git a/x11-apps/xlsatoms/ChangeLog b/x11-apps/xlsatoms/ChangeLog
index 90446c252487..30cd31b37063 100644
--- a/x11-apps/xlsatoms/ChangeLog
+++ b/x11-apps/xlsatoms/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xlsatoms
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xlsatoms-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xlsatoms-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xlsatoms-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xlsatoms-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xlsatoms-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
index 98a07b400aae..891b306d531c 100644
--- a/x11-apps/xlsatoms/Manifest
+++ b/x11-apps/xlsatoms/Manifest
@@ -1,2 +1,16 @@
-MD5 55b01200a276b153fb7bb6c0ed97b1cf xlsatoms-0.99.0.ebuild 324
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 c2caf11bb26ecfa3e926c9990281b9ac ChangeLog 785
 MD5 19e689b3c540170a3cddfe31cd824b2a files/digest-xlsatoms-0.99.0 67
+MD5 5c00d7faa056fad2a2600a1cab64363c files/digest-xlsatoms-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 74fb7131fbebc047b24ff34fef1c9f84 xlsatoms-0.99.0.ebuild 450
+MD5 52a62bc3d34d783b295d37bd86fe96e4 xlsatoms-0.99.1.ebuild 456
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIg12G5bA0cA/ScRAsa+AJ0fTWiOElpjJ/Kgz+c2d25ii3JGTgCfSmJ9
+dTYSCf2OYsgGBQfsY3bAtSE=
+=yyKA
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xlsatoms/xlsatoms-0.99.0.ebuild b/x11-apps/xlsatoms/xlsatoms-0.99.0.ebuild
index df494e0e0135..45598e8d2f09 100644
--- a/x11-apps/xlsatoms/xlsatoms-0.99.0.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-0.99.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-apps/xlsatoms/xlsatoms-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlsatoms application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsatoms/xlsatoms-0.99.1.ebuild b/x11-apps/xlsatoms/xlsatoms-0.99.1.ebuild
index c741eeb7da82..45de9f554ca2 100644
--- a/x11-apps/xlsatoms/xlsatoms-0.99.1.ebuild
+++ b/x11-apps/xlsatoms/xlsatoms-0.99.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-apps/xlsatoms/xlsatoms-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlsatoms application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/ChangeLog b/x11-apps/xlsclients/ChangeLog
index c7eda6a7fe4b..6d51fc059512 100644
--- a/x11-apps/xlsclients/ChangeLog
+++ b/x11-apps/xlsclients/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-apps/xlsclients
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xlsclients-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xlsclients-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xlsclients-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xlsclients-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xlsclients-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
index 0a3555ab582c..510a143eaf97 100644
--- a/x11-apps/xlsclients/Manifest
+++ b/x11-apps/xlsclients/Manifest
@@ -1,2 +1,16 @@
-MD5 47d57528e0d9c71b0206b6901ff08cae xlsclients-0.99.0.ebuild 326
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 20f1eed42f87e4280d70ac72a2e01cfd ChangeLog 803
 MD5 5848d1e673d82794ab9fee74065de385 files/digest-xlsclients-0.99.0 69
+MD5 39832e41a1d681d73386a4f554ac1fdb files/digest-xlsclients-0.99.1 69
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 66d12973ee8878f964168e355ae2c195 xlsclients-0.99.0.ebuild 456
+MD5 6d381e3d19c477fddb86c4c8bf6d0c9e xlsclients-0.99.1.ebuild 462
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIhQ2G5bA0cA/ScRAjKPAJ490HeODa0w/pKDMZtRLzt3a7Im+QCg4C2C
+19d1ZcgBkag9ZZM+yiABDYc=
+=HoCI
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xlsclients/xlsclients-0.99.0.ebuild b/x11-apps/xlsclients/xlsclients-0.99.0.ebuild
index dae24a466980..ce4716833bb6 100644
--- a/x11-apps/xlsclients/xlsclients-0.99.0.ebuild
+++ b/x11-apps/xlsclients/xlsclients-0.99.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-apps/xlsclients/xlsclients-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/xlsclients-0.99.1.ebuild b/x11-apps/xlsclients/xlsclients-0.99.1.ebuild
index becd3c25fc0c..d174d80f50ce 100644
--- a/x11-apps/xlsclients/xlsclients-0.99.1.ebuild
+++ b/x11-apps/xlsclients/xlsclients-0.99.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-apps/xlsclients/xlsclients-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlsclients application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXmu"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/ChangeLog b/x11-apps/xlsfonts/ChangeLog
index a511ff45b305..3be711768763 100644
--- a/x11-apps/xlsfonts/ChangeLog
+++ b/x11-apps/xlsfonts/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xlsfonts
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+  06 Nov 2005; <dang@gentoo.org> xlsfonts-0.99.1.ebuild:
+  Marked ~amd64
+
+*xlsfonts-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xlsfonts-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xlsfonts-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xlsfonts-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
index 5590ec8d83c4..96cb27f9a06c 100644
--- a/x11-apps/xlsfonts/Manifest
+++ b/x11-apps/xlsfonts/Manifest
@@ -1,2 +1,16 @@
-MD5 e30181d996a85d4aa87350f6e769c700 xlsfonts-0.99.0.ebuild 307
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f30bc1b39e6bcdade02808151c551602 ChangeLog 767
 MD5 3de39edc74ab32e5b6bd405f8d593185 files/digest-xlsfonts-0.99.0 67
+MD5 f1447ec191d7804131c8332fb746acdb files/digest-xlsfonts-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 f0cddf7ea7fc2393376c950b70d27630 xlsfonts-0.99.0.ebuild 433
+MD5 85950c87c9fc2cb39b8c985cd89816f7 xlsfonts-0.99.1.ebuild 438
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDbk/KomPajV0RnrERAhrUAJsG8Eya3L3QnMYWE/YR9hRtCXod+QCdEG2I
+w7sLSr+KdbEinoahvgN1oSQ=
+=T3ci
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xlsfonts/xlsfonts-0.99.0.ebuild b/x11-apps/xlsfonts/xlsfonts-0.99.0.ebuild
index a43415f03dd6..1846b71e2702 100644
--- a/x11-apps/xlsfonts/xlsfonts-0.99.0.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-0.99.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-apps/xlsfonts/xlsfonts-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/xlsfonts-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlsfonts application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/xlsfonts-0.99.1.ebuild b/x11-apps/xlsfonts/xlsfonts-0.99.1.ebuild
index 4920cc4293ef..6fe06249bf7b 100644
--- a/x11-apps/xlsfonts/xlsfonts-0.99.1.ebuild
+++ b/x11-apps/xlsfonts/xlsfonts-0.99.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-apps/xlsfonts/xlsfonts-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsfonts/xlsfonts-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xlsfonts application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/ChangeLog b/x11-apps/xmag/ChangeLog
index 0c6d23576312..a978cd1c6b85 100644
--- a/x11-apps/xmag/ChangeLog
+++ b/x11-apps/xmag/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xmag
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xmag-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xmag-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xmag-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xmag-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xmag-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
index ad4277c957d5..fcdd3114975b 100644
--- a/x11-apps/xmag/Manifest
+++ b/x11-apps/xmag/Manifest
@@ -1,2 +1,16 @@
-MD5 b7ac6d743c19603cbb29971776c96098 xmag-0.99.0.ebuild 491
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bc5e07445484031aa28fa855857f55d0 ChangeLog 749
 MD5 4ee302e2d5090b21a8893176f9d5788b files/digest-xmag-0.99.0 63
+MD5 d8aa6764c80e6ca21986f1fb611ea4e9 files/digest-xmag-0.99.1 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 60d7c1ae958140e48f75d2059c1b6e2f xmag-0.99.0.ebuild 609
+MD5 dc9355fb030d6800808d8db91db23823 xmag-0.99.1.ebuild 615
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIil2G5bA0cA/ScRAn1VAJ9xkUlox5kLtvZY62SRBVJTceoVIACggQRh
+ZbW+R0kwKe4OBrOQsO0jidc=
+=xT82
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xmag/xmag-0.99.0.ebuild b/x11-apps/xmag/xmag-0.99.0.ebuild
index 107849ca3c58..facdb12644a6 100644
--- a/x11-apps/xmag/xmag-0.99.0.ebuild
+++ b/x11-apps/xmag/xmag-0.99.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-apps/xmag/xmag-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/xmag-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xmag application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/xmag-0.99.1.ebuild b/x11-apps/xmag/xmag-0.99.1.ebuild
index 89ec5e369cb6..66b6e830223d 100644
--- a/x11-apps/xmag/xmag-0.99.1.ebuild
+++ b/x11-apps/xmag/xmag-0.99.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-apps/xmag/xmag-0.99.1.ebuild,v 1.1 2005/10/20 00:45:23 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmag/xmag-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xmag application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xman/ChangeLog b/x11-apps/xman/ChangeLog
index 8e8ca142af5c..5fe5dd506968 100644
--- a/x11-apps/xman/ChangeLog
+++ b/x11-apps/xman/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for x11-apps/xman
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xman-0.99.2.ebuild:
+  Marked ~amd64.
+
+*xman-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xman-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xman-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xman-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xman-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xman-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
index 1233b49f61b8..c806c6489a16 100644
--- a/x11-apps/xman/Manifest
+++ b/x11-apps/xman/Manifest
@@ -1,2 +1,18 @@
-MD5 258e2f53a627f41e1e4d5c0af70a7fc5 xman-0.99.0.ebuild 427
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 53dae7306442a0e51095206a44a8aa95 ChangeLog 877
 MD5 5f4be9e3e2a796548f2b7a589200f4de files/digest-xman-0.99.0 64
+MD5 c9e7ff986be507ef1f1b96d63eacaa2a files/digest-xman-0.99.1 64
+MD5 8ed7f2c10b3736d584be759e37e7a364 files/digest-xman-0.99.2 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 bcde82022322efa669a0619800a01773 xman-0.99.0.ebuild 545
+MD5 ff736adccd6a6104af07906ac2355f0a xman-0.99.1.ebuild 548
+MD5 b914438a2cd7c45f459b3ed6bb118aa7 xman-0.99.2.ebuild 551
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIjt2G5bA0cA/ScRAnNXAJ9xAoN6R49CpeY0/4ZbERSc1XXsQgCgzUqJ
+YD5E4NQnlcnpGp3JeW2d6nA=
+=FVgm
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xman/xman-0.99.0.ebuild b/x11-apps/xman/xman-0.99.0.ebuild
index afa811b11dd5..856e02c1dde5 100644
--- a/x11-apps/xman/xman-0.99.0.ebuild
+++ b/x11-apps/xman/xman-0.99.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-apps/xman/xman-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xman application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 # Broken without xprint
 IUSE="xprint"
 RDEPEND="xprint? ( x11-libs/libXprintUtil )"
diff --git a/x11-apps/xman/xman-0.99.1.ebuild b/x11-apps/xman/xman-0.99.1.ebuild
index 2362526a6233..a405aa39464f 100644
--- a/x11-apps/xman/xman-0.99.1.ebuild
+++ b/x11-apps/xman/xman-0.99.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-apps/xman/xman-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xman/xman-0.99.2.ebuild b/x11-apps/xman/xman-0.99.2.ebuild
index ae1679189566..1e6cde6dba5e 100644
--- a/x11-apps/xman/xman-0.99.2.ebuild
+++ b/x11-apps/xman/xman-0.99.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-apps/xman/xman-0.99.2.ebuild,v 1.1 2005/11/11 19:57:19 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xman/xman-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xman application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 # Broken without xprint
 IUSE="xprint"
 RDEPEND="xprint? ( x11-libs/libXprintUtil )"
diff --git a/x11-apps/xmessage/ChangeLog b/x11-apps/xmessage/ChangeLog
index 5e96aeb2df5e..522c4ab82701 100644
--- a/x11-apps/xmessage/ChangeLog
+++ b/x11-apps/xmessage/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xmessage
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/ChangeLog,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
+
+*xmessage-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xmessage-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  07 Sep 2005; Herbie Hopkins <herbs@gentoo.org> xmessage-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xmessage-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xmessage-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
index 84cdc41505f2..35b2db16a497 100644
--- a/x11-apps/xmessage/Manifest
+++ b/x11-apps/xmessage/Manifest
@@ -1,2 +1,6 @@
-MD5 dd1d7460f98d9dec15eaf15d675959fd xmessage-0.99.0.ebuild 495
+MD5 f9acaf771b77c3aff363f4d61040da83 ChangeLog 789
 MD5 bbe5d3e9c7d6082c61837c07ac007176 files/digest-xmessage-0.99.0 67
+MD5 5f58863a962758be2db03a23174b88a8 files/digest-xmessage-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 caca6d59c3814eb2482e8db744fd1408 xmessage-0.99.0.ebuild 628
+MD5 2fb9830f9e3c725ac8e36c0d6764eb06 xmessage-0.99.1.ebuild 631
diff --git a/x11-apps/xmessage/xmessage-0.99.0.ebuild b/x11-apps/xmessage/xmessage-0.99.0.ebuild
index 6ff5f326c601..98843d2f05d5 100644
--- a/x11-apps/xmessage/xmessage-0.99.0.ebuild
+++ b/x11-apps/xmessage/xmessage-0.99.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-apps/xmessage/xmessage-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/xmessage-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xmessage application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/xmessage-0.99.1.ebuild b/x11-apps/xmessage/xmessage-0.99.1.ebuild
index 1423c17a66ce..bd7c39221e5b 100644
--- a/x11-apps/xmessage/xmessage-0.99.1.ebuild
+++ b/x11-apps/xmessage/xmessage-0.99.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-apps/xmessage/xmessage-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmessage/xmessage-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:40 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xmh/ChangeLog b/x11-apps/xmh/ChangeLog
index a91d8f52a35b..d35d415fbfb5 100644
--- a/x11-apps/xmh/ChangeLog
+++ b/x11-apps/xmh/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-apps/xmh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*xmh-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xmh-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xmh-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xmh-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xmh-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xmh-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xmh/Manifest b/x11-apps/xmh/Manifest
index 0554f2bd57b8..cd1ce7a3f6ec 100644
--- a/x11-apps/xmh/Manifest
+++ b/x11-apps/xmh/Manifest
@@ -1,2 +1,8 @@
-MD5 d2922d213de65ba955a67387c661171a xmh-0.99.0.ebuild 490
+MD5 a6d3cdf0018787aaa11fc60c4dadbba8 ChangeLog 787
 MD5 0953cac6dfffe62579c7df1d441fbe39 files/digest-xmh-0.99.0 63
+MD5 b2046fc4d9331d1de4a0af6096eae53e files/digest-xmh-0.99.1 63
+MD5 e632bcc0067dd977112515c1ae5a46c1 files/digest-xmh-0.99.2 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 29a7ee4488c73914f448331f02c03c53 xmh-0.99.0.ebuild 606
+MD5 c3eaad9a45a976639425b69135ac3947 xmh-0.99.1.ebuild 609
+MD5 f773c0c4dd2fa78d045085dad54fcafd xmh-0.99.2.ebuild 613
diff --git a/x11-apps/xmh/xmh-0.99.0.ebuild b/x11-apps/xmh/xmh-0.99.0.ebuild
index 67eff278a7f4..c0f8b30b582a 100644
--- a/x11-apps/xmh/xmh-0.99.0.ebuild
+++ b/x11-apps/xmh/xmh-0.99.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-apps/xmh/xmh-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/xmh-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xmh application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmh/xmh-0.99.1.ebuild b/x11-apps/xmh/xmh-0.99.1.ebuild
index 77122bae3f33..d40054f644a5 100644
--- a/x11-apps/xmh/xmh-0.99.1.ebuild
+++ b/x11-apps/xmh/xmh-0.99.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-apps/xmh/xmh-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/xmh-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xmh/xmh-0.99.2.ebuild b/x11-apps/xmh/xmh-0.99.2.ebuild
index f134bb46be75..d66cc3c35531 100644
--- a/x11-apps/xmh/xmh-0.99.2.ebuild
+++ b/x11-apps/xmh/xmh-0.99.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-apps/xmh/xmh-0.99.2.ebuild,v 1.1 2005/11/11 19:57:59 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmh/xmh-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xmodmap/ChangeLog b/x11-apps/xmodmap/ChangeLog
index 7f4b88ac6be7..72c37729893c 100644
--- a/x11-apps/xmodmap/ChangeLog
+++ b/x11-apps/xmodmap/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xmodmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*xmodmap-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xmodmap-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  23 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xmodmap-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xmodmap-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xmodmap-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
index ff9414d8c17f..685768fe9c90 100644
--- a/x11-apps/xmodmap/Manifest
+++ b/x11-apps/xmodmap/Manifest
@@ -1,2 +1,6 @@
-MD5 528b0c008ab026e0f7cd7ef152a17826 xmodmap-0.99.0.ebuild 303
+MD5 832c25fdf5934567c5673d9bc91b45fd ChangeLog 781
 MD5 bb16baaacd281fc19e8e4623eb3b5f3c files/digest-xmodmap-0.99.0 66
+MD5 8f43ac4f3e9c22027e94573e91289c5c files/digest-xmodmap-0.99.1 66
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 857e71b7f05c8423f99b15663fd3f077 xmodmap-0.99.0.ebuild 434
+MD5 09939b814b2936b16f05990fc7c5455e xmodmap-0.99.1.ebuild 437
diff --git a/x11-apps/xmodmap/xmodmap-0.99.0.ebuild b/x11-apps/xmodmap/xmodmap-0.99.0.ebuild
index f5f171b511c0..f15ec6f241d8 100644
--- a/x11-apps/xmodmap/xmodmap-0.99.0.ebuild
+++ b/x11-apps/xmodmap/xmodmap-0.99.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-apps/xmodmap/xmodmap-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwud application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-0.99.1.ebuild b/x11-apps/xmodmap/xmodmap-0.99.1.ebuild
index 8d3140f8a498..61a81f739f3a 100644
--- a/x11-apps/xmodmap/xmodmap-0.99.1.ebuild
+++ b/x11-apps/xmodmap/xmodmap-0.99.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-apps/xmodmap/xmodmap-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xmore/ChangeLog b/x11-apps/xmore/ChangeLog
index d124e93b5096..7ce73d4b8f49 100644
--- a/x11-apps/xmore/ChangeLog
+++ b/x11-apps/xmore/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-apps/xmore
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*xmore-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xmore-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xmore-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xmore-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
index 1e2c662b7e9f..8062aa9330f3 100644
--- a/x11-apps/xmore/Manifest
+++ b/x11-apps/xmore/Manifest
@@ -1,2 +1,6 @@
-MD5 b37a1b0bd4d3b19a3e1abced8fa518bb xmore-0.99.0.ebuild 428
+MD5 f9c905f37941e0700dc0726b3d80536c ChangeLog 673
 MD5 1834b6705e62a75d31e8d8b23d1cdbe4 files/digest-xmore-0.99.0 64
+MD5 a74926b1e98371689953c374d753f553 files/digest-xmore-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 ccb1622eb86531bf37240bce5cf3d948 xmore-0.99.0.ebuild 548
+MD5 c7f07ac582525009856fb98eb78308ae xmore-0.99.1.ebuild 551
diff --git a/x11-apps/xmore/xmore-0.99.0.ebuild b/x11-apps/xmore/xmore-0.99.0.ebuild
index 051417a838d0..cfebd881c11d 100644
--- a/x11-apps/xmore/xmore-0.99.0.ebuild
+++ b/x11-apps/xmore/xmore-0.99.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-apps/xmore/xmore-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xmore application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 # Broken without xprint
 IUSE="xprint"
 RDEPEND="xprint? ( x11-libs/libXprintUtil )"
diff --git a/x11-apps/xmore/xmore-0.99.1.ebuild b/x11-apps/xmore/xmore-0.99.1.ebuild
index 346876ff6082..64b32992825d 100644
--- a/x11-apps/xmore/xmore-0.99.1.ebuild
+++ b/x11-apps/xmore/xmore-0.99.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-apps/xmore/xmore-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmore/xmore-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xphelloworld/ChangeLog b/x11-apps/xphelloworld/ChangeLog
index 7858990d147b..77d4ba73eb37 100644
--- a/x11-apps/xphelloworld/ChangeLog
+++ b/x11-apps/xphelloworld/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-apps/xphelloworld
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+*xphelloworld-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xphelloworld-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xphelloworld-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xphelloworld-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xphelloworld/Manifest b/x11-apps/xphelloworld/Manifest
index 1cb1a98d0d5d..8140e273d0d8 100644
--- a/x11-apps/xphelloworld/Manifest
+++ b/x11-apps/xphelloworld/Manifest
@@ -1,2 +1,6 @@
-MD5 121dc3ecd5193afc9c0d9aefc9ed9247 xphelloworld-0.99.0.ebuild 496
+MD5 56922fbdb219ae726e19b895e2104960 ChangeLog 728
 MD5 2ef38d162364461c0fac144c4552c1fa files/digest-xphelloworld-0.99.0 71
+MD5 ef656e0037704559f1073e4e64e0474d files/digest-xphelloworld-0.99.1 71
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 67a255632d3868a97ab784d646a537e7 xphelloworld-0.99.0.ebuild 630
+MD5 92c899b53127d71c3478fc12df29d0fa xphelloworld-0.99.1.ebuild 633
diff --git a/x11-apps/xphelloworld/xphelloworld-0.99.0.ebuild b/x11-apps/xphelloworld/xphelloworld-0.99.0.ebuild
index f42fadb86a76..2550d3643c2d 100644
--- a/x11-apps/xphelloworld/xphelloworld-0.99.0.ebuild
+++ b/x11-apps/xphelloworld/xphelloworld-0.99.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-apps/xphelloworld/xphelloworld-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/xphelloworld-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xphelloworld application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXaw
 	x11-libs/libXprintUtil
 	x11-libs/libXprintAppUtil
diff --git a/x11-apps/xphelloworld/xphelloworld-0.99.1.ebuild b/x11-apps/xphelloworld/xphelloworld-0.99.1.ebuild
index dc8ca9055f74..2077796f840d 100644
--- a/x11-apps/xphelloworld/xphelloworld-0.99.1.ebuild
+++ b/x11-apps/xphelloworld/xphelloworld-0.99.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-apps/xphelloworld/xphelloworld-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xphelloworld/xphelloworld-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xplsprinters/ChangeLog b/x11-apps/xplsprinters/ChangeLog
index 3fd218fcc234..b5e51d95e2da 100644
--- a/x11-apps/xplsprinters/ChangeLog
+++ b/x11-apps/xplsprinters/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-apps/xplsprinters
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*xplsprinters-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xplsprinters-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xplsprinters-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xplsprinters-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xplsprinters/Manifest b/x11-apps/xplsprinters/Manifest
index 28680c2ad5bd..f2f4ddc0b1f3 100644
--- a/x11-apps/xplsprinters/Manifest
+++ b/x11-apps/xplsprinters/Manifest
@@ -1,2 +1,6 @@
-MD5 3f3d5526d549921ea136d109dc27028a xplsprinters-0.99.0.ebuild 351
+MD5 9981e19438510a195c662d9919d74522 ChangeLog 728
 MD5 a938937243f17fb5dd64ec94d0ba7d08 files/digest-xplsprinters-0.99.0 71
+MD5 553447fda963d42b41b9989e76a9f368 files/digest-xplsprinters-0.99.1 71
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 016842f1e8d1531b9ac635f6dd77827c xplsprinters-0.99.0.ebuild 485
+MD5 8c72e87c2a3137fa1c79fdaad2d4d2a1 xplsprinters-0.99.1.ebuild 488
diff --git a/x11-apps/xplsprinters/xplsprinters-0.99.0.ebuild b/x11-apps/xplsprinters/xplsprinters-0.99.0.ebuild
index 78cba303f2e7..ccc4950f810a 100644
--- a/x11-apps/xplsprinters/xplsprinters-0.99.0.ebuild
+++ b/x11-apps/xplsprinters/xplsprinters-0.99.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-apps/xplsprinters/xplsprinters-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/xplsprinters-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xplsprinters application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXp
 	x11-libs/libXprintUtil"
diff --git a/x11-apps/xplsprinters/xplsprinters-0.99.1.ebuild b/x11-apps/xplsprinters/xplsprinters-0.99.1.ebuild
index 104eedc13549..27e8d424ce5b 100644
--- a/x11-apps/xplsprinters/xplsprinters-0.99.1.ebuild
+++ b/x11-apps/xplsprinters/xplsprinters-0.99.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-apps/xplsprinters/xplsprinters-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xplsprinters/xplsprinters-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xpr/ChangeLog b/x11-apps/xpr/ChangeLog
index 3f58105cae18..2f40b0143fff 100644
--- a/x11-apps/xpr/ChangeLog
+++ b/x11-apps/xpr/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-apps/xpr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*xpr-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xpr-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xpr-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xpr-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
index dd04d53dd7a3..4a267954d52f 100644
--- a/x11-apps/xpr/Manifest
+++ b/x11-apps/xpr/Manifest
@@ -1,2 +1,6 @@
-MD5 c2a40f338beca55be0990be837141ec6 xpr-0.99.0.ebuild 319
+MD5 a71843bd1ad0a2a923f80afec22251ea ChangeLog 659
 MD5 263c298dd69f8c10fe908f590d587023 files/digest-xpr-0.99.0 62
+MD5 58b8d1deba80d22e867a241acfef8e56 files/digest-xpr-0.99.1 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 379382e0057553cfae9a2a2f0700b8e5 xpr-0.99.0.ebuild 435
+MD5 00b9360901366e76dc79bbf65bb06c7b xpr-0.99.1.ebuild 438
diff --git a/x11-apps/xpr/xpr-0.99.0.ebuild b/x11-apps/xpr/xpr-0.99.0.ebuild
index f1c801581e30..2f30f0003b0a 100644
--- a/x11-apps/xpr/xpr-0.99.0.ebuild
+++ b/x11-apps/xpr/xpr-0.99.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-apps/xpr/xpr-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xpr application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/xpr-0.99.1.ebuild b/x11-apps/xpr/xpr-0.99.1.ebuild
index c232ec123022..ddeb9d2e7586 100644
--- a/x11-apps/xpr/xpr-0.99.1.ebuild
+++ b/x11-apps/xpr/xpr-0.99.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-apps/xpr/xpr-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xpr/xpr-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xprehashprinterlist/ChangeLog b/x11-apps/xprehashprinterlist/ChangeLog
index c0bff974c229..2a329bc739bf 100644
--- a/x11-apps/xprehashprinterlist/ChangeLog
+++ b/x11-apps/xprehashprinterlist/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for x11-apps/xprehashprinterlist
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+*xprehashprinterlist-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xprehashprinterlist-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xprehashprinterlist-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xprehashprinterlist-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xprehashprinterlist/Manifest b/x11-apps/xprehashprinterlist/Manifest
index e207387d7c20..25fea2d9cd46 100644
--- a/x11-apps/xprehashprinterlist/Manifest
+++ b/x11-apps/xprehashprinterlist/Manifest
@@ -1,2 +1,6 @@
-MD5 d1b6e0e93ed8061fd2a037fcfc8ac5a6 xprehashprinterlist-0.99.0.ebuild 334
+MD5 158186d3564d540ce760834eec75868f ChangeLog 777
 MD5 6edb69f80a012a4c1cf6c239760a20ae files/digest-xprehashprinterlist-0.99.0 78
+MD5 99538dc6111599c07a9e01bc7693b920 files/digest-xprehashprinterlist-0.99.1 78
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 e4670e6d8ab3779d0e2a540b027d38ae xprehashprinterlist-0.99.0.ebuild 482
+MD5 e594877cb816732be1a15b30770570e4 xprehashprinterlist-0.99.1.ebuild 485
diff --git a/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.0.ebuild b/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.0.ebuild
index 329b84259dbd..bb0a51b86bc5 100644
--- a/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.0.ebuild
+++ b/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.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-apps/xprehashprinterlist/xprehashprinterlist-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xprehashprinterlist application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXp"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.1.ebuild b/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.1.ebuild
index 54b2d16c345a..1775b7bc1222 100644
--- a/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.1.ebuild
+++ b/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.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-apps/xprehashprinterlist/xprehashprinterlist-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprehashprinterlist/xprehashprinterlist-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xprop/ChangeLog b/x11-apps/xprop/ChangeLog
index 1ec4c9572f7e..ab192a6508f4 100644
--- a/x11-apps/xprop/ChangeLog
+++ b/x11-apps/xprop/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xprop
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/ChangeLog,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
+
+  29 Oct 2005; Herbie Hopkins <herbs@gentoo.org> xprop-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xprop-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xprop-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xprop-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xprop-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
index 2407713fb542..5a8336f4297a 100644
--- a/x11-apps/xprop/Manifest
+++ b/x11-apps/xprop/Manifest
@@ -1,2 +1,16 @@
-MD5 944d73f6d99946f98b352a6c603c8424 xprop-0.99.0.ebuild 321
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 885d66489f86ba4fbb4ec67e68806e32 ChangeLog 757
 MD5 bf2f8b0cac98c08c7deb2ab2691c714e files/digest-xprop-0.99.0 64
+MD5 6eedb391dd6ab83bdc16d27ee08d715f files/digest-xprop-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 112352cdb346004a3d3d276567b934b3 xprop-0.99.0.ebuild 441
+MD5 daea87c733b98fa9f293010ef8082a06 xprop-0.99.1.ebuild 447
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDY1Ks2G5bA0cA/ScRAlgHAJ4hxOuGfTbhcdXhVk2W9ZFodgr1LwCgmMbY
+CvD5U1le0lp/dAhRNWRw2eo=
+=CJTA
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xprop/xprop-0.99.0.ebuild b/x11-apps/xprop/xprop-0.99.0.ebuild
index be5f5d97c4aa..b2359e11553f 100644
--- a/x11-apps/xprop/xprop-0.99.0.ebuild
+++ b/x11-apps/xprop/xprop-0.99.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-apps/xprop/xprop-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xprop application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/xprop-0.99.1.ebuild b/x11-apps/xprop/xprop-0.99.1.ebuild
index 4b579b71944d..de1049cbdcf4 100644
--- a/x11-apps/xprop/xprop-0.99.1.ebuild
+++ b/x11-apps/xprop/xprop-0.99.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-apps/xprop/xprop-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:32 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xprop application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrandr/ChangeLog b/x11-apps/xrandr/ChangeLog
index 18f06eb477b4..2ce7a38ac222 100644
--- a/x11-apps/xrandr/ChangeLog
+++ b/x11-apps/xrandr/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xrandr
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*xrandr-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xrandr-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  15 Aug 2005; Herbie Hopkins <herbs@gentoo.org> xrandr-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xrandr-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xrandr-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
index 0e2cb4f42986..724ce6740678 100644
--- a/x11-apps/xrandr/Manifest
+++ b/x11-apps/xrandr/Manifest
@@ -1,2 +1,6 @@
-MD5 44475ef44371ddc1ed3d26f100f47f37 xrandr-0.99.0.ebuild 325
+MD5 98f76191bd45e860f9238fe634297067 ChangeLog 773
 MD5 e0622f28462eb3bc1735bd2cfd7659c5 files/digest-xrandr-0.99.0 65
+MD5 55b55e121398508a470759621eea400f files/digest-xrandr-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 86aaff23f275e54925e69f051447a459 xrandr-0.99.0.ebuild 454
+MD5 2cf96e49b2d57d17fa263dbb5be5cc05 xrandr-0.99.1.ebuild 457
diff --git a/x11-apps/xrandr/xrandr-0.99.0.ebuild b/x11-apps/xrandr/xrandr-0.99.0.ebuild
index cb1d1f03a581..cb72f1863114 100644
--- a/x11-apps/xrandr/xrandr-0.99.0.ebuild
+++ b/x11-apps/xrandr/xrandr-0.99.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-apps/xrandr/xrandr-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xrandr application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXrandr
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrandr/xrandr-0.99.1.ebuild b/x11-apps/xrandr/xrandr-0.99.1.ebuild
index dc05f3793ae0..b49bc3825003 100644
--- a/x11-apps/xrandr/xrandr-0.99.1.ebuild
+++ b/x11-apps/xrandr/xrandr-0.99.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-apps/xrandr/xrandr-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xrdb/ChangeLog b/x11-apps/xrdb/ChangeLog
index b78e05889d53..de54014f3839 100644
--- a/x11-apps/xrdb/ChangeLog
+++ b/x11-apps/xrdb/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for x11-apps/xrdb
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*xrdb-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xrdb-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org> xrdb-0.99.0.ebuild:
+  added ~mips keyword
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Herbie Hopkins <herbs@gentoo.org> xrdb-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xrdb-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xrdb-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
index 8e2394d02246..6fcce116bc57 100644
--- a/x11-apps/xrdb/Manifest
+++ b/x11-apps/xrdb/Manifest
@@ -1,2 +1,6 @@
-MD5 063a29d3ba9a237e9e71c07defe7a3e0 xrdb-0.99.0.ebuild 320
+MD5 174011acf51dbaddd4ef2c1065c87189 ChangeLog 849
 MD5 b81b40a21b0597218d918038fc191af5 files/digest-xrdb-0.99.0 63
+MD5 8753e4677c6ad0f77335f1cecb8d9518 files/digest-xrdb-0.99.1 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 0ce51ae055a62009858543f56774efc6 xrdb-0.99.0.ebuild 445
+MD5 9cfa32aff1a62dc33ad797f345486eea xrdb-0.99.1.ebuild 448
diff --git a/x11-apps/xrdb/xrdb-0.99.0.ebuild b/x11-apps/xrdb/xrdb-0.99.0.ebuild
index 142f2915b652..2611cefe7de8 100644
--- a/x11-apps/xrdb/xrdb-0.99.0.ebuild
+++ b/x11-apps/xrdb/xrdb-0.99.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-apps/xrdb/xrdb-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/xrdb-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xrdb application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrdb/xrdb-0.99.1.ebuild b/x11-apps/xrdb/xrdb-0.99.1.ebuild
index 755b328b2c33..77dd6c402b9a 100644
--- a/x11-apps/xrdb/xrdb-0.99.1.ebuild
+++ b/x11-apps/xrdb/xrdb-0.99.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-apps/xrdb/xrdb-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/xrdb-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xrefresh/ChangeLog b/x11-apps/xrefresh/ChangeLog
index 3564bc983cf3..ccb3e1dcf858 100644
--- a/x11-apps/xrefresh/ChangeLog
+++ b/x11-apps/xrefresh/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xrefresh
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xrefresh-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xrefresh-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xrefresh-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xrefresh-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xrefresh-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
index b3e7521b8922..f5ce338152a2 100644
--- a/x11-apps/xrefresh/Manifest
+++ b/x11-apps/xrefresh/Manifest
@@ -1,2 +1,16 @@
-MD5 2d2ef0bdb150d06fdf835a183079bcd0 xrefresh-0.99.0.ebuild 307
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 f96e132b3812e0fe2cb43892c90f230a ChangeLog 785
 MD5 992a8cbf8469f9bfa34c2e23f296c9ef files/digest-xrefresh-0.99.0 67
+MD5 ad7c20d8742ad21970a84d66c7c97cc0 files/digest-xrefresh-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 807f46cd962aa7c1498577684fe2fbe7 xrefresh-0.99.0.ebuild 433
+MD5 96ab8013e7146fe3b77ed67b74ecfc05 xrefresh-0.99.1.ebuild 439
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIkW2G5bA0cA/ScRAuakAJ44GXEZ7YNStIg7n5LoSeBvkQKi7QCg6Nju
+U0nEruW3iS86mLV6sd9rEdc=
+=sC/g
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xrefresh/xrefresh-0.99.0.ebuild b/x11-apps/xrefresh/xrefresh-0.99.0.ebuild
index dcb53c1c417c..e04b9c575e6e 100644
--- a/x11-apps/xrefresh/xrefresh-0.99.0.ebuild
+++ b/x11-apps/xrefresh/xrefresh-0.99.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-apps/xrefresh/xrefresh-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/xrefresh-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xrefresh application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrefresh/xrefresh-0.99.1.ebuild b/x11-apps/xrefresh/xrefresh-0.99.1.ebuild
index f4789e6b96e4..8f99c2cbde0e 100644
--- a/x11-apps/xrefresh/xrefresh-0.99.1.ebuild
+++ b/x11-apps/xrefresh/xrefresh-0.99.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-apps/xrefresh/xrefresh-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrefresh/xrefresh-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xrefresh application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrx/ChangeLog b/x11-apps/xrx/ChangeLog
index 7d8e8a090818..e5d18591a471 100644
--- a/x11-apps/xrx/ChangeLog
+++ b/x11-apps/xrx/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xrx
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/ChangeLog,v 1.1 2005/10/20 01:09:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+*xrx-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xrx-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xrx-0.99.1-r1 (27 Oct 2005)
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xrx-0.99.1-r1.ebuild:
+  Rev-bump for new USE flag.
+
+  27 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org> xrx-0.99.1.ebuild:
+  Add ipv6 USE flag.
 
 *xrx-0.99.1 (20 Oct 2005)
 
diff --git a/x11-apps/xrx/Manifest b/x11-apps/xrx/Manifest
index afc8ed89eb99..f4182817d315 100644
--- a/x11-apps/xrx/Manifest
+++ b/x11-apps/xrx/Manifest
@@ -1,5 +1,8 @@
-MD5 a50f0c97ec43cb55f021ac0d2f4a9ff0 ChangeLog 541
+MD5 36f583e0ad6c30086895b04adb29beb6 ChangeLog 715
 MD5 a821646e1180ae5ba2c6f2b375c258e0 files/digest-xrx-0.99.1 63
+MD5 a821646e1180ae5ba2c6f2b375c258e0 files/digest-xrx-0.99.1-r1 63
+MD5 4fc2f6ec15ff9d7a65aed91f552ed0f0 files/digest-xrx-0.99.2 63
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 5c974c0164d5ad0ae667f0381f16cf25 xrx-0.99.0.ebuild 421
-MD5 d820d9fb5997013de119a8cf0d5f05b1 xrx-0.99.1.ebuild 430
+MD5 53fd34ebab37cbb6e170383642aad349 xrx-0.99.1-r1.ebuild 490
+MD5 c244d1b759838b86ed57061a2e2ec280 xrx-0.99.1.ebuild 487
+MD5 7a7a485952cfb8edc44882cd790d97e8 xrx-0.99.2.ebuild 487
diff --git a/x11-apps/xrx/xrx-0.99.1-r1.ebuild b/x11-apps/xrx/xrx-0.99.1-r1.ebuild
index 168c51b9b625..cf8a7c2ba1f3 100644
--- a/x11-apps/xrx/xrx-0.99.1-r1.ebuild
+++ b/x11-apps/xrx/xrx-0.99.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-apps/xrx/xrx-0.99.1-r1.ebuild,v 1.1 2005/10/27 15:23:37 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/xrx-0.99.1-r1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xrx/xrx-0.99.1.ebuild b/x11-apps/xrx/xrx-0.99.1.ebuild
index 7400e88de7cc..916ae99f5ea9 100644
--- a/x11-apps/xrx/xrx-0.99.1.ebuild
+++ b/x11-apps/xrx/xrx-0.99.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-apps/xrx/xrx-0.99.1.ebuild,v 1.1 2005/10/20 01:09:01 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/xrx-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -13,3 +13,6 @@ RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXext"
 DEPEND="${RDEPEND}"
+IUSE="ipv6"
+
+CONFIGURE_OPTIONS="$(use_enable ipv6)"
diff --git a/x11-apps/xrx/xrx-0.99.2.ebuild b/x11-apps/xrx/xrx-0.99.2.ebuild
index 4ae4917167cd..7e83fa4ce8f9 100644
--- a/x11-apps/xrx/xrx-0.99.2.ebuild
+++ b/x11-apps/xrx/xrx-0.99.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-apps/xrx/xrx-0.99.2.ebuild,v 1.1 2005/11/11 19:58:23 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrx/xrx-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xset/ChangeLog b/x11-apps/xset/ChangeLog
index 36c63e501731..9856ab74d4e8 100644
--- a/x11-apps/xset/ChangeLog
+++ b/x11-apps/xset/ChangeLog
@@ -1,6 +1,51 @@
 # ChangeLog for x11-apps/xset
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*xset-0.99.3 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xset-0.99.3.ebuild:
+  Bump for 7.0RC2.
+
+  31 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; -xset-0.99.0.ebuild,
+  -xset-0.99.1_pre20050905.ebuild:
+  Pull old versions.
+
+*xset-0.99.2 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xset-0.99.2.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xset-0.99.1_pre20050905.ebuild:
+  Fixed snapshot SRC_URI.
+
+  06 Sep 2005; Herbie Hopkins <herbs@gentoo.org>
+  xset-0.99.1_pre20050905.ebuild:
+  Marked ~amd64.
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  xset-0.99.1_pre20050905.ebuild:
+  Fixed snapshot SRC_URI.
+
+*xset-0.99.1_pre20050905 (06 Sep 2005)
+
+  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xset-0.99.1_pre20050905.ebuild, -xset-0.99.1.ebuild:
+  Fixed version in anticipation of upstream release.
+
+*xset-0.99.1 (05 Sep 2005)
+
+  05 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xset-0.99.1.ebuild:
+  New snapshot.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xset-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xset-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
index ada06cf08ee6..b0397fa1dc57 100644
--- a/x11-apps/xset/Manifest
+++ b/x11-apps/xset/Manifest
@@ -1,2 +1,6 @@
-MD5 02669c6861290507a8d52980f20c2864 xset-0.99.0.ebuild 303
-MD5 e2b45d187af1a9067ab1d71994655c68 files/digest-xset-0.99.0 63
+MD5 0248a50af8c450c6d7fd4067b1ef316a ChangeLog 1601
+MD5 a5282bfc45c9ca26f97f58e87fb3692f files/digest-xset-0.99.2 63
+MD5 eb7d60718fffc8355fe720f82248581a files/digest-xset-0.99.3 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 fb34ace49822d95d4d42dd52d92923df xset-0.99.2.ebuild 431
+MD5 780817f0bd305df9419fb93c6ae0ffa1 xset-0.99.3.ebuild 435
diff --git a/x11-apps/xset/xset-0.99.2.ebuild b/x11-apps/xset/xset-0.99.2.ebuild
index 96755c9bbf14..db7ffbc2670b 100644
--- a/x11-apps/xset/xset-0.99.2.ebuild
+++ b/x11-apps/xset/xset-0.99.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-apps/xset/xset-0.99.2.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xset/xset-0.99.3.ebuild b/x11-apps/xset/xset-0.99.3.ebuild
index 07d0cd46de11..09c73ff9be7c 100644
--- a/x11-apps/xset/xset-0.99.3.ebuild
+++ b/x11-apps/xset/xset-0.99.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-apps/xset/xset-0.99.3.ebuild,v 1.1 2005/11/11 19:59:23 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xset/xset-0.99.3.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xsetmode/ChangeLog b/x11-apps/xsetmode/ChangeLog
index ba5610d795b6..b84fcca573f6 100644
--- a/x11-apps/xsetmode/ChangeLog
+++ b/x11-apps/xsetmode/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xsetmode
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+*xsetmode-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xsetmode-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xsetmode-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xsetmode-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xsetmode/Manifest b/x11-apps/xsetmode/Manifest
index 1cee6945a3a5..24af0475977c 100644
--- a/x11-apps/xsetmode/Manifest
+++ b/x11-apps/xsetmode/Manifest
@@ -1,2 +1,6 @@
-MD5 8d1144db22d44ebb80518186f4887c4d xsetmode-0.99.0.ebuild 323
+MD5 f9c9853291e1cb9c8888c2d8d5e91464 ChangeLog 698
 MD5 847c5e7c2d0f16e3acc28cbdbf72a286 files/digest-xsetmode-0.99.0 67
+MD5 1531b3f269b2c885e41ac017ed35ef79 files/digest-xsetmode-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 76b18db2328afbe0a8f1666a0bb7a88a xsetmode-0.99.0.ebuild 449
+MD5 18d7c1ecec64a7839625caa3e028bab0 xsetmode-0.99.1.ebuild 452
diff --git a/x11-apps/xsetmode/xsetmode-0.99.0.ebuild b/x11-apps/xsetmode/xsetmode-0.99.0.ebuild
index 39b00349de75..ba213c279e34 100644
--- a/x11-apps/xsetmode/xsetmode-0.99.0.ebuild
+++ b/x11-apps/xsetmode/xsetmode-0.99.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-apps/xsetmode/xsetmode-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/xsetmode-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xsetmode application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXi
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetmode/xsetmode-0.99.1.ebuild b/x11-apps/xsetmode/xsetmode-0.99.1.ebuild
index 1a3f51557395..28e6b541862f 100644
--- a/x11-apps/xsetmode/xsetmode-0.99.1.ebuild
+++ b/x11-apps/xsetmode/xsetmode-0.99.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-apps/xsetmode/xsetmode-0.99.1.ebuild,v 1.1 2005/10/20 00:45:24 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetmode/xsetmode-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xsetpointer/ChangeLog b/x11-apps/xsetpointer/ChangeLog
index 00c8742c2e07..eae1eb6e176d 100644
--- a/x11-apps/xsetpointer/ChangeLog
+++ b/x11-apps/xsetpointer/ChangeLog
@@ -1,6 +1,25 @@
 # ChangeLog for x11-apps/xsetpointer
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/ChangeLog,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*xsetpointer-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  +xsetpointer-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xsetpointer-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xsetpointer-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org>
+  xsetpointer-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xsetpointer-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xsetpointer/Manifest b/x11-apps/xsetpointer/Manifest
index 7ca75f0d4e5c..7860ace26e4b 100644
--- a/x11-apps/xsetpointer/Manifest
+++ b/x11-apps/xsetpointer/Manifest
@@ -1,2 +1,8 @@
-MD5 0861b7c2fb25fd277e55376f8a8082be xsetpointer-0.99.0.ebuild 326
+MD5 a3ba825431e6e9ba0e966115768f60ac ChangeLog 867
 MD5 d471f21b2394e3fa05cb7ff8754972ca files/digest-xsetpointer-0.99.0 70
+MD5 3de5296af3063e6b565f99670fb5ab84 files/digest-xsetpointer-0.99.1 70
+MD5 0154f7074c19e2692eb56aa5affdfb18 files/digest-xsetpointer-0.99.2 70
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 1445bd700c1cb60248678165f5bca87d xsetpointer-0.99.0.ebuild 458
+MD5 95108971a913aa7bf3684b74571963c4 xsetpointer-0.99.1.ebuild 461
+MD5 8df91be849bcb3a526e44822bf612256 xsetpointer-0.99.2.ebuild 465
diff --git a/x11-apps/xsetpointer/xsetpointer-0.99.0.ebuild b/x11-apps/xsetpointer/xsetpointer-0.99.0.ebuild
index 15e3e11acb1c..a3db8a299030 100644
--- a/x11-apps/xsetpointer/xsetpointer-0.99.0.ebuild
+++ b/x11-apps/xsetpointer/xsetpointer-0.99.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-apps/xsetpointer/xsetpointer-0.99.0.ebuild,v 1.1 2005/08/08 06:28:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/xsetpointer-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xsetpointer application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXi
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetpointer/xsetpointer-0.99.1.ebuild b/x11-apps/xsetpointer/xsetpointer-0.99.1.ebuild
index ccef8d2e46ef..f07c72b56c05 100644
--- a/x11-apps/xsetpointer/xsetpointer-0.99.1.ebuild
+++ b/x11-apps/xsetpointer/xsetpointer-0.99.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-apps/xsetpointer/xsetpointer-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/xsetpointer-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xsetpointer/xsetpointer-0.99.2.ebuild b/x11-apps/xsetpointer/xsetpointer-0.99.2.ebuild
index 695c237cecf3..f37773dbbd8a 100644
--- a/x11-apps/xsetpointer/xsetpointer-0.99.2.ebuild
+++ b/x11-apps/xsetpointer/xsetpointer-0.99.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-apps/xsetpointer/xsetpointer-0.99.2.ebuild,v 1.1 2005/11/11 19:58:53 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetpointer/xsetpointer-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xsetroot/ChangeLog b/x11-apps/xsetroot/ChangeLog
index ece16c47123c..674d7b5a39b4 100644
--- a/x11-apps/xsetroot/ChangeLog
+++ b/x11-apps/xsetroot/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xsetroot
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+*xsetroot-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xsetroot-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  06 Sep 2005; Herbie Hopkins <herbs@gentoo.org> xsetroot-0.99.0.ebuild:
+  Marked ~amd64.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xsetroot-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xsetroot-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
index fe14fac73965..113b459a5779 100644
--- a/x11-apps/xsetroot/Manifest
+++ b/x11-apps/xsetroot/Manifest
@@ -1,2 +1,6 @@
-MD5 1cf49a39c014b66958c589995954c76a xsetroot-0.99.0.ebuild 324
+MD5 5dcb7073dab4aa6c8c38b53629269028 ChangeLog 789
 MD5 8da7c3ad691f5585df5d8ca2fb1fcc11 files/digest-xsetroot-0.99.0 67
+MD5 68baa0c0c6292f032fd86536e653df2f files/digest-xsetroot-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 cccf37584c012dde20a9f51ef45aa3bc xsetroot-0.99.0.ebuild 457
+MD5 3b9d57fa638b02cbe80d23e3de60efb3 xsetroot-0.99.1.ebuild 460
diff --git a/x11-apps/xsetroot/xsetroot-0.99.0.ebuild b/x11-apps/xsetroot/xsetroot-0.99.0.ebuild
index 7e9c0f65134e..ed6b680ec656 100644
--- a/x11-apps/xsetroot/xsetroot-0.99.0.ebuild
+++ b/x11-apps/xsetroot/xsetroot-0.99.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-apps/xsetroot/xsetroot-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/xsetroot-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xsetroot application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsetroot/xsetroot-0.99.1.ebuild b/x11-apps/xsetroot/xsetroot-0.99.1.ebuild
index 0f1462e0df86..23ae61b5fc17 100644
--- a/x11-apps/xsetroot/xsetroot-0.99.1.ebuild
+++ b/x11-apps/xsetroot/xsetroot-0.99.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-apps/xsetroot/xsetroot-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsetroot/xsetroot-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xsm/ChangeLog b/x11-apps/xsm/ChangeLog
index 521b288761d1..4338876373e4 100644
--- a/x11-apps/xsm/ChangeLog
+++ b/x11-apps/xsm/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for x11-apps/xsm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
+
+*xsm-0.99.2 (11 Nov 2005)
+
+  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> +xsm-0.99.2.ebuild:
+  Bump for 7.0RC2.
+
+*xsm-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xsm-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xsm-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xsm-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index 9f23015f42ba..13175ea4f556 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,2 +1,8 @@
-MD5 227ab1c2bfa8d60149feb526b25520ba xsm-0.99.0.ebuild 511
+MD5 52b88453113bb20945555538d4c5de2a ChangeLog 787
 MD5 560fc47517073ce9c0020442f4149c89 files/digest-xsm-0.99.0 62
+MD5 fbab563d6fee5defb0f7033ce0a7b24c files/digest-xsm-0.99.1 63
+MD5 a6b5a7dfd4ba03944bdf5354653a49cf files/digest-xsm-0.99.2 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 c2711ed40174b88e138898a8b5e1799a xsm-0.99.0.ebuild 627
+MD5 edd2a7dfaa7245957ce48c236a246450 xsm-0.99.1.ebuild 630
+MD5 ad58f3370b36c730524f6a7914d3444b xsm-0.99.2.ebuild 634
diff --git a/x11-apps/xsm/xsm-0.99.0.ebuild b/x11-apps/xsm/xsm-0.99.0.ebuild
index cd60cff9c1bd..ef74dcc4d28c 100644
--- a/x11-apps/xsm/xsm-0.99.0.ebuild
+++ b/x11-apps/xsm/xsm-0.99.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-apps/xsm/xsm-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xsm application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXaw
 	net-misc/netkit-rsh"
diff --git a/x11-apps/xsm/xsm-0.99.1.ebuild b/x11-apps/xsm/xsm-0.99.1.ebuild
index e0eed2da74ef..5d2597cfce36 100644
--- a/x11-apps/xsm/xsm-0.99.1.ebuild
+++ b/x11-apps/xsm/xsm-0.99.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-apps/xsm/xsm-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xsm/xsm-0.99.2.ebuild b/x11-apps/xsm/xsm-0.99.2.ebuild
index ecc2b08e2c0c..99724c596c86 100644
--- a/x11-apps/xsm/xsm-0.99.2.ebuild
+++ b/x11-apps/xsm/xsm-0.99.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-apps/xsm/xsm-0.99.2.ebuild,v 1.1 2005/11/11 20:00:02 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-0.99.2.ebuild,v 1.1.1.1 2005/11/30 10:14:33 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xstdcmap/ChangeLog b/x11-apps/xstdcmap/ChangeLog
index 1b9176e4c9c7..177a4105cc20 100644
--- a/x11-apps/xstdcmap/ChangeLog
+++ b/x11-apps/xstdcmap/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xstdcmap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*xstdcmap-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xstdcmap-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xstdcmap-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xstdcmap-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
index 63fc9634be92..e5270e8ff746 100644
--- a/x11-apps/xstdcmap/Manifest
+++ b/x11-apps/xstdcmap/Manifest
@@ -1,2 +1,6 @@
-MD5 9b061832ca9dc1b49a78c035b4f31725 xstdcmap-0.99.0.ebuild 324
+MD5 2547556668c60a72c0680bad604a2778 ChangeLog 698
 MD5 a6a385eda0d63f9885a26d9ac215457e files/digest-xstdcmap-0.99.0 67
+MD5 f114a3d44c815317b5d73687f104dc05 files/digest-xstdcmap-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 f739ecc95039d326dd525637d82d6489 xstdcmap-0.99.0.ebuild 450
+MD5 8e21b353f70b163feef564f9e327cbde xstdcmap-0.99.1.ebuild 453
diff --git a/x11-apps/xstdcmap/xstdcmap-0.99.0.ebuild b/x11-apps/xstdcmap/xstdcmap-0.99.0.ebuild
index 3b6a75d18504..6d9d99258126 100644
--- a/x11-apps/xstdcmap/xstdcmap-0.99.0.ebuild
+++ b/x11-apps/xstdcmap/xstdcmap-0.99.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-apps/xstdcmap/xstdcmap-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/xstdcmap-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xstdcmap application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xstdcmap/xstdcmap-0.99.1.ebuild b/x11-apps/xstdcmap/xstdcmap-0.99.1.ebuild
index 507852efa620..97c95dfb0530 100644
--- a/x11-apps/xstdcmap/xstdcmap-0.99.1.ebuild
+++ b/x11-apps/xstdcmap/xstdcmap-0.99.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-apps/xstdcmap/xstdcmap-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xstdcmap/xstdcmap-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xtrap/ChangeLog b/x11-apps/xtrap/ChangeLog
index b11312a95672..2a06e9e78146 100644
--- a/x11-apps/xtrap/ChangeLog
+++ b/x11-apps/xtrap/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for x11-apps/xtrap
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/ChangeLog,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
+
+*xtrap-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xtrap-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  14 Oct 2005; <dang@gentoo.org> xtrap-0.99.0.ebuild:
+  Marked ~amd64
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  20 Aug 2005; Luca Barbato <lu_zero@gentoo.org> xtrap-0.99.0.ebuild:
+  Marked ~ppc
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xtrap-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xtrap-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
index 5ca8484823a0..571967a353eb 100644
--- a/x11-apps/xtrap/Manifest
+++ b/x11-apps/xtrap/Manifest
@@ -1,2 +1,6 @@
-MD5 d0e9a2ca87cc266cdfc891a614d57c15 xtrap-0.99.0.ebuild 323
+MD5 97cd3d6aa2b95cc486f76bd4e7c646ca ChangeLog 829
 MD5 f1bc74ff24ca181e4b1eb8fd6bda0086 files/digest-xtrap-0.99.0 64
+MD5 6e2f4478bdc4840c70152770fd7f86aa files/digest-xtrap-0.99.1 64
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 81990b6328b2ba44e2c0db5008e742c6 xtrap-0.99.0.ebuild 455
+MD5 233bd96a05d556ba8055421ba62619f1 xtrap-0.99.1.ebuild 458
diff --git a/x11-apps/xtrap/xtrap-0.99.0.ebuild b/x11-apps/xtrap/xtrap-0.99.0.ebuild
index 4ffdf9f9e39f..3b8b9f28e25b 100644
--- a/x11-apps/xtrap/xtrap-0.99.0.ebuild
+++ b/x11-apps/xtrap/xtrap-0.99.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-apps/xtrap/xtrap-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/xtrap-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xtrap application"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXTrap"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xtrap/xtrap-0.99.1.ebuild b/x11-apps/xtrap/xtrap-0.99.1.ebuild
index 4a22bd54be10..752d1949b9ff 100644
--- a/x11-apps/xtrap/xtrap-0.99.1.ebuild
+++ b/x11-apps/xtrap/xtrap-0.99.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-apps/xtrap/xtrap-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xtrap/xtrap-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:34 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xvidtune/ChangeLog b/x11-apps/xvidtune/ChangeLog
index a43a376b2d2d..0972cc06c295 100644
--- a/x11-apps/xvidtune/ChangeLog
+++ b/x11-apps/xvidtune/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-apps/xvidtune
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/ChangeLog,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
+
+*xvidtune-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xvidtune-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xvidtune-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xvidtune-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
index 3c39d4bca4a6..0284acc67ed0 100644
--- a/x11-apps/xvidtune/Manifest
+++ b/x11-apps/xvidtune/Manifest
@@ -1,2 +1,6 @@
-MD5 45405da78b4897c97109cb706744bcb8 xvidtune-0.99.0.ebuild 516
+MD5 25b82d10a52d0f4c6ede4b1cf4e8647a ChangeLog 698
 MD5 f8d455fd33f271c8620e5fa4c127d1b7 files/digest-xvidtune-0.99.0 67
+MD5 c6896f88a65ec2cda3a38bf857cc5a2f files/digest-xvidtune-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 e1acdbae01cfa7a060470a5fac74b661 xvidtune-0.99.0.ebuild 642
+MD5 4e95a6f8002b25e6664452dd85d30a2c xvidtune-0.99.1.ebuild 645
diff --git a/x11-apps/xvidtune/xvidtune-0.99.0.ebuild b/x11-apps/xvidtune/xvidtune-0.99.0.ebuild
index d7156e5f4ec2..6837185ae273 100644
--- a/x11-apps/xvidtune/xvidtune-0.99.0.ebuild
+++ b/x11-apps/xvidtune/xvidtune-0.99.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-apps/xvidtune/xvidtune-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/xvidtune-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xvidtune application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 IUSE="xprint"
 RDEPEND="x11-libs/libXxf86vm
 	x11-libs/libXaw"
diff --git a/x11-apps/xvidtune/xvidtune-0.99.1.ebuild b/x11-apps/xvidtune/xvidtune-0.99.1.ebuild
index 357d73673095..d9646900f61f 100644
--- a/x11-apps/xvidtune/xvidtune-0.99.1.ebuild
+++ b/x11-apps/xvidtune/xvidtune-0.99.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-apps/xvidtune/xvidtune-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvidtune/xvidtune-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:37 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xvinfo/ChangeLog b/x11-apps/xvinfo/ChangeLog
index 6cfa700a2bad..224ea3eadc94 100644
--- a/x11-apps/xvinfo/ChangeLog
+++ b/x11-apps/xvinfo/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xvinfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
+
+*xvinfo-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xvinfo-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  12 Oct 2005; Luca Barbato <lu_zero@gentoo.org> xvinfo-0.99.0.ebuild:
+  Marked ~ppc
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xvinfo-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xvinfo-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
index 9f4880ea565e..edeae3e06e3a 100644
--- a/x11-apps/xvinfo/Manifest
+++ b/x11-apps/xvinfo/Manifest
@@ -1,2 +1,6 @@
-MD5 813c81556eeda904586504395c0b0a3c xvinfo-0.99.0.ebuild 321
+MD5 2d610e6d7f2b55d860a03f721bec5178 ChangeLog 770
 MD5 4a09f52913e8defc03c5b9cf688b55dd files/digest-xvinfo-0.99.0 65
+MD5 91b1bcd28b441279a6fe47202723efe4 files/digest-xvinfo-0.99.1 65
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 f4f648fe83da5ea574fe85b09b572f5d xvinfo-0.99.0.ebuild 448
+MD5 5bc75f819fff791da386e80956ac7408 xvinfo-0.99.1.ebuild 451
diff --git a/x11-apps/xvinfo/xvinfo-0.99.0.ebuild b/x11-apps/xvinfo/xvinfo-0.99.0.ebuild
index 6a6258ab2331..17f2e6010257 100644
--- a/x11-apps/xvinfo/xvinfo-0.99.0.ebuild
+++ b/x11-apps/xvinfo/xvinfo-0.99.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-apps/xvinfo/xvinfo-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/xvinfo-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xvinfo application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~ppc ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXv
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvinfo/xvinfo-0.99.1.ebuild b/x11-apps/xvinfo/xvinfo-0.99.1.ebuild
index f330fc9ec567..362d17fa5bb4 100644
--- a/x11-apps/xvinfo/xvinfo-0.99.1.ebuild
+++ b/x11-apps/xvinfo/xvinfo-0.99.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-apps/xvinfo/xvinfo-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xvinfo/xvinfo-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:39 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
diff --git a/x11-apps/xwd/ChangeLog b/x11-apps/xwd/ChangeLog
index e9ab4cefe641..6da293995634 100644
--- a/x11-apps/xwd/ChangeLog
+++ b/x11-apps/xwd/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xwd
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/ChangeLog,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xwd-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xwd-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xwd-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xwd-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xwd-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
index 0292892687a1..12c003236cb4 100644
--- a/x11-apps/xwd/Manifest
+++ b/x11-apps/xwd/Manifest
@@ -1,2 +1,16 @@
-MD5 29a831e60eef433d4fa728e42d978422 xwd-0.99.0.ebuild 319
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5aaf15e8b7738fb69b4d18fcf2443c09 ChangeLog 741
 MD5 7fe6c713a5a2b9e77ed295c7c29d11e9 files/digest-xwd-0.99.0 62
+MD5 5e42e445bbda8f41018e09c84164eac2 files/digest-xwd-0.99.1 62
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 23dbfb30703c3bcfa0ce8f9f66f1e7d5 xwd-0.99.0.ebuild 435
+MD5 4a3484c5792aa4f37496172a0a40c17e xwd-0.99.1.ebuild 441
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfInY2G5bA0cA/ScRAmLxAJ42nEq79eA5yZsh5D+aKEFpyCQckwCgj72u
+3zLbMliH+AKFo+TQNvcQKCw=
+=SPFy
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xwd/xwd-0.99.0.ebuild b/x11-apps/xwd/xwd-0.99.0.ebuild
index 583fc891f0ed..6c4ca9dba91f 100644
--- a/x11-apps/xwd/xwd-0.99.0.ebuild
+++ b/x11-apps/xwd/xwd-0.99.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-apps/xwd/xwd-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwd application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwd/xwd-0.99.1.ebuild b/x11-apps/xwd/xwd-0.99.1.ebuild
index edbe2d7dab11..a7b448bae604 100644
--- a/x11-apps/xwd/xwd-0.99.1.ebuild
+++ b/x11-apps/xwd/xwd-0.99.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-apps/xwd/xwd-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwd/xwd-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:35 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwd application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwininfo/ChangeLog b/x11-apps/xwininfo/ChangeLog
index 596eea553307..7c7e221bd929 100644
--- a/x11-apps/xwininfo/ChangeLog
+++ b/x11-apps/xwininfo/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for x11-apps/xwininfo
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/ChangeLog,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xwininfo-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xwininfo-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +xwininfo-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xwininfo-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xwininfo-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
index 77776e496312..5f3543bee1fd 100644
--- a/x11-apps/xwininfo/Manifest
+++ b/x11-apps/xwininfo/Manifest
@@ -1,2 +1,16 @@
-MD5 64ec9160024526540d4507d20f4410f6 xwininfo-0.99.0.ebuild 324
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 02c7e0fc2d5b39ebfb2ab9d62a98fb0e ChangeLog 785
 MD5 e3ab74efab3779bf34cbd8f5cd4a0e09 files/digest-xwininfo-0.99.0 67
+MD5 726d3cfc7872487486ca35e7008718bd files/digest-xwininfo-0.99.1 67
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 c822be69e813eda17c6d752553f2e819 xwininfo-0.99.0.ebuild 450
+MD5 cf8067b7b26d5145c4448b21bb03a8f6 xwininfo-0.99.1.ebuild 456
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIqQ2G5bA0cA/ScRAnlZAKCSIXEpiVNgy+goSfdmG8/8f0cFPgCgiJiy
+YyRoUiVLLLkcqNWgafBjJuY=
+=+Oz6
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xwininfo/xwininfo-0.99.0.ebuild b/x11-apps/xwininfo/xwininfo-0.99.0.ebuild
index 7d9d2819160c..f0116ff8c0a5 100644
--- a/x11-apps/xwininfo/xwininfo-0.99.0.ebuild
+++ b/x11-apps/xwininfo/xwininfo-0.99.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-apps/xwininfo/xwininfo-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwininfo application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwininfo/xwininfo-0.99.1.ebuild b/x11-apps/xwininfo/xwininfo-0.99.1.ebuild
index c1e1cc2fe0e4..bfaf4640d786 100644
--- a/x11-apps/xwininfo/xwininfo-0.99.1.ebuild
+++ b/x11-apps/xwininfo/xwininfo-0.99.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-apps/xwininfo/xwininfo-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:38 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwininfo application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libXmu
 	x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwud/ChangeLog b/x11-apps/xwud/ChangeLog
index f8493c64fcbf..dd9e59e641cc 100644
--- a/x11-apps/xwud/ChangeLog
+++ b/x11-apps/xwud/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for x11-apps/xwud
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/ChangeLog,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/ChangeLog,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
+
+  17 Nov 2005; Herbie Hopkins <herbs@gentoo.org> xwud-0.99.1.ebuild:
+  Marked ~amd64.
+
+*xwud-0.99.1 (20 Oct 2005)
+
+  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +xwud-0.99.1.ebuild:
+  Bump for 7.0 RC1.
+
+  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
+  Add metadata.
+
+  08 Aug 2005; Ferris McCormick <fmccor@gentoo.org> xwud-0.99.0.ebuild:
+  Add ~sparc keyword (Modular X testing).
 
 *xwud-0.99.0 (08 Aug 2005)
 
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
index d8d5242c0acd..07bdc29b755d 100644
--- a/x11-apps/xwud/Manifest
+++ b/x11-apps/xwud/Manifest
@@ -1,2 +1,16 @@
-MD5 528b0c008ab026e0f7cd7ef152a17826 xwud-0.99.0.ebuild 303
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b51a6ba93f7b98faab733f04c4a53de ChangeLog 749
 MD5 2752846ca08909739029bb4ce2a408b5 files/digest-xwud-0.99.0 63
+MD5 6d3897d21afb404854489170e5b5d2b8 files/digest-xwud-0.99.1 63
+MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
+MD5 5c974c0164d5ad0ae667f0381f16cf25 xwud-0.99.0.ebuild 421
+MD5 90ad4cc70fa7b45793810245549851c7 xwud-0.99.1.ebuild 427
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDfIpx2G5bA0cA/ScRAhVBAKCUIUiDiqd2sBGJutSVQ4z0CpcpLACeIBa4
+21LkAXmzxC/Z/rpvUbLprBg=
+=tXl8
+-----END PGP SIGNATURE-----
diff --git a/x11-apps/xwud/xwud-0.99.0.ebuild b/x11-apps/xwud/xwud-0.99.0.ebuild
index 0442b8287ad8..eb31098a99dc 100644
--- a/x11-apps/xwud/xwud-0.99.0.ebuild
+++ b/x11-apps/xwud/xwud-0.99.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-apps/xwud/xwud-0.99.0.ebuild,v 1.1 2005/08/08 06:28:13 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-0.99.0.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwud application"
-KEYWORDS="~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwud/xwud-0.99.1.ebuild b/x11-apps/xwud/xwud-0.99.1.ebuild
index 6f4218a2e961..6bada4bc5062 100644
--- a/x11-apps/xwud/xwud-0.99.1.ebuild
+++ b/x11-apps/xwud/xwud-0.99.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-apps/xwud/xwud-0.99.1.ebuild,v 1.1 2005/10/20 00:45:25 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwud/xwud-0.99.1.ebuild,v 1.1.1.1 2005/11/30 10:14:36 chriswhite Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,6 +8,6 @@
 inherit x-modular
 
 DESCRIPTION="X.Org xwud application"
-KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}"
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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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 @@
- * 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